From 9b7cd608aa4addf40cbe2135b38a78378e6f428f Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 28 Feb 2018 14:21:31 +0700 Subject: [PATCH] osal clean up - task create, task def macros --- boards/board.c | 7 +- boards/board.h | 2 +- demos/device/device_freertos/.cproject | 266 ++++++++++++----------- demos/device/device_os_none/.cproject | 285 ++++++++++++++----------- demos/device/src/cdc_device_app.c | 7 +- demos/device/src/cdc_device_app.h | 2 +- demos/device/src/keyboard_device_app.c | 8 +- demos/device/src/keyboard_device_app.h | 2 +- demos/device/src/mouse_device_app.c | 8 +- demos/device/src/mouse_device_app.h | 2 +- demos/device/src/msc_device_app.c | 4 +- demos/device/src/msc_device_app.h | 2 +- demos/device/src/tusb_config.h | 1 + tinyusb/common/common.h | 1 + tinyusb/common/tusb_errors.h | 1 - tinyusb/device/usbd.c | 17 +- tinyusb/device/usbd.h | 2 +- tinyusb/osal/osal.h | 6 + tinyusb/osal/osal_freeRTOS.h | 13 +- tinyusb/osal/osal_none.h | 11 +- 20 files changed, 360 insertions(+), 287 deletions(-) diff --git a/boards/board.c b/boards/board.c index e107d68fb..75529f3a9 100644 --- a/boards/board.c +++ b/boards/board.c @@ -58,13 +58,12 @@ uint32_t tusb_tick_get(void) //--------------------------------------------------------------------+ // BLINKING TASK //--------------------------------------------------------------------+ -OSAL_TASK_DEF(led_blinking_task, 128, LED_BLINKING_APP_TASK_PRIO); static uint32_t led_blink_interval_ms = 1000; // default is 1 second void led_blinking_init(void) { led_blink_interval_ms = 1000; - ASSERT(TUSB_ERROR_NONE == osal_task_create( OSAL_TASK_REF(led_blinking_task) ), VOID_RETURN ); + osal_task_create(led_blinking_task, "blinky", 128, NULL, LED_BLINKING_APP_TASK_PRIO, NULL); } void led_blinking_set_interval(uint32_t ms) @@ -72,8 +71,10 @@ void led_blinking_set_interval(uint32_t ms) led_blink_interval_ms = ms; } -OSAL_TASK_FUNCTION( led_blinking_task , p_task_para) +void led_blinking_task(void* param) { + (void) param; + OSAL_TASK_LOOP_BEGIN static uint32_t led_on_mask = 0; diff --git a/boards/board.h b/boards/board.h index f14e4e663..da2e03dd6 100644 --- a/boards/board.h +++ b/boards/board.h @@ -155,7 +155,7 @@ void board_uart_putchar(uint8_t c); /** @} */ //------------- Board Application -------------// -OSAL_TASK_FUNCTION( led_blinking_task , p_task_para); +void led_blinking_task(void* param); /// Initialize the LED blinking task application. The initial blinking rate is 1 Hert (1 per second) void led_blinking_init(void); diff --git a/demos/device/device_freertos/.cproject b/demos/device/device_freertos/.cproject index c63f16a30..3f821ed22 100644 --- a/demos/device/device_freertos/.cproject +++ b/demos/device/device_freertos/.cproject @@ -4,20 +4,20 @@ - + + + - - @@ -80,6 +80,7 @@