laiyp/lib_xua
1
0
Fork 0
forked from PAWPAW-Mirror/lib_xua
Code Pull Requests Activity

Directions added to MIDI port declarations. MIDI clean startup issue addressed

Browse Source
This commit is contained in:
Ross Owen
2012-10-23 17:45:40 +01:00
parent db1091e75f
commit a5d8080aca
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module_usb_audio/main.xc
View File

@@ -103,8 +103,8 @@ on stdcore[AUDIO_IO_CORE] : buffered out port:32 p_spdif_tx = PORT_SPDIF_OUT;
#endif #endif
#ifdef MIDI #ifdef MIDI
on stdcore[AUDIO_IO_CORE] : port p_midi_tx = PORT_MIDI_OUT; on stdcore[AUDIO_IO_CORE] : port p_midi_tx = PORT_MIDI_OUT;
on stdcore[AUDIO_IO_CORE] : port p_midi_rx = PORT_MIDI_IN; on stdcore[AUDIO_IO_CORE] : in port p_midi_rx = PORT_MIDI_IN;
#endif #endif
/* Clock blocks */ /* Clock blocks */

2
module_usb_midi/src/usb_midi.h
View File

@@ -15,7 +15,7 @@
* \param cable_number the cable number of the MIDI implementation. * \param cable_number the cable number of the MIDI implementation.
* This should be set to 0. * This should be set to 0.
**/ **/
void usb_midi(port ?p_midi_in, port ?p_midi_out, void usb_midi(in port ?p_midi_in, out port ?p_midi_out,
clock ?clk_midi, clock ?clk_midi,
chanend c_midi, chanend c_midi,
unsigned cable_number, unsigned cable_number,

9
module_usb_midi/src/usb_midi.xc
View File

@@ -81,7 +81,7 @@ extern unsigned polltime;
timer iAPTimer; timer iAPTimer;
#endif #endif
void usb_midi(port ?p_midi_in, port ?p_midi_out, void usb_midi(in port ?p_midi_in, out port ?p_midi_out,
clock ?clk_midi, clock ?clk_midi,
chanend c_midi, chanend c_midi,
unsigned cable_number, unsigned cable_number,
@@ -121,12 +121,11 @@ void usb_midi(port ?p_midi_in, port ?p_midi_out,
init_queue(symbol_fifo, symbol_fifo_arr, USB_MIDI_DEVICE_OUT_FIFO_SIZE, 4); init_queue(symbol_fifo, symbol_fifo_arr, USB_MIDI_DEVICE_OUT_FIFO_SIZE, 4);
init_queue(midi_to_host_fifo, midi_to_host_fifo_arr, 1, 4); init_queue(midi_to_host_fifo, midi_to_host_fifo_arr, 1, 4);
configure_out_port_no_ready(p_midi_out, clk_midi, 1); configure_out_port(p_midi_out, clk_midi, 1<<MIDI_SHIFT_TX);
configure_in_port(p_midi_in, clk_midi); configure_in_port(p_midi_in, clk_midi);
/* Just in case not using CLKBLK_REF */
start_clock(clk_midi); start_clock(clk_midi);
start_port(p_midi_out);
start_port(p_midi_in);
reset_midi_state(mips); reset_midi_state(mips);
@@ -138,7 +137,7 @@ void usb_midi(port ?p_midi_in, port ?p_midi_out,
CoProcessorDisable(); CoProcessorDisable();
#endif #endif
p_midi_out <: 1 << MIDI_SHIFT_TX; // Start with high bit. // p_midi_out <: 1 << MIDI_SHIFT_TX; // Start with high bit.
#ifdef IAP #ifdef IAP
CoProcessorEnable(); CoProcessorEnable();
#endif #endif