aboutsummaryrefslogtreecommitdiffstats
path: root/libmaple/usb
Commit message (Collapse)AuthorAgeFilesLines
* Slightly improve and generify the USB infrastructure.Marti Bolivar2012-06-038-48/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The good news is that <libmaple/usb.h> and <libmaple/usb_cdcacm.h> did turn out generic enough in what they specify to go on unchanged. However, we can't just go on assuming that there's USB just because we're on an F1. Now that there's value line in the tree, we need to be more careful (value line F1s don't have USB peripherals). To that end, make all the F1 board-includes/*.mk files specify what line their MCU is with an MCU_F1_LINE variable. Use that to hack libmaple/usb/rules.mk so we only try to build the USB module under appropriate circumstances. While we're at it, add a vector_symbols.inc for value line MCUs under support/ld/. We need this to get the target-config.mk modifications implied by the addition of MCU_F1_LINE. We'll fix up some other performance-line-isms under libmaple/stm32f1 in a separate commit. Also in libmaple/usb/: - Move everything into a new stm32f1 directory. Due to aforementioned rules.mk hacks, there is no immediate need for an stm32f2 directory (USB support doesn't exist there). - Update the README for style and content. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Fix a bunch of Doxygen file-level comments.Marti Bolivar2012-05-082-4/+8
| | | | | | | | | | | | | Fix @file in many places. Also fix up the descriptions where it's appropriate. This standardizes the @file formatting across the library to explicitly include any parent directories up to the repository root. Besides being nice, this will hopefully let us manage Doxygen's XML output so as to make extracting series-specific pieces via Breathe in the leaflabs-docs repo possible. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* libmaple: Add build infrastructure for private headers.Marti Bolivar2012-04-111-1/+1
| | | | | | | | | | | libmaple/rules.mk: Add LIBMAPLE_PRIVATE_INCLUDES, a place for storing headers which should be commonly available throughout libmaple, but not made public. Currently, this is just the libmaple directory. Add LIBMAPLE_PRIVATE_INCLUDES to the target flags in the STM32F1 and USB submodules. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Make USB its own submodule.Marti Bolivar2012-04-117-69/+51
| | | | | | | | | | | | | | | Add libmaple/usb/rules.mk, which compiles the USB FS device firmware submodule. Move the logic for compiling the USB stack from libmaple/rules.mk into libmaple/usb/rules.mk. Move libmaple/usb/usb_cdacm.h to libmaple/include/libmaple/. Its API is sufficiently general that we'll be able to port it over to USB OTG (either FS or HS) eventually, and that lets us include it from Wirish using the new style for libmaple headers. Fix the includes for public libmaple headers within libmaple/usb. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb_cdcacm.c: Fix warning for non-LeafLabs boards.Marti Bolivar2012-04-111-6/+2
| | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Move public headers to include directories; related cleanups.Marti Bolivar2012-04-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move libmaple/*.h to (new) libmaple/include/libmaple/. The new accepted way to include a libmaple header foo.h is with: #include <libmaple/foo.h> This is more polite in terms of the include namespace. It also allows us to e.g. implement the Arduino SPI library at all (which has header SPI.h; providing it was previously impossible on case-insensitive filesystems due to libmaple's spi.h). Similarly for Wirish. The old include style (#include "header.h") is now deprecated. libmaple/*.h: - Change include guard #defines from _FOO_H_ to _LIBMAPLE_FOO_H_. - Add license headers where they're missing - Add conditional extern "C" { ... } blocks where they're missing (they aren't always necessary, but we might was well do it against the future, while we're at it.). - Change includes from #include "foo.h" to #include <libmaple/foo.h>. - Move includes after extern "C". - Remove extra trailing newlines Note that this doesn't include the headers under libmaple/usb/ or libmaple/usb/usb_lib. These will get fixed later. libmaple/*.c: - Change includes from #include "foo.h" to #include <libmaple/foo.h>. Makefile: - Add I$(LIBMAPLE_PATH)/include/libmaple to GLOBAL_FLAGS. This allows for users (including Wirish) to migrate their code, but should go away ASAP, since it slows down compilation. Wirish: - Move wirish/**/*.h to (new) wirish/include/wirish/. This ignores the USB headers, which, as usual, are getting handled after everything else. - Similarly generify wirish/boards/ structure. For each supported board "foo", move wirish/boards/foo.h and wirish/boards/foo.cpp to wirish/boards/foo/include/board/board.h and wirish/boards/foo/board.cpp, respectively. Also remove the #ifdef hacks around the .cpp files. - wirish/rules.mk: put wirish/boards/foo/include in the include path (and add wirish/boards/foo/board.cpp to the list of sources to be compiled). This allows saying: #include <board/board.h> instead of the hack currently in place. We can allow the user to override this setting later to make adding custom board definitions easier. - Disable -Werror in libmaple/rules.mk, as the current USB warnings don't let the olimex_stm32_h103 board compile. We can re-enable -Werror once we've moved the board-specific bits out of libmaple proper. libraries, examples: - Update includes accordingly. - Miscellaneous cosmetic fixups. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb_descriptors.h: Remove usbVcomDescriptor[...] values.Marti Bolivar2011-10-211-7/+0
| | | | | | These are CDC ACM-specific. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb_descriptors.h: Whitespace and column cleanups.Marti Bolivar2011-10-211-80/+80
| | | | | | Untabify, make (mostly) 80-column clean. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb: Rename descriptors.h -> usb_descriptors.h.Marti Bolivar2011-10-212-3/+3
| | | | | | Modify its include guard, and the files that include it, appropriately. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb.h: Move to libmaple/.Marti Bolivar2011-10-211-82/+0
| | | | | | | | | | | Apart from having an unstable API, usb.h is now a fairly good citizen of libmaple, so move it to live with the rest of the libmaple headers. Its device struct is still "struct usblib_dev". Leave that there; the asymmetry with the rest of the library is a good reminder that the API isn't really on equal footing with the rest of the library. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* USB: API cleanups.Marti Bolivar2011-10-213-23/+22
| | | | | | | | | | Modify usb.h functions (changing their names in some cases) to also take a usblib_dev* argument, to fit in better with the rest of libmaple. Store an rcc_clk_id in struct usblib_dev for the same reason. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* USB: API cleanups.Marti Bolivar2011-10-213-39/+31
| | | | | | | | | | | | | | Remove usbSuspend(), usbResumeInit(), usbResume(), the USB low-priority IRQ, and usbWaitReset() from usb.h. Also remove RESUME_STATE since it was only there for usbResume(). These functions don't need to be seen by anybody except for usb.c and usb_cdcacm.c, so move them there (altering their names to fit with libmaple style guidelines) and mark them static. Clean up includes in usb.c while we're there. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb.h: Mark API unstable.Marti Bolivar2011-10-211-0/+4
| | | | | | | | The USB API is heavily reliant on the ST stack, and additionally assumes that all USB is the USB FS peripheral. As such, it's going to have to change as we go forward. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Oops; actually remove usb_config.h.Marti Bolivar2011-10-181-45/+0
| | | | | | | | usb_config.h was supposed to be removed in d7afdbe6b41a77938863854a1e719398e6c35094; however, it looks like some merge conflicts stopped that from happening while I was rebasing. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb_cdcacm.c: CleanupsMarti Bolivar2011-10-181-200/+202
| | | | | | | | | Move the callbacks to the bottom of the file, and mark them static. Replace empty callbacks with NOP_Process in the callback tables. Remove prototype for nonexistent prep_and_reset(). Other miscellaneous fixups. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb.h, usb.c: CleanupsMarti Bolivar2011-10-182-22/+18
| | | | | | | | | Remove wIstr. This cleans up the control flow. wIstr is still declared in usb_lib/usb_regs.h, but it's unused throughout the code base. Remove bIntPackSOF. Only written, never read. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Remove usb_int.h, usb_int.h, usb_int.c.Marti Bolivar2011-10-183-234/+0
| | | | | | No longer used. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb: Clean up some globals with new struct usblib_dev.Marti Bolivar2011-10-184-79/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add struct usblib_dev (and USBLIB, a pointer to the singleton) to usb.h. USBLIB contains the global state which is used by functionality imported from usb_lib/. Consolidating global state into USBLIB will make it easier to remove later. Initial fields in struct usblib_dev are endpoint interrupt callbacks, a mask for what to handle in the low-priority USB interrupt, and device state. These replace pEpInt_IN, pEpInt_OUT; wInterrupt_Mask; and bDeviceState, respectively from usb_lib/, so remove their declarations from usb_lib_globals.h accordingly. Also remove unused SaveState declaration from usblib_globals.h. Move bDeviceState into 'state' field in usblib_dev. Device state type changes from DEVICE_STATE to usb_dev_state, volatile gets dropped, and enumerators get a 'USB_' prefix, but it's otherwise the same. usb_lib/ expects pInformation to point to Device_Info, pUser_Standard_Requests -> User_Standard_Requests, and pProperty -> Device_Property. Alter usb_init_usblib() to reflect these assumptions. Reorganize usb_lib_globals.h to make these assumptions more apparent to the reader. Modify usb_init_usblib() to take endpoint callbacks as arguments; update its caller in usb_cdcacm.c. usb_lib/ defines pInformation, pProperty, and pUser_Standard_Requests itself (in usb_init.c), but we have our own definitions (in usb.c). Remove the duplicates from usb.c. Also remove EPindex and Device_Info definitions from usb.c. Unused, and anyways already defined in usb_lib/usb_init.c. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Remove usb_config.h.Marti Bolivar2011-10-183-17/+28
| | | | | | Move its defines into usb_cdcacm.c and usb.[hc] as appropriate. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb: Disentangle CDC ACM functionality.Marti Bolivar2011-10-1812-882/+880
| | | | | | | | | | | | | | | | | | | | | Add new usb_cdcacm.h, which provides the virtual serial port API. This file (and new usb_cdcacm.c) consolidate the VCOM support, which was previously distributed through descriptors.[hc], usb.[hc], usb_callbacks.[hc], and usb_config.h. Add usb_init_usblib() to usb.h, as a way of initializing the USB peripheral in terms of the data structures required by usb_lib. This is used by the new usb_cdcacm_enable(). Create new usb_lib_globals.h, with declarations for the usb_lib global state which is most used throughout the rest of the libmaple USB stack. Remove descriptors.c and usb_callbacks.[hc]; they are no longer necessary. Update the USB README accordingly. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb.c: Use usb_reg_map.h; replace most of CTR_LP().Marti Bolivar2011-10-181-90/+244
| | | | | | This cuts down on some of the uglier dependencies. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb: Remove usbPowerOff(), move usbPowerOn() to usb_callbacks.c.Marti Bolivar2011-10-183-31/+15
| | | | | | | | | | | Remove usbPowerOn(), usbPowerOff() prototypes from usb.h. These aren't used outside of the USB subsystem, so they don't belong here. Move usbPowerOn() from usb.c to usb_callbacks.c. This is the only place where it's used. Remove the unused usbPowerOff() (from usb.c) altogether. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb: Prepare for moving some files to usb_reg_map.h.Marti Bolivar2011-10-184-21/+39
| | | | | | | | | | | | | usb_config.h: Remove usb_regs.h dependency; fix includes; add license. usb_callbacks.h: Change includes to the pieces of usb_lib/ it uses, which doesn't include usb_regs.h. descriptors.h: Remove unused usb_lib.h include. usb.h: Remove unused usb_lib.h include. Some cosmetic commenting. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Add usb_reg_map.h and usb_reg_map.c.Marti Bolivar2011-10-182-0/+512
| | | | | | | | | | | usb_reg_map.h contains the usual register map and register bit definitions that libmaple convention requires. It also contains a variety of structs and convenience functions for accessing and manipulating endpoint registers, BTABLE entries, and PMA buffers. We'll be moving towards usb_reg_map.h instead of usb_lib/usb_regs.h. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb: Update README file.Marti Bolivar2011-10-181-20/+1
| | | | | | Various parts of it are no longer true, and some TODOs are now done. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Remove usb_hardware.c and usb_hardware.h.Marti Bolivar2011-10-184-220/+6
| | | | | | | These files contain a lot of duplicated and unused code. Move the relevant pieces that need to survive into usb.c and usb_callbacks.c. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb: Replace duplicated code with nvic.h API.Marti Bolivar2011-10-185-58/+19
| | | | | | | | | Replace calls to usbEnbISR()/usbDsbISR() with nvic_irq_enable()/nvic_irq_disable(). Remove ST-style code. Use nvic_sys_reset() instead of systemHardReset(). Rename some conflicting #defines that including nvic.h created. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb: Cleanups and renames.Marti Bolivar2011-10-182-21/+4
| | | | | | | | | Rename setupUSB() and disableUSB() to usb_cdcacm_enable() and usb_cdcacm_disable(), respectively. Remove usbSendHello(). This shouldn't exist. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb: Move some board-specific configuration to Wirish.Marti Bolivar2011-10-183-39/+18
| | | | | | | | | Create new BOARD_USB_DISC_DEV and BOARD_USB_DISC_BIT board-specific values. Use these as arguments to setupUSB() and disableUSB(). This helps make the USB stack more generic, and goes towards the resolution of an important FIXME. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Add support for the Olimex STM32 H103 board.David Kiliani2011-09-271-0/+6
| | | | | | | | Pin layout and header files for the STM32 H103 prototype board from Olimex featuring an STM32F103RBT6 chip. This commit contains all necessary changes to compile with BOARD=olimex_stm32_h103. Signed-off-by: David Kiliani <mail@davidkiliani.de>
* Missed one hard-coded structure size.RJ Ryan2011-09-181-1/+1
| | | | Signed-off-by: RJ Ryan <rryan@mit.edu>
* Fix memory alignment of USB descriptor structures.RJ Ryan2011-09-182-155/+88
| | | | | | | | | | | | | | | A variety of USB descriptor structures have been manually "unpacked". Instead of using the struct, their members were unpacked into the struct they were nested in. Additionally sizeof()'s were commented in favor of manual calculation of structure sizes. After uncommenting these changes, the USB CDC peripheral stopped correctly configuring with the host. The root problem with the structures is that GCC is padding them. By applying __attribute__((__packed__)), these problems are fixed. I removed all the instances of the workaround I saw within the USB code. Signed-off-by: RJ Ryan <rryan@mit.edu>
* fixed a bug in usbreceivebytesAndrew J Meyer2011-07-011-1/+5
| | | | bug prevented consecutive SerialUSB.read() calls from returning consecutive bytes
* libmaple: Fix warnings in libmaple source filesPerry Hung2011-05-123-8/+6
| | | | | -Add -Wall, -Werror to libmaple/* -Fix warnings
* Converting all files to UNIX newlines.Marti Bolivar2011-05-1013-3308/+3308
| | | | | | | Committing the results of running the following on the libmaple root directory: $ fromdos `grep --exclude-dir='[.]git' -Ilsr $'\r$' .`
* SerialUSB fixups.Marti Bolivar2011-05-044-11/+9
|
* Resolving some FIXMEs.Marti Bolivar2011-04-112-23/+3
|
* Fixing typo in libmaple/usb/descriptors.h; thanks, StephenFromNYC!Marti Bolivar2011-03-171-1/+1
| | | | http://forums.leaflabs.com/topic.php?id=687
* Maple RET6 edition supportMarti Bolivar2011-03-161-5/+5
|
* [WIP] GPIO refactor: seems ok, ready for reviewMarti Bolivar2011-03-115-80/+39
|
* Refactor linker scripts. Rename irq and exception handlers.Perry Hung2011-02-272-2/+2
| | | | | Add common linker scripts for ram and rom. Add medium and high density libraries for libcs3.
* Cleaned out libmaple.h; this had wide-ranging implications.Marti Bolivar2011-02-272-40/+109
| | | | | | | | | | | | | | | | | | | Many of the #defines in libmaple.h were board-specific, not MCU-specific. Most of these were only used by code under libmaple/usb/. These were moved into usb_config.h, and are clearly marked as being terrible hacks. I'm going to treat the USB stack as a black box that we'll deal with later. Further, instead of having a variety of #defines like "How many USARTS do I have?", we decide that based on the density of the chip. This is determined by testing for STM32_MEDIUM_DENSITY or STM32_HIGH_DENSITY defines. libmaple currently doesn't support low-density chips, so that suffices. The Makefile will set these automatically based on the MCU. Other offending #defines are ERROR_LED_PORT and ERROR_LED_PIN; these were made optional, but they're set in the Makefile as a hack to keep things working.
* Merge branch 'debug-serialusb'Marti Bolivar2011-02-127-179/+180
|\ | | | | | | | | | | Conflicts: libmaple/usb/usb.c notes/coding_standard.txt
| * readme and coding standard updatesMarti Bolivar2010-12-211-38/+46
| |
| * Merge branch 'master' into debug-serialusb.Marti Bolivar2010-12-211-196/+194
| |\ | | | | | | | | | | | | | | | | | | Chose debug-serialusb version in cases of conflict. Conflicts: libmaple/usb/usb_callbacks.c
| * | added a usbBlockingSendByte(char ch)AJM2010-12-142-5/+11
| | | | | | | | | | | | this new function will only return AFTER the usb interrupt has been serviced and the byte is sent. Bytes should NOT fall on the floor ever with this function. (but they still do? pyserials problem?)
| * | changed the serialusb to be simplest possible designAJM2010-12-143-51/+20
| | | | | | | | | | | | no longer use a ring buffer. No longer double buffer a local rx buffer and the packet memory. Instead, we read out of packet memory and block it for all reads. This is going to be slower. but it tests OK (unlike the old one...).
| * | enlarged rx buffer and nak when less than 64 bytes is left in packet bufAJM2010-12-135-20/+22
| | |
| * | candidate bugfix for serialusb receive bugAJM2010-12-134-26/+43
| | | | | | | | | | | | changed USB driver to nak whenever it cant fill an entire endpoint (64B) worth of new data. The old scheme was to set receive valid as long as as the endpoint buffer wasnt full, the new scheme is to nak until it is completely empty.
* | | Fixing usb.c countTx race; thanks, geoffreymbrown!Marti Bolivar2011-02-091-1/+1
| |/ |/|
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 15:41:03 +0000