summaryrefslogtreecommitdiffstats
path: root/nuttx
diff options
context:
space:
mode:
authorpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-05-16 22:43:40 +0000
committerpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-05-16 22:43:40 +0000
commita518169ac3ab49164fa5b1a00d33180bf8cf77f0 (patch)
tree5f479cc7c9a1bc538630ddaeae8c57b65b40e780 /nuttx
parent3e886927b5b4c5751626c26c4c0b2d693a72a355 (diff)
NxWM: Add IApplicationFactory so that we can create multiple instances of applications; And, as a result of that, re-vamp entire threading model. this is now buggier than it was before
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4742 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx')
-rw-r--r--nuttx/ChangeLog2
-rw-r--r--nuttx/configs/stm3240g-eval/nxwm/defconfig6
-rw-r--r--nuttx/include/cxx/csched74
3 files changed, 79 insertions, 3 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index e813076a5f..efa09c0be5 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -2771,3 +2771,5 @@
compilation errors when CONFIG_SCHED_ONEXIT is defined.
* configs/stm3240g-eval/nxwm/defconfig: The default NxWM not uses the STMPE11
touchscreen.
+ * include/cxx/csched: Added
+
diff --git a/nuttx/configs/stm3240g-eval/nxwm/defconfig b/nuttx/configs/stm3240g-eval/nxwm/defconfig
index f31b43b98c..0633a03f4b 100644
--- a/nuttx/configs/stm3240g-eval/nxwm/defconfig
+++ b/nuttx/configs/stm3240g-eval/nxwm/defconfig
@@ -1014,8 +1014,8 @@ CONFIG_STMPE11_GPIOINT_DISABLE=y
CONFIG_STMPE11_SWAPXY=n
CONFIG_STMPE11_TEMP_DISABLE=y
CONFIG_STMPE11_REGDEBUG=n
-CONFIG_STMPE11_THRESHX=26
-CONFIG_STMPE11_THRESHY=34
+CONFIG_STMPE11_THRESHX=39
+CONFIG_STMPE11_THRESHY=51
#
# USB Device Configuration
@@ -1324,7 +1324,7 @@ CONFIG_NXWM_TOUCHSCREEN=y
#
CONFIG_NXCONSOLE=y
CONFIG_NXCONSOLE_BPP=16
-CONFIG_NXCONSOLE_MXCHARS=256
+CONFIG_NXCONSOLE_MXCHARS=325
CONFIG_NXCONSOLE_CACHESIZE=32
# CONFIG_NXCONSOLE_LINESEPARATION
# CONFIG_NXCONSOLE_NOWRAP
diff --git a/nuttx/include/cxx/csched b/nuttx/include/cxx/csched
new file mode 100644
index 0000000000..262782888c
--- /dev/null
+++ b/nuttx/include/cxx/csched
@@ -0,0 +1,74 @@
+//***************************************************************************
+// include/cxx/cfcntl
+//
+// Copyright (C) 2012 Gregory Nutt. All rights reserved.
+// Author: Gregory Nutt <gnutt@nuttx.org>
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+//
+// 1. Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in
+// the documentation and/or other materials provided with the
+// distribution.
+// 3. Neither the name NuttX nor the names of its contributors may be
+// used to endorse or promote products derived from this software
+// without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+// OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+// AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+//***************************************************************************
+
+#ifndef __INCLUDE_CXX_CSCHED
+#define __INCLUDE_CXX_CSCHED
+
+//***************************************************************************
+// Included Files
+//***************************************************************************
+
+#include <sched.h>
+
+//***************************************************************************
+// Namespace
+//***************************************************************************
+
+namespace std
+{
+ using ::sched_param;
+ using ::task_init;
+ using ::task_activate;
+ using ::task_create;
+ using ::task_delete;
+ using ::task_restart;
+ using ::sched_setparam;
+ using ::sched_getparam;
+ using ::sched_setscheduler;
+ using ::sched_getscheduler;
+ using ::sched_get_priority_max;
+ using ::sched_get_priority_min;
+ using ::sched_rr_get_interval;
+ using ::sched_lock;
+ using ::sched_unlock;
+ using ::sched_lockcount;
+#ifdef CONFIG_SCHED_INSTRUMENTATION
+ using ::sched_note_start;
+ using ::sched_note_stop;
+ using ::sched_note_switch;
+#endif
+}
+
+#endif // __INCLUDE_CXX_CSCHED