提交 86d7e214 编写于 作者: G Gerd Hoffmann

usb-ccid: add missing wakeup calls

Properly notify the host adapter that we have
data pending, so it doesn't has to poll us.
Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
上级 cfda2cef
...@@ -283,6 +283,7 @@ typedef struct CCIDBus { ...@@ -283,6 +283,7 @@ typedef struct CCIDBus {
typedef struct USBCCIDState { typedef struct USBCCIDState {
USBDevice dev; USBDevice dev;
USBEndpoint *intr; USBEndpoint *intr;
USBEndpoint *bulk;
CCIDBus bus; CCIDBus bus;
CCIDCardState *card; CCIDCardState *card;
BulkIn bulk_in_pending[BULK_IN_PENDING_NUM]; /* circular */ BulkIn bulk_in_pending[BULK_IN_PENDING_NUM]; /* circular */
...@@ -769,6 +770,7 @@ static void ccid_write_slot_status(USBCCIDState *s, CCID_Header *recv) ...@@ -769,6 +770,7 @@ static void ccid_write_slot_status(USBCCIDState *s, CCID_Header *recv)
h->b.bError = s->bError; h->b.bError = s->bError;
h->bClockStatus = CLOCK_STATUS_RUNNING; h->bClockStatus = CLOCK_STATUS_RUNNING;
ccid_reset_error_status(s); ccid_reset_error_status(s);
usb_wakeup(s->bulk, 0);
} }
static void ccid_write_parameters(USBCCIDState *s, CCID_Header *recv) static void ccid_write_parameters(USBCCIDState *s, CCID_Header *recv)
...@@ -789,6 +791,7 @@ static void ccid_write_parameters(USBCCIDState *s, CCID_Header *recv) ...@@ -789,6 +791,7 @@ static void ccid_write_parameters(USBCCIDState *s, CCID_Header *recv)
h->bProtocolNum = s->bProtocolNum; h->bProtocolNum = s->bProtocolNum;
h->abProtocolDataStructure = s->abProtocolDataStructure; h->abProtocolDataStructure = s->abProtocolDataStructure;
ccid_reset_error_status(s); ccid_reset_error_status(s);
usb_wakeup(s->bulk, 0);
} }
static void ccid_write_data_block(USBCCIDState *s, uint8_t slot, uint8_t seq, static void ccid_write_data_block(USBCCIDState *s, uint8_t slot, uint8_t seq,
...@@ -810,6 +813,7 @@ static void ccid_write_data_block(USBCCIDState *s, uint8_t slot, uint8_t seq, ...@@ -810,6 +813,7 @@ static void ccid_write_data_block(USBCCIDState *s, uint8_t slot, uint8_t seq,
} }
memcpy(p->abData, data, len); memcpy(p->abData, data, len);
ccid_reset_error_status(s); ccid_reset_error_status(s);
usb_wakeup(s->bulk, 0);
} }
static void ccid_report_error_failed(USBCCIDState *s, uint8_t error) static void ccid_report_error_failed(USBCCIDState *s, uint8_t error)
...@@ -1319,6 +1323,7 @@ static void ccid_realize(USBDevice *dev, Error **errp) ...@@ -1319,6 +1323,7 @@ static void ccid_realize(USBDevice *dev, Error **errp)
NULL); NULL);
qbus_set_hotplug_handler(BUS(&s->bus), DEVICE(dev), &error_abort); qbus_set_hotplug_handler(BUS(&s->bus), DEVICE(dev), &error_abort);
s->intr = usb_ep_get(dev, USB_TOKEN_IN, CCID_INT_IN_EP); s->intr = usb_ep_get(dev, USB_TOKEN_IN, CCID_INT_IN_EP);
s->bulk = usb_ep_get(dev, USB_TOKEN_IN, CCID_BULK_IN_EP);
s->card = NULL; s->card = NULL;
s->migration_state = MIGRATION_NONE; s->migration_state = MIGRATION_NONE;
s->migration_target_ip = 0; s->migration_target_ip = 0;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册