catarrh/simtrace2
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-03-18 22:38:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

usb_buf: count number of elements in queue

Browse Source 
This is in preparation for limiting the maximum queue length

Change-Id: I7cb184d7a1ccb519010a2f3e3295cc3a5fbf8052
Related: OS#4251
This commit is contained in:
Harald Welte
2019-12-14 19:07:57 +01:00
parent 271be9d181
commit f4a625be53
6 changed files with 58 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/libcommon/source/card_emu.c
View File

@@ -260,18 +260,18 @@ struct msgb *usb_buf_alloc_st(uint8_t ep, uint8_t msg_class, uint8_t msg_type)
while (!msg) {
msg = usb_buf_alloc(ep); // try to allocate some memory
if (!msg) { // allocation failed, we might be out of memory
struct llist_head *queue = usb_get_queue(ep);
if (!queue) {
struct usb_buffered_ep *bep = usb_get_buf_ep(ep);
if (!bep) {
TRACE_ERROR("ep %u: %s queue does not exist\n\r",
ep, __func__);
return NULL;
}
if (llist_empty(queue)) {
if (llist_empty(&bep->queue)) {
TRACE_ERROR("ep %u: %s EOMEM (queue already empty)\n\r",
ep, __func__);
return NULL;
}
msg = msgb_dequeue(queue);
msg = msgb_dequeue_count(&bep->queue, &bep->queue_len);
if (!msg) {
TRACE_ERROR("ep %u: %s no msg in non-empty queue\n\r",
ep, __func__);

4
firmware/libcommon/source/host_communication.c
View File

@@ -76,7 +76,7 @@ int usb_refill_to_host(uint8_t ep)
bep->in_progress++;
msg = msgb_dequeue(&bep->queue);
msg = msgb_dequeue_count(&bep->queue, &bep->queue_len);
local_irq_restore(x);
@@ -180,7 +180,7 @@ int usb_drain_queue(uint8_t ep)
}
/* free all queued msgbs */
while ((msg = msgb_dequeue(&bep->queue))) {
while ((msg = msgb_dequeue_count(&bep->queue, &bep->queue_len))) {
usb_buf_free(msg);
ret++;
}

2
firmware/libcommon/source/usb_buf.c
View File

@@ -78,7 +78,7 @@ int usb_buf_submit(struct msgb *msg)
/* no need for irqsafe operation, as the usb_tx_queue is
* processed only by the main loop context */
msgb_enqueue(&ep->queue, msg);
msgb_enqueue_count(&ep->queue, msg, &ep->queue_len);
return 0;
}