Revert "Add optional 's' command to packet slave to enable/disable slave mode"

This reverts commit e7dc7fab787df63a4de72c8450e94092eb04d7db.

This patch didn't work, and magically appears to break flashing TM
from TD.

diff --git a/src/ao_packet_slave.c b/src/ao_packet_slave.c
index 3c4ffb92d26837f5216fbbe1a0a8739447098ed7..e03ebdc3a20cd90475ee00ea1610b3a3a6f28260 100644 (file)
--- a/src/ao_packet_slave.c
+++ b/src/ao_packet_slave.c
@@ -36,10 +36,8 @@ ao_packet_slave(void)
 void
 ao_packet_slave_start(void)
 {
 void
 ao_packet_slave_start(void)
 {

-       if (!ao_packet_enable) {
-               ao_packet_enable = 1;
-               ao_add_task(&ao_packet_task, ao_packet_slave, "slave");
-       }
+       ao_packet_enable = 1;
+       ao_add_task(&ao_packet_task, ao_packet_slave, "slave");

 }
 
 void
 }
 
 void


@@ -56,30 +54,10 @@ ao_packet_slave_stop(void)
        }
 }
 
        }
 }
 

-#ifdef PACKET_HAS_SLAVE_CMD
-void
-ao_packet_slave_control(void)
-{
-       ao_cmd_hex();
-       if (ao_cmd_lex_i)
-               ao_packet_slave_start();
-       else
-               ao_packet_slave_stop();
-}
-
-__code struct ao_cmds ao_packet_slave_cmds[] = {
-       { 's',  ao_packet_slave_control,        "s <enable>                         Remote packet link slave" },
-       { 0,    ao_packet_slave_control,        NULL },
-};
-#endif
-

 void
 ao_packet_slave_init(void)
 {
        ao_add_stdio(ao_packet_pollchar,
                     ao_packet_putchar,
                     NULL);
 void
 ao_packet_slave_init(void)
 {
        ao_add_stdio(ao_packet_pollchar,
                     ao_packet_putchar,
                     NULL);

-#ifdef PACKET_HAS_SLAVE_CMD
-       ao_cmd_register(&ao_packet_slave_cmds[0]);
-#endif

 }
 }

diff --git a/src/ao_pins.h b/src/ao_pins.h
index 5a0b4318056d694a591dd5ca52b2e83523da6e69..e9a265b0837a4c300f54f1c8e51e94b4b6d1ee54 100644 (file)
--- a/src/ao_pins.h
+++ b/src/ao_pins.h
@@ -41,8 +41,7 @@
        #define DBG_ON_P1               1
        #define DBG_ON_P0               0
        #define PACKET_HAS_MASTER       1
        #define DBG_ON_P1               1
        #define DBG_ON_P0               0
        #define PACKET_HAS_MASTER       1

-       #define PACKET_HAS_SLAVE        1
-       #define PACKET_HAS_SLAVE_CMD    1
+       #define PACKET_HAS_SLAVE        0

        #define AO_LED_RED              1
        #define AO_LED_GREEN            2
        #define LEDS_AVAILABLE          (AO_LED_RED|AO_LED_GREEN)
        #define AO_LED_RED              1
        #define AO_LED_GREEN            2
        #define LEDS_AVAILABLE          (AO_LED_RED|AO_LED_GREEN)