Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


made virtio nic an experimental feature
[palacios.git] / palacios / src / devices / ne2k.c
index e6c12a9..9df0871 100644 (file)
 * Virtual NE2K Network Card 
 */
 
-
-
-
-#include <devices/vnic.h>
+#include <devices/pci.h>
+#include <devices/ne2k.h>
 #include <palacios/vmm.h>
 #include <palacios/vmm_types.h>
 #include <palacios/vmm_io.h>
 #include <palacios/vmm_debug.h>
+#include <palacios/vmm_string.h>
 
-#define DEBUG_NIC
-
-#ifndef DEBUG_NIC
-#undef PrintDebug()
+#ifndef CONFIG_DEBUG_NE2K
+#undef PrintDebug
 #define PrintDebug(fmts, args...)
 #endif
 
-typedef enum {NIC_READY, NIC_REG_POSTED} nic_state_t;
-
-struct nic_regs {
-    uchar_t cmd;
-    uchar_t pgstart;
-    uchar_t pgstop;
-    ushort_t clda;
-    uchar_t boundary;
-    uchar_t tsr;
-    uchar_t tpsr;
-    uchar_t ncr;
-    ushort_t tbcr;
-    uchar_t fifo;
-    uchar_t isr;
-    ushort_t crda;
-    ushort_t rsar;
-    ushort_t rbcr;
-    uchar_t rsr;
-    uchar_t rcr;
-    uint32_t cntr;
-    uchar_t tcr;
-    uchar_t dcr;
-    uchar_t imr;
-    
-    uchar_t phys[6]; // mac address 
-    uchar_t curpag;
-    uchar_t mult[8]; // multicast mask array 
-    uchar_t rnpp;
-    uchar_t lnpp;
-    ushort_t addcnt;
-    
-    uchar_t macaddr[6];
-};
-
-struct nic_context{
-    struct guest_info * vm;
-
-    nic_state_t dev_state;
-
-    struct nic_regs regs;
-
-    uchar_t mac[6]; //the mac address of this nic
 
-    uchar_t mem[NE2K_MEM_SIZE];        
-};
 
-struct vm_device * current_vnic;
 
-#define compare_mac(src, dst) ({               \
-           ( (src[0] == dst[0]) &&             \
-             (src[1] == dst[1]) &&             \
-             (src[2] == dst[2]) &&             \
-             (src[3] == dst[3]) &&             \
-             (src[4] == dst[4]) &&             \
-             (src[5] == dst[5]) ) ? 1 : 0;     \
-       })
+#define NE2K_DEFAULT_IRQ        11
+
+#define MAX_ETH_FRAME_SIZE      1514
+
+
+// What the hell is this crap?
+#define NE2K_PMEM_SIZE          (32 * 1024)
+#define NE2K_PMEM_START         (16 * 1024)
+#define NE2K_PMEM_END           (NE2K_PMEM_SIZE + NE2K_PMEM_START)
+#define NE2K_MEM_SIZE           NE2K_PMEM_END
+
+#define NIC_REG_BASE_PORT       0xc100         //Command register (for all pages) 
+#define NIC_DATA_PORT          0xc110          //Data read/write port
+#define NIC_RESET_PORT                 0xc11f          //Data read/write port
+
+// Page 0 registers
+#define EN0_CLDALO             0x01    //Low byte of current local dma addr  RD 
+#define EN0_STARTPG            0x01    //Starting page of ring bfr WR 
+#define EN0_CLDAHI             0x02    //High byte of current local dma addr  RD 
+#define EN0_STOPPG             0x02    //Ending page +1 of ring bfr WR 
+#define EN0_BOUNDARY           0x03    //Boundary page of ring bfr RD WR 
+#define EN0_TSR                        0x04    //Transmit status reg RD 
+#define EN0_TPSR               0x04    //Transmit starting page WR 
+#define EN0_NCR                        0x05    //Number of collision reg RD 
+#define EN0_TCNTLO             0x05    //Low  byte of tx byte count WR 
+#define EN0_FIFO               0x06    //FIFO RD 
+#define EN0_TCNTHI             0x06    //High byte of tx byte count WR 
+#define EN0_ISR                        0x07    //Interrupt status reg RD WR 
+#define EN0_CRDALO             0x08    //low byte of current remote dma address RD 
+#define EN0_RSARLO             0x08    //Remote start address reg 0 
+#define EN0_CRDAHI             0x09    //high byte, current remote dma address RD 
+#define EN0_RSARHI             0x09    //Remote start address reg 1 
+#define EN0_RCNTLO             0x0a    //Remote byte count reg WR 
+#define EN0_RTL8029ID0         0x0a    //Realtek ID byte #1 RD 
+#define EN0_RCNTHI             0x0b    //Remote byte count reg WR 
+#define EN0_RTL8029ID1         0x0b    //Realtek ID byte #2 RD 
+#define EN0_RSR                        0x0c    //rx status reg RD 
+#define EN0_RXCR               0x0c    //RX configuration reg WR 
+#define EN0_TXCR               0x0d    //TX configuration reg WR 
+#define EN0_COUNTER0           0x0d    //Rcv alignment error counter RD 
+#define EN0_DCFG               0x0e    //Data configuration reg WR 
+#define EN0_COUNTER1           0x0e    //Rcv CRC error counter RD 
+#define EN0_IMR                        0x0f    //Interrupt mask reg WR 
+#define EN0_COUNTER2           0x0f    //Rcv missed frame error counter RD 
+
+//Page 1 registers
+#define EN1_PHYS               0x01
+#define EN1_CURPAG                     0x07
+#define EN1_MULT                       0x08
+
+//Page 2 registers
+#define EN2_STARTPG            0x01    //Starting page of ring bfr RD 
+#define EN2_STOPPG             0x02    //Ending page +1 of ring bfr RD 
+#define EN2_LDMA0              0x01    //Current Local DMA Address 0 WR 
+#define EN2_LDMA1              0x02    //Current Local DMA Address 1 WR 
+#define EN2_RNPR               0x03    //Remote Next Packet Pointer RD WR 
+#define EN2_TPSR               0x04            //Transmit Page Start Address RD 
+#define EN2_LNRP               0x05    //Local Next Packet Pointer RD WR 
+#define EN2_ACNT0              0x06    //Address Counter Upper WR 
+#define EN2_ACNT1              0x07    //Address Counter Lower WR 
+#define EN2_RCR                0x0c    //Receive Configuration Register RD 
+#define EN2_TCR                0x0d    //Transmit Configuration Register RD 
+#define EN2_DCR                0x0e    //Data Configuration Register RD 
+#define EN2_IMR                0x0f    //Interrupt Mask Register RD 
+
+//Page 3 registers
+#define EN3_CONFIG0            0x03
+#define EN3_CONFIG1            0x04
+#define EN3_CONFIG2            0x05
+#define EN3_CONFIG3            0x06
 
 
 
+typedef enum {NIC_READY, NIC_REG_POSTED} nic_state_t;
 
-static int vnic_mem_write(struct nic_context * nic_state, 
-                         uint32_t addr,
-                         uint_t length) {
-    
-    PrintDebug("wmem addr: %x val: %x\n", addr, val);
+struct cmd_reg {
+    union {
+       uint8_t val;
+       struct {
+           uint8_t stop        : 1;
+           uint8_t start       : 1;
+           uint8_t tx_pkt      : 1;
+           uint8_t rem_dma_cmd : 3; // 0=Not allowed, 1=Read, 2=Write, 3=Send Pkt, 4=Abort/Complete DMA
+           uint8_t pg_sel      : 2;
+       } __attribute__((packed));
+    } __attribute__((packed));
+} __attribute__((packed));
+
+
+struct intr_status_reg {
+    union {
+       uint8_t val;
+       struct {
+           uint8_t pkt_rx          : 1;
+           uint8_t pkt_tx          : 1;
+           uint8_t rx_err          : 1;
+           uint8_t tx_err          : 1;
+           uint8_t overwrite_warn  : 1;
+           uint8_t cnt_overflow    : 1;
+           uint8_t rem_dma_done    : 1;
+           uint8_t reset_status    : 1;
+       } __attribute__((packed));
+    } __attribute__((packed));
+} __attribute__((packed));
+
+
+struct intr_mask_reg {
+    union {
+       uint8_t val;
+       struct {
+           uint8_t pkt_rx          : 1;
+           uint8_t pkt_tx          : 1;
+           uint8_t rx_err          : 1;
+           uint8_t tx_err          : 1;
+           uint8_t overwrite_warn  : 1;
+           uint8_t cnt_overflow    : 1;
+           uint8_t rem_dma_done    : 1;
+           uint8_t rsvd            : 1;
+       } __attribute__((packed));
+    } __attribute__((packed));
+} __attribute__((packed));
+
+
+struct data_cfg_reg {
+    union {
+       uint8_t val;
+       struct {
+           uint8_t word_trans_sel   : 1;
+           uint8_t byte_order_sel   : 1;
+           uint8_t long_addr_sel    : 1;
+           uint8_t loopback_sel     : 1;
+           uint8_t auto_init_rem    : 1;
+           uint8_t fifo_thresh_sel  : 2;
+           uint8_t rsvd             : 1;
+       } __attribute__((packed));
+    } __attribute__((packed));
+} __attribute__((packed));
+
+
+struct tx_cfg_reg { 
+    union {
+       uint8_t val;
+       struct {
+           uint8_t inhibit_crc     : 1;
+           uint8_t enc_loop_ctrl   : 2;
+           uint8_t auto_tx_disable : 1;
+           uint8_t coll_offset_en  : 1;
+           uint8_t rsvd            : 3;
+       } __attribute__((packed));
+    } __attribute__((packed));
+} __attribute__((packed));
+
+struct tx_status_reg { 
+    union {
+       uint8_t val;
+       struct {
+           uint8_t pkt_tx_ok       : 1;
+           uint8_t rsvd            : 1;
+           uint8_t tx_collision    : 1;
+           uint8_t tx_aborted      : 1;
+           uint8_t carrier_lost    : 1;
+           uint8_t fifo_underrun   : 1;
+           uint8_t cd_heartbeat    : 1;
+           uint8_t oow_collision   : 1;
+       } __attribute__((packed));
+    } __attribute__((packed));
+} __attribute__((packed));
+
+struct rx_cfg_reg { 
+    union {
+       uint8_t val;
+       struct {
+           uint8_t save_pkt_errs    : 1;
+           uint8_t runt_pkt_ok      : 1;
+           uint8_t bcast_ok         : 1;
+           uint8_t mcast_ok         : 1;
+           uint8_t prom_phys_enable : 1;
+           uint8_t mon_mode         : 1;
+           uint8_t rsvd             : 2;
+       } __attribute__((packed));
+    } __attribute__((packed));
+} __attribute__((packed));
+
+
+struct rx_status_reg { 
+    union {
+       uint8_t val;
+       struct {
+           uint8_t pkt_rx_ok        : 1;
+           uint8_t crc_err          : 1;
+           uint8_t frame_align_err  : 1;
+           uint8_t fifo_overrun     : 1;
+           uint8_t missed_pkt       : 1;
+           uint8_t phy_match        : 1;   // 0=Physical Addr Match, 1=MCAST/BCAST Addr Match
+           uint8_t rx_disabled      : 1;
+           uint8_t deferring        : 1;
+       } __attribute__((packed));
+    } __attribute__((packed));
+} __attribute__((packed));
+
+
+struct ne2k_context {
+    struct guest_info * vm;
 
-    //    if ((addr < NE2K_PMEM_START) || (addr > NE2K_MEM_SIZE))
+    nic_state_t dev_state;
 
-    switch (length) {
-       case 1: {
-           uchar_t val = *(uchar_t *)src;
-           
-       }
-       case 2:
-       case 4:
-    }
+    // Registers
+    struct cmd_reg cmd;
+    struct intr_status_reg isr;
+    struct intr_mask_reg imr;
+    struct data_cfg_reg dcr;
+    struct tx_cfg_reg tcr;
+    struct tx_status_reg tsr;
+    struct rx_cfg_reg rcr;
+    struct rx_status_reg rsr;  
+
+    uint8_t      pgstart;      // page start reg
+    uint8_t      pgstop;       // page stop reg
+    uint8_t      boundary;     // boundary ptr
+    uint8_t      tpsr;         // tx page start addr
+    uint8_t      ncr;          // number of collisions
+    uint8_t      fifo;         // FIFO...
+
+    uint8_t      curpag;       // current page
+    uint8_t      rnpp;         // rem next pkt ptr
+    uint8_t      lnpp;         // local next pkt ptr
+
+    uint8_t      cntr0;        // counter 0 (frame alignment errors)
+    uint8_t      cntr1;        // counter 1 (CRC Errors)
+    uint8_t      cntr2;        // counter 2 (missed pkt errors)
+
+    union {                    // current local DMA Addr
+       uint16_t     clda;
+       struct {
+           uint8_t clda0;
+           uint8_t clda1;
+       } __attribute__((packed));
+    } __attribute__((packed));
+
+
+    union {                   // current remote DMA addr
+       uint16_t     crda;
+       struct {
+           uint8_t crda0;
+           uint8_t crda1;
+       } __attribute__((packed));
+    } __attribute__((packed));
+
+
+    union {                   // Remote Start Addr Reg
+       uint16_t     rsar;
+       struct {
+           uint8_t rsar0;
+           uint8_t rsar1;
+       } __attribute__((packed));
+    } __attribute__((packed));
+
+
+    union {                    // TX Byte count Reg
+       uint16_t     tbcr;
+       struct {
+           uint8_t tbcr0;
+           uint8_t tbcr1;
+       } __attribute__((packed));
+    } __attribute__((packed));
+
+    union {                    // Remote Byte count Reg
+       uint16_t     rbcr;
+       struct {
+           uint8_t rbcr0;
+           uint8_t rbcr1;
+       } __attribute__((packed));
+    } __attribute__((packed));
+
+
+
+    union {                    // Address counter?
+       uint16_t     addcnt;
+       struct {
+           uint8_t addcnt0;
+           uint8_t addcnt1;
+       } __attribute__((packed));
+    } __attribute__((packed));
+
+
+    uint8_t      mcast_addr[8];  // multicast mask array 
+    uint8_t      mac_addr[6];    // MAC Addr
+
+    uint8_t mem[NE2K_MEM_SIZE];
+
+    struct pci_device * pci_dev;
+    struct vm_device * pci_bus;
+};
 
-}
+#define compare_mac(src, dst) !memcmp(src, dst, 6)
 
+#ifdef CONFIG_DEBUG_NE2K
+static void dump_state(struct vm_device * dev) {
+    struct ne2k_context *nic_state = (struct ne2k_context *)dev->private_data;
+    int i;
 
-static void vnic_mem_writeb(struct nic_context * nic_state, 
-                           uint32_t addr,
-                           uint32_t val) {
-    uchar_t tmp = (uchar_t) (val & 0x000000ff);
 
-    if ( (addr < 32) || 
-        ((addr >= NE2K_PMEM_START && addr < NE2K_MEM_SIZE) ) {
-        nic_state->mem[addr] = tmp;
-    }
+    PrintDebug("====NE2000: Dumping state Begin ==========\n");
+    PrintDebug("Registers:\n");
 
-    PrintDebug("wmem addr: %x val: %x\n", addr, val);
-}
+    // JRL: Dump Registers
 
-static void vnic_mem_writew(struct nic_context * nic_state, 
-                           uint32_t addr,
-                           uint32_t val) {
-
-    addr &= ~1; //XXX: check exact behaviour if not even
+    PrintDebug("Memory:\n");   
 
-    if ( (addr < 32) ||
-        ((addr >= NE2K_PMEM_START && addr) < NE2K_MEM_SIZE)) {
-        *(ushort_t *)(nic_state->mem + addr) = cpu2le16(val);
-    }
+    for(i = 0; i < 32; i++) {
+        PrintDebug("0x%02x ", nic_state->mem[i]);
+    } 
 
-    PrintDebug("wmem addr: %x val: %x\n", addr, val);
+    PrintDebug("\n");
+    PrintDebug("====NE2000: Dumping state End==========\n");
 }
+#endif
 
-static void vnic_mem_writel(struct nic_context * nic_state,
-                           uint32_t addr,
-                           uint32_t val) {
-    addr &= ~1; // XXX: check exact behaviour if not even
 
-    if ( (addr < 32) ||
-        ( (addr >= NE2K_PMEM_START) && (addr < NE2K_MEM_SIZE) ) ) {
-        *(uint32_t *)(nic_state->mem + addr) = cpu2le32(val);
-    }
-    
-    PrintDebug("wmem addr: %x val: %x\n", addr, val);
-}
 
-static uchar_t vnic_mem_readb(struct nic_context * nic_state, uint32_t addr) {
-    PrintDebug("rmem addr: %x\n", addr);
-       
-    if ( (addr < 32) ||
-        ( (addr >= NE2K_PMEM_START) && (addr < NE2K_MEM_SIZE)) ) {
-        return nic_state->mem[addr];
-    } else {
-        return 0xff;
-    }
-}
+static int ne2k_update_irq(struct vm_device *dev) {
+    struct ne2k_context * nic_state = (struct ne2k_context *)dev->private_data;
+    struct pci_device * pci_dev = nic_state->pci_dev;
+    int irq_line = 0;
 
-static ushort_t vnic_mem_readw(struct nic_context * nic_state, uint32_t addr) {
-    PrintDebug("rmem addr: %x\n", addr);
-       
-    addr &= ~1; //XXX: check exact behaviour if not even 
-
-    if ( (addr < 32) ||
-         ( (addr >= NE2K_PMEM_START) && (addr < NE2K_MEM_SIZE))) {
-        return (ushort_t)le16_to_cpu((ushort_t *)(nic_state->mem + addr));
+    if (pci_dev == NULL){
+       PrintDebug("Ne2k: Device %p is not attached to any PCI Bus\n", nic_state);
+       irq_line = NE2K_DEFAULT_IRQ;
     } else {
-        return 0xffff;
+       irq_line = pdev->config_header.intr_line;
     }
-}
-
-static uint32_t vnic_mem_readl(struct nic_context * nic_state, uint32_t addr) {
-    PrintDebug("rmem addr: %x\n", addr);
-
-    addr &= ~1; //XXX: check exact behaviour if not even
-
-    if ( (addr < 32) ||
-         ( (addr >= NE2K_PMEM_START && addr < NE2K_MEM_SIZE))) {
-        return (uint32_t)le32_to_cpu((uint32_t *)(nic_state->mem + addr));
-    } else {
-        return 0xffffffff;
+           
+    if (irq_line == 0){
+       PrintError("Ne2k: IRQ_LINE: %d\n", irq_line);
+       return -1;
     }
-}
-
-
 
+    PrintDebug("ne2k_update_irq: irq_line: %d\n", irq_line);
 
-static void dump_state(struct vm_device * dev) {
-    int i = 0;
-    uchar_t * p = NULL;
-    struct nic_context * nic_state = (struct nic_context *)dev->private_data;
-
-    PrintDebug("====VNIC: Dumping state Begin ==========\n");
-    PrintDebug("Registers:\n");
-
-    p = (uchar_t *)&nic_state->regs;
-    for (i = 0; i < sizeof(struct nic_regs); i++) {
-       PrintDebug("Regs[i] = 0x%2x\n", (int)p[i]);     
-    }
 
-    PrintDebug("Memory:\n");   
-    
-    for (i = 0; i < 32; i++) {
-        PrintDebug("0x%02x ", nic_state->mem[i]);
+    // The top bit of the ISR/IMR is reserved and does not indicate and irq event
+    // We mask the bit out of the irq pending check
+    if ((nic_state->isr.val & nic_state->imr.val) & 0x7f) {
+       v3_raise_irq(nic_state->vm, irq_line);
+       PrintDebug("Ne2k: RaiseIrq: isr: 0x%02x imr: 0x%02x\n", nic_state->isr.val, nic_state->imr.val);
     }
 
-    PrintDebug("\n");
-    PrintDebug("====VNIC: Dumping state End==========\n");
+    return 0;
 }
 
-static void vnic_update_irq(struct vm_device * dev) {
-    struct nic_context * nic_state = (struct nic_context *)dev->private_data;
-    struct guest_info * guest = dev->vm;
-
-    int isr = ((nic_state->regs.isr & nic_state->regs.imr) & 0x7f);
 
-    if ((isr & 0x7f) != 0x0) {
-       v3_raise_irq(guest, NIC_IRQ);
-       PrintDebug("VNIC: RaiseIrq: isr: 0x%02x imr: 0x%02x\n", nic_state->regs.isr, nic_state->regs.imr);
-    }   
-}
 
-static void init_vnic_context(struct vm_device * dev) {
-    struct nic_context *nic_state = (struct nic_context *)dev->private_data;
+static void ne2k_init_state(struct vm_device * dev) {
+    struct ne2k_context * nic_state = (struct ne2k_context *)dev->private_data;
     int i;
-    uchar_t mac[6] = {0x52, 0x54, 0x0, 0x12, 0x34, 0x56};
+    uchar_t mac[6] = {0x52, 0x54, 0x0, 0x12, 0x34, 0x60};
 
     nic_state->vm = dev->vm;
 
-    nic_state->regs.isr = ENISR_RESET;
-    nic_state->regs.imr = 0x00;
-    nic_state->regs.cmd = 0x22;
+    nic_state->isr.reset = 1;
+    nic_state->imr.val = 0x00;
+    nic_state->cmd.val = 0x22;
 
-    for (i = 0; i < 6; i++) {
-       nic_state->regs.macaddr[i] = nic_state->mac[i] = mac[i];
+    for (i = 0; i < 5; i++) {
+       nic_state->mac_addr[i] = mac[i];
     }
 
-    for (i = 0; i < 8; i++) {
-       nic_state->regs.mult[i] = 0xff;
-    }
+    memset(nic_state->mcast_addr, 0xff, sizeof(nic_state->mcast_addr));
 
-    for(i = 0; i < 32; i++) {
-        nic_state->mem[i] = 0xff;
-    }
+    // Not sure what this is about....
+    memset(nic_state->mem, 0xff, 32); 
 
-    memcpy(nic_state->mem, nic_state->mac, 6);
+    memcpy(nic_state->mem, nic_state->mac_addr, 6);
     nic_state->mem[14] = 0x57;
     nic_state->mem[15] = 0x57;
 
+#ifdef CONFIG_DEBUG_NE2K
     dump_state(dev);
-}
+#endif
 
+}
 
-static int vnic_send_packet(struct vm_device *dev, uchar_t *pkt, int length) {
+static int ne2k_send_packet(struct vm_device *dev, uchar_t *pkt, int length) {
     int i;
   
-    PrintDebug("\nVNIC: Sending Packet\n");
+    PrintDebug("\nNe2k: Sending Packet\n");
 
     for (i = 0; i < length; i++) {
        PrintDebug("%x ",pkt[i]);
@@ -275,49 +430,24 @@ static int vnic_send_packet(struct vm_device *dev, uchar_t *pkt, int length) {
 
     PrintDebug("\n");
        
-    return V3_SEND_PKT(pkt, length);
-}
+    PrintError("Implement Send Packet interface\n");
 
-
-struct vm_device * get_rx_dev(uchar_t * dst_mac) {
-    struct nic_context * nic_state = (struct nic_context *)current_vnic->private_data;
-    struct nic_regs * nregs = &(nic_state->regs);
-
-    static const uchar_t brocast_mac[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
-
-    if (nregs->rcr & 0x10) {
-        // promiscuous model    
-    } else {
-        if (compare_mac(dst_mac,  brocast_mac)) { //broadcast address
-            if (!(nregs->rcr & 0x04)) {
-                return NULL;
-           }
-        } else if (dst_mac[0] & 0x01) {
-            // multicast packet, not fully done here
-            // ==========
-            if (!(nregs->rcr & 0x08)) {
-                return NULL;
-           }
-        } else if (!compare_mac(dst_mac, nic_state->mac)) {
-            return NULL;
-        } else {
-            // TODO: ELSE??
-        }
-    }
-
-    return current_vnic;
+    return -1;
 }
 
-static int vnic_rxbuf_full(struct vm_device * dev) {
-    int empty, index, boundary;
-    struct nic_context * nic_state = (struct nic_context *)dev->private_data;
+static int ne2k_rxbuf_full(struct vm_device *dev) {
+    int empty;
+    int index;
+    int boundary;
+    struct ne2k_context * nic_state = (struct ne2k_context *)dev->private_data;
+
+    index = nic_state->curpag << 8;
+    boundary = nic_state->boundary << 8;
 
-    index = nic_state->regs.curpag << 8;
-    boundary = nic_state->regs.boundary << 8;
     if (index < boundary) {
         empty = boundary - index;
     } else {
-        empty = ((nic_state->regs.pgstop - nic_state->regs.pgstart) << 8) - (index - boundary);
+        empty = ((nic_state->pgstop - nic_state->pgstart) << 8) - (index - boundary);
     }
 
     if (empty < (MAX_ETH_FRAME_SIZE + 4)) {
@@ -329,72 +459,72 @@ static int vnic_rxbuf_full(struct vm_device * dev) {
 
 #define MIN_BUF_SIZE 60
 
-static void vnic_receive(struct vm_device * dev, const uchar_t * pkt, int length) {
-    struct nic_context * nic_state = (struct nic_context *)dev->private_data;
-    struct nic_regs * nregs = &(nic_state->regs);
 
-    uchar_t * p = NULL;
-    uint32_t total_len = 0; 
-    uint32_t next = 0;
-    uint32_t len = 0;
-    uint32_t index = 0;
-    uint32_t empty = 0;
+// This needs to be completely redone...
+static void ne2k_receive(struct vm_device * dev, const uchar_t * pkt, int length) {
+    struct ne2k_context * nic_state = (struct ne2k_context *)dev->private_data;
+    uchar_t * p;
+    uint32_t total_len;
+    uint32_t next;
+    uint32_t len;
+    uint32_t index;
+    uint32_t empty;
     uchar_t buf[60];
-    uint32_t start = nregs->pgstart << 8;
-    uint32_t stop = nregs->pgstop << 8;
-        
-    //PrintDebug("VNIC: received packet, len=%d\n", length);
+    uint32_t start;
+    uint32_t stop;
+
+    start = nic_state->pgstart << 8;
+    stop = nic_state->pgstop << 8;
    
-    if (nregs->cmd & NE2K_STOP) {
+    if (nic_state->cmd.stop) {
        return;
     }
 
-    if (vnic_rxbuf_full(dev)){
-       PrintDebug("VNIC: received buffer overflow\n");
-        return;
+    if (ne2k_rxbuf_full(dev)) {
+       PrintError("Ne2k: received buffer overflow\n");
+       return;
     }
 
-    // if too small buffer, expand it
+
+    //packet too small, expand it
     if (length < MIN_BUF_SIZE) {
         memcpy(buf, pkt, length);
         memset(buf + length, 0, MIN_BUF_SIZE - length);
-
         pkt = buf;
-
         length = MIN_BUF_SIZE;
     }
 
-    index = nregs->curpag << 8;
+    index = nic_state->curpag << 8;
 
-    // 4 bytes header 
+    //header, 4 bytes
     total_len = length + 4;
 
-    // address for next packet (4 bytes for CRC)
+    //address for next packet (4 bytes for CRC)
     next = index + ((total_len + 4 + 255) & ~0xff);
 
     if (next >= stop) {
-        next -= stop - start;
+        next -= (stop - start);
     }
 
     p = nic_state->mem + index;
-    nregs->rsr = ENRSR_RXOK;
+    nic_state->rsr.val = 0;
+    nic_state->rsr.rx_pkt_ok = 1;
 
     if (pkt[0] & 0x01) {
-        nregs->rsr |= ENRSR_PHY;
+        nic_state->rsr.phy = 1;
     }
 
-    p[0] = nregs->rsr;
+    p[0] = nic_state->rsr.val;
     p[1] = next >> 8;
     p[2] = total_len;
     p[3] = total_len >> 8;
-
     index += 4;
 
     while (length > 0) {
         if (index <= stop) {
             empty = stop - index;
-       } else {
-           empty = 0;
+        } else {
+            empty = 0;
        }
 
         len = length;
@@ -414,592 +544,649 @@ static void vnic_receive(struct vm_device * dev, const uchar_t * pkt, int length
         length -= len;
     }
 
-    nregs->curpag = next >> 8;
+    nic_state->curpag = next >> 8;
 
-    nregs->isr |= ENISR_RX;
-    vnic_update_irq(dev);
+    nic_state->isr.pkt_rx = 1;
+    ne2k_update_irq(dev);
 }
 
-// =====begin here
-#if 0
-void pci_vnic_init(PCIBus * bus, NICInfo * nd, int devfn)
-{
-    PCINE2000State * d = NULL;
-    NE2000State * s  = NULL;
-    uint8_t * pci_conf = NULL;
-    struct pci_device * pdev = pci_register_device(bus,
-                                                  "NE2000", sizeof(PCINE2000State),
-                                                  devfn,
-                                                  NULL, NULL);
-    pci_conf = d->dev.config;
-
-    pci_conf[0x00] = 0xec; // Realtek 8029
-    pci_conf[0x01] = 0x10;
-    pci_conf[0x02] = 0x29;
-    pci_conf[0x03] = 0x80;
-    pci_conf[0x0a] = 0x00; // ethernet network controller
-    pci_conf[0x0b] = 0x02;
-    pci_conf[0x0e] = 0x00; // header_type
-    pci_conf[0x3d] = 1; // interrupt pin 0
-
-    pci_register_io_region(&d->dev, 0, 0x100,
-                           PCI_ADDRESS_SPACE_IO, ne2000_map);
-    s = &d->ne2000;
-
-    s->irq = d->dev.irq[0];
-
-    s->pci_dev = (PCIDevice *)d;
-
-    memcpy(s->macaddr, nd->macaddr, 6);
-
-    ne2000_reset(s);
-
-    s->vc = qemu_new_vlan_client(nd->vlan, ne2000_receive,
-                                 ne2000_can_receive, s);
-
-    snprintf(s->vc->info_str, sizeof(s->vc->info_str),
-             "ne2000 pci macaddr=%02x:%02x:%02x:%02x:%02x:%02x",
-             s->macaddr[0],
-             s->macaddr[1],
-             s->macaddr[2],
-             s->macaddr[3],
-             s->macaddr[4],
-             s->macaddr[5]);
-
-    /* XXX: instance number ? */
-    register_savevm("ne2000", 0, 3, ne2000_save, ne2000_load, s);
-}
-#endif
-//End Here====================================
-
-static int netif_input(uchar_t * pkt, uint_t size) {
-  uint_t i;
-  struct vm_device * dev = NULL;
-  
-  PrintDebug("\nVNIC: Packet Received:\nSource:");
-  
-  for (i = 6; i < 12; i++) {
-      PrintDebug("%x ", pkt[i]);
-  }
-
-  dev = get_rx_dev(pkt);
-
-  if (dev == NULL) {
-      return 0;
-  }
-
-  PrintDebug("\n");
-
-  for(i = 0; i < size; i++) {
-      PrintDebug("%x ", pkt[i]);
-  }
-
-  vnic_receive(dev, pkt, size);
 
-  return 0;
-}
 
 
-static int vnic_ioport_write(ushort_t port,
-                            void * src,
-                            uint_t length,
-                            struct vm_device * dev) {
-    uchar_t  page = 0;
-    struct nic_context *nic_state = (struct nic_context* )dev->private_data;
-    uchar_t val = 0;
-    int index;
-       
-    if (length == 1) {
-       memcpy(&val, src, 1);
-    } else {
-       PrintDebug("vnic_write error: length %d\n", length);  
-       return length;
+static int netif_input(uchar_t *pkt, uint_t size) {
+    struct ne2k_context * nic_state;
+    static const uchar_t brocast_mac[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+    int i;
+  
+#ifdef CONFIG_DEBUG_NE2K
+    PrintDebug("\nNe2k: Packet Received:\nSource:");
+    for (i = 6; i < 12; i++) {
+       PrintDebug("%x ", pkt[i]);
     }
-       
-    port &= 0x1f;
-       
-    PrintDebug("vnic_write: port:0x%x (%u bytes): 0x%x\n", port, length, (int)val);
-       
-    if (port == EN0_COMMAND) {
-        nic_state->regs.cmd = val;
-       
-        if (!(val & NE2K_STOP)) {
-            nic_state->regs.isr &= ~ENISR_RESET; 
-
-            if ((val & (NE2K_DMAREAD | NE2K_DMAWRITE)) &&
-               nic_state->regs.rbcr == 0) {
-                nic_state->regs.isr |= ENISR_RDC;
-                vnic_update_irq(dev);
-            }
 
+    PrintDebug("\n");
 
-            if (val & NE2K_TRANSMIT) {
-                index = (nic_state->regs.tpsr << 8);
+    for(i = 0; i < size; i++) {
+       PrintDebug("%x ", pkt[i]);
+    }    
+    PrintDebug("\n");
+#endif    
+
+
+    if (nic_state->rcr.prom_phys_enable == 1) {
+       //promiscuous mode
+       ne2k_receive(ne2ks[i], pkt, size);
+    } else if (compare_mac(pkt,  brocast_mac) && (nic_state->rcr.bcast_ok)) {
+       //broadcast packet
+       ne2k_receive(ne2ks[i], pkt, size);
+    } else if ((pkt[0] & 0x01) && (nic_state->rcr.mcast_ok)) {
+       //TODO: multicast packet
+       ne2k_receive(ne2ks[i], pkt, size);
+    } else if (compare_mac(pkt, nic_state->mac_addr)) {
+       ne2k_receive(ne2ks[i], pkt, size);
+    }
+    
+    return 0;
+}
 
-                if (index >= NE2K_PMEM_END) {
-                    index -= NE2K_PMEM_SIZE;
-               }
 
-                if (index + nic_state->regs.tbcr <= NE2K_PMEM_END) {
-                    vnic_send_packet(dev, nic_state->mem + index, nic_state->regs.tbcr);
-                }
+static void ne2k_mem_writeb(struct ne2k_context * nic_state, uint32_t addr, uint32_t val) {
+    uchar_t tmp;
 
-                nic_state->regs.tsr = ENTSR_PTX;
-                nic_state->regs.isr |= ENISR_TX;
-                nic_state->regs.cmd &= ~NE2K_TRANSMIT;
+    tmp = (uchar_t) (val & 0x000000ff);
 
-                vnic_update_irq(dev);
-            }
-        }
+    if ((addr < 32) || (addr >= NE2K_PMEM_START && addr < NE2K_MEM_SIZE)) {
+        nic_state->mem[addr] = tmp;
+    }
 
-    } else {
-        page = nic_state->regs.cmd >> 6;
-
-        if (page == 0){
-
-           switch(port) {
-               case EN0_STARTPG:
-                   nic_state->regs.pgstart = val;
-                   break;
-               case EN0_STOPPG:
-                   nic_state->regs.pgstop = val;
-                   break;
-               case EN0_BOUNDARY:
-                   nic_state->regs.boundary = val;
-                   break;
-               case EN0_TPSR:
-                   nic_state->regs.tpsr = val;
-                   break;
-               case EN0_TCNTLO:
-                   nic_state->regs.tbcr = (nic_state->regs.tbcr & 0xff00) | val;
-                   break;
-               case EN0_TCNTHI:
-                   nic_state->regs.tbcr = (nic_state->regs.tbcr & 0x00ff) | (val << 8);
-                   break;
-               case EN0_ISR:
-                   nic_state->regs.isr &= ~(val & 0x7f);
-                   vnic_update_irq(dev);
-                   break;
-               case EN0_RSARLO:
-                   nic_state->regs.rsar = (nic_state->regs.rsar & 0xff00) | val;
-                   break;
-               case EN0_RSARHI:
-                   nic_state->regs.rsar = (nic_state->regs.rsar & 0x00ff) | (val << 8);
-                   break;
-               case EN0_RCNTLO:
-                   nic_state->regs.rbcr = (nic_state->regs.rbcr & 0xff00) | val;
-                   break;
-               case EN0_RCNTHI:
-                   nic_state->regs.rbcr = (nic_state->regs.rbcr & 0x00ff) | (val << 8);
-                   break;
-               case EN0_RXCR:
-                   nic_state->regs.rcr = val;
-                   break;
-               case EN0_TXCR:
-                   nic_state->regs.tcr = val;
-               case EN0_DCFG:
-                   nic_state->regs.dcr = val;
-                   break;      
-               case EN0_IMR:
-                   nic_state->regs.imr = val;
-                   vnic_update_irq(dev);
-                   break;
-               default:
-                   PrintDebug("vnic_write error: invalid port:0x%x\n", port);
-                   break;
-           }
+    PrintDebug("wmem addr: %x val: %x\n", addr, val);
+}
 
-       } else if (page == 1) {
-
-           switch(port) {
-               case EN1_PHYS ... EN1_PHYS + 5:
-                   nic_state->regs.phys[port - EN1_PHYS] = val;
-                   break;
-               case EN1_CURPAG:
-                   nic_state->regs.curpag = val;
-                   break;
-               case EN1_MULT ... EN1_MULT + 7:
-                   nic_state->regs.mult[port - EN1_MULT] = val;
-                   break;
-               default:
-                   PrintDebug("vnic_write error: invalid port:0x%x\n", port);
-                   break;
-           }
+static void ne2k_mem_writew(struct ne2k_context * nic_state, 
+                           uint32_t addr,
+                           uint32_t val) {
+    addr &= ~1; //XXX: check exact behaviour if not even
 
-       } else if (page == 2) {
-
-           switch(port) {
-               case EN2_LDMA0:
-                   nic_state->regs.clda = (nic_state->regs.clda & 0xff00) | val;
-                   break;
-               case EN2_LDMA1:
-                   nic_state->regs.clda = (nic_state->regs.clda & 0x00ff) | (val << 8);
-                   break;
-               case EN2_RNPR:
-                   nic_state->regs.rnpp = val;
-                   break;
-               case EN2_LNRP:
-                   nic_state->regs.lnpp = val;
-                   break;
-               case EN2_ACNT0:
-                   nic_state->regs.addcnt = (nic_state->regs.addcnt & 0xff00) | val;
-                   break;
-               case EN2_ACNT1: 
-                   nic_state->regs.addcnt = (nic_state->regs.addcnt & 0x00ff) | (val << 8);
-                   break;
-               default:
-                   PrintDebug("vnic_write error: invalid port:0x%x\n", port);
-                   break;
-           }
-       }
+    if ((addr < 32) || (addr >= NE2K_PMEM_START && addr < NE2K_MEM_SIZE)) {
+        *(ushort_t *)(nic_state->mem + addr) = cpu2le16(val);
     }
 
-    //dump_state(dev);
-       
-    return length;
-       
+    PrintDebug("wmem addr: %x val: %x\n", addr, val);
 }
 
-static int vnic_ioport_read(ushort_t port, void * dst, uint_t length, struct vm_device *dev) {
-    uchar_t page = 0;
-    int val = 0;
-
-    struct nic_context *nic_state = (struct nic_context* )dev->private_data;
+static void ne2k_mem_writel(struct ne2k_context *nic_state,
+                           uint32_t addr,
+                           uint32_t val) {
+    addr &= ~1; // XXX: check exact behaviour if not even
 
-    if (length > 1) {
-       PrintDebug("vnic_read error: length %d\n", length);
-       valurn length;
+    if ((addr < 32) || (addr >= NE2K_PMEM_START && addr < NE2K_MEM_SIZE)) {
+        *(uint32_t *)(nic_state->mem + addr) = cpu2le32(val);
     }
 
-    port &= 0x1f;
+    PrintDebug("wmem addr: %x val: %x\n", addr, val);
+}
 
-    if (port == EN0_COMMAND) {
-        val = nic_state->regs.cmd;
+static uchar_t  ne2k_mem_readb(struct ne2k_context *nic_state, uint32_t addr) {
+    PrintDebug("rmem addr: %x\n", addr);
+       
+    if ((addr < 32) || (addr >= NE2K_PMEM_START && addr < NE2K_MEM_SIZE)) {
+        return nic_state->mem[addr];
     } else {
-        page = nic_state->regs.cmd >> 6;
-
-        if (page == 0) {
-
-            switch (port) {            
-               case EN0_CLDALO:
-                   val = nic_state->regs.clda & 0x00ff;
-                   break;
-               case EN0_CLDAHI:
-                   val = (nic_state->regs.clda & 0xff00) >> 8;
-                   break;
-               case EN0_BOUNDARY:
-                   val = nic_state->regs.boundary;
-                   break;
-               case EN0_TSR:
-                   val = nic_state->regs.tsr;
-                   break;
-               case EN0_NCR:
-                   val = nic_state->regs.ncr;
-                   break;
-               case EN0_FIFO:
-                   val = nic_state->regs.fifo;
-                   break;
-               case EN0_ISR:
-                   val = nic_state->regs.isr;
-                   vnic_update_irq(dev);
-                   break;
-               case EN0_CRDALO:
-                   val = nic_state->regs.crda & 0x00ff;
-                   break;
-               case EN0_CRDAHI:
-                   val = (nic_state->regs.crda & 0xff00) >> 8;
-                   break;
-               case EN0_RSR:
-                   val = nic_state->regs.rsr;
-                   break;
-               case EN0_COUNTER0:
-                   val = nic_state->regs.cntr & 0x000000ff;
-                   break;
-               case EN0_COUNTER1:
-                   val = (nic_state->regs.cntr & 0x0000ff00) >> 8;
-                   break;      
-               case EN0_COUNTER2:
-                   val = (nic_state->regs.cntr & 0x00ff0000) >> 16;
-                   break;
-               default:
-                   PrintDebug("vnic_read error: invalid port:0x%x\n", port);
-                   val = 0x00;
-                   break;
-           }
-
-        } else if (page == 1) {
-
-           switch(port) {
-               case EN1_PHYS ... EN1_PHYS + 5:
-                   val = nic_state->regs.phys[port - EN1_PHYS];
-                   break;
-               case EN1_CURPAG:
-                   val = nic_state->regs.curpag;
-                   break;
-               case EN1_MULT ... EN1_MULT + 7:
-                   val = nic_state->regs.mult[port - EN1_MULT];
-                   break;
-               default:
-                   PrintDebug("vnic_read error: invalid port:0x%x\n", port);
-                   val = 0x00;
-                   break;
-           }
-
-       } else if (page == 2) {
-
-           switch(port) {
-               case EN2_STARTPG:
-                   val = nic_state->regs.pgstart;
-                   break;
-               case EN2_STOPPG:
-                   val = nic_state->regs.pgstop;
-                   break;
-               case EN2_RNPR:
-                   val = nic_state->regs.rnpp;
-                   break;
-               case EN2_LNRP:
-                   val = nic_state->regs.lnpp;
-                   break;
-               case EN2_TPSR:
-                   val = nic_state->regs.tpsr;
-                   break;
-               case EN2_ACNT0:
-                   val = nic_state->regs.addcnt & 0x00ff;
-                   break;
-               case EN2_ACNT1: 
-                   val = (nic_state->regs.addcnt & 0xff00) >> 8;
-                   break;
-               case EN2_RCR:
-                   val = nic_state->regs.rcr;
-                   break;
-               case EN2_TCR:
-                   val = nic_state->regs.tcr;
-                   break;
-               case EN2_DCR:
-                   val = nic_state->regs.dcr;
-                   break;
-               case EN2_IMR:
-                   val = nic_state->regs.imr;
-                   break;
-               default:
-                   PrintDebug("vnic_read error: invalid port:0x%x\n", port);
-                   val = 0x00;
-                   break;
-           }
-       }
+        return 0xff;
     }
+}
 
-    memcpy(dst, &val, 1);
+static ushort_t ne2k_mem_readw(struct ne2k_context *nic_state, uint32_t addr) {
+    PrintDebug("rmem addr: %x\n", addr);
+       
+    addr &= ~1; //XXX: check exact behaviour if not even 
 
-    PrintDebug("vnic_read: port:0x%x (%u bytes): 0x%x\n", port,length, (uint32_t)val);
+    if ((addr < 32) || (addr >= NE2K_PMEM_START && addr < NE2K_MEM_SIZE)) {
+        return (ushort_t)le16_to_cpu((ushort_t *)(nic_state->mem + addr));
+    } else {
+        return 0xffff;
+    }
+}
 
-    //dump_state(dev);
+static uint32_t ne2k_mem_readl(struct ne2k_context *nic_state, uint32_t addr) {
+    PrintDebug("rmem addr: %x\n", addr);
 
-    return length;
+    addr &= ~1; //XXX: check exact behaviour if not even
 
+    if ((addr < 32) || (addr >= NE2K_PMEM_START && addr < NE2K_MEM_SIZE)) {
+        return (uint32_t)le32_to_cpu((uint32_t *)(nic_state->mem + addr));
+    } else {
+        return 0xffffffff;
+    }
 }
 
 
-
-
-static void vnic_dma_update(struct vm_device * dev, int len) {         
-    struct nic_context *nic_state = (struct nic_context *)dev->private_data;
+static void ne2k_dma_update(struct vm_device *dev, int len) {          
+    struct ne2k_context * nic_state = (struct ne2k_context *)dev->private_data;
        
-    nic_state->regs.rsar += len;
-    // wrap
+    nic_state->rsar += len;
 
-    if (nic_state->regs.rsar == nic_state->regs.pgstop) {
-        nic_state->regs.rsar = nic_state->regs.pgstart;
+    // wrap
+    if (nic_state->rsar == nic_state->pgstop) {
+        nic_state->rsar = nic_state->pgstart;
     }
 
-    if (nic_state->regs.rbcr <= len) {
-        nic_state->regs.rbcr = 0;
-        nic_state->regs.isr |= ENISR_RDC;
-
-        vnic_update_irq(dev);
+    if (nic_state->rbcr <= len) {
+        nic_state->rbcr = 0;
+        nic_state->isr.rem_dma_done = 1;
+        ne2k_update_irq(dev);
     } else {
-        nic_state->regs.rbcr -= len;
+        nic_state->rbcr -= len;
     }
 }
 
 
 //for data port read/write
-static int vnic_data_read(ushort_t port,
-                         void * dst,
-                         uint_t length,
-                         struct vm_device * dev) {
-    uint32_t val = 0;
-    struct nic_context *nic_state = (struct nic_context *)dev->private_data;
-
+static int ne2k_data_read(ushort_t port, void * dst, uint_t length, struct vm_device *dev) {
+    uint32_t val;
+    struct ne2k_context * nic_state = (struct ne2k_context *)dev->private_data;
+    
     // current dma address
-    uint32_t addr = nic_state->regs.rsar;
+    uint32_t addr = nic_state->rsar;
 
-    switch (length) {
+    switch (length){
        case 1:
-           val = vnic_mem_readb(nic_state, addr);
+           val = ne2k_mem_readb(nic_state, addr);
            break;
        case 2:
-           val = vnic_mem_readw(nic_state, addr);
+           val = ne2k_mem_readw(nic_state, addr);
            break;
        case 4:
-           val = vnic_mem_readl(nic_state, addr);
+           val = ne2k_mem_readl(nic_state, addr);
            break;
        default:
-           PrintDebug("vnic_data_read error: invalid length %d\n", length);
+           PrintError("ne2k_data_read error: invalid length %d\n", length);
            val = 0x0;
     }
-
-    vnic_dma_update(dev, length);
+    
+    ne2k_dma_update(dev, length);
 
     memcpy(dst, &val, length);
 
-    PrintDebug("vnic_read: port:0x%x (%u bytes): 0x%x", port & 0x1f, length, val);
+    PrintDebug("ne2k_read: port:0x%x (%u bytes): 0x%x", port & 0x1f, length, val);
 
     return length;
 }
 
-static int vnic_data_write(ushort_t port,
-                          void * src,
-                          uint_t length,
-                          struct vm_device * dev) {
-    uint32_t val = 0;
-    struct nic_context * nic_state = (struct nic_context *)dev->private_data;
-
-    uint32_t addr = nic_state->regs.rsar;
+static int ne2k_data_write(ushort_t port, void * src, uint_t length, struct vm_device *dev) {
+    uint32_t val;
+    struct ne2k_context * nic_state = (struct ne2k_context *)dev->private_data;
+    uint32_t addr = nic_state->rsar;
 
-    if (nic_state->regs.rbcr == 0) {
+    if (nic_state->rbcr == 0) {
        return length;
     }
 
     memcpy(&val, src, length);
 
-    //determine the starting address of reading/writing
-    //addr= ??
-       
     switch (length) {
        case 1:
-           vnic_mem_writeb(nic_state, addr, val);
+           ne2k_mem_writeb(nic_state, addr, val);
            break;
        case 2:
-           vnic_mem_writew(nic_state, addr, val);
+           ne2k_mem_writew(nic_state, addr, val);
            break;
        case 4:
-           vnic_mem_writel(nic_state, addr, val);
+           ne2k_mem_writel(nic_state, addr, val);
            break;
        default:
-           PrintDebug("nic_data_write error: invalid length %d\n", length);
+           PrintError("nic_data_write error: invalid length %d\n", length);
     }
-       
-    vnic_dma_update(dev, length);
+    
+    ne2k_dma_update(dev, length);
 
-    PrintDebug("vnic_write: port:0x%x (%u bytes): 0x%x\n", port & 0x1f,length, val);
-                       
+    PrintDebug("ne2k_write: port:0x%x (%u bytes): 0x%x\n", port & 0x1f, length, val);
+    
     return length;
 }
 
-static int vnic_reset_device(struct vm_device * dev) {
-  
+static int ne2k_reset_device(struct vm_device * dev) {  
     PrintDebug("vnic: reset device\n");
 
-    init_vnic_context(dev);
+    init_ne2k_context(dev);
 
     return 0;
 }
 
 
 //for 0xc11f port
-static int vnic_reset_port_read(ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
-    uint32_t val = 0;
+static int ne2k_reset_port_read(ushort_t port, void * dst, uint_t length, struct vm_device * dev) {
+    PrintDebug("ne2k_read: port:0x%x (%u bytes): 0x%x\n", port, length, val);
 
-    PrintDebug("vnic_read: port:0x%x (%u bytes): 0x%x\n", port,length, val);
-    memcpy(dst, &val, length);
+    memset(dst, 0, length);
+    ne2k_reset_device(dev);
 
-    vnic_reset_device(dev);
+    return length;
+}
 
+static int ne2k_reset_port_write(ushort_t port, void * src, uint_t length, struct vm_device * dev) {
+    PrintDebug("ne2k_write: port:0x%x (%u bytes): 0x%x\n", port, length, val);                 
     return length;
 }
 
-static int vnic_reset_port_write(ushort_t port, void * src, uint_t length, struct vm_device * dev) {
-    uint32_t val = 0;
 
-    PrintDebug("vnic_write: port:0x%x (%u bytes): 0x%x\n", port,length, val);
-    memcpy(&val, src, length);
-                       
+
+static int ne2k_cmd_write(uint16_t port, void * src, uint_t length, struct vm_device * dev) {
+    struct ne2k_context * nic_state = (struct ne2k_context *)dev->private_data;
+
+    if (length != 1) {
+       PrintError("Invalid write length to ne2k Command register\n");
+       return -1;
+    }
+
+    nic_state->cmd.val = *(uint8_t *)src;
+
+    if (!(nic_state->cmd.stop)) {
+       nic_state->isr.reset = 0;
+       
+
+       // if ((send pkt) && (dma byte count == 0)) 
+       if ((nic_state.rem_dma_cmd & 0x3) && (nic_state->rbcr == 0)) {
+           nic_state->isr.rem_dma_done = 1;
+           ne2k_update_irq(dev);
+       }
+       
+       if (nic_state->cmd.tx_pkt) {
+           int offset = (nic_state->tpsr << 8);
+           
+           if (offset >= NE2K_PMEM_END) {
+               offset -= NE2K_PMEM_SIZE;
+           }
+
+           if (offset + nic_state->tbcr <= NE2K_PMEM_END) {
+               ne2k_send_packet(dev, nic_state->mem + offset, nic_state->tbcr);
+           }
+
+           
+           nic_state->tsr.val = 0;        // clear the tx status reg
+           nic_state->tsr.pkt_tx_ok = 1;  // indicate successful tx
+
+           nic_state->isr.pkt_tx = 1;     // irq due to pkt tx
+           nic_state->cmd.tx_pkt = 0;     // reset cmd bit
+           ne2k_update_irq(dev);
+       }
+    } else {
+       // stop the controller
+    }
+
+    return length;
+}
+
+static int ne2k_cmd_read(uint16_t port, void * src, uint_t length, struct vm_device * dev) {
+    *(uint8_t *)dst = nic_state->cmd.val;
+
+    PrintDebug("ne2k_read: port:0x%x  val: 0x%x\n", port, *(uint8_t *)dst);
+    return length;
+}
+
+static int ne2k_std_write(uint16_t port, void * src, uint_t length, struct vm_device * dev) {
+    struct ne2k_context * nic_state = (struct ne2k_context *)dev->private_data;
+    int index = port & 0x1f;
+    uint8_t page = nic_state->cmd.pg_sel;
+
+    if (length != 1
+       PrintError("ne2k_write error: length %d\n", length);  
+       return -1;
+    }
+
+    PrintDebug("ne2k_write: port:0x%x  val: 0x%x\n", port, (int)val);
+    
+
+    if (page == 0) {
+       switch (port) {
+           case EN0_STARTPG:
+               nic_state->pgstart = val;
+               break;
+           case EN0_STOPPG:
+               nic_state->pgstop = val;
+               break;
+           case EN0_BOUNDARY:
+               nic_state->boundary = val;
+               break;
+           case EN0_TPSR:
+               nic_state->tpsr = val;
+               break;
+           case EN0_TCNTLO:
+               nic_state->tbcr0 = val;
+               break;
+           case EN0_TCNTHI:
+               nic_state->tbcr1 = val;
+               break;
+           case EN0_ISR:
+               nic_state->isr.val &= ~(val & 0x7f);
+               ne2k_update_irq(dev);
+               break;
+           case EN0_RSARLO:
+               nic_state->rsar0 = val;
+               break;
+           case EN0_RSARHI:
+               nic_state->rsar1 = val;
+               break;
+           case EN0_RCNTLO:
+               nic_state->rbcr0 = val;
+               break;
+           case EN0_RCNTHI:
+               nic_state->rbcr1 = val;
+               break;
+           case EN0_RXCR:
+               nic_state->rcr.val = val;
+               break;
+           case EN0_TXCR:
+               nic_state->tcr.val = val;
+               break;
+           case EN0_DCFG:
+               nic_state->dcr.val = val;
+               break;  
+           case EN0_IMR:
+               nic_state->imr.val = val;
+               //PrintError("ne2k_write error: write IMR:0x%x\n", (int)val);
+               ne2k_update_irq(dev);
+               break;
+           default:
+               PrintError("ne2k_write error: invalid port:0x%x\n", port);
+               return -1;
+       }
+    } else if (page == 1) {
+       switch (port) {
+           case EN1_PHYS ... EN1_PHYS + 5:
+               nic_state->mac_addr[port - EN1_PHYS] = val;
+               break;
+           case EN1_CURPAG:
+               nic_state->curpag = val;
+               break;
+           case EN1_MULT ... EN1_MULT + 7:
+               // PrintError("ne2k_write error: write EN_MULT:0x%x\n", (int)val);
+               nic_state->mcast_addr[port - EN1_MULT] = val;
+               break;
+           default:
+               PrintError("ne2k_write error: invalid port:0x%x\n", port);
+               return -1;
+       }
+    } else if (page == 2) {
+       switch (port) {
+           case EN2_LDMA0:
+               nic_state->clda0 = val;
+               break;
+           case EN2_LDMA1:
+               nic_state->clda1 = val;
+               break;
+           case EN2_RNPR:
+               nic_state->rnpp = val;
+               break;
+           case EN2_LNRP:
+               nic_state->lnpp = val;
+               break;
+           case EN2_ACNT0:
+               nic_state->addcnt0 = val;
+               break;
+           case EN2_ACNT1: 
+               nic_state->addcnt1 = val;
+               break;
+           default:
+               PrintError("ne2k_write error: invalid port:0x%x\n", port);
+               return -1;
+       }
+    } else {
+       PrintError("Invalid Register Page Value\n");
+       return -1;
+    }
+
+
+    return length;
+       
+}
+
+static int ne2k_std_read(uint16_t port, void * dst, uint_t length, struct vm_device *dev) {
+    struct ne2k_context * nic_state = (struct ne2k_context *)(dev->private_data);
+    uint16_t index = port & 0x1f;
+    uint8_t page = nic_state->cmd.pg_sel;
+
+    if (length > 1) {
+       PrintError("ne2k_read error: length %d\n", length);
+       return length;
+    }
+
+    if (page == 0) {
+
+       switch (index) {                
+           case EN0_CLDALO:
+               *(uint8_t *)dst = nic_state->clda0;
+               break;
+           case EN0_CLDAHI:
+               *(uint8_t *)dst = nic_state->clda1;
+               break;
+           case EN0_BOUNDARY:
+               *(uint8_t *)dst = nic_state->boundary;
+               break;
+           case EN0_TSR:
+               *(uint8_t *)dst = nic_state->tsr.val;
+               break;
+           case EN0_NCR:
+               *(uint8_t *)dst = nic_state->ncr;
+               break;
+           case EN0_FIFO:
+               *(uint8_t *)dst = nic_state->fifo;
+               break;
+           case EN0_ISR:
+               *(uint8_t *)dst = nic_state->isr.val;
+               ne2k_update_irq(dev);
+               break;
+           case EN0_CRDALO:
+               *(uint8_t *)dst = nic_state->crda0;
+               break;
+           case EN0_CRDAHI:
+               *(uint8_t *)dst = nic_state->crda1;
+               break;
+           case EN0_RSR:
+               *(uint8_t *)dst = nic_state->rsr.val;
+               break;
+           case EN0_COUNTER0:
+               *(uint8_t *)dst = nic_state->cntr0;
+               break;
+           case EN0_COUNTER1:
+               *(uint8_t *)dst = nic_state->cntr1;
+               break;  
+           case EN0_COUNTER2:
+               *(uint8_t *)dst = nic_state->cntr2;
+               break;
+           default:
+               PrintError("ne2k_read error: invalid port:0x%x\n", port);
+               return -1;
+       }
+
+    } else if (page == 1) {
+
+       switch (index) {
+           case EN1_PHYS ... EN1_PHYS + 5:
+               *(uint8_t *)dst = nic_state->mac_addr[index - EN1_PHYS];
+               break;
+           case EN1_CURPAG:
+               *(uint8_t *)dst = nic_state->curpag;
+               break;
+           case EN1_MULT ... EN1_MULT + 7:
+               *(uint8_t *)dst = nic_state->mcast_addr[index - EN1_MULT];
+               break;
+           default:
+               PrintError("ne2k_read error: invalid port:0x%x\n", port);
+               return -1;
+       }
+
+    } else if (page == 2) {
+
+       switch (index) {
+           case EN2_STARTPG:
+               *(uint8_t *)dst = nic_state->pgstart;
+               break;
+           case EN2_STOPPG:
+               *(uint8_t *)dst = nic_state->pgstop;
+               break;
+           case EN2_RNPR:
+               *(uint8_t *)dst = nic_state->rnpp;
+               break;
+           case EN2_LNRP:
+               *(uint8_t *)dst = nic_state->lnpp;
+               break;
+           case EN2_TPSR:
+               *(uint8_t *)dst = nic_state->tpsr;
+               break;
+           case EN2_ACNT0:
+               *(uint8_t *)dst = nic_state->addcnt0;
+               break;
+           case EN2_ACNT1: 
+               *(uint8_t *)dst = nic_state->addcnt1;
+               break;
+           case EN2_RCR:
+               *(uint8_t *)dst = nic_state->rcr.val;
+               break;
+           case EN2_TCR:
+               *(uint8_t *)dst = nic_state->tcr.val;
+               break;
+           case EN2_DCR:
+               *(uint8_t *)dst = nic_state->dcr.val;
+               break;
+           case EN2_IMR:
+               *(uint8_t *)dst = nic_state->imr.val;
+               break;
+           default:
+               PrintError("ne2k_read error: invalid port:0x%x\n", port);
+               return -1;
+       }
+    } else {
+       PrintError("Invalid Register Page Value\n");
+       return -1;
+    }
+
+    
+    PrintDebug("ne2k_read: port:0x%x  val: 0x%x\n", port, *(uint8_t *)dst);
+
     return length;
 }
 
 
-static int vnic_start_device(struct vm_device * dev) {
-    PrintDebug("vnic: start device\n");  
+static int ne2k_start_device(struct vm_device * dev) {
+    PrintDebug("vnic: start device\n");
+  
     return 0;
 }
 
 
-static int vnic_stop_device(struct vm_device * dev) {
+static int ne2k_stop_device(struct vm_device * dev) {
     PrintDebug("vnic: stop device\n");
+  
     return 0;
 }
 
-static void  init_phy_network() {      
-    V3_REGISTER_PKT_DELIVERY(&netif_input);
-}
 
-static int vnic_init_device(struct vm_device * dev) {
-  int i;
 
-  PrintDebug("vnic: init_device\n");
 
-  init_phy_network();
-  init_vnic_context(dev);
+static int ne2k_init_device(struct vm_device * dev) {
+    struct ne2k_context * nic_state = (struct ne2k_context *)(dev->private_data);
+    
+    PrintDebug("Initializing NE2K\n");
+
+    init_ne2k_context(dev);
+
+    if (nic_state->pci_bus == NULL) {
+       PrintDebug("NE2k: Not attached to pci\n");
+
+       v3_dev_hook_io(dev, NIC_REG_BASE_PORT , &ne2k_cmd_read, &ne2k_cmd_write);
+
+       for (i = 1; i < 16; i++){       
+           v3_dev_hook_io(dev, NIC_REG_BASE_PORT + i, &ne2k_std_read, &ne2k_std_write);
+       }
+
+       v3_dev_hook_io(dev, NIC_DATA_PORT, &ne2k_data_read, &ne2k_data_write);
+       v3_dev_hook_io(dev, NIC_RESET_PORT, &ne2k_reset_read, &ne2k_reset_write);
+
+    } else {
 
-  current_vnic = dev;  
+       struct v3_pci_bar bars[6];
+       struct pci_device * pci_dev = NULL;
+       int i;
 
-  for (i = 0; i < 16; i++) {   
-      v3_dev_hook_io(dev, NIC_BASE_ADDR + i, &vnic_ioport_read, &vnic_ioport_write);
-  }
+       PrintDebug("NE2k: PCI Enabled\n");
+
+       for (i = 0; i < 6; i++) {
+           bars[i].type = PCI_BAR_NONE;
+       }
 
-  v3_dev_hook_io(dev, NIC_BASE_ADDR + NIC_DATA_PORT, &vnic_data_read, &vnic_data_write);
-  v3_dev_hook_io(dev, NIC_BASE_ADDR + NIC_RESET_PORT, &vnic_reset_port_read, &vnic_reset_port_write);
+       bars[0].type = PCI_BAR_IO;
+       bars[0].default_base_port = NIC_REG_BASE_PORT;
+       bars[0].num_ports = 256;
 
-  return 0;
+       bars[0].io_read = ne2k_pci_read;
+       bars[0].io_write = ne2k_pci_write;
+
+       pci_dev = v3_pci_register_device(nic_state->pci_bus, PCI_STD_DEVICE, 0, -1, 0, 
+                                        "NE2000", bars,
+                                        pci_config_update, NULL, NULL, dev);
+
+       if (pci_dev == NULL) {
+           PrintError("Failed to register NE2K with PCI\n");
+           return -1;
+       }
+
+       pci_dev->config_header.vendor_id = 0x10ec;
+       pci_dev->config_header.device_id = 0x8029;
+       pci_dev->config_header.revision = 0x00;
+
+       pci_dev->config_header.subclass = 0x00;
+       pci_dev->config_header.class = 0x02;
+       pci_dev->config_header.header_type = 0x00;
+
+       pci_dev->config_header.intr_line = 11;
+       pci_dev->config_header.intr_pin = 1;
+
+       nic_state->pci_dev = pci_dev;
+    }
+    
+
+#ifdef CONFIG_DEBUG_NE2K
+    dump_state(dev);
+#endif
+
+    return 0;
 }
 
 
 
-static int vnic_deinit_device(struct vm_device * dev) {
+static int ne2k_deinit_device(struct vm_device *dev) {
     int i;
   
     for (i = 0; i < 16; i++){          
-       v3_dev_unhook_io(dev, NIC_BASE_ADDR + i);
+       v3_dev_unhook_io(dev, NIC_REG_BASE_PORT + i);
     }
-
-    v3_dev_unhook_io(dev, NIC_BASE_ADDR + NIC_DATA_PORT);
-    v3_dev_unhook_io(dev, NIC_BASE_ADDR + NIC_RESET_PORT);
-
-    //vnic_reset_device(dev);
+    
+    v3_dev_unhook_io(dev, NIC_DATA_PORT);
+    v3_dev_unhook_io(dev, NIC_RESET_PORT);
   
     return 0;
 }
 
 
-static struct vm_device_ops dev_ops = { 
-    .init = vnic_init_device, 
-    .deinit = vnic_deinit_device,
-    .reset = vnic_reset_device,
-    .start = vnic_start_device,
-    .stop = vnic_stop_device,
+static struct v3_device_ops dev_ops = { 
+    .init = ne2k_init_device, 
+    .deinit = ne2k_deinit_device,
+    .reset = ne2k_reset_device,
+    .start = ne2k_start_device,
+    .stop = ne2k_stop_device,
 };
 
 
-struct vm_device * v3_create_vnic() {
-    struct nic_context * nic_state = V3_Malloc(sizeof(struct nic_context));
+struct vm_device * v3_create_ne2k(struct vm_device * pci) {
+    struct ne2k_context * nic_state = V3_Malloc(sizeof(struct ne2k_context));
 
-    //memset(nic_state, 0, sizeof(struct nic_context));
+    memset(nic_state, 0, sizeof(struct ne2k_context));
 
-    //PrintDebug("VNIC internal at %x\n",(int)nic_state);
-
-    struct vm_device *device = v3_create_device("VNIC", &dev_ops, nic_state);
+    nic_state->pci_bus = pci;
 
+    struct vm_device * device = v3_create_device("NE2K", &dev_ops, nic_state);
+    
     return device;
 }