Merge pull request ARMmbed#27 from yennster/uart-debug

UART is working (no IRQ handler)

Author: Jenny Plunkett

targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/PinNames.h

@@ -28,43 +28,43 @@ typedef enum {
 } PinDirection;
 
 typedef enum {
-    P01 = 0x00,
-    P02 = 0x01,
-    P03 = 0x02,
-    P04 = 0x03,
-    P05 = 0x04,
-    P06 = 0x05,
-    P07 = 0x06,
-    P08 = 0x07,
-    P11 = 0x0A,
-    P12 = 0x0B,
-    P13 = 0x0C,
-    P14 = 0x0D,
-    P15 = 0x0E,
-    P16 = 0x0F,
-    P17 = 0x10,
-    P18 = 0x11,
-    P19 = 0x12,
-    P20 = 0x13,
-    P21 = 0x14,
-    P45 = 0x2C,
-    P46 = 0x2D,
-    P47 = 0x2E,
-    P48 = 0x2F,
-    P49 = 0x30,
-    P50 = 0x31,
-    P52 = 0x33,
-    P53 = 0x34,
-    P55 = 0x36,
-    P56 = 0x37,
-    P57 = 0x38,
-    P58 = 0x39,
-    P59 = 0x3A,
-    P60 = 0x3B,
-    P61 = 0x3C,
-    P62 = 0x3D,
-    P63 = 0x3E,
-    P64 = 0x3F,
+    P01 = 0x00000000,
+    P02 = 0x00000001,
+    P03 = 0x00000002,
+    P04 = 0x00000003,
+    P05 = 0x00000004,
+    P06 = 0x00000005,
+    P07 = 0x00000006,
+    P08 = 0x00000007,
+    P11 = 0x0000000A,
+    P12 = 0x0000000B,
+    P13 = 0x0000000C,
+    P14 = 0x0000000D,
+    P15 = 0x0000000E,
+    P16 = 0x0000000F,
+    P17 = 0x00000010,
+    P18 = 0x00000011,
+    P19 = 0x00000012,
+    P20 = 0x00000013,
+    P21 = 0x00000014,
+    P45 = 0x0000002C,
+    P46 = 0x0000002D,
+    P47 = 0x0000002E,
+    P48 = 0x0000002F,
+    P49 = 0x00000030,
+    P50 = 0x00000031,
+    P52 = 0x00000033,
+    P53 = 0x00000034,
+    P55 = 0x00000036,
+    P56 = 0x00000037,
+    P57 = 0x00000038,
+    P58 = 0x00000039,
+    P59 = 0x0000003A,
+    P60 = 0x0000003B,
+    P61 = 0x0000003C,
+    P62 = 0x0000003D,
+    P63 = 0x0000003E,
+    P64 = 0x0000003F,
 
     PIN_01 = P01,
     PIN_02 = P02,
@@ -117,12 +117,15 @@ typedef enum {
     NC = (int)0xFFFFFFFF
 } PinName;
 
-
 typedef enum {
     PullNone = 0,
-    PullDown = 1,
-    PullUp   = 2,
-    PullDefault = PullUp
+    PullUp   = 1,
+    PullDown = 2,
+    OpenDrain = 3,
+    OpenDrainPullUp = 4,
+    OpenDrainPullDown = 5,
+    Analog = 6,
+    PullDefault = PullDown
 } PinMode;
 
 #ifdef __cplusplus

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

@@ -148,13 +148,14 @@ typedef enum IRQn
 /* ================                                            UART                                           ================ */
 /* =========================================================================================================================== */
 
+
 /**
   * @brief UART
   */
 typedef struct
 {
   __IO uint32_t DR;             /*!< Data,                              Address offset : 0x00 */
- union {
+  union {
   __I  uint32_t RSR;            /*!< Receive Status,                    Address offset : 0x04 */
   __O  uint32_t ECR;            /*!< Error Clear,                       Address offset : 0x04 */
   } STATUS;
@@ -171,7 +172,7 @@ typedef struct
   __IO uint32_t MIS;            /*!< Masked Interrupt Status ,          Address offset : 0x40 */
   __O  uint32_t ICR;            /*!< Interrupt Clear,                   Address offset : 0x44 */
   __IO uint32_t DMACTL;         /*!< DMA Control,                       Address offset : 0x48 */
-  uint32_t RESERVED1[6];
+  //uint32_t RESERVED1[6];
   //__IO uint32_t LCTL;           /*!<                                    Address offset : 0x90 */
   //__IO uint32_t LSS;            /*!<                                    Address offset : 0x94 */
   //__IO uint32_t LTIM;           /*!<                                    Address offset : 0x98 */

targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/gpio_object.h

@@ -0,0 +1,36 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2006-2018 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef MBED_GPIO_OBJECT_H
+#define MBED_GPIO_OBJECT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct {
+    PinName pin;
+} gpio_t;
+
+static inline int gpio_is_connected(const gpio_t *obj)
+{
+    return obj->pin != (PinName)NC;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/objects.h

@@ -20,6 +20,7 @@
 #include "PortNames.h"
 #include "PeripheralNames.h"
 #include "PinNames.h"
+#include "serial_object.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -46,6 +47,10 @@ struct serial_s {
     PinName         ctsPin;          /*! UART clear to send (CTS) pin assignment */
     PinName         rtsPin;          /*! UART request to send (RTS) pin assignment */
     unsigned int    powerMgrId;      /* Determined from base address */
+    unsigned long   peripheralId;    /* Value that can be passed to PRCM functions */
+    UART_LEN        dataLength;      /* Data length for UART */
+    UART_STOP       stopBits;        /* Stop bits for UART */
+    UART_PAR        parityType;      /* Parity bit type for UART */
 };
 
 #ifdef __cplusplus

targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/pinmap.c

@@ -17,14 +17,34 @@
 #include "pinmap.h"
 #include "mbed_error.h"
 
+#include <ti/devices/cc32xx/inc/hw_types.h>
+#include <ti/devices/cc32xx/inc/hw_memmap.h>
+#include <ti/devices/cc32xx/inc/hw_ocp_shared.h>
+#include <ti/devices/cc32xx/driverlib/pin.h>
 
+/**
+ * Configure pin (mode, speed, output type and pull-up/pull-down)
+ */
 void pin_function(PinName pin, int function)
 {
     MBED_ASSERT(pin != (PinName)NC);
-
 }
 
+/**
+ * Configure pin pull-up/pull-down
+ */
 void pin_mode(PinName pin, PinMode mode)
 {
     MBED_ASSERT(pin != (PinName)NC);
+    switch(mode) {
+        case PullNone: PinConfigSet(pin, PIN_STRENGTH_2MA|PIN_STRENGTH_4MA, PIN_TYPE_STD); break;
+        case PullUp: PinConfigSet(pin, PIN_STRENGTH_2MA|PIN_STRENGTH_4MA, PIN_TYPE_STD_PU); break;
+        case PullDown: PinConfigSet(pin, PIN_STRENGTH_2MA|PIN_STRENGTH_4MA, PIN_TYPE_STD_PD); break;
+        case OpenDrain: PinConfigSet(pin, PIN_STRENGTH_2MA|PIN_STRENGTH_4MA, PIN_TYPE_OD); break;
+        case OpenDrainPullUp: PinConfigSet(pin, PIN_STRENGTH_2MA|PIN_STRENGTH_4MA, PIN_TYPE_OD_PU); break;
+        case OpenDrainPullDown: PinConfigSet(pin, PIN_STRENGTH_2MA|PIN_STRENGTH_4MA, PIN_TYPE_OD_PD); break;
+        case Analog: PinConfigSet(pin, PIN_STRENGTH_2MA|PIN_STRENGTH_4MA, PIN_TYPE_ANALOG); break;
+        default: PinConfigSet(pin, PIN_STRENGTH_2MA|PIN_STRENGTH_4MA, PIN_TYPE_STD); break;
+    }
+
 }