Drop the pretense of C89, put declarations where they make sense

[model-railway-devices.git] / arducontrol / interface.c

diff --git a/arducontrol/interface.c b/arducontrol/interface.c
index 675770f771ab09881256ac19ee43ba0b1c165119..014e8e98bcaa0ac5eacbeb061f1a38754e1a2ae5 100644 (file)
--- a/arducontrol/interface.c
+++ b/arducontrol/interface.c
@@ -6,10 +6,15 @@
 #include "serial.h"
 #include "s88.h"
 
-uint8_t dispatch_command(const uint8_t *, uint8_t);
+static uint8_t cmd_buffer[15];
+static uint8_t cmd_length = 0;
+static uint8_t cmd_read_pos = 0;
+
+static uint8_t dispatch_command(const uint8_t *, uint8_t);
 
 void interface_init(void)
 {
+       DDRB |= 0x01;
        DDRD = (DDRD&0xFC)|0x02;
 
        serial_init(9600);
@@ -20,27 +25,44 @@ void interface_check(void)
        if(serial_read_overrun())
                interface_send1(RECEIVE_OVERRUN);
 
-       while(serial_read_available())
+       uint8_t count = serial_read_available();
+       if(count>0)
        {
-               uint8_t length = ~serial_read();
-
-               if(length>=0x10)
-                       interface_send1(FRAMING_ERROR);
-               else if(length>0)
+               PORTB |= 0x01;
+               if(cmd_length==0)
                {
-                       uint8_t cmd[15];
-                       uint8_t i;
+                       uint8_t l = ~serial_read();
+                       if(l==0)
+                               serial_write(0xFF);
+                       else if(l>=0x10)
+                               interface_send1(FRAMING_ERROR);
+                       else
+                       {
+                               cmd_length = l;
+                               --count;
+                               cmd_read_pos = 0;
+                       }
+               }
 
-                       for(i=0; i<length; ++i)
-                               cmd[i] = serial_read();
+               if(cmd_read_pos<cmd_length)
+               {
+                       if(cmd_read_pos+count>cmd_length)
+                               count = cmd_length-cmd_read_pos;
+                       for(uint8_t i=0; i<count; ++i)
+                               cmd_buffer[cmd_read_pos++] = serial_read();
 
-                       uint8_t result = dispatch_command(cmd, length);
-                       interface_send1(result);
+                       if(cmd_read_pos>=cmd_length)
+                       {
+                               uint8_t result = dispatch_command(cmd_buffer, cmd_length);
+                               interface_send1(result);
+                               cmd_length = 0;
+                       }
                }
+               PORTB &= ~0x01;
        }
 }
 
-uint8_t dispatch_command(const uint8_t *cmd, uint8_t length)
+static uint8_t dispatch_command(const uint8_t *cmd, uint8_t length)
 {
        uint8_t type = cmd[0]>>4;
        if(type==0)
@@ -61,10 +83,8 @@ uint8_t dispatch_command(const uint8_t *cmd, uint8_t length)
 
 void interface_send(const uint8_t *cmd, uint8_t length)
 {
-       uint8_t i;
-
        serial_write(~length);
-       for(i=0; i<length; ++i)
+       for(uint8_t i=0; i<length; ++i)
                serial_write(cmd[i]);
 }