X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_lco.c;h=2cb885cfc336996f7b5a3e56e4686ed48ed26c8a;hb=91b6d1e56a37a2cfae53c3727feaaa40505f48d9;hp=47752f1f11647ee79f77ac133345b3faedf8c417;hpb=38fb80e5e6af87f8c734448e4aa69b2c39854903;p=fw%2Faltos

diff --git a/src/drivers/ao_lco.c b/src/drivers/ao_lco.c
index 47752f1f..2cb885cf 100644
--- a/src/drivers/ao_lco.c
+++ b/src/drivers/ao_lco.c
@@ -34,11 +34,10 @@
 #define AO_LCO_DRAG_RACE_START_TIME	AO_SEC_TO_TICKS(5)
 #define AO_LCO_DRAG_RACE_STOP_TIME	AO_SEC_TO_TICKS(2)
 
-#define AO_LCO_VALID_LAST	1
-#define AO_LCO_VALID_EVER	2
+#define AO_LCO_BOX_DRAG		0x1000
 
 /* UI values */
-static uint16_t	ao_lco_fire_tick;
+static AO_TICK_TYPE	ao_lco_fire_tick;
 static uint8_t	ao_lco_fire_down;
 
 static uint8_t	ao_lco_display_mutex;
@@ -125,10 +124,10 @@ ao_lco_box_present(uint16_t box)
 static struct ao_task	ao_lco_drag_task;
 static uint8_t		ao_lco_drag_active;
 
-static uint16_t
-ao_lco_drag_button_check(uint16_t now, uint16_t delay)
+static AO_TICK_TYPE
+ao_lco_drag_button_check(AO_TICK_TYPE now, AO_TICK_TYPE delay)
 {
-	uint16_t	button_delay = ~0;
+	AO_TICK_TYPE	button_delay = ~0;
 
 	/*
 	 * Check to see if the button has been held down long enough
@@ -136,14 +135,14 @@ ao_lco_drag_button_check(uint16_t now, uint16_t delay)
 	 */
 	if (ao_lco_fire_down) {
 		if (ao_lco_drag_race) {
-			if ((int16_t) (now - ao_lco_fire_tick) >= AO_LCO_DRAG_RACE_STOP_TIME) {
+			if ((AO_TICK_SIGNED) (now - ao_lco_fire_tick) >= AO_LCO_DRAG_RACE_STOP_TIME) {
 				ao_lco_drag_disable();
 				ao_lco_fire_down = 0;
 			}
 			else
 				button_delay = ao_lco_fire_tick + AO_LCO_DRAG_RACE_STOP_TIME - now;
 		} else {
-			if ((int16_t) (now - ao_lco_fire_tick) >= AO_LCO_DRAG_RACE_START_TIME) {
+			if ((AO_TICK_SIGNED) (now - ao_lco_fire_tick) >= AO_LCO_DRAG_RACE_START_TIME) {
 				ao_lco_drag_enable();
 				ao_lco_fire_down = 0;
 			}
@@ -159,14 +158,14 @@ ao_lco_drag_button_check(uint16_t now, uint16_t delay)
 static void
 ao_lco_drag_monitor(void)
 {
-	uint16_t	delay = ~0;
-	uint16_t	now;
+	AO_TICK_TYPE	delay = ~0;
+	AO_TICK_TYPE	now;
 
 	ao_beep_for(AO_BEEP_MID, AO_MS_TO_TICKS(200));
 	for (;;) {
-		PRINTD("Drag monitor count %d active %d delay %d\n",
-		       ao_lco_drag_beep_count, ao_lco_drag_active, delay);
-		if (delay == (uint16_t) ~0)
+		PRINTD("Drag monitor count %d active %d delay %lu\n",
+		       ao_lco_drag_beep_count, ao_lco_drag_active, (unsigned long) delay);
+		if (delay == (AO_TICK_TYPE) ~0)
 			ao_sleep(&ao_lco_drag_beep_count);
 		else
 			ao_sleep_for(&ao_lco_drag_beep_count, delay);
@@ -218,8 +217,8 @@ ao_lco_input(void)
 
 	for (;;) {
 		ao_event_get(&event);
-		PRINTD("event type %d unit %d value %d\n",
-		       event.type, event.unit, event.value);
+		PRINTD("event type %d unit %d value %ld\n",
+		       event.type, event.unit, (long) event.value);
 		switch (event.type) {
 		case AO_EVENT_QUADRATURE:
 			switch (event.unit) {
@@ -270,7 +269,7 @@ ao_lco_input(void)
  * visually inspect the system for correct operation
  */
 static void
-ao_lco_display_test()
+ao_lco_display_test(void)
 {
 	ao_mutex_get(&ao_lco_display_mutex);
 	ao_seven_segment_set(AO_LCO_PAD_DIGIT, 8 | 0x10);
@@ -317,15 +316,15 @@ ao_lco_main(void)
 }
 
 #if DEBUG
-void
+static void
 ao_lco_set_debug(void)
 {
-	ao_cmd_decimal();
+	uint16_t r  = ao_cmd_decimal();
 	if (ao_cmd_status == ao_cmd_success)
-		ao_lco_debug = ao_cmd_lex_i != 0;
+		ao_lco_debug = r != 0;
 }
 
-__code struct ao_cmds ao_lco_cmds[] = {
+const struct ao_cmds ao_lco_cmds[] = {
 	{ ao_lco_set_debug,	"D <0 off, 1 on>\0Debug" },
 	{ ao_lco_search,	"s\0Search for pad boxes" },
 	{ 0, NULL }