Cleanup and Bugfixing

[tpg/acess2.git] / Modules / NE2000 / ne2000.c

diff --git a/Modules/NE2000/ne2000.c b/Modules/NE2000/ne2000.c
index a032191..3717a99 100644 (file)
--- a/Modules/NE2000/ne2000.c
+++ b/Modules/NE2000/ne2000.c
@@ -4,10 +4,12 @@
  * See: ~/Sources/bochs/bochs.../iodev/ne2k.cc
  */
 #define        DEBUG   1
+#define VERSION        ((0<<8)|50)
 #include <common.h>
 #include <modules.h>
 #include <fs_devfs.h>
 #include <drv_pci.h>
+#include <tpl_drv_network.h>
 
 // === CONSTANTS ===
 #define        MEM_START       0x40
@@ -76,12 +78,13 @@ typedef struct sNe2k_Card {
  int   Ne2k_Install(char **Arguments);
 char   *Ne2k_ReadDir(tVFS_Node *Node, int Pos);
 tVFS_Node      *Ne2k_FindDir(tVFS_Node *Node, char *Name);
+ int   Ne2k_IOCtl(tVFS_Node *Node, int ID, void *Data);
 Uint64 Ne2k_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
 Uint8  Ne2k_int_GetWritePage(tCard *Card, Uint16 Length);
 void   Ne2k_IRQHandler(int IntNum);
 
 // === GLOBALS ===
-MODULE_DEFINE(0, 0x0032, Ne2k, Ne2k_Install, NULL, NULL);
+MODULE_DEFINE(0, VERSION, Ne2k, Ne2k_Install, NULL, NULL);
 tDevFS_Driver  gNe2k_DriverInfo = {
        NULL, "ne2k",
        {
@@ -89,7 +92,8 @@ tDevFS_Driver gNe2k_DriverInfo = {
        .ACLs = &gVFS_ACL_EveryoneRX,
        .Flags = VFS_FFLAG_DIRECTORY,
        .ReadDir = Ne2k_ReadDir,
-       .FindDir = Ne2k_FindDir
+       .FindDir = Ne2k_FindDir,
+       .IOCtl = Ne2k_IOCtl
        }
 };
 Uint16 gNe2k_BaseAddress;
@@ -193,6 +197,7 @@ int Ne2k_Install(char **Options)
                        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.IOCtl = Ne2k_IOCtl;
                }
        }
        
@@ -223,8 +228,69 @@ tVFS_Node *Ne2k_FindDir(tVFS_Node *Node, char *Name)
        return &gpNe2k_Cards[ Name[0]-'0' ].Node;
 }
 
+static const char *casIOCtls[] = { DRV_IOCTLNAMES, DRV_NETWORK_IOCTLNAMES, NULL };
+/**
+ * \fn int Ne2k_IOCtl(tVFS_Node *Node, int ID, void *Data)
+ * \brief IOCtl calls for a network device
+ */
+int Ne2k_IOCtl(tVFS_Node *Node, int ID, void *Data)
+{
+        int    tmp;
+       ENTER("pNode iID pData", Node, ID, Data);
+       switch( ID )
+       {
+       case DRV_IOCTL_TYPE:
+               LEAVE('i', DRV_TYPE_NETWORK);
+               return DRV_TYPE_NETWORK;
+       
+       case DRV_IOCTL_IDENT:
+               if(!CheckMem(Data, 4)) {
+                       LEAVE('i', -1);
+                       return -1;
+               }
+               memcpy(Data, "NE2K", 4);
+               LEAVE('i', 1);
+               return 1;
+       
+       case DRV_IOCTL_VERSION:
+               LEAVE('x', VERSION);
+               return VERSION;
+       
+       case DRV_IOCTL_LOOKUP:
+               if( !CheckString(Data) ) {
+                       LEAVE('i', -1);
+                       return -1;
+               }
+               tmp = LookupString( (char**)casIOCtls, Data );
+               LEAVE('i', tmp);
+               return tmp;
+       }
+       
+       // If this is the root, return
+       if( Node == &gNe2k_DriverInfo.RootNode ) {
+               LEAVE('i', 0);
+               return 0;
+       }
+       
+       // Device specific settings
+       switch( ID )
+       {
+       case NET_IOCTL_GETMAC:
+               if( !CheckMem(Data, 6) ) {
+                       LEAVE('i', -1);
+                       return -1;
+               }
+               memcpy( Data, ((tCard*)Node->ImplPtr)->MacAddr, 6 );
+               LEAVE('i', 1);
+               return 1;
+       }
+       LEAVE('i', 0);
+       return 0;
+}
+
 /**
  * \fn Uint64 Ne2k_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
+ * \brief Send a packet from the network card
  */
 Uint64 Ne2k_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
 {