Commit graph

605 commits

Author SHA1 Message Date
Michael Hope 828facd2b7 Use stdint.h to define the basic types.
Solves a problem when building in strict C++ mode, as GCC defines
uint32_t as unsigned long on systems where sizeof(long) == 4.  This
causes GCC to complain that uint32 != uint32_t as unsigned int !=
unsigned long.

Signed-off-by: Michael Hope <michaelh@juju.net.nz>
2013-06-30 21:07:59 +02:00
Daniel Nyström ffa57f5f4a libmaple/timer.c: Sync enable_irq() declaration with it's definition
Signed-off-by: Daniel Nyström <daniel@nystrom.st>
2013-06-04 14:17:28 +02:00
Marti Bolivar 0fca062e2d libmaple/usb/stm32f1/usb.c: cosmetics.
Whitespace and comments.

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2013-04-30 09:22:31 -04:00
Marti Bolivar 07b56b89fb libmaple/usb/stm32f1/usb.c: fix build error.
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2013-04-29 10:19:42 -04:00
Marti Bolivar 58794b59d4 Merge remote-tracking branch 'wesen/bug/usb-resume' 2013-04-26 12:49:55 -04:00
Manuel Odendahl 5315e3a239 Preserve previous usb state when suspending / restore on resume
Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
2013-04-26 11:12:03 +02:00
Marti Bolivar 13635d539f usb_cdcacm: Reset transmitting flag in usbReset().
Thanks to Manuel Odenahl for the fix.

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2013-04-15 15:01:58 -04:00
Marti Bolivar 048e70fc41 usb_cdcacm: Make USB lib globals weak symbols.
This allows users to override them.

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2013-01-18 18:18:30 -05:00
Marti Bolivar 964279b9bf Merge branch 'bug/usb-full-ep'
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>
2013-01-18 18:12:21 -05:00
Marti Bolivar 0dbf94bf31 usb_cdcacm.c: Fixups for usb_cdcacm_tx().
- 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>
2013-01-17 18:08:39 -05:00
Marti Bolivar df868dd75c Merge branch 'dbl-buf-usb'
For bulk double buffer support.

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2013-01-17 17:49:24 -05:00
Marti Bolivar d12a5b14e1 usb_reg_map.c: Fix incorrect function name call.
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2013-01-17 17:48:13 -05:00
Marti Bolivar 9e14f40c20 usb_reg_map.h: Fix incorrect register bit definitions.
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2013-01-17 17:47:27 -05:00
Manuel Odendahl 7446068400 Handle sending 0 byte packets.
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>
2013-01-17 21:17:00 +01:00
Marti Bolivar e4bbddf052 Merge remote-tracking branch 'wesen/bug/bkp'
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2013-01-17 15:11:14 -05:00
Manuel Odendahl 699f97fdcb Move endpoint definitions to include files (they are now needed outside in usb_serial.cpp)
Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
2013-01-17 21:11:10 +01:00
Manuel Odendahl b3287225c5 Rename misleading ptr function
Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
2013-01-17 21:09:07 +01:00
Manuel Odendahl e6a138499d Fix BKP write enable
Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
2013-01-17 21:03:18 +01:00
Manuel Odendahl bbff6fbf78 Set DCNTR before starting DMA transfer.
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>
2013-01-17 20:54:54 +01:00
Manuel Odendahl c95edd391e Refactor setting a USB EP rx count
Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
2013-01-17 20:52:34 +01:00
Manuel Odendahl e0748ce668 Rename USB_EP_EP_KIND to USB_EP_EP_KIND_DBL_BUF
Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
2013-01-17 20:52:25 +01:00
Manuel Odendahl 0c8ab1f655 Add double buffering routines
Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
2013-01-17 20:51:58 +01:00
Marti Bolivar 4faf11574e Merge remote-tracking branch 'wesen/bug/high-density-irqs'
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2012-11-08 16:20:17 -05:00
Manuel Odendahl 8e14e7ff77 usb_cdcacm.c: reenable the endpoint if an empty bulk transfer was received.
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>
2012-11-08 20:53:32 +01:00
Manuel Odendahl ec9a59bef8 stm32f1/rules.mk: update include path for assembler files
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>
2012-11-07 20:25:37 +01:00
Marti Bolivar 50448497f8 Add some missing LeafLabs copyright notices.
Sigh; Emacs's elide-head feature makes it easy to forget to update
these.

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2012-09-04 01:36:48 -04:00
Marti Bolivar e45697a65f exti.c: Use exti_num enumerators instead of magic values.
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2012-09-03 18:31:50 -04:00
Marti Bolivar ef280366bc Whitespace fixups to EXTI files.
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2012-09-03 18:27:18 -04:00
Aditya Gaddam e77b2b7f46 "Callback versions of functions now take voidArgumentFuncPtr. We can 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>"
2012-09-02 11:04:01 -04:00
Aditya Gaddam f6f2601213 "Added ability to set callbacks for interrupts that get an argument. This 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>"
2012-08-31 14:19:57 -04:00
Marti Bolivar e8c974423c Revert "Re-work the constraints on delay_us(). Ask GCC to allocate a register"
This reverts commit 715a63dccb. 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>
2012-08-22 17:05:04 -04:00
Michael Hope 715a63dccb Re-work the constraints on delay_us(). Ask GCC to allocate a register
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>
2012-08-22 13:02:58 -04:00
Marti Bolivar a3a49c3ea9 Make PRIMASK set/clear functions __always_inline.
This is just to ensure that -Os doesn't prevent these from getting
inlined.

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2012-08-14 11:35:01 -04:00
Marti Bolivar 36b24f9cce usb_cdcacm.c: Fix up descriptor definitions.
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2012-08-04 18:43:50 -04:00
Marti Bolivar 7ea6af61a0 usb_cdcacm.h: Add convenience for declaring device descriptor.
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2012-08-04 18:43:49 -04:00
Marti Bolivar 5692b97ad0 <libmaple/usb.h>: Fix usb_descriptor_string.
uint16 is the wrong type for the bString array.

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2012-08-04 18:43:48 -04:00
Marti Bolivar cf6e56ed4e Move contents of usb_descriptors.h to <libmaple/usb.h>.
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>
2012-08-04 18:43:46 -04:00
Marti Bolivar 5ac380615e Prep usb_descriptors.h for removal.
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>
2012-08-04 18:43:45 -04:00
Marti Bolivar 7f2b5d0112 usb_cdcacm: Remove unused/redundant variables.
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2012-08-04 18:43:40 -04:00
Marti Bolivar a97e9c14ed usb_cdcacm: Expose line coding state.
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>
2012-08-04 01:47:22 -04:00
Marti Bolivar b642f7b095 usb_cdcacm: Set endpoint to NAK before checking byte count.
Fixes an (admittedly very unlikely) race condition.

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2012-08-04 00:33:32 -04:00
Marti Bolivar 6788dff2e0 Add FIXME for usb_get_ep_tx_count().
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>
2012-08-04 00:18:14 -04:00
Marti Bolivar b0a9e6fda2 usb_cdcacm: various fixups.
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>
2012-08-04 00:18:01 -04:00
Marti Bolivar fa1b298b78 usb_cdcacm: Improve write speed.
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>
2012-08-03 23:15:43 -04:00
Marti Bolivar c1e57e08bf usb_cdcacm: Cosmetics
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2012-08-03 23:13:32 -04:00
Marti Bolivar d63d5c7fb9 usb_cdcacm: minor fixups.
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>
2012-08-03 22:53:31 -04:00
Marti Bolivar 69cb5c65cb usb_cdcacm: Rename "notification" -> "management".
This keeps things in line with the specification, helping readability.

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2012-08-01 13:42:08 -04:00
Marti Bolivar 0cc911c4ae Move CDC ACM config. descriptor into usb_cdcacm.c.
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2012-07-31 18:02:29 -04:00
Marti Bolivar 6126bf5919 Move bootloader details out of libmaple.h.
Finally!

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2012-07-31 17:27:43 -04:00
Marti Bolivar 365f45679b Move bootloader reset signal detection to Wirish.
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>
2012-07-31 15:04:49 -04:00