aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* usb_cdcacm.c: Fixups for usb_cdcacm_tx().Marti Bolivar2013-01-171-11/+8
| | | | | | | | | | | | | - Check if we're transmitting (instead of how many bytes are left untransmitted) before bailing, in case we're transmitting a zero-length packet. - Set transmitting=1 before setting the endpoint valid to avoid races with the USB interrupt. - Eliminate some duplicated code. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Check if the last packet sent was the full endpoint size, in this case flush ↵Manuel Odendahl2013-01-171-1/+12
| | | | | | the host buffers by sending a 0 byte packet Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
* Handle sending 0 byte packets.Manuel Odendahl2013-01-172-6/+16
| | | | | | | | Added a flag to see if we are currently waiting on an interrupt to acknowledge the sending of the current IN packet. Added a method usb_cdcacm_is_transmitting() to check for that flag. Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
* Move endpoint definitions to include files (they are now needed outside in ↵Manuel Odendahl2013-01-172-21/+21
| | | | | | usb_serial.cpp) Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
* Add fix to support Summon/Linaro GCC ARM embedded toolchain.Dmitry Prokhorov2013-01-051-0/+4
| | | | Signed-off-by: Dmitry Prokhorov <dipspb@gmail.com>
* examples/blinky.cpp: Use toggleLED() instead of digitalWrite().Marti Bolivar2013-01-011-8/+1
| | | | | | Keep things simple. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Merge remote-tracking branch 'wesen/bug/high-density-irqs'Marti Bolivar2012-11-083-1/+6
|\ | | | | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
| * stm32f1/rules.mk: update include path for assembler filesManuel Odendahl2012-11-073-1/+6
| | | | | | | | | | | | | | | | | | | | | | stm32f1/performance: load stm32.h in order to have STM32_HIGH_DENSITY when necessary STM32_HIGH_DENSITY was not defined in isrs.S and vector_table.S for a high density STM32. This was because stm32.h where the flag is now defined (in contrast to being defined on the command line in an earlier version of libmaple) was not included. This led to crashes when using one of the high density peripherals. Updated the ASFLAGS to have the correct include path in rules.mk. Include stm32.h in the assembler files. Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
* | usb_cdcacm.c: reenable the endpoint if an empty bulk transfer was received.Manuel Odendahl2012-11-081-0/+7
|/ | | | | | It is possible to receive empty bulk transfers. This would lead to the endpoint never being reenabled as this was handled by the read routine. This caused the USB to hang. Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
* Add some missing LeafLabs copyright notices.Marti Bolivar2012-09-047-0/+7
| | | | | | | Sigh; Emacs's elide-head feature makes it easy to forget to update these. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* exti.c: Use exti_num enumerators instead of magic values.Marti Bolivar2012-09-031-16/+16
| | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Merge branch 'callback_interrupt_handlers'Marti Bolivar2012-09-037-34/+263
|\
| * EXTI examples: whitespace fixups.Marti Bolivar2012-09-032-22/+22
| | | | | | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
| * ext_interrupts.cpp: Doxygen fixups.Marti Bolivar2012-09-031-26/+2
| | | | | | | | | | | | Keep the Doxygen in the header as per Wirish conventions. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
| * Whitespace fixups to EXTI files.Marti Bolivar2012-09-032-5/+4
| | | | | | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
| * "Changed tabs to spaces. Changed some braces placement to match existing ↵Aditya Gaddam2012-09-032-48/+44
| | | | | | | | | | | | examples Signed-off-by: Aditya Gaddam <adityagaddam@gmail.com>"
| * "Added two examples for using attachInterrupt. One shows the use of a global ↵Aditya Gaddam2012-09-032-0/+141
| | | | | | | | | | | | function. While the second shows the use of a static class method as the event handler. Both work on Maple REVC Signed-off-by: Aditya Gaddam <adityagaddam@gmail.com>"
| * "Callback versions of functions now take voidArgumentFuncPtr. We can ↵Aditya Gaddam2012-09-024-6/+6
| | | | | | | | | | | | probably use voidFuncPtr instead, but this way people can see that the function expects something different. Existing functions haven't changed in signature. Signed-off-by: Aditya Gaddam <adityagaddam@gmail.com>"
| * "Added ability to set callbacks for interrupts that get an argument. This ↵Aditya Gaddam2012-08-315-24/+141
| | | | | | | | | | | | argument can be the instance that needs to handle the interrupt, or just a random argument you might find useful later. Suggestions from mbolivar and iperry from pull53 on libmaple were taken into account. Signed-off-by: Aditya Gaddam <adityagaddam@gmail.com>"
* | Include <stdint.h> from wirish.h.Marti Bolivar2012-08-311-0/+2
| | | | | | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* | Fixups for Wire library builds.Marti Bolivar2012-08-316-8/+10
| | | | | | | | | | | | | | | | | | Add libraries directory to global include path, so Wire sub-headers can be included in a directory-independent way. Tweak Wire global declaration and definition so it builds. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* | HardwareSPI: move warning into .cpp from header.Marti Bolivar2012-08-272-5/+5
| | | | | | | | | | | | | | This causes the warning to be emitted at most once. As is, it can be emitted each time HardwareSPI.h is included, which is annoying. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* | usb_serial.cpp: Hackishly silence spurious warnings on VLDiscovery.Marti Bolivar2012-08-271-0/+6
|/ | | | | | Guard hooks with BOARD_HAVE_SERIALUSB to keep GCC quiet. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* notes/interrupts.txt: Fix typos and other errors.Marti Bolivar2012-08-231-29/+27
| | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Add notes/interrupts.txt.Marti Bolivar2012-08-231-0/+348
| | | | | | | | This is a developer's doc explaining how interrupts are handled in libmaple. It's time we exposed this information to enable people who know what they're doing to move around more easily. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Revert "Re-work the constraints on delay_us(). Ask GCC to allocate a register"Marti Bolivar2012-08-221-4/+4
| | | | | | | | This reverts commit 715a63dccb3a39d7d0502fb39b900c8302a60a87. It fails to build using the 2010 CodeSourcery toolchain, which is still the latest officially supported version. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb_serial.cpp: Neaten up reset signal RX hook.Marti Bolivar2012-08-221-34/+33
| | | | | | | | | | Move magic bytes from stack to Flash. De-magic-number sizeof magic byte buffer. Use uintptr_t instead of unsigned int when casting address of wait_reset(). Based on a patch by Michael Hope. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Re-work the constraints on delay_us(). Ask GCC to allocate a registerMichael Hope2012-08-221-4/+4
| | | | | | | instead of forcing r0. Use the same operand as input and output to remove the move. Signed-off-by: Michael Hope <michael.hope@linaro.org>
* Merge branch 'reset-script'Marti Bolivar2012-08-221-7/+27
|\ | | | | | | | | | | Weed out non-Maple ttyACMs on Linux. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
| * reset.py: Not every Unix is Linux.Marti Bolivar2012-08-221-8/+20
| | | | | | | | | | | | | | | | Move the sysfs tests for Maple out of unix_get_maple_path() and into a new linux_get_maple_path(). This prevents unnecessary probing for a nonexistent /sys on e.g. OS X. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
| * Improve Maple device detection in reset.py on LinuxDavid Kiliani2012-08-221-4/+12
|/ | | | | | | | Adds a function to lookup the USB vendor & product id from the udev info in the sysfs tree. This removes invalid choices and reduces user queries for the correct ttyACM device. Signed-off-by: David Kiliani <mail@davidkiliani.de>
* reset.py fixups for OS X 10.8.Marti Bolivar2012-08-201-2/+3
| | | | | | | | As discussed on this forum thread: http://forums.leaflabs.com/topic.php?id=2451 Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Make PRIMASK set/clear functions __always_inline.Marti Bolivar2012-08-142-4/+4
| | | | | | | This is just to ensure that -Os doesn't prevent these from getting inlined. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* wirish/ext_interrupts.h: DoxygenMarti Bolivar2012-08-141-6/+7
| | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* stm32loader.py: replace obsolete exception catch syntax.Marti Bolivar2012-08-101-1/+1
| | | | | | For Python 3 support. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Makefile: Don't assume Cortex M3.Marti Bolivar2012-08-052-5/+14
| | | | | | | | | Instead, derive -march and -mcpu from the target MCU in target-config.mk. Also (on STM32F4) add the necessary floating point flags. The CodeSourcery toolchains don't support these, so we'll need to prepare alternative toolchains when F4 support is official. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* fixup! Add support for ARM's GCC ARM embedded toolchain.Marti Bolivar2012-08-052-0/+7
| | | | | | Oops. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Add support for ARM's GCC ARM embedded toolchain.Marti Bolivar2012-08-055-22/+44
| | | | | | | Based on patches provided by Hanspeter Portner: http://forums.leaflabs.com/topic.php?id=1717#post-11812 Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Makefile: move flag settings after build-rules and -templates.Marti Bolivar2012-08-051-7/+7
| | | | | | | | | We'll need to mess with the linker flags to add support for ARM toolchains other than CodeSourcery's. Since the toolchain is determined in build-rules.mk, decisions that depend on it have to happen after it's included. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb_cdcacm.c: Fix up descriptor definitions.Marti Bolivar2012-08-041-39/+25
| | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb_cdcacm.h: Add convenience for declaring device descriptor.Marti Bolivar2012-08-041-0/+21
| | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* <libmaple/usb.h>: Fix usb_descriptor_string.Marti Bolivar2012-08-041-3/+3
| | | | | | uint16 is the wrong type for the bString array. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Move contents of usb_descriptors.h to <libmaple/usb.h>.Marti Bolivar2012-08-043-139/+94
| | | | | | | | These form and name of structs etc. is basically determined by the USB spec and the libmaple style guide, so there's little reason for them to change, and less reason for them to stay hidden. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Prep usb_descriptors.h for removal.Marti Bolivar2012-08-043-63/+84
| | | | | | | | | | | | Just change names and things to fit the libmaple style. Its contents will move to the top-level <libmaple/usb.h> header next. This API is still unstable, but we need to expose pieces of it in order to get the Maple-specific pieces of usb_cdcacm.c into Wirish. Adjust uses of the API appropriately. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb_cdcacm: Remove unused/redundant variables.Marti Bolivar2012-08-041-11/+3
| | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb_cdcacm: Expose line coding state.Marti Bolivar2012-08-042-22/+55
| | | | | | | This was already supported, so just move the line coding structure to the header and add some functions for accessing the current values. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb_cdcacm: Set endpoint to NAK before checking byte count.Marti Bolivar2012-08-041-4/+4
| | | | | | Fixes an (admittedly very unlikely) race condition. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Add FIXME for usb_get_ep_tx_count().Marti Bolivar2012-08-041-1/+3
| | | | | | | | | | | We definitely need to mask out the high bits, as RM0008 doesn't specify that they read as zero. Calling this function seems to crash the board, though. I'm not sure why, especially since usb_set_ep_tx_count(), used by usb_cdcacm.c, seems to work. Confusing. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb_cdcacm: various fixups.Marti Bolivar2012-08-042-64/+60
| | | | | | | | | | Mark internal state static. Properly reset the RX/TX state on USB reset. Choose better names for countTx and newBytes. Move the exposed configuration back into the .c; this information is not beneficial to hooks. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb_cdcacm: Improve write speed.Marti Bolivar2012-08-031-4/+3
| | | | | | | | | Actually fill the TX buffer in the packet memory area, so we can send more bytes per transaction. Using the test-session benchmark, we're now clocking in the high 700KB/sec range via PySerial. With screen, rate is now about 550 KB/sec. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>