diff options
| author | Michael Brown <mcb30@etherboot.org> | 2005-04-18 12:43:18 +0000 |
|---|---|---|
| committer | Michael Brown <mcb30@etherboot.org> | 2005-04-18 12:43:18 +0000 |
| commit | cf79681b80f2fe4c1d70f02f3ee1bf07a902698f (patch) | |
| tree | 9b9016729db119e4261490f175715de405bb24a3 /src/drivers/bus/isa.c | |
| parent | 85b00c4b72a03d10bf8b57636446a1c053934c8a (diff) | |
| download | ipxe-cf79681b80f2fe4c1d70f02f3ee1bf07a902698f.tar.gz | |
Fix BUILD_SERIAL.
Change from using #if to #ifdef, since #if can't cope with string
constants.
Diffstat (limited to 'src/drivers/bus/isa.c')
| -rw-r--r-- | src/drivers/bus/isa.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/drivers/bus/isa.c b/src/drivers/bus/isa.c index 99784cc0..1afb1aa1 100644 --- a/src/drivers/bus/isa.c +++ b/src/drivers/bus/isa.c @@ -32,11 +32,21 @@ static char isa_magic[0]; /* guaranteed unique symbol */ * User-supplied probe address list * */ -static isa_probe_addr_t isa_extra_probe_addrs[] = { - ISA_PROBE_ADDRS -#if ISA_PROBE_ONLY - , 0 +#ifdef ISA_PROBE_ADDRS +# ifdef ISA_PROBE_ONLY +# define HAVE_ISA_PROBE_ADDRS 1 +# define ISA_PROBE_ADDR_LIST ISA_PROBE_ADDRS, 0 +# else +# define HAVE_ISA_PROBE_ADDRS 1 +# define ISA_PROBE_ADDR_LIST ISA_PROBE_ADDRS +# endif +#else +# define HAVE_ISA_PROBE_ADDRS 0 +# define ISA_PROBE_ADDR_LIST #endif + +static isa_probe_addr_t isa_extra_probe_addrs[] = { + ISA_PROBE_ADDR_LIST }; #define isa_extra_probe_addr_count \ ( sizeof ( isa_extra_probe_addrs ) / sizeof ( isa_extra_probe_addrs[0] ) ) |