forked from Archive/PX4-Autopilot
The termios c_speed field cannot be 'const'
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5234 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
parent
8345d911e0
commit
860e5f0524
|
@ -3474,4 +3474,7 @@
|
||||||
board (Darcy Gong).
|
board (Darcy Gong).
|
||||||
* configs/shenzhou/thttpd: Add a THTTPD configuration for the
|
* configs/shenzhou/thttpd: Add a THTTPD configuration for the
|
||||||
Shenzhou board (Darcy Gong).
|
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).
|
||||||
|
|
||||||
|
|
|
@ -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
|
2. Then edit the top-level .config file to enable USB host. Make the
|
||||||
following changes:
|
following changes:
|
||||||
|
|
||||||
CONFIG_LPC17_USBHOST=n
|
CONFIG_LPC17_USBHOST=y
|
||||||
CONFIG_USBHOST=n
|
CONFIG_USBHOST=y
|
||||||
CONFIG_SCHED_WORKQUEUE=y
|
CONFIG_SCHED_WORKQUEUE=y
|
||||||
|
|
||||||
When this change is made, NSH should be extended to support USB flash
|
When this change is made, NSH should be extended to support USB flash
|
||||||
|
|
|
@ -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
|
2. Then edit the top-level .config file to enable USB host. Make the
|
||||||
following changes:
|
following changes:
|
||||||
|
|
||||||
CONFIG_LPC17_USBHOST=n
|
CONFIG_LPC17_USBHOST=y
|
||||||
CONFIG_USBHOST=n
|
CONFIG_USBHOST=y
|
||||||
CONFIG_SCHED_WORKQUEUE=y
|
CONFIG_SCHED_WORKQUEUE=y
|
||||||
|
|
||||||
When this change is made, NSH should be extended to support USB flash
|
When this change is made, NSH should be extended to support USB flash
|
||||||
|
|
|
@ -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
|
2. Then edit the top-level .config file to enable USB host. Make the
|
||||||
following changes:
|
following changes:
|
||||||
|
|
||||||
CONFIG_LPC17_USBHOST=n
|
CONFIG_LPC17_USBHOST=y
|
||||||
CONFIG_USBHOST=n
|
CONFIG_USBHOST=y
|
||||||
CONFIG_SCHED_WORKQUEUE=y
|
CONFIG_SCHED_WORKQUEUE=y
|
||||||
|
|
||||||
When this change is made, NSH should be extended to support USB flash
|
When this change is made, NSH should be extended to support USB flash
|
||||||
|
|
|
@ -47,11 +47,6 @@ if [ -z "${PATH_ORIG}" ]; then
|
||||||
export PATH_ORIG="${PATH}"
|
export PATH_ORIG="${PATH}"
|
||||||
fi
|
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
|
# 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
|
# toolchain under windows. You will also have to edit this if you install
|
||||||
# the CodeSourcery toolchain in any other location
|
# the CodeSourcery toolchain in any other location
|
||||||
|
|
|
@ -47,11 +47,6 @@ if [ -z "${PATH_ORIG}" ]; then
|
||||||
export PATH_ORIG="${PATH}"
|
export PATH_ORIG="${PATH}"
|
||||||
fi
|
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
|
# 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
|
# toolchain under windows. You will also have to edit this if you install
|
||||||
# the CodeSourcery toolchain in any other location
|
# the CodeSourcery toolchain in any other location
|
||||||
|
|
|
@ -47,11 +47,6 @@ if [ -z "${PATH_ORIG}" ]; then
|
||||||
export PATH_ORIG="${PATH}"
|
export PATH_ORIG="${PATH}"
|
||||||
fi
|
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
|
# 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
|
# toolchain under windows. You will also have to edit this if you install
|
||||||
# the CodeSourcery toolchain in any other location
|
# the CodeSourcery toolchain in any other location
|
||||||
|
|
|
@ -47,11 +47,6 @@ if [ -z "${PATH_ORIG}" ]; then
|
||||||
export PATH_ORIG="${PATH}"
|
export PATH_ORIG="${PATH}"
|
||||||
fi
|
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
|
# 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
|
# toolchain under windows. You will also have to edit this if you install
|
||||||
# the CodeSourcery toolchain in any other location
|
# the CodeSourcery toolchain in any other location
|
||||||
|
|
|
@ -47,11 +47,6 @@ if [ -z "${PATH_ORIG}" ]; then
|
||||||
export PATH_ORIG="${PATH}"
|
export PATH_ORIG="${PATH}"
|
||||||
fi
|
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
|
# 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
|
# toolchain under windows. You will also have to edit this if you install
|
||||||
# the CodeSourcery toolchain in any other location
|
# the CodeSourcery toolchain in any other location
|
||||||
|
|
|
@ -47,11 +47,6 @@ if [ -z "${PATH_ORIG}" ]; then
|
||||||
export PATH_ORIG="${PATH}"
|
export PATH_ORIG="${PATH}"
|
||||||
fi
|
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
|
# 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
|
# toolchain under windows. You will also have to edit this if you install
|
||||||
# the CodeSourcery toolchain in any other location
|
# the CodeSourcery toolchain in any other location
|
||||||
|
|
|
@ -47,11 +47,6 @@ if [ -z "${PATH_ORIG}" ]; then
|
||||||
export PATH_ORIG="${PATH}"
|
export PATH_ORIG="${PATH}"
|
||||||
fi
|
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
|
# 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
|
# toolchain under windows. You will also have to edit this if you install
|
||||||
# the CodeSourcery toolchain in any other location
|
# the CodeSourcery toolchain in any other location
|
||||||
|
|
|
@ -47,11 +47,6 @@ if [ -z "${PATH_ORIG}" ]; then
|
||||||
export PATH_ORIG="${PATH}"
|
export PATH_ORIG="${PATH}"
|
||||||
fi
|
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
|
# 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
|
# toolchain under windows. You will also have to edit this if you install
|
||||||
# the CodeSourcery toolchain in any other location
|
# the CodeSourcery toolchain in any other location
|
||||||
|
|
|
@ -47,11 +47,6 @@ if [ -z "${PATH_ORIG}" ]; then
|
||||||
export PATH_ORIG="${PATH}"
|
export PATH_ORIG="${PATH}"
|
||||||
fi
|
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
|
# 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
|
# toolchain under windows. You will also have to edit this if you install
|
||||||
# the CodeSourcery toolchain in any other location
|
# the CodeSourcery toolchain in any other location
|
||||||
|
|
|
@ -47,11 +47,6 @@ if [ -z "${PATH_ORIG}" ]; then
|
||||||
export PATH_ORIG="${PATH}"
|
export PATH_ORIG="${PATH}"
|
||||||
fi
|
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
|
# 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
|
# toolchain under windows. You will also have to edit this if you install
|
||||||
# the CodeSourcery toolchain in any other location
|
# the CodeSourcery toolchain in any other location
|
||||||
|
|
|
@ -47,11 +47,6 @@ if [ -z "${PATH_ORIG}" ]; then
|
||||||
export PATH_ORIG="${PATH}"
|
export PATH_ORIG="${PATH}"
|
||||||
fi
|
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
|
# 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
|
# toolchain under windows. You will also have to edit this if you install
|
||||||
# the CodeSourcery toolchain in any other location
|
# the CodeSourcery toolchain in any other location
|
||||||
|
|
|
@ -846,3 +846,13 @@ Where <subdir> is one of the following:
|
||||||
-CONFIG_NX_WRITEONLY=y
|
-CONFIG_NX_WRITEONLY=y
|
||||||
+# CONFIG_NX_WRITEONLY is not set
|
+# 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.
|
||||||
|
|
|
@ -230,7 +230,7 @@ struct termios
|
||||||
* cf[set|get][o|i]speed() POSIX interfaces.
|
* 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)*/
|
||||||
};
|
};
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
|
|
|
@ -110,12 +110,7 @@
|
||||||
|
|
||||||
int cfsetspeed(FAR struct termios *termiosp, speed_t speed)
|
int cfsetspeed(FAR struct termios *termiosp, speed_t speed)
|
||||||
{
|
{
|
||||||
FAR speed_t *speedp;
|
|
||||||
|
|
||||||
DEBUGASSERT(termiosp);
|
DEBUGASSERT(termiosp);
|
||||||
|
termiosp->c_speed = speed;
|
||||||
speedp = (FAR speed_t *)&termiosp->c_speed;
|
|
||||||
*speedp = speed;
|
|
||||||
|
|
||||||
return OK;
|
return OK;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue