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

bug fixes, now it boots application

Browse Source
This commit is contained in:
Conor Patrick
2018-12-02 20:30:28 -05:00
parent ac7950f4c4
commit 9ff5dc6373
11 changed files with 104 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fido2/ctap.c
View File

@@ -1463,7 +1463,7 @@ uint8_t ctap_request(uint8_t * pkt_raw, int length, CTAP_RESPONSE * resp)
else
{
printf2(TAG_ERR, "unwanted GET_NEXT_ASSERTION. lastcmd == 0x%02x\n", getAssertionState.lastcmd);
dump_hex1(TAG_GREEN, &getAssertionState, sizeof(getAssertionState));
dump_hex1(TAG_GREEN, (uint8_t*)&getAssertionState, sizeof(getAssertionState));
status = CTAP2_ERR_NOT_ALLOWED;
}
break;

11
fido2/main.c
View File

@@ -61,11 +61,15 @@ int main(int argc, char * argv[])
device_init();
printf1(TAG_GEN,"init device\n");
printf1(TAG_GEN,"init ctaphid\n");
ctaphid_init();
usbhid_init();
printf1(TAG_GEN,"init usb\n");
ctaphid_init();
printf1(TAG_GEN,"init ctaphid\n");
printf1(TAG_GEN,"init ctap\n");
ctap_init();
printf1(TAG_GEN,"init ctap\n");
memset(hidmsg,0,sizeof(hidmsg));
@@ -76,7 +80,6 @@ int main(int argc, char * argv[])
{
if (millis() - t1 > 100)
{
/*printf1(TAG_GEN,"heartbeat %ld\n", beat++);*/
heartbeat();
t1 = millis();
}