diff options
| -rw-r--r-- | hw/tusb6010.c | 1 | ||||
| -rw-r--r-- | hw/usb-musb.c | 24 | ||||
| -rw-r--r-- | hw/usb.h | 1 |
3 files changed, 20 insertions, 6 deletions
diff --git a/hw/tusb6010.c b/hw/tusb6010.c index 57fe8045b8..ce7c81f8f2 100644 --- a/hw/tusb6010.c +++ b/hw/tusb6010.c @@ -771,6 +771,7 @@ static void tusb6010_reset(DeviceState *dev) for (i = 0; i < 15; i++) { s->rx_config[i] = s->tx_config[i] = 0; } + musb_reset(s->musb); } static int tusb6010_init(SysBusDevice *dev) diff --git a/hw/usb-musb.c b/hw/usb-musb.c index 640037fab6..01e2e7c389 100644 --- a/hw/usb-musb.c +++ b/hw/usb-musb.c @@ -340,16 +340,12 @@ struct MUSBState { MUSBEndPoint ep[16]; }; -struct MUSBState *musb_init(DeviceState *parent_device, int gpio_base) +void musb_reset(MUSBState *s) { - MUSBState *s = g_malloc0(sizeof(*s)); int i; - for (i = 0; i < musb_irq_max; i++) { - s->irqs[i] = qdev_get_gpio_in(parent_device, gpio_base + i); - } - s->faddr = 0x00; + s->devctl = 0; s->power = MGC_M_POWER_HSENAB; s->tx_intr = 0x0000; s->rx_intr = 0x0000; @@ -359,6 +355,10 @@ struct MUSBState *musb_init(DeviceState *parent_device, int gpio_base) s->mask = 0x06; s->idx = 0; + s->setup_len = 0; + s->session = 0; + memset(s->buf, 0, sizeof(s->buf)); + /* TODO: _DW */ s->ep[0].config = MGC_M_CONFIGDATA_SOFTCONE | MGC_M_CONFIGDATA_DYNFIFO; for (i = 0; i < 16; i ++) { @@ -370,6 +370,18 @@ struct MUSBState *musb_init(DeviceState *parent_device, 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 = g_malloc0(sizeof(*s)); + int i; + + for (i = 0; i < musb_irq_max; i++) { + s->irqs[i] = qdev_get_gpio_in(parent_device, gpio_base + i); + } + + musb_reset(s); usb_bus_new(&s->bus, &musb_bus_ops, parent_device); usb_register_port(&s->bus, &s->port, s, 0, &musb_port_ops, @@ -344,6 +344,7 @@ enum musb_irq_source_e { 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); |