This commit is contained in:
hathach 2014-03-13 16:17:38 +07:00
parent 8e2d263742
commit 1940f9f0f7
5 changed files with 12 additions and 10 deletions

View File

@ -57,6 +57,7 @@
#endif #endif
#define CFG_PRINTF_TARGET PRINTF_TARGET_UART #define CFG_PRINTF_TARGET PRINTF_TARGET_UART
//#define CFG_PRINTF_TARGET PRINTF_TARGET_SWO
#ifdef __cplusplus #ifdef __cplusplus
} }

View File

@ -706,7 +706,7 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>9</ColumnNumber> <ColumnNumber>9</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>5</TopLine> <TopLine>6</TopLine>
<CurrentLine>11</CurrentLine> <CurrentLine>11</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\src\main.c</PathWithFileName> <PathWithFileName>..\src\main.c</PathWithFileName>
@ -1168,10 +1168,10 @@
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>19</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>41</TopLine> <TopLine>42</TopLine>
<CurrentLine>49</CurrentLine> <CurrentLine>51</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c</PathWithFileName> <PathWithFileName>..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c</PathWithFileName>
<FilenameWithoutPath>FreeRTOSCommonHooks.c</FilenameWithoutPath> <FilenameWithoutPath>FreeRTOSCommonHooks.c</FilenameWithoutPath>

View File

@ -918,7 +918,7 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>1</ColumnNumber> <ColumnNumber>1</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>106</TopLine> <TopLine>107</TopLine>
<CurrentLine>114</CurrentLine> <CurrentLine>114</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\src\main.c</PathWithFileName> <PathWithFileName>..\src\main.c</PathWithFileName>
@ -998,7 +998,7 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>139</TopLine> <TopLine>140</TopLine>
<CurrentLine>149</CurrentLine> <CurrentLine>149</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\src\msc_app.c</PathWithFileName> <PathWithFileName>..\src\msc_app.c</PathWithFileName>
@ -1014,7 +1014,7 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>40</ColumnNumber> <ColumnNumber>40</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>228</TopLine> <TopLine>229</TopLine>
<CurrentLine>238</CurrentLine> <CurrentLine>238</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\src\cli.c</PathWithFileName> <PathWithFileName>..\src\cli.c</PathWithFileName>
@ -1462,7 +1462,7 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>43</ColumnNumber> <ColumnNumber>43</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>5</TopLine> <TopLine>6</TopLine>
<CurrentLine>15</CurrentLine> <CurrentLine>15</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\..\..\vendor\fatfs\diskio.c</PathWithFileName> <PathWithFileName>..\..\..\vendor\fatfs\diskio.c</PathWithFileName>

View File

@ -115,12 +115,13 @@ void keyboard_app_init(void)
//------------- main task -------------// //------------- main task -------------//
OSAL_TASK_FUNCTION( keyboard_app_task ) (void* p_task_para) OSAL_TASK_FUNCTION( keyboard_app_task ) (void* p_task_para)
{ {
tusb_error_t error;
hid_keyboard_report_t kbd_report; hid_keyboard_report_t kbd_report;
tusb_error_t error;
OSAL_TASK_LOOP_BEGIN OSAL_TASK_LOOP_BEGIN
osal_queue_receive(queue_kbd_hdl, &kbd_report, OSAL_TIMEOUT_WAIT_FOREVER, &error); osal_queue_receive(queue_kbd_hdl, &kbd_report, OSAL_TIMEOUT_WAIT_FOREVER, &error);
(void) error; // suppress compiler warning
process_kbd_report(&kbd_report); process_kbd_report(&kbd_report);

View File

@ -102,7 +102,7 @@
#elif defined __ICCARM__ // compiled with IAR #elif defined __ICCARM__ // compiled with IAR
#if (TUSB_CFG_MCU == MCU_LPC43XX) #if (TUSB_CFG_MCU == MCU_LPC43XX)
#define TUSB_CFG_ATTR_USBRAM _Pragma("location=\".ahb_sram2\"") // some mcu like 4330 ahb_sram1 is used for heap/stack in IAR #define TUSB_CFG_ATTR_USBRAM _Pragma("location=\".ahb_sram1\"")
#elif (TUSB_CFG_MCU == MCU_LPC175X_6X) #elif (TUSB_CFG_MCU == MCU_LPC175X_6X)
#define TUSB_CFG_ATTR_USBRAM #define TUSB_CFG_ATTR_USBRAM
#endif #endif