diff options
| author | Donald Delmar Davis <don@suspectdevices.com> | 2013-05-16 12:39:25 -0700 |
|---|---|---|
| committer | Donald Delmar Davis <don@suspectdevices.com> | 2013-05-16 12:39:25 -0700 |
| commit | 01687719ecb2f2f51048fc7cba0b4d7b78dba02a (patch) | |
| tree | df58a356288e45971741483978e5ba72b45a88bc /.gitignore | |
| parent | e1be28187d23c34a62e89795a57d62ef3d0d8ebb (diff) | |
| parent | f11dc6be4f55ff8450416c3ce5a1018398376b8a (diff) | |
Merge remote-tracking branch 'upstream/master'
* upstream/master:
Use linker symbol __text_start__ to setup base of nvic vector table.
usb_midi_device - Control build with USB_TYPE build flag
Reverted work change
wirish/syscalls.c: add weak exit function.
libmaple/usb/stm32f1/usb.c: cosmetics.
Linker files for F20x boards with 768k flash
Added board.mk makefile with board specific defines
usb_midi_device: Reset transmitting flag in usbReset()
libmaple/usb/stm32f1/usb.c: fix build error.
Preserve previous usb state when suspending / restore on resume
usb_cdcacm: Reset transmitting flag in usbReset().
Conflicts:
libmaple/usb/stm32f1/usb_midi_device.c
Todo: Modify buffered transmit for Packets.
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions