From 24464a66a864f35371316da2470eeb00965f46eb Mon Sep 17 00:00:00 2001 From: Silvano Seva Date: Sat, 26 Feb 2022 12:29:28 +0100 Subject: [PATCH] Integration of tinyusb driver into OpenRTX, old driver still kept active --- meson.build | 5 +- platform/drivers/USB/usb.h | 45 +++++ platform/drivers/USB/usb_MDx.cpp | 66 +++++++ platform/drivers/USB/usb_descriptors.c | 168 ++++++++++++++++++ .../tinyusb/openrtx/tusb_config.h | 93 ++++++++++ 5 files changed, 376 insertions(+), 1 deletion(-) create mode 100644 platform/drivers/USB/usb.h create mode 100644 platform/drivers/USB/usb_MDx.cpp create mode 100644 platform/drivers/USB/usb_descriptors.c create mode 100755 subprojects/packagefiles/tinyusb/openrtx/tusb_config.h diff --git a/meson.build b/meson.build index 483ee0c4..1a8bb698 100644 --- a/meson.build +++ b/meson.build @@ -49,6 +49,7 @@ openrtx_inc = ['openrtx/include', 'platform/drivers/ADC', 'platform/drivers/NVM', 'platform/drivers/GPS', + 'platform/drivers/USB', 'platform/drivers/tones', 'platform/drivers/baseband', 'platform/drivers/backlight', @@ -127,7 +128,9 @@ mdx_src = ['platform/drivers/ADC/ADC1_MDx.c', 'platform/drivers/audio/inputStream_MDx.cpp', 'platform/drivers/baseband/HR_Cx000.cpp', 'platform/drivers/backlight/backlight_MDx.c', - 'platform/drivers/tones/toneGenerator_MDx.cpp'] + 'platform/drivers/tones/toneGenerator_MDx.cpp', + 'platform/drivers/USB/usb_MDx.cpp', + 'platform/drivers/USB/usb_descriptors.c'] ## ## GDx family: Radioddity GD-77 and Baofeng DM-1801 diff --git a/platform/drivers/USB/usb.h b/platform/drivers/USB/usb.h new file mode 100644 index 00000000..fb3670fe --- /dev/null +++ b/platform/drivers/USB/usb.h @@ -0,0 +1,45 @@ +/*************************************************************************** + * Copyright (C) 2022 by Federico Amedeo Izzo IU2NUO, * + * Niccolò Izzo IU2KIN * + * Silvano Seva IU2KWO * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, see * + ***************************************************************************/ + +#ifndef USB_H +#define USB_H + +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * Initialise the USB driver. + */ +void usb_init(); + +/** + * Shut down the USB driver. + */ +void usb_terminate(); + +#ifdef __cplusplus +} +#endif + +#endif /* USB_H */ diff --git a/platform/drivers/USB/usb_MDx.cpp b/platform/drivers/USB/usb_MDx.cpp new file mode 100644 index 00000000..2f47adf3 --- /dev/null +++ b/platform/drivers/USB/usb_MDx.cpp @@ -0,0 +1,66 @@ +/*************************************************************************** + * Copyright (C) 2022 by Federico Amedeo Izzo IU2NUO, * + * Niccolò Izzo IU2KIN * + * Frederik Saraci IU2NRO * + * Silvano Seva IU2KWO * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 3 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, see * + ***************************************************************************/ + +#include +#include +#include +#include "usb.h" + +/* + * USB interrupt handler. + * + +void OTG_FS_IRQHandler(void) +{ + tud_int_handler(0); +} +*/ + +void usb_init() +{ + gpio_setMode(GPIOA, 11, ALTERNATE); + gpio_setAlternateFunction(GPIOA, 11, 10); + gpio_setOutputSpeed(GPIOA, 11, HIGH); // 100MHz output speed + + gpio_setMode(GPIOA, 12, ALTERNATE); + gpio_setAlternateFunction(GPIOA, 12, 10); + gpio_setOutputSpeed(GPIOA, 12, HIGH); // 100MHz output speed + + RCC->APB2ENR |= RCC_APB2ENR_SYSCFGEN; + RCC->AHB2ENR |= RCC_AHB2ENR_OTGFSEN; + __DSB(); + + // Disable VBUS detection and activate the USB transceiver + USB_OTG_FS->GCCFG |= USB_OTG_GCCFG_NOVBUSSENS + | USB_OTG_GCCFG_PWRDWN; + + // Force USB device mode + USB_OTG_FS->GUSBCFG |= USB_OTG_GUSBCFG_FDMOD; + + NVIC_SetPriority(OTG_FS_IRQn, 14); + + tusb_init(); +} + +void usb_terminate() +{ + RCC->AHB2ENR &= ~RCC_AHB2ENR_OTGFSEN; + __DSB(); +} diff --git a/platform/drivers/USB/usb_descriptors.c b/platform/drivers/USB/usb_descriptors.c new file mode 100644 index 00000000..a29fdab2 --- /dev/null +++ b/platform/drivers/USB/usb_descriptors.c @@ -0,0 +1,168 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2019 Ha Thach (tinyusb.org) + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + */ + +#include +#include "tusb.h" + +/* A combination of interfaces must have a unique product id, since PC will save device driver after the first plug. + * Same VID/PID with different interface e.g MSC (first), then CDC (later) will possibly cause system error on PC. + * + * Auto ProductID layout's Bitmap: + * [MSB] MIDI | HID | MSC | CDC [LSB] + */ +#define _PID_MAP(itf, n) ( (CFG_TUD_##itf) << (n) ) +#define USB_PID (0x4000 | _PID_MAP(CDC, 0) | _PID_MAP(MSC, 1) | _PID_MAP(HID, 2) | \ + _PID_MAP(MIDI, 3) | _PID_MAP(VENDOR, 4) ) + +#define USB_VID 0x0483 // ST Microelectronics + +//--------------------------------------------------------------------+ +// Device Descriptors +//--------------------------------------------------------------------+ +tusb_desc_device_t const desc_device = +{ + .bLength = sizeof(tusb_desc_device_t), + .bDescriptorType = TUSB_DESC_DEVICE, + .bcdUSB = 0x0200, + + .bDeviceClass = TUSB_CLASS_CDC, + .bDeviceSubClass = 0, + .bDeviceProtocol = 0, + .bMaxPacketSize0 = CFG_TUD_ENDPOINT0_SIZE, + + .idVendor = USB_VID, + .idProduct = USB_PID, + .bcdDevice = 0x0100, + + .iManufacturer = 0x01, + .iProduct = 0x02, + .iSerialNumber = 0x03, + + .bNumConfigurations = 0x01 +}; + +// Invoked when received GET DEVICE DESCRIPTOR +// Application return pointer to descriptor +uint8_t const * tud_descriptor_device_cb(void) +{ + return (uint8_t const *) &desc_device; +} + +//--------------------------------------------------------------------+ +// Configuration Descriptor +//--------------------------------------------------------------------+ +enum +{ + ITF_NUM_CDC_0 = 0, + ITF_NUM_CDC_0_DATA, + ITF_NUM_TOTAL +}; + +#define CONFIG_TOTAL_LEN (TUD_CONFIG_DESC_LEN + CFG_TUD_CDC * TUD_CDC_DESC_LEN) + +#define EPNUM_CDC_0_NOTIF 0x81 +#define EPNUM_CDC_0_OUT 0x02 +#define EPNUM_CDC_0_IN 0x82 + +#define EPNUM_CDC_1_NOTIF 0x83 +#define EPNUM_CDC_1_OUT 0x04 +#define EPNUM_CDC_1_IN 0x84 + +uint8_t const desc_fs_configuration[] = +{ + // Config number, interface count, string index, total length, attribute, + // power in mA + TUD_CONFIG_DESCRIPTOR(1, ITF_NUM_TOTAL, 0, CONFIG_TOTAL_LEN, 0x00, 100), + + // 1st CDC: Interface number, string index, EP notification address and + // size, EP data address (out, in) and size. + TUD_CDC_DESCRIPTOR(ITF_NUM_CDC_0, 4, EPNUM_CDC_0_NOTIF, 8, + EPNUM_CDC_0_OUT, EPNUM_CDC_0_IN, 64), +}; + +// Invoked when received GET CONFIGURATION DESCRIPTOR +// Application return pointer to descriptor +// Descriptor contents must exist long enough for transfer to complete +uint8_t const * tud_descriptor_configuration_cb(uint8_t index) +{ + (void) index; + return desc_fs_configuration; +} + +//--------------------------------------------------------------------+ +// String Descriptors +//--------------------------------------------------------------------+ + +// array of pointer to string descriptors +static const char* string_desc_arr [] = +{ + (const char[]) { 0x09, 0x04 }, // 0: is supported language is English (0x0409) + "OpenRTX", // 1: Manufacturer + "", // 2: Product + "", // 3: Serials, should use chip ID + "OpenRTX CDC", // 4: CDC Interface +}; + +static uint16_t _desc_str[32]; + +// Invoked when received GET STRING DESCRIPTOR request +// Application return pointer to descriptor, whose contents must exist long +// enough for transfer to complete +uint16_t const* tud_descriptor_string_cb(uint8_t index, uint16_t langid) +{ + (void) langid; + + uint8_t chr_count; + + if(index == 0) + { + memcpy(&_desc_str[1], string_desc_arr[0], 2); + chr_count = 1; + } + else + { + // Note: the 0xEE index string is a Microsoft OS 1.0 Descriptors. + // https://docs.microsoft.com/en-us/windows-hardware/drivers/usbcon/microsoft-defined-usb-descriptors + + if(!(index < sizeof(string_desc_arr)/sizeof(string_desc_arr[0]))) return NULL; + + const char* str = string_desc_arr[index]; + + // Cap at max char + chr_count = strlen(str); + if(chr_count > 31) chr_count = 31; + + // Convert ASCII string into UTF-16 + for(uint8_t i=0; i