broken things buuuu

CMakeLists.txt

@@ -19,6 +19,7 @@ add_definitions(
         -DUSE_STACK_MONITOR=1
         -DUSE_DEBUG_UART=1
         -DGEX_PLAT_F072_DISCOVERY
+        -DHAL_TSC_MODULE_ENABLED
 )
 
 FILE(GLOB_RECURSE SOURCE_FILES

Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_pcd.c

@@ -70,12 +70,24 @@
   */
 
 /* Includes ------------------------------------------------------------------*/
+#include <utils/hexdump.h>
 #include "stm32f0xx_hal.h"
+#include "stdbool.h"
 
 /** @addtogroup STM32F0xx_HAL_Driver
   * @{
   */
 
+static inline void dbgShowTog(PCD_HandleTypeDef *hpcd, bool strobe)
+{
+    PCD_EPTypeDef *ep = &hpcd->IN_ep[2];
+    
+    uint32_t v = (GPIOB->ODR & ~0b111);
+    if ((PCD_GET_ENDPOINT(hpcd->Instance, ep->num)& USB_EP_DTOG_TX) == USB_EP_DTOG_TX) v |= 1;
+    if ((PCD_GET_ENDPOINT(hpcd->Instance, ep->num)& USB_EP_DTOG_RX) == USB_EP_DTOG_RX) v |= 2;
+    GPIOB->ODR = v;
+}
+
 #ifdef HAL_PCD_MODULE_ENABLED
 
 #if defined(STM32F042x6) || defined(STM32F048xx) || defined(STM32F072xB) || defined(STM32F078xx) || defined(STM32F070xB)|| defined(STM32F070x6)
@@ -738,13 +750,17 @@ HAL_StatusTypeDef HAL_PCD_EP_Open(PCD_HandleTypeDef *hpcd, uint8_t ep_addr, uint
       /* Clear the data toggle bits for the endpoint IN/OUT*/
       PCD_CLEAR_RX_DTOG(hpcd->Instance, ep->num)
       PCD_CLEAR_TX_DTOG(hpcd->Instance, ep->num)
+
       PCD_RX_DTOG(hpcd->Instance, ep->num);
+
       /* Configure DISABLE status for the Endpoint*/
       PCD_SET_EP_TX_STATUS(hpcd->Instance, ep->num, USB_EP_TX_DIS)
       PCD_SET_EP_RX_STATUS(hpcd->Instance, ep->num, USB_EP_RX_DIS)
     }
   }
 
+    dbgShowTog(hpcd, false);
+  
   __HAL_UNLOCK(hpcd);   
   return ret;
 }
@@ -925,23 +941,25 @@ HAL_StatusTypeDef HAL_PCD_EP_Transmit(PCD_HandleTypeDef *hpcd, uint8_t ep_addr,
   else
   {
     /*Write the data to the USB endpoint*/
-    if ((PCD_GET_ENDPOINT(hpcd->Instance, ep->num)& USB_EP_DTOG_TX) == USB_EP_DTOG_TX)
+    if ((PCD_GET_ENDPOINT(hpcd->Instance, ep->num)& USB_EP_DTOG_RX) == USB_EP_DTOG_RX)
     {
-      /*Set the Double buffer counter for pmabuffer1*/
+        /*Set the Double buffer counter for pmabuffer0*/
-      PCD_SET_EP_DBUF1_CNT(hpcd->Instance, ep->num, ep->is_in, len)
+        PCD_SET_EP_DBUF0_CNT(hpcd->Instance, ep->num, ep->is_in, len)
-      pmabuffer = ep->pmaaddr1;
+        pmabuffer = ep->pmaaddr0;
     }
     else
     {
-      /*Set the Double buffer counter for pmabuffer0*/
+        /*Set the Double buffer counter for pmabuffer1*/
-      PCD_SET_EP_DBUF0_CNT(hpcd->Instance, ep->num, ep->is_in, len)
+        PCD_SET_EP_DBUF1_CNT(hpcd->Instance, ep->num, ep->is_in, len)
-      pmabuffer = ep->pmaaddr0;
+        pmabuffer = ep->pmaaddr1;
     }
 
-    PCD_WritePMA(hpcd->Instance, ep->xfer_buff, pmabuffer, len);
+    PCD_WritePMA(hpcd->Instance, ep->xfer_buff, pmabuffer, (uint16_t) len);
     PCD_FreeUserBuffer(hpcd->Instance, ep->num, ep->is_in)
   }
 
+  dbgShowTog(hpcd, false);
+
   PCD_SET_EP_TX_STATUS(hpcd->Instance, ep->num, USB_EP_TX_VALID)
      
   return HAL_OK;
@@ -1193,9 +1211,13 @@ static HAL_StatusTypeDef PCD_EP_ISR_Handler(PCD_HandleTypeDef *hpcd)
   __IO uint16_t wIstr;  
   __IO uint16_t wEPVal = 0U;
 
+    GPIOB->ODR |= 4;
+    for(volatile i=0;i<20;i++);
+    GPIOB->ODR &= ~4;
   /* stay in loop while pending interrupts */
   while (((wIstr = hpcd->Instance->ISTR) & USB_ISTR_CTR) != 0U)
   {
+
     /* extract highest priority endpoint number */
     EPindex = (uint8_t)(wIstr & USB_ISTR_EP_ID);
     
@@ -1336,7 +1358,11 @@ static HAL_StatusTypeDef PCD_EP_ISR_Handler(PCD_HandleTypeDef *hpcd)
         /* clear int flag */
         PCD_CLEAR_TX_EP_CTR(hpcd->Instance, EPindex);
 
-        /* IN double Buffering*/
+          // This function is full of strange code that causes the double buffered mode to not work
+#define WANT_HAL_BUGS 0
+
+#if WANT_HAL_BUGS
+          /* IN double Buffering*/
         if (ep->doublebuffer == 0U)
         {
           ep->xfer_count = PCD_GET_EP_TX_CNT(hpcd->Instance, ep->num);
@@ -1367,11 +1393,48 @@ static HAL_StatusTypeDef PCD_EP_ISR_Handler(PCD_HandleTypeDef *hpcd)
           }
           PCD_FreeUserBuffer(hpcd->Instance, ep->num, PCD_EP_DBUF_IN)
         }
+
         /*multi-packet on the NON control IN endpoint*/
         ep->xfer_count = PCD_GET_EP_TX_CNT(hpcd->Instance, ep->num);
+
+#else
+          uint8_t tmpbuf[64];
+        /* IN double Buffering*/
+        if (ep->doublebuffer == 0U)
+        {
+          ep->xfer_count = PCD_GET_EP_TX_CNT(hpcd->Instance, ep->num);
+        }
+        else
+        {
+          // NOTE: DTOG is inverted by the device at the end of a transaction
+
+          if ((PCD_GET_ENDPOINT(hpcd->Instance, ep->num)& USB_EP_DTOG_TX) == USB_EP_DTOG_TX)
+          {
+            /*read from endpoint BUF0Addr buffer*/
+            ep->xfer_count = PCD_GET_EP_DBUF0_CNT(hpcd->Instance, ep->num);
+
+//              PCD_ReadPMA(hpcd->Instance, tmpbuf, ep->pmaaddr0, ep->xfer_count);
+//              hexDump("buf0", tmpbuf, ep->xfer_count);
+          }
+          else
+          {
+            /*read from endpoint BUF1Addr buffer*/
+            ep->xfer_count = PCD_GET_EP_DBUF1_CNT(hpcd->Instance, ep->num);
+
+//              PCD_ReadPMA(hpcd->Instance, tmpbuf, ep->pmaaddr1, ep->xfer_count);
+//              hexDump("buf1", tmpbuf, ep->xfer_count);
+          }
+        }
+#endif
+
+//        dbg("ISR: ep %02x Xferd %db, remain %d", ep->num, ep->xfer_count, ep->xfer_len);
+
         ep->xfer_buff+=ep->xfer_count;
 
-        /* Zero Length Packet? */
+
+        if(ep->num==2)  dbgShowTog(hpcd, true);
+
+        /* Zero Length Packet? <- what? */
         if (ep->xfer_len == 0U)
         {
           /* TX COMPLETE */
@@ -1379,6 +1442,7 @@ static HAL_StatusTypeDef PCD_EP_ISR_Handler(PCD_HandleTypeDef *hpcd)
         }
         else
         {
+          trap("multipart!");
           HAL_PCD_EP_Transmit(hpcd, ep->num, ep->xfer_buff, ep->xfer_len);
         }
       } 

Inc/stm32f0xx_hal_conf.h

@@ -43,7 +43,7 @@
 #include "main.h"
 /* Exported types ------------------------------------------------------------*/
 /* Exported constants --------------------------------------------------------*/
-#define USBD_NUM_ENDPOINTS 3
+#define USBD_NUM_ENDPOINTS 4
 
 /* ########################## Module Selection ############################## */
 /**

Makefile

@@ -35,6 +35,7 @@ OPT = -Os
 #######################################
 # paths
 #######################################
+#Application/User/Src/stm32f0xx_hal_timebase_TIM.c \
 # source path
 SOURCES_DIR =  \
 Application \
@@ -45,7 +46,6 @@ Application/User/Src/freertos.c \
 Application/User/Src/gpio.c \
 Application/User/Src/main.c \
 Application/User/Src/stm32f0xx_hal_msp.c \
-Application/User/Src/stm32f0xx_hal_timebase_TIM.c \
 Application/User/Src/stm32f0xx_it.c \
 Application/User/Src/usb.c \
 Drivers \
@@ -107,10 +107,10 @@ Middlewares/Third_Party/FreeRTOS/Source/tasks.c \
 Middlewares/Third_Party/FreeRTOS/Source/timers.c \
 Middlewares/Third_Party/FreeRTOS/Source/portable/MemMang/heap_4.c \
 Src/stm32f0xx_hal_msp.c \
-Src/stm32f0xx_hal_timebase_TIM.c \
-Src/stm32f0xx_it.c \
 Src/system_stm32f0xx.c \
 Src/main.c
+#Src/stm32f0xx_hal_timebase_TIM.c \
+#Src/stm32f0xx_it.c \
 
 C_SOURCES += $(foreach sdir,$(GEX_SRC_DIR),$(wildcard $(sdir)/*.c)) $(GEX_SOURCES)
 

Src/main.c

@@ -135,6 +135,7 @@ void SystemClock_Config(void)
   RCC_ClkInitTypeDef RCC_ClkInitStruct;
   RCC_PeriphCLKInitTypeDef PeriphClkInit;
 
+#if 0
     /**Initializes the CPU, AHB and APB busses clocks 
     */
   RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI48|RCC_OSCILLATORTYPE_HSE;
@@ -148,6 +149,32 @@ void SystemClock_Config(void)
   {
     _Error_Handler(__FILE__, __LINE__);
   }
+#else
+  /* Set FLASH latency */
+  LL_FLASH_SetLatency(LL_FLASH_LATENCY_1);
+
+  LL_RCC_HSE_EnableBypass();
+  LL_RCC_HSE_Enable();
+  while(LL_RCC_HSE_IsReady() != 1) {}
+
+  /* Main PLL configuration and activation */
+  LL_RCC_PLL_ConfigDomain_SYS(LL_RCC_PLLSOURCE_HSE, LL_RCC_PLL_MUL_6, LL_RCC_PREDIV_DIV_1);
+
+  LL_RCC_PLL_Enable();
+  while(LL_RCC_PLL_IsReady() != 1) {}
+
+  /* Sysclk activation on the main PLL */
+  LL_RCC_SetAHBPrescaler(LL_RCC_SYSCLK_DIV_1);
+  LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_PLL);
+  while(LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_PLL) {}
+
+  /* Set APB1 prescaler */
+  LL_RCC_SetAPB1Prescaler(LL_RCC_APB1_DIV_1);
+
+  /* Update CMSIS variable (which can be updated also through SystemCoreClockUpdate function) */
+  LL_SetSystemCoreClock(48000000);
+#endif
+
 
     /**Initializes the CPU, AHB and APB busses clocks 
     */

User

@@ -1 +1 @@
-Subproject commit a63f04027178433015830012ae9caf495a409b97
+Subproject commit c4efa5ddaa716fbf1a6b767b8401b497aa3e2f90