Skip to content

Commit e45b202

Browse files
committed
all: Apply code formatting to new paths.
Run code formatting to apply rules to: * drivers/**/*.[ch] * examples/**/*.[ch] * shared/libc/*.[ch] * shared/readline/*.[ch] Signed-off-by: Phil Howard <phil@gadgetoid.com>
1 parent cf06547 commit e45b202

File tree

23 files changed

+292
-273
lines changed

23 files changed

+292
-273
lines changed

drivers/bus/softqspi.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ static void nibble_write(mp_soft_qspi_obj_t *self, uint8_t v) {
5757
}
5858

5959
static int mp_soft_qspi_ioctl(void *self_in, uint32_t cmd) {
60-
mp_soft_qspi_obj_t *self = (mp_soft_qspi_obj_t*)self_in;
60+
mp_soft_qspi_obj_t *self = (mp_soft_qspi_obj_t *)self_in;
6161

6262
switch (cmd) {
6363
case MP_QSPI_IOCTL_INIT:
@@ -67,7 +67,7 @@ static int mp_soft_qspi_ioctl(void *self_in, uint32_t cmd) {
6767
// Configure pins
6868
mp_hal_pin_write(self->clk, 0);
6969
mp_hal_pin_output(self->clk);
70-
//mp_hal_pin_write(self->clk, 1);
70+
// mp_hal_pin_write(self->clk, 1);
7171
mp_hal_pin_output(self->io0);
7272
mp_hal_pin_input(self->io1);
7373
mp_hal_pin_write(self->io2, 1);
@@ -155,20 +155,20 @@ static void mp_soft_qspi_qwrite(mp_soft_qspi_obj_t *self, size_t len, const uint
155155
SCK_LOW(self);
156156
}
157157

158-
//mp_hal_pin_input(self->io1);
158+
// mp_hal_pin_input(self->io1);
159159
}
160160

161161
static int mp_soft_qspi_write_cmd_data(void *self_in, uint8_t cmd, size_t len, uint32_t data) {
162-
mp_soft_qspi_obj_t *self = (mp_soft_qspi_obj_t*)self_in;
162+
mp_soft_qspi_obj_t *self = (mp_soft_qspi_obj_t *)self_in;
163163
uint32_t cmd_buf = cmd | data << 8;
164164
CS_LOW(self);
165-
mp_soft_qspi_transfer(self, 1 + len, (uint8_t*)&cmd_buf, NULL);
165+
mp_soft_qspi_transfer(self, 1 + len, (uint8_t *)&cmd_buf, NULL);
166166
CS_HIGH(self);
167167
return 0;
168168
}
169169

170170
static int mp_soft_qspi_write_cmd_addr_data(void *self_in, uint8_t cmd, uint32_t addr, size_t len, const uint8_t *src) {
171-
mp_soft_qspi_obj_t *self = (mp_soft_qspi_obj_t*)self_in;
171+
mp_soft_qspi_obj_t *self = (mp_soft_qspi_obj_t *)self_in;
172172
uint8_t cmd_buf[5] = {cmd};
173173
uint8_t addr_len = mp_spi_set_addr_buff(&cmd_buf[1], addr);
174174
CS_LOW(self);
@@ -179,17 +179,17 @@ static int mp_soft_qspi_write_cmd_addr_data(void *self_in, uint8_t cmd, uint32_t
179179
}
180180

181181
static int mp_soft_qspi_read_cmd(void *self_in, uint8_t cmd, size_t len, uint32_t *dest) {
182-
mp_soft_qspi_obj_t *self = (mp_soft_qspi_obj_t*)self_in;
182+
mp_soft_qspi_obj_t *self = (mp_soft_qspi_obj_t *)self_in;
183183
uint32_t cmd_buf = cmd;
184184
CS_LOW(self);
185-
mp_soft_qspi_transfer(self, 1 + len, (uint8_t*)&cmd_buf, (uint8_t*)&cmd_buf);
185+
mp_soft_qspi_transfer(self, 1 + len, (uint8_t *)&cmd_buf, (uint8_t *)&cmd_buf);
186186
CS_HIGH(self);
187187
*dest = cmd_buf >> 8;
188188
return 0;
189189
}
190190

191191
static int mp_soft_qspi_read_cmd_qaddr_qdata(void *self_in, uint8_t cmd, uint32_t addr, size_t len, uint8_t *dest) {
192-
mp_soft_qspi_obj_t *self = (mp_soft_qspi_obj_t*)self_in;
192+
mp_soft_qspi_obj_t *self = (mp_soft_qspi_obj_t *)self_in;
193193
uint8_t cmd_buf[7] = {cmd};
194194
uint8_t addr_len = mp_spi_set_addr_buff(&cmd_buf[1], addr);
195195
CS_LOW(self);

drivers/bus/softspi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "drivers/bus/spi.h"
2828

2929
int mp_soft_spi_ioctl(void *self_in, uint32_t cmd) {
30-
mp_soft_spi_obj_t *self = (mp_soft_spi_obj_t*)self_in;
30+
mp_soft_spi_obj_t *self = (mp_soft_spi_obj_t *)self_in;
3131

3232
switch (cmd) {
3333
case MP_SPI_IOCTL_INIT:
@@ -45,7 +45,7 @@ int mp_soft_spi_ioctl(void *self_in, uint32_t cmd) {
4545
}
4646

4747
void mp_soft_spi_transfer(void *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
48-
mp_soft_spi_obj_t *self = (mp_soft_spi_obj_t*)self_in;
48+
mp_soft_spi_obj_t *self = (mp_soft_spi_obj_t *)self_in;
4949
uint32_t delay_half = self->delay_half;
5050

5151
// only MSB transfer is implemented

drivers/esp-hosted/esp_hosted_hal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ MP_WEAK int esp_hosted_hal_spi_transfer(const uint8_t *tx_buf, uint8_t *rx_buf,
171171
// Wait for handshake pin to go high.
172172
for (mp_uint_t start = mp_hal_ticks_ms(); ; mp_hal_delay_ms(1)) {
173173
if (mp_hal_pin_read(MICROPY_HW_WIFI_HANDSHAKE) &&
174-
(rx_buf == NULL || mp_hal_pin_read(MICROPY_HW_WIFI_DATAREADY))) {
174+
(rx_buf == NULL || mp_hal_pin_read(MICROPY_HW_WIFI_DATAREADY))) {
175175
break;
176176
}
177177
if ((mp_hal_ticks_ms() - start) >= 1000) {

drivers/esp-hosted/esp_hosted_wifi.c

Lines changed: 38 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -80,51 +80,49 @@ static void esp_hosted_macstr_to_bytes(const uint8_t *mac_str, size_t mac_len, u
8080
// to avoid bleeding the protocol buffer API into the public interface, convert esp_hosted_security_t
8181
// to/from CtrlWifiSecProt here.
8282

83-
static esp_hosted_security_t sec_prot_to_hosted_security(CtrlWifiSecProt sec_prot)
84-
{
83+
static esp_hosted_security_t sec_prot_to_hosted_security(CtrlWifiSecProt sec_prot) {
8584
switch (sec_prot) {
86-
case CTRL__WIFI_SEC_PROT__Open:
87-
return ESP_HOSTED_SEC_OPEN;
88-
case CTRL__WIFI_SEC_PROT__WEP:
89-
return ESP_HOSTED_SEC_WEP;
90-
case CTRL__WIFI_SEC_PROT__WPA_PSK:
91-
return ESP_HOSTED_SEC_WPA_PSK;
92-
case CTRL__WIFI_SEC_PROT__WPA2_PSK:
93-
return ESP_HOSTED_SEC_WPA2_PSK;
94-
case CTRL__WIFI_SEC_PROT__WPA_WPA2_PSK:
95-
return ESP_HOSTED_SEC_WPA_WPA2_PSK;
96-
case CTRL__WIFI_SEC_PROT__WPA2_ENTERPRISE:
97-
return ESP_HOSTED_SEC_WPA2_ENTERPRISE;
98-
case CTRL__WIFI_SEC_PROT__WPA3_PSK:
99-
return ESP_HOSTED_SEC_WPA3_PSK;
100-
case CTRL__WIFI_SEC_PROT__WPA2_WPA3_PSK:
101-
return ESP_HOSTED_SEC_WPA2_WPA3_PSK;
102-
default:
103-
return ESP_HOSTED_SEC_INVALID;
85+
case CTRL__WIFI_SEC_PROT__Open:
86+
return ESP_HOSTED_SEC_OPEN;
87+
case CTRL__WIFI_SEC_PROT__WEP:
88+
return ESP_HOSTED_SEC_WEP;
89+
case CTRL__WIFI_SEC_PROT__WPA_PSK:
90+
return ESP_HOSTED_SEC_WPA_PSK;
91+
case CTRL__WIFI_SEC_PROT__WPA2_PSK:
92+
return ESP_HOSTED_SEC_WPA2_PSK;
93+
case CTRL__WIFI_SEC_PROT__WPA_WPA2_PSK:
94+
return ESP_HOSTED_SEC_WPA_WPA2_PSK;
95+
case CTRL__WIFI_SEC_PROT__WPA2_ENTERPRISE:
96+
return ESP_HOSTED_SEC_WPA2_ENTERPRISE;
97+
case CTRL__WIFI_SEC_PROT__WPA3_PSK:
98+
return ESP_HOSTED_SEC_WPA3_PSK;
99+
case CTRL__WIFI_SEC_PROT__WPA2_WPA3_PSK:
100+
return ESP_HOSTED_SEC_WPA2_WPA3_PSK;
101+
default:
102+
return ESP_HOSTED_SEC_INVALID;
104103
}
105104
}
106105

107-
static CtrlWifiSecProt hosted_security_to_sec_prot(esp_hosted_security_t hosted_security)
108-
{
106+
static CtrlWifiSecProt hosted_security_to_sec_prot(esp_hosted_security_t hosted_security) {
109107
switch (hosted_security) {
110-
case ESP_HOSTED_SEC_OPEN:
111-
return CTRL__WIFI_SEC_PROT__Open;
112-
case ESP_HOSTED_SEC_WEP:
113-
return CTRL__WIFI_SEC_PROT__WEP;
114-
case ESP_HOSTED_SEC_WPA_PSK:
115-
return CTRL__WIFI_SEC_PROT__WPA_PSK;
116-
case ESP_HOSTED_SEC_WPA2_PSK:
117-
return CTRL__WIFI_SEC_PROT__WPA2_PSK;
118-
case ESP_HOSTED_SEC_WPA_WPA2_PSK:
119-
return CTRL__WIFI_SEC_PROT__WPA_WPA2_PSK;
120-
case ESP_HOSTED_SEC_WPA2_ENTERPRISE:
121-
return CTRL__WIFI_SEC_PROT__WPA2_ENTERPRISE;
122-
case ESP_HOSTED_SEC_WPA3_PSK:
123-
return CTRL__WIFI_SEC_PROT__WPA3_PSK;
124-
case ESP_HOSTED_SEC_WPA2_WPA3_PSK:
125-
return CTRL__WIFI_SEC_PROT__WPA2_WPA3_PSK;
126-
default:
127-
abort(); // Range should be checked by the caller, making this unreachable
108+
case ESP_HOSTED_SEC_OPEN:
109+
return CTRL__WIFI_SEC_PROT__Open;
110+
case ESP_HOSTED_SEC_WEP:
111+
return CTRL__WIFI_SEC_PROT__WEP;
112+
case ESP_HOSTED_SEC_WPA_PSK:
113+
return CTRL__WIFI_SEC_PROT__WPA_PSK;
114+
case ESP_HOSTED_SEC_WPA2_PSK:
115+
return CTRL__WIFI_SEC_PROT__WPA2_PSK;
116+
case ESP_HOSTED_SEC_WPA_WPA2_PSK:
117+
return CTRL__WIFI_SEC_PROT__WPA_WPA2_PSK;
118+
case ESP_HOSTED_SEC_WPA2_ENTERPRISE:
119+
return CTRL__WIFI_SEC_PROT__WPA2_ENTERPRISE;
120+
case ESP_HOSTED_SEC_WPA3_PSK:
121+
return CTRL__WIFI_SEC_PROT__WPA3_PSK;
122+
case ESP_HOSTED_SEC_WPA2_WPA3_PSK:
123+
return CTRL__WIFI_SEC_PROT__WPA2_WPA3_PSK;
124+
default:
125+
abort(); // Range should be checked by the caller, making this unreachable
128126
}
129127
}
130128

drivers/memory/external_flash_device.h

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ typedef struct {
7070
// Xplained board.
7171
// Datasheet: https://www.adestotech.com/wp-content/uploads/doc8715.pdf
7272
#define AT25DF081A { \
73-
.total_size = (1 << 20), /* 1 MiB */ \
73+
.total_size = (1 << 20), /* 1 MiB */ \
7474
.start_up_time_us = 10000, \
7575
.manufacturer_id = 0x1f, \
7676
.memory_type = 0x45, \
@@ -88,12 +88,12 @@ typedef struct {
8888
// Settings for the Gigadevice GD25Q16C 2MiB SPI flash.
8989
// Datasheet: http://www.gigadevice.com/datasheet/gd25q16c/
9090
#define GD25Q16C { \
91-
.total_size = (1 << 21), /* 2 MiB */ \
91+
.total_size = (1 << 21), /* 2 MiB */ \
9292
.start_up_time_us = 5000, \
9393
.manufacturer_id = 0xc8, \
9494
.memory_type = 0x40, \
9595
.capacity = 0x15, \
96-
.max_clock_speed_mhz = 104, /* if we need 120 then we can turn on high performance mode */ \
96+
.max_clock_speed_mhz = 104, /* if we need 120 then we can turn on high performance mode */ \
9797
.quad_enable_bit_mask = 0x02, \
9898
.has_sector_protection = false, \
9999
.supports_fast_read = true, \
@@ -106,12 +106,12 @@ typedef struct {
106106
// Settings for the Gigadevice GD25Q64C 8MiB SPI flash.
107107
// Datasheet: http://www.elm-tech.com/en/products/spi-flash-memory/gd25q64/gd25q64.pdf
108108
#define GD25Q64C { \
109-
.total_size = (1 << 23), /* 8 MiB */ \
109+
.total_size = (1 << 23), /* 8 MiB */ \
110110
.start_up_time_us = 5000, \
111111
.manufacturer_id = 0xc8, \
112112
.memory_type = 0x40, \
113113
.capacity = 0x17, \
114-
.max_clock_speed_mhz = 104, /* if we need 120 then we can turn on high performance mode */ \
114+
.max_clock_speed_mhz = 104, /* if we need 120 then we can turn on high performance mode */ \
115115
.quad_enable_bit_mask = 0x02, \
116116
.has_sector_protection = false, \
117117
.supports_fast_read = true, \
@@ -124,7 +124,7 @@ typedef struct {
124124
// Settings for the Cypress (was Spansion) S25FL064L 8MiB SPI flash.
125125
// Datasheet: http://www.cypress.com/file/316661/download
126126
#define S25FL064L { \
127-
.total_size = (1 << 23), /* 8 MiB */ \
127+
.total_size = (1 << 23), /* 8 MiB */ \
128128
.start_up_time_us = 300, \
129129
.manufacturer_id = 0x01, \
130130
.memory_type = 0x60, \
@@ -142,7 +142,7 @@ typedef struct {
142142
// Settings for the Cypress (was Spansion) S25FL116K 2MiB SPI flash.
143143
// Datasheet: http://www.cypress.com/file/196886/download
144144
#define S25FL116K { \
145-
.total_size = (1 << 21), /* 2 MiB */ \
145+
.total_size = (1 << 21), /* 2 MiB */ \
146146
.start_up_time_us = 10000, \
147147
.manufacturer_id = 0x01, \
148148
.memory_type = 0x40, \
@@ -160,7 +160,7 @@ typedef struct {
160160
// Settings for the Cypress (was Spansion) S25FL216K 2MiB SPI flash.
161161
// Datasheet: http://www.cypress.com/file/197346/download
162162
#define S25FL216K { \
163-
.total_size = (1 << 21), /* 2 MiB */ \
163+
.total_size = (1 << 21), /* 2 MiB */ \
164164
.start_up_time_us = 10000, \
165165
.manufacturer_id = 0x01, \
166166
.memory_type = 0x40, \
@@ -178,7 +178,7 @@ typedef struct {
178178
// Settings for the Winbond W25Q16FW 2MiB SPI flash.
179179
// Datasheet: https://www.winbond.com/resource-files/w25q16fw%20revj%2005182017%20sfdp.pdf
180180
#define W25Q16FW { \
181-
.total_size = (1 << 21), /* 2 MiB */ \
181+
.total_size = (1 << 21), /* 2 MiB */ \
182182
.start_up_time_us = 5000, \
183183
.manufacturer_id = 0xef, \
184184
.memory_type = 0x60, \
@@ -196,7 +196,7 @@ typedef struct {
196196
// Settings for the Winbond W25Q16JV-IQ 2MiB SPI flash. Note that JV-IM has a different .memory_type (0x70)
197197
// Datasheet: https://www.winbond.com/resource-files/w25q16jv%20spi%20revf%2005092017.pdf
198198
#define W25Q16JV_IQ { \
199-
.total_size = (1 << 21), /* 2 MiB */ \
199+
.total_size = (1 << 21), /* 2 MiB */ \
200200
.start_up_time_us = 5000, \
201201
.manufacturer_id = 0xef, \
202202
.memory_type = 0x40, \
@@ -214,7 +214,7 @@ typedef struct {
214214
// Settings for the Winbond W25Q16JV-IM 2MiB SPI flash. Note that JV-IQ has a different .memory_type (0x40)
215215
// Datasheet: https://www.winbond.com/resource-files/w25q16jv%20spi%20revf%2005092017.pdf
216216
#define W25Q16JV_IM { \
217-
.total_size = (1 << 21), /* 2 MiB */ \
217+
.total_size = (1 << 21), /* 2 MiB */ \
218218
.start_up_time_us = 5000, \
219219
.manufacturer_id = 0xef, \
220220
.memory_type = 0x70, \
@@ -231,7 +231,7 @@ typedef struct {
231231
// Settings for the Winbond W25Q32BV 4MiB SPI flash.
232232
// Datasheet: https://www.winbond.com/resource-files/w25q32bv_revi_100413_wo_automotive.pdf
233233
#define W25Q32BV { \
234-
.total_size = (1 << 22), /* 4 MiB */ \
234+
.total_size = (1 << 22), /* 4 MiB */ \
235235
.start_up_time_us = 10000, \
236236
.manufacturer_id = 0xef, \
237237
.memory_type = 0x60, \
@@ -248,7 +248,7 @@ typedef struct {
248248
// Settings for the Winbond W25Q32JV-IM 4MiB SPI flash.
249249
// Datasheet: https://www.winbond.com/resource-files/w25q32jv%20revg%2003272018%20plus.pdf
250250
#define W25Q32JV_IM { \
251-
.total_size = (1 << 22), /* 4 MiB */ \
251+
.total_size = (1 << 22), /* 4 MiB */ \
252252
.start_up_time_us = 5000, \
253253
.manufacturer_id = 0xef, \
254254
.memory_type = 0x70, \
@@ -265,7 +265,7 @@ typedef struct {
265265
// Settings for the Winbond W25Q32JV-IM 4MiB SPI flash.
266266
// Datasheet: https://www.winbond.com/resource-files/w25q32jv%20revg%2003272018%20plus.pdf
267267
#define W25Q32JV_IQ { \
268-
.total_size = (1 << 22), /* 4 MiB */ \
268+
.total_size = (1 << 22), /* 4 MiB */ \
269269
.start_up_time_us = 5000, \
270270
.manufacturer_id = 0xef, \
271271
.memory_type = 0x40, \
@@ -282,7 +282,7 @@ typedef struct {
282282
// Settings for the Winbond W25Q64JV-IM 8MiB SPI flash. Note that JV-IQ has a different .memory_type (0x40)
283283
// Datasheet: http://www.winbond.com/resource-files/w25q64jv%20revj%2003272018%20plus.pdf
284284
#define W25Q64JV_IM { \
285-
.total_size = (1 << 23), /* 8 MiB */ \
285+
.total_size = (1 << 23), /* 8 MiB */ \
286286
.start_up_time_us = 5000, \
287287
.manufacturer_id = 0xef, \
288288
.memory_type = 0x70, \
@@ -300,7 +300,7 @@ typedef struct {
300300
// Settings for the Winbond W25Q64JV-IQ 8MiB SPI flash. Note that JV-IM has a different .memory_type (0x70)
301301
// Datasheet: http://www.winbond.com/resource-files/w25q64jv%20revj%2003272018%20plus.pdf
302302
#define W25Q64JV_IQ { \
303-
.total_size = (1 << 23), /* 8 MiB */ \
303+
.total_size = (1 << 23), /* 8 MiB */ \
304304
.start_up_time_us = 5000, \
305305
.manufacturer_id = 0xef, \
306306
.memory_type = 0x40, \
@@ -318,7 +318,7 @@ typedef struct {
318318
// Settings for the Winbond W25Q80DL 1MiB SPI flash.
319319
// Datasheet: https://www.winbond.com/resource-files/w25q80dv%20dl_revh_10022015.pdf
320320
#define W25Q80DL { \
321-
.total_size = (1 << 20), /* 1 MiB */ \
321+
.total_size = (1 << 20), /* 1 MiB */ \
322322
.start_up_time_us = 5000, \
323323
.manufacturer_id = 0xef, \
324324
.memory_type = 0x60, \
@@ -337,7 +337,7 @@ typedef struct {
337337
// Settings for the Winbond W25Q128JV-SQ 16MiB SPI flash. Note that JV-IM has a different .memory_type (0x70)
338338
// Datasheet: https://www.winbond.com/resource-files/w25q128jv%20revf%2003272018%20plus.pdf
339339
#define W25Q128JV_SQ { \
340-
.total_size = (1 << 24), /* 16 MiB */ \
340+
.total_size = (1 << 24), /* 16 MiB */ \
341341
.start_up_time_us = 5000, \
342342
.manufacturer_id = 0xef, \
343343
.memory_type = 0x40, \
@@ -355,7 +355,7 @@ typedef struct {
355355
// Settings for the Macronix MX25L1606 2MiB SPI flash.
356356
// Datasheet:
357357
#define MX25L1606 { \
358-
.total_size = (1 << 21), /* 2 MiB */ \
358+
.total_size = (1 << 21), /* 2 MiB */ \
359359
.start_up_time_us = 5000, \
360360
.manufacturer_id = 0xc2, \
361361
.memory_type = 0x20, \
@@ -373,7 +373,7 @@ typedef struct {
373373
// Settings for the Macronix MX25L3233F 4MiB SPI flash.
374374
// Datasheet: http://www.macronix.com/Lists/Datasheet/Attachments/7426/MX25L3233F,%203V,%2032Mb,%20v1.6.pdf
375375
#define MX25L3233F { \
376-
.total_size = (1 << 22), /* 4 MiB */ \
376+
.total_size = (1 << 22), /* 4 MiB */ \
377377
.start_up_time_us = 5000, \
378378
.manufacturer_id = 0xc2, \
379379
.memory_type = 0x20, \
@@ -392,7 +392,7 @@ typedef struct {
392392
// Datasheet: http://www.macronix.com/Lists/Datasheet/Attachments/7428/MX25R6435F,%20Wide%20Range,%2064Mb,%20v1.4.pdf
393393
// By default its in lower power mode which can only do 8mhz. In high power mode it can do 80mhz.
394394
#define MX25R6435F { \
395-
.total_size = (1 << 23), /* 8 MiB */ \
395+
.total_size = (1 << 23), /* 8 MiB */ \
396396
.start_up_time_us = 5000, \
397397
.manufacturer_id = 0xc2, \
398398
.memory_type = 0x28, \
@@ -410,7 +410,7 @@ typedef struct {
410410
// Settings for the Winbond W25Q128JV-PM 16MiB SPI flash. Note that JV-IM has a different .memory_type (0x70)
411411
// Datasheet: https://www.winbond.com/resource-files/w25q128jv%20revf%2003272018%20plus.pdf
412412
#define W25Q128JV_PM { \
413-
.total_size = (1 << 24), /* 16 MiB */ \
413+
.total_size = (1 << 24), /* 16 MiB */ \
414414
.start_up_time_us = 5000, \
415415
.manufacturer_id = 0xef, \
416416
.memory_type = 0x70, \
@@ -427,7 +427,7 @@ typedef struct {
427427
// Settings for the Winbond W25Q32FV 4MiB SPI flash.
428428
// Datasheet:http://www.winbond.com/resource-files/w25q32fv%20revj%2006032016.pdf?__locale=en
429429
#define W25Q32FV { \
430-
.total_size = (1 << 22), /* 4 MiB */ \
430+
.total_size = (1 << 22), /* 4 MiB */ \
431431
.start_up_time_us = 5000, \
432432
.manufacturer_id = 0xef, \
433433
.memory_type = 0x40, \
@@ -444,7 +444,7 @@ typedef struct {
444444

445445
// Settings for the ISSI devices
446446
#define IS25LPWP064D { \
447-
.total_size = (1 << 23), /* 8 MiB */ \
447+
.total_size = (1 << 23), /* 8 MiB */ \
448448
.start_up_time_us = 5000, \
449449
.manufacturer_id = 0x9D, \
450450
.memory_type = 0x60, \
@@ -461,7 +461,7 @@ typedef struct {
461461

462462
// Settings for a GENERIC device with the most common setting
463463
#define GENERIC { \
464-
.total_size = (1 << 21), /* 2 MiB */ \
464+
.total_size = (1 << 21), /* 2 MiB */ \
465465
.start_up_time_us = 5000, \
466466
.manufacturer_id = 0x00, \
467467
.memory_type = 0x40, \

0 commit comments

Comments
 (0)