Commit Graph

30705 Commits

Author SHA1 Message Date
Gregory Nutt
951017da55 CDC/ACM: Part of previous change was incorret. 2017-07-19 09:11:13 -06:00
Gregory Nutt
940b78cac2 USB device: Fix some coding standard issues. Other purely cosmetic changes. 2017-07-19 09:00:01 -06:00
Matt Thompson
eff9ba514c SAMD21: Changes needed to get USB working. 2017-07-19 07:22:14 -06:00
Gregory Nutt
646b28223a CDC/ACM. Fix several known problems resulting from merge of USB composite device. That merge now breaks some of the non-composite USB devices. These fixes are for CDC/ACM. 2017-07-19 07:05:23 -06:00
Gregory Nutt
d595e0efdf Network poll: Remove logic conditioned on non-existent HAVE_NET_POLL. 2017-07-19 06:23:56 -06:00
Anthony Merlino
9550c3dc08 Merged in merlin17/nuttx/beacon802154 (pull request #437)
ieee802154: Minor improvements including adding the ability to regdump the radio

Approved-by: Gregory Nutt <gnutt@nuttx.org>
2017-07-18 18:16:57 +00:00
Anthony Merlino
f665c3e506 ieee802154: Adds special attribut that can be used to perform a regdump of the radio 2017-07-18 14:04:58 -04:00
Anthony Merlino
706bce0eb7 configs/clicker2-stm32: Fixes Kconfig option dependency 2017-07-18 14:02:13 -04:00
Anthony Merlino
eaf4c05f27 ieee802154: Sets txdesc retrycount to the maxretries MAC attribute when allocated 2017-07-18 14:01:30 -04:00
Anthony Merlino
222fe50d3a ieee802154: Trivial 2017-07-18 13:55:48 -04:00
Titus von Boxberg
7fc2fae1fa Merged in elbeinformatik/nuttx/typo (pull request #436)
Typos

Approved-by: Gregory Nutt <gnutt@nuttx.org>
2017-07-18 11:02:45 +00:00
Titus von Boxberg
f3267ddb71 I2C4_SDA can also be on GPIO PB7 2017-07-18 11:43:53 +02:00
Titus von Boxberg
006fa75171 corrected typos and inconsistencies for USB OTG configuration 2017-07-18 11:43:53 +02:00
Gregory Nutt
747c79aa57 Merge remote-tracking branch 'origin/master' into beacon802154 2017-07-17 07:58:47 -06:00
Gregory Nutt
799b2d5671 Update comments. 2017-07-17 07:14:12 -06:00
Gregory Nutt
d9a2a3c3f1 Networking: When upd_input() cannot process a packet, it returns ERROR so that network drivers may try calling ipv4_input() later. In this case, it must also set d_len to zero. Otherwise, all network drivers will assume tht there is also an outgoing packet. This results in a gratuitous ARP. 2017-07-17 06:50:39 -06:00
Anthony Merlino
c80e0d9d8d Merged in merlin17/nuttx/beacon802154 (pull request #435)
ieee802154:  Minor updates

Approved-by: Gregory Nutt <gnutt@nuttx.org>
2017-07-17 07:42:25 +00:00
Anthony Merlino
3158188846 ieee802154: Renaming of some fields 2017-07-17 01:20:01 -04:00
Anthony Merlino
2f89ebeebd ieee802154: Adds retry count to tx descriptor 2017-07-16 23:51:24 -04:00
Anthony Merlino
c13bd23ed9 drivers/mrf24j40: Trivial whitespace fix 2017-07-16 23:51:24 -04:00
Anthony Merlino
aaa1dd2bbe ieee802154: Renames ack_wait_dur to ack_waitdur and removes it from private mac struct 2017-07-16 23:51:24 -04:00
Anthony Merlino
8610723ee6 ieee802154: Adds some wlinfo logs for debugging 2017-07-16 23:51:24 -04:00
Anthony Merlino
acc1ecd9a9 drivers/mrf24j40: Fixes math error for calculating sleep count values 2017-07-16 23:51:24 -04:00
Anthony Merlino
86b690a285 ieee802154: Fixes issue with association on beacon-enabled networking 2017-07-16 23:51:24 -04:00
Gregory Nutt
1db918d947 Network Socket I/F: Eliminate a warning when 6LoWPAN is enabled. 2017-07-16 13:05:41 -06:00
Gregory Nutt
d639d8857d IEEE 802.15.4 MAC: Disable option to select interrupt-level meta data allocator. 2017-07-16 12:53:01 -06:00
Lwazi Dube
4a9ef0225a Makefile.win would only create uboot images for ARM. MIPS support also needed. 2017-07-16 09:23:03 -06:00
Gregory Nutt
2f01b92fe2 Merge remote-tracking branch 'origin/master' into beacon802154 2017-07-16 08:58:39 -06:00
Gregory Nutt
cb88af0082 Merged composite into master 2017-07-16 08:56:29 -06:00
Gregory Nutt
40873dc466 Merged master into composite 2017-07-16 08:46:27 -06:00
Frank Benkert
eacb4f0e84 Squashed commit of the following:
commit 69fcf3e849
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 28eb253401
Author: Gregory Nutt <gnutt@nuttx.org>
Date:   Sun Jul 16 08:36:01 2017 -0600

    Composite:  Final review for coding style before merge

commit e6af1b9994
Author: Gregory Nutt <gnutt@nuttx.org>
Date:   Sun Jul 16 07:41:38 2017 -0600

    Composite:  Simplify some intiialization of data structures.

commit 771c367411
Author: Gregory Nutt <gnutt@nuttx.org>
Date:   Sun Jul 16 07:15:08 2017 -0600

    Cosmetic changes to alignment.

commit 5d67ddda4e
Author: Gregory Nutt <gnutt@nuttx.org>
Date:   Sun Jul 16 07:00:48 2017 -0600

    USBMSC: Add missing logic to saved device description.

commit 0729151d29
Author: Gregory Nutt <gnutt@nuttx.org>
Date:   Sat Jul 15 17:11:41 2017 -0600

    Trivial, costmetic

commit 74b916ff84
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 cfaa4ece13
Author: Gregory Nutt <gnutt@nuttx.org>
Date:   Sat Jul 15 13:20:34 2017 -0600

    Add some comments.

commit 8143563be6
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 69d3a91ef1
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 55a4388bbd
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 428f2147af
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 f1cc168a5c
Author: Gregory Nutt <gnutt@nuttx.org>
Date:   Sat Jul 15 08:56:33 2017 -0600

    Refresh all composite configurations.

commit 246afcaa10
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 919877191d
Author: Gregory Nutt <gnutt@nuttx.org>
Date:   Sat Jul 15 08:20:02 2017 -0600

    Composite setup:  Remove useless board_cdc* wrapper.

commit 82129cf8c6
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 f2cb8b252a
Author: Alan Carvalho de Assis <acassis@gmail.com>
Date:   Fri Jul 14 10:19:35 2017 -0600

    Composite:  Fix for another cloned typo.

commit 676cfd526a
Author: Alan Carvalho de Assis <acassis@gmail.com>
Date:   Fri Jul 14 09:11:37 2017 -0600

    Composite: Fix some typos

commit 1ea0368c18
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 e485caced9
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 6443c29621
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 23cbc28b05
Author: Gregory Nutt <gnutt@nuttx.org>
Date:   Fri Jul 14 06:59:45 2017 -0600

    Detangle use of board_xyzclassobject() and board_xyzuninitialize()

commit 1674cb8c8e
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 6bc881a192
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 fe3af4941d
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 0f9ad16e18
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 a4cd90d4ef
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 8a4be7175e
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 18a32ed2ca
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 aaa81ce497
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 4eb548226b
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 2327f5a1b4
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 49cd279fc6
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 bb6a13f30a
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 918480047a
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 e4d262436c
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 815257743d
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 ac13619dc5
Author: Gregory Nutt <gnutt@nuttx.org>
Date:   Thu Jun 1 17:03:58 2017 -0600

    Cosmetic

commit 9dd41bdd2f
Author: Gregory Nutt <gnutt@nuttx.org>
Date:   Thu Jun 1 17:02:43 2017 -0600

    Composite: More compile-related fixes

commit fc1438c95d
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 049ccbfcbe
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 ef33329e3a
Author: Gregory Nutt <gnutt@nuttx.org>
Date:   Thu Jun 1 16:14:46 2017 -0600

    Add a warning

commit 89f77cd91a
Author: Gregory Nutt <gnutt@nuttx.org>
Date:   Thu Jun 1 16:11:27 2017 -0600

    Fix some incomplete name changes

commit 0bb7af549a
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 bd9b548914
Author: Gregory Nutt <gnutt@nuttx.org>
Date:   Thu Jun 1 15:05:41 2017 -0600

    Remove COMPILE_TIME_ASSERTION

commit 7e6f481581
Author: Frank Benkert <Frank.Benkert@avat.de>
Date:   Thu Jun 1 14:58:04 2017 -0600

    Part II of the same big commit

commit dcc9b07715
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.
2017-07-16 08:43:17 -06:00
Alan Carvalho de Assis
69fcf3e849 Fix spark/stm32_composite.c: board_composite_connect cannot be static 2017-07-16 08:39:33 -06:00
Gregory Nutt
28eb253401 Composite: Final review for coding style before merge 2017-07-16 08:36:01 -06:00
Gregory Nutt
e6af1b9994 Composite: Simplify some intiialization of data structures. 2017-07-16 07:41:38 -06:00
Gregory Nutt
771c367411 Cosmetic changes to alignment. 2017-07-16 07:15:08 -06:00
Gregory Nutt
5d67ddda4e USBMSC: Add missing logic to saved device description. 2017-07-16 07:00:48 -06:00
Gregory Nutt
0729151d29 Trivial, costmetic 2017-07-15 17:11:41 -06:00
Gregory Nutt
74b916ff84 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. 2017-07-15 14:50:29 -06:00
Gregory Nutt
cfaa4ece13 Add some comments. 2017-07-15 13:20:34 -06:00
Gregory Nutt
8143563be6 Spark: Need to condition out MSC logic in composite setup if there is no MSC in the composite. 2017-07-15 12:33:10 -06:00
Gregory Nutt
69d3a91ef1 Composite: Remove all dependencies on CONFIG_SYSTEM_COMPOSITE_* configuration settings. Nothing in the OS can depend on external application settings. 2017-07-15 11:03:33 -06:00
Gregory Nutt
55a4388bbd All composite configurations now also support a dual CDC/ACM configuration. 2017-07-15 09:59:31 -06:00
Gregory Nutt
428f2147af Composite: Move board_msc* interfaces from apps/system/composite to the board specific OS logic where they belong. 2017-07-15 09:24:32 -06:00
Gregory Nutt
f1cc168a5c Refresh all composite configurations. 2017-07-15 08:56:33 -06:00
Gregory Nutt
246afcaa10 Merge remote-tracking branch 'origin/master' into composite 2017-07-15 08:22:26 -06:00
Gregory Nutt
919877191d Composite setup: Remove useless board_cdc* wrapper. 2017-07-15 08:20:02 -06:00
Gregory Nutt
02c6672868 tools/refresh.sh: Update so that it can find the Make.defs file in the new location. 2017-07-15 08:18:56 -06:00
Gregory Nutt
82129cf8c6 Merge remote-tracking branch 'origin/master' into composite 2017-07-14 16:23:57 -06:00
Gregory Nutt
a8e0470af4 Merge remote-tracking branch 'origin/master' into beacon802154 2017-07-14 16:20:43 -06:00
Gregory Nutt
6537e4ea20 Socket I/F: Misc. fixes for compile errors/warnings going back to dual IPv4+IPv6 configuration. 2017-07-14 15:52:37 -06:00