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

Corrected expected total descriptor length

Browse source
This commit is contained in:
Florian Jung 2021-04-13 00:38:12 +02:00
parent 50e4094ed0
commit dd71bcaeb0
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -1,7 +1,7 @@
[package] [package]
name = "usbd-midi" name = "usbd-midi"
version = "0.2.0" version = "0.2.0"
authors = ["beau trepp <beautrepp@gmail.com>"] authors = ["beau trepp <beautrepp@gmail.com>", "Florian Jung <flo@windfis.ch>"]
edition = "2018" edition = "2018"
description = "A usb-midi implementation for usb-device" description = "A usb-midi implementation for usb-device"
homepage = "https://github.com/btrepp/usbd-midi" homepage = "https://github.com/btrepp/usbd-midi"

6
src/midi_device.rs
View file

@ -117,7 +117,7 @@ impl<B: UsbBus> UsbClass<B> for MidiClass<'_, B> {
let midi_streaming_start_byte = writer.position(); let midi_streaming_start_byte = writer.position();
let midi_streaming_total_length = let midi_streaming_total_length =
7 + (self.n_in_jacks + self.n_out_jacks) as usize * (MIDI_IN_SIZE + MIDI_OUT_SIZE) 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); + 7 + (4+self.n_out_jacks as usize) + 7 + (4+self.n_in_jacks as usize);
//Streaming extra info //Streaming extra info
writer.write( // len = 7 writer.write( // len = 7
@ -190,7 +190,7 @@ impl<B: UsbBus> UsbClass<B> for MidiClass<'_, B> {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 // jack mappings. must be filled in and cropped. 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 // jack mappings. must be filled in and cropped.
]; ];
writer.endpoint(&self.standard_bulkout)?; // len = 9 writer.endpoint(&self.standard_bulkout)?; // len = 7
endpoint_data[1] = self.n_out_jacks; endpoint_data[1] = self.n_out_jacks;
for i in 0..self.n_out_jacks { for i in 0..self.n_out_jacks {
@ -201,7 +201,7 @@ impl<B: UsbBus> UsbClass<B> for MidiClass<'_, B> {
&endpoint_data[0..2+self.n_out_jacks as usize] &endpoint_data[0..2+self.n_out_jacks as usize]
)?; )?;
writer.endpoint(&self.standard_bulkin)?; // len = 9 writer.endpoint(&self.standard_bulkin)?; // len = 7
endpoint_data[1] = self.n_in_jacks; endpoint_data[1] = self.n_in_jacks;
for i in 0..self.n_in_jacks { for i in 0..self.n_in_jacks {
endpoint_data[2 + i as usize] = self.out_jack_id_emb(i); endpoint_data[2 + i as usize] = self.out_jack_id_emb(i);