user: Restore debug usage message for '-d ?' in user mode emulation

[qemu.git] / hw / etraxfs_eth.c

diff --git a/hw/etraxfs_eth.c b/hw/etraxfs_eth.c
index 2446f0dcb9e89fdb5c24efa24f556b7cef9b6d2c..dff5f55f3316ebf5df65707723f25dca8008bcdb 100644 (file)
--- a/hw/etraxfs_eth.c
+++ b/hw/etraxfs_eth.c
@@ -319,8 +319,8 @@ static void mdio_cycle(struct qemu_mdio *bus)
 
 struct fs_eth
 {
-       CPUState *env;
-       VLANClientState *vc;
+       NICState *nic;
+       NICConf conf;
        int ethregs;
 
        /* Two addrs in the filter.  */
@@ -401,7 +401,7 @@ static void eth_update_ma(struct fs_eth *eth, int ma)
        eth->macaddr[ma][i++] = eth->regs[reg] >> 16;
        eth->macaddr[ma][i++] = eth->regs[reg] >> 24;
        eth->macaddr[ma][i++] = eth->regs[reg + 1];
-       eth->macaddr[ma][i++] = eth->regs[reg + 1] >> 8;
+       eth->macaddr[ma][i] = eth->regs[reg + 1] >> 8;
 
        D(printf("set mac%d=%x.%x.%x.%x.%x.%x\n", ma,
                 eth->macaddr[ma][0], eth->macaddr[ma][1],
@@ -437,6 +437,7 @@ eth_writel (void *opaque, target_phys_addr_t addr, uint32_t value)
                                eth_validate_duplex(eth);
                        }
                        eth->mdio_bus.mdc = !!(value & 4);
+                       eth->regs[addr] = value;
                        break;
 
                case RW_REC_CTRL:
@@ -463,7 +464,7 @@ static int eth_match_groupaddr(struct fs_eth *eth, const unsigned char *sa)
 
        /* First bit on the wire of a MAC address signals multicast or
           physical address.  */
-       if (!m_individual && !sa[0] & 1)
+       if (!m_individual && !(sa[0] & 1))
                return 0;
 
        /* Calculate the hash index for the GA registers. */
@@ -496,21 +497,21 @@ static int eth_match_groupaddr(struct fs_eth *eth, const unsigned char *sa)
        return match;
 }
 
-static int eth_can_receive(void *opaque)
+static int eth_can_receive(VLANClientState *nc)
 {
        return 1;
 }
 
-static void eth_receive(void *opaque, const uint8_t *buf, size_t size)
+static ssize_t eth_receive(VLANClientState *nc, const uint8_t *buf, size_t size)
 {
        unsigned char sa_bcast[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
-       struct fs_eth *eth = opaque;
+       struct fs_eth *eth = DO_UPCAST(NICState, nc, nc)->opaque;
        int use_ma0 = eth->regs[RW_REC_CTRL] & 1;
        int use_ma1 = eth->regs[RW_REC_CTRL] & 2;
        int r_bcast = eth->regs[RW_REC_CTRL] & 8;
 
        if (size < 12)
-               return;
+               return -1;
 
        D(printf("%x.%x.%x.%x.%x.%x ma=%d %d bc=%d\n",
                 buf[0], buf[1], buf[2], buf[3], buf[4], buf[5],
@@ -521,10 +522,12 @@ static void eth_receive(void *opaque, const uint8_t *buf, size_t size)
            && (!use_ma1 || memcmp(buf, eth->macaddr[1], 6))
            && (!r_bcast || memcmp(buf, sa_bcast, 6))
            && !eth_match_groupaddr(eth, buf))
-               return;
+               return size;
 
        /* FIXME: Find another way to pass on the fake csum.  */
        etraxfs_dmac_input(eth->dma_in, (void *)buf, size + 4, 1);
+
+        return size;
 }
 
 static int eth_tx_push(void *opaque, unsigned char *buf, int len)
@@ -532,30 +535,30 @@ static int eth_tx_push(void *opaque, unsigned char *buf, int len)
        struct fs_eth *eth = opaque;
 
        D(printf("%s buf=%p len=%d\n", __func__, buf, len));
-       qemu_send_packet(eth->vc, buf, len);
+       qemu_send_packet(&eth->nic->nc, buf, len);
        return len;
 }
 
-static void eth_set_link(VLANClientState *vc)
+static void eth_set_link(VLANClientState *nc)
 {
-       struct fs_eth *eth = vc->opaque;
-       D(printf("%s %d\n", __func__, vc->link_down));
-       eth->phy.link = !vc->link_down;
+       struct fs_eth *eth = DO_UPCAST(NICState, nc, nc)->opaque;
+       D(printf("%s %d\n", __func__, nc->link_down));
+       eth->phy.link = !nc->link_down;
 }
 
-static CPUReadMemoryFunc *eth_read[] = {
+static CPUReadMemoryFunc * const eth_read[] = {
        NULL, NULL,
        &eth_readl,
 };
 
-static CPUWriteMemoryFunc *eth_write[] = {
+static CPUWriteMemoryFunc * const eth_write[] = {
        NULL, NULL,
        &eth_writel,
 };
 
-static void eth_cleanup(VLANClientState *vc)
+static void eth_cleanup(VLANClientState *nc)
 {
-        struct fs_eth *eth = vc->opaque;
+       struct fs_eth *eth = DO_UPCAST(NICState, nc, nc)->opaque;
 
         cpu_unregister_io_memory(eth->ethregs);
 
@@ -563,8 +566,16 @@ static void eth_cleanup(VLANClientState *vc)
         qemu_free(eth);
 }
 
-void *etraxfs_eth_init(NICInfo *nd, CPUState *env, 
-                      target_phys_addr_t base, int phyaddr)
+static NetClientInfo net_etraxfs_info = {
+       .type = NET_CLIENT_TYPE_NIC,
+       .size = sizeof(NICState),
+       .can_receive = eth_can_receive,
+       .receive = eth_receive,
+       .cleanup = eth_cleanup,
+       .link_status_changed = eth_set_link,
+};
+
+void *etraxfs_eth_init(NICInfo *nd, target_phys_addr_t base, int phyaddr)
 {
        struct etraxfs_dma_client *dma = NULL;  
        struct fs_eth *eth = NULL;
@@ -572,7 +583,6 @@ void *etraxfs_eth_init(NICInfo *nd, CPUState *env,
        qemu_check_nic_model(nd, "fseth");
 
        dma = qemu_mallocz(sizeof *dma * 2);
-
        eth = qemu_mallocz(sizeof *eth);
 
        dma[0].client.push = eth_tx_push;
@@ -580,7 +590,6 @@ void *etraxfs_eth_init(NICInfo *nd, CPUState *env,
        dma[1].client.opaque = eth;
        dma[1].client.pull = NULL;
 
-       eth->env = env;
        eth->dma_out = dma;
        eth->dma_in = dma + 1;
 
@@ -589,14 +598,16 @@ void *etraxfs_eth_init(NICInfo *nd, CPUState *env,
        tdk_init(&eth->phy);
        mdio_attach(&eth->mdio_bus, &eth->phy, eth->phyaddr);
 
-       eth->ethregs = cpu_register_io_memory(0, eth_read, eth_write, eth);
+       eth->ethregs = cpu_register_io_memory(eth_read, eth_write, eth,
+                                              DEVICE_NATIVE_ENDIAN);
        cpu_register_physical_memory (base, 0x5c, eth->ethregs);
 
-       eth->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name,
-                                      eth_can_receive, eth_receive, NULL,
-                                      eth_cleanup, eth);
-       eth->vc->opaque = eth;
-       eth->vc->link_status_changed = eth_set_link;
+       eth->conf.macaddr = nd->macaddr;
+       eth->conf.vlan = nd->vlan;
+       eth->conf.peer = nd->netdev;
+
+       eth->nic = qemu_new_nic(&net_etraxfs_info, &eth->conf,
+                               nd->model, nd->name, eth);
 
        return dma;
 }