Update CC3220SF SDK to v3.10.00.04 (nanoframework#1321)

morali · May 17, 2019 · a7bf563 · a7bf563
1 parent 0acc013
commit a7bf563
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 28 deletions.
diff --git a/CMake/Modules/TI_SimpleLink_CC32xx_sources.cmake b/CMake/Modules/TI_SimpleLink_CC32xx_sources.cmake
@@ -41,7 +41,6 @@ set(BoardDrivers_SRCS
     I2C.c
     I2CCC32XX.c
     I2S.c
-    I2SCC32XXDMA.c
     PowerCC32XX.c
     PowerCC32XX_asm.sm4g
     PWM.c

diff --git a/targets/TI-SimpleLink/CMakeLists.txt b/targets/TI-SimpleLink/CMakeLists.txt
@@ -49,8 +49,8 @@ if("${TARGET_SERIES}" STREQUAL "CC32xx")
             message(FATAL_ERROR "error: could not find Git, make sure you have it installed.")
         endif()
 
-        message(STATUS "TI SimpleLink CC32xx SDK (latest available code from v2.40.02.00")
-        set(TI_SL_CC32xx_SDK_TAG "2.40.02.00")
+        message(STATUS "TI SimpleLink CC32xx SDK (latest available code from v3.10.00.04")
+        set(TI_SL_CC32xx_SDK_TAG "3.10.00.04")
 
         # need to setup a separate CMake project to download the code from the GitHub repository
         # otherwise it won't be available before the actual build step

diff --git a/targets/TI-SimpleLink/TI_CC3220SF_LAUNCHXL/CC3220SF_LAUNCHXL.c b/targets/TI-SimpleLink/TI_CC3220SF_LAUNCHXL/CC3220SF_LAUNCHXL.c
@@ -353,34 +353,31 @@ const uint_least8_t I2C_count = CC3220SF_LAUNCHXL_I2CCOUNT;
  *  =============================== I2S ===============================
  */
 #include <ti/drivers/I2S.h>
-#include <ti/drivers/i2s/I2SCC32XXDMA.h>
+#include <ti/drivers/i2s/I2SCC32XX.h>
 
-I2SCC32XXDMA_Object i2sCC3220SObjects[CC3220SF_LAUNCHXL_I2SCOUNT];
+I2SCC32XX_Object i2sCC3220SObjects[CC3220S_LAUNCHXL_I2SCOUNT];
 
-const I2SCC32XXDMA_HWAttrsV1 i2sCC3220SHWAttrs[CC3220SF_LAUNCHXL_I2SCOUNT] = {
+const I2SCC32XX_HWAttrs i2sCC3220SHWAttrs[CC3220S_LAUNCHXL_I2SCOUNT] = {
     {
-        .baseAddr = I2S_BASE,
-        .intNum = INT_I2S,
-        .intPriority = (~0),
-        .rxChannelIndex = UDMA_CH4_I2S_RX,
-        .txChannelIndex = UDMA_CH5_I2S_TX,
-        .xr0Pin = I2SCC32XXDMA_PIN_64_McAXR0,
-        .xr1Pin = I2SCC32XXDMA_PIN_50_McAXR1,
-        .clkxPin = I2SCC32XXDMA_PIN_62_McACLKX,
-        .clkPin = I2SCC32XXDMA_PIN_53_McACLK,
-        .fsxPin = I2SCC32XXDMA_PIN_63_McAFSX,
+      .pinSD1           =  I2SCC32XX_PIN_50_SD1,
+      .pinSD0           =  I2SCC32XX_PIN_64_SD0,
+      .pinSCK           =  I2SCC32XX_PIN_53_SCK,
+      .pinSCKX          =  I2SCC32XX_PIN_UNUSED,
+      .pinWS            =  I2SCC32XX_PIN_63_WS,
+      .rxChannelIndex   =  UDMA_CH4_I2S_RX,
+      .txChannelIndex   =  UDMA_CH5_I2S_TX,
+      .intPriority      =  0x40,
     }
 };
 
-const I2S_Config I2S_config[CC3220SF_LAUNCHXL_I2SCOUNT] = {
+const I2S_Config I2S_config[CC3220S_LAUNCHXL_I2SCOUNT] = {
     {
-        .fxnTablePtr = &I2SCC32XXDMA_fxnTable,
-        .object = &i2sCC3220SObjects[CC3220SF_LAUNCHXL_I2S0],
-        .hwAttrs = &i2sCC3220SHWAttrs[CC3220SF_LAUNCHXL_I2S0]
+        .object = &i2sCC3220SObjects[CC3220S_LAUNCHXL_I2S0],
+        .hwAttrs = &i2sCC3220SHWAttrs[CC3220S_LAUNCHXL_I2S0]
     }
 };
 
-const uint_least8_t I2S_count = CC3220SF_LAUNCHXL_I2SCOUNT;
+const uint_least8_t I2S_count = CC3220S_LAUNCHXL_I2SCOUNT;
 
 /*
  *  =============================== Power ===============================

diff --git a/targets/TI-SimpleLink/TI_CC3220SF_LAUNCHXL/CC3220SF_LAUNCHXL.h b/targets/TI-SimpleLink/TI_CC3220SF_LAUNCHXL/CC3220SF_LAUNCHXL.h
@@ -88,14 +88,14 @@ typedef enum CC3220SF_LAUNCHXL_I2CName {
 } CC3220SF_LAUNCHXL_I2CName;
 
 /*!
- *  @def    CC3220SF_LAUNCHXL_I2SName
- *  @brief  Enum of I2S names on the CC3220SF_LAUNCHXL dev board
+ *  @def    CC3220S_LAUNCHXL_I2SName
+ *  @brief  Enum of I2S names on the CC3220S_LAUNCHXL dev board
  */
-typedef enum CC3220SF_LAUNCHXL_I2SName {
-    CC3220SF_LAUNCHXL_I2S0 = 0,
+typedef enum CC3220S_LAUNCHXL_I2SName {
+    CC3220S_LAUNCHXL_I2S0 = 0,
 
-    CC3220SF_LAUNCHXL_I2SCOUNT
-} CC3220SF_LAUNCHXL_I2SName;
+    CC3220S_LAUNCHXL_I2SCOUNT
+} CC3220S_LAUNCHXL_I2SName;
 
 /*!
  *  @def    CC3220SF_LAUNCHXL_PWMName

diff --git a/targets/TI-SimpleLink/TI_CC3220SF_LAUNCHXL/target_common.h.in b/targets/TI-SimpleLink/TI_CC3220SF_LAUNCHXL/target_common.h.in
@@ -33,7 +33,7 @@
 #define PLATFORM_HAS_RNG       TRUE
 /////////////////////////////////////
 
-#define OEMSYSTEMINFOSTRING "nanoCLR running @ @TI_BOARD@ built with TI SL CC32xx SDK v2.40.01.01"
+#define OEMSYSTEMINFOSTRING "nanoCLR running @ @TI_BOARD@ built with TI SL CC32xx SDK v3.10.00.04"
 
 /////////////////////////////////////
 //#define EVENTS_HEART_BEAT       GPIO_toggle(Board_GPIO_LED0)