X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=KernelLand%2FModules%2FNetwork%2FVIARhineII%2Frhine2.c;h=c933739521dfa48d77a2fd540bd988f2dcf211da;hb=e47f509e07718893b837826f981085829cf16c84;hp=d0fe6c93442bcb6bd00c2fc944ca7e39132d1f80;hpb=9046c1ba6a1977a7555efe78a8a062cd48a2e220;p=tpg%2Facess2.git

diff --git a/KernelLand/Modules/Network/VIARhineII/rhine2.c b/KernelLand/Modules/Network/VIARhineII/rhine2.c
index d0fe6c93..c9337395 100644
--- a/KernelLand/Modules/Network/VIARhineII/rhine2.c
+++ b/KernelLand/Modules/Network/VIARhineII/rhine2.c
@@ -2,7 +2,7 @@
  * Acess2 VIA Rhine II Driver (VT6102)
  * - By John Hodge (thePowersGang)
  */
-#define	DEBUG	1
+#define	DEBUG	0
 #define VERSION	((0<<8)|10)
 #include <acess.h>
 #include <modules.h>
@@ -80,8 +80,6 @@ int Rhine2_Install(char **Options)
 {
 	 int	id = -1;
 	 int	i = 0;
-//	Uint16	base;
-	tCard	*card;
 	
 	giRhine2_CardCount = PCI_CountDevices(VENDOR_ID, DEVICE_ID);
 	if( giRhine2_CardCount == 0 )	return MODULE_ERR_NOTNEEDED;
@@ -90,7 +88,7 @@ int Rhine2_Install(char **Options)
 	
 	while( (id = PCI_GetDevice(VENDOR_ID, DEVICE_ID, i)) != -1 )
 	{
-		card = &gaRhine2_Cards[i];
+		tCard	*card = &gaRhine2_Cards[i];
 		
 		LOG("BAR0 = 0x%08x", PCI_GetBAR(id, 0));
 		LOG("BAR1 = 0x%08x", PCI_GetBAR(id, 1));
@@ -202,7 +200,6 @@ void Rhine2_int_InitialiseCard(tCard *Card)
 tIPStackBuffer *Rhine2_WaitPacket(void *Ptr)
 {
 	tCard	*card = Ptr;
-	tIPStackBuffer	*ret;
 	struct sRXDesc	*desc;
 	 int	nDesc;
 	
@@ -228,7 +225,7 @@ tIPStackBuffer *Rhine2_WaitPacket(void *Ptr)
 
 	LOG("%i descriptors in packet", nDesc);
 
-	ret = IPStack_Buffer_CreateBuffer(nDesc);
+	tIPStackBuffer	*ret = IPStack_Buffer_CreateBuffer(nDesc);
 	desc = card->NextRX;
 	while( !(desc->Length & (1 << 15)) )
 	{
@@ -329,7 +326,7 @@ int Rhine2_SendPacket(void *Ptr, tIPStackBuffer *Buffer)
 	card->NextTX = (card->NextTX + nDescs) % N_TX_DESCS;
 	desc = card->TXDescs + first_desc_id;
 	
-	desc->TXBufferStart = MM_GetPhysAddr( (tVAddr)data );
+	desc->TXBufferStart = MM_GetPhysAddr( data );
 	desc->BufferSize = len | (1 << 15);
 	desc->TSR = 0;
 	desc->TCR = 0;