webadmin/pico-keys-sdk
1
0
Fork 0
mirror of https://github.com/polhenarejos/pico-keys-sdk synced 2026-05-10 17:28:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update code style.

Browse Source 
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
2023-03-04 14:10:46 +01:00
parent 3b268a33eb
commit 15569ab419
4 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/usb/ccid/ccid.c
View File

@@ -201,7 +201,9 @@ int driver_process_usb_packet_ccid(uint16_t rx_read) {
ccid_response->abRFU1 = 0;
ccid_write(0);
}
else if (ccid_header->bMessageType == CCID_SET_PARAMS || ccid_header->bMessageType == CCID_GET_PARAMS || ccid_header->bMessageType == CCID_RESET_PARAMS) {
else if (ccid_header->bMessageType == CCID_SET_PARAMS ||
ccid_header->bMessageType == CCID_GET_PARAMS ||
ccid_header->bMessageType == CCID_RESET_PARAMS) {
/* Values from gnuk. Not specified in ICCD spec. */
const uint8_t params[] = {
0x11, /* bmFindexDindex */
@@ -298,11 +300,13 @@ static uint16_t ccid_open(uint8_t rhport, tusb_desc_interface_t const *itf_desc,
memcpy(itf_vendor, itf_desc, sizeof(uint8_t) * max_len);
((tusb_desc_interface_t *) itf_vendor)->bInterfaceClass = TUSB_CLASS_VENDOR_SPECIFIC;
((tusb_desc_interface_t *) itf_vendor)->bNumEndpoints -= 1;
vendord_open(rhport, (tusb_desc_interface_t *) itf_vendor, max_len-sizeof(tusb_desc_endpoint_t));
vendord_open(rhport,
(tusb_desc_interface_t *) itf_vendor,
max_len - sizeof(tusb_desc_endpoint_t));
TU_ASSERT(usbd_edpt_open(rhport, &desc_ep3), 0);
free(itf_vendor);
uint8_t msg[] = {0x50, 0x03};
uint8_t msg[] = { 0x50, 0x03 };
usbd_edpt_xfer(rhport, desc_ep3.bEndpointAddress, msg, sizeof(msg));
uint16_t const drv_len = sizeof(tusb_desc_interface_t) + sizeof(struct ccid_class_descriptor) +

29
src/usb/emulation/emulation.c
View File

@@ -118,7 +118,7 @@ int emul_init(char *host, uint16_t port) {
server_sockaddr.sin_addr.s_addr = htonl(INADDR_ANY);
if (bind(hid_server_sock, (struct sockaddr *) &server_sockaddr,
sizeof server_sockaddr) != 0) {
sizeof server_sockaddr) != 0) {
perror("bind");
close(hid_server_sock);
return 1;
@@ -134,16 +134,19 @@ int emul_init(char *host, uint16_t port) {
uint8_t *driver_prepare_response_emul(uint8_t itf) {
apdu.rdata = usb_get_tx(itf);
if (itf == ITF_HID)
if (itf == ITF_HID) {
apdu.rdata += 7;
}
return apdu.rdata;
}
int get_sock_itf(uint8_t itf) {
if (itf == ITF_CCID)
if (itf == ITF_CCID) {
return ccid_sock;
else if (itf == ITF_HID)
}
else if (itf == ITF_HID) {
return hid_client_sock;
}
return -1;
}
@@ -152,8 +155,7 @@ const uint8_t *complete_report = NULL;
uint16_t complete_len = 0;
extern bool last_write_result;
extern uint16_t send_buffer_size;
int driver_write_emul(uint8_t itf, const uint8_t *buffer, size_t buffer_size)
{
int driver_write_emul(uint8_t itf, const uint8_t *buffer, size_t buffer_size) {
uint16_t size = htons(buffer_size);
int sock = get_sock_itf(itf);
// DEBUG_PAYLOAD(buffer,buffer_size);
@@ -232,10 +234,11 @@ int driver_process_usb_packet_emul(uint8_t itf, uint16_t len) {
}
else if (thread_type == 2) {
apdu.sw = cbor_parse(cmd, cbor_data, cbor_len);
if (apdu.sw == 0)
if (apdu.sw == 0) {
DEBUG_DATA(res_APDU + 1, res_APDU_size);
}
finished_data_size = res_APDU_size+1;
finished_data_size = res_APDU_size + 1;
}
driver_exec_finished_hid(finished_data_size);
}
@@ -260,14 +263,16 @@ uint16_t emul_read(uint8_t itf) {
timeout = (0 * 1000 + 1000 / 1000);
if (poll(&pfd, 1, timeout) == -1)
if (poll(&pfd, 1, timeout) == -1) {
return 0;
}
if(pfd.revents & POLLIN) {
if (hid_client_sock > 0)
if (pfd.revents & POLLIN) {
if (hid_client_sock > 0) {
close(hid_client_sock);
}
hid_client_sock = accept(hid_server_sock, (struct sockaddr *) &client_sockaddr,
&client_socklen);
&client_socklen);
printf("hid_client connected!\n");
}
}

2
src/usb/usb_descriptors.c
View File

@@ -193,7 +193,7 @@ static uint8_t desc_hid_kb[] = {
#include "apdu.h"
uint8_t const *tud_hid_descriptor_report_cb(uint8_t itf) {
printf("report_cb %d\n", itf);
DEBUG_DATA(desc_hid_report, sizeof(desc_hid_report));
DEBUG_DATA(desc_hid_report, sizeof(desc_hid_report));
if (itf == ITF_HID) {
return desc_hid_report;
}