From bc4b6fcb861a7f143ddcc4aeef828cbab4006b51 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sun, 10 Jul 2011 19:56:07 +0000 Subject: Fix NXTEST strings git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3767 42af7a65-404d-4744-a932-0658087f49c3 --- apps/examples/nxtext/nxtext_bkgd.c | 18 +++++++++--------- apps/examples/nxtext/nxtext_main.c | 28 ++++++++++++++-------------- apps/examples/nxtext/nxtext_popup.c | 18 +++++++++--------- apps/examples/nxtext/nxtext_putc.c | 4 ++-- apps/examples/nxtext/nxtext_server.c | 2 +- 5 files changed, 35 insertions(+), 35 deletions(-) (limited to 'apps/examples') diff --git a/apps/examples/nxtext/nxtext_bkgd.c b/apps/examples/nxtext/nxtext_bkgd.c index a2feefd24..ca8451a92 100644 --- a/apps/examples/nxtext/nxtext_bkgd.c +++ b/apps/examples/nxtext/nxtext_bkgd.c @@ -45,8 +45,8 @@ #include #include #include -#include #include +#include #include #include @@ -122,9 +122,9 @@ NXHANDLE g_bgwnd; static void nxbg_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, bool more, FAR void *arg) { - message("nxbg_redraw: hwnd=%p rect={(%d,%d),(%d,%d)} more=%s\n", - hwnd, rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y, - more ? "true" : "false"); + gvdbg("hwnd=%p rect={(%d,%d),(%d,%d)} more=%s\n", + hwnd, rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y, + more ? "true" : "false"); nxbg_redrawrect(hwnd, rect); } @@ -142,9 +142,9 @@ static void nxbg_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, /* Report the position */ - message("nxbg_position: hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n", - hwnd, size->w, size->h, pos->x, pos->y, - bounds->pt1.x, bounds->pt1.y, bounds->pt2.x, bounds->pt2.y); + gvdbg("hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n", + hwnd, size->w, size->h, pos->x, pos->y, + bounds->pt1.x, bounds->pt1.y, bounds->pt2.x, bounds->pt2.y); /* Have we picked off the window bounds yet? */ @@ -166,7 +166,7 @@ static void nxbg_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, b_haveresolution = true; sem_post(&g_semevent); - message("nxbg_position: Have xres=%d yres=%d\n", g_xres, g_yres); + gvdbg("Have xres=%d yres=%d\n", g_xres, g_yres); } } @@ -191,7 +191,7 @@ static void nxbg_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, static void nxbg_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch, FAR void *arg) { - message("nxbg_kbdin: hwnd=%p nch=%d\n", hwnd, nch); + gvdbg("hwnd=%p nch=%d\n", hwnd, nch); nxbg_write(hwnd, ch, nch); } #endif diff --git a/apps/examples/nxtext/nxtext_main.c b/apps/examples/nxtext/nxtext_main.c index ba898faf8..9f8f674a5 100644 --- a/apps/examples/nxtext/nxtext_main.c +++ b/apps/examples/nxtext/nxtext_main.c @@ -108,20 +108,20 @@ static const char *g_bgmsg[BGMSG_LINES] = " of thine ear;\n", "Nightly she sings\n", " on yon pomegranate-tree:\n", - "Believe me, love,\n" - " it was the nightingale.\n" - "\nROMEO\n" - "It was the lark,\n" - " the herald of the morn,\n" - "No nightingale:\n" - " look, love, what envious streaks\n" - "Do lace the severing clouds\n" - " in yonder east:\n" - "Night's candles are burnt out,\n" - " and jocund day\n" - "Stands tiptoe\n" - " on the misty mountain tops.\n" - "I must be gone and live,\n" + "Believe me, love,\n", + " it was the nightingale.\n", + "\nROMEO\n", + "It was the lark,\n", + " the herald of the morn,\n", + "No nightingale:\n", + " look, love, what envious streaks\n", + "Do lace the severing clouds\n", + " in yonder east:\n", + "Night's candles are burnt out,\n", + " and jocund day\n", + "Stands tiptoe\n", + " on the misty mountain tops.\n", + "I must be gone and live,\n", " or stay and die.\n" }; #endif diff --git a/apps/examples/nxtext/nxtext_popup.c b/apps/examples/nxtext/nxtext_popup.c index 4ee704652..6397961f7 100644 --- a/apps/examples/nxtext/nxtext_popup.c +++ b/apps/examples/nxtext/nxtext_popup.c @@ -44,8 +44,8 @@ #include #include #include -#include #include +#include #include #include @@ -209,7 +209,7 @@ static void nxpu_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, bool more, FAR void *arg) { FAR struct nxtext_state_s *st = (FAR struct nxtext_state_s *)arg; - message("nxpu_redraw: hwnd=%p rect={(%d,%d),(%d,%d)} more=%s\n", + gvdbg("hwnd=%p rect={(%d,%d),(%d,%d)} more=%s\n", hwnd, rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y, more ? "true" : "false"); @@ -229,9 +229,9 @@ static void nxpu_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, /* Report the position */ - message("nxpu_position: hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n", - hwnd, size->w, size->h, pos->x, pos->y, - bounds->pt1.x, bounds->pt1.y, bounds->pt2.x, bounds->pt2.y); + gvdbg("hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n", + hwnd, size->w, size->h, pos->x, pos->y, + bounds->pt1.x, bounds->pt1.y, bounds->pt2.x, bounds->pt2.y); /* Save the window position and size */ @@ -278,7 +278,7 @@ static void nxpu_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch, FAR void *arg) { FAR struct nxtext_state_s *st = (FAR struct nxtext_state_s *)arg; - message("nxpu_kbdin: hwnd=%p nch=%d\n", hwnd, nch); + gvdbg("hwnd=%p nch=%d\n", hwnd, nch); nxpu_puts(hwnd, st, nch, ch); } #endif @@ -343,7 +343,7 @@ NXWINDOW nxpu_open(void) nxpu_initstate(); hwnd = nx_openwindow(g_hnx, &g_pucb, (FAR void *)&g_pustate); - message("nxpu_open: hwnd=%p\n", hwnd); + gvdbg("hwnd=%p\n", hwnd); if (!hwnd) { @@ -373,7 +373,7 @@ NXWINDOW nxpu_open(void) /* Set the size of the pop-up window */ - message("nxpu_open: Set pop-up size to (%d,%d)\n", size.w, size.h); + gvdbg("Set pop-up size to (%d,%d)\n", size.w, size.h); ret = nxpu_setsize(hwnd, &size); if (ret < 0) { @@ -415,7 +415,7 @@ int nxpu_close(NXWINDOW hwnd) rect.pt1.y = g_pustate.wpos.y; rect.pt2.x = g_pustate.wpos.x + g_pustate.wsize.w - 1; rect.pt2.y = g_pustate.wpos.y + g_pustate.wsize.h - 1; - gvdbg("Redraw: pt1(%d,%d) pt2(%d,%d)\n", + gvdbg("pt1(%d,%d) pt2(%d,%d)\n", rect.pt1.x, rect.pt1.y, rect.pt2.x, rect.pt2.y); nxbg_redrawrect(g_bgwnd, &rect); diff --git a/apps/examples/nxtext/nxtext_putc.c b/apps/examples/nxtext/nxtext_putc.c index 37602bb43..81fe3aae2 100644 --- a/apps/examples/nxtext/nxtext_putc.c +++ b/apps/examples/nxtext/nxtext_putc.c @@ -44,8 +44,8 @@ #include #include #include -#include #include +#include #include #include @@ -234,7 +234,7 @@ nxtext_renderglyph(FAR struct nxtext_state_s *st, /* Make sure that there is room for another glyph */ - message("nxtext_renderglyph: ch=%c [%02x]\n", isprint(ch) ? ch : '.', ch); + gvdbg("ch=%c [%02x]\n", isprint(ch) ? ch : '.', ch); /* Allocate the glyph (always succeeds) */ diff --git a/apps/examples/nxtext/nxtext_server.c b/apps/examples/nxtext/nxtext_server.c index c3518f6dd..08b3a1a20 100644 --- a/apps/examples/nxtext/nxtext_server.c +++ b/apps/examples/nxtext/nxtext_server.c @@ -145,7 +145,7 @@ int nxtext_server(int argc, char *argv[]) /* Then start the server */ ret = nx_run(dev); - message("nxtext_server: nx_run returned: %d\n", errno); + gvdbg("nx_run returned: %d\n", errno); return 3; } -- cgit v1.2.3