clean up

2 files changed, 7 insertions, 3 deletions

diff --git a/src/device/usbd.c b/src/device/usbd.c
index 4332c2925..0f6cebc6c 100644
--- a/src/device/usbd.c
+++ b/src/device/usbd.c
@@ -182,7 +182,7 @@ typedef struct ATTR_ALIGNED(4)
 

     // USBD_EVT_FUNC_CALL

     struct {

-      void (*func)(void*);

+      osal_task_func_t func;

       void* param;

     }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

   {

     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;

 }

 

-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 =

   {

diff --git a/src/device/usbd_pvt.h b/src/device/usbd_pvt.h
index 4632fc52b..8189d5811 100644
--- a/src/device/usbd_pvt.h
+++ b/src/device/usbd_pvt.h
@@ -76,7 +76,7 @@ tusb_error_t usbd_open_edpt_pair(uint8_t rhport, tusb_desc_endpoint_t const* p_d
 /*------------------------------------------------------------------*/
 /* 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