summaryrefslogtreecommitdiff
path: root/demos/host/src
diff options
context:
space:
mode:
authorhathach <[email protected]>2013-04-25 11:00:56 +0700
committerhathach <[email protected]>2013-04-25 11:00:56 +0700
commite9dbce5f1bfe193884293e7fb555f963c7f2e649 (patch)
treec4d49b49edafcdb42cb67c24ed7aa7c51d393f34 /demos/host/src
parentd4a2600ecc8cdeec26485f8ab564b12de41d6b9b (diff)
add TUSB_CFG_OS_TASK_PRIO to mandatory option for using an RTOS
using plain char for error enum character increase freeRTOS configMAX_PRIORITIES to 16 house keeping & clean up compiler warning
Diffstat (limited to 'demos/host/src')
-rw-r--r--demos/host/src/keyboard_app.c12
-rw-r--r--demos/host/src/main.c5
-rw-r--r--demos/host/src/mouse_app.c4
-rw-r--r--demos/host/src/tusb_config.h1
4 files changed, 20 insertions, 2 deletions
diff --git a/demos/host/src/keyboard_app.c b/demos/host/src/keyboard_app.c
index 889bb0c48..7269d4eba 100644
--- a/demos/host/src/keyboard_app.c
+++ b/demos/host/src/keyboard_app.c
@@ -40,6 +40,8 @@
//--------------------------------------------------------------------+
#include "keyboard_app.h"
+#if TUSB_CFG_HOST_HID_KEYBOARD
+
//--------------------------------------------------------------------+
// MACRO CONSTANT TYPEDEF
//--------------------------------------------------------------------+
@@ -48,11 +50,12 @@
//--------------------------------------------------------------------+
// INTERNAL OBJECT & FUNCTION DECLARATION
//--------------------------------------------------------------------+
-static tusb_keyboard_report_t usb_keyboard_report TUSB_CFG_ATTR_USBRAM;
-
+//OSAL_TASK_DEF(keyboard_task_def, keyboard_app_task, 128, )
OSAL_QUEUE_DEF(queue_kbd_report, QUEUE_KEYBOARD_REPORT_DEPTH, tusb_keyboard_report_t);
static osal_queue_handle_t q_kbd_report_hdl;
+static tusb_keyboard_report_t usb_keyboard_report TUSB_CFG_ATTR_USBRAM;
+
// only convert a-z (case insensitive) + 0-9
static inline uint8_t keycode_to_ascii(uint8_t keycode) ATTR_CONST ATTR_ALWAYS_INLINE;
@@ -91,6 +94,9 @@ void tusbh_hid_keyboard_isr(uint8_t dev_addr, uint8_t instance_num, tusb_event_t
//--------------------------------------------------------------------+
void keyboard_app_init(void)
{
+ memclr_(&usb_keyboard_report, sizeof(tusb_keyboard_report_t));
+
+// ASSERT( osal_task_create() )
q_kbd_report_hdl = osal_queue_create(&queue_kbd_report);
// TODO keyboard_app_task create
@@ -134,3 +140,5 @@ static inline uint8_t keycode_to_ascii(uint8_t keycode)
( KEYBOARD_KEYCODE_1 <= keycode && keycode < KEYBOARD_KEYCODE_0) ? ( (keycode - KEYBOARD_KEYCODE_1) + '1' ) :
( KEYBOARD_KEYCODE_0 == keycode) ? '0' : 'x';
}
+
+#endif
diff --git a/demos/host/src/main.c b/demos/host/src/main.c
index ad7d2c8a5..2c925eb1c 100644
--- a/demos/host/src/main.c
+++ b/demos/host/src/main.c
@@ -28,8 +28,13 @@ int main(void)
tusb_init();
//------------- application task init -------------//
+#if TUSB_CFG_HOST_HID_KEYBOARD
keyboard_app_init();
+#endif
+
+#if TUSB_CFG_HOST_HID_MOUSE
mouse_app_init();
+#endif
while (1)
{
diff --git a/demos/host/src/mouse_app.c b/demos/host/src/mouse_app.c
index 4d81941ab..acafe8d14 100644
--- a/demos/host/src/mouse_app.c
+++ b/demos/host/src/mouse_app.c
@@ -40,6 +40,8 @@
//--------------------------------------------------------------------+
#include "mouse_app.h"
+#if TUSB_CFG_HOST_HID_MOUSE
+
//--------------------------------------------------------------------+
// MACRO CONSTANT TYPEDEF
//--------------------------------------------------------------------+
@@ -118,3 +120,5 @@ OSAL_TASK_FUNCTION( mouse_app_task ) (void* p_task_para)
OSAL_TASK_LOOP_END
}
+
+#endif
diff --git a/demos/host/src/tusb_config.h b/demos/host/src/tusb_config.h
index d6f3c55ef..47cab3e81 100644
--- a/demos/host/src/tusb_config.h
+++ b/demos/host/src/tusb_config.h
@@ -93,6 +93,7 @@
#define TUSB_CFG_DEBUG 3
//#define TUSB_CFG_OS TUSB_OS_NONE // defined using eclipse build
+//#define TUSB_CFG_OS_TASK_PRIO
#define TUSB_CFG_OS_TICKS_PER_SECOND 1000