Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-09 10:25:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

usb: kill USB_MSG_{ATTACH,DETACH}

Browse Source 
The USB subsystem pipes internal attach/detach notifications through
usb_handle_packet() with a special magic PID.  This indirection is a
pretty pointless excercise as it ends up being handled by
usb_generic_handle_packet anyway.  Remove it.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2012-01-06 15:13:34 +01:00
parent 6af165892c
commit d1f8b53618
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/usb.c
View File

@ -35,7 +35,8 @@ void usb_attach(USBPort *port)
assert(dev->attached); assert(dev->attached);
assert(dev->state == USB_STATE_NOTATTACHED); assert(dev->state == USB_STATE_NOTATTACHED);
port->ops->attach(port); port->ops->attach(port);
usb_send_msg(dev, USB_MSG_ATTACH); dev->state = USB_STATE_ATTACHED;
usb_device_handle_attach(dev);
} }
void usb_detach(USBPort *port) void usb_detach(USBPort *port)
@ -45,7 +46,7 @@ void usb_detach(USBPort *port)
assert(dev != NULL); assert(dev != NULL);
assert(dev->state != USB_STATE_NOTATTACHED); assert(dev->state != USB_STATE_NOTATTACHED);
port->ops->detach(port); port->ops->detach(port);
usb_send_msg(dev, USB_MSG_DETACH); dev->state = USB_STATE_NOTATTACHED;
} }
void usb_reset(USBPort *port) void usb_reset(USBPort *port)
@ -218,15 +219,6 @@ static int do_token_out(USBDevice *s, USBPacket *p)
int usb_generic_handle_packet(USBDevice *s, USBPacket *p) int usb_generic_handle_packet(USBDevice *s, USBPacket *p)
{ {
switch(p->pid) { switch(p->pid) {
case USB_MSG_ATTACH:
s->state = USB_STATE_ATTACHED;
usb_device_handle_attach(s);
return 0;
case USB_MSG_DETACH:
s->state = USB_STATE_NOTATTACHED;
return 0;
case USB_MSG_RESET: case USB_MSG_RESET:
s->remote_wakeup = 0; s->remote_wakeup = 0;
s->addr = 0; s->addr = 0;

2
hw/usb.h
View File

@ -40,8 +40,6 @@
#define USB_TOKEN_OUT 0xe1 /* host -> device */ #define USB_TOKEN_OUT 0xe1 /* host -> device */
/* specific usb messages, also sent in the 'pid' parameter */ /* specific usb messages, also sent in the 'pid' parameter */
#define USB_MSG_ATTACH 0x100
#define USB_MSG_DETACH 0x101
#define USB_MSG_RESET 0x102 #define USB_MSG_RESET 0x102
#define USB_RET_NODEV (-1) #define USB_RET_NODEV (-1)