deon/gnuk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ICC->CCID

Browse Source
This commit is contained in:
NIIBE Yutaka
2016-05-31 19:51:07 +09:00
parent 38d164360c
commit eb90074e11
6 changed files with 291 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/usb_ctrl.c
View File

@@ -132,7 +132,7 @@ static uint16_t hid_report;
static void
gnuk_setup_endpoints_for_interface (uint16_t interface, int stop)
{
if (interface == ICC_INTERFACE)
if (interface == CCID_INTERFACE)
{
if (!stop)
{
@@ -276,7 +276,7 @@ usb_cb_setup (uint8_t req, uint8_t req_no, struct req_args *arg)
if (req_no == USB_FSIJ_GNUK_DOWNLOAD)
{
if (*icc_state_p != ICC_STATE_EXITED)
if (*ccid_state_p != CCID_STATE_EXITED)
return USB_UNSUPPORT;
if (addr < &_regnual_start || addr + arg->len > __heap_end__)
@@ -291,7 +291,7 @@ usb_cb_setup (uint8_t req, uint8_t req_no, struct req_args *arg)
}
else if (req_no == USB_FSIJ_GNUK_EXEC && arg->len == 0)
{
if (*icc_state_p != ICC_STATE_EXITED)
if (*ccid_state_p != CCID_STATE_EXITED)
return USB_UNSUPPORT;
if (((uint32_t)addr & 0x03))
@@ -311,7 +311,7 @@ usb_cb_setup (uint8_t req, uint8_t req_no, struct req_args *arg)
}
else if (type_rcp == (CLASS_REQUEST | INTERFACE_RECIPIENT))
{
if (arg->index == ICC_INTERFACE)
if (arg->index == CCID_INTERFACE)
{
if (USB_SETUP_GET (req))
{
@@ -396,7 +396,7 @@ usb_cb_ctrl_write_finish (uint8_t req, uint8_t req_no, struct req_args *arg)
{
if (USB_SETUP_SET (req) && req_no == USB_FSIJ_GNUK_EXEC)
{
if (*icc_state_p != ICC_STATE_EXITED)
if (*ccid_state_p != CCID_STATE_EXITED)
return;
bDeviceState = UNCONNECTED;