webadmin/pico-keys-sdk
1
0
Fork 0
mirror of https://github.com/polhenarejos/pico-keys-sdk synced 2026-05-11 01:38:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Harmonizing coding style.

Browse Source 
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
2023-02-14 23:11:51 +01:00
parent 31e66007d3
commit 12bdcbd1f9
30 changed files with 1475 additions and 1036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
src/usb/usb.c
View File

@@ -1,4 +1,3 @@
/*
* This file is part of the Pico HSM SDK distribution (https://github.com/polhenarejos/pico-hsm-sdk).
* Copyright (c) 2022 Pol Henarejos.
@@ -34,76 +33,89 @@
#include <stdlib.h>
// Device specific functions
static uint8_t rx_buffer[ITF_TOTAL][4096] = {0}, tx_buffer[ITF_TOTAL][4096+64] = {0};
static uint16_t w_offset[ITF_TOTAL] = {0}, r_offset[ITF_TOTAL] = {0};
static uint16_t w_len[ITF_TOTAL] = {0}, tx_r_offset[ITF_TOTAL] = {0};
static uint32_t timeout_counter[ITF_TOTAL] = {0};
static uint8_t rx_buffer[ITF_TOTAL][4096] = { 0 }, tx_buffer[ITF_TOTAL][4096+64] = { 0 };
static uint16_t w_offset[ITF_TOTAL] = { 0 }, r_offset[ITF_TOTAL] = { 0 };
static uint16_t w_len[ITF_TOTAL] = { 0 }, tx_r_offset[ITF_TOTAL] = { 0 };
static uint32_t timeout_counter[ITF_TOTAL] = { 0 };
uint8_t card_locked_itf = ITF_TOTAL; // no locked
void usb_set_timeout_counter(uint8_t itf, uint32_t v) {
void usb_set_timeout_counter(uint8_t itf, uint32_t v)
{
timeout_counter[itf] = v;
}
uint32_t usb_write_offset(uint8_t itf, uint16_t len, uint16_t offset) {
uint32_t usb_write_offset(uint8_t itf, uint16_t len, uint16_t offset)
{
#ifndef ENABLE_EMULATION
uint8_t pkt_max = 64;
#endif
int w = 0;
if (len > sizeof(tx_buffer[itf]))
if (len > sizeof(tx_buffer[itf])) {
len = sizeof(tx_buffer[itf]);
}
w_len[itf] = len;
tx_r_offset[itf] = offset;
#ifdef USB_ITF_HID
if (itf == ITF_HID)
if (itf == ITF_HID) {
w = driver_write_hid(tx_buffer[itf]+offset, MIN(len, pkt_max));
}
#endif
#ifdef USB_ITF_CCID
if (itf == ITF_CCID)
if (itf == ITF_CCID) {
w = driver_write_ccid(tx_buffer[itf]+offset, MIN(len, pkt_max));
}
#endif
#ifdef ENABLE_EMULATION
if (itf == ITF_EMUL)
if (itf == ITF_EMUL) {
w = driver_write_emul(tx_buffer[itf]+offset, len);
}
#endif
w_len[itf] -= w;
tx_r_offset[itf] += w;
return w;
}
size_t usb_rx(uint8_t itf, const uint8_t *buffer, size_t len) {
size_t usb_rx(uint8_t itf, const uint8_t *buffer, size_t len)
{
uint16_t size = MIN(sizeof(rx_buffer[itf]) - w_offset[itf], len);
if (size > 0) {
if (buffer == NULL) {
#ifdef USB_ITF_HID
if (itf == ITF_HID)
if (itf == ITF_HID) {
size = driver_read_hid(rx_buffer[itf] + w_offset[itf], size);
}
#endif
#ifdef USB_ITF_CCID
if (itf == ITF_CCID)
if (itf == ITF_CCID) {
size = driver_read_ccid(rx_buffer[itf] + w_offset[itf], size);
}
#endif
}
else
} else {
memcpy(rx_buffer[itf] + w_offset[itf], buffer, size);
}
w_offset[itf] += size;
}
return size;
}
uint32_t usb_write_flush(uint8_t itf) {
uint32_t usb_write_flush(uint8_t itf)
{
int w = 0;
if (w_len[itf] > 0) {
#ifdef USB_ITF_HID
if (itf == ITF_HID)
if (itf == ITF_HID) {
w = driver_write_hid(tx_buffer[itf]+tx_r_offset[itf], MIN(w_len[itf], 64));
}
#endif
#ifdef USB_ITF_CCID
if (itf == ITF_CCID)
if (itf == ITF_CCID) {
w = driver_write_ccid(tx_buffer[itf]+tx_r_offset[itf], MIN(w_len[itf], 64));
}
#endif
#ifdef ENABLE_EMULATION
if (itf == ITF_EMUL)
if (itf == ITF_EMUL) {
w = driver_write_emul(tx_buffer[itf]+tx_r_offset[itf], w_len[itf]);
}
#endif
tx_r_offset[itf] += w;
w_len[itf] -= w;
@@ -111,27 +123,33 @@ uint32_t usb_write_flush(uint8_t itf) {
return w;
}
uint32_t usb_write(uint8_t itf, uint16_t len) {
uint32_t usb_write(uint8_t itf, uint16_t len)
{
return usb_write_offset(itf, len, 0);
}
uint16_t usb_read_available(uint8_t itf) {
uint16_t usb_read_available(uint8_t itf)
{
return w_offset[itf] - r_offset[itf];
}
uint16_t usb_write_available(uint8_t itf) {
uint16_t usb_write_available(uint8_t itf)
{
return w_len[itf] > 0;
}
uint8_t *usb_get_rx(uint8_t itf) {
uint8_t *usb_get_rx(uint8_t itf)
{
return rx_buffer[itf];
}
uint8_t *usb_get_tx(uint8_t itf) {
uint8_t *usb_get_tx(uint8_t itf)
{
return tx_buffer[itf];
}
void usb_clear_rx(uint8_t itf) {
void usb_clear_rx(uint8_t itf)
{
w_offset[itf] = r_offset[itf] = 0;
}
@@ -149,7 +167,8 @@ queue_t usb_to_card_q;
queue_t card_to_usb_q;
#endif
void usb_init() {
void usb_init()
{
#ifndef ENABLE_EMULATION
queue_init(&card_to_usb_q, sizeof(uint32_t), 64);
queue_init(&usb_to_card_q, sizeof(uint32_t), 64);
@@ -159,7 +178,8 @@ void usb_init() {
extern int driver_process_usb_nopacket();
extern uint32_t timeout;
static int usb_event_handle(uint8_t itf) {
static int usb_event_handle(uint8_t itf)
{
#ifndef ENABLE_EMULATION
uint16_t rx_read = usb_read_available(itf);
#else
@@ -167,16 +187,19 @@ static int usb_event_handle(uint8_t itf) {
#endif
int proc_packet = 0;
#ifdef USB_ITF_HID
if (itf == ITF_HID)
if (itf == ITF_HID) {
proc_packet = driver_process_usb_packet_hid(rx_read);
}
#endif
#ifdef USB_ITF_CCID
if (itf == ITF_CCID)
if (itf == ITF_CCID) {
proc_packet = driver_process_usb_packet_ccid(rx_read);
}
#endif
#ifdef ENABLE_EMULATION
if (itf == ITF_EMUL)
if (itf == ITF_EMUL) {
proc_packet = driver_process_usb_packet_emul(rx_read);
}
#endif
if (proc_packet > 0) {
card_locked_itf = itf;
@@ -185,22 +208,24 @@ static int usb_event_handle(uint8_t itf) {
queue_add_blocking(&usb_to_card_q, &flag);
#endif
timeout_start();
}
else {
} else {
#ifdef USB_ITF_HID
if (itf == ITF_HID)
if (itf == ITF_HID) {
driver_process_usb_nopacket_hid();
}
#endif
#ifdef USB_ITF_CCID
if (itf == ITF_CCID)
if (itf == ITF_CCID) {
driver_process_usb_nopacket_ccid();
}
#endif
}
return 0;
}
extern void low_flash_init();
void card_init_core1() {
void card_init_core1()
{
#ifndef ENABLE_EMULATION
low_flash_init_core1();
#endif
@@ -208,16 +233,19 @@ void card_init_core1() {
size_t finished_data_size = 0;
void card_start(void (*func)(void)) {
void card_start(void (*func)(void))
{
#ifndef ENABLE_EMULATION
uint32_t m = 0;
while (queue_is_empty(&usb_to_card_q) == false) {
if (queue_try_remove(&usb_to_card_q, &m) == false)
if (queue_try_remove(&usb_to_card_q, &m) == false) {
break;
}
}
while (queue_is_empty(&card_to_usb_q) == false) {
if (queue_try_remove(&card_to_usb_q, &m) == false)
if (queue_try_remove(&card_to_usb_q, &m) == false) {
break;
}
}
multicore_reset_core1();
multicore_launch_core1(func);
@@ -225,7 +253,8 @@ void card_start(void (*func)(void)) {
#endif
}
void card_exit() {
void card_exit()
{
#ifndef ENABLE_EMULATION
uint32_t flag = EV_EXIT;
queue_try_add(&usb_to_card_q, &flag);
@@ -234,7 +263,8 @@ void card_exit() {
card_locked_itf = ITF_TOTAL;
}
extern void hid_task();
void usb_task() {
void usb_task()
{
#ifndef ENABLE_EMULATION
bool mounted = false;
#else
@@ -242,12 +272,14 @@ void usb_task() {
#endif
for (uint8_t itf = 0; itf < ITF_TOTAL; itf++) {
#ifdef USB_ITF_HID
if (itf == ITF_HID)
if (itf == ITF_HID) {
mounted = driver_mounted_hid();
}
#endif
#ifdef USB_ITF_CCID
if (itf == ITF_CCID)
if (itf == ITF_CCID) {
mounted = driver_mounted_ccid();
}
#endif
if (mounted == true) {
@@ -265,31 +297,33 @@ void usb_task() {
if (m == EV_EXEC_FINISHED) {
timeout_stop();
#ifdef USB_ITF_HID
if (itf == ITF_HID)
if (itf == ITF_HID) {
driver_exec_finished_hid(finished_data_size);
}
#endif
#ifdef USB_ITF_CCID
if (itf == ITF_CCID)
if (itf == ITF_CCID) {
driver_exec_finished_ccid(finished_data_size);
}
#endif
led_set_blink(BLINK_MOUNTED);
card_locked_itf = ITF_TOTAL;
}
else if (m == EV_PRESS_BUTTON) {
} else if (m == EV_PRESS_BUTTON) {
uint32_t flag = wait_button() ? EV_BUTTON_TIMEOUT : EV_BUTTON_PRESSED;
queue_try_add(&usb_to_card_q, &flag);
}
}
else {
} else {
if (timeout > 0) {
if (timeout + timeout_counter[itf] < board_millis()) {
#ifdef USB_ITF_HID
if (itf == ITF_HID)
if (itf == ITF_HID) {
driver_exec_timeout_hid();
}
#endif
#ifdef USB_ITF_CCID
if (itf == ITF_CCID)
if (itf == ITF_CCID) {
driver_exec_timeout_ccid();
}
#endif
timeout = board_millis();
}
@@ -305,18 +339,22 @@ void usb_task() {
}
uint8_t *usb_prepare_response(uint8_t itf) {
uint8_t *usb_prepare_response(uint8_t itf)
{
#ifdef USB_ITF_HID
if (itf == ITF_HID)
if (itf == ITF_HID) {
return driver_prepare_response_hid();
}
#endif
#ifdef USB_ITF_CCID
if (itf == ITF_CCID)
if (itf == ITF_CCID) {
return driver_prepare_response_ccid();
}
#endif
#ifdef ENABLE_EMULATION
if (itf == ITF_EMUL)
if (itf == ITF_EMUL) {
return driver_prepare_response_emul();
}
#endif
return NULL;
}