diff --git a/ChangeLog b/ChangeLog index f4d45af377e..fa0b9a11820 100755 --- a/ChangeLog +++ b/ChangeLog @@ -10263,3 +10263,7 @@ (2015-04-21). * include/assert.h: Wrap definitions of assertion macros in do while. Suggested by orbitalfox (2015-04-22). + * sched/semaphore/sem_wait.c: Missing comma on debug statement caused + compile error with DEBUG on. Why hasn't that been noted before? + (2015-04-23). + diff --git a/configs/olimex-lpc1766stk/ftpc/setenv.sh b/configs/olimex-lpc1766stk/ftpc/setenv.sh index ce1f55387f4..6f57a92c1e4 100755 --- a/configs/olimex-lpc1766stk/ftpc/setenv.sh +++ b/configs/olimex-lpc1766stk/ftpc/setenv.sh @@ -1,7 +1,7 @@ #!/bin/bash # configs/olimex-lpc1766stk/ftpc/setenv.sh # -# Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved. +# Copyright (C) 2011, 2014-2015 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -52,6 +52,7 @@ fi # the CodeSourcery toolchain in any other location # export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" # export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" # These are the Cygwin paths to the locations where I installed the Atollic # toolchain under windows. You will also have to edit this if you install diff --git a/configs/olimex-lpc1766stk/hidmouse/setenv.sh b/configs/olimex-lpc1766stk/hidmouse/setenv.sh index 6232016705f..4bcc750e19d 100755 --- a/configs/olimex-lpc1766stk/hidmouse/setenv.sh +++ b/configs/olimex-lpc1766stk/hidmouse/setenv.sh @@ -1,7 +1,7 @@ #!/bin/bash # configs/olimex-lpc1766stk/hidmouse/setenv.sh # -# Copyright (C) 2014 Gregory Nutt. All rights reserved. +# Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -52,6 +52,7 @@ fi # the CodeSourcery toolchain in any other location #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" # This is the Cygwin path to the location where I build the buildroot # toolchain. diff --git a/configs/olimex-lpc1766stk/nettest/setenv.sh b/configs/olimex-lpc1766stk/nettest/setenv.sh index 1a1fb344b70..6ae5c14c405 100755 --- a/configs/olimex-lpc1766stk/nettest/setenv.sh +++ b/configs/olimex-lpc1766stk/nettest/setenv.sh @@ -1,7 +1,7 @@ #!/bin/bash # configs/olimex-lpc1766stk/nettest/setenv.sh # -# Copyright (C) 2010, 2014 Gregory Nutt. All rights reserved. +# Copyright (C) 2010, 2014-2015 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -53,6 +53,7 @@ fi #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" #export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" # These are the Cygwin paths to the locations where I installed the Atollic # toolchain under windows. You will also have to edit this if you install diff --git a/configs/olimex-lpc1766stk/nsh/setenv.sh b/configs/olimex-lpc1766stk/nsh/setenv.sh index 15129665e74..fc0b58ce14a 100755 --- a/configs/olimex-lpc1766stk/nsh/setenv.sh +++ b/configs/olimex-lpc1766stk/nsh/setenv.sh @@ -1,7 +1,7 @@ #!/bin/bash # configs/olimex-lpc1766stk/nsh/setenv.sh # -# Copyright (C) 2010, 2014 Gregory Nutt. All rights reserved. +# Copyright (C) 2010, 2014-2015 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -52,6 +52,7 @@ fi # the CodeSourcery toolchain in any other location # export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" # export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" # These are the Cygwin paths to the locations where I installed the Atollic # toolchain under windows. You will also have to edit this if you install diff --git a/configs/olimex-lpc1766stk/nx/setenv.sh b/configs/olimex-lpc1766stk/nx/setenv.sh index d44e5177d5c..501212e88ac 100755 --- a/configs/olimex-lpc1766stk/nx/setenv.sh +++ b/configs/olimex-lpc1766stk/nx/setenv.sh @@ -1,7 +1,7 @@ #!/bin/bash # configs/olimex-lpc1766stk/nx/setenv.sh # -# Copyright (C) 2010, 2014 Gregory Nutt. All rights reserved. +# Copyright (C) 2010, 2014-2015 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -50,8 +50,9 @@ fi # 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 -# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" -# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" # These are the Cygwin paths to the locations where I installed the Atollic # toolchain under windows. You will also have to edit this if you install diff --git a/configs/olimex-lpc1766stk/slip-httpd/setenv.sh b/configs/olimex-lpc1766stk/slip-httpd/setenv.sh index f836c1aa7c5..5784980b5a5 100755 --- a/configs/olimex-lpc1766stk/slip-httpd/setenv.sh +++ b/configs/olimex-lpc1766stk/slip-httpd/setenv.sh @@ -1,7 +1,7 @@ #!/bin/bash # configs/olimex-lpc1766stk/slip-httpd/setenv.sh # -# Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved. +# Copyright (C) 2011, 2014-2015 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -50,8 +50,9 @@ fi # 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 -# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" -# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" # These are the Cygwin paths to the locations where I installed the Atollic # toolchain under windows. You will also have to edit this if you install diff --git a/configs/olimex-lpc1766stk/thttpd/setenv.sh b/configs/olimex-lpc1766stk/thttpd/setenv.sh index d038fba1369..00b36f65970 100755 --- a/configs/olimex-lpc1766stk/thttpd/setenv.sh +++ b/configs/olimex-lpc1766stk/thttpd/setenv.sh @@ -1,7 +1,7 @@ #!/bin/bash # configs/olimex-lpc1766stk/thttpd/setenv.sh # -# Copyright (C) 2010, 2014 Gregory Nutt. All rights reserved. +# Copyright (C) 2010, 2014-2015 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -50,8 +50,9 @@ fi # 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 -# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" -# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" # These are the Cygwin paths to the locations where I installed the Atollic # toolchain under windows. You will also have to edit this if you install diff --git a/configs/olimex-lpc1766stk/usbmsc/setenv.sh b/configs/olimex-lpc1766stk/usbmsc/setenv.sh index f08f580b1cb..0476bba8c34 100755 --- a/configs/olimex-lpc1766stk/usbmsc/setenv.sh +++ b/configs/olimex-lpc1766stk/usbmsc/setenv.sh @@ -1,7 +1,7 @@ #!/bin/bash # configs/olimex-lpc1766stk/usbmsc/setenv.sh # -# Copyright (C) 2010, 2014 Gregory Nutt. All rights reserved. +# Copyright (C) 2010, 2014-2015 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -50,8 +50,9 @@ fi # 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 -# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" -# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" # These are the Cygwin paths to the locations where I installed the Atollic # toolchain under windows. You will also have to edit this if you install diff --git a/configs/olimex-lpc1766stk/usbserial/setenv.sh b/configs/olimex-lpc1766stk/usbserial/setenv.sh index b454d40b4f2..daff8d61d9f 100755 --- a/configs/olimex-lpc1766stk/usbserial/setenv.sh +++ b/configs/olimex-lpc1766stk/usbserial/setenv.sh @@ -1,7 +1,7 @@ #!/bin/bash # configs/olimex-lpc1766stk/usbserial/setenv.sh # -# Copyright (C) 2010, 2014 Gregory Nutt. All rights reserved. +# Copyright (C) 2010, 2014-2015 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -50,8 +50,9 @@ fi # 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 -# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" -# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" # These are the Cygwin paths to the locations where I installed the Atollic # toolchain under windows. You will also have to edit this if you install diff --git a/configs/olimex-lpc1766stk/zmodem/setenv.sh b/configs/olimex-lpc1766stk/zmodem/setenv.sh index 29e86e49a37..611dbfdb92b 100755 --- a/configs/olimex-lpc1766stk/zmodem/setenv.sh +++ b/configs/olimex-lpc1766stk/zmodem/setenv.sh @@ -1,7 +1,7 @@ #!/bin/bash # configs/olimex-lpc1766stk/zmodem/setenv.sh # -# Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. +# Copyright (C) 2013-2015 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -50,8 +50,9 @@ fi # 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 -# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" -# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Users/MyName/MentorGraphics/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" # These are the Cygwin paths to the locations where I installed the Atollic # toolchain under windows. You will also have to edit this if you install diff --git a/sched/semaphore/sem_wait.c b/sched/semaphore/sem_wait.c index 6756599fa52..f4e267f6aa1 100644 --- a/sched/semaphore/sem_wait.c +++ b/sched/semaphore/sem_wait.c @@ -102,7 +102,7 @@ int sem_wait(FAR sem_t *sem) /* This API should not be called from interrupt handlers */ - DEBUGASSERT(up_interrupt_context() == false) + DEBUGASSERT(up_interrupt_context() == false); /* Assume any errors reported are due to invalid arguments. */