diff options
| author | Michael Brown | 2014-08-19 15:38:27 +0200 |
|---|---|---|
| committer | Michael Brown | 2014-08-19 15:38:27 +0200 |
| commit | 3953ddd2acf72fb30cd70bb65476dd86b6799708 (patch) | |
| tree | 365d21a5f242b5e74e68e50b48c9462193ebb109 /src/drivers/net | |
| parent | [readline] Add CTRL-W shortcut to remove a word (diff) | |
| download | ipxe-3953ddd2acf72fb30cd70bb65476dd86b6799708.tar.gz ipxe-3953ddd2acf72fb30cd70bb65476dd86b6799708.tar.xz ipxe-3953ddd2acf72fb30cd70bb65476dd86b6799708.zip | |
[smc9000] Avoid using CONFIG as a preprocessor macro
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/drivers/net')
| -rw-r--r-- | src/drivers/net/smc9000.c | 10 | ||||
| -rw-r--r-- | src/drivers/net/smc9000.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/drivers/net/smc9000.c b/src/drivers/net/smc9000.c index 31e418a97..c9762d580 100644 --- a/src/drivers/net/smc9000.c +++ b/src/drivers/net/smc9000.c @@ -882,7 +882,7 @@ static int smc9000_probe ( struct nic *nic, struct isa_device *isa ) { /* is it using AUI or 10BaseT ? */ SMC_SELECT_BANK(nic->ioaddr, 1); - if (inw(nic->ioaddr + CONFIG) & CFG_AUI_SELECT) + if (inw(nic->ioaddr + CFG) & CFG_AUI_SELECT) media = 2; else media = 1; @@ -911,12 +911,12 @@ static int smc9000_probe ( struct nic *nic, struct isa_device *isa ) { /* Select which interface to use */ SMC_SELECT_BANK(nic->ioaddr, 1); if ( media == 1 ) { - _outw( inw( nic->ioaddr + CONFIG ) & ~CFG_AUI_SELECT, - nic->ioaddr + CONFIG ); + _outw( inw( nic->ioaddr + CFG ) & ~CFG_AUI_SELECT, + nic->ioaddr + CFG ); } else if ( media == 2 ) { - _outw( inw( nic->ioaddr + CONFIG ) | CFG_AUI_SELECT, - nic->ioaddr + CONFIG ); + _outw( inw( nic->ioaddr + CFG ) | CFG_AUI_SELECT, + nic->ioaddr + CFG ); } smc_phy_configure(nic->ioaddr); diff --git a/src/drivers/net/smc9000.h b/src/drivers/net/smc9000.h index 02b1c831c..8e655f08d 100644 --- a/src/drivers/net/smc9000.h +++ b/src/drivers/net/smc9000.h @@ -131,7 +131,7 @@ typedef unsigned long int dword; #define RPC_DEFAULT (RPC_ANEG | (RPC_LED_100 << RPC_LSXA_SHFT) | (RPC_LED_FD << RPC_LSXB_SHFT) | RPC_SPEED | RPC_DPLX) /* BANK 1 */ -#define CONFIG 0 +#define CFG 0 #define CFG_AUI_SELECT 0x100 #define BASE 2 #define ADDR0 4 |