Skip to content

Commit f35f941

Browse files
GadgetoidGadgetoid
committed
global: Run uncrustify on all .c source files.
Enforce .c code consistency by running uncrustify -c tools/uncrustify.cfg across the whole* codebase, with: find . -name *.c | xargs uncrustify -c tools/uncrustify.cfg\ --replace --no-backup Followed by tools/codeformat.py to fix all the erroneous ifdef indents. * Skip third-party code in lib/ and drivers/cc3100/ * Skip third-party code in ports/cc3200/FreeRTOS/ * Skip all exclusions listed in tools/codeformat.py Signed-off-by: Phil Howard <phil@gadgetoid.com>
1 parent 90e5178 commit f35f941

File tree

20 files changed

+573
-613
lines changed

20 files changed

+573
-613
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/spiflash.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ STATIC int mp_spiflash_read_cmd(mp_spiflash_t *self, uint8_t cmd, size_t len, ui
114114
if (c->bus_kind == MP_SPIFLASH_BUS_SPI) {
115115
mp_hal_pin_write(c->bus.u_spi.cs, 0);
116116
c->bus.u_spi.proto->transfer(c->bus.u_spi.data, 1, &cmd, NULL);
117-
c->bus.u_spi.proto->transfer(c->bus.u_spi.data, len, (void*)dest, (void*)dest);
117+
c->bus.u_spi.proto->transfer(c->bus.u_spi.data, len, (void *)dest, (void *)dest);
118118
mp_hal_pin_write(c->bus.u_spi.cs, 1);
119119
return 0;
120120
} else {

‎examples/embedding/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ static const char *example_2 =
2424
"gc.collect()\n"
2525
"\n"
2626
"print('finish')\n"
27-
;
27+
;
2828

2929
// This array is the MicroPython GC heap.
3030
static char heap[8 * 1024];

‎examples/natmod/btree/btree_c.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ void abort_(void) {
4141

4242
int native_errno;
4343
#if defined(__linux__)
44-
int *__errno_location (void)
44+
int *__errno_location(void)
4545
#else
46-
int *__errno (void)
46+
int *__errno(void)
4747
#endif
4848
{
4949
return &native_errno;
5050
}
5151

5252
ssize_t mp_stream_posix_write(void *stream, const void *buf, size_t len) {
53-
mp_obj_base_t* o = stream;
53+
mp_obj_base_t *o = stream;
5454
const mp_stream_p_t *stream_p = MP_OBJ_TYPE_GET_SLOT(o->type, protocol);
5555
mp_uint_t out_sz = stream_p->write(MP_OBJ_FROM_PTR(stream), buf, len, &native_errno);
5656
if (out_sz == MP_STREAM_ERROR) {
@@ -61,7 +61,7 @@ ssize_t mp_stream_posix_write(void *stream, const void *buf, size_t len) {
6161
}
6262

6363
ssize_t mp_stream_posix_read(void *stream, void *buf, size_t len) {
64-
mp_obj_base_t* o = stream;
64+
mp_obj_base_t *o = stream;
6565
const mp_stream_p_t *stream_p = MP_OBJ_TYPE_GET_SLOT(o->type, protocol);
6666
mp_uint_t out_sz = stream_p->read(MP_OBJ_FROM_PTR(stream), buf, len, &native_errno);
6767
if (out_sz == MP_STREAM_ERROR) {
@@ -72,7 +72,7 @@ ssize_t mp_stream_posix_read(void *stream, void *buf, size_t len) {
7272
}
7373

7474
off_t mp_stream_posix_lseek(void *stream, off_t offset, int whence) {
75-
const mp_obj_base_t* o = stream;
75+
const mp_obj_base_t *o = stream;
7676
const mp_stream_p_t *stream_p = MP_OBJ_TYPE_GET_SLOT(o->type, protocol);
7777
struct mp_stream_seek_t seek_s;
7878
seek_s.offset = offset;
@@ -85,7 +85,7 @@ off_t mp_stream_posix_lseek(void *stream, off_t offset, int whence) {
8585
}
8686

8787
int mp_stream_posix_fsync(void *stream) {
88-
mp_obj_base_t* o = stream;
88+
mp_obj_base_t *o = stream;
8989
const mp_stream_p_t *stream_p = MP_OBJ_TYPE_GET_SLOT(o->type, protocol);
9090
mp_uint_t res = stream_p->ioctl(MP_OBJ_FROM_PTR(stream), MP_STREAM_FLUSH, 0, &native_errno);
9191
if (res == MP_STREAM_ERROR) {
@@ -126,22 +126,22 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
126126
btree_getiter_iternext.getiter = btree_getiter;
127127
btree_getiter_iternext.iternext = btree_iternext;
128128

129-
btree_type.base.type = (void*)&mp_fun_table.type_type;
129+
btree_type.base.type = (void *)&mp_fun_table.type_type;
130130
btree_type.flags = MP_TYPE_FLAG_ITER_IS_CUSTOM;
131131
btree_type.name = MP_QSTR_btree;
132132
MP_OBJ_TYPE_SET_SLOT(&btree_type, print, btree_print, 0);
133133
MP_OBJ_TYPE_SET_SLOT(&btree_type, iter, &btree_getiter_iternext, 1);
134134
MP_OBJ_TYPE_SET_SLOT(&btree_type, binary_op, btree_binary_op, 2);
135135
MP_OBJ_TYPE_SET_SLOT(&btree_type, subscr, btree_subscr, 3);
136-
btree_locals_dict_table[0] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_close), MP_OBJ_FROM_PTR(&btree_close_obj) };
137-
btree_locals_dict_table[1] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_flush), MP_OBJ_FROM_PTR(&btree_flush_obj) };
138-
btree_locals_dict_table[2] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_get), MP_OBJ_FROM_PTR(&btree_get_obj) };
139-
btree_locals_dict_table[3] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_put), MP_OBJ_FROM_PTR(&btree_put_obj) };
140-
btree_locals_dict_table[4] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_seq), MP_OBJ_FROM_PTR(&btree_seq_obj) };
141-
btree_locals_dict_table[5] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_keys), MP_OBJ_FROM_PTR(&btree_keys_obj) };
142-
btree_locals_dict_table[6] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_values), MP_OBJ_FROM_PTR(&btree_values_obj) };
143-
btree_locals_dict_table[7] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_items), MP_OBJ_FROM_PTR(&btree_items_obj) };
144-
MP_OBJ_TYPE_SET_SLOT(&btree_type, locals_dict, (void*)&btree_locals_dict, 4);
136+
btree_locals_dict_table[0] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_close), MP_OBJ_FROM_PTR(&btree_close_obj) };
137+
btree_locals_dict_table[1] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_flush), MP_OBJ_FROM_PTR(&btree_flush_obj) };
138+
btree_locals_dict_table[2] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_get), MP_OBJ_FROM_PTR(&btree_get_obj) };
139+
btree_locals_dict_table[3] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_put), MP_OBJ_FROM_PTR(&btree_put_obj) };
140+
btree_locals_dict_table[4] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_seq), MP_OBJ_FROM_PTR(&btree_seq_obj) };
141+
btree_locals_dict_table[5] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_keys), MP_OBJ_FROM_PTR(&btree_keys_obj) };
142+
btree_locals_dict_table[6] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_values), MP_OBJ_FROM_PTR(&btree_values_obj) };
143+
btree_locals_dict_table[7] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_items), MP_OBJ_FROM_PTR(&btree_items_obj) };
144+
MP_OBJ_TYPE_SET_SLOT(&btree_type, locals_dict, (void *)&btree_locals_dict, 4);
145145

146146
mp_store_global(MP_QSTR__open, MP_OBJ_FROM_PTR(&btree_open_obj));
147147
mp_store_global(MP_QSTR_INCL, MP_OBJ_NEW_SMALL_INT(FLAG_END_KEY_INCL));

‎examples/natmod/deflate/deflate.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
5151
deflateio_type.name = MP_QSTR_DeflateIO;
5252
MP_OBJ_TYPE_SET_SLOT(&deflateio_type, make_new, &deflateio_make_new, 0);
5353
MP_OBJ_TYPE_SET_SLOT(&deflateio_type, protocol, &deflateio_stream_p, 1);
54-
deflateio_locals_dict_table[0] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_read), MP_OBJ_FROM_PTR(&mp_stream_read_obj) };
55-
deflateio_locals_dict_table[1] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_readinto), MP_OBJ_FROM_PTR(&mp_stream_readinto_obj) };
56-
deflateio_locals_dict_table[2] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_readline), MP_OBJ_FROM_PTR(&mp_stream_unbuffered_readline_obj) };
57-
deflateio_locals_dict_table[3] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_write), MP_OBJ_FROM_PTR(&mp_stream_write_obj) };
58-
deflateio_locals_dict_table[4] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_close), MP_OBJ_FROM_PTR(&mp_stream_close_obj) };
59-
deflateio_locals_dict_table[5] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR___enter__), MP_OBJ_FROM_PTR(&mp_identity_obj) };
60-
deflateio_locals_dict_table[6] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR___exit__), MP_OBJ_FROM_PTR(&mp_stream___exit___obj) };
61-
MP_OBJ_TYPE_SET_SLOT(&deflateio_type, locals_dict, (void*)&deflateio_locals_dict, 2);
54+
deflateio_locals_dict_table[0] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_read), MP_OBJ_FROM_PTR(&mp_stream_read_obj) };
55+
deflateio_locals_dict_table[1] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_readinto), MP_OBJ_FROM_PTR(&mp_stream_readinto_obj) };
56+
deflateio_locals_dict_table[2] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_readline), MP_OBJ_FROM_PTR(&mp_stream_unbuffered_readline_obj) };
57+
deflateio_locals_dict_table[3] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_write), MP_OBJ_FROM_PTR(&mp_stream_write_obj) };
58+
deflateio_locals_dict_table[4] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_close), MP_OBJ_FROM_PTR(&mp_stream_close_obj) };
59+
deflateio_locals_dict_table[5] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR___enter__), MP_OBJ_FROM_PTR(&mp_identity_obj) };
60+
deflateio_locals_dict_table[6] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR___exit__), MP_OBJ_FROM_PTR(&mp_stream___exit___obj) };
61+
MP_OBJ_TYPE_SET_SLOT(&deflateio_type, locals_dict, (void *)&deflateio_locals_dict, 2);
6262

6363
mp_store_global(MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR_deflate));
6464
mp_store_global(MP_QSTR_DeflateIO, MP_OBJ_FROM_PTR(&deflateio_type));

‎examples/natmod/features4/features4.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
5858
MP_DYNRUNTIME_INIT_ENTRY
5959

6060
// Initialise the type.
61-
mp_type_factorial.base.type = (void*)&mp_type_type;
61+
mp_type_factorial.base.type = (void *)&mp_type_type;
6262
mp_type_factorial.flags = MP_TYPE_FLAG_NONE;
6363
mp_type_factorial.name = MP_QSTR_Factorial;
6464
MP_OBJ_TYPE_SET_SLOT(&mp_type_factorial, make_new, factorial_make_new, 0);
65-
factorial_locals_dict_table[0] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_calculate), MP_OBJ_FROM_PTR(&factorial_calculate_obj) };
66-
MP_OBJ_TYPE_SET_SLOT(&mp_type_factorial, locals_dict, (void*)&factorial_locals_dict, 1);
65+
factorial_locals_dict_table[0] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_calculate), MP_OBJ_FROM_PTR(&factorial_calculate_obj) };
66+
MP_OBJ_TYPE_SET_SLOT(&mp_type_factorial, locals_dict, (void *)&factorial_locals_dict, 1);
6767

6868
// Make the Factorial type available on the module.
6969
mp_store_global(MP_QSTR_Factorial, MP_OBJ_FROM_PTR(&mp_type_factorial));

‎examples/natmod/framebuf/framebuf.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@ STATIC MP_DEFINE_CONST_DICT(framebuf_locals_dict, framebuf_locals_dict_table);
1818
mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *args) {
1919
MP_DYNRUNTIME_INIT_ENTRY
2020

21-
mp_type_framebuf.base.type = (void*)&mp_type_type;
21+
mp_type_framebuf.base.type = (void *)&mp_type_type;
2222
mp_type_framebuf.name = MP_QSTR_FrameBuffer;
2323
MP_OBJ_TYPE_SET_SLOT(&mp_type_framebuf, make_new, framebuf_make_new, 0);
2424
MP_OBJ_TYPE_SET_SLOT(&mp_type_framebuf, buffer, framebuf_get_buffer, 1);
25-
framebuf_locals_dict_table[0] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_fill), MP_OBJ_FROM_PTR(&framebuf_fill_obj) };
26-
framebuf_locals_dict_table[1] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_fill_rect), MP_OBJ_FROM_PTR(&framebuf_fill_rect_obj) };
27-
framebuf_locals_dict_table[2] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_pixel), MP_OBJ_FROM_PTR(&framebuf_pixel_obj) };
28-
framebuf_locals_dict_table[3] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_hline), MP_OBJ_FROM_PTR(&framebuf_hline_obj) };
29-
framebuf_locals_dict_table[4] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_vline), MP_OBJ_FROM_PTR(&framebuf_vline_obj) };
30-
framebuf_locals_dict_table[5] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_rect), MP_OBJ_FROM_PTR(&framebuf_rect_obj) };
31-
framebuf_locals_dict_table[6] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_line), MP_OBJ_FROM_PTR(&framebuf_line_obj) };
32-
framebuf_locals_dict_table[7] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_ellipse), MP_OBJ_FROM_PTR(&framebuf_ellipse_obj) };
33-
framebuf_locals_dict_table[8] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_blit), MP_OBJ_FROM_PTR(&framebuf_blit_obj) };
34-
framebuf_locals_dict_table[9] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_scroll), MP_OBJ_FROM_PTR(&framebuf_scroll_obj) };
35-
framebuf_locals_dict_table[10] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_text), MP_OBJ_FROM_PTR(&framebuf_text_obj) };
36-
MP_OBJ_TYPE_SET_SLOT(&mp_type_framebuf, locals_dict, (void*)&framebuf_locals_dict, 2);
25+
framebuf_locals_dict_table[0] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_fill), MP_OBJ_FROM_PTR(&framebuf_fill_obj) };
26+
framebuf_locals_dict_table[1] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_fill_rect), MP_OBJ_FROM_PTR(&framebuf_fill_rect_obj) };
27+
framebuf_locals_dict_table[2] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_pixel), MP_OBJ_FROM_PTR(&framebuf_pixel_obj) };
28+
framebuf_locals_dict_table[3] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_hline), MP_OBJ_FROM_PTR(&framebuf_hline_obj) };
29+
framebuf_locals_dict_table[4] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_vline), MP_OBJ_FROM_PTR(&framebuf_vline_obj) };
30+
framebuf_locals_dict_table[5] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_rect), MP_OBJ_FROM_PTR(&framebuf_rect_obj) };
31+
framebuf_locals_dict_table[6] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_line), MP_OBJ_FROM_PTR(&framebuf_line_obj) };
32+
framebuf_locals_dict_table[7] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_ellipse), MP_OBJ_FROM_PTR(&framebuf_ellipse_obj) };
33+
framebuf_locals_dict_table[8] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_blit), MP_OBJ_FROM_PTR(&framebuf_blit_obj) };
34+
framebuf_locals_dict_table[9] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_scroll), MP_OBJ_FROM_PTR(&framebuf_scroll_obj) };
35+
framebuf_locals_dict_table[10] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_text), MP_OBJ_FROM_PTR(&framebuf_text_obj) };
36+
MP_OBJ_TYPE_SET_SLOT(&mp_type_framebuf, locals_dict, (void *)&framebuf_locals_dict, 2);
3737

3838
mp_store_global(MP_QSTR_FrameBuffer, MP_OBJ_FROM_PTR(&mp_type_framebuf));
3939
mp_store_global(MP_QSTR_MVLSB, MP_OBJ_NEW_SMALL_INT(FRAMEBUF_MVLSB));

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy