altos/ao_stdio: use uint8_t for stdio index

This makes type usage of this value consistent. Also fix another
-Wconversion warning.

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

diff --git a/src/kernel/ao.h b/src/kernel/ao.h
index c1a8609c6526c2ba24e67dab76192e0bb8b24542..806b4946fecb57bf891826750b3b79f7a6884c53 100644 (file)
--- a/src/kernel/ao.h
+++ b/src/kernel/ao.h
@@ -724,8 +724,8 @@ struct ao_stdio {
 };
 
 extern struct ao_stdio ao_stdios[];
-extern int8_t ao_cur_stdio;
-extern int8_t ao_num_stdios;
+extern uint8_t ao_cur_stdio;
+extern uint8_t ao_num_stdios;
 
 void
 flush(void);
@@ -735,7 +735,7 @@ extern uint8_t ao_stdin_ready;
 uint8_t
 ao_echo(void);
 
-int8_t
+uint8_t
 ao_add_stdio(int (*pollchar)(void),
             void (*putchar)(char) ,
             void (*flush)(void));

diff --git a/src/kernel/ao_stdio.c b/src/kernel/ao_stdio.c
index c578c57cd920b3bc6ea5e4af4c1af8520cfd8283..7f74f81194bcca5b1782c111c1d63b711b130e29 100644 (file)
--- a/src/kernel/ao_stdio.c
+++ b/src/kernel/ao_stdio.c
@@ -75,10 +75,10 @@
 struct ao_stdio ao_stdios[AO_NUM_STDIOS];
 
 #if AO_NUM_STDIOS > 1
-int8_t ao_cur_stdio;
-int8_t ao_num_stdios;
+uint8_t ao_cur_stdio;
+uint8_t ao_num_stdios;
 #else
-int8_t ao_cur_stdio;
+uint8_t ao_cur_stdio;
 #define ao_cur_stdio   0
 #define ao_num_stdios  0
 #endif
@@ -114,7 +114,7 @@ char
 ao_getchar(void) 
 {
        int c;
-       int8_t stdio;
+       uint8_t stdio;
 
        ao_arch_block_interrupts();
        stdio = ao_cur_stdio;
@@ -133,7 +133,7 @@ ao_getchar(void)
        ao_cur_stdio = stdio;
 #endif
        ao_arch_release_interrupts();
-       return c;
+       return (char) c;
 }
 
 uint8_t
@@ -142,7 +142,7 @@ ao_echo(void)
        return ao_stdios[ao_cur_stdio].echo;
 }
 
-int8_t
+uint8_t
 ao_add_stdio(int (*_pollchar)(void),
             void (*putchar)(char),
             void (*_flush)(void))