diff options
| author | Reinhard Panhuber <[email protected]> | 2021-02-23 19:47:57 +0100 |
|---|---|---|
| committer | Reinhard Panhuber <[email protected]> | 2021-02-23 19:47:57 +0100 |
| commit | e223d46033ad9d947724130bf484147555caf83b (patch) | |
| tree | d4ed631c04e31db6b7f7dcc3c91cae38f2ea93a1 /src/osal | |
| parent | 313dd1439db037e676429d11646008f143e6bdb9 (diff) | |
| parent | ac30211853e9f8948d03db871f839e93a75b1edd (diff) | |
Merge remote-tracking branch 'upstream/master' into edpt_ISO_xfer
Conflicts:
src/common/tusb_fifo.h
src/osal/osal_none.h
Diffstat (limited to 'src/osal')
| -rw-r--r-- | src/osal/osal_none.h | 17 | ||||
| -rw-r--r-- | src/osal/osal_pico.h | 15 |
2 files changed, 9 insertions, 23 deletions
diff --git a/src/osal/osal_none.h b/src/osal/osal_none.h index 11726c95f..ea6818621 100644 --- a/src/osal/osal_none.h +++ b/src/osal/osal_none.h @@ -130,18 +130,11 @@ typedef struct typedef osal_queue_def_t* osal_queue_t; // role device/host is used by OS NONE for mutex (disable usb isr) only -#define OSAL_QUEUE_DEF(_role, _name, _depth, _type) \ - uint8_t _name##_buf[_depth*sizeof(_type)]; \ - osal_queue_def_t _name = { \ - .role = _role, \ - .ff = { \ - .buffer = _name##_buf, \ - .depth = _depth, \ - .item_size = sizeof(_type), \ - .overwritable = false, \ - .max_pointer_idx = (2*(_depth))-1, \ - .non_used_index_space = UINT16_MAX - (2*_depth-1),\ - }\ +#define OSAL_QUEUE_DEF(_role, _name, _depth, _type) \ + uint8_t _name##_buf[_depth*sizeof(_type)]; \ + osal_queue_def_t _name = { \ + .role = _role, \ + .ff = TU_FIFO_INIT(_name##_buf, _depth, _type, false) \ } // lock queue by disable USB interrupt diff --git a/src/osal/osal_pico.h b/src/osal/osal_pico.h index 79054ddfa..de964a7a0 100644 --- a/src/osal/osal_pico.h +++ b/src/osal/osal_pico.h @@ -115,17 +115,10 @@ typedef struct typedef osal_queue_def_t* osal_queue_t; // role device/host is used by OS NONE for mutex (disable usb isr) only -#define OSAL_QUEUE_DEF(_role, _name, _depth, _type) \ - uint8_t _name##_buf[_depth*sizeof(_type)]; \ - osal_queue_def_t _name = { \ - .ff = { \ - .buffer = _name##_buf, \ - .depth = _depth, \ - .item_size = sizeof(_type), \ - .overwritable = false, \ - .max_pointer_idx = 2*_depth-1, \ - .non_used_index_space = UINT16_MAX - (2*_depth-1), \ - }\ +#define OSAL_QUEUE_DEF(_role, _name, _depth, _type) \ + uint8_t _name##_buf[_depth*sizeof(_type)]; \ + osal_queue_def_t _name = { \ + .ff = TU_FIFO_INIT(_name##_buf, _depth, _type, false) \ } // lock queue by disable USB interrupt |