summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhathach <[email protected]>2014-03-12 16:33:33 +0700
committerhathach <[email protected]>2014-03-12 16:33:33 +0700
commit1ad138e322073dd47d1401f084035edf32509624 (patch)
treef3cb84747ad3c0c3af217582d29c870a62ca953c
parent6ceb992f2c06d2f34cab8910db48ecf464724ccf (diff)
fix IAR end line warning
-rw-r--r--demos/host/host_os_none/host_os_none.ewp4
-rw-r--r--demos/host/host_os_none/host_os_none.uvopt34
-rw-r--r--vendor/fatfs/diskio.c2
-rw-r--r--vendor/fatfs/ff.c8
4 files changed, 24 insertions, 24 deletions
diff --git a/demos/host/host_os_none/host_os_none.ewp b/demos/host/host_os_none/host_os_none.ewp
index 3fb25d72b..d13ef942a 100644
--- a/demos/host/host_os_none/host_os_none.ewp
+++ b/demos/host/host_os_none/host_os_none.ewp
@@ -1026,7 +1026,7 @@
</option>
<option>
<name>GenLowLevelInterface</name>
- <state>0</state>
+ <state>1</state>
</option>
<option>
<name>GEndianModeBE</name>
@@ -1070,7 +1070,7 @@
</option>
<option>
<name>OGUseCmsis</name>
- <state>1</state>
+ <state>0</state>
</option>
<option>
<name>OGUseCmsisDspLib</name>
diff --git a/demos/host/host_os_none/host_os_none.uvopt b/demos/host/host_os_none/host_os_none.uvopt
index 178b94254..da3b12632 100644
--- a/demos/host/host_os_none/host_os_none.uvopt
+++ b/demos/host/host_os_none/host_os_none.uvopt
@@ -629,7 +629,7 @@
<DebugFlag>
<trace>0</trace>
<periodic>1</periodic>
- <aLwin>0</aLwin>
+ <aLwin>1</aLwin>
<aCover>0</aCover>
<aSer1>0</aSer1>
<aSer2>0</aSer2>
@@ -646,7 +646,7 @@
<aLa>0</aLa>
<aPa1>0</aPa1>
<AscS4>0</AscS4>
- <aSer4>0</aSer4>
+ <aSer4>1</aSer4>
<StkLoc>0</StkLoc>
<TrcWin>0</TrcWin>
<newCpu>0</newCpu>
@@ -916,10 +916,10 @@
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
- <ColumnNumber>6</ColumnNumber>
+ <ColumnNumber>22</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
- <TopLine>139</TopLine>
- <CurrentLine>145</CurrentLine>
+ <TopLine>101</TopLine>
+ <CurrentLine>107</CurrentLine>
<bDave2>0</bDave2>
<PathWithFileName>..\src\main.c</PathWithFileName>
<FilenameWithoutPath>main.c</FilenameWithoutPath>
@@ -1012,10 +1012,10 @@
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
- <ColumnNumber>21</ColumnNumber>
+ <ColumnNumber>40</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
- <TopLine>382</TopLine>
- <CurrentLine>394</CurrentLine>
+ <TopLine>190</TopLine>
+ <CurrentLine>238</CurrentLine>
<bDave2>0</bDave2>
<PathWithFileName>..\src\cli.c</PathWithFileName>
<FilenameWithoutPath>cli.c</FilenameWithoutPath>
@@ -1460,10 +1460,10 @@
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
- <ColumnNumber>39</ColumnNumber>
+ <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
- <TopLine>62</TopLine>
- <CurrentLine>63</CurrentLine>
+ <TopLine>1</TopLine>
+ <CurrentLine>1</CurrentLine>
<bDave2>0</bDave2>
<PathWithFileName>..\..\..\vendor\fatfs\diskio.c</PathWithFileName>
<FilenameWithoutPath>diskio.c</FilenameWithoutPath>
@@ -1476,10 +1476,10 @@
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
- <ColumnNumber>17</ColumnNumber>
+ <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
- <TopLine>2118</TopLine>
- <CurrentLine>2122</CurrentLine>
+ <TopLine>1</TopLine>
+ <CurrentLine>1</CurrentLine>
<bDave2>0</bDave2>
<PathWithFileName>..\..\..\vendor\fatfs\ff.c</PathWithFileName>
<FilenameWithoutPath>ff.c</FilenameWithoutPath>
@@ -1900,10 +1900,10 @@
<FileType>2</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
- <ColumnNumber>20</ColumnNumber>
+ <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
- <TopLine>139</TopLine>
- <CurrentLine>158</CurrentLine>
+ <TopLine>123</TopLine>
+ <CurrentLine>129</CurrentLine>
<bDave2>0</bDave2>
<PathWithFileName>..\..\bsp\lpc175x_6x\startup_keil\startup_LPC17xx.s</PathWithFileName>
<FilenameWithoutPath>startup_LPC17xx.s</FilenameWithoutPath>
diff --git a/vendor/fatfs/diskio.c b/vendor/fatfs/diskio.c
index 8d6794d47..ffcbbdfd0 100644
--- a/vendor/fatfs/diskio.c
+++ b/vendor/fatfs/diskio.c
@@ -105,7 +105,7 @@ DSTATUS disk_status (BYTE pdrv)
DRESULT disk_read (BYTE pdrv, BYTE*buff, DWORD sector, BYTE count)
{
uint8_t usb_addr = pdrv+1;
-
+
if ( TUSB_ERROR_NONE != tusbh_msc_read10(usb_addr, 0, buff, sector, count) ) return RES_ERROR;
return wait_for_io_complete(usb_addr);
diff --git a/vendor/fatfs/ff.c b/vendor/fatfs/ff.c
index 28aca2b59..ee2b6c0f7 100644
--- a/vendor/fatfs/ff.c
+++ b/vendor/fatfs/ff.c
@@ -736,7 +736,7 @@ FRESULT sync_window (
DWORD wsect;
UINT nf;
-
+
if (fs->wflag) { /* Write back the sector if it is dirty */
wsect = fs->winsect; /* Current sector number */
if (disk_write(fs->drv, fs->win, wsect, 1) != RES_OK)
@@ -975,7 +975,7 @@ FRESULT remove_chain (
#if _USE_ERASE
if (ecl + 1 == nxt) { /* Is next cluster contiguous? */
ecl = nxt;
- } else { /* End of contiguous clusters */
+ } else { /* End of contiguous clusters */
rt[0] = clust2sect(fs, scl); /* Start sector */
rt[1] = clust2sect(fs, ecl) + fs->csize - 1; /* End sector */
disk_ioctl(fs->drv, CTRL_ERASE_SECTOR, rt); /* Erase the block */
@@ -2729,7 +2729,7 @@ FRESULT f_close (
FATFS *fs = fp->fs;;
res = validate(fp);
if (res == FR_OK) {
- res = dec_lock(fp->lockid);
+ res = dec_lock(fp->lockid);
unlock_fs(fs, FR_OK);
}
#else
@@ -2831,7 +2831,7 @@ FRESULT f_getcwd (
res = dir_read(&dj, 0);
if (res != FR_OK) break;
if (ccl == ld_clust(dj.fs, dj.dir)) break; /* Found the entry */
- res = dir_next(&dj, 0);
+ res = dir_next(&dj, 0);
} while (res == FR_OK);
if (res == FR_NO_FILE) res = FR_INT_ERR;/* It cannot be 'not found'. */
if (res != FR_OK) break;