Add serial_uart.c and use it for PC98

[tmk_firmware.git] / protocol / serial_soft.c

diff --git a/protocol/serial_soft.c b/protocol/serial_soft.c
index 47b1e4571df7d70845f9e31f9696552e5b7f13fc..c906c664727c200ff7bfb1d7a933ee6e922e655d 100644 (file)
--- a/protocol/serial_soft.c
+++ b/protocol/serial_soft.c
@@ -46,27 +46,22 @@ POSSIBILITY OF SUCH DAMAGE.
  *  is still useful for negative logic signal like Sun protocol not supported by hardware USART.
  */
 
-#define WAIT_US     (1000000/SERIAL_BAUD)
+#define WAIT_US     (1000000L/SERIAL_BAUD)
 
-#if 1
-#define WAIT_TICK     (1000000/SERIAL_BAUD)
-#define WAIT4(tick) _delay_us(tick)
+/* debug for signal timing, see debug pin with oscilloscope */
+#ifdef SERIAL_SOFT_DEBUG
+    #define SERIAL_SOFT_DEBUG_INIT()    (DDRD |= 1<<7)
+    #define SERIAL_SOFT_DEBUG_TGL()     (PORTD ^= 1<<7)
 #else
-#define WAIT_TICK   ((16000000/SERIAL_BAUD)/4 - 5)
-static inline void  WAIT4(uint8_t tick)
-{
-       __asm__ __volatile__ (
-               "1: dec %0" "\n\t"
-                "nop"       "\n\t"
-               "brne 1b"
-               : 
-               : "r" (tick)
-       );
-}
+    #define SERIAL_SOFT_DEBUG_INIT()
+    #define SERIAL_SOFT_DEBUG_TGL()
 #endif
 
+
 void serial_init(void)
 {
+    SERIAL_SOFT_DEBUG_INIT();
+
     SERIAL_RXD_INIT();
     SERIAL_TXD_INIT();
 }
@@ -90,21 +85,48 @@ uint8_t serial_recv(void)
     return data;
 }
 
+int16_t serial_recv2(void)
+{
+    uint8_t data = 0;
+    if (rbuf_head == rbuf_tail) {
+        return -1;
+    }
+
+    data = rbuf[rbuf_tail];
+    rbuf_tail = (rbuf_tail + 1) % RBUF_SIZE;
+    return data;
+}
+
 void serial_send(uint8_t data)
 {
     /* signal state: IDLE: ON, START: OFF, STOP: ON, DATA0: OFF, DATA1: ON */
-    /* start bit */
-    SERIAL_TXD_OFF();
-    _delay_us(WAIT_US);
 
 #ifdef SERIAL_BIT_ORDER_MSB
     uint8_t mask = 0x80;
 #else
     uint8_t mask = 0x01;
 #endif
+
+#ifdef SERIAL_PARITY_ODD
+    uint8_t parity = 1;
+#elif defined(SERIAL_PARITY_EVEN)
+    uint8_t parity = 0;
+#endif
+
+    /* start bit */
+    SERIAL_TXD_OFF();
+    _delay_us(WAIT_US-2);
+
     while (mask) {
-        if (data&mask) { SERIAL_TXD_ON(); } else { SERIAL_TXD_OFF(); }
-        _delay_us(WAIT_US);
+        if (data&mask) {
+            SERIAL_TXD_ON();
+#if defined(SERIAL_PARITY_EVEN) || defined(SERIAL_PARITY_ODD)
+            parity ^= 1;
+#endif
+        } else {
+            SERIAL_TXD_OFF();
+        }
+        _delay_us(WAIT_US-2);
 
 #ifdef SERIAL_BIT_ORDER_MSB
         mask >>= 1;
@@ -113,15 +135,25 @@ void serial_send(uint8_t data)
 #endif
     }
 
+#if defined(SERIAL_PARITY_EVEN) || defined(SERIAL_PARITY_ODD)
+    /* to center of parity bit */
+    if (parity) {
+        SERIAL_TXD_ON();
+    } else {
+        SERIAL_TXD_OFF();
+    }
+    _delay_us(WAIT_US-2);
+#endif
+
     /* stop bit */
     SERIAL_TXD_ON();
-    _delay_us(WAIT_US);
+    _delay_us(WAIT_US-2);
 }
 
 /* detect edge of start bit */
 ISR(SERIAL_RXD_VECT)
 {
-PORTD ^= 1<<7;
+    SERIAL_SOFT_DEBUG_TGL()
     SERIAL_RXD_INT_ENTER()
 
     uint8_t data = 0;
@@ -134,23 +166,23 @@ PORTD ^= 1<<7;
 
 #ifdef SERIAL_PARITY_ODD
     uint8_t parity = 0;
-#else
+#elif defined(SERIAL_PARITY_EVEN)
     uint8_t parity = 1;
 #endif
 
     /* to center of start bit */
-    //_delay_us(WAIT_US/2);
-    WAIT4(WAIT_TICK/2);
-PORTD ^= 1<<7;
+    _delay_us(WAIT_US/2);
+    SERIAL_SOFT_DEBUG_TGL()
     do {
         /* to center of next bit */
-        //_delay_us(WAIT_US);
-        WAIT4(WAIT_TICK);
+        _delay_us(WAIT_US);
 
-PORTD ^= 1<<7;
+    SERIAL_SOFT_DEBUG_TGL()
         if (SERIAL_RXD_READ()) {
             data |= mask;
+#if defined(SERIAL_PARITY_EVEN) || defined(SERIAL_PARITY_ODD)
             parity ^= 1;
+#endif
         }
 #ifdef SERIAL_BIT_ORDER_MSB
         mask >>= 1;
@@ -159,23 +191,26 @@ PORTD ^= 1<<7;
 #endif
     } while (mask);
 
+#if defined(SERIAL_PARITY_EVEN) || defined(SERIAL_PARITY_ODD)
     /* to center of parity bit */
-    //_delay_us(WAIT_US);
-    WAIT4(WAIT_TICK);
+    _delay_us(WAIT_US);
     if (SERIAL_RXD_READ()) { parity ^= 1; }
-PORTD ^= 1<<7;
+    SERIAL_SOFT_DEBUG_TGL()
+#endif
 
     /* to center of stop bit */
-    //_delay_us(WAIT_US);
-    WAIT4(WAIT_TICK);
+    _delay_us(WAIT_US);
 
     uint8_t next = (rbuf_head + 1) % RBUF_SIZE;
-    //if (parity && next != rbuf_tail) {
+#if defined(SERIAL_PARITY_EVEN) || defined(SERIAL_PARITY_ODD)
+    if (parity && next != rbuf_tail) {
+#else
     if (next != rbuf_tail) {
+#endif
         rbuf[rbuf_head] = data;
         rbuf_head = next;
     }
 
     SERIAL_RXD_INT_EXIT();
-PORTD ^= 1<<7;
+    SERIAL_SOFT_DEBUG_TGL()
 }