diff options
Diffstat (limited to 'nuttx/graphics/nxmu')
32 files changed, 115 insertions, 136 deletions
diff --git a/nuttx/graphics/nxmu/nx_bitmap.c b/nuttx/graphics/nxmu/nx_bitmap.c index 43dc6acde..04bbb0d08 100644 --- a/nuttx/graphics/nxmu/nx_bitmap.c +++ b/nuttx/graphics/nxmu/nx_bitmap.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_bitmap.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nx_closewindow.c b/nuttx/graphics/nxmu/nx_closewindow.c index efda4643c..2b87af87a 100644 --- a/nuttx/graphics/nxmu/nx_closewindow.c +++ b/nuttx/graphics/nxmu/nx_closewindow.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_closewindow.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nx_connect.c b/nuttx/graphics/nxmu/nx_connect.c index ac09fd9d4..dcfbd2996 100644 --- a/nuttx/graphics/nxmu/nx_connect.c +++ b/nuttx/graphics/nxmu/nx_connect.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_connect.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <fcntl.h> @@ -71,8 +71,8 @@ * NOTE: that client ID 0 is reserved for the server(s) themselves */ -static sem_t g_nxlibsem = { 1 }; -static uint32 g_nxcid = 1; +static sem_t g_nxlibsem = { 1 }; +static uint32_t g_nxcid = 1; /**************************************************************************** * Public Data diff --git a/nuttx/graphics/nxmu/nx_disconnect.c b/nuttx/graphics/nxmu/nx_disconnect.c index efce1279a..82cb318ff 100644 --- a/nuttx/graphics/nxmu/nx_disconnect.c +++ b/nuttx/graphics/nxmu/nx_disconnect.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_disconnect.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <mqueue.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nx_eventhandler.c b/nuttx/graphics/nxmu/nx_eventhandler.c index 2b7891766..a8b97ffbb 100644 --- a/nuttx/graphics/nxmu/nx_eventhandler.c +++ b/nuttx/graphics/nxmu/nx_eventhandler.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_eventhandler.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> #include <stdlib.h> #include <mqueue.h> #include <assert.h> @@ -135,7 +135,7 @@ int nx_eventhandler(NXHANDLE handle) FAR struct nxfe_conn_s *conn = (FAR struct nxfe_conn_s *)handle; struct nxsvrmsg_s *msg; struct nxbe_window_s *wnd; - ubyte buffer[NX_MXCLIMSGLEN]; + uint8_t buffer[NX_MXCLIMSGLEN]; int nbytes; /* Get the next message from our incoming message queue */ diff --git a/nuttx/graphics/nxmu/nx_eventnotify.c b/nuttx/graphics/nxmu/nx_eventnotify.c index e722c0dce..5ea712a70 100644 --- a/nuttx/graphics/nxmu/nx_eventnotify.c +++ b/nuttx/graphics/nxmu/nx_eventnotify.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_eventnotify.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <mqueue.h> #include <assert.h> diff --git a/nuttx/graphics/nxmu/nx_fill.c b/nuttx/graphics/nxmu/nx_fill.c index b92aef537..f87ed3004 100644 --- a/nuttx/graphics/nxmu/nx_fill.c +++ b/nuttx/graphics/nxmu/nx_fill.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_fill.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <mqueue.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nx_filltrapezoid.c b/nuttx/graphics/nxmu/nx_filltrapezoid.c index c55497bc2..b573dce19 100644 --- a/nuttx/graphics/nxmu/nx_filltrapezoid.c +++ b/nuttx/graphics/nxmu/nx_filltrapezoid.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_filltrapezoid.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <string.h> #include <mqueue.h> #include <errno.h> diff --git a/nuttx/graphics/nxmu/nx_getposition.c b/nuttx/graphics/nxmu/nx_getposition.c index 21bb985aa..a57645da4 100644 --- a/nuttx/graphics/nxmu/nx_getposition.c +++ b/nuttx/graphics/nxmu/nx_getposition.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_getposition.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nx_kbdchin.c b/nuttx/graphics/nxmu/nx_kbdchin.c index e83c9a0a2..eb3ed8013 100644 --- a/nuttx/graphics/nxmu/nx_kbdchin.c +++ b/nuttx/graphics/nxmu/nx_kbdchin.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_kbdchin.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> #include <errno.h> #include <debug.h> @@ -82,7 +82,7 @@ * ****************************************************************************/ -int nx_kbdchin(NXHANDLE handle, ubyte ch) +int nx_kbdchin(NXHANDLE handle, uint8_t ch) { FAR struct nxfe_conn_s *conn = (FAR struct nxfe_conn_s *)handle; struct nxsvrmsg_kbdin_s outmsg; diff --git a/nuttx/graphics/nxmu/nx_kbdin.c b/nuttx/graphics/nxmu/nx_kbdin.c index e9665e89b..d4951bb13 100644 --- a/nuttx/graphics/nxmu/nx_kbdin.c +++ b/nuttx/graphics/nxmu/nx_kbdin.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_kbdin.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> #include <stdlib.h> #include <errno.h> #include <debug.h> @@ -83,7 +83,7 @@ * ****************************************************************************/ -int nx_kbdin(NXHANDLE handle, ubyte nch, FAR const ubyte *ch) +int nx_kbdin(NXHANDLE handle, uint8_t nch, FAR const uint8_t *ch) { FAR struct nxfe_conn_s *conn = (FAR struct nxfe_conn_s *)handle; FAR struct nxsvrmsg_kbdin_s *outmsg; diff --git a/nuttx/graphics/nxmu/nx_lower.c b/nuttx/graphics/nxmu/nx_lower.c index d5156cf80..4b4a61d1c 100644 --- a/nuttx/graphics/nxmu/nx_lower.c +++ b/nuttx/graphics/nxmu/nx_lower.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_lower.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nx_mousein.c b/nuttx/graphics/nxmu/nx_mousein.c index 3d22392c3..ad3a88a13 100644 --- a/nuttx/graphics/nxmu/nx_mousein.c +++ b/nuttx/graphics/nxmu/nx_mousein.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_mousein.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> #include <errno.h> #include <debug.h> @@ -82,7 +82,7 @@ * ****************************************************************************/ -int nx_mousein(NXHANDLE handle, nxgl_coord_t x, nxgl_coord_t y, ubyte buttons) +int nx_mousein(NXHANDLE handle, nxgl_coord_t x, nxgl_coord_t y, uint8_t buttons) { FAR struct nxfe_conn_s *conn = (FAR struct nxfe_conn_s *)handle; struct nxsvrmsg_mousein_s outmsg; diff --git a/nuttx/graphics/nxmu/nx_move.c b/nuttx/graphics/nxmu/nx_move.c index 084a08d0d..67f4fc3c1 100644 --- a/nuttx/graphics/nxmu/nx_move.c +++ b/nuttx/graphics/nxmu/nx_move.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_move.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nx_openwindow.c b/nuttx/graphics/nxmu/nx_openwindow.c index a05251546..85fec76fe 100644 --- a/nuttx/graphics/nxmu/nx_openwindow.c +++ b/nuttx/graphics/nxmu/nx_openwindow.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_openwindow.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nx_raise.c b/nuttx/graphics/nxmu/nx_raise.c index 494eb779c..e60122cea 100644 --- a/nuttx/graphics/nxmu/nx_raise.c +++ b/nuttx/graphics/nxmu/nx_raise.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_raise.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nx_releasebkgd.c b/nuttx/graphics/nxmu/nx_releasebkgd.c index 1e6001000..4ad750b66 100644 --- a/nuttx/graphics/nxmu/nx_releasebkgd.c +++ b/nuttx/graphics/nxmu/nx_releasebkgd.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_releasebkgd.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nx_requestbkgd.c b/nuttx/graphics/nxmu/nx_requestbkgd.c index f9aaf86ff..ef1c9987a 100644 --- a/nuttx/graphics/nxmu/nx_requestbkgd.c +++ b/nuttx/graphics/nxmu/nx_requestbkgd.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_requestbkgd.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nx_setbgcolor.c b/nuttx/graphics/nxmu/nx_setbgcolor.c index 302c20549..9c3cc66c4 100644 --- a/nuttx/graphics/nxmu/nx_setbgcolor.c +++ b/nuttx/graphics/nxmu/nx_setbgcolor.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_setbgcolor.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nx_setposition.c b/nuttx/graphics/nxmu/nx_setposition.c index 9ffa51e9d..d5ace394d 100644 --- a/nuttx/graphics/nxmu/nx_setposition.c +++ b/nuttx/graphics/nxmu/nx_setposition.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_setposition.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nx_setsize.c b/nuttx/graphics/nxmu/nx_setsize.c index 36169a222..aeb40e11c 100644 --- a/nuttx/graphics/nxmu/nx_setsize.c +++ b/nuttx/graphics/nxmu/nx_setsize.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nx_setsize.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nxfe.h b/nuttx/graphics/nxmu/nxfe.h index b808e5bf3..e449dc10e 100644 --- a/nuttx/graphics/nxmu/nxfe.h +++ b/nuttx/graphics/nxmu/nxfe.h @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nxfe.h * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -42,7 +42,8 @@ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> +#include <stdbool.h> #include <mqueue.h> #include <semaphore.h> @@ -103,17 +104,17 @@ struct nxfe_conn_s { /* This number uniquely identifies the client */ - int cid; /* Client ID (CID) */ - ubyte state; /* See enum nx_clistate_e */ + int cid; /* Client ID (CID) */ + uint8_t state; /* See enum nx_clistate_e */ /* These are only usable on the client side of the connection */ - mqd_t crdmq; /* MQ to read from the server (may be non-blocking) */ - mqd_t cwrmq; /* MQ to write to the server (blocking) */ + mqd_t crdmq; /* MQ to read from the server (may be non-blocking) */ + mqd_t cwrmq; /* MQ to write to the server (blocking) */ /* These are only usable on the server side of the connection */ - mqd_t swrmq; /* MQ to write to the client */ + mqd_t swrmq; /* MQ to write to the client */ }; /* Server state structure ***************************************************/ @@ -182,21 +183,21 @@ enum nxmsg_e struct nxclimsg_s { - uint32 msgid; /* Any of nxclimsg_e */ + uint32_t msgid; /* Any of nxclimsg_e */ }; /* The server is now connected */ struct nxclimsg_connected_s { - uint32 msgid; /* NX_CLIMSG_REDRAW_CONNECTED */ + uint32_t msgid; /* NX_CLIMSG_REDRAW_CONNECTED */ }; /* The server is now disconnected */ struct nxclimsg_disconnected_s { - uint32 msgid; /* NX_CLIMSG_REDRAW_DISCONNECTED */ + uint32_t msgid; /* NX_CLIMSG_REDRAW_DISCONNECTED */ }; /* This message is received when a requested window has been opened. If wnd is NULL @@ -205,17 +206,17 @@ struct nxclimsg_disconnected_s struct nxclimsg_redraw_s { - uint32 msgid; /* NX_CLIMSG_REDRAW */ + uint32_t msgid; /* NX_CLIMSG_REDRAW */ FAR struct nxbe_window_s *wnd; /* The handle to the window to redraw in */ FAR struct nxgl_rect_s rect; /* The rectangle to be redrawn */ - boolean more; /* TRUE: more redraw messages follow */ + bool more; /* true: more redraw messages follow */ }; /* This message informs the client of the new size or position of the window */ struct nxclimsg_newposition_s { - uint32 msgid; /* NX_CLIMSG_NEWPOSITION */ + uint32_t msgid; /* NX_CLIMSG_NEWPOSITION */ FAR struct nxbe_window_s *wnd; /* The window whose position/size has changed */ FAR struct nxgl_size_s size; /* The current window size */ FAR struct nxgl_point_s pos; /* The current window position */ @@ -227,10 +228,10 @@ struct nxclimsg_newposition_s #ifdef CONFIG_NX_MOUSE struct nxclimsg_mousein_s { - uint32 msgid; /* NX_SVRMSG_MOUSEIN */ + uint32_t msgid; /* NX_SVRMSG_MOUSEIN */ FAR struct nxbe_window_s *wnd; /* The handle of window receiving mouse input */ struct nxgl_point_s pos; /* Mouse X/Y position */ - ubyte buttons; /* Mouse button set */ + uint8_t buttons; /* Mouse button set */ }; #endif @@ -239,10 +240,10 @@ struct nxclimsg_mousein_s #ifdef CONFIG_NX_KBD struct nxclimsg_kbdin_s { - uint32 msgid; /* NX_CLIMSG_KBDIN */ + uint32_t msgid; /* NX_CLIMSG_KBDIN */ FAR struct nxbe_window_s *wnd; /* The handle of window receiving keypad input */ - ubyte nch; /* Number of characters received */ - ubyte ch[1]; /* Array of received characters */ + uint8_t nch; /* Number of characters received */ + uint8_t ch[1]; /* Array of received characters */ }; #endif @@ -253,94 +254,94 @@ struct nxclimsg_kbdin_s * NX_SVRMSG_CONNECT and NX_SVRMSG_DISCONNECT. */ -struct nxsvrmsg_s /* Generic server message */ +struct nxsvrmsg_s /* Generic server message */ { - uint32 msgid; /* One of enum nxsvrmsg_e */ - FAR struct nxfe_conn_s *conn; /* The specific connection sending the message */ + uint32_t msgid; /* One of enum nxsvrmsg_e */ + FAR struct nxfe_conn_s *conn; /* The specific connection sending the message */ }; /* This message requests the server to create a new window */ struct nxsvrmsg_openwindow_s { - uint32 msgid; /* NX_SVRMSG_OPENWINDOW */ - FAR struct nxbe_window_s *wnd; /* The pre-allocated window structure */ + uint32_t msgid; /* NX_SVRMSG_OPENWINDOW */ + FAR struct nxbe_window_s *wnd; /* The pre-allocated window structure */ }; /* This message informs the server that client wishes to close a window */ struct nxsvrmsg_closewindow_s { - uint32 msgid; /* NX_SVRMSG_CLOSEWINDOW */ - FAR struct nxbe_window_s *wnd; /* The window to be closed */ + uint32_t msgid; /* NX_SVRMSG_CLOSEWINDOW */ + FAR struct nxbe_window_s *wnd; /* The window to be closed */ }; /* This message requests the server to create a new window */ struct nxsvrmsg_requestbkgd_s { - uint32 msgid; /* NX_SVRMSG_REQUESTBKGD */ - FAR struct nxfe_conn_s *conn; /* The specific connection sending the message */ + uint32_t msgid; /* NX_SVRMSG_REQUESTBKGD */ + FAR struct nxfe_conn_s *conn; /* The specific connection sending the message */ FAR const struct nx_callback_s *cb; /* Event handling callbacks */ - FAR void *arg; /* Client argument used with callbacks */ + FAR void *arg; /* Client argument used with callbacks */ }; /* This message informs the server that client wishes to close a window */ struct nxsvrmsg_releasebkgd_s { - uint32 msgid; /* NX_SVRMSG_RELEASEBKGD */ + uint32_t msgid; /* NX_SVRMSG_RELEASEBKGD */ }; /* This message informs the server that the size or position of the window has changed */ struct nxsvrmsg_setposition_s { - uint32 msgid; /* NX_SVRMSG_SETPOSITION */ - FAR struct nxbe_window_s *wnd; /* The window whose position/size has changed */ - FAR struct nxgl_point_s pos; /* The new window position */ + uint32_t msgid; /* NX_SVRMSG_SETPOSITION */ + FAR struct nxbe_window_s *wnd; /* The window whose position/size has changed */ + FAR struct nxgl_point_s pos; /* The new window position */ }; /* This message informs the server that the size or position of the window has changed */ struct nxsvrmsg_setsize_s { - uint32 msgid; /* NX_SVRMSG_SETSIZE */ - FAR struct nxbe_window_s *wnd; /* The window whose position/size has changed */ - FAR struct nxgl_size_s size; /* The new window size */ + uint32_t msgid; /* NX_SVRMSG_SETSIZE */ + FAR struct nxbe_window_s *wnd; /* The window whose position/size has changed */ + FAR struct nxgl_size_s size; /* The new window size */ }; /* This message informs the server that the size or position of the window has changed */ struct nxsvrmsg_getposition_s { - uint32 msgid; /* NX_SVRMSG_FETPOSITION */ - FAR struct nxbe_window_s *wnd; /* The window whose position/size has changed */ + uint32_t msgid; /* NX_SVRMSG_FETPOSITION */ + FAR struct nxbe_window_s *wnd; /* The window whose position/size has changed */ }; /* This message informs the server to raise this window to the top of the display */ struct nxsvrmsg_raise_s { - uint32 msgid; /* NX_SVRMSG_RAISE */ - FAR struct nxbe_window_s *wnd; /* The window to be raised */ + uint32_t msgid; /* NX_SVRMSG_RAISE */ + FAR struct nxbe_window_s *wnd; /* The window to be raised */ }; /* This message informs the server to lower this window to the bottom of the display */ struct nxsvrmsg_lower_s { - uint32 msgid; /* NX_SVRMSG_LOWER */ - FAR struct nxbe_window_s *wnd; /* The window to be lowered */ + uint32_t msgid; /* NX_SVRMSG_LOWER */ + FAR struct nxbe_window_s *wnd; /* The window to be lowered */ }; /* Fill a rectangle in the window with a color */ struct nxsvrmsg_fill_s { - uint32 msgid; /* NX_SVRMSG_FILL */ - FAR struct nxbe_window_s *wnd; /* The window to fill */ - struct nxgl_rect_s rect; /* The rectangle in the window to fill */ + uint32_t msgid; /* NX_SVRMSG_FILL */ + FAR struct nxbe_window_s *wnd; /* The window to fill */ + struct nxgl_rect_s rect; /* The rectangle in the window to fill */ nxgl_mxpixel_t color[CONFIG_NX_NPLANES]; /* Color to use in the fill */ }; @@ -348,10 +349,10 @@ struct nxsvrmsg_fill_s struct nxsvrmsg_filltrapezoid_s { - uint32 msgid; /* NX_SVRMSG_FILLTRAP */ - FAR struct nxbe_window_s *wnd; /* The window to fill */ - FAR struct nxgl_rect_s clip; /* The clipping window */ - struct nxgl_trapezoid_s trap; /* The trapezoidal region in the window to fill */ + uint32_t msgid; /* NX_SVRMSG_FILLTRAP */ + FAR struct nxbe_window_s *wnd; /* The window to fill */ + FAR struct nxgl_rect_s clip; /* The clipping window */ + struct nxgl_trapezoid_s trap; /* The trapezoidal region in the window to fill */ nxgl_mxpixel_t color[CONFIG_NX_NPLANES]; /* Color to use in the fill */ }; @@ -359,29 +360,29 @@ struct nxsvrmsg_filltrapezoid_s struct nxsvrmsg_move_s { - uint32 msgid; /* NX_SVRMSG_MOVE */ - FAR struct nxbe_window_s *wnd; /* The window within which the move is done */ - struct nxgl_rect_s rect; /* Describes the rectangular region to move */ - struct nxgl_point_s offset; /* The offset to move the region */ + uint32_t msgid; /* NX_SVRMSG_MOVE */ + FAR struct nxbe_window_s *wnd; /* The window within which the move is done */ + struct nxgl_rect_s rect; /* Describes the rectangular region to move */ + struct nxgl_point_s offset; /* The offset to move the region */ }; /* Copy a rectangular bitmap into the window */ struct nxsvrmsg_bitmap_s { - uint32 msgid; /* NX_SVRMSG_BITMAP */ - FAR struct nxbe_window_s *wnd; /* The window with will receive the bitmap image */ - struct nxgl_rect_s dest; /* Destination location of the bitmap in the window */ + uint32_t msgid; /* NX_SVRMSG_BITMAP */ + FAR struct nxbe_window_s *wnd; /* The window with will receive the bitmap image */ + struct nxgl_rect_s dest; /* Destination location of the bitmap in the window */ FAR const void *src[CONFIG_NX_NPLANES]; /* The start of the source image. */ - struct nxgl_point_s origin; /* Offset into the source image data */ - unsigned int stride; /* The width of the full source image in pixels. */ + struct nxgl_point_s origin; /* Offset into the source image data */ + unsigned int stride; /* The width of the full source image in pixels. */ }; /* Set the color of the background */ struct nxsvrmsg_setbgcolor_s { - uint32 msgid; /* NX_SVRMSG_SETBGCOLOR */ + uint32_t msgid; /* NX_SVRMSG_SETBGCOLOR */ nxgl_mxpixel_t color[CONFIG_NX_NPLANES]; /* Color to use in the background */ }; @@ -393,9 +394,9 @@ struct nxsvrmsg_setbgcolor_s #ifdef CONFIG_NX_MOUSE struct nxsvrmsg_mousein_s { - uint32 msgid; /* NX_SVRMSG_MOUSEIN */ - struct nxgl_point_s pt; /* Mouse X/Y position */ - ubyte buttons; /* Mouse button set */ + uint32_t msgid; /* NX_SVRMSG_MOUSEIN */ + struct nxgl_point_s pt; /* Mouse X/Y position */ + uint8_t buttons; /* Mouse button set */ }; #endif @@ -407,9 +408,9 @@ struct nxsvrmsg_mousein_s #ifdef CONFIG_NX_KBD struct nxsvrmsg_kbdin_s { - uint32 msgid; /* NX_SVRMSG_KBDIN */ - ubyte nch ; /* Number of characters received */ - ubyte ch[1]; /* Array of received characters */ + uint32_t msgid; /* NX_SVRMSG_KBDIN */ + uint8_t nch ; /* Number of characters received */ + uint8_t ch[1]; /* Array of received characters */ }; #endif @@ -613,7 +614,7 @@ EXTERN int nxmu_mousein(FAR struct nxfe_state_s *fe, ****************************************************************************/ #ifdef CONFIG_NX_KBD -EXTERN void nxmu_kbdin(FAR struct nxfe_state_s *fe, ubyte nch, FAR ubyte *ch); +EXTERN void nxmu_kbdin(FAR struct nxfe_state_s *fe, uint8_t nch, FAR uint8_t *ch); #endif #undef EXTERN diff --git a/nuttx/graphics/nxmu/nxmu_constructwindow.c b/nuttx/graphics/nxmu/nxmu_constructwindow.c index f7e62f711..ba3b034d0 100644 --- a/nuttx/graphics/nxmu/nxmu_constructwindow.c +++ b/nuttx/graphics/nxmu/nxmu_constructwindow.c @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <stdlib.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nxmu_kbdin.c b/nuttx/graphics/nxmu/nxmu_kbdin.c index 903533357..1a3ca03ef 100644 --- a/nuttx/graphics/nxmu/nxmu_kbdin.c +++ b/nuttx/graphics/nxmu/nxmu_kbdin.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nxmu_kbdin.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> #include <stdlib.h> #include <errno.h> #include <debug.h> @@ -83,7 +83,7 @@ * ****************************************************************************/ -void nxmu_kbdin(FAR struct nxfe_state_s *fe, ubyte nch, FAR ubyte *ch) +void nxmu_kbdin(FAR struct nxfe_state_s *fe, uint8_t nch, FAR uint8_t *ch) { FAR struct nxclimsg_kbdin_s *outmsg; int size; diff --git a/nuttx/graphics/nxmu/nxmu_mouse.c b/nuttx/graphics/nxmu/nxmu_mouse.c index 0bcb09a34..f1ee162d1 100644 --- a/nuttx/graphics/nxmu/nxmu_mouse.c +++ b/nuttx/graphics/nxmu/nxmu_mouse.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nxmu__mouse.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> #include <errno.h> #include <debug.h> @@ -63,7 +63,7 @@ static struct nxgl_point_s g_mpos; static struct nxgl_point_s g_mrange; -static ubyte g_mbutton; +static uint8_t g_mbutton; /**************************************************************************** * Public Data diff --git a/nuttx/graphics/nxmu/nxmu_openwindow.c b/nuttx/graphics/nxmu/nxmu_openwindow.c index 706d00a2d..a25df0ce5 100644 --- a/nuttx/graphics/nxmu/nxmu_openwindow.c +++ b/nuttx/graphics/nxmu/nxmu_openwindow.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nxmu_openwindow.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -38,7 +38,6 @@ ****************************************************************************/ #include <nuttx/config.h> -#include <sys/types.h> #include <nuttx/nx.h> #include "nxfe.h" diff --git a/nuttx/graphics/nxmu/nxmu_redrawreq.c b/nuttx/graphics/nxmu/nxmu_redrawreq.c index 3f25e1ebf..3c23d4af6 100644 --- a/nuttx/graphics/nxmu/nxmu_redrawreq.c +++ b/nuttx/graphics/nxmu/nxmu_redrawreq.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nxmu_redrawreq.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdbool.h> #include <errno.h> #include <debug.h> @@ -85,7 +85,7 @@ void nxfe_redrawreq(FAR struct nxbe_window_s *wnd, FAR const struct nxgl_rect_s outmsg.msgid = NX_CLIMSG_REDRAW; outmsg.wnd = wnd; - outmsg.more = FALSE; + outmsg.more = false; nxgl_rectoffset(&outmsg.rect, rect, -wnd->bounds.pt1.x, -wnd->bounds.pt1.y); ret = mq_send(wnd->conn->swrmq, &outmsg, sizeof(struct nxclimsg_redraw_s), NX_CLIMSG_PRIO); diff --git a/nuttx/graphics/nxmu/nxmu_releasebkgd.c b/nuttx/graphics/nxmu/nxmu_releasebkgd.c index 521892b7c..3f8f04bdd 100644 --- a/nuttx/graphics/nxmu/nxmu_releasebkgd.c +++ b/nuttx/graphics/nxmu/nxmu_releasebkgd.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nxmu_releasebkgd.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nxmu_reportposition.c b/nuttx/graphics/nxmu/nxmu_reportposition.c index 858f3ab82..ce206a01d 100644 --- a/nuttx/graphics/nxmu/nxmu_reportposition.c +++ b/nuttx/graphics/nxmu/nxmu_reportposition.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nxmu_reportposition.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nxmu_requestbkgd.c b/nuttx/graphics/nxmu/nxmu_requestbkgd.c index 7214c235f..b8ca3e65d 100644 --- a/nuttx/graphics/nxmu/nxmu_requestbkgd.c +++ b/nuttx/graphics/nxmu/nxmu_requestbkgd.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nxmu_requestbkgd.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nxmu_semtake.c b/nuttx/graphics/nxmu/nxmu_semtake.c index 079844621..a08162286 100644 --- a/nuttx/graphics/nxmu/nxmu_semtake.c +++ b/nuttx/graphics/nxmu/nxmu_semtake.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nxmu_semtake.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,6 @@ #include <nuttx/config.h> -#include <sys/types.h> #include <errno.h> #include <assert.h> #include <debug.h> diff --git a/nuttx/graphics/nxmu/nxmu_server.c b/nuttx/graphics/nxmu/nxmu_server.c index 4b18a7580..d9ff97534 100644 --- a/nuttx/graphics/nxmu/nxmu_server.c +++ b/nuttx/graphics/nxmu/nxmu_server.c @@ -1,7 +1,7 @@ /**************************************************************************** * graphics/nxmu/nxmu_server.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ #include <nuttx/config.h> -#include <sys/types.h> +#include <stdint.h> #include <stdio.h> #include <string.h> #include <semaphore.h> @@ -301,7 +301,7 @@ int nx_runinstance(FAR const char *mqname, FAR struct fb_vtable_s *fb) { struct nxfe_state_s fe; FAR struct nxsvrmsg_s *msg; - ubyte buffer[NX_MXSVRMSGLEN]; + uint8_t buffer[NX_MXSVRMSGLEN]; int nbytes; int ret; |