aboutsummaryrefslogtreecommitdiffstats
path: root/libmaple
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #54 from ginge/masterMarti Bolivar2013-07-263-3/+344
|\ | | | | Added i2c slave support
| * Added I2C slave echo example in examples folder. Using another maple, write ↵Barry Carter2012-09-052-0/+5
| | | | | | | | | | | | | | | | | | | | a byte and then read. Slight tidy up. Reformatted CREDITS file to be in correct order. Added a note about buffer overrun Signed-off-by:- Barry Carter <barry.carter@gmail.com>
| * I2C slave support cleanups.Barry Carter2012-09-043-9/+46
| | | | | | | | | | | | | | | | | | | | Added fix for corner case where badly behaving master doesn't NACK and we don't get the callbacks fires. Removed my own name from several places and added attribution to the correct place. Updated include comments to reference the fact it now supports I2C slave Signed-off-by:- Barry Carter <barry.carter@gmail.com>
| * - tx and rx callbacks for each moduleBarry Carter2012-09-033-1/+300
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Callbacks can be called after each read/write cycle or per byte - Each I2C module can have different callbacks - General call support also working - Supports master and slave at same time. Also works with multimaster Usage: i2c_msg msg; char buffer[255]; main() { i2c_slave_enable(I2C1, I2C_FAST_MODE | I2C_SLAVE_DUAL_ADDRESS | I2C_SLAVE_GENERAL_CALL | I2C_SLAVE_USE_RX_BUFFER); // init slave mode. Enables master too i2c_slave_attach_recv_handler(I2C1, pmsg, funcrx); // attach receive handler i2c_slave_attach_transmit_handler(I2C1, pmsg, functx); // attach transmit handler i2c_slave_set_own_address(I2C1, 0x10); // set addresss 1 i2c_slave_set_own_address2(I2C1, 0x20); // set addresss 2 } void funcrx(i2c_msg *msg) { printf("length is %d.\n", msg->length); char return_data = msg0>data[0]; } void functx(i2c_msg *dev) { msg->data[0] = 0x01; msg->data[1] = 0x02; msg->data[2] = 0x03; msg->data[3] = 0x04; msg->data[4] = 0x05; msg->length = 5; } All code derived from datasheets and libmaple. Signed-off-by:- Barry Carter <barry.carter@gmail.com>
* | libmaple/timer.c: Sync enable_irq() declaration with it's definitionDaniel Nyström2013-06-041-1/+1
| | | | | | | | Signed-off-by: Daniel Nyström <daniel@nystrom.st>
* | libmaple/usb/stm32f1/usb.c: cosmetics.Marti Bolivar2013-04-301-99/+99
| | | | | | | | | | | | Whitespace and comments. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* | libmaple/usb/stm32f1/usb.c: fix build error.Marti Bolivar2013-04-291-1/+1
| | | | | | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* | Merge remote-tracking branch 'wesen/bug/usb-resume'Marti Bolivar2013-04-262-7/+14
|\ \
| * | Preserve previous usb state when suspending / restore on resumeManuel Odendahl2013-04-262-7/+14
| | | | | | | | | | | | Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
* | | usb_cdcacm: Reset transmitting flag in usbReset().Marti Bolivar2013-04-151-0/+1
| | | | | | | | | | | | | | | | | | Thanks to Manuel Odenahl for the fix. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* | | usb_cdcacm: Make USB lib globals weak symbols.Marti Bolivar2013-01-181-3/+6
| | | | | | | | | | | | | | | | | | This allows users to override them. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* | | Merge branch 'bug/usb-full-ep'Marti Bolivar2013-01-182-31/+38
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This resolves issues related to sending full (64B) packets via USB 2.0. In this case, some hosts continue to expect more data. Add infrastructure for sending 0-byte packets to signal end of transmission, and use it in SerialUSB. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
| * | | 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 branch 'dbl-buf-usb'Marti Bolivar2013-01-172-26/+217
|\ \ \ | | | | | | | | | | | | | | | | | | | | For bulk double buffer support. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
| * | | usb_reg_map.c: Fix incorrect function name call.Marti Bolivar2013-01-171-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
| * | | usb_reg_map.h: Fix incorrect register bit definitions.Marti Bolivar2013-01-171-5/+5
| | | | | | | | | | | | | | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
| * | | Rename misleading ptr functionManuel Odendahl2013-01-171-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
| * | | Refactor setting a USB EP rx countManuel Odendahl2013-01-171-18/+7
| | | | | | | | | | | | | | | | Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
| * | | Rename USB_EP_EP_KIND to USB_EP_EP_KIND_DBL_BUFManuel Odendahl2013-01-171-5/+5
| | | | | | | | | | | | | | | | Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
| * | | Add double buffering routinesManuel Odendahl2013-01-172-24/+226
| |/ / | | | | | | | | | Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
* | | Merge remote-tracking branch 'wesen/bug/bkp'Marti Bolivar2013-01-171-2/+2
|\ \ \ | | | | | | | | | | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
| * | | Fix BKP write enableManuel Odendahl2013-01-171-2/+2
| |/ / | | | | | | | | | Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
* / / Set DCNTR before starting DMA transfer.Manuel Odendahl2013-01-172-0/+11
|/ / | | | | | | | | | | | | I am not sure why this would work for most DMA transfers but I ran into trouble when doing SDIO DMA. 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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-27 10:57:39 +0000