diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-04-04 11:49:15 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-04-04 11:49:15 -0600 |
| commit | b262b5a5c69de0d0c304d3f1e1cd72c17ced05b8 (patch) | |
| tree | 73a53c3adda267ac7344c722f782fab2102c7e00 /NxWidgets | |
| parent | 6c0df9bdef90762526d5c541b04f6e2b701c8628 (diff) | |
| download | px4-nuttx-b262b5a5c69de0d0c304d3f1e1cd72c17ced05b8.tar.gz px4-nuttx-b262b5a5c69de0d0c304d3f1e1cd72c17ced05b8.tar.bz2 px4-nuttx-b262b5a5c69de0d0c304d3f1e1cd72c17ced05b8.zip | |
More renaming: up_lcdinitialize->board_lcd_initialize, up_lcdgetdev->board_lcd_getdev, up_lcduninitialize->board_lcd_uninitialize
Diffstat (limited to 'NxWidgets')
| -rw-r--r-- | NxWidgets/libnxwidgets/src/cnxserver.cxx | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/NxWidgets/libnxwidgets/src/cnxserver.cxx b/NxWidgets/libnxwidgets/src/cnxserver.cxx index 1c28a6b4a..3ac00e7fb 100644 --- a/NxWidgets/libnxwidgets/src/cnxserver.cxx +++ b/NxWidgets/libnxwidgets/src/cnxserver.cxx @@ -41,6 +41,7 @@ #include <sys/types.h> #include <sys/boardctl.h> + #include <stdint.h> #include <stdbool.h> #include <unistd.h> @@ -48,6 +49,8 @@ #include <cerrno> #include <debug.h> +#include <nuttx/board.h> + #ifdef CONFIG_NX_MULTIUSER # include <sched.h> # include <pthread.h> @@ -138,19 +141,19 @@ bool CNxServer::connect(void) // Initialize the LCD device - ret = up_lcdinitialize(); + ret = board_lcd_initialize(); if (ret < 0) { - gdbg("up_lcdinitialize failed: %d\n", -ret); + gdbg("board_lcd_initialize failed: %d\n", -ret); return false; } // Get the device instance - m_hDevice = up_lcdgetdev(CONFIG_NXWIDGETS_DEVNO); + m_hDevice = board_lcd_getdev(CONFIG_NXWIDGETS_DEVNO); 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; } @@ -368,19 +371,19 @@ int CNxServer::server(int argc, char *argv[]) #elif defined(CONFIG_NX_LCDDRIVER) // Initialize the LCD device - ret = up_lcdinitialize(); + ret = board_lcd_initialize(); if (ret < 0) { - gdbg("up_lcdinitialize failed: %d\n", -ret); + gdbg("board_lcd_initialize failed: %d\n", -ret); return EXIT_FAILURE; } // Get the device instance - dev = up_lcdgetdev(CONFIG_NXWIDGETS_DEVNO); + dev = board_lcd_getdev(CONFIG_NXWIDGETS_DEVNO); 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; } |