Skip to content

Commit cc39046

Browse files
fpistmfpistm
committed
chore: apply astyle
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 8acd7ec commit cc39046

File tree

6 files changed

+79
-76
lines changed

6 files changed

+79
-76
lines changed

‎src/SD.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,13 @@ File SDClass::open(const char *filepath, uint8_t mode /* = FA_READ */)
144144
file._fil->fs = 0;
145145
file._dir.fs = 0;
146146
#endif
147-
147+
148148
if ((mode == FILE_WRITE) && (!SD.exists(filepath))) {
149149
mode = mode | FA_CREATE_ALWAYS;
150150
}
151151

152152
file._res = f_open(file._fil, filepath, mode);
153-
if ( file._res != FR_OK) {
153+
if (file._res != FR_OK) {
154154
free(file._fil);
155155
file._fil = NULL;
156156
file._res = f_opendir(&file._dir, filepath);

‎src/STM32SD.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,10 @@ class File {
7474
DIR _dir = {}; // init all fields to 0
7575
FRESULT _res = FR_OK;
7676

77-
FRESULT getErrorstate(void) {return _res;}
77+
FRESULT getErrorstate(void)
78+
{
79+
return _res;
80+
}
7881

7982
};
8083

‎src/bsp_sd.c

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -41,82 +41,82 @@
4141

4242
/* Definition for BSP SD */
4343
#if defined(SDMMC1) || defined(SDMMC2)
44-
#ifndef SD_INSTANCE
45-
#define SD_INSTANCE SDMMC1
46-
#endif
47-
48-
#define SD_CLK_ENABLE __HAL_RCC_SDMMC1_CLK_ENABLE
49-
#define SD_CLK_DISABLE __HAL_RCC_SDMMC1_CLK_DISABLE
50-
#ifdef SDMMC2
51-
#define SD_CLK2_ENABLE __HAL_RCC_SDMMC2_CLK_ENABLE
52-
#define SD_CLK2_DISABLE __HAL_RCC_SDMMC2_CLK_DISABLE
53-
#endif
54-
55-
#define SD_CLK_EDGE SDMMC_CLOCK_EDGE_RISING
56-
#define SD_CLK_BYPASS SDMMC_CLOCK_BYPASS_DISABLE
57-
#define SD_CLK_PWR_SAVE SDMMC_CLOCK_POWER_SAVE_DISABLE
58-
#define SD_BUS_WIDE_1B SDMMC_BUS_WIDE_1B
59-
#define SD_BUS_WIDE_4B SDMMC_BUS_WIDE_4B
60-
#define SD_BUS_WIDE_8B SDMMC_BUS_WIDE_8B
61-
#define SD_HW_FLOW_CTRL_ENABLE SDMMC_HARDWARE_FLOW_CONTROL_ENABLE
62-
#define SD_HW_FLOW_CTRL_DISABLE SDMMC_HARDWARE_FLOW_CONTROL_DISABLE
63-
64-
#ifdef STM32H7xx
65-
#define SD_CLK_DIV 1
66-
#else
67-
#define SD_CLK_DIV SDMMC_TRANSFER_CLK_DIV
68-
#endif
69-
70-
#ifdef SDMMC_TRANSCEIVER_ENABLE
71-
#define SD_TRANSCEIVER_ENABLE SDMMC_TRANSCEIVER_ENABLE
72-
#define SD_TRANSCEIVER_DISABLE SDMMC_TRANSCEIVER_DISABLE
73-
#endif
44+
#ifndef SD_INSTANCE
45+
#define SD_INSTANCE SDMMC1
46+
#endif
47+
48+
#define SD_CLK_ENABLE __HAL_RCC_SDMMC1_CLK_ENABLE
49+
#define SD_CLK_DISABLE __HAL_RCC_SDMMC1_CLK_DISABLE
50+
#ifdef SDMMC2
51+
#define SD_CLK2_ENABLE __HAL_RCC_SDMMC2_CLK_ENABLE
52+
#define SD_CLK2_DISABLE __HAL_RCC_SDMMC2_CLK_DISABLE
53+
#endif
54+
55+
#define SD_CLK_EDGE SDMMC_CLOCK_EDGE_RISING
56+
#define SD_CLK_BYPASS SDMMC_CLOCK_BYPASS_DISABLE
57+
#define SD_CLK_PWR_SAVE SDMMC_CLOCK_POWER_SAVE_DISABLE
58+
#define SD_BUS_WIDE_1B SDMMC_BUS_WIDE_1B
59+
#define SD_BUS_WIDE_4B SDMMC_BUS_WIDE_4B
60+
#define SD_BUS_WIDE_8B SDMMC_BUS_WIDE_8B
61+
#define SD_HW_FLOW_CTRL_ENABLE SDMMC_HARDWARE_FLOW_CONTROL_ENABLE
62+
#define SD_HW_FLOW_CTRL_DISABLE SDMMC_HARDWARE_FLOW_CONTROL_DISABLE
63+
64+
#ifdef STM32H7xx
65+
#define SD_CLK_DIV 1
66+
#else
67+
#define SD_CLK_DIV SDMMC_TRANSFER_CLK_DIV
68+
#endif
69+
70+
#ifdef SDMMC_TRANSCEIVER_ENABLE
71+
#define SD_TRANSCEIVER_ENABLE SDMMC_TRANSCEIVER_ENABLE
72+
#define SD_TRANSCEIVER_DISABLE SDMMC_TRANSCEIVER_DISABLE
73+
#endif
7474

7575
#elif defined(SDIO)
76-
#define SD_INSTANCE SDIO
77-
#define SD_CLK_ENABLE __HAL_RCC_SDIO_CLK_ENABLE
78-
#define SD_CLK_DISABLE __HAL_RCC_SDIO_CLK_DISABLE
79-
#define SD_CLK_EDGE SDIO_CLOCK_EDGE_RISING
80-
#define SD_CLK_BYPASS SDIO_CLOCK_BYPASS_DISABLE
81-
#define SD_CLK_PWR_SAVE SDIO_CLOCK_POWER_SAVE_DISABLE
82-
#define SD_BUS_WIDE_1B SDIO_BUS_WIDE_1B
83-
#define SD_BUS_WIDE_4B SDIO_BUS_WIDE_4B
84-
#define SD_BUS_WIDE_8B SDIO_BUS_WIDE_8B
85-
#define SD_HW_FLOW_CTRL_ENABLE SDIO_HARDWARE_FLOW_CONTROL_ENABLE
86-
#define SD_HW_FLOW_CTRL_DISABLE SDIO_HARDWARE_FLOW_CONTROL_DISABLE
87-
#define SD_CLK_DIV SDIO_TRANSFER_CLK_DIV
76+
#define SD_INSTANCE SDIO
77+
#define SD_CLK_ENABLE __HAL_RCC_SDIO_CLK_ENABLE
78+
#define SD_CLK_DISABLE __HAL_RCC_SDIO_CLK_DISABLE
79+
#define SD_CLK_EDGE SDIO_CLOCK_EDGE_RISING
80+
#define SD_CLK_BYPASS SDIO_CLOCK_BYPASS_DISABLE
81+
#define SD_CLK_PWR_SAVE SDIO_CLOCK_POWER_SAVE_DISABLE
82+
#define SD_BUS_WIDE_1B SDIO_BUS_WIDE_1B
83+
#define SD_BUS_WIDE_4B SDIO_BUS_WIDE_4B
84+
#define SD_BUS_WIDE_8B SDIO_BUS_WIDE_8B
85+
#define SD_HW_FLOW_CTRL_ENABLE SDIO_HARDWARE_FLOW_CONTROL_ENABLE
86+
#define SD_HW_FLOW_CTRL_DISABLE SDIO_HARDWARE_FLOW_CONTROL_DISABLE
87+
#define SD_CLK_DIV SDIO_TRANSFER_CLK_DIV
8888
#else
89-
#error "Unknown SD_INSTANCE"
89+
#error "Unknown SD_INSTANCE"
9090
#endif
9191

9292
#ifndef SD_HW_FLOW_CTRL
93-
#define SD_HW_FLOW_CTRL SD_HW_FLOW_CTRL_DISABLE
93+
#define SD_HW_FLOW_CTRL SD_HW_FLOW_CTRL_DISABLE
9494
#endif
9595

9696
#ifndef SD_BUS_WIDE
97-
#define SD_BUS_WIDE SD_BUS_WIDE_4B
97+
#define SD_BUS_WIDE SD_BUS_WIDE_4B
9898
#endif
9999

100100
#if defined(SDMMC_TRANSCEIVER_ENABLE) && !defined(SD_TRANSCEIVER_MODE)
101-
#define SD_TRANSCEIVER_MODE SD_TRANSCEIVER_DISABLE
101+
#define SD_TRANSCEIVER_MODE SD_TRANSCEIVER_DISABLE
102102
#endif
103103

104104
/* BSP SD Private Variables */
105105
static SD_HandleTypeDef uSdHandle;
106106
static uint32_t SD_detect_ll_gpio_pin = LL_GPIO_PIN_ALL;
107107
static GPIO_TypeDef *SD_detect_gpio_port = GPIOA;
108108
#ifdef SDMMC_TRANSCEIVER_ENABLE
109-
static uint32_t SD_trans_en_ll_gpio_pin = LL_GPIO_PIN_ALL;
110-
static GPIO_TypeDef *SD_trans_en_gpio_port = GPIOA;
111-
static uint32_t SD_trans_sel_ll_gpio_pin = LL_GPIO_PIN_ALL;
112-
static GPIO_TypeDef *SD_trans_sel_gpio_port = GPIOA;
109+
static uint32_t SD_trans_en_ll_gpio_pin = LL_GPIO_PIN_ALL;
110+
static GPIO_TypeDef *SD_trans_en_gpio_port = GPIOA;
111+
static uint32_t SD_trans_sel_ll_gpio_pin = LL_GPIO_PIN_ALL;
112+
static GPIO_TypeDef *SD_trans_sel_gpio_port = GPIOA;
113113
#endif
114114
#ifndef STM32L1xx
115-
#define SD_OK HAL_OK
116-
#define SD_TRANSFER_OK ((uint8_t)0x00)
117-
#define SD_TRANSFER_BUSY ((uint8_t)0x01)
115+
#define SD_OK HAL_OK
116+
#define SD_TRANSFER_OK ((uint8_t)0x00)
117+
#define SD_TRANSFER_BUSY ((uint8_t)0x01)
118118
#else /* STM32L1xx */
119-
static SD_CardInfo uSdCardInfo;
119+
static SD_CardInfo uSdCardInfo;
120120
#endif
121121

122122

‎src/ffconf.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010

1111
/* FatFs specific configuration options. */
1212
#if __has_include("ffconf_custom.h")
13-
#include "ffconf_custom.h"
13+
#include "ffconf_custom.h"
1414
#else
15-
#if _FATFS == 68300
16-
#include "ffconf_default_68300.h"
17-
#else
18-
#include "ffconf_default_32020.h"
19-
#endif
15+
#if _FATFS == 68300
16+
#include "ffconf_default_68300.h"
17+
#else
18+
#include "ffconf_default_32020.h"
19+
#endif
2020
#endif
2121
#endif /* _ARDUINO_FFCONF_H */

‎src/ffconf_default_32020.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@
236236
/� These options have no effect at read-only configuration (_FS_READONLY == 1). */
237237

238238
#if _NORTC_YEAR < 1980 || _NORTC_YEAR > 2107 || _NORTC_MON < 1 || _NORTC_MON > 12 || _NORTC_MDAY < 1 || _NORTC_MDAY > 31
239-
#error Invalid _FS_NORTC settings
239+
#error Invalid _FS_NORTC settings
240240
#endif
241241

242242
#endif /* _FFCONFIG */

‎src/ffconf_default_68300.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -287,9 +287,9 @@
287287
#define _FS_REENTRANT 0
288288

289289
#if _FS_REENTRANT
290-
#include "cmsis_os.h"
291-
#define _FS_TIMEOUT 1000
292-
#define _SYNC_t osSemaphoreId
290+
#include "cmsis_os.h"
291+
#define _FS_TIMEOUT 1000
292+
#define _SYNC_t osSemaphoreId
293293
#endif
294294
/* The option _FS_REENTRANT switches the re-entrancy (thread safe) of the FatFs
295295
/ module itself. Note that regardless of this option, file access to different
@@ -311,16 +311,16 @@
311311
/* #include <windows.h> // O/S definitions */
312312

313313
#if _USE_LFN == 3
314-
#if !defined(ff_malloc) || !defined(ff_free)
315-
#include <stdlib.h>
316-
#endif
314+
#if !defined(ff_malloc) || !defined(ff_free)
315+
#include <stdlib.h>
316+
#endif
317317

318-
#if !defined(ff_malloc)
319-
#define ff_malloc malloc
320-
#endif
318+
#if !defined(ff_malloc)
319+
#define ff_malloc malloc
320+
#endif
321321

322-
#if !defined(ff_free)
323-
#define ff_free free
324-
#endif
322+
#if !defined(ff_free)
323+
#define ff_free free
324+
#endif
325325
#endif
326326
/*--- End of configuration options ---*/

0 commit comments

Comments
 (0)