X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FNetwork%2FNE2000%2Fne2000.c;h=cb760d666e26a9f1c1eb79618eb8b360cdc1c8c9;hb=3d0a53a04f9f156147db11a09c70046484926570;hp=3fa85f473e3ba71a3585798d26bb2315374a8043;hpb=abe6c6cf7fac39102e20cd28687b24c67f4952f8;p=tpg%2Facess2.git

diff --git a/Modules/Network/NE2000/ne2000.c b/Modules/Network/NE2000/ne2000.c
index 3fa85f47..cb760d66 100644
--- a/Modules/Network/NE2000/ne2000.c
+++ b/Modules/Network/NE2000/ne2000.c
@@ -118,14 +118,15 @@ tCard	*gpNe2k_Cards = NULL;
 int Ne2k_Install(char **Options)
 {
 	 int	i, j, k;
-	 int	count, id, base;
+	 int	count, base;
+	tPCIDev	id;
 	
 	// --- Scan PCI Bus ---
 	// Count Cards
 	giNe2k_CardCount = 0;
 	for( i = 0; i < NUM_COMPAT_DEVICES; i ++ )
 	{
-		giNe2k_CardCount += PCI_CountDevices( csaCOMPAT_DEVICES[i].Vendor, csaCOMPAT_DEVICES[i].Device, 0 );
+		giNe2k_CardCount += PCI_CountDevices( csaCOMPAT_DEVICES[i].Vendor, csaCOMPAT_DEVICES[i].Device );
 	}
 	
 	if( giNe2k_CardCount == 0 ) {
@@ -139,12 +140,12 @@ int Ne2k_Install(char **Options)
 	
 	for( i = 0; i < NUM_COMPAT_DEVICES; i ++ )
 	{
-		count = PCI_CountDevices( csaCOMPAT_DEVICES[i].Vendor, csaCOMPAT_DEVICES[i].Device, 0 );
+		count = PCI_CountDevices( csaCOMPAT_DEVICES[i].Vendor, csaCOMPAT_DEVICES[i].Device );
 		for( j = 0; j < count; j ++,k ++ )
 		{
-			id = PCI_GetDevice( csaCOMPAT_DEVICES[i].Vendor, csaCOMPAT_DEVICES[i].Device, 0, j );
+			id = PCI_GetDevice( csaCOMPAT_DEVICES[i].Vendor, csaCOMPAT_DEVICES[i].Device, j );
 			// Create Structure
-			base = PCI_AssignPort( id, 0, 0x20 );
+			base = PCI_GetBAR( id, 0 );
 			gpNe2k_Cards[ k ].IOBase = base;
 			gpNe2k_Cards[ k ].IRQ = PCI_GetIRQ( id );
 			gpNe2k_Cards[ k ].NextMemPage = 64;