From: Keith Packard <keithp@keithp.com>
Date: Mon, 25 Feb 2019 23:40:16 +0000 (-0700)
Subject: altos: Fix several mis-specified time types
X-Git-Tag: 1.9.1~1^2~109^2~2
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=6fec7b5affd223c18bad78377d7655af958dffc2

altos: Fix several mis-specified time types

Make sure AO_TICK_TYPE is used "everywhere", instead of uint16_t or other.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/attiny/ao_clock.c b/src/attiny/ao_clock.c
index d722d568..2ac0500b 100644
--- a/src/attiny/ao_clock.c
+++ b/src/attiny/ao_clock.c
@@ -28,7 +28,7 @@ ISR(TIMER1_COMPA_vect)
 		ao_wakeup((void *) &ao_tick_count);
 }
 
-uint16_t
+AO_TICK_TYPE
 ao_time(void)
 {
 	uint16_t	r;
diff --git a/src/kernel/ao_led.h b/src/kernel/ao_led.h
index 5d982ca6..b770381f 100644
--- a/src/kernel/ao_led.h
+++ b/src/kernel/ao_led.h
@@ -43,7 +43,7 @@ ao_led_set(AO_LED_TYPE colors);
 
 /* Set all LEDs in 'mask' to the specified state */
 void
-ao_led_set_mask(uint8_t colors, uint8_t mask);
+ao_led_set_mask(AO_LED_TYPE colors, AO_LED_TYPE mask);
 
 /* Toggle the specified LEDs */
 void
@@ -51,7 +51,7 @@ ao_led_toggle(AO_LED_TYPE colors);
 
 /* Turn on the specified LEDs for the indicated interval */
 void
-ao_led_for(AO_LED_TYPE colors, uint16_t ticks);
+ao_led_for(AO_LED_TYPE colors, AO_TICK_TYPE ticks);
 
 /* Initialize the LEDs */
 void
diff --git a/src/lpc/ao_arch.h b/src/lpc/ao_arch.h
index 7821839e..93676b86 100644
--- a/src/lpc/ao_arch.h
+++ b/src/lpc/ao_arch.h
@@ -33,11 +33,6 @@
 
 #define AO_LED_TYPE	AO_PORT_TYPE
 
-#ifndef AO_TICK_TYPE
-#define AO_TICK_TYPE	uint16_t
-#define AO_TICK_SIGNED	int16_t
-#endif
-
 /* Various definitions to make GCC look more like SDCC */
 
 #define ao_arch_naked_declare	__attribute__((naked))
diff --git a/src/lpc/ao_led_lpc.c b/src/lpc/ao_led_lpc.c
index 3a2d4c98..46bf0495 100644
--- a/src/lpc/ao_led_lpc.c
+++ b/src/lpc/ao_led_lpc.c
@@ -49,7 +49,7 @@ ao_led_toggle(AO_PORT_TYPE colors)
 }
 
 void
-ao_led_for(AO_PORT_TYPE colors, uint16_t ticks) 
+ao_led_for(AO_PORT_TYPE colors, AO_TICK_TYPE ticks) 
 {
 	ao_led_on(colors);
 	ao_delay(ticks);
diff --git a/src/lpc/ao_timer_lpc.c b/src/lpc/ao_timer_lpc.c
index 8999c7ac..50313333 100644
--- a/src/lpc/ao_timer_lpc.c
+++ b/src/lpc/ao_timer_lpc.c
@@ -20,7 +20,7 @@
 
 volatile AO_TICK_TYPE ao_tick_count;
 
-uint16_t
+AO_TICK_TYPE
 ao_time(void)
 {
 	return ao_tick_count;
diff --git a/src/stm/ao_arch.h b/src/stm/ao_arch.h
index c95c7cd5..e83b6bd2 100644
--- a/src/stm/ao_arch.h
+++ b/src/stm/ao_arch.h
@@ -30,11 +30,6 @@
 #define AO_STACK_SIZE	512
 #endif
 
-#ifndef AO_TICK_TYPE
-#define AO_TICK_TYPE	uint16_t
-#define AO_TICK_SIGNED	int16_t
-#endif
-
 #define AO_PORT_TYPE	uint16_t
 
 /* Various definitions to make GCC look more like SDCC */
diff --git a/src/stm/ao_led_stm.c b/src/stm/ao_led_stm.c
index 7dcbb661..ed4ec161 100644
--- a/src/stm/ao_led_stm.c
+++ b/src/stm/ao_led_stm.c
@@ -87,7 +87,7 @@ ao_led_toggle(AO_LED_TYPE colors)
 }
 
 void
-ao_led_for(AO_LED_TYPE colors, AO_LED_TYPE ticks) 
+ao_led_for(AO_LED_TYPE colors, AO_TICK_TYPE ticks) 
 {
 	ao_led_on(colors);
 	ao_delay(ticks);
diff --git a/src/stmf0/ao_arch.h b/src/stmf0/ao_arch.h
index e5f7e1f7..d70a9110 100644
--- a/src/stmf0/ao_arch.h
+++ b/src/stmf0/ao_arch.h
@@ -32,11 +32,6 @@
 
 #define AO_LED_TYPE	uint16_t
 
-#ifndef AO_TICK_TYPE
-#define AO_TICK_TYPE	uint16_t
-#define AO_TICK_SIGNED	int16_t
-#endif
-
 #define AO_PORT_TYPE	uint16_t
 
 /* Various definitions to make GCC look more like SDCC */