Merge pull request ARMmbed#2 from yennster/cc3220sf

[CC3220SF] Fixed the GPIO bug

Author: Jenny Plunkett

targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/device.h

@@ -20,5 +20,6 @@
 #ifndef MBED_DEVICE_H
 #define MBED_DEVICE_H
 
+#include "objects.h"
 
 #endif

targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/device/CC3220SF.h

@@ -175,16 +175,10 @@ typedef struct
   */
 
 /* Peripheral and SRAM base address */
-// The following defines are just examples
-#define CC3220SF_FLASH_BASE       (0x00000000UL)                              /*!< (FLASH     ) Base Address */
-#define CC3220SF_SRAM_BASE        (0x20000000UL)                              /*!< (SRAM      ) Base Address */
-#define CC3220SF_PERIPH_BASE      (0x40000000UL)                              /*!< (Peripheral) Base Address */
+// TODO
 
 /* Peripheral memory map */
-// The following defines are just examples
-#define CC3220SFTIM0_BASE         (CC3220SF_PERIPH_BASE)          /*!< (Timer0    ) Base Address */
-#define CC3220SFTIM1_BASE         (CC3220SF_PERIPH_BASE + 0x0800) /*!< (Timer1    ) Base Address */
-#define CC3220SFTIM2_BASE         (CC3220SF_PERIPH_BASE + 0x1000) /*!< (Timer2    ) Base Address */
+// TODO
 
 /** @} */ /* End of group Device_Peripheral_peripheralAddr */
 
@@ -200,10 +194,7 @@ typedef struct
   * @{
   */
 
-// The following defines are just examples
-#define CC3220SF_TIM0        ((CC3220SF_TMR_TypeDef *) CC3220SFTIM0_BASE)
-#define CC3220SF_TIM1        ((CC3220SF_TMR_TypeDef *) CC3220SFTIM0_BASE)
-#define CC3220SF_TIM2        ((CC3220SF_TMR_TypeDef *) CC3220SFTIM0_BASE)
+// TODO
 
 
 #ifdef __cplusplus

targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/gpio_api.c

@@ -22,36 +22,29 @@ uint32_t gpio_set(PinName pin)
     return (1);
 }
 
-//function to initialise the gpio pin
+// function to initialise the gpio pin
 // this links the board control bits for each pin
 // with the object created for the pin
 void gpio_init(gpio_t *obj, PinName pin)
 {
-    if (pin == NC) {
-        return;
-    } else {
-        int pin_value = 0;
-        obj->pin = pin;
-
-        // TODO
-    }
+    // TODO
+    return;
 }
 
 void gpio_mode(gpio_t *obj, PinMode mode)
 {
-    pin_mode(obj->pin, mode);
+    // TODO
+    return;
 }
 
 void gpio_dir(gpio_t *obj, PinDirection direction)
 {
     // TODO
+    return;
 }
 
 int gpio_is_connected(const gpio_t *obj)
 {
-    if (obj->pin != (PinName)NC) {
-        return 1;
-    } else {
-        return 0;
-    }
+    // TODO
+    return 0;
 }

targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/gpio_object.h

@@ -1,5 +1,5 @@
 /* mbed Microcontroller Library
- * Copyright (c) 2006-2018 ARM Limited
+ * Copyright (c) 2006-2013 ARM Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,18 +25,11 @@
 extern "C" {
 #endif
 
-// TODO
-
-struct port_s {
-    __IO uint32_t *reg_dir;
-    __IO uint32_t *reg_dirclr;
-    __IO uint32_t *reg_out;
-    __IO uint32_t *reg_in;
-    PortName port;
-    uint32_t mask;
-};
-
-#include "gpio_object.h"
+typedef struct {
+    PinName pin;
+    PinMode mode;
+    PinDirection dir;
+} gpio_t;
 
 #ifdef __cplusplus
 }

targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/objects.h

@@ -19,20 +19,12 @@
 
 #include <stdint.h>
 
-/**
-#if defined(TARGET_CC32XX)
-
-#ifndef INITIAL_SP
-#define INITIAL_SP              (0x80000000UL)
-#endif
-**/
-
 #if defined(TARGET_CC3220SF)
 
 #ifndef INITIAL_SP
 #define INITIAL_SP              (0x80000000UL)
 #endif
 
-#endif /* defined(TARGET_CC32XX) */
+#endif /* defined(TARGET_CC3220SF) */
 
 #endif  /* MBED_MBED_RTX_H */

targets/TARGET_TI/mbed_rtx.h

@@ -4216,17 +4216,20 @@
         "core": "Cortex-M7",
         "macros": ["CMSDK_CM7"]
     },
-    "CC32XX": {
+    "TI": {
         "inherits": ["Target"],
-        "extra_labels": ["TI", "CC32XX"],
-        "default_toolchain": "GCC_ARM",
-        "core": "Cortex-M4",
-        "supported_toolchains": ["ARM", "GCC_ARM", "IAR"],
+        "public": false,
+        "extra_labels": ["TI"]
+    },
+    "CC32XX": {
+        "inherits": ["TI"],
+        "public": false,
+        "supported_toolchains": ["GCC_ARM", "ARM", "IAR"],
         "device_has": [],
         "release_versions": ["5"]
     },
     "CC3220SF": {
         "inherits": ["CC32XX"],
-        "macros_add": []
+        "core": "Cortex-M4"
     }
 }