summaryrefslogtreecommitdiff
path: root/nuttx
diff options
context:
space:
mode:
Diffstat (limited to 'nuttx')
-rw-r--r--nuttx/ChangeLog3
-rw-r--r--nuttx/configs/lincoln60/README.txt4
-rw-r--r--nuttx/configs/mbed/README.txt4
-rw-r--r--nuttx/configs/olimex-lpc1766stk/README.txt4
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/ftpc/setenv.sh5
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/hidkbd/setenv.sh5
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/nettest/setenv.sh5
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/nsh/setenv.sh5
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/nx/setenv.sh5
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/ostest/setenv.sh5
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/slip-httpd/setenv.sh5
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/thttpd/setenv.sh5
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/usbserial/setenv.sh5
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/usbstorage/setenv.sh5
-rwxr-xr-xnuttx/configs/olimex-lpc1766stk/wlan/setenv.sh5
-rw-r--r--nuttx/configs/shenzhou/README.txt10
-rw-r--r--nuttx/include/termios.h2
-rw-r--r--nuttx/lib/termios/lib_cfsetspeed.c7
18 files changed, 21 insertions, 68 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 971e9ff9b..ad6521a9e 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -3474,4 +3474,7 @@
board (Darcy Gong).
* configs/shenzhou/thttpd: Add a THTTPD configuration for the
Shenzhou board (Darcy Gong).
+ * include/termios.h and lib/termios/libcf*speed.c: The non-standard,
+ "hidden" c_speed cannot be type const or else static instantiations
+ of termios will be required to initialize it (Mike Smith).
diff --git a/nuttx/configs/lincoln60/README.txt b/nuttx/configs/lincoln60/README.txt
index 07ca167cd..068ca50dc 100644
--- a/nuttx/configs/lincoln60/README.txt
+++ b/nuttx/configs/lincoln60/README.txt
@@ -461,8 +461,8 @@ host operations. To make these modifications, do the following:
2. Then edit the top-level .config file to enable USB host. Make the
following changes:
- CONFIG_LPC17_USBHOST=n
- CONFIG_USBHOST=n
+ CONFIG_LPC17_USBHOST=y
+ CONFIG_USBHOST=y
CONFIG_SCHED_WORKQUEUE=y
When this change is made, NSH should be extended to support USB flash
diff --git a/nuttx/configs/mbed/README.txt b/nuttx/configs/mbed/README.txt
index 4b413560a..958ae9818 100644
--- a/nuttx/configs/mbed/README.txt
+++ b/nuttx/configs/mbed/README.txt
@@ -432,8 +432,8 @@ host operations. To make these modifications, do the following:
2. Then edit the top-level .config file to enable USB host. Make the
following changes:
- CONFIG_LPC17_USBHOST=n
- CONFIG_USBHOST=n
+ CONFIG_LPC17_USBHOST=y
+ CONFIG_USBHOST=y
CONFIG_SCHED_WORKQUEUE=y
When this change is made, NSH should be extended to support USB flash
diff --git a/nuttx/configs/olimex-lpc1766stk/README.txt b/nuttx/configs/olimex-lpc1766stk/README.txt
index f638ed4ff..0983ab1f5 100644
--- a/nuttx/configs/olimex-lpc1766stk/README.txt
+++ b/nuttx/configs/olimex-lpc1766stk/README.txt
@@ -836,8 +836,8 @@ USB host operations. To make these modifications, do the following:
2. Then edit the top-level .config file to enable USB host. Make the
following changes:
- CONFIG_LPC17_USBHOST=n
- CONFIG_USBHOST=n
+ CONFIG_LPC17_USBHOST=y
+ CONFIG_USBHOST=y
CONFIG_SCHED_WORKQUEUE=y
When this change is made, NSH should be extended to support USB flash
diff --git a/nuttx/configs/olimex-lpc1766stk/ftpc/setenv.sh b/nuttx/configs/olimex-lpc1766stk/ftpc/setenv.sh
index f9194c00d..bc02a33b5 100755
--- a/nuttx/configs/olimex-lpc1766stk/ftpc/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/ftpc/setenv.sh
@@ -47,11 +47,6 @@ if [ -z "${PATH_ORIG}" ]; then
export PATH_ORIG="${PATH}"
fi
-# This is the Cygwin path to the location where I installed the RIDE
-# toolchain under windows. You will also have to edit this if you install
-# the RIDE toolchain in any other location
-#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
-
# This is the Cygwin path to the location where I installed the CodeSourcery
# toolchain under windows. You will also have to edit this if you install
# the CodeSourcery toolchain in any other location
diff --git a/nuttx/configs/olimex-lpc1766stk/hidkbd/setenv.sh b/nuttx/configs/olimex-lpc1766stk/hidkbd/setenv.sh
index 4c76646f9..af4a2589e 100755
--- a/nuttx/configs/olimex-lpc1766stk/hidkbd/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/hidkbd/setenv.sh
@@ -47,11 +47,6 @@ if [ -z "${PATH_ORIG}" ]; then
export PATH_ORIG="${PATH}"
fi
-# This is the Cygwin path to the location where I installed the RIDE
-# toolchain under windows. You will also have to edit this if you install
-# the RIDE toolchain in any other location
-#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
-
# This is the Cygwin path to the location where I installed the CodeSourcery
# toolchain under windows. You will also have to edit this if you install
# the CodeSourcery toolchain in any other location
diff --git a/nuttx/configs/olimex-lpc1766stk/nettest/setenv.sh b/nuttx/configs/olimex-lpc1766stk/nettest/setenv.sh
index d544f4470..d4627713d 100755
--- a/nuttx/configs/olimex-lpc1766stk/nettest/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/nettest/setenv.sh
@@ -47,11 +47,6 @@ if [ -z "${PATH_ORIG}" ]; then
export PATH_ORIG="${PATH}"
fi
-# This is the Cygwin path to the location where I installed the RIDE
-# toolchain under windows. You will also have to edit this if you install
-# the RIDE toolchain in any other location
-#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
-
# This is the Cygwin path to the location where I installed the CodeSourcery
# toolchain under windows. You will also have to edit this if you install
# the CodeSourcery toolchain in any other location
diff --git a/nuttx/configs/olimex-lpc1766stk/nsh/setenv.sh b/nuttx/configs/olimex-lpc1766stk/nsh/setenv.sh
index 84150b068..f9d5c3a16 100755
--- a/nuttx/configs/olimex-lpc1766stk/nsh/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/nsh/setenv.sh
@@ -47,11 +47,6 @@ if [ -z "${PATH_ORIG}" ]; then
export PATH_ORIG="${PATH}"
fi
-# This is the Cygwin path to the location where I installed the RIDE
-# toolchain under windows. You will also have to edit this if you install
-# the RIDE toolchain in any other location
-#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
-
# This is the Cygwin path to the location where I installed the CodeSourcery
# toolchain under windows. You will also have to edit this if you install
# the CodeSourcery toolchain in any other location
diff --git a/nuttx/configs/olimex-lpc1766stk/nx/setenv.sh b/nuttx/configs/olimex-lpc1766stk/nx/setenv.sh
index b94b47ad4..f9516c776 100755
--- a/nuttx/configs/olimex-lpc1766stk/nx/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/nx/setenv.sh
@@ -47,11 +47,6 @@ if [ -z "${PATH_ORIG}" ]; then
export PATH_ORIG="${PATH}"
fi
-# This is the Cygwin path to the location where I installed the RIDE
-# toolchain under windows. You will also have to edit this if you install
-# the RIDE toolchain in any other location
-#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
-
# This is the Cygwin path to the location where I installed the CodeSourcery
# toolchain under windows. You will also have to edit this if you install
# the CodeSourcery toolchain in any other location
diff --git a/nuttx/configs/olimex-lpc1766stk/ostest/setenv.sh b/nuttx/configs/olimex-lpc1766stk/ostest/setenv.sh
index a5547b3bf..2c3bc3e6d 100755
--- a/nuttx/configs/olimex-lpc1766stk/ostest/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/ostest/setenv.sh
@@ -47,11 +47,6 @@ if [ -z "${PATH_ORIG}" ]; then
export PATH_ORIG="${PATH}"
fi
-# This is the Cygwin path to the location where I installed the RIDE
-# toolchain under windows. You will also have to edit this if you install
-# the RIDE toolchain in any other location
-#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
-
# This is the Cygwin path to the location where I installed the CodeSourcery
# toolchain under windows. You will also have to edit this if you install
# the CodeSourcery toolchain in any other location
diff --git a/nuttx/configs/olimex-lpc1766stk/slip-httpd/setenv.sh b/nuttx/configs/olimex-lpc1766stk/slip-httpd/setenv.sh
index 35dbd55b3..c32bc579a 100755
--- a/nuttx/configs/olimex-lpc1766stk/slip-httpd/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/slip-httpd/setenv.sh
@@ -47,11 +47,6 @@ if [ -z "${PATH_ORIG}" ]; then
export PATH_ORIG="${PATH}"
fi
-# This is the Cygwin path to the location where I installed the RIDE
-# toolchain under windows. You will also have to edit this if you install
-# the RIDE toolchain in any other location
-#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
-
# This is the Cygwin path to the location where I installed the CodeSourcery
# toolchain under windows. You will also have to edit this if you install
# the CodeSourcery toolchain in any other location
diff --git a/nuttx/configs/olimex-lpc1766stk/thttpd/setenv.sh b/nuttx/configs/olimex-lpc1766stk/thttpd/setenv.sh
index bcf0c4dea..7517148f5 100755
--- a/nuttx/configs/olimex-lpc1766stk/thttpd/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/thttpd/setenv.sh
@@ -47,11 +47,6 @@ if [ -z "${PATH_ORIG}" ]; then
export PATH_ORIG="${PATH}"
fi
-# This is the Cygwin path to the location where I installed the RIDE
-# toolchain under windows. You will also have to edit this if you install
-# the RIDE toolchain in any other location
-#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
-
# This is the Cygwin path to the location where I installed the CodeSourcery
# toolchain under windows. You will also have to edit this if you install
# the CodeSourcery toolchain in any other location
diff --git a/nuttx/configs/olimex-lpc1766stk/usbserial/setenv.sh b/nuttx/configs/olimex-lpc1766stk/usbserial/setenv.sh
index ea9fe6c67..ad34dd6a1 100755
--- a/nuttx/configs/olimex-lpc1766stk/usbserial/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/usbserial/setenv.sh
@@ -47,11 +47,6 @@ if [ -z "${PATH_ORIG}" ]; then
export PATH_ORIG="${PATH}"
fi
-# This is the Cygwin path to the location where I installed the RIDE
-# toolchain under windows. You will also have to edit this if you install
-# the RIDE toolchain in any other location
-#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
-
# This is the Cygwin path to the location where I installed the CodeSourcery
# toolchain under windows. You will also have to edit this if you install
# the CodeSourcery toolchain in any other location
diff --git a/nuttx/configs/olimex-lpc1766stk/usbstorage/setenv.sh b/nuttx/configs/olimex-lpc1766stk/usbstorage/setenv.sh
index fa23269fb..4e01bb195 100755
--- a/nuttx/configs/olimex-lpc1766stk/usbstorage/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/usbstorage/setenv.sh
@@ -47,11 +47,6 @@ if [ -z "${PATH_ORIG}" ]; then
export PATH_ORIG="${PATH}"
fi
-# This is the Cygwin path to the location where I installed the RIDE
-# toolchain under windows. You will also have to edit this if you install
-# the RIDE toolchain in any other location
-#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
-
# This is the Cygwin path to the location where I installed the CodeSourcery
# toolchain under windows. You will also have to edit this if you install
# the CodeSourcery toolchain in any other location
diff --git a/nuttx/configs/olimex-lpc1766stk/wlan/setenv.sh b/nuttx/configs/olimex-lpc1766stk/wlan/setenv.sh
index b7ada2bc2..767614612 100755
--- a/nuttx/configs/olimex-lpc1766stk/wlan/setenv.sh
+++ b/nuttx/configs/olimex-lpc1766stk/wlan/setenv.sh
@@ -47,11 +47,6 @@ if [ -z "${PATH_ORIG}" ]; then
export PATH_ORIG="${PATH}"
fi
-# This is the Cygwin path to the location where I installed the RIDE
-# toolchain under windows. You will also have to edit this if you install
-# the RIDE toolchain in any other location
-#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Raisonance/Ride/arm-gcc/bin"
-
# This is the Cygwin path to the location where I installed the CodeSourcery
# toolchain under windows. You will also have to edit this if you install
# the CodeSourcery toolchain in any other location
diff --git a/nuttx/configs/shenzhou/README.txt b/nuttx/configs/shenzhou/README.txt
index 772c59a17..7bf67710d 100644
--- a/nuttx/configs/shenzhou/README.txt
+++ b/nuttx/configs/shenzhou/README.txt
@@ -846,3 +846,13 @@ Where <subdir> is one of the following:
-CONFIG_NX_WRITEONLY=y
+# CONFIG_NX_WRITEONLY is not set
+ thttpd
+ ------
+
+ This builds the THTTPD web server example using the THTTPD and
+ the apps/examples/thttpd application.
+
+ NOTE: See note above with regard to the EABI/OABI buildroot
+ toolchains. This example can only be built using the older
+ OABI toolchain due to incompatibilities introduced in later
+ GCC releases.
diff --git a/nuttx/include/termios.h b/nuttx/include/termios.h
index e381814e3..2e1c38fc2 100644
--- a/nuttx/include/termios.h
+++ b/nuttx/include/termios.h
@@ -230,7 +230,7 @@ struct termios
* cf[set|get][o|i]speed() POSIX interfaces.
*/
- const speed_t c_speed; /* Input/output speed (non-POSIX)*/
+ speed_t c_speed; /* Input/output speed (non-POSIX)*/
};
/****************************************************************************
diff --git a/nuttx/lib/termios/lib_cfsetspeed.c b/nuttx/lib/termios/lib_cfsetspeed.c
index bf9e66064..714562ff5 100644
--- a/nuttx/lib/termios/lib_cfsetspeed.c
+++ b/nuttx/lib/termios/lib_cfsetspeed.c
@@ -110,12 +110,7 @@
int cfsetspeed(FAR struct termios *termiosp, speed_t speed)
{
- FAR speed_t *speedp;
-
DEBUGASSERT(termiosp);
-
- speedp = (FAR speed_t *)&termiosp->c_speed;
- *speedp = speed;
-
+ termiosp->c_speed = speed;
return OK;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-12 04:22:17 +0000