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

Rename CONFIG_DEBUG to CONFIG_DEBUG_FEATURES

Browse Source
This commit is contained in:
Gregory Nutt
2016-06-11 14:14:08 -06:00
parent c211ce8be1
commit 1cdc746726
1185 changed files with 2056 additions and 2019 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/nxbe/nxbe_bitmap.c
+1 -1
View File
@@ -125,7 +125,7 @@ void nxbe_bitmap(FAR struct nxbe_window_s *wnd, FAR const struct nxgl_rect_s *de
unsigned int deststride;
int i;
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!wnd || !dest || !src || !origin)
{
return;
graphics/nxbe/nxbe_closewindow.c
+1 -1
View File
@@ -70,7 +70,7 @@ void nxbe_closewindow(struct nxbe_window_s *wnd)
{
FAR struct nxbe_state_s *be;
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!wnd)
{
return;
graphics/nxbe/nxbe_configure.c
+1 -1
View File
@@ -99,7 +99,7 @@ int nxbe_configure(FAR NX_DRIVERTYPE *dev, FAR struct nxbe_state_s *be)
/* Check the number of color planes */
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (be->vinfo.nplanes > CONFIG_NX_NPLANES)
{
gdbg("NX configured for only %d planes, controller wants %d\n",
graphics/nxbe/nxbe_fill.c
+1 -1
View File
@@ -112,7 +112,7 @@ void nxbe_fill(FAR struct nxbe_window_s *wnd,
struct nxgl_rect_s remaining;
int i;
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!wnd || !rect)
{
return;
graphics/nxbe/nxbe_filltrapezoid.c
+1 -1
View File
@@ -137,7 +137,7 @@ void nxbe_filltrapezoid(FAR struct nxbe_window_s *wnd,
struct nxgl_rect_s remaining;
int i;
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!wnd || !trap)
{
return;
graphics/nxbe/nxbe_getrectangle.c
+1 -1
View File
@@ -87,7 +87,7 @@ void nxbe_getrectangle(FAR struct nxbe_window_s *wnd,
{
struct nxgl_rect_s remaining;
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!wnd || !rect || !dest || plane >= wnd->be->vinfo.nplanes)
{
ginfo("Invalid parameters\n");
graphics/nxbe/nxbe_move.c
+1 -1
View File
@@ -208,7 +208,7 @@ void nxbe_move(FAR struct nxbe_window_s *wnd, FAR const struct nxgl_rect_s *rect
struct nxbe_move_s info;
int i;
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!wnd || !rect)
{
return;
graphics/nxbe/nxbe_setpixel.c
+1 -1
View File
@@ -112,7 +112,7 @@ void nxbe_setpixel(FAR struct nxbe_window_s *wnd,
struct nxgl_rect_s rect;
int i;
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!wnd || !pos)
{
return;
graphics/nxbe/nxbe_setposition.c
+1 -1
View File
@@ -63,7 +63,7 @@ void nxbe_setposition(FAR struct nxbe_window_s *wnd,
struct nxgl_rect_s before;
struct nxgl_rect_s rect;
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!wnd)
{
return;
graphics/nxbe/nxbe_setsize.c
+1 -1
View File
@@ -62,7 +62,7 @@ void nxbe_setsize(FAR struct nxbe_window_s *wnd,
{
struct nxgl_rect_s bounds;
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!wnd)
{
return;
graphics/nxmu/nxmu_releasebkgd.c
+1 -1
View File
@@ -88,7 +88,7 @@ void nxmu_releasebkgd(FAR struct nxfe_state_s *fe)
{
FAR struct nxbe_state_s *be = &fe->be;
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!fe)
{
return;
graphics/nxmu/nxmu_requestbkgd.c
+1 -1
View File
@@ -92,7 +92,7 @@ void nxmu_requestbkgd(FAR struct nxfe_conn_s *conn,
FAR const struct nx_callback_s *cb,
FAR void *arg)
{
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!conn || !be || !cb)
{
errno = EINVAL;
graphics/nxmu/nxmu_sendclient.c
+1 -1
View File
@@ -92,7 +92,7 @@ int nxmu_sendclient(FAR struct nxfe_conn_s *conn, FAR const void *msg,
/* Sanity checking */
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!conn || !conn->swrmq)
{
set_errno(EINVAL);
graphics/nxmu/nxmu_sendclientwindow.c
+1 -1
View File
@@ -92,7 +92,7 @@ int nxmu_sendclientwindow(FAR struct nxbe_window_s *wnd, FAR const void *msg,
/* Sanity checking */
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!wnd || !wnd->conn)
{
set_errno(EINVAL);
graphics/nxmu/nxmu_server.c
+1 -1
View File
@@ -301,7 +301,7 @@ int nx_runinstance(FAR const char *mqname, FAR NX_DRIVERTYPE *dev)
/* Sanity checking */
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!mqname || !dev)
{
errno = EINVAL;
graphics/nxsu/nx_bitmap.c
+1 -1
View File
@@ -97,7 +97,7 @@ int nx_bitmap(NXWINDOW hwnd, FAR const struct nxgl_rect_s *dest,
FAR const void *src[CONFIG_NX_NPLANES],
FAR const struct nxgl_point_s *origin, unsigned int stride)
{
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!hwnd || !dest || !src || !origin)
{
errno = EINVAL;
graphics/nxsu/nx_closewindow.c
+1 -1
View File
@@ -86,7 +86,7 @@
int nx_closewindow(NXWINDOW hwnd)
{
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!hwnd)
{
errno = EINVAL;
graphics/nxsu/nx_constructwindow.c
+1 -1
View File
@@ -107,7 +107,7 @@ int nx_constructwindow(NXHANDLE handle, NXWINDOW hwnd,
FAR struct nxbe_window_s *wnd = (FAR struct nxbe_window_s *)hwnd;
FAR struct nxbe_state_s *be = &fe->be;
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!wnd)
{
set_errno(EINVAL);
graphics/nxsu/nx_fill.c
+1 -1
View File
@@ -90,7 +90,7 @@
int nx_fill(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
{
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!hwnd || !rect || !color)
{
errno = EINVAL;
graphics/nxsu/nx_filltrapezoid.c
+1 -1
View File
@@ -92,7 +92,7 @@ int nx_filltrapezoid(NXWINDOW hwnd, FAR const struct nxgl_rect_s *clip,
FAR const struct nxgl_trapezoid_s *trap,
nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
{
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!hwnd || !trap || !color)
{
errno = EINVAL;
graphics/nxsu/nx_getposition.c
+1 -1
View File
@@ -87,7 +87,7 @@
int nx_getposition(NXWINDOW hwnd)
{
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!hwnd)
{
errno = EINVAL;
graphics/nxsu/nx_getrectangle.c
+1 -1
View File
@@ -96,7 +96,7 @@ int nx_getrectangle(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
unsigned int plane, FAR uint8_t *dest,
unsigned int deststride)
{
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!hwnd || !rect || !dest)
{
set_errno(EINVAL);
graphics/nxsu/nx_lower.c
+1 -1
View File
@@ -85,7 +85,7 @@
int nx_lower(NXWINDOW hwnd)
{
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!hwnd)
{
errno = EINVAL;
graphics/nxsu/nx_move.c
+1 -1
View File
@@ -88,7 +88,7 @@
int nx_move(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
FAR const struct nxgl_point_s *offset)
{
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!hwnd)
{
errno = EINVAL;
graphics/nxsu/nx_open.c
+1 -1
View File
@@ -187,7 +187,7 @@ NXHANDLE nx_open(FAR NX_DRIVERTYPE *dev)
/* Sanity checking */
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!dev)
{
errno = EINVAL;
graphics/nxsu/nx_openwindow.c
+1 -1
View File
@@ -95,7 +95,7 @@ NXWINDOW nx_openwindow(NXHANDLE handle, FAR const struct nx_callback_s *cb,
FAR struct nxbe_window_s *wnd;
int ret;
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!handle || !cb)
{
errno = EINVAL;
graphics/nxsu/nx_raise.c
+1 -1
View File
@@ -85,7 +85,7 @@
int nx_raise(NXWINDOW hwnd)
{
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!hwnd)
{
errno = EINVAL;
graphics/nxsu/nx_releasebkgd.c
+1 -1
View File
@@ -88,7 +88,7 @@ int nx_releasebkgd(NXWINDOW hwnd)
{
FAR struct nxbe_window_s *bkgd = (FAR struct nxbe_window_s *)hwnd;
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!bkgd)
{
errno = EINVAL;
graphics/nxsu/nx_requestbkgd.c
+1 -1
View File
@@ -115,7 +115,7 @@ int nx_requestbkgd(NXHANDLE handle, FAR const struct nx_callback_s *cb,
FAR struct nxfe_state_s *fe = (FAR struct nxfe_state_s *)handle;
FAR struct nxbe_state_s *be = &fe->be;
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!fe || !cb)
{
errno = EINVAL;
graphics/nxsu/nx_setbgcolor.c
+1 -1
View File
@@ -89,7 +89,7 @@ int nx_setbgcolor(NXHANDLE handle,
{
FAR struct nxfe_state_s *fe = (FAR struct nxfe_state_s *)handle;
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!fe)
{
errno = EINVAL;
graphics/nxsu/nx_setpixel.c
+1 -1
View File
@@ -91,7 +91,7 @@
int nx_setpixel(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
{
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!hwnd || !pos || !color)
{
errno = EINVAL;
graphics/nxsu/nx_setposition.c
+1 -1
View File
@@ -86,7 +86,7 @@
int nx_setposition(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos)
{
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!hwnd || !pos)
{
errno = EINVAL;
graphics/nxsu/nx_setsize.c
+1 -1
View File
@@ -86,7 +86,7 @@
int nx_setsize(NXWINDOW hwnd, FAR const struct nxgl_size_s *size)
{
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!hwnd || !size)
{
errno = EINVAL;
graphics/nxsu/nxsu_redrawreq.c
+1 -1
View File
@@ -82,7 +82,7 @@ void nxfe_redrawreq(FAR struct nxbe_window_s *wnd, FAR const struct nxgl_rect_s
{
struct nxgl_rect_s relrect;
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!wnd)
{
return;
graphics/nxsu/nxsu_reportposition.c
+1 -1
View File
@@ -82,7 +82,7 @@ void nxfe_reportposition(FAR struct nxbe_window_s *wnd)
FAR struct nxbe_state_s *be;
struct nxgl_size_s size;
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!wnd)
{
return;
graphics/nxterm/Make.defs
+1 -1
View File
@@ -44,7 +44,7 @@ ifeq ($(CONFIG_NXTERM_NXKBDIN),y)
CSRCS += nxterm_kbdin.c
endif
ifeq ($(CONFIG_DEBUG),y)
ifeq ($(CONFIG_DEBUG_FEATURES),y)
CSRCS += nxterm_sem.c
endif
graphics/nxterm/nxterm.h
+2 -2
View File
@@ -141,7 +141,7 @@ struct nxterm_state_s
FAR struct nxterm_window_s wndo; /* Describes the window and font */
NXHANDLE font; /* The current font handle */
sem_t exclsem; /* Forces mutually exclusive access */
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
pid_t holder; /* Deadlock avoidance */
#endif
uint8_t minor; /* Device minor number */
@@ -206,7 +206,7 @@ extern const struct file_operations g_nxterm_drvrops;
****************************************************************************/
/* Semaphore helpers */
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
int nxterm_semwait(FAR struct nxterm_state_s *priv);
int nxterm_sempost(FAR struct nxterm_state_s *priv);
#else
graphics/nxterm/nxterm_kbdin.c
+1 -1
View File
@@ -337,7 +337,7 @@ int nxterm_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup)
struct pollfd **slot = (struct pollfd **)fds->priv;
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (!slot)
{
gdbg("ERROR: No slot\n");
graphics/nxterm/nxterm_register.c
+1 -1
View File
@@ -99,7 +99,7 @@ FAR struct nxterm_state_s *
memcpy(&priv->wndo, wndo, sizeof(struct nxterm_window_s));
sem_init(&priv->exclsem, 0, 1);
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
priv->holder = NO_HOLDER;
#endif
graphics/nxterm/nxterm_sem.c
+2 -2
View File
@@ -46,7 +46,7 @@
#include "nxterm.h"
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
/****************************************************************************
* Pre-processor Definitions
@@ -126,4 +126,4 @@ int nxterm_sempost(FAR struct nxterm_state_s *priv)
return sem_post(&priv->exclsem);
}
#endif /* CONFIG_DEBUG */
#endif /* CONFIG_DEBUG_FEATURES */
graphics/vnc/server/Kconfig
+1 -1
View File
@@ -130,7 +130,7 @@ config VNCSERVER_INBUFFER_SIZE
config VNCSERVER_DEBUG
bool "VNC Server debug"
default n
depends on DEBUG && !DEBUG_GRAPHICS
depends on DEBUG_FEATURES && !DEBUG_GRAPHICS
---help---
Normally VNC debug output is selected with DEBUG_GRAPHICS. The VNC
server server suupport this special option to enable GRAPHICS debug
graphics/vnc/server/vnc_fbdev.c
+8 -4
View File
@@ -45,10 +45,14 @@
#include <errno.h>
#if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
# undef CONFIG_DEBUG
# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_ERROR
# undef CONFIG_DEBUG_WARN
# undef CONFIG_DEBUG_INFO
# define CONFIG_DEBUG 1
# define CONFIG_DEBUG_INFO 1
# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_ERROR 1
# define CONFIG_DEBUG_WARN 1
# define CONFIG_DEBUG_INFO 1
# define CONFIG_DEBUG_GRAPHICS 1
#endif
#include <debug.h>
@@ -580,7 +584,7 @@ static inline int vnc_wait_connect(int display)
result = g_fbstartup[display].result;
if (result != -EBUSY)
{
#ifdef CONFIG_DEBUG
#ifdef CONFIG_DEBUG_FEATURES
if (result < 0)
{
DEBUGASSERT(g_vnc_sessions[display] == NULL);
graphics/vnc/server/vnc_negotiate.c
+7 -3
View File
@@ -45,10 +45,14 @@
#include <assert.h>
#if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
# undef CONFIG_DEBUG
# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_ERROR
# undef CONFIG_DEBUG_WARN
# undef CONFIG_DEBUG_INFO
# define CONFIG_DEBUG 1
# define CONFIG_DEBUG_INFO 1
# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_ERROR 1
# define CONFIG_DEBUG_WARN 1
# define CONFIG_DEBUG_INFO 1
# define CONFIG_DEBUG_GRAPHICS 1
#endif
#include <debug.h>
graphics/vnc/server/vnc_raw.c
+7 -3
View File
@@ -44,10 +44,14 @@
#include <errno.h>
#if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
# undef CONFIG_DEBUG
# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_ERROR
# undef CONFIG_DEBUG_WARN
# undef CONFIG_DEBUG_INFO
# define CONFIG_DEBUG 1
# define CONFIG_DEBUG_INFO 1
# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_ERROR 1
# define CONFIG_DEBUG_WARN 1
# define CONFIG_DEBUG_INFO 1
# define CONFIG_DEBUG_GRAPHICS 1
#endif
#include <debug.h>
graphics/vnc/server/vnc_receiver.c
+7 -3
View File
@@ -43,10 +43,14 @@
#include <errno.h>
#if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
# undef CONFIG_DEBUG
# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_ERROR
# undef CONFIG_DEBUG_WARN
# undef CONFIG_DEBUG_INFO
# define CONFIG_DEBUG 1
# define CONFIG_DEBUG_INFO 1
# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_ERROR 1
# define CONFIG_DEBUG_WARN 1
# define CONFIG_DEBUG_INFO 1
# define CONFIG_DEBUG_GRAPHICS 1
#endif
#include <debug.h>
graphics/vnc/server/vnc_rre.c
+7 -3
View File
@@ -44,10 +44,14 @@
#include <errno.h>
#if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
# undef CONFIG_DEBUG
# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_ERROR
# undef CONFIG_DEBUG_WARN
# undef CONFIG_DEBUG_INFO
# define CONFIG_DEBUG 1
# define CONFIG_DEBUG_INFO 1
# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_ERROR 1
# define CONFIG_DEBUG_WARN 1
# define CONFIG_DEBUG_INFO 1
# define CONFIG_DEBUG_GRAPHICS 1
#endif
#include <debug.h>
graphics/vnc/server/vnc_server.c
+7 -3
View File
@@ -48,10 +48,14 @@
#include <errno.h>
#if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
# undef CONFIG_DEBUG
# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_ERROR
# undef CONFIG_DEBUG_WARN
# undef CONFIG_DEBUG_INFO
# define CONFIG_DEBUG 1
# define CONFIG_DEBUG_INFO 1
# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_ERROR 1
# define CONFIG_DEBUG_WARN 1
# define CONFIG_DEBUG_INFO 1
# define CONFIG_DEBUG_GRAPHICS 1
#endif
#include <debug.h>
graphics/vnc/server/vnc_updater.c
+7 -3
View File
@@ -48,10 +48,14 @@
#include <errno.h>
#if defined(CONFIG_VNCSERVER_DEBUG) && !defined(CONFIG_DEBUG_GRAPHICS)
# undef CONFIG_DEBUG
# undef CONFIG_DEBUG_FEATURES
# undef CONFIG_DEBUG_ERROR
# undef CONFIG_DEBUG_WARN
# undef CONFIG_DEBUG_INFO
# define CONFIG_DEBUG 1
# define CONFIG_DEBUG_INFO 1
# define CONFIG_DEBUG_FEATURES 1
# define CONFIG_DEBUG_ERROR 1
# define CONFIG_DEBUG_WARN 1
# define CONFIG_DEBUG_INFO 1
# define CONFIG_DEBUG_GRAPHICS 1
#endif
#include <debug.h>