[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/28] usb: fold usb_generic_handle_packet into usb_
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 16/28] usb: fold usb_generic_handle_packet into usb_handle_packet |
Date: |
Fri, 10 Feb 2012 12:43:12 +0100 |
There is no reason to have a separate usb_generic_handle_packet function
any more, fold it into usb_handle_packet(). Also call the do_token_*
functions which handle control transfer emulation for control pipe
packets only.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb.c | 58 +++++++++++++++++++++++++---------------------------------
1 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/hw/usb.c b/hw/usb.c
index 638a339..91107f9 100644
--- a/hw/usb.c
+++ b/hw/usb.c
@@ -140,8 +140,7 @@ static int do_token_in(USBDevice *s, USBPacket *p)
int request, value, index;
int ret = 0;
- if (p->devep != 0)
- return usb_device_handle_data(s, p);
+ assert(p->devep == 0);
request = (s->setup_buf[0] << 8) | s->setup_buf[1];
value = (s->setup_buf[3] << 8) | s->setup_buf[2];
@@ -187,8 +186,7 @@ static int do_token_in(USBDevice *s, USBPacket *p)
static int do_token_out(USBDevice *s, USBPacket *p)
{
- if (p->devep != 0)
- return usb_device_handle_data(s, p);
+ assert(p->devep == 0);
switch(s->setup_state) {
case SETUP_STATE_ACK:
@@ -221,33 +219,6 @@ static int do_token_out(USBDevice *s, USBPacket *p)
}
}
-/*
- * Generic packet handler.
- * Called by the HC (host controller).
- *
- * Returns length of the transaction or one of the USB_RET_XXX codes.
- */
-static int usb_generic_handle_packet(USBDevice *s, USBPacket *p)
-{
- /* Rest of the PIDs must match our address */
- if (s->state < USB_STATE_DEFAULT || p->devaddr != s->addr)
- return USB_RET_NODEV;
-
- switch (p->pid) {
- case USB_TOKEN_SETUP:
- return do_token_setup(s, p);
-
- case USB_TOKEN_IN:
- return do_token_in(s, p);
-
- case USB_TOKEN_OUT:
- return do_token_out(s, p);
-
- default:
- return USB_RET_STALL;
- }
-}
-
/* ctrl complete function for devices which use usb_generic_handle_packet and
may return USB_RET_ASYNC from their handle_control callback. Device code
which does this *must* call this function instead of the normal
@@ -319,9 +290,30 @@ int usb_handle_packet(USBDevice *dev, USBPacket *p)
return USB_RET_NODEV;
}
assert(dev->addr == p->devaddr);
-
+ assert(dev->state == USB_STATE_DEFAULT);
assert(p->owner == NULL);
- ret = usb_generic_handle_packet(dev, p);
+
+ if (p->devep == 0) {
+ /* control pipe */
+ switch (p->pid) {
+ case USB_TOKEN_SETUP:
+ ret = do_token_setup(dev, p);
+ break;
+ case USB_TOKEN_IN:
+ ret = do_token_in(dev, p);
+ break;
+ case USB_TOKEN_OUT:
+ ret = do_token_out(dev, p);
+ break;
+ default:
+ ret = USB_RET_STALL;
+ break;
+ }
+ } else {
+ /* data pipe */
+ ret = usb_device_handle_data(dev, p);
+ }
+
if (ret == USB_RET_ASYNC) {
p->owner = usb_ep_get(dev, p->pid, p->devep);
}
--
1.7.1
- [Qemu-devel] [PATCH 22/28] usb: add USBBusOps->wakeup_endpoint, (continued)
- [Qemu-devel] [PATCH 22/28] usb: add USBBusOps->wakeup_endpoint, Gerd Hoffmann, 2012/02/10
- [Qemu-devel] [PATCH 10/28] usb-uhci: switch to usb_find_device(), Gerd Hoffmann, 2012/02/10
- [Qemu-devel] [PATCH 03/28] usb-redir: Add the posibility to filter out certain devices from redirecion, Gerd Hoffmann, 2012/02/10
- [Qemu-devel] [PATCH 18/28] usb: add USBEndpoint->{nr,pid}, Gerd Hoffmann, 2012/02/10
- [Qemu-devel] [PATCH 06/28] usb: kill usb_send_msg, Gerd Hoffmann, 2012/02/10
- [Qemu-devel] [PATCH 14/28] usb-xhci: switch to usb_find_device(), Gerd Hoffmann, 2012/02/10
- [Qemu-devel] [PATCH 23/28] xhci: signal low- and fullspeed support, Gerd Hoffmann, 2012/02/10
- [Qemu-devel] [PATCH 15/28] usb: kill handle_packet callback, Gerd Hoffmann, 2012/02/10
- [Qemu-devel] [PATCH 12/28] usb-ohci: switch to usb_find_device(), Gerd Hoffmann, 2012/02/10
- [Qemu-devel] [PATCH 05/28] usb: kill USB_MSG_RESET, Gerd Hoffmann, 2012/02/10
- [Qemu-devel] [PATCH 16/28] usb: fold usb_generic_handle_packet into usb_handle_packet,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 26/28] xhci: kill port arg from xhci_setup_packet, Gerd Hoffmann, 2012/02/10
- [Qemu-devel] [PATCH 09/28] usb: handle dev == NULL in usb_handle_packet(), Gerd Hoffmann, 2012/02/10
- [Qemu-devel] [PATCH 11/28] usb-ehci: switch to usb_find_device(), Gerd Hoffmann, 2012/02/10
- [Qemu-devel] [PATCH 20/28] usb: maintain async packet list per endpoint, Gerd Hoffmann, 2012/02/10
- [Qemu-devel] [PATCH 13/28] usb-musb: switch to usb_find_device(), Gerd Hoffmann, 2012/02/10
- [Qemu-devel] [PATCH 27/28] xhci: remote wakeup support, Gerd Hoffmann, 2012/02/10
- [Qemu-devel] [PATCH 21/28] usb: pass USBEndpoint to usb_wakeup, Gerd Hoffmann, 2012/02/10
- [Qemu-devel] [PATCH 17/28] usb: USBPacket: add status, rename owner -> ep, Gerd Hoffmann, 2012/02/10
- [Qemu-devel] [PATCH 25/28] xhci: stop on errors, Gerd Hoffmann, 2012/02/10
- [Qemu-devel] [PATCH 19/28] usb: Set USBEndpoint in usb_packet_setup()., Gerd Hoffmann, 2012/02/10