chore: update to stm32_mw_fatfs v2.1.4

FatFs R0.12C modified by ST Signed-off-by: Frederic Pillon <frederic.pillon@st.com>

Author: fpistm

src/diskio.c

@@ -10,46 +10,6 @@
 /* storage control modules to the FatFs module with a defined API. */
 /*-----------------------------------------------------------------------*/
 
-/**
- ******************************************************************************
- *
- * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics International N.V.
- * All rights reserved.</center></h2>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted, provided that the following conditions are met:
- *
- * 1. Redistribution of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. Neither the name of STMicroelectronics nor the names of other
- * contributors to this software may be used to endorse or promote products
- * derived from this software without specific written permission.
- * 4. This software, including modifications and/or derivative works of this
- * software, must execute solely and exclusively on microcontroller or
- * microprocessor devices manufactured by or for STMicroelectronics.
- * 5. Redistribution and use of this software other than as permitted under
- * this license is void and will automatically terminate your rights under
- * this license.
- *
- * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY
- * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT
- * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ******************************************************************************
- */
-
 /* Includes ------------------------------------------------------------------*/
 #include "diskio.h"
 #include "ff_gen_drv.h"

src/drivers/sd_diskio.c

@@ -1,50 +1,22 @@
 /**
  ******************************************************************************
- * @file sd_diskio.c
+ * @file sd_diskio_template_bspv1.c
  * @author MCD Application Team
- * @version V2.0.2
- * @date 10-November-2017
- * @brief SD Disk I/O driver
+ * @brief SD Disk I/O template driver based on BSP v1 api. This file needs
+ * to be renamed and copied into the application project alongside
+ * the respective header file
  ******************************************************************************
  * @attention
  *
- * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics International N.V.
- * All rights reserved.</center></h2>
+ * Copyright (c) 2017-2019 STMicroelectronics. All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted, provided that the following conditions are met:
- *
- * 1. Redistribution of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. Neither the name of STMicroelectronics nor the names of other
- * contributors to this software may be used to endorse or promote products
- * derived from this software without specific written permission.
- * 4. This software, including modifications and/or derivative works of this
- * software, must execute solely and exclusively on microcontroller or
- * microprocessor devices manufactured by or for STMicroelectronics.
- * 5. Redistribution and use of this software other than as permitted under
- * this license is void and will automatically terminate your rights under
- * this license.
- *
- * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY
- * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT
- * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ * opensource.org/licenses/BSD-3-Clause
  *
  ******************************************************************************
- */
-
+**/
 /* Includes ------------------------------------------------------------------*/
 #include "ff_gen_drv.h"
 #include "sd_diskio.h"
@@ -61,7 +33,6 @@
 #define SD_TIMEOUT 30 * 1000
 #endif
 
-/* Block Size in Bytes */
 #define SD_DEFAULT_BLOCK_SIZE 512
 
 /*
@@ -105,7 +76,6 @@ const Diskio_drvTypeDef SD_Driver =
 /* Private functions ---------------------------------------------------------*/
 static DSTATUS SD_CheckStatus(BYTE lun)
 {
- (void)lun;
  Stat = STA_NOINIT;
 
  if(BSP_SD_GetCardState() == MSD_OK)
@@ -125,6 +95,7 @@ DSTATUS SD_initialize(BYTE lun)
 {
  Stat = STA_NOINIT;
 #if !defined(DISABLE_SD_INIT)
+
  if(BSP_SD_Init() == MSD_OK)
  {
  Stat = SD_CheckStatus(lun);
@@ -156,7 +127,6 @@ DSTATUS SD_status(BYTE lun)
  */
 DRESULT SD_read(BYTE lun, BYTE *buff, DWORD sector, UINT count)
 {
- (void)lun;
  DRESULT res = RES_ERROR;
 
  if(BSP_SD_ReadBlocks((uint32_t*)buff,
@@ -169,6 +139,7 @@ DRESULT SD_read(BYTE lun, BYTE *buff, DWORD sector, UINT count)
  }
  res = RES_OK;
  }
+
  return res;
 }
 
@@ -183,7 +154,6 @@ DRESULT SD_read(BYTE lun, BYTE *buff, DWORD sector, UINT count)
 #if _USE_WRITE == 1
 DRESULT SD_write(BYTE lun, const BYTE *buff, DWORD sector, UINT count)
 {
- (void)lun;
  DRESULT res = RES_ERROR;
 
  if(BSP_SD_WriteBlocks((uint32_t*)buff,
@@ -196,6 +166,7 @@ DRESULT SD_write(BYTE lun, const BYTE *buff, DWORD sector, UINT count)
  }
  res = RES_OK;
  }
+
  return res;
 }
 #endif /* _USE_WRITE == 1 */
@@ -210,9 +181,9 @@ DRESULT SD_write(BYTE lun, const BYTE *buff, DWORD sector, UINT count)
 #if _USE_IOCTL == 1
 DRESULT SD_ioctl(BYTE lun, BYTE cmd, void *buff)
 {
- (void)lun;
  DRESULT res = RES_ERROR;
- SD_CardInfo CardInfo;
+ BSP_SD_CardInfo CardInfo;
+
  if (Stat & STA_NOINIT) return RES_NOTRDY;
 
  switch (cmd)
@@ -240,7 +211,7 @@ DRESULT SD_ioctl(BYTE lun, BYTE cmd, void *buff)
  case GET_BLOCK_SIZE :
  BSP_SD_GetCardInfo(&CardInfo);
  *(DWORD*)buff = CardInfo.LogBlockSize / SD_DEFAULT_BLOCK_SIZE;
- res = RES_OK;
+res = RES_OK;
  break;
 
  default:

src/drivers/sd_diskio.h

@@ -1,55 +1,27 @@
 /**
  ******************************************************************************
- * @file sd_diskio.h 
+ * @file sd_diskio_tempalte.h
  * @author MCD Application Team
- * @version V2.0.2
- * @date 10-November-2017
- * @brief Header for sd_diskio.c module.
+ * @brief Header for sd_diskio_template.c module.This file needs to be
+ customized then copied under the application project
  ******************************************************************************
  * @attention
  *
- * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics International N.V.
- * All rights reserved.</center></h2>
+ * Copyright (c) 2017 STMicroelectronics. All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted, provided that the following conditions are met:
- *
- * 1. Redistribution of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. Neither the name of STMicroelectronics nor the names of other 
- * contributors to this software may be used to endorse or promote products 
- * derived from this software without specific written permission.
- * 4. This software, including modifications and/or derivative works of this 
- * software, must execute solely and exclusively on microcontroller or
- * microprocessor devices manufactured by or for STMicroelectronics.
- * 5. Redistribution and use of this software other than as permitted under 
- * this license is void and will automatically terminate your rights under 
- * this license. 
- *
- * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" 
- * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A 
- * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY
- * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT 
- * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, 
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ * opensource.org/licenses/BSD-3-Clause
  *
  ******************************************************************************
- */
-
+**/
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __SD_DISKIO_H
 #define __SD_DISKIO_H
 
 /* Includes ------------------------------------------------------------------*/
+#include "stm32xxxxx_{eval}{discovery}_sd.h"
 /* Exported types ------------------------------------------------------------*/
 /* Exported constants --------------------------------------------------------*/
 /* Exported functions ------------------------------------------------------- */

src/ff.c

@@ -3218,16 +3218,27 @@ FRESULT validate (	/* Returns FR_OK or FR_INVALID_OBJECT */
 FATFS** fs/* Pointer to pointer to the owner file system object to return */
 )
 {
-FRESULT res;
+FRESULT res = FR_INVALID_OBJECT;
 
-if (!obj || !obj->fs || !obj->fs->fs_type || obj->fs->id != obj->id || (disk_status(obj->fs->drv) & STA_NOINIT)) {
-*fs = 0;
-res = FR_INVALID_OBJECT;/* The object is invalid */
-} else {
-*fs = obj->fs;/* Owner file sytem object */
-ENTER_FF(obj->fs);/* Lock file system */
-res = FR_OK;/* Valid object */
+
+if (obj && obj->fs && obj->fs->fs_type && obj->id == obj->fs->id) {/* Test if the object is valid */
+#if _FS_REENTRANT
+if (lock_fs(obj->fs)) {/* Obtain the filesystem object */
+if (!(disk_status(obj->fs->drv) & STA_NOINIT)) { /* Test if the phsical drive is kept initialized */
+res = FR_OK;
+} else {
+unlock_fs(obj->fs, FR_OK);
+}
+} else {
+res = FR_TIMEOUT;
+}
+#else
+if (!(disk_status(obj->fs->drv) & STA_NOINIT)) { /* Test if the phsical drive is kept initialized */
+res = FR_OK;
+}
+#endif
 }
+*fs = (res == FR_OK) ? obj->fs : 0;/* Corresponding filesystem object */
 return res;
 }
 

src/ff_gen_drv.c

@@ -2,49 +2,19 @@
  ******************************************************************************
  * @file ff_gen_drv.c
  * @author MCD Application Team
- * @version V2.0.2
- * @date 10-November-2017
  * @brief FatFs generic low level driver.
- ******************************************************************************
+ *****************************************************************************
  * @attention
  *
- * <h2><center>&copy; Copyright (c) 2017 STMicroelectronics International N.V.
- * All rights reserved.</center></h2>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted, provided that the following conditions are met:
- *
- * 1. Redistribution of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. Neither the name of STMicroelectronics nor the names of other
- * contributors to this software may be used to endorse or promote products
- * derived from this software without specific written permission.
- * 4. This software, including modifications and/or derivative works of this
- * software, must execute solely and exclusively on microcontroller or
- * microprocessor devices manufactured by or for STMicroelectronics.
- * 5. Redistribution and use of this software other than as permitted under
- * this license is void and will automatically terminate your rights under
- * this license.
+ * Copyright (c) 2017 STMicroelectronics. All rights reserved.
  *
- * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY
- * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT
- * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ * opensource.org/licenses/BSD-3-Clause
  *
  ******************************************************************************
- */
-
+**/
 /* Includes ------------------------------------------------------------------*/
 #include "ff_gen_drv.h"
 
@@ -109,7 +79,6 @@ uint8_t FATFS_LinkDriver(const Diskio_drvTypeDef *drv, char *path)
  */
 uint8_t FATFS_UnLinkDriverEx(char *path, uint8_t lun)
 {
- (void)lun;
  uint8_t DiskNum = 0;
  uint8_t ret = 1;