shimun/solo
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

add ccid log tag

Browse Source
This commit is contained in:
Conor Patrick 2019-08-24 15:08:14 +08:00
parent bde4c09c21
commit ccd9a04146
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fido2/log.c
View File

@ -50,6 +50,7 @@ struct logtag tagtable[] = {
{TAG_EXT,"EXT"}, {TAG_EXT,"EXT"},
{TAG_NFC,"NFC"}, {TAG_NFC,"NFC"},
{TAG_NFC_APDU, "NAPDU"}, {TAG_NFC_APDU, "NAPDU"},
{TAG_CCID, "CCID"},
}; };

1
fido2/log.h
View File

@ -44,6 +44,7 @@ typedef enum
TAG_EXT = (1 << 18), TAG_EXT = (1 << 18),
TAG_NFC = (1 << 19), TAG_NFC = (1 << 19),
TAG_NFC_APDU = (1 << 20), TAG_NFC_APDU = (1 << 20),
TAG_CCID = (1 << 21),
TAG_NO_TAG = (1UL << 30), TAG_NO_TAG = (1UL << 30),
TAG_FILENO = (1UL << 31) TAG_FILENO = (1UL << 31)

1
fido2/main.c
View File

@ -46,6 +46,7 @@ int main(int argc, char *argv[])
TAG_GREEN| TAG_GREEN|
TAG_RED| TAG_RED|
TAG_EXT| TAG_EXT|
TAG_CCID|
TAG_ERR TAG_ERR
); );

8
targets/stm32l432/lib/usbd/usbd_ccid.c
View File

@ -226,8 +226,8 @@ uint8_t USBD_CCID_TransmitPacket(uint8_t * msg, int len)
USBD_LL_Transmit(&Solo_USBD_Device, CCID_IN_EP, msg, USBD_LL_Transmit(&Solo_USBD_Device, CCID_IN_EP, msg,
len); len);
printf1(TAG_GREEN,"ccid<< "); printf1(TAG_CCID,"<< ");
dump_hex1(TAG_GREEN, msg, len); dump_hex1(TAG_CCID, msg, len);
return USBD_OK; return USBD_OK;
} }
@ -295,8 +295,8 @@ uint8_t usb_ccid_recieve_callback(USBD_HandleTypeDef *pdev, uint8_t epnum)
/* Get the received data length */ /* Get the received data length */
hcdc->RxLength = USBD_LL_GetRxDataSize (pdev, epnum); hcdc->RxLength = USBD_LL_GetRxDataSize (pdev, epnum);
printf1(TAG_GREEN, "ccid>> "); printf1(TAG_CCID, ">> ");
dump_hex1(TAG_GREEN, ccidmsg_buf, hcdc->RxLength); dump_hex1(TAG_CCID, ccidmsg_buf, hcdc->RxLength);
handle_ccid(ccidmsg_buf, hcdc->RxLength); handle_ccid(ccidmsg_buf, hcdc->RxLength);