From 238afb474fd2c472e81874c9240bf55dd5c5c271 Mon Sep 17 00:00:00 2001 From: hathach Date: Thu, 26 Sep 2013 15:15:16 +0700 Subject: [PATCH] house keeping --- demos/host/host_os_none/host_os_none.uvopt | 52 ++++++++++++++++++---- demos/host/src/tusb_config.h | 2 +- vendor/fatfs/ccsbcs.c | 3 ++ vendor/fatfs/diskio.c | 2 +- vendor/fatfs/ff.c | 4 +- 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 1c5f0b56..f4db5b17 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 @@ -O975 -S0 -C0 -FO7 -FD10000000 -FC800 -FN2 -FF0LPC18xx43xx_512_BA -FS01A000000 -FL080000 -FF1LPC18xx43xx_512_BB -FS11B000000 -FL180000) - + + + 0 + 0 + 353 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + C:\Users\hathach\Dropbox\tinyusb\workspace\tinyusb\demos\host\src\cli.c + + +
+
0 @@ -370,7 +387,24 @@ -O975 -S0 -C0 -FO7 -FD10000000 -FC800 -FN2 -FF0LPC18xx43xx_512_BA -FS01A000000 -FL080000 -FF1LPC18xx43xx_512_BB -FS11B000000 -FL180000) - + + + 0 + 0 + 353 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + C:\Users\hathach\Dropbox\tinyusb\workspace\tinyusb\demos\host\src\cli.c + + +
+
0 @@ -520,10 +554,10 @@ 1 0 0 - 27 + 18 0 - 355 - 367 + 1 + 11 0 ..\src\cli.c cli.c @@ -1080,10 +1114,10 @@ 2 0 0 - 26 + 22 0 145 - 154 + 151 0 ..\..\bsp\lpc43xx\startup_keil\startup_LPC43xx.s startup_LPC43xx.s @@ -1122,8 +1156,8 @@ 0 0 0 - 0 - 0 + 2424 + 2431 0 ..\..\..\vendor\fatfs\ff.c ff.c diff --git a/demos/host/src/tusb_config.h b/demos/host/src/tusb_config.h index 99edfcf7..af69b5dc 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 e5634173..51c858b5 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 58e59077..3b73a79c 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 7c9857c2..5e6a37e2 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 eb60ebfc..caaae8f2 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).