Skip to contentSkip to conversation

usb: gadget: f_midi: free usb request when done

PATCH In review Felipe F. Tonello 4 participants 5 messages Sep 23, 2015 – Sep 25, 2015 USB

lore
Share & tools
lore
#0 lore raw

PATCH v2 2/3 usb: gadget: f_midi: free usb request when done

req->actual == req->length means that there is no data left to enqueue, so free the request.

---

Changes in v2:
* Re enqueue not fully completed requests, instead of read ALSA buffers.

 drivers/usb/gadget/function/f_midi.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/usb/gadget/function/f_midi.c +6 -4
index edb84ca..62356cf 100644
@@ -256,10 +256,12 @@ f_midi_complete(struct usb_ep *ep, struct usb_request *req)
 			/* We received stuff. req is queued again, below */
 			f_midi_handle_out_data(ep, req);
 		} else if (ep == midi->in_ep) {
-			/* Our transmit completed. See if there's more to go.
-			 * f_midi_transmit eats req, don't queue it again. */
-			f_midi_transmit(midi, req);
-			return;
+			/* Our transmit completed. If there is no more to go,
+			   don't queue it again. */
+			if (req->actual == req->length) {
+				free_ep_req(ep, req);
+				return;
+			}
 		}
 		break;
 
Signature · 1 line
2.1.4
#1 lore raw

Hello.

Quoted 17 lines · Felipe F. Tonello

req->actual == req->length means that there is no data left to enqueue, so free the request.

---

Changes in v2:
* Re enqueue not fully completed requests, instead of read ALSA buffers.

  drivers/usb/gadget/function/f_midi.c | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
drivers/usb/gadget/function/f_midi.c +0 -0
index edb84ca..62356cf 100644

drivers/usb/gadget/function/f_midi.c f_midi_complete(struct usb_ep *ep, struct usb_request *req) · line 260

Quoted 9 lines
drivers/usb/gadget/function/f_midi.c +2 -4
@@ -256,10 +256,12 @@ f_midi_complete(struct usb_ep *ep, struct usb_request *req)
  			/* We received stuff. req is queued again, below */
  			f_midi_handle_out_data(ep, req);
  		} else if (ep == midi->in_ep) {
-			/* Our transmit completed. See if there's more to go.
-			 * f_midi_transmit eats req, don't queue it again. */
-			f_midi_transmit(midi, req);
-			return;
+			/* Our transmit completed. If there is no more to go,
+			   don't queue it again. */

The preferred multi-line comment style is this:

/*
* bla
* bla
*/

MBR, Sergei

#2 lore raw
In reply to Felipe F. Tonello
Quoted 20 lines · Felipe F. Tonello

req->actual == req->length means that there is no data left to enqueue, so free the request.

---

Changes in v2:
* Re enqueue not fully completed requests, instead of read ALSA buffers.

 drivers/usb/gadget/function/f_midi.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/usb/gadget/function/f_midi.c +0 -0
index edb84ca..62356cf 100644
@@ -256,10 +256,12 @@ f_midi_complete(struct usb_ep *ep, struct usb_request *req)
 			/* We received stuff. req is queued again, below */
 			f_midi_handle_out_data(ep, req);
 		} else if (ep == midi->in_ep) {

drivers/usb/gadget/function/f_midi.c f_midi_complete(struct usb_ep *ep, struct usb_request *req) · line 264

Quoted 10 lines
drivers/usb/gadget/function/f_midi.c +6 -4
-			/* Our transmit completed. See if there's more to go.
-			 * f_midi_transmit eats req, don't queue it again. */
-			f_midi_transmit(midi, req);
-			return;
+			/* Our transmit completed. If there is no more to go,
+			   don't queue it again. */
+			if (req->actual == req->length) {
+				free_ep_req(ep, req);
+				return;
+			}

I find f_midi_transmit will judge if there are more data, if without data, it will free the request.

Besides, does one trigger only do one transfer? Sorry, I can't make my aplaymidi to receive data, probably due to hardware without midi support?

root@imx6qpsabreauto:~# aplaymidi
ALSA lib
/var/lib/jenkins/workspace/fido-3.14.28-X11-consolidated_new/temp_build_dir/build_all/tmp/work/cortexa9hf-vfp-neon-mx6qdl-poky-linux-gnueabi/alsa-lib/1.0.28-r0/alsa-lib-1.0.28/src/seq/seq_hw.c:457:(snd_seq_hw_open)
open /dev/snd/seq failed: No such file or directory
Cannot open sequencer - No such file or directory
Signature · 2 lines
Best Regards,
Peter Chen
#3 lore raw
Quoted 4 lines · Peter Chen

I can't make my aplaymidi to receive data

# aplaymidi
open /dev/snd/seq failed: No such file or directory

modprobe snd-seq

There are mechanisms to load it automatically, but your embedded system might not bother about any of them. Or CONFIG_SND_SEQUENCER isn't enabled at all.

In any case, raw MIDI (with the amidi tool) should work.

Regards,
Clemens

#4 lore raw
In reply to Peter Chen

Hi Peter,

Quoted 26 lines · Peter Chen
Quoted 25 lines · Felipe F. Tonello

req->actual == req->length means that there is no data left to enqueue, so free the request.

---

Changes in v2:
* Re enqueue not fully completed requests, instead of read ALSA buffers.

 drivers/usb/gadget/function/f_midi.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/usb/gadget/function/f_midi.c +1 -4
index edb84ca..62356cf 100644
@@ -256,10 +256,12 @@ f_midi_complete(struct usb_ep *ep, struct usb_request *req)
                      /* We received stuff. req is queued again, below */
                      f_midi_handle_out_data(ep, req);
              } else if (ep == midi->in_ep) {
-                     /* Our transmit completed. See if there's more to go.
-                      * f_midi_transmit eats req, don't queue it again. */
-                     f_midi_transmit(midi, req);
-                     return;
+                     /* Our transmit completed. If there is no more to go,
Quoted 8 lines

drivers/usb/gadget/function/f_midi.c f_midi_complete(struct usb_ep *ep, struct usb_request *req) · line 264

Quoted 5 lines
drivers/usb/gadget/function/f_midi.c +5 -0
+                        don't queue it again. */
+                     if (req->actual == req->length) {
+                             free_ep_req(ep, req);
+                             return;
+                     }

I find f_midi_transmit will judge if there are more data, if without data, it will free the request.

No. Transmit is called when ALSA trigger is called (whenever snd_*_read() snd_*_write() is called).

The current code is not crashing anything, but I believe it is just wrong. It can cause potential problems in future if one is not careful when doing changes to it.

I would like to send a v3 with free_ep_req().

Felipe

Quoted 15 lines

Besides, does one trigger only do one transfer? Sorry, I can't make my aplaymidi to receive data, probably due to hardware without midi support?

root@imx6qpsabreauto:~# aplaymidi
ALSA lib
/var/lib/jenkins/workspace/fido-3.14.28-X11-consolidated_new/temp_build_dir/build_all/tmp/work/cortexa9hf-vfp-neon-mx6qdl-poky-linux-gnueabi/alsa-lib/1.0.28-r0/alsa-lib-1.0.28/src/seq/seq_hw.c:457:(snd_seq_hw_open)
open /dev/snd/seq failed: No such file or directory
Cannot open sequencer - No such file or directory

--

Best Regards,
Peter Chen