Fix build for non-pico boards.

Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>

src/usb/ccid/ccid.c

@@ -378,7 +378,11 @@ static uint16_t ccid_open(uint8_t rhport, tusb_desc_interface_t const *itf_desc,
     tusb_desc_endpoint_t const *desc_ep = (tusb_desc_endpoint_t const *)((uint8_t *)itf_desc + drv_len - sizeof(tusb_desc_endpoint_t));
     TU_ASSERT(usbd_edpt_open(rhport, desc_ep), 0);
     uint8_t msg[] = { 0x50, 0x03 };
+#if defined(PICO_PLATFORM) || defined(ESP_PLATFORM)
     usbd_edpt_xfer(rhport, desc_ep->bEndpointAddress, msg, sizeof(msg));
+#else
+    usbd_edpt_xfer(rhport, desc_ep->bEndpointAddress, msg, sizeof(msg), sizeof(msg));
+#endif
 #else
     vendord_open(rhport, (tusb_desc_interface_t *)itf_vendor, max_len);
 #endif

src/usb/emulation/emulation.c

@@ -15,6 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "pico_keys.h"
 #include "emulation.h"
 #include <stdio.h>
 #ifndef _MSC_VER
@@ -41,7 +42,6 @@ typedef int socklen_t;
 #include <errno.h>
 #include <time.h>
 
-#include "pico_keys.h"
 #include "apdu.h"
 #include "usb.h"
 #include "ccid/ccid.h"

src/usb/emulation/emulation.h

@@ -20,11 +20,8 @@
 
 #include <stdint.h>
 #include <string.h>
-#ifdef _MSC_VER
-#include <windows.h>
-#else
-#include <sys/time.h>
-#endif
+#include "queue.h"
+#include "board.h"
 #include <stdbool.h>
 
 #define USB_BUFFER_SIZE 2048
@@ -34,12 +31,6 @@ extern uint16_t emul_rx_size, emul_tx_size;
 extern uint16_t driver_write_emul(uint8_t itf, const uint8_t *buffer, uint16_t buffer_size);
 extern uint16_t emul_read(uint8_t itf);
 
-static inline uint32_t board_millis() {
-    struct timeval start;
-    gettimeofday(&start, NULL);
-    return start.tv_sec * 1000 + start.tv_usec / 1000;
-}
-
 #ifdef USB_ITF_HID
 typedef uint8_t hid_report_type_t;
 #endif
@@ -71,109 +62,4 @@ extern void tud_hid_report_complete_cb(uint8_t instance, uint8_t const *report,
 extern bool tud_hid_n_report(uint8_t itf, uint8_t report_id, const uint8_t *buffer, uint32_t n);
 #endif
 
-#include <pthread.h>
-#include <semaphore.h>
-typedef struct {
-    pthread_mutex_t mtx;
-    pthread_cond_t  cnd;
-    size_t        size_elem;
-    size_t num_elem;
-    size_t max_elem;
-    uint8_t buf[1024];
-    bool is_init;
-} queue_t;
-
-static inline void queue_free(queue_t *a) {
-    pthread_mutex_destroy(&a->mtx);
-    pthread_cond_destroy(&a->cnd);
-    a->is_init = false;
-}
-static inline void queue_init(queue_t *a, size_t size_elem, size_t max_elem) {
-    if (a->is_init) {
-        queue_free(a);
-    }
-    pthread_mutex_init(&a->mtx, NULL);
-    pthread_cond_init(&a->cnd, NULL);
-    a->size_elem = size_elem;
-    a->max_elem = max_elem;
-    a->num_elem = 0;
-    a->is_init = true;
-}
-static inline void queue_add_blocking(queue_t *a, const void *b) {
-    pthread_mutex_lock(&a->mtx);
-    while (a->num_elem == a->max_elem) {
-        pthread_cond_wait(&a->cnd, &a->mtx);
-    }
-    memcpy(a->buf + a->num_elem * a->size_elem, b, a->size_elem);
-    a->num_elem++;
-    pthread_cond_signal(&a->cnd);
-    pthread_mutex_unlock(&a->mtx);
-}
-static inline void queue_remove_blocking(queue_t *a, void *b) {
-    pthread_mutex_lock(&a->mtx);
-    while (a->num_elem == 0) {
-        pthread_cond_wait(&a->cnd, &a->mtx);
-    }
-    memcpy(b, a->buf, a->size_elem);
-    memmove(a->buf, a->buf + a->size_elem, a->size_elem * (a->num_elem - 1));
-    a->num_elem--;
-    pthread_cond_signal(&a->cnd);
-    pthread_mutex_unlock(&a->mtx);
-}
-static inline int queue_try_add(queue_t *a, const void *b) {
-    pthread_mutex_lock(&a->mtx);
-    if (a->num_elem == a->max_elem) {
-        pthread_mutex_unlock(&a->mtx);
-        return 0;
-    }
-    memcpy(a->buf + a->num_elem * a->size_elem, b, a->size_elem);
-    a->num_elem++;
-    pthread_cond_signal(&a->cnd);
-    pthread_mutex_unlock(&a->mtx);
-    return 1;
-}
-static inline int queue_try_remove(queue_t *a, void *b) {
-    pthread_mutex_lock(&a->mtx);
-    if (a->num_elem == 0) {
-        pthread_mutex_unlock(&a->mtx);
-        return 0;
-    }
-    memcpy(b, a->buf, a->size_elem);
-    memmove(a->buf, a->buf + a->size_elem, a->size_elem * (a->num_elem - 1));
-    a->num_elem--;
-    pthread_cond_signal(&a->cnd);
-    pthread_mutex_unlock(&a->mtx);
-    return 1;
-}
-static inline int queue_is_empty(queue_t *a) {
-    pthread_mutex_lock(&a->mtx);
-    bool ret = a->num_elem == 0;
-    pthread_mutex_unlock(&a->mtx);
-    return ret;
-}
-static inline int queue_is_full(queue_t *a) {
-    pthread_mutex_lock(&a->mtx);
-    bool ret = a->num_elem == a->max_elem;
-    pthread_mutex_unlock(&a->mtx);
-    return ret;
-}
-static inline void queue_clear(queue_t *a) {
-    pthread_mutex_lock(&a->mtx);
-    a->num_elem = 0;
-    pthread_mutex_unlock(&a->mtx);
-}
-extern pthread_t hcore0, hcore1;
-#define multicore_launch_core1(a) pthread_create(&hcore1, NULL, (void *(*) (void *))a, NULL)
-#define multicore_reset_core1()
-
-typedef pthread_mutex_t mutex_t;
-typedef sem_t semaphore_t;
-#define mutex_init(a) pthread_mutex_init(a, NULL)
-#define mutex_try_enter(a,b) (pthread_mutex_trylock(a) == 0)
-#define mutex_enter_blocking(a) pthread_mutex_lock(a)
-#define mutex_exit(a) pthread_mutex_unlock(a)
-#define sem_release(a) sem_post(a)
-#define sem_acquire_blocking(a) sem_wait(a)
-#define multicore_lockout_victim_init() (void)0
-
 #endif // _EMULATION_H_

src/usb/hid/hid.c

@@ -15,18 +15,18 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "pico_keys.h"
 #ifndef ENABLE_EMULATION
 #include "tusb.h"
-#ifndef ESP_PLATFORM
+#if defined(PICO_PLATFORM)
 #include "bsp/board.h"
-#else
+#elif defined(ESP_PLATFORM)
 static portMUX_TYPE mutex = portMUX_INITIALIZER_UNLOCKED;
 #endif
 #else
 #include "emulation.h"
 #endif
 #include "ctap_hid.h"
-#include "pico_keys.h"
 #include "pico_keys_version.h"
 #include "apdu.h"
 #include "usb.h"
@@ -418,7 +418,7 @@ int driver_process_usb_packet_hid(uint16_t read) {
             }
             last_packet_time = 0;
             memcpy(ctap_resp, ctap_req, sizeof(CTAPHID_FRAME));
-#ifndef ENABLE_EMULATION
+#if defined(PICO_PLATFORM) || defined(ESP_PLATFORM)
             sleep_ms(1000); //For blinking the device during 1 seg
 #endif
             driver_write_hid(ITF_HID_CTAP, (const uint8_t *)ctap_resp, 64);

src/usb/tusb_config.h

@@ -58,6 +58,9 @@ extern "C" {
 #define CFG_TUSB_OS           OPT_OS_PICO
 #elif CFG_TUSB_MCU == OPT_MCU_ESP32S2 || CFG_TUSB_MCU == OPT_MCU_ESP32S3
 #define CFG_TUSB_OS           OPT_OS_FREERTOS
+#elif CFG_TUSB_MCU == OPT_MCU_NONE
+#define CFG_TUSB_OS           OPT_OS_NONE
+#define TUP_DCD_ENDPOINT_MAX 16
 #endif
 #endif
 

src/usb/usb.c

@@ -16,14 +16,12 @@
  */
 
 #include <stdio.h>
-
-// Pico
-#if !defined(ENABLE_EMULATION) && !defined(ESP_PLATFORM)
+#include "pico_keys.h"
+#if defined(PICO_PLATFORM)
 #include "pico/stdlib.h"
 #include "pico/multicore.h"
 #include "bsp/board.h"
 #endif
-#include "pico_keys.h"
 #include "usb.h"
 #include "apdu.h"
 #ifndef ENABLE_EMULATION

src/usb/usb.h

@@ -22,8 +22,11 @@
 #include "emulation.h"
 #elif defined(ESP_PLATFORM)
 #include "esp_compat.h"
-#else
+#elif defined(PICO_PLATFORM)
 #include "pico/util/queue.h"
+#else
+#include "queue.h"
+#include "board.h"
 #endif
 
 #include "compat.h"

src/usb/usb_descriptors.c

@@ -15,9 +15,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "pico_keys.h"
 #include "tusb.h"
 #include "usb_descriptors.h"
-#if !defined(ENABLE_EMULATION) && !defined(ESP_PLATFORM)
+#if defined(PICO_PLATFORM)
 #include "pico/unique_id.h"
 #endif
 #ifdef ESP_PLATFORM
@@ -25,7 +26,6 @@
 #endif
 #include "pico_keys_version.h"
 #include "usb.h"
-#include "pico_keys.h"
 
 #ifndef USB_VID
 #define USB_VID   0xFEFF