aboutsummaryrefslogtreecommitdiffstats
path: root/libmaple
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>
* 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>
* 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>
* Whitespace fixups to EXTI files.Marti Bolivar2012-09-031-2/+0
| | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* "Callback versions of functions now take voidArgumentFuncPtr. We can ↵Aditya Gaddam2012-09-022-4/+4
| | | | | | 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-313-24/+92
| | | | | | 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>"
* 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>
* 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>
* Make PRIMASK set/clear functions __always_inline.Marti Bolivar2012-08-141-2/+2
| | | | | | | This is just to ensure that -Os doesn't prevent these from getting inlined. 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>
* usb_cdcacm: CosmeticsMarti Bolivar2012-08-031-1/+1
| | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb_cdcacm: minor fixups.Marti Bolivar2012-08-031-17/+41
| | | | | | | | | | Rename USB_Line_Coding to usb_line_coding, and rename its fields to match the spec to aid searches. Alter the line_coding global to match, fixing an incorrect comment and avoiding magic numbers. Other minor fixups and comment improvements. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb_cdcacm: Rename "notification" -> "management".Marti Bolivar2012-08-012-11/+11
| | | | | | This keeps things in line with the specification, helping readability. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Move CDC ACM config. descriptor into usb_cdcacm.c.Marti Bolivar2012-07-312-15/+15
| | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Move bootloader details out of libmaple.h.Marti Bolivar2012-07-311-8/+0
| | | | | | Finally! Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Move bootloader reset signal detection to Wirish.Marti Bolivar2012-07-312-127/+24
| | | | | | | | Use usb_cdcacm hooks to move the DTR edge and "1EAF" magic packet detection to usb_serial.cpp. We'll later be able to extend this system to support Leonardo-style reset signalling. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb_cdcacm: Add usb_cdcacm_peek().Marti Bolivar2012-07-312-27/+39
| | | | | | | | | | | We need this so the bootloader reset signal detector can look ahead in the byte stream without stealing bytes from the user when "1EAF" isn't received. While we're doing this, take the time to fix a bunch of RX-related code (dead code removal, adding volatile, etc.) Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb_cdacm: Use config instead of magic numbers.Marti Bolivar2012-07-311-2/+2
| | | | | | Sigh. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb_cdcacm: Add hook system.Marti Bolivar2012-07-312-0/+44
| | | | | | | | Provide hooks so users can reach into the CDC ACM callbacks with their own code. We'll use this to move the bootloader reset signals to Wirish. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb_cdcacm: Expose some internal configuration and values.Marti Bolivar2012-07-312-84/+93
| | | | | | | | | Mark the API as unstable so people don't rely on these too hard. (This header is not part of the official libmaple docs). We'll need some of this configuration elsewhere later, and it doesn't make much sense to expose it piecemeal. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb_cdcacm.c: Add another verification TODO.Marti Bolivar2012-07-311-0/+2
| | | | | | | Not sure what the comment above the new TODO is supposed to mean, but it looks like something that should be checked. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb_cdcacm.c: Resolve TODO and improve comments.Marti Bolivar2012-07-311-5/+7
| | | | | | | | | The disc pin code was copy-pasted when the CDC ACM pieces were extracted from the rest of the USB code, and I didn't really understand what was going on when I moved it over. Having checked the spec, the comments can be safely improved. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* <libmaple/scb.h>: Add FIXME to check for F2 compatibility.Marti Bolivar2012-07-131-0/+4
| | | | Signed-off-by: Marti Bolivar <mbolivar@lozenge.(none)>
* <libmaple/scb.h>: Don't use BIT().Marti Bolivar2012-07-131-60/+60
| | | | | | Also, assert copyright LeafLabs 2012. Signed-off-by: Marti Bolivar <mbolivar@lozenge.(none)>
* <libmaple/scb.h>: Assert LeafLabs copyright.Marti Bolivar2012-07-131-0/+1
| | | | Signed-off-by: Marti Bolivar <mbolivar@lozenge.(none)>
* ADC: Doxygen fixupsMarti Bolivar2012-06-293-16/+22
| | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Doxygen hacks and fixups.Marti Bolivar2012-06-288-18/+15
| | | | | | | | - Shut Doxygen up in various places - Fix some genuine docs bugs - Ignore sources we're not responsible for Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Cosmetics.Marti Bolivar2012-06-281-1/+1
| | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Bring back and fix up util.c functionality.Marti Bolivar2012-06-261-77/+42
| | | | | | | | | | | | | | | Rip out the existing nonportable pieces, and shove them under wirish/stm32f1, using weak symbols so users who only want libmaple proper don't end up with build errors. Add stubbed-out (and only partially functional) definitions for F2 targets under wirish/stm32f2. The behavior on F103 targets is the same as it was before (though the assertion framework has always been broken and badly needs replacement, that awaits another commit). We additionally now skip re-enabling USB on F1 targets without USB, to make things work on value line MCUs. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* util.c: Fix Doxygen header.Marti Bolivar2012-06-261-1/+1
| | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Bring back throb().Marti Bolivar2012-06-261-2/+2
| | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* stm32f1: gpio.h: Add another hack mode macro.Marti Bolivar2012-06-261-0/+1
| | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* libmaple/util.c: Add FIXMEs.Marti Bolivar2012-06-261-0/+2
| | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* I2C: Move CCR/TRISE config helper back to libmaple/i2c.c.Marti Bolivar2012-06-222-37/+41
| | | | | | | | | | | | We can implement it in terms of _i2c_bus_clk() instead of hard-coding STM32_PCLK1. This might be overkill, since I2C peripherals are slow and thus likely to be on APB1 for all STM32 devices (that is the case for F2/F4, for instance), but if we're going to have _i2c_bus_clk(), we might as well respect it. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* <libmaple/i2c.h>: Add I2C_CCR_DUTY bit value definitions.Marti Bolivar2012-06-221-1/+3
| | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 05:10:04 +0000