altos: Declare port register type only in arch header

Instead of defaulting to 8 bits, explicitly require declaration of the
type of the port register for each architecture.

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

diff --git a/src/attiny/ao_arch.h b/src/attiny/ao_arch.h
index 8140dd30b2541da6a885b39e6b3e64e0d7a41855..6ca12af65836904ccbc9a05c1937e1347c054715 100644 (file)
--- a/src/attiny/ao_arch.h
+++ b/src/attiny/ao_arch.h
@@ -31,6 +31,8 @@
 
 #define AO_STACK_SIZE  116
 
+#define AO_PORT_TYPE   uint8_t
+
 /* Various definitions to make GCC look more like SDCC */
 
 #define ao_arch_naked_declare  __attribute__((naked))

diff --git a/src/avr/ao_arch.h b/src/avr/ao_arch.h
index d626e830ee97bf4bdb7bf760ef2832fff698853a..f8c7f042a1954ebc7287adacc531fe9be7b0ab74 100644 (file)
--- a/src/avr/ao_arch.h
+++ b/src/avr/ao_arch.h
@@ -41,6 +41,8 @@
 #define AO_STACK_SIZE  116
 #endif
 
+#define AO_PORT_TYPE   uint8_t
+
 /* Various definitions to make GCC look more like SDCC */
 
 #define ao_arch_naked_declare  __attribute__((naked))

diff --git a/src/cc1111/ao_arch.h b/src/cc1111/ao_arch.h
index fcac331be55363d3d9a6a4fffb17432acc546283..b3c6b5dcce6fd29ffa7710ec47c1ecb5293a950d 100644 (file)
--- a/src/cc1111/ao_arch.h
+++ b/src/cc1111/ao_arch.h
@@ -40,6 +40,8 @@
 #define AO_STACK_END   0xfe
 #define AO_STACK_SIZE  (AO_STACK_END - AO_STACK_START + 1)
 
+#define AO_PORT_TYPE   uint8_t
+
 #define ao_arch_reboot() do {                                  \
        WDCTL = WDCTL_EN | WDCTL_MODE_WATCHDOG | WDCTL_INT_64;  \
        ao_delay(AO_SEC_TO_TICKS(2));                           \

diff --git a/src/kernel/ao.h b/src/kernel/ao.h
index 244421f31f1d41b25d431d6165036a80da067425..48b06490aebeb8918580f78ae97fa9818110f669 100644 (file)
--- a/src/kernel/ao.h
+++ b/src/kernel/ao.h
@@ -43,10 +43,6 @@
 #define HAS_TASK       1
 #endif
 
-#ifndef AO_PORT_TYPE
-#define AO_PORT_TYPE uint8_t
-#endif
-
 typedef AO_PORT_TYPE ao_port_t;
 
 #if HAS_TASK