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 e6294dfe41
commit 3bbd9b6f41
9 changed files with 66 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/lcdrw/lcdrw_main.c
View File

@ -42,6 +42,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <nuttx/board.h>
#include <nuttx/lcd/lcd.h>
#include <nuttx/nx/nxglib.h>
@ -116,20 +117,21 @@ static inline int lcdrw_initialize(FAR struct lcdrw_instance_s *inst)
/* Initialize the LCD device */
printf("screens_initialize: Initializing LCD\n");
ret = up_lcdinitialize();
ret = board_lcd_initialize();
if (ret < 0)
{
fprintf(stderr, "screens_initialize: up_lcdinitialize failed: %d\n", -ret);
fprintf(stderr, "screens_initialize: board_lcd_initialize failed: %d\n", -ret);
return ret;
}
/* Get the device instance. */
printf("Get LCD instance\n");
inst->dev = up_lcdgetdev(CONFIG_EXAMPLES_LDCRW_DEVNO);
inst->dev = board_lcd_getdev(CONFIG_EXAMPLES_LDCRW_DEVNO);
if (!inst->dev)
{
fprintf(stderr, "up_lcdgetdev failed, devno=%d\n", CONFIG_EXAMPLES_LDCRW_DEVNO);
fprintf(stderr, "board_lcd_getdev failed, devno=%d\n",
CONFIG_EXAMPLES_LDCRW_DEVNO);
return ret;
}

14
examples/nx/nx_main.c
View File

@ -41,6 +41,7 @@
#include <sys/types.h>
#include <sys/boardctl.h>
#include <stdint.h>
#include <stdbool.h>
#include <stdio.h>
@ -52,13 +53,15 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/board.h>
#ifdef CONFIG_NX_LCDDRIVER
# include <nuttx/lcd/lcd.h>
#else
# include <nuttx/video/fb.h>
#endif
#include <nuttx/arch.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxtk.h>
#include <nuttx/nx/nxfonts.h>
@ -441,20 +444,21 @@ static inline int nxeg_suinitialize(void)
/* Initialize the LCD device */
printf("nxeg_initialize: Initializing LCD\n");
ret = up_lcdinitialize();
ret = board_lcd_initialize();
if (ret < 0)
{
printf("nxeg_initialize: up_lcdinitialize failed: %d\n", -ret);
printf("nxeg_initialize: board_lcd_initialize failed: %d\n", -ret);
g_exitcode = NXEXIT_LCDINITIALIZE;
return ERROR;
}
/* Get the device instance */
dev = up_lcdgetdev(CONFIG_EXAMPLES_NX_DEVNO);
dev = board_lcd_getdev(CONFIG_EXAMPLES_NX_DEVNO);
if (!dev)
{
printf("nxeg_initialize: up_lcdgetdev failed, devno=%d\n", CONFIG_EXAMPLES_NX_DEVNO);
printf("nxeg_initialize: board_lcd_getdev failed, devno=%d\n",
CONFIG_EXAMPLES_NX_DEVNO);
g_exitcode = NXEXIT_LCDGETDEV;
return ERROR;
}

11
examples/nx/nx_server.c
View File

@ -40,6 +40,7 @@
#include <nuttx/config.h>
#include <sys/boardctl.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@ -48,6 +49,7 @@
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/board.h>
#include <nuttx/nx/nx.h>
#ifdef CONFIG_NX_LCDDRIVER
@ -106,19 +108,20 @@ int nx_servertask(int argc, char *argv[])
/* Initialize the LCD device */
printf("nx_servertask: Initializing LCD\n");
ret = up_lcdinitialize();
ret = board_lcd_initialize();
if (ret < 0)
{
printf("nx_servertask: up_lcdinitialize failed: %d\n", -ret);
printf("nx_servertask: board_lcd_initialize failed: %d\n", -ret);
return 1;
}
/* Get the device instance */
dev = up_lcdgetdev(CONFIG_EXAMPLES_NX_DEVNO);
dev = board_lcd_getdev(CONFIG_EXAMPLES_NX_DEVNO);
if (!dev)
{
printf("nx_servertask: up_lcdgetdev failed, devno=%d\n", CONFIG_EXAMPLES_NX_DEVNO);
printf("nx_servertask: board_lcd_getdev failed, devno=%d\n",
CONFIG_EXAMPLES_NX_DEVNO);
return 2;
}

13
examples/nxhello/nxhello_main.c
View File

@ -53,13 +53,15 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/board.h>
#ifdef CONFIG_NX_LCDDRIVER
# include <nuttx/lcd/lcd.h>
#else
# include <nuttx/video/fb.h>
#endif
#include <nuttx/arch.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxglib.h>
#include <nuttx/nx/nxfonts.h>
@ -142,20 +144,21 @@ static inline int nxhello_initialize(void)
/* Initialize the LCD device */
printf("nxhello_initialize: Initializing LCD\n");
ret = up_lcdinitialize();
ret = board_lcd_initialize();
if (ret < 0)
{
printf("nxhello_initialize: up_lcdinitialize failed: %d\n", -ret);
printf("nxhello_initialize: board_lcd_initialize failed: %d\n", -ret);
g_nxhello.code = NXEXIT_LCDINITIALIZE;
return ERROR;
}
/* Get the device instance */
dev = up_lcdgetdev(CONFIG_EXAMPLES_NXHELLO_DEVNO);
dev = board_lcd_getdev(CONFIG_EXAMPLES_NXHELLO_DEVNO);
if (!dev)
{
printf("nxhello_initialize: up_lcdgetdev failed, devno=%d\n", CONFIG_EXAMPLES_NXHELLO_DEVNO);
printf("nxhello_initialize: board_lcd_getdev failed, devno=%d\n",
CONFIG_EXAMPLES_NXHELLO_DEVNO);
g_nxhello.code = NXEXIT_LCDGETDEV;
return ERROR;
}

13
examples/nximage/nximage_main.c
View File

@ -53,13 +53,15 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/board.h>
#ifdef CONFIG_NX_LCDDRIVER
# include <nuttx/lcd/lcd.h>
#else
# include <nuttx/video/fb.h>
#endif
#include <nuttx/arch.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxglib.h>
#include <nuttx/nx/nxfonts.h>
@ -146,20 +148,21 @@ static inline int nximage_initialize(void)
/* Initialize the LCD device */
printf("nximage_initialize: Initializing LCD\n");
ret = up_lcdinitialize();
ret = board_lcd_initialize();
if (ret < 0)
{
printf("nximage_initialize: up_lcdinitialize failed: %d\n", -ret);
printf("nximage_initialize: board_lcd_initialize failed: %d\n", -ret);
g_nximage.code = NXEXIT_LCDINITIALIZE;
return ERROR;
}
/* Get the device instance */
dev = up_lcdgetdev(CONFIG_EXAMPLES_NXIMAGE_DEVNO);
dev = board_lcd_getdev(CONFIG_EXAMPLES_NXIMAGE_DEVNO);
if (!dev)
{
printf("nximage_initialize: up_lcdgetdev failed, devno=%d\n", CONFIG_EXAMPLES_NXIMAGE_DEVNO);
printf("nximage_initialize: board_lcd_getdev failed, devno=%d\n",
CONFIG_EXAMPLES_NXIMAGE_DEVNO);
g_nximage.code = NXEXIT_LCDGETDEV;
return ERROR;
}

13
examples/nxlines/nxlines_main.c
View File

@ -50,13 +50,15 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/board.h>
#ifdef CONFIG_NX_LCDDRIVER
# include <nuttx/lcd/lcd.h>
#else
# include <nuttx/video/fb.h>
#endif
#include <nuttx/arch.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxglib.h>
@ -137,20 +139,21 @@ static inline int nxlines_initialize(void)
/* Initialize the LCD device */
printf("nxlines_initialize: Initializing LCD\n");
ret = up_lcdinitialize();
ret = board_lcd_initialize();
if (ret < 0)
{
printf("nxlines_initialize: up_lcdinitialize failed: %d\n", -ret);
printf("nxlines_initialize: board_lcd_initialize failed: %d\n", -ret);
g_nxlines.code = NXEXIT_LCDINITIALIZE;
return ERROR;
}
/* Get the device instance */
dev = up_lcdgetdev(CONFIG_EXAMPLES_NXLINES_DEVNO);
dev = board_lcd_getdev(CONFIG_EXAMPLES_NXLINES_DEVNO);
if (!dev)
{
printf("nxlines_initialize: up_lcdgetdev failed, devno=%d\n", CONFIG_EXAMPLES_NXLINES_DEVNO);
printf("nxlines_initialize: board_lcd_getdev failed, devno=%d\n",
CONFIG_EXAMPLES_NXLINES_DEVNO);
g_nxlines.code = NXEXIT_LCDGETDEV;
return ERROR;
}

10
examples/nxterm/nxterm_server.c
View File

@ -48,6 +48,7 @@
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/board.h>
#include <nuttx/nx/nx.h>
#ifdef CONFIG_NX_LCDDRIVER
@ -103,19 +104,20 @@ int nxterm_server(int argc, char *argv[])
/* Initialize the LCD device */
printf("nxterm_server: Initializing LCD\n");
ret = up_lcdinitialize();
ret = board_lcd_initialize();
if (ret < 0)
{
printf("nxterm_server: up_lcdinitialize failed: %d\n", -ret);
printf("nxterm_server: board_lcd_initialize failed: %d\n", -ret);
return 1;
}
/* Get the device instance */
dev = up_lcdgetdev(CONFIG_EXAMPLES_NXCON_DEVNO);
dev = board_lcd_getdev(CONFIG_EXAMPLES_NXCON_DEVNO);
if (!dev)
{
printf("nxterm_server: up_lcdgetdev failed, devno=%d\n", CONFIG_EXAMPLES_NXCON_DEVNO);
printf("nxterm_server: board_lcd_getdev failed, devno=%d\n",
CONFIG_EXAMPLES_NXCON_DEVNO);
return 2;
}

13
examples/nxtext/nxtext_main.c
View File

@ -52,13 +52,15 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/board.h>
#ifdef CONFIG_NX_LCDDRIVER
# include <nuttx/lcd/lcd.h>
#else
# include <nuttx/video/fb.h>
#endif
#include <nuttx/arch.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxglib.h>
#include <nuttx/nx/nxfonts.h>
@ -183,20 +185,21 @@ static inline int nxtext_suinitialize(void)
/* Initialize the LCD device */
printf("nxtext_initialize: Initializing LCD\n");
ret = up_lcdinitialize();
ret = board_lcd_initialize();
if (ret < 0)
{
printf("nxtext_initialize: up_lcdinitialize failed: %d\n", -ret);
printf("nxtext_initialize: board_lcd_initialize failed: %d\n", -ret);
g_exitcode = NXEXIT_LCDINITIALIZE;
return ERROR;
}
/* Get the device instance */
dev = up_lcdgetdev(CONFIG_EXAMPLES_NXTEXT_DEVNO);
dev = board_lcd_getdev(CONFIG_EXAMPLES_NXTEXT_DEVNO);
if (!dev)
{
printf("nxtext_initialize: up_lcdgetdev failed, devno=%d\n", CONFIG_EXAMPLES_NXTEXT_DEVNO);
printf("nxtext_initialize: board_lcd_getdev failed, devno=%d\n",
CONFIG_EXAMPLES_NXTEXT_DEVNO);
g_exitcode = NXEXIT_LCDGETDEV;
return ERROR;
}

10
examples/nxtext/nxtext_server.c
View File

@ -47,6 +47,7 @@
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/board.h>
#include <nuttx/nx/nx.h>
#ifdef CONFIG_NX_LCDDRIVER
@ -105,19 +106,20 @@ int nxtext_server(int argc, char *argv[])
/* Initialize the LCD device */
printf("nxtext_server: Initializing LCD\n");
ret = up_lcdinitialize();
ret = board_lcd_initialize();
if (ret < 0)
{
printf("nxtext_server: up_lcdinitialize failed: %d\n", -ret);
printf("nxtext_server: board_lcd_initialize failed: %d\n", -ret);
return 1;
}
/* Get the device instance */
dev = up_lcdgetdev(CONFIG_EXAMPLES_NXTEXT_DEVNO);
dev = board_lcd_getdev(CONFIG_EXAMPLES_NXTEXT_DEVNO);
if (!dev)
{
printf("nxtext_server: up_lcdgetdev failed, devno=%d\n", CONFIG_EXAMPLES_NXTEXT_DEVNO);
printf("nxtext_server: board_lcd_getdev failed, devno=%d\n",
CONFIG_EXAMPLES_NXTEXT_DEVNO);
return 2;
}