aboutsummaryrefslogtreecommitdiffstats
path: root/libmaple/usb/usb.c
Commit message (Collapse)AuthorAgeFilesLines
* Make USB its own submodule.Marti Bolivar2012-04-111-3/+5
| | | | | | | | | | | | | | | 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: API cleanups.Marti Bolivar2011-10-211-12/+7
| | | | | | | | | | 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-211-19/+21
| | | | | | | | | | | | | | 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, usb.c: CleanupsMarti Bolivar2011-10-181-20/+17
| | | | | | | | | 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>
* usb: Clean up some globals with new struct usblib_dev.Marti Bolivar2011-10-181-24/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-181-12/+13
| | | | | | 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-181-163/+11
| | | | | | | | | | | | | | | | | | | | | 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-181-28/+0
| | | | | | | | | | | 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>
* Remove usb_hardware.c and usb_hardware.h.Marti Bolivar2011-10-181-2/+2
| | | | | | | 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-181-25/+5
| | | | | | | | | 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-181-17/+2
| | | | | | | | | 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-181-5/+5
| | | | | | | | | 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>
* 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-121-3/+1
| | | | | -Add -Wall, -Werror to libmaple/* -Fix warnings
* SerialUSB fixups.Marti Bolivar2011-05-041-7/+5
|
* Resolving some FIXMEs.Marti Bolivar2011-04-111-22/+2
|
* [WIP] GPIO refactor: seems ok, ready for reviewMarti Bolivar2011-03-111-7/+26
|
* Refactor linker scripts. Rename irq and exception handlers.Perry Hung2011-02-271-1/+1
| | | | | Add common linker scripts for ram and rom. Add medium and high density libraries for libcs3.
* Merge branch 'debug-serialusb'Marti Bolivar2011-02-121-45/+31
|\ | | | | | | | | | | Conflicts: libmaple/usb/usb.c notes/coding_standard.txt
| * added a usbBlockingSendByte(char ch)AJM2010-12-141-5/+10
| | | | | | | | 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-141-25/+15
| | | | | | | | 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-131-2/+2
| |
| * candidate bugfix for serialusb receive bugAJM2010-12-131-20/+10
| | | | | | | | 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
|/
* more sphinx docsMarti Bolivar2010-10-111-113/+91
|
* Some refactoringbnewbold2010-08-051-1/+2
|
* added isConnected() to serialusbbnewbold2010-07-221-0/+8
|
* working serialUSB with timeoutbnewbold2010-07-191-0/+6
| | | | | | | | | | | as a temporary workaround for the fact that SerialUSB is often blocking, this crude implementation makes the low-level C usbSendBytes function non-blocking (with a return code of bytes sent) and implements a 2ms timeout in the wirish write() function. also adds begin(), end(), getDTR(), getRTS(), pending(). device is still initialized the old fashioned way during init() so that, eg, autoreset will work. includes a simple multi-test program.
* new usb_serialbnewbold2010-07-191-49/+53
|
* added getDTR and getRTS to usb.h, subtly modded how sendBytes checks for ↵AJM2010-06-111-6/+24
| | | | | | connection flip flopped back and forth on how much work should be done here. For now its like 5 lines of changes
* cosmetic change on usbsendbytesAJM2010-06-101-1/+1
| | | | minor
* new reset scheme now worksAJM2010-06-091-1/+1
| | | | fixed some blocking issue on serial tx, improperly checking for connection.
* added a somewhat broken version of the reset magic number scheme.AJM2010-06-091-3/+2
| | | | current version gets stuck in the isr somewhere. not sure why or where. must debug.
* first approach at modding the reset schemeAJM2010-06-091-31/+2
| | | | now we reset from recv bytes. After receiving the DTR/RTS toggle the next byte in from usb is parsed as the program_delay. For now, this just delays the reset for a period to close the serial port gracefully. Later, this delay will perhaps inform the bootloader of how long to live for...
* removed the callback for send functional descriptor.AJM2010-06-091-1/+0
| | | | It wasnt used, and was causing a compiler warning to get thrown. It isnt needed, not sure why I added it in the first place
* another fix for USB unheard print issuebnewbold2010-06-071-18/+9
|
* NEEDS REVIEW: fix for first usb write bugbnewbold2010-06-041-3/+5
| | | | | aj wrote this and had comments saying fix this wouldn't work, but it seems to...
* Preliminary wirish USBSerial implementation.Perry Hung2010-06-041-18/+23
| | | | | | -updated examples -removed HardwareUSB -cleaned up a handful of includes
* modified the makefile to build the usb related files/removed all uintx_t to ↵AJM2010-05-201-1/+1
| | | | uintx
* moved the usb directory to its proper home in ./libmapleAJM2010-05-201-0/+470
also, removed some old usb file, bootVect.h, which setup the static table for the runtime usb lib that no longer exists and was provided by the bootloader rev 1
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-25 08:47:43 +0000