summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhathach <[email protected]>2014-03-13 16:17:38 +0700
committerhathach <[email protected]>2014-03-13 16:17:38 +0700
commit1940f9f0f79a98a35c0cbbdd72125f729770af61 (patch)
tree9ba18e9e50f1a62086ceb8e0d2645af73f43ec81
parent8e2d26374253b7349784a9c33a86fc8d5b1c7100 (diff)
clean up
-rw-r--r--boards/ngx/board_ngx4330.h1
-rw-r--r--demos/host/host_freertos/host_freertos.uvopt8
-rw-r--r--demos/host/host_os_none/host_os_none.uvopt8
-rw-r--r--demos/host/src/keyboard_app.c3
-rw-r--r--demos/host/src/tusb_config.h2
5 files changed, 12 insertions, 10 deletions
diff --git a/boards/ngx/board_ngx4330.h b/boards/ngx/board_ngx4330.h
index 3ac30ecb8..7d9132315 100644
--- a/boards/ngx/board_ngx4330.h
+++ b/boards/ngx/board_ngx4330.h
@@ -57,6 +57,7 @@
#endif
#define CFG_PRINTF_TARGET PRINTF_TARGET_UART
+//#define CFG_PRINTF_TARGET PRINTF_TARGET_SWO
#ifdef __cplusplus
}
diff --git a/demos/host/host_freertos/host_freertos.uvopt b/demos/host/host_freertos/host_freertos.uvopt
index ea04b496e..c72b1b5fd 100644
--- a/demos/host/host_freertos/host_freertos.uvopt
+++ b/demos/host/host_freertos/host_freertos.uvopt
@@ -706,7 +706,7 @@
<Focus>0</Focus>
<ColumnNumber>9</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
- <TopLine>5</TopLine>
+ <TopLine>6</TopLine>
<CurrentLine>11</CurrentLine>
<bDave2>0</bDave2>
<PathWithFileName>..\src\main.c</PathWithFileName>
@@ -1168,10 +1168,10 @@
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
- <ColumnNumber>0</ColumnNumber>
+ <ColumnNumber>19</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
- <TopLine>41</TopLine>
- <CurrentLine>49</CurrentLine>
+ <TopLine>42</TopLine>
+ <CurrentLine>51</CurrentLine>
<bDave2>0</bDave2>
<PathWithFileName>..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c</PathWithFileName>
<FilenameWithoutPath>FreeRTOSCommonHooks.c</FilenameWithoutPath>
diff --git a/demos/host/host_os_none/host_os_none.uvopt b/demos/host/host_os_none/host_os_none.uvopt
index 5b7d18262..fb45378ed 100644
--- a/demos/host/host_os_none/host_os_none.uvopt
+++ b/demos/host/host_os_none/host_os_none.uvopt
@@ -918,7 +918,7 @@
<Focus>0</Focus>
<ColumnNumber>1</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
- <TopLine>106</TopLine>
+ <TopLine>107</TopLine>
<CurrentLine>114</CurrentLine>
<bDave2>0</bDave2>
<PathWithFileName>..\src\main.c</PathWithFileName>
@@ -998,7 +998,7 @@
<Focus>0</Focus>
<ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
- <TopLine>139</TopLine>
+ <TopLine>140</TopLine>
<CurrentLine>149</CurrentLine>
<bDave2>0</bDave2>
<PathWithFileName>..\src\msc_app.c</PathWithFileName>
@@ -1014,7 +1014,7 @@
<Focus>0</Focus>
<ColumnNumber>40</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
- <TopLine>228</TopLine>
+ <TopLine>229</TopLine>
<CurrentLine>238</CurrentLine>
<bDave2>0</bDave2>
<PathWithFileName>..\src\cli.c</PathWithFileName>
@@ -1462,7 +1462,7 @@
<Focus>0</Focus>
<ColumnNumber>43</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
- <TopLine>5</TopLine>
+ <TopLine>6</TopLine>
<CurrentLine>15</CurrentLine>
<bDave2>0</bDave2>
<PathWithFileName>..\..\..\vendor\fatfs\diskio.c</PathWithFileName>
diff --git a/demos/host/src/keyboard_app.c b/demos/host/src/keyboard_app.c
index c004059ef..07e65ce7b 100644
--- a/demos/host/src/keyboard_app.c
+++ b/demos/host/src/keyboard_app.c
@@ -115,12 +115,13 @@ void keyboard_app_init(void)
//------------- main task -------------//
OSAL_TASK_FUNCTION( keyboard_app_task ) (void* p_task_para)
{
- tusb_error_t error;
hid_keyboard_report_t kbd_report;
+ tusb_error_t error;
OSAL_TASK_LOOP_BEGIN
osal_queue_receive(queue_kbd_hdl, &kbd_report, OSAL_TIMEOUT_WAIT_FOREVER, &error);
+ (void) error; // suppress compiler warning
process_kbd_report(&kbd_report);
diff --git a/demos/host/src/tusb_config.h b/demos/host/src/tusb_config.h
index 82e8124af..13362054c 100644
--- a/demos/host/src/tusb_config.h
+++ b/demos/host/src/tusb_config.h
@@ -102,7 +102,7 @@
#elif defined __ICCARM__ // compiled with IAR
#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)
#define TUSB_CFG_ATTR_USBRAM
#endif