Revision dcbd0b5c

b/hw/usb-ehci.c
604 604
    EHCIState *s = port->opaque;
605 605
    uint32_t *portsc = &s->portsc[port->index];
606 606

  
607
    DPRINTF("ehci_attach invoked for index %d, portsc 0x%x, desc %s\n",
608
           port->index, *portsc, port->dev->product_desc);
607
    trace_usb_ehci_port_attach(port->index, port->dev->product_desc);
609 608

  
610 609
    *portsc |= PORTSC_CONNECT;
611 610
    *portsc |= PORTSC_CSC;
......
625 624
    EHCIState *s = port->opaque;
626 625
    uint32_t *portsc = &s->portsc[port->index];
627 626

  
628
    DPRINTF("ehci_attach invoked for index %d, portsc 0x%x\n",
629
           port->index, *portsc);
627
    trace_usb_ehci_port_detach(port->index);
630 628

  
631 629
    *portsc &= ~PORTSC_CONNECT;
632 630
    *portsc |= PORTSC_CSC;
......
733 731
    *portsc &= ~rwc;
734 732

  
735 733
    if ((val & PORTSC_PRESET) && !(*portsc & PORTSC_PRESET)) {
736
        DPRINTF("port_status_write: USBTRAN Port %d reset begin\n", port);
734
        trace_usb_ehci_port_reset(port, 1);
737 735
    }
738 736

  
739 737
    if (!(val & PORTSC_PRESET) &&(*portsc & PORTSC_PRESET)) {
740
        DPRINTF("port_status_write: USBTRAN Port %d reset done\n", port);
738
        trace_usb_ehci_port_reset(port, 0);
741 739
        usb_attach(&s->ports[port], dev);
742 740

  
743 741
        // TODO how to handle reset of ports with no device
b/trace-events
203 203
disable usb_ehci_qh(uint32_t addr, uint32_t next, uint32_t c_qtd, uint32_t n_qtd, uint32_t a_qtd, int rl, int mplen, int eps, int ep, int devaddr, int c, int h, int dtc, int i) "QH @ %08x: next %08x qtds %08x,%08x,%08x - rl %d, mplen %d, eps %d, ep %d, dev %d, c %d, h %d, dtc %d, i %d"
204 204
disable usb_ehci_qtd(uint32_t addr, uint32_t next, uint32_t altnext, int tbytes, int cpage, int cerr, int pid, int ioc, int active, int halt, int babble, int xacterr) "QH @ %08x: next %08x altnext %08x - tbytes %d, cpage %d, cerr %d, pid %d, ioc %d, active %d, halt %d, babble %d, xacterr %d"
205 205
disable usb_ehci_itd(uint32_t addr, uint32_t next) "ITD @ %08x: next %08x"
206
disable usb_ehci_port_attach(uint32_t port, const char *device) "attach port #%d - %s"
207
disable usb_ehci_port_detach(uint32_t port) "detach port #%d"
208
disable usb_ehci_port_reset(uint32_t port, int enable) "reset port #%d - %d"
206 209

  
207 210
# hw/usb-desc.c
208 211
disable usb_desc_device(int addr, int len, int ret) "dev %d query device, len %d, ret %d"

Also available in: Unified diff