Skip to content

Commit b057fb8

Browse files
tannewttannewt
committed
codeformat
1 parent 3e25d61 commit b057fb8

File tree

789 files changed

+12067
-9045
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

789 files changed

+12067
-9045
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,19 +155,19 @@ 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 void 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
}
168168

169169
STATIC void mp_soft_qspi_write_cmd_addr_data(void *self_in, uint8_t cmd, uint32_t addr, size_t len, const uint8_t *src) {
170-
mp_soft_qspi_obj_t *self = (mp_soft_qspi_obj_t*)self_in;
170+
mp_soft_qspi_obj_t *self = (mp_soft_qspi_obj_t *)self_in;
171171
uint8_t cmd_buf[4] = {cmd, addr >> 16, addr >> 8, addr};
172172
CS_LOW(self);
173173
mp_soft_qspi_transfer(self, 4, cmd_buf, NULL);
@@ -176,16 +176,16 @@ STATIC void mp_soft_qspi_write_cmd_addr_data(void *self_in, uint8_t cmd, uint32_
176176
}
177177

178178
STATIC uint32_t mp_soft_qspi_read_cmd(void *self_in, uint8_t cmd, size_t len) {
179-
mp_soft_qspi_obj_t *self = (mp_soft_qspi_obj_t*)self_in;
179+
mp_soft_qspi_obj_t *self = (mp_soft_qspi_obj_t *)self_in;
180180
uint32_t cmd_buf = cmd;
181181
CS_LOW(self);
182-
mp_soft_qspi_transfer(self, 1 + len, (uint8_t*)&cmd_buf, (uint8_t*)&cmd_buf);
182+
mp_soft_qspi_transfer(self, 1 + len, (uint8_t *)&cmd_buf, (uint8_t *)&cmd_buf);
183183
CS_HIGH(self);
184184
return cmd_buf >> 8;
185185
}
186186

187187
STATIC void mp_soft_qspi_read_cmd_qaddr_qdata(void *self_in, uint8_t cmd, uint32_t addr, size_t len, uint8_t *dest) {
188-
mp_soft_qspi_obj_t *self = (mp_soft_qspi_obj_t*)self_in;
188+
mp_soft_qspi_obj_t *self = (mp_soft_qspi_obj_t *)self_in;
189189
uint8_t cmd_buf[7] = {cmd, addr >> 16, addr >> 8, addr};
190190
CS_LOW(self);
191191
mp_soft_qspi_transfer(self, 1, cmd_buf, NULL);

‎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

‎extmod/machine_i2c.c‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ STATIC int mp_hal_i2c_read_byte(machine_i2c_obj_t *self, uint8_t *val, int nack)
183183
// >=0 - number of acks received
184184
// <0 - error, with errno being the negative of the return value
185185
int mp_machine_soft_i2c_writeto(mp_obj_base_t *self_in, uint16_t addr, const uint8_t *src, size_t len, bool stop) {
186-
machine_i2c_obj_t *self = (machine_i2c_obj_t*)self_in;
186+
machine_i2c_obj_t *self = (machine_i2c_obj_t *)self_in;
187187

188188
// start the I2C transaction
189189
int ret = mp_hal_i2c_start(self);
@@ -229,7 +229,7 @@ int mp_machine_soft_i2c_writeto(mp_obj_base_t *self_in, uint16_t addr, const uin
229229
// 0 - success
230230
// <0 - error, with errno being the negative of the return value
231231
int mp_machine_soft_i2c_readfrom(mp_obj_base_t *self_in, uint16_t addr, uint8_t *dest, size_t len, bool stop) {
232-
machine_i2c_obj_t *self = (machine_i2c_obj_t*)self_in;
232+
machine_i2c_obj_t *self = (machine_i2c_obj_t *)self_in;
233233

234234
// start the I2C transaction
235235
int ret = mp_hal_i2c_start(self);
@@ -318,7 +318,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(machine_i2c_init_obj, 1, machine_i2c_obj_init);
318318

319319
STATIC mp_obj_t machine_i2c_scan(mp_obj_t self_in) {
320320
mp_obj_base_t *self = MP_OBJ_TO_PTR(self_in);
321-
mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)self->type->protocol;
321+
mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
322322
mp_obj_t list = mp_obj_new_list(0, NULL);
323323
// 7-bit addresses 0b0000xxx and 0b1111xxx are reserved
324324
for (int addr = 0x08; addr < 0x78; ++addr) {
@@ -332,8 +332,8 @@ STATIC mp_obj_t machine_i2c_scan(mp_obj_t self_in) {
332332
MP_DEFINE_CONST_FUN_OBJ_1(machine_i2c_scan_obj, machine_i2c_scan);
333333

334334
STATIC mp_obj_t machine_i2c_start(mp_obj_t self_in) {
335-
mp_obj_base_t *self = (mp_obj_base_t*)MP_OBJ_TO_PTR(self_in);
336-
mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)self->type->protocol;
335+
mp_obj_base_t *self = (mp_obj_base_t *)MP_OBJ_TO_PTR(self_in);
336+
mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
337337
if (i2c_p->start == NULL) {
338338
mp_raise_msg(&mp_type_OSError, "I2C operation not supported");
339339
}
@@ -346,8 +346,8 @@ STATIC mp_obj_t machine_i2c_start(mp_obj_t self_in) {
346346
MP_DEFINE_CONST_FUN_OBJ_1(machine_i2c_start_obj, machine_i2c_start);
347347

348348
STATIC mp_obj_t machine_i2c_stop(mp_obj_t self_in) {
349-
mp_obj_base_t *self = (mp_obj_base_t*)MP_OBJ_TO_PTR(self_in);
350-
mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)self->type->protocol;
349+
mp_obj_base_t *self = (mp_obj_base_t *)MP_OBJ_TO_PTR(self_in);
350+
mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
351351
if (i2c_p->stop == NULL) {
352352
mp_raise_msg(&mp_type_OSError, "I2C operation not supported");
353353
}
@@ -360,8 +360,8 @@ STATIC mp_obj_t machine_i2c_stop(mp_obj_t self_in) {
360360
MP_DEFINE_CONST_FUN_OBJ_1(machine_i2c_stop_obj, machine_i2c_stop);
361361

362362
STATIC mp_obj_t machine_i2c_readinto(size_t n_args, const mp_obj_t *args) {
363-
mp_obj_base_t *self = (mp_obj_base_t*)MP_OBJ_TO_PTR(args[0]);
364-
mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)self->type->protocol;
363+
mp_obj_base_t *self = (mp_obj_base_t *)MP_OBJ_TO_PTR(args[0]);
364+
mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
365365
if (i2c_p->read == NULL) {
366366
mp_raise_msg(&mp_type_OSError, "I2C operation not supported");
367367
}
@@ -384,8 +384,8 @@ STATIC mp_obj_t machine_i2c_readinto(size_t n_args, const mp_obj_t *args) {
384384
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_i2c_readinto_obj, 2, 3, machine_i2c_readinto);
385385

386386
STATIC mp_obj_t machine_i2c_write(mp_obj_t self_in, mp_obj_t buf_in) {
387-
mp_obj_base_t *self = (mp_obj_base_t*)MP_OBJ_TO_PTR(self_in);
388-
mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)self->type->protocol;
387+
mp_obj_base_t *self = (mp_obj_base_t *)MP_OBJ_TO_PTR(self_in);
388+
mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
389389
if (i2c_p->write == NULL) {
390390
mp_raise_msg(&mp_type_OSError, "I2C operation not supported");
391391
}
@@ -406,13 +406,13 @@ STATIC mp_obj_t machine_i2c_write(mp_obj_t self_in, mp_obj_t buf_in) {
406406
MP_DEFINE_CONST_FUN_OBJ_2(machine_i2c_write_obj, machine_i2c_write);
407407

408408
STATIC mp_obj_t machine_i2c_readfrom(size_t n_args, const mp_obj_t *args) {
409-
mp_obj_base_t *self = (mp_obj_base_t*)MP_OBJ_TO_PTR(args[0]);
410-
mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)self->type->protocol;
409+
mp_obj_base_t *self = (mp_obj_base_t *)MP_OBJ_TO_PTR(args[0]);
410+
mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
411411
mp_int_t addr = mp_obj_get_int(args[1]);
412412
vstr_t vstr;
413413
vstr_init_len(&vstr, mp_obj_get_int(args[2]));
414414
bool stop = (n_args == 3) ? true : mp_obj_is_true(args[3]);
415-
int ret = i2c_p->readfrom(self, addr, (uint8_t*)vstr.buf, vstr.len, stop);
415+
int ret = i2c_p->readfrom(self, addr, (uint8_t *)vstr.buf, vstr.len, stop);
416416
if (ret < 0) {
417417
mp_raise_OSError(-ret);
418418
}
@@ -421,8 +421,8 @@ STATIC mp_obj_t machine_i2c_readfrom(size_t n_args, const mp_obj_t *args) {
421421
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_i2c_readfrom_obj, 3, 4, machine_i2c_readfrom);
422422

423423
STATIC mp_obj_t machine_i2c_readfrom_into(size_t n_args, const mp_obj_t *args) {
424-
mp_obj_base_t *self = (mp_obj_base_t*)MP_OBJ_TO_PTR(args[0]);
425-
mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)self->type->protocol;
424+
mp_obj_base_t *self = (mp_obj_base_t *)MP_OBJ_TO_PTR(args[0]);
425+
mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
426426
mp_int_t addr = mp_obj_get_int(args[1]);
427427
mp_buffer_info_t bufinfo;
428428
mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_WRITE);
@@ -436,8 +436,8 @@ STATIC mp_obj_t machine_i2c_readfrom_into(size_t n_args, const mp_obj_t *args) {
436436
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_i2c_readfrom_into_obj, 3, 4, machine_i2c_readfrom_into);
437437

438438
STATIC mp_obj_t machine_i2c_writeto(size_t n_args, const mp_obj_t *args) {
439-
mp_obj_base_t *self = (mp_obj_base_t*)MP_OBJ_TO_PTR(args[0]);
440-
mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)self->type->protocol;
439+
mp_obj_base_t *self = (mp_obj_base_t *)MP_OBJ_TO_PTR(args[0]);
440+
mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
441441
mp_int_t addr = mp_obj_get_int(args[1]);
442442
mp_buffer_info_t bufinfo;
443443
mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_READ);
@@ -452,8 +452,8 @@ STATIC mp_obj_t machine_i2c_writeto(size_t n_args, const mp_obj_t *args) {
452452
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_i2c_writeto_obj, 3, 4, machine_i2c_writeto);
453453

454454
STATIC int read_mem(mp_obj_t self_in, uint16_t addr, uint32_t memaddr, uint8_t addrsize, uint8_t *buf, size_t len) {
455-
mp_obj_base_t *self = (mp_obj_base_t*)MP_OBJ_TO_PTR(self_in);
456-
mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)self->type->protocol;
455+
mp_obj_base_t *self = (mp_obj_base_t *)MP_OBJ_TO_PTR(self_in);
456+
mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
457457
uint8_t memaddr_buf[4];
458458
size_t memaddr_len = 0;
459459
for (int16_t i = addrsize - 8; i >= 0; i -= 8) {
@@ -472,8 +472,8 @@ STATIC int read_mem(mp_obj_t self_in, uint16_t addr, uint32_t memaddr, uint8_t a
472472
#define BUF_STACK_SIZE (12)
473473

474474
STATIC int write_mem(mp_obj_t self_in, uint16_t addr, uint32_t memaddr, uint8_t addrsize, const uint8_t *buf, size_t len) {
475-
mp_obj_base_t *self = (mp_obj_base_t*)MP_OBJ_TO_PTR(self_in);
476-
mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)self->type->protocol;
475+
mp_obj_base_t *self = (mp_obj_base_t *)MP_OBJ_TO_PTR(self_in);
476+
mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
477477

478478
// need some memory to create the buffer to send; try to use stack if possible
479479
uint8_t buf2_stack[MAX_MEMADDR_SIZE + BUF_STACK_SIZE];
@@ -519,7 +519,7 @@ STATIC mp_obj_t machine_i2c_readfrom_mem(size_t n_args, const mp_obj_t *pos_args
519519

520520
// do the transfer
521521
int ret = read_mem(pos_args[0], args[ARG_addr].u_int, args[ARG_memaddr].u_int,
522-
args[ARG_addrsize].u_int, (uint8_t*)vstr.buf, vstr.len);
522+
args[ARG_addrsize].u_int, (uint8_t *)vstr.buf, vstr.len);
523523
if (ret < 0) {
524524
mp_raise_OSError(-ret);
525525
}
@@ -594,7 +594,7 @@ STATIC const mp_rom_map_elem_t machine_i2c_locals_dict_table[] = {
594594
MP_DEFINE_CONST_DICT(mp_machine_soft_i2c_locals_dict, machine_i2c_locals_dict_table);
595595

596596
int mp_machine_soft_i2c_read(mp_obj_base_t *self_in, uint8_t *dest, size_t len, bool nack) {
597-
machine_i2c_obj_t *self = (machine_i2c_obj_t*)self_in;
597+
machine_i2c_obj_t *self = (machine_i2c_obj_t *)self_in;
598598
while (len--) {
599599
int ret = mp_hal_i2c_read_byte(self, dest++, nack && (len == 0));
600600
if (ret != 0) {
@@ -605,7 +605,7 @@ int mp_machine_soft_i2c_read(mp_obj_base_t *self_in, uint8_t *dest, size_t len,
605605
}
606606

607607
int mp_machine_soft_i2c_write(mp_obj_base_t *self_in, const uint8_t *src, size_t len) {
608-
machine_i2c_obj_t *self = (machine_i2c_obj_t*)self_in;
608+
machine_i2c_obj_t *self = (machine_i2c_obj_t *)self_in;
609609
int num_acks = 0;
610610
while (len--) {
611611
int ret = mp_hal_i2c_write_byte(self, *src++);
@@ -621,8 +621,8 @@ int mp_machine_soft_i2c_write(mp_obj_base_t *self_in, const uint8_t *src, size_t
621621
}
622622

623623
STATIC const mp_machine_i2c_p_t mp_machine_soft_i2c_p = {
624-
.start = (int(*)(mp_obj_base_t*))mp_hal_i2c_start,
625-
.stop = (int(*)(mp_obj_base_t*))mp_hal_i2c_stop,
624+
.start = (int (*)(mp_obj_base_t *))mp_hal_i2c_start,
625+
.stop = (int (*)(mp_obj_base_t *))mp_hal_i2c_stop,
626626
.read = mp_machine_soft_i2c_read,
627627
.write = mp_machine_soft_i2c_write,
628628
.readfrom = mp_machine_soft_i2c_readfrom,
@@ -634,7 +634,7 @@ const mp_obj_type_t machine_i2c_type = {
634634
.name = MP_QSTR_I2C,
635635
.make_new = machine_i2c_make_new,
636636
.protocol = &mp_machine_soft_i2c_p,
637-
.locals_dict = (mp_obj_dict_t*)&mp_machine_soft_i2c_locals_dict,
637+
.locals_dict = (mp_obj_dict_t *)&mp_machine_soft_i2c_locals_dict,
638638
};
639639

640640
#endif // MICROPY_PY_MACHINE_I2C

‎extmod/machine_mem.c‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,31 @@ STATIC mp_obj_t machine_mem_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t va
7171
uintptr_t addr = MICROPY_MACHINE_MEM_GET_READ_ADDR(index, self->elem_size);
7272
uint32_t val;
7373
switch (self->elem_size) {
74-
case 1: val = (*(uint8_t*)addr); break;
75-
case 2: val = (*(uint16_t*)addr); break;
76-
default: val = (*(uint32_t*)addr); break;
74+
case 1:
75+
val = (*(uint8_t *)addr);
76+
break;
77+
case 2:
78+
val = (*(uint16_t *)addr);
79+
break;
80+
default:
81+
val = (*(uint32_t *)addr);
82+
break;
7783
}
7884
return mp_obj_new_int(val);
7985
} else {
8086
// store
8187
uintptr_t addr = MICROPY_MACHINE_MEM_GET_WRITE_ADDR(index, self->elem_size);
8288
uint32_t val = mp_obj_get_int_truncated(value);
8389
switch (self->elem_size) {
84-
case 1: (*(uint8_t*)addr) = val; break;
85-
case 2: (*(uint16_t*)addr) = val; break;
86-
default: (*(uint32_t*)addr) = val; break;
90+
case 1:
91+
(*(uint8_t *)addr) = val;
92+
break;
93+
case 2:
94+
(*(uint16_t *)addr) = val;
95+
break;
96+
default:
97+
(*(uint32_t *)addr) = val;
98+
break;
8799
}
88100
return mp_const_none;
89101
}

‎extmod/machine_signal.c‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ STATIC mp_obj_t signal_make_new(const mp_obj_type_t *type, size_t n_args, size_t
5050
mp_pin_p_t *pin_p = NULL;
5151

5252
if (MP_OBJ_IS_OBJ(pin)) {
53-
mp_obj_base_t *pin_base = (mp_obj_base_t*)MP_OBJ_TO_PTR(args[0]);
54-
pin_p = (mp_pin_p_t*)pin_base->type->protocol;
53+
mp_obj_base_t *pin_base = (mp_obj_base_t *)MP_OBJ_TO_PTR(args[0]);
54+
pin_p = (mp_pin_p_t *)pin_base->type->protocol;
5555
}
5656

5757
if (pin_p == NULL) {
@@ -90,8 +90,7 @@ STATIC mp_obj_t signal_make_new(const mp_obj_type_t *type, size_t n_args, size_t
9090
pin = MICROPY_PY_MACHINE_PIN_MAKE_NEW(NULL, n_args, n_kw, pin_args);
9191

9292
mp_local_free(pin_args);
93-
}
94-
else
93+
} else
9594
#endif
9695
// Otherwise there should be 1 or 2 args
9796
{
@@ -179,7 +178,7 @@ const mp_obj_type_t machine_signal_type = {
179178
.make_new = signal_make_new,
180179
.call = signal_call,
181180
.protocol = &signal_pin_p,
182-
.locals_dict = (void*)&signal_locals_dict,
181+
.locals_dict = (void *)&signal_locals_dict,
183182
};
184183

185184
#endif // MICROPY_PY_MACHINE

‎extmod/machine_spi.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,16 @@ mp_obj_t mp_machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_
6464
}
6565

6666
STATIC mp_obj_t machine_spi_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
67-
mp_obj_base_t *s = (mp_obj_base_t*)MP_OBJ_TO_PTR(args[0]);
68-
mp_machine_spi_p_t *spi_p = (mp_machine_spi_p_t*)s->type->protocol;
67+
mp_obj_base_t *s = (mp_obj_base_t *)MP_OBJ_TO_PTR(args[0]);
68+
mp_machine_spi_p_t *spi_p = (mp_machine_spi_p_t *)s->type->protocol;
6969
spi_p->init(s, n_args - 1, args + 1, kw_args);
7070
return mp_const_none;
7171
}
7272
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_spi_init_obj, 1, machine_spi_init);
7373

7474
STATIC mp_obj_t machine_spi_deinit(mp_obj_t self) {
75-
mp_obj_base_t *s = (mp_obj_base_t*)MP_OBJ_TO_PTR(self);
76-
mp_machine_spi_p_t *spi_p = (mp_machine_spi_p_t*)s->type->protocol;
75+
mp_obj_base_t *s = (mp_obj_base_t *)MP_OBJ_TO_PTR(self);
76+
mp_machine_spi_p_t *spi_p = (mp_machine_spi_p_t *)s->type->protocol;
7777
if (spi_p->deinit != NULL) {
7878
spi_p->deinit(s);
7979
}
@@ -82,8 +82,8 @@ STATIC mp_obj_t machine_spi_deinit(mp_obj_t self) {
8282
STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_spi_deinit_obj, machine_spi_deinit);
8383

8484
STATIC void mp_machine_spi_transfer(mp_obj_t self, size_t len, const void *src, void *dest) {
85-
mp_obj_base_t *s = (mp_obj_base_t*)MP_OBJ_TO_PTR(self);
86-
mp_machine_spi_p_t *spi_p = (mp_machine_spi_p_t*)s->type->protocol;
85+
mp_obj_base_t *s = (mp_obj_base_t *)MP_OBJ_TO_PTR(self);
86+
mp_machine_spi_p_t *spi_p = (mp_machine_spi_p_t *)s->type->protocol;
8787
spi_p->transfer(s, len, src, dest);
8888
}
8989

@@ -108,7 +108,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_machine_spi_readinto_obj, 2, 3, mp_machin
108108
STATIC mp_obj_t mp_machine_spi_write(mp_obj_t self, mp_obj_t wr_buf) {
109109
mp_buffer_info_t src;
110110
mp_get_buffer_raise(wr_buf, &src, MP_BUFFER_READ);
111-
mp_machine_spi_transfer(self, src.len, (const uint8_t*)src.buf, NULL);
111+
mp_machine_spi_transfer(self, src.len, (const uint8_t *)src.buf, NULL);
112112
return mp_const_none;
113113
}
114114
MP_DEFINE_CONST_FUN_OBJ_2(mp_machine_spi_write_obj, mp_machine_spi_write);
@@ -223,7 +223,7 @@ STATIC mp_obj_t mp_machine_soft_spi_make_new(const mp_obj_type_t *type, size_t n
223223
}
224224

225225
STATIC void mp_machine_soft_spi_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
226-
mp_machine_soft_spi_obj_t *self = (mp_machine_soft_spi_obj_t*)self_in;
226+
mp_machine_soft_spi_obj_t *self = (mp_machine_soft_spi_obj_t *)self_in;
227227

228228
enum { ARG_baudrate, ARG_polarity, ARG_phase, ARG_sck, ARG_mosi, ARG_miso };
229229
static const mp_arg_t allowed_args[] = {
@@ -261,7 +261,7 @@ STATIC void mp_machine_soft_spi_init(mp_obj_base_t *self_in, size_t n_args, cons
261261
}
262262

263263
STATIC void mp_machine_soft_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
264-
mp_machine_soft_spi_obj_t *self = (mp_machine_soft_spi_obj_t*)self_in;
264+
mp_machine_soft_spi_obj_t *self = (mp_machine_soft_spi_obj_t *)self_in;
265265
mp_soft_spi_transfer(&self->spi, len, src, dest);
266266
}
267267

@@ -277,7 +277,7 @@ const mp_obj_type_t mp_machine_soft_spi_type = {
277277
.print = mp_machine_soft_spi_print,
278278
.make_new = mp_machine_spi_make_new, // delegate to master constructor
279279
.protocol = &mp_machine_soft_spi_p,
280-
.locals_dict = (mp_obj_dict_t*)&mp_machine_spi_locals_dict,
280+
.locals_dict = (mp_obj_dict_t *)&mp_machine_spi_locals_dict,
281281
};
282282

283283
#endif // MICROPY_PY_MACHINE_SPI

0 commit comments

Comments
 (0)