aboutsummaryrefslogtreecommitdiffstats
path: root/libmaple
Commit message (Collapse)AuthorAgeFilesLines
...
* USB: API cleanups.Marti Bolivar2011-10-213-39/+31
| | | | | | | | | | | | | | 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: Mark API unstable.Marti Bolivar2011-10-211-0/+4
| | | | | | | | The USB API is heavily reliant on the ST stack, and additionally assumes that all USB is the USB FS peripheral. As such, it's going to have to change as we go forward. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Oops; actually remove usb_config.h.Marti Bolivar2011-10-181-45/+0
| | | | | | | | usb_config.h was supposed to be removed in d7afdbe6b41a77938863854a1e719398e6c35094; however, it looks like some merge conflicts stopped that from happening while I was rebasing. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb_cdcacm.c: CleanupsMarti Bolivar2011-10-181-200/+202
| | | | | | | | | Move the callbacks to the bottom of the file, and mark them static. Replace empty callbacks with NOP_Process in the callback tables. Remove prototype for nonexistent prep_and_reset(). Other miscellaneous fixups. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb.h, usb.c: CleanupsMarti Bolivar2011-10-182-22/+18
| | | | | | | | | 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>
* Remove usb_int.h, usb_int.h, usb_int.c.Marti Bolivar2011-10-184-235/+0
| | | | | | No longer used. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb: Clean up some globals with new struct usblib_dev.Marti Bolivar2011-10-184-79/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-183-17/+28
| | | | | | 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-1813-884/+881
| | | | | | | | | | | | | | | | | | | | | 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-183-31/+15
| | | | | | | | | | | 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>
* usb: Prepare for moving some files to usb_reg_map.h.Marti Bolivar2011-10-184-21/+39
| | | | | | | | | | | | | usb_config.h: Remove usb_regs.h dependency; fix includes; add license. usb_callbacks.h: Change includes to the pieces of usb_lib/ it uses, which doesn't include usb_regs.h. descriptors.h: Remove unused usb_lib.h include. usb.h: Remove unused usb_lib.h include. Some cosmetic commenting. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Add usb_reg_map.h and usb_reg_map.c.Marti Bolivar2011-10-183-0/+513
| | | | | | | | | | | usb_reg_map.h contains the usual register map and register bit definitions that libmaple convention requires. It also contains a variety of structs and convenience functions for accessing and manipulating endpoint registers, BTABLE entries, and PMA buffers. We'll be moving towards usb_reg_map.h instead of usb_lib/usb_regs.h. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usb: Update README file.Marti Bolivar2011-10-181-20/+1
| | | | | | Various parts of it are no longer true, and some TODOs are now done. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Remove usb_hardware.c and usb_hardware.h.Marti Bolivar2011-10-185-221/+6
| | | | | | | 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-185-58/+19
| | | | | | | | | 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-182-21/+4
| | | | | | | | | 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-183-39/+18
| | | | | | | | | 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>
* timer.h: fix timer_oc_set_mode().Marti Bolivar2011-10-121-4/+2
| | | | | | | | | timer_oc_set_mode() incorrectly writes to CCMR1 when channel is 2; fix this. Thanks to ala42 for the fix. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* usart: Add usart_rx().Marti Bolivar2011-10-072-0/+17
| | | | | usart_rx() is a nonblocking USART receive. Add it for symmetry with usart_tx().
* Add support for the Olimex STM32 H103 board.David Kiliani2011-09-271-0/+6
| | | | | | | | Pin layout and header files for the STM32 H103 prototype board from Olimex featuring an STM32F103RBT6 chip. This commit contains all necessary changes to compile with BOARD=olimex_stm32_h103. Signed-off-by: David Kiliani <mail@davidkiliani.de>
* rcc: Add RCC_USB to rcc_clk_id/rcc_dev_table.Marti Bolivar2011-09-242-0/+2
| | | | Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* nvic: Add nvic_sys_reset().Marti Bolivar2011-09-242-1/+14
| | | | | | This uses the SCB_AIRCR register to force a system reset. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* scb.h: Fix register map and bit definitions.Marti Bolivar2011-09-241-4/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the change log: This commit breaks backwards compatibility with 0.0.12. However, it appears that the previous version was incorrect, so these changes are necessary. The SCB register map type (scb_reg_map) appears to be adapted from versions specified by ARM; these include every possible register, and do not necessarily apply to the STM32, since some registers are implementation defined, to the extent that the implementation is allowed not to feature them at all. Thus, the current definition appears to be an overreach, since libmaple is STM32-specific. We should thus revise it based on ST's PM0056, where the STM32 SCB is specified. However, the ST docs appear to be buggy. In particular, they appear to contradict requirements made by ARM v7-M ARM with respect to the debug fault status register (DFSR), which ARM says must exist, but ST fails to specify (it does leave a DFSR-sized hole in the SCB memory layout, conveniently located next to some obvious typos which suggest that the section was not well-proofread). We defer to ARM and assume ST just forgot to document the register, and leave the DFSR field in struct scb_reg_map, since (based on my reading) its absence would be a silicon bug. All of the registers appearing in memory addresses higher than that of SCB_BFAR are not specified by ST, but the v7-M ARM appears to give some latitude on this to the implementation. Leave them in the source text, but put them in an appropriately-commented #if 0 block so that users who know they're there can yell at us if they find them missing. In this block, the Auxiliary Feature Register's field was "ADR" instead of "AFR" in struct scb_reg_map; fix this. Register bit definitions have been added which are named based on PM0056 when possible, and on the November 2010 "Derrata 2010_Q3" issue of the ARM v7-M Architecture Reference Manual, in the case of the DFSR. Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
* Merge remote branch 'rryan/usb_fixes'Marti Bolivar2011-09-204-156/+90
|\
| * Missed one hard-coded structure size.RJ Ryan2011-09-181-1/+1
| | | | | | | | Signed-off-by: RJ Ryan <rryan@mit.edu>
| * Fix memory alignment of USB descriptor structures.RJ Ryan2011-09-183-155/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A variety of USB descriptor structures have been manually "unpacked". Instead of using the struct, their members were unpacked into the struct they were nested in. Additionally sizeof()'s were commented in favor of manual calculation of structure sizes. After uncommenting these changes, the USB CDC peripheral stopped correctly configuring with the host. The root problem with the structures is that GCC is padding them. By applying __attribute__((__packed__)), these problems are fixed. I removed all the instances of the workaround I saw within the USB code. Signed-off-by: RJ Ryan <rryan@mit.edu>
* | Add a libc abort() implementation.RJ Ryan2011-09-161-5/+28
| | | | | | | | | | | | | | | | | | | | | | The STL in particular relies on abort() for entering an error state. Without an abort() definition, the use of many STL primitives results in a link error because the default implementation of abort() uses _kill, _exit, and _getpid -- none of which are present. My abort() implementation writes an error message to the error USART and enters the throbbing-LED error state. Signed-off-by: RJ Ryan <rryan@mit.edu>
* | Add an __assert_func assertion handler so that libc does not use itsRJ Ryan2011-09-161-0/+9
|/ | | | | | | default implementation. This allows the use of assert() from libc's assert.h. Signed-off-by: RJ Ryan <rryan@mit.edu>
* Added more doxygen file level headers. Documented a few more functions.Michael Hope2011-09-1315-4/+68
| | | | Signed-off-by: Michael Hope <michaelh@juju.net.nz>
* syscalls.c: Allow environment to specify heap boundaries.Marti Bolivar2011-09-121-6/+12
| | | | | | Rename HEAP_START/HEAP_END macros CONFIG_HEAP_START/CONFIG_HEAP_END, to mark them as build-time configuration options. Wrap their definitions with #ifndefs appropriately.
* usart.h: Deprecate rx_buf field in usart_dev.Marti Bolivar2011-09-121-1/+4
| | | | | | | nzmichaelh rightly argues that actual RX buffers should be heap-allocated, to avoid wastage for unused devices. Deprecate the field for 0.0.12, since that's coming out soon. This will let us get rid of this field in master immediately after 0.0.12 gets shipped.
* [support/ld] Add linker support for reconfigurable heap.Marti Bolivar2011-09-121-13/+5
| | | | | | | | | | | | | | | - common_header.inc: Declare EXTERN symbols _lm_heap_start and _lm_heap_end. - common_rom.inc: Check for _lm_heap_start and _lm_heap_end. If they are defined, preserve their values. Otherwise, _lm_heap_start is starts after .bss, and _lm_heap_end is the end of SRAM. This allows existing linker scripts to continue using the old heap scheme, but allows for customizability elsewhere. - syscalls.c: Respect the addresses of _lm_heap_start and _lm_heap_end as the boundaries of the heap in _sbrk().
* syscalls.c: Bugfix _sbrk() implementation.Marti Bolivar2011-09-071-16/+31
| | | | | | | | | | | | Fix _sbrk() implementation so it properly rejects negative arguments which would send the program break below the heap start. Fix incorrect check against argument causing heap overflow. Also set errno properly to ENOMEM when the call fails. Beginning and end of the heap are now determined by HEAP_START and HEAP_END macros. Their current values seem to work OK for heaps on the internal SRAM, but they'll need to get generalized for Maple Native.
* stm32.h: Add STM32_SRAM_END.Marti Bolivar2011-09-071-0/+12
|
* Update outdated stm32.h usages.Marti Bolivar2011-09-074-7/+7
| | | | | stm32.h has been updated to prefix its definitions. Update the rest of libmaple to take this into account.
* stm32.h: Remove SRAM_SIZE, prefix all #defines.Marti Bolivar2011-09-071-41/+63
| | | | | | | | | | | | | | | Remove SRAM_SIZE define. This seems like a bad idea given that bootloader builds drop user code at an offset from the SRAM start address. Prefix every #define with "STM32_" to avoid polluting the namespace. Keep and deprecate the remaining ones (except for aforementioned SRAM_SIZE), but define them to be the same as their prefixed variant. Take a little extra care to break libmaple builds which specify PCLK1 and PCLK2 instead of the prefixed versions. Some libmaple forks make use of these; they will break in mysterious ways if they don't handle this change properly.
* syscalls.c: Remove fictitious uart_send() and broken comments.Marti Bolivar2011-09-071-10/+0
| | | | | | | | | uart_send() is not part of libmaple, and nm doesn't show it getting linked in from anywhere else, so I don't believe it exists. Remove it. Also remove some commented-out sections from getch(), putch(), _write(), and fgets(). These either reference uart_send() or use old libmaple APIs which no longer exist.
* util.c: Respect stm32.h.Marti Bolivar2011-09-071-1/+1
|
* usart.h: Remove unnecessary local in usart_putc().Marti Bolivar2011-08-301-2/+1
|
* stm32.h: Doxygen tweaks.Marti Bolivar2011-08-301-49/+49
| | | | | | | | For some unfathomable reason, Doxygen happily believes in PCLK2, but but not PCLK1, so Breathe can't find the docs for PCLK1, and all the children are unhappy. As a workaround, move all the Doxgyen crap into __DOXYGEN_PREDEFINED_HACK sections immediately preceding the actual definitions.
* dma.c: Fix Doxygen syntax for dma_get_irq_cause().Marti Bolivar2011-08-301-2/+2
|
* util.h: DoxygenMarti Bolivar2011-08-221-0/+13
|
* stm32.h: DoxygenMarti Bolivar2011-08-221-20/+49
|
* stm32.h: DoxygenMarti Bolivar2011-08-221-1/+31
|
* scb.h: DoxygenMarti Bolivar2011-08-221-0/+1
|
* nvic.h: DoxygenMarti Bolivar2011-08-221-2/+9
|
* i2c.h: DoxygenMarti Bolivar2011-08-221-1/+1
|
* gpio.h: DoxygenMarti Bolivar2011-08-221-11/+20
|
* flash.c: DoxygenMarti Bolivar2011-08-221-1/+2
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-25 19:38:40 +0000