X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FNetwork%2FNE2000%2Fne2000.c;h=d05b2a339e01943fc8acdf898d4aca58961e5a62;hb=5f2024e5977e0cca0993a20dad5ab794c94d5711;hp=288db5f425cfe6ddf9b58be1e1b2986312e3dfd8;hpb=e957c67ea0f63a668303d087af7ee0c7ecff1f01;p=tpg%2Facess2.git

diff --git a/Modules/Network/NE2000/ne2000.c b/Modules/Network/NE2000/ne2000.c
index 288db5f4..d05b2a33 100644
--- a/Modules/Network/NE2000/ne2000.c
+++ b/Modules/Network/NE2000/ne2000.c
@@ -86,7 +86,7 @@ typedef struct sNe2k_Card {
 char	*Ne2k_ReadDir(tVFS_Node *Node, int Pos);
 tVFS_Node	*Ne2k_FindDir(tVFS_Node *Node, const char *Name);
  int	Ne2k_IOCtl(tVFS_Node *Node, int ID, void *Data);
-Uint64	Ne2k_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
+Uint64	Ne2k_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, const void *Buffer);
 Uint64	Ne2k_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
 
  int	Ne2k_int_ReadDMA(tCard *Card, int FirstPage, int NumPages, void *Buffer);
@@ -95,15 +95,23 @@ void	Ne2k_IRQHandler(int IntNum, void *Ptr);
 
 // === GLOBALS ===
 MODULE_DEFINE(0, VERSION, Ne2k, Ne2k_Install, NULL, NULL);
+tVFS_NodeType	gNe2K_RootNodeType = {
+	.ReadDir = Ne2k_ReadDir,
+	.FindDir = Ne2k_FindDir,
+	.IOCtl = Ne2k_IOCtl
+	};
+tVFS_NodeType	gNe2K_DevNodeType = {
+	.Write = Ne2k_Write,
+	.Read = Ne2k_Read,
+	.IOCtl = Ne2k_IOCtl	
+	};
 tDevFS_Driver	gNe2k_DriverInfo = {
 	NULL, "ne2k",
 	{
 	.NumACLs = 1,
 	.ACLs = &gVFS_ACL_EveryoneRX,
 	.Flags = VFS_FFLAG_DIRECTORY,
-	.ReadDir = Ne2k_ReadDir,
-	.FindDir = Ne2k_FindDir,
-	.IOCtl = Ne2k_IOCtl
+	.Type = &gNe2K_RootNodeType
 	}
 };
 Uint16	gNe2k_BaseAddress;
@@ -129,10 +137,7 @@ int Ne2k_Install(char **Options)
 		giNe2k_CardCount += PCI_CountDevices( csaCOMPAT_DEVICES[i].Vendor, csaCOMPAT_DEVICES[i].Device );
 	}
 	
-	if( giNe2k_CardCount == 0 ) {
-		Log_Warning("Ne2k", "No cards detected");
-		return MODULE_ERR_NOTNEEDED;
-	}
+	if( giNe2k_CardCount == 0 )	return MODULE_ERR_NOTNEEDED;
 	
 	// Enumerate Cards
 	k = 0;
@@ -205,9 +210,7 @@ int Ne2k_Install(char **Options)
 			gpNe2k_Cards[ k ].Node.ImplPtr = &gpNe2k_Cards[ k ];
 			gpNe2k_Cards[ k ].Node.NumACLs = 0;	// Root Only
 			gpNe2k_Cards[ k ].Node.CTime = now();
-			gpNe2k_Cards[ k ].Node.Write = Ne2k_Write;
-			gpNe2k_Cards[ k ].Node.Read = Ne2k_Read;
-			gpNe2k_Cards[ k ].Node.IOCtl = Ne2k_IOCtl;
+			gpNe2k_Cards[ k ].Node.Type = &gNe2K_DevNodeType;
 			
 			// Initialise packet semaphore
 			// - Start at zero, no max
@@ -278,13 +281,13 @@ int Ne2k_IOCtl(tVFS_Node *Node, int ID, void *Data)
 }
 
 /**
- * \fn Uint64 Ne2k_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
+ * \fn Uint64 Ne2k_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, const void *Buffer)
  * \brief Send a packet from the network card
  */
-Uint64 Ne2k_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
+Uint64 Ne2k_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, const void *Buffer)
 {
 	tCard	*Card = (tCard*)Node->ImplPtr;
-	Uint16	*buf = Buffer;
+	const Uint16	*buf = Buffer;
 	 int	rem = Length;
 	 int	page;