mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-04-16 05:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean up

Browse Source
This commit is contained in:
hathach 2018-06-22 16:01:55 +07:00
parent e3591ac682
commit d438000b99
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/device/usbd.c
View File

@ -182,7 +182,7 @@ typedef struct ATTR_ALIGNED(4)
// USBD_EVT_FUNC_CALL // USBD_EVT_FUNC_CALL
struct { struct {
void (*func)(void*); osal_task_func_t func;
void* param; void* param;
}func_call; }func_call;
}; };
@ -308,6 +308,10 @@ static tusb_error_t usbd_main_st(void)
} }
} }
} }
else if ( USBD_EVT_FUNC_CALL == event.event_id )
{
if ( event.func_call.func ) event.func_call.func(event.func_call.param);
}
else else
{ {
STASK_ASSERT(false); STASK_ASSERT(false);
@ -631,7 +635,7 @@ tusb_error_t usbd_open_edpt_pair(uint8_t rhport, tusb_desc_endpoint_t const* p_d
return TUSB_ERROR_NONE; return TUSB_ERROR_NONE;
} }
void usbd_defer_func(void (*func)(void*), void* param, bool isr ) void usbd_defer_func(osal_task_func_t func, void* param, bool isr )
{ {
usbd_task_event_t event = usbd_task_event_t event =
{ {

2
src/device/usbd_pvt.h
View File

@ -76,7 +76,7 @@ tusb_error_t usbd_open_edpt_pair(uint8_t rhport, tusb_desc_endpoint_t const* p_d
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
/* Other Helpers /* Other Helpers
*------------------------------------------------------------------*/ *------------------------------------------------------------------*/
void usbd_defer_func( void (*func)(void*), void* param, bool isr ); void usbd_defer_func( osal_task_func_t func, void* param, bool isr );
#ifdef __cplusplus #ifdef __cplusplus

1
src/osal/osal.h
View File

@ -58,6 +58,7 @@ enum
#define OSAL_TIMEOUT_CONTROL_XFER OSAL_TIMEOUT_WAIT_FOREVER #define OSAL_TIMEOUT_CONTROL_XFER OSAL_TIMEOUT_WAIT_FOREVER
typedef void (*osal_task_func_t)( void * );
#if CFG_TUSB_OS == OPT_OS_NONE #if CFG_TUSB_OS == OPT_OS_NONE
#include "osal_none.h" #include "osal_none.h"

2
src/osal/osal_freeRTOS.h
View File

@ -71,7 +71,7 @@ static inline bool in_isr(void)
typedef struct typedef struct
{ {
void (*func)(void *param); osal_task_func_t func;
uint16_t prio; uint16_t prio;
uint16_t stack_sz; uint16_t stack_sz;

2
src/osal/osal_none.h
View File

@ -68,7 +68,7 @@
#define OSAL_TASK_DEF(_name, _str, _func, _prio, _stack_sz) osal_task_def_t _name; #define OSAL_TASK_DEF(_name, _str, _func, _prio, _stack_sz) osal_task_def_t _name;
typedef uint8_t osal_task_def_t; typedef uint8_t osal_task_def_t;
typedef void* osal_task_t; typedef void* osal_task_t;
static inline osal_task_t osal_task_create(osal_task_def_t* taskdef) static inline osal_task_t osal_task_create(osal_task_def_t* taskdef)
{ {