Revision a8e662b5 hw/usb-bus.c
| b/hw/usb-bus.c | ||
|---|---|---|
| 50 | 50 |
return rc; |
| 51 | 51 |
} |
| 52 | 52 |
|
| 53 |
static int usb_qdev_exit(DeviceState *qdev) |
|
| 54 |
{
|
|
| 55 |
USBDevice *dev = DO_UPCAST(USBDevice, qdev, qdev); |
|
| 56 |
|
|
| 57 |
usb_device_detach(dev); |
|
| 58 |
if (dev->info->handle_destroy) {
|
|
| 59 |
dev->info->handle_destroy(dev); |
|
| 60 |
} |
|
| 61 |
return 0; |
|
| 62 |
} |
|
| 63 |
|
|
| 53 | 64 |
void usb_qdev_register(USBDeviceInfo *info) |
| 54 | 65 |
{
|
| 55 | 66 |
info->qdev.bus_info = &usb_bus_info; |
| 56 | 67 |
info->qdev.init = usb_qdev_init; |
| 68 |
info->qdev.exit = usb_qdev_exit; |
|
| 57 | 69 |
qdev_register(&info->qdev); |
| 58 | 70 |
} |
| 59 | 71 |
|
| ... | ... | |
| 101 | 113 |
bus->nfree++; |
| 102 | 114 |
} |
| 103 | 115 |
|
| 116 |
void usb_unregister_port(USBBus *bus, USBPort *port) |
|
| 117 |
{
|
|
| 118 |
if (port->dev) |
|
| 119 |
qdev_free(&port->dev->qdev); |
|
| 120 |
QTAILQ_REMOVE(&bus->free, port, next); |
|
| 121 |
bus->nfree--; |
|
| 122 |
} |
|
| 123 |
|
|
| 104 | 124 |
static void do_attach(USBDevice *dev) |
| 105 | 125 |
{
|
| 106 | 126 |
USBBus *bus = usb_bus_from_device(dev); |
| ... | ... | |
| 136 | 156 |
return 0; |
| 137 | 157 |
} |
| 138 | 158 |
|
| 159 |
int usb_device_detach(USBDevice *dev) |
|
| 160 |
{
|
|
| 161 |
USBBus *bus = usb_bus_from_device(dev); |
|
| 162 |
USBPort *port; |
|
| 163 |
|
|
| 164 |
if (!dev->attached) {
|
|
| 165 |
fprintf(stderr, "Warning: tried to detach unattached usb device %s\n", |
|
| 166 |
dev->devname); |
|
| 167 |
return -1; |
|
| 168 |
} |
|
| 169 |
dev->attached--; |
|
| 170 |
|
|
| 171 |
QTAILQ_FOREACH(port, &bus->used, next) {
|
|
| 172 |
if (port->dev == dev) |
|
| 173 |
break; |
|
| 174 |
} |
|
| 175 |
assert(port != NULL); |
|
| 176 |
|
|
| 177 |
QTAILQ_REMOVE(&bus->used, port, next); |
|
| 178 |
bus->nused--; |
|
| 179 |
|
|
| 180 |
usb_attach(port, NULL); |
|
| 181 |
|
|
| 182 |
QTAILQ_INSERT_TAIL(&bus->free, port, next); |
|
| 183 |
bus->nfree++; |
|
| 184 |
return 0; |
|
| 185 |
} |
|
| 186 |
|
|
| 139 | 187 |
int usb_device_delete_addr(int busnr, int addr) |
| 140 | 188 |
{
|
| 141 | 189 |
USBBus *bus; |
| ... | ... | |
| 152 | 200 |
} |
| 153 | 201 |
if (!port) |
| 154 | 202 |
return -1; |
| 155 |
|
|
| 156 | 203 |
dev = port->dev; |
| 157 |
QTAILQ_REMOVE(&bus->used, port, next); |
|
| 158 |
bus->nused--; |
|
| 159 |
|
|
| 160 |
usb_attach(port, NULL); |
|
| 161 |
dev->info->handle_destroy(dev); |
|
| 162 | 204 |
|
| 163 |
QTAILQ_INSERT_TAIL(&bus->free, port, next); |
|
| 164 |
bus->nfree++; |
|
| 205 |
qdev_free(&dev->qdev); |
|
| 165 | 206 |
return 0; |
| 166 | 207 |
} |
| 167 | 208 |
|
Also available in: Unified diff