From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:35409) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzQV4-0002B1-4t for qemu-devel@nongnu.org; Fri, 02 Sep 2011 05:57:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QzQV2-0002Gc-LY for qemu-devel@nongnu.org; Fri, 02 Sep 2011 05:57:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46372) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzQV2-0002GP-1t for qemu-devel@nongnu.org; Fri, 02 Sep 2011 05:57:24 -0400 From: Gerd Hoffmann Date: Fri, 2 Sep 2011 11:56:47 +0200 Message-Id: <1314957407-29508-19-git-send-email-kraxel@redhat.com> In-Reply-To: <1314957407-29508-1-git-send-email-kraxel@redhat.com> References: <1314957407-29508-1-git-send-email-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 18/18] usb-musb: Add reset function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Riku Voipio , =?UTF-8?q?Juha=20Riihim=C3=A4ki?= , Gerd Hoffmann From: Juha Riihim=C3=A4ki Add a separate reset function musb_reset() to the usb-musb interface, so that users who implement a reset function can also reset usb-musb. Use this in tusb6010. Signed-off-by: Juha Riihim=C3=A4ki [Riku Voipio: Fixes and restructuring patchset] Signed-off-by: Riku Voipio [Peter Maydell: More fixes and cleanups for upstream submission] Signed-off-by: Peter Maydell Signed-off-by: Gerd Hoffmann --- hw/tusb6010.c | 1 + hw/usb-musb.c | 24 ++++++++++++++++++------ hw/usb.h | 1 + 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/hw/tusb6010.c b/hw/tusb6010.c index 57fe804..ce7c81f 100644 --- a/hw/tusb6010.c +++ b/hw/tusb6010.c @@ -771,6 +771,7 @@ static void tusb6010_reset(DeviceState *dev) for (i =3D 0; i < 15; i++) { s->rx_config[i] =3D s->tx_config[i] =3D 0; } + musb_reset(s->musb); } =20 static int tusb6010_init(SysBusDevice *dev) diff --git a/hw/usb-musb.c b/hw/usb-musb.c index 640037f..01e2e7c 100644 --- a/hw/usb-musb.c +++ b/hw/usb-musb.c @@ -340,16 +340,12 @@ struct MUSBState { MUSBEndPoint ep[16]; }; =20 -struct MUSBState *musb_init(DeviceState *parent_device, int gpio_base) +void musb_reset(MUSBState *s) { - MUSBState *s =3D g_malloc0(sizeof(*s)); int i; =20 - for (i =3D 0; i < musb_irq_max; i++) { - s->irqs[i] =3D qdev_get_gpio_in(parent_device, gpio_base + i); - } - s->faddr =3D 0x00; + s->devctl =3D 0; s->power =3D MGC_M_POWER_HSENAB; s->tx_intr =3D 0x0000; s->rx_intr =3D 0x0000; @@ -359,6 +355,10 @@ struct MUSBState *musb_init(DeviceState *parent_devi= ce, int gpio_base) s->mask =3D 0x06; s->idx =3D 0; =20 + s->setup_len =3D 0; + s->session =3D 0; + memset(s->buf, 0, sizeof(s->buf)); + /* TODO: _DW */ s->ep[0].config =3D MGC_M_CONFIGDATA_SOFTCONE | MGC_M_CONFIGDATA_DYN= FIFO; for (i =3D 0; i < 16; i ++) { @@ -370,6 +370,18 @@ struct MUSBState *musb_init(DeviceState *parent_devi= ce, int gpio_base) usb_packet_init(&s->ep[i].packey[0].p); usb_packet_init(&s->ep[i].packey[1].p); } +} + +struct MUSBState *musb_init(DeviceState *parent_device, int gpio_base) +{ + MUSBState *s =3D g_malloc0(sizeof(*s)); + int i; + + for (i =3D 0; i < musb_irq_max; i++) { + s->irqs[i] =3D qdev_get_gpio_in(parent_device, gpio_base + i); + } + + musb_reset(s); =20 usb_bus_new(&s->bus, &musb_bus_ops, parent_device); usb_register_port(&s->bus, &s->port, s, 0, &musb_port_ops, diff --git a/hw/usb.h b/hw/usb.h index 55c061e..c08d469 100644 --- a/hw/usb.h +++ b/hw/usb.h @@ -344,6 +344,7 @@ enum musb_irq_source_e { =20 typedef struct MUSBState MUSBState; MUSBState *musb_init(DeviceState *parent_device, int gpio_base); +void musb_reset(MUSBState *s); uint32_t musb_core_intr_get(MUSBState *s); void musb_core_intr_clear(MUSBState *s, uint32_t mask); void musb_set_size(MUSBState *s, int epnum, int size, int is_tx); --=20 1.7.1