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

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

diff --git a/arducontrol/motorola.c b/arducontrol/motorola.c
index 33cf1c0a9209054391b6c380000cdf34ce1ebd85..883457ecf52b4bd44b5badccf0ae3f7ec14be826 100644 (file)
--- a/arducontrol/motorola.c
+++ b/arducontrol/motorola.c
@@ -1,4 +1,4 @@
-#include "interface.h"
+#include "commands.h"
 #include "motorola.h"
 #include "output.h"
 
@@ -12,82 +12,77 @@ static uint8_t motorola_speed_to_value(uint8_t speed)
                return 0;
 }
 
-static void motorola_common_packet(uint8_t addr, uint8_t aux, uint8_t value)
+static OutputPacket *motorola_common_packet(uint8_t addr, uint8_t aux, uint8_t value)
 {
-       uint8_t i;
+       OutputPacket *packet = output_create_packet();
 
-       clear_packet();
+       packet->bit_duration = 2;
+       packet->length = 18*8;
 
-       packet.bit_duration = 2;
-       packet.length = 18*8;
-
-       for(i=0; i<4; ++i)
+       for(uint8_t i=0; i<4; ++i)
        {
                uint8_t d = addr%3;
                addr /= 3;
 
-               packet.data[i*2] = (d==0 ? 0x01 : 0x7F);
-               packet.data[i*2+1] = (d==1 ? 0x7F : 0x01);
+               packet->data[i*2] = (d==0 ? 0x01 : 0x7F);
+               packet->data[i*2+1] = (d==1 ? 0x7F : 0x01);
        }
 
-       packet.data[8] = (aux ? 0x7F : 0x01);
-       packet.data[9] = packet.data[8];
+       packet->data[8] = (aux ? 0x7F : 0x01);
+       packet->data[9] = packet->data[8];
 
-       for(i=0; i<4; ++i)
+       for(uint8_t i=0; i<4; ++i)
        {
-               packet.data[10+i*2] = ((value&1) ? 0x7F : 0x01);
+               packet->data[10+i*2] = ((value&1) ? 0x7F : 0x01);
                value >>= 1;
        }
 
-       packet.repeat_count = 2;
+       packet->repeat_count = 2;
        // Duration of three trits
-       packet.repeat_delay = 96;
-       packet.final_delay = 224;
+       packet->repeat_delay = 96;
+       packet->final_delay = 224;
+
+       return packet;
 }
 
-static void motorola_old_packet(uint8_t addr, uint8_t aux, uint8_t value)
+static OutputPacket *motorola_old_packet(uint8_t addr, uint8_t aux, uint8_t value)
 {
-       uint8_t i;
+       OutputPacket *packet = motorola_common_packet(addr, aux, value);
 
-       motorola_common_packet(addr, aux, value);
+       for(uint8_t i=0; i<4; ++i)
+               packet->data[11+i*2] = packet->data[10+i*2];
 
-       for(i=0; i<4; ++i)
-               packet.data[11+i*2] = packet.data[10+i*2];
+       return packet;
 }
 
 void motorola_locomotive_speed_packet(uint8_t addr, uint8_t aux, uint8_t speed)
 {
        motorola_old_packet(addr, aux, motorola_speed_to_value(speed));
-
-       packet.ready = 1;
+       output_send_packet();
 }
 
 void motorola_locomotive_reverse_packet(uint8_t addr, uint8_t aux)
 {
        motorola_old_packet(addr, aux, 1);
-
-       packet.ready = 1;
+       output_send_packet();
 }
 
 void motorola_locomotive_speed_direction_packet(uint8_t addr, uint8_t aux, uint8_t speed, uint8_t dir)
 {
-       motorola_common_packet(addr, aux, motorola_speed_to_value(speed));
+       OutputPacket *packet = motorola_common_packet(addr, aux, motorola_speed_to_value(speed));
 
-       packet.data[11] = (dir ? 0x01 : 0x7F);
-       packet.data[13] = (dir ? 0x7F : 0x01);
-       packet.data[15] = (dir ? 0x01 : 0x7F);
-       packet.data[17] = 0x80-packet.data[16];
+       packet->data[11] = (dir ? 0x01 : 0x7F);
+       packet->data[13] = (dir ? 0x7F : 0x01);
+       packet->data[15] = (dir ? 0x01 : 0x7F);
+       packet->data[17] = 0x80-packet->data[16];
 
-       packet.ready = 1;
+       output_send_packet();
 }
 
 void motorola_locomotive_speed_function_packet(uint8_t addr, uint8_t aux, uint8_t speed, uint8_t func, uint8_t state)
 {
-       uint8_t i;
-       uint8_t value;
-
-       value = motorola_speed_to_value(speed);
-       motorola_common_packet(addr, aux, value);
+       uint8_t value = motorola_speed_to_value(speed);
+       OutputPacket *packet = motorola_common_packet(addr, aux, value);
 
        /*
        001 -> 011
@@ -103,13 +98,13 @@ void motorola_locomotive_speed_function_packet(uint8_t addr, uint8_t aux, uint8_
        if(func==value)
                func = ((value&8) ? 2 : 5) | (func&8);
 
-       for(i=0; i<4; ++i)
+       for(uint8_t i=0; i<4; ++i)
        {
-               packet.data[11+i*2] = ((func&1) ? 0x7F : 0x01);
+               packet->data[11+i*2] = ((func&1) ? 0x7F : 0x01);
                func >>= 1;
        }
 
-       packet.ready = 1;
+       output_send_packet();
 }
 
 void motorola_solenoid_packet(uint8_t addr, uint8_t output, uint8_t state)
@@ -118,14 +113,14 @@ void motorola_solenoid_packet(uint8_t addr, uint8_t output, uint8_t state)
        if(state)
                value |= 8;
 
-       motorola_old_packet(addr, 0, value);
-       packet.repeat_delay >>= 1;
-       packet.bit_duration = 1;
+       OutputPacket *packet = motorola_old_packet(addr, 0, value);
+       packet->repeat_delay >>= 1;
+       packet->bit_duration = 1;
 
-       packet.ready = 1;
+       output_send_packet();
 }
 
-uint8_t motorola_command(void)
+uint8_t motorola_command(const uint8_t *cmd_buf, uint8_t cmd_length)
 {
        if(cmd_buf[0]==MOTOROLA_SPEED || cmd_buf[0]==MOTOROLA_SPEED_DIRECTION || cmd_buf[0]==MOTOROLA_SPEED_FUNCTION)
        {
@@ -136,7 +131,7 @@ uint8_t motorola_command(void)
                if(addr>80)
                        return INVALID_VALUE;
 
-               if(cmd_buf[2]&0x0E)
+               if(cmd_buf[2]&0x0C)
                        return INVALID_VALUE;
                uint8_t aux = cmd_buf[2]&0x01;
 
@@ -156,8 +151,6 @@ uint8_t motorola_command(void)
 
                uint8_t dir = !(cmd_buf[3]&0x80);
 
-               while(packet.ready && !packet.done) ;
-
                if(cmd_buf[0]==MOTOROLA_SPEED)
                        motorola_locomotive_speed_packet(addr, aux, speed);
                else if(cmd_buf[0]==MOTOROLA_SPEED_DIRECTION)
@@ -178,8 +171,6 @@ uint8_t motorola_command(void)
                        return INVALID_VALUE;
                uint8_t aux = cmd_buf[2]&0x01;
 
-               while(packet.ready && !packet.done) ;
-
                motorola_locomotive_reverse_packet(addr, aux);
        }
        else if(cmd_buf[0]==MOTOROLA_SOLENOID)
@@ -196,8 +187,6 @@ uint8_t motorola_command(void)
                uint8_t output = (cmd_buf[2]&0x70)>>4;
                uint8_t state = cmd_buf[2]&1;
 
-               while(packet.ready && !packet.done) ;
-
                motorola_solenoid_packet(addr, output, state);
        }
        else