From: Keith Packard Date: Sat, 14 Apr 2012 01:35:46 +0000 (-0700) Subject: altos: Check all USE_SERIAL_*_STDIO when computing AO_NUM_STDIOS X-Git-Tag: 1.0.9.5~39 X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=1a84d34fa08f43a5f79b1a5f8d8de7674d04647d altos: Check all USE_SERIAL_*_STDIO when computing AO_NUM_STDIOS AO_NUM_STDIOS is allocated based on the total number of possible stdio values. Now that multiple serial stdio are possible, make sure to check all of them. Signed-off-by: Keith Packard --- diff --git a/src/core/ao_stdio.c b/src/core/ao_stdio.c index 18fa913e..9b4ea473 100644 --- a/src/core/ao_stdio.c +++ b/src/core/ao_stdio.c @@ -21,11 +21,47 @@ * Basic I/O functions to support SDCC stdio package */ -#ifdef SERIAL_STDIN_PORT -#define USE_SERIAL_STDIN 1 -#else -#define USE_SERIAL_STDIN 0 +#ifndef USE_SERIAL_0_STDIN +#define USE_SERIAL_0_STDIN 0 #endif +#ifndef USE_SERIAL_1_STDIN +#define USE_SERIAL_1_STDIN 0 +#endif +#ifndef USE_SERIAL_2_STDIN +#define USE_SERIAL_2_STDIN 0 +#endif +#ifndef USE_SERIAL_3_STDIN +#define USE_SERIAL_3_STDIN 0 +#endif +#ifndef USE_SERIAL_4_STDIN +#define USE_SERIAL_4_STDIN 0 +#endif +#ifndef USE_SERIAL_5_STDIN +#define USE_SERIAL_5_STDIN 0 +#endif +#ifndef USE_SERIAL_6_STDIN +#define USE_SERIAL_6_STDIN 0 +#endif +#ifndef USE_SERIAL_7_STDIN +#define USE_SERIAL_7_STDIN 0 +#endif +#ifndef USE_SERIAL_8_STDIN +#define USE_SERIAL_8_STDIN 0 +#endif +#ifndef USE_SERIAL_9_STDIN +#define USE_SERIAL_9_STDIN 0 +#endif + +#define USE_SERIAL_STDIN (USE_SERIAL_0_STDIN + \ + USE_SERIAL_1_STDIN | \ + USE_SERIAL_2_STDIN | \ + USE_SERIAL_3_STDIN | \ + USE_SERIAL_4_STDIN | \ + USE_SERIAL_5_STDIN | \ + USE_SERIAL_6_STDIN | \ + USE_SERIAL_7_STDIN | \ + USE_SERIAL_8_STDIN | \ + USE_SERIAL_9_STDIN) #define AO_NUM_STDIOS (HAS_USB + PACKET_HAS_SLAVE + USE_SERIAL_STDIN)