Send at least four S88 data octets per packets if possible

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

diff --git a/arducontrol/interface.c b/arducontrol/interface.c
index 96b1f96cd97e8cc1cf78435eb60d0a22123b9b6c..1cc4b15fa77a1af3c9f3eae71a2a49dbf5144f89 100644 (file)
--- a/arducontrol/interface.c
+++ b/arducontrol/interface.c
@@ -1,16 +1,11 @@
+#include <avr/io.h>
 #include "interface.h"
 #include "monitor.h"
 #include "motorola.h"
 #include "output.h"
 #include "serial.h"
+#include "s88.h"
 
-volatile uint8_t recv_buf[32];
-uint8_t recv_head = 0;
-uint8_t recv_tail = 0;
-volatile uint8_t recv_fill = 0;
-volatile uint8_t recv_overrun = 0;
-
-void process_commands(void);
 uint8_t dispatch_command(const uint8_t *, uint8_t);
 
 void interface_init(void)
@@ -22,53 +17,27 @@ void interface_init(void)
 
 void interface_check(void)
 {
-       if(recv_overrun)
-       {
-               serial_write(0xFE);
-               serial_write(RECEIVE_OVERRUN);
-               recv_overrun = 0;
-       }
-       if(recv_fill>0)
-               process_commands();
-}
+       if(serial_read_overrun())
+               interface_send1(RECEIVE_OVERRUN);
 
-void process_commands(void)
-{
-       while(recv_fill>0)
+       while(serial_read_available())
        {
-               uint8_t cmd[15];
-               uint8_t length = ~recv_buf[recv_tail];
-
-               if(length<0x10)
-               {
-                       if(recv_fill<=length)
-                               break;
+               uint8_t length = ~serial_read();
 
-                       uint8_t i, j;
-                       for(i=0, j=recv_tail+1; i<length; ++i, ++j)
-                       {
-                               if(j>=sizeof(recv_buf))
-                                       j = 0;
-                               cmd[i] = recv_buf[j];
-                       }
-               }
+               if(length==0)
+                       serial_write(0xFF);
+               else if(length>=0x10)
+                       interface_send1(FRAMING_ERROR);
                else
                {
-                       length = 0;
-                       serial_write(0xFE);
-                       serial_write(FRAMING_ERROR);
-               }
+                       uint8_t cmd[15];
+                       uint8_t i;
 
-               recv_tail += length+1;
-               if(recv_tail>=sizeof(recv_buf))
-                       recv_tail -= sizeof(recv_buf);
-               recv_fill -= length+1;
+                       for(i=0; i<length; ++i)
+                               cmd[i] = serial_read();
 
-               if(length>0)
-               {
                        uint8_t result = dispatch_command(cmd, length);
-                       serial_write(0xFE);
-                       serial_write(result);
+                       interface_send1(result);
                }
        }
 }
@@ -86,22 +55,23 @@ uint8_t dispatch_command(const uint8_t *cmd, uint8_t length)
        }
        else if(type==1)
                return motorola_command(cmd, length);
+       else if(type==3)
+               return s88_command(cmd, length);
        else
                return INVALID_COMMAND;
 }
 
-static inline void receive(uint8_t c)
+void interface_send(const uint8_t *cmd, uint8_t length)
 {
-       if(recv_fill>=sizeof(recv_buf))
-       {
-               recv_overrun = 1;
-               return;
-       }
+       uint8_t i;
 
-       recv_buf[recv_head++] = c;
-       if(recv_head>=sizeof(recv_buf))
-               recv_head = 0;
-       ++recv_fill;
+       serial_write(~length);
+       for(i=0; i<length; ++i)
+               serial_write(cmd[i]);
 }
 
-SERIAL_SET_CALLBACK(receive)
+void interface_send1(uint8_t cmd)
+{
+       serial_write(0xFE);
+       serial_write(cmd);
+}