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

host_communication: keep track of number of pending/queued req_ctx

Browse Source
This commit is contained in:
Harald Welte
2016-03-02 10:35:51 +01:00
parent acd48c51f2
commit a0cf200695
1 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
firmware/src_simtrace/host_communication.c
View File

@@ -10,7 +10,12 @@ static void usb_write_cb(uint8_t *arg, uint8_t status, uint32_t transferred,
{ {
struct req_ctx *rctx = (struct req_ctx *) arg; struct req_ctx *rctx = (struct req_ctx *) arg;
usbep_in_progress[rctx->ep] = 0; TRACE_DEBUG("%s (EP=%u)\r\n", __func__, rctx->ep);
__disable_irq();
usbep_in_progress[rctx->ep]--;
__enable_irq();
TRACE_DEBUG("%u: in_progress=%d\n", rctx->ep, usbep_in_progress[rctx->ep]);
if (status != USBD_STATUS_SUCCESS) if (status != USBD_STATUS_SUCCESS)
TRACE_ERROR("%s error, status=%d\n", __func__, status); TRACE_ERROR("%s error, status=%d\n", __func__, status);
@@ -24,15 +29,27 @@ int usb_refill_to_host(struct llist_head *queue, uint32_t ep)
struct req_ctx *rctx; struct req_ctx *rctx;
int rc; int rc;
if (usbep_in_progress[ep]) __disable_irq();
if (usbep_in_progress[ep]) {
__enable_irq();
return 0; return 0;
}
if (llist_empty(queue)) if (llist_empty(queue)) {
__enable_irq();
return 0; return 0;
}
usbep_in_progress[ep]++;
rctx = llist_entry(queue->next, struct req_ctx, list); rctx = llist_entry(queue->next, struct req_ctx, list);
llist_del(&rctx->list); llist_del(&rctx->list);
__enable_irq();
TRACE_DEBUG("%u: in_progress=%d\n", ep, usbep_in_progress[ep]);
TRACE_DEBUG("%s (EP=%u)\r\n", __func__, ep);
req_ctx_set_state(rctx, RCTX_S_USB_TX_BUSY); req_ctx_set_state(rctx, RCTX_S_USB_TX_BUSY);
rctx->ep = ep; rctx->ep = ep;
@@ -41,11 +58,13 @@ int usb_refill_to_host(struct llist_head *queue, uint32_t ep)
if (rc != USBD_STATUS_SUCCESS) { if (rc != USBD_STATUS_SUCCESS) {
TRACE_ERROR("%s error %x\n", __func__, rc); TRACE_ERROR("%s error %x\n", __func__, rc);
req_ctx_set_state(rctx, RCTX_S_USB_TX_PENDING); req_ctx_set_state(rctx, RCTX_S_USB_TX_PENDING);
__disable_irq();
usbep_in_progress[ep]--;
__enable_irq();
TRACE_DEBUG("%u: in_progress=%d\n", ep, usbep_in_progress[ep]);
return 0; return 0;
} }
usbep_in_progress[ep] = 1;
return 1; return 1;
} }
@@ -55,6 +74,8 @@ static void usb_read_cb(uint8_t *arg, uint8_t status, uint32_t transferred,
struct req_ctx *rctx = (struct req_ctx *) arg; struct req_ctx *rctx = (struct req_ctx *) arg;
struct llist_head *queue = (struct llist_head *) usbep_in_progress[rctx->ep]; struct llist_head *queue = (struct llist_head *) usbep_in_progress[rctx->ep];
TRACE_DEBUG("%s (EP=%u)\r\n", __func__, rctx->ep);
usbep_in_progress[rctx->ep] = 0; usbep_in_progress[rctx->ep] = 0;
if (status != USBD_STATUS_SUCCESS) { if (status != USBD_STATUS_SUCCESS) {
@@ -75,6 +96,8 @@ int usb_refill_from_host(struct llist_head *queue, int ep)
if (usbep_in_progress[ep]) if (usbep_in_progress[ep])
return 0; return 0;
TRACE_DEBUG("%s (EP=%u)\r\n", __func__, ep);
rctx = req_ctx_find_get(0, RCTX_S_FREE, RCTX_S_USB_RX_BUSY); rctx = req_ctx_find_get(0, RCTX_S_FREE, RCTX_S_USB_RX_BUSY);
rctx->ep = ep; rctx->ep = ep;