This commit backs out most of commit b4747286b19d3b15193b2a5e8a0fe48fa0a8638c. That change was added because sem_wait() would sometimes cause cancellation points inappropriated. But with these recent changes, nxsem_wait() is used instead and it is not a cancellation point.
In the OS, all calls to sem_wait() changed to nxsem_wait(). nxsem_wait() does not return errors via errno so each place where nxsem_wait() is now called must not examine the errno variable.
In all OS functions (not libraries), change sem_wait() to nxsem_wait(). This will prevent the OS from creating bogus cancellation points and from modifying the per-task errno variable.
sched/semaphore: Add the function nxsem_wait(). This is a new internal OS interface. It is functionally equivalent to sem_wait() except that (1) it is not a cancellation point, and (2) it does not set the per-thread errno value on return.
sched/semaphore: Add nxsem_post() which is identical to sem_post() except that it never modifies the errno variable. Changed all references to sem_post in the OS to nxsem_post().
sched/semaphore: Add nxsem_destroy() which is identical to sem_destroy() except that it never modifies the errno variable. Changed all references to sem_destroy() in the OS to nxsem_destroy().
libc/semaphore and sched/semaphore: Add nxsem_getprotocol() and nxsem_setprotocola which are identical to sem_getprotocol() and set_setprotocol() except that they never modifies the errno variable. Changed all references to sem_setprotocol in the OS to nxsem_setprotocol(). sem_getprotocol() was not used in the OS
libc/semaphore: Add nxsem_getvalue() which is identical to sem_getvalue() except that it never modifies the errno variable. Changed all references to sem_getvalue in the OS to nxsem_getvalue().
sched/semaphore: Rename all internal private functions from sem_xyz to nxsem_xyz. The sem_ prefix is (will be) reserved only for the application semaphore interfaces.
libc/semaphore: Add nxsem_init() which is identical to sem_init() except that it never modifies the errno variable. Changed all references to sem_init in the OS to nxsem_init().
sched/semaphore: Rename sem_tickwait() to nxsem_tickwait() so that it is clear this is an internal OS function.
sched/semaphoate: Rename sem_reset() to nxsem_reset() so that it is clear this is an internal OS function.
commit 69fcf3e849dbcc8cbab4310d587a215ddd0a7382
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 28eb2534013397911a30c4014f09167f66be9f32
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Sun Jul 16 08:36:01 2017 -0600
Composite: Final review for coding style before merge
commit e6af1b9994ff9eb371f72be810f2e0377651fc10
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Sun Jul 16 07:41:38 2017 -0600
Composite: Simplify some intiialization of data structures.
commit 771c367411b8efb1e6269a9863ad37966f0c6660
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Sun Jul 16 07:15:08 2017 -0600
Cosmetic changes to alignment.
commit 5d67ddda4e4c0916830e8bda03cad5dc795724b3
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Sun Jul 16 07:00:48 2017 -0600
USBMSC: Add missing logic to saved device description.
commit 0729151d29a440cae4fc0e019567020417026c03
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Sat Jul 15 17:11:41 2017 -0600
Trivial, costmetic
commit 74b916ff84ba50cb7e6b7493efffe56017064136
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 cfaa4ece13adc37cf1a1316a69d885e63e7bc2de
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Sat Jul 15 13:20:34 2017 -0600
Add some comments.
commit 8143563be6ca1c41b1dd5aaed24cf9a22e262cac
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 69d3a91ef10a1c16aeb943b49b572ee479a267ad
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 55a4388bbd78101249fc87bb9137438aed9dd3f2
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 428f2147af15142f6a02b3d86d3635bd5dbe3f2a
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 f1cc168a5c0785d3716c6106f1d5f1e24db2c4c0
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Sat Jul 15 08:56:33 2017 -0600
Refresh all composite configurations.
commit 246afcaa109b0bfa3e72281b367455a59f9266cd
Merge: 919877191d 02c6672868
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Sat Jul 15 08:22:26 2017 -0600
Merge remote-tracking branch 'origin/master' into composite
commit 919877191d62d76e859f143f0784c53cc362adb3
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Sat Jul 15 08:20:02 2017 -0600
Composite setup: Remove useless board_cdc* wrapper.
commit 82129cf8c68816ec34cae9801cd3582ca63ece0a
Merge: f2cb8b252a 6537e4ea20
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Fri Jul 14 16:23:57 2017 -0600
Merge remote-tracking branch 'origin/master' into composite
commit f2cb8b252a60acc4757dd0be5ea8e649f4f5b09f
Author: Alan Carvalho de Assis <acassis@gmail.com>
Date: Fri Jul 14 10:19:35 2017 -0600
Composite: Fix for another cloned typo.
commit 676cfd526a65d7edb2fe10f07c5e2e2332321a5f
Author: Alan Carvalho de Assis <acassis@gmail.com>
Date: Fri Jul 14 09:11:37 2017 -0600
Composite: Fix some typos
commit 1ea0368c185a8b917190ff9fff5142fc844c75de
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 e485caced9d7910965795c5cd2e4b823a2b4551d
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 6443c296219037cf6e54ab6758d3b66081628e7a
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 23cbc28b053f1a237a47766cd5f5a282da80dda5
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Fri Jul 14 06:59:45 2017 -0600
Detangle use of board_xyzclassobject() and board_xyzuninitialize()
commit 1674cb8c8e16831a4984d32d06a232419ecde974
Merge: 6bc881a192 5033a6def7
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Thu Jul 13 13:57:40 2017 -0600
Merge remote-tracking branch 'origin/master' into composite
commit 6bc881a19296ed909ba4a03f420160864c79a55f
Merge: fe3af4941d 85b8d16d8c
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Tue Jul 11 12:24:07 2017 -0600
Merge remote-tracking branch 'origin/master' into composite
commit fe3af4941d667d3e6cee74d1138d5f6c00401c0e
Merge: 0f9ad16e18 1bc0eea143
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Mon Jul 10 11:07:36 2017 -0600
Merge remote-tracking branch 'origin/master' into composite
commit 0f9ad16e1841677177819c498d9d554bba9ecf12
Merge: a4cd90d4ef aa2e9c15a5
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Fri Jul 7 20:26:53 2017 -0600
Merge remote-tracking branch 'origin/master' into composite
commit a4cd90d4efa5a610b8fcdeb61d2cd3825d17471e
Merge: 8a4be7175e 31f832d8c5
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Wed Jul 5 11:12:52 2017 -0600
Merge remote-tracking branch 'origin/master' into composite
commit 8a4be7175e2f1d25edf85860c8b4ba74a8715829
Merge: 18a32ed2ca ae1771454a
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Fri Jun 30 16:14:04 2017 -0600
Merge remote-tracking branch 'origin/master' into composite
commit 18a32ed2cadbfe0951fda93866cb44c4713b6255
Merge: aaa81ce497 6d8df90b79
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Thu Jun 29 10:18:16 2017 -0600
Merge remote-tracking branch 'origin/master' into composite
commit aaa81ce497aaa566e01e6b5a242e1a098936490e
Merge: 4eb548226b 8cb4636bb1
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Mon Jun 26 11:56:11 2017 -0600
Merge remote-tracking branch 'origin/master' into composite
commit 4eb548226b51778485ccc3e23790cfcaa30110ee
Merge: 2327f5a1b4 dc8eec0b61
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Mon Jun 19 17:27:00 2017 -0600
Merge remote-tracking branch 'origin/master' into composite
commit 2327f5a1b4f66c7ecc86bcd66ee3490eaa060ed0
Merge: 49cd279fc6 99bf0b522b
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Fri Jun 16 17:30:03 2017 -0600
Merge remote-tracking branch 'origin/master' into composite
commit 49cd279fc6a5efc2029681469d315fa82ea7db1c
Merge: bb6a13f30a 46f86982ee
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Wed Jun 14 09:17:49 2017 -0600
Merge remote-tracking branch 'origin/master' into composite
commit bb6a13f30a262b814299c4f8ec146d4a69a1c093
Merge: 918480047a ac93d4bda9
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Mon Jun 5 17:40:06 2017 -0600
Merge remote-tracking branch 'origin/master' into composite
commit 918480047afd324eddcfa7680cedbe7d90f4c064
Merge: e4d262436c 4526cd665e
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Sat Jun 3 08:52:31 2017 -0600
Merge remote-tracking branch 'origin/master' into composite
commit e4d262436c0594560d0feddb1413fdcf863ec258
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 815257743d88220ead9113c8238fb9d3e47549ca
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 ac13619dc5d99ecf2f7feb76e343a1889bafafc9
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Thu Jun 1 17:03:58 2017 -0600
Cosmetic
commit 9dd41bdd2f63d33b1bd3dee6d6c3364fc0f04009
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Thu Jun 1 17:02:43 2017 -0600
Composite: More compile-related fixes
commit fc1438c95d72ec5aa9252611548fb0e43c857ade
Merge: 049ccbfcbe ff2b54a5e0
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Thu Jun 1 16:35:41 2017 -0600
Merge remote-tracking branch 'origin/master' into composite
commit 049ccbfcbeefd1de3c61fd56bb963cb877ffdea3
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 ef33329e3a97dbed2cb98bc21df8e3b9fdb561ac
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Thu Jun 1 16:14:46 2017 -0600
Add a warning
commit 89f77cd91aec238e02a39aad2af916db4c5b0990
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Thu Jun 1 16:11:27 2017 -0600
Fix some incomplete name changes
commit 0bb7af549a74743ec2a5e9d6fd0872d8dea92dc4
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 bd9b548914c22179b56e0eaba4faa8ff0ac17b37
Author: Gregory Nutt <gnutt@nuttx.org>
Date: Thu Jun 1 15:05:41 2017 -0600
Remove COMPILE_TIME_ASSERTION
commit 7e6f481581d79f02499905c9eb79e4b6bc3835aa
Author: Frank Benkert <Frank.Benkert@avat.de>
Date: Thu Jun 1 14:58:04 2017 -0600
Part II of the same big commit
commit dcc9b07715cc6996c6495cddef5fd7dc5a3d861e
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.
