Use fixed-width C99 types for PowerPC in_be16() and co.

Also use the const qualifier on the address pointer's target in in_*()

Closes #2128

2 files changed, 6 insertions, 4 deletions

diff --git a/c/src/lib/libbsp/powerpc/shared/console/console.inl b/c/src/lib/libbsp/powerpc/shared/console/console.inl
index 1e300ef01a..177444e870 100644
--- a/c/src/lib/libbsp/powerpc/shared/console/console.inl
+++ b/c/src/lib/libbsp/powerpc/shared/console/console.inl
@@ -6,17 +6,18 @@
  */
 
 #include <bsp.h>
+#include <stdint.h>
 
 #define INL_IN_DECL(name,base) \
 static inline unsigned char name(int off) \
 { \
-	return in_8((unsigned char*)(((unsigned long)base) + off)); \
+	return in_8((uint8_t*)(((unsigned long)base) + off)); \
 }
 
 #define INL_OUT_DECL(name,base) \
 static inline void name(int off, unsigned int val) \
 { \
-	out_8((unsigned char*)(((unsigned long)base) + off), val); \
+	out_8((uint8_t*)(((unsigned long)base) + off), val); \
 }
 
 #ifdef BSP_UART_IOBASE_COM1
diff --git a/c/src/lib/libbsp/powerpc/shared/console/uart.c b/c/src/lib/libbsp/powerpc/shared/console/uart.c
index 917fd5bf7c..cd8657cfda 100644
--- a/c/src/lib/libbsp/powerpc/shared/console/uart.c
+++ b/c/src/lib/libbsp/powerpc/shared/console/uart.c
@@ -5,6 +5,7 @@
  * an endorsement by T.sqware of the product in which it is included.
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <bsp.h>
 #include <bsp/irq.h>
@@ -72,13 +73,13 @@ static struct uart_data uart_data[2] = {
 static inline unsigned char
 uread(int uart, unsigned int reg)
 {
-	return in_8((unsigned char*)(uart_data[uart].ioBase + reg));
+	return in_8((uint8_t*)(uart_data[uart].ioBase + reg));
 }
 
 static inline void
 uwrite(int uart, int reg, unsigned int val)
 {
-	out_8((unsigned char*)(uart_data[uart].ioBase + reg), val);
+	out_8((uint8_t*)(uart_data[uart].ioBase + reg), val);
 }