fix IAR end line warning

This commit is contained in:
hathach
2014-03-12 16:33:33 +07:00
parent 6ceb992f2c
commit 1ad138e322
4 changed files with 24 additions and 24 deletions

View File

@@ -1026,7 +1026,7 @@
</option> </option>
<option> <option>
<name>GenLowLevelInterface</name> <name>GenLowLevelInterface</name>
<state>0</state> <state>1</state>
</option> </option>
<option> <option>
<name>GEndianModeBE</name> <name>GEndianModeBE</name>
@@ -1070,7 +1070,7 @@
</option> </option>
<option> <option>
<name>OGUseCmsis</name> <name>OGUseCmsis</name>
<state>1</state> <state>0</state>
</option> </option>
<option> <option>
<name>OGUseCmsisDspLib</name> <name>OGUseCmsisDspLib</name>

View File

@@ -629,7 +629,7 @@
<DebugFlag> <DebugFlag>
<trace>0</trace> <trace>0</trace>
<periodic>1</periodic> <periodic>1</periodic>
<aLwin>0</aLwin> <aLwin>1</aLwin>
<aCover>0</aCover> <aCover>0</aCover>
<aSer1>0</aSer1> <aSer1>0</aSer1>
<aSer2>0</aSer2> <aSer2>0</aSer2>
@@ -646,7 +646,7 @@
<aLa>0</aLa> <aLa>0</aLa>
<aPa1>0</aPa1> <aPa1>0</aPa1>
<AscS4>0</AscS4> <AscS4>0</AscS4>
<aSer4>0</aSer4> <aSer4>1</aSer4>
<StkLoc>0</StkLoc> <StkLoc>0</StkLoc>
<TrcWin>0</TrcWin> <TrcWin>0</TrcWin>
<newCpu>0</newCpu> <newCpu>0</newCpu>
@@ -916,10 +916,10 @@
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>6</ColumnNumber> <ColumnNumber>22</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>139</TopLine> <TopLine>101</TopLine>
<CurrentLine>145</CurrentLine> <CurrentLine>107</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\src\main.c</PathWithFileName> <PathWithFileName>..\src\main.c</PathWithFileName>
<FilenameWithoutPath>main.c</FilenameWithoutPath> <FilenameWithoutPath>main.c</FilenameWithoutPath>
@@ -1012,10 +1012,10 @@
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>21</ColumnNumber> <ColumnNumber>40</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>382</TopLine> <TopLine>190</TopLine>
<CurrentLine>394</CurrentLine> <CurrentLine>238</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\src\cli.c</PathWithFileName> <PathWithFileName>..\src\cli.c</PathWithFileName>
<FilenameWithoutPath>cli.c</FilenameWithoutPath> <FilenameWithoutPath>cli.c</FilenameWithoutPath>
@@ -1460,10 +1460,10 @@
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>39</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>62</TopLine> <TopLine>1</TopLine>
<CurrentLine>63</CurrentLine> <CurrentLine>1</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\..\..\vendor\fatfs\diskio.c</PathWithFileName> <PathWithFileName>..\..\..\vendor\fatfs\diskio.c</PathWithFileName>
<FilenameWithoutPath>diskio.c</FilenameWithoutPath> <FilenameWithoutPath>diskio.c</FilenameWithoutPath>
@@ -1476,10 +1476,10 @@
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>17</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>2118</TopLine> <TopLine>1</TopLine>
<CurrentLine>2122</CurrentLine> <CurrentLine>1</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\..\..\vendor\fatfs\ff.c</PathWithFileName> <PathWithFileName>..\..\..\vendor\fatfs\ff.c</PathWithFileName>
<FilenameWithoutPath>ff.c</FilenameWithoutPath> <FilenameWithoutPath>ff.c</FilenameWithoutPath>
@@ -1900,10 +1900,10 @@
<FileType>2</FileType> <FileType>2</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>20</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>139</TopLine> <TopLine>123</TopLine>
<CurrentLine>158</CurrentLine> <CurrentLine>129</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\..\bsp\lpc175x_6x\startup_keil\startup_LPC17xx.s</PathWithFileName> <PathWithFileName>..\..\bsp\lpc175x_6x\startup_keil\startup_LPC17xx.s</PathWithFileName>
<FilenameWithoutPath>startup_LPC17xx.s</FilenameWithoutPath> <FilenameWithoutPath>startup_LPC17xx.s</FilenameWithoutPath>

View File

@@ -105,7 +105,7 @@ DSTATUS disk_status (BYTE pdrv)
DRESULT disk_read (BYTE pdrv, BYTE*buff, DWORD sector, BYTE count) DRESULT disk_read (BYTE pdrv, BYTE*buff, DWORD sector, BYTE count)
{ {
uint8_t usb_addr = pdrv+1; uint8_t usb_addr = pdrv+1;
if ( TUSB_ERROR_NONE != tusbh_msc_read10(usb_addr, 0, buff, sector, count) ) return RES_ERROR; if ( TUSB_ERROR_NONE != tusbh_msc_read10(usb_addr, 0, buff, sector, count) ) return RES_ERROR;
return wait_for_io_complete(usb_addr); return wait_for_io_complete(usb_addr);

8
vendor/fatfs/ff.c vendored
View File

@@ -736,7 +736,7 @@ FRESULT sync_window (
DWORD wsect; DWORD wsect;
UINT nf; UINT nf;
if (fs->wflag) { /* Write back the sector if it is dirty */ if (fs->wflag) { /* Write back the sector if it is dirty */
wsect = fs->winsect; /* Current sector number */ wsect = fs->winsect; /* Current sector number */
if (disk_write(fs->drv, fs->win, wsect, 1) != RES_OK) if (disk_write(fs->drv, fs->win, wsect, 1) != RES_OK)
@@ -975,7 +975,7 @@ FRESULT remove_chain (
#if _USE_ERASE #if _USE_ERASE
if (ecl + 1 == nxt) { /* Is next cluster contiguous? */ if (ecl + 1 == nxt) { /* Is next cluster contiguous? */
ecl = nxt; ecl = nxt;
} else { /* End of contiguous clusters */ } else { /* End of contiguous clusters */
rt[0] = clust2sect(fs, scl); /* Start sector */ rt[0] = clust2sect(fs, scl); /* Start sector */
rt[1] = clust2sect(fs, ecl) + fs->csize - 1; /* End sector */ rt[1] = clust2sect(fs, ecl) + fs->csize - 1; /* End sector */
disk_ioctl(fs->drv, CTRL_ERASE_SECTOR, rt); /* Erase the block */ disk_ioctl(fs->drv, CTRL_ERASE_SECTOR, rt); /* Erase the block */
@@ -2729,7 +2729,7 @@ FRESULT f_close (
FATFS *fs = fp->fs;; FATFS *fs = fp->fs;;
res = validate(fp); res = validate(fp);
if (res == FR_OK) { if (res == FR_OK) {
res = dec_lock(fp->lockid); res = dec_lock(fp->lockid);
unlock_fs(fs, FR_OK); unlock_fs(fs, FR_OK);
} }
#else #else
@@ -2831,7 +2831,7 @@ FRESULT f_getcwd (
res = dir_read(&dj, 0); res = dir_read(&dj, 0);
if (res != FR_OK) break; if (res != FR_OK) break;
if (ccl == ld_clust(dj.fs, dj.dir)) break; /* Found the entry */ 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); } while (res == FR_OK);
if (res == FR_NO_FILE) res = FR_INT_ERR;/* It cannot be 'not found'. */ if (res == FR_NO_FILE) res = FR_INT_ERR;/* It cannot be 'not found'. */
if (res != FR_OK) break; if (res != FR_OK) break;