Commit 5b1cdb4e authored by Juha Riihimäki's avatar Juha Riihimäki Committed by Gerd Hoffmann
Browse files

usb-musb: Add reset function 



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: default avatarJuha Riihimäki <juha.riihimaki@nokia.com>
[Riku Voipio: Fixes and restructuring patchset]
Signed-off-by: default avatarRiku Voipio <riku.voipio@iki.fi>
[Peter Maydell: More fixes and cleanups for upstream submission]
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 406c2075

hw/tusb6010.c

+1 −0
Original line number Diff line number Diff line
@@ -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)

hw/usb-musb.c

+18 −6
Original line number Diff line number Diff line
@@ -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,

hw/usb.h

+1 −0
Original line number Diff line number Diff line
@@ -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);