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

More renaming: up_lcdinitialize->board_lcd_initialize, up_lcdgetdev->board_lcd_getdev, up_lcduninitialize->board_lcd_uninitialize

Browse Source
This commit is contained in:
Gregory Nutt 2015-04-04 11:49:15 -06:00
parent e25fb828ef
commit 3542cd0282
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libnxwidgets/src/cnxserver.cxx
View File

@ -41,6 +41,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/boardctl.h> #include <sys/boardctl.h>
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include <unistd.h> #include <unistd.h>
@ -48,6 +49,8 @@
#include <cerrno> #include <cerrno>
#include <debug.h> #include <debug.h>
#include <nuttx/board.h>
#ifdef CONFIG_NX_MULTIUSER #ifdef CONFIG_NX_MULTIUSER
# include <sched.h> # include <sched.h>
# include <pthread.h> # include <pthread.h>
@ -138,19 +141,19 @@ bool CNxServer::connect(void)
// Initialize the LCD device // Initialize the LCD device
ret = up_lcdinitialize(); ret = board_lcd_initialize();
if (ret < 0) if (ret < 0)
{ {
gdbg("up_lcdinitialize failed: %d\n", -ret); gdbg("board_lcd_initialize failed: %d\n", -ret);
return false; return false;
} }
// Get the device instance // Get the device instance
m_hDevice = up_lcdgetdev(CONFIG_NXWIDGETS_DEVNO); m_hDevice = board_lcd_getdev(CONFIG_NXWIDGETS_DEVNO);
if (!m_hDevice) if (!m_hDevice)
{ {
gdbg("up_lcdgetdev failed, devno=%d\n", CONFIG_NXWIDGETS_DEVNO); gdbg("board_lcd_getdev failed, devno=%d\n", CONFIG_NXWIDGETS_DEVNO);
return false; return false;
} }
@ -368,19 +371,19 @@ int CNxServer::server(int argc, char *argv[])
#elif defined(CONFIG_NX_LCDDRIVER) #elif defined(CONFIG_NX_LCDDRIVER)
// Initialize the LCD device // Initialize the LCD device
ret = up_lcdinitialize(); ret = board_lcd_initialize();
if (ret < 0) if (ret < 0)
{ {
gdbg("up_lcdinitialize failed: %d\n", -ret); gdbg("board_lcd_initialize failed: %d\n", -ret);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
// Get the device instance // Get the device instance
dev = up_lcdgetdev(CONFIG_NXWIDGETS_DEVNO); dev = board_lcd_getdev(CONFIG_NXWIDGETS_DEVNO);
if (!dev) if (!dev)
{ {
gdbg("up_lcdgetdev failed, devno=%d\n", CONFIG_NXWIDGETS_DEVNO); gdbg("board_lcd_getdev failed, devno=%d\n", CONFIG_NXWIDGETS_DEVNO);
return EXIT_FAILURE; return EXIT_FAILURE;
} }