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

host_communication/card_emu: adapt to nwe req_ctx / queuing paradignm

Browse Source
This commit is contained in:
Harald Welte
2016-02-29 14:12:40 +01:00
parent f672e9d63a
commit 54cb3d017f
6 changed files with 71 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
firmware/src_simtrace/host_communication.c
View File

@@ -1,5 +1,8 @@
#include "board.h"
#include "req_ctx.h"
#include "linuxlist.h"
static volatile uint32_t usbep_in_progress[BOARD_USB_NUMENDPOINTS];
/* call-back after (successful?) transfer of a buffer */
static void usb_write_cb(uint8_t *arg, uint8_t status, uint32_t transferred,
@@ -7,6 +10,8 @@ static void usb_write_cb(uint8_t *arg, uint8_t status, uint32_t transferred,
{
struct req_ctx *rctx = (struct req_ctx *) arg;
usbep_in_progress[rctx->ep] = 0;
if (status != USBD_STATUS_SUCCESS)
TRACE_ERROR("%s error, status=%d\n", __func__, status);
@@ -14,15 +19,24 @@ static void usb_write_cb(uint8_t *arg, uint8_t status, uint32_t transferred,
req_ctx_set_state(rctx, RCTX_S_FREE);
}
int usb_to_host(void)
int usb_refill_to_host(struct llist_head *queue, uint32_t ep)
{
struct req_ctx *rctx;
int rc;
rctx = req_ctx_find_get(0, RCTX_S_USB_TX_PENDING, RCTX_S_USB_TX_BUSY);
if (usbep_in_progress[ep])
return 0;
/* FIXME: obtain endpoint number from req_ctx! */
rc = USBD_Write(PHONE_DATAIN, rctx->data, rctx->tot_len,
if (llist_empty(queue))
return 0;
rctx = llist_entry(queue->next, struct req_ctx, list);
llist_del(&rctx->list);
req_ctx_set_state(rctx, RCTX_S_USB_TX_BUSY);
rctx->ep = ep;
rc = USBD_Write(ep, rctx->data, rctx->tot_len,
(TransferCallback) &usb_write_cb, rctx);
if (rc != USBD_STATUS_SUCCESS) {
TRACE_ERROR("%s error %x\n", __func__, rc);
@@ -30,6 +44,8 @@ int usb_to_host(void)
return 0;
}
usbep_in_progress[ep] = 1;
return 1;
}
@@ -37,6 +53,9 @@ static void usb_read_cb(uint8_t *arg, uint8_t status, uint32_t transferred,
uint32_t remaining)
{
struct req_ctx *rctx = (struct req_ctx *) arg;
struct llist_head *queue = (struct llist_head *) usbep_in_progress[rctx->ep];
usbep_in_progress[rctx->ep] = 0;
if (status != USBD_STATUS_SUCCESS) {
TRACE_ERROR("%s error, status=%d\n", __func__, status);
@@ -45,14 +64,19 @@ static void usb_read_cb(uint8_t *arg, uint8_t status, uint32_t transferred,
return;
}
req_ctx_set_state(rctx, RCTX_S_UART_TX_PENDING);
llist_add_tail(&rctx->list, queue);
}
int usb_from_host(int ep)
int usb_refill_from_host(struct llist_head *queue, int ep)
{
struct req_ctx *rctx;
int rc;
if (usbep_in_progress[ep])
return 0;
rctx = req_ctx_find_get(0, RCTX_S_FREE, RCTX_S_USB_RX_BUSY);
rctx->ep = ep;
rc = USBD_Read(ep, rctx->data, rctx->size,
(TransferCallback) &usb_read_cb, rctx);
@@ -60,7 +84,10 @@ int usb_from_host(int ep)
if (rc != USBD_STATUS_SUCCESS) {
TRACE_ERROR("%s error %x\n", __func__, rc);
req_ctx_put(rctx);
return 0;
}
return 0;
usbep_in_progress[ep] = (uint32_t) queue;
return 1;
}