You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2026/04/11 13:39:33 UTC
(nuttx-apps) branch master updated (359137811 -> 96a003072)
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git
from 359137811 crypto/mbedtls: expose include paths as public
new 9d849adfa include/debug.h: Use <nuttx/debug.h> in apps
new 96a003072 include/debug.h: fix checkpatch fallout in touched apps files
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
builtin/exec_builtin.c | 2 +-
canutils/canlib/canlib_getbaud.c | 2 +-
canutils/canlib/canlib_getloopback.c | 2 +-
canutils/canlib/canlib_getsilent.c | 2 +-
canutils/canlib/canlib_setbaud.c | 2 +-
canutils/canlib/canlib_setloopback.c | 2 +-
canutils/canlib/canlib_setsilent.c | 2 +-
examples/adc/adc_main.c | 4 +-
examples/ajoystick/ajoy_main.c | 2 +-
examples/battery/batt_main.c | 4 +-
examples/bridge/bridge_main.c | 2 +-
examples/camera/camera_bkgd.c | 2 +-
examples/can/can_main.c | 2 +-
examples/capture/cap_main.c | 2 +-
examples/chat/chat_main.c | 2 +-
examples/configdata/configdata_main.c | 4 +-
examples/cordic/cordic_main.c | 2 +-
examples/discover/discover_main.c | 2 +-
examples/djoystick/djoy_main.c | 2 +-
examples/elf/main/elf_main.c | 2 +-
examples/etl/etl_main.cxx | 2 +-
examples/fbcon/fbcon_main.c | 5 +-
examples/flowc/flowc.h | 2 +-
examples/ft80x/ft80x.h | 2 +-
examples/ftpd/ftpd_main.c | 2 +-
examples/hall/hall_main.c | 2 +-
examples/helloxx/helloxx_main.cxx | 2 +-
examples/hts221_reader/hts221_reader_main.c | 2 +-
examples/i2schar/i2schar_main.c | 2 +-
examples/i2schar/i2schar_receiver.c | 2 +-
examples/i2schar/i2schar_transmitter.c | 2 +-
examples/igmp/igmp.c | 2 +-
examples/igmp/igmp.h | 2 +-
examples/ipcfg/ipcfg_main.c | 2 +-
examples/keyboard/kbd_main.c | 2 +-
examples/lis3dsh_reader/lis3dsh_reader_main.c | 2 +-
examples/lsm303_reader/lsm303_reader_main.c | 2 +-
examples/lsm6dsl_reader/lsm6dsl_reader_main.c | 2 +-
examples/lvglterm/lvglterm.c | 2 +-
examples/mld/mld.h | 2 +-
examples/mld/mld_main.c | 2 +-
examples/module/chardev/chardev.c | 2 +-
examples/module/main/module_main.c | 2 +-
examples/mtdpart/mtdpart_main.c | 2 +-
examples/mtdrwb/mtdrwb_main.c | 2 +-
examples/netloop/lo_listener.c | 2 +-
examples/netloop/lo_main.c | 2 +-
examples/nettest/nettest.h | 2 +-
examples/nettest/nettest_netinit.c | 2 +-
examples/nettest/nettest_target1.c | 2 +-
examples/nng_test/pubsub.c | 2 +-
examples/nrf24l01_btle/nrf24l01_btle.c | 2 +-
examples/nrf24l01_btle/nrf24l01_btle.h | 2 +-
examples/nrf24l01_term/nrf24l01_term.c | 2 +-
examples/nunchuck/nunchuck_main.c | 2 +-
examples/nx/nx_events.c | 56 ++++---
examples/nx/nx_kbdin.c | 85 +++++-----
examples/nx/nx_main.c | 162 +++++++++++-------
examples/nxdemo/nxdemo_bkgd.c | 2 +-
examples/nxdemo/nxdemo_main.c | 2 +-
examples/nxflat/nxflat_main.c | 2 +-
examples/nxhello/nxhello_bkgd.c | 74 +++++----
examples/nxhello/nxhello_main.c | 89 +++++-----
examples/nximage/nximage_bkgd.c | 63 +++----
examples/nximage/nximage_main.c | 93 ++++++-----
examples/nxlines/nxlines_bkgd.c | 2 +-
examples/nxlines/nxlines_main.c | 92 ++++++-----
examples/nxterm/nxterm_main.c | 2 +-
examples/nxterm/nxterm_toolbar.c | 11 +-
examples/nxterm/nxterm_wndo.c | 18 +-
examples/nxtext/nxtext_bkgd.c | 35 ++--
examples/nxtext/nxtext_main.c | 90 +++++-----
examples/nxtext/nxtext_popup.c | 2 +-
examples/nxtext/nxtext_putc.c | 90 +++++-----
examples/pf_ieee802154/pfieee802154.h | 2 +-
examples/poll/net_listener.c | 2 +-
examples/poll/net_reader.c | 2 +-
examples/poll/poll_listener.c | 2 +-
examples/poll/poll_main.c | 2 +-
examples/poll/select_listener.c | 2 +-
examples/posix_spawn/spawn_main.c | 2 +-
examples/powerled/powerled_main.c | 2 +-
examples/powermonitor/powermonitor_main.c | 2 +-
examples/pwfb/pwfb_events.c | 2 +-
examples/pwfb/pwfb_main.c | 65 ++++----
examples/pwlines/pwlines_events.c | 2 +-
examples/pwlines/pwlines_main.c | 71 ++++----
examples/pwlines/pwlines_update.c | 2 +-
examples/pwm/pwm_main.c | 4 +-
examples/qencoder/qe_main.c | 23 ++-
examples/random/random_main.c | 2 +-
examples/relays/relays_main.c | 2 +-
examples/rmtchar/rmtchar_common.c | 2 +-
examples/rmtchar/rmtchar_main.c | 4 +-
examples/rmtchar/rmtchar_receiver.c | 2 +-
examples/rmtchar/rmtchar_transmitter.c | 2 +-
examples/smps/smps_main.c | 2 +-
examples/sotest/main/sotest_main.c | 2 +-
examples/sx127x_demo/sx127x_demo.c | 2 +-
examples/tcpblaster/tcpblaster.h | 2 +-
examples/tcpblaster/tcpblaster_netinit.c | 2 +-
examples/tcpblaster/tcpblaster_target1.c | 2 +-
examples/tcpecho/tcpecho_main.c | 2 +-
examples/thttpd/thttpd_main.c | 2 +-
examples/touchscreen/tc_main.c | 2 +-
examples/udp/udp.h | 2 +-
examples/udp/udp_netinit.c | 2 +-
examples/udpblaster/udpblaster_target.c | 2 +-
examples/usbserial/usbserial_main.c | 2 +-
examples/usrsocktest/usrsocktest_daemon.c | 2 +-
examples/usrsocktest/usrsocktest_main.c | 2 +-
examples/watchdog/watchdog_main.c | 2 +-
examples/watcher/wdt.c | 2 +-
examples/webserver/webserver_main.c | 2 +-
examples/wgetjson/wgetjson_main.c | 2 +-
examples/ws2812/ws2812_main.c | 4 +-
examples/ws2812esp32rmt/ws2812esp32rmt_main.c | 2 +-
examples/xmlrpc/xmlrpc_main.c | 2 +-
examples/zerocross/zerocross_main.c | 2 +-
fsutils/flash_eraseall/flash_eraseall.c | 7 +-
fsutils/flashtool/flashtool_main.c | 2 +-
fsutils/inifile/inifile.c | 2 +-
fsutils/ipcfg/ipcfg.c | 2 +-
fsutils/ipcfg/ipcfg_binary.c | 12 +-
fsutils/ipcfg/ipcfg_text.c | 14 +-
fsutils/mkfatfs/configfat.c | 2 +-
fsutils/mkfatfs/mkfatfs.c | 2 +-
fsutils/mkfatfs/writefat.c | 6 +-
fsutils/mkgpt/mkgpt.c | 2 +-
graphics/ft80x/ft80x.h | 2 +-
graphics/input/generator/input_gen_ctx.c | 2 +-
graphics/input/generator/input_gen_dev.c | 2 +-
graphics/input/generator/input_gen_event.c | 2 +-
.../nxwidgets/UnitTests/CButton/cbutton_main.cxx | 2 +-
.../nxwidgets/UnitTests/CButton/cbuttontest.cxx | 2 +-
.../nxwidgets/UnitTests/CButton/cbuttontest.hxx | 2 +-
.../UnitTests/CButtonArray/cbuttonarray_main.cxx | 2 +-
.../UnitTests/CButtonArray/cbuttonarraytest.cxx | 2 +-
.../UnitTests/CButtonArray/cbuttonarraytest.hxx | 2 +-
.../UnitTests/CCheckBox/ccheckbox_main.cxx | 2 +-
.../UnitTests/CCheckBox/ccheckboxtest.cxx | 2 +-
.../UnitTests/CCheckBox/ccheckboxtest.hxx | 2 +-
.../UnitTests/CGlyphButton/cglyphbutton_main.cxx | 2 +-
.../UnitTests/CGlyphButton/cglyphbuttontest.cxx | 2 +-
.../UnitTests/CGlyphButton/cglyphbuttontest.hxx | 2 +-
.../cglyphsliderhorizontal_main.cxx | 2 +-
.../cglyphsliderhorizontaltest.cxx | 2 +-
.../cglyphsliderhorizontaltest.hxx | 2 +-
.../nxwidgets/UnitTests/CImage/cimage_main.cxx | 2 +-
graphics/nxwidgets/UnitTests/CImage/cimagetest.cxx | 2 +-
graphics/nxwidgets/UnitTests/CImage/cimagetest.hxx | 2 +-
.../nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx | 2 +-
.../nxwidgets/UnitTests/CKeypad/ckeypadtest.cxx | 2 +-
.../nxwidgets/UnitTests/CKeypad/ckeypadtest.hxx | 2 +-
.../nxwidgets/UnitTests/CLabel/clabel_main.cxx | 2 +-
graphics/nxwidgets/UnitTests/CLabel/clabeltest.cxx | 2 +-
graphics/nxwidgets/UnitTests/CLabel/clabeltest.hxx | 2 +-
.../UnitTests/CLatchButton/clatchbutton_main.cxx | 2 +-
.../UnitTests/CLatchButton/clatchbuttontest.cxx | 2 +-
.../UnitTests/CLatchButton/clatchbuttontest.hxx | 2 +-
.../CLatchButtonArray/clatchbuttonarray_main.cxx | 2 +-
.../CLatchButtonArray/clatchbuttonarraytest.cxx | 2 +-
.../CLatchButtonArray/clatchbuttonarraytest.hxx | 2 +-
.../nxwidgets/UnitTests/CListBox/clistbox_main.cxx | 2 +-
.../nxwidgets/UnitTests/CListBox/clistboxtest.cxx | 2 +-
.../nxwidgets/UnitTests/CListBox/clistboxtest.hxx | 2 +-
.../UnitTests/CProgressBar/cprogressbar_main.cxx | 2 +-
.../UnitTests/CProgressBar/cprogressbartest.cxx | 2 +-
.../UnitTests/CProgressBar/cprogressbartest.hxx | 2 +-
.../UnitTests/CRadioButton/cradiobutton_main.cxx | 2 +-
.../UnitTests/CRadioButton/cradiobuttontest.cxx | 2 +-
.../UnitTests/CRadioButton/cradiobuttontest.hxx | 2 +-
.../cscrollbarhorizontal_main.cxx | 2 +-
.../cscrollbarhorizontaltest.cxx | 2 +-
.../cscrollbarhorizontaltest.hxx | 2 +-
.../CScrollbarVertical/cscrollbarvertical_main.cxx | 2 +-
.../CScrollbarVertical/cscrollbarverticaltest.cxx | 2 +-
.../CScrollbarVertical/cscrollbarverticaltest.hxx | 2 +-
.../CSliderHorizonal/csliderhorizontal_main.cxx | 2 +-
.../CSliderHorizonal/csliderhorizontaltest.cxx | 2 +-
.../CSliderHorizonal/csliderhorizontaltest.hxx | 2 +-
.../CSliderVertical/cslidervertical_main.cxx | 2 +-
.../CSliderVertical/csliderverticaltest.cxx | 2 +-
.../CSliderVertical/csliderverticaltest.hxx | 2 +-
.../nxwidgets/UnitTests/CTextBox/ctextbox_main.cxx | 2 +-
.../nxwidgets/UnitTests/CTextBox/ctextboxtest.cxx | 2 +-
.../nxwidgets/UnitTests/CTextBox/ctextboxtest.hxx | 2 +-
graphics/nxwidgets/src/ccallback.cxx | 4 +-
graphics/nxwidgets/src/cgraphicsport.cxx | 2 +-
graphics/nxwidgets/src/cimage.cxx | 2 +-
graphics/nxwidgets/src/clabelgrid.cxx | 2 +-
graphics/nxwidgets/src/cnumericedit.cxx | 2 +-
graphics/nxwidgets/src/cnxserver.cxx | 2 +-
graphics/nxwidgets/src/cnxtimer.cxx | 2 +-
graphics/nxwidgets/src/cscaledbitmap.cxx | 4 +-
graphics/nxwidgets/src/cscrollingpanel.cxx | 2 +-
graphics/nxwidgets/src/cwidgetcontrol.cxx | 2 +-
graphics/nxwidgets/src/singletons.cxx | 2 +-
graphics/nxwm/src/ccalibration.cxx | 2 +-
graphics/nxwm/src/chexcalculator.cxx | 2 +-
graphics/nxwm/src/ckeyboard.cxx | 4 +-
graphics/nxwm/src/cmediaplayer.cxx | 2 +-
graphics/nxwm/src/cnxterm.cxx | 2 +-
graphics/nxwm/src/ctaskbar.cxx | 4 +-
graphics/nxwm/src/ctouchscreen.cxx | 6 +-
graphics/nxwm/src/cwindowmessenger.cxx | 2 +-
graphics/slcd/cslcd.cxx | 2 +-
graphics/tiff/tiff_addstrip.c | 27 ++-
graphics/tiff/tiff_finalize.c | 2 +-
graphics/tiff/tiff_initialize.c | 184 ++++++++++++++-------
graphics/tiff/tiff_utils.c | 41 +++--
graphics/twm4nx/apps/ccalibration.cxx | 2 +-
graphics/twm4nx/apps/cclock.cxx | 2 +-
graphics/twm4nx/apps/cnxterm.cxx | 2 +-
graphics/twm4nx/src/cmainmenu.cxx | 2 +-
include/graphics/nxwidgets/cscaledbitmap.hxx | 2 +-
include/graphics/nxwm/cstartwindow.hxx | 2 +-
include/graphics/twm4nx/apps/calib_config.hxx | 2 +-
include/graphics/twm4nx/apps/clock_config.hxx | 2 +-
include/graphics/twm4nx/apps/nxterm_config.hxx | 2 +-
include/graphics/twm4nx/ciconwidget.hxx | 2 +-
include/graphics/twm4nx/twm4nx_config.hxx | 2 +-
include/netutils/cmux.h | 2 +-
industry/foc/fixed16/foc_cordic.c | 2 +-
industry/foc/float/foc_cordic.c | 2 +-
interpreters/python/python_wrapper.c | 2 +-
logging/nxscope/nxscope.c | 4 +-
logging/nxscope/nxscope_chan.c | 2 +-
logging/nxscope/nxscope_idummy.c | 2 +-
logging/nxscope/nxscope_internals.c | 2 +-
logging/nxscope/nxscope_iser.c | 2 +-
logging/nxscope/nxscope_iudp.c | 2 +-
logging/nxscope/nxscope_pser.c | 4 +-
lte/alt1250/alt1250_dbg.h | 2 +-
lte/lapi/src/lapi_dbg.h | 2 +-
netutils/chat/chat.c | 2 +-
netutils/cmux/cmux.h | 2 +-
netutils/dhcp6c/dhcp6c.c | 2 +-
netutils/dhcpc/dhcpc.c | 2 +-
netutils/dhcpd/dhcpd.c | 2 +-
netutils/discover/discover.c | 2 +-
netutils/esp8266/esp8266.c | 2 +-
netutils/ftpc/ftpc_chmod.c | 2 +-
netutils/ftpc/ftpc_cmd.c | 2 +-
netutils/ftpc/ftpc_connect.c | 2 +-
netutils/ftpc/ftpc_getfile.c | 2 +-
netutils/ftpc/ftpc_getreply.c | 2 +-
netutils/ftpc/ftpc_idle.c | 2 +-
netutils/ftpc/ftpc_listdir.c | 2 +-
netutils/ftpc/ftpc_login.c | 2 +-
netutils/ftpc/ftpc_putfile.c | 2 +-
netutils/ftpc/ftpc_rpwd.c | 2 +-
netutils/ftpc/ftpc_socket.c | 2 +-
netutils/ftpc/ftpc_transfer.c | 2 +-
netutils/ftpd/ftpd.c | 2 +-
netutils/libcurl4nx/curl4nx_easy_cleanup.c | 2 +-
netutils/libcurl4nx/curl4nx_easy_duphandle.c | 2 +-
netutils/libcurl4nx/curl4nx_easy_escape.c | 2 +-
netutils/libcurl4nx/curl4nx_easy_getinfo.c | 2 +-
netutils/libcurl4nx/curl4nx_easy_init.c | 2 +-
netutils/libcurl4nx/curl4nx_easy_perform.c | 2 +-
netutils/libcurl4nx/curl4nx_easy_reset.c | 2 +-
netutils/libcurl4nx/curl4nx_easy_setopt.c | 2 +-
netutils/libcurl4nx/curl4nx_easy_unescape.c | 2 +-
netutils/mdns/mdnsd.c | 2 +-
netutils/netinit/netinit.c | 2 +-
netutils/netlib/netlib_checkhttpconnectivity.c | 2 +-
netutils/netlib/netlib_checkifconflict.c | 2 +-
netutils/netlib/netlib_checkifconnectivity.c | 2 +-
netutils/netlib/netlib_checkipconnectivity.c | 2 +-
netutils/netlib/netlib_getifstatistics.c | 2 +-
netutils/netlib/netlib_ipmsfilter.c | 2 +-
netutils/netlib/netlib_listenon.c | 2 +-
netutils/netlib/netlib_nodeaddrconv.c | 2 +-
netutils/netlib/netlib_obtainipv4addr.c | 2 +-
netutils/netlib/netlib_obtainipv6addr.c | 2 +-
netutils/netlib/netlib_server.c | 2 +-
netutils/ntpclient/ntpclient.c | 2 +-
netutils/pppd/ppp.h | 2 +-
netutils/pppd/pppd.c | 2 +-
netutils/ptpd/ptpd.c | 2 +-
netutils/telnetd/telnetd_daemon.c | 2 +-
netutils/tftpc/tftpc_get.c | 2 +-
netutils/tftpc/tftpc_packets.c | 2 +-
netutils/tftpc/tftpc_put.c | 2 +-
netutils/thttpd/fdwatch.c | 2 +-
netutils/thttpd/libhttpd.c | 2 +-
netutils/thttpd/tdate_parse.c | 2 +-
netutils/thttpd/thttpd.c | 2 +-
netutils/thttpd/thttpd_alloc.c | 2 +-
netutils/thttpd/thttpd_cgi.c | 4 +-
netutils/thttpd/timers.c | 2 +-
netutils/webclient/webclient.c | 4 +-
netutils/webserver/httpd.c | 2 +-
netutils/webserver/httpd_dirlist.c | 2 +-
netutils/webserver/httpd_mmap.c | 2 +-
netutils/webserver/httpd_sendfile.c | 2 +-
nshlib/nsh_altconsole.c | 2 +-
nshlib/nsh_codeccmd.c | 2 +-
nshlib/nsh_console.c | 2 +-
nshlib/nsh_fscmds.c | 2 +-
nshlib/nsh_mntcmds.c | 2 +-
nshlib/nsh_netcmds.c | 2 +-
nshlib/nsh_parse.c | 2 +-
nshlib/nsh_telnetd.c | 2 +-
nshlib/nsh_usbconsole.c | 2 +-
nshlib/nsh_usbtrace.c | 2 +-
platform/mikroe-stm32f4/mikroe_configdata.c | 4 +-
system/cdcacm/sercon_main.c | 2 +-
system/cdcacm/serdis_main.c | 2 +-
system/cle/cle.c | 2 +-
system/composite/composite_main.c | 2 +-
system/cu/cu_main.c | 2 +-
system/dd/dd_main.c | 2 +-
system/dhcp6c/renew6_main.c | 2 +-
system/i2c/i2c_main.c | 4 +-
system/nxcamera/nxcamera.c | 118 ++++++-------
system/nxlooper/nxlooper.c | 2 +-
system/nxplayer/nxplayer.c | 2 +-
system/nxplayer/nxplayer_common.c | 2 +-
system/nxrecorder/nxrecorder.c | 2 +-
system/nxrecorder/nxrecorder_common.c | 2 +-
system/popen/popen.c | 2 +-
system/readline/readline_common.c | 2 +-
system/spi/spi_main.c | 2 +-
system/system/system.c | 2 +-
system/tee/tee.c | 2 +-
system/termcurses/tcurses_vt100.c | 2 +-
system/termcurses/termcurses.c | 2 +-
system/ubloxmodem/ubloxmodem_main.c | 2 +-
system/usbmsc/usbmsc_main.c | 2 +-
system/vi/vi.c | 2 +-
system/zmodem/zm.h | 6 +-
testing/drivers/drivertest/drivertest_audio.c | 2 +-
.../drivers/drivertest/drivertest_framebuffer.c | 2 +-
testing/drivers/drivertest/drivertest_lcd.c | 2 +-
testing/drivers/drivertest/drivertest_pwm.c | 4 +-
testing/drivers/drivertest/drivertest_watchdog.c | 2 +-
testing/drivers/nand_sim/nand_sim_main.c | 6 +-
testing/fs/epoll/epoll.c | 10 +-
testing/fs/mtd_config_fs/mtd_config_fs_test_main.c | 2 +-
testing/fs/nxffs/nxffs_main.c | 4 +-
testing/fs/smart/smart_main.c | 4 +-
testing/libc/arch_libc/arch_libc_test_main.c | 2 +-
testing/libc/scanftest/scanftest_main.c | 2 +-
testing/mm/memstress/memorystress_main.c | 2 +-
testing/ostest/signest.c | 4 +-
wireless/bluetooth/nimble/include/logcfg/logcfg.h | 2 +-
wireless/gs2200m/gs2200m_main.c | 2 +-
wireless/ieee802154/i8shark/i8shark_main.c | 2 +-
wireless/wapi/src/driver_wext.c | 2 +-
wireless/wapi/src/util.h | 2 +-
352 files changed, 1242 insertions(+), 1003 deletions(-)
(nuttx-apps) 01/02: include/debug.h: Use in apps
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git
commit 9d849adfabac2a33ef1ee73ecfdc3648eb5f7454
Author: Piyush Patle <pi...@gmail.com>
AuthorDate: Wed Apr 1 16:29:59 2026 +0530
include/debug.h: Use <nuttx/debug.h> in apps
Replace app-side includes of <debug.h> with <nuttx/debug.h> to use the
header from the NuttX tree explicitly after the header move.
Signed-off-by: Piyush Patle <pi...@gmail.com>
---
builtin/exec_builtin.c | 2 +-
canutils/canlib/canlib_getbaud.c | 2 +-
canutils/canlib/canlib_getloopback.c | 2 +-
canutils/canlib/canlib_getsilent.c | 2 +-
canutils/canlib/canlib_setbaud.c | 2 +-
canutils/canlib/canlib_setloopback.c | 2 +-
canutils/canlib/canlib_setsilent.c | 2 +-
examples/adc/adc_main.c | 4 ++--
examples/ajoystick/ajoy_main.c | 2 +-
examples/battery/batt_main.c | 4 ++--
examples/bridge/bridge_main.c | 2 +-
examples/camera/camera_bkgd.c | 2 +-
examples/can/can_main.c | 2 +-
examples/capture/cap_main.c | 2 +-
examples/chat/chat_main.c | 2 +-
examples/configdata/configdata_main.c | 4 ++--
examples/cordic/cordic_main.c | 2 +-
examples/discover/discover_main.c | 2 +-
examples/djoystick/djoy_main.c | 2 +-
examples/elf/main/elf_main.c | 2 +-
examples/etl/etl_main.cxx | 2 +-
examples/fbcon/fbcon_main.c | 5 ++---
examples/flowc/flowc.h | 2 +-
examples/ft80x/ft80x.h | 2 +-
examples/ftpd/ftpd_main.c | 2 +-
examples/hall/hall_main.c | 2 +-
examples/helloxx/helloxx_main.cxx | 2 +-
examples/hts221_reader/hts221_reader_main.c | 2 +-
examples/i2schar/i2schar_main.c | 2 +-
examples/i2schar/i2schar_receiver.c | 2 +-
examples/i2schar/i2schar_transmitter.c | 2 +-
examples/igmp/igmp.c | 2 +-
examples/igmp/igmp.h | 2 +-
examples/ipcfg/ipcfg_main.c | 2 +-
examples/keyboard/kbd_main.c | 2 +-
examples/lis3dsh_reader/lis3dsh_reader_main.c | 2 +-
examples/lsm303_reader/lsm303_reader_main.c | 2 +-
examples/lsm6dsl_reader/lsm6dsl_reader_main.c | 2 +-
examples/lvglterm/lvglterm.c | 2 +-
examples/mld/mld.h | 2 +-
examples/mld/mld_main.c | 2 +-
examples/module/chardev/chardev.c | 2 +-
examples/module/main/module_main.c | 2 +-
examples/mtdpart/mtdpart_main.c | 2 +-
examples/mtdrwb/mtdrwb_main.c | 2 +-
examples/netloop/lo_listener.c | 2 +-
examples/netloop/lo_main.c | 2 +-
examples/nettest/nettest.h | 2 +-
examples/nettest/nettest_netinit.c | 2 +-
examples/nettest/nettest_target1.c | 2 +-
examples/nng_test/pubsub.c | 2 +-
examples/nrf24l01_btle/nrf24l01_btle.c | 2 +-
examples/nrf24l01_btle/nrf24l01_btle.h | 2 +-
examples/nrf24l01_term/nrf24l01_term.c | 2 +-
examples/nunchuck/nunchuck_main.c | 2 +-
examples/nx/nx_events.c | 2 +-
examples/nx/nx_kbdin.c | 2 +-
examples/nx/nx_main.c | 2 +-
examples/nxdemo/nxdemo_bkgd.c | 2 +-
examples/nxdemo/nxdemo_main.c | 2 +-
examples/nxflat/nxflat_main.c | 2 +-
examples/nxhello/nxhello_bkgd.c | 2 +-
examples/nxhello/nxhello_main.c | 2 +-
examples/nximage/nximage_bkgd.c | 2 +-
examples/nximage/nximage_main.c | 2 +-
examples/nxlines/nxlines_bkgd.c | 2 +-
examples/nxlines/nxlines_main.c | 2 +-
examples/nxterm/nxterm_main.c | 2 +-
examples/nxterm/nxterm_toolbar.c | 2 +-
examples/nxterm/nxterm_wndo.c | 2 +-
examples/nxtext/nxtext_bkgd.c | 2 +-
examples/nxtext/nxtext_main.c | 2 +-
examples/nxtext/nxtext_popup.c | 2 +-
examples/nxtext/nxtext_putc.c | 4 ++--
examples/pf_ieee802154/pfieee802154.h | 2 +-
examples/poll/net_listener.c | 2 +-
examples/poll/net_reader.c | 2 +-
examples/poll/poll_listener.c | 2 +-
examples/poll/poll_main.c | 2 +-
examples/poll/select_listener.c | 2 +-
examples/posix_spawn/spawn_main.c | 2 +-
examples/powerled/powerled_main.c | 2 +-
examples/powermonitor/powermonitor_main.c | 2 +-
examples/pwfb/pwfb_events.c | 2 +-
examples/pwfb/pwfb_main.c | 2 +-
examples/pwlines/pwlines_events.c | 2 +-
examples/pwlines/pwlines_main.c | 2 +-
examples/pwlines/pwlines_update.c | 2 +-
examples/pwm/pwm_main.c | 4 ++--
examples/qencoder/qe_main.c | 4 ++--
examples/random/random_main.c | 2 +-
examples/relays/relays_main.c | 2 +-
examples/rmtchar/rmtchar_common.c | 2 +-
examples/rmtchar/rmtchar_main.c | 4 ++--
examples/rmtchar/rmtchar_receiver.c | 2 +-
examples/rmtchar/rmtchar_transmitter.c | 2 +-
examples/smps/smps_main.c | 2 +-
examples/sotest/main/sotest_main.c | 2 +-
examples/sx127x_demo/sx127x_demo.c | 2 +-
examples/tcpblaster/tcpblaster.h | 2 +-
examples/tcpblaster/tcpblaster_netinit.c | 2 +-
examples/tcpblaster/tcpblaster_target1.c | 2 +-
examples/tcpecho/tcpecho_main.c | 2 +-
examples/thttpd/thttpd_main.c | 2 +-
examples/touchscreen/tc_main.c | 2 +-
examples/udp/udp.h | 2 +-
examples/udp/udp_netinit.c | 2 +-
examples/udpblaster/udpblaster_target.c | 2 +-
examples/usbserial/usbserial_main.c | 2 +-
examples/usrsocktest/usrsocktest_daemon.c | 2 +-
examples/usrsocktest/usrsocktest_main.c | 2 +-
examples/watchdog/watchdog_main.c | 2 +-
examples/watcher/wdt.c | 2 +-
examples/webserver/webserver_main.c | 2 +-
examples/wgetjson/wgetjson_main.c | 2 +-
examples/ws2812/ws2812_main.c | 4 ++--
examples/ws2812esp32rmt/ws2812esp32rmt_main.c | 2 +-
examples/xmlrpc/xmlrpc_main.c | 2 +-
examples/zerocross/zerocross_main.c | 2 +-
fsutils/flash_eraseall/flash_eraseall.c | 2 +-
fsutils/flashtool/flashtool_main.c | 2 +-
fsutils/inifile/inifile.c | 2 +-
fsutils/ipcfg/ipcfg.c | 2 +-
fsutils/ipcfg/ipcfg_binary.c | 12 ++++++------
fsutils/ipcfg/ipcfg_text.c | 14 +++++++-------
fsutils/mkfatfs/configfat.c | 2 +-
fsutils/mkfatfs/mkfatfs.c | 2 +-
fsutils/mkfatfs/writefat.c | 6 +++---
fsutils/mkgpt/mkgpt.c | 2 +-
graphics/ft80x/ft80x.h | 2 +-
graphics/input/generator/input_gen_ctx.c | 2 +-
graphics/input/generator/input_gen_dev.c | 2 +-
graphics/input/generator/input_gen_event.c | 2 +-
graphics/nxwidgets/UnitTests/CButton/cbutton_main.cxx | 2 +-
graphics/nxwidgets/UnitTests/CButton/cbuttontest.cxx | 2 +-
graphics/nxwidgets/UnitTests/CButton/cbuttontest.hxx | 2 +-
.../nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx | 2 +-
.../nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx | 2 +-
.../nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx | 2 +-
graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx | 2 +-
graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.cxx | 2 +-
graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.hxx | 2 +-
.../nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx | 2 +-
.../nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx | 2 +-
.../nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx | 2 +-
.../CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx | 2 +-
.../CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx | 2 +-
.../CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx | 2 +-
graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx | 2 +-
graphics/nxwidgets/UnitTests/CImage/cimagetest.cxx | 2 +-
graphics/nxwidgets/UnitTests/CImage/cimagetest.hxx | 2 +-
graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx | 2 +-
graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.cxx | 2 +-
graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.hxx | 2 +-
graphics/nxwidgets/UnitTests/CLabel/clabel_main.cxx | 2 +-
graphics/nxwidgets/UnitTests/CLabel/clabeltest.cxx | 2 +-
graphics/nxwidgets/UnitTests/CLabel/clabeltest.hxx | 2 +-
.../nxwidgets/UnitTests/CLatchButton/clatchbutton_main.cxx | 2 +-
.../nxwidgets/UnitTests/CLatchButton/clatchbuttontest.cxx | 2 +-
.../nxwidgets/UnitTests/CLatchButton/clatchbuttontest.hxx | 2 +-
.../UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx | 2 +-
.../UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx | 2 +-
.../UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx | 2 +-
graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx | 2 +-
graphics/nxwidgets/UnitTests/CListBox/clistboxtest.cxx | 2 +-
graphics/nxwidgets/UnitTests/CListBox/clistboxtest.hxx | 2 +-
.../nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx | 2 +-
.../nxwidgets/UnitTests/CProgressBar/cprogressbartest.cxx | 2 +-
.../nxwidgets/UnitTests/CProgressBar/cprogressbartest.hxx | 2 +-
.../nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx | 2 +-
.../nxwidgets/UnitTests/CRadioButton/cradiobuttontest.cxx | 2 +-
.../nxwidgets/UnitTests/CRadioButton/cradiobuttontest.hxx | 2 +-
.../CScrollbarHorizontal/cscrollbarhorizontal_main.cxx | 2 +-
.../CScrollbarHorizontal/cscrollbarhorizontaltest.cxx | 2 +-
.../CScrollbarHorizontal/cscrollbarhorizontaltest.hxx | 2 +-
.../CScrollbarVertical/cscrollbarvertical_main.cxx | 2 +-
.../CScrollbarVertical/cscrollbarverticaltest.cxx | 2 +-
.../CScrollbarVertical/cscrollbarverticaltest.hxx | 2 +-
.../UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx | 2 +-
.../UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx | 2 +-
.../UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx | 2 +-
.../UnitTests/CSliderVertical/cslidervertical_main.cxx | 2 +-
.../UnitTests/CSliderVertical/csliderverticaltest.cxx | 2 +-
.../UnitTests/CSliderVertical/csliderverticaltest.hxx | 2 +-
graphics/nxwidgets/UnitTests/CTextBox/ctextbox_main.cxx | 2 +-
graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.cxx | 2 +-
graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.hxx | 2 +-
graphics/nxwidgets/src/ccallback.cxx | 4 ++--
graphics/nxwidgets/src/cgraphicsport.cxx | 2 +-
graphics/nxwidgets/src/cimage.cxx | 2 +-
graphics/nxwidgets/src/clabelgrid.cxx | 2 +-
graphics/nxwidgets/src/cnumericedit.cxx | 2 +-
graphics/nxwidgets/src/cnxserver.cxx | 2 +-
graphics/nxwidgets/src/cnxtimer.cxx | 2 +-
graphics/nxwidgets/src/cscaledbitmap.cxx | 4 ++--
graphics/nxwidgets/src/cscrollingpanel.cxx | 2 +-
graphics/nxwidgets/src/cwidgetcontrol.cxx | 2 +-
graphics/nxwidgets/src/singletons.cxx | 2 +-
graphics/nxwm/src/ccalibration.cxx | 2 +-
graphics/nxwm/src/chexcalculator.cxx | 2 +-
graphics/nxwm/src/ckeyboard.cxx | 4 ++--
graphics/nxwm/src/cmediaplayer.cxx | 2 +-
graphics/nxwm/src/cnxterm.cxx | 2 +-
graphics/nxwm/src/ctaskbar.cxx | 4 ++--
graphics/nxwm/src/ctouchscreen.cxx | 6 +++---
graphics/nxwm/src/cwindowmessenger.cxx | 2 +-
graphics/slcd/cslcd.cxx | 2 +-
graphics/tiff/tiff_addstrip.c | 2 +-
graphics/tiff/tiff_finalize.c | 2 +-
graphics/tiff/tiff_initialize.c | 10 +++++-----
graphics/tiff/tiff_utils.c | 4 ++--
graphics/twm4nx/apps/ccalibration.cxx | 2 +-
graphics/twm4nx/apps/cclock.cxx | 2 +-
graphics/twm4nx/apps/cnxterm.cxx | 2 +-
graphics/twm4nx/src/cmainmenu.cxx | 2 +-
include/graphics/nxwidgets/cscaledbitmap.hxx | 2 +-
include/graphics/nxwm/cstartwindow.hxx | 2 +-
include/graphics/twm4nx/apps/calib_config.hxx | 2 +-
include/graphics/twm4nx/apps/clock_config.hxx | 2 +-
include/graphics/twm4nx/apps/nxterm_config.hxx | 2 +-
include/graphics/twm4nx/ciconwidget.hxx | 2 +-
include/graphics/twm4nx/twm4nx_config.hxx | 2 +-
include/netutils/cmux.h | 2 +-
industry/foc/fixed16/foc_cordic.c | 2 +-
industry/foc/float/foc_cordic.c | 2 +-
interpreters/python/python_wrapper.c | 2 +-
logging/nxscope/nxscope.c | 4 ++--
logging/nxscope/nxscope_chan.c | 2 +-
logging/nxscope/nxscope_idummy.c | 2 +-
logging/nxscope/nxscope_internals.c | 2 +-
logging/nxscope/nxscope_iser.c | 2 +-
logging/nxscope/nxscope_iudp.c | 2 +-
logging/nxscope/nxscope_pser.c | 4 ++--
lte/alt1250/alt1250_dbg.h | 2 +-
lte/lapi/src/lapi_dbg.h | 2 +-
netutils/chat/chat.c | 2 +-
netutils/cmux/cmux.h | 2 +-
netutils/dhcp6c/dhcp6c.c | 2 +-
netutils/dhcpc/dhcpc.c | 2 +-
netutils/dhcpd/dhcpd.c | 2 +-
netutils/discover/discover.c | 2 +-
netutils/esp8266/esp8266.c | 2 +-
netutils/ftpc/ftpc_chmod.c | 2 +-
netutils/ftpc/ftpc_cmd.c | 2 +-
netutils/ftpc/ftpc_connect.c | 2 +-
netutils/ftpc/ftpc_getfile.c | 2 +-
netutils/ftpc/ftpc_getreply.c | 2 +-
netutils/ftpc/ftpc_idle.c | 2 +-
netutils/ftpc/ftpc_listdir.c | 2 +-
netutils/ftpc/ftpc_login.c | 2 +-
netutils/ftpc/ftpc_putfile.c | 2 +-
netutils/ftpc/ftpc_rpwd.c | 2 +-
netutils/ftpc/ftpc_socket.c | 2 +-
netutils/ftpc/ftpc_transfer.c | 2 +-
netutils/ftpd/ftpd.c | 2 +-
netutils/libcurl4nx/curl4nx_easy_cleanup.c | 2 +-
netutils/libcurl4nx/curl4nx_easy_duphandle.c | 2 +-
netutils/libcurl4nx/curl4nx_easy_escape.c | 2 +-
netutils/libcurl4nx/curl4nx_easy_getinfo.c | 2 +-
netutils/libcurl4nx/curl4nx_easy_init.c | 2 +-
netutils/libcurl4nx/curl4nx_easy_perform.c | 2 +-
netutils/libcurl4nx/curl4nx_easy_reset.c | 2 +-
netutils/libcurl4nx/curl4nx_easy_setopt.c | 2 +-
netutils/libcurl4nx/curl4nx_easy_unescape.c | 2 +-
netutils/mdns/mdnsd.c | 2 +-
netutils/netinit/netinit.c | 2 +-
netutils/netlib/netlib_checkhttpconnectivity.c | 2 +-
netutils/netlib/netlib_checkifconflict.c | 2 +-
netutils/netlib/netlib_checkifconnectivity.c | 2 +-
netutils/netlib/netlib_checkipconnectivity.c | 2 +-
netutils/netlib/netlib_getifstatistics.c | 2 +-
netutils/netlib/netlib_ipmsfilter.c | 2 +-
netutils/netlib/netlib_listenon.c | 2 +-
netutils/netlib/netlib_nodeaddrconv.c | 2 +-
netutils/netlib/netlib_obtainipv4addr.c | 2 +-
netutils/netlib/netlib_obtainipv6addr.c | 2 +-
netutils/netlib/netlib_server.c | 2 +-
netutils/ntpclient/ntpclient.c | 2 +-
netutils/pppd/ppp.h | 2 +-
netutils/pppd/pppd.c | 2 +-
netutils/ptpd/ptpd.c | 2 +-
netutils/telnetd/telnetd_daemon.c | 2 +-
netutils/tftpc/tftpc_get.c | 2 +-
netutils/tftpc/tftpc_packets.c | 2 +-
netutils/tftpc/tftpc_put.c | 2 +-
netutils/thttpd/fdwatch.c | 2 +-
netutils/thttpd/libhttpd.c | 2 +-
netutils/thttpd/tdate_parse.c | 2 +-
netutils/thttpd/thttpd.c | 2 +-
netutils/thttpd/thttpd_alloc.c | 2 +-
netutils/thttpd/thttpd_cgi.c | 4 ++--
netutils/thttpd/timers.c | 2 +-
netutils/webclient/webclient.c | 4 ++--
netutils/webserver/httpd.c | 2 +-
netutils/webserver/httpd_dirlist.c | 2 +-
netutils/webserver/httpd_mmap.c | 2 +-
netutils/webserver/httpd_sendfile.c | 2 +-
nshlib/nsh_altconsole.c | 2 +-
nshlib/nsh_codeccmd.c | 2 +-
nshlib/nsh_console.c | 2 +-
nshlib/nsh_fscmds.c | 2 +-
nshlib/nsh_mntcmds.c | 2 +-
nshlib/nsh_netcmds.c | 2 +-
nshlib/nsh_parse.c | 2 +-
nshlib/nsh_telnetd.c | 2 +-
nshlib/nsh_usbconsole.c | 2 +-
nshlib/nsh_usbtrace.c | 2 +-
platform/mikroe-stm32f4/mikroe_configdata.c | 4 ++--
system/cdcacm/sercon_main.c | 2 +-
system/cdcacm/serdis_main.c | 2 +-
system/cle/cle.c | 2 +-
system/composite/composite_main.c | 2 +-
system/cu/cu_main.c | 2 +-
system/dd/dd_main.c | 2 +-
system/dhcp6c/renew6_main.c | 2 +-
system/i2c/i2c_main.c | 4 ++--
system/nxcamera/nxcamera.c | 2 +-
system/nxlooper/nxlooper.c | 2 +-
system/nxplayer/nxplayer.c | 2 +-
system/nxplayer/nxplayer_common.c | 2 +-
system/nxrecorder/nxrecorder.c | 2 +-
system/nxrecorder/nxrecorder_common.c | 2 +-
system/popen/popen.c | 2 +-
system/readline/readline_common.c | 2 +-
system/spi/spi_main.c | 2 +-
system/system/system.c | 2 +-
system/tee/tee.c | 2 +-
system/termcurses/tcurses_vt100.c | 2 +-
system/termcurses/termcurses.c | 2 +-
system/ubloxmodem/ubloxmodem_main.c | 2 +-
system/usbmsc/usbmsc_main.c | 2 +-
system/vi/vi.c | 2 +-
system/zmodem/zm.h | 6 +++---
testing/drivers/drivertest/drivertest_audio.c | 2 +-
testing/drivers/drivertest/drivertest_framebuffer.c | 2 +-
testing/drivers/drivertest/drivertest_lcd.c | 2 +-
testing/drivers/drivertest/drivertest_pwm.c | 4 ++--
testing/drivers/drivertest/drivertest_watchdog.c | 2 +-
testing/drivers/nand_sim/nand_sim_main.c | 6 +++---
testing/fs/epoll/epoll.c | 10 +++++-----
testing/fs/mtd_config_fs/mtd_config_fs_test_main.c | 2 +-
testing/fs/nxffs/nxffs_main.c | 4 ++--
testing/fs/smart/smart_main.c | 4 ++--
testing/libc/arch_libc/arch_libc_test_main.c | 2 +-
testing/libc/scanftest/scanftest_main.c | 2 +-
testing/mm/memstress/memorystress_main.c | 2 +-
testing/ostest/signest.c | 4 ++--
wireless/bluetooth/nimble/include/logcfg/logcfg.h | 2 +-
wireless/gs2200m/gs2200m_main.c | 2 +-
wireless/ieee802154/i8shark/i8shark_main.c | 2 +-
wireless/wapi/src/driver_wext.c | 2 +-
wireless/wapi/src/util.h | 2 +-
352 files changed, 403 insertions(+), 404 deletions(-)
diff --git a/builtin/exec_builtin.c b/builtin/exec_builtin.c
index 325d594cf..b87133243 100644
--- a/builtin/exec_builtin.c
+++ b/builtin/exec_builtin.c
@@ -29,7 +29,7 @@
#include <spawn.h>
#include <fcntl.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "builtin/builtin.h"
diff --git a/canutils/canlib/canlib_getbaud.c b/canutils/canlib/canlib_getbaud.c
index af123edea..61ebb4de9 100644
--- a/canutils/canlib/canlib_getbaud.c
+++ b/canutils/canlib/canlib_getbaud.c
@@ -25,7 +25,7 @@
****************************************************************************/
#include <sys/ioctl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <nuttx/can/can.h>
diff --git a/canutils/canlib/canlib_getloopback.c b/canutils/canlib/canlib_getloopback.c
index 443161e96..b931301d5 100644
--- a/canutils/canlib/canlib_getloopback.c
+++ b/canutils/canlib/canlib_getloopback.c
@@ -25,7 +25,7 @@
****************************************************************************/
#include <sys/ioctl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <nuttx/can/can.h>
diff --git a/canutils/canlib/canlib_getsilent.c b/canutils/canlib/canlib_getsilent.c
index 868072eb1..18e2b0637 100644
--- a/canutils/canlib/canlib_getsilent.c
+++ b/canutils/canlib/canlib_getsilent.c
@@ -25,7 +25,7 @@
****************************************************************************/
#include <sys/ioctl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <nuttx/can/can.h>
diff --git a/canutils/canlib/canlib_setbaud.c b/canutils/canlib/canlib_setbaud.c
index b3ee68f26..f8bbb23ff 100644
--- a/canutils/canlib/canlib_setbaud.c
+++ b/canutils/canlib/canlib_setbaud.c
@@ -25,7 +25,7 @@
****************************************************************************/
#include <sys/ioctl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <nuttx/can/can.h>
diff --git a/canutils/canlib/canlib_setloopback.c b/canutils/canlib/canlib_setloopback.c
index 7e78b1a34..18164210c 100644
--- a/canutils/canlib/canlib_setloopback.c
+++ b/canutils/canlib/canlib_setloopback.c
@@ -25,7 +25,7 @@
****************************************************************************/
#include <sys/ioctl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <nuttx/can/can.h>
diff --git a/canutils/canlib/canlib_setsilent.c b/canutils/canlib/canlib_setsilent.c
index 0900f9261..bf8ef1722 100644
--- a/canutils/canlib/canlib_setsilent.c
+++ b/canutils/canlib/canlib_setsilent.c
@@ -25,7 +25,7 @@
****************************************************************************/
#include <sys/ioctl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <nuttx/can/can.h>
diff --git a/examples/adc/adc_main.c b/examples/adc/adc_main.c
index 68f4f1955..e5678e123 100644
--- a/examples/adc/adc_main.c
+++ b/examples/adc/adc_main.c
@@ -35,7 +35,7 @@
#include <string.h>
#include <fcntl.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/analog/adc.h>
#include <nuttx/analog/ioctl.h>
@@ -95,7 +95,7 @@ static void adc_help(FAR struct adc_state_s *adc)
printf("Usage: adc [OPTIONS]\n");
printf("\nArguments are \"sticky\". "
"For example, once the ADC device is\n");
- printf("specified, that device will be re-used until it is changed.\n");
+ printf("specified, that device will be reused until it is changed.\n");
printf("\n\"sticky\" OPTIONS include:\n");
printf(" [-p devpath] selects the ADC device. "
"Default: %s Current: %s\n",
diff --git a/examples/ajoystick/ajoy_main.c b/examples/ajoystick/ajoy_main.c
index 178608b2f..8a58b66a9 100644
--- a/examples/ajoystick/ajoy_main.c
+++ b/examples/ajoystick/ajoy_main.c
@@ -33,7 +33,7 @@
#include <fcntl.h>
#include <errno.h>
#include <fixedmath.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <unistd.h>
#include <nuttx/input/ajoystick.h>
diff --git a/examples/battery/batt_main.c b/examples/battery/batt_main.c
index d88a2885f..384d78147 100644
--- a/examples/battery/batt_main.c
+++ b/examples/battery/batt_main.c
@@ -31,7 +31,7 @@
#include <stdlib.h>
#include <fcntl.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/power/battery_ioctl.h>
#include <nuttx/power/battery_charger.h>
@@ -117,7 +117,7 @@ void health_report(int health)
case BATTERY_HEALTH_GOOD:
{
- printf("Battery is in good condiction!\n");
+ printf("Battery is in good condition!\n");
}
break;
diff --git a/examples/bridge/bridge_main.c b/examples/bridge/bridge_main.c
index 8d2165514..183ccedbe 100644
--- a/examples/bridge/bridge_main.c
+++ b/examples/bridge/bridge_main.c
@@ -29,7 +29,7 @@
#include <stdlib.h>
#include <sched.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <unistd.h>
#include <net/if.h>
diff --git a/examples/camera/camera_bkgd.c b/examples/camera/camera_bkgd.c
index e53010dad..a0c0bd2fa 100644
--- a/examples/camera/camera_bkgd.c
+++ b/examples/camera/camera_bkgd.c
@@ -32,7 +32,7 @@
#include <stdlib.h>
#include <semaphore.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <sys/boardctl.h>
#include <arch/board/board.h>
diff --git a/examples/can/can_main.c b/examples/can/can_main.c
index b62f565fe..422458a33 100644
--- a/examples/can/can_main.c
+++ b/examples/can/can_main.c
@@ -35,7 +35,7 @@
#include <string.h>
#include <fcntl.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/can/can.h>
diff --git a/examples/capture/cap_main.c b/examples/capture/cap_main.c
index 2ba238a60..1c44e0383 100644
--- a/examples/capture/cap_main.c
+++ b/examples/capture/cap_main.c
@@ -37,7 +37,7 @@
#include <limits.h>
#include <inttypes.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/timers/capture.h>
diff --git a/examples/chat/chat_main.c b/examples/chat/chat_main.c
index caf6cca28..291e88824 100644
--- a/examples/chat/chat_main.c
+++ b/examples/chat/chat_main.c
@@ -45,7 +45,7 @@
#include <sys/ioctl.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <fcntl.h>
#include <poll.h>
diff --git a/examples/configdata/configdata_main.c b/examples/configdata/configdata_main.c
index 236d8e267..3218569f6 100644
--- a/examples/configdata/configdata_main.c
+++ b/examples/configdata/configdata_main.c
@@ -35,7 +35,7 @@
#include <fcntl.h>
#include <string.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/crc32.h>
#include <nuttx/mtd/mtd.h>
@@ -450,7 +450,7 @@ static int configdata_verifyconfig(void)
{
g_nverified++;
#if CONFIG_EXAMPLES_CONFIGDATA_VERBOSE != 0
- printf(" Verifed entry %04X, %d\n",
+ printf(" Verified entry %04X, %d\n",
entry->id, entry->instance);
#endif
}
diff --git a/examples/cordic/cordic_main.c b/examples/cordic/cordic_main.c
index 204a755ac..3d4aede0c 100644
--- a/examples/cordic/cordic_main.c
+++ b/examples/cordic/cordic_main.c
@@ -35,7 +35,7 @@
#include <string.h>
#include <fcntl.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <math.h>
#include <fixedmath.h>
diff --git a/examples/discover/discover_main.c b/examples/discover/discover_main.c
index cd14720ed..9f5941587 100644
--- a/examples/discover/discover_main.c
+++ b/examples/discover/discover_main.c
@@ -29,7 +29,7 @@
#include <string.h>
#include <unistd.h>
#include <time.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <net/if.h>
#include <netinet/in.h>
diff --git a/examples/djoystick/djoy_main.c b/examples/djoystick/djoy_main.c
index 110de4531..b3d1134c9 100644
--- a/examples/djoystick/djoy_main.c
+++ b/examples/djoystick/djoy_main.c
@@ -32,7 +32,7 @@
#include <stdlib.h>
#include <fcntl.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <unistd.h>
#include <nuttx/input/djoystick.h>
diff --git a/examples/elf/main/elf_main.c b/examples/elf/main/elf_main.c
index 7a52b5f6e..000339e00 100644
--- a/examples/elf/main/elf_main.c
+++ b/examples/elf/main/elf_main.c
@@ -37,7 +37,7 @@
#include <unistd.h>
#include <string.h>
#include <pthread.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <nuttx/symtab.h>
diff --git a/examples/etl/etl_main.cxx b/examples/etl/etl_main.cxx
index efb4aa835..f8628cdfc 100644
--- a/examples/etl/etl_main.cxx
+++ b/examples/etl/etl_main.cxx
@@ -27,7 +27,7 @@
#include <nuttx/config.h>
#include <cstdio>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <etl/vector.h>
#include <etl/numeric.h>
diff --git a/examples/fbcon/fbcon_main.c b/examples/fbcon/fbcon_main.c
index 2aa95e0c5..da0833800 100644
--- a/examples/fbcon/fbcon_main.c
+++ b/examples/fbcon/fbcon_main.c
@@ -42,7 +42,7 @@
#include <nuttx/video/fb.h>
#include <ctype.h>
#include <spawn.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <poll.h>
#include <nuttx/ascii.h>
#include <nuttx/lib/builtin.h>
@@ -1913,7 +1913,7 @@ static void fbcon_write(FAR struct fbcon_state_s *st,
do
{
- /* Is the character part of a VT100 escape sequnce? */
+ /* Is the character part of a VT100 escape sequence? */
state = fbcon_vt100(st, ch);
switch (state)
@@ -2652,4 +2652,3 @@ errout:
fprintf(stderr, "FBCON exiting with error %d\n", exitcode);
return exitcode;
}
-
diff --git a/examples/flowc/flowc.h b/examples/flowc/flowc.h
index c96fe76af..12caefa93 100644
--- a/examples/flowc/flowc.h
+++ b/examples/flowc/flowc.h
@@ -29,7 +29,7 @@
#ifdef EXAMPLES_FLOWC_HOST
#else
-# include <debug.h>
+# include <nuttx/debug.h>
#endif
/****************************************************************************
diff --git a/examples/ft80x/ft80x.h b/examples/ft80x/ft80x.h
index 0349f6eb4..70492f24e 100644
--- a/examples/ft80x/ft80x.h
+++ b/examples/ft80x/ft80x.h
@@ -31,7 +31,7 @@
#include <nuttx/compiler.h>
#include <stdio.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#ifdef CONFIG_EXAMPLES_FT80X
diff --git a/examples/ftpd/ftpd_main.c b/examples/ftpd/ftpd_main.c
index 5c7888b24..e2673572a 100644
--- a/examples/ftpd/ftpd_main.c
+++ b/examples/ftpd/ftpd_main.c
@@ -33,7 +33,7 @@
#include <unistd.h>
#include <sched.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <sys/param.h>
#include <netinet/in.h>
diff --git a/examples/hall/hall_main.c b/examples/hall/hall_main.c
index ed3c3b570..e0fdc2e78 100644
--- a/examples/hall/hall_main.c
+++ b/examples/hall/hall_main.c
@@ -37,7 +37,7 @@
#include <limits.h>
#include <inttypes.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/sensors/hall3ph.h>
diff --git a/examples/helloxx/helloxx_main.cxx b/examples/helloxx/helloxx_main.cxx
index c3425ff6b..8df920916 100644
--- a/examples/helloxx/helloxx_main.cxx
+++ b/examples/helloxx/helloxx_main.cxx
@@ -27,7 +27,7 @@
#include <nuttx/config.h>
#include <cstdio>
-#include <debug.h>
+#include <nuttx/debug.h>
//***************************************************************************
// Definitions
diff --git a/examples/hts221_reader/hts221_reader_main.c b/examples/hts221_reader/hts221_reader_main.c
index ac00ede5e..5c1c39664 100644
--- a/examples/hts221_reader/hts221_reader_main.c
+++ b/examples/hts221_reader/hts221_reader_main.c
@@ -32,7 +32,7 @@
#include <errno.h>
#include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/sensors/hts221.h>
diff --git a/examples/i2schar/i2schar_main.c b/examples/i2schar/i2schar_main.c
index dec7b70c1..176def927 100644
--- a/examples/i2schar/i2schar_main.c
+++ b/examples/i2schar/i2schar_main.c
@@ -33,7 +33,7 @@
#include <string.h>
#include <pthread.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <nuttx/audio/audio.h>
diff --git a/examples/i2schar/i2schar_receiver.c b/examples/i2schar/i2schar_receiver.c
index fdcc0c8ba..e088bee9f 100644
--- a/examples/i2schar/i2schar_receiver.c
+++ b/examples/i2schar/i2schar_receiver.c
@@ -31,7 +31,7 @@
#include <fcntl.h>
#include <pthread.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <unistd.h>
#include <string.h>
diff --git a/examples/i2schar/i2schar_transmitter.c b/examples/i2schar/i2schar_transmitter.c
index df1560ac6..14e4ec347 100644
--- a/examples/i2schar/i2schar_transmitter.c
+++ b/examples/i2schar/i2schar_transmitter.c
@@ -31,7 +31,7 @@
#include <fcntl.h>
#include <pthread.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <unistd.h>
#include <sys/ioctl.h>
diff --git a/examples/igmp/igmp.c b/examples/igmp/igmp.c
index da904fa34..7da32c680 100644
--- a/examples/igmp/igmp.c
+++ b/examples/igmp/igmp.c
@@ -29,7 +29,7 @@
#include <stdint.h>
#include <stdio.h>
#include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <arpa/inet.h>
#include <net/if.h>
diff --git a/examples/igmp/igmp.h b/examples/igmp/igmp.h
index 11ffb57f9..3cf99b1b0 100644
--- a/examples/igmp/igmp.h
+++ b/examples/igmp/igmp.h
@@ -27,7 +27,7 @@
* Included Files
****************************************************************************/
-#include <debug.h>
+#include <nuttx/debug.h>
/****************************************************************************
* Pre-processor Definitions
diff --git a/examples/ipcfg/ipcfg_main.c b/examples/ipcfg/ipcfg_main.c
index f64a73ea8..51c411081 100644
--- a/examples/ipcfg/ipcfg_main.c
+++ b/examples/ipcfg/ipcfg_main.c
@@ -30,7 +30,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <unistd.h>
#include <arpa/inet.h>
diff --git a/examples/keyboard/kbd_main.c b/examples/keyboard/kbd_main.c
index ff832c862..d793e6344 100644
--- a/examples/keyboard/kbd_main.c
+++ b/examples/keyboard/kbd_main.c
@@ -33,7 +33,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/input/keyboard.h>
diff --git a/examples/lis3dsh_reader/lis3dsh_reader_main.c b/examples/lis3dsh_reader/lis3dsh_reader_main.c
index dad00b312..98194ea66 100644
--- a/examples/lis3dsh_reader/lis3dsh_reader_main.c
+++ b/examples/lis3dsh_reader/lis3dsh_reader_main.c
@@ -47,7 +47,7 @@
#include <fcntl.h>
#include <sched.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <time.h>
#include <unistd.h>
diff --git a/examples/lsm303_reader/lsm303_reader_main.c b/examples/lsm303_reader/lsm303_reader_main.c
index b48e81a2d..51611720d 100644
--- a/examples/lsm303_reader/lsm303_reader_main.c
+++ b/examples/lsm303_reader/lsm303_reader_main.c
@@ -32,7 +32,7 @@
#include <errno.h>
#include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/sensors/lsm303agr.h>
diff --git a/examples/lsm6dsl_reader/lsm6dsl_reader_main.c b/examples/lsm6dsl_reader/lsm6dsl_reader_main.c
index c3ec68ff7..6f7cf0355 100644
--- a/examples/lsm6dsl_reader/lsm6dsl_reader_main.c
+++ b/examples/lsm6dsl_reader/lsm6dsl_reader_main.c
@@ -32,7 +32,7 @@
#include <errno.h>
#include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/sensors/lsm6dsl.h>
diff --git a/examples/lvglterm/lvglterm.c b/examples/lvglterm/lvglterm.c
index 90269daa8..71c5e650e 100644
--- a/examples/lvglterm/lvglterm.c
+++ b/examples/lvglterm/lvglterm.c
@@ -36,7 +36,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <time.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <poll.h>
#include <spawn.h>
#include <lvgl/lvgl.h>
diff --git a/examples/mld/mld.h b/examples/mld/mld.h
index 69d8f13a4..936a37062 100644
--- a/examples/mld/mld.h
+++ b/examples/mld/mld.h
@@ -27,7 +27,7 @@
* Included Files
****************************************************************************/
-#include <debug.h>
+#include <nuttx/debug.h>
/****************************************************************************
* Pre-processor Definitions
diff --git a/examples/mld/mld_main.c b/examples/mld/mld_main.c
index 363a7e41d..594115a22 100644
--- a/examples/mld/mld_main.c
+++ b/examples/mld/mld_main.c
@@ -33,7 +33,7 @@
#include <fcntl.h>
#include <string.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <arpa/inet.h>
#include <net/if.h>
diff --git a/examples/module/chardev/chardev.c b/examples/module/chardev/chardev.c
index f0faa3bfb..b2fd7b61d 100644
--- a/examples/module/chardev/chardev.c
+++ b/examples/module/chardev/chardev.c
@@ -32,7 +32,7 @@
#include <string.h>
#include <errno.h>
#include <syslog.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/module.h>
#include <nuttx/lib/elf.h>
diff --git a/examples/module/main/module_main.c b/examples/module/main/module_main.c
index 37da14fee..9eb9b205e 100644
--- a/examples/module/main/module_main.c
+++ b/examples/module/main/module_main.c
@@ -38,7 +38,7 @@
#include <fcntl.h>
#include <syslog.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/module.h>
#include <nuttx/symtab.h>
diff --git a/examples/mtdpart/mtdpart_main.c b/examples/mtdpart/mtdpart_main.c
index 35ba65ce7..428eddc57 100644
--- a/examples/mtdpart/mtdpart_main.c
+++ b/examples/mtdpart/mtdpart_main.c
@@ -31,7 +31,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/mtd/mtd.h>
#include <nuttx/drivers/drivers.h>
diff --git a/examples/mtdrwb/mtdrwb_main.c b/examples/mtdrwb/mtdrwb_main.c
index 1ebbe44f5..93b9d3290 100644
--- a/examples/mtdrwb/mtdrwb_main.c
+++ b/examples/mtdrwb/mtdrwb_main.c
@@ -31,7 +31,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/mtd/mtd.h>
#include <nuttx/drivers/drivers.h>
diff --git a/examples/netloop/lo_listener.c b/examples/netloop/lo_listener.c
index 8b51027bb..20f72ad9c 100644
--- a/examples/netloop/lo_listener.c
+++ b/examples/netloop/lo_listener.c
@@ -39,7 +39,7 @@
#include <string.h>
#include <pthread.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <net/if.h>
#include <arpa/inet.h>
diff --git a/examples/netloop/lo_main.c b/examples/netloop/lo_main.c
index cfdfab429..513278b08 100644
--- a/examples/netloop/lo_main.c
+++ b/examples/netloop/lo_main.c
@@ -37,7 +37,7 @@
#include <fcntl.h>
#include <poll.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <arpa/inet.h>
#include <netinet/in.h>
diff --git a/examples/nettest/nettest.h b/examples/nettest/nettest.h
index e4ff7f3cc..fd314befb 100644
--- a/examples/nettest/nettest.h
+++ b/examples/nettest/nettest.h
@@ -31,7 +31,7 @@
#ifdef NETTEST_HOST
#else
-# include <debug.h>
+# include <nuttx/debug.h>
#endif
/****************************************************************************
diff --git a/examples/nettest/nettest_netinit.c b/examples/nettest/nettest_netinit.c
index 5c29ca411..e2e786164 100644
--- a/examples/nettest/nettest_netinit.c
+++ b/examples/nettest/nettest_netinit.c
@@ -28,7 +28,7 @@
#include <stdbool.h>
#include <stdio.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <arpa/inet.h>
#include <netinet/in.h>
diff --git a/examples/nettest/nettest_target1.c b/examples/nettest/nettest_target1.c
index 3875be272..47db8916b 100644
--- a/examples/nettest/nettest_target1.c
+++ b/examples/nettest/nettest_target1.c
@@ -32,7 +32,7 @@
#include <stdio.h>
#include <unistd.h>
#include <sched.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "nettest.h"
diff --git a/examples/nng_test/pubsub.c b/examples/nng_test/pubsub.c
index 4f285906e..78e427eb2 100644
--- a/examples/nng_test/pubsub.c
+++ b/examples/nng_test/pubsub.c
@@ -32,7 +32,7 @@
#include <pthread.h>
#include <fcntl.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nng/nng.h>
#include <nng/protocol/pubsub0/pub.h>
diff --git a/examples/nrf24l01_btle/nrf24l01_btle.c b/examples/nrf24l01_btle/nrf24l01_btle.c
index ee373798f..6e1490f45 100644
--- a/examples/nrf24l01_btle/nrf24l01_btle.c
+++ b/examples/nrf24l01_btle/nrf24l01_btle.c
@@ -27,7 +27,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <unistd.h>
#include <nuttx/signal.h>
diff --git a/examples/nrf24l01_btle/nrf24l01_btle.h b/examples/nrf24l01_btle/nrf24l01_btle.h
index 73d166356..9394ee568 100644
--- a/examples/nrf24l01_btle/nrf24l01_btle.h
+++ b/examples/nrf24l01_btle/nrf24l01_btle.h
@@ -31,7 +31,7 @@
#include <stdint.h>
#include <stdbool.h>
-#include <debug.h>
+#include <nuttx/debug.h>
/****************************************************************************
* Pre-processor Definitions
diff --git a/examples/nrf24l01_term/nrf24l01_term.c b/examples/nrf24l01_term/nrf24l01_term.c
index b8af3dca0..c120cafc1 100644
--- a/examples/nrf24l01_term/nrf24l01_term.c
+++ b/examples/nrf24l01_term/nrf24l01_term.c
@@ -38,7 +38,7 @@
#include <string.h>
#include <stdlib.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <poll.h>
#include <fcntl.h>
diff --git a/examples/nunchuck/nunchuck_main.c b/examples/nunchuck/nunchuck_main.c
index fa72e1ce6..63200288c 100644
--- a/examples/nunchuck/nunchuck_main.c
+++ b/examples/nunchuck/nunchuck_main.c
@@ -33,7 +33,7 @@
#include <fcntl.h>
#include <errno.h>
#include <fixedmath.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <unistd.h>
#include <nuttx/input/nunchuck.h>
diff --git a/examples/nx/nx_events.c b/examples/nx/nx_events.c
index 360856584..4e5616641 100644
--- a/examples/nx/nx_events.c
+++ b/examples/nx/nx_events.c
@@ -31,7 +31,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <nuttx/nx/nx.h>
diff --git a/examples/nx/nx_kbdin.c b/examples/nx/nx_kbdin.c
index 856323a24..cdab7fe20 100644
--- a/examples/nx/nx_kbdin.c
+++ b/examples/nx/nx_kbdin.c
@@ -31,7 +31,7 @@
#include <stdio.h>
#include <string.h>
#include <ctype.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <nuttx/nx/nx.h>
diff --git a/examples/nx/nx_main.c b/examples/nx/nx_main.c
index a7b9134c0..942d59870 100644
--- a/examples/nx/nx_main.c
+++ b/examples/nx/nx_main.c
@@ -38,7 +38,7 @@
#include <sched.h>
#include <pthread.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/arch.h>
#include <nuttx/board.h>
diff --git a/examples/nxdemo/nxdemo_bkgd.c b/examples/nxdemo/nxdemo_bkgd.c
index fd03f08c0..ecd82b238 100644
--- a/examples/nxdemo/nxdemo_bkgd.c
+++ b/examples/nxdemo/nxdemo_bkgd.c
@@ -34,7 +34,7 @@
#include <semaphore.h>
#include <sys/param.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <unistd.h>
#include <nuttx/nx/nx.h>
diff --git a/examples/nxdemo/nxdemo_main.c b/examples/nxdemo/nxdemo_main.c
index ca5d5b878..e6875b9cd 100644
--- a/examples/nxdemo/nxdemo_main.c
+++ b/examples/nxdemo/nxdemo_main.c
@@ -38,7 +38,7 @@
#include <sched.h>
#include <pthread.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/arch.h>
#include <nuttx/board.h>
diff --git a/examples/nxflat/nxflat_main.c b/examples/nxflat/nxflat_main.c
index 0c8425e2e..c7ea6cf19 100644
--- a/examples/nxflat/nxflat_main.c
+++ b/examples/nxflat/nxflat_main.c
@@ -34,7 +34,7 @@
#include <unistd.h>
#include <string.h>
#include <pthread.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <nuttx/symtab.h>
diff --git a/examples/nxhello/nxhello_bkgd.c b/examples/nxhello/nxhello_bkgd.c
index ee73f2614..323b4870d 100644
--- a/examples/nxhello/nxhello_bkgd.c
+++ b/examples/nxhello/nxhello_bkgd.c
@@ -33,7 +33,7 @@
#include <string.h>
#include <semaphore.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxglib.h>
diff --git a/examples/nxhello/nxhello_main.c b/examples/nxhello/nxhello_main.c
index 13e2b8a62..8165d9abe 100644
--- a/examples/nxhello/nxhello_main.c
+++ b/examples/nxhello/nxhello_main.c
@@ -38,7 +38,7 @@
#include <sched.h>
#include <pthread.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/arch.h>
#include <nuttx/board.h>
diff --git a/examples/nximage/nximage_bkgd.c b/examples/nximage/nximage_bkgd.c
index 36ac04eda..8a86f0498 100644
--- a/examples/nximage/nximage_bkgd.c
+++ b/examples/nximage/nximage_bkgd.c
@@ -33,7 +33,7 @@
#include <string.h>
#include <semaphore.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxglib.h>
diff --git a/examples/nximage/nximage_main.c b/examples/nximage/nximage_main.c
index 4598ae4f6..fd2beac0b 100644
--- a/examples/nximage/nximage_main.c
+++ b/examples/nximage/nximage_main.c
@@ -38,7 +38,7 @@
#include <sched.h>
#include <pthread.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/arch.h>
#include <nuttx/board.h>
diff --git a/examples/nxlines/nxlines_bkgd.c b/examples/nxlines/nxlines_bkgd.c
index 22b068c64..f3e3940fd 100644
--- a/examples/nxlines/nxlines_bkgd.c
+++ b/examples/nxlines/nxlines_bkgd.c
@@ -32,7 +32,7 @@
#include <unistd.h>
#include <string.h>
#include <sys/param.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <fixedmath.h>
#include <inttypes.h>
diff --git a/examples/nxlines/nxlines_main.c b/examples/nxlines/nxlines_main.c
index 7b3d4ba0d..85b75177e 100644
--- a/examples/nxlines/nxlines_main.c
+++ b/examples/nxlines/nxlines_main.c
@@ -36,7 +36,7 @@
#include <string.h>
#include <sched.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/arch.h>
#include <nuttx/board.h>
diff --git a/examples/nxterm/nxterm_main.c b/examples/nxterm/nxterm_main.c
index c1a912a08..6fbf0be6d 100644
--- a/examples/nxterm/nxterm_main.c
+++ b/examples/nxterm/nxterm_main.c
@@ -38,7 +38,7 @@
#include <string.h>
#include <assert.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#ifdef CONFIG_NX_LCDDRIVER
# include <nuttx/lcd/lcd.h>
diff --git a/examples/nxterm/nxterm_toolbar.c b/examples/nxterm/nxterm_toolbar.c
index 24bcee463..0fa7c0802 100644
--- a/examples/nxterm/nxterm_toolbar.c
+++ b/examples/nxterm/nxterm_toolbar.c
@@ -33,7 +33,7 @@
#include <string.h>
#include <semaphore.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h>
diff --git a/examples/nxterm/nxterm_wndo.c b/examples/nxterm/nxterm_wndo.c
index 2bba6016a..c326e0449 100644
--- a/examples/nxterm/nxterm_wndo.c
+++ b/examples/nxterm/nxterm_wndo.c
@@ -35,7 +35,7 @@
#include <string.h>
#include <semaphore.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxglib.h>
diff --git a/examples/nxtext/nxtext_bkgd.c b/examples/nxtext/nxtext_bkgd.c
index 1e0d4a18d..8eb55ba09 100644
--- a/examples/nxtext/nxtext_bkgd.c
+++ b/examples/nxtext/nxtext_bkgd.c
@@ -33,7 +33,7 @@
#include <string.h>
#include <semaphore.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h>
diff --git a/examples/nxtext/nxtext_main.c b/examples/nxtext/nxtext_main.c
index 1ad8bb9b3..d3d02956f 100644
--- a/examples/nxtext/nxtext_main.c
+++ b/examples/nxtext/nxtext_main.c
@@ -38,7 +38,7 @@
#include <sched.h>
#include <pthread.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/arch.h>
#include <nuttx/board.h>
diff --git a/examples/nxtext/nxtext_popup.c b/examples/nxtext/nxtext_popup.c
index 4ca10e1b7..19dbd3cc5 100644
--- a/examples/nxtext/nxtext_popup.c
+++ b/examples/nxtext/nxtext_popup.c
@@ -32,7 +32,7 @@
#include <string.h>
#include <semaphore.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h>
diff --git a/examples/nxtext/nxtext_putc.c b/examples/nxtext/nxtext_putc.c
index 47fdd9ba5..384ae22bb 100644
--- a/examples/nxtext/nxtext_putc.c
+++ b/examples/nxtext/nxtext_putc.c
@@ -32,7 +32,7 @@
#include <string.h>
#include <ctype.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h>
@@ -365,7 +365,7 @@ nxtext_getglyph(NXHANDLE hfont, FAR struct nxtext_state_s *st, uint8_t ch)
*
* Description:
* This is part of the nxtext_putc logic. It creates and positions a
- * the character and renders (or re-uses) a glyph for font.
+ * the character and renders (or reuses) a glyph for font.
*
****************************************************************************/
diff --git a/examples/pf_ieee802154/pfieee802154.h b/examples/pf_ieee802154/pfieee802154.h
index ee7a88b5c..adf9e3bd6 100644
--- a/examples/pf_ieee802154/pfieee802154.h
+++ b/examples/pf_ieee802154/pfieee802154.h
@@ -27,7 +27,7 @@
* Included Files
****************************************************************************/
-#include <debug.h>
+#include <nuttx/debug.h>
#include <netpacket/ieee802154.h>
/****************************************************************************
diff --git a/examples/poll/net_listener.c b/examples/poll/net_listener.c
index 9db855477..e20306d6c 100644
--- a/examples/poll/net_listener.c
+++ b/examples/poll/net_listener.c
@@ -39,7 +39,7 @@
#include <string.h>
#include <pthread.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <net/if.h>
#include <arpa/inet.h>
diff --git a/examples/poll/net_reader.c b/examples/poll/net_reader.c
index 5e22822e3..288179763 100644
--- a/examples/poll/net_reader.c
+++ b/examples/poll/net_reader.c
@@ -39,7 +39,7 @@
#include <pthread.h>
#include <fcntl.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <net/if.h>
#include <arpa/inet.h>
diff --git a/examples/poll/poll_listener.c b/examples/poll/poll_listener.c
index 5864c4222..ce912357d 100644
--- a/examples/poll/poll_listener.c
+++ b/examples/poll/poll_listener.c
@@ -36,7 +36,7 @@
#include <poll.h>
#include <fcntl.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <arpa/inet.h>
diff --git a/examples/poll/poll_main.c b/examples/poll/poll_main.c
index 817916839..5dfb2d938 100644
--- a/examples/poll/poll_main.c
+++ b/examples/poll/poll_main.c
@@ -36,7 +36,7 @@
#include <fcntl.h>
#include <poll.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "poll_internal.h"
diff --git a/examples/poll/select_listener.c b/examples/poll/select_listener.c
index 69cfe92d6..e99eda06d 100644
--- a/examples/poll/select_listener.c
+++ b/examples/poll/select_listener.c
@@ -37,7 +37,7 @@
#include <pthread.h>
#include <fcntl.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "poll_internal.h"
diff --git a/examples/posix_spawn/spawn_main.c b/examples/posix_spawn/spawn_main.c
index 100030b6c..34428d472 100644
--- a/examples/posix_spawn/spawn_main.c
+++ b/examples/posix_spawn/spawn_main.c
@@ -37,7 +37,7 @@
#include <string.h>
#include <fcntl.h>
#include <spawn.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <nuttx/drivers/ramdisk.h>
diff --git a/examples/powerled/powerled_main.c b/examples/powerled/powerled_main.c
index 4478d2ee7..b949aadfa 100644
--- a/examples/powerled/powerled_main.c
+++ b/examples/powerled/powerled_main.c
@@ -35,7 +35,7 @@
#include <stdlib.h>
#include <stdbool.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <sys/ioctl.h>
#ifndef CONFIG_NSH_ARCHINIT
diff --git a/examples/powermonitor/powermonitor_main.c b/examples/powermonitor/powermonitor_main.c
index 3a335dd66..0e13e3b4b 100644
--- a/examples/powermonitor/powermonitor_main.c
+++ b/examples/powermonitor/powermonitor_main.c
@@ -28,7 +28,7 @@
#include <stdint.h>
#include <stdbool.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <stdio.h>
#include <fixedmath.h>
#include <sys/types.h>
diff --git a/examples/pwfb/pwfb_events.c b/examples/pwfb/pwfb_events.c
index 142985ab7..bec7a845a 100644
--- a/examples/pwfb/pwfb_events.c
+++ b/examples/pwfb/pwfb_events.c
@@ -31,7 +31,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <nuttx/nx/nx.h>
diff --git a/examples/pwfb/pwfb_main.c b/examples/pwfb/pwfb_main.c
index 6a7bfc438..3b5993372 100644
--- a/examples/pwfb/pwfb_main.c
+++ b/examples/pwfb/pwfb_main.c
@@ -39,7 +39,7 @@
#include <pthread.h>
#include <fixedmath.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/arch.h>
#include <nuttx/board.h>
diff --git a/examples/pwlines/pwlines_events.c b/examples/pwlines/pwlines_events.c
index 73a2b80a6..3dcd0504c 100644
--- a/examples/pwlines/pwlines_events.c
+++ b/examples/pwlines/pwlines_events.c
@@ -31,7 +31,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <nuttx/nx/nx.h>
diff --git a/examples/pwlines/pwlines_main.c b/examples/pwlines/pwlines_main.c
index dc776d744..8d448cc11 100644
--- a/examples/pwlines/pwlines_main.c
+++ b/examples/pwlines/pwlines_main.c
@@ -39,7 +39,7 @@
#include <pthread.h>
#include <fixedmath.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/arch.h>
#include <nuttx/board.h>
diff --git a/examples/pwlines/pwlines_update.c b/examples/pwlines/pwlines_update.c
index 2dbe4e39e..37d41456e 100644
--- a/examples/pwlines/pwlines_update.c
+++ b/examples/pwlines/pwlines_update.c
@@ -33,7 +33,7 @@
#include <inttypes.h>
#include <unistd.h>
#include <string.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <fixedmath.h>
#include <nuttx/nx/nx.h>
diff --git a/examples/pwm/pwm_main.c b/examples/pwm/pwm_main.c
index 7a1a83c16..683587f08 100644
--- a/examples/pwm/pwm_main.c
+++ b/examples/pwm/pwm_main.c
@@ -34,7 +34,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <string.h>
#include <inttypes.h>
@@ -199,7 +199,7 @@ static void pwm_help(FAR struct pwm_state_s *pwm)
printf("Usage: pwm [OPTIONS]\n");
printf("\nArguments are \"sticky\". "
"For example, once the PWM frequency is\n");
- printf("specified, that frequency will be re-used until it is changed.\n");
+ printf("specified, that frequency will be reused until it is changed.\n");
printf("\n\"sticky\" OPTIONS include:\n");
printf(" [-p devpath] selects the PWM device. "
"Default: %s Current: %s\n",
diff --git a/examples/qencoder/qe_main.c b/examples/qencoder/qe_main.c
index 2614fe7fb..504db260d 100644
--- a/examples/qencoder/qe_main.c
+++ b/examples/qencoder/qe_main.c
@@ -37,7 +37,7 @@
#include <limits.h>
#include <inttypes.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/sensors/qencoder.h>
@@ -317,7 +317,7 @@ int main(int argc, FAR char *argv[])
goto errout_with_dev;
}
- /* GETINDEX succesful */
+ /* GETINDEX successful */
else
{
diff --git a/examples/random/random_main.c b/examples/random/random_main.c
index 2b1be2827..3a35b4e89 100644
--- a/examples/random/random_main.c
+++ b/examples/random/random_main.c
@@ -31,7 +31,7 @@
#include <string.h>
#include <fcntl.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <unistd.h>
/****************************************************************************
diff --git a/examples/relays/relays_main.c b/examples/relays/relays_main.c
index f5ab6fb7b..83e108419 100644
--- a/examples/relays/relays_main.c
+++ b/examples/relays/relays_main.c
@@ -34,7 +34,7 @@
#include <unistd.h>
#include <string.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#ifdef CONFIG_ARCH_RELAYS
diff --git a/examples/rmtchar/rmtchar_common.c b/examples/rmtchar/rmtchar_common.c
index 663f0abd5..098e5363a 100644
--- a/examples/rmtchar/rmtchar_common.c
+++ b/examples/rmtchar/rmtchar_common.c
@@ -31,7 +31,7 @@
#include <fcntl.h>
#include <pthread.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <unistd.h>
#include "rmtchar.h"
diff --git a/examples/rmtchar/rmtchar_main.c b/examples/rmtchar/rmtchar_main.c
index dcf2c54f2..63a8ced85 100644
--- a/examples/rmtchar/rmtchar_main.c
+++ b/examples/rmtchar/rmtchar_main.c
@@ -33,7 +33,7 @@
#include <string.h>
#include <pthread.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "rmtchar.h"
@@ -112,7 +112,7 @@ static void rmtchar_help(FAR struct rmtchar_state_s *rmtchar)
printf("Usage: rmtchar [OPTIONS]\n");
printf("\nArguments are \"sticky\".\n");
printf("For example, once the RMT character device is\n");
- printf("specified, that device will be re-used until it is changed.\n");
+ printf("specified, that device will be reused until it is changed.\n");
printf("\n\"sticky\" OPTIONS include:\n");
printf(" [-i items] selects the number of words (items) to be transmitted"
" or received by the RMT character device. "
diff --git a/examples/rmtchar/rmtchar_receiver.c b/examples/rmtchar/rmtchar_receiver.c
index b6d94800e..2e1b20e36 100644
--- a/examples/rmtchar/rmtchar_receiver.c
+++ b/examples/rmtchar/rmtchar_receiver.c
@@ -31,7 +31,7 @@
#include <fcntl.h>
#include <pthread.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <unistd.h>
#include "rmtchar.h"
diff --git a/examples/rmtchar/rmtchar_transmitter.c b/examples/rmtchar/rmtchar_transmitter.c
index 8c0528e2a..75fc0103b 100644
--- a/examples/rmtchar/rmtchar_transmitter.c
+++ b/examples/rmtchar/rmtchar_transmitter.c
@@ -31,7 +31,7 @@
#include <fcntl.h>
#include <pthread.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <unistd.h>
#include <nuttx/audio/audio.h>
diff --git a/examples/smps/smps_main.c b/examples/smps/smps_main.c
index ba6a7b079..852696855 100644
--- a/examples/smps/smps_main.c
+++ b/examples/smps/smps_main.c
@@ -35,7 +35,7 @@
#include <stdlib.h>
#include <stdbool.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <sys/ioctl.h>
#include <sys/boardctl.h>
diff --git a/examples/sotest/main/sotest_main.c b/examples/sotest/main/sotest_main.c
index 98b11730c..0d399568f 100644
--- a/examples/sotest/main/sotest_main.c
+++ b/examples/sotest/main/sotest_main.c
@@ -37,7 +37,7 @@
#include <syslog.h>
#include <dlfcn.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <unistd.h>
#include <nuttx/symtab.h>
diff --git a/examples/sx127x_demo/sx127x_demo.c b/examples/sx127x_demo/sx127x_demo.c
index 05175a6ed..a93fe74fe 100644
--- a/examples/sx127x_demo/sx127x_demo.c
+++ b/examples/sx127x_demo/sx127x_demo.c
@@ -37,7 +37,7 @@
#include <string.h>
#include <stdlib.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <poll.h>
#include <fcntl.h>
diff --git a/examples/tcpblaster/tcpblaster.h b/examples/tcpblaster/tcpblaster.h
index 9fc7c4dcc..5d645f4ab 100644
--- a/examples/tcpblaster/tcpblaster.h
+++ b/examples/tcpblaster/tcpblaster.h
@@ -31,7 +31,7 @@
#ifdef TCPBLASTER_HOST
#else
-# include <debug.h>
+# include <nuttx/debug.h>
#endif
/****************************************************************************
diff --git a/examples/tcpblaster/tcpblaster_netinit.c b/examples/tcpblaster/tcpblaster_netinit.c
index 6007674f4..f9719d295 100644
--- a/examples/tcpblaster/tcpblaster_netinit.c
+++ b/examples/tcpblaster/tcpblaster_netinit.c
@@ -28,7 +28,7 @@
#include <stdbool.h>
#include <stdio.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <arpa/inet.h>
#include <netinet/in.h>
diff --git a/examples/tcpblaster/tcpblaster_target1.c b/examples/tcpblaster/tcpblaster_target1.c
index f46fd0da8..827fe3a7d 100644
--- a/examples/tcpblaster/tcpblaster_target1.c
+++ b/examples/tcpblaster/tcpblaster_target1.c
@@ -32,7 +32,7 @@
#include <stdio.h>
#include <unistd.h>
#include <sched.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "tcpblaster.h"
diff --git a/examples/tcpecho/tcpecho_main.c b/examples/tcpecho/tcpecho_main.c
index 96aba8096..2de49f6af 100644
--- a/examples/tcpecho/tcpecho_main.c
+++ b/examples/tcpecho/tcpecho_main.c
@@ -28,7 +28,7 @@
* Included Files
****************************************************************************/
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <poll.h>
#include <stdint.h>
diff --git a/examples/thttpd/thttpd_main.c b/examples/thttpd/thttpd_main.c
index 291e7552c..5ee01b455 100644
--- a/examples/thttpd/thttpd_main.c
+++ b/examples/thttpd/thttpd_main.c
@@ -33,7 +33,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <net/if.h>
#include <arpa/inet.h>
diff --git a/examples/touchscreen/tc_main.c b/examples/touchscreen/tc_main.c
index 129de8d27..b2f40a8f7 100644
--- a/examples/touchscreen/tc_main.c
+++ b/examples/touchscreen/tc_main.c
@@ -33,7 +33,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#ifdef CONFIG_EXAMPLES_TOUCHSCREEN_MOUSE
# include <nuttx/input/mouse.h>
diff --git a/examples/udp/udp.h b/examples/udp/udp.h
index 415317f50..2f15d8ea3 100644
--- a/examples/udp/udp.h
+++ b/examples/udp/udp.h
@@ -29,7 +29,7 @@
#ifdef EXAMPLES_UDP_HOST
#else
-# include <debug.h>
+# include <nuttx/debug.h>
#endif
#include <arpa/inet.h>
diff --git a/examples/udp/udp_netinit.c b/examples/udp/udp_netinit.c
index 3cd2625b7..d5851b22a 100644
--- a/examples/udp/udp_netinit.c
+++ b/examples/udp/udp_netinit.c
@@ -28,7 +28,7 @@
#include <stdbool.h>
#include <stdio.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <arpa/inet.h>
#include <netinet/in.h>
diff --git a/examples/udpblaster/udpblaster_target.c b/examples/udpblaster/udpblaster_target.c
index 0df0072d4..be5908fbd 100644
--- a/examples/udpblaster/udpblaster_target.c
+++ b/examples/udpblaster/udpblaster_target.c
@@ -31,7 +31,7 @@
#include <string.h>
#include <poll.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <unistd.h>
#include <net/if.h>
diff --git a/examples/usbserial/usbserial_main.c b/examples/usbserial/usbserial_main.c
index 66e4790b9..e1eec27c8 100644
--- a/examples/usbserial/usbserial_main.c
+++ b/examples/usbserial/usbserial_main.c
@@ -35,7 +35,7 @@
#include <string.h>
#include <fcntl.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/usb/usbdev.h>
#include <nuttx/usb/usbdev_trace.h>
diff --git a/examples/usrsocktest/usrsocktest_daemon.c b/examples/usrsocktest/usrsocktest_daemon.c
index 3d84d8396..efa543591 100644
--- a/examples/usrsocktest/usrsocktest_daemon.c
+++ b/examples/usrsocktest/usrsocktest_daemon.c
@@ -31,7 +31,7 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <fcntl.h>
#include <errno.h>
#include <poll.h>
diff --git a/examples/usrsocktest/usrsocktest_main.c b/examples/usrsocktest/usrsocktest_main.c
index d09036c38..c6109423e 100644
--- a/examples/usrsocktest/usrsocktest_main.c
+++ b/examples/usrsocktest/usrsocktest_main.c
@@ -32,7 +32,7 @@
#include <malloc.h>
#include <stdio.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <fcntl.h>
#include <errno.h>
#include <unistd.h>
diff --git a/examples/watchdog/watchdog_main.c b/examples/watchdog/watchdog_main.c
index 06a36c75d..4e22001a1 100644
--- a/examples/watchdog/watchdog_main.c
+++ b/examples/watchdog/watchdog_main.c
@@ -26,7 +26,7 @@
#include <nuttx/config.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
diff --git a/examples/watcher/wdt.c b/examples/watcher/wdt.c
index ccfbeaa98..667240dee 100644
--- a/examples/watcher/wdt.c
+++ b/examples/watcher/wdt.c
@@ -32,7 +32,7 @@
#include <string.h>
#include <errno.h>
#include <fcntl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <sys/ioctl.h>
#include <unistd.h>
diff --git a/examples/webserver/webserver_main.c b/examples/webserver/webserver_main.c
index 7a16c8c45..8309f59c8 100644
--- a/examples/webserver/webserver_main.c
+++ b/examples/webserver/webserver_main.c
@@ -51,7 +51,7 @@
#include <string.h>
#include <unistd.h>
#include <time.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <net/if.h>
#include <netinet/in.h>
diff --git a/examples/wgetjson/wgetjson_main.c b/examples/wgetjson/wgetjson_main.c
index 860a0fb5b..083d68e93 100644
--- a/examples/wgetjson/wgetjson_main.c
+++ b/examples/wgetjson/wgetjson_main.c
@@ -34,7 +34,7 @@
#include <unistd.h>
#include <string.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "netutils/netlib.h"
#include "netutils/webclient.h"
diff --git a/examples/ws2812/ws2812_main.c b/examples/ws2812/ws2812_main.c
index 438e68f11..ebb16b575 100644
--- a/examples/ws2812/ws2812_main.c
+++ b/examples/ws2812/ws2812_main.c
@@ -26,7 +26,7 @@
#include <nuttx/config.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <fcntl.h>
#include <inttypes.h>
@@ -77,7 +77,7 @@ static void help(FAR struct neo_config_s *conf)
printf("\nArguments are \"sticky\". "
"For example, once the device path is\n");
- printf("specified, that path will be re-used until it is changed.\n");
+ printf("specified, that path will be reused until it is changed.\n");
printf(" [-p path] selects the ws2812 device. "
"Default: %s Current: %s\n",
diff --git a/examples/ws2812esp32rmt/ws2812esp32rmt_main.c b/examples/ws2812esp32rmt/ws2812esp32rmt_main.c
index 3f451436e..7eb8dd6fe 100644
--- a/examples/ws2812esp32rmt/ws2812esp32rmt_main.c
+++ b/examples/ws2812esp32rmt/ws2812esp32rmt_main.c
@@ -26,7 +26,7 @@
#include <nuttx/config.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <fcntl.h>
#include <inttypes.h>
diff --git a/examples/xmlrpc/xmlrpc_main.c b/examples/xmlrpc/xmlrpc_main.c
index feeb0bf4e..0d90626e5 100644
--- a/examples/xmlrpc/xmlrpc_main.c
+++ b/examples/xmlrpc/xmlrpc_main.c
@@ -52,7 +52,7 @@
* Included Files
****************************************************************************/
-#include <debug.h>
+#include <nuttx/debug.h>
#include <sys/select.h>
#include <sys/socket.h>
#include <sys/time.h>
diff --git a/examples/zerocross/zerocross_main.c b/examples/zerocross/zerocross_main.c
index d2f49fa5b..2b6da5b62 100644
--- a/examples/zerocross/zerocross_main.c
+++ b/examples/zerocross/zerocross_main.c
@@ -32,7 +32,7 @@
#include <stdlib.h>
#include <fcntl.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <unistd.h>
#include <nuttx/sensors/zerocross.h>
diff --git a/fsutils/flash_eraseall/flash_eraseall.c b/fsutils/flash_eraseall/flash_eraseall.c
index 2dde3a1ee..f7462c152 100644
--- a/fsutils/flash_eraseall/flash_eraseall.c
+++ b/fsutils/flash_eraseall/flash_eraseall.c
@@ -30,7 +30,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/mtd/mtd.h>
#include "fsutils/flash_eraseall.h"
diff --git a/fsutils/flashtool/flashtool_main.c b/fsutils/flashtool/flashtool_main.c
index 8e4f288f3..b1f7f29a4 100644
--- a/fsutils/flashtool/flashtool_main.c
+++ b/fsutils/flashtool/flashtool_main.c
@@ -29,7 +29,7 @@
#include <stdlib.h>
#include <getopt.h>
#include <fcntl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <ctype.h>
diff --git a/fsutils/inifile/inifile.c b/fsutils/inifile/inifile.c
index 16c9da6af..8bb52326b 100644
--- a/fsutils/inifile/inifile.c
+++ b/fsutils/inifile/inifile.c
@@ -29,7 +29,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <strings.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "fsutils/inifile.h"
diff --git a/fsutils/ipcfg/ipcfg.c b/fsutils/ipcfg/ipcfg.c
index c1d4f9f9d..9f6deab5b 100644
--- a/fsutils/ipcfg/ipcfg.c
+++ b/fsutils/ipcfg/ipcfg.c
@@ -29,7 +29,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "fsutils/ipcfg.h"
#include "ipcfg.h"
diff --git a/fsutils/ipcfg/ipcfg_binary.c b/fsutils/ipcfg/ipcfg_binary.c
index 0247a4e88..c12a7ada4 100644
--- a/fsutils/ipcfg/ipcfg_binary.c
+++ b/fsutils/ipcfg/ipcfg_binary.c
@@ -31,7 +31,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "fsutils/ipcfg.h"
#include "ipcfg.h"
@@ -154,7 +154,7 @@ static int ipcfg_read_binary(int fd, FAR void *buffer, size_t nbytes)
* Input Parameters:
* fd - File descriptor of the open file to write to
* buffer - Location to write to
- * nbytes - Number of bytes to wrtie
+ * nbytes - Number of bytes to write
*
* Returned Value:
* Zero is returned on success; a negated errno value is returned on any
@@ -265,7 +265,7 @@ static int ipcfg_find_binary(int fd, sa_family_t af)
*
* Input Parameters:
* path - The full path to the IP configuration file
- * ipv4cfg - Location to read IPv4 configration to
+ * ipv4cfg - Location to read IPv4 configuration to
*
* Returned Value:
* Zero is returned on success; a negated errno value is returned on any
@@ -316,7 +316,7 @@ errout_with_fd:
*
* Input Parameters:
* path - The full path to the IP configuration file
- * ipv6cfg - Location to read IPv6 configration to
+ * ipv6cfg - Location to read IPv6 configuration to
*
* Returned Value:
* Zero is returned on success; a negated errno value is returned on any
@@ -367,7 +367,7 @@ errout_with_fd:
*
* Input Parameters:
* path - The full path to the IP configuration file
- * ipv4cfg - The IPv4 configration to write
+ * ipv4cfg - The IPv4 configuration to write
*
* Returned Value:
* Zero is returned on success; a negated errno value is returned on any
@@ -474,7 +474,7 @@ errout_with_fd:
*
* Input Parameters:
* path - The full path to the IP configuration file
- * ipv6cfg - The IPv6 configration to write
+ * ipv6cfg - The IPv6 configuration to write
*
* Returned Value:
* Zero is returned on success; a negated errno value is returned on any
diff --git a/fsutils/ipcfg/ipcfg_text.c b/fsutils/ipcfg/ipcfg_text.c
index 738bde088..f0e64f8e8 100644
--- a/fsutils/ipcfg/ipcfg_text.c
+++ b/fsutils/ipcfg/ipcfg_text.c
@@ -31,7 +31,7 @@
#include <unistd.h>
#include <ctype.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <arpa/inet.h>
@@ -238,7 +238,7 @@ static int ipcfg_put_ipv6addr(FAR FILE *stream, FAR const char *variable,
*
* Input Parameters:
* stream - Stream of the open file to write to
- * ipv4cfg - The IPv4 configration to write
+ * ipv4cfg - The IPv4 configuration to write
*
* Returned Value:
* Zero is returned on success; a negated errno value is returned on any
@@ -278,7 +278,7 @@ static int ipcfg_write_ipv4(FAR FILE *stream,
*
* Input Parameters:
* stream - Stream of the open file to write to
- * ipv6cfg - The IPv6 configration to write
+ * ipv6cfg - The IPv6 configuration to write
*
* Returned Value:
* Zero is returned on success; a negated errno value is returned on any
@@ -322,7 +322,7 @@ static int ipcfg_write_ipv6(FAR FILE *stream,
* Input Parameters:
* path - The full path to the IP configuration file
* netdev - Network device name string
- * ipv4cfg - Location to read IPv4 configration to
+ * ipv4cfg - Location to read IPv4 configuration to
*
* Returned Value:
* Zero is returned on success; a negated errno value is returned on any
@@ -473,7 +473,7 @@ int ipcfg_read_text_ipv4(FAR const char *path, FAR const char *netdev,
* Input Parameters:
* path - The full path to the IP configuration file
* netdev - Network device name string
- * ipv6cfg - Location to read IPv6 configration to
+ * ipv6cfg - Location to read IPv6 configuration to
*
* Returned Value:
* Zero is returned on success; a negated errno value is returned on any
@@ -639,7 +639,7 @@ int ipcfg_read_text_ipv6(FAR const char *path, FAR const char *netdev,
* Input Parameters:
* path - The full path to the IP configuration file
* netdev - Network device name string
- * ipv4cfg - The IPv4 configration to write
+ * ipv4cfg - The IPv4 configuration to write
*
* Returned Value:
* Zero is returned on success; a negated errno value is returned on any
@@ -726,7 +726,7 @@ int ipcfg_write_text_ipv4(FAR const char *path, FAR const char *netdev,
* Input Parameters:
* path - The full path to the IP configuration file
* netdev - Network device name string
- * ipv6cfg - The IPv6 configration to write
+ * ipv6cfg - The IPv6 configuration to write
*
* Returned Value:
* Zero is returned on success; a negated errno value is returned on any
diff --git a/fsutils/mkfatfs/configfat.c b/fsutils/mkfatfs/configfat.c
index cb6d41da4..a3550cf7a 100644
--- a/fsutils/mkfatfs/configfat.c
+++ b/fsutils/mkfatfs/configfat.c
@@ -29,7 +29,7 @@
#include <inttypes.h>
#include <stdint.h>
#include <string.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include "fsutils/mkfatfs.h"
diff --git a/fsutils/mkfatfs/mkfatfs.c b/fsutils/mkfatfs/mkfatfs.c
index 2bf7e56b8..8b2227e02 100644
--- a/fsutils/mkfatfs/mkfatfs.c
+++ b/fsutils/mkfatfs/mkfatfs.c
@@ -31,7 +31,7 @@
#include <stdlib.h>
#include <fcntl.h>
#include <string.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <unistd.h>
diff --git a/fsutils/mkfatfs/writefat.c b/fsutils/mkfatfs/writefat.c
index d88e0bbb7..01837d05c 100644
--- a/fsutils/mkfatfs/writefat.c
+++ b/fsutils/mkfatfs/writefat.c
@@ -31,7 +31,7 @@
#include <stdint.h>
#include <string.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <unistd.h>
#include <nuttx/fs/fat.h>
@@ -206,7 +206,7 @@ static inline void mkfatfs_initmbr(FAR struct fat_format_s *fmt,
/* The following fields are only valid for FAT12/16 */
- /* 1@36: Drive number for MSDOS bootstrap -- left zero */
+ /* 1@36: Drive number for MS-DOS bootstrap -- left zero */
/* 1@37: Reserved (zero) */
@@ -268,7 +268,7 @@ static inline void mkfatfs_initmbr(FAR struct fat_format_s *fmt,
/* 12@52: Reserved (zero) */
- /* 1@64: Drive number for MSDOS bootstrap -- left zero */
+ /* 1@64: Drive number for MS-DOS bootstrap -- left zero */
/* 1@65: Reserved (zero) */
diff --git a/fsutils/mkgpt/mkgpt.c b/fsutils/mkgpt/mkgpt.c
index e7621fab0..994902067 100644
--- a/fsutils/mkgpt/mkgpt.c
+++ b/fsutils/mkgpt/mkgpt.c
@@ -32,7 +32,7 @@
#include <stdint.h>
#include <unistd.h>
#include <string.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
diff --git a/graphics/ft80x/ft80x.h b/graphics/ft80x/ft80x.h
index 6462f1ce1..64254691c 100644
--- a/graphics/ft80x/ft80x.h
+++ b/graphics/ft80x/ft80x.h
@@ -32,7 +32,7 @@
#include <stdio.h>
#include <stdint.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#ifdef CONFIG_GRAPHICS_FT80X
diff --git a/graphics/input/generator/input_gen_ctx.c b/graphics/input/generator/input_gen_ctx.c
index 6449979fd..ea415e020 100644
--- a/graphics/input/generator/input_gen_ctx.c
+++ b/graphics/input/generator/input_gen_ctx.c
@@ -26,7 +26,7 @@
#include <nuttx/config.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <stdlib.h>
#include <strings.h>
diff --git a/graphics/input/generator/input_gen_dev.c b/graphics/input/generator/input_gen_dev.c
index 117946d9c..9c921107c 100644
--- a/graphics/input/generator/input_gen_dev.c
+++ b/graphics/input/generator/input_gen_dev.c
@@ -26,7 +26,7 @@
#include <nuttx/config.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <sys/file.h>
#include <sys/ioctl.h>
diff --git a/graphics/input/generator/input_gen_event.c b/graphics/input/generator/input_gen_event.c
index 64637bb85..51219d51b 100644
--- a/graphics/input/generator/input_gen_event.c
+++ b/graphics/input/generator/input_gen_event.c
@@ -26,7 +26,7 @@
#include <nuttx/config.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <stdint.h>
#include <unistd.h>
diff --git a/graphics/nxwidgets/UnitTests/CButton/cbutton_main.cxx b/graphics/nxwidgets/UnitTests/CButton/cbutton_main.cxx
index 472348ba5..663048593 100644
--- a/graphics/nxwidgets/UnitTests/CButton/cbutton_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CButton/cbutton_main.cxx
@@ -29,7 +29,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CButton/cbuttontest.cxx b/graphics/nxwidgets/UnitTests/CButton/cbuttontest.cxx
index 773f0435e..c7628b41a 100644
--- a/graphics/nxwidgets/UnitTests/CButton/cbuttontest.cxx
+++ b/graphics/nxwidgets/UnitTests/CButton/cbuttontest.cxx
@@ -29,7 +29,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CButton/cbuttontest.hxx b/graphics/nxwidgets/UnitTests/CButton/cbuttontest.hxx
index 8b1749d88..608e77929 100644
--- a/graphics/nxwidgets/UnitTests/CButton/cbuttontest.hxx
+++ b/graphics/nxwidgets/UnitTests/CButton/cbuttontest.hxx
@@ -32,7 +32,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx
index 8af3de7d1..51a09a16c 100644
--- a/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx
@@ -31,7 +31,7 @@
#include <cstdlib>
#include <malloc.h>
#include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx
index a19c6f880..e84caf02f 100644
--- a/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx
+++ b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.cxx
@@ -29,7 +29,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx
index a13783bd5..0d69a2838 100644
--- a/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx
+++ b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarraytest.hxx
@@ -32,7 +32,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx
index 8719611ba..087e31499 100644
--- a/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx
@@ -32,7 +32,7 @@
#include <cstring>
#include <malloc.h>
#include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.cxx b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.cxx
index 1ff5a0a53..8f8398324 100644
--- a/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.cxx
+++ b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.cxx
@@ -29,7 +29,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.hxx b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.hxx
index 1bd72dba5..205884f47 100644
--- a/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.hxx
+++ b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckboxtest.hxx
@@ -32,7 +32,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx
index ec673c5f2..01081b38e 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx
@@ -32,7 +32,7 @@
#include <cstring>
#include <malloc.h>
#include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx
index f46468626..acee748fa 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx
+++ b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.cxx
@@ -29,7 +29,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx
index d7593734f..89884872f 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx
+++ b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbuttontest.hxx
@@ -32,7 +32,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <sys/param.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx
index e40c78be7..59546fa73 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx
@@ -32,7 +32,7 @@
#include <cstring>
#include <malloc.h>
#include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx
index 2809bfb26..a9e38f00a 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx
+++ b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx
@@ -29,7 +29,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx
index c3fd43ecc..0d563eecb 100644
--- a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx
+++ b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx
@@ -32,7 +32,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx b/graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx
index 3423d6e74..339627a74 100644
--- a/graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx
@@ -32,7 +32,7 @@
#include <cstring>
#include <malloc.h>
#include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CImage/cimagetest.cxx b/graphics/nxwidgets/UnitTests/CImage/cimagetest.cxx
index 2472f19f2..9eedd8aa4 100644
--- a/graphics/nxwidgets/UnitTests/CImage/cimagetest.cxx
+++ b/graphics/nxwidgets/UnitTests/CImage/cimagetest.cxx
@@ -29,7 +29,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CImage/cimagetest.hxx b/graphics/nxwidgets/UnitTests/CImage/cimagetest.hxx
index 34568a5f4..99970b6f1 100644
--- a/graphics/nxwidgets/UnitTests/CImage/cimagetest.hxx
+++ b/graphics/nxwidgets/UnitTests/CImage/cimagetest.hxx
@@ -32,7 +32,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx b/graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx
index bfd5dfd2c..9e9d4b269 100644
--- a/graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx
@@ -31,7 +31,7 @@
#include <cstdlib>
#include <malloc.h>
#include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.cxx b/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.cxx
index 64cf7c366..a51555e44 100644
--- a/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.cxx
+++ b/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.cxx
@@ -29,7 +29,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.hxx b/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.hxx
index f566d8bcd..783fb0b52 100644
--- a/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.hxx
+++ b/graphics/nxwidgets/UnitTests/CKeypad/ckeypadtest.hxx
@@ -32,7 +32,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CLabel/clabel_main.cxx b/graphics/nxwidgets/UnitTests/CLabel/clabel_main.cxx
index bed815541..c822abf1a 100644
--- a/graphics/nxwidgets/UnitTests/CLabel/clabel_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CLabel/clabel_main.cxx
@@ -29,7 +29,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CLabel/clabeltest.cxx b/graphics/nxwidgets/UnitTests/CLabel/clabeltest.cxx
index 1851674ad..1b439125f 100644
--- a/graphics/nxwidgets/UnitTests/CLabel/clabeltest.cxx
+++ b/graphics/nxwidgets/UnitTests/CLabel/clabeltest.cxx
@@ -29,7 +29,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CLabel/clabeltest.hxx b/graphics/nxwidgets/UnitTests/CLabel/clabeltest.hxx
index 57ccc1f0d..317a08bec 100644
--- a/graphics/nxwidgets/UnitTests/CLabel/clabeltest.hxx
+++ b/graphics/nxwidgets/UnitTests/CLabel/clabeltest.hxx
@@ -32,7 +32,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CLatchButton/clatchbutton_main.cxx b/graphics/nxwidgets/UnitTests/CLatchButton/clatchbutton_main.cxx
index ca0310ae2..0663f74c3 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButton/clatchbutton_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CLatchButton/clatchbutton_main.cxx
@@ -29,7 +29,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.cxx b/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.cxx
index 58fe9b6a1..a8dbe2603 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.cxx
+++ b/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.cxx
@@ -29,7 +29,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.hxx b/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.hxx
index 71946d325..641ccb9ec 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.hxx
+++ b/graphics/nxwidgets/UnitTests/CLatchButton/clatchbuttontest.hxx
@@ -32,7 +32,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx
index fd6dcbeb0..a1e713660 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx
@@ -31,7 +31,7 @@
#include <cstdlib>
#include <malloc.h>
#include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx
index 3da02db99..146f9172a 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx
+++ b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.cxx
@@ -29,7 +29,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx
index 212d512a7..9ebfed210 100644
--- a/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx
+++ b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarraytest.hxx
@@ -32,7 +32,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx b/graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx
index 45864f1e5..c9bb459ed 100644
--- a/graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx
@@ -32,7 +32,7 @@
#include <cstring>
#include <malloc.h>
#include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.cxx b/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.cxx
index 7bd3836de..b81fff628 100644
--- a/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.cxx
+++ b/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.cxx
@@ -29,7 +29,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.hxx b/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.hxx
index 452240dc9..7171c26cd 100644
--- a/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.hxx
+++ b/graphics/nxwidgets/UnitTests/CListBox/clistboxtest.hxx
@@ -32,7 +32,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx
index d5c5d4b9f..3df02715f 100644
--- a/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx
@@ -32,7 +32,7 @@
#include <cstring>
#include <malloc.h>
#include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.cxx b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.cxx
index 11ad6bb07..537774ea8 100644
--- a/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.cxx
+++ b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.cxx
@@ -29,7 +29,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.hxx b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.hxx
index dd8dcf103..657da3d8e 100644
--- a/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.hxx
+++ b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbartest.hxx
@@ -32,7 +32,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx
index fd0c13b40..b093382a1 100644
--- a/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx
@@ -32,7 +32,7 @@
#include <cstring>
#include <malloc.h>
#include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.cxx b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.cxx
index 683dc02dc..5d0be7bb5 100644
--- a/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.cxx
+++ b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.cxx
@@ -29,7 +29,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.hxx b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.hxx
index fc8d7ee29..8a5c1f0df 100644
--- a/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.hxx
+++ b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobuttontest.hxx
@@ -32,7 +32,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx
index 51ea0e6e2..2429a75d1 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx
@@ -32,7 +32,7 @@
#include <cstring>
#include <malloc.h>
#include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx
index e59f0fe3b..21501c125 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx
+++ b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.cxx
@@ -29,7 +29,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx
index c8b31b392..b53d318d5 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx
+++ b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontaltest.hxx
@@ -32,7 +32,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx
index 04664b08b..9497febe5 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx
@@ -32,7 +32,7 @@
#include <cstring>
#include <malloc.h>
#include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx
index bbf21f2c2..8770f5df4 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx
+++ b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.cxx
@@ -29,7 +29,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx
index 159fb3bf2..fc062fed2 100644
--- a/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx
+++ b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarverticaltest.hxx
@@ -32,7 +32,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx
index 9b8f21b54..6c122a20b 100644
--- a/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx
@@ -32,7 +32,7 @@
#include <cstring>
#include <malloc.h>
#include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx
index 8a9e19496..5dd3880f7 100644
--- a/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx
+++ b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.cxx
@@ -29,7 +29,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx
index 538af2daf..9f9297399 100644
--- a/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx
+++ b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontaltest.hxx
@@ -32,7 +32,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx b/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx
index 40872745c..2d109b35a 100644
--- a/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx
@@ -32,7 +32,7 @@
#include <cstring>
#include <malloc.h>
#include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.cxx b/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.cxx
index efad3275e..aa2241764 100644
--- a/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.cxx
+++ b/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.cxx
@@ -29,7 +29,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx b/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx
index 7bad5e81d..0bac9b3d6 100644
--- a/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx
+++ b/graphics/nxwidgets/UnitTests/CSliderVertical/csliderverticaltest.hxx
@@ -32,7 +32,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CTextBox/ctextbox_main.cxx b/graphics/nxwidgets/UnitTests/CTextBox/ctextbox_main.cxx
index 92de3dd85..ef9a5e362 100644
--- a/graphics/nxwidgets/UnitTests/CTextBox/ctextbox_main.cxx
+++ b/graphics/nxwidgets/UnitTests/CTextBox/ctextbox_main.cxx
@@ -29,7 +29,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.cxx b/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.cxx
index 4d0fad790..d34d937b9 100644
--- a/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.cxx
+++ b/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.cxx
@@ -30,7 +30,7 @@
#include <cstdio>
#include <cerrno>
#include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxfonts.h>
diff --git a/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.hxx b/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.hxx
index 427824422..21e994d74 100644
--- a/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.hxx
+++ b/graphics/nxwidgets/UnitTests/CTextBox/ctextboxtest.hxx
@@ -32,7 +32,7 @@
#include <nuttx/init.h>
#include <cstdio>
#include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/nxwidgets/src/ccallback.cxx b/graphics/nxwidgets/src/ccallback.cxx
index 510f55161..f07deaf93 100644
--- a/graphics/nxwidgets/src/ccallback.cxx
+++ b/graphics/nxwidgets/src/ccallback.cxx
@@ -34,7 +34,7 @@
#include <stdint.h>
#include <stdbool.h>
#include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <cassert>
#include <cerrno>
@@ -308,7 +308,7 @@ void CCallback::newKeyboardEvent(NXHANDLE hwnd, uint8_t nCh,
* NXEVENT_SYCNCHED - Synchronization handshake
*
* This completes the handshake started by nx_synch(). nx_synch()
- * sends a syncrhonization messages to the NX server which responds
+ * sends a synchronization message to the NX server which responds
* with this event. The sleeping client is awakened and continues
* graphics processing, completing the handshake.
*
diff --git a/graphics/nxwidgets/src/cgraphicsport.cxx b/graphics/nxwidgets/src/cgraphicsport.cxx
index 2e299162d..ffe56033e 100644
--- a/graphics/nxwidgets/src/cgraphicsport.cxx
+++ b/graphics/nxwidgets/src/cgraphicsport.cxx
@@ -64,7 +64,7 @@
#include <stdint.h>
#include <stdbool.h>
#include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nxglib.h>
#include <nuttx/video/rgbcolors.h>
diff --git a/graphics/nxwidgets/src/cimage.cxx b/graphics/nxwidgets/src/cimage.cxx
index a500c3b4e..337b7fea4 100644
--- a/graphics/nxwidgets/src/cimage.cxx
+++ b/graphics/nxwidgets/src/cimage.cxx
@@ -62,7 +62,7 @@
#include <stdint.h>
#include <stdbool.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nxglib.h>
diff --git a/graphics/nxwidgets/src/clabelgrid.cxx b/graphics/nxwidgets/src/clabelgrid.cxx
index 6302f4c6a..175535bba 100644
--- a/graphics/nxwidgets/src/clabelgrid.cxx
+++ b/graphics/nxwidgets/src/clabelgrid.cxx
@@ -59,7 +59,7 @@
****************************************************************************/
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "graphics/nxwidgets/clabelgrid.hxx"
#include "graphics/nxwidgets/clabel.hxx"
diff --git a/graphics/nxwidgets/src/cnumericedit.cxx b/graphics/nxwidgets/src/cnumericedit.cxx
index 770f727c7..22556c7d8 100644
--- a/graphics/nxwidgets/src/cnumericedit.cxx
+++ b/graphics/nxwidgets/src/cnumericedit.cxx
@@ -66,7 +66,7 @@
#include <limits.h>
#include <nuttx/nx/nxglib.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "graphics/nxwidgets/cnumericedit.hxx"
#include "graphics/nxwidgets/cbutton.hxx"
diff --git a/graphics/nxwidgets/src/cnxserver.cxx b/graphics/nxwidgets/src/cnxserver.cxx
index 67ad93332..60f841833 100644
--- a/graphics/nxwidgets/src/cnxserver.cxx
+++ b/graphics/nxwidgets/src/cnxserver.cxx
@@ -37,7 +37,7 @@
#include <cerrno>
#include <sched.h>
#include <pthread.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/board.h>
diff --git a/graphics/nxwidgets/src/cnxtimer.cxx b/graphics/nxwidgets/src/cnxtimer.cxx
index 81ba0da64..dd6be5101 100644
--- a/graphics/nxwidgets/src/cnxtimer.cxx
+++ b/graphics/nxwidgets/src/cnxtimer.cxx
@@ -64,7 +64,7 @@
#include <stdbool.h>
#include <cstring>
#include <ctime>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <nuttx/clock.h>
diff --git a/graphics/nxwidgets/src/cscaledbitmap.cxx b/graphics/nxwidgets/src/cscaledbitmap.cxx
index ec46ca5c4..65f1a372f 100644
--- a/graphics/nxwidgets/src/cscaledbitmap.cxx
+++ b/graphics/nxwidgets/src/cscaledbitmap.cxx
@@ -29,7 +29,7 @@
#include <stdint.h>
#include <stdbool.h>
#include <cstring>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nxglib.h>
@@ -64,7 +64,7 @@ CScaledBitmap::CScaledBitmap(IBitmap *bitmap, struct nxgl_size_s &newSize)
m_xScale = itob16((uint32_t)m_bitmap->getWidth()) / newSize.w;
// Similarly, yScale will be used to convert a request Y position to a Y
- // positionin the contained bitmap:
+ // position in the contained bitmap:
//
// yImage = yRequested * oldHeight / newHeight
// = yRequested * yScale
diff --git a/graphics/nxwidgets/src/cscrollingpanel.cxx b/graphics/nxwidgets/src/cscrollingpanel.cxx
index d369d42fc..80f51c87c 100644
--- a/graphics/nxwidgets/src/cscrollingpanel.cxx
+++ b/graphics/nxwidgets/src/cscrollingpanel.cxx
@@ -62,7 +62,7 @@
#include <stdint.h>
#include <stdbool.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "graphics/nxwidgets/cwidgetcontrol.hxx"
#include "graphics/nxwidgets/cscrollingpanel.hxx"
diff --git a/graphics/nxwidgets/src/cwidgetcontrol.cxx b/graphics/nxwidgets/src/cwidgetcontrol.cxx
index 921b05412..3107d7729 100644
--- a/graphics/nxwidgets/src/cwidgetcontrol.cxx
+++ b/graphics/nxwidgets/src/cwidgetcontrol.cxx
@@ -31,7 +31,7 @@
#include <cstring>
#include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <sched.h>
#include "graphics/nxwidgets/nxconfig.hxx"
diff --git a/graphics/nxwidgets/src/singletons.cxx b/graphics/nxwidgets/src/singletons.cxx
index e6c4da73e..a6e44797c 100644
--- a/graphics/nxwidgets/src/singletons.cxx
+++ b/graphics/nxwidgets/src/singletons.cxx
@@ -64,7 +64,7 @@
#include <stdint.h>
#include <stdbool.h>
#include <sched.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "graphics/nxwidgets/nxconfig.hxx"
#include "graphics/nxwidgets/cnxserver.hxx"
diff --git a/graphics/nxwm/src/ccalibration.cxx b/graphics/nxwm/src/ccalibration.cxx
index 21adb2183..262a9d567 100644
--- a/graphics/nxwm/src/ccalibration.cxx
+++ b/graphics/nxwm/src/ccalibration.cxx
@@ -30,7 +30,7 @@
#include <sched.h>
#include <limits.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <unistd.h>
#ifdef CONFIG_NXWM_TOUCHSCREEN_CONFIGDATA
diff --git a/graphics/nxwm/src/chexcalculator.cxx b/graphics/nxwm/src/chexcalculator.cxx
index e5ab0d9e8..f2cf62018 100644
--- a/graphics/nxwm/src/chexcalculator.cxx
+++ b/graphics/nxwm/src/chexcalculator.cxx
@@ -27,7 +27,7 @@
#include <nuttx/config.h>
#include <cstdio>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "graphics/nxwidgets/cwidgetcontrol.hxx"
diff --git a/graphics/nxwm/src/ckeyboard.cxx b/graphics/nxwm/src/ckeyboard.cxx
index 20dcc44cc..7afb0b0ae 100644
--- a/graphics/nxwm/src/ckeyboard.cxx
+++ b/graphics/nxwm/src/ckeyboard.cxx
@@ -32,7 +32,7 @@
#include <sched.h>
#include <pthread.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <unistd.h>
#include "graphics/nxwm/nxwmconfig.hxx"
@@ -188,7 +188,7 @@ int CKeyboard::open(void)
if (errcode == ENOENT || errcode == ENODEV)
{
- // REVIST: Can we inject a constant string here to let the
+ // REVISIT: Can we inject a constant string here to let the
// user know that we are waiting for a USB keyboard to be
// connected?
diff --git a/graphics/nxwm/src/cmediaplayer.cxx b/graphics/nxwm/src/cmediaplayer.cxx
index bcfb95718..8561eb469 100644
--- a/graphics/nxwm/src/cmediaplayer.cxx
+++ b/graphics/nxwm/src/cmediaplayer.cxx
@@ -33,7 +33,7 @@
#include <cerrno>
#include <strings.h>
#include <dirent.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "system/nxplayer.h"
#include <nuttx/audio/audio.h>
diff --git a/graphics/nxwm/src/cnxterm.cxx b/graphics/nxwm/src/cnxterm.cxx
index 0c4d20455..40bc5997b 100644
--- a/graphics/nxwm/src/cnxterm.cxx
+++ b/graphics/nxwm/src/cnxterm.cxx
@@ -35,7 +35,7 @@
#include <semaphore.h>
#include <sched.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <unistd.h>
#include "nshlib/nshlib.h"
diff --git a/graphics/nxwm/src/ctaskbar.cxx b/graphics/nxwm/src/ctaskbar.cxx
index d66d36850..7160b93d9 100644
--- a/graphics/nxwm/src/ctaskbar.cxx
+++ b/graphics/nxwm/src/ctaskbar.cxx
@@ -26,7 +26,7 @@
#include <nuttx/config.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nxglib.h>
@@ -617,7 +617,7 @@ bool CTaskbar::maximizeApplication(IApplication *app)
/**
* Minimize an application by moving its window to the bottom of the and
- * redrawing the next visible appliation.
+ * redrawing the next visible application.
*
* @param app. The new application to add to the task bar
* @return true on success
diff --git a/graphics/nxwm/src/ctouchscreen.cxx b/graphics/nxwm/src/ctouchscreen.cxx
index bbebc0f7a..b7807c710 100644
--- a/graphics/nxwm/src/ctouchscreen.cxx
+++ b/graphics/nxwm/src/ctouchscreen.cxx
@@ -34,7 +34,7 @@
#include <sched.h>
#include <pthread.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <unistd.h>
#include <nuttx/nx/nxglib.h>
@@ -181,7 +181,7 @@ void CTouchscreen::setCalibrationData(const struct SCalibrationData &caldata)
m_calibData = caldata;
// Note that we have calibration data. Data will now be scaled and forwarded
- // to NX (unless we are still in cpature mode)
+ // to NX (unless we are still in capture mode)
m_calibrated = true;
@@ -205,7 +205,7 @@ bool CTouchscreen::waitRawTouchData(struct touch_sample_s *touch)
{
_info("Capturing touch input\n");
- // Setup to cpature raw data into the user provided buffer
+ // Setup to capture raw data into the user provided buffer
sched_lock();
m_touch = touch;
diff --git a/graphics/nxwm/src/cwindowmessenger.cxx b/graphics/nxwm/src/cwindowmessenger.cxx
index 8761e4799..92a2ba91a 100644
--- a/graphics/nxwm/src/cwindowmessenger.cxx
+++ b/graphics/nxwm/src/cwindowmessenger.cxx
@@ -28,7 +28,7 @@
#include <cerrno>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <fcntl.h>
#include "graphics/nxwm/nxwmconfig.hxx"
diff --git a/graphics/slcd/cslcd.cxx b/graphics/slcd/cslcd.cxx
index 8f7320e1e..f732b8e42 100644
--- a/graphics/slcd/cslcd.cxx
+++ b/graphics/slcd/cslcd.cxx
@@ -25,7 +25,7 @@
/////////////////////////////////////////////////////////////////////////////
#include <fixedmath.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nx.h>
diff --git a/graphics/tiff/tiff_addstrip.c b/graphics/tiff/tiff_addstrip.c
index ff4a9d598..5db952088 100644
--- a/graphics/tiff/tiff_addstrip.c
+++ b/graphics/tiff/tiff_addstrip.c
@@ -28,7 +28,7 @@
#include <assert.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "graphics/tiff.h"
diff --git a/graphics/tiff/tiff_finalize.c b/graphics/tiff/tiff_finalize.c
index 2ad01a06e..da49343c9 100644
--- a/graphics/tiff/tiff_finalize.c
+++ b/graphics/tiff/tiff_finalize.c
@@ -29,7 +29,7 @@
#include <unistd.h>
#include <assert.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "graphics/tiff.h"
diff --git a/graphics/tiff/tiff_initialize.c b/graphics/tiff/tiff_initialize.c
index b6de8408d..263f650cf 100644
--- a/graphics/tiff/tiff_initialize.c
+++ b/graphics/tiff/tiff_initialize.c
@@ -32,7 +32,7 @@
#include <time.h>
#include <assert.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "graphics/tiff.h"
@@ -68,7 +68,7 @@
* 172 XResolution Hard-coded to 300/1
* 180 YResolution Hard-coded to 300/1
* 188 "NuttX" Length = 6 (including NUL terminator)
- * 194 "YYYY:MM:DD HH:MM:SS" Length = 20 (ncluding NUL terminator)
+ * 194 "YYYY:MM:DD HH:MM:SS" Length = 20 (including NUL terminator)
* 214 [2 bytes padding]
* 216 StripByteCounts Beginning of strip byte counts
* xxx StripOffsets Beginning of strip offsets
@@ -121,7 +121,7 @@
* 184 XResolution Hard-coded to 300/1
* 192 YResolution Hard-coded to 300/1
* 200 "NuttX" Length = 6 (including NUL terminator)
- * 206 "YYYY:MM:DD HH:MM:SS" Length = 20 (ncluding NUL terminator)
+ * 206 "YYYY:MM:DD HH:MM:SS" Length = 20 (including NUL terminator)
* 226 [2 bytes padding]
* 228 StripByteCounts Beginning of strip byte counts
* xxx StripOffsets Beginning of strip offsets
@@ -170,7 +170,7 @@
* 212 BitsPerSample 8, 8, 8
* 218 [2 bytes padding]
* 220 "NuttX" Length = 6 (including NUL terminator)
- * 226 "YYYY:MM:DD HH:MM:SS" Length = 20 (ncluding NUL terminator)
+ * 226 "YYYY:MM:DD HH:MM:SS" Length = 20 (including NUL terminator)
* 246 [2 bytes padding]
* 248 StripByteCounts Beginning of strip byte counts
* xxx StripOffsets Beginning of strip offsets
@@ -410,7 +410,7 @@ static int tiff_datetime(FAR char *timbuf, unsigned int buflen)
gmtime_r((FAR const time_t*)&ts.tv_sec, &tm);
- /* Comvert the current time in the TIFF format */
+ /* Convert the current time to TIFF format */
strftime(timbuf, buflen, TIFF_DATETIME_FORMAT, &tm);
return OK;
diff --git a/graphics/tiff/tiff_utils.c b/graphics/tiff/tiff_utils.c
index c16f7b3e3..17e72689b 100644
--- a/graphics/tiff/tiff_utils.c
+++ b/graphics/tiff/tiff_utils.c
@@ -30,7 +30,7 @@
#include <unistd.h>
#include <assert.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "graphics/tiff.h"
@@ -335,7 +335,7 @@ int tiff_putstring(int fd, FAR const char *string, int len)
* Name: tiff_wordalign
*
* Description:
- * Pad a file with zeros as necessary to achieve word alignament.
+ * Pad a file with zeros as necessary to achieve word alignment.
*
* Input Parameters:
* fd - File descriptor to be used.
diff --git a/graphics/twm4nx/apps/ccalibration.cxx b/graphics/twm4nx/apps/ccalibration.cxx
index 7eab8067a..40317cdb6 100644
--- a/graphics/twm4nx/apps/ccalibration.cxx
+++ b/graphics/twm4nx/apps/ccalibration.cxx
@@ -32,7 +32,7 @@
#include <limits.h>
#include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <sched.h>
#include <unistd.h>
diff --git a/graphics/twm4nx/apps/cclock.cxx b/graphics/twm4nx/apps/cclock.cxx
index 55c6c3e34..e9d3b55bd 100644
--- a/graphics/twm4nx/apps/cclock.cxx
+++ b/graphics/twm4nx/apps/cclock.cxx
@@ -31,7 +31,7 @@
#include <cassert>
#include <semaphore.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <sched.h>
#include <unistd.h>
diff --git a/graphics/twm4nx/apps/cnxterm.cxx b/graphics/twm4nx/apps/cnxterm.cxx
index 1918775a8..a36edc4db 100644
--- a/graphics/twm4nx/apps/cnxterm.cxx
+++ b/graphics/twm4nx/apps/cnxterm.cxx
@@ -34,7 +34,7 @@
#include <sys/boardctl.h>
#include <semaphore.h>
#include <fcntl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <unistd.h>
#include "nshlib/nshlib.h"
diff --git a/graphics/twm4nx/src/cmainmenu.cxx b/graphics/twm4nx/src/cmainmenu.cxx
index 2c2034f3b..e2b9c1992 100644
--- a/graphics/twm4nx/src/cmainmenu.cxx
+++ b/graphics/twm4nx/src/cmainmenu.cxx
@@ -27,7 +27,7 @@
#include <nuttx/config.h>
#include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <graphics/nxwidgets/cnxstring.hxx>
diff --git a/include/graphics/nxwidgets/cscaledbitmap.hxx b/include/graphics/nxwidgets/cscaledbitmap.hxx
index b2cc5f577..f175dd6ee 100644
--- a/include/graphics/nxwidgets/cscaledbitmap.hxx
+++ b/include/graphics/nxwidgets/cscaledbitmap.hxx
@@ -32,7 +32,7 @@
#include <stdint.h>
#include <stdbool.h>
#include <fixedmath.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/video/rgbcolors.h>
#include <nuttx/nx/nxglib.h>
diff --git a/include/graphics/nxwm/cstartwindow.hxx b/include/graphics/nxwm/cstartwindow.hxx
index fb4fb2acb..2c1d0178a 100644
--- a/include/graphics/nxwm/cstartwindow.hxx
+++ b/include/graphics/nxwm/cstartwindow.hxx
@@ -29,7 +29,7 @@
#include <nuttx/config.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "graphics/nxwidgets/tnxarray.hxx"
diff --git a/include/graphics/twm4nx/apps/calib_config.hxx b/include/graphics/twm4nx/apps/calib_config.hxx
index 85abc746a..ffcdfc6a7 100644
--- a/include/graphics/twm4nx/apps/calib_config.hxx
+++ b/include/graphics/twm4nx/apps/calib_config.hxx
@@ -28,7 +28,7 @@
/////////////////////////////////////////////////////////////////////////////
#include <nuttx/config.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "graphics/nxwidgets/nxconfig.hxx"
#include "graphics/twm4nx/twm4nx_config.hxx"
diff --git a/include/graphics/twm4nx/apps/clock_config.hxx b/include/graphics/twm4nx/apps/clock_config.hxx
index b6c059060..2e2db213c 100644
--- a/include/graphics/twm4nx/apps/clock_config.hxx
+++ b/include/graphics/twm4nx/apps/clock_config.hxx
@@ -28,7 +28,7 @@
/////////////////////////////////////////////////////////////////////////////
#include <nuttx/config.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "graphics/nxglyphs.hxx"
#include "graphics/nxwidgets/crlepalettebitmap.hxx"
diff --git a/include/graphics/twm4nx/apps/nxterm_config.hxx b/include/graphics/twm4nx/apps/nxterm_config.hxx
index e90be9b90..2d0661e9e 100644
--- a/include/graphics/twm4nx/apps/nxterm_config.hxx
+++ b/include/graphics/twm4nx/apps/nxterm_config.hxx
@@ -28,7 +28,7 @@
/////////////////////////////////////////////////////////////////////////////
#include <nuttx/config.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "graphics/nxglyphs.hxx"
#include "graphics/nxwidgets/crlepalettebitmap.hxx"
diff --git a/include/graphics/twm4nx/ciconwidget.hxx b/include/graphics/twm4nx/ciconwidget.hxx
index e96b69ca8..e9152fc19 100644
--- a/include/graphics/twm4nx/ciconwidget.hxx
+++ b/include/graphics/twm4nx/ciconwidget.hxx
@@ -32,7 +32,7 @@
#include <cstdint>
#include <cstdbool>
#include <mqueue.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/nx/nxglib.h>
#include <nuttx/nx/nx.h>
diff --git a/include/graphics/twm4nx/twm4nx_config.hxx b/include/graphics/twm4nx/twm4nx_config.hxx
index 679cc887e..60b34d09d 100644
--- a/include/graphics/twm4nx/twm4nx_config.hxx
+++ b/include/graphics/twm4nx/twm4nx_config.hxx
@@ -28,7 +28,7 @@
/////////////////////////////////////////////////////////////////////////////
#include <nuttx/config.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "graphics/nxglyphs.hxx"
#include "graphics/nxwidgets/nxconfig.hxx"
diff --git a/include/netutils/cmux.h b/include/netutils/cmux.h
index 42f0d5ca0..8bbf2e1f0 100644
--- a/include/netutils/cmux.h
+++ b/include/netutils/cmux.h
@@ -29,7 +29,7 @@
#include <sys/time.h>
#include <stdbool.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
/****************************************************************************
diff --git a/industry/foc/fixed16/foc_cordic.c b/industry/foc/fixed16/foc_cordic.c
index fdd4cc059..22af88a46 100644
--- a/industry/foc/fixed16/foc_cordic.c
+++ b/industry/foc/fixed16/foc_cordic.c
@@ -30,7 +30,7 @@
#include <assert.h>
#include <fcntl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <nuttx/math/cordic.h>
diff --git a/industry/foc/float/foc_cordic.c b/industry/foc/float/foc_cordic.c
index f53c05674..d4fe510ff 100644
--- a/industry/foc/float/foc_cordic.c
+++ b/industry/foc/float/foc_cordic.c
@@ -30,7 +30,7 @@
#include <assert.h>
#include <fcntl.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <nuttx/math/cordic.h>
diff --git a/interpreters/python/python_wrapper.c b/interpreters/python/python_wrapper.c
index 1eb1d3cc3..6617bae98 100644
--- a/interpreters/python/python_wrapper.c
+++ b/interpreters/python/python_wrapper.c
@@ -41,7 +41,7 @@
#include <fcntl.h>
#include <dirent.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/drivers/ramdisk.h>
diff --git a/logging/nxscope/nxscope.c b/logging/nxscope/nxscope.c
index f919bf62c..094395dd8 100644
--- a/logging/nxscope/nxscope.c
+++ b/logging/nxscope/nxscope.c
@@ -27,7 +27,7 @@
#include <nuttx/config.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <string.h>
#include <stdlib.h>
@@ -150,7 +150,7 @@ static int nxscope_chinfo_send(FAR struct nxscope_s *s, uint8_t ch)
namelen = strnlen(s->chinfo[ch].name, CHAN_NAMELEN_MAX);
memcpy(&data[tmp], s->chinfo[ch].name, namelen);
- /* Treminate name wit a null-character */
+ /* Terminate name with a null character */
txlen = tmp + namelen + 1;
data[txlen - 1] = '\0';
diff --git a/logging/nxscope/nxscope_chan.c b/logging/nxscope/nxscope_chan.c
index 10c30ad25..a68451f47 100644
--- a/logging/nxscope/nxscope_chan.c
+++ b/logging/nxscope/nxscope_chan.c
@@ -27,7 +27,7 @@
#include <nuttx/config.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <endian.h>
#include <errno.h>
#include <string.h>
diff --git a/logging/nxscope/nxscope_idummy.c b/logging/nxscope/nxscope_idummy.c
index 8615748af..f139ce4dd 100644
--- a/logging/nxscope/nxscope_idummy.c
+++ b/logging/nxscope/nxscope_idummy.c
@@ -27,7 +27,7 @@
#include <nuttx/config.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <stdlib.h>
#include <string.h>
diff --git a/logging/nxscope/nxscope_internals.c b/logging/nxscope/nxscope_internals.c
index 43ffdd610..b001b4187 100644
--- a/logging/nxscope/nxscope_internals.c
+++ b/logging/nxscope/nxscope_internals.c
@@ -27,7 +27,7 @@
#include <nuttx/config.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/logging/nxscope/nxscope_iser.c b/logging/nxscope/nxscope_iser.c
index b1722042b..492617723 100644
--- a/logging/nxscope/nxscope_iser.c
+++ b/logging/nxscope/nxscope_iser.c
@@ -26,7 +26,7 @@
#include <nuttx/config.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/logging/nxscope/nxscope_iudp.c b/logging/nxscope/nxscope_iudp.c
index 07aae7711..5a5e1eed0 100644
--- a/logging/nxscope/nxscope_iudp.c
+++ b/logging/nxscope/nxscope_iudp.c
@@ -26,7 +26,7 @@
#include <nuttx/config.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <fcntl.h>
#include <netinet/in.h>
diff --git a/logging/nxscope/nxscope_pser.c b/logging/nxscope/nxscope_pser.c
index 2d0917d51..2f8d5ad41 100644
--- a/logging/nxscope/nxscope_pser.c
+++ b/logging/nxscope/nxscope_pser.c
@@ -27,7 +27,7 @@
#include <nuttx/config.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <endian.h>
#include <errno.h>
#include <string.h>
@@ -274,7 +274,7 @@ int nxscope_proto_ser_init(FAR struct nxscope_proto_s *proto, FAR void *cfg)
{
DEBUGASSERT(proto);
- /* cfg argument not used, but keept here for compatibility with
+ /* cfg argument not used, but kept here for compatibility with
* future protocol implementations.
*/
diff --git a/lte/alt1250/alt1250_dbg.h b/lte/alt1250/alt1250_dbg.h
index 82b9bb27a..0034bea82 100644
--- a/lte/alt1250/alt1250_dbg.h
+++ b/lte/alt1250/alt1250_dbg.h
@@ -29,7 +29,7 @@
#include <nuttx/config.h>
#include <stdio.h>
-#include <debug.h>
+#include <nuttx/debug.h>
/****************************************************************************
* Pre-processor Definitions
diff --git a/lte/lapi/src/lapi_dbg.h b/lte/lapi/src/lapi_dbg.h
index 403847653..ebe02523a 100644
--- a/lte/lapi/src/lapi_dbg.h
+++ b/lte/lapi/src/lapi_dbg.h
@@ -27,7 +27,7 @@
* Included Files
****************************************************************************/
-#include <debug.h>
+#include <nuttx/debug.h>
/****************************************************************************
* Pre-processor Definitions
diff --git a/netutils/chat/chat.c b/netutils/chat/chat.c
index 3849631df..c1af84ae8 100644
--- a/netutils/chat/chat.c
+++ b/netutils/chat/chat.c
@@ -45,7 +45,7 @@
#include <sys/stat.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <poll.h>
#include <stdio.h>
diff --git a/netutils/cmux/cmux.h b/netutils/cmux/cmux.h
index 470aacfa4..7758f83b5 100644
--- a/netutils/cmux/cmux.h
+++ b/netutils/cmux/cmux.h
@@ -29,7 +29,7 @@
#include <sys/time.h>
#include <stdbool.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#define CMUX_BIT0 (0)
diff --git a/netutils/dhcp6c/dhcp6c.c b/netutils/dhcp6c/dhcp6c.c
index 5418c0a98..3989bee0c 100644
--- a/netutils/dhcp6c/dhcp6c.c
+++ b/netutils/dhcp6c/dhcp6c.c
@@ -36,7 +36,7 @@
#include <resolv.h>
#include <string.h>
#include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <stdlib.h>
#include <stdbool.h>
#include <stdint.h>
diff --git a/netutils/dhcpc/dhcpc.c b/netutils/dhcpc/dhcpc.c
index 003d7d8cb..e899b6930 100644
--- a/netutils/dhcpc/dhcpc.c
+++ b/netutils/dhcpc/dhcpc.c
@@ -48,7 +48,7 @@
#include <string.h>
#include <unistd.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <pthread.h>
#include <arpa/inet.h>
diff --git a/netutils/dhcpd/dhcpd.c b/netutils/dhcpd/dhcpd.c
index a382709a2..a166e9123 100644
--- a/netutils/dhcpd/dhcpd.c
+++ b/netutils/dhcpd/dhcpd.c
@@ -40,7 +40,7 @@
# define OK (0)
#else
# include <nuttx/config.h> /* NuttX configuration */
-# include <debug.h> /* For nerr, info */
+# include <nuttx/debug.h> /* For nerr, info */
# include <nuttx/compiler.h> /* For CONFIG_CPP_HAVE_WARNING */
# include "netutils/dhcpd.h" /* Advertised DHCPD APIs */
#endif
diff --git a/netutils/discover/discover.c b/netutils/discover/discover.c
index 6bb3f675b..ba11fbe87 100644
--- a/netutils/discover/discover.c
+++ b/netutils/discover/discover.c
@@ -24,7 +24,7 @@
* Included Files
****************************************************************************/
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <sched.h>
#include <stdint.h>
diff --git a/netutils/esp8266/esp8266.c b/netutils/esp8266/esp8266.c
index 51de514b7..051dd15fc 100644
--- a/netutils/esp8266/esp8266.c
+++ b/netutils/esp8266/esp8266.c
@@ -39,7 +39,7 @@
#include <termios.h>
#include <assert.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <unistd.h>
#include <netdb.h>
diff --git a/netutils/ftpc/ftpc_chmod.c b/netutils/ftpc/ftpc_chmod.c
index 5710b7c8b..d9b490b0a 100644
--- a/netutils/ftpc/ftpc_chmod.c
+++ b/netutils/ftpc/ftpc_chmod.c
@@ -26,7 +26,7 @@
#include "ftpc_config.h"
-#include <debug.h>
+#include <nuttx/debug.h>
#include "netutils/ftpc.h"
#include "ftpc_internal.h"
diff --git a/netutils/ftpc/ftpc_cmd.c b/netutils/ftpc/ftpc_cmd.c
index b6b7556b5..1e3ff9ea8 100644
--- a/netutils/ftpc/ftpc_cmd.c
+++ b/netutils/ftpc/ftpc_cmd.c
@@ -30,7 +30,7 @@
#include <strings.h>
#include <stdarg.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "ftpc_internal.h"
diff --git a/netutils/ftpc/ftpc_connect.c b/netutils/ftpc/ftpc_connect.c
index 8624f4905..61defa614 100644
--- a/netutils/ftpc/ftpc_connect.c
+++ b/netutils/ftpc/ftpc_connect.c
@@ -30,7 +30,7 @@
#include <unistd.h>
#include <string.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <arpa/inet.h>
diff --git a/netutils/ftpc/ftpc_getfile.c b/netutils/ftpc/ftpc_getfile.c
index 83524df4e..3ca989a80 100644
--- a/netutils/ftpc/ftpc_getfile.c
+++ b/netutils/ftpc/ftpc_getfile.c
@@ -32,7 +32,7 @@
#include <unistd.h>
#include <string.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include "netutils/ftpc.h"
diff --git a/netutils/ftpc/ftpc_getreply.c b/netutils/ftpc/ftpc_getreply.c
index d5a3d0983..e63e0ed2b 100644
--- a/netutils/ftpc/ftpc_getreply.c
+++ b/netutils/ftpc/ftpc_getreply.c
@@ -28,7 +28,7 @@
#include <stdlib.h>
#include <string.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "ftpc_internal.h"
diff --git a/netutils/ftpc/ftpc_idle.c b/netutils/ftpc/ftpc_idle.c
index 42e2fdbef..dd5ab5c23 100644
--- a/netutils/ftpc/ftpc_idle.c
+++ b/netutils/ftpc/ftpc_idle.c
@@ -26,7 +26,7 @@
#include "ftpc_config.h"
-#include <debug.h>
+#include <nuttx/debug.h>
#include "netutils/ftpc.h"
#include "ftpc_internal.h"
diff --git a/netutils/ftpc/ftpc_listdir.c b/netutils/ftpc/ftpc_listdir.c
index 92461f6e3..02947ad5c 100644
--- a/netutils/ftpc/ftpc_listdir.c
+++ b/netutils/ftpc/ftpc_listdir.c
@@ -33,7 +33,7 @@
#include <libgen.h>
#include <assert.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "netutils/ftpc.h"
diff --git a/netutils/ftpc/ftpc_login.c b/netutils/ftpc/ftpc_login.c
index 9e99c0dc5..4ee477e00 100644
--- a/netutils/ftpc/ftpc_login.c
+++ b/netutils/ftpc/ftpc_login.c
@@ -28,7 +28,7 @@
#include <string.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "netutils/ftpc.h"
diff --git a/netutils/ftpc/ftpc_putfile.c b/netutils/ftpc/ftpc_putfile.c
index 9ac75cc0e..a0ea6bc3e 100644
--- a/netutils/ftpc/ftpc_putfile.c
+++ b/netutils/ftpc/ftpc_putfile.c
@@ -35,7 +35,7 @@
#include <libgen.h>
#include <assert.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "netutils/ftpc.h"
diff --git a/netutils/ftpc/ftpc_rpwd.c b/netutils/ftpc/ftpc_rpwd.c
index 8ff608d9b..c2673b20e 100644
--- a/netutils/ftpc/ftpc_rpwd.c
+++ b/netutils/ftpc/ftpc_rpwd.c
@@ -28,7 +28,7 @@
#include <stdlib.h>
#include <string.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "netutils/ftpc.h"
diff --git a/netutils/ftpc/ftpc_socket.c b/netutils/ftpc/ftpc_socket.c
index db9b4ccd0..4a769a3d3 100644
--- a/netutils/ftpc/ftpc_socket.c
+++ b/netutils/ftpc/ftpc_socket.c
@@ -31,7 +31,7 @@
#include <unistd.h>
#include <string.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include "ftpc_internal.h"
diff --git a/netutils/ftpc/ftpc_transfer.c b/netutils/ftpc/ftpc_transfer.c
index 7d294d52d..b6ef5a65c 100644
--- a/netutils/ftpc/ftpc_transfer.c
+++ b/netutils/ftpc/ftpc_transfer.c
@@ -35,7 +35,7 @@
#include <ctype.h>
#include <errno.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <arpa/inet.h>
#include "netutils/ftpc.h"
diff --git a/netutils/ftpd/ftpd.c b/netutils/ftpd/ftpd.c
index 73b8fc9b9..a6ed75324 100644
--- a/netutils/ftpd/ftpd.c
+++ b/netutils/ftpd/ftpd.c
@@ -58,7 +58,7 @@
#include <libgen.h>
#include <assert.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <arpa/inet.h>
diff --git a/netutils/libcurl4nx/curl4nx_easy_cleanup.c b/netutils/libcurl4nx/curl4nx_easy_cleanup.c
index 1c3000671..0533693e8 100644
--- a/netutils/libcurl4nx/curl4nx_easy_cleanup.c
+++ b/netutils/libcurl4nx/curl4nx_easy_cleanup.c
@@ -26,7 +26,7 @@
#include <nuttx/config.h>
#include <nuttx/compiler.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <stdint.h>
#include <stdio.h>
diff --git a/netutils/libcurl4nx/curl4nx_easy_duphandle.c b/netutils/libcurl4nx/curl4nx_easy_duphandle.c
index 4de16e0af..9bf44580c 100644
--- a/netutils/libcurl4nx/curl4nx_easy_duphandle.c
+++ b/netutils/libcurl4nx/curl4nx_easy_duphandle.c
@@ -26,7 +26,7 @@
#include <nuttx/config.h>
#include <nuttx/compiler.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <sys/socket.h>
#include <sys/time.h>
diff --git a/netutils/libcurl4nx/curl4nx_easy_escape.c b/netutils/libcurl4nx/curl4nx_easy_escape.c
index ff76d6d8c..8c5919b72 100644
--- a/netutils/libcurl4nx/curl4nx_easy_escape.c
+++ b/netutils/libcurl4nx/curl4nx_easy_escape.c
@@ -26,7 +26,7 @@
#include <nuttx/config.h>
#include <nuttx/compiler.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <sys/socket.h>
#include <sys/time.h>
diff --git a/netutils/libcurl4nx/curl4nx_easy_getinfo.c b/netutils/libcurl4nx/curl4nx_easy_getinfo.c
index ed8e90a9d..ff64739ad 100644
--- a/netutils/libcurl4nx/curl4nx_easy_getinfo.c
+++ b/netutils/libcurl4nx/curl4nx_easy_getinfo.c
@@ -26,7 +26,7 @@
#include <nuttx/config.h>
#include <nuttx/compiler.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <sys/socket.h>
#include <sys/time.h>
diff --git a/netutils/libcurl4nx/curl4nx_easy_init.c b/netutils/libcurl4nx/curl4nx_easy_init.c
index 1817bf734..661cfde76 100644
--- a/netutils/libcurl4nx/curl4nx_easy_init.c
+++ b/netutils/libcurl4nx/curl4nx_easy_init.c
@@ -26,7 +26,7 @@
#include <nuttx/config.h>
#include <nuttx/compiler.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <stdint.h>
#include <stdio.h>
diff --git a/netutils/libcurl4nx/curl4nx_easy_perform.c b/netutils/libcurl4nx/curl4nx_easy_perform.c
index 466b3efe7..529aaa22d 100644
--- a/netutils/libcurl4nx/curl4nx_easy_perform.c
+++ b/netutils/libcurl4nx/curl4nx_easy_perform.c
@@ -26,7 +26,7 @@
#include <nuttx/config.h>
#include <nuttx/compiler.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <sys/socket.h>
#include <sys/time.h>
diff --git a/netutils/libcurl4nx/curl4nx_easy_reset.c b/netutils/libcurl4nx/curl4nx_easy_reset.c
index 7ece89011..9ee355a2f 100644
--- a/netutils/libcurl4nx/curl4nx_easy_reset.c
+++ b/netutils/libcurl4nx/curl4nx_easy_reset.c
@@ -26,7 +26,7 @@
#include <nuttx/config.h>
#include <nuttx/compiler.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <stdint.h>
#include <stdlib.h>
diff --git a/netutils/libcurl4nx/curl4nx_easy_setopt.c b/netutils/libcurl4nx/curl4nx_easy_setopt.c
index 03f8ff5d1..378862b9e 100644
--- a/netutils/libcurl4nx/curl4nx_easy_setopt.c
+++ b/netutils/libcurl4nx/curl4nx_easy_setopt.c
@@ -26,7 +26,7 @@
#include <nuttx/config.h>
#include <nuttx/compiler.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <stdint.h>
#include <stdbool.h>
diff --git a/netutils/libcurl4nx/curl4nx_easy_unescape.c b/netutils/libcurl4nx/curl4nx_easy_unescape.c
index 23f169afe..7e3955497 100644
--- a/netutils/libcurl4nx/curl4nx_easy_unescape.c
+++ b/netutils/libcurl4nx/curl4nx_easy_unescape.c
@@ -26,7 +26,7 @@
#include <nuttx/config.h>
#include <nuttx/compiler.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <sys/socket.h>
#include <sys/time.h>
diff --git a/netutils/mdns/mdnsd.c b/netutils/mdns/mdnsd.c
index 1f648950b..d060a8849 100644
--- a/netutils/mdns/mdnsd.c
+++ b/netutils/mdns/mdnsd.c
@@ -32,7 +32,7 @@
#include <syslog.h>
#include <limits.h>
#include <semaphore.h>
-#include <debug.h> /* For nerr, info */
+#include <nuttx/debug.h> /* For nerr, info */
#include "netutils/netlib.h"
#include "netutils/mdnsd.h"
diff --git a/netutils/netinit/netinit.c b/netutils/netinit/netinit.c
index c0a459725..24feea642 100644
--- a/netutils/netinit/netinit.c
+++ b/netutils/netinit/netinit.c
@@ -36,7 +36,7 @@
#endif
#include <arpa/inet.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <net/if.h>
#include <netinet/in.h>
#include <pthread.h>
diff --git a/netutils/netlib/netlib_checkhttpconnectivity.c b/netutils/netlib/netlib_checkhttpconnectivity.c
index 4b0df89c2..a4ed482e5 100644
--- a/netutils/netlib/netlib_checkhttpconnectivity.c
+++ b/netutils/netlib/netlib_checkhttpconnectivity.c
@@ -32,7 +32,7 @@
#include <unistd.h>
#include <string.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#ifdef CONFIG_LIBC_NETDB
# include <netdb.h>
diff --git a/netutils/netlib/netlib_checkifconflict.c b/netutils/netlib/netlib_checkifconflict.c
index 5aebddd8e..c8c8fc2c1 100644
--- a/netutils/netlib/netlib_checkifconflict.c
+++ b/netutils/netlib/netlib_checkifconflict.c
@@ -29,7 +29,7 @@
#include <unistd.h>
#include <string.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "netutils/netlib.h"
diff --git a/netutils/netlib/netlib_checkifconnectivity.c b/netutils/netlib/netlib_checkifconnectivity.c
index c08995366..bfc06001a 100644
--- a/netutils/netlib/netlib_checkifconnectivity.c
+++ b/netutils/netlib/netlib_checkifconnectivity.c
@@ -31,7 +31,7 @@
#include <unistd.h>
#include <string.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <arpa/inet.h>
#include <nuttx/net/ip.h>
diff --git a/netutils/netlib/netlib_checkipconnectivity.c b/netutils/netlib/netlib_checkipconnectivity.c
index 44a5c636a..04b3c3c0b 100644
--- a/netutils/netlib/netlib_checkipconnectivity.c
+++ b/netutils/netlib/netlib_checkipconnectivity.c
@@ -31,7 +31,7 @@
#include <unistd.h>
#include <string.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <arpa/inet.h>
#include <nuttx/net/ip.h>
diff --git a/netutils/netlib/netlib_getifstatistics.c b/netutils/netlib/netlib_getifstatistics.c
index b838d556d..e6c52abba 100644
--- a/netutils/netlib/netlib_getifstatistics.c
+++ b/netutils/netlib/netlib_getifstatistics.c
@@ -29,7 +29,7 @@
#include <stdio.h>
#include <string.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <sys/types.h>
diff --git a/netutils/netlib/netlib_ipmsfilter.c b/netutils/netlib/netlib_ipmsfilter.c
index d7f9b0ff1..9fa2f23aa 100644
--- a/netutils/netlib/netlib_ipmsfilter.c
+++ b/netutils/netlib/netlib_ipmsfilter.c
@@ -33,7 +33,7 @@
#include <unistd.h>
#include <string.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <netinet/in.h>
#include <sys/sockio.h>
diff --git a/netutils/netlib/netlib_listenon.c b/netutils/netlib/netlib_listenon.c
index 608937ff7..a80cd8158 100644
--- a/netutils/netlib/netlib_listenon.c
+++ b/netutils/netlib/netlib_listenon.c
@@ -32,7 +32,7 @@
#include <stdio.h>
#include <unistd.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <arpa/inet.h>
#include <netinet/in.h>
diff --git a/netutils/netlib/netlib_nodeaddrconv.c b/netutils/netlib/netlib_nodeaddrconv.c
index 67c6ee2f7..1df293788 100644
--- a/netutils/netlib/netlib_nodeaddrconv.c
+++ b/netutils/netlib/netlib_nodeaddrconv.c
@@ -34,7 +34,7 @@
#include <string.h>
#include <assert.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "nuttx/wireless/pktradio.h"
#include "netutils/netlib.h"
diff --git a/netutils/netlib/netlib_obtainipv4addr.c b/netutils/netlib/netlib_obtainipv4addr.c
index 5390466fe..cab55b74c 100644
--- a/netutils/netlib/netlib_obtainipv4addr.c
+++ b/netutils/netlib/netlib_obtainipv4addr.c
@@ -24,7 +24,7 @@
* Included Files
****************************************************************************/
-#include <debug.h>
+#include <nuttx/debug.h>
#include <sys/types.h>
#include "netutils/dhcpc.h"
diff --git a/netutils/netlib/netlib_obtainipv6addr.c b/netutils/netlib/netlib_obtainipv6addr.c
index f55667705..c1a74b8ce 100644
--- a/netutils/netlib/netlib_obtainipv6addr.c
+++ b/netutils/netlib/netlib_obtainipv6addr.c
@@ -30,7 +30,7 @@
#include <unistd.h>
#include <string.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <netinet/in.h>
#include <net/if.h>
diff --git a/netutils/netlib/netlib_server.c b/netutils/netlib/netlib_server.c
index 98ff5e907..9436481bc 100644
--- a/netutils/netlib/netlib_server.c
+++ b/netutils/netlib/netlib_server.c
@@ -34,7 +34,7 @@
#include <unistd.h>
#include <pthread.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <netinet/in.h>
diff --git a/netutils/ntpclient/ntpclient.c b/netutils/ntpclient/ntpclient.c
index 22c448fdd..ce7d2f0d9 100644
--- a/netutils/ntpclient/ntpclient.c
+++ b/netutils/ntpclient/ntpclient.c
@@ -40,7 +40,7 @@
#include <sched.h>
#include <assert.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <unistd.h>
#include <netinet/in.h>
diff --git a/netutils/pppd/ppp.h b/netutils/pppd/ppp.h
index f436a1206..519b7f168 100644
--- a/netutils/pppd/ppp.h
+++ b/netutils/pppd/ppp.h
@@ -51,7 +51,7 @@
#include "netutils/chat.h"
-#include "debug.h"
+#include <nuttx/debug.h>
#include "ppp_conf.h"
#include "ahdlc.h"
#include "lcp.h"
diff --git a/netutils/pppd/pppd.c b/netutils/pppd/pppd.c
index 73efa27c9..849e3e874 100644
--- a/netutils/pppd/pppd.c
+++ b/netutils/pppd/pppd.c
@@ -50,7 +50,7 @@
#include <fcntl.h>
#include <errno.h>
#include <poll.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <unistd.h>
#include <netinet/in.h>
diff --git a/netutils/ptpd/ptpd.c b/netutils/ptpd/ptpd.c
index f85619093..74b43084d 100644
--- a/netutils/ptpd/ptpd.c
+++ b/netutils/ptpd/ptpd.c
@@ -40,7 +40,7 @@
#include <sched.h>
#include <assert.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <unistd.h>
#include <fcntl.h>
diff --git a/netutils/telnetd/telnetd_daemon.c b/netutils/telnetd/telnetd_daemon.c
index 989de34f9..c1512113c 100644
--- a/netutils/telnetd/telnetd_daemon.c
+++ b/netutils/telnetd/telnetd_daemon.c
@@ -35,7 +35,7 @@
#include <sched.h>
#include <spawn.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/net/telnet.h>
diff --git a/netutils/tftpc/tftpc_get.c b/netutils/tftpc/tftpc_get.c
index 36227e29a..84be9b223 100644
--- a/netutils/tftpc/tftpc_get.c
+++ b/netutils/tftpc/tftpc_get.c
@@ -34,7 +34,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <arpa/inet.h>
diff --git a/netutils/tftpc/tftpc_packets.c b/netutils/tftpc/tftpc_packets.c
index 05d56083c..9f6af0c65 100644
--- a/netutils/tftpc/tftpc_packets.c
+++ b/netutils/tftpc/tftpc_packets.c
@@ -34,7 +34,7 @@
#include <stdio.h>
#include <string.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <netinet/in.h>
#include <arpa/inet.h>
diff --git a/netutils/tftpc/tftpc_put.c b/netutils/tftpc/tftpc_put.c
index 3f3a9c849..456100bdb 100644
--- a/netutils/tftpc/tftpc_put.c
+++ b/netutils/tftpc/tftpc_put.c
@@ -34,7 +34,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/net/netconfig.h>
#include "netutils/tftp.h"
diff --git a/netutils/thttpd/fdwatch.c b/netutils/thttpd/fdwatch.c
index 105fea30f..dcbd782e5 100644
--- a/netutils/thttpd/fdwatch.c
+++ b/netutils/thttpd/fdwatch.c
@@ -39,7 +39,7 @@
#include <stdint.h>
#include <stdlib.h>
#include <sys/param.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <poll.h>
#include "config.h"
diff --git a/netutils/thttpd/libhttpd.c b/netutils/thttpd/libhttpd.c
index 2d6a558e6..19acb562c 100644
--- a/netutils/thttpd/libhttpd.c
+++ b/netutils/thttpd/libhttpd.c
@@ -58,7 +58,7 @@
#include <signal.h>
#include <sched.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <fnmatch.h>
#include "netutils/thttpd.h"
diff --git a/netutils/thttpd/tdate_parse.c b/netutils/thttpd/tdate_parse.c
index 113059223..2b49d3995 100644
--- a/netutils/thttpd/tdate_parse.c
+++ b/netutils/thttpd/tdate_parse.c
@@ -41,7 +41,7 @@
#include <string.h>
#include <ctype.h>
#include <time.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "tdate_parse.h"
diff --git a/netutils/thttpd/thttpd.c b/netutils/thttpd/thttpd.c
index 22338665b..f7de45177 100644
--- a/netutils/thttpd/thttpd.c
+++ b/netutils/thttpd/thttpd.c
@@ -50,7 +50,7 @@
#include <fcntl.h>
#include <signal.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <arpa/inet.h>
diff --git a/netutils/thttpd/thttpd_alloc.c b/netutils/thttpd/thttpd_alloc.c
index 7999f7823..6deade0be 100644
--- a/netutils/thttpd/thttpd_alloc.c
+++ b/netutils/thttpd/thttpd_alloc.c
@@ -30,7 +30,7 @@
#include <sys/types.h>
#include <stdlib.h>
#include <malloc.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include "config.h"
diff --git a/netutils/thttpd/thttpd_cgi.c b/netutils/thttpd/thttpd_cgi.c
index 5c8914560..a0cacf03e 100644
--- a/netutils/thttpd/thttpd_cgi.c
+++ b/netutils/thttpd/thttpd_cgi.c
@@ -52,7 +52,7 @@
#include <libgen.h>
#include <assert.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/binfmt/binfmt.h>
#include "netutils/thttpd.h"
@@ -766,7 +766,7 @@ static int cgi_child(int argc, char **argv)
/* Close all file descriptors EXCEPT for stdin, stdout, stderr and
* hc->conn_fd. We'll keep stderr open for error reporting; stdin and
* stdout will be closed later by dup2(). Keeping stdin and stdout open
- * now prevents re-use of fd=0 and 1 by pipe().
+ * now prevents reuse of fd=0 and 1 by pipe().
*/
ninfo("Closing descriptors\n");
diff --git a/netutils/thttpd/timers.c b/netutils/thttpd/timers.c
index a3bd89831..d2026bd1b 100644
--- a/netutils/thttpd/timers.c
+++ b/netutils/thttpd/timers.c
@@ -39,7 +39,7 @@
#include <stdlib.h>
#include <stdio.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "thttpd_alloc.h"
#include "timers.h"
diff --git a/netutils/webclient/webclient.c b/netutils/webclient/webclient.c
index 8784b68b5..61f56cb4f 100644
--- a/netutils/webclient/webclient.c
+++ b/netutils/webclient/webclient.c
@@ -48,7 +48,7 @@
#include <nuttx/config.h>
#include <nuttx/compiler.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <assert.h>
#include <fcntl.h>
@@ -857,7 +857,7 @@ static inline int wget_parsechunkheader(struct webclient_context *ctx,
if (semicolon != NULL)
{
found_extension = true;
- ninfo("Ignoring extentions in chunk header\n");
+ ninfo("Ignoring extensions in chunk header\n");
*semicolon = 0;
}
}
diff --git a/netutils/webserver/httpd.c b/netutils/webserver/httpd.c
index 23f69a949..1cc8d58fc 100644
--- a/netutils/webserver/httpd.c
+++ b/netutils/webserver/httpd.c
@@ -52,7 +52,7 @@
#include <string.h>
#include <assert.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#ifndef CONFIG_NETUTILS_HTTPD_SINGLECONNECT
# include <pthread.h>
diff --git a/netutils/webserver/httpd_dirlist.c b/netutils/webserver/httpd_dirlist.c
index bac1b2d77..6dda65286 100644
--- a/netutils/webserver/httpd_dirlist.c
+++ b/netutils/webserver/httpd_dirlist.c
@@ -36,7 +36,7 @@
#include <stdio.h>
#include <assert.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <string.h>
#include <dirent.h>
#include <stdlib.h>
diff --git a/netutils/webserver/httpd_mmap.c b/netutils/webserver/httpd_mmap.c
index a4f47427d..b17ad54c4 100644
--- a/netutils/webserver/httpd_mmap.c
+++ b/netutils/webserver/httpd_mmap.c
@@ -35,7 +35,7 @@
#include <fcntl.h>
#include <stdio.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "netutils/httpd.h"
diff --git a/netutils/webserver/httpd_sendfile.c b/netutils/webserver/httpd_sendfile.c
index 7ff8a5ccd..3a8286fe9 100644
--- a/netutils/webserver/httpd_sendfile.c
+++ b/netutils/webserver/httpd_sendfile.c
@@ -35,7 +35,7 @@
#include <fcntl.h>
#include <stdio.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "netutils/httpd.h"
diff --git a/nshlib/nsh_altconsole.c b/nshlib/nsh_altconsole.c
index 7423fedf7..bb9fc30f2 100644
--- a/nshlib/nsh_altconsole.c
+++ b/nshlib/nsh_altconsole.c
@@ -30,7 +30,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <string.h>
#include "nsh.h"
diff --git a/nshlib/nsh_codeccmd.c b/nshlib/nsh_codeccmd.c
index 91b3953ff..0d677669f 100644
--- a/nshlib/nsh_codeccmd.c
+++ b/nshlib/nsh_codeccmd.c
@@ -37,7 +37,7 @@
#include <fcntl.h>
#include <libgen.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#if defined(CONFIG_NSH_DISABLE_URLENCODE) && defined(CONFIG_NSH_DISABLE_URLDECODE)
# undef CONFIG_CODECS_URLCODE
diff --git a/nshlib/nsh_console.c b/nshlib/nsh_console.c
index cb95e0342..ebcbe6fb2 100644
--- a/nshlib/nsh_console.c
+++ b/nshlib/nsh_console.c
@@ -36,7 +36,7 @@
#include <string.h>
#include <assert.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "nsh.h"
#include "nsh_console.h"
diff --git a/nshlib/nsh_fscmds.c b/nshlib/nsh_fscmds.c
index 13f26f694..a88c1a20d 100644
--- a/nshlib/nsh_fscmds.c
+++ b/nshlib/nsh_fscmds.c
@@ -43,7 +43,7 @@
#include <limits.h>
#include <libgen.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "nsh.h"
diff --git a/nshlib/nsh_mntcmds.c b/nshlib/nsh_mntcmds.c
index f4a2e903b..a58d6ef9c 100644
--- a/nshlib/nsh_mntcmds.c
+++ b/nshlib/nsh_mntcmds.c
@@ -35,7 +35,7 @@
#include <string.h>
#include <unistd.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <netdb.h>
#include <netinet/in.h>
diff --git a/nshlib/nsh_netcmds.c b/nshlib/nsh_netcmds.c
index 8cd0d6cc3..3171bdfbb 100644
--- a/nshlib/nsh_netcmds.c
+++ b/nshlib/nsh_netcmds.c
@@ -45,7 +45,7 @@
#include <libgen.h> /* Needed for basename */
#include <assert.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <getopt.h>
#if defined(CONFIG_LIBC_NETDB) && !defined(CONFIG_NSH_DISABLE_NSLOOKUP)
diff --git a/nshlib/nsh_parse.c b/nshlib/nsh_parse.c
index 9a67cc845..61ed7de55 100644
--- a/nshlib/nsh_parse.c
+++ b/nshlib/nsh_parse.c
@@ -31,7 +31,7 @@
#include <fcntl.h>
#include <string.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <sched.h>
#include <unistd.h>
diff --git a/nshlib/nsh_telnetd.c b/nshlib/nsh_telnetd.c
index 62f87e479..83fc36ca6 100644
--- a/nshlib/nsh_telnetd.c
+++ b/nshlib/nsh_telnetd.c
@@ -27,7 +27,7 @@
#include <nuttx/config.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <sys/socket.h>
diff --git a/nshlib/nsh_usbconsole.c b/nshlib/nsh_usbconsole.c
index cc7f97005..74f8a4795 100644
--- a/nshlib/nsh_usbconsole.c
+++ b/nshlib/nsh_usbconsole.c
@@ -32,7 +32,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#ifdef CONFIG_CDCACM
# include <nuttx/usb/cdcacm.h>
diff --git a/nshlib/nsh_usbtrace.c b/nshlib/nsh_usbtrace.c
index df05d45a3..f57a81ac6 100644
--- a/nshlib/nsh_usbtrace.c
+++ b/nshlib/nsh_usbtrace.c
@@ -27,7 +27,7 @@
#include <nuttx/config.h>
#include <stdarg.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/usb/usbdev_trace.h>
diff --git a/platform/mikroe-stm32f4/mikroe_configdata.c b/platform/mikroe-stm32f4/mikroe_configdata.c
index b6d9bb6fc..d65e695c7 100644
--- a/platform/mikroe-stm32f4/mikroe_configdata.c
+++ b/platform/mikroe-stm32f4/mikroe_configdata.c
@@ -30,7 +30,7 @@
#include <fcntl.h>
#include <assert.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <unistd.h>
#include <sys/ioctl.h>
@@ -233,7 +233,7 @@ int platform_getconfig(enum config_data_e id, int instance,
case CONFIGDATA_TSCALIBRATION:
#ifdef CONFIG_MIKROE_STM32F4_CONFIGDATA_FS
- /* Load config data fram a file on the filesystem. Try to open
+ /* Load config data from a file on the filesystem. Try to open
* the file.
*/
diff --git a/system/cdcacm/sercon_main.c b/system/cdcacm/sercon_main.c
index 9b8ab41d8..c03ce2d18 100644
--- a/system/cdcacm/sercon_main.c
+++ b/system/cdcacm/sercon_main.c
@@ -30,7 +30,7 @@
#include <sys/boardctl.h>
#include <stdio.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/usb/usbdev.h>
#include <nuttx/usb/cdcacm.h>
diff --git a/system/cdcacm/serdis_main.c b/system/cdcacm/serdis_main.c
index 834ae186b..56e5fbfe0 100644
--- a/system/cdcacm/serdis_main.c
+++ b/system/cdcacm/serdis_main.c
@@ -30,7 +30,7 @@
#include <sys/boardctl.h>
#include <stdio.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/usb/usbdev.h>
#include <nuttx/usb/cdcacm.h>
diff --git a/system/cle/cle.c b/system/cle/cle.c
index 21b442806..bfa01c11f 100644
--- a/system/cle/cle.c
+++ b/system/cle/cle.c
@@ -36,7 +36,7 @@
#include <ctype.h>
#include <syslog.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <termios.h>
#include <nuttx/ascii.h>
diff --git a/system/composite/composite_main.c b/system/composite/composite_main.c
index 9dc4399e8..f6dc54bff 100644
--- a/system/composite/composite_main.c
+++ b/system/composite/composite_main.c
@@ -35,7 +35,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/usb/usbdev.h>
#include <nuttx/usb/composite.h>
diff --git a/system/cu/cu_main.c b/system/cu/cu_main.c
index fa5b31900..f0767ddc3 100644
--- a/system/cu/cu_main.c
+++ b/system/cu/cu_main.c
@@ -52,7 +52,7 @@
#include <errno.h>
#include <stdlib.h>
#include <signal.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <stdint.h>
#include <stdbool.h>
#include <semaphore.h>
diff --git a/system/dd/dd_main.c b/system/dd/dd_main.c
index 9be5de7ac..a240ae3fe 100644
--- a/system/dd/dd_main.c
+++ b/system/dd/dd_main.c
@@ -32,7 +32,7 @@
#include <sys/stat.h>
#ifdef __NuttX__
-#include <debug.h>
+#include <nuttx/debug.h>
#endif
#include <inttypes.h>
#include <stdint.h>
diff --git a/system/dhcp6c/renew6_main.c b/system/dhcp6c/renew6_main.c
index d0f44382b..7149af1f2 100644
--- a/system/dhcp6c/renew6_main.c
+++ b/system/dhcp6c/renew6_main.c
@@ -25,7 +25,7 @@
****************************************************************************/
#include <nuttx/config.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <string.h>
#include <errno.h>
diff --git a/system/i2c/i2c_main.c b/system/i2c/i2c_main.c
index 7abe9bdd1..80e7974d2 100644
--- a/system/i2c/i2c_main.c
+++ b/system/i2c/i2c_main.c
@@ -35,7 +35,7 @@
#include <stdarg.h>
#include <assert.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "i2ctool.h"
@@ -165,7 +165,7 @@ static int i2ccmd_help(FAR struct i2ctool_s *i2ctool, int argc,
"o Arguments are \"sticky\". For example, once "
"the I2C address is\n");
i2ctool_printf(i2ctool,
- " specified, that address will be re-used until "
+ " specified, that address will be reused until "
"it is changed.\n");
i2ctool_printf(i2ctool, "\nWARNING:\n");
i2ctool_printf(i2ctool,
diff --git a/system/nxcamera/nxcamera.c b/system/nxcamera/nxcamera.c
index d2070e966..d698b9e20 100644
--- a/system/nxcamera/nxcamera.c
+++ b/system/nxcamera/nxcamera.c
@@ -27,7 +27,7 @@
#include <nuttx/config.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/system/nxlooper/nxlooper.c b/system/nxlooper/nxlooper.c
index 3d8404520..6c142ee26 100644
--- a/system/nxlooper/nxlooper.c
+++ b/system/nxlooper/nxlooper.c
@@ -27,7 +27,7 @@
#include <nuttx/config.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/system/nxplayer/nxplayer.c b/system/nxplayer/nxplayer.c
index 0de66f68a..173ad622f 100644
--- a/system/nxplayer/nxplayer.c
+++ b/system/nxplayer/nxplayer.c
@@ -27,7 +27,7 @@
#include <nuttx/config.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/system/nxplayer/nxplayer_common.c b/system/nxplayer/nxplayer_common.c
index 94b794c2c..c33c38690 100644
--- a/system/nxplayer/nxplayer_common.c
+++ b/system/nxplayer/nxplayer_common.c
@@ -27,7 +27,7 @@
#include <sys/types.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/system/nxrecorder/nxrecorder.c b/system/nxrecorder/nxrecorder.c
index 6a75f6a57..2f6d01d22 100644
--- a/system/nxrecorder/nxrecorder.c
+++ b/system/nxrecorder/nxrecorder.c
@@ -27,7 +27,7 @@
#include <nuttx/config.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/system/nxrecorder/nxrecorder_common.c b/system/nxrecorder/nxrecorder_common.c
index d063f140c..c78a360ca 100644
--- a/system/nxrecorder/nxrecorder_common.c
+++ b/system/nxrecorder/nxrecorder_common.c
@@ -27,7 +27,7 @@
#include <sys/types.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/system/popen/popen.c b/system/popen/popen.c
index d9286c959..b52fbaafe 100644
--- a/system/popen/popen.c
+++ b/system/popen/popen.c
@@ -35,7 +35,7 @@
#include <sched.h>
#include <spawn.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <fcntl.h>
#include <errno.h>
diff --git a/system/readline/readline_common.c b/system/readline/readline_common.c
index 273821357..0fd3b9396 100644
--- a/system/readline/readline_common.c
+++ b/system/readline/readline_common.c
@@ -31,7 +31,7 @@
#include <ctype.h>
#include <errno.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/ascii.h>
#include <nuttx/vt100.h>
diff --git a/system/spi/spi_main.c b/system/spi/spi_main.c
index 140826e43..8950a48b8 100644
--- a/system/spi/spi_main.c
+++ b/system/spi/spi_main.c
@@ -35,7 +35,7 @@
#include <stdarg.h>
#include <assert.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "spitool.h"
diff --git a/system/system/system.c b/system/system/system.c
index 3fd9850d7..46db1719b 100644
--- a/system/system/system.c
+++ b/system/system/system.c
@@ -31,7 +31,7 @@
#include <sched.h>
#include <spawn.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <execinfo.h>
#include <syslog.h>
diff --git a/system/tee/tee.c b/system/tee/tee.c
index cb934c7a9..844c94c11 100644
--- a/system/tee/tee.c
+++ b/system/tee/tee.c
@@ -50,7 +50,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <debug.h>
+#include <nuttx/debug.h>
/****************************************************************************
* Pre-processor Definitions
diff --git a/system/termcurses/tcurses_vt100.c b/system/termcurses/tcurses_vt100.c
index 84c369cce..ac4685a4e 100644
--- a/system/termcurses/tcurses_vt100.c
+++ b/system/termcurses/tcurses_vt100.c
@@ -35,7 +35,7 @@
#include <string.h>
#include <fcntl.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <stdio.h>
#include <stdlib.h>
#include <termios.h>
diff --git a/system/termcurses/termcurses.c b/system/termcurses/termcurses.c
index 4d042b6eb..6e3273c31 100644
--- a/system/termcurses/termcurses.c
+++ b/system/termcurses/termcurses.c
@@ -34,7 +34,7 @@
#include <stdlib.h>
#include <fcntl.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "tcurses_priv.h"
diff --git a/system/ubloxmodem/ubloxmodem_main.c b/system/ubloxmodem/ubloxmodem_main.c
index 0a54b9240..3f7baa601 100644
--- a/system/ubloxmodem/ubloxmodem_main.c
+++ b/system/ubloxmodem/ubloxmodem_main.c
@@ -45,7 +45,7 @@
#include <sys/ioctl.h>
#include <sys/param.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <fcntl.h>
#include <poll.h>
diff --git a/system/usbmsc/usbmsc_main.c b/system/usbmsc/usbmsc_main.c
index 6b08e4da0..3cddcc230 100644
--- a/system/usbmsc/usbmsc_main.c
+++ b/system/usbmsc/usbmsc_main.c
@@ -35,7 +35,7 @@
#include <stdlib.h>
#include <malloc.h>
#include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/usb/usbdev.h>
#include <nuttx/usb/usbmsc.h>
diff --git a/system/vi/vi.c b/system/vi/vi.c
index d2c894cf3..e94bc4361 100644
--- a/system/vi/vi.c
+++ b/system/vi/vi.c
@@ -39,7 +39,7 @@
#include <ctype.h>
#include <syslog.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <system/termcurses.h>
#include <graphics/curses.h>
diff --git a/system/zmodem/zm.h b/system/zmodem/zm.h
index a7971c00e..8593e1ff7 100644
--- a/system/zmodem/zm.h
+++ b/system/zmodem/zm.h
@@ -36,7 +36,7 @@
#include <sys/types.h>
#include <stdint.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <syslog.h>
#include <nuttx/compiler.h>
@@ -206,7 +206,7 @@
#define ZM_XFRDONE 1 /* Success - Transfer complete */
/* The actual packet buffer size includes 5 bytes to hold the transfer type
- * and the maxmimum size 4-byte CRC.
+ * and the maximum size 4-byte CRC.
*/
#define ZM_PKTBUFSIZE (CONFIG_SYSTEM_ZMODEM_PKTBUFSIZE + 5)
@@ -332,7 +332,7 @@ struct zm_state_s
uint16_t flags; /* See ZM_FLAG_* definitions */
uint16_t nerrors; /* Number of data errors */
timer_t timer; /* Watchdog timer */
- int remfd; /* The R/W file descritor used for communication with remote */
+ int remfd; /* The R/W file descriptor used for communication with remote */
/* Buffers.
*
diff --git a/testing/drivers/drivertest/drivertest_audio.c b/testing/drivers/drivertest/drivertest_audio.c
index a467f6f26..de12da3d1 100644
--- a/testing/drivers/drivertest/drivertest_audio.c
+++ b/testing/drivers/drivertest/drivertest_audio.c
@@ -44,7 +44,7 @@
#include <errno.h>
#include <dirent.h>
#include <mqueue.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <unistd.h>
#include <nuttx/audio/audio.h>
diff --git a/testing/drivers/drivertest/drivertest_framebuffer.c b/testing/drivers/drivertest/drivertest_framebuffer.c
index ac8f6f266..cf57d3f8a 100644
--- a/testing/drivers/drivertest/drivertest_framebuffer.c
+++ b/testing/drivers/drivertest/drivertest_framebuffer.c
@@ -38,7 +38,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <string.h>
#include <inttypes.h>
#include <poll.h>
diff --git a/testing/drivers/drivertest/drivertest_lcd.c b/testing/drivers/drivertest/drivertest_lcd.c
index 647d8cbe2..405b129f0 100644
--- a/testing/drivers/drivertest/drivertest_lcd.c
+++ b/testing/drivers/drivertest/drivertest_lcd.c
@@ -40,7 +40,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <string.h>
#include <inttypes.h>
diff --git a/testing/drivers/drivertest/drivertest_pwm.c b/testing/drivers/drivertest/drivertest_pwm.c
index a587fead1..3dd3bae64 100644
--- a/testing/drivers/drivertest/drivertest_pwm.c
+++ b/testing/drivers/drivertest/drivertest_pwm.c
@@ -34,7 +34,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <string.h>
#include <inttypes.h>
@@ -107,7 +107,7 @@ static void pwm_help(FAR const char *progname,
progname);
printf("\nArguments are \"sticky\". "
"For example, once the PWM frequency is\n");
- printf("specified, that frequency will be re-used until it is changed.\n");
+ printf("specified, that frequency will be reused until it is changed.\n");
printf("\n\"sticky\" OPTIONS include:\n");
printf(" [-p devpath] selects the PWM device. "
"Default: %s Current: %s\n", PWM_DEFAULT_DEVPATH,
diff --git a/testing/drivers/drivertest/drivertest_watchdog.c b/testing/drivers/drivertest/drivertest_watchdog.c
index 1021e8e10..72f5abe0e 100644
--- a/testing/drivers/drivertest/drivertest_watchdog.c
+++ b/testing/drivers/drivertest/drivertest_watchdog.c
@@ -35,7 +35,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <inttypes.h>
#include <stdarg.h>
#include <stddef.h>
diff --git a/testing/drivers/nand_sim/nand_sim_main.c b/testing/drivers/nand_sim/nand_sim_main.c
index 9e91227a4..70ea24227 100644
--- a/testing/drivers/nand_sim/nand_sim_main.c
+++ b/testing/drivers/nand_sim/nand_sim_main.c
@@ -24,7 +24,7 @@
* Included Files
****************************************************************************/
-#include <debug.h>
+#include <nuttx/debug.h>
#include <stdio.h>
#include <nuttx/drivers/drivers.h>
@@ -72,7 +72,7 @@ FAR struct nand_raw_s *g_nand_mtd_raw;
* Name: wrapper_init
*
* Description:
- * Initializes the wrapper by allocating memory and assiging the methods.
+ * Initializes the wrapper by allocating memory and assigning the methods.
*
* Returned Value:
* 0: Successful
@@ -114,7 +114,7 @@ int wrapper_init(void)
* Name: terminate
*
* Description:
- * Handles the SIGTERM signal by exitting gracefully.
+ * Handles the SIGTERM signal by exiting gracefully.
*
****************************************************************************/
diff --git a/testing/fs/epoll/epoll.c b/testing/fs/epoll/epoll.c
index cd1d6cc0f..8422c5fe7 100644
--- a/testing/fs/epoll/epoll.c
+++ b/testing/fs/epoll/epoll.c
@@ -26,7 +26,7 @@
#include <nuttx/config.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
#include <sys/epoll.h>
#include <sys/timerfd.h>
@@ -193,7 +193,7 @@ static void epoll01(FAR void **state)
ret = timerfd_stop(args->fd[0]);
assert_true(ret == 0);
- /* 3rd wait should directly return 0, timer has stoped */
+ /* 3rd wait should directly return 0, timer has stopped */
ret = epoll_wait(args->efd, &evs, 1, 0);
TIME_ASSERT_RANGE(get_elapse(args->start), 1000);
@@ -274,7 +274,7 @@ static void epoll02(FAR void **state)
struct epoll_event evs[2];
int ret;
- /* 1st wait, shoud return after 1000ms */
+ /* 1st wait, should return after 1000ms */
ret = epoll_wait(args->efd, evs, 2, 1100);
TIME_ASSERT_RANGE(get_elapse(args->start), 1000);
@@ -406,7 +406,7 @@ static void epoll03(FAR void **state)
/* 1st wait should timeout, because server accept will trigger
* EPOLLOUT event, but we do not set EPOLLOUT in ev.events.
- * Even the server has writen the data, but to check the EPOLLIN event,
+ * Even the server has written the data, but to check the EPOLLIN event,
* client need call epoll_wait again, because local socket internal state
* changed, we need setup it again to get the EPOLLIN event.
*/
@@ -416,7 +416,7 @@ static void epoll03(FAR void **state)
TIME_ASSERT_RANGE(get_elapse(args->start), 1000);
assert_true(ret == 0);
- /* 2nd wait shoud return immediately, because server has send
+ /* 2nd wait should return immediately, because server has sent
* data to client.
*/
diff --git a/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c b/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c
index c85df92aa..7b8390150 100644
--- a/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c
+++ b/testing/fs/mtd_config_fs/mtd_config_fs_test_main.c
@@ -42,7 +42,7 @@
#include <string.h>
#include <errno.h>
#include <nuttx/crc8.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <assert.h>
/****************************************************************************
diff --git a/testing/fs/nxffs/nxffs_main.c b/testing/fs/nxffs/nxffs_main.c
index 25c15513a..3305aa684 100644
--- a/testing/fs/nxffs/nxffs_main.c
+++ b/testing/fs/nxffs/nxffs_main.c
@@ -37,7 +37,7 @@
#include <dirent.h>
#include <string.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/crc32.h>
#include <nuttx/mtd/mtd.h>
@@ -598,7 +598,7 @@ static int nxffs_verifyfs(void)
else
{
#if CONFIG_TESTING_NXFFS_VERBOSE != 0
- printf(" Verifed file %s\n", file->name);
+ printf(" Verified file %s\n", file->name);
#endif
}
}
diff --git a/testing/fs/smart/smart_main.c b/testing/fs/smart/smart_main.c
index 671f5b5cb..9c8717a9d 100644
--- a/testing/fs/smart/smart_main.c
+++ b/testing/fs/smart/smart_main.c
@@ -37,7 +37,7 @@
#include <dirent.h>
#include <string.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <nuttx/crc32.h>
#include <nuttx/mtd/mtd.h>
@@ -611,7 +611,7 @@ static int smart_verifyfs(void)
else
{
#if CONFIG_TESTING_SMART_VERBOSE != 0
- printf(" Verifed file %s\n", file->name);
+ printf(" Verified file %s\n", file->name);
#endif
}
}
diff --git a/testing/libc/arch_libc/arch_libc_test_main.c b/testing/libc/arch_libc/arch_libc_test_main.c
index 1e1a06b19..b69c1dfc4 100644
--- a/testing/libc/arch_libc/arch_libc_test_main.c
+++ b/testing/libc/arch_libc/arch_libc_test_main.c
@@ -32,7 +32,7 @@
#include <unistd.h>
#include <string.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <assert.h>
/****************************************************************************
diff --git a/testing/libc/scanftest/scanftest_main.c b/testing/libc/scanftest/scanftest_main.c
index 6334c3074..0b1e614ae 100644
--- a/testing/libc/scanftest/scanftest_main.c
+++ b/testing/libc/scanftest/scanftest_main.c
@@ -75,7 +75,7 @@
#include <limits.h>
#include <libgen.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
/****************************************************************************
* Pre-processor Definitions
diff --git a/testing/mm/memstress/memorystress_main.c b/testing/mm/memstress/memorystress_main.c
index eca7b7735..f3952e08d 100644
--- a/testing/mm/memstress/memorystress_main.c
+++ b/testing/mm/memstress/memorystress_main.c
@@ -26,7 +26,7 @@
#include <nuttx/config.h>
#include <stdlib.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <stdio.h>
#include <unistd.h>
#include <pthread.h>
diff --git a/testing/ostest/signest.c b/testing/ostest/signest.c
index 5e8e65961..d79b40119 100644
--- a/testing/ostest/signest.c
+++ b/testing/ostest/signest.c
@@ -37,7 +37,7 @@
#include <stdlib.h>
#include <sys/types.h>
#include <unistd.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "ostest.h"
@@ -532,7 +532,7 @@ errout_with_waiter:
total_handled = g_odd_handled + g_even_handled;
total_nested = g_odd_nested + g_even_nested;
- printf("signest_test: With intefering thread\n");
+ printf("signest_test: With interfering thread\n");
printf(" Total signalled %-3d Odd=%-3d Even=%-3d\n",
total_signals, odd_signals, even_signals);
printf(" Total handled %-3d Odd=%-3d Even=%-3d\n",
diff --git a/wireless/bluetooth/nimble/include/logcfg/logcfg.h b/wireless/bluetooth/nimble/include/logcfg/logcfg.h
index 419c1373d..de738d51f 100644
--- a/wireless/bluetooth/nimble/include/logcfg/logcfg.h
+++ b/wireless/bluetooth/nimble/include/logcfg/logcfg.h
@@ -27,7 +27,7 @@
* Included Files
****************************************************************************/
-#include <debug.h>
+#include <nuttx/debug.h>
/****************************************************************************
* Pre-processor Definitions
diff --git a/wireless/gs2200m/gs2200m_main.c b/wireless/gs2200m/gs2200m_main.c
index f58cf882c..39749761c 100644
--- a/wireless/gs2200m/gs2200m_main.c
+++ b/wireless/gs2200m/gs2200m_main.c
@@ -32,7 +32,7 @@
#include <string.h>
#include <stdlib.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <fcntl.h>
#include <errno.h>
#include <poll.h>
diff --git a/wireless/ieee802154/i8shark/i8shark_main.c b/wireless/ieee802154/i8shark/i8shark_main.c
index 8d7af6f7f..c213045dc 100644
--- a/wireless/ieee802154/i8shark/i8shark_main.c
+++ b/wireless/ieee802154/i8shark/i8shark_main.c
@@ -36,7 +36,7 @@
#include <fcntl.h>
#include <time.h>
#include <errno.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <arpa/inet.h>
#include <sys/socket.h>
diff --git a/wireless/wapi/src/driver_wext.c b/wireless/wapi/src/driver_wext.c
index 23b158328..f7dc2906e 100644
--- a/wireless/wapi/src/driver_wext.c
+++ b/wireless/wapi/src/driver_wext.c
@@ -59,7 +59,7 @@
#include <stdlib.h>
#include <assert.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include "wireless/wapi.h"
diff --git a/wireless/wapi/src/util.h b/wireless/wapi/src/util.h
index 4639d3159..a2a0e2e78 100644
--- a/wireless/wapi/src/util.h
+++ b/wireless/wapi/src/util.h
@@ -39,7 +39,7 @@
****************************************************************************/
#include <string.h>
-#include <debug.h>
+#include <nuttx/debug.h>
#include <errno.h>
/****************************************************************************
(nuttx-apps) 02/02: include/debug.h: fix checkpatch fallout in touched apps files
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git
commit 96a003072d596d2e1b81ff3fd944692877e5bae3
Author: Piyush Patle <pi...@gmail.com>
AuthorDate: Sat Apr 11 03:50:44 2026 +0530
include/debug.h: fix checkpatch fallout in touched apps files
Clean up style issues in the files touched by the <nuttx/debug.h> include
migration so the full apps-side PR passes checkpatch.
Signed-off-by: Piyush Patle <pi...@gmail.com>
---
examples/nx/nx_events.c | 54 ++++++----
examples/nx/nx_kbdin.c | 83 ++++++++-------
examples/nx/nx_main.c | 160 +++++++++++++++++-----------
examples/nxhello/nxhello_bkgd.c | 72 +++++++------
examples/nxhello/nxhello_main.c | 87 +++++++--------
examples/nximage/nximage_bkgd.c | 61 ++++++-----
examples/nximage/nximage_main.c | 91 ++++++++--------
examples/nxlines/nxlines_main.c | 90 ++++++++--------
examples/nxterm/nxterm_toolbar.c | 9 +-
examples/nxterm/nxterm_wndo.c | 16 ++-
examples/nxtext/nxtext_bkgd.c | 33 +++---
examples/nxtext/nxtext_main.c | 88 +++++++++-------
examples/nxtext/nxtext_putc.c | 86 ++++++++-------
examples/pwfb/pwfb_main.c | 63 ++++++-----
examples/pwlines/pwlines_main.c | 69 ++++++------
examples/qencoder/qe_main.c | 19 ++--
fsutils/flash_eraseall/flash_eraseall.c | 5 +-
graphics/tiff/tiff_addstrip.c | 25 +++--
graphics/tiff/tiff_initialize.c | 180 ++++++++++++++++++++++----------
graphics/tiff/tiff_utils.c | 37 ++++---
system/nxcamera/nxcamera.c | 116 ++++++++++----------
21 files changed, 842 insertions(+), 602 deletions(-)
diff --git a/examples/nx/nx_events.c b/examples/nx/nx_events.c
index 4e5616641..065c4e3cf 100644
--- a/examples/nx/nx_events.c
+++ b/examples/nx/nx_events.c
@@ -52,25 +52,30 @@
static void nxeg_redraw(NXEGWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
bool morem, FAR void *arg);
-static void nxeg_position(NXEGWINDOW hwnd, FAR const struct nxgl_size_s *size,
+static void nxeg_position(NXEGWINDOW hwnd,
+ FAR const struct nxgl_size_s *size,
FAR const struct nxgl_point_s *pos,
FAR const struct nxgl_rect_s *bounds,
FAR void *arg);
#ifdef CONFIG_NX_XYINPUT
-static void nxeg_mousein(NXEGWINDOW hwnd, FAR const struct nxgl_point_s *pos,
+static void nxeg_mousein(NXEGWINDOW hwnd,
+ FAR const struct nxgl_point_s *pos,
uint8_t buttons, FAR void *arg);
#endif
#ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS
-static void nxeg_tbredraw(NXEGWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
+static void nxeg_tbredraw(NXEGWINDOW hwnd,
+ FAR const struct nxgl_rect_s *rect,
bool morem, FAR void *arg);
-static void nxeg_tbposition(NXEGWINDOW hwnd, FAR const struct nxgl_size_s *size,
+static void nxeg_tbposition(NXEGWINDOW hwnd,
+ FAR const struct nxgl_size_s *size,
FAR const struct nxgl_point_s *pos,
FAR const struct nxgl_rect_s *bounds,
FAR void *arg);
#ifdef CONFIG_NX_XYINPUT
-static void nxeg_tbmousein(NXEGWINDOW hwnd, FAR const struct nxgl_point_s *pos,
- uint8_t buttons, FAR void *arg);
+static void nxeg_tbmousein(NXEGWINDOW hwnd,
+ FAR const struct nxgl_point_s *pos,
+ uint8_t buttons, FAR void *arg);
#endif
#endif
@@ -137,6 +142,7 @@ static inline void nxeg_fillwindow(NXEGWINDOW hwnd,
printf("nxeg_fillwindow: nxtk_fillwindow failed: %d\n", errno);
}
#endif
+
#ifdef CONFIG_NX_KBD
nxeg_filltext(hwnd, rect, st);
#endif
@@ -148,8 +154,8 @@ static inline void nxeg_fillwindow(NXEGWINDOW hwnd,
#ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS
static inline void nxeg_filltoolbar(NXTKWINDOW htb,
- FAR const struct nxgl_rect_s *rect,
- nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
+ FAR const struct nxgl_rect_s *rect,
+ nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
{
int ret;
@@ -181,7 +187,8 @@ static void nxeg_redraw(NXEGWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
* Name: nxeg_position
****************************************************************************/
-static void nxeg_position(NXEGWINDOW hwnd, FAR const struct nxgl_size_s *size,
+static void nxeg_position(NXEGWINDOW hwnd,
+ FAR const struct nxgl_size_s *size,
FAR const struct nxgl_point_s *pos,
FAR const struct nxgl_rect_s *bounds,
FAR void *arg)
@@ -190,7 +197,8 @@ static void nxeg_position(NXEGWINDOW hwnd, FAR const struct nxgl_size_s *size,
/* Report the position */
- printf("nxeg_position%d: hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n",
+ printf("nxeg_position%d: hwnd=%p size=(%d,%d) pos=(%d,%d) "
+ "bounds={(%d,%d),(%d,%d)}\n",
st->wnum, hwnd, size->w, size->h, pos->x, pos->y,
bounds->pt1.x, bounds->pt1.y, bounds->pt2.x, bounds->pt2.y);
@@ -198,7 +206,9 @@ static void nxeg_position(NXEGWINDOW hwnd, FAR const struct nxgl_size_s *size,
if (!b_haveresolution)
{
- /* Save the window limits (these should be the same for all places and all windows */
+ /* Save the window limits (these should be the same for all places
+ * and all windows.
+ */
g_xres = bounds->pt2.x;
g_yres = bounds->pt2.y;
@@ -228,7 +238,8 @@ static void nxeg_mousein(NXEGWINDOW hwnd, FAR const struct nxgl_point_s *pos,
****************************************************************************/
#ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS
-static void nxeg_tbredraw(NXEGWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
+static void nxeg_tbredraw(NXEGWINDOW hwnd,
+ FAR const struct nxgl_rect_s *rect,
bool more, FAR void *arg)
{
FAR struct nxeg_state_s *st = (FAR struct nxeg_state_s *)arg;
@@ -245,16 +256,18 @@ static void nxeg_tbredraw(NXEGWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
****************************************************************************/
#ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS
-static void nxeg_tbposition(NXEGWINDOW hwnd, FAR const struct nxgl_size_s *size,
- FAR const struct nxgl_point_s *pos,
- FAR const struct nxgl_rect_s *bounds,
- FAR void *arg)
+static void nxeg_tbposition(NXEGWINDOW hwnd,
+ FAR const struct nxgl_size_s *size,
+ FAR const struct nxgl_point_s *pos,
+ FAR const struct nxgl_rect_s *bounds,
+ FAR void *arg)
{
FAR struct nxeg_state_s *st = (FAR struct nxeg_state_s *)arg;
/* Report the position */
- printf("nxeg_ptbosition%d: hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n",
+ printf("nxeg_ptbosition%d: hwnd=%p size=(%d,%d) pos=(%d,%d) "
+ "bounds={(%d,%d),(%d,%d)}\n",
st->wnum, hwnd, size->w, size->h, pos->x, pos->y,
bounds->pt1.x, bounds->pt1.y, bounds->pt2.x, bounds->pt2.y);
}
@@ -266,8 +279,9 @@ static void nxeg_tbposition(NXEGWINDOW hwnd, FAR const struct nxgl_size_s *size,
#ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS
#ifdef CONFIG_NX_XYINPUT
-static void nxeg_tbmousein(NXEGWINDOW hwnd, FAR const struct nxgl_point_s *pos,
- uint8_t buttons, FAR void *arg)
+static void nxeg_tbmousein(NXEGWINDOW hwnd,
+ FAR const struct nxgl_point_s *pos,
+ uint8_t buttons, FAR void *arg)
{
FAR struct nxeg_state_s *st = (FAR struct nxeg_state_s *)arg;
@@ -291,7 +305,7 @@ FAR void *nx_listenerthread(FAR void *arg)
/* Process events forever */
- for (;;)
+ for (; ; )
{
/* Handle the next event. If we were configured blocking, then
* we will stay right here until the next event is received. Since
diff --git a/examples/nx/nx_kbdin.c b/examples/nx/nx_kbdin.c
index cdab7fe20..51f0e7efd 100644
--- a/examples/nx/nx_kbdin.c
+++ b/examples/nx/nx_kbdin.c
@@ -109,7 +109,8 @@ static void nxeg_fillchar(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
if (!nxgl_nullrect(&intersection))
{
#ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS
- ret = nxtk_bitmapwindow((NXTKWINDOW)hwnd, &intersection, (FAR const void **)&src,
+ ret = nxtk_bitmapwindow((NXTKWINDOW)hwnd, &intersection,
+ (FAR const void **)&src,
&bm->bounds.pt1,
(unsigned int)bm->glyph->stride);
if (ret < 0)
@@ -165,7 +166,7 @@ nxeg_renderglyph(FAR struct nxeg_state_s *st,
/* Allocate memory to hold the glyph with its offsets */
glyph->stride = (glyph->width * CONFIG_EXAMPLES_NX_BPP + 7) / 8;
- bmsize = glyph->stride * glyph->height;
+ bmsize = glyph->stride * glyph->height;
glyph->bitmap = (FAR uint8_t *)malloc(bmsize);
if (glyph->bitmap)
@@ -178,13 +179,13 @@ nxeg_renderglyph(FAR struct nxeg_state_s *st,
/* Pack 1-bit pixels into a 2-bits */
pixel &= 0x01;
- pixel = (pixel) << 1 |pixel;
+ pixel = (pixel) << 1 | pixel;
# endif
# if CONFIG_EXAMPLES_NX_BPP < 4
/* Pack 2-bit pixels into a nibble */
pixel &= 0x03;
- pixel = (pixel) << 2 |pixel;
+ pixel = (pixel) << 2 | pixel;
# endif
/* Pack 4-bit nibbles into a byte */
@@ -222,7 +223,7 @@ nxeg_renderglyph(FAR struct nxeg_state_s *st,
/* Then render the glyph into the allocated memory */
- ret = RENDERER((FAR nxgl_mxpixel_t*)glyph->bitmap,
+ ret = RENDERER((FAR nxgl_mxpixel_t *)glyph->bitmap,
glyph->height, glyph->width, glyph->stride,
bm, CONFIG_EXAMPLES_NX_FONTCOLOR);
if (ret < 0)
@@ -236,9 +237,9 @@ nxeg_renderglyph(FAR struct nxeg_state_s *st,
}
else
{
- /* Make it permanent */
+ /* Make it permanent */
- st->nglyphs++;
+ st->nglyphs++;
}
}
}
@@ -269,6 +270,7 @@ nxeg_addspace(FAR struct nxeg_state_s *st, uint8_t ch)
st->nglyphs++;
}
+
return glyph;
}
@@ -283,13 +285,14 @@ nxeg_findglyph(FAR struct nxeg_state_s *st, uint8_t ch)
/* First, try to find the glyph in the cache of pre-rendered glyphs */
- for (i = 0; i < st->nglyphs; i++)
+ for (i = 0; i < st->nglyphs; i++)
{
if (st->glyph[i].code == ch)
{
return &st->glyph[i];
}
}
+
return NULL;
}
@@ -313,21 +316,22 @@ nxeg_getglyph(FAR struct nxeg_state_s *st, uint8_t ch)
bm = nxf_getbitmap(g_fonthandle, ch);
if (!bm)
{
- /* No, there is no glyph for this code. Use space */
+ /* No, there is no glyph for this code. Use space. */
glyph = nxeg_findglyph(st, ' ');
if (!glyph)
{
- /* There isn't fake glyph for ' ' yet... create one */
+ /* There isn't a fake glyph for ' ' yet... create one */
glyph = nxeg_addspace(st, ' ');
}
}
else
{
- glyph = nxeg_renderglyph(st, bm, ch);
+ glyph = nxeg_renderglyph(st, bm, ch);
}
}
+
return glyph;
}
@@ -346,41 +350,42 @@ nxeg_addchar(FAR struct nxeg_state_s *st, uint8_t ch)
if (st->nchars < NXTK_MAXKBDCHARS)
{
- /* Yes, setup the bitmap */
+ /* Yes, setup the bitmap */
- bm = &st->bm[st->nchars];
+ bm = &st->bm[st->nchars];
- /* Find the matching glyph */
+ /* Find the matching glyph */
- bm->glyph = nxeg_getglyph(st, ch);
- if (!bm->glyph)
- {
- return NULL;
- }
+ bm->glyph = nxeg_getglyph(st, ch);
+ if (!bm->glyph)
+ {
+ return NULL;
+ }
- /* Set up the bounds for the bitmap */
+ /* Set up the bounds for the bitmap */
- if (st->nchars <= 0)
- {
- /* The first character is one space from the left */
+ if (st->nchars <= 0)
+ {
+ /* The first character is one space from the left */
- leftx = st->spwidth;
- }
- else
- {
- /* Otherwise, it is to the left of the preceding char */
+ leftx = st->spwidth;
+ }
+ else
+ {
+ /* Otherwise, it is to the left of the preceding char */
- bmleft = &st->bm[st->nchars-1];
- leftx = bmleft->bounds.pt2.x + 1;
- }
+ bmleft = &st->bm[st->nchars - 1];
+ leftx = bmleft->bounds.pt2.x + 1;
+ }
- bm->bounds.pt1.x = leftx;
- bm->bounds.pt1.y = 2;
- bm->bounds.pt2.x = leftx + bm->glyph->width - 1;
- bm->bounds.pt2.y = 2 + bm->glyph->height - 1;
+ bm->bounds.pt1.x = leftx;
+ bm->bounds.pt1.y = 2;
+ bm->bounds.pt2.x = leftx + bm->glyph->width - 1;
+ bm->bounds.pt2.y = 2 + bm->glyph->height - 1;
- st->nchars++;
+ st->nchars++;
}
+
return bm;
}
@@ -424,10 +429,12 @@ void nxeg_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch,
****************************************************************************/
#ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS
-void nxeg_tbkbdin(NXWINDOW hwnd, uint8_t nch, const uint8_t *ch, FAR void *arg)
+void nxeg_tbkbdin(NXWINDOW hwnd, uint8_t nch, const uint8_t *ch,
+ FAR void *arg)
{
FAR struct nxeg_state_s *st = (FAR struct nxeg_state_s *)arg;
- printf("nxeg_tbkbdin: ERROR -- toolbar should not received keyboard input\n");
+ printf("nxeg_tbkbdin: ERROR -- toolbar should not received keyboard "
+ "input\n");
printf("nxeg_tbkbdin%d: hwnd=%p nch=%d\n", st->wnum, hwnd, nch);
}
#endif
diff --git a/examples/nx/nx_main.c b/examples/nx/nx_main.c
index 942d59870..9bdeded9c 100644
--- a/examples/nx/nx_main.c
+++ b/examples/nx/nx_main.c
@@ -54,6 +54,7 @@
****************************************************************************/
/* Configuration ************************************************************/
+
/* If not specified, assume that the hardware supports one video plane */
#ifndef CONFIG_EXAMPLES_NX_VPLANE
@@ -98,7 +99,10 @@ nxgl_coord_t g_yres;
bool b_haveresolution = false;
bool g_connected = false;
-sem_t g_semevent = {0};
+sem_t g_semevent =
+{
+ 0
+};
/* Colors used to fill window 1 & 2 */
@@ -181,14 +185,16 @@ static void nxeg_freestate(FAR struct nxeg_state_s *st)
{
for (i = 0; i < st->nglyphs; i++)
{
- if (st->glyph[i].bitmap)
- {
- free(st->glyph[i].bitmap);
- }
- st->glyph[i].bitmap = NULL;
+ if (st->glyph[i].bitmap)
+ {
+ free(st->glyph[i].bitmap);
+ }
+
+ st->glyph[i].bitmap = NULL;
}
+
st->nchars = 0;
- }
+ }
#endif
}
#endif
@@ -199,7 +205,7 @@ static void nxeg_freestate(FAR struct nxeg_state_s *st)
#ifdef CONFIG_EXAMPLES_NX_RAWWINDOWS
static inline NXEGWINDOW nxeg_openwindow(FAR const struct nx_callback_s *cb,
- FAR struct nxeg_state_s *state)
+ FAR struct nxeg_state_s *state)
{
NXEGWINDOW hwnd;
@@ -209,8 +215,10 @@ static inline NXEGWINDOW nxeg_openwindow(FAR const struct nx_callback_s *cb,
printf("nxeg_openwindow: nx_openwindow failed: %d\n", errno);
g_exitcode = NXEXIT_NXOPENWINDOW;
}
+
return hwnd;
}
+
#else
static inline NXEGWINDOW nxeg_openwindow(FAR const struct nx_callback_s *cb,
FAR struct nxeg_state_s *state)
@@ -223,8 +231,10 @@ static inline NXEGWINDOW nxeg_openwindow(FAR const struct nx_callback_s *cb,
printf("nxeg_openwindow: nxtk_openwindow failed: %d\n", errno);
g_exitcode = NXEXIT_NXOPENWINDOW;
}
+
return hwnd;
}
+
#endif
/****************************************************************************
@@ -232,7 +242,8 @@ static inline NXEGWINDOW nxeg_openwindow(FAR const struct nx_callback_s *cb,
****************************************************************************/
#ifdef CONFIG_EXAMPLES_NX_RAWWINDOWS
-static inline int nxeg_closewindow(NXEGWINDOW hwnd, FAR struct nxeg_state_s *state)
+static inline int nxeg_closewindow(NXEGWINDOW hwnd,
+ FAR struct nxeg_state_s *state)
{
int ret = nx_closewindow(hwnd);
if (ret < 0)
@@ -240,10 +251,13 @@ static inline int nxeg_closewindow(NXEGWINDOW hwnd, FAR struct nxeg_state_s *sta
printf("nxeg_closewindow: nx_closewindow failed: %d\n", errno);
g_exitcode = NXEXIT_NXCLOSEWINDOW;
}
+
return ret;
}
+
#else
-static inline int nxeg_closewindow(NXEGWINDOW hwnd, FAR struct nxeg_state_s *state)
+static inline int nxeg_closewindow(NXEGWINDOW hwnd,
+ FAR struct nxeg_state_s *state)
{
int ret = nxtk_closewindow(hwnd);
if (ret < 0)
@@ -251,9 +265,11 @@ static inline int nxeg_closewindow(NXEGWINDOW hwnd, FAR struct nxeg_state_s *sta
printf("nxeg_closewindow: nxtk_closewindow failed: %d\n", errno);
g_exitcode = NXEXIT_NXCLOSEWINDOW;
}
+
nxeg_freestate(state);
return ret;
}
+
#endif
/****************************************************************************
@@ -261,7 +277,8 @@ static inline int nxeg_closewindow(NXEGWINDOW hwnd, FAR struct nxeg_state_s *sta
****************************************************************************/
#ifdef CONFIG_EXAMPLES_NX_RAWWINDOWS
-static inline int nxeg_setsize(NXEGWINDOW hwnd, FAR struct nxgl_size_s *size)
+static inline int nxeg_setsize(NXEGWINDOW hwnd,
+ FAR struct nxgl_size_s *size)
{
int ret = nx_setsize(hwnd, size);
if (ret < 0)
@@ -269,10 +286,13 @@ static inline int nxeg_setsize(NXEGWINDOW hwnd, FAR struct nxgl_size_s *size)
printf("nxeg_setsize: nx_setsize failed: %d\n", errno);
g_exitcode = NXEXIT_NXSETSIZE;
}
+
return ret;
}
+
#else
-static inline int nxeg_setsize(NXEGWINDOW hwnd, FAR struct nxgl_size_s *size)
+static inline int nxeg_setsize(NXEGWINDOW hwnd,
+ FAR struct nxgl_size_s *size)
{
int ret = nxtk_setsize(hwnd, size);
if (ret < 0)
@@ -280,8 +300,10 @@ static inline int nxeg_setsize(NXEGWINDOW hwnd, FAR struct nxgl_size_s *size)
printf("nxeg_setsize: nxtk_setsize failed: %d\n", errno);
g_exitcode = NXEXIT_NXSETSIZE;
}
+
return ret;
}
+
#endif
/****************************************************************************
@@ -289,7 +311,8 @@ static inline int nxeg_setsize(NXEGWINDOW hwnd, FAR struct nxgl_size_s *size)
****************************************************************************/
#ifdef CONFIG_EXAMPLES_NX_RAWWINDOWS
-static inline int nxeg_setposition(NXEGWINDOW hwnd, FAR struct nxgl_point_s *pos)
+static inline int nxeg_setposition(NXEGWINDOW hwnd,
+ FAR struct nxgl_point_s *pos)
{
int ret = nx_setposition(hwnd, pos);
if (ret < 0)
@@ -297,10 +320,13 @@ static inline int nxeg_setposition(NXEGWINDOW hwnd, FAR struct nxgl_point_s *pos
printf("nxeg_setposition: nx_setposition failed: %d\n", errno);
g_exitcode = NXEXIT_NXSETPOSITION;
}
+
return ret;
}
+
#else
-static inline int nxeg_setposition(NXEGWINDOW hwnd, FAR struct nxgl_point_s *pos)
+static inline int nxeg_setposition(NXEGWINDOW hwnd,
+ FAR struct nxgl_point_s *pos)
{
int ret = nxtk_setposition(hwnd, pos);
if (ret < 0)
@@ -308,8 +334,10 @@ static inline int nxeg_setposition(NXEGWINDOW hwnd, FAR struct nxgl_point_s *pos
printf("nxeg_setposition: nxtk_setposition failed: %d\n", errno);
g_exitcode = NXEXIT_NXSETPOSITION;
}
+
return ret;
}
+
#endif
/****************************************************************************
@@ -328,8 +356,10 @@ static inline int nxeq_opentoolbar(NXEGWINDOW hwnd, nxgl_coord_t height,
printf("nxeq_opentoolbar: nxtk_opentoolbar failed: %d\n", errno);
g_exitcode = NXEXIT_NXOPENTOOLBAR;
}
+
return ret;
}
+
#endif
/****************************************************************************
@@ -345,8 +375,10 @@ static inline int nxeg_lower(NXEGWINDOW hwnd)
printf("nxeg_lower: nx_lower failed: %d\n", errno);
g_exitcode = NXEXIT_NXLOWER;
}
+
return ret;
}
+
#else
static inline int nxeg_lower(NXEGWINDOW hwnd)
{
@@ -356,8 +388,10 @@ static inline int nxeg_lower(NXEGWINDOW hwnd)
printf("nxeg_lower: nxtk_lower failed: %d\n", errno);
g_exitcode = NXEXIT_NXLOWER;
}
+
return ret;
}
+
#endif
/****************************************************************************
@@ -373,8 +407,10 @@ static inline int nxeg_raise(NXEGWINDOW hwnd)
printf("nxeg_raise: nx_raise failed: %d\n", errno);
g_exitcode = NXEXIT_NXRAISE;
}
+
return ret;
}
+
#else
static inline int nxeg_raise(NXEGWINDOW hwnd)
{
@@ -384,8 +420,10 @@ static inline int nxeg_raise(NXEGWINDOW hwnd)
printf("nxeg_raise: nxtk_raise failed: %d\n", errno);
g_exitcode = NXEXIT_NXRAISE;
}
+
return ret;
}
+
#endif
/****************************************************************************
@@ -416,7 +454,7 @@ static int nxeg_initialize(void)
ret = sched_setparam(0, ¶m);
if (ret < 0)
{
- printf("nxeg_initialize: sched_setparam failed: %d\n" , ret);
+ printf("nxeg_initialize: sched_setparam failed: %d\n", ret);
g_exitcode = NXEXIT_SCHEDSETPARAM;
return ERROR;
}
@@ -426,7 +464,8 @@ static int nxeg_initialize(void)
ret = boardctl(BOARDIOC_NX_START, 0);
if (ret < 0)
{
- printf("nxeg_initialize: Failed to start the NX server: %d\n", errno);
+ printf("nxeg_initialize: Failed to start the NX server: %d\n",
+ errno);
g_exitcode = NXEXIT_TASKCREATE;
return ERROR;
}
@@ -436,54 +475,54 @@ static int nxeg_initialize(void)
g_hnx = nx_connect();
if (g_hnx)
{
- pthread_attr_t attr;
+ pthread_attr_t attr;
#ifdef CONFIG_VNCSERVER
/* Setup the VNC server to support keyboard/mouse inputs */
- struct boardioc_vncstart_s vnc =
- {
- 0, g_hnx
- };
-
- ret = boardctl(BOARDIOC_VNC_START, (uintptr_t)&vnc);
- if (ret < 0)
- {
- printf("boardctl(BOARDIOC_VNC_START) failed: %d\n", ret);
- nx_disconnect(g_hnx);
- g_exitcode = NXEXIT_FBINITIALIZE;
- return ERROR;
- }
+ struct boardioc_vncstart_s vnc =
+ {
+ 0, g_hnx
+ };
+
+ ret = boardctl(BOARDIOC_VNC_START, (uintptr_t)&vnc);
+ if (ret < 0)
+ {
+ printf("boardctl(BOARDIOC_VNC_START) failed: %d\n", ret);
+ nx_disconnect(g_hnx);
+ g_exitcode = NXEXIT_FBINITIALIZE;
+ return ERROR;
+ }
#endif
- /* Start a separate thread to listen for server events. This is probably
- * the least efficient way to do this, but it makes this example flow more
- * smoothly.
- */
+ /* Start a separate thread to listen for server events. This is
+ * probably the least efficient way to do this, but it makes this
+ * example flow more smoothly.
+ */
- pthread_attr_init(&attr);
- param.sched_priority = CONFIG_EXAMPLES_NX_LISTENERPRIO;
- pthread_attr_setschedparam(&attr, ¶m);
- pthread_attr_setstacksize(&attr, CONFIG_EXAMPLES_NX_STACKSIZE);
+ pthread_attr_init(&attr);
+ param.sched_priority = CONFIG_EXAMPLES_NX_LISTENERPRIO;
+ pthread_attr_setschedparam(&attr, ¶m);
+ pthread_attr_setstacksize(&attr, CONFIG_EXAMPLES_NX_STACKSIZE);
- ret = pthread_create(&thread, &attr, nx_listenerthread, NULL);
- if (ret != 0)
- {
- printf("nxeg_initialize: pthread_create failed: %d\n", ret);
- g_exitcode = NXEXIT_PTHREADCREATE;
- return ERROR;
- }
+ ret = pthread_create(&thread, &attr, nx_listenerthread, NULL);
+ if (ret != 0)
+ {
+ printf("nxeg_initialize: pthread_create failed: %d\n", ret);
+ g_exitcode = NXEXIT_PTHREADCREATE;
+ return ERROR;
+ }
- /* Don't return until we are connected to the server */
+ /* Don't return until we are connected to the server */
- while (!g_connected)
- {
- /* Wait for the listener thread to wake us up when we really
- * are connected.
- */
+ while (!g_connected)
+ {
+ /* Wait for the listener thread to wake us up when we really
+ * are connected.
+ */
- sem_wait(&g_semevent);
- }
+ sem_wait(&g_semevent);
+ }
}
else
{
@@ -562,6 +601,7 @@ int main(int argc, FAR char *argv[])
{
sem_wait(&g_semevent);
}
+
printf("nx_main: Screen resolution (%d,%d)\n", g_xres, g_yres);
/* Set the size of the window 1 */
@@ -576,9 +616,8 @@ int main(int argc, FAR char *argv[])
goto errout_with_hwnd1;
}
- /* Sleep a bit -- both so that we can see the result of the above operations
- * but also, in the multi-user case, so that the server can get a chance to
- * actually do them!
+ /* Sleep a bit. This lets us see the result of the above operations and,
+ * in the multi-user case, gives the server a chance to actually do them.
*/
printf("nx_main: Sleeping\n\n");
@@ -605,7 +644,8 @@ int main(int argc, FAR char *argv[])
#ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS
printf("nx_main: Add toolbar to window #1\n");
- ret = nxeq_opentoolbar(hwnd1, CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT, &g_tbcb, &g_wstate[0]);
+ ret = nxeq_opentoolbar(hwnd1, CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT,
+ &g_tbcb, &g_wstate[0]);
if (ret < 0)
{
goto errout_with_hwnd1;
@@ -633,7 +673,7 @@ int main(int argc, FAR char *argv[])
printf("nx_main: Sleeping\n\n");
sleep(1);
- /* Set the size of the window 2 == size of window 1*/
+ /* Set the size of window 2 equal to the size of window 1 */
printf("nx_main: Set hwnd2 size to (%d,%d)\n", size.w, size.h);
ret = nxeg_setsize(hwnd2, &size);
@@ -666,7 +706,8 @@ int main(int argc, FAR char *argv[])
#ifndef CONFIG_EXAMPLES_NX_RAWWINDOWS
printf("nx_main: Add toolbar to window #2\n");
- ret = nxeq_opentoolbar(hwnd2, CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT, &g_tbcb, &g_wstate[1]);
+ ret = nxeq_opentoolbar(hwnd2, CONFIG_EXAMPLES_NX_TOOLBAR_HEIGHT,
+ &g_tbcb, &g_wstate[1]);
if (ret < 0)
{
goto errout_with_hwnd2;
@@ -770,6 +811,7 @@ errout_with_hwnd1:
nxeg_closewindow(hwnd1, &g_wstate[0]);
errout_with_nx:
+
/* Disconnect from the server */
printf("nx_main: Disconnect from the server\n");
diff --git a/examples/nxhello/nxhello_bkgd.c b/examples/nxhello/nxhello_bkgd.c
index 323b4870d..5e0a5b80e 100644
--- a/examples/nxhello/nxhello_bkgd.c
+++ b/examples/nxhello/nxhello_bkgd.c
@@ -76,19 +76,21 @@
****************************************************************************/
static void nxhello_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
- bool morem, FAR void *arg);
-static void nxhello_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
- FAR const struct nxgl_point_s *pos,
- FAR const struct nxgl_rect_s *bounds,
- FAR void *arg);
+ bool morem, FAR void *arg);
+static void nxhello_position(NXWINDOW hwnd,
+ FAR const struct nxgl_size_s *size,
+ FAR const struct nxgl_point_s *pos,
+ FAR const struct nxgl_rect_s *bounds,
+ FAR void *arg);
#ifdef CONFIG_NX_XYINPUT
-static void nxhello_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
- uint8_t buttons, FAR void *arg);
+static void nxhello_mousein(NXWINDOW hwnd,
+ FAR const struct nxgl_point_s *pos,
+ uint8_t buttons, FAR void *arg);
#endif
#ifdef CONFIG_NX_KBD
-static void nxhello_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch,
- FAR void *arg);
+static void nxhello_kbdin(NXWINDOW hwnd, uint8_t nch,
+ FAR const uint8_t *ch, FAR void *arg);
#endif
/****************************************************************************
@@ -125,7 +127,7 @@ const struct nx_callback_s g_nxhellocb =
****************************************************************************/
static void nxhello_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
- bool more, FAR void *arg)
+ bool more, FAR void *arg)
{
ginfo("hwnd=%p rect={(%d,%d),(%d,%d)} more=%s\n",
hwnd, rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y,
@@ -136,10 +138,11 @@ static void nxhello_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
* Name: nxhello_position
****************************************************************************/
-static void nxhello_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
- FAR const struct nxgl_point_s *pos,
- FAR const struct nxgl_rect_s *bounds,
- FAR void *arg)
+static void nxhello_position(NXWINDOW hwnd,
+ FAR const struct nxgl_size_s *size,
+ FAR const struct nxgl_point_s *pos,
+ FAR const struct nxgl_rect_s *bounds,
+ FAR void *arg)
{
/* Report the position */
@@ -171,8 +174,9 @@ static void nxhello_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
****************************************************************************/
#ifdef CONFIG_NX_XYINPUT
-static void nxhello_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
- uint8_t buttons, FAR void *arg)
+static void nxhello_mousein(NXWINDOW hwnd,
+ FAR const struct nxgl_point_s *pos,
+ uint8_t buttons, FAR void *arg)
{
printf("nxhello_mousein: hwnd=%p pos=(%d,%d) button=%02x\n",
hwnd, pos->x, pos->y, buttons);
@@ -184,16 +188,16 @@ static void nxhello_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
****************************************************************************/
#ifdef CONFIG_NX_KBD
-static void nxhello_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch,
- FAR void *arg)
+static void nxhello_kbdin(NXWINDOW hwnd, uint8_t nch,
+ FAR const uint8_t *ch, FAR void *arg)
{
ginfo("hwnd=%p nch=%d\n", hwnd, nch);
- /* In this example, there is no keyboard so a keyboard event is not
- * expected.
- */
+ /* In this example, there is no keyboard so a keyboard event is not
+ * expected.
+ */
- printf("nxhello_kbdin: Unexpected keyboard callback\n");
+ printf("nxhello_kbdin: Unexpected keyboard callback\n");
}
#endif
@@ -212,7 +216,7 @@ static void nxhello_center(FAR struct nxgl_point_s *pos,
* hello world message.
*/
- for (ptr = (uint8_t*)g_hello, width = 0; *ptr; ptr++)
+ for (ptr = (uint8_t *)g_hello, width = 0; *ptr; ptr++)
{
/* Get the font bitmap for this character */
@@ -225,7 +229,7 @@ static void nxhello_center(FAR struct nxgl_point_s *pos,
}
else
{
- /* Use the width of a space */
+ /* Use the width of a space */
width += fontset->spwidth;
}
@@ -266,7 +270,7 @@ static void nxhello_initglyph(FAR uint8_t *glyph, uint8_t height,
/* Pack 1-bit pixels into a 2-bits */
pixel &= 0x01;
- pixel = (pixel) << 1 |pixel;
+ pixel = (pixel) << 1 | pixel;
# endif
# if CONFIG_EXAMPLES_NXHELLO_BPP < 4
@@ -274,7 +278,7 @@ static void nxhello_initglyph(FAR uint8_t *glyph, uint8_t height,
/* Pack 2-bit pixels into a nibble */
pixel &= 0x03;
- pixel = (pixel) << 2 |pixel;
+ pixel = (pixel) << 2 | pixel;
# endif
@@ -348,10 +352,10 @@ void nxhello_hello(NXWINDOW hwnd)
mxstride = (fontset->mxwidth * CONFIG_EXAMPLES_NXHELLO_BPP + 7) >> 3;
glyphsize = (unsigned int)fontset->mxheight * mxstride;
- glyph = (FAR uint8_t*)malloc(glyphsize);
+ glyph = (FAR uint8_t *)malloc(glyphsize);
- /* NOTE: no check for failure to allocate the memory. In a real application
- * you would need to handle that event.
+ /* NOTE: no check for failure to allocate the memory. In a real
+ * application you would need to handle that event.
*/
/* Get a position so the "Hello, World!" string will be centered on the
@@ -389,7 +393,7 @@ void nxhello_hello(NXWINDOW hwnd)
#if CONFIG_NX_NPLANES > 1
# warning "More logic is needed for the case where CONFIG_NX_PLANES > 1"
#endif
- RENDERER((FAR nxgl_mxpixel_t*)glyph, fheight, fwidth,
+ RENDERER((FAR nxgl_mxpixel_t *)glyph, fheight, fwidth,
fstride, fbm, CONFIG_EXAMPLES_NXHELLO_FONTCOLOR);
/* Describe the destination of the font with a rectangle */
@@ -411,15 +415,15 @@ void nxhello_hello(NXWINDOW hwnd)
printf("nxhello_write: nx_bitmapwindow failed: %d\n", errno);
}
- /* Skip to the right the width of the font */
+ /* Skip to the right the width of the font */
pos.x += fwidth;
}
else
{
- /* No bitmap (probably because the font is a space). Skip to the
- * right the width of a space.
- */
+ /* No bitmap (probably because the font is a space). Skip to the
+ * right the width of a space.
+ */
pos.x += fontset->spwidth;
}
diff --git a/examples/nxhello/nxhello_main.c b/examples/nxhello/nxhello_main.c
index 8165d9abe..d524f6f2c 100644
--- a/examples/nxhello/nxhello_main.c
+++ b/examples/nxhello/nxhello_main.c
@@ -95,7 +95,8 @@ static inline int nxhello_initialize(void)
ret = boardctl(BOARDIOC_NX_START, 0);
if (ret < 0)
{
- printf("nxhello_initialize: Failed to start the NX server: %d\n", errno);
+ printf("nxhello_initialize: Failed to start the NX server: %d\n",
+ errno);
return ERROR;
}
@@ -104,52 +105,53 @@ static inline int nxhello_initialize(void)
g_nxhello.hnx = nx_connect();
if (g_nxhello.hnx)
{
- pthread_attr_t attr;
+ pthread_attr_t attr;
#ifdef CONFIG_VNCSERVER
/* Setup the VNC server to support keyboard/mouse inputs */
- struct boardioc_vncstart_s vnc =
- {
- 0, g_nxhello.hnx
- };
-
- ret = boardctl(BOARDIOC_VNC_START, (uintptr_t)&vnc);
- if (ret < 0)
- {
- printf("boardctl(BOARDIOC_VNC_START) failed: %d\n", ret);
- nx_disconnect(g_nxhello.hnx);
- return ERROR;
- }
+ struct boardioc_vncstart_s vnc =
+ {
+ 0, g_nxhello.hnx
+ };
+
+ ret = boardctl(BOARDIOC_VNC_START, (uintptr_t)&vnc);
+ if (ret < 0)
+ {
+ printf("boardctl(BOARDIOC_VNC_START) failed: %d\n", ret);
+ nx_disconnect(g_nxhello.hnx);
+ return ERROR;
+ }
#endif
- /* Start a separate thread to listen for server events. This is probably
- * the least efficient way to do this, but it makes this example flow more
- * smoothly.
- */
-
- pthread_attr_init(&attr);
- param.sched_priority = CONFIG_EXAMPLES_NXHELLO_LISTENERPRIO;
- pthread_attr_setschedparam(&attr, ¶m);
- pthread_attr_setstacksize(&attr, CONFIG_EXAMPLES_NXHELLO_LISTENER_STACKSIZE);
-
- ret = pthread_create(&thread, &attr, nxhello_listener, NULL);
- if (ret != 0)
- {
- printf("nxhello_initialize: pthread_create failed: %d\n", ret);
- return ERROR;
- }
-
- /* Don't return until we are connected to the server */
-
- while (!g_nxhello.connected)
- {
- /* Wait for the listener thread to wake us up when we really
- * are connected.
- */
-
- sem_wait(&g_nxhello.eventsem);
- }
+ /* Start a separate thread to listen for server events. This is
+ * probably the least efficient way to do this, but it makes this
+ * example flow more smoothly.
+ */
+
+ pthread_attr_init(&attr);
+ param.sched_priority = CONFIG_EXAMPLES_NXHELLO_LISTENERPRIO;
+ pthread_attr_setschedparam(&attr, ¶m);
+ pthread_attr_setstacksize(&attr,
+ CONFIG_EXAMPLES_NXHELLO_LISTENER_STACKSIZE);
+
+ ret = pthread_create(&thread, &attr, nxhello_listener, NULL);
+ if (ret != 0)
+ {
+ printf("nxhello_initialize: pthread_create failed: %d\n", ret);
+ return ERROR;
+ }
+
+ /* Don't return until we are connected to the server */
+
+ while (!g_nxhello.connected)
+ {
+ /* Wait for the listener thread to wake us up when we really
+ * are connected.
+ */
+
+ sem_wait(&g_nxhello.eventsem);
+ }
}
else
{
@@ -225,7 +227,8 @@ int main(int argc, FAR char *argv[])
sem_wait(&g_nxhello.eventsem);
}
- printf("nxhello_main: Screen resolution (%d,%d)\n", g_nxhello.xres, g_nxhello.yres);
+ printf("nxhello_main: Screen resolution (%d,%d)\n",
+ g_nxhello.xres, g_nxhello.yres);
/* Now, say hello and exit, sleeping a little before each. */
diff --git a/examples/nximage/nximage_bkgd.c b/examples/nximage/nximage_bkgd.c
index 8a86f0498..8e3a2f651 100644
--- a/examples/nximage/nximage_bkgd.c
+++ b/examples/nximage/nximage_bkgd.c
@@ -109,19 +109,21 @@ struct nximage_run_s
****************************************************************************/
static void nximage_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
- bool more, FAR void *arg);
-static void nximage_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
- FAR const struct nxgl_point_s *pos,
- FAR const struct nxgl_rect_s *bounds,
- FAR void *arg);
+ bool more, FAR void *arg);
+static void nximage_position(NXWINDOW hwnd,
+ FAR const struct nxgl_size_s *size,
+ FAR const struct nxgl_point_s *pos,
+ FAR const struct nxgl_rect_s *bounds,
+ FAR void *arg);
#ifdef CONFIG_NX_XYINPUT
-static void nximage_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
- uint8_t buttons, FAR void *arg);
+static void nximage_mousein(NXWINDOW hwnd,
+ FAR const struct nxgl_point_s *pos,
+ uint8_t buttons, FAR void *arg);
#endif
#ifdef CONFIG_NX_KBD
-static void nximage_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch,
- FAR void *arg);
+static void nximage_kbdin(NXWINDOW hwnd, uint8_t nch,
+ FAR const uint8_t *ch, FAR void *arg);
#endif
/****************************************************************************
@@ -164,7 +166,7 @@ const struct nx_callback_s g_nximagecb =
****************************************************************************/
static void nximage_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
- bool more, FAR void *arg)
+ bool more, FAR void *arg)
{
ginfo("hwnd=%p rect={(%d,%d),(%d,%d)} more=%s\n",
hwnd, rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y,
@@ -179,10 +181,11 @@ static void nximage_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
*
****************************************************************************/
-static void nximage_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
- FAR const struct nxgl_point_s *pos,
- FAR const struct nxgl_rect_s *bounds,
- FAR void *arg)
+static void nximage_position(NXWINDOW hwnd,
+ FAR const struct nxgl_size_s *size,
+ FAR const struct nxgl_point_s *pos,
+ FAR const struct nxgl_rect_s *bounds,
+ FAR void *arg)
{
/* Report the position */
@@ -218,8 +221,9 @@ static void nximage_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
****************************************************************************/
#ifdef CONFIG_NX_XYINPUT
-static void nximage_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
- uint8_t buttons, FAR void *arg)
+static void nximage_mousein(NXWINDOW hwnd,
+ FAR const struct nxgl_point_s *pos,
+ uint8_t buttons, FAR void *arg)
{
printf("nximage_mousein: hwnd=%p pos=(%d,%d) button=%02x\n",
hwnd, pos->x, pos->y, buttons);
@@ -235,16 +239,16 @@ static void nximage_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
****************************************************************************/
#ifdef CONFIG_NX_KBD
-static void nximage_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch,
- FAR void *arg)
+static void nximage_kbdin(NXWINDOW hwnd, uint8_t nch,
+ FAR const uint8_t *ch, FAR void *arg)
{
ginfo("hwnd=%p nch=%d\n", hwnd, nch);
- /* In this example, there is no keyboard so a keyboard event is not
- * expected.
- */
+ /* In this example, there is no keyboard so a keyboard event is not
+ * expected.
+ */
- printf("nximage_kbdin: Unexpected keyboard callback\n");
+ printf("nximage_kbdin: Unexpected keyboard callback\n");
}
#endif
@@ -288,9 +292,9 @@ void nximage_image(NXWINDOW hwnd)
{
/* Read input row(s) */
- nximage_blitrow(g_runs[0].run, &state);
+ nximage_blitrow(g_runs[0].run, &state);
#if NINPUT_ROWS > 1
- nximage_blitrow(g_runs[1].run, &state);
+ nximage_blitrow(g_runs[1].run, &state);
#endif
/* Output rows before averaging */
@@ -306,7 +310,8 @@ void nximage_image(NXWINDOW hwnd)
#if CONFIG_NX_NPLANES > 1
# warning "More logic is needed for the case where CONFIG_NX_PLANES > 1"
#endif
- ret = nx_bitmap((NXWINDOW)hwnd, &dest, src, &pos, SCALED_WIDTH*sizeof(nxgl_mxpixel_t));
+ ret = nx_bitmap((NXWINDOW)hwnd, &dest, src, &pos,
+ SCALED_WIDTH * sizeof(nxgl_mxpixel_t));
if (ret < 0)
{
printf("nximage_image: nx_bitmapwindow failed: %d\n", errno);
@@ -348,7 +353,8 @@ void nximage_image(NXWINDOW hwnd)
#if CONFIG_NX_NPLANES > 1
# warning "More logic is needed for the case where CONFIG_NX_PLANES > 1"
#endif
- ret = nx_bitmap((NXWINDOW)hwnd, &dest, src, &pos, SCALED_WIDTH*sizeof(nxgl_mxpixel_t));
+ ret = nx_bitmap((NXWINDOW)hwnd, &dest, src, &pos,
+ SCALED_WIDTH * sizeof(nxgl_mxpixel_t));
if (ret < 0)
{
printf("nximage_image: nx_bitmapwindow failed: %d\n", errno);
@@ -369,7 +375,8 @@ void nximage_image(NXWINDOW hwnd)
#if CONFIG_NX_NPLANES > 1
# warning "More logic is needed for the case where CONFIG_NX_PLANES > 1"
#endif
- ret = nx_bitmap((NXWINDOW)hwnd, &dest, src, &pos, SCALED_WIDTH*sizeof(nxgl_mxpixel_t));
+ ret = nx_bitmap((NXWINDOW)hwnd, &dest, src, &pos,
+ SCALED_WIDTH * sizeof(nxgl_mxpixel_t));
if (ret < 0)
{
printf("nximage_image: nx_bitmapwindow failed: %d\n", errno);
diff --git a/examples/nximage/nximage_main.c b/examples/nximage/nximage_main.c
index fd2beac0b..4d9648f0f 100644
--- a/examples/nximage/nximage_main.c
+++ b/examples/nximage/nximage_main.c
@@ -90,7 +90,7 @@ static inline int nximage_initialize(void)
ret = sched_setparam(0, ¶m);
if (ret < 0)
{
- printf("nximage_initialize: sched_setparam failed: %d\n" , ret);
+ printf("nximage_initialize: sched_setparam failed: %d\n", ret);
return ERROR;
}
@@ -99,7 +99,8 @@ static inline int nximage_initialize(void)
ret = boardctl(BOARDIOC_NX_START, 0);
if (ret < 0)
{
- printf("nximage_initialize: Failed to start the NX server: %d\n", errno);
+ printf("nximage_initialize: Failed to start the NX server: %d\n",
+ errno);
return ERROR;
}
@@ -108,52 +109,53 @@ static inline int nximage_initialize(void)
g_nximage.hnx = nx_connect();
if (g_nximage.hnx)
{
- pthread_attr_t attr;
+ pthread_attr_t attr;
#ifdef CONFIG_VNCSERVER
/* Setup the VNC server to support keyboard/mouse inputs */
- struct boardioc_vncstart_s vnc =
- {
- 0, g_nximage.hnx
- };
-
- ret = boardctl(BOARDIOC_VNC_START, (uintptr_t)&vnc);
- if (ret < 0)
- {
- printf("boardctl(BOARDIOC_VNC_START) failed: %d\n", ret);
- nx_disconnect(g_nximage.hnx);
- return ERROR;
- }
+ struct boardioc_vncstart_s vnc =
+ {
+ 0, g_nximage.hnx
+ };
+
+ ret = boardctl(BOARDIOC_VNC_START, (uintptr_t)&vnc);
+ if (ret < 0)
+ {
+ printf("boardctl(BOARDIOC_VNC_START) failed: %d\n", ret);
+ nx_disconnect(g_nximage.hnx);
+ return ERROR;
+ }
#endif
- /* Start a separate thread to listen for server events. This is probably
- * the least efficient way to do this, but it makes this example flow more
- * smoothly.
- */
-
- pthread_attr_init(&attr);
- param.sched_priority = CONFIG_EXAMPLES_NXIMAGE_LISTENERPRIO;
- pthread_attr_setschedparam(&attr, ¶m);
- pthread_attr_setstacksize(&attr, CONFIG_EXAMPLES_NXIMAGE_LISTENER_STACKSIZE);
-
- ret = pthread_create(&thread, &attr, nximage_listener, NULL);
- if (ret != 0)
- {
- printf("nximage_initialize: pthread_create failed: %d\n", ret);
- return ERROR;
- }
-
- /* Don't return until we are connected to the server */
-
- while (!g_nximage.connected)
- {
- /* Wait for the listener thread to wake us up when we really
- * are connected.
- */
-
- sem_wait(&g_nximage.eventsem);
- }
+ /* Start a separate thread to listen for server events. This is
+ * probably the least efficient way to do this, but it makes this
+ * example flow more smoothly.
+ */
+
+ pthread_attr_init(&attr);
+ param.sched_priority = CONFIG_EXAMPLES_NXIMAGE_LISTENERPRIO;
+ pthread_attr_setschedparam(&attr, ¶m);
+ pthread_attr_setstacksize(&attr,
+ CONFIG_EXAMPLES_NXIMAGE_LISTENER_STACKSIZE);
+
+ ret = pthread_create(&thread, &attr, nximage_listener, NULL);
+ if (ret != 0)
+ {
+ printf("nximage_initialize: pthread_create failed: %d\n", ret);
+ return ERROR;
+ }
+
+ /* Don't return until we are connected to the server */
+
+ while (!g_nximage.connected)
+ {
+ /* Wait for the listener thread to wake us up when we really
+ * are connected.
+ */
+
+ sem_wait(&g_nximage.eventsem);
+ }
}
else
{
@@ -194,7 +196,7 @@ int main(int argc, FAR char *argv[])
/* Set the background to the configured background color */
- color = nximage_bgcolor();
+ color = nximage_bgcolor();
printf("nximage_main: Set background color=%u\n", color);
ret = nx_setbgcolor(g_nximage.hnx, &color);
@@ -222,7 +224,8 @@ int main(int argc, FAR char *argv[])
sem_wait(&g_nximage.eventsem);
}
- printf("nximage_main: Screen resolution (%d,%d)\n", g_nximage.xres, g_nximage.yres);
+ printf("nximage_main: Screen resolution (%d,%d)\n",
+ g_nximage.xres, g_nximage.yres);
/* Now, put up the NuttX logo and wait a bit so that it visible. */
diff --git a/examples/nxlines/nxlines_main.c b/examples/nxlines/nxlines_main.c
index 85b75177e..f13294fd0 100644
--- a/examples/nxlines/nxlines_main.c
+++ b/examples/nxlines/nxlines_main.c
@@ -51,6 +51,7 @@
****************************************************************************/
/* Configuration ************************************************************/
+
/* If not specified, assume that the hardware supports one video plane */
#ifndef CONFIG_EXAMPLES_NXLINES_VPLANE
@@ -111,7 +112,7 @@ static inline int nxlines_initialize(void)
ret = sched_setparam(0, ¶m);
if (ret < 0)
{
- printf("nxlines_initialize: sched_setparam failed: %d\n" , ret);
+ printf("nxlines_initialize: sched_setparam failed: %d\n", ret);
return ERROR;
}
@@ -120,7 +121,8 @@ static inline int nxlines_initialize(void)
ret = boardctl(BOARDIOC_NX_START, 0);
if (ret < 0)
{
- printf("nxlines_initialize: Failed to start the NX server: %d\n", errno);
+ printf("nxlines_initialize: Failed to start the NX server: %d\n",
+ errno);
return ERROR;
}
@@ -129,52 +131,53 @@ static inline int nxlines_initialize(void)
g_nxlines.hnx = nx_connect();
if (g_nxlines.hnx)
{
- pthread_attr_t attr;
+ pthread_attr_t attr;
#ifdef CONFIG_VNCSERVER
/* Setup the VNC server to support keyboard/mouse inputs */
- struct boardioc_vncstart_s vnc =
- {
- 0, g_nxlines.hnx
- };
-
- ret = boardctl(BOARDIOC_VNC_START, (uintptr_t)&vnc);
- if (ret < 0)
- {
- printf("boardctl(BOARDIOC_VNC_START) failed: %d\n", ret);
- nx_disconnect(g_nxlines.hnx);
- return ERROR;
- }
+ struct boardioc_vncstart_s vnc =
+ {
+ 0, g_nxlines.hnx
+ };
+
+ ret = boardctl(BOARDIOC_VNC_START, (uintptr_t)&vnc);
+ if (ret < 0)
+ {
+ printf("boardctl(BOARDIOC_VNC_START) failed: %d\n", ret);
+ nx_disconnect(g_nxlines.hnx);
+ return ERROR;
+ }
#endif
- /* Start a separate thread to listen for server events. This is probably
- * the least efficient way to do this, but it makes this example flow more
- * smoothly.
- */
-
- pthread_attr_init(&attr);
- param.sched_priority = CONFIG_EXAMPLES_NXLINES_LISTENERPRIO;
- pthread_attr_setschedparam(&attr, ¶m);
- pthread_attr_setstacksize(&attr, CONFIG_EXAMPLES_NXLINES_LISTENER_STACKSIZE);
-
- ret = pthread_create(&thread, &attr, nxlines_listener, NULL);
- if (ret != 0)
- {
- printf("nxlines_initialize: pthread_create failed: %d\n", ret);
- return ERROR;
- }
-
- /* Don't return until we are connected to the server */
-
- while (!g_nxlines.connected)
- {
- /* Wait for the listener thread to wake us up when we really
- * are connected.
- */
-
- sem_wait(&g_nxlines.eventsem);
- }
+ /* Start a separate thread to listen for server events. This is
+ * probably the least efficient way to do this, but it makes this
+ * example flow more smoothly.
+ */
+
+ pthread_attr_init(&attr);
+ param.sched_priority = CONFIG_EXAMPLES_NXLINES_LISTENERPRIO;
+ pthread_attr_setschedparam(&attr, ¶m);
+ pthread_attr_setstacksize(&attr,
+ CONFIG_EXAMPLES_NXLINES_LISTENER_STACKSIZE);
+
+ ret = pthread_create(&thread, &attr, nxlines_listener, NULL);
+ if (ret != 0)
+ {
+ printf("nxlines_initialize: pthread_create failed: %d\n", ret);
+ return ERROR;
+ }
+
+ /* Don't return until we are connected to the server */
+
+ while (!g_nxlines.connected)
+ {
+ /* Wait for the listener thread to wake us up when we really
+ * are connected.
+ */
+
+ sem_wait(&g_nxlines.eventsem);
+ }
}
else
{
@@ -240,7 +243,8 @@ int main(int argc, FAR char *argv[])
sem_wait(&g_nxlines.eventsem);
}
- printf("nxlines_main: Screen resolution (%d,%d)\n", g_nxlines.xres, g_nxlines.yres);
+ printf("nxlines_main: Screen resolution (%d,%d)\n",
+ g_nxlines.xres, g_nxlines.yres);
/* Now, say perform the lines (these test does not return so the remaining
* logic is cosmetic).
diff --git a/examples/nxterm/nxterm_toolbar.c b/examples/nxterm/nxterm_toolbar.c
index 0fa7c0802..327a54057 100644
--- a/examples/nxterm/nxterm_toolbar.c
+++ b/examples/nxterm/nxterm_toolbar.c
@@ -54,12 +54,14 @@
static void nxtool_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
bool morem, FAR void *arg);
-static void nxtool_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
+static void nxtool_position(NXWINDOW hwnd,
+ FAR const struct nxgl_size_s *size,
FAR const struct nxgl_point_s *pos,
FAR const struct nxgl_rect_s *bounds,
FAR void *arg);
#ifdef CONFIG_NX_XYINPUT
-static void nxtool_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
+static void nxtool_mousein(NXWINDOW hwnd,
+ FAR const struct nxgl_point_s *pos,
uint8_t buttons, FAR void *arg);
#endif
@@ -121,7 +123,8 @@ static void nxtool_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
* Name: nxtool_position
****************************************************************************/
-static void nxtool_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
+static void nxtool_position(NXWINDOW hwnd,
+ FAR const struct nxgl_size_s *size,
FAR const struct nxgl_point_s *pos,
FAR const struct nxgl_rect_s *bounds,
FAR void *arg)
diff --git a/examples/nxterm/nxterm_wndo.c b/examples/nxterm/nxterm_wndo.c
index c326e0449..ca88204ae 100644
--- a/examples/nxterm/nxterm_wndo.c
+++ b/examples/nxterm/nxterm_wndo.c
@@ -49,12 +49,14 @@
static void nxwndo_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
bool morem, FAR void *arg);
-static void nxwndo_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
+static void nxwndo_position(NXWINDOW hwnd,
+ FAR const struct nxgl_size_s *size,
FAR const struct nxgl_point_s *pos,
FAR const struct nxgl_rect_s *bounds,
FAR void *arg);
#ifdef CONFIG_NX_XYINPUT
-static void nxwndo_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
+static void nxwndo_mousein(NXWINDOW hwnd,
+ FAR const struct nxgl_point_s *pos,
uint8_t buttons, FAR void *arg);
#endif
@@ -119,7 +121,9 @@ static void nxwndo_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
}
else
{
- /* If the driver has not been opened, then just redraw the window color */
+ /* If the driver has not been opened, then just redraw the window
+ * color.
+ */
wcolor[0] = CONFIG_EXAMPLES_NXTERM_WCOLOR;
nxtk_fillwindow(hwnd, rect, wcolor);
@@ -130,7 +134,8 @@ static void nxwndo_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
* Name: nxwndo_position
****************************************************************************/
-static void nxwndo_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
+static void nxwndo_position(NXWINDOW hwnd,
+ FAR const struct nxgl_size_s *size,
FAR const struct nxgl_point_s *pos,
FAR const struct nxgl_rect_s *bounds,
FAR void *arg)
@@ -163,7 +168,8 @@ static void nxwndo_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
g_nxterm_vars.haveres = true;
sem_post(&g_nxterm_vars.eventsem);
- ginfo("Have xres=%d yres=%d\n", g_nxterm_vars.xres, g_nxterm_vars.yres);
+ ginfo("Have xres=%d yres=%d\n",
+ g_nxterm_vars.xres, g_nxterm_vars.yres);
}
}
diff --git a/examples/nxtext/nxtext_bkgd.c b/examples/nxtext/nxtext_bkgd.c
index 8eb55ba09..b0957bb7a 100644
--- a/examples/nxtext/nxtext_bkgd.c
+++ b/examples/nxtext/nxtext_bkgd.c
@@ -107,7 +107,8 @@ NXHANDLE g_bgwnd;
* Name: nxbg_redrawrect
****************************************************************************/
-static void nxbg_redrawrect(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect)
+static void nxbg_redrawrect(NXWINDOW hwnd,
+ FAR const struct nxgl_rect_s *rect)
{
int ret;
int i;
@@ -172,7 +173,9 @@ static void nxbg_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
st->wsize.w = size->w;
st->wsize.h = size->h;
- /* Save the window limits (these should be the same for all places and all windows */
+ /* Save the window limits (these should be the same for all places
+ * and all windows.
+ */
g_xres = bounds->pt2.x + 1;
g_yres = bounds->pt2.y + 1;
@@ -219,7 +222,8 @@ static void nxbg_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch,
* only.
****************************************************************************/
-static inline void nxbg_movedisplay(NXWINDOW hwnd, int bottom, int lineheight)
+static inline void nxbg_movedisplay(NXWINDOW hwnd, int bottom,
+ int lineheight)
{
FAR struct nxtext_bitmap_s *bm;
struct nxgl_rect_s rect;
@@ -227,10 +231,10 @@ static inline void nxbg_movedisplay(NXWINDOW hwnd, int bottom, int lineheight)
int ret;
int i;
- /* Move each row, one at a time. They could all be moved at once (by calling
- * nxbg_redrawrect), but the since the region is cleared, then re-written, the
- * effect would not be good. Below the region is also cleared and re-written,
- * however, in much smaller chunks.
+ /* Move each row, one at a time. They could all be moved at once (by
+ * calling nxbg_redrawrect), but since the region is cleared, then
+ * rewritten, the effect would not be good. Below the region is also
+ * cleared and rewritten, however, in much smaller chunks.
*/
rect.pt1.x = 0;
@@ -256,7 +260,8 @@ static inline void nxbg_movedisplay(NXWINDOW hwnd, int bottom, int lineheight)
for (i = 0; i < g_bgstate.nchars; i++)
{
bm = &g_bgstate.bm[i];
- if (bm->pos.y <= rect.pt2.y && bm->pos.y + g_bgstate.fheight >= rect.pt1.y)
+ if (bm->pos.y <= rect.pt2.y &&
+ bm->pos.y + g_bgstate.fheight >= rect.pt1.y)
{
nxtext_fillchar(hwnd, &rect, &g_bgstate, g_bghfont, bm);
}
@@ -266,7 +271,7 @@ static inline void nxbg_movedisplay(NXWINDOW hwnd, int bottom, int lineheight)
/* Finally, clear the bottom part of the display */
rect.pt1.y = bottom;
- rect.pt2.y = g_bgstate.wsize.h- 1;
+ rect.pt2.y = g_bgstate.wsize.h - 1;
ret = nx_fill(hwnd, &rect, g_bgstate.wcolor);
if (ret < 0)
@@ -296,13 +301,15 @@ static inline void nxbg_scroll(NXWINDOW hwnd, int lineheight)
{
/* Yes... Delete the character by moving all of the data */
- for (j = i; j < g_bgstate.nchars-1; j++)
+ for (j = i; j < g_bgstate.nchars - 1; j++)
{
- memcpy(&g_bgstate.bm[j], &g_bgstate.bm[j+1], sizeof(struct nxtext_bitmap_s));
+ memcpy(&g_bgstate.bm[j], &g_bgstate.bm[j + 1],
+ sizeof(struct nxtext_bitmap_s));
}
- /* Decrement the number of cached characters ('i' is not incremented
- * in this case because it already points to the next character)
+ /* Decrement the number of cached characters. 'i' is not
+ * incremented in this case because it already points to the next
+ * character.
*/
g_bgstate.nchars--;
diff --git a/examples/nxtext/nxtext_main.c b/examples/nxtext/nxtext_main.c
index d3d02956f..c749cd53a 100644
--- a/examples/nxtext/nxtext_main.c
+++ b/examples/nxtext/nxtext_main.c
@@ -60,6 +60,7 @@
****************************************************************************/
/* Configuration ************************************************************/
+
/* If not specified, assume that the hardware supports one video plane */
#ifndef CONFIG_EXAMPLES_NXTEXT_VPLANE
@@ -138,7 +139,10 @@ nxgl_coord_t g_yres;
bool b_haveresolution = false;
bool g_connected = false;
-sem_t g_semevent = {0};
+sem_t g_semevent =
+{
+ 0
+};
int g_exitcode = NXEXIT_SUCCESS;
@@ -162,7 +166,7 @@ static int nxtext_initialize(void)
ret = sched_setparam(0, ¶m);
if (ret < 0)
{
- printf("nxtext_initialize: sched_setparam failed: %d\n" , ret);
+ printf("nxtext_initialize: sched_setparam failed: %d\n", ret);
g_exitcode = NXEXIT_SCHEDSETPARAM;
return ERROR;
}
@@ -173,7 +177,8 @@ static int nxtext_initialize(void)
ret = boardctl(BOARDIOC_NX_START, 0);
if (ret < 0)
{
- printf("nxtext_initialize: Failed to start the NX server: %d\n", errno);
+ printf("nxtext_initialize: Failed to start the NX server: %d\n",
+ errno);
g_exitcode = NXEXIT_SERVERSTART;
return ERROR;
}
@@ -188,24 +193,24 @@ static int nxtext_initialize(void)
#ifdef CONFIG_VNCSERVER
/* Setup the VNC server to support keyboard/mouse inputs */
- struct boardioc_vncstart_s vnc =
- {
- 0, g_hnx
- };
-
- ret = boardctl(BOARDIOC_VNC_START, (uintptr_t)&vnc);
- if (ret < 0)
- {
- printf("boardctl(BOARDIOC_VNC_START) failed: %d\n", ret);
- nx_disconnect(g_hnx);
- g_exitcode = NXEXIT_FBINITIALIZE;
- return ERROR;
- }
+ struct boardioc_vncstart_s vnc =
+ {
+ 0, g_hnx
+ };
+
+ ret = boardctl(BOARDIOC_VNC_START, (uintptr_t)&vnc);
+ if (ret < 0)
+ {
+ printf("boardctl(BOARDIOC_VNC_START) failed: %d\n", ret);
+ nx_disconnect(g_hnx);
+ g_exitcode = NXEXIT_FBINITIALIZE;
+ return ERROR;
+ }
#endif
- /* Start a separate thread to listen for server events. This is probably
- * the least efficient way to do this, but it makes this example flow more
- * smoothly.
+ /* Start a separate thread to listen for server events. This is
+ * probably the least efficient way to do this, but it makes this
+ * example flow more smoothly.
*/
pthread_attr_init(&attr);
@@ -216,10 +221,10 @@ static int nxtext_initialize(void)
ret = pthread_create(&thread, &attr, nxtext_listener, NULL);
if (ret != 0)
{
- printf("nxtext_initialize: pthread_create failed: %d\n", ret);
+ printf("nxtext_initialize: pthread_create failed: %d\n", ret);
- g_exitcode = NXEXIT_PTHREADCREATE;
- return ERROR;
+ g_exitcode = NXEXIT_PTHREADCREATE;
+ return ERROR;
}
/* Don't return until we are connected to the server */
@@ -277,7 +282,8 @@ int main(int argc, FAR char *argv[])
g_bghfont = nxf_getfonthandle(CONFIG_EXAMPLES_NXTEXT_BGFONTID);
if (!g_bghfont)
{
- printf("nxtext_main: Failed to get background font handle: %d\n", errno);
+ printf("nxtext_main: Failed to get background font handle: %d\n",
+ errno);
g_exitcode = NXEXIT_FONTOPEN;
goto errout;
}
@@ -285,14 +291,16 @@ int main(int argc, FAR char *argv[])
g_puhfont = nxf_getfonthandle(CONFIG_EXAMPLES_NXTEXT_PUFONTID);
if (!g_puhfont)
{
- printf("nxtext_main: Failed to get pop-up font handle: %d\n", errno);
+ printf("nxtext_main: Failed to get pop-up font handle: %d\n",
+ errno);
g_exitcode = NXEXIT_FONTOPEN;
goto errout;
}
/* Set the background to the configured background color */
- printf("nxtext_main: Set background color=%d\n", CONFIG_EXAMPLES_NXTEXT_BGCOLOR);
+ printf("nxtext_main: Set background color=%d\n",
+ CONFIG_EXAMPLES_NXTEXT_BGCOLOR);
color = CONFIG_EXAMPLES_NXTEXT_BGCOLOR;
ret = nx_setbgcolor(g_hnx, &color);
if (ret < 0)
@@ -328,7 +336,7 @@ int main(int argc, FAR char *argv[])
popcnt = 0;
bkgndx = 0;
- for (;;)
+ for (; ; )
{
/* Sleep for one second */
@@ -346,15 +354,18 @@ int main(int argc, FAR char *argv[])
hwnd = nxpu_open();
#ifdef CONFIG_NX_KBD
- /* Give keyboard input to the top window (which should be the pop-up) */
+ /* Give keyboard input to the top window (which should be the
+ * pop-up).
+ */
printf("nxtext_main: Send keyboard input: %s\n", g_pumsg);
- ret = nx_kbdin(g_hnx, strlen((FAR const char *)g_pumsg), g_pumsg);
+ ret = nx_kbdin(g_hnx, strlen((FAR const char *)g_pumsg),
+ g_pumsg);
if (ret < 0)
- {
- printf("nxtext_main: nx_kbdin failed: %d\n", errno);
- goto errout_with_hwnd;
- }
+ {
+ printf("nxtext_main: nx_kbdin failed: %d\n", errno);
+ goto errout_with_hwnd;
+ }
#endif
}
else if (popcnt == 5)
@@ -367,11 +378,12 @@ int main(int argc, FAR char *argv[])
}
/* Give another line of text to the background window. Force this
- * text to go the background by calling the background window interfaces
- * directly.
+ * text to the background by calling the background window
+ * interfaces directly.
*/
- nxbg_write(g_bgwnd, (FAR const uint8_t *)g_bgmsg[bkgndx], strlen(g_bgmsg[bkgndx]));
+ nxbg_write(g_bgwnd, (FAR const uint8_t *)g_bgmsg[bkgndx],
+ strlen(g_bgmsg[bkgndx]));
if (++bkgndx >= BGMSG_LINES)
{
bkgndx = 0;
@@ -386,13 +398,15 @@ errout_with_hwnd:
if (popcnt >= 3)
{
printf("nxtext_main: Close pop-up\n");
- nxpu_close(hwnd);
+ nxpu_close(hwnd);
}
-//errout_with_bkgd:
+ /* errout_with_bkgd: */
+
nx_releasebkgd(g_bgwnd);
errout_with_nx:
+
/* Disconnect from the server */
printf("nxtext_main: Disconnect from the server\n");
diff --git a/examples/nxtext/nxtext_putc.c b/examples/nxtext/nxtext_putc.c
index 384ae22bb..325132caf 100644
--- a/examples/nxtext/nxtext_putc.c
+++ b/examples/nxtext/nxtext_putc.c
@@ -95,6 +95,7 @@ static void nxtext_freeglyph(FAR struct nxtext_glyph_s *glyph)
{
free(glyph->bitmap);
}
+
memset(glyph, 0, sizeof(struct nxtext_glyph_s));
}
@@ -111,11 +112,11 @@ nxtext_allocglyph(FAR struct nxtext_state_s *st)
int i;
/* Search through the glyph cache looking for an unused glyph. Also, keep
- * track of the least used glyph as well. We need that if we have to replace
- * a glyph in the cache.
+ * track of the least used glyph as well. We need that if we have to
+ * replace a glyph in the cache.
*/
- for (i = 0; i < st->maxglyphs; i++)
+ for (i = 0; i < st->maxglyphs; i++)
{
/* Is this glyph in use? */
@@ -149,9 +150,9 @@ nxtext_allocglyph(FAR struct nxtext_state_s *st)
if (luusecnt > 1)
{
- uint8_t decr = luusecnt - 1;
+ uint8_t decr = luusecnt - 1;
- for (i = 0; i < st->maxglyphs; i++)
+ for (i = 0; i < st->maxglyphs; i++)
{
/* Is this glyph in use? */
@@ -180,7 +181,7 @@ nxtext_findglyph(FAR struct nxtext_state_s *st, uint8_t ch)
/* First, try to find the glyph in the cache of pre-rendered glyphs */
- for (i = 0; i < st->maxglyphs; i++)
+ for (i = 0; i < st->maxglyphs; i++)
{
FAR struct nxtext_glyph_s *glyph = &st->glyph[i];
if (glyph->usecnt > 0 && glyph->code == ch)
@@ -189,7 +190,7 @@ nxtext_findglyph(FAR struct nxtext_state_s *st, uint8_t ch)
if (glyph->usecnt < MAX_USECNT)
{
- glyph->usecnt++;
+ glyph->usecnt++;
}
/* And return the glyph that we found */
@@ -197,6 +198,7 @@ nxtext_findglyph(FAR struct nxtext_state_s *st, uint8_t ch)
return glyph;
}
}
+
return NULL;
}
@@ -248,13 +250,13 @@ nxtext_renderglyph(FAR struct nxtext_state_s *st,
/* Pack 1-bit pixels into a 2-bits */
pixel &= 0x01;
- pixel = (pixel) << 1 |pixel;
+ pixel = (pixel) << 1 | pixel;
# endif
# if CONFIG_EXAMPLES_NXTEXT_BPP < 4
/* Pack 2-bit pixels into a nibble */
pixel &= 0x03;
- pixel = (pixel) << 2 |pixel;
+ pixel = (pixel) << 2 | pixel;
# endif
/* Pack 4-bit nibbles into a byte */
@@ -292,7 +294,7 @@ nxtext_renderglyph(FAR struct nxtext_state_s *st,
/* Then render the glyph into the allocated memory */
- ret = RENDERER((FAR nxgl_mxpixel_t*)glyph->bitmap,
+ ret = RENDERER((FAR nxgl_mxpixel_t *)glyph->bitmap,
glyph->height, glyph->width, glyph->stride,
fbm, st->fcolor[0]);
if (ret < 0)
@@ -312,7 +314,8 @@ nxtext_renderglyph(FAR struct nxtext_state_s *st,
* Name: nxtext_fontsize
****************************************************************************/
-static int nxtext_fontsize(NXHANDLE hfont, uint8_t ch, FAR struct nxgl_size_s *size)
+static int nxtext_fontsize(NXHANDLE hfont, uint8_t ch,
+ FAR struct nxgl_size_s *size)
{
FAR const struct nx_fontbitmap_s *fbm;
@@ -379,37 +382,39 @@ nxtext_addchar(NXHANDLE hfont, FAR struct nxtext_state_s *st, uint8_t ch)
if (st->nchars < st->maxchars)
{
- /* Yes, setup the bitmap information */
+ /* Yes, setup the bitmap information */
- bm = &st->bm[st->nchars];
- bm->code = ch;
- bm->flags = 0;
- bm->pos.x = st->fpos.x;
- bm->pos.y = st->fpos.y;
+ bm = &st->bm[st->nchars];
+ bm->code = ch;
+ bm->flags = 0;
+ bm->pos.x = st->fpos.x;
+ bm->pos.y = st->fpos.y;
- /* Find (or create) the matching glyph */
+ /* Find (or create) the matching glyph */
- glyph = nxtext_getglyph(hfont, st, ch);
- if (!glyph)
- {
- /* No, there is no font for this code. Just mark this as a space. */
+ glyph = nxtext_getglyph(hfont, st, ch);
+ if (!glyph)
+ {
+ /* No, there is no font for this code. Just mark this as a
+ * space.
+ */
- bm->flags |= BMFLAGS_NOGLYPH;
+ bm->flags |= BMFLAGS_NOGLYPH;
- /* Set up the next character position */
+ /* Set up the next character position */
- st->fpos.x += st->spwidth;
- }
- else
- {
- /* Set up the next character position */
+ st->fpos.x += st->spwidth;
+ }
+ else
+ {
+ /* Set up the next character position */
- st->fpos.x += glyph->width;
- }
+ st->fpos.x += glyph->width;
+ }
- /* Success.. increment nchars to retain this character */
+ /* Success.. increment nchars to retain this character */
- st->nchars++;
+ st->nchars++;
}
return bm;
@@ -465,7 +470,8 @@ void nxtext_newline(FAR struct nxtext_state_s *st)
*
****************************************************************************/
-void nxtext_putc(NXWINDOW hwnd, FAR struct nxtext_state_s *st, NXHANDLE hfont, uint8_t ch)
+void nxtext_putc(NXWINDOW hwnd, FAR struct nxtext_state_s *st,
+ NXHANDLE hfont, uint8_t ch)
{
FAR const struct nxtext_bitmap_s *bm;
@@ -562,13 +568,13 @@ void nxtext_fillchar(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
/* Find (or create) the glyph that goes with this font */
- glyph = nxtext_getglyph(hfont, st, bm->code);
- if (!glyph)
- {
- /* Shouldn't happen */
+ glyph = nxtext_getglyph(hfont, st, bm->code);
+ if (!glyph)
+ {
+ /* Shouldn't happen */
- return;
- }
+ return;
+ }
/* Blit the font bitmap into the window */
diff --git a/examples/pwfb/pwfb_main.c b/examples/pwfb/pwfb_main.c
index 3b5993372..cd98a48e2 100644
--- a/examples/pwfb/pwfb_main.c
+++ b/examples/pwfb/pwfb_main.c
@@ -57,6 +57,8 @@
#include "pwfb_internal.h"
+#define ARROW1_CURSOR_IMAGE g_arrow1##Cursor
+
/****************************************************************************
* Private Data
****************************************************************************/
@@ -115,22 +117,22 @@ static bool pwfb_server_initialize(FAR struct pwfb_state_s *st)
#ifdef CONFIG_VNCSERVER
/* Setup the VNC server to support keyboard/mouse inputs */
- struct boardioc_vncstart_s vnc =
- {
- 0, st->hnx
- };
-
- ret = boardctl(BOARDIOC_VNC_START, (uintptr_t)&vnc);
- if (ret < 0)
- {
- printf("pwfb_server_initialize: ERROR: "
- "boardctl(BOARDIOC_VNC_START) failed: %d\n",
- ret);
-
- nx_disconnect(st->hnx);
- g_exitcode = NXEXIT_FBINITIALIZE;
- return ERROR;
- }
+ struct boardioc_vncstart_s vnc =
+ {
+ 0, st->hnx
+ };
+
+ ret = boardctl(BOARDIOC_VNC_START, (uintptr_t)&vnc);
+ if (ret < 0)
+ {
+ printf("pwfb_server_initialize: ERROR: "
+ "boardctl(BOARDIOC_VNC_START) failed: %d\n",
+ ret);
+
+ nx_disconnect(st->hnx);
+ g_exitcode = NXEXIT_FBINITIALIZE;
+ return ERROR;
+ }
#endif
}
else
@@ -168,10 +170,10 @@ static bool pwfb_listener_initialize(FAR struct pwfb_state_s *st)
ret = pthread_create(&thread, &attr, pwfb_listener, st);
if (ret != 0)
{
- printf("pwfb_listener_initialize: ERROR: "
- "pthread_create failed: %d\n",
- ret);
- return false;
+ printf("pwfb_listener_initialize: ERROR: "
+ "pthread_create failed: %d\n",
+ ret);
+ return false;
}
/* Don't return until we are connected to the server */
@@ -340,8 +342,8 @@ static bool pwfb_putc(FAR struct pwfb_state_s *st,
/* Render the glyph into the window */
src = glyph->bitmap;
- ret = nxtk_bitmapwindow(wndo->hwnd, &bounds, &src,
- fpos, (unsigned int)glyph->stride);
+ ret = nxtk_bitmapwindow(wndo->hwnd, &bounds, &src,
+ fpos, (unsigned int)glyph->stride);
if (ret < 0)
{
printf("pwfb_putc: ERROR: "
@@ -510,8 +512,8 @@ static bool pwfb_configure_cursor(FAR struct pwfb_state_s *st,
st->cursor.state = PFWB_CURSOR_MOVING;
st->cursor.countdown = CURSOR_MOVING_DELAY;
st->cursor.blinktime = 0;
- st->cursor.xmax = itob16(st->xres - g_arrow1Cursor.size.w - 1);
- st->cursor.ymax = itob16(st->yres - g_arrow1Cursor.size.h - 1);
+ st->cursor.xmax = itob16(st->xres - ARROW1_CURSOR_IMAGE.size.w - 1);
+ st->cursor.ymax = itob16(st->yres - ARROW1_CURSOR_IMAGE.size.h - 1);
st->cursor.xpos = itob16(pos->x);
st->cursor.ypos = itob16(pos->y);
st->cursor.deltax = dtob16(deltax);
@@ -519,7 +521,7 @@ static bool pwfb_configure_cursor(FAR struct pwfb_state_s *st,
/* Set the cursor image */
- ret = nxcursor_setimage(st->hnx, &g_arrow1Cursor);
+ ret = nxcursor_setimage(st->hnx, &ARROW1_CURSOR_IMAGE);
if (ret < 0)
{
printf("pwfb_configure_cursor: ERROR: "
@@ -651,7 +653,8 @@ int main(int argc, FAR char *argv[])
pos.x = wstate.xres / 8;
pos.y = wstate.yres / 8;
- if (!pwfb_configure_window(&wstate, 0, &size, &pos, g_wndomsg1, 4.200, 4.285))
+ if (!pwfb_configure_window(&wstate, 0, &size, &pos, g_wndomsg1,
+ 4.200, 4.285))
{
printf("pwfb_main: ERROR: "
"pwfb_configure_window failed for window 1\n");
@@ -681,7 +684,8 @@ int main(int argc, FAR char *argv[])
pos.x = wstate.xres / 4;
pos.y = wstate.yres / 4;
- if (!pwfb_configure_window(&wstate, 1, &size, &pos, g_wndomsg2, -3.317, 5.0))
+ if (!pwfb_configure_window(&wstate, 1, &size, &pos, g_wndomsg2,
+ -3.317, 5.0))
{
printf("pwfb_main: ERROR: "
"pwfb_configure_window failed for window 2\n");
@@ -711,7 +715,8 @@ int main(int argc, FAR char *argv[])
pos.x = (3 * wstate.xres) / 8;
pos.y = (3 * wstate.yres) / 8;
- if (!pwfb_configure_window(&wstate, 2, &size, &pos, g_wndomsg3, 4.600, -3.852))
+ if (!pwfb_configure_window(&wstate, 2, &size, &pos, g_wndomsg3,
+ 4.600, -3.852))
{
printf("pwfb_main: ERROR: "
"pwfb_configure_window failed for window 2\n");
@@ -797,6 +802,7 @@ errout_with_hwnd1:
#endif
errout_with_fontcache:
+
/* Release the font cache */
nxf_cache_disconnect(wstate.wndo[0].fcache);
@@ -804,6 +810,7 @@ errout_with_fontcache:
nxf_cache_disconnect(wstate.wndo[2].fcache);
errout_with_nx:
+
/* Disconnect from the server */
printf("pwfb_main: Disconnect from the server\n");
diff --git a/examples/pwlines/pwlines_main.c b/examples/pwlines/pwlines_main.c
index 8d448cc11..53a2b3a53 100644
--- a/examples/pwlines/pwlines_main.c
+++ b/examples/pwlines/pwlines_main.c
@@ -94,21 +94,21 @@ static bool pwlines_server_initialize(FAR struct pwlines_state_s *st)
#ifdef CONFIG_VNCSERVER
/* Setup the VNC server to support keyboard/mouse inputs */
- struct boardioc_vncstart_s vnc =
- {
- 0, st->hnx
- };
-
- ret = boardctl(BOARDIOC_VNC_START, (uintptr_t)&vnc);
- if (ret < 0)
- {
- printf("pwlines_server_initialize: ERROR: "
- "boardctl(BOARDIOC_VNC_START) failed: %d\n",
- ret);
-
- nx_disconnect(st->hnx);
- return false;
- }
+ struct boardioc_vncstart_s vnc =
+ {
+ 0, st->hnx
+ };
+
+ ret = boardctl(BOARDIOC_VNC_START, (uintptr_t)&vnc);
+ if (ret < 0)
+ {
+ printf("pwlines_server_initialize: ERROR: "
+ "boardctl(BOARDIOC_VNC_START) failed: %d\n",
+ ret);
+
+ nx_disconnect(st->hnx);
+ return false;
+ }
#endif
}
else
@@ -141,15 +141,16 @@ static bool pwlines_listener_initialize(FAR struct pwlines_state_s *st)
pthread_attr_init(&attr);
param.sched_priority = CONFIG_EXAMPLES_PWLINES_LISTENER_PRIO;
pthread_attr_setschedparam(&attr, ¶m);
- pthread_attr_setstacksize(&attr, CONFIG_EXAMPLES_PWLINES_LISTENER_STACKSIZE);
+ pthread_attr_setstacksize(&attr,
+ CONFIG_EXAMPLES_PWLINES_LISTENER_STACKSIZE);
ret = pthread_create(&thread, &attr, pwlines_listener, st);
if (ret != 0)
{
- printf("pwlines_listener_initialize: ERROR: "
- "pthread_create failed: %d\n",
- ret);
- return false;
+ printf("pwlines_listener_initialize: ERROR: "
+ "pthread_create failed: %d\n",
+ ret);
+ return false;
}
/* Don't return until we are connected to the server */
@@ -193,7 +194,8 @@ static bool pwlines_state_initialize(FAR struct pwlines_state_s *st)
* Name: pwlines_configure_window
****************************************************************************/
-static bool pwlines_configure_window(FAR struct pwlines_state_s *st, int wndx,
+static bool pwlines_configure_window(FAR struct pwlines_state_s *st,
+ int wndx,
FAR struct nxgl_size_s *size,
FAR struct nxgl_point_s *pos,
double deltax, double deltay)
@@ -353,8 +355,9 @@ int main(int argc, FAR char *argv[])
printf("pwlines_main: Open window 1\n");
- wstate.wndo[0].hwnd = nxtk_openwindow(wstate.hnx, NXBE_WINDOW_RAMBACKED,
- &g_pwlines_wncb, (FAR void *)&wstate);
+ wstate.wndo[0].hwnd =
+ nxtk_openwindow(wstate.hnx, NXBE_WINDOW_RAMBACKED,
+ &g_pwlines_wncb, (FAR void *)&wstate);
if (wstate.wndo[0].hwnd == NULL)
{
printf("pwlines_main: ERROR: "
@@ -386,7 +389,8 @@ int main(int argc, FAR char *argv[])
pos.x = wstate.xres / 8;
pos.y = wstate.yres / 8;
- if (!pwlines_configure_window(&wstate, 0, &size, &pos, 4.200, 4.285))
+ if (!pwlines_configure_window(&wstate, 0, &size, &pos,
+ 4.200, 4.285))
{
printf("pwlines_main: ERROR: "
"pwlines_configure_window failed for window 1\n");
@@ -397,8 +401,9 @@ int main(int argc, FAR char *argv[])
printf("pwlines_main: Open window 2\n");
- wstate.wndo[1].hwnd = nxtk_openwindow(wstate.hnx, NXBE_WINDOW_RAMBACKED,
- &g_pwlines_wncb, (FAR void *)&wstate);
+ wstate.wndo[1].hwnd =
+ nxtk_openwindow(wstate.hnx, NXBE_WINDOW_RAMBACKED,
+ &g_pwlines_wncb, (FAR void *)&wstate);
if (wstate.wndo[1].hwnd == NULL)
{
printf("pwlines_main: ERROR: "
@@ -414,7 +419,8 @@ int main(int argc, FAR char *argv[])
pos.x = wstate.xres / 4;
pos.y = wstate.yres / 4;
- if (!pwlines_configure_window(&wstate, 1, &size, &pos, -3.317, 5.0))
+ if (!pwlines_configure_window(&wstate, 1, &size, &pos,
+ -3.317, 5.0))
{
printf("pwlines_main: ERROR: "
"pwlines_configure_window failed for window 2\n");
@@ -425,8 +431,9 @@ int main(int argc, FAR char *argv[])
printf("pwlines_main: Open window 3\n");
- wstate.wndo[2].hwnd = nxtk_openwindow(wstate.hnx, NXBE_WINDOW_RAMBACKED,
- &g_pwlines_wncb, (FAR void *)&wstate);
+ wstate.wndo[2].hwnd =
+ nxtk_openwindow(wstate.hnx, NXBE_WINDOW_RAMBACKED,
+ &g_pwlines_wncb, (FAR void *)&wstate);
if (wstate.wndo[2].hwnd == NULL)
{
printf("pwlines_main: ERROR: "
@@ -442,7 +449,8 @@ int main(int argc, FAR char *argv[])
pos.x = (3 * wstate.xres) / 8;
pos.y = (3 * wstate.yres) / 8;
- if (!pwlines_configure_window(&wstate, 2, &size, &pos, 4.600, -3.852))
+ if (!pwlines_configure_window(&wstate, 2, &size, &pos,
+ 4.600, -3.852))
{
printf("pwlines_main: ERROR: "
"pwlines_configure_window failed for window 2\n");
@@ -512,6 +520,7 @@ errout_with_hwnd1:
}
errout_with_nx:
+
/* Disconnect from the server */
printf("pwlines_main: Disconnect from the server\n");
diff --git a/examples/qencoder/qe_main.c b/examples/qencoder/qe_main.c
index 504db260d..23e529802 100644
--- a/examples/qencoder/qe_main.c
+++ b/examples/qencoder/qe_main.c
@@ -307,11 +307,14 @@ int main(int argc, FAR char *argv[])
if (g_qeexample.use_qeindex)
{
- ret = ioctl(fd, QEIOC_GETINDEX, (unsigned long)((uintptr_t)&index));
+ ret = ioctl(fd, QEIOC_GETINDEX,
+ (unsigned long)((uintptr_t)&index));
if (ret < 0)
{
- printf("qe_main: ioctl(QEIOC_GETINDEX) failed: %d\n", errno);
- printf("Your MCU probably does not support this ioctl call.\n");
+ printf("qe_main: ioctl(QEIOC_GETINDEX) failed: %d\n",
+ errno);
+ printf("Your MCU probably does not support this ioctl "
+ "call.\n");
printf("Consider using this example without the -i option.\n");
exitval = EXIT_FAILURE;
goto errout_with_dev;
@@ -321,13 +324,17 @@ int main(int argc, FAR char *argv[])
else
{
- printf("qe_main: %3d. pos: %" PRIi32 ", last index: %" PRIi32 ", hit indexes: %" \
- PRIi16 "\n", nloops + 1, index.qenc_pos, index.indx_pos, index.indx_cnt);
+ printf("qe_main: %3d. pos: %" PRIi32 ", "
+ "last index: %" PRIi32 ", "
+ "hit indexes: %" PRIi16 "\n",
+ nloops + 1, index.qenc_pos, index.indx_pos,
+ index.indx_cnt);
}
}
else
{
- ret = ioctl(fd, QEIOC_POSITION, (unsigned long)((uintptr_t)&position));
+ ret = ioctl(fd, QEIOC_POSITION,
+ (unsigned long)((uintptr_t)&position));
if (ret < 0)
{
printf("qe_main: ioctl(QEIOC_POSITION) failed: %d\n", errno);
diff --git a/fsutils/flash_eraseall/flash_eraseall.c b/fsutils/flash_eraseall/flash_eraseall.c
index f7462c152..fda7b7e04 100644
--- a/fsutils/flash_eraseall/flash_eraseall.c
+++ b/fsutils/flash_eraseall/flash_eraseall.c
@@ -71,13 +71,14 @@ int flash_eraseall(FAR const char *driver)
if (ret < 0)
{
errcode = errno;
- ferr("ERROR: MTD ioctl(%04x) failed: %d\n", MTDIOC_BULKERASE, errcode);
+ ferr("ERROR: MTD ioctl(%04x) failed: %d\n",
+ MTDIOC_BULKERASE, errcode);
ret = -errcode;
}
/* Close the block driver */
- close(fd);
+ close(fd);
}
return ret;
diff --git a/graphics/tiff/tiff_addstrip.c b/graphics/tiff/tiff_addstrip.c
index 5db952088..965152eac 100644
--- a/graphics/tiff/tiff_addstrip.c
+++ b/graphics/tiff/tiff_addstrip.c
@@ -65,13 +65,15 @@
* tiff_initialize().
*
* Input Parameters:
- * info - A pointer to the caller allocated parameter passing/TIFF state instance.
+ * info - A pointer to the caller allocated parameter passing/TIFF
+ * state instance.
* buffer - A buffer containing a single row of data.
*
* Returned Value:
* Zero (OK) on success. A negated errno value on failure.
*
****************************************************************************/
+
int tiff_convstrip(FAR struct tiff_info_s *info, FAR const uint8_t *strip)
{
#ifdef CONFIG_DEBUG_GRAPHICS
@@ -100,9 +102,9 @@ int tiff_convstrip(FAR struct tiff_info_s *info, FAR const uint8_t *strip)
/* Convert RGB565 to RGB888 */
rgb565 = *src++;
- *dest++ = (rgb565 >> (11-3)) & 0xf8; /* Move bits 11-15 to 3-7 */
- *dest++ = (rgb565 >> ( 5-2)) & 0xfc; /* Move bits 5-10 to 2-7 */
- *dest++ = (rgb565 << ( 3)) & 0xf8; /* Move bits 0- 4 to 3-7 */
+ *dest++ = (rgb565 >> (11 - 3)) & 0xf8; /* Move bits 11-15 to 3-7 */
+ *dest++ = (rgb565 >> (5 - 2)) & 0xfc; /* Move bits 5-10 to 2-7 */
+ *dest++ = (rgb565 << 3) & 0xf8; /* Move bits 0- 4 to 3-7 */
/* Update the byte count */
@@ -113,7 +115,7 @@ int tiff_convstrip(FAR struct tiff_info_s *info, FAR const uint8_t *strip)
/* Flush the conversion buffer to tmpfile2 when it becomes full */
- if (nbytes > (info->iosize-3))
+ if (nbytes > (info->iosize - 3))
{
ret = tiff_write(info->tmp2fd, info->iobuffer, nbytes);
if (ret < 0)
@@ -134,6 +136,7 @@ int tiff_convstrip(FAR struct tiff_info_s *info, FAR const uint8_t *strip)
#ifdef CONFIG_DEBUG_GRAPHICS
DEBUGASSERT(ntotal == info->bps);
#endif
+
return ret;
}
@@ -150,7 +153,8 @@ int tiff_convstrip(FAR struct tiff_info_s *info, FAR const uint8_t *strip)
* tiff_initialize().
*
* Input Parameters:
- * info - A pointer to the caller allocated parameter passing/TIFF state instance.
+ * info - A pointer to the caller allocated parameter passing/TIFF
+ * state instance.
* buffer - A buffer containing a single row of data.
*
* Returned Value:
@@ -172,7 +176,9 @@ int tiff_addstrip(FAR struct tiff_info_s *info, FAR const uint8_t *strip)
ret = tiff_convstrip(info, strip);
}
- /* For other formats, it is a simple write using the number of bytes per strip */
+ /* For other formats, it is a simple write using the number of bytes per
+ * strip.
+ */
else
{
@@ -191,6 +197,7 @@ int tiff_addstrip(FAR struct tiff_info_s *info, FAR const uint8_t *strip)
{
goto errout;
}
+
info->outsize += 4;
ret = tiff_putint32(info->tmp1fd, info->tmp2size);
@@ -198,6 +205,7 @@ int tiff_addstrip(FAR struct tiff_info_s *info, FAR const uint8_t *strip)
{
goto errout;
}
+
info->tmp1size += 4;
/* Increment the size of tmp2file. */
@@ -212,14 +220,17 @@ int tiff_addstrip(FAR struct tiff_info_s *info, FAR const uint8_t *strip)
ret = (int)newsize;
goto errout;
}
+
info->tmp2size = (size_t)newsize;
/* Increment the number of strips in the TIFF file */
info->nstrips++;
+
return OK;
errout:
+
tiff_abort(info);
return ret;
}
diff --git a/graphics/tiff/tiff_initialize.c b/graphics/tiff/tiff_initialize.c
index 263f650cf..2c4f5921a 100644
--- a/graphics/tiff/tiff_initialize.c
+++ b/graphics/tiff/tiff_initialize.c
@@ -41,6 +41,7 @@
/****************************************************************************
* Pre-Processor Definitions
****************************************************************************/
+
/* Bi-level Images
*
* Offset Description Contents/Notes
@@ -50,13 +51,18 @@
* 8 [2 bytes padding]
* IFD: 10 Number of Directory Entries 13
* 12 NewSubfileType
- * 24 ImageWidth Number of columns is a user parameter
- * 36 ImageLength Number of rows is a user parameter
- * 48 Compression Hard-coded no compression (for now)
+ * 24 ImageWidth Number of columns is a user
+ * parameter
+ * 36 ImageLength Number of rows is a user
+ * parameter
+ * 48 Compression Hard-coded no compression
+ * (for now)
* 60 PhotometricInterpretation Value is a user parameter
- * 72 StripOffsets Offset and count determined as strips added
+ * 72 StripOffsets Offset and count determined
+ * as strips added
* 84 RowsPerStrip Value is a user parameter
- * 96 StripByteCounts Offset and count determined as strips added
+ * 96 StripByteCounts Offset and count determined
+ * as strips added
* 108 XResolution Value is a user parameter
* 120 YResolution Value is a user parameter
* 132 Resolution Unit Hard-coded to "inches"
@@ -67,8 +73,10 @@
* Values:
* 172 XResolution Hard-coded to 300/1
* 180 YResolution Hard-coded to 300/1
- * 188 "NuttX" Length = 6 (including NUL terminator)
- * 194 "YYYY:MM:DD HH:MM:SS" Length = 20 (including NUL terminator)
+ * 188 "NuttX" Length = 6 (including NUL
+ * terminator)
+ * 194 "YYYY:MM:DD HH:MM:SS" Length = 20 (including NUL
+ * terminator)
* 214 [2 bytes padding]
* 216 StripByteCounts Beginning of strip byte counts
* xxx StripOffsets Beginning of strip offsets
@@ -76,7 +84,7 @@
* xxx Data for strips Beginning of strip data
*/
-#define TIFF_IFD_OFFSET (SIZEOF_TIFF_HEADER+2)
+#define TIFF_IFD_OFFSET (SIZEOF_TIFF_HEADER + 2)
#define TIFF_BILEV_NIFDENTRIES 13
#define TIFF_BILEV_STRIPIFDOFFS 72
@@ -102,14 +110,19 @@
* 8 [2 bytes padding]
* IFD: 10 Number of Directory Entries 14
* 12 NewSubfileType
- * 24 ImageWidth Number of columns is a user parameter
- * 36 ImageLength Number of rows is a user parameter
+ * 24 ImageWidth Number of columns is a user
+ * parameter
+ * 36 ImageLength Number of rows is a user
+ * parameter
* 48 BitsPerSample
- * 60 Compression Hard-coded no compression (for now)
+ * 60 Compression Hard-coded no compression
+ * (for now)
* 72 PhotometricInterpretation Value is a user parameter
- * 84 StripOffsets Offset and count determined as strips added
+ * 84 StripOffsets Offset and count determined
+ * as strips added
* 96 RowsPerStrip Value is a user parameter
- * 108 StripByteCounts Offset and count determined as strips added
+ * 108 StripByteCounts Offset and count determined
+ * as strips added
* 120 XResolution Value is a user parameter
* 132 YResolution Value is a user parameter
* 144 Resolution Unit Hard-coded to "inches"
@@ -120,8 +133,10 @@
* Values:
* 184 XResolution Hard-coded to 300/1
* 192 YResolution Hard-coded to 300/1
- * 200 "NuttX" Length = 6 (including NUL terminator)
- * 206 "YYYY:MM:DD HH:MM:SS" Length = 20 (including NUL terminator)
+ * 200 "NuttX" Length = 6 (including NUL
+ * terminator)
+ * 206 "YYYY:MM:DD HH:MM:SS" Length = 20 (including NUL
+ * terminator)
* 226 [2 bytes padding]
* 228 StripByteCounts Beginning of strip byte counts
* xxx StripOffsets Beginning of strip offsets
@@ -148,15 +163,20 @@
* 8 [2 bytes padding]
* IFD: 10 Number of Directory Entries 15
* 12 NewSubfileType
- * 24 ImageWidth Number of columns is a user parameter
- * 36 ImageLength Number of rows is a user parameter
+ * 24 ImageWidth Number of columns is a user
+ * parameter
+ * 36 ImageLength Number of rows is a user
+ * parameter
* 48 BitsPerSample 8, 8, 8
- * 60 Compression Hard-coded no compression (for now)
+ * 60 Compression Hard-coded no compression
+ * (for now)
* 72 PhotometricInterpretation Value is a user parameter
- * 84 StripOffsets Offset and count determined as strips added
+ * 84 StripOffsets Offset and count determined
+ * as strips added
* 96 SamplesPerPixel Hard-coded to 3
* 108 RowsPerStrip Value is a user parameter
- * 120 StripByteCounts Offset and count determined as strips added
+ * 120 StripByteCounts Offset and count determined
+ * as strips added
* 132 XResolution Value is a user parameter
* 144 YResolution Value is a user parameter
* 156 Resolution Unit Hard-coded to "inches"
@@ -169,8 +189,10 @@
* 204 YResolution Hard-coded to 300/1
* 212 BitsPerSample 8, 8, 8
* 218 [2 bytes padding]
- * 220 "NuttX" Length = 6 (including NUL terminator)
- * 226 "YYYY:MM:DD HH:MM:SS" Length = 20 (including NUL terminator)
+ * 220 "NuttX" Length = 6 (including NUL
+ * terminator)
+ * 226 "YYYY:MM:DD HH:MM:SS" Length = 20 (including NUL
+ * terminator)
* 246 [2 bytes padding]
* 248 StripByteCounts Beginning of strip byte counts
* xxx StripOffsets Beginning of strip offsets
@@ -189,8 +211,12 @@
#define TIFF_RGB_DATEOFFSET 226
#define TIFF_RGB_STRIPBCOFFSET 248
-/* Debug *******************************************************************/
-/* CONFIG_DEBUG_TIFFOFFSETS may be defined (along with CONFIG_DEBUG_FEATURES and
+/****************************************************************************
+ * Debug
+ ****************************************************************************/
+
+/* CONFIG_DEBUG_TIFFOFFSETS may be defined (along with CONFIG_DEBUG_FEATURES
+ * and
* CONFIG_DEBUG_GRAPHICS) in order to verify the pre-determined TIFF file
* offsets.
*/
@@ -200,11 +226,11 @@
#endif
#ifdef CONFIG_DEBUG_TIFFOFFSETS
-# define tiff_offset(o,l) (o) += (l)
-# define tiff_checkoffs(o,x) DEBUGASSERT((o) == (x))
+# define tiff_offset(o, l) (o) += (l)
+# define tiff_checkoffs(o, x) DEBUGASSERT((o) == (x))
#else
-# define tiff_offset(o,l)
-# define tiff_checkoffs(o,x)
+# define tiff_offset(o, l)
+# define tiff_checkoffs(o, x)
#endif
/****************************************************************************
@@ -408,7 +434,7 @@ static int tiff_datetime(FAR char *timbuf, unsigned int buflen)
/* Break the current time up into the format needed by strftime */
- gmtime_r((FAR const time_t*)&ts.tv_sec, &tm);
+ gmtime_r((FAR const time_t *)&ts.tv_sec, &tm);
/* Convert the current time to TIFF format */
@@ -427,7 +453,8 @@ static int tiff_datetime(FAR char *timbuf, unsigned int buflen)
* Setup to create a new TIFF file.
*
* Input Parameters:
- * info - A pointer to the caller allocated parameter passing/TIFF state instance.
+ * info - A pointer to the caller allocated parameter passing/TIFF state
+ * instance.
*
* Returned Value:
* Zero (OK) on success. A negated errno value on failure.
@@ -447,7 +474,7 @@ int tiff_initialize(FAR struct tiff_info_s *info)
/* Open all output files */
- info->outfd = open(info->outfile, O_RDWR|O_CREAT|O_TRUNC, 0666);
+ info->outfd = open(info->outfile, O_RDWR | O_CREAT | O_TRUNC, 0666);
if (info->outfd < 0)
{
gerr("ERROR: Failed to open %s for reading/writing: %d\n",
@@ -455,7 +482,7 @@ int tiff_initialize(FAR struct tiff_info_s *info)
goto errout;
}
- info->tmp1fd = open(info->tmpfile1, O_RDWR|O_CREAT|O_TRUNC, 0666);
+ info->tmp1fd = open(info->tmpfile1, O_RDWR | O_CREAT | O_TRUNC, 0666);
if (info->tmp1fd < 0)
{
gerr("ERROR: Failed to open %s for reading/writing: %d\n",
@@ -463,7 +490,7 @@ int tiff_initialize(FAR struct tiff_info_s *info)
goto errout;
}
- info->tmp2fd = open(info->tmpfile2, O_RDWR|O_CREAT|O_TRUNC, 0666);
+ info->tmp2fd = open(info->tmpfile2, O_RDWR | O_CREAT | O_TRUNC, 0666);
if (info->tmp2fd < 0)
{
gerr("ERROR: Failed to open %s for reading/writing: %d\n",
@@ -505,7 +532,7 @@ int tiff_initialize(FAR struct tiff_info_s *info)
case FB_FMT_RGB24: /* BPP=24 R=8, G=8, B=8 */
info->filefmt = &g_rgbinfo; /* RGB file image file info */
info->imgflags = IMGFLAGS_FMT_RGB24; /* Bit encoded image characteristics */
- info->bps = 3 *info->pps; /* Bytes per strip */
+ info->bps = 3 * info->pps; /* Bytes per strip */
break;
default:
@@ -526,6 +553,7 @@ int tiff_initialize(FAR struct tiff_info_s *info)
{
goto errout;
}
+
tiff_offset(offset, TIFF_IFD_OFFSET);
/* Write the Number of directory entries
@@ -538,6 +566,7 @@ int tiff_initialize(FAR struct tiff_info_s *info)
{
goto errout;
}
+
tiff_offset(offset, 2);
/* Write the NewSubfileType IFD entry
@@ -545,11 +574,13 @@ int tiff_initialize(FAR struct tiff_info_s *info)
* All formats: Offset 12 NewSubfileType
*/
- ret = tiff_putifdentry16(info, IFD_TAG_NEWSUBFILETYPE, IFD_FIELD_LONG, 1, 0);
+ ret = tiff_putifdentry16(info, IFD_TAG_NEWSUBFILETYPE,
+ IFD_FIELD_LONG, 1, 0);
if (ret < 0)
{
goto errout;
}
+
tiff_offset(offset, SIZEOF_IFD_ENTRY);
/* Write ImageWidth and ImageLength
@@ -558,17 +589,20 @@ int tiff_initialize(FAR struct tiff_info_s *info)
* 36 ImageLength Number of rows is a user parameter
*/
- ret = tiff_putifdentry16(info, IFD_TAG_IMAGEWIDTH, IFD_FIELD_SHORT, 1, info->imgwidth);
+ ret = tiff_putifdentry16(info, IFD_TAG_IMAGEWIDTH,
+ IFD_FIELD_SHORT, 1, info->imgwidth);
if (ret == OK)
{
- ret= tiff_putifdentry16(info, IFD_TAG_IMAGELENGTH, IFD_FIELD_SHORT, 1, info->imgheight);
+ ret = tiff_putifdentry16(info, IFD_TAG_IMAGELENGTH,
+ IFD_FIELD_SHORT, 1, info->imgheight);
}
if (ret < 0)
{
goto errout;
}
- tiff_offset(offset, 2*SIZEOF_IFD_ENTRY);
+
+ tiff_offset(offset, 2 * SIZEOF_IFD_ENTRY);
/* Write BitsPerSample
*
@@ -589,20 +623,24 @@ int tiff_initialize(FAR struct tiff_info_s *info)
val16 = 4;
}
- ret = tiff_putifdentry16(info, IFD_TAG_BITSPERSAMPLE, IFD_FIELD_SHORT, 1, val16);
+ ret = tiff_putifdentry16(info, IFD_TAG_BITSPERSAMPLE,
+ IFD_FIELD_SHORT, 1, val16);
if (ret < 0)
{
goto errout;
}
+
tiff_offset(offset, SIZEOF_IFD_ENTRY);
}
else if (IMGFLAGS_ISRGB(info->imgflags))
{
- ret = tiff_putifdentry(info, IFD_TAG_BITSPERSAMPLE, IFD_FIELD_SHORT, 3, TIFF_RGB_BPSOFFSET);
+ ret = tiff_putifdentry(info, IFD_TAG_BITSPERSAMPLE,
+ IFD_FIELD_SHORT, 3, TIFF_RGB_BPSOFFSET);
if (ret < 0)
{
goto errout;
}
+
tiff_offset(offset, SIZEOF_IFD_ENTRY);
}
@@ -613,11 +651,13 @@ int tiff_initialize(FAR struct tiff_info_s *info)
* RGB: Offset 60 " " " " "" " " " " " "
*/
- ret = tiff_putifdentry16(info, IFD_TAG_COMPRESSION, IFD_FIELD_SHORT, 1, TAG_COMP_NONE);
+ ret = tiff_putifdentry16(info, IFD_TAG_COMPRESSION,
+ IFD_FIELD_SHORT, 1, TAG_COMP_NONE);
if (ret < 0)
{
goto errout;
}
+
tiff_offset(offset, SIZEOF_IFD_ENTRY);
/* Write PhotometricInterpretation:
@@ -641,6 +681,7 @@ int tiff_initialize(FAR struct tiff_info_s *info)
{
goto errout;
}
+
tiff_offset(offset, SIZEOF_IFD_ENTRY);
/* Write StripOffsets:
@@ -656,6 +697,7 @@ int tiff_initialize(FAR struct tiff_info_s *info)
{
goto errout;
}
+
tiff_offset(offset, SIZEOF_IFD_ENTRY);
/* Write SamplesPerPixel
@@ -667,11 +709,13 @@ int tiff_initialize(FAR struct tiff_info_s *info)
if (IMGFLAGS_ISRGB(info->imgflags))
{
- ret = tiff_putifdentry16(info, IFD_TAG_SAMPLESPERPIXEL, IFD_FIELD_SHORT, 1, 3);
+ ret = tiff_putifdentry16(info, IFD_TAG_SAMPLESPERPIXEL,
+ IFD_FIELD_SHORT, 1, 3);
if (ret < 0)
{
goto errout;
}
+
tiff_offset(offset, SIZEOF_IFD_ENTRY);
}
@@ -682,26 +726,33 @@ int tiff_initialize(FAR struct tiff_info_s *info)
* RGB: Offset 108 Value is a user parameter
*/
- ret = tiff_putifdentry16(info, IFD_TAG_ROWSPERSTRIP, IFD_FIELD_SHORT, 1, info->rps);
+ ret = tiff_putifdentry16(info, IFD_TAG_ROWSPERSTRIP,
+ IFD_FIELD_SHORT, 1, info->rps);
if (ret < 0)
{
goto errout;
}
+
tiff_offset(offset, SIZEOF_IFD_ENTRY);
/* Write StripByteCounts:
*
- * Bi-level Images: Offset 96 Count determined as strips added, Value offset = 216
- * Greyscale: Offset 108 Count determined as strips added, Value offset = 228
- * RGB: Offset 120 Count determined as strips added, Value offset = 248
+ * Bi-level Images: Offset 96 Count determined as strips added, Value
+ * offset = 216
+ * Greyscale: Offset 108 Count determined as strips added, Value
+ * offset = 228
+ * RGB: Offset 120 Count determined as strips added, Value
+ * offset = 248
*/
tiff_checkoffs(offset, info->filefmt->sbcifdoffset);
- ret = tiff_putifdentry(info, IFD_TAG_STRIPCOUNTS, IFD_FIELD_LONG, 0, info->filefmt->sbcoffset);
+ ret = tiff_putifdentry(info, IFD_TAG_STRIPCOUNTS,
+ IFD_FIELD_LONG, 0, info->filefmt->sbcoffset);
if (ret < 0)
{
goto errout;
}
+
tiff_offset(offset, SIZEOF_IFD_ENTRY);
/* Write XResolution and YResolution:
@@ -711,17 +762,22 @@ int tiff_initialize(FAR struct tiff_info_s *info)
* RGB: Offset 132 and 144, Values are a user parameters
*/
- ret = tiff_putifdentry(info, IFD_TAG_XRESOLUTION, IFD_FIELD_RATIONAL, 1, info->filefmt->xresoffset);
+ ret = tiff_putifdentry(info, IFD_TAG_XRESOLUTION,
+ IFD_FIELD_RATIONAL, 1,
+ info->filefmt->xresoffset);
if (ret == OK)
{
- ret = tiff_putifdentry(info, IFD_TAG_YRESOLUTION, IFD_FIELD_RATIONAL, 1, info->filefmt->yresoffset);
+ ret = tiff_putifdentry(info, IFD_TAG_YRESOLUTION,
+ IFD_FIELD_RATIONAL, 1,
+ info->filefmt->yresoffset);
}
if (ret < 0)
{
goto errout;
}
- tiff_offset(offset, 2*SIZEOF_IFD_ENTRY);
+
+ tiff_offset(offset, 2 * SIZEOF_IFD_ENTRY);
/* Write ResolutionUnit:
*
@@ -730,11 +786,13 @@ int tiff_initialize(FAR struct tiff_info_s *info)
* RGB: Offset 156, Hard-coded to "inches"
*/
- ret = tiff_putifdentry16(info, IFD_TAG_RESUNIT, IFD_FIELD_SHORT, 1, TAG_RESUNIT_INCH);
+ ret = tiff_putifdentry16(info, IFD_TAG_RESUNIT,
+ IFD_FIELD_SHORT, 1, TAG_RESUNIT_INCH);
if (ret < 0)
{
goto errout;
}
+
tiff_offset(offset, SIZEOF_IFD_ENTRY);
/* Write Software:
@@ -744,11 +802,14 @@ int tiff_initialize(FAR struct tiff_info_s *info)
* RGB: Offset 168 Count, Hard-coded "NuttX"
*/
- ret = tiff_putifdentry(info, IFD_TAG_SOFTWARE, IFD_FIELD_ASCII, TIFF_SOFTWARE_STRLEN, info->filefmt->swoffset);
+ ret = tiff_putifdentry(info, IFD_TAG_SOFTWARE,
+ IFD_FIELD_ASCII, TIFF_SOFTWARE_STRLEN,
+ info->filefmt->swoffset);
if (ret < 0)
{
goto errout;
}
+
tiff_offset(offset, SIZEOF_IFD_ENTRY);
/* Write DateTime:
@@ -758,11 +819,14 @@ int tiff_initialize(FAR struct tiff_info_s *info)
* RGB: Offset 180 Count, Format "YYYY:MM:DD HH:MM:SS"
*/
- ret = tiff_putifdentry(info, IFD_TAG_DATETIME, IFD_FIELD_ASCII, TIFF_DATETIME_STRLEN, info->filefmt->dateoffset);
+ ret = tiff_putifdentry(info, IFD_TAG_DATETIME,
+ IFD_FIELD_ASCII, TIFF_DATETIME_STRLEN,
+ info->filefmt->dateoffset);
if (ret < 0)
{
goto errout;
}
+
tiff_offset(offset, SIZEOF_IFD_ENTRY);
/* Write Next IFD Offset and 2 bytes of padding:
@@ -780,6 +844,7 @@ int tiff_initialize(FAR struct tiff_info_s *info)
{
goto errout;
}
+
tiff_offset(offset, 4);
/* Now we begin the value section of the file */
@@ -807,6 +872,7 @@ int tiff_initialize(FAR struct tiff_info_s *info)
{
goto errout;
}
+
tiff_offset(offset, 8);
tiff_checkoffs(offset, info->filefmt->yresoffset);
@@ -820,6 +886,7 @@ int tiff_initialize(FAR struct tiff_info_s *info)
{
goto errout;
}
+
tiff_offset(offset, 8);
/* Write RGB BitsPerSample Data:
@@ -837,6 +904,7 @@ int tiff_initialize(FAR struct tiff_info_s *info)
tiff_putint16(info->outfd, 8);
tiff_putint16(info->outfd, 8);
tiff_putint16(info->outfd, 0);
+
tiff_offset(offset, 8);
}
@@ -849,11 +917,13 @@ int tiff_initialize(FAR struct tiff_info_s *info)
*/
tiff_checkoffs(offset, info->filefmt->swoffset);
- ret = tiff_putstring(info->outfd, TIFF_SOFTWARE_STRING, TIFF_SOFTWARE_STRLEN);
+ ret = tiff_putstring(info->outfd, TIFF_SOFTWARE_STRING,
+ TIFF_SOFTWARE_STRLEN);
if (ret < 0)
{
goto errout;
}
+
tiff_offset(offset, TIFF_SOFTWARE_STRLEN);
/* Write the DateTime string:
@@ -876,6 +946,7 @@ int tiff_initialize(FAR struct tiff_info_s *info)
{
goto errout;
}
+
tiff_offset(offset, TIFF_DATETIME_STRLEN);
/* Add two bytes of padding */
@@ -885,6 +956,7 @@ int tiff_initialize(FAR struct tiff_info_s *info)
{
goto errout;
}
+
tiff_offset(offset, 2);
/* And that should do it! */
diff --git a/graphics/tiff/tiff_utils.c b/graphics/tiff/tiff_utils.c
index 17e72689b..12aa4bb8e 100644
--- a/graphics/tiff/tiff_utils.c
+++ b/graphics/tiff/tiff_utils.c
@@ -93,10 +93,10 @@ void tiff_put32(FAR uint8_t *dest, uint32_t value)
{
#ifdef CONFIG_ENDIAN_BIG
tiff_put16(dest, (uint16_t)(value >> 16));
- tiff_put16(dest+2, (uint16_t)(value & 0xffff));
+ tiff_put16(dest + 2, (uint16_t)(value & 0xffff));
#else
tiff_put16(dest, (uint16_t)(value & 0xffff));
- tiff_put16(dest+2, (uint16_t)(value >> 16));
+ tiff_put16(dest + 2, (uint16_t)(value >> 16));
#endif
}
@@ -112,11 +112,10 @@ uint16_t tiff_get16(FAR uint8_t *src)
uint32_t tiff_get32(FAR uint8_t *src)
{
#ifdef CONFIG_ENDIAN_BIG
- return (uint32_t)tiff_get16(src) << 16 | (uint32_t)tiff_get16(src+2);
+ return (uint32_t)tiff_get16(src) << 16 | (uint32_t)tiff_get16(src + 2);
#else
- return (uint32_t)tiff_get16(src+2) << 16 | (uint32_t)tiff_get16(src);
+ return (uint32_t)tiff_get16(src + 2) << 16 | (uint32_t)tiff_get16(src);
#endif
-
}
/****************************************************************************
@@ -153,7 +152,7 @@ ssize_t tiff_read(int fd, FAR void *buffer, size_t count)
* (ntotal).
*/
- nbytes = read(fd, buffer, count-ntotal);
+ nbytes = read(fd, buffer, count - ntotal);
/* Check for an error */
@@ -166,22 +165,26 @@ ssize_t tiff_read(int fd, FAR void *buffer, size_t count)
errval = errno;
if (errval != EINTR)
{
- /* Other errors are bad news and we will break out with an error */
+ /* Other errors are bad news and we will break out with an
+ * error.
+ */
return -errval;
}
}
- /* Zero is a special case and means that the end of file was encountered. */
+ /* Zero is a special case and means that the end of file was
+ * encountered.
+ */
else if (nbytes == 0)
{
break;
}
- /* What if read returns some number of bytes other than the requested number?
- * This probably means that the end-of-file will be encountered the next time
- * that we call read().
+ /* What if read returns some number of bytes other than the requested
+ * number? This probably means that the end-of-file will be
+ * encountered the next time that we call read().
*/
else
@@ -236,13 +239,17 @@ int tiff_write(int fd, FAR const void *buffer, size_t count)
errval = errno;
if (errval != EINTR)
{
- /* Other errors are bad news and we will break out with an error */
+ /* Other errors are bad news and we will break out with an
+ * error.
+ */
return -errval;
}
}
- /* What if write returns some number of bytes other than the requested number? */
+ /* What if write returns some number of bytes other than the requested
+ * number?
+ */
else
{
@@ -326,7 +333,7 @@ int tiff_putstring(int fd, FAR const char *string, int len)
#ifdef CONFIG_DEBUG_GRAPHICS
int actual = strlen(string);
- DEBUGASSERT(len = actual+1);
+ DEBUGASSERT(len == actual + 1);
#endif
return tiff_write(fd, string, len);
}
@@ -362,7 +369,9 @@ ssize_t tiff_wordalign(int fd, size_t size)
{
return (ssize_t)ret;
}
+
size += nbytes;
}
+
return size;
}
diff --git a/system/nxcamera/nxcamera.c b/system/nxcamera/nxcamera.c
index d698b9e20..b8f5d41aa 100644
--- a/system/nxcamera/nxcamera.c
+++ b/system/nxcamera/nxcamera.c
@@ -52,6 +52,10 @@
#ifdef CONFIG_LIBYUV
# include <libyuv.h>
+
+# define CONVERT_TO_ARGB ConvertToARGB
+# define CONVERT_FROM_I420 ConvertFromI420
+# define CONVERT_TO_I420 ConvertToI420
#endif
/****************************************************************************
@@ -91,38 +95,38 @@ static int show_image(FAR struct nxcamera_s *pcam, FAR v4l2_buffer_t *buf)
#ifdef CONFIG_LIBYUV
if (pcam->display_vinfo.fmt == FB_FMT_RGB32)
{
- return ConvertToARGB(pcam->bufs[buf->index],
- pcam->buf_sizes[buf->index],
- pcam->display_pinfo.fbmem,
- pcam->display_pinfo.stride,
- 0,
- 0,
- pcam->fmt.fmt.pix.width,
- pcam->fmt.fmt.pix.height,
- pcam->fmt.fmt.pix.width,
- pcam->fmt.fmt.pix.height,
- 0,
- pcam->fmt.fmt.pix.pixelformat);
+ return CONVERT_TO_ARGB(pcam->bufs[buf->index],
+ pcam->buf_sizes[buf->index],
+ pcam->display_pinfo.fbmem,
+ pcam->display_pinfo.stride,
+ 0,
+ 0,
+ pcam->fmt.fmt.pix.width,
+ pcam->fmt.fmt.pix.height,
+ pcam->fmt.fmt.pix.width,
+ pcam->fmt.fmt.pix.height,
+ 0,
+ pcam->fmt.fmt.pix.pixelformat);
}
else if (pcam->display_vinfo.fmt == FB_FMT_RGB16_565)
{
if (pcam->fmt.fmt.pix.pixelformat == V4L2_PIX_FMT_YUV420)
{
- return ConvertFromI420(pcam->bufs[buf->index],
- pcam->fmt.fmt.pix.width,
- &pcam->bufs[buf->index][
- pcam->fmt.fmt.pix.width *
- pcam->fmt.fmt.pix.height],
- pcam->fmt.fmt.pix.width / 2,
- &pcam->bufs[buf->index][
- pcam->fmt.fmt.pix.width *
- pcam->fmt.fmt.pix.height * 5 / 4],
- pcam->fmt.fmt.pix.width / 2,
- pcam->display_pinfo.fbmem,
- pcam->display_pinfo.stride,
- pcam->fmt.fmt.pix.width,
- pcam->fmt.fmt.pix.height,
- V4L2_PIX_FMT_RGB565);
+ return CONVERT_FROM_I420(pcam->bufs[buf->index],
+ pcam->fmt.fmt.pix.width,
+ &pcam->bufs[buf->index][
+ pcam->fmt.fmt.pix.width *
+ pcam->fmt.fmt.pix.height],
+ pcam->fmt.fmt.pix.width / 2,
+ &pcam->bufs[buf->index][
+ pcam->fmt.fmt.pix.width *
+ pcam->fmt.fmt.pix.height * 5 / 4],
+ pcam->fmt.fmt.pix.width / 2,
+ pcam->display_pinfo.fbmem,
+ pcam->display_pinfo.stride,
+ pcam->fmt.fmt.pix.width,
+ pcam->fmt.fmt.pix.height,
+ V4L2_PIX_FMT_RGB565);
}
else
{
@@ -134,42 +138,42 @@ static int show_image(FAR struct nxcamera_s *pcam, FAR v4l2_buffer_t *buf)
return -ENOMEM;
}
- ret = ConvertToI420(pcam->bufs[buf->index],
- pcam->buf_sizes[buf->index],
- dst,
- pcam->fmt.fmt.pix.width,
- &dst[pcam->fmt.fmt.pix.width *
- pcam->fmt.fmt.pix.height],
- pcam->fmt.fmt.pix.width / 2,
- &dst[pcam->fmt.fmt.pix.width *
- pcam->fmt.fmt.pix.height * 5 / 4],
- pcam->fmt.fmt.pix.width / 2,
- 0,
- 0,
- pcam->fmt.fmt.pix.width,
- pcam->fmt.fmt.pix.height,
- pcam->fmt.fmt.pix.width,
- pcam->fmt.fmt.pix.height,
- 0,
- pcam->fmt.fmt.pix.pixelformat);
- if (ret < 0)
- {
- goto err;
- }
-
- ret = ConvertFromI420(dst,
+ ret = CONVERT_TO_I420(pcam->bufs[buf->index],
+ pcam->buf_sizes[buf->index],
+ dst,
pcam->fmt.fmt.pix.width,
&dst[pcam->fmt.fmt.pix.width *
- pcam->fmt.fmt.pix.height],
+ pcam->fmt.fmt.pix.height],
pcam->fmt.fmt.pix.width / 2,
&dst[pcam->fmt.fmt.pix.width *
- pcam->fmt.fmt.pix.height * 5 / 4],
+ pcam->fmt.fmt.pix.height * 5 / 4],
pcam->fmt.fmt.pix.width / 2,
- pcam->display_pinfo.fbmem,
- pcam->display_pinfo.stride,
+ 0,
+ 0,
pcam->fmt.fmt.pix.width,
pcam->fmt.fmt.pix.height,
- V4L2_PIX_FMT_RGB565);
+ pcam->fmt.fmt.pix.width,
+ pcam->fmt.fmt.pix.height,
+ 0,
+ pcam->fmt.fmt.pix.pixelformat);
+ if (ret < 0)
+ {
+ goto err;
+ }
+
+ ret = CONVERT_FROM_I420(dst,
+ pcam->fmt.fmt.pix.width,
+ &dst[pcam->fmt.fmt.pix.width *
+ pcam->fmt.fmt.pix.height],
+ pcam->fmt.fmt.pix.width / 2,
+ &dst[pcam->fmt.fmt.pix.width *
+ pcam->fmt.fmt.pix.height * 5 / 4],
+ pcam->fmt.fmt.pix.width / 2,
+ pcam->display_pinfo.fbmem,
+ pcam->display_pinfo.stride,
+ pcam->fmt.fmt.pix.width,
+ pcam->fmt.fmt.pix.height,
+ V4L2_PIX_FMT_RGB565);
if (ret < 0)
{
goto err;