X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Modules%2FNetwork%2FNE2000%2Fne2000.c;fp=Modules%2FNetwork%2FNE2000%2Fne2000.c;h=f3faddae3eb60a1891ca3d88b4fbcd97e59268c5;hb=4ab9a574c9301d9590c91209f62c348e1d8c8883;hp=60f9ac2d13d9ef18cbc41b03de2c33c26db55aae;hpb=ffb2e56a3b6c55a23c817dd11b1c46c647db79de;p=tpg%2Facess2.git

diff --git a/Modules/Network/NE2000/ne2000.c b/Modules/Network/NE2000/ne2000.c
index 60f9ac2d..f3faddae 100644
--- a/Modules/Network/NE2000/ne2000.c
+++ b/Modules/Network/NE2000/ne2000.c
@@ -128,7 +128,7 @@ int Ne2k_Install(char **Options)
 	}
 	
 	if( giNe2k_CardCount == 0 ) {
-		Warning("[Ne2k ] No cards detected");
+		Log_Warning("Ne2k", "No cards detected");
 		return MODULE_ERR_NOTNEEDED;
 	}
 	
@@ -199,21 +199,13 @@ int Ne2k_Install(char **Options)
 			Ne2k_WriteReg(base, MAC5, gpNe2k_Cards[ k ].MacAddr[5]);
 			*/
 			
-			Log_Log("NE2K", "Card %i 0x%04x %02x:%02x:%02x:%02x:%02x:%02x",
-				k, base,
+			Log_Log("Ne2k", "Card %i 0x%04x IRQ%i %02x:%02x:%02x:%02x:%02x:%02x",
+				k, base, gpNe2k_Cards[ k ].IRQ,
 				gpNe2k_Cards[k].MacAddr[0], gpNe2k_Cards[k].MacAddr[1],
 				gpNe2k_Cards[k].MacAddr[2], gpNe2k_Cards[k].MacAddr[3],
 				gpNe2k_Cards[k].MacAddr[4], gpNe2k_Cards[k].MacAddr[5]
 				);
 			
-			Log("[NE2K]: Card #%i: IRQ=%i, IOBase=0x%x",
-				k, gpNe2k_Cards[ k ].IRQ, gpNe2k_Cards[ k ].IOBase);
-			Log("MAC Address %x:%x:%x:%x:%x:%x",
-				gpNe2k_Cards[ k ].MacAddr[0], gpNe2k_Cards[ k ].MacAddr[1],
-				gpNe2k_Cards[ k ].MacAddr[2], gpNe2k_Cards[ k ].MacAddr[3],
-				gpNe2k_Cards[ k ].MacAddr[4], gpNe2k_Cards[ k ].MacAddr[5]
-				);
-			
 			// Set VFS Node
 			gpNe2k_Cards[ k ].Name[0] = '0'+k;
 			gpNe2k_Cards[ k ].Name[1] = '\0';
@@ -320,7 +312,8 @@ Uint64 Ne2k_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
 	
 	// Sanity Check Length
 	if(Length > TX_BUF_SIZE*256) {
-		Warning(
+		Log_Warning(
+			"Ne2k",
 			"Ne2k_Write - Attempting to send over TX_BUF_SIZE*256 (%i) bytes (%i)",
 			TX_BUF_SIZE*256, Length
 			);
@@ -518,5 +511,5 @@ void Ne2k_IRQHandler(int IntNum)
 			return ;
 		}
 	}
-	Warning("[NE2K ] Recieved Unknown IRQ %i", IntNum);
+	Log_Warning("Ne2k", "Recieved Unknown IRQ %i", IntNum);
 }