diff options
| author | hathach <[email protected]> | 2014-03-31 11:26:41 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2014-03-31 11:26:41 +0700 |
| commit | 0bb2cc64b0e1248bfc8e564755a0850b5e5ad762 (patch) | |
| tree | 7a3c1d73ce2cb9f05acbb930b5490a0d93f97234 /demos/device/src | |
| parent | 538c2bd6983938ecfb8b5ef6e9d2caaab853c3e7 (diff) | |
device_freertos/.cproject works well with msc & keyboard
Diffstat (limited to 'demos/device/src')
| -rw-r--r-- | demos/device/src/cdc_device_app.c | 3 | ||||
| -rw-r--r-- | demos/device/src/keyboard_device_app.c | 3 | ||||
| -rw-r--r-- | demos/device/src/msc_device_app.c | 1 | ||||
| -rw-r--r-- | demos/device/src/tusb_config.h | 4 |
4 files changed, 7 insertions, 4 deletions
diff --git a/demos/device/src/cdc_device_app.c b/demos/device/src/cdc_device_app.c index d4f295d76..543f30b1c 100644 --- a/demos/device/src/cdc_device_app.c +++ b/demos/device/src/cdc_device_app.c @@ -41,6 +41,7 @@ #if TUSB_CFG_DEVICE_CDC
#include "common/fifo.h" // TODO refractor
+#include "app_os_prio.h"
//--------------------------------------------------------------------+
// INCLUDE
@@ -52,7 +53,7 @@ enum { //--------------------------------------------------------------------+
// MACRO CONSTANT TYPEDEF
//--------------------------------------------------------------------+
-OSAL_TASK_DEF(cdcd_serial_app_task, 128, CDCD_SERIAL_APP_TASK_PRIO);
+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;
diff --git a/demos/device/src/keyboard_device_app.c b/demos/device/src/keyboard_device_app.c index 64be878ea..c3096a247 100644 --- a/demos/device/src/keyboard_device_app.c +++ b/demos/device/src/keyboard_device_app.c @@ -42,6 +42,7 @@ //--------------------------------------------------------------------+
// INCLUDE
//--------------------------------------------------------------------+
+#include "app_os_prio.h"
//--------------------------------------------------------------------+
// MACRO CONSTANT TYPEDEF
@@ -50,7 +51,7 @@ //--------------------------------------------------------------------+
// INTERNAL OBJECT & FUNCTION DECLARATION
//--------------------------------------------------------------------+
-OSAL_TASK_DEF(keyboard_device_app_task, 128, KEYBOARDD_APP_TASK_PRIO);
+OSAL_TASK_DEF(keyboard_device_app_task, 128, KEYBOARD_APP_TASK_PRIO);
TUSB_CFG_ATTR_USBRAM hid_keyboard_report_t keyboard_report;
diff --git a/demos/device/src/msc_device_app.c b/demos/device/src/msc_device_app.c index 852fdf34e..c6c12eab6 100644 --- a/demos/device/src/msc_device_app.c +++ b/demos/device/src/msc_device_app.c @@ -42,6 +42,7 @@ //--------------------------------------------------------------------+
// INCLUDE
//--------------------------------------------------------------------+
+#include "app_os_prio.h"
//--------------------------------------------------------------------+
// MACRO CONSTANT TYPEDEF
diff --git a/demos/device/src/tusb_config.h b/demos/device/src/tusb_config.h index f7e577685..23c2dfd23 100644 --- a/demos/device/src/tusb_config.h +++ b/demos/device/src/tusb_config.h @@ -62,7 +62,7 @@ #define TUSB_CFG_DEVICE_HID_MOUSE 0
#define TUSB_CFG_DEVICE_HID_GENERIC 0 // not supported yet
#define TUSB_CFG_DEVICE_MSC 1
-#define TUSB_CFG_DEVICE_CDC 1
+#define TUSB_CFG_DEVICE_CDC 0
//--------------------------------------------------------------------+
// COMMON CONFIGURATION
@@ -91,7 +91,7 @@ #if (TUSB_CFG_MCU == MCU_LPC11UXX) || (TUSB_CFG_MCU == MCU_LPC13UXX)
#define TUSB_CFG_ATTR_USBRAM ATTR_SECTION(USBRAM_SECTION) ATTR_ALIGNED(64) // lp11u & lp13u requires data to be 64 byte aligned
#elif (TUSB_CFG_MCU == MCU_LPC175X_6X)
- #define TUSB_CFG_ATTR_USBRAM
+ #define TUSB_CFG_ATTR_USBRAM // LPC17xx USB DMA can access all address
#elif (TUSB_CFG_MCU == MCU_LPC43XX)
#define TUSB_CFG_ATTR_USBRAM // Use keil tool configure to have AHB SRAM as default memory
#endif
|