Compile Compatibility with MDK-ARM Keil (STM32F10x without HAL)

[xxx-88]

While integrating TinyUSB into a project using MDK-ARM Keil with device support provided by the Keil Pack Manager, I ran into compatibility issues when not using the STM32 HAL.

Keil projects that rely on the older SPL-style CMSIS device headers (e.g., stm32f10x.h) rather than the HAL-based stm32f1xx.h do not compile out of the box with TinyUSB. This is because the SPL headers lack certain preprocesor macros expected by TinyUSB's STM32 fsdev driver.

My solution is just expansion of "fsdev_stm32.h" file, but I'm not sure about compatibility althrough full F1 MCU series. Also, I'm not sure if such thing is needed in library, as SPL libraries is deprecated and it will (I hope so) be somehow reimplemented in Keil also. But for now, this is my solution.

Implementation (see full file in attachment):

#elif CFG_TUSB_MCU == OPT_MCU_STM32F1
	#if defined(__ARMCC_VERSION) && !defined(USE_HAL_DRIVER) // Detect MDK-ARM Keil without HAL libraries
		#include "stm32f10x.h"
		
		// CMSIS register patch. Checked with STM32F103, other MCUs is not validated!
		#define FSDEV_REG_BASE           (APB1PERIPH_BASE + 0x00005C00UL)
		#define FSDEV_PMA_BASE           (APB1PERIPH_BASE + 0x00006000UL)

		#define USB_EP_CTR_RX            (USB_EP0R_CTR_RX)
		#define USB_EP_DTOG_RX           (USB_EP0R_DTOG_RX)
		#define USB_EPRX_STAT            (USB_EP0R_STAT_RX)
		#define USB_EP_SETUP             (USB_EP0R_SETUP)

		#define USB_EP_TYPE              (USB_EP0R_EP_TYPE)
		#define USB_EP_KIND              (USB_EP0R_EP_KIND)

		#define USB_EP_CTR_TX            (USB_EP0R_CTR_TX)
		#define USB_EP_DTOG_TX           (USB_EP0R_DTOG_TX)
		#define USB_EPTX_STAT            (USB_EP0R_STAT_TX)

		#define USB_EPADDR_FIELD         (USB_EP0R_EA)

		#define USB_EPREG_MASK           (USB_EP_CTR_RX | USB_EP_SETUP | USB_EP_TYPE | USB_EP_KIND | USB_EP_CTR_TX | USB_EPADDR_FIELD)

		#define USB_EP_TYPE_MASK         (USB_EP0R_EP_TYPE)

		#define USB_EP_BULK               0x00000000U
		#define USB_EP_CONTROL            0x00000200U
		#define USB_EP_ISOCHRONOUS        0x00000400U
		#define USB_EP_INTERRUPT          0x00000600U
		#define USB_EP_T_MASK            (~USB_EP_TYPE & USB_EPREG_MASK)

		#define USB_EPKIND_MASK          (~USB_EP_KIND & USB_EPREG_MASK)
		
	#else
		#include "stm32f1xx.h"
	#endif
	
  #define FSDEV_PMA_SIZE (512u)
  // NO internal Pull-ups
  //         *B, and *C:    2 x 16 bits/word

  // F1 names this differently from the rest
  #define USB_CNTR_LPMODE   USB_CNTR_LP_MODE

fsdev_stm32.zip