added void * argument to timer callback

[palacios.git] / palacios / include / geekos / ne2k.h

diff --git a/palacios/include/geekos/ne2k.h b/palacios/include/geekos/ne2k.h
index d17a646..10c2175 100644 (file)
--- a/palacios/include/geekos/ne2k.h
+++ b/palacios/include/geekos/ne2k.h
@@ -1,7 +1,6 @@
 #ifndef GEEKOS_NE2K_H
 #define GEEKOS_NE2K_H
 
-//#include <geekos/ktypes.h>
 #include <geekos/malloc.h>
 
 #define NE2K_PAGE0     0x00
@@ -11,6 +10,8 @@
 
 #define NE2K_BASE_ADDR         0xc100          /* Starting address of the card */
 #define NE2K_CR                NE2K_BASE_ADDR  /* Command register */
+#define NE2K_DATAPORT  (NE2K_CR + 0x10)
+#define NE2K_RESET     (NE2K_CR + 0x1f)
 
 /* Page 0 register offsets */
 #define NE2K CLDA0     (NE2K_CR + 0x01)
@@ -158,6 +159,8 @@ struct NE2K_Packet_Info {
 
 int Init_Ne2k();
 int NE2K_Receive();
-int NE2K_Send(struct NE2K_REGS *regs, uchar_t src[], uchar_t dest[], uint_t type, uchar_t *data, uint_t size);
+int NE2K_Transmit(uint_t size);
+int NE2K_Send_Packet(uchar_t *packet, uint_t size);
+int NE2K_Send(uchar_t src[], uchar_t dest[], uint_t type, uchar_t *data, uint_t size);
 
 #endif  /* GEEKOS_NE2K_H */