diff options
| author | Gedare Bloom <gedare@rtems.org> | 2011-12-05 15:21:50 +0000 |
|---|---|---|
| committer | Gedare Bloom <gedare@rtems.org> | 2011-12-05 15:21:50 +0000 |
| commit | 514414253318a27f839cfb9c29b9e75316559532 (patch) | |
| tree | 7709c390765b3e2162ab6564c822a058c28f604d /c | |
| parent | 2011-12-05 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-514414253318a27f839cfb9c29b9e75316559532.tar.bz2 | |
2011-12-05 Sebastien Bourdeauducq <seb@tmplab.org>
* milkymist_midi/midi.c: move MIDI message detection from higher layers
to the MIDI interrupt handler
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/lib/libbsp/lm32/shared/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/lm32/shared/milkymist_midi/midi.c | 24 |
2 files changed, 26 insertions, 3 deletions
diff --git a/c/src/lib/libbsp/lm32/shared/ChangeLog b/c/src/lib/libbsp/lm32/shared/ChangeLog index ea0f98f8fd..15e59040d1 100644 --- a/c/src/lib/libbsp/lm32/shared/ChangeLog +++ b/c/src/lib/libbsp/lm32/shared/ChangeLog @@ -1,3 +1,8 @@ +2011-12-05 Sebastien Bourdeauducq <seb@tmplab.org> + + * milkymist_midi/midi.c: move MIDI message detection from higher layers + to the MIDI interrupt handler + 2011-11-27 Sebastien Bourdeauducq <seb@tmplab.org> PR 1972/bsps diff --git a/c/src/lib/libbsp/lm32/shared/milkymist_midi/midi.c b/c/src/lib/libbsp/lm32/shared/milkymist_midi/midi.c index ad5c4342d8..ce1a2f50e1 100644 --- a/c/src/lib/libbsp/lm32/shared/milkymist_midi/midi.c +++ b/c/src/lib/libbsp/lm32/shared/milkymist_midi/midi.c @@ -26,6 +26,8 @@ #define DEVICE_NAME "/dev/midi" static rtems_id midi_q; +static unsigned char *midi_p = NULL; +static unsigned char midi_msg[3]; static rtems_isr interrupt_handler(rtems_vector_number n) { @@ -34,7 +36,23 @@ static rtems_isr interrupt_handler(rtems_vector_number n) while (MM_READ(MM_MIDI_STAT) & MIDI_STAT_RX_EVT) { msg = MM_READ(MM_MIDI_RXTX); MM_WRITE(MM_MIDI_STAT, MIDI_STAT_RX_EVT); - rtems_message_queue_send(midi_q, &msg, 1); + + if ((msg & 0xf8) == 0xf8) + continue; /* ignore system real-time */ + + if (msg & 0x80) + midi_p = midi_msg; /* status byte */ + + if (!midi_p) + continue; /* ignore extra or unsynchronized data */ + + *midi_p++ = msg; + + if (midi_p == midi_msg+3) { + /* received a complete MIDI message */ + rtems_message_queue_send(midi_q, midi_msg, 3); + midi_p = NULL; + } } lm32_interrupt_ack(1 << MM_IRQ_MIDI); } @@ -53,8 +71,8 @@ rtems_device_driver midi_initialize( sc = rtems_message_queue_create( rtems_build_name('M', 'I', 'D', 'I'), - 64, - 1, + 32, + 3, 0, &midi_q ); |