diff options
| -rw-r--r-- | hw/usb-musb.c | 8 | ||||
| -rw-r--r-- | usb-linux.c | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/hw/usb-musb.c b/hw/usb-musb.c index b30caeb4e8..38986d3689 100644 --- a/hw/usb-musb.c +++ b/hw/usb-musb.c @@ -497,14 +497,14 @@ static void musb_detach(USBPort *port) musb_session_update(s, 1, s->session); } -static inline void musb_cb_tick0(void *opaque) +static void musb_cb_tick0(void *opaque) { MUSBEndPoint *ep = (MUSBEndPoint *) opaque; ep->delayed_cb[0](&ep->packey[0].p, opaque); } -static inline void musb_cb_tick1(void *opaque) +static void musb_cb_tick1(void *opaque) { MUSBEndPoint *ep = (MUSBEndPoint *) opaque; @@ -513,7 +513,7 @@ static inline void musb_cb_tick1(void *opaque) #define musb_cb_tick (dir ? musb_cb_tick1 : musb_cb_tick0) -static inline void musb_schedule_cb(USBDevice *dev, USBPacket *packey) +static void musb_schedule_cb(USBDevice *dev, USBPacket *packey) { MUSBPacket *p = container_of(packey, MUSBPacket, p); MUSBEndPoint *ep = p->ep; @@ -572,7 +572,7 @@ static int musb_timeout(int ttype, int speed, int val) hw_error("bad interval\n"); } -static inline void musb_packet(MUSBState *s, MUSBEndPoint *ep, +static void musb_packet(MUSBState *s, MUSBEndPoint *ep, int epnum, int pid, int len, USBCallback cb, int dir) { int ret; diff --git a/usb-linux.c b/usb-linux.c index 36a01ea0de..0ef1d2619b 100644 --- a/usb-linux.c +++ b/usb-linux.c @@ -659,6 +659,7 @@ static int usb_host_handle_iso_data(USBHostDevice *s, USBPacket *p, int in) switch(errno) { case ETIMEDOUT: len = USB_RET_NAK; + break; case EPIPE: default: len = USB_RET_STALL; |