From a5d8080aca03003b8a4a69f97475fa26a9aec711 Mon Sep 17 00:00:00 2001
From: Ross Owen <ross@xmos.com>
Date: Tue, 23 Oct 2012 17:45:40 +0100
Subject: [PATCH] Directions added to MIDI port declarations.  MIDI clean
 startup issue addressed

---
 module_usb_audio/main.xc        | 4 ++--
 module_usb_midi/src/usb_midi.h  | 2 +-
 module_usb_midi/src/usb_midi.xc | 9 ++++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/module_usb_audio/main.xc b/module_usb_audio/main.xc
index 8fb25d02..eff5ffab 100755
--- a/module_usb_audio/main.xc
+++ b/module_usb_audio/main.xc
@@ -103,8 +103,8 @@ on stdcore[AUDIO_IO_CORE] : buffered out port:32 p_spdif_tx   = PORT_SPDIF_OUT;
 #endif
 
 #ifdef MIDI
-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] :  port p_midi_tx                     = PORT_MIDI_OUT;
+on stdcore[AUDIO_IO_CORE] : in port p_midi_rx                     = PORT_MIDI_IN;
 #endif
 
 /* Clock blocks */
diff --git a/module_usb_midi/src/usb_midi.h b/module_usb_midi/src/usb_midi.h
index dc5017f9..ca0f4920 100644
--- a/module_usb_midi/src/usb_midi.h
+++ b/module_usb_midi/src/usb_midi.h
@@ -15,7 +15,7 @@
  *  \param cable_number the cable number of the MIDI implementation.
  *                      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,
               chanend c_midi,
               unsigned cable_number,
diff --git a/module_usb_midi/src/usb_midi.xc b/module_usb_midi/src/usb_midi.xc
index 9765ed79..d02ecc76 100644
--- a/module_usb_midi/src/usb_midi.xc
+++ b/module_usb_midi/src/usb_midi.xc
@@ -81,7 +81,7 @@ extern unsigned polltime;
 timer iAPTimer;
 #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,
             chanend c_midi,
             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(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);
 
+    /* Just in case not using CLKBLK_REF */
     start_clock(clk_midi);
-    start_port(p_midi_out);
-    start_port(p_midi_in);
 
     reset_midi_state(mips);
 
@@ -138,7 +137,7 @@ void usb_midi(port ?p_midi_in, port ?p_midi_out,
     CoProcessorDisable();
 #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  
     CoProcessorEnable();
 #endif