clean up

Signed-off-by: HiFiPhile <[email protected]>

Author: HiFiPhile

README.rst

@@ -229,7 +229,7 @@ Supported CPUs
 |              +----+------------------------+--------+------+-----------+------------------------+-------------------+
 |              | F2, F4, F7, H7, H7RS        | ✔      | ✔    | ✔         | dwc2                   |                   |
 |              +-----------------------------+--------+------+-----------+------------------------+-------------------+
-|              | C0, G0, H5                  | ✔      |      | ✖         | stm32_fsdev            |                   |
+|              | C0, G0, H5                  | ✔      | ✔    | ✖         | stm32_fsdev            |  Tested on C0     |
 |              +-----------------------------+--------+------+-----------+------------------------+-------------------+
 |              | G4                          | ✔      | ✖    | ✖         | stm32_fsdev            |                   |
 |              +----+------------------------+--------+------+-----------+------------------------+-------------------+

hw/bsp/stm32c0/boards/stm32c071nucleo/stm32c071xx_flash.icf

@@ -30,4 +30,4 @@ place in RAM_region   { readwrite,
                         block CSTACK, block HEAP };
 
 export symbol __ICFEDIT_region_RAM_start__;
-export symbol __ICFEDIT_region_RAM_end__;
+export symbol __ICFEDIT_region_RAM_end__;

src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c

@@ -840,12 +840,14 @@ void dcd_int_disable(uint8_t rhport) {
   fsdev_int_disable(rhport);
 }
 
+#if defined(USB_BCDR_DPPU) || defined(SYSCFG_PMC_USB_PU)
 void dcd_connect(uint8_t rhport) {
   fsdev_connect(rhport);
 }
 
 void dcd_disconnect(uint8_t rhport) {
   fsdev_disconnect(rhport);
 }
+#endif
 
 #endif

src/portable/st/stm32_fsdev/fsdev_at32.h

@@ -207,17 +207,17 @@ TU_ATTR_ALWAYS_INLINE static inline void fsdev_int_disable(uint8_t rhport) {
 TU_ATTR_ALWAYS_INLINE static inline void fsdev_disconnect(uint8_t rhport) {
   (void) rhport;
   /* disable usb phy */
-  FSDEV_REG->CNTR |= USB_CNTR_PDWN;
+  *(volatile uint32_t*)(FSDEV_REG_BASE + 0x40) |= USB_CNTR_PDWN;
   /* D+ 1.5k pull-up disable, USB->cfg_bit.puo = TRUE; */
-  *(uint32_t *)(FSDEV_REG_BASE+0x60) |= (1u<<1);
+  *(volatile uint32_t *)(FSDEV_REG_BASE+0x60) |= (1u<<1);
 }
 
 TU_ATTR_ALWAYS_INLINE static inline void fsdev_connect(uint8_t rhport) {
   (void) rhport;
   /* enable usb phy */
-  FSDEV_REG->CNTR &= ~USB_CNTR_PDWN;
+  *(volatile uint32_t*)(FSDEV_REG_BASE + 0x40) &= ~USB_CNTR_PDWN;
   /* Dp 1.5k pull-up enable, USB->cfg_bit.puo = 0; */
-  *(uint32_t *)(FSDEV_REG_BASE+0x60) &= ~(1u<<1);
+  *(volatile uint32_t *)(FSDEV_REG_BASE+0x60) &= ~(1u<<1);
 }
 
 #endif

src/portable/st/stm32_fsdev/hcd_stm32_fsdev.c

@@ -50,7 +50,7 @@
 //--------------------------------------------------------------------+
 
 // Debug level for FSDEV
-#define FSDEV_DEBUG 1
+#define FSDEV_DEBUG 3
 
 // Max number of endpoints application can open, can be larger than FSDEV_EP_COUNT
 #ifndef CFG_TUH_FSDEV_ENDPOINT_MAX
@@ -314,12 +314,8 @@ static void ch_handle_error(uint8_t ch_id, uint32_t ch_reg, tusb_dir_t dir) {
   uint8_t ep_id = endpoint_find(daddr, ep_num | (dir == TUSB_DIR_IN ? TUSB_DIR_IN_MASK : 0));
   if (ep_id == TUSB_INDEX_INVALID_8) return;
 
-  hcd_endpoint_t* edpt = &_hcd_data.edpt[ep_id];
   hcd_xfer_t* xfer = &_hcd_data.xfer[ch_id];
 
-  TU_LOG(FSDEV_DEBUG, "ch_handle_error epreg=0x%08X ch=%u ep=0x%02X daddr=%u queued=%u/%u\r\n",
-         ch_reg, ch_id, ep_num, daddr, xfer->queued_len[dir], edpt->buflen);
-
   ch_reg &= USB_EPREG_MASK | CH_STAT_MASK(dir);
   ch_reg &= ~(dir == TUSB_DIR_OUT ? USB_CH_ERRTX : USB_CH_ERRRX);
 
@@ -661,10 +657,10 @@ static void edpoint_close(uint8_t ep_id) {
 static uint32_t hcd_pma_alloc(uint8_t channel, tusb_dir_t dir, uint16_t len) {
   (void) len;
   // Simple static allocation as we are unlikely to handle ISO endpoints in host mode
-  // We just give each channel a buffer of max packet size (64 bytes)
+  // We just give each channel two buffers of max packet size (64 bytes) for IN and OUT
 
   uint16_t addr = FSDEV_BTABLE_BASE + 8 * FSDEV_EP_COUNT;
-  addr += channel * 64 * 2 + (dir == TUSB_DIR_IN ? 64 : 0);
+  addr += channel * TUSB_EPSIZE_BULK_FS * 2 + (dir == TUSB_DIR_IN ? TUSB_EPSIZE_BULK_FS : 0);
 
   TU_ASSERT(addr <= FSDEV_PMA_SIZE, 0xFFFF);