From 3bbd9b6f41c1ec836364881a8617c863242a3270 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 4 Apr 2015 11:49:15 -0600 Subject: [PATCH] More renaming: up_lcdinitialize->board_lcd_initialize, up_lcdgetdev->board_lcd_getdev, up_lcduninitialize->board_lcd_uninitialize --- examples/lcdrw/lcdrw_main.c | 10 ++++++---- examples/nx/nx_main.c | 14 +++++++++----- examples/nx/nx_server.c | 11 +++++++---- examples/nxhello/nxhello_main.c | 13 ++++++++----- examples/nximage/nximage_main.c | 13 ++++++++----- examples/nxlines/nxlines_main.c | 13 ++++++++----- examples/nxterm/nxterm_server.c | 10 ++++++---- examples/nxtext/nxtext_main.c | 13 ++++++++----- examples/nxtext/nxtext_server.c | 10 ++++++---- 9 files changed, 66 insertions(+), 41 deletions(-) diff --git a/examples/lcdrw/lcdrw_main.c b/examples/lcdrw/lcdrw_main.c index e65e3f79f..103b425a7 100644 --- a/examples/lcdrw/lcdrw_main.c +++ b/examples/lcdrw/lcdrw_main.c @@ -42,6 +42,7 @@ #include #include +#include #include #include @@ -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; } diff --git a/examples/nx/nx_main.c b/examples/nx/nx_main.c index ba5a1077e..e9d3eaa92 100644 --- a/examples/nx/nx_main.c +++ b/examples/nx/nx_main.c @@ -41,6 +41,7 @@ #include #include + #include #include #include @@ -52,13 +53,15 @@ #include #include +#include +#include + #ifdef CONFIG_NX_LCDDRIVER # include #else # include #endif -#include #include #include #include @@ -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; } diff --git a/examples/nx/nx_server.c b/examples/nx/nx_server.c index 029700859..fbb9a1b92 100644 --- a/examples/nx/nx_server.c +++ b/examples/nx/nx_server.c @@ -40,6 +40,7 @@ #include #include + #include #include #include @@ -48,6 +49,7 @@ #include #include +#include #include #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; } diff --git a/examples/nxhello/nxhello_main.c b/examples/nxhello/nxhello_main.c index 6f9127253..61b2b5393 100644 --- a/examples/nxhello/nxhello_main.c +++ b/examples/nxhello/nxhello_main.c @@ -53,13 +53,15 @@ #include #include +#include +#include + #ifdef CONFIG_NX_LCDDRIVER # include #else # include #endif -#include #include #include #include @@ -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; } diff --git a/examples/nximage/nximage_main.c b/examples/nximage/nximage_main.c index d5020ec75..9bf6112b8 100644 --- a/examples/nximage/nximage_main.c +++ b/examples/nximage/nximage_main.c @@ -53,13 +53,15 @@ #include #include +#include +#include + #ifdef CONFIG_NX_LCDDRIVER # include #else # include #endif -#include #include #include #include @@ -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; } diff --git a/examples/nxlines/nxlines_main.c b/examples/nxlines/nxlines_main.c index 145b5b754..7f4b1deba 100644 --- a/examples/nxlines/nxlines_main.c +++ b/examples/nxlines/nxlines_main.c @@ -50,13 +50,15 @@ #include #include +#include +#include + #ifdef CONFIG_NX_LCDDRIVER # include #else # include #endif -#include #include #include @@ -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; } diff --git a/examples/nxterm/nxterm_server.c b/examples/nxterm/nxterm_server.c index 4eaa83c17..c52f73c79 100644 --- a/examples/nxterm/nxterm_server.c +++ b/examples/nxterm/nxterm_server.c @@ -48,6 +48,7 @@ #include #include +#include #include #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; } diff --git a/examples/nxtext/nxtext_main.c b/examples/nxtext/nxtext_main.c index b3553dfd9..ed00fc04d 100644 --- a/examples/nxtext/nxtext_main.c +++ b/examples/nxtext/nxtext_main.c @@ -52,13 +52,15 @@ #include #include +#include +#include + #ifdef CONFIG_NX_LCDDRIVER # include #else # include #endif -#include #include #include #include @@ -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; } diff --git a/examples/nxtext/nxtext_server.c b/examples/nxtext/nxtext_server.c index 5dc12261f..844c800bf 100644 --- a/examples/nxtext/nxtext_server.c +++ b/examples/nxtext/nxtext_server.c @@ -47,6 +47,7 @@ #include #include +#include #include #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; }