add attribute warn unused result for osal_create_* function

taskify keyboard_app mouse_app & led_blinking

3 files changed, 111 insertions, 23 deletions

diff --git a/demos/host/src/keyboard_app.c b/demos/host/src/keyboard_app.c
index 7269d4eba..6bf075bb6 100644
--- a/demos/host/src/keyboard_app.c
+++ b/demos/host/src/keyboard_app.c
@@ -50,7 +50,8 @@
 //--------------------------------------------------------------------+
 // INTERNAL OBJECT & FUNCTION DECLARATION
 //--------------------------------------------------------------------+
-//OSAL_TASK_DEF(keyboard_task_def, keyboard_app_task, 128, )
+OSAL_TASK_DEF(keyboard_task_def, keyboard_app_task, 128, KEYBOARD_APP_TASK_PRIO);
+
 OSAL_QUEUE_DEF(queue_kbd_report, QUEUE_KEYBOARD_REPORT_DEPTH, tusb_keyboard_report_t);
 static osal_queue_handle_t q_kbd_report_hdl;
 
@@ -96,10 +97,9 @@ void keyboard_app_init(void)
 {
   memclr_(&usb_keyboard_report, sizeof(tusb_keyboard_report_t));
 
-//  ASSERT( osal_task_create() )
+  ASSERT( TUSB_ERROR_NONE == osal_task_create(&keyboard_task_def), (void) 0 );
   q_kbd_report_hdl = osal_queue_create(&queue_kbd_report);
-
-  // TODO keyboard_app_task create
+  ASSERT_PTR( q_kbd_report_hdl, (void) 0 );
 }
 
 //------------- main task -------------//
diff --git a/demos/host/src/main.c b/demos/host/src/main.c
index 2c925eb1c..edd037c2d 100644
--- a/demos/host/src/main.c
+++ b/demos/host/src/main.c
@@ -1,3 +1,43 @@
+/*
+ * main.c
+ *
+ *  Created on: Mar 24, 2013
+ *      Author: hathach
+ */
+
+/*
+ * Software License Agreement (BSD License)
+ * Copyright (c) 2012, hathach (tinyusb.org)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the tiny usb stack.
+ */
+
+//--------------------------------------------------------------------+
+// INCLUDE
+//--------------------------------------------------------------------+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -17,17 +57,32 @@
   __CRP const unsigned int CRP_WORD = CRP_NO_CRP ;
 #endif
 
+//--------------------------------------------------------------------+
+// MACRO CONSTANT TYPEDEF
+//--------------------------------------------------------------------+
+
+//--------------------------------------------------------------------+
+// INTERNAL OBJECT & FUNCTION DECLARATION
+//--------------------------------------------------------------------+
 void print_greeting(void);
+
+OSAL_TASK_FUNCTION( led_blinking_task ) (void* p_task_para);
+OSAL_TASK_DEF(led_blinking_task_def, led_blinking_task, 128, LED_BLINKING_APP_TASK_PRIO);
+
+//--------------------------------------------------------------------+
+// IMPLEMENTATION
+//--------------------------------------------------------------------+
+
 int main(void)
 {
-  uint32_t current_tick = system_ticks;
-
   board_init();
   print_greeting();
 
   tusb_init();
 
   //------------- application task init -------------//
+  (void) osal_task_create(&led_blinking_task_def);
+
 #if TUSB_CFG_HOST_HID_KEYBOARD
   keyboard_app_init();
 #endif
@@ -36,34 +91,36 @@ int main(void)
   mouse_app_init();
 #endif
 
+  //------------- start OS scheduler -------------//
+#if TUSB_CFG_OS == TUSB_OS_FREERTOS
+  vTaskStartScheduler();
+
+#elif TUSB_CFG_OS == TUSB_OS_NONE
+
   while (1)
   {
-
-#if TUSB_CFG_OS == TUSB_OS_NONE
     tusb_task_runner();
     keyboard_app_task(NULL);
     mouse_app_task(NULL);
+    led_blinking_task(NULL);
+  }
+#else
+  #error need to start RTOS schduler
 #endif
 
-    if (current_tick + CFG_TICKS_PER_SECOND < system_ticks)
-    {
-      current_tick += CFG_TICKS_PER_SECOND;
+  //------------- this part of code should not be reached -------------//
+  hal_debugger_breakpoint();
+  while(1)
+  {
 
-      /* Toggle LED once per second */
-      if ( (current_tick/CFG_TICKS_PER_SECOND) % 2)
-      {
-        board_leds(0x01, 0x00);
-      }
-      else
-      {
-        board_leds(0x00, 0x01);
-      }
-    }
   }
 
   return 0;
 }
 
+//--------------------------------------------------------------------+
+// HELPER FUNCTION
+//--------------------------------------------------------------------+
 void print_greeting(void)
 {
   printf("\r\n\
@@ -74,3 +131,28 @@ void print_greeting(void)
 --------------------------------------------------------------------\r\n\r\n"
   );
 }
+
+OSAL_TASK_FUNCTION( led_blinking_task ) (void* p_task_para)
+{
+  static uint32_t current_tick = 0;
+
+  OSAL_TASK_LOOP_BEGIN
+
+  if (current_tick + CFG_TICKS_PER_SECOND < system_ticks)
+  {
+    current_tick += CFG_TICKS_PER_SECOND;
+
+    /* Toggle LED once per second */
+    if ( (current_tick/CFG_TICKS_PER_SECOND) % 2)
+    {
+      board_leds(0x01, 0x00);
+    }
+    else
+    {
+      board_leds(0x00, 0x01);
+    }
+  }
+
+  OSAL_TASK_LOOP_END
+}
+
diff --git a/demos/host/src/mouse_app.c b/demos/host/src/mouse_app.c
index acafe8d14..18ebe4e68 100644
--- a/demos/host/src/mouse_app.c
+++ b/demos/host/src/mouse_app.c
@@ -50,11 +50,13 @@
 //--------------------------------------------------------------------+
 // INTERNAL OBJECT & FUNCTION DECLARATION
 //--------------------------------------------------------------------+
-static tusb_mouse_report_t usb_mouse_report TUSB_CFG_ATTR_USBRAM;
+OSAL_TASK_DEF(mouse_task_def, mouse_app_task, 128, MOUSE_APP_TASK_PRIO);
 
 OSAL_QUEUE_DEF(queue_mouse_report, QUEUE_MOUSE_REPORT_DEPTH, tusb_mouse_report_t);
 static osal_queue_handle_t q_mouse_report_hdl;
 
+static tusb_mouse_report_t usb_mouse_report TUSB_CFG_ATTR_USBRAM;
+
 //--------------------------------------------------------------------+
 // tinyusb callback (ISR context)
 //--------------------------------------------------------------------+
@@ -92,9 +94,13 @@ void tusbh_hid_mouse_isr(uint8_t dev_addr, uint8_t instance_num, tusb_event_t ev
 //--------------------------------------------------------------------+
 void mouse_app_init(void)
 {
+  memclr_(&usb_mouse_report, sizeof(tusb_mouse_report_t));
+
+  ASSERT( TUSB_ERROR_NONE == osal_task_create(&mouse_task_def), (void) 0 );
+
   q_mouse_report_hdl = osal_queue_create(&queue_mouse_report);
+  ASSERT_PTR( q_mouse_report_hdl, (void) 0 );
 
-  // TODO mouse_app_task create
 }
 
 //------------- main task -------------//