diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-27 01:26:47 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-27 01:26:47 +0000 |
commit | 2ee480b59e7f6d641dde0ec63254aaa8a87401c2 (patch) | |
tree | c8cf994dce3eb57a24b51273051e3208c78f9753 /NxWidgets | |
parent | 4e2728ef8651d0047d0f251bb1495327d2349414 (diff) | |
download | px4-nuttx-2ee480b59e7f6d641dde0ec63254aaa8a87401c2.tar.gz px4-nuttx-2ee480b59e7f6d641dde0ec63254aaa8a87401c2.tar.bz2 px4-nuttx-2ee480b59e7f6d641dde0ec63254aaa8a87401c2.zip |
Fixes mostly related to touchscreen on Shenzhou board (still does not work)
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5196 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'NxWidgets')
-rw-r--r-- | NxWidgets/libnxwidgets/src/cnxserver.cxx | 2 | ||||
-rw-r--r-- | NxWidgets/nxwm/src/chexcalculator.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/NxWidgets/libnxwidgets/src/cnxserver.cxx b/NxWidgets/libnxwidgets/src/cnxserver.cxx index be67e5641..8816c73bc 100644 --- a/NxWidgets/libnxwidgets/src/cnxserver.cxx +++ b/NxWidgets/libnxwidgets/src/cnxserver.cxx @@ -214,7 +214,7 @@ bool CNxServer::connect(void) // Start the server task - gvdbg("NxServer::connect: Starting server task\n"); + gvdbg("CNxServer::connect: Starting server task\n"); serverId = TASK_CREATE("NX Server", CONFIG_NXWIDGETS_SERVERPRIO, CONFIG_NXWIDGETS_SERVERSTACK, server, (FAR const char **)0); if (serverId < 0) diff --git a/NxWidgets/nxwm/src/chexcalculator.cxx b/NxWidgets/nxwm/src/chexcalculator.cxx index 167c114b7..f8f1bb246 100644 --- a/NxWidgets/nxwm/src/chexcalculator.cxx +++ b/NxWidgets/nxwm/src/chexcalculator.cxx @@ -656,7 +656,7 @@ int64_t CHexCalculator::evaluateBinaryOperation(uint8_t operation, int64_t value return value1 + value2; default: - gdbg("ERROR: Unexpected pending operation %d\n", m_pending); + gdbg("ERROR: Unexpected pending operation %d\n", operation); return 0; } } |