Skip to content
  1. Jul 19, 2017
  2. Jul 18, 2017
  3. Jul 17, 2017
  4. Jul 16, 2017
    • Gregory Nutt's avatar
    • Gregory Nutt's avatar
    • Lwazi Dube's avatar
    • Gregory Nutt's avatar
      Merged composite into master · cb88af00
      Gregory Nutt authored
      cb88af00
    • Gregory Nutt's avatar
      Merged master into composite · 40873dc4
      Gregory Nutt authored
      40873dc4
    • Frank Benkert's avatar
      Squashed commit of the following: · eacb4f0e
      Frank Benkert authored
      commit 69fcf3e8
      Author: Alan Carvalho de Assis <acassis@gmail.com>
      Date:   Sun Jul 16 08:39:33 2017 -0600
      
          Fix spark/stm32_composite.c: board_composite_connect cannot be static
      
      commit 28eb2534
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Sun Jul 16 08:36:01 2017 -0600
      
          Composite:  Final review for coding style before merge
      
      commit e6af1b99
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Sun Jul 16 07:41:38 2017 -0600
      
          Composite:  Simplify some intiialization of data structures.
      
      commit 771c3674
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Sun Jul 16 07:15:08 2017 -0600
      
          Cosmetic changes to alignment.
      
      commit 5d67ddda
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Sun Jul 16 07:00:48 2017 -0600
      
          USBMSC: Add missing logic to saved device description.
      
      commit 0729151d
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Sat Jul 15 17:11:41 2017 -0600
      
          Trivial, costmetic
      
      commit 74b916ff
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Sat Jul 15 14:50:29 2017 -0600
      
          Composite:  Private functions need to be marked static.  Move static functions out of 'Public Functions' to 'Private Functions' where they belong.  Disable composite configuration 1 in all STM32 F1 configurations.
      
      commit cfaa4ece
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Sat Jul 15 13:20:34 2017 -0600
      
          Add some comments.
      
      commit 8143563b
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Sat Jul 15 12:33:10 2017 -0600
      
          Spark: Need to condition out MSC logic in composite setup if there is no MSC in the composite.
      
      commit 69d3a91e
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Sat Jul 15 11:03:33 2017 -0600
      
          Composite:  Remove all dependencies on CONFIG_SYSTEM_COMPOSITE_* configuration settings.  Nothing in the OS can depend on external application settings.
      
      commit 55a4388b
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Sat Jul 15 09:59:31 2017 -0600
      
          All composite configurations now also support a dual CDC/ACM configuration.
      
      commit 428f2147
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Sat Jul 15 09:24:32 2017 -0600
      
          Composite:  Move board_msc* interfaces from apps/system/composite to the board specific OS logic where they belong.
      
      commit f1cc168a
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Sat Jul 15 08:56:33 2017 -0600
      
          Refresh all composite configurations.
      
      commit 246afcaa
      Merge: 91987719 02c66728
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Sat Jul 15 08:22:26 2017 -0600
      
          Merge remote-tracking branch 'origin/master' into composite
      
      commit 91987719
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Sat Jul 15 08:20:02 2017 -0600
      
          Composite setup:  Remove useless board_cdc* wrapper.
      
      commit 82129cf8
      Merge: f2cb8b25 6537e4ea
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Fri Jul 14 16:23:57 2017 -0600
      
          Merge remote-tracking branch 'origin/master' into composite
      
      commit f2cb8b25
      Author: Alan Carvalho de Assis <acassis@gmail.com>
      Date:   Fri Jul 14 10:19:35 2017 -0600
      
          Composite:  Fix for another cloned typo.
      
      commit 676cfd52
      Author: Alan Carvalho de Assis <acassis@gmail.com>
      Date:   Fri Jul 14 09:11:37 2017 -0600
      
          Composite: Fix some typos
      
      commit 1ea0368c
      Author: Alan Carvalho de Assis <acassis@gmail.com>
      Date:   Fri Jul 14 09:10:18 2017 -0600
      
          Composite: ./stm3210e-eval/src/stm32_composite.c
      
      commit e485cace
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Fri Jul 14 09:08:17 2017 -0600
      
          Composite:  I don't think the original code should have forced minor=0.
      
      commit 6443c296
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Fri Jul 14 07:15:38 2017 -0600
      
          Composite:  Flesh out support for all of other configurations that support composite.
      
      commit 23cbc28b
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Fri Jul 14 06:59:45 2017 -0600
      
          Detangle use of board_xyzclassobject() and board_xyzuninitialize()
      
      commit 1674cb8c
      Merge: 6bc881a1 5033a6de
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Thu Jul 13 13:57:40 2017 -0600
      
          Merge remote-tracking branch 'origin/master' into composite
      
      commit 6bc881a1
      Merge: fe3af494 85b8d16d
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Tue Jul 11 12:24:07 2017 -0600
      
          Merge remote-tracking branch 'origin/master' into composite
      
      commit fe3af494
      Merge: 0f9ad16e 1bc0eea1
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Mon Jul 10 11:07:36 2017 -0600
      
          Merge remote-tracking branch 'origin/master' into composite
      
      commit 0f9ad16e
      Merge: a4cd90d4 aa2e9c15
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Fri Jul 7 20:26:53 2017 -0600
      
          Merge remote-tracking branch 'origin/master' into composite
      
      commit a4cd90d4
      Merge: 8a4be717 31f832d8
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Wed Jul 5 11:12:52 2017 -0600
      
          Merge remote-tracking branch 'origin/master' into composite
      
      commit 8a4be717
      Merge: 18a32ed2 ae177145
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Fri Jun 30 16:14:04 2017 -0600
      
          Merge remote-tracking branch 'origin/master' into composite
      
      commit 18a32ed2
      Merge: aaa81ce4 6d8df90b
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Thu Jun 29 10:18:16 2017 -0600
      
          Merge remote-tracking branch 'origin/master' into composite
      
      commit aaa81ce4
      Merge: 4eb54822 8cb4636b
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Mon Jun 26 11:56:11 2017 -0600
      
          Merge remote-tracking branch 'origin/master' into composite
      
      commit 4eb54822
      Merge: 2327f5a1 dc8eec0b
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Mon Jun 19 17:27:00 2017 -0600
      
          Merge remote-tracking branch 'origin/master' into composite
      
      commit 2327f5a1
      Merge: 49cd279f 99bf0b52
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Fri Jun 16 17:30:03 2017 -0600
      
          Merge remote-tracking branch 'origin/master' into composite
      
      commit 49cd279f
      Merge: bb6a13f3 46f86982
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Wed Jun 14 09:17:49 2017 -0600
      
          Merge remote-tracking branch 'origin/master' into composite
      
      commit bb6a13f3
      Merge: 91848004 ac93d4bd
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Mon Jun 5 17:40:06 2017 -0600
      
          Merge remote-tracking branch 'origin/master' into composite
      
      commit 91848004
      Merge: e4d26243 4526cd66
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Sat Jun 3 08:52:31 2017 -0600
      
          Merge remote-tracking branch 'origin/master' into composite
      
      commit e4d26243
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Fri Jun 2 07:19:27 2017 -0600
      
          SAMV71-Xult Composite:  Now can switch between two different composite configurations dynamically.
      
      commit 81525774
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Fri Jun 2 07:11:57 2017 -0600
      
          usbdev composite and SAMV7-Xult: Move board-specific USB composite configuration out of boardctl.c and into board-specific logic where it belongs.  Add a configuration option to the boardctl() calls to support multiple composite device configurations dynamically.
      
      commit ac13619d
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Thu Jun 1 17:03:58 2017 -0600
      
          Cosmetic
      
      commit 9dd41bdd
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Thu Jun 1 17:02:43 2017 -0600
      
          Composite: More compile-related fixes
      
      commit fc1438c9
      Merge: 049ccbfc ff2b54a5
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Thu Jun 1 16:35:41 2017 -0600
      
          Merge remote-tracking branch 'origin/master' into composite
      
      commit 049ccbfc
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Thu Jun 1 16:35:16 2017 -0600
      
          Composite: Add some structure definitions missed in first application of the patch.
      
      commit ef33329e
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Thu Jun 1 16:14:46 2017 -0600
      
          Add a warning
      
      commit 89f77cd9
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Thu Jun 1 16:11:27 2017 -0600
      
          Fix some incomplete name changes
      
      commit 0bb7af54
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Thu Jun 1 15:09:50 2017 -0600
      
          It is unnecessary to pack a structure that consists only of uint8_t data fields.
      
      commit bd9b5489
      Author: Gregory Nutt <gnutt@nuttx.org>
      Date:   Thu Jun 1 15:05:41 2017 -0600
      
          Remove COMPILE_TIME_ASSERTION
      
      commit 7e6f4815
      Author: Frank Benkert <Frank.Benkert@avat.de>
      Date:   Thu Jun 1 14:58:04 2017 -0600
      
          Part II of the same big commit
      
      commit dcc9b077
      Author: Frank Benkert <Frank.Benkert@avat.de>
      Date:   Thu Jun 1 14:08:22 2017 -0600
      
          [[This is part 1 or several commits]]
      
          We developed a huge Changeset over a year ago to make USB Composite configuration dynamical and be able to instanciate the CDCACM multiple times inside this device.  We use this feature to switch between one in normal and up to three CDCACMs in maintenance boot.
      
          The control path starts in “boardctl.c” where the configuration for the device is constructed.  There are still a few issues which I’ll ask you to have a look at before this beast can be merged.
      
          1. To be able to construct the data dynamically I have changed some USB-Structs to be packed. Maybe there are additional structs to change (just for completeness – not for current functionality).
      
          2. I’ve added the Macro “COMPILE_TIME_ASSERTION” two times (in usbmsc_desc.c and in cdcacm_desc.c) to stay private. Maybe you’ll find a better place. It’s used to check the size of the structs against the assumptions.
      
          3. I’ve changed the interface for some USB-Functions to receive also the dynamic configuration. Maybe this can be done more elegant.
      
          4. The original NuttX (without the patch) seems to have problems with a Composite device holding a CDCACM and an MSC. The “USB SET CONFIGURATION” request does not to work at all. This makes the test fail under Windows and under Linux. Applying this patch doesn’t change anything – because it only changes the configuration – not the behavior. Maybe you’ll have a look at this problem before applying the patch.
      eacb4f0e