diff options
82 files changed, 506 insertions, 533 deletions
diff --git a/nuttx/configs/c5471evm/include/board.h b/nuttx/configs/c5471evm/include/board.h index ffad227a7..615d4723a 100644 --- a/nuttx/configs/c5471evm/include/board.h +++ b/nuttx/configs/c5471evm/include/board.h @@ -1,7 +1,7 @@ -/************************************************************ +/************************************************************************ * arch/board.h * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * 3. Neither the name Gregory Nutt nor the names of its contributors may be + * 3. Neither the name NuttX nor the names of its contributors may be * used to endorse or promote products derived from this software * without specific prior written permission. * @@ -31,28 +31,24 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************/ + ************************************************************************/ #ifndef __ARCH_BOARD_H #define __ARCH_BOARD_H -/************************************************************ +/************************************************************************ * Included Files - ************************************************************/ + ************************************************************************/ -#ifndef __ASSEMBLY__ -# include <sys/types.h> -#endif - -/************************************************************ +/************************************************************************ * Definitions - ************************************************************/ + ************************************************************************/ -/* Clocking *************************************************/ +/* Clocking *************************************************************/ #define C5471_CLOCK 47500000 /* 47.5 MHz */ -/* LED definitions ******************************************/ +/* LED definitions ******************************************************/ #define LED_STARTED 0 #define LED_HEAPALLOCATE 1 @@ -63,8 +59,8 @@ #define LED_ASSERTION 6 #define LED_PANIC 7 -/************************************************************ +/************************************************************************ * Inline Functions - ************************************************************/ + ************************************************************************/ #endif /* __ARCH_BOARD_H */ diff --git a/nuttx/configs/c5471evm/src/up_leds.c b/nuttx/configs/c5471evm/src/up_leds.c index 1299ed88b..f733e9ffe 100644 --- a/nuttx/configs/c5471evm/src/up_leds.c +++ b/nuttx/configs/c5471evm/src/up_leds.c @@ -1,7 +1,7 @@ /**************************************************************************** * up_leds.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -38,21 +38,21 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> #include "up_internal.h" /**************************************************************************** * Definitions ****************************************************************************/ -#define CS2 *(volatile uint32*)0xffff2e08 -#define LEDS *(volatile uint32*)0x01000000 +#define CS2 *(volatile uint32_t*)0xffff2e08 +#define LEDS *(volatile uint32_t*)0x01000000 /**************************************************************************** * Private Data ****************************************************************************/ -static uint32 g_ledstate; +static uint32_t g_ledstate; /**************************************************************************** * Private Functions diff --git a/nuttx/configs/demo9s12ne64/include/board.h b/nuttx/configs/demo9s12ne64/include/board.h index 68bb15acf..5cc401461 100755 --- a/nuttx/configs/demo9s12ne64/include/board.h +++ b/nuttx/configs/demo9s12ne64/include/board.h @@ -43,10 +43,9 @@ #include <nuttx/config.h> #ifndef __ASSEMBLY__ -# include <sys/types.h> +# include <stdint.h> #endif - /************************************************************************************ * Definitions ************************************************************************************/ @@ -110,7 +109,7 @@ EXTERN void hcs12_boardinitialize(void); #ifdef CONFIG_ARCH_BUTTONS EXTERN void up_buttoninit(void); -EXTERN ubyte up_buttons(void); +EXTERN uint8_t up_buttons(void); #endif #undef EXTERN diff --git a/nuttx/configs/demo9s12ne64/src/demo9s12ne64.h b/nuttx/configs/demo9s12ne64/src/demo9s12ne64.h index 6d6589e1e..4ce8b46aa 100755 --- a/nuttx/configs/demo9s12ne64/src/demo9s12ne64.h +++ b/nuttx/configs/demo9s12ne64/src/demo9s12ne64.h @@ -43,7 +43,6 @@ #include <nuttx/config.h>
#include <nuttx/compiler.h>
-#include <sys/types.h>
/************************************************************************************
* Definitions
diff --git a/nuttx/configs/demo9s12ne64/src/up_boot.c b/nuttx/configs/demo9s12ne64/src/up_boot.c index 6b5c68886..18bf2b774 100755 --- a/nuttx/configs/demo9s12ne64/src/up_boot.c +++ b/nuttx/configs/demo9s12ne64/src/up_boot.c @@ -39,7 +39,6 @@ ************************************************************************************/
#include <nuttx/config.h>
-#include <sys/types.h>
#include <debug.h>
diff --git a/nuttx/configs/demo9s12ne64/src/up_buttons.c b/nuttx/configs/demo9s12ne64/src/up_buttons.c index cd669109d..fa015585d 100755 --- a/nuttx/configs/demo9s12ne64/src/up_buttons.c +++ b/nuttx/configs/demo9s12ne64/src/up_buttons.c @@ -38,7 +38,8 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> + +#include <stdint.h> #include <arch/board/board.h> #include "demo9s12ne64.h" @@ -73,7 +74,7 @@ void up_buttoninit(void) * Name: up_buttons ****************************************************************************/ -ubyte up_buttons(void) +uint8_t up_buttons(void) { return 0; } diff --git a/nuttx/configs/demo9s12ne64/src/up_leds.c b/nuttx/configs/demo9s12ne64/src/up_leds.c index d7bc586b6..f84f83cdd 100755 --- a/nuttx/configs/demo9s12ne64/src/up_leds.c +++ b/nuttx/configs/demo9s12ne64/src/up_leds.c @@ -39,7 +39,6 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> #include <debug.h> @@ -48,7 +47,7 @@ #include "demo9s12ne64.h" /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /* Enables debug output from this file (needs CONFIG_DEBUG with diff --git a/nuttx/configs/demo9s12ne64/src/up_nsh.c b/nuttx/configs/demo9s12ne64/src/up_nsh.c index 7884af109..fa35a3067 100755 --- a/nuttx/configs/demo9s12ne64/src/up_nsh.c +++ b/nuttx/configs/demo9s12ne64/src/up_nsh.c @@ -39,7 +39,6 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> #include <stdio.h> #include <debug.h> diff --git a/nuttx/configs/demo9s12ne64/src/up_spi.c b/nuttx/configs/demo9s12ne64/src/up_spi.c index 12dc0a7a8..5f33d0776 100755 --- a/nuttx/configs/demo9s12ne64/src/up_spi.c +++ b/nuttx/configs/demo9s12ne64/src/up_spi.c @@ -39,8 +39,9 @@ ************************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> +#include <stdbool.h> #include <debug.h> #include <nuttx/spi.h> @@ -117,11 +118,11 @@ void weak_function hcs12_spiinitialize(void) * ****************************************************************************/ -void hcs12_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean selected) +void hcs12_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { } -ubyte hcs12_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +uint8_t hcs12_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { return SPI_STATUS_PRESENT; } diff --git a/nuttx/configs/eagle100/include/board.h b/nuttx/configs/eagle100/include/board.h index febc93038..09d695938 100644 --- a/nuttx/configs/eagle100/include/board.h +++ b/nuttx/configs/eagle100/include/board.h @@ -41,9 +41,6 @@ * Included Files ************************************************************************************/ -#ifndef __ASSEMBLY__ -# include <sys/types.h> -#endif #include "lm3s_internal.h" /************************************************************************************ diff --git a/nuttx/configs/eagle100/src/eagle100_internal.h b/nuttx/configs/eagle100/src/eagle100_internal.h index e2ff65fd3..67eec836d 100644 --- a/nuttx/configs/eagle100/src/eagle100_internal.h +++ b/nuttx/configs/eagle100/src/eagle100_internal.h @@ -43,7 +43,6 @@ #include <nuttx/config.h>
#include <nuttx/compiler.h>
-#include <sys/types.h>
/************************************************************************************
* Definitions
diff --git a/nuttx/configs/eagle100/src/up_boot.c b/nuttx/configs/eagle100/src/up_boot.c index 175e8e924..a545f7e0d 100644 --- a/nuttx/configs/eagle100/src/up_boot.c +++ b/nuttx/configs/eagle100/src/up_boot.c @@ -39,7 +39,6 @@ ************************************************************************************/
#include <nuttx/config.h>
-#include <sys/types.h>
#include <debug.h>
diff --git a/nuttx/configs/eagle100/src/up_ethernet.c b/nuttx/configs/eagle100/src/up_ethernet.c index d8ee03f8a..54145ff58 100644 --- a/nuttx/configs/eagle100/src/up_ethernet.c +++ b/nuttx/configs/eagle100/src/up_ethernet.c @@ -39,8 +39,8 @@ ************************************************************************************/
#include <nuttx/config.h>
-#include <sys/types.h>
+#include <stdint.h>
#include <debug.h>
#include <assert.h>
@@ -75,8 +75,8 @@ #ifdef CONFIG_LM3S_BOARDMAC
void lm3s_ethernetmac(struct ether_addr *ethaddr)
{
- uint32 user0;
- uint32 user1;
+ uint32_t user0;
+ uint32_t user1;
/* Get the current value of the user registers */
diff --git a/nuttx/configs/eagle100/src/up_leds.c b/nuttx/configs/eagle100/src/up_leds.c index f382e63a3..c080bf674 100644 --- a/nuttx/configs/eagle100/src/up_leds.c +++ b/nuttx/configs/eagle100/src/up_leds.c @@ -39,8 +39,8 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdbool.h> #include <debug.h> #include <arch/board/board.h> @@ -89,7 +89,7 @@ * Public Functions ****************************************************************************/ -static boolean g_nest; +static uint8_t g_nest; /**************************************************************************** * Name: up_ledinit @@ -129,7 +129,7 @@ void up_ledon(int led) case LED_IRQSENABLED: case LED_STACKCREATED: led_dumpgpio("up_ledon: before lm3s_gpiowrite()"); - lm3s_gpiowrite(LED_GPIO, FALSE); + lm3s_gpiowrite(LED_GPIO, false); led_dumpgpio("up_ledon: after lm3s_gpiowrite()"); break; } @@ -157,7 +157,7 @@ void up_ledoff(int led) if (--g_nest <= 0) { led_dumpgpio("up_ledoff: before lm3s_gpiowrite()"); - lm3s_gpiowrite(LED_GPIO, TRUE); + lm3s_gpiowrite(LED_GPIO, true); led_dumpgpio("up_ledoff: after lm3s_gpiowrite()"); } break; diff --git a/nuttx/configs/eagle100/src/up_nsh.c b/nuttx/configs/eagle100/src/up_nsh.c index 0cb36ac10..184523c92 100644 --- a/nuttx/configs/eagle100/src/up_nsh.c +++ b/nuttx/configs/eagle100/src/up_nsh.c @@ -39,7 +39,6 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> #include <stdio.h> #include <debug.h> diff --git a/nuttx/configs/eagle100/src/up_ssi.c b/nuttx/configs/eagle100/src/up_ssi.c index 217e4b3bc..3ee773f59 100644 --- a/nuttx/configs/eagle100/src/up_ssi.c +++ b/nuttx/configs/eagle100/src/up_ssi.c @@ -39,8 +39,9 @@ ************************************************************************************/
#include <nuttx/config.h>
-#include <sys/types.h>
+#include <stdint.h>
+#include <stdbool.h>
#include <debug.h>
#include <nuttx/spi.h>
@@ -129,7 +130,7 @@ void weak_function lm3s_ssiinitialize(void) *
****************************************************************************/
-void lm3s_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean selected)
+void lm3s_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected)
{
ssidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
if (devid == SPIDEV_MMCSD)
@@ -142,7 +143,7 @@ void lm3s_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean sel }
}
-ubyte lm3s_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+uint8_t lm3s_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
{
#warning "Need to check schematic"
ssidbg("Returning SPI_STATUS_PRESENT\n");
diff --git a/nuttx/configs/ez80f910200kitg/src/ez80_leds.c b/nuttx/configs/ez80f910200kitg/src/ez80_leds.c index b790aa43f..12cfe11c6 100644 --- a/nuttx/configs/ez80f910200kitg/src/ez80_leds.c +++ b/nuttx/configs/ez80f910200kitg/src/ez80_leds.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/ez80f910200kitg/src/ez80_leds.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -38,7 +38,7 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> + #include <arch/board/board.h> #include "up_internal.h" diff --git a/nuttx/configs/ez80f910200kitg/src/ez80_lowinit.c b/nuttx/configs/ez80f910200kitg/src/ez80_lowinit.c index 25cd78a3e..f56ac52ce 100644 --- a/nuttx/configs/ez80f910200kitg/src/ez80_lowinit.c +++ b/nuttx/configs/ez80f910200kitg/src/ez80_lowinit.c @@ -1,7 +1,7 @@ /***************************************************************************
* configs/ez80f910200kitg/src/ez80_lowinit.c
*
- * Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Based upon sample code included with the Zilog ZDS-II toolchain.
@@ -40,12 +40,11 @@ ***************************************************************************/
#include <nuttx/config.h>
-#include <sys/types.h>
#include "chip/chip.h"
/***************************************************************************
- * Definitions
+ * Pre-processor Definitions
***************************************************************************/
/***************************************************************************
diff --git a/nuttx/configs/ez80f910200zco/include/board.h b/nuttx/configs/ez80f910200zco/include/board.h index ecbd4aee6..cbcabc803 100644 --- a/nuttx/configs/ez80f910200zco/include/board.h +++ b/nuttx/configs/ez80f910200zco/include/board.h @@ -1,7 +1,7 @@ /**************************************************************************** * arch/ez80f910200zco/include/board.h * - * Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -40,6 +40,8 @@ * Included Files ****************************************************************************/ +#include <stdint.h> + /**************************************************************************** * Definitions ****************************************************************************/ @@ -80,7 +82,7 @@ extern "C" { #ifdef CONFIG_ARCH_BUTTONS EXTERN void up_buttoninit(void); -EXTERN ubyte up_buttons(void); +EXTERN uint8_t up_buttons(void); #endif #undef EXTERN diff --git a/nuttx/configs/ez80f910200zco/src/ez80_buttons.c b/nuttx/configs/ez80f910200zco/src/ez80_buttons.c index c6cdc8936..11ead57b3 100755 --- a/nuttx/configs/ez80f910200zco/src/ez80_buttons.c +++ b/nuttx/configs/ez80f910200zco/src/ez80_buttons.c @@ -1,7 +1,7 @@ /****************************************************************************
* configs/ez80f910200zco/src/ez80_leds.c
*
- * Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,8 @@ ****************************************************************************/
#include <nuttx/config.h>
-#include <sys/types.h>
+
+#include <stdint.h>
#include <nuttx/irq.h>
@@ -69,7 +70,7 @@ #if 0
void up_PBinterrupt(void)
{
- ubyte regval;
+ uint8_t regval;
regval = inp(EZ80_PB_DR); /* Clear interrupt flag for eZ80F91 date codes before 0611 */
regval |= 7;
@@ -82,7 +83,7 @@ void up_PBinterrupt(void) void up_pb1interrupt(void)
{
- ubyte regval;
+ uint8_t regval;
regval = inp(EZ80_PB_DR); /* Clear interrupt flag for eZ80F91 date codes before 0611 */
regval |= 7;
@@ -95,7 +96,7 @@ void up_pb1interrupt(void) void up_pb2interrupt(void)
{
- ubyte regval;
+ uint8_t regval;
regval = inp(EZ80_PB_DR); /* Clear interrupt flag for eZ80F91 date codes before 0611 */
regval |= 7;
@@ -118,7 +119,7 @@ void up_pb2interrupt(void) #ifdef CONFIG_ARCH_BUTTONS
void up_buttoninit(void)
{
- ubyte regval;
+ uint8_t regval;
#if 0 /* Interrupts are not used */
@@ -166,7 +167,7 @@ void up_buttoninit(void) * Name: up_buttons
****************************************************************************/
-ubyte up_buttons(void)
+uint8_t up_buttons(void)
{
return inp(EZ80_PB_DDR) & 7;
}
diff --git a/nuttx/configs/ez80f910200zco/src/ez80_leds.c b/nuttx/configs/ez80f910200zco/src/ez80_leds.c index 8f0e4d3dc..7637f43b5 100644 --- a/nuttx/configs/ez80f910200zco/src/ez80_leds.c +++ b/nuttx/configs/ez80f910200zco/src/ez80_leds.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/ez80f910200zco/src/ez80_leds.c * - * Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -38,7 +38,8 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> + +#include <stdint.h> #include <arch/board/board.h> #include "ez80f910200zco.h" @@ -61,145 +62,145 @@ */ #if 0 /* Not used */ -static const ubyte g_chblock[7] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; /* block */ +static const uint8_t g_chblock[7] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; /* block */ #endif -static const ubyte g_chspace[7] = {0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f}; /* space */ +static const uint8_t g_chspace[7] = {0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f}; /* space */ #if 0 /* Not used */ -static const ubyte g_chexclam[7] = {0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x1f, 0x1b}; /* ! */ -static const ubyte g_chquote[7] = {0x15, 0x15, 0x15, 0x1f, 0x1f, 0x1f, 0x1f}; /* " */ -static const ubyte g_chnum[7] = {0x1f, 0x15, 0x00, 0x15, 0x00, 0x15, 0x1f}; /* # */ -static const ubyte g_chdollar[7] = {0x1b, 0x11, 0x0a, 0x11, 0x0a, 0x11, 0x1b}; /* $ */ -static const ubyte g_chpct[7] = {0x1f, 0x1e, 0x15, 0x1b, 0x15, 0x0f, 0x1f}; /* % */ -static const ubyte g_champ[7] = {0x11, 0x0e, 0x0e, 0x11, 0x15, 0x0e, 0x10}; /* & */ -static const ubyte g_chsquote[7] = {0x1b, 0x1b, 0x1b, 0x1f, 0x1f, 0x1f, 0x1f}; /* ' */ -static const ubyte g_chlparen[7] = {0x1d, 0x1b, 0x17, 0x17, 0x17, 0x1b, 0x1d}; /* ( */ -static const ubyte g_chrparen[7] = {0x17, 0x1b, 0x1d, 0x1d, 0x1d, 0x1b, 0x17}; /* ) */ +static const uint8_t g_chexclam[7] = {0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x1f, 0x1b}; /* ! */ +static const uint8_t g_chquote[7] = {0x15, 0x15, 0x15, 0x1f, 0x1f, 0x1f, 0x1f}; /* " */ +static const uint8_t g_chnum[7] = {0x1f, 0x15, 0x00, 0x15, 0x00, 0x15, 0x1f}; /* # */ +static const uint8_t g_chdollar[7] = {0x1b, 0x11, 0x0a, 0x11, 0x0a, 0x11, 0x1b}; /* $ */ +static const uint8_t g_chpct[7] = {0x1f, 0x1e, 0x15, 0x1b, 0x15, 0x0f, 0x1f}; /* % */ +static const uint8_t g_champ[7] = {0x11, 0x0e, 0x0e, 0x11, 0x15, 0x0e, 0x10}; /* & */ +static const uint8_t g_chsquote[7] = {0x1b, 0x1b, 0x1b, 0x1f, 0x1f, 0x1f, 0x1f}; /* ' */ +static const uint8_t g_chlparen[7] = {0x1d, 0x1b, 0x17, 0x17, 0x17, 0x1b, 0x1d}; /* ( */ +static const uint8_t g_chrparen[7] = {0x17, 0x1b, 0x1d, 0x1d, 0x1d, 0x1b, 0x17}; /* ) */ #endif -static const ubyte g_chast[7] = {0x1f, 0x0a, 0x11, 0x00, 0x11, 0x0a, 0x1f}; /* * */ +static const uint8_t g_chast[7] = {0x1f, 0x0a, 0x11, 0x00, 0x11, 0x0a, 0x1f}; /* * */ #if 0 /* Not used */ -static const ubyte g_chplus[7] = {0x1f, 0x1b, 0x1b, 0x00, 0x1b, 0x1b, 0x1f}; /* + */ -static const ubyte g_chcomma[7] = {0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1b, 0x17}; /* , */ -static const ubyte g_chhyphen[7] = {0x1f, 0x1f, 0x1f, 0x00, 0x1f, 0x1f, 0x1f}; /* - */ -static const ubyte g_chperiod[7] = {0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1b}; /* . */ -static const ubyte g_chslash[7] = {0x1f, 0x1e, 0x1d, 0x1b, 0x17, 0x0f, 0x1f}; /* / */ +static const uint8_t g_chplus[7] = {0x1f, 0x1b, 0x1b, 0x00, 0x1b, 0x1b, 0x1f}; /* + */ +static const uint8_t g_chcomma[7] = {0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1b, 0x17}; /* , */ +static const uint8_t g_chhyphen[7] = {0x1f, 0x1f, 0x1f, 0x00, 0x1f, 0x1f, 0x1f}; /* - */ +static const uint8_t g_chperiod[7] = {0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1b}; /* . */ +static const uint8_t g_chslash[7] = {0x1f, 0x1e, 0x1d, 0x1b, 0x17, 0x0f, 0x1f}; /* / */ #endif -static const ubyte g_ch0[7] = {0x11, 0x0e, 0x0c, 0x0a, 0x06, 0x0e, 0x11}; /* 0 */ +static const uint8_t g_ch0[7] = {0x11, 0x0e, 0x0c, 0x0a, 0x06, 0x0e, 0x11}; /* 0 */ #if 0 /* Not used */ -static const ubyte g_ch1[7] = {0x1b, 0x13, 0x1b, 0x1b, 0x1b, 0x1b, 0x11}; /* 1 */ -static const ubyte g_ch2[7] = {0x11, 0x0e, 0x1d, 0x1b, 0x17, 0x0f, 0x00}; /* 2 */ -static const ubyte g_ch3[7] = {0x11, 0x0e, 0x1e, 0x19, 0x1e, 0x0e, 0x11}; /* 3 */ -static const ubyte g_ch4[7] = {0x0e, 0x0e, 0x0e, 0x10, 0x1e, 0x1e, 0x1e}; /* 4 */ -static const ubyte g_ch5[7] = {0x00, 0x0f, 0x0f, 0x01, 0x1e, 0x0e, 0x11}; /* 5 */ -static const ubyte g_ch6[7] = {0x11, 0x0f, 0x0f, 0x01, 0x0e, 0x0e, 0x11}; /* 6 */ -static const ubyte g_ch7[7] = {0x00, 0x1e, 0x1e, 0x1d, 0x1b, 0x1b, 0x1b}; /* 7 */ -static const ubyte g_ch8[7] = {0x11, 0x0e, 0x0e, 0x11, 0x0e, 0x0e, 0x11}; /* 8 */ -static const ubyte g_ch9[7] = {0x11, 0x0e, 0x0e, 0x10, 0x1e, 0x1d, 0x1b}; /* 9 */ -static const ubyte g_chcolon[7] = {0x1f, 0x1f, 0x1b, 0x1f, 0x1b, 0x1f, 0x1f}; /* : */ -static const ubyte g_shsemi[7] = {0x1f, 0x1f, 0x1b, 0x1f, 0x1b, 0x17, 0x1f}; /* ; */ -static const ubyte g_chlt[7] = {0x1d, 0x1b, 0x17, 0x0f, 0x17, 0x1b, 0x1d}; /* < */ -static const ubyte g_cheq[7] = {0x1f, 0x1f, 0x00, 0x1f, 0x00, 0x1f, 0x1f}; /* = */ -static const ubyte g_chgt[7] = {0x17, 0x1b, 0x1d, 0x1e, 0x1d, 0x1b, 0x17}; /* > */ -static const ubyte g_chquest[7] = {0x11, 0x0e, 0x0d, 0x1b, 0x1b, 0x1f, 0x1b}; /* ? */ -static const ubyte g_chat[7] = {0x11, 0x0a, 0x04, 0x04, 0x05, 0x0a, 0x11}; /* @ */ +static const uint8_t g_ch1[7] = {0x1b, 0x13, 0x1b, 0x1b, 0x1b, 0x1b, 0x11}; /* 1 */ +static const uint8_t g_ch2[7] = {0x11, 0x0e, 0x1d, 0x1b, 0x17, 0x0f, 0x00}; /* 2 */ +static const uint8_t g_ch3[7] = {0x11, 0x0e, 0x1e, 0x19, 0x1e, 0x0e, 0x11}; /* 3 */ +static const uint8_t g_ch4[7] = {0x0e, 0x0e, 0x0e, 0x10, 0x1e, 0x1e, 0x1e}; /* 4 */ +static const uint8_t g_ch5[7] = {0x00, 0x0f, 0x0f, 0x01, 0x1e, 0x0e, 0x11}; /* 5 */ +static const uint8_t g_ch6[7] = {0x11, 0x0f, 0x0f, 0x01, 0x0e, 0x0e, 0x11}; /* 6 */ +static const uint8_t g_ch7[7] = {0x00, 0x1e, 0x1e, 0x1d, 0x1b, 0x1b, 0x1b}; /* 7 */ +static const uint8_t g_ch8[7] = {0x11, 0x0e, 0x0e, 0x11, 0x0e, 0x0e, 0x11}; /* 8 */ +static const uint8_t g_ch9[7] = {0x11, 0x0e, 0x0e, 0x10, 0x1e, 0x1d, 0x1b}; /* 9 */ +static const uint8_t g_chcolon[7] = {0x1f, 0x1f, 0x1b, 0x1f, 0x1b, 0x1f, 0x1f}; /* : */ +static const uint8_t g_shsemi[7] = {0x1f, 0x1f, 0x1b, 0x1f, 0x1b, 0x17, 0x1f}; /* ; */ +static const uint8_t g_chlt[7] = {0x1d, 0x1b, 0x17, 0x0f, 0x17, 0x1b, 0x1d}; /* < */ +static const uint8_t g_cheq[7] = {0x1f, 0x1f, 0x00, 0x1f, 0x00, 0x1f, 0x1f}; /* = */ +static const uint8_t g_chgt[7] = {0x17, 0x1b, 0x1d, 0x1e, 0x1d, 0x1b, 0x17}; /* > */ +static const uint8_t g_chquest[7] = {0x11, 0x0e, 0x0d, 0x1b, 0x1b, 0x1f, 0x1b}; /* ? */ +static const uint8_t g_chat[7] = {0x11, 0x0a, 0x04, 0x04, 0x05, 0x0a, 0x11}; /* @ */ #endif -static const ubyte g_chA[7] = {0x11, 0x0e, 0x0e, 0x0e, 0x00, 0x0e, 0x0e}; /* A */ +static const uint8_t g_chA[7] = {0x11, 0x0e, 0x0e, 0x0e, 0x00, 0x0e, 0x0e}; /* A */ #if 0 /* Not used */ -static const ubyte g_chB[7] = {0x01, 0x0e, 0x0e, 0x01, 0x0e, 0x0e, 0x01}; /* B */ +static const uint8_t g_chB[7] = {0x01, 0x0e, 0x0e, 0x01, 0x0e, 0x0e, 0x01}; /* B */ #endif -static const ubyte g_chC[7] = {0x11, 0x0e, 0x0f, 0x0f, 0x0f, 0x0e, 0x11}; /* C */ +static const uint8_t g_chC[7] = {0x11, 0x0e, 0x0f, 0x0f, 0x0f, 0x0e, 0x11}; /* C */ #if 0 /* Not used */ -static const ubyte g_chD[7] = {0x01, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x01}; /* D */ +static const uint8_t g_chD[7] = {0x01, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x01}; /* D */ #endif -static const ubyte g_chE[7] = {0x00, 0x0f, 0x0f, 0x01, 0x0f, 0x0f, 0x00}; /* E */ +static const uint8_t g_chE[7] = {0x00, 0x0f, 0x0f, 0x01, 0x0f, 0x0f, 0x00}; /* E */ #if 0 /* Not used */ -static const ubyte g_chF[7] = {0x00, 0x0f, 0x0f, 0x01, 0x0f, 0x0f, 0x0f}; /* F */ -static const ubyte g_chG[7] = {0x11, 0x0e, 0x0f, 0x08, 0x0e, 0x0e, 0x11}; /* G */ +static const uint8_t g_chF[7] = {0x00, 0x0f, 0x0f, 0x01, 0x0f, 0x0f, 0x0f}; /* F */ +static const uint8_t g_chG[7] = {0x11, 0x0e, 0x0f, 0x08, 0x0e, 0x0e, 0x11}; /* G */ #endif -static const ubyte g_chH[7] = {0x0e, 0x0e, 0x0e, 0x00, 0x0e, 0x0e, 0x0e}; /* H */ -static const ubyte g_chI[7] = {0x00, 0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x00}; /* I */ +static const uint8_t g_chH[7] = {0x0e, 0x0e, 0x0e, 0x00, 0x0e, 0x0e, 0x0e}; /* H */ +static const uint8_t g_chI[7] = {0x00, 0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x00}; /* I */ #if 0 /* Not used */ -static const ubyte g_chJ[7] = {0x00, 0x1d, 0x1d, 0x1d, 0x0d, 0x0d, 0x13}; /* J */ -static const ubyte g_chK[7] = {0x0e, 0x0d, 0x0b, 0x07, 0x0b, 0x0d, 0x0e}; /* K */ -static const ubyte g_chL[7] = {0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x00}; /* L */ -static const ubyte g_chM[7] = {0x0e, 0x04, 0x0a, 0x0a, 0x0e, 0x0e, 0x0e}; /* M */ -static const ubyte g_chN[7] = {0x0e, 0x0e, 0x06, 0x0a, 0x0c, 0x0e, 0x0e}; /* N */ -static const ubyte g_chO[7] = {0x11, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x11}; /* O */ -static const ubyte g_chP[7] = {0x01, 0x0e, 0x0e, 0x01, 0x0f, 0x0f, 0x0f}; /* P */ -static const ubyte g_chQ[7] = {0x11, 0x0e, 0x0e, 0x0e, 0x0a, 0x0c, 0x10}; /* Q */ +static const uint8_t g_chJ[7] = {0x00, 0x1d, 0x1d, 0x1d, 0x0d, 0x0d, 0x13}; /* J */ +static const uint8_t g_chK[7] = {0x0e, 0x0d, 0x0b, 0x07, 0x0b, 0x0d, 0x0e}; /* K */ +static const uint8_t g_chL[7] = {0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x00}; /* L */ +static const uint8_t g_chM[7] = {0x0e, 0x04, 0x0a, 0x0a, 0x0e, 0x0e, 0x0e}; /* M */ +static const uint8_t g_chN[7] = {0x0e, 0x0e, 0x06, 0x0a, 0x0c, 0x0e, 0x0e}; /* N */ +static const uint8_t g_chO[7] = {0x11, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x11}; /* O */ +static const uint8_t g_chP[7] = {0x01, 0x0e, 0x0e, 0x01, 0x0f, 0x0f, 0x0f}; /* P */ +static const uint8_t g_chQ[7] = {0x11, 0x0e, 0x0e, 0x0e, 0x0a, 0x0c, 0x10}; /* Q */ #endif -static const ubyte g_chR[7] = {0x01, 0x0e, 0x0e, 0x01, 0x0b, 0x0d, 0x0e}; /* R */ -static const ubyte g_chS[7] = {0x11, 0x0e, 0x0f, 0x11, 0x1e, 0x0e, 0x11}; /* S */ +static const uint8_t g_chR[7] = {0x01, 0x0e, 0x0e, 0x01, 0x0b, 0x0d, 0x0e}; /* R */ +static const uint8_t g_chS[7] = {0x11, 0x0e, 0x0f, 0x11, 0x1e, 0x0e, 0x11}; /* S */ #if 0 /* Not used */ -static const ubyte g_chT[7] = {0x00, 0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x1b}; /* T */ -static const ubyte g_chU[7] = {0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x11}; /* U */ -static const ubyte g_chV[7] = {0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x15, 0x1b}; /* V */ -static const ubyte g_chW[7] = {0x0e, 0x0e, 0x0a, 0x0a, 0x0a, 0x0a, 0x15}; /* W */ -static const ubyte g_chX[7] = {0x0e, 0x0e, 0x15, 0x1b, 0x15, 0x0e, 0x0e}; /* X */ -static const ubyte g_chY[7] = {0x0e, 0x0e, 0x15, 0x1b, 0x1b, 0x1b, 0x1b}; /* Y */ -static const ubyte g_chZ[7] = {0x00, 0x1e, 0x1d, 0x1b, 0x17, 0x0f, 0x00}; /* Z */ -static const ubyte g_chlbrack[7] = {0x03, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x03}; /* [ */ -static const ubyte g_chbslash[7] = {0x1f, 0x0f, 0x17, 0x1b, 0x1d, 0x1e, 0x1f}; /* backslash */ -static const ubyte g_chrbrack[7] = {0x1c, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1c}; /* ] */ -static const ubyte g_chcaret[7] = {0x1b, 0x15, 0x0e, 0x1f, 0x1f, 0x1f, 0x1f}; /* ^ */ -static const ubyte g_chunder[7] = {0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x00}; /* _ */ -static const ubyte g_chgrave[7] = {0x1b, 0x1b, 0x1b, 0x1f, 0x1f, 0x1f, 0x1f}; /* ' */ -static const ubyte g_cha[7] = {0x1f, 0x1f, 0x19, 0x16, 0x16, 0x16, 0x18}; /* a */ -static const ubyte g_chb[7] = {0x17, 0x17, 0x11, 0x16, 0x16, 0x16, 0x11}; /* b */ -static const ubyte g_chc[7] = {0x1f, 0x1f, 0x19, 0x16, 0x17, 0x16, 0x19}; /* c */ -static const ubyte g_chd[7] = {0x1e, 0x1e, 0x18, 0x16, 0x16, 0x16, 0x18}; /* d */ -static const ubyte g_che[7] = {0x1f, 0x1f, 0x19, 0x10, 0x17, 0x16, 0x19}; /* e */ -static const ubyte g_chf[7] = {0x1d, 0x1a, 0x1b, 0x11, 0x1b, 0x1b, 0x1b}; /* f */ -static const ubyte g_chg[7] = {0x1f, 0x19, 0x16, 0x16, 0x18, 0x16, 0x19}; /* g */ -static const ubyte g_chh[7] = {0x17, 0x17, 0x11, 0x16, 0x16, 0x16, 0x16}; /* h */ -static const ubyte g_chi[7] = {0x1f, 0x1f, 0x1b, 0x1f, 0x1b, 0x1b, 0x1b}; /* i */ -static const ubyte g_chj[7] = {0x1f, 0x1d, 0x1f, 0x1d, 0x1d, 0x1d, 0x13}; /* j */ -static const ubyte g_chk[7] = {0x17, 0x17, 0x15, 0x13, 0x13, 0x15, 0x16}; /* k */ -static const ubyte g_chl[7] = {0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x1b}; /* l */ -static const ubyte g_chm[7] = {0x1f, 0x1f, 0x05, 0x0a, 0x0a, 0x0a, 0x0a}; /* m */ -static const ubyte g_chn[7] = {0x1f, 0x1f, 0x11, 0x16, 0x16, 0x16, 0x16}; /* n */ -static const ubyte g_cho[7] = {0x1f, 0x1f, 0x19, 0x16, 0x16, 0x16, 0x19}; /* o */ -static const ubyte g_chp[7] = {0x1f, 0x11, 0x16, 0x16, 0x11, 0x17, 0x17}; /* p */ -static const ubyte g_chq[7] = {0x1f, 0x18, 0x16, 0x16, 0x18, 0x1e, 0x1e}; /* q */ -static const ubyte g_chr[7] = {0x1f, 0x1f, 0x11, 0x16, 0x17, 0x17, 0x17}; /* r */ -static const ubyte g_chs[7] = {0x1f, 0x1f, 0x18, 0x17, 0x19, 0x1e, 0x11}; /* s */ -static const ubyte g_cht[7] = {0x1f, 0x1f, 0x1b, 0x11, 0x1b, 0x1b, 0x1b}; /* t */ -static const ubyte g_chu[7] = {0x1f, 0x1f, 0x16, 0x16, 0x16, 0x16, 0x18}; /* u */ -static const ubyte g_chv[7] = {0x1f, 0x1f, 0x16, 0x16, 0x16, 0x16, 0x19}; /* v */ -static const ubyte g_chw[7] = {0x1f, 0x1f, 0x0a, 0x0a, 0x0a, 0x0a, 0x15}; /* w */ -static const ubyte g_chx[7] = {0x1f, 0x1f, 0x0e, 0x15, 0x1b, 0x15, 0x0e}; /* x */ -static const ubyte g_chy[7] = {0x1f, 0x1a, 0x1a, 0x1a, 0x1d, 0x1b, 0x17}; /* y */ -static const ubyte g_cha[7] = {0x1f, 0x1f, 0x10, 0x1d, 0x1b, 0x17, 0x10}; /* z */ -static const ubyte g_chlbrace[7] = {0x1d, 0x1b, 0x1b, 0x17, 0x1b, 0x1b, 0x1d}; /* { */ -static const ubyte g_chvbar[7] = {0x1b, 0x1b, 0x1b, 0x1f, 0x1b, 0x1b, 0x1b}; /* | */ -static const ubyte g_chrbrace[7] = {0x17, 0x1b, 0x1b, 0x1d, 0x1b, 0x1b, 0x17}; /* } */ -static const ubyte g_chtilde[7] = {0x1f, 0x1a, 0x15, 0x1f, 0x1f, 0x1f, 0x1f}; /* ~ */ +static const uint8_t g_chT[7] = {0x00, 0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x1b}; /* T */ +static const uint8_t g_chU[7] = {0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x11}; /* U */ +static const uint8_t g_chV[7] = {0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x15, 0x1b}; /* V */ +static const uint8_t g_chW[7] = {0x0e, 0x0e, 0x0a, 0x0a, 0x0a, 0x0a, 0x15}; /* W */ +static const uint8_t g_chX[7] = {0x0e, 0x0e, 0x15, 0x1b, 0x15, 0x0e, 0x0e}; /* X */ +static const uint8_t g_chY[7] = {0x0e, 0x0e, 0x15, 0x1b, 0x1b, 0x1b, 0x1b}; /* Y */ +static const uint8_t g_chZ[7] = {0x00, 0x1e, 0x1d, 0x1b, 0x17, 0x0f, 0x00}; /* Z */ +static const uint8_t g_chlbrack[7] = {0x03, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x03}; /* [ */ +static const uint8_t g_chbslash[7] = {0x1f, 0x0f, 0x17, 0x1b, 0x1d, 0x1e, 0x1f}; /* backslash */ +static const uint8_t g_chrbrack[7] = {0x1c, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1c}; /* ] */ +static const uint8_t g_chcaret[7] = {0x1b, 0x15, 0x0e, 0x1f, 0x1f, 0x1f, 0x1f}; /* ^ */ +static const uint8_t g_chunder[7] = {0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x00}; /* _ */ +static const uint8_t g_chgrave[7] = {0x1b, 0x1b, 0x1b, 0x1f, 0x1f, 0x1f, 0x1f}; /* ' */ +static const uint8_t g_cha[7] = {0x1f, 0x1f, 0x19, 0x16, 0x16, 0x16, 0x18}; /* a */ +static const uint8_t g_chb[7] = {0x17, 0x17, 0x11, 0x16, 0x16, 0x16, 0x11}; /* b */ +static const uint8_t g_chc[7] = {0x1f, 0x1f, 0x19, 0x16, 0x17, 0x16, 0x19}; /* c */ +static const uint8_t g_chd[7] = {0x1e, 0x1e, 0x18, 0x16, 0x16, 0x16, 0x18}; /* d */ +static const uint8_t g_che[7] = {0x1f, 0x1f, 0x19, 0x10, 0x17, 0x16, 0x19}; /* e */ +static const uint8_t g_chf[7] = {0x1d, 0x1a, 0x1b, 0x11, 0x1b, 0x1b, 0x1b}; /* f */ +static const uint8_t g_chg[7] = {0x1f, 0x19, 0x16, 0x16, 0x18, 0x16, 0x19}; /* g */ +static const uint8_t g_chh[7] = {0x17, 0x17, 0x11, 0x16, 0x16, 0x16, 0x16}; /* h */ +static const uint8_t g_chi[7] = {0x1f, 0x1f, 0x1b, 0x1f, 0x1b, 0x1b, 0x1b}; /* i */ +static const uint8_t g_chj[7] = {0x1f, 0x1d, 0x1f, 0x1d, 0x1d, 0x1d, 0x13}; /* j */ +static const uint8_t g_chk[7] = {0x17, 0x17, 0x15, 0x13, 0x13, 0x15, 0x16}; /* k */ +static const uint8_t g_chl[7] = {0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x1b}; /* l */ +static const uint8_t g_chm[7] = {0x1f, 0x1f, 0x05, 0x0a, 0x0a, 0x0a, 0x0a}; /* m */ +static const uint8_t g_chn[7] = {0x1f, 0x1f, 0x11, 0x16, 0x16, 0x16, 0x16}; /* n */ +static const uint8_t g_cho[7] = {0x1f, 0x1f, 0x19, 0x16, 0x16, 0x16, 0x19}; /* o */ +static const uint8_t g_chp[7] = {0x1f, 0x11, 0x16, 0x16, 0x11, 0x17, 0x17}; /* p */ +static const uint8_t g_chq[7] = {0x1f, 0x18, 0x16, 0x16, 0x18, 0x1e, 0x1e}; /* q */ +static const uint8_t g_chr[7] = {0x1f, 0x1f, 0x11, 0x16, 0x17, 0x17, 0x17}; /* r */ +static const uint8_t g_chs[7] = {0x1f, 0x1f, 0x18, 0x17, 0x19, 0x1e, 0x11}; /* s */ +static const uint8_t g_cht[7] = {0x1f, 0x1f, 0x1b, 0x11, 0x1b, 0x1b, 0x1b}; /* t */ +static const uint8_t g_chu[7] = {0x1f, 0x1f, 0x16, 0x16, 0x16, 0x16, 0x18}; /* u */ +static const uint8_t g_chv[7] = {0x1f, 0x1f, 0x16, 0x16, 0x16, 0x16, 0x19}; /* v */ +static const uint8_t g_chw[7] = {0x1f, 0x1f, 0x0a, 0x0a, 0x0a, 0x0a, 0x15}; /* w */ +static const uint8_t g_chx[7] = {0x1f, 0x1f, 0x0e, 0x15, 0x1b, 0x15, 0x0e}; /* x */ +static const uint8_t g_chy[7] = {0x1f, 0x1a, 0x1a, 0x1a, 0x1d, 0x1b, 0x17}; /* y */ +static const uint8_t g_cha[7] = {0x1f, 0x1f, 0x10, 0x1d, 0x1b, 0x17, 0x10}; /* z */ +static const uint8_t g_chlbrace[7] = {0x1d, 0x1b, 0x1b, 0x17, 0x1b, 0x1b, 0x1d}; /* { */ +static const uint8_t g_chvbar[7] = {0x1b, 0x1b, 0x1b, 0x1f, 0x1b, 0x1b, 0x1b}; /* | */ +static const uint8_t g_chrbrace[7] = {0x17, 0x1b, 0x1b, 0x1d, 0x1b, 0x1b, 0x17}; /* } */ +static const uint8_t g_chtilde[7] = {0x1f, 0x1a, 0x15, 0x1f, 0x1f, 0x1f, 0x1f}; /* ~ */ #endif /* The current and previously selected glyph */ -static const ubyte *g_currglyph = g_chspace; -static const ubyte *g_prevglyph = g_chspace; +static const uint8_t *g_currglyph = g_chspace; +static const uint8_t *g_prevglyph = g_chspace; /* Current row and column */ -static ubyte g_anodecol = 1; -static ubyte g_cathoderow = 0; +static uint8_t g_anodecol = 1; +static uint8_t g_cathoderow = 0; static sbyte g_intcount = 0; /**************************************************************************** @@ -229,7 +230,7 @@ void up_ledinit(void) void up_ledon(int led) { - FAR const ubyte *tmp = g_currglyph; + FAR const uint8_t *tmp = g_currglyph; switch (led) { case LED_STARTED: diff --git a/nuttx/configs/ez80f910200zco/src/ez80_lowinit.c b/nuttx/configs/ez80f910200zco/src/ez80_lowinit.c index e015e57e3..e08670df6 100644 --- a/nuttx/configs/ez80f910200zco/src/ez80_lowinit.c +++ b/nuttx/configs/ez80f910200zco/src/ez80_lowinit.c @@ -1,7 +1,7 @@ /***************************************************************************
* configs/ez80f910200zco/src/ez80_lowinit.c
*
- * Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Based upon sample code included with the Zilog ZDS-II toolchain.
@@ -40,7 +40,6 @@ ***************************************************************************/
#include <nuttx/config.h>
-#include <sys/types.h>
#include "chip/chip.h"
diff --git a/nuttx/configs/ez80f910200zco/src/ez80f910200zco.h b/nuttx/configs/ez80f910200zco/src/ez80f910200zco.h index 4f2424c5f..f7612d694 100644 --- a/nuttx/configs/ez80f910200zco/src/ez80f910200zco.h +++ b/nuttx/configs/ez80f910200zco/src/ez80f910200zco.h @@ -40,6 +40,10 @@ * Included Files ****************************************************************************/ +#ifndef __ASSEMBLY__ +# include <stdint.h> +#endif + /**************************************************************************** * Definitions ****************************************************************************/ @@ -64,8 +68,8 @@ #define EZ80_TRIGGERS EZ80_LEDCATHODE #define EZ80_GPIODATA 0x800002 /* RD/WR: GPIO data */ -#define ez80_getmmreg8(a) (*(ubyte*)(a)) -#define ez80_putmmreg8(v,a) (*(ubyte*)(a) = (v)) +#define ez80_getmmreg8(a) (*(uint8_t*)(a)) +#define ez80_putmmreg8(v,a) (*(uint8_t*)(a) = (v)) /* LED anode/GPIO port output control bit definitions */ diff --git a/nuttx/configs/mcu123-lpc214x/include/board.h b/nuttx/configs/mcu123-lpc214x/include/board.h index e860cbb5e..04dab43f9 100644 --- a/nuttx/configs/mcu123-lpc214x/include/board.h +++ b/nuttx/configs/mcu123-lpc214x/include/board.h @@ -1,7 +1,7 @@ /**************************************************************************** * configs/mcu123-lpc214x/include/board.h * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -40,10 +40,6 @@ * Included Files ****************************************************************************/ -#ifndef __ASSEMBLY__ -# include <sys/types.h> -#endif - /**************************************************************************** * Definitions ****************************************************************************/ diff --git a/nuttx/configs/mcu123-lpc214x/src/up_leds.c b/nuttx/configs/mcu123-lpc214x/src/up_leds.c index f259fff61..1cc716753 100644 --- a/nuttx/configs/mcu123-lpc214x/src/up_leds.c +++ b/nuttx/configs/mcu123-lpc214x/src/up_leds.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/mcu123-lpc214x/src/up_leds.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -38,7 +38,6 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> #include "chip.h" #include "up_arch.h" diff --git a/nuttx/configs/mcu123-lpc214x/src/up_nsh.c b/nuttx/configs/mcu123-lpc214x/src/up_nsh.c index 18abb7435..9518862c8 100644 --- a/nuttx/configs/mcu123-lpc214x/src/up_nsh.c +++ b/nuttx/configs/mcu123-lpc214x/src/up_nsh.c @@ -39,7 +39,6 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> #include <stdio.h> #include <debug.h> diff --git a/nuttx/configs/mcu123-lpc214x/src/up_spi.c b/nuttx/configs/mcu123-lpc214x/src/up_spi.c index 50d41cc90..f9949a7ea 100644 --- a/nuttx/configs/mcu123-lpc214x/src/up_spi.c +++ b/nuttx/configs/mcu123-lpc214x/src/up_spi.c @@ -62,7 +62,10 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <nuttx/spi.h> + +#include <sys/types.h> +#include <stdint.h> +#include <stdbool.h> #include <debug.h> #include <arch/board/board.h> @@ -120,10 +123,10 @@ * Private Function Prototypes ****************************************************************************/ -static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean selected); -static uint32 spi_setfrequency(FAR struct spi_dev_s *dev, uint32 frequency); -static ubyte spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); -static uint16 spi_send(FAR struct spi_dev_s *dev, uint16 ch); +static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); +static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency); +static uint8_t spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); +static uint16_t spi_send(FAR struct spi_dev_s *dev, uint16_t ch); static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size_t nwords); static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nwords); @@ -164,16 +167,16 @@ static struct spi_dev_s g_spidev = { &g_spiops }; * Input Parameters: * dev - Device-specific state data * devid - Identifies the device to select - * selected - TRUE: slave selected, FALSE: slave de-selected + * selected - true: slave selected, false: slave de-selected * * Returned Value: * None * ****************************************************************************/ -static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean selected) +static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { - uint32 bit = 1 << 20; + uint32_t bit = 1 << 20; if (selected) { @@ -227,9 +230,9 @@ static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean * ****************************************************************************/ -static uint32 spi_setfrequency(FAR struct spi_dev_s *dev, uint32 frequency) +static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency) { - uint32 divisor = LPC214X_PCLKFREQ / frequency; + uint32_t divisor = LPC214X_PCLKFREQ / frequency; if (divisor < 2) { @@ -262,7 +265,7 @@ static uint32 spi_setfrequency(FAR struct spi_dev_s *dev, uint32 frequency) * ****************************************************************************/ -static ubyte spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +static uint8_t spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { /* I don't think there is anyway to determine these things on the mcu123.com * board. @@ -288,9 +291,9 @@ static ubyte spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) * ****************************************************************************/ -static uint16 spi_send(FAR struct spi_dev_s *dev, uint16 wd) +static uint16_t spi_send(FAR struct spi_dev_s *dev, uint16_t wd) { - register uint16 regval; + register uint16_t regval; /* Wait while the TX FIFO is full */ @@ -298,7 +301,7 @@ static uint16 spi_send(FAR struct spi_dev_s *dev, uint16 wd) /* Write the byte to the TX FIFO */ - putreg16((ubyte)wd, LPC214X_SPI1_DR); + putreg16((uint8_t)wd, LPC214X_SPI1_DR); /* Wait for the RX FIFO not empty */ @@ -323,7 +326,7 @@ static uint16 spi_send(FAR struct spi_dev_s *dev, uint16 wd) * nwords - the length of data to send from the buffer in number of words. * The wordsize is determined by the number of bits-per-word * selected for the SPI interface. If nbits <= 8, the data is - * packed into ubytes; if nbits >8, the data is packed into uint16's + * packed into uint8_t's; if nbits >8, the data is packed into uint16_t's * * Returned Value: * None @@ -332,8 +335,8 @@ static uint16 spi_send(FAR struct spi_dev_s *dev, uint16 wd) static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size_t nwords) { - FAR const ubyte *ptr = (FAR const ubyte *)buffer; - ubyte sr; + FAR const uint8_t *ptr = (FAR const uint8_t *)buffer; + uint8_t sr; /* Loop while thre are bytes remaining to be sent */ @@ -346,7 +349,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size { /* Send the data */ - putreg16((uint16)*ptr, LPC214X_SPI1_DR); + putreg16((uint16_t)*ptr, LPC214X_SPI1_DR); ptr++; nwords--; } @@ -367,7 +370,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size (void)getreg16(LPC214X_SPI1_DR); } - /* There is a race condition where TFE may go TRUE just before + /* There is a race condition where TFE may go true just before * RNE goes true and this loop terminates prematurely. The nasty little * delay in the following solves that (it could probably be tuned * to improve performance). @@ -394,7 +397,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size * nwords - the length of data that can be received in the buffer in number * of words. The wordsize is determined by the number of bits-per-word * selected for the SPI interface. If nbits <= 8, the data is - * packed into ubytes; if nbits >8, the data is packed into uint16's + * packed into uint8_t's; if nbits >8, the data is packed into uint16_t's * * Returned Value: * None @@ -403,8 +406,8 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nwords) { - FAR ubyte *ptr = (FAR ubyte*)buffer; - uint32 rxpending = 0; + FAR uint8_t *ptr = (FAR uint8_t*)buffer; + uint32_t rxpending = 0; /* While there is remaining to be sent (and no synchronization error has occurred) */ @@ -431,7 +434,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw spivdbg("RX: rxpending: %d\n", rxpending); while (getreg8(LPC214X_SPI1_SR) & LPC214X_SPI1SR_RNE) { - *ptr++ = (ubyte)getreg16(LPC214X_SPI1_DR); + *ptr++ = (uint8_t)getreg16(LPC214X_SPI1_DR); rxpending--; } } @@ -457,8 +460,8 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nw FAR struct spi_dev_s *up_spiinitialize(int port) { - uint32 regval32; - ubyte regval8; + uint32_t regval32; + uint8_t regval8; int i; /* Only the SPI1 interface is supported */ diff --git a/nuttx/configs/mcu123-lpc214x/src/up_usbstrg.c b/nuttx/configs/mcu123-lpc214x/src/up_usbstrg.c index aab15f13a..0159e81fc 100755 --- a/nuttx/configs/mcu123-lpc214x/src/up_usbstrg.c +++ b/nuttx/configs/mcu123-lpc214x/src/up_usbstrg.c @@ -42,7 +42,6 @@ #include <nuttx/config.h> #include <stdio.h> -#include <sys/types.h> #include <debug.h> #include <errno.h> diff --git a/nuttx/configs/mx1ads/include/board.h b/nuttx/configs/mx1ads/include/board.h index 212903f22..7fa096b25 100644 --- a/nuttx/configs/mx1ads/include/board.h +++ b/nuttx/configs/mx1ads/include/board.h @@ -41,10 +41,6 @@ * Included Files ************************************************************************************/ -#ifndef __ASSEMBLY__ -# include <sys/types.h> -#endif - /************************************************************************************ * Definitions ************************************************************************************/ diff --git a/nuttx/configs/mx1ads/src/up_boot.c b/nuttx/configs/mx1ads/src/up_boot.c index 237f6aa9b..05ba833af 100755 --- a/nuttx/configs/mx1ads/src/up_boot.c +++ b/nuttx/configs/mx1ads/src/up_boot.c @@ -39,7 +39,8 @@ ************************************************************************************/
#include <nuttx/config.h>
-#include <sys/types.h>
+
+#include <stdint.h>
#include <arch/board/board.h>
@@ -69,7 +70,7 @@ void imx_boardinitialize(void)
{
- uint32 regval;
+ uint32_t regval;
putreg32(0x000003ab, IMX_SC_GPCR); /* I/O pad driving strength */
putreg32(IMX_MPCTL0_VALUE, IMX_PLL_MPCTL0);
diff --git a/nuttx/configs/mx1ads/src/up_leds.c b/nuttx/configs/mx1ads/src/up_leds.c index 38e3e6a69..ff9a9b638 100644 --- a/nuttx/configs/mx1ads/src/up_leds.c +++ b/nuttx/configs/mx1ads/src/up_leds.c @@ -39,7 +39,7 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> + #include "up_internal.h" /**************************************************************************** diff --git a/nuttx/configs/mx1ads/src/up_network.c b/nuttx/configs/mx1ads/src/up_network.c index 342fd7891..5eb0460ea 100644 --- a/nuttx/configs/mx1ads/src/up_network.c +++ b/nuttx/configs/mx1ads/src/up_network.c @@ -41,7 +41,6 @@ #include <nuttx/config.h> #if defined(CONFIG_NET) && defined(CONFIG_NET_CS8900) -#include <sys/types.h> #include <debug.h> #include <arch/board/board.h> diff --git a/nuttx/configs/ntosd-dm320/include/board.h b/nuttx/configs/ntosd-dm320/include/board.h index e4a9befe8..30ecb14ba 100644 --- a/nuttx/configs/ntosd-dm320/include/board.h +++ b/nuttx/configs/ntosd-dm320/include/board.h @@ -1,7 +1,7 @@ /************************************************************************************ * arch/board/board.h * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -40,10 +40,6 @@ * Included Files ************************************************************************************/ -#ifndef __ASSEMBLY__ -# include <sys/types.h> -#endif - /************************************************************************************ * Definitions ************************************************************************************/ diff --git a/nuttx/configs/ntosd-dm320/src/up_leds.c b/nuttx/configs/ntosd-dm320/src/up_leds.c index 102d0a38c..15cf7b99f 100644 --- a/nuttx/configs/ntosd-dm320/src/up_leds.c +++ b/nuttx/configs/ntosd-dm320/src/up_leds.c @@ -1,7 +1,7 @@ -/************************************************************ - * up_leds.c +/************************************************************************ + * confgs/ntosd-dm320/src/up_leds.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -14,7 +14,7 @@ * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. - * 3. Neither the name Gregory Nutt nor the names of its contributors may be + * 3. Neither the name NuttX nor the names of its contributors may be * used to endorse or promote products derived from this software * without specific prior written permission. * @@ -31,35 +31,35 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************/ + ************************************************************************/ -/************************************************************ +/************************************************************************ * Included Files - ************************************************************/ + ************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> + #include "up_internal.h" -/************************************************************ +/************************************************************************ * Definitions - ************************************************************/ + ************************************************************************/ -/************************************************************ +/************************************************************************ * Private Data - ************************************************************/ + ************************************************************************/ -/************************************************************ +/************************************************************************ * Private Functions - ************************************************************/ + ************************************************************************/ -/************************************************************ +/************************************************************************ * Public Funtions - ************************************************************/ + ************************************************************************/ -/************************************************************ +/************************************************************************ * Name: up_ledinit - ************************************************************/ + ************************************************************************/ #ifdef CONFIG_ARCH_LEDS void up_ledinit(void) @@ -70,9 +70,9 @@ void up_ledinit(void) GIO_CLEAR_OUTPUT(GIO_LED_RED); } -/************************************************************ +/************************************************************************ * Name: up_ledon - ************************************************************/ + ************************************************************************/ void up_ledon(int led) { @@ -86,9 +86,9 @@ void up_ledon(int led) } } -/************************************************************ +/************************************************************************ * Name: up_ledoff - ************************************************************/ + ************************************************************************/ void up_ledoff(int led) { diff --git a/nuttx/configs/ntosd-dm320/src/up_network.c b/nuttx/configs/ntosd-dm320/src/up_network.c index a3cff0ddf..df2f76ca7 100644 --- a/nuttx/configs/ntosd-dm320/src/up_network.c +++ b/nuttx/configs/ntosd-dm320/src/up_network.c @@ -40,7 +40,6 @@ #include <nuttx/config.h> #if defined(CONFIG_NET) && defined(CONFIG_NET_DM90x0) -#include <sys/types.h> #include <debug.h> #include <arch/board/board.h> diff --git a/nuttx/configs/olimex-strp711/include/board.h b/nuttx/configs/olimex-strp711/include/board.h index 911e0bff7..1d4b503c4 100644 --- a/nuttx/configs/olimex-strp711/include/board.h +++ b/nuttx/configs/olimex-strp711/include/board.h @@ -1,7 +1,7 @@ /**************************************************************************** * configs/olimex-strp711/include/board.h * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -70,7 +70,7 @@ ****************************************************************************/ #ifndef __ASSEMBLY__ -# include <sys/types.h> +# include <stdint.h> #endif #include "chip.h" @@ -173,7 +173,7 @@ extern "C" { #ifdef CONFIG_ARCH_BUTTONS EXTERN void up_buttoninit(void); -EXTERN ubyte up_buttons(void); +EXTERN uint8_t up_buttons(void); #endif #undef EXTERN diff --git a/nuttx/configs/olimex-strp711/src/up_buttons.c b/nuttx/configs/olimex-strp711/src/up_buttons.c index f6340026e..a33c1caeb 100644 --- a/nuttx/configs/olimex-strp711/src/up_buttons.c +++ b/nuttx/configs/olimex-strp711/src/up_buttons.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/olimex-strp711/src/up_leds.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -38,7 +38,7 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> #include "chip.h" #include "up_arch.h" @@ -76,7 +76,7 @@ #ifdef CONFIG_ARCH_BUTTONS void up_buttoninit(void) { - uint16 reg16; + uint16_t reg16; /* Configure the GPIO0 & 1 pins as inputs */ @@ -109,9 +109,9 @@ void up_buttoninit(void) * Name: up_buttons ****************************************************************************/ -ubyte up_buttons(void) +uint8_t up_buttons(void) { - ubyte ret = 0; + uint8_t ret = 0; if ((getreg16(STR71X_GPIO0_PD) & STR71X_WAKEUPBUTTON_GPIO0) != 0) { diff --git a/nuttx/configs/olimex-strp711/src/up_leds.c b/nuttx/configs/olimex-strp711/src/up_leds.c index a5719d5f9..8f803346d 100644 --- a/nuttx/configs/olimex-strp711/src/up_leds.c +++ b/nuttx/configs/olimex-strp711/src/up_leds.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/olimex-strp711/src/up_leds.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -38,7 +38,7 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> #include "chip.h" #include "up_arch.h" @@ -62,8 +62,8 @@ * Private Data ****************************************************************************/ -static uint16 g_led2set; -static uint16 g_led2clr; +static uint16_t g_led2set; +static uint16_t g_led2clr; /**************************************************************************** * Private Functions @@ -73,9 +73,9 @@ static uint16 g_led2clr; * Name: up_setleds ****************************************************************************/ -static void up_setleds(uint16 setbits, uint16 clearbits) +static void up_setleds(uint16_t setbits, uint16_t clearbits) { - uint16 reg16; + uint16_t reg16; /* Save the state of LED2 for later */ @@ -101,7 +101,7 @@ static void up_setleds(uint16 setbits, uint16 clearbits) #ifdef CONFIG_ARCH_LEDS void up_ledinit(void) { - uint16 reg16; + uint16_t reg16; /* Set normal function output */ diff --git a/nuttx/configs/olimex-strp711/src/up_nsh.c b/nuttx/configs/olimex-strp711/src/up_nsh.c index cf4f55807..586989579 100644 --- a/nuttx/configs/olimex-strp711/src/up_nsh.c +++ b/nuttx/configs/olimex-strp711/src/up_nsh.c @@ -39,7 +39,6 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> #include <stdio.h> #include <debug.h> diff --git a/nuttx/configs/olimex-strp711/src/up_spi.c b/nuttx/configs/olimex-strp711/src/up_spi.c index 04337445b..4f6036c3f 100644 --- a/nuttx/configs/olimex-strp711/src/up_spi.c +++ b/nuttx/configs/olimex-strp711/src/up_spi.c @@ -38,6 +38,11 @@ ****************************************************************************/ #include <nuttx/config.h> + +#include <sys/types.h> +#include <stdint.h> +#include <stdbool.h> + #include <nuttx/spi.h> #include <arch/board/board.h> @@ -248,8 +253,8 @@ struct str71x_spidev_s { struct spi_dev_s spidev; /* Externally visible part of the SPI interface */ - uint32 spibase; /* BSPIn base address */ - uint16 csbit; /* BSPIn SS bit int GPIO0 */ + uint32_t spibase; /* BSPIn base address */ + uint16_t csbit; /* BSPIn SS bit int GPIO0 */ }; /**************************************************************************** @@ -258,15 +263,15 @@ struct str71x_spidev_s /* Helpers */ -static inline uint16 spi_getreg(FAR struct str71x_spidev_s *priv, ubyte offset); -static inline void spi_putreg(FAR struct str71x_spidev_s *priv, ubyte offset, uint16 value); +static inline uint16_t spi_getreg(FAR struct str71x_spidev_s *priv, uint8_t offset); +static inline void spi_putreg(FAR struct str71x_spidev_s *priv, uint8_t offset, uint16_t value); /* SPI methods */ -static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean selected); -static uint32 spi_setfrequency(FAR struct spi_dev_s *dev, uint32 frequency); -static ubyte spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); -static uint16 spi_send(FAR struct spi_dev_s *dev, uint16 wd); +static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected); +static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency); +static uint8_t spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid); +static uint16_t spi_send(FAR struct spi_dev_s *dev, uint16_t wd); static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size_t buflen); static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t buflen); @@ -327,7 +332,7 @@ static struct str71x_spidev_s g_spidev1 = * ****************************************************************************/ -static inline uint16 spi_getreg(FAR struct str71x_spidev_s *priv, ubyte offset) +static inline uint16_t spi_getreg(FAR struct str71x_spidev_s *priv, uint8_t offset) { return getreg16(priv->spibase + offset); } @@ -348,7 +353,7 @@ static inline uint16 spi_getreg(FAR struct str71x_spidev_s *priv, ubyte offset) * ****************************************************************************/ -static inline void spi_putreg(FAR struct str71x_spidev_s *priv, ubyte offset, uint16 value) +static inline void spi_putreg(FAR struct str71x_spidev_s *priv, uint8_t offset, uint16_t value) { putreg16(value, priv->spibase + offset); } @@ -364,17 +369,17 @@ static inline void spi_putreg(FAR struct str71x_spidev_s *priv, ubyte offset, ui * Input Parameters: * dev - Device-specific state data * devid - Identifies the device to select - * selected - TRUE: slave selected, FALSE: slave de-selected + * selected - true: slave selected, false: slave de-selected * * Returned Value: * None * ****************************************************************************/ -static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean selected) +static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { FAR struct str71x_spidev_s *priv = (FAR struct str71x_spidev_s *)dev; - uint16 reg16; + uint16_t reg16; DEBUGASSERT(priv && priv->spibase); @@ -439,11 +444,11 @@ static void spi_select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean * ****************************************************************************/ -static uint32 spi_setfrequency(FAR struct spi_dev_s *dev, uint32 frequency) +static uint32_t spi_setfrequency(FAR struct spi_dev_s *dev, uint32_t frequency) { FAR struct str71x_spidev_s *priv = (FAR struct str71x_spidev_s *)dev; - uint32 divisor; - uint32 cr1; + uint32_t divisor; + uint32_t cr1; DEBUGASSERT(priv && priv->spibase); @@ -476,7 +481,7 @@ static uint32 spi_setfrequency(FAR struct spi_dev_s *dev, uint32 frequency) cr1 = spi_getreg(priv, STR71X_BSPI_CSR1_OFFSET); cr1 &= ~(STR71X_BSPICSR1_BSPE|STR71X_BSPICSR1_MSTR); spi_putreg(priv, STR71X_BSPI_CSR1_OFFSET, cr1); - spi_putreg(priv, STR71X_BSPI_CLK_OFFSET, (uint16)divisor); + spi_putreg(priv, STR71X_BSPI_CLK_OFFSET, (uint16_t)divisor); /* Now we can enable the BSP in master mode */ @@ -501,10 +506,10 @@ static uint32 spi_setfrequency(FAR struct spi_dev_s *dev, uint32 frequency) * ****************************************************************************/ -static ubyte spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +static uint8_t spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { - ubyte ret = 0; - uint16 reg16 = getreg16(STR71X_GPIO1_PD); + uint8_t ret = 0; + uint16_t reg16 = getreg16(STR71X_GPIO1_PD); if ((reg16 & MMCSD_GPIO1_WPIN) != 0) { @@ -535,7 +540,7 @@ static ubyte spi_status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) * ****************************************************************************/ -static uint16 spi_send(FAR struct spi_dev_s *dev, uint16 wd) +static uint16_t spi_send(FAR struct spi_dev_s *dev, uint16_t wd) { FAR struct str71x_spidev_s *priv = (FAR struct str71x_spidev_s *)dev; @@ -561,7 +566,7 @@ static uint16 spi_send(FAR struct spi_dev_s *dev, uint16 wd) /* Get the received value from the RX FIFO and return it */ - return (ubyte)(spi_getreg(priv, STR71X_BSPI_RXR_OFFSET) >> 8); + return (uint8_t)(spi_getreg(priv, STR71X_BSPI_RXR_OFFSET) >> 8); } /************************************************************************* @@ -576,7 +581,7 @@ static uint16 spi_send(FAR struct spi_dev_s *dev, uint16 wd) * buflen - the length of data to send from the buffer in number of words. * The wordsize is determined by the number of bits-per-word * selected for the SPI interface. If nbits <= 8, the data is - * packed into ubytes; if nbits >8, the data is packed into uint16's + * packed into uint8_t's; if nbits >8, the data is packed into uint16_t's * * Returned Value: * None @@ -586,8 +591,8 @@ static uint16 spi_send(FAR struct spi_dev_s *dev, uint16 wd) static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size_t buflen) { FAR struct str71x_spidev_s *priv = (FAR struct str71x_spidev_s *)dev; - FAR const ubyte *ptr = (FAR const ubyte *)buffer; - uint16 csr2; + FAR const uint8_t *ptr = (FAR const uint8_t *)buffer; + uint16_t csr2; DEBUGASSERT(priv && priv->spibase); @@ -601,7 +606,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size { /* Send the data */ - spi_putreg(priv, STR71X_BSPI_TXR_OFFSET, ((uint16)*ptr) << 8); + spi_putreg(priv, STR71X_BSPI_TXR_OFFSET, ((uint16_t)*ptr) << 8); ptr++; buflen--; } @@ -621,8 +626,8 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size (void)spi_getreg(priv, STR71X_BSPI_RXR_OFFSET); } - /* There is a race condition where TFNE may go FALSE just before - * RFNE goes TRUE and this loop terminates prematurely. The nasty little + /* There is a race condition where TFNE may go false just before + * RFNE goes true and this loop terminates prematurely. The nasty little * delay in the following solves that (it could probably be tuned to * improve performance). */ @@ -648,7 +653,7 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size * buflen - the length of data that can be received in the buffer in number * of words. The wordsize is determined by the number of bits-per-word * selected for the SPI interface. If nbits <= 8, the data is - * packed into ubytes; if nbits >8, the data is packed into uint16's + * packed into uint8_t; if nbits >8, the data is packed into uint16_t's * * Returned Value: * None @@ -658,8 +663,8 @@ static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t buflen) { FAR struct str71x_spidev_s *priv = (FAR struct str71x_spidev_s *)dev; - FAR ubyte *ptr = (FAR ubyte*)buffer; - uint32 fifobytes = 0; + FAR uint8_t *ptr = (FAR uint8_t*)buffer; + uint32_t fifobytes = 0; DEBUGASSERT(priv && priv->spibase); @@ -685,7 +690,7 @@ static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t bu while ((spi_getreg(priv, STR71X_BSPI_CSR2_OFFSET) & STR71X_BSPICSR2_RFNE) != 0) { - *ptr++ = (ubyte)(spi_getreg(priv, STR71X_BSPI_RXR_OFFSET) >> 8); + *ptr++ = (uint8_t)(spi_getreg(priv, STR71X_BSPI_RXR_OFFSET) >> 8); fifobytes--; } } @@ -713,7 +718,7 @@ FAR struct spi_dev_s *up_spiinitialize(int port) { FAR struct spi_dev_s *ret; irqstate_t flags; - uint16 reg16; + uint16_t reg16; flags = irqsave(); #ifdef CONFIG_STR71X_BSPI0 diff --git a/nuttx/configs/pjrc-8051/include/board.h b/nuttx/configs/pjrc-8051/include/board.h index 85edae22c..fe036da8c 100644 --- a/nuttx/configs/pjrc-8051/include/board.h +++ b/nuttx/configs/pjrc-8051/include/board.h @@ -1,7 +1,7 @@ /************************************************************ * board/board.h * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without diff --git a/nuttx/configs/pjrc-8051/include/pjrc.h b/nuttx/configs/pjrc-8051/include/pjrc.h index 0934c78be..50dfe01f2 100644 --- a/nuttx/configs/pjrc-8051/include/pjrc.h +++ b/nuttx/configs/pjrc-8051/include/pjrc.h @@ -1,7 +1,7 @@ /************************************************************************** * pjrc.h * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -40,7 +40,7 @@ * Included Files **************************************************************************/ -#include <sys/types.h> +#include <stdint.h> /************************************************************************** * Public Definitions @@ -135,14 +135,14 @@ */ #ifndef __ASSEMBLY__ -xdata at 0xF800 ubyte p82c55_port_a; -xdata at 0xF801 ubyte p82c55_port_b; -xdata at 0xF802 ubyte p82c55_port_c; -xdata at 0xF803 ubyte p82c55_abc_config; -xdata at 0xF900 ubyte p82c55_port_d; -xdata at 0xF901 ubyte p82c55_port_e; -xdata at 0xF902 ubyte p82c55_port_f; -xdata at 0xF903 ubyte p82c55_def_config; +xdata at 0xF800 uint8_t p82c55_port_a; +xdata at 0xF801 uint8_t p82c55_port_b; +xdata at 0xF802 uint8_t p82c55_port_c; +xdata at 0xF803 uint8_t p82c55_abc_config; +xdata at 0xF900 uint8_t p82c55_port_d; +xdata at 0xF901 uint8_t p82c55_port_e; +xdata at 0xF902 uint8_t p82c55_port_f; +xdata at 0xF903 uint8_t p82c55_def_config; #endif /* LED (Port E) bit definitions */ diff --git a/nuttx/configs/pjrc-8051/src/up_leds.c b/nuttx/configs/pjrc-8051/src/up_leds.c index c7730ac3e..5ac842d1e 100644 --- a/nuttx/configs/pjrc-8051/src/up_leds.c +++ b/nuttx/configs/pjrc-8051/src/up_leds.c @@ -1,7 +1,7 @@ -/************************************************************ +/************************************************************************ * up_leds.c * - * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -31,34 +31,34 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ************************************************************/ + ************************************************************************/ -/************************************************************ +/************************************************************************ * Included Files - ************************************************************/ + ************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> #include "up_internal.h" -/************************************************************ +/************************************************************************ * Definitions - ************************************************************/ + ************************************************************************/ #define RESET_KLUDGE_NEEDED 1 -/************************************************************ +/************************************************************************ * Private Data - ************************************************************/ + ************************************************************************/ -static ubyte g_ledstate; +static uint8_t g_ledstate; -/************************************************************ +/************************************************************************ * Private Functions - ************************************************************/ + ************************************************************************/ #if defined(CONFIG_LED_DEBUG) && defined(CONFIG_ARCH_LEDS) -static void _up_puthex(ubyte hex) __naked +static void _up_puthex(uint8_t hex) __naked { hex; /* To avoid unreferenced argument warning */ _asm @@ -67,7 +67,7 @@ static void _up_puthex(ubyte hex) __naked _endasm; } -static void _up_putch(ubyte ch) __naked +static void _up_putch(uint8_t ch) __naked { _asm mov a, dpl @@ -114,13 +114,13 @@ static void _up_putnl(void) __naked #endif -/************************************************************ +/************************************************************************ * Public Funtions - ************************************************************/ + ************************************************************************/ -/************************************************************ +/************************************************************************ * Name: up_ledinit - ************************************************************/ + ************************************************************************/ #ifdef CONFIG_ARCH_LEDS void up_ledinit(void) @@ -137,11 +137,11 @@ void up_ledinit(void) _up_showledinit(); } -/************************************************************ +/************************************************************************ * Name: up_ledon - ************************************************************/ + ************************************************************************/ -void up_ledon(ubyte led) +void up_ledon(uint8_t led) { /* This may be called from an interrupt handler */ @@ -171,11 +171,11 @@ void up_ledon(ubyte led) irqrestore(flags); } -/************************************************************ +/************************************************************************ * Name: up_ledoff - ************************************************************/ + ************************************************************************/ -void up_ledoff(ubyte led) +void up_ledoff(uint8_t led) { /* This may be called from an interrupt handler */ diff --git a/nuttx/configs/skp16c26/include/board.h b/nuttx/configs/skp16c26/include/board.h index 961e1b0dd..32a08f2ed 100644 --- a/nuttx/configs/skp16c26/include/board.h +++ b/nuttx/configs/skp16c26/include/board.h @@ -41,10 +41,6 @@ * Included Files ************************************************************************************/ -#ifndef __ASSEMBLY__ -# include <sys/types.h> -#endif - /************************************************************************************ * Definitions ************************************************************************************/ diff --git a/nuttx/configs/skp16c26/src/skp16c26_internal.h b/nuttx/configs/skp16c26/src/skp16c26_internal.h index cdfc4460d..5d8f235f8 100644 --- a/nuttx/configs/skp16c26/src/skp16c26_internal.h +++ b/nuttx/configs/skp16c26/src/skp16c26_internal.h @@ -40,10 +40,6 @@ * Included Files ************************************************************************************/ -#ifndef __ASSEMBLY__ -# include <sys/types.h> -#endif - /************************************************************************************ * Definitions ************************************************************************************/ diff --git a/nuttx/configs/skp16c26/src/up_buttons.c b/nuttx/configs/skp16c26/src/up_buttons.c index 64d9d7345..828269a8e 100644 --- a/nuttx/configs/skp16c26/src/up_buttons.c +++ b/nuttx/configs/skp16c26/src/up_buttons.c @@ -38,7 +38,7 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> #include "chip.h" #include "up_arch.h" @@ -75,7 +75,7 @@ #ifdef CONFIG_ARCH_BUTTONS void up_buttoninit(void) { - ubyte regval; + uint8_t regval; regval = getreg8(M16C_PD8); regval |= (SW1_BIT | SW2_BIT | SW3_BIT); @@ -86,10 +86,10 @@ void up_buttoninit(void) * Name: up_buttons ****************************************************************************/ -ubyte up_buttons(void) +uint8_t up_buttons(void) { - ubyte swset = 0; - ubyte regval = getreg8(M16C_P8); + uint8_t swset = 0; + uint8_t regval = getreg8(M16C_P8); if (SW_PRESSED(regval, SW1_BIT)) { diff --git a/nuttx/configs/skp16c26/src/up_lcd.c b/nuttx/configs/skp16c26/src/up_lcd.c index 4cb08ca25..197b67084 100644 --- a/nuttx/configs/skp16c26/src/up_lcd.c +++ b/nuttx/configs/skp16c26/src/up_lcd.c @@ -38,7 +38,9 @@ ************************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> + +#include <stdint.h> +#include <stdbool.h> #include <ctype.h> #include "up_arch.h" @@ -77,8 +79,8 @@ * Private Data ************************************************************************************/ -static ubyte g_nchars; /* Number of characters in lines 2 */ -static ubyte g_line[LCD_NCHARS]; /* The content of lines 2 */ +static uint8_t g_nchars; /* Number of characters in lines 2 */ +static uint8_t g_line[LCD_NCHARS]; /* The content of lines 2 */ /************************************************************************************ * Private Functions @@ -88,9 +90,9 @@ static ubyte g_line[LCD_NCHARS]; /* The content of lines 2 */ * Name: up_lcddelay ************************************************************************************/ -static void up_lcddelay(uint16 count) +static void up_lcddelay(uint16_t count) { - uint32 counter = (uint16)count << 8; + uint32_t counter = (uint16_t)count << 8; while(counter--) { asm("\tnop\n\tnop\n\tnop\n" : :); /* 3 NOPs */ @@ -101,11 +103,11 @@ static void up_lcddelay(uint16 count) * Name: up_setrs ************************************************************************************/ -static inline void up_setrs(boolean data) +static inline void up_setrs(bool data) { /* Set/clear bit 1 of port 6 */ - register ubyte regval = getreg8(M16C_P6); + register uint8_t regval = getreg8(M16C_P6); if (data) { regval |= (1 << 0); /* High = data */ @@ -125,7 +127,7 @@ static inline void up_seten(void) { /* Set bit 1 of port 6 */ - register ubyte regval = getreg8(M16C_P6); + register uint8_t regval = getreg8(M16C_P6); regval = (1 << 1); putreg8(regval, M16C_P6); } @@ -138,7 +140,7 @@ static inline void up_clren(void) { /* Clear bit 1 of port 6 */ - register ubyte regval = getreg8(M16C_P6); + register uint8_t regval = getreg8(M16C_P6); regval &= ~(1 << 1); putreg8(regval, M16C_P6); } @@ -147,7 +149,7 @@ static inline void up_clren(void) * Name: up_enpluse ************************************************************************************/ -static inline void up_enpulse(boolean data) +static inline void up_enpulse(bool data) { up_seten(); /* EN enable chip (HIGH) */ up_lcddelay(0); /* Short delay */ @@ -160,7 +162,7 @@ static inline void up_enpulse(boolean data) * Name: up_lcdwrite ************************************************************************************/ -void up_lcdwrite(boolean data, ubyte ch) +void up_lcdwrite(bool data, uint8_t ch) { up_setrs(data); /* Set RS appropriately */ @@ -187,19 +189,19 @@ static void up_scroll(void) /* Clear the display and position the cursor at the beginning of line 1 */ - up_lcdwrite(FALSE, LCD_CLEAR); - up_lcdwrite(FALSE, LCD_HOME_L1); + up_lcdwrite(false, LCD_CLEAR); + up_lcdwrite(false, LCD_HOME_L1); /* Copy line 2 to line 1 */ for (i = 0; i < g_nchars; i++) { - up_lcdwrite(TRUE, g_line[i]); + up_lcdwrite(true, g_line[i]); } /* Position the cursor at the beginning of line 2 */ - up_lcdwrite(FALSE, LCD_HOME_L2); + up_lcdwrite(false, LCD_HOME_L2); g_nchars = 0; } @@ -213,7 +215,7 @@ static void up_scroll(void) void up_lcdinit(void) { - ubyte regval; + uint8_t regval; /* Enable writing to PD9 by selecting bit 2 in the protection register */ @@ -241,15 +243,15 @@ void up_lcdinit(void) /* Write the reset sequence */ - up_lcdwrite(FALSE, 0x33); + up_lcdwrite(false, 0x33); up_lcddelay(20); - up_lcdwrite(FALSE, 0x32); + up_lcdwrite(false, 0x32); up_lcddelay(20); - up_lcdwrite(FALSE, FUNCTION_SET); /* reset sequence */ - up_lcdwrite(FALSE, FUNCTION_SET); - up_lcdwrite(FALSE, LCD_CURSOR_OFF); - up_lcdwrite(FALSE, LCD_CLEAR); - up_lcdwrite(FALSE, LCD_HOME_L1); + up_lcdwrite(false, FUNCTION_SET); /* reset sequence */ + up_lcdwrite(false, FUNCTION_SET); + up_lcdwrite(false, LCD_CURSOR_OFF); + up_lcdwrite(false, LCD_CLEAR); + up_lcdwrite(false, LCD_HOME_L1); } /************************************************************************************ @@ -271,7 +273,7 @@ void up_lcdputc(char ch) else if (g_nchars < LCD_NCHARS && isprint(ch)) { - up_lcdwrite(TRUE, ch); + up_lcdwrite(true, ch); g_line[g_nchars] = ch; g_nchars++; } diff --git a/nuttx/configs/skp16c26/src/up_lcdconsole.c b/nuttx/configs/skp16c26/src/up_lcdconsole.c index e203c24d9..c4e1d0e79 100644 --- a/nuttx/configs/skp16c26/src/up_lcdconsole.c +++ b/nuttx/configs/skp16c26/src/up_lcdconsole.c @@ -38,7 +38,7 @@ ************************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> + #include <nuttx/arch.h> #include "up_internal.h" diff --git a/nuttx/configs/skp16c26/src/up_leds.c b/nuttx/configs/skp16c26/src/up_leds.c index a65d423a9..b64b8b7d0 100644 --- a/nuttx/configs/skp16c26/src/up_leds.c +++ b/nuttx/configs/skp16c26/src/up_leds.c @@ -38,7 +38,7 @@ ************************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> #include <arch/board/board.h> #include "up_arch.h" @@ -85,7 +85,7 @@ * Private Data Definitions ************************************************************************************/ -static const ubyte g_ledstate[7] = +static const uint8_t g_ledstate[7] = { (GREEN_LED_OFF | YELLOW_LED_OFF | RED_LED_OFF), /* LED_STARTED */ (GREEN_LED_ON | YELLOW_LED_OFF | RED_LED_OFF), /* LED_HEAPALLOCATE */ @@ -97,8 +97,8 @@ static const ubyte g_ledstate[7] = (GREEN_LED_ON | YELLOW_LED_ON | RED_LED_ON ) /* LED_ASSERTION */ }; -static ubyte g_prevled[3]; -static ubyte g_nestlevel; +static uint8_t g_prevled[3]; +static uint8_t g_nestlevel; /************************************************************************************ * Private Functions @@ -108,9 +108,9 @@ static ubyte g_nestlevel; * Name: up_ledinit ************************************************************************************/ -static void up_setleds(ubyte gybits, ubyte rbit) +static void up_setleds(uint8_t gybits, uint8_t rbit) { - ubyte regval; + uint8_t regval; regval = getreg8(GREENYELLOW_LED_PORT); regval &= ~GREENYELLOW_LED_MASK; @@ -133,7 +133,7 @@ static void up_setleds(ubyte gybits, ubyte rbit) void up_ledinit(void) { - register ubyte regval; + register uint8_t regval; /* Make sure that the LEDs are in the OFF state */ @@ -162,7 +162,7 @@ void up_ledinit(void) void up_ledon(int led) { - ubyte ledset; + uint8_t ledset; /* If this is the ASSERTION led, preserve the Y&G bits from the last setting and * set the RED LED on. @@ -198,7 +198,7 @@ void up_ledon(int led) void up_ledoff(int led) { - ubyte ledset; + uint8_t ledset; /* If this is the ASSERTION led then what we do depends on the previous state */ diff --git a/nuttx/configs/stm3210e-eval/RIDE/bigfatstub.c b/nuttx/configs/stm3210e-eval/RIDE/bigfatstub.c index 63150f58f..96d48052d 100755 --- a/nuttx/configs/stm3210e-eval/RIDE/bigfatstub.c +++ b/nuttx/configs/stm3210e-eval/RIDE/bigfatstub.c @@ -1,4 +1,4 @@ -#include <sys/types.h>
+#include <stdint.h>
#include <nuttx/irq.h>
#include "up_internal.h"
@@ -9,7 +9,7 @@ void os_start(void) for (;;);
}
-void up_assert_code(const ubyte *filename, int lineno, int errorcode)
+void up_assert_code(const uint8_t *filename, int lineno, int errorcode)
{
up_lowputc('?');
up_lowputc('\n');
@@ -23,7 +23,7 @@ int irq_attach(int irq, xcpt_t isr) for (;;);
}
-uint32 *up_doirq(int irq, uint32 *regs)
+uint32 *up_doirq(int irq, uint32_t *regs)
{
up_lowputc('I');
up_lowputc('\n');
diff --git a/nuttx/configs/stm3210e-eval/include/board.h b/nuttx/configs/stm3210e-eval/include/board.h index 795054136..8ccb33d88 100755 --- a/nuttx/configs/stm3210e-eval/include/board.h +++ b/nuttx/configs/stm3210e-eval/include/board.h @@ -43,7 +43,7 @@ #include <nuttx/config.h> #ifndef __ASSEMBLY__ -# include <sys/types.h> +# include <stdint.h> #endif #include "stm32_rcc.h" #include "stm32_sdio.h" @@ -204,7 +204,7 @@ EXTERN void stm32_boardinitialize(void); #ifdef CONFIG_ARCH_BUTTONS EXTERN void up_buttoninit(void); -EXTERN ubyte up_buttons(void); +EXTERN uint8_t up_buttons(void); #endif #undef EXTERN diff --git a/nuttx/configs/stm3210e-eval/src/stm3210e-internal.h b/nuttx/configs/stm3210e-eval/src/stm3210e-internal.h index 867318043..c0c1f5406 100755 --- a/nuttx/configs/stm3210e-eval/src/stm3210e-internal.h +++ b/nuttx/configs/stm3210e-eval/src/stm3210e-internal.h @@ -43,7 +43,7 @@ #include <nuttx/config.h>
#include <nuttx/compiler.h>
-#include <sys/types.h>
+#include <stdint.h>
/************************************************************************************
* Definitions
@@ -111,14 +111,14 @@ struct extmem_save_s
{
- uint32 gpiod_crl;
- uint32 gpiod_crh;
- uint32 gpioe_crl;
- uint32 gpioe_crh;
- uint32 gpiof_crl;
- uint32 gpiof_crh;
- uint32 gpiog_crl;
- uint32 gpiog_crh;
+ uint32_t gpiod_crl;
+ uint32_t gpiod_crh;
+ uint32_t gpioe_crl;
+ uint32_t gpioe_crh;
+ uint32_t gpiof_crl;
+ uint32_t gpiof_crh;
+ uint32_t gpiog_crl;
+ uint32_t gpiog_crh;
};
/************************************************************************************
@@ -130,7 +130,7 @@ struct extmem_save_s /* GPIO configurations common to SRAM and NOR Flash */
#define NCOMMON_CONFIG 37
-extern const uint16 g_commonconfig[NCOMMON_CONFIG];
+extern const uint16_t g_commonconfig[NCOMMON_CONFIG];
/************************************************************************************
* Public Functions
@@ -185,7 +185,7 @@ extern void stm32_extcontextrestore(struct extmem_save_s *restore); *
************************************************************************************/
-extern void stm32_extmemgpios(const uint16 *gpios, int ngpios);
+extern void stm32_extmemgpios(const uint16_t *gpios, int ngpios);
/************************************************************************************
* Name: stm32_enablefsmc
diff --git a/nuttx/configs/stm3210e-eval/src/up_boot.c b/nuttx/configs/stm3210e-eval/src/up_boot.c index 527f9d919..8646fee5b 100755 --- a/nuttx/configs/stm3210e-eval/src/up_boot.c +++ b/nuttx/configs/stm3210e-eval/src/up_boot.c @@ -39,7 +39,6 @@ ************************************************************************************/
#include <nuttx/config.h>
-#include <sys/types.h>
#include <debug.h>
diff --git a/nuttx/configs/stm3210e-eval/src/up_buttons.c b/nuttx/configs/stm3210e-eval/src/up_buttons.c index 67b8537c7..99feacec5 100644 --- a/nuttx/configs/stm3210e-eval/src/up_buttons.c +++ b/nuttx/configs/stm3210e-eval/src/up_buttons.c @@ -38,7 +38,8 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> + +#include <stdint.h> #include <arch/board/board.h> #include "stm3210e-internal.h" @@ -53,7 +54,7 @@ * Private Data ****************************************************************************/ -static const uint16 g_buttons[NUM_BUTTONS] = +static const uint16_t g_buttons[NUM_BUTTONS] = { GPIO_BTN_WAKEUP, GPIO_BTN_TAMPER, GPIO_BTN_KEY, GPIO_JOY_KEY, GPIO_JOY_DOWN, GPIO_JOY_LEFT, GPIO_JOY_RIGHT, GPIO_JOY_UP @@ -89,9 +90,9 @@ void up_buttoninit(void) * Name: up_buttons ****************************************************************************/ -ubyte up_buttons(void) +uint8_t up_buttons(void) { - ubyte ret = 0; + uint8_t ret = 0; int i; /* Check that state of each key */ diff --git a/nuttx/configs/stm3210e-eval/src/up_deselectnor.c b/nuttx/configs/stm3210e-eval/src/up_deselectnor.c index e0e3e4dbb..7450b8c72 100644 --- a/nuttx/configs/stm3210e-eval/src/up_deselectnor.c +++ b/nuttx/configs/stm3210e-eval/src/up_deselectnor.c @@ -40,7 +40,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <debug.h> #include "up_arch.h" diff --git a/nuttx/configs/stm3210e-eval/src/up_deselectsram.c b/nuttx/configs/stm3210e-eval/src/up_deselectsram.c index b3cb877ba..51329eb15 100644 --- a/nuttx/configs/stm3210e-eval/src/up_deselectsram.c +++ b/nuttx/configs/stm3210e-eval/src/up_deselectsram.c @@ -40,7 +40,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <debug.h> #include "up_arch.h" diff --git a/nuttx/configs/stm3210e-eval/src/up_extcontext.c b/nuttx/configs/stm3210e-eval/src/up_extcontext.c index 05e6b267f..e96230a4b 100644 --- a/nuttx/configs/stm3210e-eval/src/up_extcontext.c +++ b/nuttx/configs/stm3210e-eval/src/up_extcontext.c @@ -40,7 +40,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <assert.h> #include <debug.h> diff --git a/nuttx/configs/stm3210e-eval/src/up_extmem.c b/nuttx/configs/stm3210e-eval/src/up_extmem.c index 88876c2ca..18c39e844 100644 --- a/nuttx/configs/stm3210e-eval/src/up_extmem.c +++ b/nuttx/configs/stm3210e-eval/src/up_extmem.c @@ -40,7 +40,7 @@ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> #include <assert.h> #include <debug.h> @@ -95,7 +95,7 @@ /* GPIO configurations common to SRAM and NOR Flash */ -const uint16 g_commonconfig[NCOMMON_CONFIG] = +const uint16_t g_commonconfig[NCOMMON_CONFIG] = { /* A0... A18 */ @@ -123,13 +123,13 @@ const uint16 g_commonconfig[NCOMMON_CONFIG] = /* GPIO configurations unique to SRAM */ -static const uint16 g_sramconfig[] = +static const uint16_t g_sramconfig[] = { /* NE3, NBL0, NBL1, */ GPIO_NPS_NE3, GPIO_NPS_NBL0, GPIO_NPS_NBL1 }; -#define NSRAM_CONFIG (sizeof(g_sramconfig)/sizeof(uint16)) +#define NSRAM_CONFIG (sizeof(g_sramconfig)/sizeof(uint16_t)) /************************************************************************************ * Private Functions @@ -147,7 +147,7 @@ static const uint16 g_sramconfig[] = * ************************************************************************************/ -void stm32_extmemgpios(const uint16 *gpios, int ngpios) +void stm32_extmemgpios(const uint16_t *gpios, int ngpios) { int i; @@ -169,7 +169,7 @@ void stm32_extmemgpios(const uint16 *gpios, int ngpios) void stm32_enablefsmc(void) { - uint32 regval; + uint32_t regval; /* Enable AHB clocking to the FSMC */ @@ -188,7 +188,7 @@ void stm32_enablefsmc(void) void stm32_disablefsmc(void) { - uint32 regval; + uint32_t regval; /* Enable AHB clocking to the FSMC */ diff --git a/nuttx/configs/stm3210e-eval/src/up_leds.c b/nuttx/configs/stm3210e-eval/src/up_leds.c index d6308d427..611a5c849 100755 --- a/nuttx/configs/stm3210e-eval/src/up_leds.c +++ b/nuttx/configs/stm3210e-eval/src/up_leds.c @@ -39,8 +39,9 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> +#include <stdbool.h> #include <debug.h> #include <arch/board/board.h> @@ -135,7 +136,7 @@ * Private Data ****************************************************************************/ -static const uint16 g_ledbits[8] = +static const uint16_t g_ledbits[8] = { (LED_STARTED_ON_SETBITS | LED_STARTED_ON_CLRBITS | LED_STARTED_OFF_SETBITS | LED_STARTED_OFF_CLRBITS), @@ -170,22 +171,22 @@ static inline void led_clrbits(unsigned int clrbits) { if ((clrbits & STM3210E_LED1) != 0) { - stm32_gpiowrite(GPIO_LED1, FALSE); + stm32_gpiowrite(GPIO_LED1, false); } if ((clrbits & STM3210E_LED2) != 0) { - stm32_gpiowrite(GPIO_LED2, FALSE); + stm32_gpiowrite(GPIO_LED2, false); } if ((clrbits & STM3210E_LED3) != 0) { - stm32_gpiowrite(GPIO_LED3, FALSE); + stm32_gpiowrite(GPIO_LED3, false); } if ((clrbits & STM3210E_LED4) != 0) { - stm32_gpiowrite(GPIO_LED4, FALSE); + stm32_gpiowrite(GPIO_LED4, false); } } @@ -193,22 +194,22 @@ static inline void led_setbits(unsigned int setbits) { if ((setbits & STM3210E_LED1) != 0) { - stm32_gpiowrite(GPIO_LED1, TRUE); + stm32_gpiowrite(GPIO_LED1, true); } if ((setbits & STM3210E_LED2) != 0) { - stm32_gpiowrite(GPIO_LED2, TRUE); + stm32_gpiowrite(GPIO_LED2, true); } if ((setbits & STM3210E_LED3) != 0) { - stm32_gpiowrite(GPIO_LED3, TRUE); + stm32_gpiowrite(GPIO_LED3, true); } if ((setbits & STM3210E_LED4) != 0) { - stm32_gpiowrite(GPIO_LED4, TRUE); + stm32_gpiowrite(GPIO_LED4, true); } } diff --git a/nuttx/configs/stm3210e-eval/src/up_nsh.c b/nuttx/configs/stm3210e-eval/src/up_nsh.c index fe18f1c51..6c908951f 100755 --- a/nuttx/configs/stm3210e-eval/src/up_nsh.c +++ b/nuttx/configs/stm3210e-eval/src/up_nsh.c @@ -39,8 +39,8 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdbool.h> #include <stdio.h> #include <debug.h> #include <errno.h> @@ -207,7 +207,7 @@ int nsh_archinitialize(void) * the slot. */ - sdio_mediachange(sdio, TRUE); + sdio_mediachange(sdio, true); #endif return OK; } diff --git a/nuttx/configs/stm3210e-eval/src/up_selectnor.c b/nuttx/configs/stm3210e-eval/src/up_selectnor.c index 0cc4be8dd..3c41b1c9f 100644 --- a/nuttx/configs/stm3210e-eval/src/up_selectnor.c +++ b/nuttx/configs/stm3210e-eval/src/up_selectnor.c @@ -40,7 +40,7 @@ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> #include <debug.h> #include "up_arch.h" @@ -80,7 +80,7 @@ /* GPIO configurations unique to NOR Flash */ -static const uint16 g_norconfig[] = +static const uint16_t g_norconfig[] = { /* A19... A22 */ @@ -90,7 +90,7 @@ static const uint16 g_norconfig[] = GPIO_NPS_NE2 }; -#define NNOR_CONFIG (sizeof(g_norconfig)/sizeof(uint16)) +#define NNOR_CONFIG (sizeof(g_norconfig)/sizeof(uint16_t)) /************************************************************************************ * Private Functions diff --git a/nuttx/configs/stm3210e-eval/src/up_selectsram.c b/nuttx/configs/stm3210e-eval/src/up_selectsram.c index 5578b0713..0b3d2d495 100644 --- a/nuttx/configs/stm3210e-eval/src/up_selectsram.c +++ b/nuttx/configs/stm3210e-eval/src/up_selectsram.c @@ -40,7 +40,7 @@ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> #include <debug.h> #include "up_arch.h" @@ -88,13 +88,13 @@ /* GPIO configurations unique to SRAM */ -static const uint16 g_sramconfig[] = +static const uint16_t g_sramconfig[] = { /* NE3, NBL0, NBL1, */ GPIO_NPS_NE3, GPIO_NPS_NBL0, GPIO_NPS_NBL1 }; -#define NSRAM_CONFIG (sizeof(g_sramconfig)/sizeof(uint16)) +#define NSRAM_CONFIG (sizeof(g_sramconfig)/sizeof(uint16_t)) /************************************************************************************ * Private Functions diff --git a/nuttx/configs/stm3210e-eval/src/up_spi.c b/nuttx/configs/stm3210e-eval/src/up_spi.c index 3c2c3e236..3fc6567de 100755 --- a/nuttx/configs/stm3210e-eval/src/up_spi.c +++ b/nuttx/configs/stm3210e-eval/src/up_spi.c @@ -39,8 +39,9 @@ ************************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> +#include <stdbool.h> #include <debug.h> #include <nuttx/spi.h> @@ -132,7 +133,7 @@ void weak_function stm32_spiinitialize(void) ****************************************************************************/ #ifdef CONFIG_STM32_SPI1 -void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean selected) +void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); @@ -144,31 +145,31 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean s } } -ubyte stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { return SPI_STATUS_PRESENT; } #endif #ifdef CONFIG_STM32_SPI2 -void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean selected) +void stm32_spi2select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -ubyte stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +uint8_t stm32_spi2status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { return SPI_STATUS_PRESENT; } #endif #ifdef CONFIG_STM32_SPI3 -void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, boolean selected) +void stm32_spi3select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) { spidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); } -ubyte stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) +uint8_t stm32_spi3status(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { return SPI_STATUS_PRESENT; } diff --git a/nuttx/configs/stm3210e-eval/src/up_usbdev.c b/nuttx/configs/stm3210e-eval/src/up_usbdev.c index d13318de8..b1ff79a6a 100644 --- a/nuttx/configs/stm3210e-eval/src/up_usbdev.c +++ b/nuttx/configs/stm3210e-eval/src/up_usbdev.c @@ -39,8 +39,10 @@ ************************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> +#include <sys/types.h> +#include <stdint.h> +#include <stdbool.h> #include <debug.h> #include <nuttx/usbdev.h> @@ -89,9 +91,9 @@ void stm32_usbinitialize(void) * ************************************************************************************/ -int stm32_usbpullup(FAR struct usbdev_s *dev, boolean enable) +int stm32_usbpullup(FAR struct usbdev_s *dev, bool enable) { - usbtrace(TRACE_DEVPULLUP, (uint16)enable); + usbtrace(TRACE_DEVPULLUP, (uint16_t)enable); stm32_gpiowrite(GPIO_USB_PULLUP, !enable); return OK; } @@ -107,7 +109,7 @@ int stm32_usbpullup(FAR struct usbdev_s *dev, boolean enable) * ************************************************************************************/ -void stm32_usbsuspend(FAR struct usbdev_s *dev, boolean resume) +void stm32_usbsuspend(FAR struct usbdev_s *dev, bool resume) { ulldbg("resume: %d\n", resume); } diff --git a/nuttx/configs/stm3210e-eval/src/up_usbstrg.c b/nuttx/configs/stm3210e-eval/src/up_usbstrg.c index 72805b8d8..add9a7ed9 100755 --- a/nuttx/configs/stm3210e-eval/src/up_usbstrg.c +++ b/nuttx/configs/stm3210e-eval/src/up_usbstrg.c @@ -40,7 +40,6 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> #include <stdio.h> #include <debug.h> @@ -147,7 +146,7 @@ int usbstrg_archinitialize(void) * the slot. */ - sdio_mediachange(sdio, TRUE); + sdio_mediachange(sdio, true); return OK; } diff --git a/nuttx/configs/us7032evb1/include/board.h b/nuttx/configs/us7032evb1/include/board.h index d674dddd2..c0d03aad5 100644 --- a/nuttx/configs/us7032evb1/include/board.h +++ b/nuttx/configs/us7032evb1/include/board.h @@ -1,7 +1,7 @@ /**************************************************************************** * configs/us7032evb1/include/board.h * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -41,7 +41,7 @@ ****************************************************************************/ #ifndef __ASSEMBLY__ -# include <sys/types.h> +# include <stdint.h> #endif #include "chip.h" @@ -88,7 +88,7 @@ extern "C" { #ifdef CONFIG_ARCH_BUTTONS EXTERN void up_buttoninit(void); -EXTERN ubyte up_buttons(void); +EXTERN uint8_t up_buttons(void); #endif #undef EXTERN diff --git a/nuttx/configs/us7032evb1/shterm/shterm.c b/nuttx/configs/us7032evb1/shterm/shterm.c index 0bd2b8070..0a1e143b1 100644 --- a/nuttx/configs/us7032evb1/shterm/shterm.c +++ b/nuttx/configs/us7032evb1/shterm/shterm.c @@ -1,7 +1,7 @@ /**************************************************************************** * config/us7032evb1/shterm/shterm.c * - * Copyright(C) 2008 Gregory Nutt. All rights reserved. + * Copyright(C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -37,7 +37,6 @@ * Included Files ****************************************************************************/ -#include <sys/types.h> #include <sys/stat.h> #include <stdio.h> #include <stdlib.h> diff --git a/nuttx/configs/us7032evb1/src/up_leds.c b/nuttx/configs/us7032evb1/src/up_leds.c index f713c064a..4d6e213db 100644 --- a/nuttx/configs/us7032evb1/src/up_leds.c +++ b/nuttx/configs/us7032evb1/src/up_leds.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/us7032evb1/src/up_leds.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -38,7 +38,7 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> #include "chip.h" #include "up_arch.h" @@ -76,7 +76,7 @@ #ifdef CONFIG_ARCH_LEDS void up_ledinit(void) { - uint16 reg16; + uint16_t reg16; /* Setup port B, pin 15 as an output */ @@ -103,7 +103,7 @@ void up_ledinit(void) void up_ledon(int led) { - uint16 reg16; + uint16_t reg16; if (led) { @@ -121,7 +121,7 @@ void up_ledon(int led) void up_ledoff(int led) { - uint16 reg16; + uint16_t reg16; if (led) { diff --git a/nuttx/configs/xtrs/src/xtr_irq.c b/nuttx/configs/xtrs/src/xtr_irq.c index 91d0cf42a..1186f34f8 100644 --- a/nuttx/configs/xtrs/src/xtr_irq.c +++ b/nuttx/configs/xtrs/src/xtr_irq.c @@ -1,7 +1,7 @@ /**************************************************************************** * board/xtr_irq.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <nuttx/irq.h> #include "up_arch.h" @@ -113,5 +112,5 @@ void up_disable_irq(int irq) void up_enable_irq(int irq) { - irqrestore(TRUE); + irqrestore(true); } diff --git a/nuttx/configs/xtrs/src/xtr_lowputc.c b/nuttx/configs/xtrs/src/xtr_lowputc.c index c85f540d2..344f22061 100644 --- a/nuttx/configs/xtrs/src/xtr_lowputc.c +++ b/nuttx/configs/xtrs/src/xtr_lowputc.c @@ -6,7 +6,7 @@ * * This file is a part of NuttX and hence * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -43,7 +43,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <nuttx/irq.h> #include <nuttx/arch.h> #include <assert.h> diff --git a/nuttx/configs/xtrs/src/xtr_serial.c b/nuttx/configs/xtrs/src/xtr_serial.c index 9e25d09d1..f37d2876a 100644 --- a/nuttx/configs/xtrs/src/xtr_serial.c +++ b/nuttx/configs/xtrs/src/xtr_serial.c @@ -6,7 +6,7 @@ * * This file is a part of NuttX and hence * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -44,6 +44,8 @@ #include <nuttx/config.h> #include <sys/types.h> +#include <stdint.h> +#include <stdbool.h> #include <unistd.h> #include <string.h> #include <errno.h> @@ -102,18 +104,18 @@ * Private Function Prototypes ****************************************************************************/ -static int up_setup(struct uart_dev_s *dev); -static void up_shutdown(struct uart_dev_s *dev); -static int up_attach(struct uart_dev_s *dev); -static void up_detach(struct uart_dev_s *dev); -static int up_ioctl(struct file *filep, int cmd, unsigned long arg); -static int up_receive(struct uart_dev_s *dev, uint32 *status); -static void up_rxint(struct uart_dev_s *dev, boolean enable); -static boolean up_rxavailable(struct uart_dev_s *dev); -static void up_send(struct uart_dev_s *dev, int ch); -static void up_txint(struct uart_dev_s *dev, boolean enable); -static boolean up_txready(struct uart_dev_s *dev); -static boolean up_txempty(struct uart_dev_s *dev); +static int up_setup(struct uart_dev_s *dev); +static void up_shutdown(struct uart_dev_s *dev); +static int up_attach(struct uart_dev_s *dev); +static void up_detach(struct uart_dev_s *dev); +static int up_ioctl(struct file *filep, int cmd, unsigned long arg); +static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static void up_rxint(struct uart_dev_s *dev, bool enable); +static bool up_rxavailable(struct uart_dev_s *dev); +static void up_send(struct uart_dev_s *dev, int ch); +static void up_txint(struct uart_dev_s *dev, bool enable); +static bool up_txready(struct uart_dev_s *dev); +static bool up_txempty(struct uart_dev_s *dev); /**************************************************************************** * Private Variables @@ -145,9 +147,9 @@ static char g_uarttxbuffer[CONFIG_UART_TXBUFSIZE]; static uart_dev_t g_uartport = { 0, /* open_count */ - FALSE, /* xmitwaiting */ - FALSE, /* recvwaiting */ - FALSE, /* isconsole */ + false, /* xmitwaiting */ + false, /* recvwaiting */ + false, /* isconsole */ { 1 }, /* closesem */ { 0 }, /* xmitsem */ { 0 }, /* recvsem */ @@ -275,9 +277,9 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(struct uart_dev_s *dev, uint32 *status) +static int up_receive(struct uart_dev_s *dev, uint32_t *status) { -// uint8 ch = z80_lowputc(); +// uint8_t ch = z80_lowputc(); *status = 0; return ch; @@ -291,7 +293,7 @@ static int up_receive(struct uart_dev_s *dev, uint32 *status) * ****************************************************************************/ -static void up_rxint(struct uart_dev_s *dev, boolean enable) +static void up_rxint(struct uart_dev_s *dev, bool enable) { } @@ -299,13 +301,13 @@ static void up_rxint(struct uart_dev_s *dev, boolean enable) * Name: up_rxavailable * * Description: - * Return TRUE if the receive fifo is not empty + * Return true if the receive fifo is not empty * ****************************************************************************/ -static boolean up_rxavailable(struct uart_dev_s *dev) +static bool up_rxavailable(struct uart_dev_s *dev) { - return TRUE; + return true; } /**************************************************************************** @@ -329,7 +331,7 @@ static void up_send(struct uart_dev_s *dev, int ch) * ****************************************************************************/ -static void up_txint(struct uart_dev_s *dev, boolean enable) +static void up_txint(struct uart_dev_s *dev, bool enable) { } @@ -337,26 +339,26 @@ static void up_txint(struct uart_dev_s *dev, boolean enable) * Name: up_txready * * Description: - * Return TRUE if the transmit fifo is not full + * Return true if the transmit fifo is not full * ****************************************************************************/ -static boolean up_txready(struct uart_dev_s *dev) +static bool up_txready(struct uart_dev_s *dev) { - return TRUE; + return true; } /**************************************************************************** * Name: up_txempty * * Description: - * Return TRUE if the transmit fifo is empty + * Return true if the transmit fifo is empty * ****************************************************************************/ -static boolean up_txempty(struct uart_dev_s *dev) +static bool up_txempty(struct uart_dev_s *dev) { - return TRUE; + return true; } /**************************************************************************** diff --git a/nuttx/configs/xtrs/src/xtr_timerisr.c b/nuttx/configs/xtrs/src/xtr_timerisr.c index cd0757f58..de0109534 100644 --- a/nuttx/configs/xtrs/src/xtr_timerisr.c +++ b/nuttx/configs/xtrs/src/xtr_timerisr.c @@ -1,7 +1,7 @@ /**************************************************************************** * board/xtr_timerisr.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <debug.h> #include <nuttx/arch.h> diff --git a/nuttx/configs/z16f2800100zcog/src/z16f_leds.c b/nuttx/configs/z16f2800100zcog/src/z16f_leds.c index 612e7a86b..0d7f571ac 100644 --- a/nuttx/configs/z16f2800100zcog/src/z16f_leds.c +++ b/nuttx/configs/z16f2800100zcog/src/z16f_leds.c @@ -46,7 +46,7 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> + #include <arch/board/board.h> #include "up_internal.h" diff --git a/nuttx/configs/z16f2800100zcog/src/z16f_lowinit.c b/nuttx/configs/z16f2800100zcog/src/z16f_lowinit.c index bac3347fd..3c2c43ec8 100644 --- a/nuttx/configs/z16f2800100zcog/src/z16f_lowinit.c +++ b/nuttx/configs/z16f2800100zcog/src/z16f_lowinit.c @@ -40,7 +40,6 @@ ***************************************************************************/
#include <nuttx/config.h>
-#include <sys/types.h>
#include "chip/chip.h"
diff --git a/nuttx/configs/z80sim/src/z80_irq.c b/nuttx/configs/z80sim/src/z80_irq.c index 334ea672c..7312f66e3 100644 --- a/nuttx/configs/z80sim/src/z80_irq.c +++ b/nuttx/configs/z80sim/src/z80_irq.c @@ -1,7 +1,7 @@ /**************************************************************************** * board/z80_irq.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <nuttx/irq.h> #include "up_arch.h" @@ -113,5 +112,5 @@ void up_disable_irq(int irq) void up_enable_irq(int irq) { - irqrestore(TRUE); + irqrestore(true); } diff --git a/nuttx/configs/z80sim/src/z80_lowputc.c b/nuttx/configs/z80sim/src/z80_lowputc.c index 269d37f92..58615ea24 100644 --- a/nuttx/configs/z80sim/src/z80_lowputc.c +++ b/nuttx/configs/z80sim/src/z80_lowputc.c @@ -1,7 +1,7 @@ /******************************************************************************** * board/z80_lowputc.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <nuttx/irq.h> #include <nuttx/arch.h> #include <assert.h> diff --git a/nuttx/configs/z80sim/src/z80_serial.c b/nuttx/configs/z80sim/src/z80_serial.c index 803ff6fb9..0e66c804f 100644 --- a/nuttx/configs/z80sim/src/z80_serial.c +++ b/nuttx/configs/z80sim/src/z80_serial.c @@ -1,7 +1,7 @@ /**************************************************************************** * board/z80_serial.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -40,6 +40,8 @@ #include <nuttx/config.h> #include <sys/types.h> +#include <stdint.h> +#include <stdbool.h> #include <unistd.h> #include <string.h> #include <errno.h> @@ -68,18 +70,18 @@ * Private Function Prototypes ****************************************************************************/ -static int up_setup(struct uart_dev_s *dev); -static void up_shutdown(struct uart_dev_s *dev); -static int up_attach(struct uart_dev_s *dev); -static void up_detach(struct uart_dev_s *dev); -static int up_ioctl(struct file *filep, int cmd, unsigned long arg); -static int up_receive(struct uart_dev_s *dev, uint32 *status); -static void up_rxint(struct uart_dev_s *dev, boolean enable); -static boolean up_rxavailable(struct uart_dev_s *dev); -static void up_send(struct uart_dev_s *dev, int ch); -static void up_txint(struct uart_dev_s *dev, boolean enable); -static boolean up_txready(struct uart_dev_s *dev); -static boolean up_txempty(struct uart_dev_s *dev); +static int up_setup(struct uart_dev_s *dev); +static void up_shutdown(struct uart_dev_s *dev); +static int up_attach(struct uart_dev_s *dev); +static void up_detach(struct uart_dev_s *dev); +static int up_ioctl(struct file *filep, int cmd, unsigned long arg); +static int up_receive(struct uart_dev_s *dev, uint32_t *status); +static void up_rxint(struct uart_dev_s *dev, bool enable); +static bool up_rxavailable(struct uart_dev_s *dev); +static void up_send(struct uart_dev_s *dev, int ch); +static void up_txint(struct uart_dev_s *dev, bool enable); +static bool up_txready(struct uart_dev_s *dev); +static bool up_txempty(struct uart_dev_s *dev); /**************************************************************************** * Private Variables @@ -111,9 +113,9 @@ static char g_uarttxbuffer[CONFIG_UART_TXBUFSIZE]; static uart_dev_t g_uartport = { 0, /* open_count */ - FALSE, /* xmitwaiting */ - FALSE, /* recvwaiting */ - TRUE, /* isconsole */ + false, /* xmitwaiting */ + false, /* recvwaiting */ + true, /* isconsole */ { 1 }, /* closesem */ { 0 }, /* xmitsem */ { 0 }, /* recvsem */ @@ -225,9 +227,9 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg) * ****************************************************************************/ -static int up_receive(struct uart_dev_s *dev, uint32 *status) +static int up_receive(struct uart_dev_s *dev, uint32_t *status) { - uint8 ch = z80_lowgetc(); + uint8_t ch = z80_lowgetc(); *status = 0; return ch; } @@ -240,7 +242,7 @@ static int up_receive(struct uart_dev_s *dev, uint32 *status) * ****************************************************************************/ -static void up_rxint(struct uart_dev_s *dev, boolean enable) +static void up_rxint(struct uart_dev_s *dev, bool enable) { } @@ -248,13 +250,13 @@ static void up_rxint(struct uart_dev_s *dev, boolean enable) * Name: up_rxavailable * * Description: - * Return TRUE if the receive fifo is not empty + * Return true if the receive fifo is not empty * ****************************************************************************/ -static boolean up_rxavailable(struct uart_dev_s *dev) +static bool up_rxavailable(struct uart_dev_s *dev) { - return TRUE; + return true; } /**************************************************************************** @@ -278,7 +280,7 @@ static void up_send(struct uart_dev_s *dev, int ch) * ****************************************************************************/ -static void up_txint(struct uart_dev_s *dev, boolean enable) +static void up_txint(struct uart_dev_s *dev, bool enable) { } @@ -286,26 +288,26 @@ static void up_txint(struct uart_dev_s *dev, boolean enable) * Name: up_txready * * Description: - * Return TRUE if the tranmsit fifo is not full + * Return true if the tranmsit fifo is not full * ****************************************************************************/ -static boolean up_txready(struct uart_dev_s *dev) +static bool up_txready(struct uart_dev_s *dev) { - return TRUE; + return true; } /**************************************************************************** * Name: up_txempty * * Description: - * Return TRUE if the transmit fifo is empty + * Return true if the transmit fifo is empty * ****************************************************************************/ -static boolean up_txempty(struct uart_dev_s *dev) +static bool up_txempty(struct uart_dev_s *dev) { - return TRUE; + return true; } /**************************************************************************** diff --git a/nuttx/configs/z80sim/src/z80_timerisr.c b/nuttx/configs/z80sim/src/z80_timerisr.c index a088d14b8..85210eca4 100644 --- a/nuttx/configs/z80sim/src/z80_timerisr.c +++ b/nuttx/configs/z80sim/src/z80_timerisr.c @@ -1,7 +1,7 @@ /**************************************************************************** * board/z80_timerisr.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <debug.h> #include <nuttx/arch.h> diff --git a/nuttx/configs/z8encore000zco/src/z8_leds.c b/nuttx/configs/z8encore000zco/src/z8_leds.c index 7eab7e66b..f14dae6ef 100644 --- a/nuttx/configs/z8encore000zco/src/z8_leds.c +++ b/nuttx/configs/z8encore000zco/src/z8_leds.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/z8encore000zco/src/z8_leds.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -46,7 +46,7 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> #include <arch/board/board.h> #include "up_internal.h" @@ -114,8 +114,8 @@ struct z8_ledbits_s { - ubyte anode; - ubyte cathode; + uint8_t anode; + uint8_t cathode; }; /**************************************************************************** @@ -145,9 +145,9 @@ static const struct z8_ledbits_s g_ledarray[10][4] = ****************************************************************************/ #ifdef CONFIG_ARCH_LEDS -static void z8_putled134(FAR const struct z8_ledbits_s *bits, ubyte addr) +static void z8_putled134(FAR const struct z8_ledbits_s *bits, uint8_t addr) { - ubyte porte; + uint8_t porte; porte = bits->cathode; putreg8(porte, PEOD); /* Load porte data */ @@ -163,9 +163,9 @@ static void z8_putled134(FAR const struct z8_ledbits_s *bits, ubyte addr) ****************************************************************************/ #ifdef CONFIG_ARCH_LEDS -static void z8_putled2(FAR const struct z8_ledbits_s *bits, ubyte addr) +static void z8_putled2(FAR const struct z8_ledbits_s *bits, uint8_t addr) { - ubyte portg; + uint8_t portg; putreg8(bits->cathode, PEOD); /* Load porte data */ portg = bits->anode; diff --git a/nuttx/configs/z8encore000zco/src/z8_lowinit.c b/nuttx/configs/z8encore000zco/src/z8_lowinit.c index 5180e3e85..7443dbb65 100644 --- a/nuttx/configs/z8encore000zco/src/z8_lowinit.c +++ b/nuttx/configs/z8encore000zco/src/z8_lowinit.c @@ -1,7 +1,7 @@ /***************************************************************************
* configs/z8encore000zco/src/z8_lowinit.c
*
- * Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Based upon sample code included with the Zilog ZDS-II toolchain.
@@ -40,7 +40,6 @@ ***************************************************************************/
#include <nuttx/config.h>
-#include <sys/types.h>
#include "chip/chip.h"
diff --git a/nuttx/configs/z8f64200100kit/src/z8_leds.c b/nuttx/configs/z8f64200100kit/src/z8_leds.c index 9b7e9cd88..b83167c0a 100644 --- a/nuttx/configs/z8f64200100kit/src/z8_leds.c +++ b/nuttx/configs/z8f64200100kit/src/z8_leds.c @@ -1,7 +1,7 @@ /**************************************************************************** * configs/z8f64200100kit/src/z8_leds.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -38,7 +38,7 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> + #include <arch/board/board.h> #include "up_internal.h" diff --git a/nuttx/configs/z8f64200100kit/src/z8_lowinit.c b/nuttx/configs/z8f64200100kit/src/z8_lowinit.c index 3cafe63b3..a3cb0163a 100644 --- a/nuttx/configs/z8f64200100kit/src/z8_lowinit.c +++ b/nuttx/configs/z8f64200100kit/src/z8_lowinit.c @@ -1,7 +1,7 @@ /***************************************************************************
* configs/z8f64200100kit/src/z8_lowinit.c
*
- * Copyright (C) 2008 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Based upon sample code included with the Zilog ZDS-II toolchain.
@@ -40,7 +40,6 @@ ***************************************************************************/
#include <nuttx/config.h>
-#include <sys/types.h>
#include "chip/chip.h"
|