From: Keith Packard <keithp@keithp.com>
Date: Thu, 6 Nov 2014 23:58:42 +0000 (-0800)
Subject: altos: Declare port register type only in arch header
X-Git-Tag: bdale-altosdroid~6^2~24
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=f2e5ffd839fe5be99359e4c86a96f03148bac698

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 8140dd30..6ca12af6 100644
--- 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 d626e830..f8c7f042 100644
--- 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 fcac331b..b3c6b5dc 100644
--- 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 244421f3..48b06490 100644
--- 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