diff options
| author | hathach <[email protected]> | 2018-04-07 15:03:56 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2018-04-07 15:03:56 +0700 |
| commit | 9be8e7bef6d8d8cada684f1f46334bceded7479f (patch) | |
| tree | 7c92f4e4d92f9fc50e2ddcaa2c99edcaf7fd8f8e /tinyusb/osal | |
| parent | b9fc708e41a8e2cc3135aa2ff07567e6daa61097 (diff) | |
add nrf52 walkaround for errata 104, 171, 187.
clean up osal_none
Diffstat (limited to 'tinyusb/osal')
| -rw-r--r-- | tinyusb/osal/osal_none.h | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/tinyusb/osal/osal_none.h b/tinyusb/osal/osal_none.h index 8500638fc..f8a0ace19 100644 --- a/tinyusb/osal/osal_none.h +++ b/tinyusb/osal/osal_none.h @@ -74,27 +74,27 @@ static inline osal_task_t osal_task_create(osal_func_t code, const char* name, u return (osal_task_t) 1;
}
-#define TASK_RESTART \
+#define TASK_RESTART \
_state = 0
-#define OSAL_TASK_BEGIN \
- static uint16_t _state = 0; \
- ATTR_UNUSED static uint32_t _timeout = 0; \
- (void) _timeout; \
- switch(_state) { \
+#define OSAL_TASK_BEGIN \
+ static uint16_t _state = 0; \
+ ATTR_UNUSED static uint32_t _timeout = 0; \
+ (void) _timeout; \
+ switch(_state) { \
case 0: {
-#define OSAL_TASK_END \
- default: TASK_RESTART; break; \
- }}\
+#define OSAL_TASK_END \
+ default: TASK_RESTART; break; \
+ }} \
return;
-#define osal_task_delay(msec) \
- do {\
- _timeout = tusb_hal_millis();\
- _state = __LINE__; case __LINE__:\
+#define osal_task_delay(msec) \
+ do { \
+ _timeout = tusb_hal_millis(); \
+ _state = __LINE__; case __LINE__: \
if ( _timeout + msec > tusb_hal_millis() ) \
- return TUSB_ERROR_OSAL_WAITING;\
+ return TUSB_ERROR_OSAL_WAITING; \
}while(0)
//--------------------------------------------------------------------+
@@ -156,23 +156,21 @@ static inline void osal_queue_flush(osal_queue_t const queue_hdl) queue_hdl->count = queue_hdl->rd_idx = queue_hdl->wr_idx = 0;
}
-#define osal_queue_receive(queue_hdl, p_data, msec, p_error) \
- do {\
- _timeout = tusb_hal_millis();\
- _state = __LINE__; case __LINE__:\
- if( queue_hdl->count == 0 ) {\
- if ( (msec != OSAL_TIMEOUT_WAIT_FOREVER) && ( _timeout + msec <= tusb_hal_millis()) ) /* time out */ \
- *(p_error) = TUSB_ERROR_OSAL_TIMEOUT;\
- else\
- return TUSB_ERROR_OSAL_WAITING;\
- } else{\
- /*TODO mutex lock tusb_hal_int_disable */\
- memcpy(p_data, queue_hdl->buffer + (queue_hdl->rd_idx * queue_hdl->item_size), queue_hdl->item_size);\
- queue_hdl->rd_idx = (queue_hdl->rd_idx + 1) % queue_hdl->depth;\
- queue_hdl->count--;\
- /*TODO mutex unlock tusb_hal_int_enable */\
- *(p_error) = TUSB_ERROR_NONE;\
- }\
+#define osal_queue_receive(queue_hdl, p_data, msec, p_error) \
+ do { \
+ _timeout = tusb_hal_millis(); \
+ _state = __LINE__; case __LINE__: \
+ if( queue_hdl->count == 0 ) { \
+ if ( (msec != OSAL_TIMEOUT_WAIT_FOREVER) && ( _timeout + msec <= tusb_hal_millis()) ) \
+ *(p_error) = TUSB_ERROR_OSAL_TIMEOUT; \
+ else \
+ return TUSB_ERROR_OSAL_WAITING; \
+ } else{ \
+ /*tusb_hal_int_disable_all();*/ \
+ fifo_read(queue_hdl, p_data); \
+ /*tusb_hal_int_enable_all();*/ \
+ *(p_error) = TUSB_ERROR_NONE; \
+ } \
}while(0)
@@ -210,19 +208,21 @@ static inline void osal_semaphore_reset(osal_semaphore_t sem_hdl) sem_hdl->count = 0;
}
-#define osal_semaphore_wait(sem_hdl, msec, p_error) \
- do {\
- _timeout = tusb_hal_millis();\
- _state = __LINE__; case __LINE__:\
- if( sem_hdl->count == 0 ) {\
- if ( (msec != OSAL_TIMEOUT_WAIT_FOREVER) && (_timeout + msec <= tusb_hal_millis()) ) /* time out */ \
- *(p_error) = TUSB_ERROR_OSAL_TIMEOUT;\
- else\
- return TUSB_ERROR_OSAL_WAITING;\
- } else{\
- if (sem_hdl->count) sem_hdl->count--; /*TODO mutex tusb_hal_int_disable consideration*/\
- *(p_error) = TUSB_ERROR_NONE;\
- }\
+#define osal_semaphore_wait(sem_hdl, msec, p_error) \
+ do { \
+ _timeout = tusb_hal_millis(); \
+ _state = __LINE__; case __LINE__: \
+ if( sem_hdl->count == 0 ) { \
+ if ( (msec != OSAL_TIMEOUT_WAIT_FOREVER) && (_timeout + msec <= tusb_hal_millis()) ) \
+ *(p_error) = TUSB_ERROR_OSAL_TIMEOUT; \
+ else \
+ return TUSB_ERROR_OSAL_WAITING; \
+ } else{ \
+ /*tusb_hal_int_disable_all();*/ \
+ sem_hdl->count--; \
+ /*tusb_hal_int_enable_all();*/ \
+ *(p_error) = TUSB_ERROR_NONE; \
+ } \
}while(0)
//--------------------------------------------------------------------+
|