alex/usbd-midi
1
0
Fork 0
mirror of https://github.com/italicsjenga/usbd-midi.git synced 2024-12-23 12:21:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Fix windows support

Browse source
This commit is contained in:
Florian Jung 2021-04-10 18:03:59 +02:00
parent 42b1efa16b
commit 50e4094ed0
2 changed files with 65 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/data/usb/constants.rs
View file

@ -7,6 +7,7 @@ pub const USB_MIDISTREAMING_SUBCLASS: u8 =0x03;
pub const MIDI_IN_JACK_SUBTYPE : u8 = 0x02;
pub const MIDI_OUT_JACK_SUBTYPE : u8 = 0x03;
pub const EMBEDDED : u8 = 0x01;
pub const EXTERNAL : u8 = 0x02;
pub const CS_INTERFACE: u8 = 0x24;
pub const CS_ENDPOINT: u8 = 0x25;
pub const HEADER_SUBTYPE: u8 = 0x01;

87
src/midi_device.rs
View file

@ -59,13 +59,26 @@ impl<B: UsbBus> MidiClass<'_, B> {
self.standard_bulkout.read(buffer)
}
/// calculates the index'th midi in jack id
fn in_jack_id(&self, index: u8) -> u8 {
return index + 1;
/// calculates the index'th external midi in jack id
fn in_jack_id_ext(&self, index: u8) -> u8 {
debug_assert!(index < self.n_in_jacks);
return 2 * index + 1;
}
/// calculates the index'th midi in jack id
fn out_jack_id(&self, index: u8) -> u8 {
return self.n_in_jacks + index + 1;
/// calculates the index'th embedded midi out jack id
fn out_jack_id_emb(&self, index: u8) -> u8 {
debug_assert!(index < self.n_in_jacks);
return 2 * index + 2;
}
/// calculates the index'th external midi out jack id
fn out_jack_id_ext(&self, index: u8) -> u8 {
debug_assert!(index < self.n_out_jacks);
return 2 * self.n_in_jacks + 2 * index + 1;
}
/// calculates the index'th embedded midi in jack id
fn in_jack_id_emb(&self, index: u8) -> u8 {
debug_assert!(index < self.n_out_jacks);
return 2 * self.n_in_jacks + 2 * index + 2;
}
}
@ -103,8 +116,8 @@ impl<B: UsbBus> UsbClass<B> for MidiClass<'_, B> {
let midi_streaming_start_byte = writer.position();
let midi_streaming_total_length =
7 + self.n_in_jacks as usize * MIDI_IN_SIZE as usize + self.n_out_jacks as usize * MIDI_OUT_SIZE as usize
+ 9 + (4+self.n_in_jacks as usize) + 9 + (4+self.n_out_jacks as usize);
7 + (self.n_in_jacks + self.n_out_jacks) as usize * (MIDI_IN_SIZE + MIDI_OUT_SIZE) as usize
+ 9 + (4+self.n_out_jacks as usize) + 9 + (4+self.n_in_jacks as usize);
//Streaming extra info
writer.write( // len = 7
@ -118,26 +131,54 @@ impl<B: UsbBus> UsbClass<B> for MidiClass<'_, B> {
//JACKS
for i in 0..self.n_in_jacks {
writer.write( // len = 6 = MIDI_IN_SIZE
CS_INTERFACE,
&[
MIDI_IN_JACK_SUBTYPE,
EXTERNAL,
self.in_jack_id_ext(i), // id
0x00
]
)?;
}
for i in 0..self.n_out_jacks {
writer.write( // len = 6 = MIDI_IN_SIZE
CS_INTERFACE,
&[
MIDI_IN_JACK_SUBTYPE,
EMBEDDED,
self.in_jack_id(i), // id
self.in_jack_id_emb(i), // id
0x00
]
)?;
}
for i in 0..self.n_out_jacks {
writer.write ( // len = 9 = MIDI_OUT_SIZE
CS_INTERFACE,
&[
MIDI_OUT_JACK_SUBTYPE,
EXTERNAL,
self.out_jack_id_ext(i), //id
0x01, // 1 pin
self.in_jack_id_emb(i), // pin is connected to this entity...
0x01, // ...to the first pin
0x00
]
)?;
}
for i in 0..self.n_in_jacks {
writer.write ( // len = 9 = MIDI_OUT_SIZE
CS_INTERFACE,
&[
MIDI_OUT_JACK_SUBTYPE,
EMBEDDED,
self.out_jack_id(i), //id
0x00, // no pins
0x00, 0x00, // windows wants these two bytes, no idea why. they don't belong here.
self.out_jack_id_emb(i), //id
0x01, // 1 pin
self.in_jack_id_ext(i), // pin is connected to this entity...
0x01, // ...to the first pin
0x00
]
)?;
@ -151,25 +192,25 @@ impl<B: UsbBus> UsbClass<B> for MidiClass<'_, B> {
writer.endpoint(&self.standard_bulkout)?; // len = 9
endpoint_data[1] = self.n_in_jacks;
for i in 0..self.n_in_jacks {
endpoint_data[2 + i as usize] = self.in_jack_id(i);
}
writer.write( // len = 4 + self.n_in_jacks
CS_ENDPOINT,
&endpoint_data[0..2+self.n_in_jacks as usize]
)?;
writer.endpoint(&self.standard_bulkin)?; // len = 9
endpoint_data[1] = self.n_out_jacks;
for i in 0..self.n_out_jacks {
endpoint_data[2 + i as usize] = self.out_jack_id(i);
endpoint_data[2 + i as usize] = self.in_jack_id_emb(i);
}
writer.write( // len = 4 + self.n_out_jacks
CS_ENDPOINT,
&endpoint_data[0..2+self.n_out_jacks as usize]
)?;
writer.endpoint(&self.standard_bulkin)?; // len = 9
endpoint_data[1] = self.n_in_jacks;
for i in 0..self.n_in_jacks {
endpoint_data[2 + i as usize] = self.out_jack_id_emb(i);
}
writer.write( // len = 4 + self.n_in_jacks
CS_ENDPOINT,
&endpoint_data[0..2+self.n_in_jacks as usize]
)?;
let midi_streaming_end_byte = writer.position();
assert!(midi_streaming_end_byte - midi_streaming_start_byte == midi_streaming_total_length);