diff options
| author | hathach <[email protected]> | 2013-09-26 15:15:16 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-09-26 15:15:16 +0700 |
| commit | 238afb474fd2c472e81874c9240bf55dd5c5c271 (patch) | |
| tree | ab4d41890e75d7df0b0b960b5a7df245f2a2a5ec | |
| parent | a6726f7d39e15cb01196eaba91ab494b54a00bdb (diff) | |
house keeping
| -rw-r--r-- | demos/host/host_os_none/host_os_none.uvopt | 52 | ||||
| -rw-r--r-- | demos/host/src/tusb_config.h | 2 | ||||
| -rw-r--r-- | vendor/fatfs/ccsbcs.c | 3 | ||||
| -rw-r--r-- | vendor/fatfs/diskio.c | 2 | ||||
| -rw-r--r-- | vendor/fatfs/ff.c | 4 | ||||
| -rw-r--r-- | vendor/fatfs/ff.h | 1 |
6 files changed, 52 insertions, 12 deletions
diff --git a/demos/host/host_os_none/host_os_none.uvopt b/demos/host/host_os_none/host_os_none.uvopt index 1c5f0b565..f4db5b17d 100644 --- a/demos/host/host_os_none/host_os_none.uvopt +++ b/demos/host/host_os_none/host_os_none.uvopt @@ -158,7 +158,24 @@ <Name>-O975 -S0 -C0 -FO7 -FD10000000 -FC800 -FN2 -FF0LPC18xx43xx_512_BA -FS01A000000 -FL080000 -FF1LPC18xx43xx_512_BB -FS11B000000 -FL180000)</Name> </SetRegEntry> </TargetDriverDllRegistry> - <Breakpoint/> + <Breakpoint> + <Bp> + <Number>0</Number> + <Type>0</Type> + <LineNumber>353</LineNumber> + <EnabledFlag>1</EnabledFlag> + <Address>0</Address> + <ByteObject>0</ByteObject> + <HtxType>0</HtxType> + <ManyObjects>0</ManyObjects> + <SizeOfObject>0</SizeOfObject> + <BreakByAccess>0</BreakByAccess> + <BreakIfRCount>0</BreakIfRCount> + <Filename>C:\Users\hathach\Dropbox\tinyusb\workspace\tinyusb\demos\host\src\cli.c</Filename> + <ExecCommand></ExecCommand> + <Expression></Expression> + </Bp> + </Breakpoint> <WatchWindow1> <Ww> <count>0</count> @@ -370,7 +387,24 @@ <Name>-O975 -S0 -C0 -FO7 -FD10000000 -FC800 -FN2 -FF0LPC18xx43xx_512_BA -FS01A000000 -FL080000 -FF1LPC18xx43xx_512_BB -FS11B000000 -FL180000)</Name> </SetRegEntry> </TargetDriverDllRegistry> - <Breakpoint/> + <Breakpoint> + <Bp> + <Number>0</Number> + <Type>0</Type> + <LineNumber>353</LineNumber> + <EnabledFlag>1</EnabledFlag> + <Address>0</Address> + <ByteObject>0</ByteObject> + <HtxType>0</HtxType> + <ManyObjects>0</ManyObjects> + <SizeOfObject>0</SizeOfObject> + <BreakByAccess>0</BreakByAccess> + <BreakIfRCount>0</BreakIfRCount> + <Filename>C:\Users\hathach\Dropbox\tinyusb\workspace\tinyusb\demos\host\src\cli.c</Filename> + <ExecCommand></ExecCommand> + <Expression></Expression> + </Bp> + </Breakpoint> <WatchWindow1> <Ww> <count>0</count> @@ -520,10 +554,10 @@ <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>27</ColumnNumber> + <ColumnNumber>18</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>355</TopLine> - <CurrentLine>367</CurrentLine> + <TopLine>1</TopLine> + <CurrentLine>11</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\src\cli.c</PathWithFileName> <FilenameWithoutPath>cli.c</FilenameWithoutPath> @@ -1080,10 +1114,10 @@ <FileType>2</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>26</ColumnNumber> + <ColumnNumber>22</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> <TopLine>145</TopLine> - <CurrentLine>154</CurrentLine> + <CurrentLine>151</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\bsp\lpc43xx\startup_keil\startup_LPC43xx.s</PathWithFileName> <FilenameWithoutPath>startup_LPC43xx.s</FilenameWithoutPath> @@ -1122,8 +1156,8 @@ <Focus>0</Focus> <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>0</TopLine> - <CurrentLine>0</CurrentLine> + <TopLine>2424</TopLine> + <CurrentLine>2431</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\..\..\vendor\fatfs\ff.c</PathWithFileName> <FilenameWithoutPath>ff.c</FilenameWithoutPath> diff --git a/demos/host/src/tusb_config.h b/demos/host/src/tusb_config.h index 99edfcf7b..af69b5dcd 100644 --- a/demos/host/src/tusb_config.h +++ b/demos/host/src/tusb_config.h @@ -76,7 +76,7 @@ #define TUSB_CFG_HOST_HID_KEYBOARD 0 #define TUSB_CFG_HOST_HID_MOUSE 1 #define TUSB_CFG_HOST_HID_GENERIC 0 -#define TUSB_CFG_HOST_MSC 1 +#define TUSB_CFG_HOST_MSC 0 #define TUSB_CFG_HOST_CDC 0 #define TUSB_CFG_HOST_CDC_RNDIS 0 diff --git a/vendor/fatfs/ccsbcs.c b/vendor/fatfs/ccsbcs.c index e5634173b..51c858b58 100644 --- a/vendor/fatfs/ccsbcs.c +++ b/vendor/fatfs/ccsbcs.c @@ -27,6 +27,7 @@ #include "ff.h" +#if TUSB_CFG_HOST_MSC #if _CODE_PAGE == 437 #define _TBLDEF 1 @@ -538,3 +539,5 @@ WCHAR ff_wtoupper ( /* Upper converted character */ return tbl_lower[i] ? tbl_upper[i] : chr; } + +#endif // TUSB_CFG_HOST_MSC diff --git a/vendor/fatfs/diskio.c b/vendor/fatfs/diskio.c index 58e590775..3b73a79c5 100644 --- a/vendor/fatfs/diskio.c +++ b/vendor/fatfs/diskio.c @@ -202,4 +202,4 @@ DWORD get_fattime (void) return timestamp.value; } -#endif +#endif // TUSB_CFG_HOST_MSC diff --git a/vendor/fatfs/ff.c b/vendor/fatfs/ff.c index 7c9857c2b..5e6a37e29 100644 --- a/vendor/fatfs/ff.c +++ b/vendor/fatfs/ff.c @@ -99,7 +99,7 @@ #include "ff.h" /* FatFs configurations and declarations */ #include "diskio.h" /* Declarations of low level disk I/O functions */ - +#if TUSB_CFG_HOST_MSC /*-------------------------------------------------------------------------- Module Private Definitions @@ -4323,3 +4323,5 @@ int f_printf ( #endif /* !_FS_READONLY */ #endif /* _USE_STRFUNC */ + +#endif // TUSB_CFG_HOST_MSC diff --git a/vendor/fatfs/ff.h b/vendor/fatfs/ff.h index eb60ebfc1..caaae8f2c 100644 --- a/vendor/fatfs/ff.h +++ b/vendor/fatfs/ff.h @@ -23,6 +23,7 @@ extern "C" { #include "integer.h" /* Basic integer types */ #include "ffconf.h" /* FatFs configuration options */ +#include "tusb_config.h" #if _FATFS != _FFCONF #error Wrong configuration file (ffconf.h). |
