ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dev-smartcard-reader: reuse usb.h definitions 

Signed-off-by: Alon Levy <alevy@redhat.com>
Reviewed-by: Marc-André Lureau <mlureau@redhat.com>
This commit is contained in:
Alon Levy 2013-03-05 15:31:26 +02:00
parent c5cd7c8756
commit 693e47738d
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hw/usb/dev-smartcard-reader.c
View File

@ -68,12 +68,6 @@ do { \
#define BULK_IN_BUF_SIZE 384 #define BULK_IN_BUF_SIZE 384
#define BULK_IN_PENDING_NUM 8 #define BULK_IN_PENDING_NUM 8
#define InterfaceOutClass \
((USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE)<<8)
#define InterfaceInClass \
((USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE)<<8)
#define CCID_MAX_PACKET_SIZE 64 #define CCID_MAX_PACKET_SIZE 64
#define CCID_CONTROL_ABORT 0x1 #define CCID_CONTROL_ABORT 0x1
@ -410,8 +404,8 @@ static const USBDescStrings desc_strings = {
static const USBDescIface desc_iface0 = { static const USBDescIface desc_iface0 = {
.bInterfaceNumber = 0, .bInterfaceNumber = 0,
.bNumEndpoints = 3, .bNumEndpoints = 3,
.bInterfaceClass = 0x0b, .bInterfaceClass = USB_CLASS_CSCID,
.bInterfaceSubClass = 0x00, .bInterfaceSubClass = USB_SUBCLASS_UNDEFINED,
.bInterfaceProtocol = 0x00, .bInterfaceProtocol = 0x00,
.iInterface = STR_INTERFACE, .iInterface = STR_INTERFACE,
.ndesc = 1, .ndesc = 1,
@ -687,15 +681,15 @@ static void ccid_handle_control(USBDevice *dev, USBPacket *p, int request,
switch (request) { switch (request) {
/* Class specific requests. */ /* Class specific requests. */
case InterfaceOutClass | CCID_CONTROL_ABORT: case ClassInterfaceOutRequest | CCID_CONTROL_ABORT:
DPRINTF(s, 1, "ccid_control abort UNIMPLEMENTED\n"); DPRINTF(s, 1, "ccid_control abort UNIMPLEMENTED\n");
p->status = USB_RET_STALL; p->status = USB_RET_STALL;
break; break;
case InterfaceInClass | CCID_CONTROL_GET_CLOCK_FREQUENCIES: case ClassInterfaceRequest | CCID_CONTROL_GET_CLOCK_FREQUENCIES:
DPRINTF(s, 1, "ccid_control get clock frequencies UNIMPLEMENTED\n"); DPRINTF(s, 1, "ccid_control get clock frequencies UNIMPLEMENTED\n");
p->status = USB_RET_STALL; p->status = USB_RET_STALL;
break; break;
case InterfaceInClass | CCID_CONTROL_GET_DATA_RATES: case ClassInterfaceRequest | CCID_CONTROL_GET_DATA_RATES:
DPRINTF(s, 1, "ccid_control get data rates UNIMPLEMENTED\n"); DPRINTF(s, 1, "ccid_control get data rates UNIMPLEMENTED\n");
p->status = USB_RET_STALL; p->status = USB_RET_STALL;
break; break;