CONFIG_ namespace cleanup patches. These are all simple macro renames;
no object code will be changed by this patch. In every case, I used my
cross-reference generator to check that I caught all occurrences of changed
symbols.
drivers/net/at1700.c drivers/net/fmv18x.c drivers/net/pcmcia/fmvj18x_cs.c:
Change CONFIG_[01] to CONF_REGISTER_[01]
drivers/net/Makefile:
Eliminate unused and unset configuration symbol CONFIG_3C589 and
CONFIG_DE650.
drivers/net/aironet4500_card.c
CONFIG_AIRONET4500_365 needed to be CONFIG_AIRONET4500_I365.
(This was a real bug!)
drivers/char/rio/rioinit.c:
Changed CONFIG_ADDRESS and CONFIG_DATA to CONFIGURE_ADDRESS
and CONFIGURE_DATA.
drivers/i2o/i2o_lan.c:
Changed never-set symbol CONFIG_ANYLAN to __UNUSED__
drivers/block/ll_rw_blk.c:
Changed never-set symbol CONFIG_APBLOCK to CONFIG_AP1000. This is
consistent with comments in major.h (CONFIG_AP1000 is never set either
but at least this reduces the clutter.)
drivers/media/video/zr36120_mem.c:
This file guards an inclusion of a nonexistent bigphysarea.h
header file with a never-set CONFIG_BIGPHYS_AREA symbol. According
to Documentation/sound/sonicvibes, this is a hack that goes with
an third-party bigphysarea patch -- which should take responsibility
for patching this file as well. This should probably be removed, but
I've just renamed the macro EXTERNAL_BIGPHYS_AREA to get it out of
CONFIG_ space.
drivers/net/tokenring/tms380tr.h:
CONFIG_BRIDGE_PARMS -> CONF_BRIDGE_PARMS. This symbol is not actually
used anywhere.
The following drivers/video changes form an connected group:
drivers/video/atyfb.c, drivers/video/aty.h:
CONFIG_CHIP_ID -> CONFIGURE_CHIP_ID
drivers/video/aty.h, drivers/video/aty128fb.c, drivers/video/aty128.h:
CONFIG_CTL -> CONFIGURE_CTL
drivers/video/aty128fb.c, drivers/video/aty128.h:
CONFIG_MEMSIZE -> CONFIGURE_MEMSIZE
drivers/video/aty.h:
CONFIG_PANEL_LG -> CONFIGURE_PANEL_LG
drivers/video/atyfb.c, drivers/video/aty.h:
CONFIG_STAT[012] -> CONFIGURE_STAT[012]
drivers/net/wan/comx.h:
CONFIG_COMX_DEBUG_RAW -> ENABLE_COMX_DEBUG_RAW
arch/alpha/kernel/smc37c93x.c:
CONFIG_CONTROL -> CONFIGURE_CONTROL, CONFIG_ON_KEY -> CONFIGURE_ON_KEY,
CONFIG_OFF_KEY -> CONFIGURE_OFF_KEY.
drivers/char/rio/cirrus.h:
CONFIG_COR[1245] -> CONFIGURE_COR[1245]
drivers/net/wan/cycx_main.c:
CONFIG_CYCLOMX_CARDS -> CONFIGURE_CYCLOMX_CARDS
drivers/net/eepro100.c:
CONFIG_DATA_SIZE -> CONFIGURE_DATA_SIZE
net/decnet/Makefile:
Removed unset symbol CONFIG_DECNET_FW.
drivers/dio/dio.c:
CONFIG_DIO_CONSTANTS -> ENABLE_DIO_CONSTANTS
drivers/net/tokenring/smctr.h:
CONFIG_ERROR -> CONFIGURE_ERROR, CONFIG_WARNING -> CONFIGURE_WARNING.
These symbols are not actually used anywhere.
include/linux/ps2esdi.h, drivers/block/ps2esdi.c:
CONFIG_?? -> CONFIGURE_??.
net/irda/irsyms.c:
CONFIG_IRTTY -> ENABLE_IRTTY. Never set, seems to do nothing.
--- drivers/net/at1700.c 2001/04/20 15:38:58 1.1
+++ drivers/net/at1700.c 2001/04/20 15:41:10
@@ -131,8 +131,8 @@
#define RX_INTR 3
#define TX_MODE 4
#define RX_MODE 5
-#define CONFIG_0 6 /* Misc. configuration settings. */
-#define CONFIG_1 7
+#define CONF_REGISTER_0 6 /* Misc. configuration settings. */
+#define CONF_REGISTER_1 7
/* Run-time register bank 2 definitions. */
#define DATAPORT 8 /* Word-wide DMA or programmed-I/O
dataport. */
#define TX_START 10
@@ -391,22 +391,22 @@
/* Set the configuration register 0 to 32K 100ns. byte-wide memory, 16 bit
bus access, two 4K Tx queues, and disabled Tx and Rx. */
- outb(0xda, ioaddr + CONFIG_0);
+ outb(0xda, ioaddr + CONF_REGISTER_0);
/* Set the station address in bank zero. */
- outb(0x00, ioaddr + CONFIG_1);
+ outb(0x00, ioaddr + CONF_REGISTER_1);
for (i = 0; i < 6; i++)
outb(dev->dev_addr[i], ioaddr + 8 + i);
/* Switch to bank 1 and set the multicast table to accept none. */
- outb(0x04, ioaddr + CONFIG_1);
+ outb(0x04, ioaddr + CONF_REGISTER_1);
for (i = 0; i < 8; i++)
outb(0x00, ioaddr + 8 + i);
/* Switch to bank 2 */
/* Lock our I/O address, and set manual processing mode for 16 collisions. */
- outb(0x08, ioaddr + CONFIG_1);
+ outb(0x08, ioaddr + CONF_REGISTER_1);
outb(dev->if_port, ioaddr + MODE13);
outb(0x00, ioaddr + COL16CNTL);
@@ -513,10 +513,10 @@
/* Set the configuration register 0 to 32K 100ns. byte-wide memory, 16 bit
bus access, and two 4K Tx queues. */
- outb(0x5a, ioaddr + CONFIG_0);
+ outb(0x5a, ioaddr + CONF_REGISTER_0);
/* Powerup, switch to register bank 2, and enable the Rx and Tx. */
- outb(0xe8, ioaddr + CONFIG_1);
+ outb(0xe8, ioaddr + CONF_REGISTER_1);
lp->tx_started = 0;
lp->tx_queue_ready = 1;
@@ -553,8 +553,8 @@
/* ToDo: We should try to restart the adaptor... */
outw (0xffff, ioaddr + 24);
outw (0xffff, ioaddr + TX_STATUS);
- outb (0x5a, ioaddr + CONFIG_0);
- outb (0xe8, ioaddr + CONFIG_1);
+ outb (0x5a, ioaddr + CONF_REGISTER_0);
+ outb (0xe8, ioaddr + CONF_REGISTER_1);
outw (0x8182, ioaddr + TX_INTR);
outb (0x00, ioaddr + TX_START);
outb (0x03, ioaddr + COL16CNTL);
@@ -773,7 +773,7 @@
netif_stop_queue(dev);
/* Set configuration register 0 to disable Tx and Rx. */
- outb(0xda, ioaddr + CONFIG_0);
+ outb(0xda, ioaddr + CONF_REGISTER_0);
/* No statistic counters on the chip to update. */
@@ -784,7 +784,7 @@
}
/* Power-down the chip. Green, green, green! */
- outb(0x00, ioaddr + CONFIG_1);
+ outb(0x00, ioaddr + CONF_REGISTER_1);
return 0;
}
@@ -860,13 +860,13 @@
save_flags(flags);
cli();
if (memcmp(mc_filter, lp->mc_filter, sizeof(mc_filter))) {
- int saved_bank = inw(ioaddr + CONFIG_0);
+ int saved_bank = inw(ioaddr + CONF_REGISTER_0);
/* Switch to bank 1 and set the multicast table. */
- outw((saved_bank & ~0x0C00) | 0x0480, ioaddr + CONFIG_0);
+ outw((saved_bank & ~0x0C00) | 0x0480, ioaddr + CONF_REGISTER_0);
for (i = 0; i < 8; i++)
outb(mc_filter[i], ioaddr + 8 + i);
memcpy(lp->mc_filter, mc_filter, sizeof(mc_filter));
- outw(saved_bank, ioaddr + CONFIG_0);
+ outw(saved_bank, ioaddr + CONF_REGISTER_0);
}
restore_flags(flags);
return;
--- drivers/net/fmv18x.c 2001/04/20 15:45:11 1.1
+++ drivers/net/fmv18x.c 2001/04/20 15:45:57
@@ -92,8 +92,8 @@
#define RX_INTR 3
#define TX_MODE 4
#define RX_MODE 5
-#define CONFIG_0 6 /* Misc. configuration settings. */
-#define CONFIG_1 7
+#define CONF_REGISTER_0 6 /* Misc. configuration settings. */
+#define CONF_REGISTER_1 7
/* Run-time register bank 2 definitions. */
#define DATAPORT 8 /* Word-wide DMA or programmed-I/O
dataport. */
#define TX_START 10
@@ -238,8 +238,8 @@
}
/* Initialize LAN Controller and LAN Card */
- outb(0xda, ioaddr + CONFIG_0); /* Initialize LAN Controller */
- outb(0x00, ioaddr + CONFIG_1); /* Stand by mode */
+ outb(0xda, ioaddr + CONF_REGISTER_0); /* Initialize LAN Controller */
+ outb(0x00, ioaddr + CONF_REGISTER_1); /* Stand by mode */
outb(0x00, ioaddr + FJ_CONFIG1); /* Disable IRQ of LAN Card */
outb(0x00, ioaddr + FJ_BUFCNTL); /* Reset ? I'm not sure (TAMIYA) */
@@ -247,17 +247,17 @@
udelay(200);
/* Set the station address in bank zero. */
- outb(0x00, ioaddr + CONFIG_1);
+ outb(0x00, ioaddr + CONF_REGISTER_1);
for (i = 0; i < 6; i++)
outb(dev->dev_addr[i], ioaddr + 8 + i);
/* Switch to bank 1 and set the multicast table to accept none. */
- outb(0x04, ioaddr + CONFIG_1);
+ outb(0x04, ioaddr + CONF_REGISTER_1);
for (i = 0; i < 8; i++)
outb(0x00, ioaddr + 8 + i);
/* Switch to bank 2 and lock our I/O address. */
- outb(0x08, ioaddr + CONFIG_1);
+ outb(0x08, ioaddr + CONF_REGISTER_1);
outb(dev->if_port, ioaddr + MODE13);
outb(0x00, ioaddr + COL16CNTL);
@@ -302,10 +302,10 @@
/* Set the configuration register 0 to 32K 100ns. byte-wide memory,
16 bit bus access, and two 4K Tx, enable the Rx and Tx. */
- outb(0x5a, ioaddr + CONFIG_0);
+ outb(0x5a, ioaddr + CONF_REGISTER_0);
/* Powerup and switch to register bank 2 for the run-time registers. */
- outb(0xe8, ioaddr + CONFIG_1);
+ outb(0xe8, ioaddr + CONF_REGISTER_1);
lp->tx_started = 0;
lp->tx_queue_ready = 1;
@@ -354,8 +354,8 @@
spin_lock_irqsave(&lp->lock, flags);
/* Initialize LAN Controller and LAN Card */
- outb(0xda, ioaddr + CONFIG_0); /* Initialize LAN Controller */
- outb(0x00, ioaddr + CONFIG_1); /* Stand by mode */
+ outb(0xda, ioaddr + CONF_REGISTER_0); /* Initialize LAN Controller */
+ outb(0x00, ioaddr + CONF_REGISTER_1); /* Stand by mode */
outb(0x00, ioaddr + FJ_CONFIG1); /* Disable IRQ of LAN Card */
outb(0x00, ioaddr + FJ_BUFCNTL); /* Reset ? I'm not sure */
net_open(dev);
@@ -574,12 +574,12 @@
netif_stop_queue(dev);
/* Set configuration register 0 to disable Tx and Rx. */
- outb(0xda, ioaddr + CONFIG_0);
+ outb(0xda, ioaddr + CONF_REGISTER_0);
/* Update the statistics -- ToDo. */
/* Power-down the chip. Green, green, green! */
- outb(0x00, ioaddr + CONFIG_1);
+ outb(0x00, ioaddr + CONF_REGISTER_1);
/* Set the ethernet adaptor disable IRQ */
outb(0x00, ioaddr + FJ_CONFIG1);
--- drivers/net/pcmcia/fmvj18x_cs.c 2001/04/20 15:46:49 1.1
+++ drivers/net/pcmcia/fmvj18x_cs.c 2001/04/20 15:47:55
@@ -157,8 +157,8 @@
#define RX_INTR 3 /* receive interrupt mask register */
#define TX_MODE 4 /* transmit mode register */
#define RX_MODE 5 /* receive mode register */
-#define CONFIG_0 6 /* configuration register 0 */
-#define CONFIG_1 7 /* configuration register 1 */
+#define CONF_REGISTER_0 6 /* configuration register 0 */
+#define CONF_REGISTER_1 7 /* configuration register 1 */
#define NODE_ID 8 /* node ID register (bank 0) */
#define MAR_ADR 8 /* multicast address registers (bank 1) */
@@ -225,12 +225,12 @@
#define RECV_ALL 0x03 /* (RX_MODE) */
#define CONFIG0_DFL 0x5a /* 16bit bus, 4K x 2 Tx queues */
#define CONFIG0_DFL_1 0x5e /* 16bit bus, 8K x 2 Tx queues */
-#define CONFIG0_RST 0xda /* Data Link Controller off (CONFIG_0) */
-#define CONFIG0_RST_1 0xde /* Data Link Controller off (CONFIG_0) */
-#define BANK_0 0xa0 /* bank 0 (CONFIG_1) */
-#define BANK_1 0xa4 /* bank 1 (CONFIG_1) */
-#define BANK_2 0xa8 /* bank 2 (CONFIG_1) */
-#define CHIP_OFF 0x80 /* contrl chip power off (CONFIG_1) */
+#define CONFIG0_RST 0xda /* Data Link Controller off (CONF_REGISTER_0) */
+#define CONFIG0_RST_1 0xde /* Data Link Controller off (CONF_REGISTER_0) */
+#define BANK_0 0xa0 /* bank 0 (CONF_REGISTER_1) */
+#define BANK_1 0xa4 /* bank 1 (CONF_REGISTER_1) */
+#define BANK_2 0xa8 /* bank 2 (CONF_REGISTER_1) */
+#define CHIP_OFF 0x80 /* contrl chip power off (CONF_REGISTER_1) */
#define DO_TX 0x80 /* do transmit packet */
#define SEND_PKT 0x81 /* send a packet */
#define AUTO_MODE 0x07 /* Auto skip packet on 16 col detected */
@@ -242,9 +242,9 @@
#define TX_TIMEOUT ((400*HZ)/1000)
-#define BANK_0U 0x20 /* bank 0 (CONFIG_1) */
-#define BANK_1U 0x24 /* bank 1 (CONFIG_1) */
-#define BANK_2U 0x28 /* bank 2 (CONFIG_1) */
+#define BANK_0U 0x20 /* bank 0 (CONF_REGISTER_1) */
+#define BANK_1U 0x24 /* bank 1 (CONF_REGISTER_1) */
+#define BANK_2U 0x28 /* bank 2 (CONF_REGISTER_1) */
/*======================================================================
@@ -520,15 +520,15 @@
/* Power On chip and select bank 0 */
if(cardtype == UNGERMANN)
- outb(BANK_0U, ioaddr + CONFIG_1);
+ outb(BANK_0U, ioaddr + CONF_REGISTER_1);
else
- outb(BANK_0, ioaddr + CONFIG_1);
+ outb(BANK_0, ioaddr + CONF_REGISTER_1);
/* Reset controller */
if( sram_config == 0 )
- outb(CONFIG0_RST, ioaddr + CONFIG_0);
+ outb(CONFIG0_RST, ioaddr + CONF_REGISTER_0);
else
- outb(CONFIG0_RST_1, ioaddr + CONFIG_0);
+ outb(CONFIG0_RST_1, ioaddr + CONF_REGISTER_0);
/* Set hardware address */
switch (cardtype) {
@@ -939,15 +939,15 @@
/* Power On chip and select bank 0 */
if( lp->cardtype == UNGERMANN)
- outb(BANK_0U, ioaddr + CONFIG_1);
+ outb(BANK_0U, ioaddr + CONF_REGISTER_1);
else
- outb(BANK_0, ioaddr + CONFIG_1);
+ outb(BANK_0, ioaddr + CONF_REGISTER_1);
/* Reset buffers */
if( sram_config == 0 )
- outb(CONFIG0_RST, ioaddr + CONFIG_0);
+ outb(CONFIG0_RST, ioaddr + CONF_REGISTER_0);
else
- outb(CONFIG0_RST_1, ioaddr + CONFIG_0);
+ outb(CONFIG0_RST_1, ioaddr + CONF_REGISTER_0);
/* Set Tx modes */
outb(D_TX_MODE, ioaddr + TX_MODE);
@@ -960,9 +960,9 @@
/* Switch to bank 1 */
if ( lp->cardtype == UNGERMANN )
- outb(BANK_1U, ioaddr + CONFIG_1);
+ outb(BANK_1U, ioaddr + CONF_REGISTER_1);
else
- outb(BANK_1, ioaddr + CONFIG_1);
+ outb(BANK_1, ioaddr + CONF_REGISTER_1);
/* set the multicast table to accept none. */
for (i = 0; i < 6; i++)
@@ -970,9 +970,9 @@
/* Switch to bank 2 (runtime mode) */
if ( lp->cardtype == UNGERMANN )
- outb(BANK_2U, ioaddr + CONFIG_1);
+ outb(BANK_2U, ioaddr + CONF_REGISTER_1);
else
- outb(BANK_2, ioaddr + CONFIG_1);
+ outb(BANK_2, ioaddr + CONF_REGISTER_1);
/* set 16col ctrl bits */
if( lp->cardtype == TDK )
@@ -989,9 +989,9 @@
/* Enable Tx and Rx */
if( sram_config == 0 )
- outb(CONFIG0_DFL, ioaddr + CONFIG_0);
+ outb(CONFIG0_DFL, ioaddr + CONF_REGISTER_0);
else
- outb(CONFIG0_DFL_1, ioaddr + CONFIG_0);
+ outb(CONFIG0_DFL_1, ioaddr + CONF_REGISTER_0);
/* Init receive pointer ? */
inw(ioaddr + DATAPORT);
@@ -1156,14 +1156,14 @@
/* Set configuration register 0 to disable Tx and Rx. */
if( sram_config == 0 )
- outb(CONFIG0_RST ,ioaddr + CONFIG_0);
+ outb(CONFIG0_RST ,ioaddr + CONF_REGISTER_0);
else
- outb(CONFIG0_RST_1 ,ioaddr + CONFIG_0);
+ outb(CONFIG0_RST_1 ,ioaddr + CONF_REGISTER_0);
/* Update the statistics -- ToDo. */
/* Power-down the chip. Green, green, green! */
- outb(CHIP_OFF ,ioaddr + CONFIG_1);
+ outb(CHIP_OFF ,ioaddr + CONF_REGISTER_1);
/* Set the ethernet adaptor disable IRQ */
if( lp->cardtype != TDK )
@@ -1247,13 +1247,13 @@
save_flags(flags);
cli();
if (memcmp(mc_filter, lp->mc_filter, sizeof(mc_filter))) {
- int saved_bank = inb(ioaddr + CONFIG_1);
+ int saved_bank = inb(ioaddr + CONF_REGISTER_1);
/* Switch to bank 1 and set the multicast table. */
- outb(0xe4, ioaddr + CONFIG_1);
+ outb(0xe4, ioaddr + CONF_REGISTER_1);
for (i = 0; i < 8; i++)
outb(mc_filter[i], ioaddr + 8 + i);
memcpy(lp->mc_filter, mc_filter, sizeof(mc_filter));
- outb(saved_bank, ioaddr + CONFIG_1);
+ outb(saved_bank, ioaddr + CONF_REGISTER_1);
}
restore_flags(flags);
}
--- drivers/net/Makefile 2001/04/20 15:52:14 1.1
+++ drivers/net/Makefile 2001/04/20 15:52:18
@@ -143,7 +143,6 @@
obj-$(CONFIG_STRIP) += strip.o
obj-$(CONFIG_DE650) += de650.o 8390.o
-obj-$(CONFIG_3C589) += 3c589.o
obj-$(CONFIG_DUMMY) += dummy.o
obj-$(CONFIG_BONDING) += bonding.o
obj-$(CONFIG_DE600) += de600.o
--- drivers/net/aironet4500_card.c 2001/04/20 16:20:52 1.1
+++ drivers/net/aironet4500_card.c 2001/04/20 16:21:27
@@ -639,7 +639,7 @@
#endif /* CONFIG_AIRONET4500_ISA */
-#ifdef CONFIG_AIRONET4500_365
+#ifdef CONFIG_AIRONET4500_I365
#define port_range 0x40
--- drivers/block/ll_rw_blk.c 2001/04/20 16:34:13 1.1
+++ drivers/block/ll_rw_blk.c 2001/04/20 16:34:27
@@ -1284,7 +1284,7 @@
#ifdef CONFIG_SJCD
sjcd_init();
#endif
-#ifdef CONFIG_APBLOCK
+#ifdef CONFIG_AP1000
ap_init();
#endif
#ifdef CONFIG_DDV
--- drivers/block/ps2esdi.c 2001/04/20 18:07:05 1.1
+++ drivers/block/ps2esdi.c 2001/04/20 18:07:48
@@ -761,12 +761,12 @@
printk
("Config bits: %s%s%s%s%s\n",
- (reply[0] & CONFIG_IS) ? "Invalid Secondary, " :
"",
- ((reply[0] & CONFIG_ZD) && !(reply[0] &
CONFIG_IS))
+ (reply[0] & CONFIGURE_IS) ? "Invalid Secondary, "
+: "",
+ ((reply[0] & CONFIGURE_ZD) && !(reply[0] &
+CONFIGURE_IS))
? "Zero Defect, " : "Defects Present, ",
- (reply[0] & CONFIG_SF) ? "Skewed Format, " : "",
- (reply[0] & CONFIG_FR) ? "Removable, " :
"Non-Removable, ",
- (reply[0] & CONFIG_RT) ? "No Retries" :
"Retries");
+ (reply[0] & CONFIGURE_SF) ? "Skewed Format, " :
+"",
+ (reply[0] & CONFIGURE_FR) ? "Removable, " :
+"Non-Removable, ",
+ (reply[0] & CONFIGURE_RT) ? "No Retries" :
+"Retries");
rba = reply[1] | ((unsigned long) reply[2] << 16);
printk("%s: Number of RBA's: %lu\n", DEVICE_NAME, rba);
--- drivers/char/rio/cirrus.h 2001/04/20 17:44:34 1.1
+++ drivers/char/rio/cirrus.h 2001/04/20 17:44:54
@@ -394,10 +394,10 @@
/* Defines for the subscripts of a CONFIG packet */
-#define CONFIG_COR1 1 /* Option register 1 */
-#define CONFIG_COR2 2 /* Option register 2 */
-#define CONFIG_COR4 3 /* Option register 4 */
-#define CONFIG_COR5 4 /* Option register 5 */
+#define CONFIGURE_COR1 1 /* Option register 1 */
+#define CONFIGURE_COR2 2 /* Option register 2 */
+#define CONFIGURE_COR4 3 /* Option register 4 */
+#define CONFIGURE_COR5 4 /* Option register 5 */
#define CONFIG_TXXON 5 /* Tx XON character */
#define CONFIG_TXXOFF 6 /* Tx XOFF character */
#define CONFIG_RXXON 7 /* Rx XON character */
--- drivers/char/rio/rioinit.c 2001/04/20 16:25:37 1.1
+++ drivers/char/rio/rioinit.c 2001/04/20 16:26:10
@@ -826,8 +826,8 @@
#ifndef linux
-#define CONFIG_ADDRESS 0xcf8
-#define CONFIG_DATA 0xcfc
+#define CONFIGURE_ADDRESS 0xcf8
+#define CONFIGURE_DATA 0xcfc
#define FORWARD_REG 0xcfa
@@ -850,9 +850,9 @@
cav |= ((device_num & 0x1f) << 11);
cav |= ((bus_number & 0xff) << 16);
cav |= 0x80000000; /* Enable bit */
- outpd(CONFIG_ADDRESS,cav);
- val = inpd(CONFIG_DATA);
- outpd(CONFIG_ADDRESS,0);
+ outpd(CONFIGURE_ADDRESS,cav);
+ val = inpd(CONFIGURE_DATA);
+ outpd(CONFIGURE_ADDRESS,0);
return val;
}
@@ -874,9 +874,9 @@
cav |= ((device_num & 0x1f) << 11);
cav |= ((bus_number & 0xff) << 16);
cav |= 0x80000000; /* Enable bit */
- outpd(CONFIG_ADDRESS, cav);
- outpd(CONFIG_DATA, val);
- outpd(CONFIG_ADDRESS, 0);
+ outpd(CONFIGURE_ADDRESS, cav);
+ outpd(CONFIGURE_DATA, val);
+ outpd(CONFIGURE_ADDRESS, 0);
return val;
}
#else
--- drivers/dio/dio.c 2001/04/20 17:57:07 1.1
+++ drivers/dio/dio.c 2001/04/20 17:57:37
@@ -33,9 +33,9 @@
#include <asm/hwtest.h> /* hwreg_present() */
#include <asm/io.h> /* readb() */
/* not a real config option yet! */
-#define CONFIG_DIO_CONSTANTS
+#define ENABLE_DIO_CONSTANTS
-#ifdef CONFIG_DIO_CONSTANTS
+#ifdef ENABLE_DIO_CONSTANTS
/* We associate each numeric ID with an appropriate descriptive string
* using a constant array of these structs.
* FIXME: we should be able to arrange to throw away most of the strings
@@ -97,7 +97,7 @@
static char dio_no_name[] = { 0 };
#define dio_getname(_id) (dio_no_name)
-#endif /* CONFIG_DIO_CONSTANTS */
+#endif /* ENABLE_DIO_CONSTANTS */
/* We represent all the DIO boards in the system with a linked list of these structs.
*/
struct dioboard
--- drivers/i2o/i2o_lan.c 2001/04/20 16:31:20 1.1
+++ drivers/i2o/i2o_lan.c 2001/04/20 16:31:47
@@ -1290,7 +1290,7 @@
unregister_dev = unregister_netdev;
break;
-#ifdef CONFIG_ANYLAN
+#ifdef __UNUSED__
case I2O_LAN_100VG:
printk(KERN_ERR "i2o_lan: 100base VG not yet supported.\n");
return NULL;
--- drivers/media/video/zr36120_mem.c 2001/04/20 16:42:34 1.1
+++ drivers/media/video/zr36120_mem.c 2001/04/20 17:01:01
@@ -24,7 +24,7 @@
#include <linux/wrapper.h>
#include <linux/slab.h>
#include <asm/io.h>
-#ifdef CONFIG_BIGPHYS_AREA
+#ifdef EXTERNAL_BIGPHYS_AREA
#include <linux/bigphysarea.h>
#endif
@@ -38,7 +38,7 @@
void* bmalloc(unsigned long size)
{
void* mem;
-#ifdef CONFIG_BIGPHYS_AREA
+#ifdef EXTERNAL_BIGPHYS_AREA
mem = bigphysarea_alloc_pages(size/PAGE_SIZE, 1, GFP_KERNEL);
#else
/*
@@ -68,7 +68,7 @@
adr += PAGE_SIZE;
siz -= PAGE_SIZE;
}
-#ifdef CONFIG_BIGPHYS_AREA
+#ifdef EXTERNAL_BIGPHYS_AREA
bigphysarea_free_pages(mem);
#else
free_pages((unsigned long)mem,get_order(size));
--- drivers/net/Makefile 2001/04/20 15:57:18 1.2
+++ drivers/net/Makefile 2001/04/20 17:53:41
@@ -142,7 +142,6 @@
endif
obj-$(CONFIG_STRIP) += strip.o
-obj-$(CONFIG_DE650) += de650.o 8390.o
obj-$(CONFIG_DUMMY) += dummy.o
obj-$(CONFIG_BONDING) += bonding.o
obj-$(CONFIG_DE600) += de600.o
--- drivers/net/eepro100.c 2001/04/20 17:51:31 1.1
+++ drivers/net/eepro100.c 2001/04/20 17:51:56
@@ -388,7 +388,7 @@
TxUnderrun=0x1000, StatusComplete=0x8000,
};
-#define CONFIG_DATA_SIZE 22
+#define CONFIGURE_DATA_SIZE 22
struct TxFD { /* Transmit frame descriptor set. */
s32 status;
u32 link; /* void * */
@@ -400,7 +400,7 @@
s32 tx_buf_size0; /* Length of Tx frame. */
u32 tx_buf_addr1; /* void *, frame to be transmitted. */
s32 tx_buf_size1; /* Length of Tx frame. */
- /* the structure must have space for at least CONFIG_DATA_SIZE starting
+ /* the structure must have space for at least CONFIGURE_DATA_SIZE starting
* from tx_desc_addr field */
};
@@ -487,12 +487,12 @@
/* The parameters for a CmdConfigure operation.
There are so many options that it would be difficult to document each bit.
We mostly use the default or recommended settings. */
-static const char i82557_config_cmd[CONFIG_DATA_SIZE] = {
+static const char i82557_config_cmd[CONFIGURE_DATA_SIZE] = {
22, 0x08, 0, 0, 0, 0, 0x32, 0x03, 1, /* 1=Use MII 0=Use AUI */
0, 0x2E, 0, 0x60, 0,
0xf2, 0x48, 0, 0x40, 0xf2, 0x80, /* 0x40=Force full-duplex */
0x3f, 0x05, };
-static const char i82558_config_cmd[CONFIG_DATA_SIZE] = {
+static const char i82558_config_cmd[CONFIGURE_DATA_SIZE] = {
22, 0x08, 0, 1, 0, 0, 0x22, 0x03, 1, /* 1=Use MII 0=Use AUI */
0, 0x2E, 0, 0x60, 0x08, 0x88,
0x68, 0, 0x40, 0xf2, 0x84, /* Disable FC */
@@ -1981,7 +1981,7 @@
cpu_to_le32(TX_RING_ELEM_DMA(sp, (entry + 1) % TX_RING_SIZE));
config_cmd_data = (void *)&sp->tx_ring[entry].tx_desc_addr;
/* Construct a full CmdConfig frame. */
- memcpy(config_cmd_data, i82558_config_cmd, CONFIG_DATA_SIZE);
+ memcpy(config_cmd_data, i82558_config_cmd, CONFIGURE_DATA_SIZE);
config_cmd_data[1] = (txfifo << 4) | rxfifo;
config_cmd_data[4] = rxdmacount;
config_cmd_data[5] = txdmacount + 0x80;
--- drivers/net/tokenring/smctr.h 2001/04/20 18:00:56 1.1
+++ drivers/net/tokenring/smctr.h 2001/04/20 18:01:40
@@ -1134,8 +1134,8 @@
#define RAM_CONFLICT 0x0084
#define ROM_CONFLICT 0x0085
#define UNKNOWN_ADAPTER 0x0086
-#define CONFIG_ERROR 0x0087
-#define CONFIG_WARNING 0x0088
+#define CONFIGURE_ERROR 0x0087
+#define CONFIGURE_WARNING 0x0088
#define NO_FIXED_CNFG 0x0089
#define EEROM_CKSUM_ERROR 0x008A
#define ROM_SIGNATURE_ERROR 0x008B
--- drivers/net/tokenring/tms380tr.h 2001/04/20 17:09:57 1.1
+++ drivers/net/tokenring/tms380tr.h 2001/04/20 17:10:45
@@ -261,7 +261,7 @@
#define OC_RESTORE_OPEN_PARMS 0x0800 /* RESTORE_OPEN_PARMS command */
#define OC_SET_FIRST_16_GROUP 0x1000 /* SET_FIRST_16_GROUP command */
#define OC_SET_BRIDGE_PARMS 0x2000 /* SET_BRIDGE_PARMS command */
-#define OC_CONFIG_BRIDGE_PARMS 0x4000 /* CONFIG_BRIDGE_PARMS command */
+#define OC_CONF_BRIDGE_PARMS 0x4000 /* CONF_BRIDGE_PARMS command */
#define OPEN 0x0300 /* C: open command. S: completion. */
#define TRANSMIT 0x0400 /* C: transmit command. S: completion
@@ -325,7 +325,7 @@
* S: completion. (reject:
* COMMAND_REJECT)
*/
-#define CONFIG_BRIDGE_PARMS 0x1100 /* C: ..
+#define CONF_BRIDGE_PARMS 0x1100 /* C: ..
* S: completion. (reject:
* COMMAND_REJECT)
*/
--- drivers/net/wan/comx.h 2001/04/20 17:40:25 1.1
+++ drivers/net/wan/comx.h 2001/04/20 17:40:42
@@ -77,7 +77,7 @@
char *debug_area;
int debug_start, debug_end, debug_size;
struct proc_dir_entry *debug_file;
-#ifdef CONFIG_COMX_DEBUG_RAW
+#ifdef ENABLE_COMX_DEBUG_RAW
char *raw;
int raw_len;
#endif
@@ -149,7 +149,7 @@
#define FILENAME_MODE "mode"
#define FILENAME_DLCI "dlci"
#define FILENAME_MASTER "master"
-#ifdef CONFIG_COMX_DEBUG_RAW
+#ifdef ENABLE_COMX_DEBUG_RAW
#define FILENAME_RAW "raw"
#endif
--- drivers/net/wan/cycx_main.c 2001/04/20 17:49:20 1.1
+++ drivers/net/wan/cycx_main.c 2001/04/20 17:49:51
@@ -63,7 +63,7 @@
#define DRV_RELEASE 9 /* release (minor version) number */
#define MAX_CARDS 1 /* max number of adapters */
-#define CONFIG_CYCLOMX_CARDS 1
+#define CONFIGURE_CYCLOMX_CARDS 1
/* Function Prototypes */
@@ -84,7 +84,7 @@
static char fullname[] = "CYCLOM 2X(tm) Sync Card Driver";
static char copyright[] = "(c) 1998-2000 Arnaldo Carvalho de Melo "
"<[EMAIL PROTECTED]>";
-static int ncards = CONFIG_CYCLOMX_CARDS;
+static int ncards = CONFIGURE_CYCLOMX_CARDS;
static cycx_t *card_array = NULL; /* adapter data space */
/* Kernel Loadable Module Entry Points */
--- drivers/video/aty.h 2001/04/20 17:22:39 1.1
+++ drivers/video/aty.h 2001/04/20 17:23:43
@@ -67,7 +67,7 @@
#define CUR_HORZ_VERT_POSN 0x006C /* Dword offset 0_1B */
#define CUR_HORZ_VERT_OFF 0x0070 /* Dword offset 0_1C */
-#define CONFIG_PANEL_LG 0x0074 /* Dword offset 0_1D */
+#define CONFIGURE_PANEL_LG 0x0074 /* Dword offset 0_1D */
#define GP_IO 0x0078 /* Dword offset 0_1E */
@@ -79,8 +79,8 @@
#define CLOCK_CNTL 0x0090 /* Dword offset 0_24 */
#define CLOCK_SEL_CNTL 0x0090 /* Dword offset 0_24 */
-#define CONFIG_STAT1 0x0094 /* Dword offset 0_25 */
-#define CONFIG_STAT2 0x0098 /* Dword offset 0_26 */
+#define CONFIGURE_STAT1 0x0094 /* Dword offset 0_25 */
+#define CONFIGURE_STAT2 0x0098 /* Dword offset 0_26 */
#define BUS_CNTL 0x00A0 /* Dword offset 0_28 */
@@ -111,9 +111,9 @@
#define POWER_MANAGEMENT_LG 0x00D8 /* Dword offset 0_36 (LG) */
-#define CONFIG_CNTL 0x00DC /* Dword offset 0_37 (CT, ET, VT) */
-#define CONFIG_CHIP_ID 0x00E0 /* Dword offset 0_38 */
-#define CONFIG_STAT0 0x00E4 /* Dword offset 0_39 */
+#define CONFIGURE_CNTL 0x00DC /* Dword offset 0_37 (CT, ET, VT) */
+#define CONFIGURE_CHIP_ID 0x00E0 /* Dword offset 0_38 */
+#define CONFIGURE_STAT0 0x00E4 /* Dword offset 0_39 */
#define CRC_SIG 0x00E8 /* Dword offset 0_3A */
@@ -615,17 +615,17 @@
#define VCLK2_POST 0x30
#define VCLK3_POST 0xC0
-/* CONFIG_CNTL register constants */
+/* CONFIGURE_CNTL register constants */
#define APERTURE_4M_ENABLE 1
#define APERTURE_8M_ENABLE 2
#define VGA_APERTURE_ENABLE 4
-/* CONFIG_STAT0 register constants (GX, CX) */
+/* CONFIGURE_STAT0 register constants (GX, CX) */
#define CFG_BUS_TYPE 0x00000007
#define CFG_MEM_TYPE 0x00000038
#define CFG_INIT_DAC_TYPE 0x00000e00
-/* CONFIG_STAT0 register constants (CT, ET, VT) */
+/* CONFIGURE_STAT0 register constants (CT, ET, VT) */
#define CFG_MEM_TYPE_xT 0x00000007
#define ISA 0
@@ -704,7 +704,7 @@
#define PCI_ATI_VENDOR_ID 0x1002
-/* CONFIG_CHIP_ID register constants */
+/* CONFIGURE_CHIP_ID register constants */
#define CFG_CHIP_TYPE 0x0000FFFF
#define CFG_CHIP_CLASS 0x00FF0000
#define CFG_CHIP_REV 0xFF000000
@@ -713,7 +713,7 @@
#define CFG_CHIP_MINOR 0xC0000000
-/* Chip IDs read from CONFIG_CHIP_ID */
+/* Chip IDs read from CONFIGURE_CHIP_ID */
/* mach64GX family */
#define GX_CHIP_ID 0xD7 /* mach64GX (ATI888GX00) */
--- drivers/video/aty128.h 2001/04/20 17:24:59 1.1
+++ drivers/video/aty128.h 2001/04/20 17:25:27
@@ -20,9 +20,9 @@
#define I2C_CNTL_1 0x0094
#define PALETTE_INDEX 0x00b0
#define PALETTE_DATA 0x00b4
-#define CONFIG_CNTL 0x00e0
+#define CONFIGURE_CNTL 0x00e0
#define GEN_RESET_CNTL 0x00f0
-#define CONFIG_MEMSIZE 0x00f8
+#define CONFIGURE_MEMSIZE 0x00f8
#define MEM_CNTL 0x0140
#define AGP_BASE 0x0170
#define AGP_CNTL 0x0174
--- drivers/video/aty128fb.c 2001/04/20 17:26:19 1.1
+++ drivers/video/aty128fb.c 2001/04/20 17:27:05
@@ -1204,7 +1204,7 @@
aty128_set_pll(&par->pll, info);
aty128_set_fifo(&par->fifo_reg, info);
- config = aty_ld_le32(CONFIG_CNTL) & ~3;
+ config = aty_ld_le32(CONFIGURE_CNTL) & ~3;
#if defined(__BIG_ENDIAN)
if (par->crtc.bpp >= 24)
@@ -1213,7 +1213,7 @@
config |= 1; /* make aperture do 16 byte swapping */
#endif
- aty_st_le32(CONFIG_CNTL, config);
+ aty_st_le32(CONFIGURE_CNTL, config);
aty_st_8(CRTC_EXT_CNTL + 1, 0); /* turn the video back on */
if (par->accel_flags & FB_ACCELF_TEXT)
@@ -1681,10 +1681,10 @@
char *video_card = "Rage128";
if (!info->vram_size) /* may have already been probed */
- info->vram_size = aty_ld_le32(CONFIG_MEMSIZE) & 0x03FFFFFF;
+ info->vram_size = aty_ld_le32(CONFIGURE_MEMSIZE) & 0x03FFFFFF;
/* Get the chip revision */
- chip_rev = (aty_ld_le32(CONFIG_CNTL) >> 16) & 0x1F;
+ chip_rev = (aty_ld_le32(CONFIGURE_CNTL) >> 16) & 0x1F;
/* put a name with the face */
while (aci->name && info->pdev->device != aci->device) { aci++; }
@@ -1881,7 +1881,7 @@
goto err_free_info;
/* Grab memory size from the card */
- info->vram_size = aty_ld_le32(CONFIG_MEMSIZE) & 0x03FFFFFF;
+ info->vram_size = aty_ld_le32(CONFIGURE_MEMSIZE) & 0x03FFFFFF;
/* Virtualize the framebuffer */
info->frame_buffer_phys = fb_addr;
--- drivers/video/atyfb.c 2001/04/20 17:21:36 1.1
+++ drivers/video/atyfb.c 2001/04/20 17:35:46
@@ -3282,7 +3282,7 @@
u8 pll_ref_div;
info->aty_cmap_regs = (struct aty_cmap_regs *)(info->ati_regbase+0xc0);
- chip_id = aty_ld_le32(CONFIG_CHIP_ID, info);
+ chip_id = aty_ld_le32(CONFIGURE_CHIP_ID, info);
Gx = chip_id & CFG_CHIP_TYPE;
Rev = (chip_id & CFG_CHIP_REV)>>24;
for (j = 0; j < (sizeof(aty_features)/sizeof(*aty_features)); j++)
@@ -3297,13 +3297,13 @@
} else
printk("atyfb: %s [0x%04x rev 0x%02x] ", chipname, Gx, Rev);
if ((Gx == GX_CHIP_ID) || (Gx == CX_CHIP_ID)) {
- info->bus_type = (aty_ld_le32(CONFIG_STAT0, info) >> 0) & 0x07;
- info->ram_type = (aty_ld_le32(CONFIG_STAT0, info) >> 3) & 0x07;
+ info->bus_type = (aty_ld_le32(CONFIGURE_STAT0, info) >> 0) & 0x07;
+ info->ram_type = (aty_ld_le32(CONFIGURE_STAT0, info) >> 3) & 0x07;
ramname = aty_gx_ram[info->ram_type];
/* FIXME: clockchip/RAMDAC probing? */
#ifdef CONFIG_ATARI
info->clk_type = CLK_ATI18818_1;
- info->dac_type = (aty_ld_le32(CONFIG_STAT0, info) >> 9) & 0x07;
+ info->dac_type = (aty_ld_le32(CONFIGURE_STAT0, info) >> 9) & 0x07;
if (info->dac_type == 0x07)
info->dac_subtype = DAC_ATT20C408;
else
@@ -3319,7 +3319,7 @@
mclk = 50;
} else {
info->bus_type = PCI;
- info->ram_type = (aty_ld_le32(CONFIG_STAT0, info) & 0x07);
+ info->ram_type = (aty_ld_le32(CONFIGURE_STAT0, info) & 0x07);
ramname = aty_ct_ram[info->ram_type];
info->dac_type = DAC_INTERNAL;
info->dac_subtype = DAC_INTERNAL;
@@ -3454,7 +3454,7 @@
}
if (Gx == GI_CHIP_ID) {
- if (aty_ld_le32(CONFIG_STAT1, info) & 0x40000000)
+ if (aty_ld_le32(CONFIGURE_STAT1, info) & 0x40000000)
info->total_vram += 0x400000;
}
@@ -3805,7 +3805,7 @@
* Fix PROMs idea of MEM_CNTL settings...
*/
mem = aty_ld_le32(MEM_CNTL, info);
- chip_id = aty_ld_le32(CONFIG_CHIP_ID, info);
+ chip_id = aty_ld_le32(CONFIGURE_CHIP_ID, info);
if (((chip_id & CFG_CHIP_TYPE) == VT_CHIP_ID) &&
!((chip_id >> 24) & 1)) {
switch (mem & 0x0f) {
@@ -3824,7 +3824,7 @@
default:
break;
}
- if ((aty_ld_le32(CONFIG_STAT0, info) & 7) >= SDRAM)
+ if ((aty_ld_le32(CONFIGURE_STAT0, info) & 7) >= SDRAM)
mem &= ~(0x00700000);
}
mem &= ~(0xcf80e000); /* Turn off all undocumented bits. */
--- include/linux/ps2esdi.h 2001/04/20 18:05:47 1.1
+++ include/linux/ps2esdi.h 2001/04/20 18:06:25
@@ -32,11 +32,11 @@
#define ATT_EOI 0x02
/* bits of word 0 of configuration status block. more info see p.38 of tech ref */
-#define CONFIG_IS 0x10 /* Invalid Secondary */
-#define CONFIG_ZD 0x08 /* Zero Defect */
-#define CONFIG_SF 0x04 /* Skewed Format */
-#define CONFIG_FR 0x02 /* Removable */
-#define CONFIG_RT 0x01 /* Retries */
+#define CONFIGURE_IS 0x10 /* Invalid Secondary */
+#define CONFIGURE_ZD 0x08 /* Zero Defect */
+#define CONFIGURE_SF 0x04 /* Skewed Format */
+#define CONFIGURE_FR 0x02 /* Removable */
+#define CONFIGURE_RT 0x01 /* Retries */
#define PORT_SYS_A 0x92
#define PORT_DMA_FN 0x18
--- net/decnet/Makefile 2001/04/20 17:55:33 1.1
+++ net/decnet/Makefile 2001/04/20 17:55:38
@@ -5,7 +5,6 @@
obj-m := $(O_TARGET)
obj-$(CONFIG_DECNET_ROUTER) += dn_fib.o dn_rules.o dn_table.o
-obj-$(CONFIG_DECNET_FW) += dn_fw.o
obj-y += sysctl_net_decnet.o
--- net/irda/irsyms.c 2001/04/20 18:10:07 1.1
+++ net/irda/irsyms.c 2001/04/20 18:10:47
@@ -175,7 +175,7 @@
EXPORT_SYMBOL(setup_dma);
EXPORT_SYMBOL(infrared_mode);
-#ifdef CONFIG_IRTTY
+#ifdef ENABLE_IRTTY
EXPORT_SYMBOL(irtty_set_dtr_rts);
EXPORT_SYMBOL(irtty_register_dongle);
EXPORT_SYMBOL(irtty_unregister_dongle);
End of diffs.
--
<a href="http://www.tuxedo.org/~esr/">Eric S. Raymond</a>
The most foolish mistake we could possibly make would be to permit
the conquered Eastern peoples to have arms. History teaches that all
conquerors who have allowed their subject races to carry arms have
prepared their own downfall by doing so.
-- Hitler, April 11 1942, revealing the real agenda of "gun control"
_______________________________________________
kbuild-devel mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/kbuild-devel
