Merge pull request #123 from dismirlian/usbh_devel

USBH: Fix compile with FATFS 0.12b

7 files changed, 60 insertions, 315 deletions

diff --git a/os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.c b/os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.c
index 3944a79..4723508 100644
--- a/os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.c
+++ b/os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.c
@@ -244,7 +244,6 @@ static bool _activate_ep(USBHDriver *host, usbh_ep_t *ep) {
 			ep->xfer.buf = urb->buff;
 		}
 		ep->xfer.error_count = 0;
-		//urb->status = USBH_URBSTATUS_QUEUED;
 	} else {
 		osalDbgCheck(urb->requestedLength >= urb->actualLength);
 
@@ -1026,25 +1025,36 @@ static inline void _sof_int(USBHDriver *host) {
 #undef HPRT_PLSTS_MASK
 #define HPRT_PLSTS_MASK (3U<<10)
 	if (host->check_ls_activity) {
-		uint16_t remaining = host->otg->HFNUM >> 16;
+		stm32_otg_t *const otg = host->otg;
+		uint16_t remaining = otg->HFNUM >> 16;
 		if (remaining < 5975) {
 			uwarnf("LS: ISR called too late (time=%d)", 6000 - remaining);
 			return;
 		}
-		/* 15us loop */
+		/* 15us loop during which we check if the core generates an actual keep-alive
+		 * (or activity other than idle) on the DP/DM lines. After 15us, we abort
+		 * the loop and wait for the next SOF. If no activity is detected, the upper
+		 * layer will time-out waiting for the reset to happen, and the port will remain
+		 * enabled (though in a dumb state). This will be detected on the next port reset
+		 * request and the OTG core will be reset. */
 		for (;;) {
-			uint32_t line_status = host->otg->HPRT & HPRT_PLSTS_MASK;
-			remaining = host->otg->HFNUM >> 16;
+			uint32_t line_status = otg->HPRT & HPRT_PLSTS_MASK;
+			remaining = otg->HFNUM >> 16;
+			if (!(otg->HPRT & HPRT_PENA)) {
+				uwarn("LS: Port disabled");
+				return;
+			}
 			if (line_status != HPRT_PLSTS_DM) {
+				/* success; report that the port is enabled */
 				uinfof("LS: activity detected, line=%d, time=%d", line_status >> 10,  6000 - remaining);
 				host->check_ls_activity = FALSE;
-				host->otg->GINTMSK = (host->otg->GINTMSK & ~GINTMSK_SOFM) | (GINTMSK_HCM | GINTMSK_RXFLVLM);
+				otg->GINTMSK = (otg->GINTMSK & ~GINTMSK_SOFM) | (GINTMSK_HCM | GINTMSK_RXFLVLM);
 				host->rootport.lld_status |= USBH_PORTSTATUS_ENABLE;
 				host->rootport.lld_c_status |= USBH_PORTSTATUS_C_ENABLE;
 				return;
 			}
 			if (remaining < 5910) {
-				uwarn("LS: No activity detected");
+				udbg("LS: No activity detected");
 				return;
 			}
 		}
@@ -1156,9 +1166,6 @@ static inline void _nptxfe_int(USBHDriver *host) {
 	rem += _write_packet(&host->ep_active_lists[USBH_EPTYPE_BULK],
 			otg->HNPTXSTS & HPTXSTS_PTXFSAVL_MASK);
 
-//	if (rem)
-//		otg->GINTMSK |= GINTMSK_NPTXFEM;
-
 	if (!rem)
 		otg->GINTMSK &= ~GINTMSK_NPTXFEM;
 
@@ -1655,7 +1662,7 @@ usbh_urbstatus_t usbh_lld_root_hub_request(USBHDriver *usbh, uint8_t bmRequestTy
 			hprt = otg->HPRT;
 			if (hprt & HPRT_PENA) {
 				/* This can occur when the OTG core doesn't generate traffic
-				 * despite reporting a successful por enable  */
+				 * despite reporting a successful por enable. */
 				uerr("Detected enabled port; resetting OTG core");
 				otg->GAHBCFG = 0;
 				osalThreadSleepS(MS2ST(20));
diff --git a/os/hal/src/hal_usbh.c b/os/hal/src/hal_usbh.c
index a7ba236..7dff98a 100644
--- a/os/hal/src/hal_usbh.c
+++ b/os/hal/src/hal_usbh.c
@@ -233,11 +233,8 @@ void usbhURBSubmitI(usbh_urb_t *urb) {
 		_usbh_urb_completeI(urb, USBH_URBSTATUS_STALL);
 		return;
 	}
-	if (ep->status != USBH_EPSTATUS_OPEN) {
-		_usbh_urb_completeI(urb, USBH_URBSTATUS_DISCONNECTED);
-		return;
-	}
-	if (!(usbhDeviceGetPort(ep->device)->status & USBH_PORTSTATUS_ENABLE)) {
+	if ((ep->status != USBH_EPSTATUS_OPEN)
+		|| !(usbhDeviceGetPort(ep->device)->status & USBH_PORTSTATUS_ENABLE)) {
 		_usbh_urb_completeI(urb, USBH_URBSTATUS_DISCONNECTED);
 		return;
 	}
@@ -271,18 +268,11 @@ void _usbh_urb_abort_and_waitS(usbh_urb_t *urb, usbh_urbstatus_t status) {
 		osalThreadSuspendS(&urb->abortingThread);
 		osalDbgAssert(urb->abortingThread == 0, "maybe we should uncomment the line below");
 		//urb->abortingThread = 0;
-	}
-#if !(USBH_DEBUG_ENABLE && USBH_DEBUG_ENABLE_WARNINGS)
-	else {
+	} else {
 		/* This call is necessary because _usbh_urb_abortI may require a reschedule */
 		osalOsRescheduleS();
 	}
-#else
 	uwarn("URB aborted");
-	osalOsRescheduleS();	/* debug printing functions call I-class functions inside
-	 	 	 	 	 	 	 which may cause a priority violation without this call
-							Also, _usbh_urb_abortI may require a reschedule */
-#endif
 }
 
 /* usbhURBCancelI may require a reschedule if called from a S-locked state */
@@ -295,34 +285,14 @@ void usbhURBCancelAndWaitS(usbh_urb_t *urb) {
 }
 
 msg_t usbhURBWaitTimeoutS(usbh_urb_t *urb, systime_t timeout) {
-	msg_t ret;
-
 	osalDbgCheckClassS();
 	_check_urb(urb);
-
-	switch (urb->status) {
-	case USBH_URBSTATUS_INITIALIZED:
-	case USBH_URBSTATUS_PENDING:
-		ret = osalThreadSuspendTimeoutS(&urb->waitingThread, timeout);
-		osalDbgAssert(urb->waitingThread == 0, "maybe we should uncomment the line below");
-		//urb->waitingThread = 0;
-		break;
-
-	case USBH_URBSTATUS_OK:
-		ret = MSG_OK;
-		break;
-
-/*	case USBH_URBSTATUS_UNINITIALIZED:
- *	case USBH_URBSTATUS_ERROR:
- *	case USBH_URBSTATUS_TIMEOUT:
- *	case USBH_URBSTATUS_CANCELLED:
- *	case USBH_URBSTATUS_STALL:
- *	case USBH_URBSTATUS_DISCONNECTED: */
-	default:
-		ret = MSG_RESET;
-		break;
+	if (urb->status == USBH_URBSTATUS_OK) {
+		return MSG_OK;
+	} else if (urb->status != USBH_URBSTATUS_PENDING) {
+		return MSG_RESET;
 	}
-	return ret;
+	return osalThreadSuspendTimeoutS(&urb->waitingThread, timeout);
 }
 
 msg_t usbhURBSubmitAndWaitS(usbh_urb_t *urb, systime_t timeout) {
@@ -844,9 +814,6 @@ bool usbhDeviceReadString(usbh_device_t *dev, char *dest, uint8_t size,
 	return HAL_SUCCESS;
 }
 
-
-
-
 /*===========================================================================*/
 /* Port processing functions.                                                */
 /*===========================================================================*/
@@ -908,13 +875,13 @@ static void _port_process_status_change(usbh_port_t *port) {
 	if (port->c_status & USBH_PORTSTATUS_C_RESET) {
 		port->c_status &= ~USBH_PORTSTATUS_C_RESET;
 		usbhhubClearFeaturePort(port, USBH_PORT_FEAT_C_RESET);
-		uinfof("Port %d: reset=%d", port->number, port->status & USBH_PORTSTATUS_RESET ? 1 : 0);
+		udbgf("Port %d: reset=%d", port->number, port->status & USBH_PORTSTATUS_RESET ? 1 : 0);
 	}
 
 	if (port->c_status & USBH_PORTSTATUS_C_ENABLE) {
 		port->c_status &= ~USBH_PORTSTATUS_C_ENABLE;
 		usbhhubClearFeaturePort(port, USBH_PORT_FEAT_C_ENABLE);
-		uinfof("Port %d: enable=%d", port->number, port->status & USBH_PORTSTATUS_ENABLE ? 1 : 0);
+		udbgf("Port %d: enable=%d", port->number, port->status & USBH_PORTSTATUS_ENABLE ? 1 : 0);
 	}
 
 	if (port->c_status & USBH_PORTSTATUS_C_OVERCURRENT) {
@@ -1096,7 +1063,6 @@ void _usbh_port_disconnected(usbh_port_t *port) {
 }
 
 
-
 /*===========================================================================*/
 /* Hub processing functions.                                                 */
 /*===========================================================================*/
diff --git a/os/hal/src/usbh/hal_usbh_ftdi.c b/os/hal/src/usbh/hal_usbh_ftdi.c
index 6e33867..6fb556d 100644
--- a/os/hal/src/usbh/hal_usbh_ftdi.c
+++ b/os/hal/src/usbh/hal_usbh_ftdi.c
@@ -415,7 +415,7 @@ static void _out_cb(usbh_urb_t *urb) {
 		return;
 	case USBH_URBSTATUS_DISCONNECTED:
 		uwarn("FTDI: URB OUT disconnected");
-		chThdDequeueNextI(&ftdipp->oq_waiting, Q_RESET);
+		chThdDequeueAllI(&ftdipp->oq_waiting, Q_RESET);
 		return;
 	default:
 		uerrf("FTDI: URB OUT status unexpected = %d", urb->status);
@@ -516,12 +516,12 @@ static void _in_cb(usbh_urb_t *urb) {
 			udbgf("FTDI: URB IN no data, status=%02x %02x",
 					((uint8_t *)urb->buff)[0],
 					((uint8_t *)urb->buff)[1]);
-			return;
+		//	return;
 		}
 		break;
 	case USBH_URBSTATUS_DISCONNECTED:
 		uwarn("FTDI: URB IN disconnected");
-		chThdDequeueNextI(&ftdipp->iq_waiting, Q_RESET);
+		chThdDequeueAllI(&ftdipp->iq_waiting, Q_RESET);
 		return;
 	default:
 		uerrf("FTDI: URB IN status unexpected = %d", urb->status);
diff --git a/os/various/fatfs_bindings/fatfs_diskio.c b/os/various/fatfs_bindings/fatfs_diskio.c
index 6949310..9fa41e2 100644
--- a/os/various/fatfs_bindings/fatfs_diskio.c
+++ b/os/various/fatfs_bindings/fatfs_diskio.c
@@ -180,7 +180,6 @@ DRESULT disk_read (
 /*-----------------------------------------------------------------------*/
 /* Write Sector(s)                                                       */
 
-#if _USE_WRITE
 DRESULT disk_write (
     BYTE pdrv,            /* Physical drive nmuber (0..) */
     const BYTE *buff,    /* Data to be written */
@@ -226,14 +225,12 @@ DRESULT disk_write (
   }
   return RES_PARERR;
 }
-#endif /* _USE_WRITE */
 
 
 
 /*-----------------------------------------------------------------------*/
 /* Miscellaneous Functions                                               */
 
-#if _USE_IOCTL
 DRESULT disk_ioctl (
     BYTE pdrv,        /* Physical drive nmuber (0..) */
     BYTE cmd,        /* Control code */
@@ -246,11 +243,13 @@ DRESULT disk_ioctl (
     switch (cmd) {
     case CTRL_SYNC:
         return RES_OK;
+#if _MAX_SS > _MIN_SS
     case GET_SECTOR_SIZE:
         *((WORD *)buff) = MMCSD_BLOCK_SIZE;
         return RES_OK;
-#if _USE_ERASE
-    case CTRL_ERASE_SECTOR:
+#endif
+#if _USE_TRIM
+    case CTRL_TRIM:
         mmcErase(&MMCD1, *((DWORD *)buff), *((DWORD *)buff + 1));
         return RES_OK;
 #endif
@@ -265,14 +264,16 @@ DRESULT disk_ioctl (
     case GET_SECTOR_COUNT:
         *((DWORD *)buff) = mmcsdGetCardCapacity(&SDCD1);
         return RES_OK;
+#if _MAX_SS > _MIN_SS
     case GET_SECTOR_SIZE:
         *((WORD *)buff) = MMCSD_BLOCK_SIZE;
         return RES_OK;
+#endif
     case GET_BLOCK_SIZE:
         *((DWORD *)buff) = 256; /* 512b blocks in one erase block */
         return RES_OK;
-#if _USE_ERASE
-    case CTRL_ERASE_SECTOR:
+#if _USE_TRIM
+    case CTRL_TRIM:
         sdcErase(&SDCD1, *((DWORD *)buff), *((DWORD *)buff + 1));
         return RES_OK;
 #endif
@@ -288,12 +289,14 @@ DRESULT disk_ioctl (
       case GET_SECTOR_COUNT:
           *((DWORD *)buff) = MSBLKD[0].info.blk_num;
           return RES_OK;
+#if _MAX_SS > _MIN_SS
       case GET_SECTOR_SIZE:
           *((WORD *)buff) = MSBLKD[0].info.blk_size;
           return RES_OK;
-#if _USE_ERASE
+#endif
+#if _USE_TRIM
 #error "unimplemented yet!"
-//    case CTRL_ERASE_SECTOR:
+//    case CTRL_TRIM:
 //      ....
 //      return RES_OK;
 #endif
@@ -304,7 +307,6 @@ DRESULT disk_ioctl (
   }
   return RES_PARERR;
 }
-#endif /* _USE_IOCTL */
 
 DWORD get_fattime(void) {
 #if HAL_USE_RTC
@@ -316,5 +318,3 @@ DWORD get_fattime(void) {
     return ((uint32_t)0 | (1 << 16)) | (1 << 21); /* wrong but valid time */
 #endif
 }
-
-
diff --git a/testhal/STM32/STM32F4xx/USB_HOST/Makefile b/testhal/STM32/STM32F4xx/USB_HOST/Makefile
index 33d032a..dfda9ac 100644
--- a/testhal/STM32/STM32F4xx/USB_HOST/Makefile
+++ b/testhal/STM32/STM32F4xx/USB_HOST/Makefile
@@ -102,7 +102,7 @@ include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
 include $(CHIBIOS)/test/rt/test.mk

 include $(CHIBIOS)/os/hal/lib/streams/streams.mk

 include $(CHIBIOS)/os/various/shell/shell.mk

-include $(CHIBIOS)/os/various/fatfs_bindings/fatfs.mk

+include $(CHIBIOS_CONTRIB)/os/various/fatfs_bindings/fatfs.mk

 

 # Define linker script file here

 LDSCRIPT= $(STARTUPLD)/STM32F407xG.ld

diff --git a/testhal/STM32/STM32F4xx/USB_HOST/ffconf.h b/testhal/STM32/STM32F4xx/USB_HOST/ffconf.h
deleted file mode 100644
index 42388a2..0000000
--- a/testhal/STM32/STM32F4xx/USB_HOST/ffconf.h
+++ /dev/null
@@ -1,229 +0,0 @@
-/* CHIBIOS FIX */

-#include "ch.h"

-

-/*---------------------------------------------------------------------------/

-/  FatFs - FAT file system module configuration file  R0.10b (C)ChaN, 2014

-/---------------------------------------------------------------------------*/

-

-#ifndef _FFCONF

-#define _FFCONF 8051    /* Revision ID */

-

-/*---------------------------------------------------------------------------/

-/ Functions and Buffer Configurations

-/---------------------------------------------------------------------------*/

-

-#define _FS_TINY        0   /* 0:Normal or 1:Tiny */

-/* When _FS_TINY is set to 1, it reduces memory consumption _MAX_SS bytes each

-/  file object. For file data transfer, FatFs uses the common sector buffer in

-/  the file system object (FATFS) instead of private sector buffer eliminated

-/  from the file object (FIL). */

-

-

-#define _FS_READONLY    0   /* 0:Read/Write or 1:Read only */

-/* Setting _FS_READONLY to 1 defines read only configuration. This removes

-/  writing functions, f_write(), f_sync(), f_unlink(), f_mkdir(), f_chmod(),

-/  f_rename(), f_truncate() and useless f_getfree(). */

-

-

-#define _FS_MINIMIZE    0   /* 0 to 3 */

-/* The _FS_MINIMIZE option defines minimization level to remove API functions.

-/

-/   0: All basic functions are enabled.

-/   1: f_stat(), f_getfree(), f_unlink(), f_mkdir(), f_chmod(), f_utime(),

-/      f_truncate() and f_rename() function are removed.

-/   2: f_opendir(), f_readdir() and f_closedir() are removed in addition to 1.

-/   3: f_lseek() function is removed in addition to 2. */

-

-

-#define _USE_STRFUNC    0   /* 0:Disable or 1-2:Enable */

-/* To enable string functions, set _USE_STRFUNC to 1 or 2. */

-

-

-#define _USE_MKFS       0   /* 0:Disable or 1:Enable */

-/* To enable f_mkfs() function, set _USE_MKFS to 1 and set _FS_READONLY to 0 */

-

-

-#define _USE_FASTSEEK   0   /* 0:Disable or 1:Enable */

-/* To enable fast seek feature, set _USE_FASTSEEK to 1. */

-

-

-#define _USE_LABEL      0   /* 0:Disable or 1:Enable */

-/* To enable volume label functions, set _USE_LAVEL to 1 */

-

-

-#define _USE_FORWARD    0   /* 0:Disable or 1:Enable */

-/* To enable f_forward() function, set _USE_FORWARD to 1 and set _FS_TINY to 1. */

-

-

-/*---------------------------------------------------------------------------/

-/ Locale and Namespace Configurations

-/---------------------------------------------------------------------------*/

-

-#define _CODE_PAGE  1252

-/* The _CODE_PAGE specifies the OEM code page to be used on the target system.

-/  Incorrect setting of the code page can cause a file open failure.

-/

-/   932  - Japanese Shift_JIS (DBCS, OEM, Windows)

-/   936  - Simplified Chinese GBK (DBCS, OEM, Windows)

-/   949  - Korean (DBCS, OEM, Windows)

-/   950  - Traditional Chinese Big5 (DBCS, OEM, Windows)

-/   1250 - Central Europe (Windows)

-/   1251 - Cyrillic (Windows)

-/   1252 - Latin 1 (Windows)

-/   1253 - Greek (Windows)

-/   1254 - Turkish (Windows)

-/   1255 - Hebrew (Windows)

-/   1256 - Arabic (Windows)

-/   1257 - Baltic (Windows)

-/   1258 - Vietnam (OEM, Windows)

-/   437  - U.S. (OEM)

-/   720  - Arabic (OEM)

-/   737  - Greek (OEM)

-/   775  - Baltic (OEM)

-/   850  - Multilingual Latin 1 (OEM)

-/   858  - Multilingual Latin 1 + Euro (OEM)

-/   852  - Latin 2 (OEM)

-/   855  - Cyrillic (OEM)

-/   866  - Russian (OEM)

-/   857  - Turkish (OEM)

-/   862  - Hebrew (OEM)

-/   874  - Thai (OEM, Windows)

-/   1    - ASCII (Valid for only non-LFN configuration) */

-

-

-#define _USE_LFN    0       /* 0 to 3 */

-#define _MAX_LFN    255     /* Maximum LFN length to handle (12 to 255) */

-/* The _USE_LFN option switches the LFN feature.

-/

-/   0: Disable LFN feature. _MAX_LFN has no effect.

-/   1: Enable LFN with static working buffer on the BSS. Always NOT thread-safe.

-/   2: Enable LFN with dynamic working buffer on the STACK.

-/   3: Enable LFN with dynamic working buffer on the HEAP.

-/

-/  When enable LFN feature, Unicode handling functions ff_convert() and ff_wtoupper()

-/  function must be added to the project.

-/  The LFN working buffer occupies (_MAX_LFN + 1) * 2 bytes. When use stack for the

-/  working buffer, take care on stack overflow. When use heap memory for the working

-/  buffer, memory management functions, ff_memalloc() and ff_memfree(), must be added

-/  to the project. */

-

-

-#define _LFN_UNICODE    0   /* 0:ANSI/OEM or 1:Unicode */

-/* To switch the character encoding on the FatFs API (TCHAR) to Unicode, enable LFN

-/  feature and set _LFN_UNICODE to 1. This option affects behavior of string I/O

-/  functions. This option must be 0 when LFN feature is not enabled. */

-

-

-#define _STRF_ENCODE    3   /* 0:ANSI/OEM, 1:UTF-16LE, 2:UTF-16BE, 3:UTF-8 */

-/* When Unicode API is enabled by _LFN_UNICODE option, this option selects the character

-/  encoding on the file to be read/written via string I/O functions, f_gets(), f_putc(),

-/  f_puts and f_printf(). This option has no effect when Unicode API is not enabled. */

-

-

-#define _FS_RPATH       0   /* 0 to 2 */

-/* The _FS_RPATH option configures relative path feature.

-/

-/   0: Disable relative path feature and remove related functions.

-/   1: Enable relative path. f_chdrive() and f_chdir() function are available.

-/   2: f_getcwd() function is available in addition to 1.

-/

-/  Note that output of the f_readdir() fnction is affected by this option. */

-

-

-/*---------------------------------------------------------------------------/

-/ Drive/Volume Configurations

-/---------------------------------------------------------------------------*/

-

-#define _VOLUMES    1

-/* Number of volumes (logical drives) to be used. */

-

-

-#define _STR_VOLUME_ID  0   /* 0:Use only 0-9 for drive ID, 1:Use strings for drive ID */

-#define _VOLUME_STRS    "RAM","NAND","CF","SD1","SD2","USB1","USB2","USB3"

-/* When _STR_VOLUME_ID is set to 1, also pre-defined strings can be used as drive

-/  number in the path name. _VOLUME_STRS defines the drive ID strings for each logical

-/  drives. Number of items must be equal to _VOLUMES. Valid characters for the drive ID

-/  strings are: 0-9 and A-Z. */

-

-

-#define _MULTI_PARTITION    0   /* 0:Single partition, 1:Enable multiple partition */

-/* By default(0), each logical drive number is bound to the same physical drive number

-/  and only a FAT volume found on the physical drive is mounted. When it is set to 1,

-/  each logical drive number is bound to arbitrary drive/partition listed in VolToPart[].

-*/

-

-

-#define _MIN_SS     512

-#define _MAX_SS     512

-/* These options configure the range of sector size to be supported. (512, 1024, 2048 or

-/  4096) Always set both 512 for most systems, all memory card and harddisk. But a larger

-/  value may be required for on-board flash memory and some type of optical media.

-/  When _MAX_SS is larger than _MIN_SS, FatFs is configured to variable sector size and

-/  GET_SECTOR_SIZE command must be implemented to the disk_ioctl() function. */

-

-

-#define _USE_ERASE  0   /* 0:Disable or 1:Enable */

-/* To enable sector erase feature, set _USE_ERASE to 1. Also CTRL_ERASE_SECTOR command

-/  should be added to the disk_ioctl() function. */

-

-

-#define _FS_NOFSINFO    0   /* 0 to 3 */

-/* If you need to know correct free space on the FAT32 volume, set bit 0 of this option

-/  and f_getfree() function at first time after volume mount will force a full FAT scan.

-/  Bit 1 controls the last allocated cluster number as bit 0.

-/

-/  bit0=0: Use free cluster count in the FSINFO if available.

-/  bit0=1: Do not trust free cluster count in the FSINFO.

-/  bit1=0: Use last allocated cluster number in the FSINFO if available.

-/  bit1=1: Do not trust last allocated cluster number in the FSINFO.

-*/

-

-

-

-/*---------------------------------------------------------------------------/

-/ System Configurations

-/---------------------------------------------------------------------------*/

-

-#define _FS_LOCK    0   /* 0:Disable or >=1:Enable */

-/* To enable file lock control feature, set _FS_LOCK to non-zero value.

-/  The value defines how many files/sub-directories can be opened simultaneously

-/  with file lock control. This feature uses bss _FS_LOCK * 12 bytes. */

-

-

-#define _FS_REENTRANT   0               /* 0:Disable or 1:Enable */

-#define _FS_TIMEOUT     MS2ST(1000)     /* Timeout period in unit of time tick */

-#define _SYNC_t         semaphore_t*    /* O/S dependent sync object type. e.g. HANDLE, OS_EVENT*, ID, SemaphoreHandle_t and etc.. */

-/* The _FS_REENTRANT option switches the re-entrancy (thread safe) of the FatFs module.

-/

-/   0: Disable re-entrancy. _FS_TIMEOUT and _SYNC_t have no effect.

-/   1: Enable re-entrancy. Also user provided synchronization handlers,

-/      ff_req_grant(), ff_rel_grant(), ff_del_syncobj() and ff_cre_syncobj()

-/      function must be added to the project.

-*/

-

-

-#define _WORD_ACCESS    0   /* 0 or 1 */

-/* The _WORD_ACCESS option is an only platform dependent option. It defines

-/  which access method is used to the word data on the FAT volume.

-/

-/   0: Byte-by-byte access. Always compatible with all platforms.

-/   1: Word access. Do not choose this unless under both the following conditions.

-/

-/  * Address misaligned memory access is always allowed for ALL instructions.

-/  * Byte order on the memory is little-endian.

-/

-/  If it is the case, _WORD_ACCESS can also be set to 1 to improve performance and

-/  reduce code size. Following table shows an example of some processor types.

-/

-/   ARM7TDMI    0           ColdFire    0           V850E2      0

-/   Cortex-M3   0           Z80         0/1         V850ES      0/1

-/   Cortex-M0   0           RX600(LE)   0/1         TLCS-870    0/1

-/   AVR         0/1         RX600(BE)   0           TLCS-900    0/1

-/   AVR32       0           RL78        0           R32C        0

-/   PIC18       0/1         SH-2        0           M16C        0/1

-/   PIC24       0           H8S         0           MSP430      0

-/   PIC32       0           H8/300H     0           x86         0/1

-*/

-

-

-#endif /* _FFCONF */

diff --git a/testhal/STM32/STM32F4xx/USB_HOST/main.c b/testhal/STM32/STM32F4xx/USB_HOST/main.c
index 595e454..c540233 100644
--- a/testhal/STM32/STM32F4xx/USB_HOST/main.c
+++ b/testhal/STM32/STM32F4xx/USB_HOST/main.c
@@ -86,6 +86,8 @@ static void ThreadTestFTDI(void *p) {
     (void)p;

     USBHFTDIPortDriver *const ftdipp = &FTDIPD[0];

 

+    chRegSetThreadName("FTDI");

+

     shellInit();

 

 start:

@@ -129,7 +131,6 @@ start:
                 shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,

                                               "shell", NORMALPRIO,

                                               shellThread, (void *)&shell_cfg1);

-

             } else if (chThdTerminatedX(shelltp)) {

                 chThdRelease(shelltp);

                 if (usbhftdipGetState(ftdipp) != USBHFTDIP_STATE_READY)

@@ -218,6 +219,8 @@ static void ThreadTestAOA(void *p) {
     USBHAOADriver *const aoap = &USBHAOAD[0];

     USBHAOAChannel *const aoacp = &aoap->channel;

 

+    chRegSetThreadName("AOA");

+

 start:

     while (usbhaoaGetState(aoap) != USBHAOA_STATE_READY) {

         chThdSleepMilliseconds(100);

@@ -303,34 +306,26 @@ static FIL file;
 

 static FRESULT scan_files(BaseSequentialStream *chp, char *path) {

   FRESULT res;

-  FILINFO fno;

   DIR dir;

-  int i;

-  char *fn;

+  UINT i;

+  static FILINFO fno;

 

-#if _USE_LFN

-  fno.lfname = 0;

-  fno.lfsize = 0;

-#endif

   res = f_opendir(&dir, path);

   if (res == FR_OK) {

-    i = strlen(path);

     for (;;) {

       res = f_readdir(&dir, &fno);

       if (res != FR_OK || fno.fname[0] == 0)

         break;

-      if (fno.fname[0] == '.')

-        continue;

-      fn = fno.fname;

       if (fno.fattrib & AM_DIR) {

+		i = strlen(path);

         path[i++] = '/';

-        strcpy(&path[i], fn);

+        strcpy(&path[i], fno.fname);

         res = scan_files(chp, path);

         if (res != FR_OK)

           break;

         path[--i] = 0;

       } else {

-          usbDbgPrintf("FS: %s/%s", path, fn);

+          usbDbgPrintf("FS: %s/%s", path, fno.fname);

       }

     }

   }

@@ -338,7 +333,7 @@ static FRESULT scan_files(BaseSequentialStream *chp, char *path) {
 }

 #endif

 

-static THD_WORKING_AREA(waTestMSD, 1024);

+static THD_WORKING_AREA(waTestMSD, 1300);

 static void ThreadTestMSD(void *p) {

     (void)p;

 

@@ -346,6 +341,8 @@ static void ThreadTestMSD(void *p) {
     DWORD clusters;

     FRESULT res;

 

+    chRegSetThreadName("MSD");

+

 #if !UVC_TO_MSD_PHOTOS_CAPTURE

     BaseSequentialStream * const chp = (BaseSequentialStream *)&USBH_DEBUG_SD;

     systime_t st, et;

@@ -516,6 +513,8 @@ static void ThreadTestHID(void *p) {
     uint8_t i;

     static uint8_t kbd_led_states[HAL_USBHHID_MAX_INSTANCES];

 

+    chRegSetThreadName("HID");

+

     for (i = 0; i < HAL_USBHHID_MAX_INSTANCES; i++) {

         hidcfg[i].cb_report = _hid_report_callback;

         hidcfg[i].protocol = USBHHID_PROTOCOL_BOOT;

@@ -626,6 +625,8 @@ static void ThreadTestUVC(void *p) {
     (void)p;

     USBHUVCDriver *const uvcdp = &USBHUVCD[0];

 

+    chRegSetThreadName("UVC");

+

     for(;;) {

         chThdSleepMilliseconds(100);