Werner's Miscellanea
Sign in or create your account | Project List | Help
Werner's Miscellanea Commit Details
Date: | 2011-11-30 10:46:03 (12 years 3 months ago) |
---|---|
Author: | Werner Almesberger |
Commit: | a946aac7baf9771e87a48624a9250dda6079d894 |
Message: | m1/patches/rtems/: added Milkymist-specific USB-MIDI forwarding |
Files: |
m1/patches/rtems/milkymist-usb-midi.patch (1 diff) m1/patches/rtems/series (1 diff) |
Change Details
m1/patches/rtems/milkymist-usb-midi.patch | ||
---|---|---|
1 | Index: rtems/c/src/lib/libbsp/lm32/shared/milkymist_usbinput/comloc.h | |
2 | =================================================================== | |
3 | --- rtems.orig/c/src/lib/libbsp/lm32/shared/milkymist_usbinput/comloc.h 2011-11-30 05:40:59.000000000 -0300 | |
4 | @@ -22,5 +22,7 @@ | |
5 | #define COMLOC_MEVT(offset) COMLOCV(MM_SOFTUSB_DMEM_BASE+0x1102+offset) | |
6 | #define COMLOC_KEVT_PRODUCE COMLOCV(MM_SOFTUSB_DMEM_BASE+0x1142) | |
7 | #define COMLOC_KEVT(offset) COMLOCV(MM_SOFTUSB_DMEM_BASE+0x1143+offset) | |
8 | +#define COMLOC_MIDI_PRODUCE COMLOCV(MM_SOFTUSB_DMEM_BASE+0x1183) | |
9 | +#define COMLOC_MIDI(offset) COMLOCV(MM_SOFTUSB_DMEM_BASE+0x1184+offset) | |
10 | ||
11 | #endif /* __COMLOC_H_ */ | |
12 | Index: rtems/c/src/lib/libbsp/lm32/shared/milkymist_usbinput/usbinput.c | |
13 | =================================================================== | |
14 | --- rtems.orig/c/src/lib/libbsp/lm32/shared/milkymist_usbinput/usbinput.c 2011-11-30 05:38:19.000000000 -0300 | |
15 | @@ -35,6 +35,7 @@ | |
16 | ||
17 | static int mouse_consume; | |
18 | static int keyboard_consume; | |
19 | +static int midi_consume; | |
20 | ||
21 | static rtems_id event_q; | |
22 | ||
23 | @@ -58,6 +59,14 @@ | |
24 | rtems_message_queue_send(event_q, msg, 8); | |
25 | keyboard_consume = (keyboard_consume + 1) & 0x07; | |
26 | } | |
27 | + | |
28 | + while(midi_consume != COMLOC_MIDI_PRODUCE) { | |
29 | + for(i=0;i<3;i++) | |
30 | + msg[i] = COMLOC_MIDI(4*midi_consume+i+1); | |
31 | + rtems_message_queue_send(event_q, msg, 3); | |
32 | + midi_consume = (midi_consume + 1) & 0x0f; | |
33 | + } | |
34 | + | |
35 | } | |
36 | ||
37 | rtems_device_driver usbinput_initialize( | |
38 | @@ -87,6 +96,7 @@ | |
39 | ||
40 | mouse_consume = 0; | |
41 | keyboard_consume = 0; | |
42 | + midi_consume = 0; | |
43 | ||
44 | sc = rtems_io_register_name(DEVICE_NAME, major, 0); | |
45 | RTEMS_CHECK_SC(sc, "create USB input device"); |
m1/patches/rtems/series | ||
---|---|---|
14 | 14 | # milkymist-map-sysfreq.patch - applied 2011-11-27 |
15 | 15 | # milkymist-videoformat.patch - applied 2011-11-27 |
16 | 16 | #fix-timer-includes.patch |
17 | milkymist-usb-midi.patch |
Branches:
master