X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=arducontrol%2Finterface.c;h=675770f771ab09881256ac19ee43ba0b1c165119;hb=70404f704dc8acbfa4bae971661dd484a997085a;hp=9d21e9cbfe1ddf874d0e41b9807aa29a2164686e;hpb=b47b38e9dd282c5f8fb1ded25ade805e64d0cf1a;p=model-railway-devices.git

diff --git a/arducontrol/interface.c b/arducontrol/interface.c
index 9d21e9c..675770f 100644
--- a/arducontrol/interface.c
+++ b/arducontrol/interface.c
@@ -1,114 +1,75 @@
+#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;
-uint8_t cmd_buf[15];
-uint8_t cmd_length;
+uint8_t dispatch_command(const uint8_t *, uint8_t);
 
-void process_commands();
-uint8_t process_command();
-
-void interface_init()
+void interface_init(void)
 {
 	DDRD = (DDRD&0xFC)|0x02;
 
 	serial_init(9600);
 }
 
-void interface_check()
+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()
-{
-	while(recv_fill>0)
+	while(serial_read_available())
 	{
-		uint8_t consumed;
-		uint8_t c = recv_buf[recv_tail];
+		uint8_t length = ~serial_read();
 
-		cmd_length = 0;
-
-		if(c>=0xF0)
+		if(length>=0x10)
+			interface_send1(FRAMING_ERROR);
+		else if(length>0)
 		{
-			cmd_length = ~c;
-			if(recv_fill<=cmd_length)
-				break;
+			uint8_t cmd[15];
+			uint8_t i;
 
-			uint8_t i, j;
-			for(i=0, j=recv_tail+1; i<cmd_length; ++i, ++j)
-			{
-				if(j>=sizeof(recv_buf))
-					j = 0;
-				cmd_buf[i] = recv_buf[j];
-			}
+			for(i=0; i<length; ++i)
+				cmd[i] = serial_read();
 
-			consumed = 1+cmd_length;
-		}
-		else
-		{
-			serial_write(0xFE);
-			serial_write(FRAMING_ERROR);
-			consumed = 1;
-		}
-
-		recv_tail += consumed;
-		if(recv_tail>=sizeof(recv_buf))
-			recv_tail -= sizeof(recv_buf);
-		recv_fill -= consumed;
-
-		if(cmd_length>0)
-		{
-			uint8_t result = process_command();
-			serial_write(0xFE);
-			serial_write(result);
+			uint8_t result = dispatch_command(cmd, length);
+			interface_send1(result);
 		}
 	}
 }
 
-uint8_t process_command()
+uint8_t dispatch_command(const uint8_t *cmd, uint8_t length)
 {
-	uint8_t type = cmd_buf[0]>>4;
+	uint8_t type = cmd[0]>>4;
 	if(type==0)
 	{
-		uint8_t subtype = (cmd_buf[0]>>3)&1;
+		uint8_t subtype = (cmd[0]>>3)&1;
 		if(subtype==0)
-			return output_command();
+			return output_command(cmd, length);
 		else
-			return monitor_command();
+			return monitor_command(cmd, length);
 	}
 	else if(type==1)
-		return motorola_command();
+		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);
+}