Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 00:14:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Replace all occurrences of vdbg with vinfo

Browse Source
This commit is contained in:
Gregory Nutt
2016-06-11 11:59:51 -06:00
parent 3a74a438d9
commit fc3540cffe
845 changed files with 5817 additions and 5817 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/nxbe/nxbe_getrectangle.c
+1 -1
View File
@@ -90,7 +90,7 @@ void nxbe_getrectangle(FAR struct nxbe_window_s *wnd,
#ifdef CONFIG_DEBUG
if (!wnd || !rect || !dest || plane >= wnd->be->vinfo.nplanes)
{
gvdbg("Invalid parameters\n");
ginfo("Invalid parameters\n");
return;
}
#endif
graphics/nxmu/nx_start.c
+2 -2
View File
@@ -135,7 +135,7 @@ int nx_server(int argc, char *argv[])
/* Then start the server (nx_run does not normally return) */
ret = nx_run(dev);
gvdbg("nx_run returned: %d\n", ret);
ginfo("nx_run returned: %d\n", ret);
return EXIT_FAILURE;
}
@@ -174,7 +174,7 @@ int nx_start(void)
/* Start the server kernel thread */
gvdbg("Starting server task\n");
ginfo("Starting server task\n");
server = kernel_thread("NX Server", CONFIG_NXSTART_SERVERPRIO,
CONFIG_NXSTART_SERVERSTACK, nx_server, NULL);
if (server < 0)
graphics/nxmu/nxmu_server.c
+2 -2
View File
@@ -345,7 +345,7 @@ int nx_runinstance(FAR const char *mqname, FAR NX_DRIVERTYPE *dev)
DEBUGASSERT(nbytes >= sizeof(struct nxsvrmsg_s));
msg = (FAR struct nxsvrmsg_s *)buffer;
gvdbg("Received opcode=%d nbytes=%d\n", msg->msgid, nbytes);
ginfo("Received opcode=%d nbytes=%d\n", msg->msgid, nbytes);
switch (msg->msgid)
{
/* Messages sent from clients to the NX server *********************/
@@ -531,7 +531,7 @@ int nx_runinstance(FAR const char *mqname, FAR NX_DRIVERTYPE *dev)
{
FAR struct nxclimsg_redraw_s *redraw = (FAR struct nxclimsg_redraw_s *)buffer;
DEBUGASSERT(redraw->wnd == &fe.be.bkgd);
gvdbg("Re-draw background rect={(%d,%d),(%d,%d)}\n",
ginfo("Re-draw background rect={(%d,%d),(%d,%d)}\n",
redraw->rect.pt1.x, redraw->rect.pt1.y,
redraw->rect.pt2.x, redraw->rect.pt2.y);
nxbe_fill(&fe.be.bkgd, &redraw->rect, fe.be.bgcolor);
graphics/nxsu/nx_open.c
+1 -1
View File
@@ -101,7 +101,7 @@ static void nxsu_bkgdredraw(NXWINDOW hwnd,
FAR struct nxbe_window_s *wnd = (FAR struct nxbe_window_s *)hwnd;
FAR struct nxbe_state_s *be = wnd->be;
gvdbg("BG redraw rect={(%d,%d),(%d,%d)}\n",
ginfo("BG redraw rect={(%d,%d),(%d,%d)}\n",
rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y);
nxbe_fill(wnd, &wnd->bounds, be->bgcolor);
}
graphics/nxterm/nxterm_kbdin.c
+1 -1
View File
@@ -393,7 +393,7 @@ void nxterm_kbdin(NXTERM handle, FAR const uint8_t *buffer, uint8_t buflen)
char ch;
int ret;
gvdbg("buflen=%d\n");
ginfo("buflen=%d\n");
DEBUGASSERT(handle);
/* Get the reference to the driver structure from the handle */
graphics/nxterm/nxterm_redraw.c
+1 -1
View File
@@ -105,7 +105,7 @@ void nxterm_redraw(NXTERM handle, FAR const struct nxgl_rect_s *rect, bool more)
int i;
DEBUGASSERT(handle && rect);
gvdbg("rect={(%d,%d),(%d,%d)} more=%s\n",
ginfo("rect={(%d,%d),(%d,%d)} more=%s\n",
rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y,
more ? "true" : "false");
graphics/vnc/server/vnc_fbdev.c
+14 -14
View File
@@ -162,7 +162,7 @@ static int up_getvideoinfo(FAR struct fb_vtable_s *vtable,
FAR struct vnc_fbinfo_s *fbinfo = (FAR struct vnc_fbinfo_s *)vtable;
FAR struct vnc_session_s *session;
gvdbg("vtable=%p vinfo=%p\n", vtable, vinfo);
ginfo("vtable=%p vinfo=%p\n", vtable, vinfo);
DEBUGASSERT(fbinfo != NULL && vinfo != NULL);
if (fbinfo != NULL && vinfo != NULL)
@@ -203,7 +203,7 @@ static int up_getplaneinfo(FAR struct fb_vtable_s *vtable, int planeno,
FAR struct vnc_fbinfo_s *fbinfo = (FAR struct vnc_fbinfo_s *)vtable;
FAR struct vnc_session_s *session;
gvdbg("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo);
ginfo("vtable=%p planeno=%d pinfo=%p\n", vtable, planeno, pinfo);
DEBUGASSERT(fbinfo != NULL && pinfo != NULL && planeno == 0);
if (fbinfo != NULL && pinfo != NULL && planeno == 0)
@@ -249,7 +249,7 @@ static int up_getcmap(FAR struct fb_vtable_s *vtable,
FAR struct vnc_session_s *session;
int i;
gvdbg("vtable=%p cmap=%p\n", vtable, cmap);
ginfo("vtable=%p cmap=%p\n", vtable, cmap);
DEBUGASSERT(fbinfo != NULL && cmap != NULL);
@@ -264,7 +264,7 @@ static int up_getcmap(FAR struct fb_vtable_s *vtable,
return -ENOTCONN;
}
gvdbg("first=%d len=%d\n", vcmap->first, cmap->len);
ginfo("first=%d len=%d\n", vcmap->first, cmap->len);
#warning Missing logic
return OK;
@@ -286,7 +286,7 @@ static int up_putcmap(FAR struct fb_vtable_s *vtable, FAR const struct fb_cmap_s
FAR struct vnc_session_s *session;
int i;
gvdbg("vtable=%p cmap=%p\n", vtable, cmap);
ginfo("vtable=%p cmap=%p\n", vtable, cmap);
DEBUGASSERT(fbinfo != NULL && cmap != NULL);
@@ -301,7 +301,7 @@ static int up_putcmap(FAR struct fb_vtable_s *vtable, FAR const struct fb_cmap_s
return -ENOTCONN;
}
gvdbg("first=%d len=%d\n", vcmap->first, cmap->len);
ginfo("first=%d len=%d\n", vcmap->first, cmap->len);
#warning Missing logic
return OK;
@@ -324,7 +324,7 @@ static int up_getcursor(FAR struct fb_vtable_s *vtable,
FAR struct vnc_session_s *session;
int i;
gvdbg("vtable=%p attrib=%p\n", vtable, attrib);
ginfo("vtable=%p attrib=%p\n", vtable, attrib);
DEBUGASSERT(fbinfo != NULL && attrib != NULL);
@@ -360,7 +360,7 @@ static int up_setcursor(FAR struct fb_vtable_s *vtable,
FAR struct vnc_session_s *session;
int i;
gvdbg("vtable=%p settings=%p\n", vtable, settings);
ginfo("vtable=%p settings=%p\n", vtable, settings);
DEBUGASSERT(fbinfo != NULL && settings != NULL);
@@ -375,7 +375,7 @@ static int up_setcursor(FAR struct fb_vtable_s *vtable,
return -ENOTCONN;
}
gvdbg("flags: %02x\n", settings->flags);
ginfo("flags: %02x\n", settings->flags);
if ((settings->flags & FB_CUR_SETPOSITION) != 0)
{
#warning Missing logic
@@ -435,7 +435,7 @@ static int vnc_start_server(int display)
/* Start the VNC server kernel thread. */
gvdbg("Starting the VNC server for display %d\n", display);
ginfo("Starting the VNC server for display %d\n", display);
g_fbstartup[display].result = -EBUSY;
sem_reset(&g_fbstartup[display].fbinit, 0);
@@ -630,7 +630,7 @@ int up_fbinitialize(int display)
ret = vnc_start_server(display);
if (ret < 0)
{
gvdbg("ERROR: vnc_start_server() failed: %d\n", ret);
ginfo("ERROR: vnc_start_server() failed: %d\n", ret);
return ret;
}
@@ -639,7 +639,7 @@ int up_fbinitialize(int display)
ret = vnc_wait_connect(display);
if (ret < 0)
{
gvdbg("ERROR: vnc_wait_connect() failed: %d\n", ret);
ginfo("ERROR: vnc_wait_connect() failed: %d\n", ret);
}
return ret;
@@ -711,7 +711,7 @@ int vnc_fbinitialize(int display, vnc_kbdout_t kbdout,
ret = vnc_start_server(display);
if (ret < 0)
{
gvdbg("ERROR: vnc_start_server() failed: %d\n", ret);
ginfo("ERROR: vnc_start_server() failed: %d\n", ret);
return ret;
}
@@ -720,7 +720,7 @@ int vnc_fbinitialize(int display, vnc_kbdout_t kbdout,
ret = vnc_wait_start(display);
if (ret < 0)
{
gvdbg("ERROR: vnc_wait_start() failed: %d\n", ret);
ginfo("ERROR: vnc_wait_start() failed: %d\n", ret);
return ret;
}
graphics/vnc/server/vnc_negotiate.c
+16 -16
View File
@@ -136,7 +136,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
/* Inform the client of the VNC protocol version */
gvdbg("Send protocol version: %s\n", g_vncproto);
ginfo("Send protocol version: %s\n", g_vncproto);
len = strlen(g_vncproto);
nsent = psock_send(&session->connect, g_vncproto, len, 0);
@@ -152,7 +152,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
/* Receive the echo of the protocol string */
gvdbg("Receive echo from VNC client\n");
ginfo("Receive echo from VNC client\n");
nrecvd = psock_recv(&session->connect, session->inbuf, len, 0);
if (nrecvd < 0)
@@ -176,7 +176,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
* any stinkin' security.
*/
gvdbg("Send SecurityType\n");
ginfo("Send SecurityType\n");
sectype = (FAR struct rfb_sectype_s *)session->outbuf;
rfb_putbe32(sectype->type, RFB_SECTYPE_NONE);
@@ -198,7 +198,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
* only option offered.
*/
gvdbg("Send SupportedSecurityTypes\n");
ginfo("Send SupportedSecurityTypes\n");
sectypes = (FAR struct rfb_supported_sectypes_s *)session->outbuf;
sectypes->ntypes = 1;
@@ -221,7 +221,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
* type is to be used on the connection.
*/
gvdbg("Receive SecurityType\n");
ginfo("Receive SecurityType\n");
sectype = (FAR struct rfb_selected_sectype_s *)session->inbuf;
@@ -242,7 +242,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
DEBUGASSERT(nrecvd == sizeof(struct rfb_selected_sectype_s));
gvdbg("Send SecurityResult\n");
ginfo("Send SecurityResult\n");
secresult = (FAR struct rfb_sectype_result_s *)session->outbuf;
@@ -266,7 +266,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
DEBUGASSERT(nsent == sizeof(struct rfb_sectype_result_s));
gvdbg("Send failure reason\n");
ginfo("Send failure reason\n");
secfail = (FAR struct rfb_sectype_fail_s *)session->outbuf;
len = strlen(g_nosecurity);
@@ -312,7 +312,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
* In this implementation, the sharing flag is ignored.
*/
gvdbg("Receive ClientInit\n");
ginfo("Receive ClientInit\n");
nrecvd = psock_recv(&session->connect, session->inbuf,
sizeof(struct rfb_clientinit_s), 0);
@@ -344,7 +344,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
* Very Low (8 colors) - RGB3 1:1:1 (TrueColor)
*/
gvdbg("Send ServerInit\n");
ginfo("Send ServerInit\n");
serverinit = (FAR struct rfb_serverinit_s *)session->outbuf;
@@ -385,7 +385,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
* This may override some of our framebuffer settings.
*/
gvdbg("Receive SetPixelFormat\n");
ginfo("Receive SetPixelFormat\n");
setformat = (FAR struct rfb_setpixelformat_s *)session->inbuf;
@@ -432,7 +432,7 @@ int vnc_negotiate(FAR struct vnc_session_s *session)
/* Receive supported encoding types from client. */
gvdbg("Receive encoding types\n");
ginfo("Receive encoding types\n");
encodings = (FAR struct rfb_setencodings_s *)session->inbuf;
@@ -498,35 +498,35 @@ int vnc_client_pixelformat(FAR struct vnc_session_s *session,
if (pixelfmt->bpp == 8 && pixelfmt->depth == 6)
{
gvdbg("Client pixel format: RGB8 2:2:2\n");
ginfo("Client pixel format: RGB8 2:2:2\n");
session->colorfmt = FB_FMT_RGB8_222;
session->bpp = 8;
session->bigendian = false;
}
else if (pixelfmt->bpp == 8 && pixelfmt->depth == 8)
{
gvdbg("Client pixel format: RGB8 3:3:2\n");
ginfo("Client pixel format: RGB8 3:3:2\n");
session->colorfmt = FB_FMT_RGB8_332;
session->bpp = 8;
session->bigendian = false;
}
else if (pixelfmt->bpp == 16 && pixelfmt->depth == 15)
{
gvdbg("Client pixel format: RGB16 5:5:5\n");
ginfo("Client pixel format: RGB16 5:5:5\n");
session->colorfmt = FB_FMT_RGB16_555;
session->bpp = 16;
session->bigendian = (pixelfmt->bigendian != 0) ? true : false;
}
else if (pixelfmt->bpp == 16 && pixelfmt->depth == 16)
{
gvdbg("Client pixel format: RGB16 5:6:5\n");
ginfo("Client pixel format: RGB16 5:6:5\n");
session->colorfmt = FB_FMT_RGB16_565;
session->bpp = 16;
session->bigendian = (pixelfmt->bigendian != 0) ? true : false;
}
else if (pixelfmt->bpp == 32 && pixelfmt->depth == 24)
{
gvdbg("Client pixel format: RGB32 8:8:8\n");
ginfo("Client pixel format: RGB32 8:8:8\n");
session->colorfmt = FB_FMT_RGB32;
session->bpp = 32;
session->bigendian = (pixelfmt->bigendian != 0) ? true : false;
graphics/vnc/server/vnc_raw.c
+1 -1
View File
@@ -491,7 +491,7 @@ int vnc_raw(FAR struct vnc_session_s *session, FAR struct nxgl_rect_s *rect)
}
while (size > 0);
updvdbg("Sent {(%d, %d),(%d, %d)}\n",
updinfo("Sent {(%d, %d),(%d, %d)}\n",
x, y, x + updwidth -1, y + updheight - 1);
}
}
graphics/vnc/server/vnc_receiver.c
+7 -7
View File
@@ -138,7 +138,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
int ret;
DEBUGASSERT(session);
gvdbg("Receiver running for Display %d\n", session->display);
ginfo("Receiver running for Display %d\n", session->display);
#ifdef CONFIG_NET_SOCKOPTS
/* Disable the receive timeout so that we will wait indefinitely for the
@@ -196,7 +196,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
{
case RFB_SETPIXELFMT_MSG: /* SetPixelFormat */
{
gvdbg("Received SetPixelFormat\n");
ginfo("Received SetPixelFormat\n");
/* Read the rest of the SetPixelFormat message */
@@ -230,7 +230,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
FAR struct rfb_setencodings_s *encodings;
unsigned int nencodings;
gvdbg("Received SetEncodings\n");
ginfo("Received SetEncodings\n");
/* Read the SetEncodings message without the following
* encodings.
@@ -278,7 +278,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
FAR struct rfb_fbupdatereq_s *update;
struct nxgl_rect_s rect;
gvdbg("Received FramebufferUpdateRequest\n");
ginfo("Received FramebufferUpdateRequest\n");
/* Read the rest of the SetPixelFormat message */
@@ -314,7 +314,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
{
FAR struct rfb_keyevent_s *keyevent;
gvdbg("Received KeyEvent\n");
ginfo("Received KeyEvent\n");
/* Read the rest of the KeyEvent message */
@@ -343,7 +343,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
FAR struct rfb_pointerevent_s *event;
uint8_t buttons;
#endif
gvdbg("Received PointerEvent\n");
ginfo("Received PointerEvent\n");
/* Read the rest of the PointerEvent message */
@@ -397,7 +397,7 @@ int vnc_receiver(FAR struct vnc_session_s *session)
FAR struct rfb_clientcuttext_s *cuttext;
uint32_t length;
gvdbg("Received ClientCutText\n");
ginfo("Received ClientCutText\n");
/* Read the ClientCutText message without the following
* text.
graphics/vnc/server/vnc_rre.c
+1 -1
View File
@@ -299,7 +299,7 @@ int vnc_rre(FAR struct vnc_session_s *session, FAR struct nxgl_rect_s *rect)
}
DEBUGASSERT(nsent == nbytes);
updvdbg("Sent {(%d, %d),(%d, %d)}\n",
updinfo("Sent {(%d, %d),(%d, %d)}\n",
rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y);
return nbytes;
}
graphics/vnc/server/vnc_server.c
+6 -6
View File
@@ -161,7 +161,7 @@ static int vnc_connect(FAR struct vnc_session_s *session, int port)
struct sockaddr_in addr;
int ret;
gvdbg("Connecting display %d\n", session->display);
ginfo("Connecting display %d\n", session->display);
/* Create a listening socket */
@@ -197,7 +197,7 @@ static int vnc_connect(FAR struct vnc_session_s *session, int port)
/* Connect to the client */
gvdbg("Accepting connection for Display %d\n", session->display);
ginfo("Accepting connection for Display %d\n", session->display);
ret = psock_accept(&session->listen, NULL, NULL, &session->connect);
if (ret < 0)
@@ -206,7 +206,7 @@ static int vnc_connect(FAR struct vnc_session_s *session, int port)
goto errout_with_listener;
}
gvdbg("Display %d connected\n", session->display);
ginfo("Display %d connected\n", session->display);
session->state = VNCSERVER_CONNECTED;
return OK;
@@ -257,7 +257,7 @@ int vnc_server(int argc, FAR char *argv[])
goto errout_with_post;
}
gvdbg("Server started for Display %d\n", display);
ginfo("Server started for Display %d\n", display);
/* Allocate the framebuffer memory. We rely on the fact that
* the KMM allocator will align memory to 32-bits or better.
@@ -310,7 +310,7 @@ int vnc_server(int argc, FAR char *argv[])
ret = vnc_connect(session, RFB_DISPLAY_PORT(display));
if (ret >= 0)
{
gvdbg("New VNC connection\n");
ginfo("New VNC connection\n");
/* Perform the VNC initialization sequence after the client has
* sucessfully connected to the server. Negotiate security,
@@ -350,7 +350,7 @@ int vnc_server(int argc, FAR char *argv[])
*/
ret = vnc_receiver(session);
gvdbg("Session terminated with %d\n", ret);
ginfo("Session terminated with %d\n", ret);
UNUSED(ret);
/* Stop the VNC updater thread. */
graphics/vnc/server/vnc_server.h
+8 -8
View File
@@ -188,25 +188,25 @@
# ifdef CONFIG_CPP_HAVE_VARARGS
# define upddbg(format, ...) dbg(format, ##__VA_ARGS__)
# define updlldbg(format, ...) lldbg(format, ##__VA_ARGS__)
# define updvdbg(format, ...) vdbg(format, ##__VA_ARGS__)
# define updllvdbg(format, ...) llvdbg(format, ##__VA_ARGS__)
# define updinfo(format, ...) info(format, ##__VA_ARGS__)
# define updllinfo(format, ...) llinfo(format, ##__VA_ARGS__)
# else
# define upddbg dbg
# define updlldbg lldbg
# define updvdbg vdbg
# define updllvdbg llvdbg
# define updinfo info
# define updllinfo llinfo
# endif
#else
# ifdef CONFIG_CPP_HAVE_VARARGS
# define upddbg(x...)
# define updlldbg(x...)
# define updvdbg(x...)
# define updllvdbg(x...)
# define updinfo(x...)
# define updllinfo(x...)
# else
# define upddbg (void)
# define updlldbg (void)
# define updvdbg (void)
# define updllvdbg (void)
# define updinfo (void)
# define updllinfo (void)
# endif
#endif
graphics/vnc/server/vnc_updater.c
+6 -6
View File
@@ -299,7 +299,7 @@ vnc_remove_queue(FAR struct vnc_session_s *session)
if (session->nwhupd > 0 && rect->whupd)
{
session->nwhupd--;
updvdbg("Whole screen update: nwhupd=%d\n", session->nwhupd);
updinfo("Whole screen update: nwhupd=%d\n", session->nwhupd);
}
sched_unlock();
@@ -369,7 +369,7 @@ static FAR void *vnc_updater(FAR void *arg)
int ret;
DEBUGASSERT(session != NULL);
gvdbg("Updater running for Display %d\n", session->display);
ginfo("Updater running for Display %d\n", session->display);
/* Loop, processing updates until we are asked to stop.
* REVISIT: Probably need some kind of signal mechanism to wake up
@@ -386,7 +386,7 @@ static FAR void *vnc_updater(FAR void *arg)
srcrect = vnc_remove_queue(session);
DEBUGASSERT(srcrect != NULL);
updvdbg("Dequeued {(%d, %d),(%d, %d)}\n",
updinfo("Dequeued {(%d, %d),(%d, %d)}\n",
srcrect->rect.pt1.x, srcrect->rect.pt1.y,
srcrect->rect.pt2.x, srcrect->rect.pt2.y);
@@ -442,7 +442,7 @@ int vnc_start_updater(FAR struct vnc_session_s *session)
struct sched_param param;
int status;
gvdbg("Starting updater for Display %d\n", session->display);
ginfo("Starting updater for Display %d\n", session->display);
/* Create thread that is gonna send rectangles to the client */
@@ -577,7 +577,7 @@ int vnc_update_rectangle(FAR struct vnc_session_s *session,
FAR struct vnc_fbupdate_s *curr;
FAR struct vnc_fbupdate_s *next;
updvdbg("New whole screen update...\n");
updinfo("New whole screen update...\n");
curr = (FAR struct vnc_fbupdate_s *)session->updqueue.head;
sq_init(&session->updqueue);
@@ -619,7 +619,7 @@ int vnc_update_rectangle(FAR struct vnc_session_s *session,
vnc_add_queue(session, update);
updvdbg("Queued {(%d, %d),(%d, %d)}\n",
updinfo("Queued {(%d, %d),(%d, %d)}\n",
intersection.pt1.x, intersection.pt1.y,
intersection.pt2.x, intersection.pt2.y);
}