X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FNetwork%2FRTL8139%2Frtl8139.c;h=eb77812bae9023394f1feee24e134d742ac07eab;hb=de37bdfbcd4814c20babda4a7198736bf0effd3e;hp=a34aeb4a479a3b1bedb2aea5015d555551a0625c;hpb=e957c67ea0f63a668303d087af7ee0c7ecff1f01;p=tpg%2Facess2.git diff --git a/Modules/Network/RTL8139/rtl8139.c b/Modules/Network/RTL8139/rtl8139.c index a34aeb4a..eb77812b 100644 --- a/Modules/Network/RTL8139/rtl8139.c +++ b/Modules/Network/RTL8139/rtl8139.c @@ -127,19 +127,19 @@ int RTL8139_Install(char **Options) tCard *card; giRTL8139_CardCount = PCI_CountDevices(VENDOR_ID, DEVICE_ID); - Log_Debug("RTL8139", "%i cards", giRTL8139_CardCount); if( giRTL8139_CardCount == 0 ) return MODULE_ERR_NOTNEEDED; - + + Log_Debug("RTL8139", "%i cards", giRTL8139_CardCount); gaRTL8139_Cards = calloc( giRTL8139_CardCount, sizeof(tCard) ); - //while( (id = PCI_GetDevice(0x10EC, 0x8139, 0, id)) != -1 ) - while( (id = PCI_GetDevice(VENDOR_ID, DEVICE_ID, i)) != -1 ) + for( i = 0 ; (id = PCI_GetDevice(VENDOR_ID, DEVICE_ID, i)) != -1; i ++ ) { card = &gaRTL8139_Cards[i]; base = PCI_GetBAR( id, 0 ); if( !(base & 1) ) { - Log_Warning("RTL8139", "Driver does not support MMIO, skipping card"); + Log_Warning("RTL8139", "Driver does not support MMIO, skipping card (addr %x)", + base); card->IOBase = 0; card->IRQ = 0; continue ; @@ -215,8 +215,6 @@ int RTL8139_Install(char **Options) card->MacAddr[0], card->MacAddr[1], card->MacAddr[2], card->MacAddr[3], card->MacAddr[4], card->MacAddr[5] ); - - i ++; } gRTL8139_DriverInfo.RootNode.Size = giRTL8139_CardCount;