From e3ba485a852fc10a85533d0c5a28c6e01d66a0d4 Mon Sep 17 00:00:00 2001 From: patacongo Date: Fri, 22 Jul 2011 20:12:50 +0000 Subject: apps/examples/usbstorage can now be built as NSH built-in commands; configs/stm3210e-eval/nsh2 now uses these usb storage commands git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3812 42af7a65-404d-4744-a932-0658087f49c3 --- apps/examples/nxhello/nxhello_bkgd.c | 2 +- apps/examples/nxhello/nxhello_main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'apps/examples/nxhello') diff --git a/apps/examples/nxhello/nxhello_bkgd.c b/apps/examples/nxhello/nxhello_bkgd.c index 3b609d1f6..09beac952 100644 --- a/apps/examples/nxhello/nxhello_bkgd.c +++ b/apps/examples/nxhello/nxhello_bkgd.c @@ -248,7 +248,7 @@ static void nxhello_center(FAR struct nxgl_point_s *pos, */ pos->x = (g_nxhello.xres - width) / 2; - pos->y = (g_nxhello.yres - fbm->metric.height) / 2; + pos->y = (g_nxhello.yres - fontset->mxheight) / 2; } /**************************************************************************** diff --git a/apps/examples/nxhello/nxhello_main.c b/apps/examples/nxhello/nxhello_main.c index 4f6701aa5..38c2e52c2 100644 --- a/apps/examples/nxhello/nxhello_main.c +++ b/apps/examples/nxhello/nxhello_main.c @@ -211,7 +211,7 @@ static inline int nxhello_initialize(void) # define MAIN_NAME_STRING "nxhello_main" #else # define MAIN_NAME user_start -# define MAIN_NAME_STRING "user_start" +# define MAIN_NAME_STRING MAIN_NAME_STRING "" #endif int MAIN_NAME(int argc, char *argv[]) @@ -235,7 +235,7 @@ int MAIN_NAME(int argc, char *argv[]) g_nxhello.hfont = nxf_getfonthandle(NXFONT_DEFAULT); if (!g_nxhello.hfont) { - message("user_start: Failed to get font handle: %d\n", errno); + message(MAIN_NAME_STRING ": Failed to get font handle: %d\n", errno); g_nxhello.code = NXEXIT_FONTOPEN; goto errout; } -- cgit v1.2.3