From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=41998 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ofd0Z-0007FT-3G for qemu-devel@nongnu.org; Sun, 01 Aug 2010 14:11:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ofd0X-00063E-QB for qemu-devel@nongnu.org; Sun, 01 Aug 2010 14:11:34 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:43934) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ofd0X-00062f-2k for qemu-devel@nongnu.org; Sun, 01 Aug 2010 14:11:33 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 1 Aug 2010 19:37:17 +0200 Message-Id: <1280684242-19611-15-git-send-email-hpoussin@reactos.org> In-Reply-To: <4C5579DA.8050508@reactos.org> References: <4C5579DA.8050508@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 15/20] [MIPS] qdev: convert dp83932 network card to rc4030 device List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Use it in Jazz emulation Remove dp83932_init() function, which is not used anymore Signed-off-by: Herv=C3=A9 Poussineau --- hw/dp8393x.c | 64 ++++++++++++++++++++++++++++++++++++--------------= ----- hw/mips.h | 5 ---- hw/mips_jazz.c | 6 +++- 3 files changed, 46 insertions(+), 29 deletions(-) diff --git a/hw/dp8393x.c b/hw/dp8393x.c index e65e4d1..f8fd9f5 100644 --- a/hw/dp8393x.c +++ b/hw/dp8393x.c @@ -21,6 +21,8 @@ #include "qemu-timer.h" #include "net.h" #include "mips.h" +#include "rc4030.h" +#include "qdev-addr.h" =20 //#define DEBUG_SONIC =20 @@ -147,7 +149,7 @@ do { printf("sonic ERROR: %s: " fmt, __func__ , ## __= VA_ARGS__); } while (0) =20 typedef struct dp8393xState { /* Hardware */ - int it_shift; + uint32_t it_shift; qemu_irq irq; #ifdef DEBUG_SONIC int irq_level; @@ -869,8 +871,6 @@ static void nic_cleanup(VLANClientState *nc) =20 qemu_del_timer(s->watchdog); qemu_free_timer(s->watchdog); - - qemu_free(s); } =20 static NetClientInfo net_dp83932_info =3D { @@ -881,33 +881,53 @@ static NetClientInfo net_dp83932_info =3D { .cleanup =3D nic_cleanup, }; =20 -void dp83932_init(NICInfo *nd, target_phys_addr_t base, int it_shift, - qemu_irq irq, void* mem_opaque, - void (*memory_rw)(void *opaque, target_phys_addr_t add= r, uint8_t *buf, int len, int is_write)) -{ - dp8393xState *s; - - qemu_check_nic_model(nd, "dp83932"); +typedef struct RC4030dp83932State { + RC4030Device dev; + target_phys_addr_t iobase; + uint32_t irq; + dp8393xState state; +} RC4030dp83932State; =20 - s =3D qemu_mallocz(sizeof(dp8393xState)); +static int dp83932_rc4030_init(RC4030Device *dev) +{ + RC4030dp83932State *rc4030 =3D DO_UPCAST(RC4030dp83932State, dev, de= v); + dp8393xState *s =3D &rc4030->state; =20 - s->mem_opaque =3D mem_opaque; - s->memory_rw =3D memory_rw; - s->it_shift =3D it_shift; - s->irq =3D irq; + s->mem_opaque =3D rc4030_get_opaque(); + s->memory_rw =3D rc4030_dma_memory_rw; + rc4030_init_irq(dev, &s->irq, rc4030->irq); s->watchdog =3D qemu_new_timer(vm_clock, dp8393x_watchdog, s); s->regs[SONIC_SR] =3D 0x0004; /* only revision recognized by Linux *= / =20 - memcpy(s->conf.macaddr.a, nd->macaddr, sizeof(s->conf.macaddr)); - s->conf.vlan =3D nd->vlan; - s->conf.peer =3D nd->netdev; - - s->nic =3D qemu_new_nic(&net_dp83932_info, &s->conf, nd->model, nd->= name, s); - + qemu_macaddr_default_if_unset(&s->conf.macaddr); + s->nic =3D qemu_new_nic(&net_dp83932_info, &s->conf, dev->qdev.info-= >name, dev->qdev.id, s); qemu_format_nic_info_str(&s->nic->nc, s->conf.macaddr.a); + qemu_register_reset(nic_reset, s); nic_reset(s); =20 s->mmio_index =3D cpu_register_io_memory(dp8393x_read, dp8393x_write= , s); - cpu_register_physical_memory(base, 0x40 << it_shift, s->mmio_index); + cpu_register_physical_memory(rc4030->iobase, 0x40 << s->it_shift, s-= >mmio_index); + + return 0; } + +static RC4030DeviceInfo dp83932_rc4030_info =3D { + .qdev.name =3D "rc4030-dp83932", + .qdev.size =3D sizeof(RC4030dp83932State), + .init =3D dp83932_rc4030_init, + .qdev.props =3D (Property[]) { + DEFINE_PROP_TADDR("iobase", RC4030dp83932State, iobase, = 0x80001000), + DEFINE_PROP_UINT32("itshift", RC4030dp83932State, state.it_shift= , 2), + DEFINE_PROP_UINT32("irq", RC4030dp83932State, irq, = 4), + DEFINE_NIC_PROPERTIES( RC4030dp83932State, state.conf), + DEFINE_PROP_END_OF_LIST(), + }, +}; + +static void dp8393x_register_devices(void) +{ + rc4030_qdev_register(&dp83932_rc4030_info); +} + +device_init(dp8393x_register_devices) diff --git a/hw/mips.h b/hw/mips.h index aa790d8..d8e4954 100644 --- a/hw/mips.h +++ b/hw/mips.h @@ -15,9 +15,4 @@ void ds1225y_set_protection(void *opaque, int protectio= n); /* mipsnet.c */ void mipsnet_init(int base, qemu_irq irq, NICInfo *nd); =20 -/* dp8393x.c */ -void dp83932_init(NICInfo *nd, target_phys_addr_t base, int it_shift, - qemu_irq irq, void* mem_opaque, - void (*memory_rw)(void *opaque, target_phys_addr_t add= r, uint8_t *buf, int len, int is_write)); - #endif diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index cf0001e..c0a27b2 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c @@ -192,8 +192,10 @@ void mips_jazz_init (ram_addr_t ram_size, if (!nd->model) nd->model =3D qemu_strdup("dp83932"); if (strcmp(nd->model, "dp83932") =3D=3D 0) { - dp83932_init(nd, 0x80001000, 2, rc4030[4], - rc4030_opaque, rc4030_dma_memory_rw); + qemu_check_nic_model(nd, nd->model); + dev =3D qdev_create(NULL, nd->model); + qdev_set_nic_properties(dev, nd); + qdev_init_nofail(dev); break; } else if (strcmp(nd->model, "?") =3D=3D 0) { fprintf(stderr, "qemu: Supported NICs: dp83932\n"); --=20 1.7.1.GIT