Skip to content

Commit 0001965

Browse files
GadgetoidGadgetoid
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 37a4b70 commit 0001965

File tree

16 files changed

+217
-198
lines changed

16 files changed

+217
-198
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: 3 additions & 3 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:
@@ -49,11 +49,11 @@ static uint8_t swap_bits(uint8_t byte) {
4949
0x00, 0x08, 0x04, 0x0c, 0x02, 0x0a, 0x06, 0x0e,
5050
0x01, 0x09, 0x05, 0x0d, 0x03, 0x0b, 0x07, 0x0f
5151
};
52-
return ((swap_table[byte & 0x0f] << 4) | swap_table[byte >> 4]);
52+
return (swap_table[byte & 0x0f] << 4) | swap_table[byte >> 4];
5353
}
5454

5555
void mp_soft_spi_transfer(void *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
56-
mp_soft_spi_obj_t *self = (mp_soft_spi_obj_t*)self_in;
56+
mp_soft_spi_obj_t *self = (mp_soft_spi_obj_t *)self_in;
5757
uint32_t delay_half = self->delay_half;
5858

5959
// If a port defines MICROPY_HW_SOFTSPI_MIN_DELAY, and the configured

‎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
@@ -45,16 +45,16 @@ int puts(const char *s) {
4545

4646
int native_errno;
4747
#if defined(__linux__)
48-
int *__errno_location (void)
48+
int *__errno_location(void)
4949
#else
50-
int *__errno (void)
50+
int *__errno(void)
5151
#endif
5252
{
5353
return &native_errno;
5454
}
5555

5656
ssize_t mp_stream_posix_write(void *stream, const void *buf, size_t len) {
57-
mp_obj_base_t* o = stream;
57+
mp_obj_base_t *o = stream;
5858
const mp_stream_p_t *stream_p = MP_OBJ_TYPE_GET_SLOT(o->type, protocol);
5959
mp_uint_t out_sz = stream_p->write(MP_OBJ_FROM_PTR(stream), buf, len, &native_errno);
6060
if (out_sz == MP_STREAM_ERROR) {
@@ -65,7 +65,7 @@ ssize_t mp_stream_posix_write(void *stream, const void *buf, size_t len) {
6565
}
6666

6767
ssize_t mp_stream_posix_read(void *stream, void *buf, size_t len) {
68-
mp_obj_base_t* o = stream;
68+
mp_obj_base_t *o = stream;
6969
const mp_stream_p_t *stream_p = MP_OBJ_TYPE_GET_SLOT(o->type, protocol);
7070
mp_uint_t out_sz = stream_p->read(MP_OBJ_FROM_PTR(stream), buf, len, &native_errno);
7171
if (out_sz == MP_STREAM_ERROR) {
@@ -76,7 +76,7 @@ ssize_t mp_stream_posix_read(void *stream, void *buf, size_t len) {
7676
}
7777

7878
off_t mp_stream_posix_lseek(void *stream, off_t offset, int whence) {
79-
const mp_obj_base_t* o = stream;
79+
const mp_obj_base_t *o = stream;
8080
const mp_stream_p_t *stream_p = MP_OBJ_TYPE_GET_SLOT(o->type, protocol);
8181
struct mp_stream_seek_t seek_s;
8282
seek_s.offset = offset;
@@ -89,7 +89,7 @@ off_t mp_stream_posix_lseek(void *stream, off_t offset, int whence) {
8989
}
9090

9191
int mp_stream_posix_fsync(void *stream) {
92-
mp_obj_base_t* o = stream;
92+
mp_obj_base_t *o = stream;
9393
const mp_stream_p_t *stream_p = MP_OBJ_TYPE_GET_SLOT(o->type, protocol);
9494
mp_uint_t res = stream_p->ioctl(MP_OBJ_FROM_PTR(stream), MP_STREAM_FLUSH, 0, &native_errno);
9595
if (res == MP_STREAM_ERROR) {
@@ -146,22 +146,22 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
146146
btree_getiter_iternext.getiter = btree_getiter;
147147
btree_getiter_iternext.iternext = btree_iternext;
148148

149-
btree_type.base.type = (void*)&mp_fun_table.type_type;
149+
btree_type.base.type = (void *)&mp_fun_table.type_type;
150150
btree_type.flags = MP_TYPE_FLAG_ITER_IS_CUSTOM;
151151
btree_type.name = MP_QSTR_btree;
152152
MP_OBJ_TYPE_SET_SLOT(&btree_type, print, btree_print, 0);
153153
MP_OBJ_TYPE_SET_SLOT(&btree_type, iter, &btree_getiter_iternext, 1);
154154
MP_OBJ_TYPE_SET_SLOT(&btree_type, binary_op, btree_binary_op, 2);
155155
MP_OBJ_TYPE_SET_SLOT(&btree_type, subscr, btree_subscr, 3);
156-
btree_locals_dict_table[0] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_close), MP_OBJ_FROM_PTR(&btree_close_obj) };
157-
btree_locals_dict_table[1] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_flush), MP_OBJ_FROM_PTR(&btree_flush_obj) };
158-
btree_locals_dict_table[2] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_get), MP_OBJ_FROM_PTR(&btree_get_obj) };
159-
btree_locals_dict_table[3] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_put), MP_OBJ_FROM_PTR(&btree_put_obj) };
160-
btree_locals_dict_table[4] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_seq), MP_OBJ_FROM_PTR(&btree_seq_obj) };
161-
btree_locals_dict_table[5] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_keys), MP_OBJ_FROM_PTR(&btree_keys_obj) };
162-
btree_locals_dict_table[6] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_values), MP_OBJ_FROM_PTR(&btree_values_obj) };
163-
btree_locals_dict_table[7] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_items), MP_OBJ_FROM_PTR(&btree_items_obj) };
164-
MP_OBJ_TYPE_SET_SLOT(&btree_type, locals_dict, (void*)&btree_locals_dict, 4);
156+
btree_locals_dict_table[0] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_close), MP_OBJ_FROM_PTR(&btree_close_obj) };
157+
btree_locals_dict_table[1] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_flush), MP_OBJ_FROM_PTR(&btree_flush_obj) };
158+
btree_locals_dict_table[2] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_get), MP_OBJ_FROM_PTR(&btree_get_obj) };
159+
btree_locals_dict_table[3] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_put), MP_OBJ_FROM_PTR(&btree_put_obj) };
160+
btree_locals_dict_table[4] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_seq), MP_OBJ_FROM_PTR(&btree_seq_obj) };
161+
btree_locals_dict_table[5] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_keys), MP_OBJ_FROM_PTR(&btree_keys_obj) };
162+
btree_locals_dict_table[6] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_values), MP_OBJ_FROM_PTR(&btree_values_obj) };
163+
btree_locals_dict_table[7] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_items), MP_OBJ_FROM_PTR(&btree_items_obj) };
164+
MP_OBJ_TYPE_SET_SLOT(&btree_type, locals_dict, (void *)&btree_locals_dict, 4);
165165

166166
mp_store_global(MP_QSTR_open, MP_OBJ_FROM_PTR(&btree_open_obj));
167167
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
@@ -68,12 +68,12 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
6868
MP_DYNRUNTIME_INIT_ENTRY
6969

7070
// Initialise the type.
71-
mp_type_factorial.base.type = (void*)&mp_type_type;
71+
mp_type_factorial.base.type = (void *)&mp_type_type;
7272
mp_type_factorial.flags = MP_TYPE_FLAG_NONE;
7373
mp_type_factorial.name = MP_QSTR_Factorial;
7474
MP_OBJ_TYPE_SET_SLOT(&mp_type_factorial, make_new, factorial_make_new, 0);
75-
factorial_locals_dict_table[0] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_calculate), MP_OBJ_FROM_PTR(&factorial_calculate_obj) };
76-
MP_OBJ_TYPE_SET_SLOT(&mp_type_factorial, locals_dict, (void*)&factorial_locals_dict, 1);
75+
factorial_locals_dict_table[0] = (mp_map_elem_t) { MP_OBJ_NEW_QSTR(MP_QSTR_calculate), MP_OBJ_FROM_PTR(&factorial_calculate_obj) };
76+
MP_OBJ_TYPE_SET_SLOT(&mp_type_factorial, locals_dict, (void *)&factorial_locals_dict, 1);
7777

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

0 commit comments

Comments
 (0)