sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changing NuttX fixed size type names to C99 standard names -- things will be broken for awhile

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2352 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2009-12-15 20:56:22 +00:00
parent 7f239968e7
commit 83a12256fd
82 changed files with 506 additions and 533 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
configs/c5471evm/include/board.h
View File

@ -1,7 +1,7 @@
/************************************************************ /************************************************************************
* arch/board.h * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * 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 * notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the * the documentation and/or other materials provided with the
* distribution. * 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 * used to endorse or promote products derived from this software
* without specific prior written permission. * without specific prior written permission.
* *
@ -31,28 +31,24 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************/ ************************************************************************/
#ifndef __ARCH_BOARD_H #ifndef __ARCH_BOARD_H
#define __ARCH_BOARD_H #define __ARCH_BOARD_H
/************************************************************ /************************************************************************
* Included Files * Included Files
************************************************************/ ************************************************************************/
#ifndef __ASSEMBLY__ /************************************************************************
# include <sys/types.h>
#endif
/************************************************************
* Definitions * Definitions
************************************************************/ ************************************************************************/
/* Clocking *************************************************/ /* Clocking *************************************************************/
#define C5471_CLOCK 47500000 /* 47.5 MHz */ #define C5471_CLOCK 47500000 /* 47.5 MHz */
/* LED definitions ******************************************/ /* LED definitions ******************************************************/
#define LED_STARTED 0 #define LED_STARTED 0
#define LED_HEAPALLOCATE 1 #define LED_HEAPALLOCATE 1
@ -63,8 +59,8 @@
#define LED_ASSERTION 6 #define LED_ASSERTION 6
#define LED_PANIC 7 #define LED_PANIC 7
/************************************************************ /************************************************************************
* Inline Functions * Inline Functions
************************************************************/ ************************************************************************/
#endif /* __ARCH_BOARD_H */ #endif /* __ARCH_BOARD_H */

10
configs/c5471evm/src/up_leds.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* up_leds.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -38,21 +38,21 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h> #include <stdint.h>
#include "up_internal.h" #include "up_internal.h"
/**************************************************************************** /****************************************************************************
* Definitions * Definitions
****************************************************************************/ ****************************************************************************/
#define CS2 *(volatile uint32*)0xffff2e08 #define CS2 *(volatile uint32_t*)0xffff2e08
#define LEDS *(volatile uint32*)0x01000000 #define LEDS *(volatile uint32_t*)0x01000000
/**************************************************************************** /****************************************************************************
* Private Data * Private Data
****************************************************************************/ ****************************************************************************/
static uint32 g_ledstate; static uint32_t g_ledstate;
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions

5
configs/demo9s12ne64/include/board.h
View File

@ -43,10 +43,9 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
# include <sys/types.h> # include <stdint.h>
#endif #endif
/************************************************************************************ /************************************************************************************
* Definitions * Definitions
************************************************************************************/ ************************************************************************************/
@ -110,7 +109,7 @@ EXTERN void hcs12_boardinitialize(void);
#ifdef CONFIG_ARCH_BUTTONS #ifdef CONFIG_ARCH_BUTTONS
EXTERN void up_buttoninit(void); EXTERN void up_buttoninit(void);
EXTERN ubyte up_buttons(void); EXTERN uint8_t up_buttons(void);
#endif #endif
#undef EXTERN #undef EXTERN

1
configs/demo9s12ne64/src/demo9s12ne64.h
View File

@ -43,7 +43,6 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/compiler.h> #include <nuttx/compiler.h>
#include <sys/types.h>
/************************************************************************************ /************************************************************************************
* Definitions * Definitions

1
configs/demo9s12ne64/src/up_boot.c
View File

@ -39,7 +39,6 @@
************************************************************************************/ ************************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <debug.h> #include <debug.h>

5
configs/demo9s12ne64/src/up_buttons.c
View File

@ -38,7 +38,8 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <stdint.h>
#include <arch/board/board.h> #include <arch/board/board.h>
#include "demo9s12ne64.h" #include "demo9s12ne64.h"
@ -73,7 +74,7 @@ void up_buttoninit(void)
* Name: up_buttons * Name: up_buttons
****************************************************************************/ ****************************************************************************/
ubyte up_buttons(void) uint8_t up_buttons(void)
{ {
return 0; return 0;
} }

3
configs/demo9s12ne64/src/up_leds.c
View File

@ -39,7 +39,6 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <debug.h> #include <debug.h>
@ -48,7 +47,7 @@
#include "demo9s12ne64.h" #include "demo9s12ne64.h"
/**************************************************************************** /****************************************************************************
* Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Enables debug output from this file (needs CONFIG_DEBUG with /* Enables debug output from this file (needs CONFIG_DEBUG with

1
configs/demo9s12ne64/src/up_nsh.c
View File

@ -39,7 +39,6 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <stdio.h> #include <stdio.h>
#include <debug.h> #include <debug.h>

7
configs/demo9s12ne64/src/up_spi.c
View File

@ -39,8 +39,9 @@
************************************************************************************/ ************************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
#include <debug.h> #include <debug.h>
#include <nuttx/spi.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; return SPI_STATUS_PRESENT;
} }

3
configs/eagle100/include/board.h
View File

@ -41,9 +41,6 @@
* Included Files * Included Files
************************************************************************************/ ************************************************************************************/
#ifndef __ASSEMBLY__
# include <sys/types.h>
#endif
#include "lm3s_internal.h" #include "lm3s_internal.h"
/************************************************************************************ /************************************************************************************

1
configs/eagle100/src/eagle100_internal.h
View File

@ -43,7 +43,6 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/compiler.h> #include <nuttx/compiler.h>
#include <sys/types.h>
/************************************************************************************ /************************************************************************************
* Definitions * Definitions

1
configs/eagle100/src/up_boot.c
View File

@ -39,7 +39,6 @@
************************************************************************************/ ************************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <debug.h> #include <debug.h>

6
configs/eagle100/src/up_ethernet.c
View File

@ -39,8 +39,8 @@
************************************************************************************/ ************************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <stdint.h>
#include <debug.h> #include <debug.h>
#include <assert.h> #include <assert.h>
@ -75,8 +75,8 @@
#ifdef CONFIG_LM3S_BOARDMAC #ifdef CONFIG_LM3S_BOARDMAC
void lm3s_ethernetmac(struct ether_addr *ethaddr) void lm3s_ethernetmac(struct ether_addr *ethaddr)
{ {
uint32 user0; uint32_t user0;
uint32 user1; uint32_t user1;
/* Get the current value of the user registers */ /* Get the current value of the user registers */

8
configs/eagle100/src/up_leds.c
View File

@ -39,8 +39,8 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <stdbool.h>
#include <debug.h> #include <debug.h>
#include <arch/board/board.h> #include <arch/board/board.h>
@ -89,7 +89,7 @@
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/
static boolean g_nest; static uint8_t g_nest;
/**************************************************************************** /****************************************************************************
* Name: up_ledinit * Name: up_ledinit
@ -129,7 +129,7 @@ void up_ledon(int led)
case LED_IRQSENABLED: case LED_IRQSENABLED:
case LED_STACKCREATED: case LED_STACKCREATED:
led_dumpgpio("up_ledon: before lm3s_gpiowrite()"); led_dumpgpio("up_ledon: before lm3s_gpiowrite()");
lm3s_gpiowrite(LED_GPIO, FALSE); lm3s_gpiowrite(LED_GPIO, false);
led_dumpgpio("up_ledon: after lm3s_gpiowrite()"); led_dumpgpio("up_ledon: after lm3s_gpiowrite()");
break; break;
} }
@ -157,7 +157,7 @@ void up_ledoff(int led)
if (--g_nest <= 0) if (--g_nest <= 0)
{ {
led_dumpgpio("up_ledoff: before lm3s_gpiowrite()"); led_dumpgpio("up_ledoff: before lm3s_gpiowrite()");
lm3s_gpiowrite(LED_GPIO, TRUE); lm3s_gpiowrite(LED_GPIO, true);
led_dumpgpio("up_ledoff: after lm3s_gpiowrite()"); led_dumpgpio("up_ledoff: after lm3s_gpiowrite()");
} }
break; break;

1
configs/eagle100/src/up_nsh.c
View File

@ -39,7 +39,6 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <stdio.h> #include <stdio.h>
#include <debug.h> #include <debug.h>

7
configs/eagle100/src/up_ssi.c
View File

@ -39,8 +39,9 @@
************************************************************************************/ ************************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
#include <debug.h> #include <debug.h>
#include <nuttx/spi.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"); ssidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
if (devid == SPIDEV_MMCSD) 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" #warning "Need to check schematic"
ssidbg("Returning SPI_STATUS_PRESENT\n"); ssidbg("Returning SPI_STATUS_PRESENT\n");

4
configs/ez80f910200kitg/src/ez80_leds.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/ez80f910200kitg/src/ez80_leds.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -38,7 +38,7 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <arch/board/board.h> #include <arch/board/board.h>
#include "up_internal.h" #include "up_internal.h"

5
configs/ez80f910200kitg/src/ez80_lowinit.c
View File

@ -1,7 +1,7 @@
/*************************************************************************** /***************************************************************************
* configs/ez80f910200kitg/src/ez80_lowinit.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Based upon sample code included with the Zilog ZDS-II toolchain. * Based upon sample code included with the Zilog ZDS-II toolchain.
@ -40,12 +40,11 @@
***************************************************************************/ ***************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include "chip/chip.h" #include "chip/chip.h"
/*************************************************************************** /***************************************************************************
* Definitions * Pre-processor Definitions
***************************************************************************/ ***************************************************************************/
/*************************************************************************** /***************************************************************************

6
configs/ez80f910200zco/include/board.h
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* arch/ez80f910200zco/include/board.h * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -40,6 +40,8 @@
* Included Files * Included Files
****************************************************************************/ ****************************************************************************/
#include <stdint.h>
/**************************************************************************** /****************************************************************************
* Definitions * Definitions
****************************************************************************/ ****************************************************************************/
@ -80,7 +82,7 @@ extern "C" {
#ifdef CONFIG_ARCH_BUTTONS #ifdef CONFIG_ARCH_BUTTONS
EXTERN void up_buttoninit(void); EXTERN void up_buttoninit(void);
EXTERN ubyte up_buttons(void); EXTERN uint8_t up_buttons(void);
#endif #endif
#undef EXTERN #undef EXTERN

15
configs/ez80f910200zco/src/ez80_buttons.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/ez80f910200zco/src/ez80_leds.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -38,7 +38,8 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <stdint.h>
#include <nuttx/irq.h> #include <nuttx/irq.h>
@ -69,7 +70,7 @@
#if 0 #if 0
void up_PBinterrupt(void) void up_PBinterrupt(void)
{ {
ubyte regval; uint8_t regval;
regval = inp(EZ80_PB_DR); /* Clear interrupt flag for eZ80F91 date codes before 0611 */ regval = inp(EZ80_PB_DR); /* Clear interrupt flag for eZ80F91 date codes before 0611 */
regval |= 7; regval |= 7;
@ -82,7 +83,7 @@ void up_PBinterrupt(void)
void up_pb1interrupt(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 = inp(EZ80_PB_DR); /* Clear interrupt flag for eZ80F91 date codes before 0611 */
regval |= 7; regval |= 7;
@ -95,7 +96,7 @@ void up_pb1interrupt(void)
void up_pb2interrupt(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 = inp(EZ80_PB_DR); /* Clear interrupt flag for eZ80F91 date codes before 0611 */
regval |= 7; regval |= 7;
@ -118,7 +119,7 @@ void up_pb2interrupt(void)
#ifdef CONFIG_ARCH_BUTTONS #ifdef CONFIG_ARCH_BUTTONS
void up_buttoninit(void) void up_buttoninit(void)
{ {
ubyte regval; uint8_t regval;
#if 0 /* Interrupts are not used */ #if 0 /* Interrupts are not used */
@ -166,7 +167,7 @@ void up_buttoninit(void)
* Name: up_buttons * Name: up_buttons
****************************************************************************/ ****************************************************************************/
ubyte up_buttons(void) uint8_t up_buttons(void)
{ {
return inp(EZ80_PB_DDR) & 7; return inp(EZ80_PB_DDR) & 7;
} }

207
configs/ez80f910200zco/src/ez80_leds.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/ez80f910200zco/src/ez80_leds.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -38,7 +38,8 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <stdint.h>
#include <arch/board/board.h> #include <arch/board/board.h>
#include "ez80f910200zco.h" #include "ez80f910200zco.h"
@ -61,145 +62,145 @@
*/ */
#if 0 /* Not used */ #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 #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 */ #if 0 /* Not used */
static const ubyte g_chexclam[7] = {0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x1f, 0x1b}; /* ! */ static const uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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_chrparen[7] = {0x17, 0x1b, 0x1d, 0x1d, 0x1d, 0x1b, 0x17}; /* ) */
#endif #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 */ #if 0 /* Not used */
static const ubyte g_chplus[7] = {0x1f, 0x1b, 0x1b, 0x00, 0x1b, 0x1b, 0x1f}; /* + */ static const uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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_chslash[7] = {0x1f, 0x1e, 0x1d, 0x1b, 0x17, 0x0f, 0x1f}; /* / */
#endif #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 */ #if 0 /* Not used */
static const ubyte g_ch1[7] = {0x1b, 0x13, 0x1b, 0x1b, 0x1b, 0x1b, 0x11}; /* 1 */ static const uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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_chat[7] = {0x11, 0x0a, 0x04, 0x04, 0x05, 0x0a, 0x11}; /* @ */
#endif #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 */ #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 #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 */ #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 #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 */ #if 0 /* Not used */
static const ubyte g_chF[7] = {0x00, 0x0f, 0x0f, 0x01, 0x0f, 0x0f, 0x0f}; /* F */ static const uint8_t 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_chG[7] = {0x11, 0x0e, 0x0f, 0x08, 0x0e, 0x0e, 0x11}; /* G */
#endif #endif
static const ubyte g_chH[7] = {0x0e, 0x0e, 0x0e, 0x00, 0x0e, 0x0e, 0x0e}; /* H */ static const uint8_t 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_chI[7] = {0x00, 0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x00}; /* I */
#if 0 /* Not used */ #if 0 /* Not used */
static const ubyte g_chJ[7] = {0x00, 0x1d, 0x1d, 0x1d, 0x0d, 0x0d, 0x13}; /* J */ static const uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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_chQ[7] = {0x11, 0x0e, 0x0e, 0x0e, 0x0a, 0x0c, 0x10}; /* Q */
#endif #endif
static const ubyte g_chR[7] = {0x01, 0x0e, 0x0e, 0x01, 0x0b, 0x0d, 0x0e}; /* R */ static const uint8_t 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_chS[7] = {0x11, 0x0e, 0x0f, 0x11, 0x1e, 0x0e, 0x11}; /* S */
#if 0 /* Not used */ #if 0 /* Not used */
static const ubyte g_chT[7] = {0x00, 0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x1b}; /* T */ static const uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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 uint8_t 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_chtilde[7] = {0x1f, 0x1a, 0x15, 0x1f, 0x1f, 0x1f, 0x1f}; /* ~ */
#endif #endif
/* The current and previously selected glyph */ /* The current and previously selected glyph */
static const ubyte *g_currglyph = g_chspace; static const uint8_t *g_currglyph = g_chspace;
static const ubyte *g_prevglyph = g_chspace; static const uint8_t *g_prevglyph = g_chspace;
/* Current row and column */ /* Current row and column */
static ubyte g_anodecol = 1; static uint8_t g_anodecol = 1;
static ubyte g_cathoderow = 0; static uint8_t g_cathoderow = 0;
static sbyte g_intcount = 0; static sbyte g_intcount = 0;
/**************************************************************************** /****************************************************************************
@ -229,7 +230,7 @@ void up_ledinit(void)
void up_ledon(int led) void up_ledon(int led)
{ {
FAR const ubyte *tmp = g_currglyph; FAR const uint8_t *tmp = g_currglyph;
switch (led) switch (led)
{ {
case LED_STARTED: case LED_STARTED:

3
configs/ez80f910200zco/src/ez80_lowinit.c
View File

@ -1,7 +1,7 @@
/*************************************************************************** /***************************************************************************
* configs/ez80f910200zco/src/ez80_lowinit.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Based upon sample code included with the Zilog ZDS-II toolchain. * Based upon sample code included with the Zilog ZDS-II toolchain.
@ -40,7 +40,6 @@
***************************************************************************/ ***************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include "chip/chip.h" #include "chip/chip.h"

8
configs/ez80f910200zco/src/ez80f910200zco.h
View File

@ -40,6 +40,10 @@
* Included Files * Included Files
****************************************************************************/ ****************************************************************************/
#ifndef __ASSEMBLY__
# include <stdint.h>
#endif
/**************************************************************************** /****************************************************************************
* Definitions * Definitions
****************************************************************************/ ****************************************************************************/
@ -64,8 +68,8 @@
#define EZ80_TRIGGERS EZ80_LEDCATHODE #define EZ80_TRIGGERS EZ80_LEDCATHODE
#define EZ80_GPIODATA 0x800002 /* RD/WR: GPIO data */ #define EZ80_GPIODATA 0x800002 /* RD/WR: GPIO data */
#define ez80_getmmreg8(a) (*(ubyte*)(a)) #define ez80_getmmreg8(a) (*(uint8_t*)(a))
#define ez80_putmmreg8(v,a) (*(ubyte*)(a) = (v)) #define ez80_putmmreg8(v,a) (*(uint8_t*)(a) = (v))
/* LED anode/GPIO port output control bit definitions */ /* LED anode/GPIO port output control bit definitions */

6
configs/mcu123-lpc214x/include/board.h
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/mcu123-lpc214x/include/board.h * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -40,10 +40,6 @@
* Included Files * Included Files
****************************************************************************/ ****************************************************************************/
#ifndef __ASSEMBLY__
# include <sys/types.h>
#endif
/**************************************************************************** /****************************************************************************
* Definitions * Definitions
****************************************************************************/ ****************************************************************************/

3
configs/mcu123-lpc214x/src/up_leds.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/mcu123-lpc214x/src/up_leds.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -38,7 +38,6 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include "chip.h" #include "chip.h"
#include "up_arch.h" #include "up_arch.h"

1
configs/mcu123-lpc214x/src/up_nsh.c
View File

@ -39,7 +39,6 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <stdio.h> #include <stdio.h>
#include <debug.h> #include <debug.h>

53
configs/mcu123-lpc214x/src/up_spi.c
View File

@ -62,7 +62,10 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/spi.h>
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
#include <debug.h> #include <debug.h>
#include <arch/board/board.h> #include <arch/board/board.h>
@ -120,10 +123,10 @@
* Private Function Prototypes * Private Function Prototypes
****************************************************************************/ ****************************************************************************/
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);
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);
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);
static uint16 spi_send(FAR struct spi_dev_s *dev, uint16 ch); 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_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); 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: * Input Parameters:
* dev - Device-specific state data * dev - Device-specific state data
* devid - Identifies the device to select * devid - Identifies the device to select
* selected - TRUE: slave selected, FALSE: slave de-selected * selected - true: slave selected, false: slave de-selected
* *
* Returned Value: * Returned Value:
* None * 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) 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) 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 /* I don't think there is anyway to determine these things on the mcu123.com
* board. * 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 */ /* 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 */ /* 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 */ /* 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. * 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 * The wordsize is determined by the number of bits-per-word
* selected for the SPI interface. If nbits <= 8, the data is * 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: * Returned Value:
* None * 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) 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; FAR const uint8_t *ptr = (FAR const uint8_t *)buffer;
ubyte sr; uint8_t sr;
/* Loop while thre are bytes remaining to be sent */ /* 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 */ /* Send the data */
putreg16((uint16)*ptr, LPC214X_SPI1_DR); putreg16((uint16_t)*ptr, LPC214X_SPI1_DR);
ptr++; ptr++;
nwords--; 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); (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 * RNE goes true and this loop terminates prematurely. The nasty little
* delay in the following solves that (it could probably be tuned * delay in the following solves that (it could probably be tuned
* to improve performance). * 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 * 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 * of words. The wordsize is determined by the number of bits-per-word
* selected for the SPI interface. If nbits <= 8, the data is * 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: * Returned Value:
* None * 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) static void spi_recvblock(FAR struct spi_dev_s *dev, FAR void *buffer, size_t nwords)
{ {
FAR ubyte *ptr = (FAR ubyte*)buffer; FAR uint8_t *ptr = (FAR uint8_t*)buffer;
uint32 rxpending = 0; uint32_t rxpending = 0;
/* While there is remaining to be sent (and no synchronization error has occurred) */ /* 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); spivdbg("RX: rxpending: %d\n", rxpending);
while (getreg8(LPC214X_SPI1_SR) & LPC214X_SPI1SR_RNE) while (getreg8(LPC214X_SPI1_SR) & LPC214X_SPI1SR_RNE)
{ {
*ptr++ = (ubyte)getreg16(LPC214X_SPI1_DR); *ptr++ = (uint8_t)getreg16(LPC214X_SPI1_DR);
rxpending--; 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) FAR struct spi_dev_s *up_spiinitialize(int port)
{ {
uint32 regval32; uint32_t regval32;
ubyte regval8; uint8_t regval8;
int i; int i;
/* Only the SPI1 interface is supported */ /* Only the SPI1 interface is supported */

1
configs/mcu123-lpc214x/src/up_usbstrg.c
View File

@ -42,7 +42,6 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <stdio.h> #include <stdio.h>
#include <sys/types.h>
#include <debug.h> #include <debug.h>
#include <errno.h> #include <errno.h>

4
configs/mx1ads/include/board.h
View File

@ -41,10 +41,6 @@
* Included Files * Included Files
************************************************************************************/ ************************************************************************************/
#ifndef __ASSEMBLY__
# include <sys/types.h>
#endif
/************************************************************************************ /************************************************************************************
* Definitions * Definitions
************************************************************************************/ ************************************************************************************/

5
configs/mx1ads/src/up_boot.c
View File

@ -39,7 +39,8 @@
************************************************************************************/ ************************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <stdint.h>
#include <arch/board/board.h> #include <arch/board/board.h>
@ -69,7 +70,7 @@
void imx_boardinitialize(void) void imx_boardinitialize(void)
{ {
uint32 regval; uint32_t regval;
putreg32(0x000003ab, IMX_SC_GPCR); /* I/O pad driving strength */ putreg32(0x000003ab, IMX_SC_GPCR); /* I/O pad driving strength */
putreg32(IMX_MPCTL0_VALUE, IMX_PLL_MPCTL0); putreg32(IMX_MPCTL0_VALUE, IMX_PLL_MPCTL0);

2
configs/mx1ads/src/up_leds.c
View File

@ -39,7 +39,7 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include "up_internal.h" #include "up_internal.h"
/**************************************************************************** /****************************************************************************

1
configs/mx1ads/src/up_network.c
View File

@ -41,7 +41,6 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#if defined(CONFIG_NET) && defined(CONFIG_NET_CS8900) #if defined(CONFIG_NET) && defined(CONFIG_NET_CS8900)
#include <sys/types.h>
#include <debug.h> #include <debug.h>
#include <arch/board/board.h> #include <arch/board/board.h>

6
configs/ntosd-dm320/include/board.h
View File

@ -1,7 +1,7 @@
/************************************************************************************ /************************************************************************************
* arch/board/board.h * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -40,10 +40,6 @@
* Included Files * Included Files
************************************************************************************/ ************************************************************************************/
#ifndef __ASSEMBLY__
# include <sys/types.h>
#endif
/************************************************************************************ /************************************************************************************
* Definitions * Definitions
************************************************************************************/ ************************************************************************************/

44
configs/ntosd-dm320/src/up_leds.c
View File

@ -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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * 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 * notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the * the documentation and/or other materials provided with the
* distribution. * 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 * used to endorse or promote products derived from this software
* without specific prior written permission. * without specific prior written permission.
* *
@ -31,35 +31,35 @@
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************/ ************************************************************************/
/************************************************************ /************************************************************************
* Included Files * Included Files
************************************************************/ ************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include "up_internal.h" #include "up_internal.h"
/************************************************************ /************************************************************************
* Definitions * Definitions
************************************************************/ ************************************************************************/
/************************************************************ /************************************************************************
* Private Data * Private Data
************************************************************/ ************************************************************************/
/************************************************************ /************************************************************************
* Private Functions * Private Functions
************************************************************/ ************************************************************************/
/************************************************************ /************************************************************************
* Public Funtions * Public Funtions
************************************************************/ ************************************************************************/
/************************************************************ /************************************************************************
* Name: up_ledinit * Name: up_ledinit
************************************************************/ ************************************************************************/
#ifdef CONFIG_ARCH_LEDS #ifdef CONFIG_ARCH_LEDS
void up_ledinit(void) void up_ledinit(void)
@ -70,9 +70,9 @@ void up_ledinit(void)
GIO_CLEAR_OUTPUT(GIO_LED_RED); GIO_CLEAR_OUTPUT(GIO_LED_RED);
} }
/************************************************************ /************************************************************************
* Name: up_ledon * Name: up_ledon
************************************************************/ ************************************************************************/
void up_ledon(int led) void up_ledon(int led)
{ {
@ -86,9 +86,9 @@ void up_ledon(int led)
} }
} }
/************************************************************ /************************************************************************
* Name: up_ledoff * Name: up_ledoff
************************************************************/ ************************************************************************/
void up_ledoff(int led) void up_ledoff(int led)
{ {

1
configs/ntosd-dm320/src/up_network.c
View File

@ -40,7 +40,6 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#if defined(CONFIG_NET) && defined(CONFIG_NET_DM90x0) #if defined(CONFIG_NET) && defined(CONFIG_NET_DM90x0)
#include <sys/types.h>
#include <debug.h> #include <debug.h>
#include <arch/board/board.h> #include <arch/board/board.h>

6
configs/olimex-strp711/include/board.h
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/olimex-strp711/include/board.h * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -70,7 +70,7 @@
****************************************************************************/ ****************************************************************************/
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
# include <sys/types.h> # include <stdint.h>
#endif #endif
#include "chip.h" #include "chip.h"
@ -173,7 +173,7 @@ extern "C" {
#ifdef CONFIG_ARCH_BUTTONS #ifdef CONFIG_ARCH_BUTTONS
EXTERN void up_buttoninit(void); EXTERN void up_buttoninit(void);
EXTERN ubyte up_buttons(void); EXTERN uint8_t up_buttons(void);
#endif #endif
#undef EXTERN #undef EXTERN

10
configs/olimex-strp711/src/up_buttons.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/olimex-strp711/src/up_leds.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -38,7 +38,7 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h> #include <stdint.h>
#include "chip.h" #include "chip.h"
#include "up_arch.h" #include "up_arch.h"
@ -76,7 +76,7 @@
#ifdef CONFIG_ARCH_BUTTONS #ifdef CONFIG_ARCH_BUTTONS
void up_buttoninit(void) void up_buttoninit(void)
{ {
uint16 reg16; uint16_t reg16;
/* Configure the GPIO0 & 1 pins as inputs */ /* Configure the GPIO0 & 1 pins as inputs */
@ -109,9 +109,9 @@ void up_buttoninit(void)
* Name: up_buttons * 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) if ((getreg16(STR71X_GPIO0_PD) & STR71X_WAKEUPBUTTON_GPIO0) != 0)
{ {

14
configs/olimex-strp711/src/up_leds.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/olimex-strp711/src/up_leds.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -38,7 +38,7 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h> #include <stdint.h>
#include "chip.h" #include "chip.h"
#include "up_arch.h" #include "up_arch.h"
@ -62,8 +62,8 @@
* Private Data * Private Data
****************************************************************************/ ****************************************************************************/
static uint16 g_led2set; static uint16_t g_led2set;
static uint16 g_led2clr; static uint16_t g_led2clr;
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
@ -73,9 +73,9 @@ static uint16 g_led2clr;
* Name: up_setleds * 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 */ /* Save the state of LED2 for later */
@ -101,7 +101,7 @@ static void up_setleds(uint16 setbits, uint16 clearbits)
#ifdef CONFIG_ARCH_LEDS #ifdef CONFIG_ARCH_LEDS
void up_ledinit(void) void up_ledinit(void)
{ {
uint16 reg16; uint16_t reg16;
/* Set normal function output */ /* Set normal function output */

1
configs/olimex-strp711/src/up_nsh.c
View File

@ -39,7 +39,6 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <stdio.h> #include <stdio.h>
#include <debug.h> #include <debug.h>

71
configs/olimex-strp711/src/up_spi.c
View File

@ -38,6 +38,11 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
#include <nuttx/spi.h> #include <nuttx/spi.h>
#include <arch/board/board.h> #include <arch/board/board.h>
@ -248,8 +253,8 @@
struct str71x_spidev_s struct str71x_spidev_s
{ {
struct spi_dev_s spidev; /* Externally visible part of the SPI interface */ struct spi_dev_s spidev; /* Externally visible part of the SPI interface */
uint32 spibase; /* BSPIn base address */ uint32_t spibase; /* BSPIn base address */
uint16 csbit; /* BSPIn SS bit int GPIO0 */ uint16_t csbit; /* BSPIn SS bit int GPIO0 */
}; };
/**************************************************************************** /****************************************************************************
@ -258,15 +263,15 @@ struct str71x_spidev_s
/* Helpers */ /* Helpers */
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);
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);
/* SPI methods */ /* SPI methods */
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);
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);
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);
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);
static void spi_sndblock(FAR struct spi_dev_s *dev, FAR const void *buffer, size_t buflen); 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); 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); 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); 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: * Input Parameters:
* dev - Device-specific state data * dev - Device-specific state data
* devid - Identifies the device to select * devid - Identifies the device to select
* selected - TRUE: slave selected, FALSE: slave de-selected * selected - true: slave selected, false: slave de-selected
* *
* Returned Value: * Returned Value:
* None * 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; FAR struct str71x_spidev_s *priv = (FAR struct str71x_spidev_s *)dev;
uint16 reg16; uint16_t reg16;
DEBUGASSERT(priv && priv->spibase); 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; FAR struct str71x_spidev_s *priv = (FAR struct str71x_spidev_s *)dev;
uint32 divisor; uint32_t divisor;
uint32 cr1; uint32_t cr1;
DEBUGASSERT(priv && priv->spibase); 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 = spi_getreg(priv, STR71X_BSPI_CSR1_OFFSET);
cr1 &= ~(STR71X_BSPICSR1_BSPE|STR71X_BSPICSR1_MSTR); cr1 &= ~(STR71X_BSPICSR1_BSPE|STR71X_BSPICSR1_MSTR);
spi_putreg(priv, STR71X_BSPI_CSR1_OFFSET, cr1); 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 */ /* 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; uint8_t ret = 0;
uint16 reg16 = getreg16(STR71X_GPIO1_PD); uint16_t reg16 = getreg16(STR71X_GPIO1_PD);
if ((reg16 & MMCSD_GPIO1_WPIN) != 0) 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; 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 */ /* 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. * 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 * The wordsize is determined by the number of bits-per-word
* selected for the SPI interface. If nbits <= 8, the data is * 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: * Returned Value:
* None * 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) 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 struct str71x_spidev_s *priv = (FAR struct str71x_spidev_s *)dev;
FAR const ubyte *ptr = (FAR const ubyte *)buffer; FAR const uint8_t *ptr = (FAR const uint8_t *)buffer;
uint16 csr2; uint16_t csr2;
DEBUGASSERT(priv && priv->spibase); 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 */ /* 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++; ptr++;
buflen--; 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); (void)spi_getreg(priv, STR71X_BSPI_RXR_OFFSET);
} }
/* There is a race condition where TFNE may go FALSE just before /* There is a race condition where TFNE may go false just before
* RFNE goes TRUE and this loop terminates prematurely. The nasty little * RFNE goes true and this loop terminates prematurely. The nasty little
* delay in the following solves that (it could probably be tuned to * delay in the following solves that (it could probably be tuned to
* improve performance). * 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 * 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 * of words. The wordsize is determined by the number of bits-per-word
* selected for the SPI interface. If nbits <= 8, the data is * 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: * Returned Value:
* None * 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) 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 struct str71x_spidev_s *priv = (FAR struct str71x_spidev_s *)dev;
FAR ubyte *ptr = (FAR ubyte*)buffer; FAR uint8_t *ptr = (FAR uint8_t*)buffer;
uint32 fifobytes = 0; uint32_t fifobytes = 0;
DEBUGASSERT(priv && priv->spibase); 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) 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--; fifobytes--;
} }
} }
@ -713,7 +718,7 @@ FAR struct spi_dev_s *up_spiinitialize(int port)
{ {
FAR struct spi_dev_s *ret; FAR struct spi_dev_s *ret;
irqstate_t flags; irqstate_t flags;
uint16 reg16; uint16_t reg16;
flags = irqsave(); flags = irqsave();
#ifdef CONFIG_STR71X_BSPI0 #ifdef CONFIG_STR71X_BSPI0

2
configs/pjrc-8051/include/board.h
View File

@ -1,7 +1,7 @@
/************************************************************ /************************************************************
* board/board.h * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without

20
configs/pjrc-8051/include/pjrc.h
View File

@ -1,7 +1,7 @@
/************************************************************************** /**************************************************************************
* pjrc.h * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -40,7 +40,7 @@
* Included Files * Included Files
**************************************************************************/ **************************************************************************/
#include <sys/types.h> #include <stdint.h>
/************************************************************************** /**************************************************************************
* Public Definitions * Public Definitions
@ -135,14 +135,14 @@
*/ */
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
xdata at 0xF800 ubyte p82c55_port_a; xdata at 0xF800 uint8_t p82c55_port_a;
xdata at 0xF801 ubyte p82c55_port_b; xdata at 0xF801 uint8_t p82c55_port_b;
xdata at 0xF802 ubyte p82c55_port_c; xdata at 0xF802 uint8_t p82c55_port_c;
xdata at 0xF803 ubyte p82c55_abc_config; xdata at 0xF803 uint8_t p82c55_abc_config;
xdata at 0xF900 ubyte p82c55_port_d; xdata at 0xF900 uint8_t p82c55_port_d;
xdata at 0xF901 ubyte p82c55_port_e; xdata at 0xF901 uint8_t p82c55_port_e;
xdata at 0xF902 ubyte p82c55_port_f; xdata at 0xF902 uint8_t p82c55_port_f;
xdata at 0xF903 ubyte p82c55_def_config; xdata at 0xF903 uint8_t p82c55_def_config;
#endif #endif
/* LED (Port E) bit definitions */ /* LED (Port E) bit definitions */

50
configs/pjrc-8051/src/up_leds.c
View File

@ -1,7 +1,7 @@
/************************************************************ /************************************************************************
* up_leds.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * 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 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
************************************************************/ ************************************************************************/
/************************************************************ /************************************************************************
* Included Files * Included Files
************************************************************/ ************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h> #include <stdint.h>
#include "up_internal.h" #include "up_internal.h"
/************************************************************ /************************************************************************
* Definitions * Definitions
************************************************************/ ************************************************************************/
#define RESET_KLUDGE_NEEDED 1 #define RESET_KLUDGE_NEEDED 1
/************************************************************ /************************************************************************
* Private Data * Private Data
************************************************************/ ************************************************************************/
static ubyte g_ledstate; static uint8_t g_ledstate;
/************************************************************ /************************************************************************
* Private Functions * Private Functions
************************************************************/ ************************************************************************/
#if defined(CONFIG_LED_DEBUG) && defined(CONFIG_ARCH_LEDS) #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 */ hex; /* To avoid unreferenced argument warning */
_asm _asm
@ -67,7 +67,7 @@ static void _up_puthex(ubyte hex) __naked
_endasm; _endasm;
} }
static void _up_putch(ubyte ch) __naked static void _up_putch(uint8_t ch) __naked
{ {
_asm _asm
mov a, dpl mov a, dpl
@ -114,13 +114,13 @@ static void _up_putnl(void) __naked
#endif #endif
/************************************************************ /************************************************************************
* Public Funtions * Public Funtions
************************************************************/ ************************************************************************/
/************************************************************ /************************************************************************
* Name: up_ledinit * Name: up_ledinit
************************************************************/ ************************************************************************/
#ifdef CONFIG_ARCH_LEDS #ifdef CONFIG_ARCH_LEDS
void up_ledinit(void) void up_ledinit(void)
@ -137,11 +137,11 @@ void up_ledinit(void)
_up_showledinit(); _up_showledinit();
} }
/************************************************************ /************************************************************************
* Name: up_ledon * Name: up_ledon
************************************************************/ ************************************************************************/
void up_ledon(ubyte led) void up_ledon(uint8_t led)
{ {
/* This may be called from an interrupt handler */ /* This may be called from an interrupt handler */
@ -171,11 +171,11 @@ void up_ledon(ubyte led)
irqrestore(flags); irqrestore(flags);
} }
/************************************************************ /************************************************************************
* Name: up_ledoff * Name: up_ledoff
************************************************************/ ************************************************************************/
void up_ledoff(ubyte led) void up_ledoff(uint8_t led)
{ {
/* This may be called from an interrupt handler */ /* This may be called from an interrupt handler */

4
configs/skp16c26/include/board.h
View File

@ -41,10 +41,6 @@
* Included Files * Included Files
************************************************************************************/ ************************************************************************************/
#ifndef __ASSEMBLY__
# include <sys/types.h>
#endif
/************************************************************************************ /************************************************************************************
* Definitions * Definitions
************************************************************************************/ ************************************************************************************/

4
configs/skp16c26/src/skp16c26_internal.h
View File

@ -40,10 +40,6 @@
* Included Files * Included Files
************************************************************************************/ ************************************************************************************/
#ifndef __ASSEMBLY__
# include <sys/types.h>
#endif
/************************************************************************************ /************************************************************************************
* Definitions * Definitions
************************************************************************************/ ************************************************************************************/

10
configs/skp16c26/src/up_buttons.c
View File

@ -38,7 +38,7 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h> #include <stdint.h>
#include "chip.h" #include "chip.h"
#include "up_arch.h" #include "up_arch.h"
@ -75,7 +75,7 @@
#ifdef CONFIG_ARCH_BUTTONS #ifdef CONFIG_ARCH_BUTTONS
void up_buttoninit(void) void up_buttoninit(void)
{ {
ubyte regval; uint8_t regval;
regval = getreg8(M16C_PD8); regval = getreg8(M16C_PD8);
regval |= (SW1_BIT | SW2_BIT | SW3_BIT); regval |= (SW1_BIT | SW2_BIT | SW3_BIT);
@ -86,10 +86,10 @@ void up_buttoninit(void)
* Name: up_buttons * Name: up_buttons
****************************************************************************/ ****************************************************************************/
ubyte up_buttons(void) uint8_t up_buttons(void)
{ {
ubyte swset = 0; uint8_t swset = 0;
ubyte regval = getreg8(M16C_P8); uint8_t regval = getreg8(M16C_P8);
if (SW_PRESSED(regval, SW1_BIT)) if (SW_PRESSED(regval, SW1_BIT))
{ {

50
configs/skp16c26/src/up_lcd.c
View File

@ -38,7 +38,9 @@
************************************************************************************/ ************************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
#include <ctype.h> #include <ctype.h>
#include "up_arch.h" #include "up_arch.h"
@ -77,8 +79,8 @@
* Private Data * Private Data
************************************************************************************/ ************************************************************************************/
static ubyte g_nchars; /* Number of characters in lines 2 */ static uint8_t g_nchars; /* Number of characters in lines 2 */
static ubyte g_line[LCD_NCHARS]; /* The content of lines 2 */ static uint8_t g_line[LCD_NCHARS]; /* The content of lines 2 */
/************************************************************************************ /************************************************************************************
* Private Functions * Private Functions
@ -88,9 +90,9 @@ static ubyte g_line[LCD_NCHARS]; /* The content of lines 2 */
* Name: up_lcddelay * 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--) while(counter--)
{ {
asm("\tnop\n\tnop\n\tnop\n" : :); /* 3 NOPs */ asm("\tnop\n\tnop\n\tnop\n" : :); /* 3 NOPs */
@ -101,11 +103,11 @@ static void up_lcddelay(uint16 count)
* Name: up_setrs * Name: up_setrs
************************************************************************************/ ************************************************************************************/
static inline void up_setrs(boolean data) static inline void up_setrs(bool data)
{ {
/* Set/clear bit 1 of port 6 */ /* Set/clear bit 1 of port 6 */
register ubyte regval = getreg8(M16C_P6); register uint8_t regval = getreg8(M16C_P6);
if (data) if (data)
{ {
regval |= (1 << 0); /* High = data */ regval |= (1 << 0); /* High = data */
@ -125,7 +127,7 @@ static inline void up_seten(void)
{ {
/* Set bit 1 of port 6 */ /* Set bit 1 of port 6 */
register ubyte regval = getreg8(M16C_P6); register uint8_t regval = getreg8(M16C_P6);
regval = (1 << 1); regval = (1 << 1);
putreg8(regval, M16C_P6); putreg8(regval, M16C_P6);
} }
@ -138,7 +140,7 @@ static inline void up_clren(void)
{ {
/* Clear bit 1 of port 6 */ /* Clear bit 1 of port 6 */
register ubyte regval = getreg8(M16C_P6); register uint8_t regval = getreg8(M16C_P6);
regval &= ~(1 << 1); regval &= ~(1 << 1);
putreg8(regval, M16C_P6); putreg8(regval, M16C_P6);
} }
@ -147,7 +149,7 @@ static inline void up_clren(void)
* Name: up_enpluse * Name: up_enpluse
************************************************************************************/ ************************************************************************************/
static inline void up_enpulse(boolean data) static inline void up_enpulse(bool data)
{ {
up_seten(); /* EN enable chip (HIGH) */ up_seten(); /* EN enable chip (HIGH) */
up_lcddelay(0); /* Short delay */ up_lcddelay(0); /* Short delay */
@ -160,7 +162,7 @@ static inline void up_enpulse(boolean data)
* Name: up_lcdwrite * Name: up_lcdwrite
************************************************************************************/ ************************************************************************************/
void up_lcdwrite(boolean data, ubyte ch) void up_lcdwrite(bool data, uint8_t ch)
{ {
up_setrs(data); /* Set RS appropriately */ 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 */ /* Clear the display and position the cursor at the beginning of line 1 */
up_lcdwrite(FALSE, LCD_CLEAR); up_lcdwrite(false, LCD_CLEAR);
up_lcdwrite(FALSE, LCD_HOME_L1); up_lcdwrite(false, LCD_HOME_L1);
/* Copy line 2 to line 1 */ /* Copy line 2 to line 1 */
for (i = 0; i < g_nchars; i++) 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 */ /* Position the cursor at the beginning of line 2 */
up_lcdwrite(FALSE, LCD_HOME_L2); up_lcdwrite(false, LCD_HOME_L2);
g_nchars = 0; g_nchars = 0;
} }
@ -213,7 +215,7 @@ static void up_scroll(void)
void up_lcdinit(void) void up_lcdinit(void)
{ {
ubyte regval; uint8_t regval;
/* Enable writing to PD9 by selecting bit 2 in the protection register */ /* Enable writing to PD9 by selecting bit 2 in the protection register */
@ -241,15 +243,15 @@ void up_lcdinit(void)
/* Write the reset sequence */ /* Write the reset sequence */
up_lcdwrite(FALSE, 0x33); up_lcdwrite(false, 0x33);
up_lcddelay(20); up_lcddelay(20);
up_lcdwrite(FALSE, 0x32); up_lcdwrite(false, 0x32);
up_lcddelay(20); up_lcddelay(20);
up_lcdwrite(FALSE, FUNCTION_SET); /* reset sequence */ up_lcdwrite(false, FUNCTION_SET); /* reset sequence */
up_lcdwrite(FALSE, FUNCTION_SET); up_lcdwrite(false, FUNCTION_SET);
up_lcdwrite(FALSE, LCD_CURSOR_OFF); up_lcdwrite(false, LCD_CURSOR_OFF);
up_lcdwrite(FALSE, LCD_CLEAR); up_lcdwrite(false, LCD_CLEAR);
up_lcdwrite(FALSE, LCD_HOME_L1); up_lcdwrite(false, LCD_HOME_L1);
} }
/************************************************************************************ /************************************************************************************
@ -271,7 +273,7 @@ void up_lcdputc(char ch)
else if (g_nchars < LCD_NCHARS && isprint(ch)) else if (g_nchars < LCD_NCHARS && isprint(ch))
{ {
up_lcdwrite(TRUE, ch); up_lcdwrite(true, ch);
g_line[g_nchars] = ch; g_line[g_nchars] = ch;
g_nchars++; g_nchars++;
} }

2
configs/skp16c26/src/up_lcdconsole.c
View File

@ -38,7 +38,7 @@
************************************************************************************/ ************************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include "up_internal.h" #include "up_internal.h"

18
configs/skp16c26/src/up_leds.c
View File

@ -38,7 +38,7 @@
************************************************************************************/ ************************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h> #include <stdint.h>
#include <arch/board/board.h> #include <arch/board/board.h>
#include "up_arch.h" #include "up_arch.h"
@ -85,7 +85,7 @@
* Private Data Definitions * 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_OFF | YELLOW_LED_OFF | RED_LED_OFF), /* LED_STARTED */
(GREEN_LED_ON | YELLOW_LED_OFF | RED_LED_OFF), /* LED_HEAPALLOCATE */ (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 */ (GREEN_LED_ON | YELLOW_LED_ON | RED_LED_ON ) /* LED_ASSERTION */
}; };
static ubyte g_prevled[3]; static uint8_t g_prevled[3];
static ubyte g_nestlevel; static uint8_t g_nestlevel;
/************************************************************************************ /************************************************************************************
* Private Functions * Private Functions
@ -108,9 +108,9 @@ static ubyte g_nestlevel;
* Name: up_ledinit * 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 = getreg8(GREENYELLOW_LED_PORT);
regval &= ~GREENYELLOW_LED_MASK; regval &= ~GREENYELLOW_LED_MASK;
@ -133,7 +133,7 @@ static void up_setleds(ubyte gybits, ubyte rbit)
void up_ledinit(void) void up_ledinit(void)
{ {
register ubyte regval; register uint8_t regval;
/* Make sure that the LEDs are in the OFF state */ /* Make sure that the LEDs are in the OFF state */
@ -162,7 +162,7 @@ void up_ledinit(void)
void up_ledon(int led) 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 /* If this is the ASSERTION led, preserve the Y&G bits from the last setting and
* set the RED LED on. * set the RED LED on.
@ -198,7 +198,7 @@ void up_ledon(int led)
void up_ledoff(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 */ /* If this is the ASSERTION led then what we do depends on the previous state */

6
configs/stm3210e-eval/RIDE/bigfatstub.c
View File

@ -1,4 +1,4 @@
#include <sys/types.h> #include <stdint.h>
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include "up_internal.h" #include "up_internal.h"
@ -9,7 +9,7 @@ void os_start(void)
for (;;); 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('?');
up_lowputc('\n'); up_lowputc('\n');
@ -23,7 +23,7 @@ int irq_attach(int irq, xcpt_t isr)
for (;;); for (;;);
} }
uint32 *up_doirq(int irq, uint32 *regs) uint32 *up_doirq(int irq, uint32_t *regs)
{ {
up_lowputc('I'); up_lowputc('I');
up_lowputc('\n'); up_lowputc('\n');

4
configs/stm3210e-eval/include/board.h
View File

@ -43,7 +43,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
# include <sys/types.h> # include <stdint.h>
#endif #endif
#include "stm32_rcc.h" #include "stm32_rcc.h"
#include "stm32_sdio.h" #include "stm32_sdio.h"
@ -204,7 +204,7 @@ EXTERN void stm32_boardinitialize(void);
#ifdef CONFIG_ARCH_BUTTONS #ifdef CONFIG_ARCH_BUTTONS
EXTERN void up_buttoninit(void); EXTERN void up_buttoninit(void);
EXTERN ubyte up_buttons(void); EXTERN uint8_t up_buttons(void);
#endif #endif
#undef EXTERN #undef EXTERN

22
configs/stm3210e-eval/src/stm3210e-internal.h
View File

@ -43,7 +43,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <nuttx/compiler.h> #include <nuttx/compiler.h>
#include <sys/types.h> #include <stdint.h>
/************************************************************************************ /************************************************************************************
* Definitions * Definitions
@ -111,14 +111,14 @@
struct extmem_save_s struct extmem_save_s
{ {
uint32 gpiod_crl; uint32_t gpiod_crl;
uint32 gpiod_crh; uint32_t gpiod_crh;
uint32 gpioe_crl; uint32_t gpioe_crl;
uint32 gpioe_crh; uint32_t gpioe_crh;
uint32 gpiof_crl; uint32_t gpiof_crl;
uint32 gpiof_crh; uint32_t gpiof_crh;
uint32 gpiog_crl; uint32_t gpiog_crl;
uint32 gpiog_crh; uint32_t gpiog_crh;
}; };
/************************************************************************************ /************************************************************************************
@ -130,7 +130,7 @@ struct extmem_save_s
/* GPIO configurations common to SRAM and NOR Flash */ /* GPIO configurations common to SRAM and NOR Flash */
#define NCOMMON_CONFIG 37 #define NCOMMON_CONFIG 37
extern const uint16 g_commonconfig[NCOMMON_CONFIG]; extern const uint16_t g_commonconfig[NCOMMON_CONFIG];
/************************************************************************************ /************************************************************************************
* Public Functions * 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 * Name: stm32_enablefsmc

1
configs/stm3210e-eval/src/up_boot.c
View File

@ -39,7 +39,6 @@
************************************************************************************/ ************************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <debug.h> #include <debug.h>

9
configs/stm3210e-eval/src/up_buttons.c
View File

@ -38,7 +38,8 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <stdint.h>
#include <arch/board/board.h> #include <arch/board/board.h>
#include "stm3210e-internal.h" #include "stm3210e-internal.h"
@ -53,7 +54,7 @@
* Private Data * 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_BTN_WAKEUP, GPIO_BTN_TAMPER, GPIO_BTN_KEY, GPIO_JOY_KEY,
GPIO_JOY_DOWN, GPIO_JOY_LEFT, GPIO_JOY_RIGHT, GPIO_JOY_UP GPIO_JOY_DOWN, GPIO_JOY_LEFT, GPIO_JOY_RIGHT, GPIO_JOY_UP
@ -89,9 +90,9 @@ void up_buttoninit(void)
* Name: up_buttons * Name: up_buttons
****************************************************************************/ ****************************************************************************/
ubyte up_buttons(void) uint8_t up_buttons(void)
{ {
ubyte ret = 0; uint8_t ret = 0;
int i; int i;
/* Check that state of each key */ /* Check that state of each key */

1
configs/stm3210e-eval/src/up_deselectnor.c
View File

@ -40,7 +40,6 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <debug.h> #include <debug.h>
#include "up_arch.h" #include "up_arch.h"

1
configs/stm3210e-eval/src/up_deselectsram.c
View File

@ -40,7 +40,6 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <debug.h> #include <debug.h>
#include "up_arch.h" #include "up_arch.h"

1
configs/stm3210e-eval/src/up_extcontext.c
View File

@ -40,7 +40,6 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <assert.h> #include <assert.h>
#include <debug.h> #include <debug.h>

14
configs/stm3210e-eval/src/up_extmem.c
View File

@ -40,7 +40,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h> #include <stdint.h>
#include <assert.h> #include <assert.h>
#include <debug.h> #include <debug.h>
@ -95,7 +95,7 @@
/* GPIO configurations common to SRAM and NOR Flash */ /* GPIO configurations common to SRAM and NOR Flash */
const uint16 g_commonconfig[NCOMMON_CONFIG] = const uint16_t g_commonconfig[NCOMMON_CONFIG] =
{ {
/* A0... A18 */ /* A0... A18 */
@ -123,13 +123,13 @@ const uint16 g_commonconfig[NCOMMON_CONFIG] =
/* GPIO configurations unique to SRAM */ /* GPIO configurations unique to SRAM */
static const uint16 g_sramconfig[] = static const uint16_t g_sramconfig[] =
{ {
/* NE3, NBL0, NBL1, */ /* NE3, NBL0, NBL1, */
GPIO_NPS_NE3, GPIO_NPS_NBL0, GPIO_NPS_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 * 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; int i;
@ -169,7 +169,7 @@ void stm32_extmemgpios(const uint16 *gpios, int ngpios)
void stm32_enablefsmc(void) void stm32_enablefsmc(void)
{ {
uint32 regval; uint32_t regval;
/* Enable AHB clocking to the FSMC */ /* Enable AHB clocking to the FSMC */
@ -188,7 +188,7 @@ void stm32_enablefsmc(void)
void stm32_disablefsmc(void) void stm32_disablefsmc(void)
{ {
uint32 regval; uint32_t regval;
/* Enable AHB clocking to the FSMC */ /* Enable AHB clocking to the FSMC */

21
configs/stm3210e-eval/src/up_leds.c
View File

@ -39,8 +39,9 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
#include <debug.h> #include <debug.h>
#include <arch/board/board.h> #include <arch/board/board.h>
@ -135,7 +136,7 @@
* Private Data * 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_ON_SETBITS | LED_STARTED_ON_CLRBITS |
LED_STARTED_OFF_SETBITS | LED_STARTED_OFF_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) if ((clrbits & STM3210E_LED1) != 0)
{ {
stm32_gpiowrite(GPIO_LED1, FALSE); stm32_gpiowrite(GPIO_LED1, false);
} }
if ((clrbits & STM3210E_LED2) != 0) if ((clrbits & STM3210E_LED2) != 0)
{ {
stm32_gpiowrite(GPIO_LED2, FALSE); stm32_gpiowrite(GPIO_LED2, false);
} }
if ((clrbits & STM3210E_LED3) != 0) if ((clrbits & STM3210E_LED3) != 0)
{ {
stm32_gpiowrite(GPIO_LED3, FALSE); stm32_gpiowrite(GPIO_LED3, false);
} }
if ((clrbits & STM3210E_LED4) != 0) 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) if ((setbits & STM3210E_LED1) != 0)
{ {
stm32_gpiowrite(GPIO_LED1, TRUE); stm32_gpiowrite(GPIO_LED1, true);
} }
if ((setbits & STM3210E_LED2) != 0) if ((setbits & STM3210E_LED2) != 0)
{ {
stm32_gpiowrite(GPIO_LED2, TRUE); stm32_gpiowrite(GPIO_LED2, true);
} }
if ((setbits & STM3210E_LED3) != 0) if ((setbits & STM3210E_LED3) != 0)
{ {
stm32_gpiowrite(GPIO_LED3, TRUE); stm32_gpiowrite(GPIO_LED3, true);
} }
if ((setbits & STM3210E_LED4) != 0) if ((setbits & STM3210E_LED4) != 0)
{ {
stm32_gpiowrite(GPIO_LED4, TRUE); stm32_gpiowrite(GPIO_LED4, true);
} }
} }

4
configs/stm3210e-eval/src/up_nsh.c
View File

@ -39,8 +39,8 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include <debug.h> #include <debug.h>
#include <errno.h> #include <errno.h>
@ -207,7 +207,7 @@ int nsh_archinitialize(void)
* the slot. * the slot.
*/ */
sdio_mediachange(sdio, TRUE); sdio_mediachange(sdio, true);
#endif #endif
return OK; return OK;
} }

6
configs/stm3210e-eval/src/up_selectnor.c
View File

@ -40,7 +40,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h> #include <stdint.h>
#include <debug.h> #include <debug.h>
#include "up_arch.h" #include "up_arch.h"
@ -80,7 +80,7 @@
/* GPIO configurations unique to NOR Flash */ /* GPIO configurations unique to NOR Flash */
static const uint16 g_norconfig[] = static const uint16_t g_norconfig[] =
{ {
/* A19... A22 */ /* A19... A22 */
@ -90,7 +90,7 @@ static const uint16 g_norconfig[] =
GPIO_NPS_NE2 GPIO_NPS_NE2
}; };
#define NNOR_CONFIG (sizeof(g_norconfig)/sizeof(uint16)) #define NNOR_CONFIG (sizeof(g_norconfig)/sizeof(uint16_t))
/************************************************************************************ /************************************************************************************
* Private Functions * Private Functions

6
configs/stm3210e-eval/src/up_selectsram.c
View File

@ -40,7 +40,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h> #include <stdint.h>
#include <debug.h> #include <debug.h>
#include "up_arch.h" #include "up_arch.h"
@ -88,13 +88,13 @@
/* GPIO configurations unique to SRAM */ /* GPIO configurations unique to SRAM */
static const uint16 g_sramconfig[] = static const uint16_t g_sramconfig[] =
{ {
/* NE3, NBL0, NBL1, */ /* NE3, NBL0, NBL1, */
GPIO_NPS_NE3, GPIO_NPS_NBL0, GPIO_NPS_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 * Private Functions

15
configs/stm3210e-eval/src/up_spi.c
View File

@ -39,8 +39,9 @@
************************************************************************************/ ************************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
#include <debug.h> #include <debug.h>
#include <nuttx/spi.h> #include <nuttx/spi.h>
@ -132,7 +133,7 @@ void weak_function stm32_spiinitialize(void)
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_STM32_SPI1 #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"); 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; return SPI_STATUS_PRESENT;
} }
#endif #endif
#ifdef CONFIG_STM32_SPI2 #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"); 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; return SPI_STATUS_PRESENT;
} }
#endif #endif
#ifdef CONFIG_STM32_SPI3 #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"); 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; return SPI_STATUS_PRESENT;
} }

10
configs/stm3210e-eval/src/up_usbdev.c
View File

@ -39,8 +39,10 @@
************************************************************************************/ ************************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
#include <debug.h> #include <debug.h>
#include <nuttx/usbdev.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); stm32_gpiowrite(GPIO_USB_PULLUP, !enable);
return OK; 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); ulldbg("resume: %d\n", resume);
} }

3
configs/stm3210e-eval/src/up_usbstrg.c
View File

@ -40,7 +40,6 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <stdio.h> #include <stdio.h>
#include <debug.h> #include <debug.h>
@ -147,7 +146,7 @@ int usbstrg_archinitialize(void)
* the slot. * the slot.
*/ */
sdio_mediachange(sdio, TRUE); sdio_mediachange(sdio, true);
return OK; return OK;
} }

6
configs/us7032evb1/include/board.h
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/us7032evb1/include/board.h * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -41,7 +41,7 @@
****************************************************************************/ ****************************************************************************/
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
# include <sys/types.h> # include <stdint.h>
#endif #endif
#include "chip.h" #include "chip.h"
@ -88,7 +88,7 @@ extern "C" {
#ifdef CONFIG_ARCH_BUTTONS #ifdef CONFIG_ARCH_BUTTONS
EXTERN void up_buttoninit(void); EXTERN void up_buttoninit(void);
EXTERN ubyte up_buttons(void); EXTERN uint8_t up_buttons(void);
#endif #endif
#undef EXTERN #undef EXTERN

3
configs/us7032evb1/shterm/shterm.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* config/us7032evb1/shterm/shterm.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -37,7 +37,6 @@
* Included Files * Included Files
****************************************************************************/ ****************************************************************************/
#include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

10
configs/us7032evb1/src/up_leds.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/us7032evb1/src/up_leds.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -38,7 +38,7 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h> #include <stdint.h>
#include "chip.h" #include "chip.h"
#include "up_arch.h" #include "up_arch.h"
@ -76,7 +76,7 @@
#ifdef CONFIG_ARCH_LEDS #ifdef CONFIG_ARCH_LEDS
void up_ledinit(void) void up_ledinit(void)
{ {
uint16 reg16; uint16_t reg16;
/* Setup port B, pin 15 as an output */ /* Setup port B, pin 15 as an output */
@ -103,7 +103,7 @@ void up_ledinit(void)
void up_ledon(int led) void up_ledon(int led)
{ {
uint16 reg16; uint16_t reg16;
if (led) if (led)
{ {
@ -121,7 +121,7 @@ void up_ledon(int led)
void up_ledoff(int led) void up_ledoff(int led)
{ {
uint16 reg16; uint16_t reg16;
if (led) if (led)
{ {

5
configs/xtrs/src/xtr_irq.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* board/xtr_irq.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -39,7 +39,6 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include "up_arch.h" #include "up_arch.h"
@ -113,5 +112,5 @@ void up_disable_irq(int irq)
void up_enable_irq(int irq) void up_enable_irq(int irq)
{ {
irqrestore(TRUE); irqrestore(true);
} }

3
configs/xtrs/src/xtr_lowputc.c
View File

@ -6,7 +6,7 @@
* *
* This file is a part of NuttX and hence * 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 * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -43,7 +43,6 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <assert.h> #include <assert.h>

60
configs/xtrs/src/xtr_serial.c
View File

@ -6,7 +6,7 @@
* *
* This file is a part of NuttX and hence * 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 * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -44,6 +44,8 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h> #include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
@ -102,18 +104,18 @@
* Private Function Prototypes * Private Function Prototypes
****************************************************************************/ ****************************************************************************/
static int up_setup(struct uart_dev_s *dev); static int up_setup(struct uart_dev_s *dev);
static void up_shutdown(struct uart_dev_s *dev); static void up_shutdown(struct uart_dev_s *dev);
static int up_attach(struct uart_dev_s *dev); static int up_attach(struct uart_dev_s *dev);
static void up_detach(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_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);
static void up_rxint(struct uart_dev_s *dev, boolean enable); static void up_rxint(struct uart_dev_s *dev, bool enable);
static boolean up_rxavailable(struct uart_dev_s *dev); static bool up_rxavailable(struct uart_dev_s *dev);
static void up_send(struct uart_dev_s *dev, int ch); 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);
static boolean up_txready(struct uart_dev_s *dev); static bool up_txready(struct uart_dev_s *dev);
static boolean up_txempty(struct uart_dev_s *dev); static bool up_txempty(struct uart_dev_s *dev);
/**************************************************************************** /****************************************************************************
* Private Variables * Private Variables
@ -145,9 +147,9 @@ static char g_uarttxbuffer[CONFIG_UART_TXBUFSIZE];
static uart_dev_t g_uartport = static uart_dev_t g_uartport =
{ {
0, /* open_count */ 0, /* open_count */
FALSE, /* xmitwaiting */ false, /* xmitwaiting */
FALSE, /* recvwaiting */ false, /* recvwaiting */
FALSE, /* isconsole */ false, /* isconsole */
{ 1 }, /* closesem */ { 1 }, /* closesem */
{ 0 }, /* xmitsem */ { 0 }, /* xmitsem */
{ 0 }, /* recvsem */ { 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; *status = 0;
return ch; 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 * Name: up_rxavailable
* *
* Description: * 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 * Name: up_txready
* *
* Description: * 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 * Name: up_txempty
* *
* Description: * 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;
} }
/**************************************************************************** /****************************************************************************

3
configs/xtrs/src/xtr_timerisr.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* board/xtr_timerisr.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -39,7 +39,6 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <debug.h> #include <debug.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>

2
configs/z16f2800100zcog/src/z16f_leds.c
View File

@ -46,7 +46,7 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <arch/board/board.h> #include <arch/board/board.h>
#include "up_internal.h" #include "up_internal.h"

1
configs/z16f2800100zcog/src/z16f_lowinit.c
View File

@ -40,7 +40,6 @@
***************************************************************************/ ***************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include "chip/chip.h" #include "chip/chip.h"

5
configs/z80sim/src/z80_irq.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* board/z80_irq.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -39,7 +39,6 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include "up_arch.h" #include "up_arch.h"
@ -113,5 +112,5 @@ void up_disable_irq(int irq)
void up_enable_irq(int irq) void up_enable_irq(int irq)
{ {
irqrestore(TRUE); irqrestore(true);
} }

3
configs/z80sim/src/z80_lowputc.c
View File

@ -1,7 +1,7 @@
/******************************************************************************** /********************************************************************************
* board/z80_lowputc.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -39,7 +39,6 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <assert.h> #include <assert.h>

60
configs/z80sim/src/z80_serial.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* board/z80_serial.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -40,6 +40,8 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h> #include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
@ -68,18 +70,18 @@
* Private Function Prototypes * Private Function Prototypes
****************************************************************************/ ****************************************************************************/
static int up_setup(struct uart_dev_s *dev); static int up_setup(struct uart_dev_s *dev);
static void up_shutdown(struct uart_dev_s *dev); static void up_shutdown(struct uart_dev_s *dev);
static int up_attach(struct uart_dev_s *dev); static int up_attach(struct uart_dev_s *dev);
static void up_detach(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_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);
static void up_rxint(struct uart_dev_s *dev, boolean enable); static void up_rxint(struct uart_dev_s *dev, bool enable);
static boolean up_rxavailable(struct uart_dev_s *dev); static bool up_rxavailable(struct uart_dev_s *dev);
static void up_send(struct uart_dev_s *dev, int ch); 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);
static boolean up_txready(struct uart_dev_s *dev); static bool up_txready(struct uart_dev_s *dev);
static boolean up_txempty(struct uart_dev_s *dev); static bool up_txempty(struct uart_dev_s *dev);
/**************************************************************************** /****************************************************************************
* Private Variables * Private Variables
@ -111,9 +113,9 @@ static char g_uarttxbuffer[CONFIG_UART_TXBUFSIZE];
static uart_dev_t g_uartport = static uart_dev_t g_uartport =
{ {
0, /* open_count */ 0, /* open_count */
FALSE, /* xmitwaiting */ false, /* xmitwaiting */
FALSE, /* recvwaiting */ false, /* recvwaiting */
TRUE, /* isconsole */ true, /* isconsole */
{ 1 }, /* closesem */ { 1 }, /* closesem */
{ 0 }, /* xmitsem */ { 0 }, /* xmitsem */
{ 0 }, /* recvsem */ { 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; *status = 0;
return ch; 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 * Name: up_rxavailable
* *
* Description: * 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 * Name: up_txready
* *
* Description: * 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 * Name: up_txempty
* *
* Description: * 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;
} }
/**************************************************************************** /****************************************************************************

3
configs/z80sim/src/z80_timerisr.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* board/z80_timerisr.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -39,7 +39,6 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <debug.h> #include <debug.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>

16
configs/z8encore000zco/src/z8_leds.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/z8encore000zco/src/z8_leds.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -46,7 +46,7 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h> #include <stdint.h>
#include <arch/board/board.h> #include <arch/board/board.h>
#include "up_internal.h" #include "up_internal.h"
@ -114,8 +114,8 @@
struct z8_ledbits_s struct z8_ledbits_s
{ {
ubyte anode; uint8_t anode;
ubyte cathode; uint8_t cathode;
}; };
/**************************************************************************** /****************************************************************************
@ -145,9 +145,9 @@ static const struct z8_ledbits_s g_ledarray[10][4] =
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_ARCH_LEDS #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; porte = bits->cathode;
putreg8(porte, PEOD); /* Load porte data */ 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 #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 */ putreg8(bits->cathode, PEOD); /* Load porte data */
portg = bits->anode; portg = bits->anode;

3
configs/z8encore000zco/src/z8_lowinit.c
View File

@ -1,7 +1,7 @@
/*************************************************************************** /***************************************************************************
* configs/z8encore000zco/src/z8_lowinit.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Based upon sample code included with the Zilog ZDS-II toolchain. * Based upon sample code included with the Zilog ZDS-II toolchain.
@ -40,7 +40,6 @@
***************************************************************************/ ***************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include "chip/chip.h" #include "chip/chip.h"

4
configs/z8f64200100kit/src/z8_leds.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* configs/z8f64200100kit/src/z8_leds.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -38,7 +38,7 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include <arch/board/board.h> #include <arch/board/board.h>
#include "up_internal.h" #include "up_internal.h"

3
configs/z8f64200100kit/src/z8_lowinit.c
View File

@ -1,7 +1,7 @@
/*************************************************************************** /***************************************************************************
* configs/z8f64200100kit/src/z8_lowinit.c * 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> * Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* *
* Based upon sample code included with the Zilog ZDS-II toolchain. * Based upon sample code included with the Zilog ZDS-II toolchain.
@ -40,7 +40,6 @@
***************************************************************************/ ***************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h>
#include "chip/chip.h" #include "chip/chip.h"