diff --git a/configs/olimex-lpc1766stk/ftpc/setenv.sh b/configs/olimex-lpc1766stk/ftpc/setenv.sh index ce1f55387f..6f57a92c1e 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 6232016705..4bcc750e19 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 1a1fb344b7..6ae5c14c40 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 15129665e7..fc0b58ce14 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 d44e5177d5..501212e88a 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 f836c1aa7c..5784980b5a 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/src/lpc17_nsh.c b/configs/olimex-lpc1766stk/src/lpc17_nsh.c index 0541e4d435..62b1725747 100644 --- a/configs/olimex-lpc1766stk/src/lpc17_nsh.c +++ b/configs/olimex-lpc1766stk/src/lpc17_nsh.c @@ -141,25 +141,23 @@ static struct usbhost_connection_s *g_usbconn; #ifdef NSH_HAVEUSBHOST static int nsh_waiter(int argc, char *argv[]) { - bool connected = false; + struct usbhost_hubport_s *hport; syslog(LOG_INFO, "nsh_waiter: Running\n"); for (;;) { /* Wait for the device to change state */ - DEBUGVERIFY(CONN_WAIT(g_usbconn, &connected)); - - connected = !connected; - syslog(LOG_INFO, "%s\n", connected ? "connected" : "disconnected"); + DEBUGVERIFY(CONN_WAIT(g_usbconn, &hport)); + syslog(LOG_INFO, "nsh_waiter: %s\n", hport->connected ? "connected" : "disconnected"); /* Did we just become connected? */ - if (connected) + if (hport->connected) { /* Yes.. enumerate the newly connected device */ - (void)CONN_ENUMERATE(g_usbconn, 0); + (void)CONN_ENUMERATE(g_usbconn, hport); } } diff --git a/configs/olimex-lpc1766stk/thttpd/setenv.sh b/configs/olimex-lpc1766stk/thttpd/setenv.sh index d038fba136..00b36f6597 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 f08f580b1c..0476bba8c3 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 b454d40b4f..daff8d61d9 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 29e86e49a3..611dbfdb92 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