osal clean up

- task create, task def macros

9 files changed, 20 insertions, 16 deletions

diff --git a/demos/device/src/cdc_device_app.c b/demos/device/src/cdc_device_app.c
index d305732d9..209cefba3 100644
--- a/demos/device/src/cdc_device_app.c
+++ b/demos/device/src/cdc_device_app.c
@@ -51,7 +51,6 @@ enum { SERIAL_BUFFER_SIZE = 64 };
 //--------------------------------------------------------------------+

 // MACRO CONSTANT TYPEDEF

 //--------------------------------------------------------------------+

-OSAL_TASK_DEF(cdcd_serial_app_task, 128, CDC_SERIAL_APP_TASK_PRIO);

 OSAL_SEM_DEF(cdcd_semaphore);

 

 static osal_semaphore_handle_t sem_hdl;

@@ -119,11 +118,13 @@ void cdcd_serial_app_init(void)
   sem_hdl = osal_semaphore_create( OSAL_SEM_REF(cdcd_semaphore) );

   ASSERT_PTR( sem_hdl, VOID_RETURN);

 

-  ASSERT( TUSB_ERROR_NONE == osal_task_create( OSAL_TASK_REF(cdcd_serial_app_task) ), VOID_RETURN);

+  osal_task_create(cdcd_serial_app_task, "cdc", 128, NULL, CDC_SERIAL_APP_TASK_PRIO, NULL);

 }

 

-OSAL_TASK_FUNCTION( cdcd_serial_app_task , p_task_para)

+void cdcd_serial_app_task(void* param)

 {

+  (void) param;

+

   OSAL_TASK_LOOP_BEGIN

 

   tusb_error_t error;

diff --git a/demos/device/src/cdc_device_app.h b/demos/device/src/cdc_device_app.h
index 61931a3a5..19941bbac 100644
--- a/demos/device/src/cdc_device_app.h
+++ b/demos/device/src/cdc_device_app.h
@@ -56,7 +56,7 @@
 #if TUSB_CFG_DEVICE_CDC

 

 void cdcd_serial_app_init(void);

-OSAL_TASK_FUNCTION( cdcd_serial_app_task , p_task_para);

+void cdcd_serial_app_task(void* param);

 

 #else

 

diff --git a/demos/device/src/keyboard_device_app.c b/demos/device/src/keyboard_device_app.c
index f4c3691be..dc3707559 100644
--- a/demos/device/src/keyboard_device_app.c
+++ b/demos/device/src/keyboard_device_app.c
@@ -51,8 +51,6 @@
 //--------------------------------------------------------------------+

 // INTERNAL OBJECT & FUNCTION DECLARATION

 //--------------------------------------------------------------------+

-OSAL_TASK_DEF(keyboard_device_app_task, 128, KEYBOARD_APP_TASK_PRIO);

-

 TUSB_CFG_ATTR_USBRAM hid_keyboard_report_t keyboard_report;

 

 //--------------------------------------------------------------------+

@@ -108,11 +106,13 @@ void tusbd_hid_keyboard_set_report_cb(uint8_t coreid, hid_request_report_type_t
 //--------------------------------------------------------------------+

 void keyboard_device_app_init(void)

 {

-  ASSERT( TUSB_ERROR_NONE == osal_task_create( OSAL_TASK_REF(keyboard_device_app_task) ), VOID_RETURN);

+  osal_task_create(keyboard_device_app_task, "kbd", 128, NULL, KEYBOARD_APP_TASK_PRIO, NULL);

 }

 

-OSAL_TASK_FUNCTION( keyboard_device_app_task , p_task_para)

+void keyboard_device_app_task(void* param)

 {

+  (void) param;

+

   OSAL_TASK_LOOP_BEGIN

 

   osal_task_delay(50);

diff --git a/demos/device/src/keyboard_device_app.h b/demos/device/src/keyboard_device_app.h
index bb200162c..3eeb6b48b 100644
--- a/demos/device/src/keyboard_device_app.h
+++ b/demos/device/src/keyboard_device_app.h
@@ -56,7 +56,7 @@
 #if TUSB_CFG_DEVICE_HID_KEYBOARD

 

 void keyboard_device_app_init(void);

-OSAL_TASK_FUNCTION( keyboard_device_app_task , p_task_para);

+void keyboard_device_app_task(void* param);

 

 #else

 

diff --git a/demos/device/src/mouse_device_app.c b/demos/device/src/mouse_device_app.c
index 49469ab8e..8f395d901 100644
--- a/demos/device/src/mouse_device_app.c
+++ b/demos/device/src/mouse_device_app.c
@@ -51,8 +51,6 @@
 //--------------------------------------------------------------------+

 // INTERNAL OBJECT & FUNCTION DECLARATION

 //--------------------------------------------------------------------+

-OSAL_TASK_DEF(mouse_device_app_task, 128, MOUSE_APP_TASK_PRIO);

-

 TUSB_CFG_ATTR_USBRAM hid_mouse_report_t mouse_report;

 

 //--------------------------------------------------------------------+

@@ -97,11 +95,13 @@ void tusbd_hid_mouse_set_report_cb(uint8_t coreid, hid_request_report_type_t rep
 //--------------------------------------------------------------------+

 void mouse_device_app_init(void)

 {

-  ASSERT( TUSB_ERROR_NONE == osal_task_create( OSAL_TASK_REF(mouse_device_app_task) ), VOID_RETURN);

+  osal_task_create(mouse_device_app_task, "mouse", 128, NULL, MOUSE_APP_TASK_PRIO, NULL);

 }

 

-OSAL_TASK_FUNCTION( mouse_device_app_task , p_task_para)

+void mouse_device_app_task(void * param)

 {

+  (void) para;

+

   OSAL_TASK_LOOP_BEGIN

 

   osal_task_delay(20);

diff --git a/demos/device/src/mouse_device_app.h b/demos/device/src/mouse_device_app.h
index 511c61833..7c90b68a4 100644
--- a/demos/device/src/mouse_device_app.h
+++ b/demos/device/src/mouse_device_app.h
@@ -56,7 +56,7 @@
 #if TUSB_CFG_DEVICE_HID_MOUSE

 

 void mouse_device_app_init(void);

-OSAL_TASK_FUNCTION( mouse_device_app_task , p_task_para);

+void mouse_device_app_task(void * param);

 

 #else

 

diff --git a/demos/device/src/msc_device_app.c b/demos/device/src/msc_device_app.c
index e1b91295c..a421825a1 100644
--- a/demos/device/src/msc_device_app.c
+++ b/demos/device/src/msc_device_app.c
@@ -156,8 +156,10 @@ msc_csw_status_t tusbd_msc_scsi_cb (uint8_t coreid, uint8_t lun, uint8_t scsi_cm
 //--------------------------------------------------------------------+

 // APPLICATION CODE

 //--------------------------------------------------------------------+

-OSAL_TASK_FUNCTION( msc_device_app_task , p_task_para)

+void msc_device_app_task(void* param)

 { // no need to implement the task yet

+  (void) param;

+

   OSAL_TASK_LOOP_BEGIN

 

   OSAL_TASK_LOOP_END

diff --git a/demos/device/src/msc_device_app.h b/demos/device/src/msc_device_app.h
index 7020d933a..3ab38241e 100644
--- a/demos/device/src/msc_device_app.h
+++ b/demos/device/src/msc_device_app.h
@@ -70,7 +70,7 @@ issue at github.com/hathach/tinyusb"
 #endif

 

 void msc_device_app_init(void);

-OSAL_TASK_FUNCTION( msc_device_app_task , p_task_para);

+void msc_device_app_task(void* param);

 

 extern scsi_sense_fixed_data_t mscd_sense_data;

 

diff --git a/demos/device/src/tusb_config.h b/demos/device/src/tusb_config.h
index f653b85fd..96dcb3ad8 100644
--- a/demos/device/src/tusb_config.h
+++ b/demos/device/src/tusb_config.h
@@ -49,6 +49,7 @@
 //#define TUSB_CFG_MCU will be passed from IDE/command line for easy board/mcu switching

 

 #define TUSB_CFG_CONTROLLER_0_MODE  (TUSB_MODE_DEVICE)

+//#define TUSB_CFG_CONTROLLER_1_MODE  (TUSB_MODE_DEVICE)

 

 //--------------------------------------------------------------------+

 // DEVICE CONFIGURATION