diff options
| author | fredizzimo <fsundvik@gmail.com> | 2018-02-08 22:07:46 +0200 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-02-08 15:07:46 -0500 |
| commit | 53ff8a31b61952d9675558149d927f7942071df9 (patch) | |
| tree | a57b9e6f7d6494c9ef903f886a660dd43f4e5044 /tmk_core/protocol/midi/bytequeue | |
| parent | 63c16f4b632a2a82a775f51a3ad0cc690cca1fc9 (diff) | |
| download | qmk_firmware-53ff8a31b61952d9675558149d927f7942071df9.tar.gz qmk_firmware-53ff8a31b61952d9675558149d927f7942071df9.zip | |
Merge ChibiOS and LUFA descriptor support (#2362)
* Move lufa descriptor to protocol/usb_descriptor
* Try to compile usb_descriptor on ChibiOS
* Add lufa_utils for ChibiOS
Lufa USB descriptors for ChibiOS
* More lufa_util compatibility fixes
* First compiling version of shared USB descriptor
* Send the usb descriptors
* Fix the CONSOLE output on ChibiOS
* Add errors for unsupported interfaces
* Enable support for vitual serial port USB descriptors
* Implement virtual serial port for ChibiOS
* Cleanup the lufa_utils
Use the default lufa header files
* Add raw hid support for ChibiOS
This is completely untested
* Enable midi compilation on ChibiOS
* Move midi functionality out of lufa.c
* Don't register sysex callback when not needed
* ChibiOS compilation fixes
* Update ChibiOS submodule
* Fix the Midi USB descriptor
It didn't work properly when both Midi and Virtual serial port was enabled.
* Add MIDI support for ChibiOS
* Fix USB descriptor strings on ChibiOS
* Use serial usb driver for raw hid
* Generalize the ChibiOS stream like drivers
This makes the initialization much more simple and eliminates a lot of
the code duplication.
* Convert console output to chibios stream driver
* Fixes for ChibiOS update
* Update the ChibiOS contrib submodule
To include the usb data toggle synchronization fixes
* Fix duplicate reset enumeration on ChibiOS
* Add missing include
* Add number of endpoints check for ChibiOS
* Enable serial USB driver on all keyboards
* Add missing includes when API is enabled withot midi
* Add another missing inlcude
Diffstat (limited to 'tmk_core/protocol/midi/bytequeue')
| -rwxr-xr-x | tmk_core/protocol/midi/bytequeue/interrupt_setting.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/tmk_core/protocol/midi/bytequeue/interrupt_setting.c b/tmk_core/protocol/midi/bytequeue/interrupt_setting.c index eafef527c..0ab8b5462 100755 --- a/tmk_core/protocol/midi/bytequeue/interrupt_setting.c +++ b/tmk_core/protocol/midi/bytequeue/interrupt_setting.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | //Copyright 20010 Alex Norman | 1 | //Copyright 20010 Alex Norman |
| 2 | //writen by Alex Norman | 2 | //writen by Alex Norman |
| 3 | // | 3 | // |
| 4 | //This file is part of avr-bytequeue. | 4 | //This file is part of avr-bytequeue. |
| 5 | // | 5 | // |
| @@ -22,6 +22,7 @@ | |||
| 22 | //implementations of the typedef and these functions | 22 | //implementations of the typedef and these functions |
| 23 | 23 | ||
| 24 | #include "interrupt_setting.h" | 24 | #include "interrupt_setting.h" |
| 25 | #if defined(__AVR__) | ||
| 25 | #include <avr/interrupt.h> | 26 | #include <avr/interrupt.h> |
| 26 | 27 | ||
| 27 | interrupt_setting_t store_and_clear_interrupt(void) { | 28 | interrupt_setting_t store_and_clear_interrupt(void) { |
| @@ -33,4 +34,16 @@ interrupt_setting_t store_and_clear_interrupt(void) { | |||
| 33 | void restore_interrupt_setting(interrupt_setting_t setting) { | 34 | void restore_interrupt_setting(interrupt_setting_t setting) { |
| 34 | SREG = setting; | 35 | SREG = setting; |
| 35 | } | 36 | } |
| 37 | #elif defined(__arm__) | ||
| 38 | #include "ch.h" | ||
| 39 | |||
| 40 | interrupt_setting_t store_and_clear_interrupt(void) { | ||
| 41 | chSysLock(); | ||
| 42 | return 0; | ||
| 43 | } | ||
| 44 | |||
| 45 | void restore_interrupt_setting(interrupt_setting_t setting) { | ||
| 46 | chSysUnlock(); | ||
| 47 | } | ||
| 48 | #endif | ||
| 36 | 49 | ||
