X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FNetwork%2FNE2000%2Fne2000.c;h=1ebe778f9a4146a1a52ee7b60aefae3e777e76b7;hb=b00c9161c75b0ef6a1de3b7b15444a783afe8a86;hp=40d9b823476dae99e761045c24039387f348112f;hpb=701555cd9e3aa5131572043867e15387db3cddef;p=tpg%2Facess2.git

diff --git a/Modules/Network/NE2000/ne2000.c b/Modules/Network/NE2000/ne2000.c
index 40d9b823..1ebe778f 100644
--- a/Modules/Network/NE2000/ne2000.c
+++ b/Modules/Network/NE2000/ne2000.c
@@ -29,7 +29,7 @@ static const struct {
 	{0x10EC, 0x8029},	// Realtek 8029
 	{0x10EC, 0x8129}	// Realtek 8129
 };
-#define NUM_COMPAT_DEVICES	(sizeof(csaCOMPAT_DEVICES)/sizeof(csaCOMPAT_DEVICES[0]))
+#define NUM_COMPAT_DEVICES	((int)(sizeof(csaCOMPAT_DEVICES)/sizeof(csaCOMPAT_DEVICES[0])))
 
 enum eNe2k_Page0Read {
 	CMD = 0,	//!< the master command register
@@ -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,12 +199,11 @@ int Ne2k_Install(char **Options)
 			Ne2k_WriteReg(base, MAC5, 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]
+			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]
 				);
 			
 			// Set VFS Node
@@ -313,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
 			);
@@ -511,5 +511,5 @@ void Ne2k_IRQHandler(int IntNum)
 			return ;
 		}
 	}
-	Warning("[NE2K ] Recieved Unknown IRQ %i", IntNum);
+	Log_Warning("Ne2k", "Recieved Unknown IRQ %i", IntNum);
 }