提交 d0ff81b8 编写于 作者: H Hans de Goede 提交者: Gerd Hoffmann

usb: Rename __usb_packet_complete to usb_packet_complete_one

And make it available for use outside of core.c
Signed-off-by: NHans de Goede <hdegoede@redhat.com>
Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
上级 3151f209
...@@ -370,6 +370,7 @@ USBDevice *usb_find_device(USBPort *port, uint8_t addr); ...@@ -370,6 +370,7 @@ USBDevice *usb_find_device(USBPort *port, uint8_t addr);
int usb_handle_packet(USBDevice *dev, USBPacket *p); int usb_handle_packet(USBDevice *dev, USBPacket *p);
void usb_packet_complete(USBDevice *dev, USBPacket *p); void usb_packet_complete(USBDevice *dev, USBPacket *p);
void usb_packet_complete_one(USBDevice *dev, USBPacket *p);
void usb_cancel_packet(USBPacket * p); void usb_cancel_packet(USBPacket * p);
void usb_ep_init(USBDevice *dev); void usb_ep_init(USBDevice *dev);
......
...@@ -412,10 +412,11 @@ int usb_handle_packet(USBDevice *dev, USBPacket *p) ...@@ -412,10 +412,11 @@ int usb_handle_packet(USBDevice *dev, USBPacket *p)
return ret; return ret;
} }
static void __usb_packet_complete(USBDevice *dev, USBPacket *p) void usb_packet_complete_one(USBDevice *dev, USBPacket *p)
{ {
USBEndpoint *ep = p->ep; USBEndpoint *ep = p->ep;
assert(QTAILQ_FIRST(&ep->queue) == p);
assert(p->result != USB_RET_ASYNC && p->result != USB_RET_NAK); assert(p->result != USB_RET_ASYNC && p->result != USB_RET_NAK);
if (p->result < 0) { if (p->result < 0) {
...@@ -435,8 +436,7 @@ void usb_packet_complete(USBDevice *dev, USBPacket *p) ...@@ -435,8 +436,7 @@ void usb_packet_complete(USBDevice *dev, USBPacket *p)
int ret; int ret;
usb_packet_check_state(p, USB_PACKET_ASYNC); usb_packet_check_state(p, USB_PACKET_ASYNC);
assert(QTAILQ_FIRST(&ep->queue) == p); usb_packet_complete_one(dev, p);
__usb_packet_complete(dev, p);
while (!ep->halted && !QTAILQ_EMPTY(&ep->queue)) { while (!ep->halted && !QTAILQ_EMPTY(&ep->queue)) {
p = QTAILQ_FIRST(&ep->queue); p = QTAILQ_FIRST(&ep->queue);
...@@ -450,7 +450,7 @@ void usb_packet_complete(USBDevice *dev, USBPacket *p) ...@@ -450,7 +450,7 @@ void usb_packet_complete(USBDevice *dev, USBPacket *p)
break; break;
} }
p->result = ret; p->result = ret;
__usb_packet_complete(ep->dev, p); usb_packet_complete_one(ep->dev, p);
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册