diff options
Diffstat (limited to 'chip/g/usb-stream.h')
| -rw-r--r-- | chip/g/usb-stream.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/chip/g/usb-stream.h b/chip/g/usb-stream.h index 020f6995c5..a0c580acea 100644 --- a/chip/g/usb-stream.h +++ b/chip/g/usb-stream.h @@ -29,12 +29,12 @@ struct usb_stream_config { */ int endpoint; - int *is_reset; + /* USB TX transfer is in progress */ + uint8_t *tx_in_progress; /* * Deferred function to call to handle USB and Queue request. */ - const struct deferred_data *deferred_tx; const struct deferred_data *deferred_rx; int tx_size; @@ -114,19 +114,16 @@ extern struct producer_ops const usb_stream_producer_ops; static struct g_usb_desc CONCAT2(NAME, _out_desc_); \ static struct g_usb_desc CONCAT2(NAME, _in_desc_)[MAX_IN_DESC]; \ static uint8_t CONCAT2(NAME, _buf_rx_)[RX_SIZE]; \ - static int CONCAT2(NAME, _is_reset_); \ - static void CONCAT2(NAME, _deferred_tx_)(void); \ - DECLARE_DEFERRED(CONCAT2(NAME, _deferred_tx_)); \ + static uint8_t CONCAT2(NAME, _tx_in_progress_); \ static void CONCAT2(NAME, _deferred_rx_)(void); \ DECLARE_DEFERRED(CONCAT2(NAME, _deferred_rx_)); \ static int CONCAT2(NAME, _rx_handled); \ static size_t CONCAT2(NAME, _tx_handled); \ struct usb_stream_config const NAME = { \ .endpoint = ENDPOINT, \ - .is_reset = &CONCAT2(NAME, _is_reset_), \ + .tx_in_progress = &CONCAT2(NAME, _tx_in_progress_), \ .in_desc = &CONCAT2(NAME, _in_desc_)[0], \ .out_desc = &CONCAT2(NAME, _out_desc_), \ - .deferred_tx = &CONCAT2(NAME, _deferred_tx__data), \ .deferred_rx = &CONCAT2(NAME, _deferred_rx__data), \ .tx_size = TX_SIZE, \ .rx_size = RX_SIZE, \ @@ -172,8 +169,6 @@ extern struct producer_ops const usb_stream_producer_ops; .wMaxPacketSize = RX_SIZE, \ .bInterval = 0, \ }; \ - static void CONCAT2(NAME, _deferred_tx_)(void) \ - { tx_stream_handler(&NAME); } \ static void CONCAT2(NAME, _deferred_rx_)(void) \ { rx_stream_handler(&NAME); } \ static void CONCAT2(NAME, _ep_tx)(void) \ @@ -218,7 +213,6 @@ extern struct producer_ops const usb_stream_producer_ops; * Handle USB and Queue request in a deferred callback. */ void rx_stream_handler(struct usb_stream_config const *config); -void tx_stream_handler(struct usb_stream_config const *config); /* * These functions are used by the trampoline functions defined above to |