diff options
Diffstat (limited to 'nuttx/arch/sim')
-rw-r--r-- | nuttx/arch/sim/src/Makefile | 2 | ||||
-rw-r--r-- | nuttx/arch/sim/src/board_lcd.c (renamed from nuttx/arch/sim/src/up_lcd.c) | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/nuttx/arch/sim/src/Makefile b/nuttx/arch/sim/src/Makefile index 0fd5bfea9..2a0a7b5cc 100644 --- a/nuttx/arch/sim/src/Makefile +++ b/nuttx/arch/sim/src/Makefile @@ -69,7 +69,7 @@ ifeq ($(CONFIG_DEV_CONSOLE),y) endif ifeq ($(CONFIG_NX_LCDDRIVER),y) - CSRCS += up_lcd.c + CSRCS += board_lcd.c else CSRCS += up_framebuffer.c ifeq ($(CONFIG_SIM_X11FB),y) diff --git a/nuttx/arch/sim/src/up_lcd.c b/nuttx/arch/sim/src/board_lcd.c index fb815d12e..ecac19aa2 100644 --- a/nuttx/arch/sim/src/up_lcd.c +++ b/nuttx/arch/sim/src/board_lcd.c @@ -1,7 +1,7 @@ /**************************************************************************** - * arch/sim/src/up_lcd.c + * arch/sim/src/board_lcd.c * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -47,6 +47,7 @@ #include <debug.h> #include <nuttx/arch.h> +#include <nuttx/board.h> #include <nuttx/lcd/lcd.h> /**************************************************************************** @@ -138,7 +139,7 @@ struct sim_dev_s }; /**************************************************************************** - * Private Function Protototypes + * Private Function Prototypes ****************************************************************************/ /* LCD Data Transfer Methods */ @@ -384,7 +385,7 @@ static int sim_setcontrast(struct lcd_dev_s *dev, unsigned int contrast) ****************************************************************************/ /**************************************************************************** - * Name: up_lcdinitialize + * Name: board_lcd_initialize * * Description: * Initialize the LCD video hardware. The initial state of the LCD is @@ -393,14 +394,14 @@ static int sim_setcontrast(struct lcd_dev_s *dev, unsigned int contrast) * ****************************************************************************/ -int up_lcdinitialize(void) +int board_lcd_initialize(void) { gvdbg("Initializing\n"); return OK; } /**************************************************************************** - * Name: up_lcdgetdev + * Name: board_lcd_getdev * * Description: * Return a a reference to the LCD object for the specified LCD. This @@ -408,21 +409,20 @@ int up_lcdinitialize(void) * ****************************************************************************/ -FAR struct lcd_dev_s *up_lcdgetdev(int lcddev) +FAR struct lcd_dev_s *board_lcd_getdev(int lcddev) { DEBUGASSERT(lcddev == 0); return &g_lcddev.dev; } /**************************************************************************** - * Name: up_lcduninitialize + * Name: board_lcd_uninitialize * * Description: * Unitialize the LCD support * ****************************************************************************/ -void up_lcduninitialize(void) +void board_lcd_uninitialize(void) { } - |