Skip to contentSkip to conversation

Obvious(ish): 3c515 should work if ISAPNP is a module.

PATCH In review Matthew Bell 3 participants 4 messages Dec 14, 2002 – Dec 15, 2002 Network drivers

lore
Share & tools
lore

Matthew Bell

author
#0 lore raw

PATCH 1/1 Obvious(ish): 3c515 should work if ISAPNP is a module.

This is valid for at least 2.4.20 and earlier; it works for me, and I can't see any exceptional reason why it shouldn't work when ISAPNP is a module.

drivers/net/3c515.c 2002-08-03 18:24:05.000000000 +0100 renamed from drivers/net/3c515.c 2002-02-25 19:37:59.000000000 +0000 +4 -4
@@ -370,7 +370,7 @@
        { "Default", 0, 0xFF, XCVR_10baseT, 10000},
 };
 
-#ifdef CONFIG_ISAPNP
+#if defined(CONFIG_ISAPNP) || defined (CONFIG_ISAPNP_MODULE)
 static struct isapnp_device_id corkscrew_isapnp_adapters[] = {
        {       ISAPNP_ANY_ID, ISAPNP_ANY_ID,
                ISAPNP_VENDOR('T', 'C', 'M'), ISAPNP_FUNCTION(0x5051),

@@ -462,12 +462,12 @@
 {
        int cards_found = 0;
        static int ioaddr;
-#ifdef CONFIG_ISAPNP
+#if defined(CONFIG_ISAPNP) || defined (CONFIG_ISAPNP_MODULE)
        short i;
        static int pnp_cards;
 #endif
 
-#ifdef CONFIG_ISAPNP
+#if defined(CONFIG_ISAPNP) || defined (CONFIG_ISAPNP_MODULE)
        if(nopnp == 1)
                goto no_pnp;
        for(i=0; corkscrew_isapnp_adapters[i].vendor != 0; i++) {

@@ -530,7 +530,7 @@
        /* Check all locations on the ISA bus -- evil! */
        for (ioaddr = 0x100; ioaddr < 0x400; ioaddr += 0x20) {
                int irq;
-#ifdef CONFIG_ISAPNP
+#if defined(CONFIG_ISAPNP) || defined (CONFIG_ISAPNP_MODULE)
                /* Make sure this was not already picked up by isapnp */
                if(ioaddr == corkscrew_isapnp_phys_addr[0]) continue;
                if(ioaddr == corkscrew_isapnp_phys_addr[1]) continue;
Signature · 4 lines
_______________________________________________
Get your free email from http://mymail.operamail.com

Powered by Outblaze
#1 lore raw
Quoted 7 lines · Matthew Bell

This is valid for at least 2.4.20 and earlier; it works for me, and I can't see any exceptional reason why it shouldn't work when ISAPNP is a module.

drivers/net/3c515.c 2002-08-03 18:24:05.000000000 +0100 line 376

Quoted 8 lines
drivers/net/3c515.c 2002-08-03 18:24:05.000000000 +0100 renamed from drivers/net/3c515.c 2002-02-25 19:37:59.000000000 +0000 +1 -1
@@ -370,7 +370,7 @@
        { "Default", 0, 0xFF, XCVR_10baseT, 10000},
 };
 
-#ifdef CONFIG_ISAPNP
+#if defined(CONFIG_ISAPNP) || defined (CONFIG_ISAPNP_MODULE)
 static struct isapnp_device_id corkscrew_isapnp_adapters[] = {
        {       ISAPNP_ANY_ID, ISAPNP_ANY_ID,
                ISAPNP_VENDOR('T', 'C', 'M'), ISAPNP_FUNCTION(0x5051),

[...]

It's really only obvious*ish*: If isapnp is a module but 3c515 built-in, you'll get link errors. The real fix for this is to do

+#ifdef __ISAPNP__

which will get all cases right.

--Kai

#2 lore raw
Quoted 19 lines · Kai Germaschewski
Quoted 15 lines · Matthew Bell

This is valid for at least 2.4.20 and earlier; it works for me, and I can't see any exceptional reason why it shouldn't work when ISAPNP is a module.

drivers/net/3c515.c 2002-08-03 18:24:05.000000000 +0100 renamed from drivers/net/3c515.c 2002-02-25 19:37:59.000000000 +0000 +1 -1
@@ -370,7 +370,7 @@
        { "Default", 0, 0xFF, XCVR_10baseT, 10000},
 };
 
-#ifdef CONFIG_ISAPNP
+#if defined(CONFIG_ISAPNP) || defined (CONFIG_ISAPNP_MODULE)
 static struct isapnp_device_id corkscrew_isapnp_adapters[] = {
        {       ISAPNP_ANY_ID, ISAPNP_ANY_ID,
                ISAPNP_VENDOR('T', 'C', 'M'), ISAPNP_FUNCTION(0x5051),

[...]

Quoted 6 lines

It's really only obvious*ish*: If isapnp is a module but 3c515 built-in, you'll get link errors. The real fix for this is to do

+#ifdef __ISAPNP__

which will get all cases right.

... but unfortunately thats currently going away ;) to make way for CONFIG_PNP

Zwane

Signature · 1 line
function.linuxpower.ca
#3 lore raw
Quoted 9 lines · Zwane Mwaikambo
Quoted 3 lines

+#ifdef __ISAPNP__

which will get all cases right.

... but unfortunately thats currently going away ;) to make way for CONFIG_PNP

Zwane

Someone needs their coffee...

Signature · 1 line
function.linuxpower.ca