Merge pull request ARMmbed#20 from yennster/uart-new

Fixing serial_putc, register offsets

Author: Jenny Plunkett

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

@@ -158,6 +158,7 @@ typedef struct
   __I  uint32_t RSR;            /*!< Receive Status,                    Address offset : 0x04 */
   __O  uint32_t ECR;            /*!< Error Clear,                       Address offset : 0x04 */
   } STATUS;
+  uint32_t RESERVED0[4];
   __IO uint32_t FR;             /*!< Flags,                             Address offset : 0x18 */
   __IO uint32_t ILPR;           /*!< IrDA Low-power Counter,            Address offset : 0x20 */
   __IO uint32_t IBRD;           /*!< Integer Baud Rate,                 Address offset : 0x24 */
@@ -170,7 +171,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 RESERVED0[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/serial_api.c

@@ -242,26 +242,41 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable) {
 }
 
 static void serial_flow_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable) {
-    serial_irq_set_internal(obj, irq, enable);
+    uart_data[obj->index].rx_irq_set_flow = enable;
+    serial_irq_set_internal(obj, RxIrq, enable);
 }
 
 /******************************************************************************
  * READ/WRITE
  ******************************************************************************/
 int serial_getc(serial_t *obj) {
-    return ((int) UARTCharGet(obj->baseAddr));
+    //return ((int) UARTCharGet(obj->baseAddr));
+    while (!serial_readable(obj));
+    int data = obj->uart->DR;
+    return data;
 }
 
 void serial_putc(serial_t *obj, int c) {
-    UARTCharPut(obj->baseAddr, (unsigned char) c); // @suppress("Field cannot be resolved")
+    //UARTCharPut(obj->baseAddr, (unsigned char) c); // @suppress("Field cannot be resolved")
+    while (!serial_writable(obj));
+    //obj->uart->DR = (unsigned char) c;
+    HWREG(obj->baseAddr + UART_O_DR) = (unsigned char) c;
+    uart_data[obj->index].count++;
 }
 
 int serial_readable(serial_t *obj) {
     return ((int) (HWREG(obj->baseAddr + UART_O_FR) & UART_FR_RXFE));
 }
 
 int serial_writable(serial_t *obj) {
-    return ((int) (HWREG(obj->baseAddr + UART_O_FR) & UART_FR_TXFF));
+    //return ((int) (HWREG(obj->baseAddr + UART_O_FR) & UART_FR_TXFF));
+    int isWritable = 1;
+    if (HWREG(obj->baseAddr + UART_O_FR) & UART_FR_TXFF) { //(obj->uart->LSR & 0x20)
+        uart_data[obj->index].count = 0;
+    } else if (uart_data[obj->index].count >= 16) {
+        isWritable = 0;
+    }
+    return isWritable;
 }
 
 void serial_clear(serial_t *obj) {