summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-08-29 19:06:56 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-08-29 19:06:56 +0000
commit3bc153b30a6d7c218e3de369507a6a82e512f73a (patch)
tree376261364ec6ffd45b2c00445737b04d8675d130
parent3000e30c53c6e1b4dcbd7c2efe9d7bba551b23fb (diff)
downloadnuttx-3bc153b30a6d7c218e3de369507a6a82e512f73a.tar.gz
nuttx-3bc153b30a6d7c218e3de369507a6a82e512f73a.tar.bz2
nuttx-3bc153b30a6d7c218e3de369507a6a82e512f73a.zip
Work around a CodeSourcery floating point bug
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3922 42af7a65-404d-4744-a932-0658087f49c3
-rw-r--r--nuttx/arch/arm/src/stm32/stm32_i2c.c4
-rwxr-xr-xnuttx/configs/stm3210e-eval/nsh2/setenv.sh5
2 files changed, 7 insertions, 2 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_i2c.c b/nuttx/arch/arm/src/stm32/stm32_i2c.c
index 2eff0cea4..78a957dbe 100644
--- a/nuttx/arch/arm/src/stm32/stm32_i2c.c
+++ b/nuttx/arch/arm/src/stm32/stm32_i2c.c
@@ -218,7 +218,7 @@ static void stm32_i2c_setclock(FAR struct stm32_i2c_priv_s *priv, uint32_t frequ
/* Update timing and control registers */
- if (frequency < 400e3) {
+ if (frequency < 400000) {
/* Speed: 100 kHz
* Risetime: 1000 ns
@@ -802,7 +802,7 @@ FAR struct i2c_dev_s * up_i2cinitialize(int port)
inst->ops = &stm32_i2c_ops;
inst->priv = priv;
- inst->frequency = 100e3;
+ inst->frequency = 100000;
inst->address = 0;
inst->flags = 0;
diff --git a/nuttx/configs/stm3210e-eval/nsh2/setenv.sh b/nuttx/configs/stm3210e-eval/nsh2/setenv.sh
index af11e796f..09d1c5cea 100755
--- a/nuttx/configs/stm3210e-eval/nsh2/setenv.sh
+++ b/nuttx/configs/stm3210e-eval/nsh2/setenv.sh
@@ -47,6 +47,11 @@ if [ -z "${PATH_ORIG}" ]; then
export PATH_ORIG="${PATH}"
fi
+# This 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 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