summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2010-05-04 21:42:54 -0700
committerKeith Packard <keithp@keithp.com>2010-05-04 21:42:54 -0700
commitaa9ff021d683764a43800eaa18ea0c9be5134939 (patch)
treef577f89c7f50cb6a973d497d8551267d57a32725
parent8c95f33686f69da717013ec2c25dbcd99c03aa45 (diff)
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.
-rw-r--r--src/ao_packet_slave.c26
-rw-r--r--src/ao_pins.h3
2 files changed, 3 insertions, 26 deletions
diff --git a/src/ao_packet_slave.c b/src/ao_packet_slave.c
index 3c4ffb92..e03ebdc3 100644
--- 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)
{
- 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
@@ -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);
-#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 5a0b4318..e9a265b0 100644
--- 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 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)