Merge 4473eb7dbd into dc0fa4e207

extras/serial-driver/component.mk

@@ -0,0 +1,11 @@
+# Component makefile for extras/serial-driver
+#
+# See examples/terminal for usage
+
+INC_DIRS += $(ROOT)extras/serial-driver
+
+# args for passing into compile rule generation
+extras/serial-driver_INC_DIR =  $(ROOT)extras/serial-driver
+extras/serial-driver_SRC_DIR =  $(ROOT)extras/serial-driver
+
+$(eval $(call component_compile_rules,extras/serial-driver))

extras/serial-driver/serial_driver.c

@@ -0,0 +1,120 @@
+/* 
+ * The MIT License (MIT)
+ * 
+ * Copyright (c) 2015 Johan Kanflo (github.com/kanflo)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <esp8266.h>
+#include <FreeRTOS.h>
+#include <semphr.h>
+
+#if (configUSE_COUNTING_SEMAPHORES == 0)
+ #error "You need to define configUSE_COUNTING_SEMAPHORES in a local FreeRTOSConfig.h, see examples/terminal/FreeRTOSConfig.h"
+#endif
+
+// IRQ driven UART RX driver for ESP8266 written for use with esp-open-rtos
+// TODO: Handle UART1
+
+#define UART0_RX_SIZE  (81)
+
+#ifndef UART0
+#define UART0 (0)
+#endif
+
+static xSemaphoreHandle uart0_sem = NULL;
+static char rx_buf[UART0_RX_SIZE];
+static uint8_t rd_pos = 0;
+static uint8_t wr_pos = 0;
+static bool inited = false;
+
+static void uart0_rx_init(void);
+
+
+IRAM void uart0_rx_handler(void)
+{
+    // TODO: Handle UART1, see reg 0x3ff20020, bit2, bit0 represents uart1 and uart0 respectively
+    if (!UART(UART0).INT_STATUS & UART_INT_STATUS_RXFIFO_FULL) {
+        return;
+    }
+    UART(UART0).INT_CLEAR = UART_INT_CLEAR_RXFIFO_FULL;
+    while (UART(UART0).STATUS & (UART_STATUS_RXFIFO_COUNT_M << UART_STATUS_RXFIFO_COUNT_S)) {
+        char ch = UART(UART0).FIFO & (UART_FIFO_DATA_M << UART_FIFO_DATA_S);
+        uint8_t wr_next = (wr_pos+1) % UART0_RX_SIZE;
+        if (wr_next != rd_pos) {
+            rx_buf[wr_pos] = ch;
+            wr_pos = (wr_pos+1) % UART0_RX_SIZE;
+            xSemaphoreGiveFromISR(uart0_sem, NULL);
+        }
+    }
+}
+
+uint32_t uart0_num_char(void)
+{
+    uint32_t count;
+    if (!inited) uart0_rx_init();
+    _xt_isr_mask(1 << INUM_UART);
+    if (rd_pos > wr_pos) count = rd_pos - wr_pos;
+    else count = wr_pos - rd_pos;
+    _xt_isr_unmask(1 << INUM_UART);
+    return count;
+}
+
+// _read_r in core/newlib_syscalls.c will be skipped in favour of this function
+long _read_r(struct _reent *r, int fd, char *ptr, int len)
+{
+    if (!inited) uart0_rx_init();
+    for(int i = 0; i < len; i++) {
+        char ch;
+        if (xSemaphoreTake(uart0_sem, portMAX_DELAY)) {
+            _xt_isr_mask(1 << INUM_UART);
+            ch = rx_buf[rd_pos];
+            rd_pos = (rd_pos+1) % UART0_RX_SIZE;
+            _xt_isr_unmask(1 << INUM_UART);
+            ptr[i] = ch;
+        }
+    }
+    return len;
+}
+
+static void uart0_rx_init(void)
+{
+    int trig_lvl = 1;
+    uart0_sem = xSemaphoreCreateCounting(UART0_RX_SIZE, 0);
+
+    _xt_isr_attach(INUM_UART, uart0_rx_handler);
+    _xt_isr_unmask(1 << INUM_UART);
+
+    //clear rx and tx fifo,not ready
+    UART(UART0).CONF0 = UART_CONF0_RXFIFO_RESET | UART_CONF0_TXFIFO_RESET;
+    UART(UART0).CONF0 &= ~(UART_CONF0_RXFIFO_RESET | UART_CONF0_TXFIFO_RESET);
+
+    //set rx fifo trigger
+    UART(UART0).CONF1 &= ~(UART_CONF1_RXFIFO_FULL_THRESHOLD_M << UART_CONF1_RXFIFO_FULL_THRESHOLD_S);
+    UART(UART0).CONF1 |= (trig_lvl & UART_CONF1_RXFIFO_FULL_THRESHOLD_M) << UART_CONF1_RXFIFO_FULL_THRESHOLD_S;
+
+    //clear all interrupt
+    UART(UART0).INT_CLEAR = 0x1ff;
+
+    //enable rx_interrupt
+    UART(UART0).INT_ENABLE = UART_INT_ENABLE_RXFIFO_FULL;
+
+    inited = true;
+}

extras/serial-driver/serial_driver.h

@@ -0,0 +1,33 @@
+/* 
+ * The MIT License (MIT)
+ * 
+ * Copyright (c) 2015 Johan Kanflo (github.com/kanflo)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef __I2C_H__
+#define __I2C_H__
+#endif
+
+#include <stdint.h>
+#include <stdbool.h>
+
+// Return number of characters waiting in UART0
+uint32_t uart0_num_char(void);