sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge from master

Browse Source
This commit is contained in:
Gregory Nutt 2015-04-23 07:17:28 -06:00
commit 0076e6b3b5
12 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -10263,3 +10263,7 @@
(2015-04-21). (2015-04-21).
* include/assert.h: Wrap definitions of assertion macros in do while. * include/assert.h: Wrap definitions of assertion macros in do while.
Suggested by orbitalfox (2015-04-22). 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).

3
configs/olimex-lpc1766stk/ftpc/setenv.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# configs/olimex-lpc1766stk/ftpc/setenv.sh # 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 <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -52,6 +52,7 @@ fi
# the CodeSourcery toolchain in any other location # 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 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_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 # 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 # toolchain under windows. You will also have to edit this if you install

3
configs/olimex-lpc1766stk/hidmouse/setenv.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# configs/olimex-lpc1766stk/hidmouse/setenv.sh # 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 <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -52,6 +52,7 @@ fi
# the CodeSourcery toolchain in any other location # 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 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_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 # This is the Cygwin path to the location where I build the buildroot
# toolchain. # toolchain.

3
configs/olimex-lpc1766stk/nettest/setenv.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# configs/olimex-lpc1766stk/nettest/setenv.sh # 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 <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # 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 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_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"
#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 # 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 # toolchain under windows. You will also have to edit this if you install

3
configs/olimex-lpc1766stk/nsh/setenv.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# configs/olimex-lpc1766stk/nsh/setenv.sh # 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 <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -52,6 +52,7 @@ fi
# the CodeSourcery toolchain in any other location # 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 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_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 # 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 # toolchain under windows. You will also have to edit this if you install

7
configs/olimex-lpc1766stk/nx/setenv.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# configs/olimex-lpc1766stk/nx/setenv.sh # 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 <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # 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 # 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
# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/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/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 # 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 # toolchain under windows. You will also have to edit this if you install

7
configs/olimex-lpc1766stk/slip-httpd/setenv.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# configs/olimex-lpc1766stk/slip-httpd/setenv.sh # 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 <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # 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 # 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
# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/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/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 # 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 # toolchain under windows. You will also have to edit this if you install

7
configs/olimex-lpc1766stk/thttpd/setenv.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# configs/olimex-lpc1766stk/thttpd/setenv.sh # 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 <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # 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 # 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
# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/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/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 # 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 # toolchain under windows. You will also have to edit this if you install

7
configs/olimex-lpc1766stk/usbmsc/setenv.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# configs/olimex-lpc1766stk/usbmsc/setenv.sh # 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 <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # 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 # 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
# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/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/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 # 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 # toolchain under windows. You will also have to edit this if you install

7
configs/olimex-lpc1766stk/usbserial/setenv.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# configs/olimex-lpc1766stk/usbserial/setenv.sh # 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 <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # 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 # 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
# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/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/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 # 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 # toolchain under windows. You will also have to edit this if you install

7
configs/olimex-lpc1766stk/zmodem/setenv.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# configs/olimex-lpc1766stk/zmodem/setenv.sh # 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 <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # 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 # 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
# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/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/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 # 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 # toolchain under windows. You will also have to edit this if you install

2
sched/semaphore/sem_wait.c
View File

@ -102,7 +102,7 @@ int sem_wait(FAR sem_t *sem)
/* This API should not be called from interrupt handlers */ /* 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. */ /* Assume any errors reported are due to invalid arguments. */