diff --git a/devices/ble_hci/common-hal/_bleio/Adapter.c b/devices/ble_hci/common-hal/_bleio/Adapter.c index fd28f09a5e557..fac7eb9f5fddf 100644 --- a/devices/ble_hci/common-hal/_bleio/Adapter.c +++ b/devices/ble_hci/common-hal/_bleio/Adapter.c @@ -57,7 +57,7 @@ bleio_connection_internal_t bleio_connections[BLEIO_TOTAL_CONNECTION_COUNT]; -STATIC void add_generic_services(bleio_adapter_obj_t *adapter) { +static void add_generic_services(bleio_adapter_obj_t *adapter) { // Create Generic Access UUID, Service, and Characteristics. // Generic Access Service setup. @@ -158,13 +158,13 @@ STATIC void add_generic_services(bleio_adapter_obj_t *adapter) { } -STATIC void check_enabled(bleio_adapter_obj_t *adapter) { +static void check_enabled(bleio_adapter_obj_t *adapter) { if (!common_hal_bleio_adapter_get_enabled(adapter)) { mp_raise_bleio_BluetoothError(MP_ERROR_TEXT("Adapter not enabled")); } } -// STATIC bool adapter_on_ble_evt(ble_evt_t *ble_evt, void *self_in) { +// static bool adapter_on_ble_evt(ble_evt_t *ble_evt, void *self_in) { // bleio_adapter_obj_t *self = (bleio_adapter_obj_t*)self_in; // // For debugging. @@ -258,7 +258,7 @@ static void _adapter_set_name(bleio_adapter_obj_t *self, mp_obj_str_t *name_obj) // Get various values and limits set by the adapter. // Set event mask. -STATIC void bleio_adapter_hci_init(bleio_adapter_obj_t *self) { +static void bleio_adapter_hci_init(bleio_adapter_obj_t *self) { mp_int_t name_len = 0; #if CIRCUITPY_OS_GETENV @@ -418,7 +418,7 @@ void common_hal_bleio_adapter_set_name(bleio_adapter_obj_t *self, const char *na } -// STATIC bool scan_on_ble_evt(ble_evt_t *ble_evt, void *scan_results_in) { +// static bool scan_on_ble_evt(ble_evt_t *ble_evt, void *scan_results_in) { // bleio_scanresults_obj_t *scan_results = (bleio_scanresults_obj_t*)scan_results_in; // if (ble_evt->header.evt_id == BLE_GAP_EVT_TIMEOUT && @@ -516,7 +516,7 @@ void common_hal_bleio_adapter_stop_scan(bleio_adapter_obj_t *self) { // volatile bool done; // } connect_info_t; -// STATIC bool connect_on_ble_evt(ble_evt_t *ble_evt, void *info_in) { +// static bool connect_on_ble_evt(ble_evt_t *ble_evt, void *info_in) { // connect_info_t *info = (connect_info_t*)info_in; // switch (ble_evt->header.evt_id) { @@ -613,13 +613,13 @@ mp_obj_t common_hal_bleio_adapter_connect(bleio_adapter_obj_t *self, bleio_addre return mp_const_none; } -STATIC void check_data_fit(size_t data_len, bool connectable) { +static void check_data_fit(size_t data_len, bool connectable) { if (data_len > MAX_ADVERTISEMENT_SIZE) { mp_raise_ValueError(MP_ERROR_TEXT("Data too large for advertisement packet")); } } -// STATIC bool advertising_on_ble_evt(ble_evt_t *ble_evt, void *self_in) { +// static bool advertising_on_ble_evt(ble_evt_t *ble_evt, void *self_in) { // bleio_adapter_obj_t *self = (bleio_adapter_obj_t*)self_in; // switch (ble_evt->header.evt_id) { diff --git a/devices/ble_hci/common-hal/_bleio/CharacteristicBuffer.c b/devices/ble_hci/common-hal/_bleio/CharacteristicBuffer.c index e7c6ec9817b41..9692e5f72427e 100644 --- a/devices/ble_hci/common-hal/_bleio/CharacteristicBuffer.c +++ b/devices/ble_hci/common-hal/_bleio/CharacteristicBuffer.c @@ -18,7 +18,7 @@ #include "common-hal/_bleio/CharacteristicBuffer.h" // Push all the data onto the ring buffer. When the buffer is full, new bytes will be dropped. -STATIC void write_to_ringbuf(bleio_characteristic_buffer_obj_t *self, uint8_t *data, uint16_t len) { +static void write_to_ringbuf(bleio_characteristic_buffer_obj_t *self, uint8_t *data, uint16_t len) { ringbuf_put_n(&self->ringbuf, data, len); } diff --git a/devices/ble_hci/common-hal/_bleio/Connection.c b/devices/ble_hci/common-hal/_bleio/Connection.c index 4bd44ce2ba796..30ed0af575c57 100644 --- a/devices/ble_hci/common-hal/_bleio/Connection.c +++ b/devices/ble_hci/common-hal/_bleio/Connection.c @@ -368,7 +368,7 @@ void common_hal_bleio_connection_set_connection_interval(bleio_connection_intern } // service_uuid may be NULL, to discover all services. -// STATIC bool discover_next_services(bleio_connection_internal_t* connection, uint16_t start_handle, ble_uuid_t *service_uuid) { +// static bool discover_next_services(bleio_connection_internal_t* connection, uint16_t start_handle, ble_uuid_t *service_uuid) { // m_discovery_successful = false; // m_discovery_in_process = true; @@ -385,7 +385,7 @@ void common_hal_bleio_connection_set_connection_interval(bleio_connection_intern // return m_discovery_successful; // } -// STATIC bool discover_next_characteristics(bleio_connection_internal_t* connection, bleio_service_obj_t *service, uint16_t start_handle) { +// static bool discover_next_characteristics(bleio_connection_internal_t* connection, bleio_service_obj_t *service, uint16_t start_handle) { // m_char_discovery_service = service; // ble_gattc_handle_range_t handle_range; @@ -407,7 +407,7 @@ void common_hal_bleio_connection_set_connection_interval(bleio_connection_intern // return m_discovery_successful; // } -// STATIC bool discover_next_descriptors(bleio_connection_internal_t* connection, bleio_characteristic_obj_t *characteristic, uint16_t start_handle, uint16_t end_handle) { +// static bool discover_next_descriptors(bleio_connection_internal_t* connection, bleio_characteristic_obj_t *characteristic, uint16_t start_handle, uint16_t end_handle) { // m_desc_discovery_characteristic = characteristic; // ble_gattc_handle_range_t handle_range; @@ -429,7 +429,7 @@ void common_hal_bleio_connection_set_connection_interval(bleio_connection_intern // return m_discovery_successful; // } -// STATIC void on_primary_srv_discovery_rsp(ble_gattc_evt_prim_srvc_disc_rsp_t *response, bleio_connection_internal_t* connection) { +// static void on_primary_srv_discovery_rsp(ble_gattc_evt_prim_srvc_disc_rsp_t *response, bleio_connection_internal_t* connection) { // for (size_t i = 0; i < response->count; ++i) { // ble_gattc_service_t *gattc_service = &response->services[i]; @@ -465,7 +465,7 @@ void common_hal_bleio_connection_set_connection_interval(bleio_connection_intern // m_discovery_in_process = false; // } -// STATIC void on_char_discovery_rsp(ble_gattc_evt_char_disc_rsp_t *response, bleio_connection_internal_t* connection) { +// static void on_char_discovery_rsp(ble_gattc_evt_char_disc_rsp_t *response, bleio_connection_internal_t* connection) { // for (size_t i = 0; i < response->count; ++i) { // ble_gattc_char_t *gattc_char = &response->chars[i]; @@ -509,7 +509,7 @@ void common_hal_bleio_connection_set_connection_interval(bleio_connection_intern // m_discovery_in_process = false; // } -// STATIC void on_desc_discovery_rsp(ble_gattc_evt_desc_disc_rsp_t *response, bleio_connection_internal_t* connection) { +// static void on_desc_discovery_rsp(ble_gattc_evt_desc_disc_rsp_t *response, bleio_connection_internal_t* connection) { // for (size_t i = 0; i < response->count; ++i) { // ble_gattc_desc_t *gattc_desc = &response->descs[i]; @@ -564,7 +564,7 @@ void common_hal_bleio_connection_set_connection_interval(bleio_connection_intern // m_discovery_in_process = false; // } -// STATIC bool discovery_on_ble_evt(ble_evt_t *ble_evt, mp_obj_t payload) { +// static bool discovery_on_ble_evt(ble_evt_t *ble_evt, mp_obj_t payload) { // bleio_connection_internal_t* connection = MP_OBJ_TO_PTR(payload); // switch (ble_evt->header.evt_id) { // case BLE_GAP_EVT_DISCONNECTED: @@ -592,7 +592,7 @@ void common_hal_bleio_connection_set_connection_interval(bleio_connection_intern // return true; // } -// STATIC void discover_remote_services(bleio_connection_internal_t *self, mp_obj_t service_uuids_whitelist) { +// static void discover_remote_services(bleio_connection_internal_t *self, mp_obj_t service_uuids_whitelist) { // ble_drv_add_event_handler(discovery_on_ble_evt, self); // // Start over with an empty list. diff --git a/devices/ble_hci/common-hal/_bleio/PacketBuffer.c b/devices/ble_hci/common-hal/_bleio/PacketBuffer.c index d4836700afa50..97626205a62ff 100644 --- a/devices/ble_hci/common-hal/_bleio/PacketBuffer.c +++ b/devices/ble_hci/common-hal/_bleio/PacketBuffer.c @@ -16,7 +16,7 @@ #include "shared-bindings/_bleio/PacketBuffer.h" #include "supervisor/shared/tick.h" -STATIC void write_to_ringbuf(bleio_packet_buffer_obj_t *self, uint8_t *data, uint16_t len) { +static void write_to_ringbuf(bleio_packet_buffer_obj_t *self, uint8_t *data, uint16_t len) { if (len + sizeof(uint16_t) > ringbuf_size(&self->ringbuf)) { // This shouldn't happen. return; @@ -35,7 +35,7 @@ STATIC void write_to_ringbuf(bleio_packet_buffer_obj_t *self, uint8_t *data, uin ringbuf_put_n(&self->ringbuf, data, len); } -STATIC uint32_t queue_next_write(bleio_packet_buffer_obj_t *self) { +static uint32_t queue_next_write(bleio_packet_buffer_obj_t *self) { // Queue up the next outgoing buffer. We use two, one that has been passed to the SD for // transmission (when packet_queued is true) and the other is `pending` and can still be // modified. By primarily appending to the `pending` buffer we can reduce the protocol overhead diff --git a/devices/ble_hci/common-hal/_bleio/att.c b/devices/ble_hci/common-hal/_bleio/att.c index 57f7b0549ccce..930b4793161c2 100644 --- a/devices/ble_hci/common-hal/_bleio/att.c +++ b/devices/ble_hci/common-hal/_bleio/att.c @@ -51,18 +51,18 @@ #include "shared-bindings/_bleio/UUID.h" #include "supervisor/shared/tick.h" -STATIC uint16_t max_mtu = BT_ATT_DEFAULT_LE_MTU; // 23 -STATIC unsigned long timeout = 5000; +static uint16_t max_mtu = BT_ATT_DEFAULT_LE_MTU; // 23 +static unsigned long timeout = 5000; -STATIC volatile bool confirm; +static volatile bool confirm; -STATIC uint16_t long_write_handle = BLE_GATT_HANDLE_INVALID; -STATIC uint8_t *long_write_value = NULL; -STATIC uint16_t long_write_value_length = 0; +static uint16_t long_write_handle = BLE_GATT_HANDLE_INVALID; +static uint8_t *long_write_value = NULL; +static uint16_t long_write_value_length = 0; // When we send a request, fill this struct with info about the expected response. // We check this against the actual received response. -STATIC struct { +static struct { uint16_t conn_handle; // Expected handle. uint8_t opcode; // Expected RSP opcode. uint8_t *buffer; // Pointer to response packet @@ -77,7 +77,7 @@ typedef struct __packed { uint8_t uuid[]; // 2 or 16 bytes } characteristic_declaration_t; -STATIC uint8_t bleio_properties_to_ble_spec_properties(uint8_t bleio_properties) { +static uint8_t bleio_properties_to_ble_spec_properties(uint8_t bleio_properties) { uint8_t ble_spec_properties = 0; if (bleio_properties & CHAR_PROP_BROADCAST) { ble_spec_properties |= BT_GATT_CHRC_BROADCAST; @@ -103,7 +103,7 @@ STATIC uint8_t bleio_properties_to_ble_spec_properties(uint8_t bleio_properties) // FIX not currently used; re-enable when used. #if 0 -STATIC uint8_t ble_spec_properties_to_bleio_properties(uint8_t ble_spec_properties) { +static uint8_t ble_spec_properties_to_bleio_properties(uint8_t ble_spec_properties) { uint8_t bleio_properties = 0; if (ble_spec_properties & BT_GATT_CHRC_BROADCAST) { bleio_properties |= CHAR_PROP_BROADCAST; @@ -128,7 +128,7 @@ STATIC uint8_t ble_spec_properties_to_bleio_properties(uint8_t ble_spec_properti } #endif // #if 0 -STATIC void send_error(uint16_t conn_handle, uint8_t opcode, uint16_t handle, uint8_t code) { +static void send_error(uint16_t conn_handle, uint8_t opcode, uint16_t handle, uint8_t code) { struct __packed { struct bt_att_hdr h; struct bt_att_error_rsp r; @@ -141,11 +141,11 @@ STATIC void send_error(uint16_t conn_handle, uint8_t opcode, uint16_t handle, ui hci_send_acl_pkt(conn_handle, BT_L2CAP_CID_ATT, sizeof(rsp), (uint8_t *)&rsp); } -STATIC void send_req(uint16_t conn_handle, size_t request_length, uint8_t *request_buffer) { +static void send_req(uint16_t conn_handle, size_t request_length, uint8_t *request_buffer) { hci_send_acl_pkt(conn_handle, BT_L2CAP_CID_ATT, request_length, request_buffer); } -STATIC int send_req_wait_for_rsp(uint16_t conn_handle, size_t request_length, uint8_t *request_buffer, uint8_t response_buffer[]) { +static int send_req_wait_for_rsp(uint16_t conn_handle, size_t request_length, uint8_t *request_buffer, uint8_t response_buffer[]) { // We expect a particular kind of response after this request. expected_rsp.conn_handle = conn_handle; // The response opcode is the request opcode + 1. @@ -179,7 +179,7 @@ STATIC int send_req_wait_for_rsp(uint16_t conn_handle, size_t request_length, ui } // If a response matches what is in expected_rsp, copy the rest of it into the buffer. -STATIC void check_and_save_expected_rsp(uint16_t conn_handle, uint8_t opcode, uint8_t dlen, uint8_t data[]) { +static void check_and_save_expected_rsp(uint16_t conn_handle, uint8_t opcode, uint8_t dlen, uint8_t data[]) { if (conn_handle == expected_rsp.conn_handle && expected_rsp.opcode == opcode) { expected_rsp.buffer[0] = opcode; memcpy(&expected_rsp.buffer[1], data, dlen); @@ -242,7 +242,7 @@ bool att_disconnect(uint16_t conn_handle) { } // FIX -// STATIC bool discover_services(uint16_t conn_handle, BLERemoteDevice* device, const char* serviceUuidFilter) { +// static bool discover_services(uint16_t conn_handle, BLERemoteDevice* device, const char* serviceUuidFilter) { // uint16_t reqStart_handle = 0x0001; // uint16_t reqEnd_handle = 0xffff; @@ -297,7 +297,7 @@ bool att_disconnect(uint16_t conn_handle) { // return true; // } -// STATIC bool discover_characteristics(uint16_t conn_handle, BLERemoteDevice* device) { +// static bool discover_characteristics(uint16_t conn_handle, BLERemoteDevice* device) { // uint16_t reqStart_handle = 0x0001; // uint16_t reqEnd_handle = 0xffff; @@ -353,7 +353,7 @@ bool att_disconnect(uint16_t conn_handle) { // return true; // } -// STATIC bool discover_descriptors(uint16_t conn_handle, BLERemoteDevice* device) { +// static bool discover_descriptors(uint16_t conn_handle, BLERemoteDevice* device) { // uint16_t reqStart_handle = 0x0001; // uint16_t reqEnd_handle = 0xffff; @@ -711,7 +711,7 @@ bool att_indicate(uint16_t handle, const uint8_t *value, int length) { return num_indications > 0; } -STATIC void process_error(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) { +static void process_error(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) { struct bt_att_error_rsp *rsp = (struct bt_att_error_rsp *)data; if (dlen != sizeof(struct bt_att_error_rsp)) { @@ -727,7 +727,7 @@ STATIC void process_error(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) { } } -STATIC void process_mtu_req(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) { +static void process_mtu_req(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) { struct bt_att_exchange_mtu_req *req = (struct bt_att_exchange_mtu_req *)data; if (dlen != sizeof(struct bt_att_exchange_mtu_req)) { @@ -760,7 +760,7 @@ STATIC void process_mtu_req(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) hci_send_acl_pkt(conn_handle, BT_L2CAP_CID_ATT, sizeof(rsp), (uint8_t *)&rsp); } -STATIC void process_mtu_rsp(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) { +static void process_mtu_rsp(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) { struct bt_att_exchange_mtu_rsp *rsp = (struct bt_att_exchange_mtu_rsp *)data; if (dlen != sizeof(struct bt_att_exchange_mtu_rsp)) { @@ -777,7 +777,7 @@ STATIC void process_mtu_rsp(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) check_and_save_expected_rsp(conn_handle, BT_ATT_OP_MTU_RSP, dlen, data); } -STATIC void process_find_info_req(uint16_t conn_handle, uint16_t mtu, uint8_t dlen, uint8_t data[]) { +static void process_find_info_req(uint16_t conn_handle, uint16_t mtu, uint8_t dlen, uint8_t data[]) { struct bt_att_find_info_req *req = (struct bt_att_find_info_req *)data; if (dlen != sizeof(struct bt_att_find_info_req)) { @@ -883,7 +883,7 @@ static int att_find_info_req(uint16_t conn_handle, uint16_t start_handle, uint16 return send_req_wait_for_rsp(conn_handle, sizeof(req), (uint8_t *)&req, response_buffer); } -STATIC void process_find_info_rsp(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) { +static void process_find_info_rsp(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) { if (dlen < 2) { return; // invalid, drop } @@ -891,7 +891,7 @@ STATIC void process_find_info_rsp(uint16_t conn_handle, uint8_t dlen, uint8_t da check_and_save_expected_rsp(conn_handle, BT_ATT_OP_FIND_INFO_RSP, dlen, data); } -STATIC void process_find_type_req(uint16_t conn_handle, uint16_t mtu, uint8_t dlen, uint8_t data[]) { +static void process_find_type_req(uint16_t conn_handle, uint16_t mtu, uint8_t dlen, uint8_t data[]) { struct bt_att_find_type_req *req = (struct bt_att_find_type_req *)data; if (dlen < sizeof(struct bt_att_find_type_req)) { @@ -1040,7 +1040,7 @@ static int att_read_group_req(uint16_t conn_handle, uint16_t start_handle, uint1 return send_req_wait_for_rsp(conn_handle, sizeof(req_bytes), req_bytes, response_buffer); } -STATIC void process_read_group_rsp(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) { +static void process_read_group_rsp(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) { if (dlen < 2) { return; // invalid, drop } @@ -1048,7 +1048,7 @@ STATIC void process_read_group_rsp(uint16_t conn_handle, uint8_t dlen, uint8_t d check_and_save_expected_rsp(conn_handle, BT_ATT_OP_READ_GROUP_RSP, dlen, data); } -STATIC void process_read_or_read_blob_req(uint16_t conn_handle, uint16_t mtu, uint8_t opcode, uint8_t dlen, uint8_t data[]) { +static void process_read_or_read_blob_req(uint16_t conn_handle, uint16_t mtu, uint8_t opcode, uint8_t dlen, uint8_t data[]) { uint16_t handle; uint16_t offset = 0; uint8_t response_opcode; @@ -1167,11 +1167,11 @@ STATIC void process_read_or_read_blob_req(uint16_t conn_handle, uint16_t mtu, ui hci_send_acl_pkt(conn_handle, BT_L2CAP_CID_ATT, rsp_length, rsp_bytes); } -STATIC void process_read_rsp(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) { +static void process_read_rsp(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) { check_and_save_expected_rsp(conn_handle, BT_ATT_OP_READ_RSP, dlen, data); } -STATIC void process_read_type_req(uint16_t conn_handle, uint16_t mtu, uint8_t dlen, uint8_t data[]) { +static void process_read_type_req(uint16_t conn_handle, uint16_t mtu, uint8_t dlen, uint8_t data[]) { struct bt_att_read_type_req *req = (struct bt_att_read_type_req *)data; uint16_t type_uuid = req->uuid[0] | (req->uuid[1] << 8); @@ -1335,7 +1335,7 @@ static int att_read_type_req(uint16_t conn_handle, uint16_t start_handle, uint16 return send_req_wait_for_rsp(conn_handle, sizeof(req_bytes), req_bytes, response_buffer); } -STATIC void process_read_type_rsp(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) { +static void process_read_type_rsp(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) { if (dlen < 1) { return; // invalid, drop } @@ -1344,7 +1344,7 @@ STATIC void process_read_type_rsp(uint16_t conn_handle, uint8_t dlen, uint8_t da } // Handles BT_ATT_OP_WRITE_REQ or BT_ATT_OP_WRITE_ -STATIC void process_write_req_or_cmd(uint16_t conn_handle, uint16_t mtu, uint8_t op, uint8_t dlen, uint8_t data[]) { +static void process_write_req_or_cmd(uint16_t conn_handle, uint16_t mtu, uint8_t op, uint8_t dlen, uint8_t data[]) { // struct bt_att_write_cmd is identical, so don't bother to split code paths based on opcode. struct bt_att_write_req *req = (struct bt_att_write_req *)data; @@ -1413,7 +1413,7 @@ STATIC void process_write_req_or_cmd(uint16_t conn_handle, uint16_t mtu, uint8_t } } -STATIC void process_write_rsp(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) { +static void process_write_rsp(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) { if (dlen != 0) { return; // drop } @@ -1421,7 +1421,7 @@ STATIC void process_write_rsp(uint16_t conn_handle, uint8_t dlen, uint8_t data[] check_and_save_expected_rsp(conn_handle, BT_ATT_OP_WRITE_RSP, dlen, data); } -STATIC void process_prepare_write_req(uint16_t conn_handle, uint16_t mtu, uint8_t dlen, uint8_t data[]) { +static void process_prepare_write_req(uint16_t conn_handle, uint16_t mtu, uint8_t dlen, uint8_t data[]) { struct bt_att_prepare_write_req *req = (struct bt_att_prepare_write_req *)data; if (dlen < sizeof(struct bt_att_prepare_write_req)) { @@ -1491,7 +1491,7 @@ STATIC void process_prepare_write_req(uint16_t conn_handle, uint16_t mtu, uint8_ // hci_send_acl_pkt(conn_handle, BT_L2CAP_CID_ATT, response_length, response); } -STATIC void process_exec_write_req(uint16_t conn_handle, uint16_t mtu, uint8_t dlen, uint8_t data[]) { +static void process_exec_write_req(uint16_t conn_handle, uint16_t mtu, uint8_t dlen, uint8_t data[]) { struct bt_att_exec_write_req *req = (struct bt_att_exec_write_req *)data; if (dlen != sizeof(struct bt_att_exec_write_req)) { @@ -1522,7 +1522,7 @@ STATIC void process_exec_write_req(uint16_t conn_handle, uint16_t mtu, uint8_t d hci_send_acl_pkt(conn_handle, BT_L2CAP_CID_ATT, response_length, response); } -STATIC void process_notify_or_indicate(uint16_t conn_handle, uint8_t opcode, uint8_t dlen, uint8_t data[]) { +static void process_notify_or_indicate(uint16_t conn_handle, uint8_t opcode, uint8_t dlen, uint8_t data[]) { if (dlen < 2) { return; // drop } @@ -1573,7 +1573,7 @@ STATIC void process_notify_or_indicate(uint16_t conn_handle, uint8_t opcode, uin } } -STATIC void process_confirm(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) { +static void process_confirm(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) { (void)conn_handle; (void)dlen; (void)data; diff --git a/devices/ble_hci/common-hal/_bleio/hci.c b/devices/ble_hci/common-hal/_bleio/hci.c index e3f74421e51ff..126f05fbae2a3 100644 --- a/devices/ble_hci/common-hal/_bleio/hci.c +++ b/devices/ble_hci/common-hal/_bleio/hci.c @@ -101,23 +101,23 @@ typedef struct __attribute__ ((packed)) { #define RX_BUFFER_SIZE (3 + 255) #define ACL_DATA_BUFFER_SIZE (255) -STATIC uint8_t rx_buffer[RX_BUFFER_SIZE]; -STATIC size_t rx_idx; +static uint8_t rx_buffer[RX_BUFFER_SIZE]; +static size_t rx_idx; -STATIC uint8_t acl_data_buffer[ACL_DATA_BUFFER_SIZE]; -STATIC size_t acl_data_len; +static uint8_t acl_data_buffer[ACL_DATA_BUFFER_SIZE]; +static size_t acl_data_len; -STATIC size_t num_command_packets_allowed; -STATIC volatile size_t pending_pkt; +static size_t num_command_packets_allowed; +static volatile size_t pending_pkt; // Results from parsing a command response packet. -STATIC bool cmd_response_received; -STATIC uint16_t cmd_response_opcode; -STATIC uint8_t cmd_response_status; -STATIC size_t cmd_response_len; -STATIC uint8_t *cmd_response_data; +static bool cmd_response_received; +static uint16_t cmd_response_opcode; +static uint8_t cmd_response_status; +static size_t cmd_response_len; +static uint8_t *cmd_response_data; -STATIC volatile bool hci_poll_in_progress = false; +static volatile bool hci_poll_in_progress = false; ////////////////////////////////////////////////////////////////////// @@ -126,7 +126,7 @@ STATIC volatile bool hci_poll_in_progress = false; #include "hci_debug.c" #endif // HCI_DEBUG -STATIC void process_acl_data_pkt(uint8_t pkt_len, uint8_t pkt_data[]) { +static void process_acl_data_pkt(uint8_t pkt_len, uint8_t pkt_data[]) { h4_hci_acl_pkt_t *pkt = (h4_hci_acl_pkt_t *)pkt_data; if (pkt->pb != ACL_DATA_PB_MIDDLE) { @@ -167,7 +167,7 @@ STATIC void process_acl_data_pkt(uint8_t pkt_len, uint8_t pkt_data[]) { // Process number of completed packets. Reduce number of pending packets by reported // number of completed. -STATIC void process_num_comp_pkts(uint16_t handle, uint16_t num_pkts) { +static void process_num_comp_pkts(uint16_t handle, uint16_t num_pkts) { if (num_pkts && pending_pkt > num_pkts) { pending_pkt -= num_pkts; } else { @@ -175,7 +175,7 @@ STATIC void process_num_comp_pkts(uint16_t handle, uint16_t num_pkts) { } } -STATIC void process_evt_pkt(size_t pkt_len, uint8_t pkt_data[]) { +static void process_evt_pkt(size_t pkt_len, uint8_t pkt_data[]) { h4_hci_evt_pkt_t *pkt = (h4_hci_evt_pkt_t *)pkt_data; switch (pkt->evt) { @@ -412,7 +412,7 @@ hci_result_t hci_poll_for_incoming_pkt(void) { } -STATIC hci_result_t write_pkt(uint8_t *buffer, size_t len) { +static hci_result_t write_pkt(uint8_t *buffer, size_t len) { // Wait for CTS to go low before writing to HCI adapter. uint64_t start = supervisor_ticks_ms64(); @@ -432,7 +432,7 @@ STATIC hci_result_t write_pkt(uint8_t *buffer, size_t len) { return HCI_OK; } -STATIC hci_result_t send_command(uint16_t opcode, uint8_t params_len, void *params) { +static hci_result_t send_command(uint16_t opcode, uint8_t params_len, void *params) { uint8_t cmd_pkt_len = sizeof(h4_hci_cmd_pkt_t) + params_len; uint8_t tx_buffer[cmd_pkt_len]; diff --git a/devices/ble_hci/common-hal/_bleio/hci_debug.c b/devices/ble_hci/common-hal/_bleio/hci_debug.c index 162dd386e7262..74824d1041661 100644 --- a/devices/ble_hci/common-hal/_bleio/hci_debug.c +++ b/devices/ble_hci/common-hal/_bleio/hci_debug.c @@ -6,7 +6,7 @@ // This file is #include'd in hci.c when HCI_DEBUG is non-zero. -STATIC const char *att_opcode_name(uint16_t opcode) { +static const char *att_opcode_name(uint16_t opcode) { switch (opcode) { case BT_ATT_OP_ERROR_RSP: return "ERROR_RSP"; @@ -75,7 +75,7 @@ STATIC const char *att_opcode_name(uint16_t opcode) { } } -STATIC const char *hci_evt_name(uint8_t evt) { +static const char *hci_evt_name(uint8_t evt) { switch (evt) { case BT_HCI_EVT_UNKNOWN: return "UNKNOWN"; @@ -146,7 +146,7 @@ STATIC const char *hci_evt_name(uint8_t evt) { } } -STATIC const char *hci_evt_le_name(uint8_t evt_le) { +static const char *hci_evt_le_name(uint8_t evt_le) { switch (evt_le) { case BT_HCI_EVT_LE_CONN_COMPLETE: return "LE_CONN_COMPLETE"; @@ -191,7 +191,7 @@ STATIC const char *hci_evt_le_name(uint8_t evt_le) { } } -STATIC const char *hci_opcode_name(uint16_t opcode) { +static const char *hci_opcode_name(uint16_t opcode) { switch (opcode) { case BT_OP_NOP: return "NOP"; @@ -455,7 +455,7 @@ STATIC const char *hci_opcode_name(uint16_t opcode) { } -STATIC void dump_cmd_pkt(bool tx, uint8_t pkt_len, uint8_t pkt_data[]) { +static void dump_cmd_pkt(bool tx, uint8_t pkt_len, uint8_t pkt_data[]) { h4_hci_cmd_pkt_t *pkt = (h4_hci_cmd_pkt_t *)pkt_data; mp_printf(&mp_plat_print, "%s HCI COMMAND (%x) op: %s (%04x), len: %d, data: ", @@ -471,7 +471,7 @@ STATIC void dump_cmd_pkt(bool tx, uint8_t pkt_len, uint8_t pkt_data[]) { mp_printf(&mp_plat_print, "\n"); } -STATIC void dump_acl_pkt(bool tx, uint8_t pkt_len, uint8_t pkt_data[]) { +static void dump_acl_pkt(bool tx, uint8_t pkt_len, uint8_t pkt_data[]) { h4_hci_acl_pkt_t *pkt = (h4_hci_acl_pkt_t *)pkt_data; acl_data_t *acl = (acl_data_t *)pkt->data; @@ -509,7 +509,7 @@ STATIC void dump_acl_pkt(bool tx, uint8_t pkt_len, uint8_t pkt_data[]) { mp_printf(&mp_plat_print, "\n"); } -STATIC void dump_evt_pkt(bool tx, uint8_t pkt_len, uint8_t pkt_data[]) { +static void dump_evt_pkt(bool tx, uint8_t pkt_len, uint8_t pkt_data[]) { h4_hci_evt_pkt_t *pkt = (h4_hci_evt_pkt_t *)pkt_data; mp_printf(&mp_plat_print, "%s HCI EVENT (%x) evt: %s (%02x), param_len: %d, data: ", diff --git a/main.c b/main.c index 3dbd8327a0afe..3988bc9e7dc0e 100644 --- a/main.c +++ b/main.c @@ -121,13 +121,13 @@ static void reset_devices(void) { #endif } -STATIC uint8_t *_heap; -STATIC uint8_t *_pystack; +static uint8_t *_heap; +static uint8_t *_pystack; -STATIC const char line_clear[] = "\x1b[2K\x1b[0G"; +static const char line_clear[] = "\x1b[2K\x1b[0G"; #if MICROPY_ENABLE_PYSTACK || MICROPY_ENABLE_GC -STATIC uint8_t *_allocate_memory(safe_mode_t safe_mode, const char *env_key, size_t default_size, size_t *final_size) { +static uint8_t *_allocate_memory(safe_mode_t safe_mode, const char *env_key, size_t default_size, size_t *final_size) { *final_size = default_size; #if CIRCUITPY_OS_GETENV if (safe_mode == SAFE_MODE_NONE) { @@ -152,7 +152,7 @@ STATIC uint8_t *_allocate_memory(safe_mode_t safe_mode, const char *env_key, siz } #endif -STATIC void start_mp(safe_mode_t safe_mode) { +static void start_mp(safe_mode_t safe_mode) { supervisor_workflow_reset(); // Stack limit should be less than real stack size, so we have a chance @@ -205,7 +205,7 @@ STATIC void start_mp(safe_mode_t safe_mode) { mp_obj_list_init((mp_obj_list_t *)mp_sys_argv, 0); } -STATIC void stop_mp(void) { +static void stop_mp(void) { #if MICROPY_VFS mp_vfs_mount_t *vfs = MP_STATE_VM(vfs_mount_table); @@ -237,9 +237,9 @@ STATIC void stop_mp(void) { #endif } -STATIC const char *_current_executing_filename = NULL; +static const char *_current_executing_filename = NULL; -STATIC pyexec_result_t _exec_result = {0, MP_OBJ_NULL, 0}; +static pyexec_result_t _exec_result = {0, MP_OBJ_NULL, 0}; #if CIRCUITPY_STATUS_BAR void supervisor_execution_status(void) { @@ -264,7 +264,7 @@ pyexec_result_t *pyexec_result(void) { // Look for the first file that exists in the list of filenames, using mp_import_stat(). // Return its index. If no file found, return -1. -STATIC const char *first_existing_file_in_list(const char *const *filenames, size_t n_filenames) { +static const char *first_existing_file_in_list(const char *const *filenames, size_t n_filenames) { for (size_t i = 0; i < n_filenames; i++) { mp_import_stat_t stat = mp_import_stat(filenames[i]); if (stat == MP_IMPORT_STAT_FILE) { @@ -274,7 +274,7 @@ STATIC const char *first_existing_file_in_list(const char *const *filenames, siz return NULL; } -STATIC bool maybe_run_list(const char *const *filenames, size_t n_filenames) { +static bool maybe_run_list(const char *const *filenames, size_t n_filenames) { _exec_result.return_code = 0; _exec_result.exception = MP_OBJ_NULL; _exec_result.exception_line = 0; @@ -309,11 +309,11 @@ STATIC bool maybe_run_list(const char *const *filenames, size_t n_filenames) { return true; } -STATIC void count_strn(void *data, const char *str, size_t len) { +static void count_strn(void *data, const char *str, size_t len) { *(size_t *)data += len; } -STATIC void cleanup_after_vm(mp_obj_t exception) { +static void cleanup_after_vm(mp_obj_t exception) { // Get the traceback of any exception from this run off the heap. // MP_OBJ_SENTINEL means "this run does not contribute to traceback storage, don't touch it" // MP_OBJ_NULL (=0) means "this run completed successfully, clear any stored traceback" @@ -399,7 +399,7 @@ STATIC void cleanup_after_vm(mp_obj_t exception) { supervisor_workflow_reset(); } -STATIC void print_code_py_status_message(safe_mode_t safe_mode) { +static void print_code_py_status_message(safe_mode_t safe_mode) { mp_hal_stdout_tx_str(line_clear); if (autoreload_is_enabled()) { serial_write_compressed( @@ -412,7 +412,7 @@ STATIC void print_code_py_status_message(safe_mode_t safe_mode) { } } -STATIC bool __attribute__((noinline)) run_code_py(safe_mode_t safe_mode, bool *simulate_reset) { +static bool __attribute__((noinline)) run_code_py(safe_mode_t safe_mode, bool *simulate_reset) { bool serial_connected_at_start = serial_connected(); bool printed_safe_mode_message = false; #if CIRCUITPY_AUTORELOAD_DELAY_MS > 0 @@ -783,7 +783,7 @@ STATIC bool __attribute__((noinline)) run_code_py(safe_mode_t safe_mode, bool *s vstr_t *boot_output; #if CIRCUITPY_SAFEMODE_PY -STATIC void __attribute__ ((noinline)) run_safemode_py(safe_mode_t safe_mode) { +static void __attribute__ ((noinline)) run_safemode_py(safe_mode_t safe_mode) { // Don't run if we aren't in safe mode or we won't be able to find safemode.py. // Also don't run if it's a user-initiated safemode (pressing button(s) during boot), // since that's deliberate. @@ -807,7 +807,7 @@ STATIC void __attribute__ ((noinline)) run_safemode_py(safe_mode_t safe_mode) { } #endif -STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) { +static void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) { if (safe_mode == SAFE_MODE_NO_HEAP) { return; } @@ -904,7 +904,7 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) { port_post_boot_py(false); } -STATIC int run_repl(safe_mode_t safe_mode) { +static int run_repl(safe_mode_t safe_mode) { int exit_code = PYEXEC_FORCED_EXIT; filesystem_flush(); diff --git a/ports/atmel-samd/audio_dma.c b/ports/atmel-samd/audio_dma.c index c31461a41117e..39c9dde648e13 100644 --- a/ports/atmel-samd/audio_dma.c +++ b/ports/atmel-samd/audio_dma.c @@ -358,7 +358,7 @@ bool audio_dma_get_playing(audio_dma_t *dma) { // WARN(tannewt): DO NOT print from here, or anything it calls. Printing calls // background tasks such as this and causes a stack overflow. -STATIC void dma_callback_fun(void *arg) { +static void dma_callback_fun(void *arg) { audio_dma_t *dma = arg; if (dma == NULL) { return; diff --git a/ports/atmel-samd/bindings/samd/Clock.c b/ports/atmel-samd/bindings/samd/Clock.c index ee879cb66e60a..1564d65fc8c40 100644 --- a/ports/atmel-samd/bindings/samd/Clock.c +++ b/ports/atmel-samd/bindings/samd/Clock.c @@ -17,7 +17,7 @@ //| ``samd.clock`` to reference the desired clock.""" //| -STATIC void samd_clock_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { +static void samd_clock_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { samd_clock_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_printf(print, "%q.%q.%q", MP_QSTR_samd, MP_QSTR_clock, self->name); @@ -25,7 +25,7 @@ STATIC void samd_clock_print(const mp_print_t *print, mp_obj_t self_in, mp_print //| enabled: bool //| """Is the clock enabled? (read-only)""" -STATIC mp_obj_t samd_clock_get_enabled(mp_obj_t self_in) { +static mp_obj_t samd_clock_get_enabled(mp_obj_t self_in) { samd_clock_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_bool(clock_get_enabled(self->type, self->index)); } @@ -37,7 +37,7 @@ MP_PROPERTY_GETTER(samd_clock_enabled_obj, //| parent: Union[Clock, None] //| """Clock parent. (read-only)""" -STATIC mp_obj_t samd_clock_get_parent(mp_obj_t self_in) { +static mp_obj_t samd_clock_get_parent(mp_obj_t self_in) { samd_clock_obj_t *self = MP_OBJ_TO_PTR(self_in); uint8_t p_type, p_index; if (!clock_get_parent(self->type, self->index, &p_type, &p_index)) { @@ -61,7 +61,7 @@ MP_PROPERTY_GETTER(samd_clock_parent_obj, //| frequency: int //| """Clock frequency in Herz. (read-only)""" -STATIC mp_obj_t samd_clock_get_frequency(mp_obj_t self_in) { +static mp_obj_t samd_clock_get_frequency(mp_obj_t self_in) { samd_clock_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_int_from_uint(clock_get_frequency(self->type, self->index)); } @@ -74,14 +74,14 @@ MP_PROPERTY_GETTER(samd_clock_frequency_obj, //| calibration: int //| """Clock calibration. Not all clocks can be calibrated.""" //| -STATIC mp_obj_t samd_clock_get_calibration(mp_obj_t self_in) { +static mp_obj_t samd_clock_get_calibration(mp_obj_t self_in) { samd_clock_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_int_from_uint(clock_get_calibration(self->type, self->index)); } MP_DEFINE_CONST_FUN_OBJ_1(samd_clock_get_calibration_obj, samd_clock_get_calibration); -STATIC mp_obj_t samd_clock_set_calibration(mp_obj_t self_in, mp_obj_t calibration) { +static mp_obj_t samd_clock_set_calibration(mp_obj_t self_in, mp_obj_t calibration) { samd_clock_obj_t *self = MP_OBJ_TO_PTR(self_in); int ret = clock_set_calibration(self->type, self->index, mp_obj_get_int(calibration)); if (ret == -2) { @@ -99,14 +99,14 @@ MP_PROPERTY_GETSET(samd_clock_calibration_obj, (mp_obj_t)&samd_clock_get_calibration_obj, (mp_obj_t)&samd_clock_set_calibration_obj); -STATIC const mp_rom_map_elem_t samd_clock_locals_dict_table[] = { +static const mp_rom_map_elem_t samd_clock_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_enabled), MP_ROM_PTR(&samd_clock_enabled_obj) }, { MP_ROM_QSTR(MP_QSTR_parent), MP_ROM_PTR(&samd_clock_parent_obj) }, { MP_ROM_QSTR(MP_QSTR_frequency), MP_ROM_PTR(&samd_clock_frequency_obj) }, { MP_ROM_QSTR(MP_QSTR_calibration), MP_ROM_PTR(&samd_clock_calibration_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(samd_clock_locals_dict, samd_clock_locals_dict_table); +static MP_DEFINE_CONST_DICT(samd_clock_locals_dict, samd_clock_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( samd_clock_type, @@ -174,7 +174,7 @@ CLOCK_GCLK_(I2S, 1); CLOCK(SYSTICK, 2, 0); #endif -STATIC const mp_rom_map_elem_t samd_clock_global_dict_table[] = { +static const mp_rom_map_elem_t samd_clock_global_dict_table[] = { #ifdef SAMD21_EXPOSE_ALL_CLOCKS CLOCK_ENTRY(XOSC), CLOCK_ENTRY(GCLKIN), @@ -310,7 +310,7 @@ CLOCK(CPU, 2, 1); CLOCK(RTC, 2, 2); -STATIC const mp_rom_map_elem_t samd_clock_global_dict_table[] = { +static const mp_rom_map_elem_t samd_clock_global_dict_table[] = { CLOCK_ENTRY(XOSC0), CLOCK_ENTRY(XOSC1), CLOCK_ENTRY(GCLKIN), diff --git a/ports/atmel-samd/bindings/samd/__init__.c b/ports/atmel-samd/bindings/samd/__init__.c index 76e7a3b2e0eec..9f3ad1c3dd0ac 100644 --- a/ports/atmel-samd/bindings/samd/__init__.c +++ b/ports/atmel-samd/bindings/samd/__init__.c @@ -25,12 +25,12 @@ const mp_obj_module_t samd_clock_module = { .globals = (mp_obj_dict_t *)&samd_clock_globals, }; -STATIC const mp_rom_map_elem_t samd_module_globals_table[] = { +static const mp_rom_map_elem_t samd_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_samd) }, { MP_ROM_QSTR(MP_QSTR_clock), MP_ROM_PTR(&samd_clock_module) }, }; -STATIC MP_DEFINE_CONST_DICT(samd_module_globals, samd_module_globals_table); +static MP_DEFINE_CONST_DICT(samd_module_globals, samd_module_globals_table); const mp_obj_module_t samd_module = { .base = { &mp_type_module }, diff --git a/ports/atmel-samd/boards/8086_commander/pins.c b/ports/atmel-samd/boards/8086_commander/pins.c index 09dbe751d9812..c39872d87066c 100644 --- a/ports/atmel-samd/boards/8086_commander/pins.c +++ b/ports/atmel-samd/boards/8086_commander/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS diff --git a/ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/pins.c b/ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/pins.c index a69b45efbbbee..12e05331d90f8 100644 --- a/ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/pins.c +++ b/ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_TOUCH), MP_ROM_PTR(&pin_PA07) }, diff --git a/ports/atmel-samd/boards/adafruit_pixel_trinkey_m0/pins.c b/ports/atmel-samd/boards/adafruit_pixel_trinkey_m0/pins.c index 20b5a2edfe0ec..2020a526b808e 100644 --- a/ports/atmel-samd/boards/adafruit_pixel_trinkey_m0/pins.c +++ b/ports/atmel-samd/boards/adafruit_pixel_trinkey_m0/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PA01) }, diff --git a/ports/atmel-samd/boards/adafruit_proxlight_trinkey_m0/pins.c b/ports/atmel-samd/boards/adafruit_proxlight_trinkey_m0/pins.c index 03cbbd3baa5ac..ff994cf46abfe 100644 --- a/ports/atmel-samd/boards/adafruit_proxlight_trinkey_m0/pins.c +++ b/ports/atmel-samd/boards/adafruit_proxlight_trinkey_m0/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_INTERRUPT), MP_ROM_PTR(&pin_PA00) }, diff --git a/ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/pins.c b/ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/pins.c index 39001c43904ad..fe7e1dc2b50f3 100644 --- a/ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/pins.c +++ b/ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PA01) }, diff --git a/ports/atmel-samd/boards/adafruit_sht4x_trinkey_m0/pins.c b/ports/atmel-samd/boards/adafruit_sht4x_trinkey_m0/pins.c index 67209ad9be900..41e4e4c5f5ae0 100644 --- a/ports/atmel-samd/boards/adafruit_sht4x_trinkey_m0/pins.c +++ b/ports/atmel-samd/boards/adafruit_sht4x_trinkey_m0/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_TOUCH), MP_ROM_PTR(&pin_PA07) }, diff --git a/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/pins.c b/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/pins.c index 14e9739af82a0..3b5f58010cbcb 100644 --- a/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/pins.c +++ b/ports/atmel-samd/boards/adafruit_slide_trinkey_m0/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PA04) }, diff --git a/ports/atmel-samd/boards/adafruit_trrs_trinkey_m0/pins.c b/ports/atmel-samd/boards/adafruit_trrs_trinkey_m0/pins.c index e8d56789907ef..fc12141404604 100644 --- a/ports/atmel-samd/boards/adafruit_trrs_trinkey_m0/pins.c +++ b/ports/atmel-samd/boards/adafruit_trrs_trinkey_m0/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PA01) }, diff --git a/ports/atmel-samd/boards/aloriumtech_evo_m51/pins.c b/ports/atmel-samd/boards/aloriumtech_evo_m51/pins.c index cbef4ed83e7c6..04e863cbb49f1 100644 --- a/ports/atmel-samd/boards/aloriumtech_evo_m51/pins.c +++ b/ports/atmel-samd/boards/aloriumtech_evo_m51/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/arduino_mkr1300/pins.c b/ports/atmel-samd/boards/arduino_mkr1300/pins.c index b2819e2f8bdb8..23e607a52646e 100644 --- a/ports/atmel-samd/boards/arduino_mkr1300/pins.c +++ b/ports/atmel-samd/boards/arduino_mkr1300/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/arduino_mkrzero/pins.c b/ports/atmel-samd/boards/arduino_mkrzero/pins.c index b751373aa05ed..8bad471e3fe7e 100644 --- a/ports/atmel-samd/boards/arduino_mkrzero/pins.c +++ b/ports/atmel-samd/boards/arduino_mkrzero/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/arduino_nano_33_iot/pins.c b/ports/atmel-samd/boards/arduino_nano_33_iot/pins.c index 2b4749c13e01c..bb93227d19e46 100644 --- a/ports/atmel-samd/boards/arduino_nano_33_iot/pins.c +++ b/ports/atmel-samd/boards/arduino_nano_33_iot/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/arduino_zero/pins.c b/ports/atmel-samd/boards/arduino_zero/pins.c index d5f2545dd6f42..776cf6d4f2225 100644 --- a/ports/atmel-samd/boards/arduino_zero/pins.c +++ b/ports/atmel-samd/boards/arduino_zero/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/bast_pro_mini_m0/pins.c b/ports/atmel-samd/boards/bast_pro_mini_m0/pins.c index d93ad07010549..5b41572e8d68f 100644 --- a/ports/atmel-samd/boards/bast_pro_mini_m0/pins.c +++ b/ports/atmel-samd/boards/bast_pro_mini_m0/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/bdmicro_vina_d21/pins.c b/ports/atmel-samd/boards/bdmicro_vina_d21/pins.c index 5f50a44e8922f..d80b6df00df96 100644 --- a/ports/atmel-samd/boards/bdmicro_vina_d21/pins.c +++ b/ports/atmel-samd/boards/bdmicro_vina_d21/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/bdmicro_vina_d51/pins.c b/ports/atmel-samd/boards/bdmicro_vina_d51/pins.c index 907cc24e0673a..42297190c96b7 100644 --- a/ports/atmel-samd/boards/bdmicro_vina_d51/pins.c +++ b/ports/atmel-samd/boards/bdmicro_vina_d51/pins.c @@ -9,7 +9,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA04) }, diff --git a/ports/atmel-samd/boards/bdmicro_vina_d51_pcb7/pins.c b/ports/atmel-samd/boards/bdmicro_vina_d51_pcb7/pins.c index 43a77af8ab4a2..f1500d4ee8564 100644 --- a/ports/atmel-samd/boards/bdmicro_vina_d51_pcb7/pins.c +++ b/ports/atmel-samd/boards/bdmicro_vina_d51_pcb7/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA04) }, diff --git a/ports/atmel-samd/boards/blm_badge/pins.c b/ports/atmel-samd/boards/blm_badge/pins.c index f7d3289e6b74b..ed38a6b9f89e7 100644 --- a/ports/atmel-samd/boards/blm_badge/pins.c +++ b/ports/atmel-samd/boards/blm_badge/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA01) }, diff --git a/ports/atmel-samd/boards/capablerobot_usbhub/pins.c b/ports/atmel-samd/boards/capablerobot_usbhub/pins.c index 7ff959f10ab2c..d6c7e8516a867 100644 --- a/ports/atmel-samd/boards/capablerobot_usbhub/pins.c +++ b/ports/atmel-samd/boards/capablerobot_usbhub/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_ANMB), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/catwan_usbstick/pins.c b/ports/atmel-samd/boards/catwan_usbstick/pins.c index bc0d437960a0c..91d5cf39a2959 100644 --- a/ports/atmel-samd/boards/catwan_usbstick/pins.c +++ b/ports/atmel-samd/boards/catwan_usbstick/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA30) }, diff --git a/ports/atmel-samd/boards/circuitbrains_basic_m0/pins.c b/ports/atmel-samd/boards/circuitbrains_basic_m0/pins.c index 376d3ed11cf04..f119e0a6069e2 100644 --- a/ports/atmel-samd/boards/circuitbrains_basic_m0/pins.c +++ b/ports/atmel-samd/boards/circuitbrains_basic_m0/pins.c @@ -10,7 +10,7 @@ // This mapping only includes functional names because pins broken // out on connectors are labeled with their MCU name available from // microcontroller.pin. -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/circuitbrains_deluxe_m4/pins.c b/ports/atmel-samd/boards/circuitbrains_deluxe_m4/pins.c index 4e8bcc171d0f5..f9eb15d988d84 100644 --- a/ports/atmel-samd/boards/circuitbrains_deluxe_m4/pins.c +++ b/ports/atmel-samd/boards/circuitbrains_deluxe_m4/pins.c @@ -10,7 +10,7 @@ // This mapping only includes functional names because pins broken // out on connectors are labeled with their MCU name available from // microcontroller.pin. -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/circuitplayground_express/pins.c b/ports/atmel-samd/boards/circuitplayground_express/pins.c index 60cfeac1c1f7f..3de93ced59a9e 100644 --- a/ports/atmel-samd/boards/circuitplayground_express/pins.c +++ b/ports/atmel-samd/boards/circuitplayground_express/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/circuitplayground_express_crickit/pins.c b/ports/atmel-samd/boards/circuitplayground_express_crickit/pins.c index 60cfeac1c1f7f..3de93ced59a9e 100644 --- a/ports/atmel-samd/boards/circuitplayground_express_crickit/pins.c +++ b/ports/atmel-samd/boards/circuitplayground_express_crickit/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/circuitplayground_express_displayio/pins.c b/ports/atmel-samd/boards/circuitplayground_express_displayio/pins.c index 60cfeac1c1f7f..3de93ced59a9e 100644 --- a/ports/atmel-samd/boards/circuitplayground_express_displayio/pins.c +++ b/ports/atmel-samd/boards/circuitplayground_express_displayio/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/cp32-m4/pins.c b/ports/atmel-samd/boards/cp32-m4/pins.c index 784acb235e878..1b9277d31a04d 100644 --- a/ports/atmel-samd/boards/cp32-m4/pins.c +++ b/ports/atmel-samd/boards/cp32-m4/pins.c @@ -9,7 +9,7 @@ // This mapping only includes functional names because pins broken // out on connectors are labeled with their MCU name available from // microcontroller.pin. -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_SPEAKER_P), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/cp_sapling_m0/pins.c b/ports/atmel-samd/boards/cp_sapling_m0/pins.c index 229d575fd7adf..2e3b51f7710bc 100644 --- a/ports/atmel-samd/boards/cp_sapling_m0/pins.c +++ b/ports/atmel-samd/boards/cp_sapling_m0/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS diff --git a/ports/atmel-samd/boards/cp_sapling_m0_revb/pins.c b/ports/atmel-samd/boards/cp_sapling_m0_revb/pins.c index b0fcf5c621d25..aef1a3ee6628e 100644 --- a/ports/atmel-samd/boards/cp_sapling_m0_revb/pins.c +++ b/ports/atmel-samd/boards/cp_sapling_m0_revb/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS diff --git a/ports/atmel-samd/boards/cp_sapling_m0_spiflash/pins.c b/ports/atmel-samd/boards/cp_sapling_m0_spiflash/pins.c index 229d575fd7adf..2e3b51f7710bc 100644 --- a/ports/atmel-samd/boards/cp_sapling_m0_spiflash/pins.c +++ b/ports/atmel-samd/boards/cp_sapling_m0_spiflash/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS diff --git a/ports/atmel-samd/boards/datalore_ip_m4/pins.c b/ports/atmel-samd/boards/datalore_ip_m4/pins.c index 65a0c9c22b203..8a9168b2e02b2 100644 --- a/ports/atmel-samd/boards/datalore_ip_m4/pins.c +++ b/ports/atmel-samd/boards/datalore_ip_m4/pins.c @@ -9,7 +9,7 @@ // This mapping only includes functional names because pins broken // out on connectors are labeled with their MCU name available from // microcontroller.pin. -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/datum_distance/pins.c b/ports/atmel-samd/boards/datum_distance/pins.c index e922829682a4c..695ce6162ee4f 100644 --- a/ports/atmel-samd/boards/datum_distance/pins.c +++ b/ports/atmel-samd/boards/datum_distance/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PB11) }, diff --git a/ports/atmel-samd/boards/datum_imu/pins.c b/ports/atmel-samd/boards/datum_imu/pins.c index a9cef252b2379..2fa76c57ef5f5 100644 --- a/ports/atmel-samd/boards/datum_imu/pins.c +++ b/ports/atmel-samd/boards/datum_imu/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/datum_light/pins.c b/ports/atmel-samd/boards/datum_light/pins.c index e922829682a4c..695ce6162ee4f 100644 --- a/ports/atmel-samd/boards/datum_light/pins.c +++ b/ports/atmel-samd/boards/datum_light/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PB11) }, diff --git a/ports/atmel-samd/boards/datum_weather/pins.c b/ports/atmel-samd/boards/datum_weather/pins.c index fe40cdff068d8..583e75aadab8d 100644 --- a/ports/atmel-samd/boards/datum_weather/pins.c +++ b/ports/atmel-samd/boards/datum_weather/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PB11) }, diff --git a/ports/atmel-samd/boards/dynalora_usb/pins.c b/ports/atmel-samd/boards/dynalora_usb/pins.c index 8efe68762fb3a..644555b64be5a 100644 --- a/ports/atmel-samd/boards/dynalora_usb/pins.c +++ b/ports/atmel-samd/boards/dynalora_usb/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA00) }, diff --git a/ports/atmel-samd/boards/dynossat_edu_eps/pins.c b/ports/atmel-samd/boards/dynossat_edu_eps/pins.c index 943d477e65e8b..fdf2618f7bedd 100644 --- a/ports/atmel-samd/boards/dynossat_edu_eps/pins.c +++ b/ports/atmel-samd/boards/dynossat_edu_eps/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PB11) }, diff --git a/ports/atmel-samd/boards/dynossat_edu_obc/pins.c b/ports/atmel-samd/boards/dynossat_edu_obc/pins.c index c225af8fbdf6a..eac7824b46e82 100644 --- a/ports/atmel-samd/boards/dynossat_edu_obc/pins.c +++ b/ports/atmel-samd/boards/dynossat_edu_obc/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA07) }, diff --git a/ports/atmel-samd/boards/escornabot_makech/pins.c b/ports/atmel-samd/boards/escornabot_makech/pins.c index 5d274a88a2433..bac77c55aa696 100644 --- a/ports/atmel-samd/boards/escornabot_makech/pins.c +++ b/ports/atmel-samd/boards/escornabot_makech/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // LEDs diff --git a/ports/atmel-samd/boards/feather_m0_adalogger/pins.c b/ports/atmel-samd/boards/feather_m0_adalogger/pins.c index 3a5234da77c9c..1f18c8dc01b4b 100644 --- a/ports/atmel-samd/boards/feather_m0_adalogger/pins.c +++ b/ports/atmel-samd/boards/feather_m0_adalogger/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/feather_m0_basic/pins.c b/ports/atmel-samd/boards/feather_m0_basic/pins.c index 24f5a839d140a..21e0de72438c7 100644 --- a/ports/atmel-samd/boards/feather_m0_basic/pins.c +++ b/ports/atmel-samd/boards/feather_m0_basic/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/feather_m0_express/pins.c b/ports/atmel-samd/boards/feather_m0_express/pins.c index c52a03af8a65a..96ca061eb18d0 100644 --- a/ports/atmel-samd/boards/feather_m0_express/pins.c +++ b/ports/atmel-samd/boards/feather_m0_express/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/feather_m0_express_crickit/pins.c b/ports/atmel-samd/boards/feather_m0_express_crickit/pins.c index c52a03af8a65a..96ca061eb18d0 100644 --- a/ports/atmel-samd/boards/feather_m0_express_crickit/pins.c +++ b/ports/atmel-samd/boards/feather_m0_express_crickit/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/feather_m0_rfm69/pins.c b/ports/atmel-samd/boards/feather_m0_rfm69/pins.c index 9d58e52a4db35..ae37f8d9a279e 100644 --- a/ports/atmel-samd/boards/feather_m0_rfm69/pins.c +++ b/ports/atmel-samd/boards/feather_m0_rfm69/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/feather_m0_rfm9x/pins.c b/ports/atmel-samd/boards/feather_m0_rfm9x/pins.c index 5b01f214c4eca..67a84112a5345 100644 --- a/ports/atmel-samd/boards/feather_m0_rfm9x/pins.c +++ b/ports/atmel-samd/boards/feather_m0_rfm9x/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/feather_m0_supersized/pins.c b/ports/atmel-samd/boards/feather_m0_supersized/pins.c index c52a03af8a65a..96ca061eb18d0 100644 --- a/ports/atmel-samd/boards/feather_m0_supersized/pins.c +++ b/ports/atmel-samd/boards/feather_m0_supersized/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/feather_m4_can/pins.c b/ports/atmel-samd/boards/feather_m4_can/pins.c index 579474479ef34..ce6b61657fb01 100644 --- a/ports/atmel-samd/boards/feather_m4_can/pins.c +++ b/ports/atmel-samd/boards/feather_m4_can/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/feather_m4_express/pins.c b/ports/atmel-samd/boards/feather_m4_express/pins.c index 90f455090d285..06eba88959440 100644 --- a/ports/atmel-samd/boards/feather_m4_express/pins.c +++ b/ports/atmel-samd/boards/feather_m4_express/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/fluff_m0/pins.c b/ports/atmel-samd/boards/fluff_m0/pins.c index 080b31a85821e..7ff9b664e959b 100644 --- a/ports/atmel-samd/boards/fluff_m0/pins.c +++ b/ports/atmel-samd/boards/fluff_m0/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_AREF), MP_ROM_PTR(&pin_PA03) }, diff --git a/ports/atmel-samd/boards/gemma_m0/pins.c b/ports/atmel-samd/boards/gemma_m0/pins.c index a5ed8fc33ecb1..69d7300296eea 100644 --- a/ports/atmel-samd/boards/gemma_m0/pins.c +++ b/ports/atmel-samd/boards/gemma_m0/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PA05) }, // pad 1 diff --git a/ports/atmel-samd/boards/grandcentral_m4_express/pins.c b/ports/atmel-samd/boards/grandcentral_m4_express/pins.c index 6bf7b45a7544e..a8965e3bd3bce 100644 --- a/ports/atmel-samd/boards/grandcentral_m4_express/pins.c +++ b/ports/atmel-samd/boards/grandcentral_m4_express/pins.c @@ -7,7 +7,7 @@ #include "py/objtuple.h" #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_obj_tuple_t sdio_data_tuple = { +static const mp_rom_obj_tuple_t sdio_data_tuple = { {&mp_type_tuple}, 4, { @@ -22,7 +22,7 @@ STATIC const mp_rom_obj_tuple_t sdio_data_tuple = { // This mapping only includes functional names because pins broken // out on connectors are labeled with their MCU name available from // microcontroller.pin. -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_AREF), MP_ROM_PTR(&pin_PA03) }, diff --git a/ports/atmel-samd/boards/hallowing_m0_express/pins.c b/ports/atmel-samd/boards/hallowing_m0_express/pins.c index 43cffa6cbfc65..276ae938f3ac1 100644 --- a/ports/atmel-samd/boards/hallowing_m0_express/pins.c +++ b/ports/atmel-samd/boards/hallowing_m0_express/pins.c @@ -9,7 +9,7 @@ #include "supervisor/board.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/hallowing_m4_express/pins.c b/ports/atmel-samd/boards/hallowing_m4_express/pins.c index eb3044bb65b7a..3db56be90db82 100644 --- a/ports/atmel-samd/boards/hallowing_m4_express/pins.c +++ b/ports/atmel-samd/boards/hallowing_m4_express/pins.c @@ -8,7 +8,7 @@ #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/huntercat_nfc/pins.c b/ports/atmel-samd/boards/huntercat_nfc/pins.c index 4ed56b244be79..8a42a3a22b763 100644 --- a/ports/atmel-samd/boards/huntercat_nfc/pins.c +++ b/ports/atmel-samd/boards/huntercat_nfc/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA03) }, diff --git a/ports/atmel-samd/boards/itsybitsy_m0_express/pins.c b/ports/atmel-samd/boards/itsybitsy_m0_express/pins.c index ff51363861caa..78f55835c3cda 100644 --- a/ports/atmel-samd/boards/itsybitsy_m0_express/pins.c +++ b/ports/atmel-samd/boards/itsybitsy_m0_express/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA11) }, diff --git a/ports/atmel-samd/boards/itsybitsy_m4_express/pins.c b/ports/atmel-samd/boards/itsybitsy_m4_express/pins.c index 404292a6a1a8d..029fa7c5ba87c 100644 --- a/ports/atmel-samd/boards/itsybitsy_m4_express/pins.c +++ b/ports/atmel-samd/boards/itsybitsy_m4_express/pins.c @@ -9,7 +9,7 @@ // This mapping only includes functional names because pins broken // out on connectors are labeled with their MCU name available from // microcontroller.pin. -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/kicksat-sprite/pins.c b/ports/atmel-samd/boards/kicksat-sprite/pins.c index ea914681eb592..8fbd024340295 100644 --- a/ports/atmel-samd/boards/kicksat-sprite/pins.c +++ b/ports/atmel-samd/boards/kicksat-sprite/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "supervisor/board.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA05) }, diff --git a/ports/atmel-samd/boards/loc_ber_m4_base_board/pins.c b/ports/atmel-samd/boards/loc_ber_m4_base_board/pins.c index 6428231670883..52908720522de 100644 --- a/ports/atmel-samd/boards/loc_ber_m4_base_board/pins.c +++ b/ports/atmel-samd/boards/loc_ber_m4_base_board/pins.c @@ -9,7 +9,7 @@ // This mapping only includes functional names because pins broken // out on connectors are labeled with their MCU name available from // microcontroller.pin. -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/matrixportal_m4/pins.c b/ports/atmel-samd/boards/matrixportal_m4/pins.c index f2748d7f45a4c..4233704d1392b 100644 --- a/ports/atmel-samd/boards/matrixportal_m4/pins.c +++ b/ports/atmel-samd/boards/matrixportal_m4/pins.c @@ -7,7 +7,7 @@ #include "py/objtuple.h" #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_obj_tuple_t matrix_addr_tuple = { +static const mp_rom_obj_tuple_t matrix_addr_tuple = { {&mp_type_tuple}, 5, { @@ -19,7 +19,7 @@ STATIC const mp_rom_obj_tuple_t matrix_addr_tuple = { } }; -STATIC const mp_rom_obj_tuple_t matrix_data_tuple = { +static const mp_rom_obj_tuple_t matrix_data_tuple = { {&mp_type_tuple}, 6, { @@ -33,7 +33,7 @@ STATIC const mp_rom_obj_tuple_t matrix_data_tuple = { } }; -STATIC const mp_rom_map_elem_t matrix_common_table[] = { +static const mp_rom_map_elem_t matrix_common_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR_rgb_pins), MP_ROM_PTR(&matrix_data_tuple) }, { MP_OBJ_NEW_QSTR(MP_QSTR_clock_pin), MP_ROM_PTR(&pin_PB06) }, { MP_OBJ_NEW_QSTR(MP_QSTR_latch_pin), MP_ROM_PTR(&pin_PB14) }, @@ -42,7 +42,7 @@ STATIC const mp_rom_map_elem_t matrix_common_table[] = { MP_DEFINE_CONST_DICT(matrix_common_dict, matrix_common_table); -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/meowmeow/pins.c b/ports/atmel-samd/boards/meowmeow/pins.c index d92f0d86125e7..a94a33b8c867f 100644 --- a/ports/atmel-samd/boards/meowmeow/pins.c +++ b/ports/atmel-samd/boards/meowmeow/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/metro_m0_express/pins.c b/ports/atmel-samd/boards/metro_m0_express/pins.c index 8b00c7329e26a..323aa1e91c84b 100644 --- a/ports/atmel-samd/boards/metro_m0_express/pins.c +++ b/ports/atmel-samd/boards/metro_m0_express/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/metro_m4_airlift_lite/pins.c b/ports/atmel-samd/boards/metro_m4_airlift_lite/pins.c index e52042721e880..3e56a6f76c93b 100644 --- a/ports/atmel-samd/boards/metro_m4_airlift_lite/pins.c +++ b/ports/atmel-samd/boards/metro_m4_airlift_lite/pins.c @@ -9,7 +9,7 @@ // This mapping only includes functional names because pins broken // out on connectors are labeled with their MCU name available from // microcontroller.pin. -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/metro_m4_express/pins.c b/ports/atmel-samd/boards/metro_m4_express/pins.c index 73a36156618bc..045d0165bd723 100644 --- a/ports/atmel-samd/boards/metro_m4_express/pins.c +++ b/ports/atmel-samd/boards/metro_m4_express/pins.c @@ -9,7 +9,7 @@ // This mapping only includes functional names because pins broken // out on connectors are labeled with their MCU name available from // microcontroller.pin. -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/mini_sam_m4/pins.c b/ports/atmel-samd/boards/mini_sam_m4/pins.c index 6edc837a39c14..5dfd6bb8f0a22 100644 --- a/ports/atmel-samd/boards/mini_sam_m4/pins.c +++ b/ports/atmel-samd/boards/mini_sam_m4/pins.c @@ -9,7 +9,7 @@ // This mapping only includes functional names because pins broken // out on connectors are labeled with their MCU name available from // microcontroller.pin. -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/monster_m4sk/pins.c b/ports/atmel-samd/boards/monster_m4sk/pins.c index 7b91ac0b6ee01..a96732a559669 100644 --- a/ports/atmel-samd/boards/monster_m4sk/pins.c +++ b/ports/atmel-samd/boards/monster_m4sk/pins.c @@ -9,7 +9,7 @@ #include "supervisor/board.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_SPEAKER), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/ndgarage_ndbit6/pins.c b/ports/atmel-samd/boards/ndgarage_ndbit6/pins.c index f6755dc5bb8c3..7dce61096e0fb 100644 --- a/ports/atmel-samd/boards/ndgarage_ndbit6/pins.c +++ b/ports/atmel-samd/boards/ndgarage_ndbit6/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PA05) }, diff --git a/ports/atmel-samd/boards/ndgarage_ndbit6_v2/pins.c b/ports/atmel-samd/boards/ndgarage_ndbit6_v2/pins.c index 96a5a0cc21398..b99d57ed9f93c 100644 --- a/ports/atmel-samd/boards/ndgarage_ndbit6_v2/pins.c +++ b/ports/atmel-samd/boards/ndgarage_ndbit6_v2/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/neopixel_trinkey_m0/pins.c b/ports/atmel-samd/boards/neopixel_trinkey_m0/pins.c index af4edfbd1d770..6a6d0673ce8bc 100644 --- a/ports/atmel-samd/boards/neopixel_trinkey_m0/pins.c +++ b/ports/atmel-samd/boards/neopixel_trinkey_m0/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_TOUCH1), MP_ROM_PTR(&pin_PA03) }, diff --git a/ports/atmel-samd/boards/nfc_copy_cat/pins.c b/ports/atmel-samd/boards/nfc_copy_cat/pins.c index 2829e382a44dd..cb4e227bdc432 100644 --- a/ports/atmel-samd/boards/nfc_copy_cat/pins.c +++ b/ports/atmel-samd/boards/nfc_copy_cat/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_PA02) }, // IRQ diff --git a/ports/atmel-samd/boards/openbook_m4/pins.c b/ports/atmel-samd/boards/openbook_m4/pins.c index c8cdfe351e917..250773c6c33d6 100644 --- a/ports/atmel-samd/boards/openbook_m4/pins.c +++ b/ports/atmel-samd/boards/openbook_m4/pins.c @@ -9,7 +9,7 @@ #include "supervisor/board.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, // A0 = audio right channel diff --git a/ports/atmel-samd/boards/p1am_200/pins.c b/ports/atmel-samd/boards/p1am_200/pins.c index d7dbaee64cbcb..91864e3fc5112 100644 --- a/ports/atmel-samd/boards/p1am_200/pins.c +++ b/ports/atmel-samd/boards/p1am_200/pins.c @@ -9,7 +9,7 @@ // This mapping only includes functional names because pins broken // out on connectors are labeled with their MCU name available from // microcontroller.pin. -STATIC const mp_rom_map_elem_t board_global_dict_table[] = { +static const mp_rom_map_elem_t board_global_dict_table[] = { // Left side header // Analog Pins { MP_OBJ_NEW_QSTR(MP_QSTR_AREF), MP_ROM_PTR(&pin_PA03) }, diff --git a/ports/atmel-samd/boards/pewpew10/pins.c b/ports/atmel-samd/boards/pewpew10/pins.c index 846b0c85dafbd..68aab74f449ca 100644 --- a/ports/atmel-samd/boards/pewpew10/pins.c +++ b/ports/atmel-samd/boards/pewpew10/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // Pins for internal use. diff --git a/ports/atmel-samd/boards/pewpew_lcd/pins.c b/ports/atmel-samd/boards/pewpew_lcd/pins.c index 36d92a39bc6e1..4ad72a1ebb68c 100644 --- a/ports/atmel-samd/boards/pewpew_lcd/pins.c +++ b/ports/atmel-samd/boards/pewpew_lcd/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_global_dict_table[] = { +static const mp_rom_map_elem_t board_global_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA23) }, { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PA22) }, { MP_ROM_QSTR(MP_QSTR_CS), MP_ROM_PTR(&pin_PA17) }, diff --git a/ports/atmel-samd/boards/pewpew_m4/board.c b/ports/atmel-samd/boards/pewpew_m4/board.c index 30ccf86ce5c6a..6ba7155867a9c 100644 --- a/ports/atmel-samd/boards/pewpew_m4/board.c +++ b/ports/atmel-samd/boards/pewpew_m4/board.c @@ -29,7 +29,7 @@ typedef struct { #define DELAY 0x80 -STATIC uint32_t lookupCfg(uint32_t key, uint32_t defl) { +static uint32_t lookupCfg(uint32_t key, uint32_t defl) { const uint32_t *ptr = UF2_BINFO->config_data; if (!ptr || (((uint32_t)ptr) & 3) || *ptr != CFG_MAGIC0) { // no config data! diff --git a/ports/atmel-samd/boards/pewpew_m4/pins.c b/ports/atmel-samd/boards/pewpew_m4/pins.c index d5cc79305dcc7..71a2d5e1f934b 100644 --- a/ports/atmel-samd/boards/pewpew_m4/pins.c +++ b/ports/atmel-samd/boards/pewpew_m4/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_BUTTON_LEFT), MP_ROM_PTR(&pin_PB23) }, diff --git a/ports/atmel-samd/boards/picoplanet/pins.c b/ports/atmel-samd/boards/picoplanet/pins.c index 745a481962ada..cd49da547baff 100644 --- a/ports/atmel-samd/boards/picoplanet/pins.c +++ b/ports/atmel-samd/boards/picoplanet/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/pybadge/pins.c b/ports/atmel-samd/boards/pybadge/pins.c index ba5902a57d74f..6c81b537c956e 100644 --- a/ports/atmel-samd/boards/pybadge/pins.c +++ b/ports/atmel-samd/boards/pybadge/pins.c @@ -9,7 +9,7 @@ #include "supervisor/board.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/pycubed/pins.c b/ports/atmel-samd/boards/pycubed/pins.c index cfb40b06b43eb..7bda1a2e30ec1 100644 --- a/ports/atmel-samd/boards/pycubed/pins.c +++ b/ports/atmel-samd/boards/pycubed/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "supervisor/board.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA13) }, diff --git a/ports/atmel-samd/boards/pycubed_mram/pins.c b/ports/atmel-samd/boards/pycubed_mram/pins.c index cfb40b06b43eb..7bda1a2e30ec1 100644 --- a/ports/atmel-samd/boards/pycubed_mram/pins.c +++ b/ports/atmel-samd/boards/pycubed_mram/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "supervisor/board.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA13) }, diff --git a/ports/atmel-samd/boards/pycubed_mram_v05/pins.c b/ports/atmel-samd/boards/pycubed_mram_v05/pins.c index 473e2e52e4961..32b640c232d7c 100644 --- a/ports/atmel-samd/boards/pycubed_mram_v05/pins.c +++ b/ports/atmel-samd/boards/pycubed_mram_v05/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "supervisor/board.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA13) }, diff --git a/ports/atmel-samd/boards/pycubed_v05/pins.c b/ports/atmel-samd/boards/pycubed_v05/pins.c index f513523fc2fb2..07a8190efa800 100644 --- a/ports/atmel-samd/boards/pycubed_v05/pins.c +++ b/ports/atmel-samd/boards/pycubed_v05/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA13) }, diff --git a/ports/atmel-samd/boards/pygamer/pins.c b/ports/atmel-samd/boards/pygamer/pins.c index 959be3aca8aa1..f2aed3d6527b0 100644 --- a/ports/atmel-samd/boards/pygamer/pins.c +++ b/ports/atmel-samd/boards/pygamer/pins.c @@ -9,7 +9,7 @@ #include "supervisor/board.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/pyportal/pins.c b/ports/atmel-samd/boards/pyportal/pins.c index f502613c04d87..50cda39e85cb0 100644 --- a/ports/atmel-samd/boards/pyportal/pins.c +++ b/ports/atmel-samd/boards/pyportal/pins.c @@ -12,7 +12,7 @@ // This mapping only includes functional names because pins broken // out on connectors are labeled with their MCU name available from // microcontroller.pin. -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_SPEAKER), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/pyportal_titano/pins.c b/ports/atmel-samd/boards/pyportal_titano/pins.c index f502613c04d87..50cda39e85cb0 100644 --- a/ports/atmel-samd/boards/pyportal_titano/pins.c +++ b/ports/atmel-samd/boards/pyportal_titano/pins.c @@ -12,7 +12,7 @@ // This mapping only includes functional names because pins broken // out on connectors are labeled with their MCU name available from // microcontroller.pin. -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_SPEAKER), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/pyruler/pins.c b/ports/atmel-samd/boards/pyruler/pins.c index af78aa245b0fc..5eff2a9b5141b 100644 --- a/ports/atmel-samd/boards/pyruler/pins.c +++ b/ports/atmel-samd/boards/pyruler/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA08) }, diff --git a/ports/atmel-samd/boards/qtpy_m0/pins.c b/ports/atmel-samd/boards/qtpy_m0/pins.c index 4618ed5108fe3..e23ab2b2a7740 100644 --- a/ports/atmel-samd/boards/qtpy_m0/pins.c +++ b/ports/atmel-samd/boards/qtpy_m0/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/qtpy_m0_haxpress/pins.c b/ports/atmel-samd/boards/qtpy_m0_haxpress/pins.c index 4618ed5108fe3..e23ab2b2a7740 100644 --- a/ports/atmel-samd/boards/qtpy_m0_haxpress/pins.c +++ b/ports/atmel-samd/boards/qtpy_m0_haxpress/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/robohatmm1_m4/pins.c b/ports/atmel-samd/boards/robohatmm1_m4/pins.c index 793aa352e0c4d..f5bc7f42f021f 100644 --- a/ports/atmel-samd/boards/robohatmm1_m4/pins.c +++ b/ports/atmel-samd/boards/robohatmm1_m4/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" // Version 2.4 -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // SERVO Pins diff --git a/ports/atmel-samd/boards/sam32/pins.c b/ports/atmel-samd/boards/sam32/pins.c index 160c9a10775da..d7ed30453ee87 100644 --- a/ports/atmel-samd/boards/sam32/pins.c +++ b/ports/atmel-samd/boards/sam32/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO39), MP_ROM_PTR(&pin_PB08) }, diff --git a/ports/atmel-samd/boards/same54_xplained/pins.c b/ports/atmel-samd/boards/same54_xplained/pins.c index 25a3f5fad1012..3a5883fd86314 100644 --- a/ports/atmel-samd/boards/same54_xplained/pins.c +++ b/ports/atmel-samd/boards/same54_xplained/pins.c @@ -7,7 +7,7 @@ #include "py/objtuple.h" #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_obj_tuple_t sdio_data_tuple = { +static const mp_rom_obj_tuple_t sdio_data_tuple = { {&mp_type_tuple}, 4, { @@ -22,7 +22,7 @@ STATIC const mp_rom_obj_tuple_t sdio_data_tuple = { // This mapping only includes functional names because pins broken // out on connectors are labeled with their MCU name available from // microcontroller.pin. -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PD08) }, diff --git a/ports/atmel-samd/boards/seeeduino_wio_terminal/pins.c b/ports/atmel-samd/boards/seeeduino_wio_terminal/pins.c index e45e2dd557786..fb908f930d996 100644 --- a/ports/atmel-samd/boards/seeeduino_wio_terminal/pins.c +++ b/ports/atmel-samd/boards/seeeduino_wio_terminal/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS diff --git a/ports/atmel-samd/boards/seeeduino_xiao/pins.c b/ports/atmel-samd/boards/seeeduino_xiao/pins.c index 4da8ef0473506..09a63159597a9 100644 --- a/ports/atmel-samd/boards/seeeduino_xiao/pins.c +++ b/ports/atmel-samd/boards/seeeduino_xiao/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS diff --git a/ports/atmel-samd/boards/seeeduino_xiao_kb/pins.c b/ports/atmel-samd/boards/seeeduino_xiao_kb/pins.c index 4da8ef0473506..09a63159597a9 100644 --- a/ports/atmel-samd/boards/seeeduino_xiao_kb/pins.c +++ b/ports/atmel-samd/boards/seeeduino_xiao_kb/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS diff --git a/ports/atmel-samd/boards/sensebox_mcu/pins.c b/ports/atmel-samd/boards/sensebox_mcu/pins.c index 6a498ef34c428..91e123ea7eb88 100644 --- a/ports/atmel-samd/boards/sensebox_mcu/pins.c +++ b/ports/atmel-samd/boards/sensebox_mcu/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS diff --git a/ports/atmel-samd/boards/serpente/pins.c b/ports/atmel-samd/boards/serpente/pins.c index 3158f5964c9c4..d4b23b3ad78ed 100644 --- a/ports/atmel-samd/boards/serpente/pins.c +++ b/ports/atmel-samd/boards/serpente/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA04) }, diff --git a/ports/atmel-samd/boards/shirtty/pins.c b/ports/atmel-samd/boards/shirtty/pins.c index 0c3f599cac5cc..c1a75b809a2f0 100644 --- a/ports/atmel-samd/boards/shirtty/pins.c +++ b/ports/atmel-samd/boards/shirtty/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA08) }, diff --git a/ports/atmel-samd/boards/silicognition-m4-shim/pins.c b/ports/atmel-samd/boards/silicognition-m4-shim/pins.c index e593c6c45316f..ec564e3cb1c7d 100644 --- a/ports/atmel-samd/boards/silicognition-m4-shim/pins.c +++ b/ports/atmel-samd/boards/silicognition-m4-shim/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/snekboard/pins.c b/ports/atmel-samd/boards/snekboard/pins.c index 2c07e14c4d78d..3fc559cf22433 100644 --- a/ports/atmel-samd/boards/snekboard/pins.c +++ b/ports/atmel-samd/boards/snekboard/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PB08) }, diff --git a/ports/atmel-samd/boards/sparkfun_lumidrive/pins.c b/ports/atmel-samd/boards/sparkfun_lumidrive/pins.c index 3494fb20d742e..65396f228c00c 100755 --- a/ports/atmel-samd/boards/sparkfun_lumidrive/pins.c +++ b/ports/atmel-samd/boards/sparkfun_lumidrive/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PA04) }, diff --git a/ports/atmel-samd/boards/sparkfun_qwiic_micro_no_flash/pins.c b/ports/atmel-samd/boards/sparkfun_qwiic_micro_no_flash/pins.c index 804514ddf24f2..4e2ce7ed24d06 100644 --- a/ports/atmel-samd/boards/sparkfun_qwiic_micro_no_flash/pins.c +++ b/ports/atmel-samd/boards/sparkfun_qwiic_micro_no_flash/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS diff --git a/ports/atmel-samd/boards/sparkfun_qwiic_micro_with_flash/pins.c b/ports/atmel-samd/boards/sparkfun_qwiic_micro_with_flash/pins.c index 804514ddf24f2..4e2ce7ed24d06 100644 --- a/ports/atmel-samd/boards/sparkfun_qwiic_micro_with_flash/pins.c +++ b/ports/atmel-samd/boards/sparkfun_qwiic_micro_with_flash/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS diff --git a/ports/atmel-samd/boards/sparkfun_redboard_turbo/pins.c b/ports/atmel-samd/boards/sparkfun_redboard_turbo/pins.c index 00784c16ce4a6..211d1f0daf313 100755 --- a/ports/atmel-samd/boards/sparkfun_redboard_turbo/pins.c +++ b/ports/atmel-samd/boards/sparkfun_redboard_turbo/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/sparkfun_samd21_dev/pins.c b/ports/atmel-samd/boards/sparkfun_samd21_dev/pins.c index 1e6898b5f45c2..8fd73a307f8ec 100644 --- a/ports/atmel-samd/boards/sparkfun_samd21_dev/pins.c +++ b/ports/atmel-samd/boards/sparkfun_samd21_dev/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS diff --git a/ports/atmel-samd/boards/sparkfun_samd21_mini/pins.c b/ports/atmel-samd/boards/sparkfun_samd21_mini/pins.c index ed068ed1bacb4..f5f46f97fc40a 100644 --- a/ports/atmel-samd/boards/sparkfun_samd21_mini/pins.c +++ b/ports/atmel-samd/boards/sparkfun_samd21_mini/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS diff --git a/ports/atmel-samd/boards/sparkfun_samd51_micromod/pins.c b/ports/atmel-samd/boards/sparkfun_samd51_micromod/pins.c index d79b00223074c..9424ee83debe2 100644 --- a/ports/atmel-samd/boards/sparkfun_samd51_micromod/pins.c +++ b/ports/atmel-samd/boards/sparkfun_samd51_micromod/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // The SparkFun MicroMod spec uses a zero-based peripheral numbering scheme. // The 0th peripheral is the default and the "0" is omitted from the diff --git a/ports/atmel-samd/boards/sparkfun_samd51_thing_plus/pins.c b/ports/atmel-samd/boards/sparkfun_samd51_thing_plus/pins.c index cca6a48817490..f22314676f2ee 100644 --- a/ports/atmel-samd/boards/sparkfun_samd51_thing_plus/pins.c +++ b/ports/atmel-samd/boards/sparkfun_samd51_thing_plus/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/stackrduino_m0_pro/pins.c b/ports/atmel-samd/boards/stackrduino_m0_pro/pins.c index 163697b730a56..287fa853fb820 100644 --- a/ports/atmel-samd/boards/stackrduino_m0_pro/pins.c +++ b/ports/atmel-samd/boards/stackrduino_m0_pro/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/stringcar_m0_express/pins.c b/ports/atmel-samd/boards/stringcar_m0_express/pins.c index bb650ea86d9c6..09a816722ddcb 100644 --- a/ports/atmel-samd/boards/stringcar_m0_express/pins.c +++ b/ports/atmel-samd/boards/stringcar_m0_express/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_PIEZO), MP_ROM_PTR(&pin_PA08) }, diff --git a/ports/atmel-samd/boards/trellis_m4_express/pins.c b/ports/atmel-samd/boards/trellis_m4_express/pins.c index a8c45f09160af..f1277f09e7af7 100644 --- a/ports/atmel-samd/boards/trellis_m4_express/pins.c +++ b/ports/atmel-samd/boards/trellis_m4_express/pins.c @@ -9,7 +9,7 @@ // This mapping only includes functional names because pins broken // out on connectors are labeled with their MCU name available from // microcontroller.pin. -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/trinket_m0/pins.c b/ports/atmel-samd/boards/trinket_m0/pins.c index 7f9e319faa9d9..ac990dc501768 100644 --- a/ports/atmel-samd/boards/trinket_m0/pins.c +++ b/ports/atmel-samd/boards/trinket_m0/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA08) }, diff --git a/ports/atmel-samd/boards/trinket_m0_haxpress/pins.c b/ports/atmel-samd/boards/trinket_m0_haxpress/pins.c index 7f9e319faa9d9..ac990dc501768 100644 --- a/ports/atmel-samd/boards/trinket_m0_haxpress/pins.c +++ b/ports/atmel-samd/boards/trinket_m0_haxpress/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA08) }, diff --git a/ports/atmel-samd/boards/uartlogger2/pins.c b/ports/atmel-samd/boards/uartlogger2/pins.c index b6ce568a49592..bf66e71597a97 100644 --- a/ports/atmel-samd/boards/uartlogger2/pins.c +++ b/ports/atmel-samd/boards/uartlogger2/pins.c @@ -9,7 +9,7 @@ // This mapping only includes functional names because pins broken // out on connectors are labeled with their MCU name available from // microcontroller.pin. -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) }, diff --git a/ports/atmel-samd/boards/uchip/pins.c b/ports/atmel-samd/boards/uchip/pins.c index 4ad74392846ff..edbeed91c82d8 100644 --- a/ports/atmel-samd/boards/uchip/pins.c +++ b/ports/atmel-samd/boards/uchip/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_PA07) }, diff --git a/ports/atmel-samd/boards/ugame10/pins.c b/ports/atmel-samd/boards/ugame10/pins.c index 9cd38dd30ecd3..612640abdf9a9 100644 --- a/ports/atmel-samd/boards/ugame10/pins.c +++ b/ports/atmel-samd/boards/ugame10/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_X), MP_ROM_PTR(&pin_PA00) }, diff --git a/ports/atmel-samd/boards/winterbloom_big_honking_button/pins.c b/ports/atmel-samd/boards/winterbloom_big_honking_button/pins.c index 9daaed174feaf..8ffb17211c98b 100644 --- a/ports/atmel-samd/boards/winterbloom_big_honking_button/pins.c +++ b/ports/atmel-samd/boards/winterbloom_big_honking_button/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_PA07) }, diff --git a/ports/atmel-samd/boards/winterbloom_big_honking_button/usermods/_bhb/bhb.c b/ports/atmel-samd/boards/winterbloom_big_honking_button/usermods/_bhb/bhb.c index b5c162b14dc43..9b8c6b64e99c9 100644 --- a/ports/atmel-samd/boards/winterbloom_big_honking_button/usermods/_bhb/bhb.c +++ b/ports/atmel-samd/boards/winterbloom_big_honking_button/usermods/_bhb/bhb.c @@ -10,9 +10,9 @@ #include "samd/pins.h" #include "sam.h" -STATIC mp_obj_t _bhb_read_adc(void); +static mp_obj_t _bhb_read_adc(void); -STATIC mp_obj_t _bhb_init_adc(void) { +static mp_obj_t _bhb_init_adc(void) { claim_pin(&pin_PB08); common_hal_never_reset_pin(&pin_PB08); @@ -93,7 +93,7 @@ STATIC mp_obj_t _bhb_init_adc(void) { return mp_const_none; } -STATIC mp_obj_t _bhb_read_adc(void) { +static mp_obj_t _bhb_read_adc(void) { /* Wait for bus synchronization. */ while (ADC->STATUS.bit.SYNCBUSY) { } @@ -117,16 +117,16 @@ STATIC mp_obj_t _bhb_read_adc(void) { } -STATIC MP_DEFINE_CONST_FUN_OBJ_0(_bhb_init_adc_obj, _bhb_init_adc); -STATIC MP_DEFINE_CONST_FUN_OBJ_0(_bhb_read_adc_obj, _bhb_read_adc); +static MP_DEFINE_CONST_FUN_OBJ_0(_bhb_init_adc_obj, _bhb_init_adc); +static MP_DEFINE_CONST_FUN_OBJ_0(_bhb_read_adc_obj, _bhb_read_adc); -STATIC const mp_rom_map_elem_t _bhb_module_globals_table[] = { +static const mp_rom_map_elem_t _bhb_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__bhb) }, { MP_ROM_QSTR(MP_QSTR_init_adc), MP_ROM_PTR(&_bhb_init_adc_obj) }, { MP_ROM_QSTR(MP_QSTR_read_adc), MP_ROM_PTR(&_bhb_read_adc_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(_bhb_module_globals, _bhb_module_globals_table); +static MP_DEFINE_CONST_DICT(_bhb_module_globals, _bhb_module_globals_table); const mp_obj_module_t _bhb_user_cmodule = { .base = { &mp_type_module }, diff --git a/ports/atmel-samd/boards/winterbloom_sol/pins.c b/ports/atmel-samd/boards/winterbloom_sol/pins.c index 7a9e1bf1a5787..5a7f24b6ce543 100644 --- a/ports/atmel-samd/boards/winterbloom_sol/pins.c +++ b/ports/atmel-samd/boards/winterbloom_sol/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA17) }, diff --git a/ports/atmel-samd/boards/xinabox_cc03/pins.c b/ports/atmel-samd/boards/xinabox_cc03/pins.c index 7c87d30f8c771..8dc337fbc5b40 100644 --- a/ports/atmel-samd/boards/xinabox_cc03/pins.c +++ b/ports/atmel-samd/boards/xinabox_cc03/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA11) }, diff --git a/ports/atmel-samd/boards/xinabox_cs11/pins.c b/ports/atmel-samd/boards/xinabox_cs11/pins.c index a462ea5ac1d2a..3f70af5309066 100644 --- a/ports/atmel-samd/boards/xinabox_cs11/pins.c +++ b/ports/atmel-samd/boards/xinabox_cs11/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA11) }, diff --git a/ports/atmel-samd/common-hal/alarm/__init__.c b/ports/atmel-samd/common-hal/alarm/__init__.c index 38ad44fb5788d..483aa1a9679ad 100644 --- a/ports/atmel-samd/common-hal/alarm/__init__.c +++ b/ports/atmel-samd/common-hal/alarm/__init__.c @@ -19,7 +19,7 @@ #include "supervisor/port.h" #include "supervisor/workflow.h" -STATIC uint32_t TAMPID = 0; +static uint32_t TAMPID = 0; // Singleton instance of SleepMemory. const alarm_sleep_memory_obj_t alarm_sleep_memory_obj = { @@ -72,7 +72,7 @@ mp_obj_t common_hal_alarm_record_wake_alarm(void) { } // Set up light sleep or deep sleep alarms. -STATIC void _setup_sleep_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms) { +static void _setup_sleep_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms) { alarm_pin_pinalarm_set_alarms(deep_sleep, n_alarms, alarms); alarm_time_timealarm_set_alarms(deep_sleep, n_alarms, alarms); } diff --git a/ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c b/ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c index 9c83d96f3f05e..cd537a66fea84 100644 --- a/ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c +++ b/ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c @@ -18,8 +18,8 @@ // This variable stores whether a PinAlarm woke in light sleep or fake deep sleep // It CANNOT detect if the program woke from deep sleep. -STATIC volatile bool woke_up = false; -STATIC alarm_pin_pinalarm_obj_t *trig_alarm = NULL; +static volatile bool woke_up = false; +static alarm_pin_pinalarm_obj_t *trig_alarm = NULL; // Tamper Pins for deep sleep: IN0:PB00; IN1:PB02; IN2:PA02; IN3:PC00; IN4:PC01; // wakeup from deep sleep seems to be triggered when these pins go from Hi/Lo to Hi-Z state. diff --git a/ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c b/ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c index e8a4bca5c1d9e..7194daf38e50f 100644 --- a/ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c +++ b/ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c @@ -12,8 +12,8 @@ #include "shared-bindings/time/__init__.h" #include "supervisor/port.h" -STATIC volatile bool woke_up = false; -STATIC mp_float_t wakeup_time; +static volatile bool woke_up = false; +static mp_float_t wakeup_time; void common_hal_alarm_time_timealarm_construct(alarm_time_timealarm_obj_t *self, mp_float_t monotonic_time) { // TODO: when issuing light/seep sleep, throw a ValueError if the diff --git a/ports/atmel-samd/common-hal/busio/I2C.c b/ports/atmel-samd/common-hal/busio/I2C.c index d8136c1ef9678..033c74c0a1ab0 100644 --- a/ports/atmel-samd/common-hal/busio/I2C.c +++ b/ports/atmel-samd/common-hal/busio/I2C.c @@ -165,7 +165,7 @@ void common_hal_busio_i2c_unlock(busio_i2c_obj_t *self) { self->has_lock = false; } -STATIC uint8_t _common_hal_busio_i2c_write(busio_i2c_obj_t *self, uint16_t addr, +static uint8_t _common_hal_busio_i2c_write(busio_i2c_obj_t *self, uint16_t addr, const uint8_t *data, size_t len, bool transmit_stop_bit) { uint16_t attempts = ATTEMPTS; diff --git a/ports/atmel-samd/common-hal/canio/CAN.c b/ports/atmel-samd/common-hal/canio/CAN.c index 324345ec9984d..3321d0abdbc84 100644 --- a/ports/atmel-samd/common-hal/canio/CAN.c +++ b/ports/atmel-samd/common-hal/canio/CAN.c @@ -20,12 +20,12 @@ #include "genhdr/candata.h" -STATIC Can *const can_insts[] = CAN_INSTS; +static Can *const can_insts[] = CAN_INSTS; -STATIC canio_can_obj_t *can_objs[MP_ARRAY_SIZE(can_insts)]; +static canio_can_obj_t *can_objs[MP_ARRAY_SIZE(can_insts)]; // This must be placed in the first 64kB of RAM -STATIC COMPILER_SECTION(".canram") canio_can_state_t can_state[MP_ARRAY_SIZE(can_insts)]; +static COMPILER_SECTION(".canram") canio_can_state_t can_state[MP_ARRAY_SIZE(can_insts)]; void common_hal_canio_can_construct(canio_can_obj_t *self, const mcu_pin_obj_t *tx, const mcu_pin_obj_t *rx, int baudrate, bool loopback, bool silent) { mcu_pin_function_t *tx_function = mcu_find_pin_function(can_tx, tx, -1, MP_QSTR_tx); @@ -371,7 +371,7 @@ void common_hal_canio_reset(void) { } -STATIC void can_handler(int i) { +static void can_handler(int i) { canio_can_obj_t *self = can_objs[i]; (void)self; diff --git a/ports/atmel-samd/common-hal/canio/Listener.c b/ports/atmel-samd/common-hal/canio/Listener.c index 2c044ad4af114..23f7710d6cb24 100644 --- a/ports/atmel-samd/common-hal/canio/Listener.c +++ b/ports/atmel-samd/common-hal/canio/Listener.c @@ -19,14 +19,14 @@ #include "supervisor/shared/tick.h" #include "component/can.h" -STATIC void allow_config_change(canio_can_obj_t *can) { +static void allow_config_change(canio_can_obj_t *can) { can->hw->CCCR.bit.INIT = 1; while (!can->hw->CCCR.bit.INIT) { } can->hw->CCCR.bit.CCE = 1; } -STATIC void prevent_config_change(canio_can_obj_t *can) { +static void prevent_config_change(canio_can_obj_t *can) { can->hw->CCCR.bit.CCE = 0; can->hw->CCCR.bit.INIT = 0; while (can->hw->CCCR.bit.INIT) { @@ -34,26 +34,26 @@ STATIC void prevent_config_change(canio_can_obj_t *can) { } __attribute__((unused)) -STATIC void static_assertions(void) { +static void static_assertions(void) { MP_STATIC_ASSERT(CAN_GFC_ANFE_RXF0_Val + 1 == CAN_GFC_ANFE_RXF1_Val); MP_STATIC_ASSERT(CAN_GFC_ANFS_RXF0_Val + 1 == CAN_GFC_ANFS_RXF1_Val); MP_STATIC_ASSERT(CAN_SIDFE_0_SFEC_STF0M_Val + 1 == CAN_SIDFE_0_SFEC_STF1M_Val); MP_STATIC_ASSERT(CAN_XIDFE_0_EFEC_STF0M_Val + 1 == CAN_XIDFE_0_EFEC_STF1M_Val); } -STATIC bool single_id_filter(canio_match_obj_t *match) { +static bool single_id_filter(canio_match_obj_t *match) { return match->mask == 0 || match->mask == match->id; } -STATIC bool standard_filter_in_use(CanMramSidfe *filter) { +static bool standard_filter_in_use(CanMramSidfe *filter) { return filter->SIDFE_0.bit.SFEC != CAN_SIDFE_0_SFEC_DISABLE_Val; } -STATIC bool extended_filter_in_use(CanMramXidfe *filter) { +static bool extended_filter_in_use(CanMramXidfe *filter) { return filter->XIDFE_0.bit.EFEC != CAN_XIDFE_0_EFEC_DISABLE_Val; } -STATIC size_t num_filters_needed(size_t nmatch, canio_match_obj_t **matches, bool extended) { +static size_t num_filters_needed(size_t nmatch, canio_match_obj_t **matches, bool extended) { size_t num_half_filters_needed = 1; for (size_t i = 0; i < nmatch; i++) { if (extended != matches[i]->extended) { @@ -68,7 +68,7 @@ STATIC size_t num_filters_needed(size_t nmatch, canio_match_obj_t **matches, boo return num_half_filters_needed / 2; } -STATIC size_t num_filters_available(canio_can_obj_t *can, bool extended) { +static size_t num_filters_available(canio_can_obj_t *can, bool extended) { size_t available = 0; if (extended) { for (size_t i = 0; i < MP_ARRAY_SIZE(can->state->extended_rx_filter); i++) { @@ -86,7 +86,7 @@ STATIC size_t num_filters_available(canio_can_obj_t *can, bool extended) { return available; } -STATIC void clear_filters(canio_listener_obj_t *self) { +static void clear_filters(canio_listener_obj_t *self) { canio_can_obj_t *can = self->can; int fifo = self->fifo_idx; @@ -115,7 +115,7 @@ STATIC void clear_filters(canio_listener_obj_t *self) { } } -STATIC CanMramXidfe *next_extended_filter(canio_listener_obj_t *self, CanMramXidfe *start) { +static CanMramXidfe *next_extended_filter(canio_listener_obj_t *self, CanMramXidfe *start) { CanMramXidfe *end = &self->can->state->extended_rx_filter[MP_ARRAY_SIZE(self->can->state->extended_rx_filter)]; if (start == NULL) { start = self->can->state->extended_rx_filter; @@ -131,7 +131,7 @@ STATIC CanMramXidfe *next_extended_filter(canio_listener_obj_t *self, CanMramXid return start; } -STATIC CanMramSidfe *next_standard_filter(canio_listener_obj_t *self, CanMramSidfe *start) { +static CanMramSidfe *next_standard_filter(canio_listener_obj_t *self, CanMramSidfe *start) { CanMramSidfe *end = &self->can->state->standard_rx_filter[MP_ARRAY_SIZE(self->can->state->standard_rx_filter)]; if (start == NULL) { start = self->can->state->standard_rx_filter; @@ -147,7 +147,7 @@ STATIC CanMramSidfe *next_standard_filter(canio_listener_obj_t *self, CanMramSid return start; } -STATIC void install_standard_filter(CanMramSidfe *standard, int id1, int id2, int sfec, int sft) { +static void install_standard_filter(CanMramSidfe *standard, int id1, int id2, int sfec, int sft) { assert(standard); CAN_SIDFE_0_Type val = { .bit.SFID1 = id1, @@ -158,7 +158,7 @@ STATIC void install_standard_filter(CanMramSidfe *standard, int id1, int id2, in standard->SIDFE_0 = val; } -STATIC void install_extended_filter(CanMramXidfe *extended, int id1, int id2, int efec, int eft) { +static void install_extended_filter(CanMramXidfe *extended, int id1, int id2, int efec, int eft) { assert(extended); CAN_XIDFE_0_Type val0 = { .bit.EFID1 = id1, @@ -175,7 +175,7 @@ STATIC void install_extended_filter(CanMramXidfe *extended, int id1, int id2, in #define NO_ID (-1) -STATIC void set_filters(canio_listener_obj_t *self, size_t nmatch, canio_match_obj_t **matches) { +static void set_filters(canio_listener_obj_t *self, size_t nmatch, canio_match_obj_t **matches) { int fifo = self->fifo_idx; if (!nmatch) { diff --git a/ports/atmel-samd/common-hal/microcontroller/Pin.c b/ports/atmel-samd/common-hal/microcontroller/Pin.c index 16fce15a594fb..bbf3957818e76 100644 --- a/ports/atmel-samd/common-hal/microcontroller/Pin.c +++ b/ports/atmel-samd/common-hal/microcontroller/Pin.c @@ -26,7 +26,7 @@ bool speaker_enable_in_use; #define SWD_MUX GPIO_PIN_FUNCTION_G #endif -STATIC uint32_t never_reset_pins[PORT_COUNT]; +static uint32_t never_reset_pins[PORT_COUNT]; void reset_all_pins(void) { uint32_t pin_mask[PORT_COUNT] = PORT_OUT_IMPLEMENTED; diff --git a/ports/atmel-samd/common-hal/microcontroller/Processor.c b/ports/atmel-samd/common-hal/microcontroller/Processor.c index dd78c3f7e58f0..95ecde815e6fc 100644 --- a/ports/atmel-samd/common-hal/microcontroller/Processor.c +++ b/ports/atmel-samd/common-hal/microcontroller/Processor.c @@ -75,7 +75,7 @@ // (by computing (a + b/2) / b instead of just a / b) actually didn't help // accuracy anyway. #ifdef SAMD21 -STATIC float calculate_temperature(uint16_t raw_value) { +static float calculate_temperature(uint16_t raw_value) { uint32_t val1; /* Temperature Log Row Content first 32 bits */ uint32_t val2; /* Temperature Log Row Content another 32 bits */ int room_temp_val_int; /* Integer part of room temperature in °C */ @@ -143,10 +143,10 @@ STATIC float calculate_temperature(uint16_t raw_value) { #ifdef SAM_D5X_E5X // Decimal to fraction conversion. (adapted from ASF sample). -STATIC float convert_dec_to_frac(uint8_t val) { +static float convert_dec_to_frac(uint8_t val) { return val / MICROPY_FLOAT_CONST(10.); } -STATIC float calculate_temperature(uint16_t TP, uint16_t TC) { +static float calculate_temperature(uint16_t TP, uint16_t TC) { uint32_t TLI = (*(uint32_t *)FUSES_ROOM_TEMP_VAL_INT_ADDR & FUSES_ROOM_TEMP_VAL_INT_Msk) >> FUSES_ROOM_TEMP_VAL_INT_Pos; uint32_t TLD = (*(uint32_t *)FUSES_ROOM_TEMP_VAL_DEC_ADDR & FUSES_ROOM_TEMP_VAL_DEC_Msk) >> FUSES_ROOM_TEMP_VAL_DEC_Pos; float TL = TLI + convert_dec_to_frac(TLD); diff --git a/ports/atmel-samd/common-hal/microcontroller/__init__.c b/ports/atmel-samd/common-hal/microcontroller/__init__.c index 505cd078e3b29..693b92638cad3 100644 --- a/ports/atmel-samd/common-hal/microcontroller/__init__.c +++ b/ports/atmel-samd/common-hal/microcontroller/__init__.c @@ -93,7 +93,7 @@ watchdog_watchdogtimer_obj_t common_hal_mcu_watchdogtimer_obj = { #endif // This maps MCU pin names to pin objects. -STATIC const mp_rom_map_elem_t mcu_pin_global_dict_table[] = { +static const mp_rom_map_elem_t mcu_pin_global_dict_table[] = { #if defined(PIN_PA00) && !defined(IGNORE_PIN_PA00) { MP_ROM_QSTR(MP_QSTR_PA00), MP_ROM_PTR(&pin_PA00) }, #endif diff --git a/ports/atmel-samd/common-hal/neopixel_write/__init__.c b/ports/atmel-samd/common-hal/neopixel_write/__init__.c index 5599a4b9e25d8..2a5857bfbfc23 100644 --- a/ports/atmel-samd/common-hal/neopixel_write/__init__.c +++ b/ports/atmel-samd/common-hal/neopixel_write/__init__.c @@ -91,7 +91,7 @@ static void neopixel_send_buffer_core(volatile uint32_t *clraddr, uint32_t pinMa ""); } -STATIC uint64_t next_start_raw_ticks = 0; +static uint64_t next_start_raw_ticks = 0; void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout, uint8_t *pixels, uint32_t numBytes) { // This is adapted directly from the Adafruit NeoPixel library SAMD21G18A code: diff --git a/ports/atmel-samd/common-hal/os/__init__.c b/ports/atmel-samd/common-hal/os/__init__.c index 4d3d8d96fa5e0..2c1de431c6635 100644 --- a/ports/atmel-samd/common-hal/os/__init__.c +++ b/ports/atmel-samd/common-hal/os/__init__.c @@ -16,24 +16,24 @@ #include "hal/include/hal_rand_sync.h" #endif -STATIC const qstr os_uname_info_fields[] = { +static const qstr os_uname_info_fields[] = { MP_QSTR_sysname, MP_QSTR_nodename, MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine }; #ifdef SAMD21 -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "samd21"); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "samd21"); +static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "samd21"); +static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "samd21"); #endif #ifdef SAM_D5X_E5X -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "samd51"); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "samd51"); +static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "samd51"); +static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "samd51"); #endif -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME); +static const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING); +static const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE); +static const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME); -STATIC MP_DEFINE_ATTRTUPLE( +static MP_DEFINE_ATTRTUPLE( os_uname_info_obj, os_uname_info_fields, 5, diff --git a/ports/atmel-samd/common-hal/pulseio/PulseOut.c b/ports/atmel-samd/common-hal/pulseio/PulseOut.c index dabc9c02b7a83..a345405533a3e 100644 --- a/ports/atmel-samd/common-hal/pulseio/PulseOut.c +++ b/ports/atmel-samd/common-hal/pulseio/PulseOut.c @@ -39,7 +39,7 @@ static void turn_off(__IO PORT_PINCFG_Type *pincfg) { pincfg->reg = PORT_PINCFG_RESETVALUE; } -STATIC void pulse_finish(void) { +static void pulse_finish(void) { pulse_index++; if (active_pincfg == NULL) { diff --git a/ports/atmel-samd/common-hal/pwmio/PWMOut.c b/ports/atmel-samd/common-hal/pwmio/PWMOut.c index 1b8afbc516a0b..71d6f38d502ad 100644 --- a/ports/atmel-samd/common-hal/pwmio/PWMOut.c +++ b/ports/atmel-samd/common-hal/pwmio/PWMOut.c @@ -49,7 +49,7 @@ static uint8_t tcc_channel(const pin_timer_t *t) { return t->wave_output % tcc_cc_num[t->index]; } -STATIC bool channel_ok(const pin_timer_t *t) { +static bool channel_ok(const pin_timer_t *t) { uint8_t channel_bit = 1 << tcc_channel(t); return (!t->is_tc && ((tcc_channels[t->index] & channel_bit) == 0)) || t->is_tc; diff --git a/ports/atmel-samd/common-hal/sdioio/SDCard.c b/ports/atmel-samd/common-hal/sdioio/SDCard.c index e5a02bd29c992..071aada4962ac 100644 --- a/ports/atmel-samd/common-hal/sdioio/SDCard.c +++ b/ports/atmel-samd/common-hal/sdioio/SDCard.c @@ -148,23 +148,23 @@ uint8_t common_hal_sdioio_sdcard_get_width(sdioio_sdcard_obj_t *self) { return self->num_data; // self->width; } -STATIC void check_for_deinit(sdioio_sdcard_obj_t *self) { +static void check_for_deinit(sdioio_sdcard_obj_t *self) { } -STATIC void check_whole_block(mp_buffer_info_t *bufinfo) { +static void check_whole_block(mp_buffer_info_t *bufinfo) { if (bufinfo->len % 512) { mp_raise_ValueError(MP_ERROR_TEXT("Buffer length must be a multiple of 512")); } } -STATIC void wait_write_complete(sdioio_sdcard_obj_t *self) { +static void wait_write_complete(sdioio_sdcard_obj_t *self) { if (self->state_programming) { sd_mmc_wait_end_of_write_blocks(0); self->state_programming = 0; } } -STATIC void debug_print_state(sdioio_sdcard_obj_t *self, const char *what, sd_mmc_err_t r) { +static void debug_print_state(sdioio_sdcard_obj_t *self, const char *what, sd_mmc_err_t r) { #if DEBUG_SDIO DEBUG_PRINT("%s: %d\n", what, r); #endif diff --git a/ports/atmel-samd/supervisor/internal_flash.c b/ports/atmel-samd/supervisor/internal_flash.c index 02ad1cb4f7f32..af821e3b4d0d9 100644 --- a/ports/atmel-samd/supervisor/internal_flash.c +++ b/ports/atmel-samd/supervisor/internal_flash.c @@ -67,7 +67,7 @@ static int32_t convert_block_to_flash_addr(uint32_t block) { return -1; } -STATIC bool supervisor_flash_read_block(uint8_t *dest, uint32_t block) { +static bool supervisor_flash_read_block(uint8_t *dest, uint32_t block) { // non-MBR block, get data from flash memory int32_t src = convert_block_to_flash_addr(block); if (src == -1) { @@ -78,7 +78,7 @@ STATIC bool supervisor_flash_read_block(uint8_t *dest, uint32_t block) { return error_code == ERR_NONE; } -STATIC bool supervisor_flash_write_block(const uint8_t *src, uint32_t block) { +static bool supervisor_flash_write_block(const uint8_t *src, uint32_t block) { // non-MBR block, copy to cache int32_t dest = convert_block_to_flash_addr(block); if (dest == -1) { diff --git a/ports/broadcom/bindings/videocore/Framebuffer.c b/ports/broadcom/bindings/videocore/Framebuffer.c index 9c2278400930c..f5d8ab8d34b38 100644 --- a/ports/broadcom/bindings/videocore/Framebuffer.c +++ b/ports/broadcom/bindings/videocore/Framebuffer.c @@ -27,7 +27,7 @@ //| A Framebuffer is often used in conjunction with a //| `framebufferio.FramebufferDisplay`.""" -STATIC mp_obj_t videocore_framebuffer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t videocore_framebuffer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_width, ARG_height, }; static const mp_arg_t allowed_args[] = { { MP_QSTR_width, MP_ARG_INT | MP_ARG_REQUIRED }, @@ -51,13 +51,13 @@ STATIC mp_obj_t videocore_framebuffer_make_new(const mp_obj_type_t *type, size_t //| rgbmatrix instance. After deinitialization, no further operations //| may be performed.""" //| ... -STATIC mp_obj_t videocore_framebuffer_deinit(mp_obj_t self_in) { +static mp_obj_t videocore_framebuffer_deinit(mp_obj_t self_in) { videocore_framebuffer_obj_t *self = (videocore_framebuffer_obj_t *)self_in; common_hal_videocore_framebuffer_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(videocore_framebuffer_deinit_obj, videocore_framebuffer_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(videocore_framebuffer_deinit_obj, videocore_framebuffer_deinit); static void check_for_deinit(videocore_framebuffer_obj_t *self) { if (common_hal_videocore_framebuffer_deinited(self)) { @@ -67,7 +67,7 @@ static void check_for_deinit(videocore_framebuffer_obj_t *self) { //| width: int //| """The width of the display, in pixels""" -STATIC mp_obj_t videocore_framebuffer_get_width(mp_obj_t self_in) { +static mp_obj_t videocore_framebuffer_get_width(mp_obj_t self_in) { videocore_framebuffer_obj_t *self = (videocore_framebuffer_obj_t *)self_in; check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_videocore_framebuffer_get_width(self)); @@ -79,7 +79,7 @@ MP_PROPERTY_GETTER(videocore_framebuffer_width_obj, //| height: int //| """The height of the display, in pixels""" //| -STATIC mp_obj_t videocore_framebuffer_get_height(mp_obj_t self_in) { +static mp_obj_t videocore_framebuffer_get_height(mp_obj_t self_in) { videocore_framebuffer_obj_t *self = (videocore_framebuffer_obj_t *)self_in; check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_videocore_framebuffer_get_height(self)); @@ -89,54 +89,54 @@ MP_DEFINE_CONST_FUN_OBJ_1(videocore_framebuffer_get_height_obj, videocore_frameb MP_PROPERTY_GETTER(videocore_framebuffer_height_obj, (mp_obj_t)&videocore_framebuffer_get_height_obj); -STATIC const mp_rom_map_elem_t videocore_framebuffer_locals_dict_table[] = { +static const mp_rom_map_elem_t videocore_framebuffer_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&videocore_framebuffer_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&videocore_framebuffer_width_obj) }, { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&videocore_framebuffer_height_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(videocore_framebuffer_locals_dict, videocore_framebuffer_locals_dict_table); +static MP_DEFINE_CONST_DICT(videocore_framebuffer_locals_dict, videocore_framebuffer_locals_dict_table); -STATIC void videocore_framebuffer_get_bufinfo(mp_obj_t self_in, mp_buffer_info_t *bufinfo) { +static void videocore_framebuffer_get_bufinfo(mp_obj_t self_in, mp_buffer_info_t *bufinfo) { common_hal_videocore_framebuffer_get_buffer(self_in, bufinfo, 0); } // These versions exist so that the prototype matches the protocol, // avoiding a type cast that can hide errors -STATIC void videocore_framebuffer_swapbuffers(mp_obj_t self_in, uint8_t *dirty_row_bitmap) { +static void videocore_framebuffer_swapbuffers(mp_obj_t self_in, uint8_t *dirty_row_bitmap) { (void)dirty_row_bitmap; common_hal_videocore_framebuffer_refresh(self_in); } -STATIC void videocore_framebuffer_deinit_proto(mp_obj_t self_in) { +static void videocore_framebuffer_deinit_proto(mp_obj_t self_in) { common_hal_videocore_framebuffer_deinit(self_in); } -STATIC int videocore_framebuffer_get_width_proto(mp_obj_t self_in) { +static int videocore_framebuffer_get_width_proto(mp_obj_t self_in) { return common_hal_videocore_framebuffer_get_width(self_in); } -STATIC int videocore_framebuffer_get_height_proto(mp_obj_t self_in) { +static int videocore_framebuffer_get_height_proto(mp_obj_t self_in) { return common_hal_videocore_framebuffer_get_height(self_in); } -STATIC int videocore_framebuffer_get_color_depth_proto(mp_obj_t self_in) { +static int videocore_framebuffer_get_color_depth_proto(mp_obj_t self_in) { return 32; } -STATIC int videocore_framebuffer_get_bytes_per_cell_proto(mp_obj_t self_in) { +static int videocore_framebuffer_get_bytes_per_cell_proto(mp_obj_t self_in) { return 1; } -STATIC int videocore_framebuffer_get_native_frames_per_second_proto(mp_obj_t self_in) { +static int videocore_framebuffer_get_native_frames_per_second_proto(mp_obj_t self_in) { return 30; } -STATIC int videocore_framebuffer_get_row_stride_proto(mp_obj_t self_in) { +static int videocore_framebuffer_get_row_stride_proto(mp_obj_t self_in) { return common_hal_videocore_framebuffer_get_row_stride(self_in); } -STATIC const framebuffer_p_t videocore_framebuffer_proto = { +static const framebuffer_p_t videocore_framebuffer_proto = { MP_PROTO_IMPLEMENT(MP_QSTR_protocol_framebuffer) .get_bufinfo = videocore_framebuffer_get_bufinfo, .get_width = videocore_framebuffer_get_width_proto, diff --git a/ports/broadcom/bindings/videocore/__init__.c b/ports/broadcom/bindings/videocore/__init__.c index 34cee303af405..3c83ba2ac7837 100644 --- a/ports/broadcom/bindings/videocore/__init__.c +++ b/ports/broadcom/bindings/videocore/__init__.c @@ -13,12 +13,12 @@ //| """Low-level routines for interacting with the Broadcom VideoCore GPU""" -STATIC const mp_rom_map_elem_t videocore_module_globals_table[] = { +static const mp_rom_map_elem_t videocore_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_videocore) }, { MP_ROM_QSTR(MP_QSTR_Framebuffer), MP_ROM_PTR(&videocore_framebuffer_type) }, }; -STATIC MP_DEFINE_CONST_DICT(videocore_module_globals, videocore_module_globals_table); +static MP_DEFINE_CONST_DICT(videocore_module_globals, videocore_module_globals_table); const mp_obj_module_t videocore_module = { .base = { &mp_type_module }, diff --git a/ports/broadcom/boards/diodes_delight_piunora/pins.c b/ports/broadcom/boards/diodes_delight_piunora/pins.c index ea410bf247ebd..27bbe93e1eeca 100644 --- a/ports/broadcom/boards/diodes_delight_piunora/pins.c +++ b/ports/broadcom/boards/diodes_delight_piunora/pins.c @@ -8,7 +8,7 @@ #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_global_dict_table[] = { +static const mp_rom_map_elem_t board_global_dict_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GPIO5), MP_ROM_PTR(&pin_GPIO5) }, diff --git a/ports/broadcom/boards/raspberrypi_cm4/pins.c b/ports/broadcom/boards/raspberrypi_cm4/pins.c index 0d1e8e4abeb8e..83f781eea97ac 100644 --- a/ports/broadcom/boards/raspberrypi_cm4/pins.c +++ b/ports/broadcom/boards/raspberrypi_cm4/pins.c @@ -8,7 +8,7 @@ #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_global_dict_table[] = { +static const mp_rom_map_elem_t board_global_dict_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // These match the names used in the CM4 datasheet diff --git a/ports/broadcom/boards/raspberrypi_cm4io/pins.c b/ports/broadcom/boards/raspberrypi_cm4io/pins.c index 7c40a17369b2b..d9666eafda321 100644 --- a/ports/broadcom/boards/raspberrypi_cm4io/pins.c +++ b/ports/broadcom/boards/raspberrypi_cm4io/pins.c @@ -8,7 +8,7 @@ #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_global_dict_table[] = { +static const mp_rom_map_elem_t board_global_dict_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // These match the names used in Blinka diff --git a/ports/broadcom/boards/raspberrypi_pi4b/pins.c b/ports/broadcom/boards/raspberrypi_pi4b/pins.c index 7c40a17369b2b..d9666eafda321 100644 --- a/ports/broadcom/boards/raspberrypi_pi4b/pins.c +++ b/ports/broadcom/boards/raspberrypi_pi4b/pins.c @@ -8,7 +8,7 @@ #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_global_dict_table[] = { +static const mp_rom_map_elem_t board_global_dict_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // These match the names used in Blinka diff --git a/ports/broadcom/boards/raspberrypi_zero/pins.c b/ports/broadcom/boards/raspberrypi_zero/pins.c index 362675216b43b..4b3cf22813585 100644 --- a/ports/broadcom/boards/raspberrypi_zero/pins.c +++ b/ports/broadcom/boards/raspberrypi_zero/pins.c @@ -8,7 +8,7 @@ #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_global_dict_table[] = { +static const mp_rom_map_elem_t board_global_dict_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // These match the names used in Blinka { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/broadcom/boards/raspberrypi_zero2w/pins.c b/ports/broadcom/boards/raspberrypi_zero2w/pins.c index 77295b2152fee..1d8f247487e63 100644 --- a/ports/broadcom/boards/raspberrypi_zero2w/pins.c +++ b/ports/broadcom/boards/raspberrypi_zero2w/pins.c @@ -8,7 +8,7 @@ #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_global_dict_table[] = { +static const mp_rom_map_elem_t board_global_dict_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // These match the names used in Blinka { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/broadcom/boards/raspberrypi_zero_w/pins.c b/ports/broadcom/boards/raspberrypi_zero_w/pins.c index 362675216b43b..4b3cf22813585 100644 --- a/ports/broadcom/boards/raspberrypi_zero_w/pins.c +++ b/ports/broadcom/boards/raspberrypi_zero_w/pins.c @@ -8,7 +8,7 @@ #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_global_dict_table[] = { +static const mp_rom_map_elem_t board_global_dict_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // These match the names used in Blinka { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/broadcom/common-hal/busio/I2C.c b/ports/broadcom/common-hal/busio/I2C.c index c0e40a681120c..19f346595f738 100644 --- a/ports/broadcom/common-hal/busio/I2C.c +++ b/ports/broadcom/common-hal/busio/I2C.c @@ -17,14 +17,14 @@ #if BCM_VERSION == 2711 #define NUM_I2C (8) -STATIC BSC0_Type *i2c[NUM_I2C] = {BSC0, BSC1, NULL, BSC3, BSC4, BSC5, BSC6, NULL}; +static BSC0_Type *i2c[NUM_I2C] = {BSC0, BSC1, NULL, BSC3, BSC4, BSC5, BSC6, NULL}; #else #define NUM_I2C (3) -STATIC BSC0_Type *i2c[NUM_I2C] = {BSC0, BSC1, NULL}; +static BSC0_Type *i2c[NUM_I2C] = {BSC0, BSC1, NULL}; #endif -STATIC bool never_reset_i2c[NUM_I2C]; -STATIC bool i2c_in_use[NUM_I2C]; +static bool never_reset_i2c[NUM_I2C]; +static bool i2c_in_use[NUM_I2C]; void reset_i2c(void) { // BSC2 is dedicated to the first HDMI output. @@ -127,7 +127,7 @@ void common_hal_busio_i2c_unlock(busio_i2c_obj_t *self) { // Discussion of I2C implementation is here: https://github.com/raspberrypi/linux/issues/254 -STATIC uint8_t _common_hal_busio_i2c_write(busio_i2c_obj_t *self, uint16_t addr, +static uint8_t _common_hal_busio_i2c_write(busio_i2c_obj_t *self, uint16_t addr, const uint8_t *data, size_t len, bool transmit_stop_bit) { COMPLETE_MEMORY_READS; self->peripheral->S_b.DONE = true; diff --git a/ports/broadcom/common-hal/busio/SPI.c b/ports/broadcom/common-hal/busio/SPI.c index 5169470de84b3..f573d7b032991 100644 --- a/ports/broadcom/common-hal/busio/SPI.c +++ b/ports/broadcom/common-hal/busio/SPI.c @@ -22,16 +22,16 @@ #if BCM_VERSION == 2711 #define NUM_SPI (7) -STATIC SPI0_Type *spi[NUM_SPI] = {SPI0, NULL, NULL, SPI3, SPI4, SPI5, SPI6}; -STATIC SPI1_Type *aux_spi[NUM_SPI] = {NULL, SPI1, SPI2, NULL, NULL, NULL, NULL}; +static SPI0_Type *spi[NUM_SPI] = {SPI0, NULL, NULL, SPI3, SPI4, SPI5, SPI6}; +static SPI1_Type *aux_spi[NUM_SPI] = {NULL, SPI1, SPI2, NULL, NULL, NULL, NULL}; #else #define NUM_SPI (3) -STATIC SPI0_Type *spi[NUM_SPI] = {SPI0, NULL, NULL}; -STATIC SPI1_Type *aux_spi[NUM_SPI] = {NULL, SPI1, SPI2}; +static SPI0_Type *spi[NUM_SPI] = {SPI0, NULL, NULL}; +static SPI1_Type *aux_spi[NUM_SPI] = {NULL, SPI1, SPI2}; #endif -STATIC bool never_reset_spi[NUM_SPI]; -STATIC bool spi_in_use[NUM_SPI]; +static bool never_reset_spi[NUM_SPI]; +static bool spi_in_use[NUM_SPI]; void reset_spi(void) { for (size_t i = 0; i < NUM_SPI; i++) { @@ -216,7 +216,7 @@ void common_hal_busio_spi_unlock(busio_spi_obj_t *self) { self->has_lock = false; } -STATIC void _spi_transfer(SPI0_Type *p, +static void _spi_transfer(SPI0_Type *p, const uint8_t *data_out, size_t out_len, uint8_t *data_in, size_t in_len) { size_t len = MAX(out_len, in_len); @@ -252,7 +252,7 @@ STATIC void _spi_transfer(SPI0_Type *p, COMPLETE_MEMORY_READS; } -STATIC void _aux_spi_transfer(SPI1_Type *p, +static void _aux_spi_transfer(SPI1_Type *p, const uint8_t *data_out, size_t out_len, uint8_t *data_in, size_t in_len) { size_t len = MAX(out_len, in_len); diff --git a/ports/broadcom/common-hal/busio/UART.c b/ports/broadcom/common-hal/busio/UART.c index a5dc2732b6989..55c890475eb65 100644 --- a/ports/broadcom/common-hal/busio/UART.c +++ b/ports/broadcom/common-hal/busio/UART.c @@ -24,10 +24,10 @@ // UART1 is a different peripheral than the rest so it is hardcoded below. #if BCM_VERSION == 2711 #define NUM_UART (6) -STATIC ARM_UART_PL011_Type *uart[NUM_UART] = {UART0, NULL, UART2, UART3, UART4, UART5}; +static ARM_UART_PL011_Type *uart[NUM_UART] = {UART0, NULL, UART2, UART3, UART4, UART5}; #else #define NUM_UART (2) -STATIC ARM_UART_PL011_Type *uart[NUM_UART] = {UART0, NULL}; +static ARM_UART_PL011_Type *uart[NUM_UART] = {UART0, NULL}; #endif typedef enum { @@ -67,7 +67,7 @@ void reset_uart(void) { } } -STATIC void fetch_all_from_fifo(busio_uart_obj_t *self) { +static void fetch_all_from_fifo(busio_uart_obj_t *self) { if (self->uart_id == 1) { while (UART1->STAT_b.DATA_READY && ringbuf_num_empty(&self->ringbuf) > 0) { int c = UART1->IO_b.DATA; @@ -359,13 +359,13 @@ size_t common_hal_busio_uart_write(busio_uart_obj_t *self, const uint8_t *data, return len; } -STATIC void disable_interrupt(busio_uart_obj_t *self) { +static void disable_interrupt(busio_uart_obj_t *self) { if (self->uart_id == 1) { UART1->IER_b.DATA_READY = false; } } -STATIC void enable_interrupt(busio_uart_obj_t *self) { +static void enable_interrupt(busio_uart_obj_t *self) { if (self->uart_id == 1) { UART1->IER_b.DATA_READY = true; } diff --git a/ports/broadcom/common-hal/microcontroller/Pin.c b/ports/broadcom/common-hal/microcontroller/Pin.c index 758256f21cf40..be5c0ff621088 100644 --- a/ports/broadcom/common-hal/microcontroller/Pin.c +++ b/ports/broadcom/common-hal/microcontroller/Pin.c @@ -8,8 +8,8 @@ #include "peripherals/broadcom/gpio.h" -STATIC bool pin_in_use[BCM_PIN_COUNT]; -STATIC bool never_reset_pin[BCM_PIN_COUNT]; +static bool pin_in_use[BCM_PIN_COUNT]; +static bool never_reset_pin[BCM_PIN_COUNT]; void reset_all_pins(void) { for (size_t i = 0; i < BCM_PIN_COUNT; i++) { diff --git a/ports/broadcom/common-hal/os/__init__.c b/ports/broadcom/common-hal/os/__init__.c index eaf402deb14df..72a9a07e9077e 100644 --- a/ports/broadcom/common-hal/os/__init__.c +++ b/ports/broadcom/common-hal/os/__init__.c @@ -10,19 +10,19 @@ #include "py/objtuple.h" #include "py/qstr.h" -STATIC const qstr os_uname_info_fields[] = { +static const qstr os_uname_info_fields[] = { MP_QSTR_sysname, MP_QSTR_nodename, MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine }; -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, MICROPY_HW_MCU_NAME); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, MICROPY_HW_MCU_NAME); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME); +static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, MICROPY_HW_MCU_NAME); +static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, MICROPY_HW_MCU_NAME); +static const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING); +static const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE); +static const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME); -STATIC MP_DEFINE_ATTRTUPLE( +static MP_DEFINE_ATTRTUPLE( os_uname_info_obj, os_uname_info_fields, 5, diff --git a/ports/broadcom/common-hal/sdioio/SDCard.c b/ports/broadcom/common-hal/sdioio/SDCard.c index cd523ff4373f8..f87d40cd8dcab 100644 --- a/ports/broadcom/common-hal/sdioio/SDCard.c +++ b/ports/broadcom/common-hal/sdioio/SDCard.c @@ -27,12 +27,12 @@ void osal_task_delay(uint32_t msec) { } /*!< Host function to initialize the driver */ -STATIC sdmmc_err_t _init(void) { +static sdmmc_err_t _init(void) { return SDMMC_OK; } /*!< host function to set bus width */ -STATIC sdmmc_err_t _set_bus_width(int slot, size_t width) { +static sdmmc_err_t _set_bus_width(int slot, size_t width) { if (width == 4) { EMMC->CONTROL0_b.HCTL_DWIDTH = true; } else if (width == 8) { @@ -42,12 +42,12 @@ STATIC sdmmc_err_t _set_bus_width(int slot, size_t width) { } /*!< host function to get the maximum bus width of a particular slot */ -STATIC size_t _get_bus_width(int slot) { +static size_t _get_bus_width(int slot) { return 4; } /*!< host function to set card clock frequency */ -STATIC sdmmc_err_t _set_card_clk(int slot, uint32_t freq_khz) { +static sdmmc_err_t _set_card_clk(int slot, uint32_t freq_khz) { uint32_t base_clock = 125000000; uint32_t frequency = freq_khz * 1000; uint64_t start_ticks = port_get_raw_ticks(NULL); @@ -85,7 +85,7 @@ STATIC sdmmc_err_t _set_card_clk(int slot, uint32_t freq_khz) { } /*!< host function to do a transaction */ -STATIC sdmmc_err_t _do_transaction(int slot, sdmmc_command_t *cmdinfo) { +static sdmmc_err_t _do_transaction(int slot, sdmmc_command_t *cmdinfo) { if (EMMC->STATUS_b.CMD_INHIBIT) { return SDMMC_ERR_BUSY; } @@ -204,7 +204,7 @@ STATIC sdmmc_err_t _do_transaction(int slot, sdmmc_command_t *cmdinfo) { } /*!< host function to deinitialize the driver, called with the `slot` */ -STATIC sdmmc_err_t _deinit(int slot) { +static sdmmc_err_t _deinit(int slot) { return SDMMC_OK; } @@ -298,7 +298,7 @@ uint8_t common_hal_sdioio_sdcard_get_width(sdioio_sdcard_obj_t *self) { return self->num_data; } -STATIC void check_whole_block(mp_buffer_info_t *bufinfo) { +static void check_whole_block(mp_buffer_info_t *bufinfo) { if (bufinfo->len % 512) { mp_raise_ValueError(MP_ERROR_TEXT("Buffer length must be a multiple of 512")); } diff --git a/ports/broadcom/supervisor/internal_flash.c b/ports/broadcom/supervisor/internal_flash.c index 0fa8f1e157ae4..2e75154ea3593 100644 --- a/ports/broadcom/supervisor/internal_flash.c +++ b/ports/broadcom/supervisor/internal_flash.c @@ -12,12 +12,12 @@ #include "shared-bindings/digitalio/DigitalInOut.h" #include "shared-bindings/sdioio/SDCard.h" -STATIC sdioio_sdcard_obj_t sd; +static sdioio_sdcard_obj_t sd; -STATIC uint32_t first_lba = 0; -STATIC uint32_t sector_count = 0; +static uint32_t first_lba = 0; +static uint32_t sector_count = 0; -STATIC bool inited = false; +static bool inited = false; void supervisor_flash_init(void) { if (inited) { diff --git a/ports/broadcom/supervisor/port.c b/ports/broadcom/supervisor/port.c index 6a936586995db..33b20b7c8647a 100644 --- a/ports/broadcom/supervisor/port.c +++ b/ports/broadcom/supervisor/port.c @@ -35,7 +35,7 @@ extern volatile bool mp_msc_enabled; -STATIC uint32_t board_revision; +static uint32_t board_revision; safe_mode_t port_init(void) { board_revision = vcmailbox_get_board_revision(); diff --git a/ports/cxd56/boards/spresense/pins.c b/ports/cxd56/boards/spresense/pins.c index a552307e268f2..48a7ce209769d 100644 --- a/ports/cxd56/boards/spresense/pins.c +++ b/ports/cxd56/boards/spresense/pins.c @@ -8,7 +8,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_obj_tuple_t sdio_data_tuple = { +static const mp_rom_obj_tuple_t sdio_data_tuple = { {&mp_type_tuple}, 4, { @@ -19,7 +19,7 @@ STATIC const mp_rom_obj_tuple_t sdio_data_tuple = { } }; -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_UART2_RXD) }, diff --git a/ports/cxd56/common-hal/analogio/AnalogIn.c b/ports/cxd56/common-hal/analogio/AnalogIn.c index ca27afe83f78e..b124f1bac8013 100644 --- a/ports/cxd56/common-hal/analogio/AnalogIn.c +++ b/ports/cxd56/common-hal/analogio/AnalogIn.c @@ -22,7 +22,7 @@ typedef struct { int fd; } analogin_dev_t; -STATIC analogin_dev_t analogin_dev[] = { +static analogin_dev_t analogin_dev[] = { {"/dev/lpadc0", &pin_LPADC0, -1}, {"/dev/lpadc1", &pin_LPADC1, -1}, {"/dev/lpadc2", &pin_LPADC2, -1}, diff --git a/ports/cxd56/common-hal/busio/I2C.c b/ports/cxd56/common-hal/busio/I2C.c index ca7e4476c3e22..4cfa3f8467df7 100644 --- a/ports/cxd56/common-hal/busio/I2C.c +++ b/ports/cxd56/common-hal/busio/I2C.c @@ -78,7 +78,7 @@ bool common_hal_busio_i2c_probe(busio_i2c_obj_t *self, uint8_t addr) { return I2C_TRANSFER(self->i2c_dev, &msg, 1) < 0 ? false : true; } -STATIC uint8_t _common_hal_busio_i2c_write(busio_i2c_obj_t *self, uint16_t address, const uint8_t *data, size_t len, bool stop) { +static uint8_t _common_hal_busio_i2c_write(busio_i2c_obj_t *self, uint16_t address, const uint8_t *data, size_t len, bool stop) { struct i2c_msg_s msg; msg.frequency = self->frequency; diff --git a/ports/cxd56/common-hal/busio/UART.c b/ports/cxd56/common-hal/busio/UART.c index 12325d94cba3e..0b6a5dbd622eb 100644 --- a/ports/cxd56/common-hal/busio/UART.c +++ b/ports/cxd56/common-hal/busio/UART.c @@ -29,7 +29,7 @@ typedef struct { int fd; } busio_uart_dev_t; -STATIC busio_uart_dev_t busio_uart_dev[] = { +static busio_uart_dev_t busio_uart_dev[] = { {"/dev/ttyS2", &pin_UART2_TXD, &pin_UART2_RXD, -1}, }; diff --git a/ports/cxd56/common-hal/camera/Camera.c b/ports/cxd56/common-hal/camera/Camera.c index 239460ab07ea5..c3c935a168d42 100644 --- a/ports/cxd56/common-hal/camera/Camera.c +++ b/ports/cxd56/common-hal/camera/Camera.c @@ -20,14 +20,14 @@ typedef struct { int fd; } camera_dev_t; -STATIC camera_dev_t camera_dev = {"/dev/video", -1}; +static camera_dev_t camera_dev = {"/dev/video", -1}; typedef struct { uint16_t width; uint16_t height; } image_size_t; -STATIC const image_size_t isx012_image_size_table[] = { +static const image_size_t isx012_image_size_table[] = { { VIDEO_HSIZE_QVGA, VIDEO_VSIZE_QVGA }, { VIDEO_HSIZE_VGA, VIDEO_VSIZE_VGA }, { VIDEO_HSIZE_HD, VIDEO_VSIZE_HD }, @@ -37,7 +37,7 @@ STATIC const image_size_t isx012_image_size_table[] = { { VIDEO_HSIZE_5M, VIDEO_VSIZE_5M }, }; -STATIC const image_size_t isx019_image_size_table[] = { +static const image_size_t isx019_image_size_table[] = { { VIDEO_HSIZE_QVGA, VIDEO_VSIZE_QVGA }, { VIDEO_HSIZE_VGA, VIDEO_VSIZE_VGA }, { VIDEO_HSIZE_HD, VIDEO_VSIZE_HD }, diff --git a/ports/cxd56/common-hal/gnss/GNSS.c b/ports/cxd56/common-hal/gnss/GNSS.c index bb16b1ad822e8..c33202349350a 100644 --- a/ports/cxd56/common-hal/gnss/GNSS.c +++ b/ports/cxd56/common-hal/gnss/GNSS.c @@ -18,7 +18,7 @@ typedef struct { int fd; } gnss_dev_t; -STATIC gnss_dev_t gnss_dev = {"/dev/gps", -1}; +static gnss_dev_t gnss_dev = {"/dev/gps", -1}; static gnss_positionfix_t fix_to_positionfix_type(uint8_t fix) { switch (fix) { diff --git a/ports/cxd56/common-hal/microcontroller/Pin.c b/ports/cxd56/common-hal/microcontroller/Pin.c index 5ac185d7cc226..0f9d6b1f3bd82 100644 --- a/ports/cxd56/common-hal/microcontroller/Pin.c +++ b/ports/cxd56/common-hal/microcontroller/Pin.c @@ -65,7 +65,7 @@ const mcu_pin_obj_t pin_LPADC3 = PIN(3, true); const mcu_pin_obj_t pin_HPADC0 = PIN(4, true); const mcu_pin_obj_t pin_HPADC1 = PIN(5, true); -STATIC pin_status_t pins[] = { +static pin_status_t pins[] = { { &pin_UART2_RXD, true, true }, { &pin_UART2_TXD, true, true }, { &pin_HIF_IRQ_OUT, true, true }, diff --git a/ports/cxd56/common-hal/microcontroller/__init__.c b/ports/cxd56/common-hal/microcontroller/__init__.c index 9240d7309d9b5..fa872f2807ba0 100644 --- a/ports/cxd56/common-hal/microcontroller/__init__.c +++ b/ports/cxd56/common-hal/microcontroller/__init__.c @@ -63,7 +63,7 @@ void common_hal_mcu_reset(void) { boardctl(BOARDIOC_RESET, 0); } -STATIC const mp_rom_map_elem_t mcu_pin_globals_table[] = { +static const mp_rom_map_elem_t mcu_pin_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_UART2_RXD), MP_ROM_PTR(&pin_UART2_RXD) }, { MP_ROM_QSTR(MP_QSTR_UART2_TXD), MP_ROM_PTR(&pin_UART2_TXD) }, { MP_ROM_QSTR(MP_QSTR_HIF_IRQ_OUT), MP_ROM_PTR(&pin_HIF_IRQ_OUT) }, diff --git a/ports/cxd56/common-hal/os/__init__.c b/ports/cxd56/common-hal/os/__init__.c index 0cb374f60aa63..7d211b3a79d06 100644 --- a/ports/cxd56/common-hal/os/__init__.c +++ b/ports/cxd56/common-hal/os/__init__.c @@ -10,18 +10,18 @@ #include "py/objstr.h" #include "py/objtuple.h" -STATIC const qstr os_uname_info_fields[] = { +static const qstr os_uname_info_fields[] = { MP_QSTR_sysname, MP_QSTR_nodename, MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine }; -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "spresense"); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "spresense"); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME); +static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "spresense"); +static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "spresense"); +static const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING); +static const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE); +static const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME); -STATIC MP_DEFINE_ATTRTUPLE( +static MP_DEFINE_ATTRTUPLE( os_uname_info_obj, os_uname_info_fields, 5, diff --git a/ports/cxd56/common-hal/pwmio/PWMOut.c b/ports/cxd56/common-hal/pwmio/PWMOut.c index ee87f2ce71b05..f754858f306d9 100644 --- a/ports/cxd56/common-hal/pwmio/PWMOut.c +++ b/ports/cxd56/common-hal/pwmio/PWMOut.c @@ -19,7 +19,7 @@ typedef struct { bool reset; } pwmout_dev_t; -STATIC pwmout_dev_t pwmout_dev[] = { +static pwmout_dev_t pwmout_dev[] = { {"/dev/pwm0", &pin_PWM0, -1, true}, {"/dev/pwm1", &pin_PWM1, -1, true}, {"/dev/pwm2", &pin_PWM2, -1, true}, diff --git a/ports/cxd56/common-hal/sdioio/SDCard.c b/ports/cxd56/common-hal/sdioio/SDCard.c index 5497ea152deac..05cc0fa1efe9a 100644 --- a/ports/cxd56/common-hal/sdioio/SDCard.c +++ b/ports/cxd56/common-hal/sdioio/SDCard.c @@ -89,7 +89,7 @@ uint32_t common_hal_sdioio_sdcard_get_count(sdioio_sdcard_obj_t *self) { return self->count; } -STATIC void check_whole_block(mp_buffer_info_t *bufinfo) { +static void check_whole_block(mp_buffer_info_t *bufinfo) { if (bufinfo->len % 512) { mp_raise_ValueError(MP_ERROR_TEXT("Buffer length must be a multiple of 512")); } diff --git a/ports/espressif/bindings/espcamera/Camera.c b/ports/espressif/bindings/espcamera/Camera.c index 9e3c6d9c78513..69bb6282e698f 100644 --- a/ports/espressif/bindings/espcamera/Camera.c +++ b/ports/espressif/bindings/espcamera/Camera.c @@ -70,7 +70,7 @@ //| :param framebuffer_count: The number of framebuffers (1 for single-buffered and 2 for double-buffered) //| :param grab_mode: When to grab a new frame //| """ -STATIC mp_obj_t espcamera_camera_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t espcamera_camera_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_data_pins, ARG_pixel_clock_pin, ARG_vsync_pin, ARG_href_pin, ARG_i2c, ARG_external_clock_pin, ARG_external_clock_frequency, ARG_powerdown_pin, ARG_reset_pin, ARG_pixel_format, ARG_frame_size, ARG_jpeg_quality, ARG_framebuffer_count, ARG_grab_mode, NUM_ARGS }; static const mp_arg_t allowed_args[] = { { MP_QSTR_data_pins, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED }, @@ -144,14 +144,14 @@ STATIC mp_obj_t espcamera_camera_make_new(const mp_obj_type_t *type, size_t n_ar //| def deinit(self) -> None: //| """Deinitialises the camera and releases all memory resources for reuse.""" //| ... -STATIC mp_obj_t espcamera_camera_deinit(mp_obj_t self_in) { +static mp_obj_t espcamera_camera_deinit(mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_espcamera_camera_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_deinit_obj, espcamera_camera_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_deinit_obj, espcamera_camera_deinit); -STATIC void check_for_deinit(espcamera_camera_obj_t *self) { +static void check_for_deinit(espcamera_camera_obj_t *self) { if (common_hal_espcamera_camera_deinited(self)) { raise_deinited_error(); } @@ -166,21 +166,21 @@ STATIC void check_for_deinit(espcamera_camera_obj_t *self) { //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t espcamera_camera_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t espcamera_camera_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; return espcamera_camera_deinit(args[0]); } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espcamera_camera___exit___obj, 4, 4, espcamera_camera_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espcamera_camera___exit___obj, 4, 4, espcamera_camera_obj___exit__); //| frame_available: bool //| """True if a frame is available, False otherwise""" -STATIC mp_obj_t espcamera_camera_frame_available_get(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_frame_available_get(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return mp_obj_new_bool(esp_camera_fb_available()); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_frame_available_get_obj, espcamera_camera_frame_available_get); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_frame_available_get_obj, espcamera_camera_frame_available_get); MP_PROPERTY_GETTER(espcamera_camera_frame_available_obj, (mp_obj_t)&espcamera_camera_frame_available_get_obj); @@ -194,7 +194,7 @@ MP_PROPERTY_GETTER(espcamera_camera_frame_available_obj, //| If `pixel_format` is `PixelFormat.JPEG`, the returned value is a read-only `memoryview`. //| Otherwise, the returned value is a read-only `displayio.Bitmap`. //| """ -STATIC mp_obj_t espcamera_camera_take(size_t n_args, const mp_obj_t *args) { +static mp_obj_t espcamera_camera_take(size_t n_args, const mp_obj_t *args) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(args[0]); mp_float_t timeout = n_args < 2 ? MICROPY_FLOAT_CONST(0.25) : mp_obj_get_float(args[1]); check_for_deinit(self); @@ -214,7 +214,7 @@ STATIC mp_obj_t espcamera_camera_take(size_t n_args, const mp_obj_t *args) { return bitmap; } } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espcamera_camera_take_obj, 1, 2, espcamera_camera_take); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espcamera_camera_take_obj, 1, 2, espcamera_camera_take); //| def reconfigure( @@ -231,7 +231,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espcamera_camera_take_obj, 1, 2, espc //| //| If an argument is unspecified or None, then the setting is unchanged.""" -STATIC mp_obj_t espcamera_camera_reconfigure(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t espcamera_camera_reconfigure(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); check_for_deinit(self); @@ -272,12 +272,12 @@ MP_DEFINE_CONST_FUN_OBJ_KW(espcamera_camera_reconfigure_obj, 1, espcamera_camera //| pixel_format: PixelFormat //| """The pixel format of captured frames""" -STATIC mp_obj_t espcamera_camera_get_pixel_format(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_pixel_format(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return cp_enum_find(&espcamera_pixel_format_type, common_hal_espcamera_camera_get_pixel_format(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_pixel_format_obj, espcamera_camera_get_pixel_format); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_pixel_format_obj, espcamera_camera_get_pixel_format); MP_PROPERTY_GETTER(espcamera_camera_pixel_format_obj, (mp_obj_t)&espcamera_camera_get_pixel_format_obj); @@ -286,12 +286,12 @@ MP_PROPERTY_GETTER(espcamera_camera_pixel_format_obj, //| frame_size: FrameSize //| """The size of captured frames""" -STATIC mp_obj_t espcamera_camera_get_frame_size(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_frame_size(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return cp_enum_find(&espcamera_frame_size_type, common_hal_espcamera_camera_get_frame_size(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_frame_size_obj, espcamera_camera_get_frame_size); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_frame_size_obj, espcamera_camera_get_frame_size); MP_PROPERTY_GETTER(espcamera_camera_frame_size_obj, (mp_obj_t)&espcamera_camera_get_frame_size_obj); @@ -299,20 +299,20 @@ MP_PROPERTY_GETTER(espcamera_camera_frame_size_obj, //| contrast: int //| """The sensor contrast. Positive values increase contrast, negative values lower it. The total range is device-specific but is often from -2 to +2 inclusive.""" -STATIC mp_obj_t espcamera_camera_get_contrast(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_contrast(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_contrast(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_contrast_obj, espcamera_camera_get_contrast); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_contrast_obj, espcamera_camera_get_contrast); -STATIC mp_obj_t espcamera_camera_set_contrast(const mp_obj_t self_in, const mp_obj_t arg) { +static mp_obj_t espcamera_camera_set_contrast(const mp_obj_t self_in, const mp_obj_t arg) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_espcamera_camera_set_contrast(self, mp_obj_get_int(arg)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_contrast_obj, espcamera_camera_set_contrast); +static MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_contrast_obj, espcamera_camera_set_contrast); MP_PROPERTY_GETSET(espcamera_camera_contrast_obj, (mp_obj_t)&espcamera_camera_get_contrast_obj, (mp_obj_t)&espcamera_camera_set_contrast_obj); @@ -320,20 +320,20 @@ MP_PROPERTY_GETSET(espcamera_camera_contrast_obj, //| brightness: int //| """The sensor brightness. Positive values increase brightness, negative values lower it. The total range is device-specific but is often from -2 to +2 inclusive.""" -STATIC mp_obj_t espcamera_camera_get_brightness(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_brightness(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_brightness(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_brightness_obj, espcamera_camera_get_brightness); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_brightness_obj, espcamera_camera_get_brightness); -STATIC mp_obj_t espcamera_camera_set_brightness(const mp_obj_t self_in, const mp_obj_t arg) { +static mp_obj_t espcamera_camera_set_brightness(const mp_obj_t self_in, const mp_obj_t arg) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_espcamera_camera_set_brightness(self, mp_obj_get_int(arg)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_brightness_obj, espcamera_camera_set_brightness); +static MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_brightness_obj, espcamera_camera_set_brightness); MP_PROPERTY_GETSET(espcamera_camera_brightness_obj, (mp_obj_t)&espcamera_camera_get_brightness_obj, (mp_obj_t)&espcamera_camera_set_brightness_obj); @@ -341,20 +341,20 @@ MP_PROPERTY_GETSET(espcamera_camera_brightness_obj, //| saturation: int //| """The sensor saturation. Positive values increase saturation (more vibrant colors), negative values lower it (more muted colors). The total range is device-specific but the value is often from -2 to +2 inclusive.""" -STATIC mp_obj_t espcamera_camera_get_saturation(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_saturation(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_saturation(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_saturation_obj, espcamera_camera_get_saturation); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_saturation_obj, espcamera_camera_get_saturation); -STATIC mp_obj_t espcamera_camera_set_saturation(const mp_obj_t self_in, const mp_obj_t arg) { +static mp_obj_t espcamera_camera_set_saturation(const mp_obj_t self_in, const mp_obj_t arg) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_espcamera_camera_set_saturation(self, mp_obj_get_int(arg)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_saturation_obj, espcamera_camera_set_saturation); +static MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_saturation_obj, espcamera_camera_set_saturation); MP_PROPERTY_GETSET(espcamera_camera_saturation_obj, (mp_obj_t)&espcamera_camera_get_saturation_obj, (mp_obj_t)&espcamera_camera_set_saturation_obj); @@ -362,20 +362,20 @@ MP_PROPERTY_GETSET(espcamera_camera_saturation_obj, //| sharpness: int //| """The sensor sharpness. Positive values increase sharpness (more defined edges), negative values lower it (softer edges). The total range is device-specific but the value is often from -2 to +2 inclusive.""" -STATIC mp_obj_t espcamera_camera_get_sharpness(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_sharpness(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_sharpness(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_sharpness_obj, espcamera_camera_get_sharpness); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_sharpness_obj, espcamera_camera_get_sharpness); -STATIC mp_obj_t espcamera_camera_set_sharpness(const mp_obj_t self_in, const mp_obj_t arg) { +static mp_obj_t espcamera_camera_set_sharpness(const mp_obj_t self_in, const mp_obj_t arg) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_espcamera_camera_set_sharpness(self, mp_obj_get_int(arg)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_sharpness_obj, espcamera_camera_set_sharpness); +static MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_sharpness_obj, espcamera_camera_set_sharpness); MP_PROPERTY_GETSET(espcamera_camera_sharpness_obj, (mp_obj_t)&espcamera_camera_get_sharpness_obj, (mp_obj_t)&espcamera_camera_set_sharpness_obj); @@ -383,20 +383,20 @@ MP_PROPERTY_GETSET(espcamera_camera_sharpness_obj, //| denoise: int //| """The sensor 'denoise' setting. Any camera sensor has inherent 'noise', especially in low brightness environments. Software algorithms can decrease noise at the expense of fine detail. A larger value increases the amount of software noise removal. The total range is device-specific but the value is often from 0 to 10.""" -STATIC mp_obj_t espcamera_camera_get_denoise(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_denoise(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_denoise(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_denoise_obj, espcamera_camera_get_denoise); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_denoise_obj, espcamera_camera_get_denoise); -STATIC mp_obj_t espcamera_camera_set_denoise(const mp_obj_t self_in, const mp_obj_t arg) { +static mp_obj_t espcamera_camera_set_denoise(const mp_obj_t self_in, const mp_obj_t arg) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_espcamera_camera_set_denoise(self, mp_obj_get_int(arg)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_denoise_obj, espcamera_camera_set_denoise); +static MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_denoise_obj, espcamera_camera_set_denoise); MP_PROPERTY_GETSET(espcamera_camera_denoise_obj, (mp_obj_t)&espcamera_camera_get_denoise_obj, (mp_obj_t)&espcamera_camera_set_denoise_obj); @@ -404,20 +404,20 @@ MP_PROPERTY_GETSET(espcamera_camera_denoise_obj, //| gain_ceiling: GainCeiling //| """The sensor 'gain ceiling' setting. "Gain" is an analog multiplier applied to the raw sensor data. The 'ceiling' is the maximum gain value that the sensor will use. A higher gain means that the sensor has a greater response to light, but also makes sensor noise more visible.""" -STATIC mp_obj_t espcamera_camera_get_gain_ceiling(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_gain_ceiling(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return cp_enum_find(&espcamera_gain_ceiling_type, common_hal_espcamera_camera_get_gainceiling(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_gain_ceiling_obj, espcamera_camera_get_gain_ceiling); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_gain_ceiling_obj, espcamera_camera_get_gain_ceiling); -STATIC mp_obj_t espcamera_camera_set_gain_ceiling(const mp_obj_t self_in, const mp_obj_t arg) { +static mp_obj_t espcamera_camera_set_gain_ceiling(const mp_obj_t self_in, const mp_obj_t arg) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_espcamera_camera_set_gainceiling(self, validate_gain_ceiling(arg, MP_QSTR_gain_ceiling)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_gain_ceiling_obj, espcamera_camera_set_gain_ceiling); +static MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_gain_ceiling_obj, espcamera_camera_set_gain_ceiling); MP_PROPERTY_GETSET(espcamera_camera_gain_ceiling_obj, (mp_obj_t)&espcamera_camera_get_gain_ceiling_obj, (mp_obj_t)&espcamera_camera_set_gain_ceiling_obj); @@ -425,20 +425,20 @@ MP_PROPERTY_GETSET(espcamera_camera_gain_ceiling_obj, //| quality: int //| """The 'quality' setting when capturing JPEG images. This is similar to the quality setting when exporting a jpeg image from photo editing software. Typical values range from 5 to 40, with higher numbers leading to larger image sizes and better overall image quality. However, when the quality is set to a high number, the total size of the JPEG data can exceed the size of an internal buffer, causing image capture to fail.""" -STATIC mp_obj_t espcamera_camera_get_quality(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_quality(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_quality(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_quality_obj, espcamera_camera_get_quality); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_quality_obj, espcamera_camera_get_quality); -STATIC mp_obj_t espcamera_camera_set_quality(const mp_obj_t self_in, const mp_obj_t arg) { +static mp_obj_t espcamera_camera_set_quality(const mp_obj_t self_in, const mp_obj_t arg) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_espcamera_camera_set_quality(self, mp_obj_get_int(arg)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_quality_obj, espcamera_camera_set_quality); +static MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_quality_obj, espcamera_camera_set_quality); MP_PROPERTY_GETSET(espcamera_camera_quality_obj, (mp_obj_t)&espcamera_camera_get_quality_obj, (mp_obj_t)&espcamera_camera_set_quality_obj); @@ -446,20 +446,20 @@ MP_PROPERTY_GETSET(espcamera_camera_quality_obj, //| colorbar: bool //| """When `True`, a test pattern image is captured and the real sensor data is not used.""" -STATIC mp_obj_t espcamera_camera_get_colorbar(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_colorbar(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return mp_obj_new_bool(common_hal_espcamera_camera_get_colorbar(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_colorbar_obj, espcamera_camera_get_colorbar); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_colorbar_obj, espcamera_camera_get_colorbar); -STATIC mp_obj_t espcamera_camera_set_colorbar(const mp_obj_t self_in, const mp_obj_t arg) { +static mp_obj_t espcamera_camera_set_colorbar(const mp_obj_t self_in, const mp_obj_t arg) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_espcamera_camera_set_colorbar(self, mp_obj_is_true(arg)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_colorbar_obj, espcamera_camera_set_colorbar); +static MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_colorbar_obj, espcamera_camera_set_colorbar); MP_PROPERTY_GETSET(espcamera_camera_colorbar_obj, (mp_obj_t)&espcamera_camera_get_colorbar_obj, (mp_obj_t)&espcamera_camera_set_colorbar_obj); @@ -467,20 +467,20 @@ MP_PROPERTY_GETSET(espcamera_camera_colorbar_obj, //| whitebal: bool //| """When `True`, the camera attempts to automatically control white balance. When `False`, the `wb_mode` setting is used instead.""" -STATIC mp_obj_t espcamera_camera_get_whitebal(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_whitebal(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return mp_obj_new_bool(common_hal_espcamera_camera_get_whitebal(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_whitebal_obj, espcamera_camera_get_whitebal); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_whitebal_obj, espcamera_camera_get_whitebal); -STATIC mp_obj_t espcamera_camera_set_whitebal(const mp_obj_t self_in, const mp_obj_t arg) { +static mp_obj_t espcamera_camera_set_whitebal(const mp_obj_t self_in, const mp_obj_t arg) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_espcamera_camera_set_whitebal(self, mp_obj_is_true(arg)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_whitebal_obj, espcamera_camera_set_whitebal); +static MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_whitebal_obj, espcamera_camera_set_whitebal); MP_PROPERTY_GETSET(espcamera_camera_whitebal_obj, (mp_obj_t)&espcamera_camera_get_whitebal_obj, (mp_obj_t)&espcamera_camera_set_whitebal_obj); @@ -488,20 +488,20 @@ MP_PROPERTY_GETSET(espcamera_camera_whitebal_obj, //| gain_ctrl: bool //| """When `True`, the camera attempts to automatically control the sensor gain, up to the value in the `gain_ceiling` property. When `False`, the `agc_gain` setting is used instead.""" -STATIC mp_obj_t espcamera_camera_get_gain_ctrl(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_gain_ctrl(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return mp_obj_new_bool(common_hal_espcamera_camera_get_gain_ctrl(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_gain_ctrl_obj, espcamera_camera_get_gain_ctrl); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_gain_ctrl_obj, espcamera_camera_get_gain_ctrl); -STATIC mp_obj_t espcamera_camera_set_gain_ctrl(const mp_obj_t self_in, const mp_obj_t arg) { +static mp_obj_t espcamera_camera_set_gain_ctrl(const mp_obj_t self_in, const mp_obj_t arg) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_espcamera_camera_set_gain_ctrl(self, mp_obj_is_true(arg)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_gain_ctrl_obj, espcamera_camera_set_gain_ctrl); +static MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_gain_ctrl_obj, espcamera_camera_set_gain_ctrl); MP_PROPERTY_GETSET(espcamera_camera_gain_ctrl_obj, (mp_obj_t)&espcamera_camera_get_gain_ctrl_obj, (mp_obj_t)&espcamera_camera_set_gain_ctrl_obj); @@ -509,20 +509,20 @@ MP_PROPERTY_GETSET(espcamera_camera_gain_ctrl_obj, //| exposure_ctrl: bool //| """When `True` the camera attempts to automatically control the exposure. When `False`, the `aec_value` setting is used instead.""" -STATIC mp_obj_t espcamera_camera_get_exposure_ctrl(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_exposure_ctrl(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return mp_obj_new_bool(common_hal_espcamera_camera_get_exposure_ctrl(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_exposure_ctrl_obj, espcamera_camera_get_exposure_ctrl); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_exposure_ctrl_obj, espcamera_camera_get_exposure_ctrl); -STATIC mp_obj_t espcamera_camera_set_exposure_ctrl(const mp_obj_t self_in, const mp_obj_t arg) { +static mp_obj_t espcamera_camera_set_exposure_ctrl(const mp_obj_t self_in, const mp_obj_t arg) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_espcamera_camera_set_exposure_ctrl(self, mp_obj_is_true(arg)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_exposure_ctrl_obj, espcamera_camera_set_exposure_ctrl); +static MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_exposure_ctrl_obj, espcamera_camera_set_exposure_ctrl); MP_PROPERTY_GETSET(espcamera_camera_exposure_ctrl_obj, (mp_obj_t)&espcamera_camera_get_exposure_ctrl_obj, (mp_obj_t)&espcamera_camera_set_exposure_ctrl_obj); @@ -530,20 +530,20 @@ MP_PROPERTY_GETSET(espcamera_camera_exposure_ctrl_obj, //| hmirror: bool //| """When `True` the camera image is mirrored left-to-right""" -STATIC mp_obj_t espcamera_camera_get_hmirror(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_hmirror(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return mp_obj_new_bool(common_hal_espcamera_camera_get_hmirror(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_hmirror_obj, espcamera_camera_get_hmirror); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_hmirror_obj, espcamera_camera_get_hmirror); -STATIC mp_obj_t espcamera_camera_set_hmirror(const mp_obj_t self_in, const mp_obj_t arg) { +static mp_obj_t espcamera_camera_set_hmirror(const mp_obj_t self_in, const mp_obj_t arg) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_espcamera_camera_set_hmirror(self, mp_obj_is_true(arg)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_hmirror_obj, espcamera_camera_set_hmirror); +static MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_hmirror_obj, espcamera_camera_set_hmirror); MP_PROPERTY_GETSET(espcamera_camera_hmirror_obj, (mp_obj_t)&espcamera_camera_get_hmirror_obj, (mp_obj_t)&espcamera_camera_set_hmirror_obj); @@ -551,20 +551,20 @@ MP_PROPERTY_GETSET(espcamera_camera_hmirror_obj, //| vflip: bool //| """When `True` the camera image is flipped top-to-bottom""" -STATIC mp_obj_t espcamera_camera_get_vflip(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_vflip(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return mp_obj_new_bool(common_hal_espcamera_camera_get_vflip(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_vflip_obj, espcamera_camera_get_vflip); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_vflip_obj, espcamera_camera_get_vflip); -STATIC mp_obj_t espcamera_camera_set_vflip(const mp_obj_t self_in, const mp_obj_t arg) { +static mp_obj_t espcamera_camera_set_vflip(const mp_obj_t self_in, const mp_obj_t arg) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_espcamera_camera_set_vflip(self, mp_obj_is_true(arg)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_vflip_obj, espcamera_camera_set_vflip); +static MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_vflip_obj, espcamera_camera_set_vflip); MP_PROPERTY_GETSET(espcamera_camera_vflip_obj, (mp_obj_t)&espcamera_camera_get_vflip_obj, (mp_obj_t)&espcamera_camera_set_vflip_obj); @@ -572,20 +572,20 @@ MP_PROPERTY_GETSET(espcamera_camera_vflip_obj, //| aec2: bool //| """When `True` the sensor's "night mode" is enabled, extending the range of automatic gain control.""" -STATIC mp_obj_t espcamera_camera_get_aec2(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_aec2(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return mp_obj_new_bool(common_hal_espcamera_camera_get_aec2(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_aec2_obj, espcamera_camera_get_aec2); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_aec2_obj, espcamera_camera_get_aec2); -STATIC mp_obj_t espcamera_camera_set_aec2(const mp_obj_t self_in, const mp_obj_t arg) { +static mp_obj_t espcamera_camera_set_aec2(const mp_obj_t self_in, const mp_obj_t arg) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_espcamera_camera_set_aec2(self, mp_obj_is_true(arg)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_aec2_obj, espcamera_camera_set_aec2); +static MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_aec2_obj, espcamera_camera_set_aec2); MP_PROPERTY_GETSET(espcamera_camera_aec2_obj, (mp_obj_t)&espcamera_camera_get_aec2_obj, (mp_obj_t)&espcamera_camera_set_aec2_obj); @@ -593,20 +593,20 @@ MP_PROPERTY_GETSET(espcamera_camera_aec2_obj, //| awb_gain: bool //| """Access the awb_gain property of the camera sensor""" -STATIC mp_obj_t espcamera_camera_get_awb_gain(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_awb_gain(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return mp_obj_new_bool(common_hal_espcamera_camera_get_awb_gain(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_awb_gain_obj, espcamera_camera_get_awb_gain); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_awb_gain_obj, espcamera_camera_get_awb_gain); -STATIC mp_obj_t espcamera_camera_set_awb_gain(const mp_obj_t self_in, const mp_obj_t arg) { +static mp_obj_t espcamera_camera_set_awb_gain(const mp_obj_t self_in, const mp_obj_t arg) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_espcamera_camera_set_awb_gain(self, mp_obj_is_true(arg)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_awb_gain_obj, espcamera_camera_set_awb_gain); +static MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_awb_gain_obj, espcamera_camera_set_awb_gain); MP_PROPERTY_GETSET(espcamera_camera_awb_gain_obj, (mp_obj_t)&espcamera_camera_get_awb_gain_obj, (mp_obj_t)&espcamera_camera_set_awb_gain_obj); @@ -614,20 +614,20 @@ MP_PROPERTY_GETSET(espcamera_camera_awb_gain_obj, //| agc_gain: int //| """Access the gain level of the sensor. Higher values produce brighter images. Typical settings range from 0 to 30. """ -STATIC mp_obj_t espcamera_camera_get_agc_gain(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_agc_gain(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_agc_gain(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_agc_gain_obj, espcamera_camera_get_agc_gain); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_agc_gain_obj, espcamera_camera_get_agc_gain); -STATIC mp_obj_t espcamera_camera_set_agc_gain(const mp_obj_t self_in, const mp_obj_t arg) { +static mp_obj_t espcamera_camera_set_agc_gain(const mp_obj_t self_in, const mp_obj_t arg) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_espcamera_camera_set_agc_gain(self, mp_obj_get_int(arg)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_agc_gain_obj, espcamera_camera_set_agc_gain); +static MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_agc_gain_obj, espcamera_camera_set_agc_gain); MP_PROPERTY_GETSET(espcamera_camera_agc_gain_obj, (mp_obj_t)&espcamera_camera_get_agc_gain_obj, (mp_obj_t)&espcamera_camera_set_agc_gain_obj); @@ -635,20 +635,20 @@ MP_PROPERTY_GETSET(espcamera_camera_agc_gain_obj, //| aec_value: int //| """Access the exposure value of the camera. Higher values produce brighter images. Typical settings range from 0 to 1200.""" -STATIC mp_obj_t espcamera_camera_get_aec_value(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_aec_value(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_aec_value(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_aec_value_obj, espcamera_camera_get_aec_value); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_aec_value_obj, espcamera_camera_get_aec_value); -STATIC mp_obj_t espcamera_camera_set_aec_value(const mp_obj_t self_in, const mp_obj_t arg) { +static mp_obj_t espcamera_camera_set_aec_value(const mp_obj_t self_in, const mp_obj_t arg) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_espcamera_camera_set_aec_value(self, mp_obj_get_int(arg)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_aec_value_obj, espcamera_camera_set_aec_value); +static MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_aec_value_obj, espcamera_camera_set_aec_value); MP_PROPERTY_GETSET(espcamera_camera_aec_value_obj, (mp_obj_t)&espcamera_camera_get_aec_value_obj, (mp_obj_t)&espcamera_camera_set_aec_value_obj); @@ -656,20 +656,20 @@ MP_PROPERTY_GETSET(espcamera_camera_aec_value_obj, //| special_effect: int //| """Enable a "special effect". Zero is no special effect. On OV5640, special effects range from 0 to 6 inclusive and select various color modes.""" -STATIC mp_obj_t espcamera_camera_get_special_effect(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_special_effect(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_special_effect(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_special_effect_obj, espcamera_camera_get_special_effect); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_special_effect_obj, espcamera_camera_get_special_effect); -STATIC mp_obj_t espcamera_camera_set_special_effect(const mp_obj_t self_in, const mp_obj_t arg) { +static mp_obj_t espcamera_camera_set_special_effect(const mp_obj_t self_in, const mp_obj_t arg) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_espcamera_camera_set_special_effect(self, mp_obj_get_int(arg)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_special_effect_obj, espcamera_camera_set_special_effect); +static MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_special_effect_obj, espcamera_camera_set_special_effect); MP_PROPERTY_GETSET(espcamera_camera_special_effect_obj, (mp_obj_t)&espcamera_camera_get_special_effect_obj, (mp_obj_t)&espcamera_camera_set_special_effect_obj); @@ -677,20 +677,20 @@ MP_PROPERTY_GETSET(espcamera_camera_special_effect_obj, //| wb_mode: int //| """The white balance mode. 0 is automatic white balance. Typical values range from 0 to 4 inclusive.""" -STATIC mp_obj_t espcamera_camera_get_wb_mode(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_wb_mode(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_wb_mode(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_wb_mode_obj, espcamera_camera_get_wb_mode); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_wb_mode_obj, espcamera_camera_get_wb_mode); -STATIC mp_obj_t espcamera_camera_set_wb_mode(const mp_obj_t self_in, const mp_obj_t arg) { +static mp_obj_t espcamera_camera_set_wb_mode(const mp_obj_t self_in, const mp_obj_t arg) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_espcamera_camera_set_wb_mode(self, mp_obj_get_int(arg)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_wb_mode_obj, espcamera_camera_set_wb_mode); +static MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_wb_mode_obj, espcamera_camera_set_wb_mode); MP_PROPERTY_GETSET(espcamera_camera_wb_mode_obj, (mp_obj_t)&espcamera_camera_get_wb_mode_obj, (mp_obj_t)&espcamera_camera_set_wb_mode_obj); @@ -698,20 +698,20 @@ MP_PROPERTY_GETSET(espcamera_camera_wb_mode_obj, //| ae_level: int //| """The exposure offset for automatic exposure. Typical values range from -2 to +2.""" -STATIC mp_obj_t espcamera_camera_get_ae_level(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_ae_level(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_ae_level(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_ae_level_obj, espcamera_camera_get_ae_level); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_ae_level_obj, espcamera_camera_get_ae_level); -STATIC mp_obj_t espcamera_camera_set_ae_level(const mp_obj_t self_in, const mp_obj_t arg) { +static mp_obj_t espcamera_camera_set_ae_level(const mp_obj_t self_in, const mp_obj_t arg) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_espcamera_camera_set_ae_level(self, mp_obj_get_int(arg)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_ae_level_obj, espcamera_camera_set_ae_level); +static MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_ae_level_obj, espcamera_camera_set_ae_level); MP_PROPERTY_GETSET(espcamera_camera_ae_level_obj, (mp_obj_t)&espcamera_camera_get_ae_level_obj, (mp_obj_t)&espcamera_camera_set_ae_level_obj); @@ -719,20 +719,20 @@ MP_PROPERTY_GETSET(espcamera_camera_ae_level_obj, //| dcw: bool //| """When `True` an advanced white balance mode is selected.""" -STATIC mp_obj_t espcamera_camera_get_dcw(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_dcw(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return mp_obj_new_bool(common_hal_espcamera_camera_get_dcw(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_dcw_obj, espcamera_camera_get_dcw); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_dcw_obj, espcamera_camera_get_dcw); -STATIC mp_obj_t espcamera_camera_set_dcw(const mp_obj_t self_in, const mp_obj_t arg) { +static mp_obj_t espcamera_camera_set_dcw(const mp_obj_t self_in, const mp_obj_t arg) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_espcamera_camera_set_dcw(self, mp_obj_is_true(arg)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_dcw_obj, espcamera_camera_set_dcw); +static MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_dcw_obj, espcamera_camera_set_dcw); MP_PROPERTY_GETSET(espcamera_camera_dcw_obj, (mp_obj_t)&espcamera_camera_get_dcw_obj, (mp_obj_t)&espcamera_camera_set_dcw_obj); @@ -740,20 +740,20 @@ MP_PROPERTY_GETSET(espcamera_camera_dcw_obj, //| bpc: bool //| """When `True`, "black point compensation" is enabled. This can make black parts of the image darker.""" -STATIC mp_obj_t espcamera_camera_get_bpc(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_bpc(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return mp_obj_new_bool(common_hal_espcamera_camera_get_bpc(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_bpc_obj, espcamera_camera_get_bpc); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_bpc_obj, espcamera_camera_get_bpc); -STATIC mp_obj_t espcamera_camera_set_bpc(const mp_obj_t self_in, const mp_obj_t arg) { +static mp_obj_t espcamera_camera_set_bpc(const mp_obj_t self_in, const mp_obj_t arg) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_espcamera_camera_set_bpc(self, mp_obj_is_true(arg)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_bpc_obj, espcamera_camera_set_bpc); +static MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_bpc_obj, espcamera_camera_set_bpc); MP_PROPERTY_GETSET(espcamera_camera_bpc_obj, (mp_obj_t)&espcamera_camera_get_bpc_obj, (mp_obj_t)&espcamera_camera_set_bpc_obj); @@ -761,20 +761,20 @@ MP_PROPERTY_GETSET(espcamera_camera_bpc_obj, //| wpc: bool //| """When `True`, "white point compensation" is enabled. This can make white parts of the image whiter.""" -STATIC mp_obj_t espcamera_camera_get_wpc(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_wpc(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return mp_obj_new_bool(common_hal_espcamera_camera_get_wpc(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_wpc_obj, espcamera_camera_get_wpc); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_wpc_obj, espcamera_camera_get_wpc); -STATIC mp_obj_t espcamera_camera_set_wpc(const mp_obj_t self_in, const mp_obj_t arg) { +static mp_obj_t espcamera_camera_set_wpc(const mp_obj_t self_in, const mp_obj_t arg) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_espcamera_camera_set_wpc(self, mp_obj_is_true(arg)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_wpc_obj, espcamera_camera_set_wpc); +static MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_wpc_obj, espcamera_camera_set_wpc); MP_PROPERTY_GETSET(espcamera_camera_wpc_obj, (mp_obj_t)&espcamera_camera_get_wpc_obj, (mp_obj_t)&espcamera_camera_set_wpc_obj); @@ -782,20 +782,20 @@ MP_PROPERTY_GETSET(espcamera_camera_wpc_obj, //| raw_gma: bool //| """When `True`, raw gamma mode is enabled.""" -STATIC mp_obj_t espcamera_camera_get_raw_gma(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_raw_gma(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return mp_obj_new_bool(common_hal_espcamera_camera_get_raw_gma(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_raw_gma_obj, espcamera_camera_get_raw_gma); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_raw_gma_obj, espcamera_camera_get_raw_gma); -STATIC mp_obj_t espcamera_camera_set_raw_gma(const mp_obj_t self_in, const mp_obj_t arg) { +static mp_obj_t espcamera_camera_set_raw_gma(const mp_obj_t self_in, const mp_obj_t arg) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_espcamera_camera_set_raw_gma(self, mp_obj_is_true(arg)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_raw_gma_obj, espcamera_camera_set_raw_gma); +static MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_raw_gma_obj, espcamera_camera_set_raw_gma); MP_PROPERTY_GETSET(espcamera_camera_raw_gma_obj, (mp_obj_t)&espcamera_camera_get_raw_gma_obj, (mp_obj_t)&espcamera_camera_set_raw_gma_obj); @@ -803,32 +803,32 @@ MP_PROPERTY_GETSET(espcamera_camera_raw_gma_obj, //| lenc: bool //| """Enable "lens correction". This can help compensate for light fall-off at the edge of the sensor area.""" -STATIC mp_obj_t espcamera_camera_get_lenc(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_lenc(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return mp_obj_new_bool(common_hal_espcamera_camera_get_lenc(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_lenc_obj, espcamera_camera_get_lenc); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_lenc_obj, espcamera_camera_get_lenc); -STATIC mp_obj_t espcamera_camera_set_lenc(const mp_obj_t self_in, const mp_obj_t arg) { +static mp_obj_t espcamera_camera_set_lenc(const mp_obj_t self_in, const mp_obj_t arg) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_espcamera_camera_set_lenc(self, mp_obj_is_true(arg)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_lenc_obj, espcamera_camera_set_lenc); +static MP_DEFINE_CONST_FUN_OBJ_2(espcamera_camera_set_lenc_obj, espcamera_camera_set_lenc); MP_PROPERTY_GETSET(espcamera_camera_lenc_obj, (mp_obj_t)&espcamera_camera_get_lenc_obj, (mp_obj_t)&espcamera_camera_set_lenc_obj); //| max_frame_size: FrameSize //| """The maximum frame size that can be captured""" -STATIC mp_obj_t espcamera_camera_get_max_frame_size(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_max_frame_size(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return cp_enum_find(&espcamera_frame_size_type, common_hal_espcamera_camera_get_max_frame_size(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_max_frame_size_obj, espcamera_camera_get_max_frame_size); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_max_frame_size_obj, espcamera_camera_get_max_frame_size); MP_PROPERTY_GETTER(espcamera_camera_max_frame_size_obj, (mp_obj_t)&espcamera_camera_get_max_frame_size_obj); @@ -836,12 +836,12 @@ MP_PROPERTY_GETTER(espcamera_camera_max_frame_size_obj, //| address: int //| """The I2C (SCCB) address of the sensor""" -STATIC mp_obj_t espcamera_camera_get_address(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_address(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_address(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_address_obj, espcamera_camera_get_address); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_address_obj, espcamera_camera_get_address); MP_PROPERTY_GETTER(espcamera_camera_address_obj, (mp_obj_t)&espcamera_camera_get_address_obj); @@ -849,13 +849,13 @@ MP_PROPERTY_GETTER(espcamera_camera_address_obj, //| sensor_name: str //| """The name of the sensor""" -STATIC mp_obj_t espcamera_camera_get_sensor_name(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_sensor_name(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); const char *sensor_name = common_hal_espcamera_camera_get_sensor_name(self); return mp_obj_new_str(sensor_name, strlen(sensor_name)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_sensor_name_obj, espcamera_camera_get_sensor_name); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_sensor_name_obj, espcamera_camera_get_sensor_name); MP_PROPERTY_GETTER(espcamera_camera_sensor_name_obj, (mp_obj_t)&espcamera_camera_get_sensor_name_obj); @@ -863,48 +863,48 @@ MP_PROPERTY_GETTER(espcamera_camera_sensor_name_obj, //| supports_jpeg: bool //| """True if the sensor can capture images in JPEG format""" -STATIC mp_obj_t espcamera_camera_get_supports_jpeg(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_supports_jpeg(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return mp_obj_new_bool(common_hal_espcamera_camera_get_supports_jpeg(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_supports_jpeg_obj, espcamera_camera_get_supports_jpeg); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_supports_jpeg_obj, espcamera_camera_get_supports_jpeg); MP_PROPERTY_GETTER(espcamera_camera_supports_jpeg_obj, (mp_obj_t)&espcamera_camera_get_supports_jpeg_obj); //| height: int //| """The height of the image being captured""" -STATIC mp_obj_t espcamera_camera_get_height(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_height(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_height(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_height_obj, espcamera_camera_get_height); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_height_obj, espcamera_camera_get_height); MP_PROPERTY_GETTER(espcamera_camera_height_obj, (mp_obj_t)&espcamera_camera_get_height_obj); //| width: int //| """The width of the image being captured""" -STATIC mp_obj_t espcamera_camera_get_width(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_width(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_width(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_width_obj, espcamera_camera_get_width); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_width_obj, espcamera_camera_get_width); MP_PROPERTY_GETTER(espcamera_camera_width_obj, (mp_obj_t)&espcamera_camera_get_width_obj); //| grab_mode: GrabMode //| """The grab mode of the camera""" -STATIC mp_obj_t espcamera_camera_get_grab_mode(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_grab_mode(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return cp_enum_find(&espcamera_grab_mode_type, common_hal_espcamera_camera_get_grab_mode(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_grab_mode_obj, espcamera_camera_get_grab_mode); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_grab_mode_obj, espcamera_camera_get_grab_mode); MP_PROPERTY_GETTER(espcamera_camera_grab_mode_obj, (mp_obj_t)&espcamera_camera_get_grab_mode_obj); @@ -913,18 +913,18 @@ MP_PROPERTY_GETTER(espcamera_camera_grab_mode_obj, //| framebuffer_count: int //| """True if double buffering is used""" //| -STATIC mp_obj_t espcamera_camera_get_framebuffer_count(const mp_obj_t self_in) { +static mp_obj_t espcamera_camera_get_framebuffer_count(const mp_obj_t self_in) { espcamera_camera_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_espcamera_camera_get_framebuffer_count(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_framebuffer_count_obj, espcamera_camera_get_framebuffer_count); +static MP_DEFINE_CONST_FUN_OBJ_1(espcamera_camera_get_framebuffer_count_obj, espcamera_camera_get_framebuffer_count); MP_PROPERTY_GETTER(espcamera_camera_framebuffer_count_obj, (mp_obj_t)&espcamera_camera_get_framebuffer_count_obj); -STATIC const mp_rom_map_elem_t espcamera_camera_locals_table[] = { +static const mp_rom_map_elem_t espcamera_camera_locals_table[] = { { MP_ROM_QSTR(MP_QSTR_address), MP_ROM_PTR(&espcamera_camera_address_obj) }, { MP_ROM_QSTR(MP_QSTR_aec2), MP_ROM_PTR(&espcamera_camera_aec2_obj) }, { MP_ROM_QSTR(MP_QSTR_aec_value), MP_ROM_PTR(&espcamera_camera_aec_value_obj) }, @@ -969,7 +969,7 @@ STATIC const mp_rom_map_elem_t espcamera_camera_locals_table[] = { { MP_ROM_QSTR(MP_QSTR_wpc), MP_ROM_PTR(&espcamera_camera_wpc_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(espcamera_camera_locals_dict, espcamera_camera_locals_table); +static MP_DEFINE_CONST_DICT(espcamera_camera_locals_dict, espcamera_camera_locals_table); MP_DEFINE_CONST_OBJ_TYPE( espcamera_camera_type, diff --git a/ports/espressif/bindings/espcamera/__init__.c b/ports/espressif/bindings/espcamera/__init__.c index 8cef1fb0dfe73..3443ccee42ba9 100644 --- a/ports/espressif/bindings/espcamera/__init__.c +++ b/ports/espressif/bindings/espcamera/__init__.c @@ -45,7 +45,7 @@ MAKE_ENUM_MAP(espcamera_grab_mode) { MAKE_ENUM_MAP_ENTRY(grab_mode, LATEST), }; -STATIC MP_DEFINE_CONST_DICT(espcamera_grab_mode_locals_dict, espcamera_grab_mode_locals_table); +static MP_DEFINE_CONST_DICT(espcamera_grab_mode_locals_dict, espcamera_grab_mode_locals_table); MAKE_PRINTER(espcamera, espcamera_grab_mode); MAKE_ENUM_TYPE(espcamera, GrabMode, espcamera_grab_mode); @@ -76,7 +76,7 @@ MAKE_ENUM_MAP(espcamera_pixel_format) { MAKE_ENUM_MAP_ENTRY(pixel_format, JPEG), }; -STATIC MP_DEFINE_CONST_DICT(espcamera_pixel_format_locals_dict, espcamera_pixel_format_locals_table); +static MP_DEFINE_CONST_DICT(espcamera_pixel_format_locals_dict, espcamera_pixel_format_locals_table); MAKE_PRINTER(espcamera, espcamera_pixel_format); MAKE_ENUM_TYPE(espcamera, PixelFormat, espcamera_pixel_format); @@ -201,7 +201,7 @@ MAKE_ENUM_MAP(espcamera_frame_size) { MAKE_ENUM_MAP_ENTRY(frame_size, QSXGA), }; -STATIC MP_DEFINE_CONST_DICT(espcamera_frame_size_locals_dict, espcamera_frame_size_locals_table); +static MP_DEFINE_CONST_DICT(espcamera_frame_size_locals_dict, espcamera_frame_size_locals_table); MAKE_PRINTER(espcamera, espcamera_frame_size); MAKE_ENUM_TYPE(espcamera, FrameSize, espcamera_frame_size); @@ -241,7 +241,7 @@ MAKE_ENUM_MAP(espcamera_gain_ceiling) { MAKE_ENUM_MAP_ENTRY(gain_ceiling, GAIN_128X) }; -STATIC MP_DEFINE_CONST_DICT(espcamera_gain_ceiling_locals_dict, espcamera_gain_ceiling_locals_table); +static MP_DEFINE_CONST_DICT(espcamera_gain_ceiling_locals_dict, espcamera_gain_ceiling_locals_table); MAKE_PRINTER(espcamera, espcamera_gain_ceiling); MAKE_ENUM_TYPE(espcamera, GainCeiling, espcamera_gain_ceiling); @@ -249,7 +249,7 @@ gainceiling_t validate_gain_ceiling(mp_obj_t obj, qstr arg_name) { return cp_enum_value(&espcamera_gain_ceiling_type, obj, arg_name); } -STATIC const mp_rom_map_elem_t espcamera_module_globals_table[] = { +static const mp_rom_map_elem_t espcamera_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_espcamera) }, { MP_ROM_QSTR(MP_QSTR_Camera), MP_ROM_PTR(&espcamera_camera_type), }, { MP_ROM_QSTR(MP_QSTR_FrameSize), &espcamera_frame_size_type }, @@ -258,7 +258,7 @@ STATIC const mp_rom_map_elem_t espcamera_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_PixelFormat), &espcamera_pixel_format_type }, }; -STATIC MP_DEFINE_CONST_DICT(espcamera_module_globals, espcamera_module_globals_table); +static MP_DEFINE_CONST_DICT(espcamera_module_globals, espcamera_module_globals_table); const mp_obj_module_t espcamera_module = { .base = { &mp_type_module }, diff --git a/ports/espressif/bindings/espidf/__init__.c b/ports/espressif/bindings/espidf/__init__.c index e0373eaa61123..3d6321017f2e7 100644 --- a/ports/espressif/bindings/espidf/__init__.c +++ b/ports/espressif/bindings/espidf/__init__.c @@ -26,7 +26,7 @@ //| ... //| -STATIC mp_obj_t espidf_heap_caps_get_total_size(void) { +static mp_obj_t espidf_heap_caps_get_total_size(void) { return MP_OBJ_NEW_SMALL_INT(heap_caps_get_total_size(MALLOC_CAP_8BIT)); } MP_DEFINE_CONST_FUN_OBJ_0(espidf_heap_caps_get_total_size_obj, espidf_heap_caps_get_total_size); @@ -36,7 +36,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(espidf_heap_caps_get_total_size_obj, espidf_heap_caps_ //| ... //| -STATIC mp_obj_t espidf_heap_caps_get_free_size(void) { +static mp_obj_t espidf_heap_caps_get_free_size(void) { return MP_OBJ_NEW_SMALL_INT(heap_caps_get_free_size(MALLOC_CAP_8BIT)); } MP_DEFINE_CONST_FUN_OBJ_0(espidf_heap_caps_get_free_size_obj, espidf_heap_caps_get_free_size); @@ -46,7 +46,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(espidf_heap_caps_get_free_size_obj, espidf_heap_caps_g //| ... //| -STATIC mp_obj_t espidf_heap_caps_get_largest_free_block(void) { +static mp_obj_t espidf_heap_caps_get_largest_free_block(void) { return MP_OBJ_NEW_SMALL_INT(heap_caps_get_largest_free_block(MALLOC_CAP_8BIT)); } MP_DEFINE_CONST_FUN_OBJ_0(espidf_heap_caps_get_largest_free_block_obj, espidf_heap_caps_get_largest_free_block); @@ -58,7 +58,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(espidf_heap_caps_get_largest_free_block_obj, espidf_he //| layout of data in nvs has changed. The old data will be lost when you perform this operation. //| """ //| -STATIC mp_obj_t espidf_erase_nvs(void) { +static mp_obj_t espidf_erase_nvs(void) { ESP_ERROR_CHECK(nvs_flash_deinit()); ESP_ERROR_CHECK(nvs_flash_erase()); ESP_ERROR_CHECK(nvs_flash_init()); @@ -67,7 +67,7 @@ STATIC mp_obj_t espidf_erase_nvs(void) { MP_DEFINE_CONST_FUN_OBJ_0(espidf_erase_nvs_obj, espidf_erase_nvs); -STATIC void espidf_exception_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) { +static void espidf_exception_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) { mp_print_kind_t k = kind & ~PRINT_EXC_SUBCLASS; bool is_subclass = kind & PRINT_EXC_SUBCLASS; if (!is_subclass && (k == PRINT_EXC)) { @@ -116,12 +116,12 @@ MP_DEFINE_CONST_OBJ_TYPE( //| def get_total_psram() -> int: //| """Returns the number of bytes of psram detected, or 0 if psram is not present or not configured""" //| -STATIC mp_obj_t espidf_get_total_psram(void) { +static mp_obj_t espidf_get_total_psram(void) { return MP_OBJ_NEW_SMALL_INT(common_hal_espidf_get_total_psram()); } MP_DEFINE_CONST_FUN_OBJ_0(espidf_get_total_psram_obj, espidf_get_total_psram); -STATIC const mp_rom_map_elem_t espidf_module_globals_table[] = { +static const mp_rom_map_elem_t espidf_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_espidf) }, { MP_ROM_QSTR(MP_QSTR_heap_caps_get_total_size), MP_ROM_PTR(&espidf_heap_caps_get_total_size_obj)}, @@ -135,7 +135,7 @@ STATIC const mp_rom_map_elem_t espidf_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_MemoryError), MP_ROM_PTR(&mp_type_espidf_MemoryError) }, }; -STATIC MP_DEFINE_CONST_DICT(espidf_module_globals, espidf_module_globals_table); +static MP_DEFINE_CONST_DICT(espidf_module_globals, espidf_module_globals_table); const mp_obj_module_t espidf_module = { .base = { &mp_type_module }, diff --git a/ports/espressif/bindings/espnow/ESPNow.c b/ports/espressif/bindings/espnow/ESPNow.c index 6c8d2b50a537f..80dfac93c12f2 100644 --- a/ports/espressif/bindings/espnow/ESPNow.c +++ b/ports/espressif/bindings/espnow/ESPNow.c @@ -41,7 +41,7 @@ static void espnow_check_for_deinit(espnow_obj_t *self) { //| `wifi_phy_rate_t `_ //| """ //| ... -STATIC mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_buffer_size, ARG_phy_rate }; static const mp_arg_t allowed_args[] = { { MP_QSTR_buffer_size, MP_ARG_INT, { .u_int = 526 } }, @@ -71,13 +71,13 @@ STATIC mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args, size_t //| def deinit(self) -> None: //| """Deinitializes ESP-NOW and releases it for another program.""" //| ... -STATIC mp_obj_t espnow_deinit(mp_obj_t self_in) { +static mp_obj_t espnow_deinit(mp_obj_t self_in) { espnow_obj_t *self = MP_OBJ_TO_PTR(self_in); espnow_check_for_deinit(self); common_hal_espnow_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_deinit_obj, espnow_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(espnow_deinit_obj, espnow_deinit); //| def __enter__(self) -> ESPNow: //| """No-op used by Context Managers.""" @@ -88,11 +88,11 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_deinit_obj, espnow_deinit); //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t espnow_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t espnow_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; return espnow_deinit(args[0]); } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow___exit___obj, 4, 4, espnow_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow___exit___obj, 4, 4, espnow_obj___exit__); // --- Send and Read messages --- @@ -109,7 +109,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espnow___exit___obj, 4, 4, espnow_obj //| :param Peer peer: Send message to this peer. If `None`, send to all registered peers. //| """ //| ... -STATIC mp_obj_t espnow_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t espnow_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_message, ARG_peer }; static const mp_arg_t allowed_args[] = { { MP_QSTR_message, MP_ARG_OBJ | MP_ARG_REQUIRED }, @@ -134,7 +134,7 @@ STATIC mp_obj_t espnow_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k return common_hal_espnow_send(self, &message, mac); } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_send_obj, 2, espnow_send); +static MP_DEFINE_CONST_FUN_OBJ_KW(espnow_send_obj, 2, espnow_send); //| def read(self) -> Optional[ESPNowPacket]: //| """Read a packet from the receive buffer. @@ -143,18 +143,18 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espnow_send_obj, 2, espnow_send); //| //| :returns: An `ESPNowPacket` if available in the buffer, otherwise `None`.""" //| ... -STATIC mp_obj_t espnow_read(mp_obj_t self_in) { +static mp_obj_t espnow_read(mp_obj_t self_in) { espnow_obj_t *self = MP_OBJ_TO_PTR(self_in); espnow_check_for_deinit(self); return common_hal_espnow_read(self); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_read_obj, espnow_read); +static MP_DEFINE_CONST_FUN_OBJ_1(espnow_read_obj, espnow_read); //| send_success: int //| """The number of tx packets received by the peer(s) ``ESP_NOW_SEND_SUCCESS``. (read-only)""" //| -STATIC mp_obj_t espnow_get_send_success(const mp_obj_t self_in) { +static mp_obj_t espnow_get_send_success(const mp_obj_t self_in) { espnow_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_int_from_uint(self->send_success); } @@ -166,7 +166,7 @@ MP_PROPERTY_GETTER(espnow_send_success_obj, //| send_failure: int //| """The number of failed tx packets ``ESP_NOW_SEND_FAIL``. (read-only)""" //| -STATIC mp_obj_t espnow_send_get_failure(const mp_obj_t self_in) { +static mp_obj_t espnow_send_get_failure(const mp_obj_t self_in) { espnow_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_int_from_uint(self->send_failure); } @@ -178,7 +178,7 @@ MP_PROPERTY_GETTER(espnow_send_failure_obj, //| read_success: int //| """The number of rx packets captured in the buffer. (read-only)""" //| -STATIC mp_obj_t espnow_get_read_success(const mp_obj_t self_in) { +static mp_obj_t espnow_get_read_success(const mp_obj_t self_in) { espnow_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_int_from_uint(self->read_success); } @@ -190,7 +190,7 @@ MP_PROPERTY_GETTER(espnow_read_success_obj, //| read_failure: int //| """The number of dropped rx packets due to buffer overflow. (read-only)""" //| -STATIC mp_obj_t espnow_read_get_failure(const mp_obj_t self_in) { +static mp_obj_t espnow_read_get_failure(const mp_obj_t self_in) { espnow_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_int_from_uint(self->read_failure); } @@ -204,18 +204,18 @@ MP_PROPERTY_GETTER(espnow_read_failure_obj, //| //| :param ReadableBuffer pmk: The ESP-NOW Primary Master Key (length = 16 bytes).""" //| ... -STATIC mp_obj_t espnow_set_pmk(mp_obj_t self_in, mp_obj_t key) { +static mp_obj_t espnow_set_pmk(mp_obj_t self_in, mp_obj_t key) { espnow_obj_t *self = MP_OBJ_TO_PTR(self_in); espnow_check_for_deinit(self); common_hal_espnow_set_pmk(self, common_hal_espnow_get_bytes_len(key, ESP_NOW_KEY_LEN)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_set_pmk_obj, espnow_set_pmk); +static MP_DEFINE_CONST_FUN_OBJ_2(espnow_set_pmk_obj, espnow_set_pmk); //| buffer_size: int //| """The size of the internal ring buffer. (read-only)""" //| -STATIC mp_obj_t espnow_get_buffer_size(const mp_obj_t self_in) { +static mp_obj_t espnow_get_buffer_size(const mp_obj_t self_in) { espnow_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_int_from_uint(self->recv_buffer_size); } @@ -229,13 +229,13 @@ MP_PROPERTY_GETTER(espnow_buffer_size_obj, //| `wifi_phy_rate_t `_ //| """ //| -STATIC mp_obj_t espnow_get_phy_rate(const mp_obj_t self_in) { +static mp_obj_t espnow_get_phy_rate(const mp_obj_t self_in) { espnow_obj_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_NEW_SMALL_INT(self->phy_rate); } MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_phy_rate_obj, espnow_get_phy_rate); -STATIC mp_obj_t espnow_set_phy_rate(const mp_obj_t self_in, const mp_obj_t value) { +static mp_obj_t espnow_set_phy_rate(const mp_obj_t self_in, const mp_obj_t value) { espnow_obj_t *self = MP_OBJ_TO_PTR(self_in); espnow_check_for_deinit(self); common_hal_espnow_set_phy_rate(self, mp_obj_get_int(value)); @@ -252,16 +252,16 @@ MP_PROPERTY_GETSET(espnow_phy_rate_obj, //| peers: Peers //| """The peer info records for all registered `ESPNow` peers. (read-only)""" //| -STATIC mp_obj_t espnow_get_peers(mp_obj_t self_in) { +static mp_obj_t espnow_get_peers(mp_obj_t self_in) { espnow_obj_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_FROM_PTR(self->peers); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_peers_obj, espnow_get_peers); +static MP_DEFINE_CONST_FUN_OBJ_1(espnow_get_peers_obj, espnow_get_peers); MP_PROPERTY_GETTER(espnow_peers_obj, (mp_obj_t)&espnow_get_peers_obj); -STATIC const mp_rom_map_elem_t espnow_locals_dict_table[] = { +static const mp_rom_map_elem_t espnow_locals_dict_table[] = { // Context managers { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj) }, { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&espnow___exit___obj) }, @@ -287,13 +287,13 @@ STATIC const mp_rom_map_elem_t espnow_locals_dict_table[] = { // Peer related properties { MP_ROM_QSTR(MP_QSTR_peers), MP_ROM_PTR(&espnow_peers_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(espnow_locals_dict, espnow_locals_dict_table); +static MP_DEFINE_CONST_DICT(espnow_locals_dict, espnow_locals_dict_table); // --- Dummy Buffer Protocol support --- // ...so asyncio can poll.ipoll() on this device // Support ioctl(MP_STREAM_POLL, ) for asyncio -STATIC mp_uint_t espnow_stream_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) { +static mp_uint_t espnow_stream_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) { espnow_obj_t *self = MP_OBJ_TO_PTR(self_in); espnow_check_for_deinit(self); switch (request) { @@ -311,7 +311,7 @@ STATIC mp_uint_t espnow_stream_ioctl(mp_obj_t self_in, mp_uint_t request, uintpt } } -STATIC const mp_stream_p_t espnow_stream_p = { +static const mp_stream_p_t espnow_stream_p = { .ioctl = espnow_stream_ioctl, }; @@ -325,7 +325,7 @@ STATIC const mp_stream_p_t espnow_stream_p = { //| """Return the number of `bytes` available to read. Used to implement ``len()``.""" //| ... //| -STATIC mp_obj_t espnow_unary_op(mp_unary_op_t op, mp_obj_t self_in) { +static mp_obj_t espnow_unary_op(mp_unary_op_t op, mp_obj_t self_in) { espnow_obj_t *self = MP_OBJ_TO_PTR(self_in); espnow_check_for_deinit(self); size_t len = ringbuf_num_filled(self->recv_buffer); diff --git a/ports/espressif/bindings/espnow/Peer.c b/ports/espressif/bindings/espnow/Peer.c index 35f18e44bec44..70600a4fb1d41 100644 --- a/ports/espressif/bindings/espnow/Peer.c +++ b/ports/espressif/bindings/espnow/Peer.c @@ -32,7 +32,7 @@ //| :param bool encrypted: Whether or not to use encryption. //| """ //| ... -STATIC mp_obj_t espnow_peer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t espnow_peer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_mac, ARG_lmk, ARG_channel, ARG_interface, ARG_encrypted }; static const mp_arg_t allowed_args[] = { { MP_QSTR_mac, MP_ARG_OBJ | MP_ARG_REQUIRED }, @@ -75,13 +75,13 @@ STATIC mp_obj_t espnow_peer_make_new(const mp_obj_type_t *type, size_t n_args, s //| mac: ReadableBuffer //| """The WiFi mac to use.""" //| -STATIC mp_obj_t espnow_peer_get_mac(const mp_obj_t self_in) { +static mp_obj_t espnow_peer_get_mac(const mp_obj_t self_in) { espnow_peer_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_bytes(self->peer_info.peer_addr, MP_ARRAY_SIZE(self->peer_info.peer_addr)); } MP_DEFINE_CONST_FUN_OBJ_1(espnow_peer_get_mac_obj, espnow_peer_get_mac); -STATIC mp_obj_t espnow_peer_set_mac(const mp_obj_t self_in, const mp_obj_t value) { +static mp_obj_t espnow_peer_set_mac(const mp_obj_t self_in, const mp_obj_t value) { espnow_peer_obj_t *self = MP_OBJ_TO_PTR(self_in); memcpy(self->peer_info.peer_addr, common_hal_espnow_get_bytes_len(value, ESP_NOW_ETH_ALEN), ESP_NOW_ETH_ALEN); @@ -98,13 +98,13 @@ MP_PROPERTY_GETSET(espnow_peer_mac_obj, //| lmk: ReadableBuffer //| """The WiFi lmk to use.""" //| -STATIC mp_obj_t espnow_peer_get_lmk(const mp_obj_t self_in) { +static mp_obj_t espnow_peer_get_lmk(const mp_obj_t self_in) { espnow_peer_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_bytes(self->peer_info.lmk, MP_ARRAY_SIZE(self->peer_info.lmk)); } MP_DEFINE_CONST_FUN_OBJ_1(espnow_peer_get_lmk_obj, espnow_peer_get_lmk); -STATIC mp_obj_t espnow_peer_set_lmk(const mp_obj_t self_in, const mp_obj_t value) { +static mp_obj_t espnow_peer_set_lmk(const mp_obj_t self_in, const mp_obj_t value) { espnow_peer_obj_t *self = MP_OBJ_TO_PTR(self_in); memcpy(self->peer_info.lmk, common_hal_espnow_get_bytes_len(value, ESP_NOW_KEY_LEN), ESP_NOW_KEY_LEN); @@ -121,13 +121,13 @@ MP_PROPERTY_GETSET(espnow_peer_lmk_obj, //| channel: int //| """The WiFi channel to use.""" //| -STATIC mp_obj_t espnow_peer_get_channel(const mp_obj_t self_in) { +static mp_obj_t espnow_peer_get_channel(const mp_obj_t self_in) { espnow_peer_obj_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_NEW_SMALL_INT(self->peer_info.channel); } MP_DEFINE_CONST_FUN_OBJ_1(espnow_peer_get_channel_obj, espnow_peer_get_channel); -STATIC mp_obj_t espnow_peer_set_channel(const mp_obj_t self_in, const mp_obj_t value) { +static mp_obj_t espnow_peer_set_channel(const mp_obj_t self_in, const mp_obj_t value) { espnow_peer_obj_t *self = MP_OBJ_TO_PTR(self_in); self->peer_info.channel = mp_arg_validate_int_range(mp_obj_get_int(value), 0, 14, MP_QSTR_channel); @@ -144,13 +144,13 @@ MP_PROPERTY_GETSET(espnow_peer_channel_obj, //| interface: int //| """The WiFi interface to use.""" //| -STATIC mp_obj_t espnow_peer_get_interface(const mp_obj_t self_in) { +static mp_obj_t espnow_peer_get_interface(const mp_obj_t self_in) { espnow_peer_obj_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_NEW_SMALL_INT(self->peer_info.ifidx); } MP_DEFINE_CONST_FUN_OBJ_1(espnow_peer_get_interface_obj, espnow_peer_get_interface); -STATIC mp_obj_t espnow_peer_set_interface(const mp_obj_t self_in, const mp_obj_t value) { +static mp_obj_t espnow_peer_set_interface(const mp_obj_t self_in, const mp_obj_t value) { espnow_peer_obj_t *self = MP_OBJ_TO_PTR(self_in); self->peer_info.ifidx = (wifi_interface_t)mp_arg_validate_int_range(mp_obj_get_int(value), 0, 1, MP_QSTR_interface); @@ -167,13 +167,13 @@ MP_PROPERTY_GETSET(espnow_peer_interface_obj, //| encrypted: bool //| """Whether or not to use encryption.""" //| -STATIC mp_obj_t espnow_peer_get_encrypted(const mp_obj_t self_in) { +static mp_obj_t espnow_peer_get_encrypted(const mp_obj_t self_in) { espnow_peer_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_bool(self->peer_info.encrypt); } MP_DEFINE_CONST_FUN_OBJ_1(espnow_peer_get_encrypted_obj, espnow_peer_get_encrypted); -STATIC mp_obj_t espnow_peer_set_encrypted(const mp_obj_t self_in, const mp_obj_t value) { +static mp_obj_t espnow_peer_set_encrypted(const mp_obj_t self_in, const mp_obj_t value) { espnow_peer_obj_t *self = MP_OBJ_TO_PTR(self_in); self->peer_info.encrypt = mp_obj_is_true(value); @@ -192,7 +192,7 @@ MP_PROPERTY_GETSET(espnow_peer_encrypted_obj, (mp_obj_t)&espnow_peer_get_encrypted_obj, (mp_obj_t)&espnow_peer_set_encrypted_obj); -STATIC const mp_rom_map_elem_t espnow_peer_locals_dict_table[] = { +static const mp_rom_map_elem_t espnow_peer_locals_dict_table[] = { // Peer parameters { MP_ROM_QSTR(MP_QSTR_mac), MP_ROM_PTR(&espnow_peer_mac_obj) }, { MP_ROM_QSTR(MP_QSTR_lmk), MP_ROM_PTR(&espnow_peer_lmk_obj) }, @@ -200,7 +200,7 @@ STATIC const mp_rom_map_elem_t espnow_peer_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_interface), MP_ROM_PTR(&espnow_peer_interface_obj) }, { MP_ROM_QSTR(MP_QSTR_encrypted), MP_ROM_PTR(&espnow_peer_encrypted_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(espnow_peer_locals_dict, espnow_peer_locals_dict_table); +static MP_DEFINE_CONST_DICT(espnow_peer_locals_dict, espnow_peer_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( espnow_peer_type, diff --git a/ports/espressif/bindings/espnow/Peers.c b/ports/espressif/bindings/espnow/Peers.c index f3965b04ed8b0..2f168768c917c 100644 --- a/ports/espressif/bindings/espnow/Peers.c +++ b/ports/espressif/bindings/espnow/Peers.c @@ -28,13 +28,13 @@ //| :param Peer peer: The peer object to append. //| """ //| ... -STATIC mp_obj_t espnow_peers_append(mp_obj_t self_in, mp_obj_t arg) { +static mp_obj_t espnow_peers_append(mp_obj_t self_in, mp_obj_t arg) { espnow_peer_obj_t *peer = MP_OBJ_TO_PTR(mp_arg_validate_type(arg, &espnow_peer_type, MP_QSTR_Peer)); CHECK_ESP_RESULT(esp_now_add_peer(&peer->peer_info)); espnow_peers_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_list_append(self->list, arg); } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_peers_append_obj, espnow_peers_append); +static MP_DEFINE_CONST_FUN_OBJ_2(espnow_peers_append_obj, espnow_peers_append); //| def remove(self, peer: Peer) -> None: //| """Remove peer. @@ -43,25 +43,25 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_peers_append_obj, espnow_peers_append); //| """ //| ... //| -STATIC mp_obj_t espnow_peers_remove(mp_obj_t self_in, mp_obj_t arg) { +static mp_obj_t espnow_peers_remove(mp_obj_t self_in, mp_obj_t arg) { espnow_peer_obj_t *peer = MP_OBJ_TO_PTR(mp_arg_validate_type(arg, &espnow_peer_type, MP_QSTR_Peer)); CHECK_ESP_RESULT(esp_now_del_peer(peer->peer_info.peer_addr)); espnow_peers_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_list_remove(self->list, arg); } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(espnow_peers_remove_obj, espnow_peers_remove); +static MP_DEFINE_CONST_FUN_OBJ_2(espnow_peers_remove_obj, espnow_peers_remove); -STATIC const mp_rom_map_elem_t espnow_peers_locals_dict_table[] = { +static const mp_rom_map_elem_t espnow_peers_locals_dict_table[] = { // Peer management functions { MP_ROM_QSTR(MP_QSTR_append), MP_ROM_PTR(&espnow_peers_append_obj) }, { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&espnow_peers_remove_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(espnow_peers_locals_dict, espnow_peers_locals_dict_table); +static MP_DEFINE_CONST_DICT(espnow_peers_locals_dict, espnow_peers_locals_dict_table); /******************************************************************************/ /* peers print */ -STATIC void espnow_peers_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { +static void espnow_peers_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { espnow_peers_obj_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_TYPE_GET_SLOT(mp_obj_get_type(self->list), print)(print, self->list, kind); } @@ -69,7 +69,7 @@ STATIC void espnow_peers_print(const mp_print_t *print, mp_obj_t self_in, mp_pri /******************************************************************************/ /* peers unary_op */ -STATIC mp_obj_t espnow_peers_unary_op(mp_unary_op_t op, mp_obj_t self_in) { +static mp_obj_t espnow_peers_unary_op(mp_unary_op_t op, mp_obj_t self_in) { espnow_peers_obj_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_TYPE_GET_SLOT(mp_obj_get_type(self->list), unary_op)(op, self->list); } @@ -77,7 +77,7 @@ STATIC mp_obj_t espnow_peers_unary_op(mp_unary_op_t op, mp_obj_t self_in) { /******************************************************************************/ /* peers subscript */ -STATIC mp_obj_t espnow_peers_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) { +static mp_obj_t espnow_peers_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) { if (value != MP_OBJ_SENTINEL) { return MP_OBJ_NULL; // op not supported } @@ -88,7 +88,7 @@ STATIC mp_obj_t espnow_peers_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t v /******************************************************************************/ /* peers iterator */ -STATIC mp_obj_t espnow_peers_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) { +static mp_obj_t espnow_peers_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) { espnow_peers_obj_t *self = MP_OBJ_TO_PTR(self_in); return ((mp_getiter_fun_t)MP_OBJ_TYPE_GET_SLOT(mp_obj_get_type(self->list), iter))(self->list, iter_buf); } diff --git a/ports/espressif/bindings/espnow/__init__.c b/ports/espressif/bindings/espnow/__init__.c index 67c768df1b9d3..79bc0b0f3a638 100644 --- a/ports/espressif/bindings/espnow/__init__.c +++ b/ports/espressif/bindings/espnow/__init__.c @@ -54,7 +54,7 @@ //| ... //| -STATIC const mp_rom_map_elem_t espnow_module_globals_table[] = { +static const mp_rom_map_elem_t espnow_module_globals_table[] = { // module name { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_espnow) }, @@ -64,7 +64,7 @@ STATIC const mp_rom_map_elem_t espnow_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_Peer), MP_ROM_PTR(&espnow_peer_type) }, { MP_ROM_QSTR(MP_QSTR_Peers), MP_ROM_PTR(&espnow_peers_type) }, }; -STATIC MP_DEFINE_CONST_DICT(espnow_module_globals, espnow_module_globals_table); +static MP_DEFINE_CONST_DICT(espnow_module_globals, espnow_module_globals_table); const mp_obj_module_t espnow_module = { .base = { &mp_type_module }, diff --git a/ports/espressif/bindings/espulp/Architecture.c b/ports/espressif/bindings/espulp/Architecture.c index fd657a9ac30e4..ee45035e89dfe 100644 --- a/ports/espressif/bindings/espulp/Architecture.c +++ b/ports/espressif/bindings/espulp/Architecture.c @@ -24,7 +24,7 @@ MAKE_ENUM_MAP(espulp_architecture) { MAKE_ENUM_MAP_ENTRY(architecture, FSM), MAKE_ENUM_MAP_ENTRY(architecture, RISCV), }; -STATIC MP_DEFINE_CONST_DICT(espulp_architecture_locals_dict, espulp_architecture_locals_table); +static MP_DEFINE_CONST_DICT(espulp_architecture_locals_dict, espulp_architecture_locals_table); MAKE_PRINTER(espulp, espulp_architecture); diff --git a/ports/espressif/bindings/espulp/ULP.c b/ports/espressif/bindings/espulp/ULP.c index 41c0c10b223b5..44d573df061e8 100644 --- a/ports/espressif/bindings/espulp/ULP.c +++ b/ports/espressif/bindings/espulp/ULP.c @@ -21,7 +21,7 @@ //| //| :param Architecture arch: The ulp arch""" //| ... -STATIC mp_obj_t espulp_ulp_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t espulp_ulp_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_arch }; static const mp_arg_t allowed_args[] = { { MP_QSTR_arch, MP_ARG_OBJ, {.u_obj = (void *)&architecture_FSM_obj} }, @@ -39,7 +39,7 @@ STATIC mp_obj_t espulp_ulp_make_new(const mp_obj_type_t *type, size_t n_args, si return MP_OBJ_FROM_PTR(self); } -STATIC void check_for_deinit(espulp_ulp_obj_t *self) { +static void check_for_deinit(espulp_ulp_obj_t *self) { if (common_hal_espulp_ulp_deinited(self)) { raise_deinited_error(); } @@ -48,12 +48,12 @@ STATIC void check_for_deinit(espulp_ulp_obj_t *self) { //| def deinit(self) -> None: //| """Deinitialises the ULP and releases it for another program.""" //| ... -STATIC mp_obj_t espulp_ulp_deinit(mp_obj_t self_in) { +static mp_obj_t espulp_ulp_deinit(mp_obj_t self_in) { espulp_ulp_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_espulp_ulp_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espulp_ulp_deinit_obj, espulp_ulp_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(espulp_ulp_deinit_obj, espulp_ulp_deinit); //| def __enter__(self) -> ULP: //| """No-op used by Context Managers.""" @@ -64,11 +64,11 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(espulp_ulp_deinit_obj, espulp_ulp_deinit); //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t espulp_ulp_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t espulp_ulp_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; return espulp_ulp_deinit(args[0]); } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espulp_ulp___exit___obj, 4, 4, espulp_ulp_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espulp_ulp___exit___obj, 4, 4, espulp_ulp_obj___exit__); //| def run( //| self, program: ReadableBuffer, *, pins: Sequence[microcontroller.Pin] = () @@ -78,7 +78,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(espulp_ulp___exit___obj, 4, 4, espulp //| //| The program will continue to run even when the running Python is halted.""" //| ... -STATIC mp_obj_t espulp_ulp_run(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t espulp_ulp_run(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { espulp_ulp_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); check_for_deinit(self); @@ -114,24 +114,24 @@ STATIC mp_obj_t espulp_ulp_run(size_t n_args, const mp_obj_t *pos_args, mp_map_t common_hal_espulp_ulp_run(self, bufinfo.buf, bufinfo.len, pin_mask); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(espulp_ulp_run_obj, 2, espulp_ulp_run); +static MP_DEFINE_CONST_FUN_OBJ_KW(espulp_ulp_run_obj, 2, espulp_ulp_run); //| def halt(self) -> None: //| """Halts the running program and releases the pins given in `run()`.""" //| ... -STATIC mp_obj_t espulp_ulp_halt(mp_obj_t self_in) { +static mp_obj_t espulp_ulp_halt(mp_obj_t self_in) { espulp_ulp_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_espulp_ulp_halt(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(espulp_ulp_halt_obj, espulp_ulp_halt); +static MP_DEFINE_CONST_FUN_OBJ_1(espulp_ulp_halt_obj, espulp_ulp_halt); //| arch: Architecture //| """The ulp architecture. (read-only)""" //| -STATIC mp_obj_t espulp_ulp_get_arch(mp_obj_t self_in) { +static mp_obj_t espulp_ulp_get_arch(mp_obj_t self_in) { espulp_ulp_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -142,7 +142,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(espulp_ulp_get_arch_obj, espulp_ulp_get_arch); MP_PROPERTY_GETTER(espulp_ulp_arch_obj, (mp_obj_t)&espulp_ulp_get_arch_obj); -STATIC const mp_rom_map_elem_t espulp_ulp_locals_table[] = { +static const mp_rom_map_elem_t espulp_ulp_locals_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&espulp_ulp_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj) }, { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&espulp_ulp___exit___obj) }, @@ -150,7 +150,7 @@ STATIC const mp_rom_map_elem_t espulp_ulp_locals_table[] = { { MP_ROM_QSTR(MP_QSTR_halt), MP_ROM_PTR(&espulp_ulp_halt_obj) }, { MP_ROM_QSTR(MP_QSTR_arch), MP_ROM_PTR(&espulp_ulp_arch_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(espulp_ulp_locals_dict, espulp_ulp_locals_table); +static MP_DEFINE_CONST_DICT(espulp_ulp_locals_dict, espulp_ulp_locals_table); MP_DEFINE_CONST_OBJ_TYPE( espulp_ulp_type, diff --git a/ports/espressif/bindings/espulp/ULPAlarm.c b/ports/espressif/bindings/espulp/ULPAlarm.c index cef898d83ef65..edff8e44b8e24 100644 --- a/ports/espressif/bindings/espulp/ULPAlarm.c +++ b/ports/espressif/bindings/espulp/ULPAlarm.c @@ -20,7 +20,7 @@ //| :param ULP ulp: The ulp instance""" //| ... //| -STATIC mp_obj_t espulp_ulpalarm_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t espulp_ulpalarm_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_ulp }; static const mp_arg_t allowed_args[] = { { MP_QSTR_ulp, MP_ARG_REQUIRED | MP_ARG_OBJ }, diff --git a/ports/espressif/bindings/espulp/__init__.c b/ports/espressif/bindings/espulp/__init__.c index dbbdf8dd2698a..59a3519868ce2 100644 --- a/ports/espressif/bindings/espulp/__init__.c +++ b/ports/espressif/bindings/espulp/__init__.c @@ -42,7 +42,7 @@ //| ... //| -STATIC mp_obj_t espulp_get_rtc_gpio_number(mp_obj_t pin_obj) { +static mp_obj_t espulp_get_rtc_gpio_number(mp_obj_t pin_obj) { const mcu_pin_obj_t *pin = validate_obj_is_pin(pin_obj, MP_QSTR_pin); mp_int_t number = common_hal_espulp_get_rtc_gpio_number(pin); if (number < 0) { @@ -52,7 +52,7 @@ STATIC mp_obj_t espulp_get_rtc_gpio_number(mp_obj_t pin_obj) { } MP_DEFINE_CONST_FUN_OBJ_1(espulp_get_rtc_gpio_number_obj, espulp_get_rtc_gpio_number); -STATIC const mp_rom_map_elem_t espulp_module_globals_table[] = { +static const mp_rom_map_elem_t espulp_module_globals_table[] = { // module name { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_espulp) }, @@ -64,7 +64,7 @@ STATIC const mp_rom_map_elem_t espulp_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_ULPAlarm), MP_OBJ_FROM_PTR(&espulp_ulpalarm_type) }, { MP_ROM_QSTR(MP_QSTR_Architecture), MP_ROM_PTR(&espulp_architecture_type) }, }; -STATIC MP_DEFINE_CONST_DICT(espulp_module_globals, espulp_module_globals_table); +static MP_DEFINE_CONST_DICT(espulp_module_globals, espulp_module_globals_table); const mp_obj_module_t espulp_module = { .base = { &mp_type_module }, diff --git a/ports/espressif/boards/01space_lcd042_esp32c3/pins.c b/ports/espressif/boards/01space_lcd042_esp32c3/pins.c index 2942fc304fa08..1518fdecafb41 100644 --- a/ports/espressif/boards/01space_lcd042_esp32c3/pins.c +++ b/ports/espressif/boards/01space_lcd042_esp32c3/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/adafruit_esp32s3_camera/pins.c b/ports/espressif/boards/adafruit_esp32s3_camera/pins.c index 72d8a9729e248..9745626da021e 100644 --- a/ports/espressif/boards/adafruit_esp32s3_camera/pins.c +++ b/ports/espressif/boards/adafruit_esp32s3_camera/pins.c @@ -8,7 +8,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_obj_tuple_t camera_data_tuple = { +static const mp_rom_obj_tuple_t camera_data_tuple = { {&mp_type_tuple}, 8, { @@ -24,7 +24,7 @@ STATIC const mp_rom_obj_tuple_t camera_data_tuple = { }; -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO35) }, diff --git a/ports/espressif/boards/adafruit_feather_esp32_v2/pins.c b/ports/espressif/boards/adafruit_feather_esp32_v2/pins.c index c985cc505746c..a244bacd39fc5 100644 --- a/ports/espressif/boards/adafruit_feather_esp32_v2/pins.c +++ b/ports/espressif/boards/adafruit_feather_esp32_v2/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // External pins are in silkscreen order, from top to bottom, left side, then right side diff --git a/ports/espressif/boards/adafruit_feather_esp32c6_4mbflash_nopsram/pins.c b/ports/espressif/boards/adafruit_feather_esp32c6_4mbflash_nopsram/pins.c index 36e859867105a..f12c493235900 100644 --- a/ports/espressif/boards/adafruit_feather_esp32c6_4mbflash_nopsram/pins.c +++ b/ports/espressif/boards/adafruit_feather_esp32c6_4mbflash_nopsram/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // External pins are in silkscreen order, from top to bottom, left side, then right side diff --git a/ports/espressif/boards/adafruit_feather_esp32s2/pins.c b/ports/espressif/boards/adafruit_feather_esp32s2/pins.c index 860e192924289..7d4d1a801ab41 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s2/pins.c +++ b/ports/espressif/boards/adafruit_feather_esp32s2/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/pins.c b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/pins.c index 597b31639299f..7eeffa79da483 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/pins.c +++ b/ports/espressif/boards/adafruit_feather_esp32s2_reverse_tft/pins.c @@ -8,7 +8,7 @@ #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO39) }, diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tft/pins.c b/ports/espressif/boards/adafruit_feather_esp32s2_tft/pins.c index a6ee350588b93..97dd1029d9945 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s2_tft/pins.c +++ b/ports/espressif/boards/adafruit_feather_esp32s2_tft/pins.c @@ -8,7 +8,7 @@ #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO1) }, diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/pins.c b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/pins.c index 860e192924289..7d4d1a801ab41 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/pins.c +++ b/ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/pins.c b/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/pins.c index 860e192924289..7d4d1a801ab41 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/pins.c +++ b/ports/espressif/boards/adafruit_feather_esp32s3_nopsram/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/pins.c b/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/pins.c index 597b31639299f..7eeffa79da483 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/pins.c +++ b/ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/pins.c @@ -8,7 +8,7 @@ #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO39) }, diff --git a/ports/espressif/boards/adafruit_feather_esp32s3_tft/pins.c b/ports/espressif/boards/adafruit_feather_esp32s3_tft/pins.c index a6ee350588b93..97dd1029d9945 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s3_tft/pins.c +++ b/ports/espressif/boards/adafruit_feather_esp32s3_tft/pins.c @@ -8,7 +8,7 @@ #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO1) }, diff --git a/ports/espressif/boards/adafruit_feather_huzzah32/pins.c b/ports/espressif/boards/adafruit_feather_huzzah32/pins.c index 204d505550acc..1e941ecdfff5e 100644 --- a/ports/espressif/boards/adafruit_feather_huzzah32/pins.c +++ b/ports/espressif/boards/adafruit_feather_huzzah32/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // External pins are in silkscreen order, from top to bottom, left side, then right side diff --git a/ports/espressif/boards/adafruit_funhouse/pins.c b/ports/espressif/boards/adafruit_funhouse/pins.c index 03c1cde145910..b6d419f32e275 100644 --- a/ports/espressif/boards/adafruit_funhouse/pins.c +++ b/ports/espressif/boards/adafruit_funhouse/pins.c @@ -8,7 +8,7 @@ #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS diff --git a/ports/espressif/boards/adafruit_huzzah32_breakout/pins.c b/ports/espressif/boards/adafruit_huzzah32_breakout/pins.c index 8c4b9a599945b..e79f4c6096778 100644 --- a/ports/espressif/boards/adafruit_huzzah32_breakout/pins.c +++ b/ports/espressif/boards/adafruit_huzzah32_breakout/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/adafruit_itsybitsy_esp32/pins.c b/ports/espressif/boards/adafruit_itsybitsy_esp32/pins.c index d1e48ff9d9e08..8ea74a0cbb228 100644 --- a/ports/espressif/boards/adafruit_itsybitsy_esp32/pins.c +++ b/ports/espressif/boards/adafruit_itsybitsy_esp32/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // External pins are in silkscreen order, from top to bottom, left side, then right side diff --git a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/pins.c b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/pins.c index b154ba0df345a..746a2cad4478a 100644 --- a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/pins.c +++ b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/pins.c @@ -8,7 +8,7 @@ #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) }, diff --git a/ports/espressif/boards/adafruit_matrixportal_s3/pins.c b/ports/espressif/boards/adafruit_matrixportal_s3/pins.c index 2ab8d37559175..d303529bdd771 100644 --- a/ports/espressif/boards/adafruit_matrixportal_s3/pins.c +++ b/ports/espressif/boards/adafruit_matrixportal_s3/pins.c @@ -7,7 +7,7 @@ #include "py/objtuple.h" #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_obj_tuple_t matrix_addr_tuple = { +static const mp_rom_obj_tuple_t matrix_addr_tuple = { {&mp_type_tuple}, 5, { @@ -19,7 +19,7 @@ STATIC const mp_rom_obj_tuple_t matrix_addr_tuple = { } }; -STATIC const mp_rom_obj_tuple_t matrix_data_tuple = { +static const mp_rom_obj_tuple_t matrix_data_tuple = { {&mp_type_tuple}, 6, { @@ -33,7 +33,7 @@ STATIC const mp_rom_obj_tuple_t matrix_data_tuple = { } }; -STATIC const mp_rom_map_elem_t matrix_common_table[] = { +static const mp_rom_map_elem_t matrix_common_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR_rgb_pins), MP_ROM_PTR(&matrix_data_tuple) }, { MP_OBJ_NEW_QSTR(MP_QSTR_clock_pin), MP_ROM_PTR(&pin_GPIO2) }, { MP_OBJ_NEW_QSTR(MP_QSTR_latch_pin), MP_ROM_PTR(&pin_GPIO47) }, @@ -41,7 +41,7 @@ STATIC const mp_rom_map_elem_t matrix_common_table[] = { }; MP_DEFINE_CONST_DICT(matrix_common_dict, matrix_common_table); -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/adafruit_metro_esp32s2/pins.c b/ports/espressif/boards/adafruit_metro_esp32s2/pins.c index 6fcfeb51fa907..64664966d4704 100644 --- a/ports/espressif/boards/adafruit_metro_esp32s2/pins.c +++ b/ports/espressif/boards/adafruit_metro_esp32s2/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO17) }, diff --git a/ports/espressif/boards/adafruit_metro_esp32s3/pins.c b/ports/espressif/boards/adafruit_metro_esp32s3/pins.c index b6f860b456312..0bc14bedf4713 100644 --- a/ports/espressif/boards/adafruit_metro_esp32s3/pins.c +++ b/ports/espressif/boards/adafruit_metro_esp32s3/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO14) }, diff --git a/ports/espressif/boards/adafruit_qtpy_esp32_pico/pins.c b/ports/espressif/boards/adafruit_qtpy_esp32_pico/pins.c index c6da266296ee5..fba81ee3562f1 100644 --- a/ports/espressif/boards/adafruit_qtpy_esp32_pico/pins.c +++ b/ports/espressif/boards/adafruit_qtpy_esp32_pico/pins.c @@ -8,7 +8,7 @@ CIRCUITPY_BOARD_BUS_SINGLETON(stemma_i2c, i2c, 1) -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/adafruit_qtpy_esp32c3/pins.c b/ports/espressif/boards/adafruit_qtpy_esp32c3/pins.c index 87b818a4b1f7d..a35205bbb514b 100644 --- a/ports/espressif/boards/adafruit_qtpy_esp32c3/pins.c +++ b/ports/espressif/boards/adafruit_qtpy_esp32c3/pins.c @@ -9,7 +9,7 @@ CIRCUITPY_BOARD_BUS_SINGLETON(stemma_i2c, i2c, 1) -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO9) }, diff --git a/ports/espressif/boards/adafruit_qtpy_esp32s2/pins.c b/ports/espressif/boards/adafruit_qtpy_esp32s2/pins.c index e16bfb90aa51d..446164fdef193 100644 --- a/ports/espressif/boards/adafruit_qtpy_esp32s2/pins.c +++ b/ports/espressif/boards/adafruit_qtpy_esp32s2/pins.c @@ -8,7 +8,7 @@ CIRCUITPY_BOARD_BUS_SINGLETON(stemma_i2c, i2c, 1) -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/adafruit_qtpy_esp32s3_4mbflash_2mbpsram/pins.c b/ports/espressif/boards/adafruit_qtpy_esp32s3_4mbflash_2mbpsram/pins.c index ed717c4ed99b6..b98a7209e8d9a 100644 --- a/ports/espressif/boards/adafruit_qtpy_esp32s3_4mbflash_2mbpsram/pins.c +++ b/ports/espressif/boards/adafruit_qtpy_esp32s3_4mbflash_2mbpsram/pins.c @@ -8,7 +8,7 @@ CIRCUITPY_BOARD_BUS_SINGLETON(stemma_i2c, i2c, 1) -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/pins.c b/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/pins.c index ed717c4ed99b6..b98a7209e8d9a 100644 --- a/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/pins.c +++ b/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/pins.c @@ -8,7 +8,7 @@ CIRCUITPY_BOARD_BUS_SINGLETON(stemma_i2c, i2c, 1) -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/adafruit_qualia_s3_rgb666/pins.c b/ports/espressif/boards/adafruit_qualia_s3_rgb666/pins.c index 116e833761524..524182126a164 100644 --- a/ports/espressif/boards/adafruit_qualia_s3_rgb666/pins.c +++ b/ports/espressif/boards/adafruit_qualia_s3_rgb666/pins.c @@ -14,9 +14,9 @@ static const char i2c_bus_init_sequence[] = { 2, 2, 0, // disable all output inversion 0, // trailing NUL for python bytes() representation }; -STATIC MP_DEFINE_BYTES_OBJ(i2c_init_byte_obj, i2c_bus_init_sequence); +static MP_DEFINE_BYTES_OBJ(i2c_init_byte_obj, i2c_bus_init_sequence); -STATIC const mp_rom_map_elem_t tft_io_expander_table[] = { +static const mp_rom_map_elem_t tft_io_expander_table[] = { { MP_ROM_QSTR(MP_QSTR_i2c_address), MP_ROM_INT(0x3f)}, { MP_ROM_QSTR(MP_QSTR_gpio_address), MP_ROM_INT(1)}, { MP_ROM_QSTR(MP_QSTR_gpio_data_len), MP_ROM_INT(1)}, @@ -29,7 +29,7 @@ STATIC const mp_rom_map_elem_t tft_io_expander_table[] = { }; MP_DEFINE_CONST_DICT(tft_io_expander_dict, tft_io_expander_table); -STATIC const mp_rom_obj_tuple_t tft_r_pins = { +static const mp_rom_obj_tuple_t tft_r_pins = { {&mp_type_tuple}, 5, { @@ -41,7 +41,7 @@ STATIC const mp_rom_obj_tuple_t tft_r_pins = { } }; -STATIC const mp_rom_obj_tuple_t tft_g_pins = { +static const mp_rom_obj_tuple_t tft_g_pins = { {&mp_type_tuple}, 6, { @@ -54,7 +54,7 @@ STATIC const mp_rom_obj_tuple_t tft_g_pins = { } }; -STATIC const mp_rom_obj_tuple_t tft_b_pins = { +static const mp_rom_obj_tuple_t tft_b_pins = { {&mp_type_tuple}, 5, { @@ -66,7 +66,7 @@ STATIC const mp_rom_obj_tuple_t tft_b_pins = { } }; -STATIC const mp_rom_map_elem_t tft_table[] = { +static const mp_rom_map_elem_t tft_table[] = { { MP_ROM_QSTR(MP_QSTR_de), MP_ROM_PTR(&pin_GPIO2) }, { MP_ROM_QSTR(MP_QSTR_vsync), MP_ROM_PTR(&pin_GPIO42) }, { MP_ROM_QSTR(MP_QSTR_hsync), MP_ROM_PTR(&pin_GPIO41) }, @@ -77,7 +77,7 @@ STATIC const mp_rom_map_elem_t tft_table[] = { }; MP_DEFINE_CONST_DICT(tft_dict, tft_table); -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_TFT_PINS), MP_ROM_PTR(&tft_dict) }, diff --git a/ports/espressif/boards/ai-thinker-esp32-cam/pins.c b/ports/espressif/boards/ai-thinker-esp32-cam/pins.c index 22126fa9fe45d..2003fd4d8a388 100755 --- a/ports/espressif/boards/ai-thinker-esp32-cam/pins.c +++ b/ports/espressif/boards/ai-thinker-esp32-cam/pins.c @@ -9,7 +9,7 @@ CIRCUITPY_BOARD_BUS_SINGLETON(sscb_i2c, i2c, 2) // Camera sensor -STATIC const mp_rom_obj_tuple_t camera_data_tuple = { +static const mp_rom_obj_tuple_t camera_data_tuple = { // The order matters. They must be ordered from low to high (Y2, Y3 .. Y9). Do not include any of the control pins in here. {&mp_type_tuple}, 8, @@ -25,7 +25,7 @@ STATIC const mp_rom_obj_tuple_t camera_data_tuple = { } }; -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // Red LED on the back of the board diff --git a/ports/espressif/boards/ai_thinker_esp32-c3s-2m/pins.c b/ports/espressif/boards/ai_thinker_esp32-c3s-2m/pins.c index 544498baf5f42..6f3b27c3a4e62 100644 --- a/ports/espressif/boards/ai_thinker_esp32-c3s-2m/pins.c +++ b/ports/espressif/boards/ai_thinker_esp32-c3s-2m/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/ai_thinker_esp32-c3s/pins.c b/ports/espressif/boards/ai_thinker_esp32-c3s/pins.c index 544498baf5f42..6f3b27c3a4e62 100644 --- a/ports/espressif/boards/ai_thinker_esp32-c3s/pins.c +++ b/ports/espressif/boards/ai_thinker_esp32-c3s/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/pins.c b/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/pins.c index e0d12c035ad71..108c40f1636f0 100644 --- a/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/pins.c +++ b/ports/espressif/boards/ai_thinker_esp_12k_nodemcu/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/arduino_nano_esp32s3/pins.c b/ports/espressif/boards/arduino_nano_esp32s3/pins.c index d2d77ed8249e1..6b901ba3c77f9 100644 --- a/ports/espressif/boards/arduino_nano_esp32s3/pins.c +++ b/ports/espressif/boards/arduino_nano_esp32s3/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_B0), MP_ROM_PTR(&pin_GPIO46) }, diff --git a/ports/espressif/boards/arduino_nano_esp32s3_inverted_statusled/pins.c b/ports/espressif/boards/arduino_nano_esp32s3_inverted_statusled/pins.c index d583818196ce7..76afa127c06ac 100644 --- a/ports/espressif/boards/arduino_nano_esp32s3_inverted_statusled/pins.c +++ b/ports/espressif/boards/arduino_nano_esp32s3_inverted_statusled/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_B0), MP_ROM_PTR(&pin_GPIO46) }, diff --git a/ports/espressif/boards/artisense_rd00/pins.c b/ports/espressif/boards/artisense_rd00/pins.c index e6d43d058058c..55bed8bb3ebea 100644 --- a/ports/espressif/boards/artisense_rd00/pins.c +++ b/ports/espressif/boards/artisense_rd00/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO1) }, diff --git a/ports/espressif/boards/atmegazero_esp32s2/pins.c b/ports/espressif/boards/atmegazero_esp32s2/pins.c index 45c2cfcb687d5..8264b4aa3a2c8 100644 --- a/ports/espressif/boards/atmegazero_esp32s2/pins.c +++ b/ports/espressif/boards/atmegazero_esp32s2/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/beetle-esp32-c3/pins.c b/ports/espressif/boards/beetle-esp32-c3/pins.c index aa6579677f8ae..3bc3a1e905f91 100644 --- a/ports/espressif/boards/beetle-esp32-c3/pins.c +++ b/ports/espressif/boards/beetle-esp32-c3/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS diff --git a/ports/espressif/boards/bpi_bit_s2/pins.c b/ports/espressif/boards/bpi_bit_s2/pins.c index 577287efbe84d..9e504730f17ca 100644 --- a/ports/espressif/boards/bpi_bit_s2/pins.c +++ b/ports/espressif/boards/bpi_bit_s2/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO17) }, diff --git a/ports/espressif/boards/bpi_leaf_s3/pins.c b/ports/espressif/boards/bpi_leaf_s3/pins.c index 3327cddf964d6..8a3355d919cbf 100644 --- a/ports/espressif/boards/bpi_leaf_s3/pins.c +++ b/ports/espressif/boards/bpi_leaf_s3/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/bpi_picow_s3/pins.c b/ports/espressif/boards/bpi_picow_s3/pins.c index 5e25d760a7b9e..8a7f8af129460 100644 --- a/ports/espressif/boards/bpi_picow_s3/pins.c +++ b/ports/espressif/boards/bpi_picow_s3/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO43) }, diff --git a/ports/espressif/boards/brainboardz_neuron/pins.c b/ports/espressif/boards/brainboardz_neuron/pins.c index e7490397ee0f0..5b8ad1f2a9f93 100755 --- a/ports/espressif/boards/brainboardz_neuron/pins.c +++ b/ports/espressif/boards/brainboardz_neuron/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/columbia-dsl-sensor/pins.c b/ports/espressif/boards/columbia-dsl-sensor/pins.c index 4a9f3811ce661..ed09416a78a1b 100644 --- a/ports/espressif/boards/columbia-dsl-sensor/pins.c +++ b/ports/espressif/boards/columbia-dsl-sensor/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/crcibernetica-ideaboard/pins.c b/ports/espressif/boards/crcibernetica-ideaboard/pins.c index a07312181f479..380f6c5e95f7d 100644 --- a/ports/espressif/boards/crcibernetica-ideaboard/pins.c +++ b/ports/espressif/boards/crcibernetica-ideaboard/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/crumpspace_crumps2/pins.c b/ports/espressif/boards/crumpspace_crumps2/pins.c index 8523d872546d2..809f58a79724a 100644 --- a/ports/espressif/boards/crumpspace_crumps2/pins.c +++ b/ports/espressif/boards/crumpspace_crumps2/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/cytron_maker_feather_aiot_s3/pins.c b/ports/espressif/boards/cytron_maker_feather_aiot_s3/pins.c index e479cd73e53b9..69441fdd1db86 100644 --- a/ports/espressif/boards/cytron_maker_feather_aiot_s3/pins.c +++ b/ports/espressif/boards/cytron_maker_feather_aiot_s3/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/deneyap_kart/pins.c b/ports/espressif/boards/deneyap_kart/pins.c index 77bb288192270..338056d1e6ab3 100644 --- a/ports/espressif/boards/deneyap_kart/pins.c +++ b/ports/espressif/boards/deneyap_kart/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // External pins are in silkscreen order, from top to bottom, right side, then left side diff --git a/ports/espressif/boards/deneyap_kart_1a/pins.c b/ports/espressif/boards/deneyap_kart_1a/pins.c index c01dcb9dde605..edac9958e8180 100644 --- a/ports/espressif/boards/deneyap_kart_1a/pins.c +++ b/ports/espressif/boards/deneyap_kart_1a/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // External pins are in silkscreen order, from top to bottom, right side, then left side diff --git a/ports/espressif/boards/deneyap_kart_1a_v2/pins.c b/ports/espressif/boards/deneyap_kart_1a_v2/pins.c index 860e192924289..7d4d1a801ab41 100644 --- a/ports/espressif/boards/deneyap_kart_1a_v2/pins.c +++ b/ports/espressif/boards/deneyap_kart_1a_v2/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/deneyap_kart_g/pins.c b/ports/espressif/boards/deneyap_kart_g/pins.c index d3f8877c3e074..0fb41ad1cc208 100644 --- a/ports/espressif/boards/deneyap_kart_g/pins.c +++ b/ports/espressif/boards/deneyap_kart_g/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO20) }, diff --git a/ports/espressif/boards/deneyap_mini/pins.c b/ports/espressif/boards/deneyap_mini/pins.c index a05ccfdab20a2..4e720400843ad 100644 --- a/ports/espressif/boards/deneyap_mini/pins.c +++ b/ports/espressif/boards/deneyap_mini/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) }, diff --git a/ports/espressif/boards/deneyap_mini_v2/pins.c b/ports/espressif/boards/deneyap_mini_v2/pins.c index b2fd066f44617..95c4fa50e5302 100644 --- a/ports/espressif/boards/deneyap_mini_v2/pins.c +++ b/ports/espressif/boards/deneyap_mini_v2/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) }, diff --git a/ports/espressif/boards/doit_esp32_devkit_v1/pins.c b/ports/espressif/boards/doit_esp32_devkit_v1/pins.c index 04fa5766450fc..19affa7c732fe 100644 --- a/ports/espressif/boards/doit_esp32_devkit_v1/pins.c +++ b/ports/espressif/boards/doit_esp32_devkit_v1/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // External pins are in silkscreen order, from top to bottom, left side diff --git a/ports/espressif/boards/electroniccats_bastwifi/pins.c b/ports/espressif/boards/electroniccats_bastwifi/pins.c index 9ae589cf0c39e..7884c2831b71f 100644 --- a/ports/espressif/boards/electroniccats_bastwifi/pins.c +++ b/ports/espressif/boards/electroniccats_bastwifi/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/es3ink/pins.c b/ports/espressif/boards/es3ink/pins.c index 1d3f279853afb..60127e0ac3c72 100644 --- a/ports/espressif/boards/es3ink/pins.c +++ b/ports/espressif/boards/es3ink/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/espressif_esp32_devkitc_v4_wroom_32e/pins.c b/ports/espressif/boards/espressif_esp32_devkitc_v4_wroom_32e/pins.c index 4d6f45d4bedd8..7c5ac13e15e1f 100644 --- a/ports/espressif/boards/espressif_esp32_devkitc_v4_wroom_32e/pins.c +++ b/ports/espressif/boards/espressif_esp32_devkitc_v4_wroom_32e/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // External pins are in silkscreen order, from top to bottom, left side, then right side diff --git a/ports/espressif/boards/espressif_esp32_devkitc_v4_wrover/pins.c b/ports/espressif/boards/espressif_esp32_devkitc_v4_wrover/pins.c index c867e474800f3..49c7044549188 100644 --- a/ports/espressif/boards/espressif_esp32_devkitc_v4_wrover/pins.c +++ b/ports/espressif/boards/espressif_esp32_devkitc_v4_wrover/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // External pins are in silkscreen order, from top to bottom, left side, then right side diff --git a/ports/espressif/boards/espressif_esp32_eye/pins.c b/ports/espressif/boards/espressif_esp32_eye/pins.c index 5871f0a941f68..6d1e45541799a 100644 --- a/ports/espressif/boards/espressif_esp32_eye/pins.c +++ b/ports/espressif/boards/espressif_esp32_eye/pins.c @@ -7,7 +7,7 @@ #include "py/objtuple.h" #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_obj_tuple_t camera_data_tuple = { +static const mp_rom_obj_tuple_t camera_data_tuple = { {&mp_type_tuple}, 8, { @@ -22,7 +22,7 @@ STATIC const mp_rom_obj_tuple_t camera_data_tuple = { } }; -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_I2S_SCK), MP_ROM_PTR(&pin_GPIO26) }, diff --git a/ports/espressif/boards/espressif_esp32_lyrat/pins.c b/ports/espressif/boards/espressif_esp32_lyrat/pins.c index dccf1d99d3240..20defb0b6e395 100644 --- a/ports/espressif/boards/espressif_esp32_lyrat/pins.c +++ b/ports/espressif/boards/espressif_esp32_lyrat/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // External pins are in silkscreen order, from top to bottom, left side, then right side diff --git a/ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/pins.c b/ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/pins.c index 99446214074fa..2956db92a874b 100644 --- a/ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/pins.c +++ b/ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/espressif_esp32c6_devkitc_1_n8/pins.c b/ports/espressif/boards/espressif_esp32c6_devkitc_1_n8/pins.c index 00b294ccc57c0..53689f9177f97 100644 --- a/ports/espressif/boards/espressif_esp32c6_devkitc_1_n8/pins.c +++ b/ports/espressif/boards/espressif_esp32c6_devkitc_1_n8/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/espressif_esp32c6_devkitm_1_n4/pins.c b/ports/espressif/boards/espressif_esp32c6_devkitm_1_n4/pins.c index 99446214074fa..2956db92a874b 100644 --- a/ports/espressif/boards/espressif_esp32c6_devkitm_1_n4/pins.c +++ b/ports/espressif/boards/espressif_esp32c6_devkitm_1_n4/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/espressif_esp32h2_devkitm_1_n4/pins.c b/ports/espressif/boards/espressif_esp32h2_devkitm_1_n4/pins.c index 933e0fa5e0728..34aa40f599f5c 100644 --- a/ports/espressif/boards/espressif_esp32h2_devkitm_1_n4/pins.c +++ b/ports/espressif/boards/espressif_esp32h2_devkitm_1_n4/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/pins.c b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/pins.c index fef4e99ffc60f..1f386ccbb224e 100644 --- a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/pins.c +++ b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/pins.c b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/pins.c index fef4e99ffc60f..1f386ccbb224e 100644 --- a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/pins.c +++ b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/pins.c b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/pins.c index fef4e99ffc60f..1f386ccbb224e 100644 --- a/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/pins.c +++ b/ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/espressif_esp32s3_box/pins.c b/ports/espressif/boards/espressif_esp32s3_box/pins.c index 477956c503e33..a2c6651087f5e 100644 --- a/ports/espressif/boards/espressif_esp32s3_box/pins.c +++ b/ports/espressif/boards/espressif_esp32s3_box/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // First PMOD connector diff --git a/ports/espressif/boards/espressif_esp32s3_box_lite/pins.c b/ports/espressif/boards/espressif_esp32s3_box_lite/pins.c index 477956c503e33..a2c6651087f5e 100644 --- a/ports/espressif/boards/espressif_esp32s3_box_lite/pins.c +++ b/ports/espressif/boards/espressif_esp32s3_box_lite/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // First PMOD connector diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/pins.c b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/pins.c index 0ab3e57cbc572..3bb64f434d02f 100644 --- a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/pins.c +++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n32r8/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/pins.c b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/pins.c index 0ab3e57cbc572..3bb64f434d02f 100644 --- a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/pins.c +++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/pins.c b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/pins.c index 0ab3e57cbc572..3bb64f434d02f 100644 --- a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/pins.c +++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/pins.c b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/pins.c index 0ab3e57cbc572..3bb64f434d02f 100644 --- a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/pins.c +++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8_hacktablet/pins.c b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8_hacktablet/pins.c index 5ded13d1a0983..ca2439e1d40a1 100644 --- a/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8_hacktablet/pins.c +++ b/ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8_hacktablet/pins.c @@ -8,7 +8,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_obj_tuple_t tft_r_pins = { +static const mp_rom_obj_tuple_t tft_r_pins = { {&mp_type_tuple}, 5, { @@ -20,7 +20,7 @@ STATIC const mp_rom_obj_tuple_t tft_r_pins = { } }; -STATIC const mp_rom_obj_tuple_t tft_g_pins = { +static const mp_rom_obj_tuple_t tft_g_pins = { {&mp_type_tuple}, 6, { @@ -33,7 +33,7 @@ STATIC const mp_rom_obj_tuple_t tft_g_pins = { } }; -STATIC const mp_rom_obj_tuple_t tft_b_pins = { +static const mp_rom_obj_tuple_t tft_b_pins = { {&mp_type_tuple}, 5, { @@ -45,7 +45,7 @@ STATIC const mp_rom_obj_tuple_t tft_b_pins = { } }; -STATIC const mp_rom_map_elem_t tft_table[] = { +static const mp_rom_map_elem_t tft_table[] = { { MP_ROM_QSTR(MP_QSTR_de), MP_ROM_PTR(&pin_GPIO45) }, { MP_ROM_QSTR(MP_QSTR_vsync), MP_ROM_PTR(&pin_GPIO48) }, { MP_ROM_QSTR(MP_QSTR_hsync), MP_ROM_PTR(&pin_GPIO47) }, @@ -56,7 +56,7 @@ STATIC const mp_rom_map_elem_t tft_table[] = { }; MP_DEFINE_CONST_DICT(tft_dict, tft_table); -STATIC const mp_rom_map_elem_t timings800_table[] = { +static const mp_rom_map_elem_t timings800_table[] = { { MP_ROM_QSTR(MP_QSTR_frequency), MP_ROM_INT(6500000) }, // nominal 16MHz, but display is unstable/tears at that frequency { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_INT(800) }, { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_INT(480) }, @@ -75,7 +75,7 @@ STATIC const mp_rom_map_elem_t timings800_table[] = { MP_DEFINE_CONST_DICT(timings800_dict, timings800_table); -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_TFT_PINS), MP_ROM_PTR(&tft_dict) }, diff --git a/ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/pins.c b/ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/pins.c index bad7079457df4..0a30b6614a1d9 100644 --- a/ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/pins.c +++ b/ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/espressif_esp32s3_eye/pins.c b/ports/espressif/boards/espressif_esp32s3_eye/pins.c index cff9827ef5671..d756886f99175 100644 --- a/ports/espressif/boards/espressif_esp32s3_eye/pins.c +++ b/ports/espressif/boards/espressif_esp32s3_eye/pins.c @@ -8,7 +8,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_obj_tuple_t camera_data_tuple = { +static const mp_rom_obj_tuple_t camera_data_tuple = { {&mp_type_tuple}, 8, { @@ -24,7 +24,7 @@ STATIC const mp_rom_obj_tuple_t camera_data_tuple = { }; -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/espressif_esp32s3_lcd_ev/pins.c b/ports/espressif/boards/espressif_esp32s3_lcd_ev/pins.c index a1469a291ad6a..b20fed522e3ea 100644 --- a/ports/espressif/boards/espressif_esp32s3_lcd_ev/pins.c +++ b/ports/espressif/boards/espressif_esp32s3_lcd_ev/pins.c @@ -9,7 +9,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t tft_io_expander_table[] = { +static const mp_rom_map_elem_t tft_io_expander_table[] = { { MP_ROM_QSTR(MP_QSTR_i2c_address), MP_ROM_INT(0x20)}, { MP_ROM_QSTR(MP_QSTR_gpio_address), MP_ROM_INT(1)}, { MP_ROM_QSTR(MP_QSTR_gpio_data_len), MP_ROM_INT(1)}, @@ -21,7 +21,7 @@ STATIC const mp_rom_map_elem_t tft_io_expander_table[] = { }; MP_DEFINE_CONST_DICT(tft_io_expander_dict, tft_io_expander_table); -STATIC const mp_rom_obj_tuple_t tft_r_pins = { +static const mp_rom_obj_tuple_t tft_r_pins = { {&mp_type_tuple}, 5, { @@ -33,7 +33,7 @@ STATIC const mp_rom_obj_tuple_t tft_r_pins = { } }; -STATIC const mp_rom_obj_tuple_t tft_g_pins = { +static const mp_rom_obj_tuple_t tft_g_pins = { {&mp_type_tuple}, 6, { @@ -46,7 +46,7 @@ STATIC const mp_rom_obj_tuple_t tft_g_pins = { } }; -STATIC const mp_rom_obj_tuple_t tft_b_pins = { +static const mp_rom_obj_tuple_t tft_b_pins = { {&mp_type_tuple}, 5, { @@ -58,7 +58,7 @@ STATIC const mp_rom_obj_tuple_t tft_b_pins = { } }; -STATIC const mp_rom_map_elem_t tft_pins_table[] = { +static const mp_rom_map_elem_t tft_pins_table[] = { { MP_ROM_QSTR(MP_QSTR_de), MP_ROM_PTR(&pin_GPIO17) }, { MP_ROM_QSTR(MP_QSTR_vsync), MP_ROM_PTR(&pin_GPIO3) }, { MP_ROM_QSTR(MP_QSTR_hsync), MP_ROM_PTR(&pin_GPIO46) }, @@ -69,7 +69,7 @@ STATIC const mp_rom_map_elem_t tft_pins_table[] = { }; MP_DEFINE_CONST_DICT(tft_pins_dict, tft_pins_table); -STATIC const mp_rom_map_elem_t tft_timings_table[] = { +static const mp_rom_map_elem_t tft_timings_table[] = { { MP_ROM_QSTR(MP_QSTR_frequency), MP_ROM_INT(6500000) }, // nominal 16MHz, but display is unstable/tears at that frequency { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_INT(480) }, { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_INT(480) }, @@ -87,7 +87,7 @@ STATIC const mp_rom_map_elem_t tft_timings_table[] = { }; MP_DEFINE_CONST_DICT(tft_timings_dict, tft_timings_table); -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_TFT_PINS), MP_ROM_PTR(&tft_pins_dict) }, diff --git a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/pins.c b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/pins.c index 9cbc3ee3abe3e..0713000b6ff62 100644 --- a/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/pins.c +++ b/ports/espressif/boards/espressif_esp32s3_usb_otg_n8/pins.c @@ -11,7 +11,7 @@ // Pin names from: // https://espressif-docs.readthedocs-hosted.com/projects/espressif-esp-dev-kits/en/latest/esp32s3/esp32-s3-usb-otg/user_guide.html#pin-layout -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_USB_SEL), MP_ROM_PTR(&pin_GPIO18) }, diff --git a/ports/espressif/boards/espressif_hmi_devkit_1/pins.c b/ports/espressif/boards/espressif_hmi_devkit_1/pins.c index e29129bc74af1..339ec60b8def6 100644 --- a/ports/espressif/boards/espressif_hmi_devkit_1/pins.c +++ b/ports/espressif/boards/espressif_hmi_devkit_1/pins.c @@ -7,7 +7,7 @@ #include "py/objtuple.h" #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_obj_tuple_t lcd_data_tuple = { +static const mp_rom_obj_tuple_t lcd_data_tuple = { {&mp_type_tuple}, 16, { @@ -30,7 +30,7 @@ STATIC const mp_rom_obj_tuple_t lcd_data_tuple = { } }; -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/espressif_kaluga_1.3/pins.c b/ports/espressif/boards/espressif_kaluga_1.3/pins.c index a48f11402e850..993ba3c4f5a2f 100644 --- a/ports/espressif/boards/espressif_kaluga_1.3/pins.c +++ b/ports/espressif/boards/espressif_kaluga_1.3/pins.c @@ -7,7 +7,7 @@ #include "py/objtuple.h" #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_obj_tuple_t camera_data_tuple = { +static const mp_rom_obj_tuple_t camera_data_tuple = { {&mp_type_tuple}, 8, { @@ -22,7 +22,7 @@ STATIC const mp_rom_obj_tuple_t camera_data_tuple = { } }; -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/espressif_kaluga_1/pins.c b/ports/espressif/boards/espressif_kaluga_1/pins.c index 98be2b4d291da..dd2f9e9de84a0 100644 --- a/ports/espressif/boards/espressif_kaluga_1/pins.c +++ b/ports/espressif/boards/espressif_kaluga_1/pins.c @@ -7,7 +7,7 @@ #include "py/objtuple.h" #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_obj_tuple_t camera_data_tuple = { +static const mp_rom_obj_tuple_t camera_data_tuple = { {&mp_type_tuple}, 8, { @@ -22,7 +22,7 @@ STATIC const mp_rom_obj_tuple_t camera_data_tuple = { } }; -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/espressif_saola_1_wroom/pins.c b/ports/espressif/boards/espressif_saola_1_wroom/pins.c index 272ad8b3c95fb..1ace83376358c 100644 --- a/ports/espressif/boards/espressif_saola_1_wroom/pins.c +++ b/ports/espressif/boards/espressif_saola_1_wroom/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/espressif_saola_1_wrover/pins.c b/ports/espressif/boards/espressif_saola_1_wrover/pins.c index 272ad8b3c95fb..1ace83376358c 100644 --- a/ports/espressif/boards/espressif_saola_1_wrover/pins.c +++ b/ports/espressif/boards/espressif_saola_1_wrover/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/firebeetle2_esp32s3/pins.c b/ports/espressif/boards/firebeetle2_esp32s3/pins.c index 6ae7611d6160d..b611924a8983b 100644 --- a/ports/espressif/boards/firebeetle2_esp32s3/pins.c +++ b/ports/espressif/boards/firebeetle2_esp32s3/pins.c @@ -8,7 +8,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_obj_tuple_t camera_data_tuple = { +static const mp_rom_obj_tuple_t camera_data_tuple = { // The order matters. // They must be ordered from low to high (Y2, Y3 .. Y9). @@ -28,7 +28,7 @@ STATIC const mp_rom_obj_tuple_t camera_data_tuple = { }; -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // Left header, module facing down. diff --git a/ports/espressif/boards/flipperzero_wifi_dev/pins.c b/ports/espressif/boards/flipperzero_wifi_dev/pins.c index edb43953e513a..68520bac73e6b 100644 --- a/ports/espressif/boards/flipperzero_wifi_dev/pins.c +++ b/ports/espressif/boards/flipperzero_wifi_dev/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/franzininho_wifi_wroom/pins.c b/ports/espressif/boards/franzininho_wifi_wroom/pins.c index 272ad8b3c95fb..1ace83376358c 100644 --- a/ports/espressif/boards/franzininho_wifi_wroom/pins.c +++ b/ports/espressif/boards/franzininho_wifi_wroom/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/franzininho_wifi_wrover/pins.c b/ports/espressif/boards/franzininho_wifi_wrover/pins.c index 272ad8b3c95fb..1ace83376358c 100644 --- a/ports/espressif/boards/franzininho_wifi_wrover/pins.c +++ b/ports/espressif/boards/franzininho_wifi_wrover/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/gravitech_cucumber_m/pins.c b/ports/espressif/boards/gravitech_cucumber_m/pins.c index 96d99fd3b8084..742fa545a0c3a 100644 --- a/ports/espressif/boards/gravitech_cucumber_m/pins.c +++ b/ports/espressif/boards/gravitech_cucumber_m/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/gravitech_cucumber_ms/pins.c b/ports/espressif/boards/gravitech_cucumber_ms/pins.c index f1bfc0dc4ee48..1d11ede8918ab 100644 --- a/ports/espressif/boards/gravitech_cucumber_ms/pins.c +++ b/ports/espressif/boards/gravitech_cucumber_ms/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/gravitech_cucumber_r/pins.c b/ports/espressif/boards/gravitech_cucumber_r/pins.c index 96d99fd3b8084..742fa545a0c3a 100644 --- a/ports/espressif/boards/gravitech_cucumber_r/pins.c +++ b/ports/espressif/boards/gravitech_cucumber_r/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/gravitech_cucumber_rs/pins.c b/ports/espressif/boards/gravitech_cucumber_rs/pins.c index f1bfc0dc4ee48..1d11ede8918ab 100644 --- a/ports/espressif/boards/gravitech_cucumber_rs/pins.c +++ b/ports/espressif/boards/gravitech_cucumber_rs/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/hardkernel_odroid_go/pins.c b/ports/espressif/boards/hardkernel_odroid_go/pins.c index de80fe22f9999..bfb893af9c2c9 100644 --- a/ports/espressif/boards/hardkernel_odroid_go/pins.c +++ b/ports/espressif/boards/hardkernel_odroid_go/pins.c @@ -10,7 +10,7 @@ // Pin names from: https://wiki.odroid.com/odroid_go/odroid_go -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // Left side diff --git a/ports/espressif/boards/heltec_esp32s3_wifi_lora_v3/pins.c b/ports/espressif/boards/heltec_esp32s3_wifi_lora_v3/pins.c index 2833ca06032a1..fd0fdaba6ecc2 100644 --- a/ports/espressif/boards/heltec_esp32s3_wifi_lora_v3/pins.c +++ b/ports/espressif/boards/heltec_esp32s3_wifi_lora_v3/pins.c @@ -8,7 +8,7 @@ #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/hexky_s2/pins.c b/ports/espressif/boards/hexky_s2/pins.c index 13c979e292987..e340a645f6a52 100644 --- a/ports/espressif/boards/hexky_s2/pins.c +++ b/ports/espressif/boards/hexky_s2/pins.c @@ -8,7 +8,7 @@ #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // ANALOG PINS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO1) }, diff --git a/ports/espressif/boards/hiibot_iots2/pins.c b/ports/espressif/boards/hiibot_iots2/pins.c index c011f056edd9c..c1203abdb3150 100644 --- a/ports/espressif/boards/hiibot_iots2/pins.c +++ b/ports/espressif/boards/hiibot_iots2/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_global_dict_table[] = { +static const mp_rom_map_elem_t board_global_dict_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/lilygo_tdeck/pins.c b/ports/espressif/boards/lilygo_tdeck/pins.c index 50c368dd6f236..256c1453149f0 100644 --- a/ports/espressif/boards/lilygo_tdeck/pins.c +++ b/ports/espressif/boards/lilygo_tdeck/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/lilygo_tdisplay_s3/pins.c b/ports/espressif/boards/lilygo_tdisplay_s3/pins.c index 04530b4c9a1f7..55df1e6988c32 100644 --- a/ports/espressif/boards/lilygo_tdisplay_s3/pins.c +++ b/ports/espressif/boards/lilygo_tdisplay_s3/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BUTTON0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/lilygo_tembed_esp32s3/pins.c b/ports/espressif/boards/lilygo_tembed_esp32s3/pins.c index 414a42a358c08..58cf8a71e27a8 100644 --- a/ports/espressif/boards/lilygo_tembed_esp32s3/pins.c +++ b/ports/espressif/boards/lilygo_tembed_esp32s3/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/lilygo_ttgo_t-01c3/pins.c b/ports/espressif/boards/lilygo_ttgo_t-01c3/pins.c index af37ae12ab589..85037490ce2c8 100644 --- a/ports/espressif/boards/lilygo_ttgo_t-01c3/pins.c +++ b/ports/espressif/boards/lilygo_ttgo_t-01c3/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) }, diff --git a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/pins.c b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/pins.c index 6149a862bc943..5941337ccbdc2 100644 --- a/ports/espressif/boards/lilygo_ttgo_t-oi-plus/pins.c +++ b/ports/espressif/boards/lilygo_ttgo_t-oi-plus/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) }, { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_GPIO2) }, diff --git a/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/pins.c b/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/pins.c index 3b48b40002527..4bf9d604fefa4 100644 --- a/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/pins.c +++ b/ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/lilygo_ttgo_t8_s2/pins.c b/ports/espressif/boards/lilygo_ttgo_t8_s2/pins.c index f3daa6fa4ea20..13cbaba7f1a43 100644 --- a/ports/espressif/boards/lilygo_ttgo_t8_s2/pins.c +++ b/ports/espressif/boards/lilygo_ttgo_t8_s2/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/pins.c b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/pins.c index 36ebf6325b0e8..8e11cd070face 100644 --- a/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/pins.c +++ b/ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/pins.c b/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/pins.c index cc9c7240f55cc..199b675fe5d7f 100644 --- a/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/pins.c +++ b/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_16m/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BUTTON0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_4m/pins.c b/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_4m/pins.c index 1181147f92124..e241d8480e889 100644 --- a/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_4m/pins.c +++ b/ports/espressif/boards/lilygo_ttgo_tdisplay_esp32_4m/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BUTTON0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/lilygo_twatch_2020_v3/pins.c b/ports/espressif/boards/lilygo_twatch_2020_v3/pins.c index c3dc1e137af2f..9942a9e3f31c6 100644 --- a/ports/espressif/boards/lilygo_twatch_2020_v3/pins.c +++ b/ports/espressif/boards/lilygo_twatch_2020_v3/pins.c @@ -9,7 +9,7 @@ CIRCUITPY_BOARD_BUS_SINGLETON(touch_i2c, i2c, 1) -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // buzz buzz diff --git a/ports/espressif/boards/lolin_c3_mini/pins.c b/ports/espressif/boards/lolin_c3_mini/pins.c index fa9acef968eda..b4661100072f5 100644 --- a/ports/espressif/boards/lolin_c3_mini/pins.c +++ b/ports/espressif/boards/lolin_c3_mini/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // C3 Mini Board diff --git a/ports/espressif/boards/lolin_c3_pico/pins.c b/ports/espressif/boards/lolin_c3_pico/pins.c index 687fa443cf774..00fc01a6de86a 100644 --- a/ports/espressif/boards/lolin_c3_pico/pins.c +++ b/ports/espressif/boards/lolin_c3_pico/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // C3 Mini Board diff --git a/ports/espressif/boards/lolin_s2_mini/pins.c b/ports/espressif/boards/lolin_s2_mini/pins.c index 066c906b55bc6..55057d0db8f65 100644 --- a/ports/espressif/boards/lolin_s2_mini/pins.c +++ b/ports/espressif/boards/lolin_s2_mini/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // S2 Mini Board bottom, right, top-bottom diff --git a/ports/espressif/boards/lolin_s2_pico/pins.c b/ports/espressif/boards/lolin_s2_pico/pins.c index 61e8ac49e5f81..b182639d56588 100644 --- a/ports/espressif/boards/lolin_s2_pico/pins.c +++ b/ports/espressif/boards/lolin_s2_pico/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // Not broken out - Button diff --git a/ports/espressif/boards/lolin_s3/pins.c b/ports/espressif/boards/lolin_s3/pins.c index 155b1970118bf..a256c5f79b187 100644 --- a/ports/espressif/boards/lolin_s3/pins.c +++ b/ports/espressif/boards/lolin_s3/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/lolin_s3_mini/pins.c b/ports/espressif/boards/lolin_s3_mini/pins.c index 3d3cca2cc7a6c..a4f8f4e2e1043 100644 --- a/ports/espressif/boards/lolin_s3_mini/pins.c +++ b/ports/espressif/boards/lolin_s3_mini/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/lolin_s3_pro/pins.c b/ports/espressif/boards/lolin_s3_pro/pins.c index 61546d5bf12a8..7c56ae4da52f3 100644 --- a/ports/espressif/boards/lolin_s3_pro/pins.c +++ b/ports/espressif/boards/lolin_s3_pro/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/luatos_core_esp32c3/pins.c b/ports/espressif/boards/luatos_core_esp32c3/pins.c index d933e8f55c551..d0d82fff085ec 100644 --- a/ports/espressif/boards/luatos_core_esp32c3/pins.c +++ b/ports/espressif/boards/luatos_core_esp32c3/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // Luatos Core ESP32-C3 diff --git a/ports/espressif/boards/luatos_core_esp32c3_ch343/pins.c b/ports/espressif/boards/luatos_core_esp32c3_ch343/pins.c index d933e8f55c551..d0d82fff085ec 100644 --- a/ports/espressif/boards/luatos_core_esp32c3_ch343/pins.c +++ b/ports/espressif/boards/luatos_core_esp32c3_ch343/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // Luatos Core ESP32-C3 diff --git a/ports/espressif/boards/m5stack_atom_echo/pins.c b/ports/espressif/boards/m5stack_atom_echo/pins.c index 54115bf172986..3a78c5ead72c9 100644 --- a/ports/espressif/boards/m5stack_atom_echo/pins.c +++ b/ports/espressif/boards/m5stack_atom_echo/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // External pins are in silkscreen order, from top to bottom, left side, then right side diff --git a/ports/espressif/boards/m5stack_atom_lite/pins.c b/ports/espressif/boards/m5stack_atom_lite/pins.c index e0b26d97e8ec7..4afb92f3bcebf 100644 --- a/ports/espressif/boards/m5stack_atom_lite/pins.c +++ b/ports/espressif/boards/m5stack_atom_lite/pins.c @@ -9,7 +9,7 @@ CIRCUITPY_BOARD_BUS_SINGLETON(porta_i2c, i2c, 1) -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // External pins are in silkscreen order, from top to bottom, left side, then right side diff --git a/ports/espressif/boards/m5stack_atom_matrix/pins.c b/ports/espressif/boards/m5stack_atom_matrix/pins.c index 4868976d41826..f1d62abee1083 100644 --- a/ports/espressif/boards/m5stack_atom_matrix/pins.c +++ b/ports/espressif/boards/m5stack_atom_matrix/pins.c @@ -9,7 +9,7 @@ CIRCUITPY_BOARD_BUS_SINGLETON(porta_i2c, i2c, 1) -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // External pins are in silkscreen order, from top to bottom, left side, then right side diff --git a/ports/espressif/boards/m5stack_atom_u/pins.c b/ports/espressif/boards/m5stack_atom_u/pins.c index 9cc7e80e0c502..e0d2a251bbbd4 100644 --- a/ports/espressif/boards/m5stack_atom_u/pins.c +++ b/ports/espressif/boards/m5stack_atom_u/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // External pins are in silkscreen order, from top to bottom, left side, then right side diff --git a/ports/espressif/boards/m5stack_atoms3/pins.c b/ports/espressif/boards/m5stack_atoms3/pins.c index db5dec3e18d24..e369ffffd3d85 100644 --- a/ports/espressif/boards/m5stack_atoms3/pins.c +++ b/ports/espressif/boards/m5stack_atoms3/pins.c @@ -9,7 +9,7 @@ CIRCUITPY_BOARD_BUS_SINGLETON(porta_i2c, i2c, 1) -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_PORTA_SCL), MP_ROM_PTR(&pin_GPIO1) }, diff --git a/ports/espressif/boards/m5stack_atoms3_lite/pins.c b/ports/espressif/boards/m5stack_atoms3_lite/pins.c index c533de59c730b..24274539306cc 100644 --- a/ports/espressif/boards/m5stack_atoms3_lite/pins.c +++ b/ports/espressif/boards/m5stack_atoms3_lite/pins.c @@ -8,7 +8,7 @@ CIRCUITPY_BOARD_BUS_SINGLETON(porta_i2c, i2c, 1) -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_PORTA_SCL), MP_ROM_PTR(&pin_GPIO1) }, diff --git a/ports/espressif/boards/m5stack_atoms3u/pins.c b/ports/espressif/boards/m5stack_atoms3u/pins.c index 137b93b1d03e8..ad4b16e6d0266 100644 --- a/ports/espressif/boards/m5stack_atoms3u/pins.c +++ b/ports/espressif/boards/m5stack_atoms3u/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_PORTA_SCL), MP_ROM_PTR(&pin_GPIO1) }, diff --git a/ports/espressif/boards/m5stack_cardputer/pins.c b/ports/espressif/boards/m5stack_cardputer/pins.c index 52079bfff9229..7fff3e11e5e7b 100644 --- a/ports/espressif/boards/m5stack_cardputer/pins.c +++ b/ports/espressif/boards/m5stack_cardputer/pins.c @@ -8,7 +8,7 @@ #include "shared-module/displayio/__init__.h" CIRCUITPY_BOARD_BUS_SINGLETON(sd_spi, spi, 1) -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // Port A diff --git a/ports/espressif/boards/m5stack_core2/pins.c b/ports/espressif/boards/m5stack_core2/pins.c index 029e80fce9979..5deaba82f4f74 100644 --- a/ports/espressif/boards/m5stack_core2/pins.c +++ b/ports/espressif/boards/m5stack_core2/pins.c @@ -9,7 +9,7 @@ CIRCUITPY_BOARD_BUS_SINGLETON(porta_i2c, i2c, 1) -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // External pins are in silkscreen order, from top to bottom, left side, then right side diff --git a/ports/espressif/boards/m5stack_core_basic/pins.c b/ports/espressif/boards/m5stack_core_basic/pins.c index 1ef887dfde667..c56375242f353 100644 --- a/ports/espressif/boards/m5stack_core_basic/pins.c +++ b/ports/espressif/boards/m5stack_core_basic/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // External pins are in silkscreen order, from top to bottom, left side, then right side diff --git a/ports/espressif/boards/m5stack_core_fire/pins.c b/ports/espressif/boards/m5stack_core_fire/pins.c index e0ae325b516e9..700b20c91ec38 100644 --- a/ports/espressif/boards/m5stack_core_fire/pins.c +++ b/ports/espressif/boards/m5stack_core_fire/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // External pins are in silkscreen order, from top to bottom, left side, then right side diff --git a/ports/espressif/boards/m5stack_cores3/pins.c b/ports/espressif/boards/m5stack_cores3/pins.c index 5735f54cf09f6..2ebb225277ded 100644 --- a/ports/espressif/boards/m5stack_cores3/pins.c +++ b/ports/espressif/boards/m5stack_cores3/pins.c @@ -8,7 +8,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_obj_tuple_t camera_data_tuple = { +static const mp_rom_obj_tuple_t camera_data_tuple = { {&mp_type_tuple}, 8, { @@ -25,7 +25,7 @@ STATIC const mp_rom_obj_tuple_t camera_data_tuple = { CIRCUITPY_BOARD_BUS_SINGLETON(porta_i2c, i2c, 1) -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // M5 Bus (except I2S & PORT B) diff --git a/ports/espressif/boards/m5stack_dial/pins.c b/ports/espressif/boards/m5stack_dial/pins.c index b33486aa3349d..27f40064a09b9 100644 --- a/ports/espressif/boards/m5stack_dial/pins.c +++ b/ports/espressif/boards/m5stack_dial/pins.c @@ -10,7 +10,7 @@ CIRCUITPY_BOARD_BUS_SINGLETON(porta_i2c, i2c, 1) -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // Port A diff --git a/ports/espressif/boards/m5stack_m5paper/pins.c b/ports/espressif/boards/m5stack_m5paper/pins.c index 8a0d1a6c5d7ed..f474a993e1852 100644 --- a/ports/espressif/boards/m5stack_m5paper/pins.c +++ b/ports/espressif/boards/m5stack_m5paper/pins.c @@ -9,7 +9,7 @@ CIRCUITPY_BOARD_BUS_SINGLETON(porta_i2c, i2c, 1) -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // Power MAIN diff --git a/ports/espressif/boards/m5stack_stamp_c3/pins.c b/ports/espressif/boards/m5stack_stamp_c3/pins.c index 55d52488f361f..e3e38e6e96138 100644 --- a/ports/espressif/boards/m5stack_stamp_c3/pins.c +++ b/ports/espressif/boards/m5stack_stamp_c3/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // port A diff --git a/ports/espressif/boards/m5stack_stick_c/pins.c b/ports/espressif/boards/m5stack_stick_c/pins.c index 55c88fafe7c00..6386004156b8e 100644 --- a/ports/espressif/boards/m5stack_stick_c/pins.c +++ b/ports/espressif/boards/m5stack_stick_c/pins.c @@ -9,7 +9,7 @@ CIRCUITPY_BOARD_BUS_SINGLETON(porta_i2c, i2c, 1) -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // External pins are in silkscreen order, from top to bottom, left side, then right side diff --git a/ports/espressif/boards/m5stack_stick_c_plus/pins.c b/ports/espressif/boards/m5stack_stick_c_plus/pins.c index af3f2eb531c54..53fd6a731cfaa 100644 --- a/ports/espressif/boards/m5stack_stick_c_plus/pins.c +++ b/ports/espressif/boards/m5stack_stick_c_plus/pins.c @@ -9,7 +9,7 @@ CIRCUITPY_BOARD_BUS_SINGLETON(porta_i2c, i2c, 1) -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // External pins are in silkscreen order, from top to bottom, left side, then right side diff --git a/ports/espressif/boards/m5stack_timer_camera_x/pins.c b/ports/espressif/boards/m5stack_timer_camera_x/pins.c index ccba5c06abefa..44c7ac02a3973 100644 --- a/ports/espressif/boards/m5stack_timer_camera_x/pins.c +++ b/ports/espressif/boards/m5stack_timer_camera_x/pins.c @@ -11,7 +11,7 @@ CIRCUITPY_BOARD_BUS_SINGLETON(bm8563_i2c, i2c, 1) // RTC CIRCUITPY_BOARD_BUS_SINGLETON(sscb_i2c, i2c, 2) // Camera sensor -STATIC const mp_rom_obj_tuple_t camera_data_tuple = { +static const mp_rom_obj_tuple_t camera_data_tuple = { // The order matters. // They must be ordered from low to high (Y2, Y3 .. Y9). @@ -30,7 +30,7 @@ STATIC const mp_rom_obj_tuple_t camera_data_tuple = { } }; -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO2) }, diff --git a/ports/espressif/boards/magiclick_s3_n4r2/pins.c b/ports/espressif/boards/magiclick_s3_n4r2/pins.c index 3628dd9498615..38fa2f8973351 100644 --- a/ports/espressif/boards/magiclick_s3_n4r2/pins.c +++ b/ports/espressif/boards/magiclick_s3_n4r2/pins.c @@ -5,7 +5,7 @@ // SPDX-License-Identifier: MIT #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) }, diff --git a/ports/espressif/boards/maker_badge/pins.c b/ports/espressif/boards/maker_badge/pins.c index d0dfd057baaca..7b9be5b07c47f 100644 --- a/ports/espressif/boards/maker_badge/pins.c +++ b/ports/espressif/boards/maker_badge/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/makerfabs_tft7/pins.c b/ports/espressif/boards/makerfabs_tft7/pins.c index 0d4ade4aa78e5..9f9730c942399 100644 --- a/ports/espressif/boards/makerfabs_tft7/pins.c +++ b/ports/espressif/boards/makerfabs_tft7/pins.c @@ -7,7 +7,7 @@ #include "py/objtuple.h" #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_obj_tuple_t tft_r_pins = { +static const mp_rom_obj_tuple_t tft_r_pins = { {&mp_type_tuple}, 5, { @@ -19,7 +19,7 @@ STATIC const mp_rom_obj_tuple_t tft_r_pins = { } }; -STATIC const mp_rom_obj_tuple_t tft_g_pins = { +static const mp_rom_obj_tuple_t tft_g_pins = { {&mp_type_tuple}, 6, { @@ -32,7 +32,7 @@ STATIC const mp_rom_obj_tuple_t tft_g_pins = { } }; -STATIC const mp_rom_obj_tuple_t tft_b_pins = { +static const mp_rom_obj_tuple_t tft_b_pins = { {&mp_type_tuple}, 5, { @@ -44,7 +44,7 @@ STATIC const mp_rom_obj_tuple_t tft_b_pins = { } }; -STATIC const mp_rom_map_elem_t tft_pins_table[] = { +static const mp_rom_map_elem_t tft_pins_table[] = { { MP_ROM_QSTR(MP_QSTR_de), MP_ROM_PTR(&pin_GPIO40) }, { MP_ROM_QSTR(MP_QSTR_vsync), MP_ROM_PTR(&pin_GPIO41) }, { MP_ROM_QSTR(MP_QSTR_hsync), MP_ROM_PTR(&pin_GPIO39) }, @@ -55,7 +55,7 @@ STATIC const mp_rom_map_elem_t tft_pins_table[] = { }; MP_DEFINE_CONST_DICT(tft_pins_dict, tft_pins_table); -STATIC const mp_rom_map_elem_t timings800_table[] = { +static const mp_rom_map_elem_t timings800_table[] = { { MP_ROM_QSTR(MP_QSTR_frequency), MP_ROM_INT(6500000) }, // nominal 16MHz, but display is unstable/tears at that frequency { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_INT(800) }, { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_INT(480) }, @@ -73,7 +73,7 @@ STATIC const mp_rom_map_elem_t timings800_table[] = { }; MP_DEFINE_CONST_DICT(timings800_dict, timings800_table); -STATIC const mp_rom_map_elem_t timings1024_table[] = { +static const mp_rom_map_elem_t timings1024_table[] = { { MP_ROM_QSTR(MP_QSTR_frequency), MP_ROM_INT(10000000) }, // nominal 16MHz, but display is unstable/tears at that frequency { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_INT(1024) }, { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_INT(600) }, @@ -91,7 +91,7 @@ STATIC const mp_rom_map_elem_t timings1024_table[] = { }; MP_DEFINE_CONST_DICT(timings1024_dict, timings1024_table); -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_TFT_PINS), MP_ROM_PTR(&tft_pins_dict) }, diff --git a/ports/espressif/boards/makergo_esp32c3_supermini/pins.c b/ports/espressif/boards/makergo_esp32c3_supermini/pins.c index e858c703ed9d6..bc599c313bb24 100644 --- a/ports/espressif/boards/makergo_esp32c3_supermini/pins.c +++ b/ports/espressif/boards/makergo_esp32c3_supermini/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // GPIO diff --git a/ports/espressif/boards/microdev_micro_c3/pins.c b/ports/espressif/boards/microdev_micro_c3/pins.c index 80d691f875ec6..75915f184cada 100644 --- a/ports/espressif/boards/microdev_micro_c3/pins.c +++ b/ports/espressif/boards/microdev_micro_c3/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/microdev_micro_s2/pins.c b/ports/espressif/boards/microdev_micro_s2/pins.c index b4c389ccb24ae..9fd67575e2148 100644 --- a/ports/espressif/boards/microdev_micro_s2/pins.c +++ b/ports/espressif/boards/microdev_micro_s2/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/mixgo_ce_serial/pins.c b/ports/espressif/boards/mixgo_ce_serial/pins.c index 76e77ec44dec6..4555a77026012 100644 --- a/ports/espressif/boards/mixgo_ce_serial/pins.c +++ b/ports/espressif/boards/mixgo_ce_serial/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/mixgo_ce_udisk/pins.c b/ports/espressif/boards/mixgo_ce_udisk/pins.c index 76e77ec44dec6..4555a77026012 100644 --- a/ports/espressif/boards/mixgo_ce_udisk/pins.c +++ b/ports/espressif/boards/mixgo_ce_udisk/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/morpheans_morphesp-240/pins.c b/ports/espressif/boards/morpheans_morphesp-240/pins.c index 2bfc33067456a..cbdccfd325833 100644 --- a/ports/espressif/boards/morpheans_morphesp-240/pins.c +++ b/ports/espressif/boards/morpheans_morphesp-240/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/muselab_nanoesp32_s2_wroom/pins.c b/ports/espressif/boards/muselab_nanoesp32_s2_wroom/pins.c index 272ad8b3c95fb..1ace83376358c 100644 --- a/ports/espressif/boards/muselab_nanoesp32_s2_wroom/pins.c +++ b/ports/espressif/boards/muselab_nanoesp32_s2_wroom/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/muselab_nanoesp32_s2_wrover/pins.c b/ports/espressif/boards/muselab_nanoesp32_s2_wrover/pins.c index 272ad8b3c95fb..1ace83376358c 100644 --- a/ports/espressif/boards/muselab_nanoesp32_s2_wrover/pins.c +++ b/ports/espressif/boards/muselab_nanoesp32_s2_wrover/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/odt_pixelwing_esp32_s2/pins.c b/ports/espressif/boards/odt_pixelwing_esp32_s2/pins.c index b4ccf3b067c50..76b2aaf45f1d1 100644 --- a/ports/espressif/boards/odt_pixelwing_esp32_s2/pins.c +++ b/ports/espressif/boards/odt_pixelwing_esp32_s2/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO21) }, diff --git a/ports/espressif/boards/oxocard_artwork/pins.c b/ports/espressif/boards/oxocard_artwork/pins.c index f72c4722e4515..39036909ef80a 100644 --- a/ports/espressif/boards/oxocard_artwork/pins.c +++ b/ports/espressif/boards/oxocard_artwork/pins.c @@ -9,7 +9,7 @@ CIRCUITPY_BOARD_BUS_SINGLETON(stemma_i2c, i2c, 1) -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BTN5), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/oxocard_connect/pins.c b/ports/espressif/boards/oxocard_connect/pins.c index c589f3a2f4a6c..dbee3e0c435eb 100644 --- a/ports/espressif/boards/oxocard_connect/pins.c +++ b/ports/espressif/boards/oxocard_connect/pins.c @@ -9,7 +9,7 @@ CIRCUITPY_BOARD_BUS_SINGLETON(stemma_i2c, i2c, 1) -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BTN5), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/oxocard_galaxy/pins.c b/ports/espressif/boards/oxocard_galaxy/pins.c index ed26a79a25f1d..2aab9629dec6e 100644 --- a/ports/espressif/boards/oxocard_galaxy/pins.c +++ b/ports/espressif/boards/oxocard_galaxy/pins.c @@ -9,7 +9,7 @@ CIRCUITPY_BOARD_BUS_SINGLETON(stemma_i2c, i2c, 1) -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BTN5), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/oxocard_science/pins.c b/ports/espressif/boards/oxocard_science/pins.c index 43b5e43926559..b47cdf38d8ea5 100644 --- a/ports/espressif/boards/oxocard_science/pins.c +++ b/ports/espressif/boards/oxocard_science/pins.c @@ -9,7 +9,7 @@ CIRCUITPY_BOARD_BUS_SINGLETON(stemma_i2c, i2c, 1) -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BTN5), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/seeed_xiao_esp32c3/pins.c b/ports/espressif/boards/seeed_xiao_esp32c3/pins.c index 11d4d536de001..f274add0c2241 100644 --- a/ports/espressif/boards/seeed_xiao_esp32c3/pins.c +++ b/ports/espressif/boards/seeed_xiao_esp32c3/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO2) }, diff --git a/ports/espressif/boards/sensebox_mcu_esp32s2/pins.c b/ports/espressif/boards/sensebox_mcu_esp32s2/pins.c index c2504df4ba8b6..0325ae7d7ae71 100644 --- a/ports/espressif/boards/sensebox_mcu_esp32s2/pins.c +++ b/ports/espressif/boards/sensebox_mcu_esp32s2/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/smartbeedesigns_bee_data_logger/pins.c b/ports/espressif/boards/smartbeedesigns_bee_data_logger/pins.c index adf5bc0c2f529..8eefc7fd055f6 100644 --- a/ports/espressif/boards/smartbeedesigns_bee_data_logger/pins.c +++ b/ports/espressif/boards/smartbeedesigns_bee_data_logger/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) }, diff --git a/ports/espressif/boards/smartbeedesigns_bee_motion_s3/pins.c b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/pins.c index c4371a480a449..0fb9decd87a42 100644 --- a/ports/espressif/boards/smartbeedesigns_bee_motion_s3/pins.c +++ b/ports/espressif/boards/smartbeedesigns_bee_motion_s3/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS diff --git a/ports/espressif/boards/smartbeedesigns_bee_s3/pins.c b/ports/espressif/boards/smartbeedesigns_bee_s3/pins.c index de714028c29c7..9f8fde4d7d515 100644 --- a/ports/espressif/boards/smartbeedesigns_bee_s3/pins.c +++ b/ports/espressif/boards/smartbeedesigns_bee_s3/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) }, diff --git a/ports/espressif/boards/spotpear_esp32c3_lcd_1_44/pins.c b/ports/espressif/boards/spotpear_esp32c3_lcd_1_44/pins.c index ec65b6fe70e9a..a811f9fa7669f 100644 --- a/ports/espressif/boards/spotpear_esp32c3_lcd_1_44/pins.c +++ b/ports/espressif/boards/spotpear_esp32c3_lcd_1_44/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // buttons diff --git a/ports/espressif/boards/sqfmi_watchy/pins.c b/ports/espressif/boards/sqfmi_watchy/pins.c index 86583d86cf481..e37ff7d5a1d34 100644 --- a/ports/espressif/boards/sqfmi_watchy/pins.c +++ b/ports/espressif/boards/sqfmi_watchy/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_VBAT), MP_ROM_PTR(&pin_GPIO34) }, diff --git a/ports/espressif/boards/sunton_esp32_2424S012/pins.c b/ports/espressif/boards/sunton_esp32_2424S012/pins.c index 0492365127305..8843fbdb7c1da 100644 --- a/ports/espressif/boards/sunton_esp32_2424S012/pins.c +++ b/ports/espressif/boards/sunton_esp32_2424S012/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // User button diff --git a/ports/espressif/boards/sunton_esp32_2432S028/pins.c b/ports/espressif/boards/sunton_esp32_2432S028/pins.c index 25c9b50f0066a..b852ab11e04c2 100644 --- a/ports/espressif/boards/sunton_esp32_2432S028/pins.c +++ b/ports/espressif/boards/sunton_esp32_2432S028/pins.c @@ -11,7 +11,7 @@ CIRCUITPY_BOARD_BUS_SINGLETON(sd_spi, spi, 0) CIRCUITPY_BOARD_BUS_SINGLETON(touch_spi, spi, 1) CIRCUITPY_BOARD_BUS_SINGLETON(lcd_spi, spi, 2) -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // Boot button diff --git a/ports/espressif/boards/sunton_esp32_8048S070/pins.c b/ports/espressif/boards/sunton_esp32_8048S070/pins.c index 1597b90e3bcd9..697eff9b8ef6b 100644 --- a/ports/espressif/boards/sunton_esp32_8048S070/pins.c +++ b/ports/espressif/boards/sunton_esp32_8048S070/pins.c @@ -8,7 +8,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_obj_tuple_t tft_r_pins = { +static const mp_rom_obj_tuple_t tft_r_pins = { {&mp_type_tuple}, 5, { @@ -20,7 +20,7 @@ STATIC const mp_rom_obj_tuple_t tft_r_pins = { } }; -STATIC const mp_rom_obj_tuple_t tft_g_pins = { +static const mp_rom_obj_tuple_t tft_g_pins = { {&mp_type_tuple}, 6, { @@ -33,7 +33,7 @@ STATIC const mp_rom_obj_tuple_t tft_g_pins = { } }; -STATIC const mp_rom_obj_tuple_t tft_b_pins = { +static const mp_rom_obj_tuple_t tft_b_pins = { {&mp_type_tuple}, 5, { @@ -45,7 +45,7 @@ STATIC const mp_rom_obj_tuple_t tft_b_pins = { } }; -STATIC const mp_rom_map_elem_t tft_pins_table[] = { +static const mp_rom_map_elem_t tft_pins_table[] = { { MP_ROM_QSTR(MP_QSTR_de), MP_ROM_PTR(&pin_GPIO41) }, { MP_ROM_QSTR(MP_QSTR_vsync), MP_ROM_PTR(&pin_GPIO40) }, { MP_ROM_QSTR(MP_QSTR_hsync), MP_ROM_PTR(&pin_GPIO39) }, @@ -56,7 +56,7 @@ STATIC const mp_rom_map_elem_t tft_pins_table[] = { }; MP_DEFINE_CONST_DICT(tft_pins_dict, tft_pins_table); -STATIC const mp_rom_map_elem_t timings_table[] = { +static const mp_rom_map_elem_t timings_table[] = { { MP_ROM_QSTR(MP_QSTR_frequency), MP_ROM_INT(12500000) }, { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_INT(800) }, { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_INT(480) }, @@ -75,7 +75,7 @@ STATIC const mp_rom_map_elem_t timings_table[] = { }; MP_DEFINE_CONST_DICT(timings_dict, timings_table); -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // Display constructs diff --git a/ports/espressif/boards/targett_module_clip_wroom/pins.c b/ports/espressif/boards/targett_module_clip_wroom/pins.c index e0d12c035ad71..108c40f1636f0 100644 --- a/ports/espressif/boards/targett_module_clip_wroom/pins.c +++ b/ports/espressif/boards/targett_module_clip_wroom/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/targett_module_clip_wrover/pins.c b/ports/espressif/boards/targett_module_clip_wrover/pins.c index e0d12c035ad71..108c40f1636f0 100644 --- a/ports/espressif/boards/targett_module_clip_wrover/pins.c +++ b/ports/espressif/boards/targett_module_clip_wrover/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/unexpectedmaker_bling/pins.c b/ports/espressif/boards/unexpectedmaker_bling/pins.c index 7de9b5fb57785..ae53c1fae951d 100644 --- a/ports/espressif/boards/unexpectedmaker_bling/pins.c +++ b/ports/espressif/boards/unexpectedmaker_bling/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/unexpectedmaker_blizzard_s3/pins.c b/ports/espressif/boards/unexpectedmaker_blizzard_s3/pins.c index d451c77d2bb9c..24730cf4fa9e4 100644 --- a/ports/espressif/boards/unexpectedmaker_blizzard_s3/pins.c +++ b/ports/espressif/boards/unexpectedmaker_blizzard_s3/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/unexpectedmaker_feathers2/pins.c b/ports/espressif/boards/unexpectedmaker_feathers2/pins.c index 66932c527e271..c0e8f931faf5a 100644 --- a/ports/espressif/boards/unexpectedmaker_feathers2/pins.c +++ b/ports/espressif/boards/unexpectedmaker_feathers2/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) }, diff --git a/ports/espressif/boards/unexpectedmaker_feathers2_neo/pins.c b/ports/espressif/boards/unexpectedmaker_feathers2_neo/pins.c index 5d004a163eef2..37b64938a9926 100644 --- a/ports/espressif/boards/unexpectedmaker_feathers2_neo/pins.c +++ b/ports/espressif/boards/unexpectedmaker_feathers2_neo/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/pins.c b/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/pins.c index bafa643cde69d..30281a1e784f5 100644 --- a/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/pins.c +++ b/ports/espressif/boards/unexpectedmaker_feathers2_prerelease/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) }, diff --git a/ports/espressif/boards/unexpectedmaker_feathers3/pins.c b/ports/espressif/boards/unexpectedmaker_feathers3/pins.c index 17078c078cc22..e611348caa0b9 100644 --- a/ports/espressif/boards/unexpectedmaker_feathers3/pins.c +++ b/ports/espressif/boards/unexpectedmaker_feathers3/pins.c @@ -8,7 +8,7 @@ CIRCUITPY_BOARD_BUS_SINGLETON(stemma_i2c, i2c, 1) -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/unexpectedmaker_nanos3/pins.c b/ports/espressif/boards/unexpectedmaker_nanos3/pins.c index 9f72128061638..b144c611b3f4e 100644 --- a/ports/espressif/boards/unexpectedmaker_nanos3/pins.c +++ b/ports/espressif/boards/unexpectedmaker_nanos3/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/unexpectedmaker_pros3/pins.c b/ports/espressif/boards/unexpectedmaker_pros3/pins.c index 861e73b28890b..60a29af7208f9 100644 --- a/ports/espressif/boards/unexpectedmaker_pros3/pins.c +++ b/ports/espressif/boards/unexpectedmaker_pros3/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/unexpectedmaker_tinyc6/pins.c b/ports/espressif/boards/unexpectedmaker_tinyc6/pins.c index 252cea123ac9f..0f38eedeb2ed6 100644 --- a/ports/espressif/boards/unexpectedmaker_tinyc6/pins.c +++ b/ports/espressif/boards/unexpectedmaker_tinyc6/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/unexpectedmaker_tinypico/pins.c b/ports/espressif/boards/unexpectedmaker_tinypico/pins.c index 5292f2c28ebf3..5aa4b4bdad505 100644 --- a/ports/espressif/boards/unexpectedmaker_tinypico/pins.c +++ b/ports/espressif/boards/unexpectedmaker_tinypico/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) }, diff --git a/ports/espressif/boards/unexpectedmaker_tinypico_nano/pins.c b/ports/espressif/boards/unexpectedmaker_tinypico_nano/pins.c index aeaa285ba4789..32d57398685ff 100644 --- a/ports/espressif/boards/unexpectedmaker_tinypico_nano/pins.c +++ b/ports/espressif/boards/unexpectedmaker_tinypico_nano/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/unexpectedmaker_tinys2/pins.c b/ports/espressif/boards/unexpectedmaker_tinys2/pins.c index 12e7c371b3d9d..0da1f6ce392a3 100644 --- a/ports/espressif/boards/unexpectedmaker_tinys2/pins.c +++ b/ports/espressif/boards/unexpectedmaker_tinys2/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/unexpectedmaker_tinys3/pins.c b/ports/espressif/boards/unexpectedmaker_tinys3/pins.c index 0cc756de69337..23b8b960bf666 100644 --- a/ports/espressif/boards/unexpectedmaker_tinys3/pins.c +++ b/ports/espressif/boards/unexpectedmaker_tinys3/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/unexpectedmaker_tinywatch_s3/pins.c b/ports/espressif/boards/unexpectedmaker_tinywatch_s3/pins.c index 2345fbfb5c020..12a78b2539987 100644 --- a/ports/espressif/boards/unexpectedmaker_tinywatch_s3/pins.c +++ b/ports/espressif/boards/unexpectedmaker_tinywatch_s3/pins.c @@ -8,7 +8,7 @@ CIRCUITPY_BOARD_BUS_SINGLETON(touch_i2c, i2c, 1) -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/pins.c b/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/pins.c index e9b743c458306..6e7b08b2d6467 100644 --- a/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/pins.c +++ b/ports/espressif/boards/waveshare_esp32_s2_pico_lcd/pins.c @@ -8,7 +8,7 @@ #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/waveshare_esp32_s3_geek/pins.c b/ports/espressif/boards/waveshare_esp32_s3_geek/pins.c index 83ad1905853db..01c3baf8c9f8f 100644 --- a/ports/espressif/boards/waveshare_esp32_s3_geek/pins.c +++ b/ports/espressif/boards/waveshare_esp32_s3_geek/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // Boot button (can also be used as regular button) diff --git a/ports/espressif/boards/waveshare_esp32_s3_lcd_1_28/pins.c b/ports/espressif/boards/waveshare_esp32_s3_lcd_1_28/pins.c index eb59636dedad6..51943badf03e5 100644 --- a/ports/espressif/boards/waveshare_esp32_s3_lcd_1_28/pins.c +++ b/ports/espressif/boards/waveshare_esp32_s3_lcd_1_28/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // User accessible GPIO diff --git a/ports/espressif/boards/waveshare_esp32_s3_pico/pins.c b/ports/espressif/boards/waveshare_esp32_s3_pico/pins.c index bc563ae3c9578..1cf578a1aaab3 100644 --- a/ports/espressif/boards/waveshare_esp32_s3_pico/pins.c +++ b/ports/espressif/boards/waveshare_esp32_s3_pico/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/waveshare_esp32_s3_zero/pins.c b/ports/espressif/boards/waveshare_esp32_s3_zero/pins.c index 00159363b8689..c4cd4ab821959 100644 --- a/ports/espressif/boards/waveshare_esp32_s3_zero/pins.c +++ b/ports/espressif/boards/waveshare_esp32_s3_zero/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // Top side of the board - left column diff --git a/ports/espressif/boards/waveshare_esp32s2_pico/pins.c b/ports/espressif/boards/waveshare_esp32s2_pico/pins.c index 5542ff468ba97..6d0515c454117 100644 --- a/ports/espressif/boards/waveshare_esp32s2_pico/pins.c +++ b/ports/espressif/boards/waveshare_esp32s2_pico/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/espressif/boards/weact_esp32c6_n4/pins.c b/ports/espressif/boards/weact_esp32c6_n4/pins.c index 7c996e457111d..4a890ef7156d5 100644 --- a/ports/espressif/boards/weact_esp32c6_n4/pins.c +++ b/ports/espressif/boards/weact_esp32c6_n4/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BOOT), MP_ROM_PTR(&pin_GPIO9) }, diff --git a/ports/espressif/boards/weact_esp32c6_n8/pins.c b/ports/espressif/boards/weact_esp32c6_n8/pins.c index 51161d9aba880..2d53022f34394 100644 --- a/ports/espressif/boards/weact_esp32c6_n8/pins.c +++ b/ports/espressif/boards/weact_esp32c6_n8/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) }, diff --git a/ports/espressif/boards/wemos_lolin32_lite/pins.c b/ports/espressif/boards/wemos_lolin32_lite/pins.c index d3ebafffec659..f0b82787479a5 100644 --- a/ports/espressif/boards/wemos_lolin32_lite/pins.c +++ b/ports/espressif/boards/wemos_lolin32_lite/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // External pins are in silkscreen order, from top to bottom, left side, then right side diff --git a/ports/espressif/boards/yd_esp32_s3_n16r8/pins.c b/ports/espressif/boards/yd_esp32_s3_n16r8/pins.c index 71df308ecd89e..eb1e79c1f68db 100644 --- a/ports/espressif/boards/yd_esp32_s3_n16r8/pins.c +++ b/ports/espressif/boards/yd_esp32_s3_n16r8/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // Left header, module facing up. diff --git a/ports/espressif/boards/yd_esp32_s3_n8r8/pins.c b/ports/espressif/boards/yd_esp32_s3_n8r8/pins.c index 71df308ecd89e..eb1e79c1f68db 100644 --- a/ports/espressif/boards/yd_esp32_s3_n8r8/pins.c +++ b/ports/espressif/boards/yd_esp32_s3_n8r8/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // Left header, module facing up. diff --git a/ports/espressif/common-hal/_bleio/Adapter.c b/ports/espressif/common-hal/_bleio/Adapter.c index 45a4581fd27c3..1120c7b914cfd 100644 --- a/ports/espressif/common-hal/_bleio/Adapter.c +++ b/ports/espressif/common-hal/_bleio/Adapter.c @@ -266,14 +266,14 @@ void common_hal_bleio_adapter_stop_scan(bleio_adapter_obj_t *self) { self->scan_results = NULL; } -STATIC void _convert_address(const bleio_address_obj_t *address, ble_addr_t *nimble_address) { +static void _convert_address(const bleio_address_obj_t *address, ble_addr_t *nimble_address) { nimble_address->type = address->type; mp_buffer_info_t address_buf_info; mp_get_buffer_raise(address->bytes, &address_buf_info, MP_BUFFER_READ); memcpy(nimble_address->val, (uint8_t *)address_buf_info.buf, NUM_BLEIO_ADDRESS_BYTES); } -STATIC int _mtu_reply(uint16_t conn_handle, +static int _mtu_reply(uint16_t conn_handle, const struct ble_gatt_error *error, uint16_t mtu, void *arg) { bleio_connection_internal_t *connection = (bleio_connection_internal_t *)arg; @@ -284,7 +284,7 @@ STATIC int _mtu_reply(uint16_t conn_handle, return 0; } -STATIC void _new_connection(uint16_t conn_handle) { +static void _new_connection(uint16_t conn_handle) { // Set the tx_power for the connection higher than the advertisement. esp_ble_tx_power_set(conn_handle, ESP_PWR_LVL_N0); @@ -411,7 +411,7 @@ typedef struct { struct os_mbuf_pkthdr hdr; } os_mbuf_t; -STATIC void _wrap_in_mbuf(const uint8_t *data, uint16_t len, os_mbuf_t *buf) { +static void _wrap_in_mbuf(const uint8_t *data, uint16_t len, os_mbuf_t *buf) { struct os_mbuf *mbuf = &buf->mbuf; mbuf->om_data = (uint8_t *)data, mbuf->om_flags = 0; @@ -585,7 +585,7 @@ uint32_t _common_hal_bleio_adapter_start_advertising(bleio_adapter_obj_t *self, return rc; } -STATIC void check_data_fit(size_t data_len, bool connectable) { +static void check_data_fit(size_t data_len, bool connectable) { if (data_len > MYNEWT_VAL(BLE_EXT_ADV_MAX_SIZE) || (connectable && data_len > MYNEWT_VAL(BLE_EXT_ADV_MAX_SIZE))) { mp_raise_ValueError(MP_ERROR_TEXT("Data too large for advertisement packet")); diff --git a/ports/espressif/common-hal/_bleio/Characteristic.c b/ports/espressif/common-hal/_bleio/Characteristic.c index 7e96cfe05be2a..4df80a53d991e 100644 --- a/ports/espressif/common-hal/_bleio/Characteristic.c +++ b/ports/espressif/common-hal/_bleio/Characteristic.c @@ -20,7 +20,7 @@ // #include "common-hal/_bleio/bonding.h" -STATIC int characteristic_on_ble_gap_evt(struct ble_gap_event *event, void *param); +static int characteristic_on_ble_gap_evt(struct ble_gap_event *event, void *param); void common_hal_bleio_characteristic_construct(bleio_characteristic_obj_t *self, bleio_service_obj_t *service, uint16_t handle, bleio_uuid_obj_t *uuid, bleio_characteristic_properties_t props, @@ -109,7 +109,7 @@ typedef struct { uint16_t len; } _read_info_t; -STATIC int _read_cb(uint16_t conn_handle, +static int _read_cb(uint16_t conn_handle, const struct ble_gatt_error *error, struct ble_gatt_attr *attr, void *arg) { @@ -164,7 +164,7 @@ size_t common_hal_bleio_characteristic_get_max_length(bleio_characteristic_obj_t return self->max_length; } -STATIC int _write_cb(uint16_t conn_handle, +static int _write_cb(uint16_t conn_handle, const struct ble_gatt_error *error, struct ble_gatt_attr *attr, void *arg) { @@ -223,7 +223,7 @@ void common_hal_bleio_characteristic_set_value(bleio_characteristic_obj_t *self, } // Used when we're the client. -STATIC int characteristic_on_ble_gap_evt(struct ble_gap_event *event, void *param) { +static int characteristic_on_ble_gap_evt(struct ble_gap_event *event, void *param) { bleio_characteristic_obj_t *self = (bleio_characteristic_obj_t *)param; switch (event->type) { case BLE_GAP_EVENT_NOTIFY_RX: { diff --git a/ports/espressif/common-hal/_bleio/Connection.c b/ports/espressif/common-hal/_bleio/Connection.c index 3704ce88b3787..be416b2fe02f2 100644 --- a/ports/espressif/common-hal/_bleio/Connection.c +++ b/ports/espressif/common-hal/_bleio/Connection.c @@ -134,10 +134,10 @@ void common_hal_bleio_connection_set_connection_interval(bleio_connection_intern // TODO: Implement this. } -STATIC volatile int _last_discovery_status; +static volatile int _last_discovery_status; static TaskHandle_t discovery_task = NULL; -STATIC int _discovered_service_cb(uint16_t conn_handle, +static int _discovered_service_cb(uint16_t conn_handle, const struct ble_gatt_error *error, const struct ble_gatt_svc *svc, void *arg) { @@ -177,7 +177,7 @@ STATIC int _discovered_service_cb(uint16_t conn_handle, return 0; } -STATIC int _discovered_characteristic_cb(uint16_t conn_handle, +static int _discovered_characteristic_cb(uint16_t conn_handle, const struct ble_gatt_error *error, const struct ble_gatt_chr *chr, void *arg) { @@ -231,7 +231,7 @@ STATIC int _discovered_characteristic_cb(uint16_t conn_handle, return 0; } -STATIC int _discovered_descriptor_cb(uint16_t conn_handle, +static int _discovered_descriptor_cb(uint16_t conn_handle, const struct ble_gatt_error *error, uint16_t chr_val_handle, const struct ble_gatt_dsc *dsc, @@ -286,7 +286,7 @@ STATIC int _discovered_descriptor_cb(uint16_t conn_handle, return 0; } -STATIC void discover_remote_services(bleio_connection_internal_t *self, mp_obj_t service_uuids_whitelist) { +static void discover_remote_services(bleio_connection_internal_t *self, mp_obj_t service_uuids_whitelist) { // Start over with an empty list. self->remote_service_list = mp_obj_new_list(0, NULL); diff --git a/ports/espressif/common-hal/_bleio/PacketBuffer.c b/ports/espressif/common-hal/_bleio/PacketBuffer.c index 8cee74f15417b..e6886811966de 100644 --- a/ports/espressif/common-hal/_bleio/PacketBuffer.c +++ b/ports/espressif/common-hal/_bleio/PacketBuffer.c @@ -46,10 +46,10 @@ void bleio_packet_buffer_extend(bleio_packet_buffer_obj_t *self, uint16_t conn_h ringbuf_put_n(&self->ringbuf, data, len); } -STATIC int packet_buffer_on_ble_client_evt(struct ble_gap_event *event, void *param); -STATIC int queue_next_write(bleio_packet_buffer_obj_t *self); +static int packet_buffer_on_ble_client_evt(struct ble_gap_event *event, void *param); +static int queue_next_write(bleio_packet_buffer_obj_t *self); -STATIC int _write_cb(uint16_t conn_handle, +static int _write_cb(uint16_t conn_handle, const struct ble_gatt_error *error, struct ble_gatt_attr *attr, void *arg) { @@ -62,7 +62,7 @@ STATIC int _write_cb(uint16_t conn_handle, return 0; } -STATIC int queue_next_write(bleio_packet_buffer_obj_t *self) { +static int queue_next_write(bleio_packet_buffer_obj_t *self) { // Queue up the next outgoing buffer. We use two, one that has been passed to the SD for // transmission (when packet_queued is true) and the other is `pending` and can still be // modified. By primarily appending to the `pending` buffer we can reduce the protocol overhead @@ -125,7 +125,7 @@ STATIC int queue_next_write(bleio_packet_buffer_obj_t *self) { } // This is called from the nimble task. *Not* CircuitPython's. -STATIC int packet_buffer_on_ble_client_evt(struct ble_gap_event *event, void *param) { +static int packet_buffer_on_ble_client_evt(struct ble_gap_event *event, void *param) { bleio_packet_buffer_obj_t *self = (bleio_packet_buffer_obj_t *)param; if (event->type == BLE_GAP_EVENT_DISCONNECT && self->conn_handle == event->disconnect.conn.conn_handle) { self->conn_handle = BLEIO_HANDLE_INVALID; diff --git a/ports/espressif/common-hal/_bleio/bonding.c b/ports/espressif/common-hal/_bleio/bonding.c index 29ada04cceac7..a20b609fb1337 100644 --- a/ports/espressif/common-hal/_bleio/bonding.c +++ b/ports/espressif/common-hal/_bleio/bonding.c @@ -46,7 +46,7 @@ void bonding_print_keys(bonding_keys_t *keys) { } #endif -STATIC size_t compute_block_size(uint16_t data_length) { +static size_t compute_block_size(uint16_t data_length) { // Round data size up to the nearest 32-bit address. return sizeof(bonding_block_t) + ((data_length + 3) & ~0x3); } @@ -69,7 +69,7 @@ void bonding_erase_storage(void) { // The last block returned is the unused block at the end. // Return NULL if we have run off the end of the bonding space. -STATIC bonding_block_t *next_block(bonding_block_t *block) { +static bonding_block_t *next_block(bonding_block_t *block) { while (1) { // Advance to next block. if (block == NULL) { @@ -97,7 +97,7 @@ STATIC bonding_block_t *next_block(bonding_block_t *block) { // Find the block with given is_central, type and ediv value. // If type == BLOCK_UNUSED, ediv is ignored and the the sole unused block at the end is returned. // If not found, return NULL. -STATIC bonding_block_t *find_existing_block(bool is_central, bonding_block_type_t type, uint16_t ediv) { +static bonding_block_t *find_existing_block(bool is_central, bonding_block_type_t type, uint16_t ediv) { bonding_block_t *block = NULL; while (1) { block = next_block(block); @@ -130,7 +130,7 @@ size_t bonding_peripheral_bond_count(void) { } // Get an empty block large enough to store data_length data. -STATIC bonding_block_t *find_unused_block(uint16_t data_length) { +static bonding_block_t *find_unused_block(uint16_t data_length) { bonding_block_t *unused_block = find_existing_block(true, BLOCK_UNUSED, EDIV_INVALID); // If no more room, erase all existing blocks and start over. if (!unused_block || @@ -143,18 +143,18 @@ STATIC bonding_block_t *find_unused_block(uint16_t data_length) { // Set the header word to all 0's, to mark the block as invalid. // We don't change data_length, so we can still skip over this block. -STATIC void invalidate_block(bonding_block_t *block) { +static void invalidate_block(bonding_block_t *block) { uint32_t zero = 0; sd_flash_write_sync((uint32_t *)block, &zero, 1); } // Write bonding block header. -STATIC void write_block_header(bonding_block_t *dest_block, bonding_block_t *source_block_header) { +static void write_block_header(bonding_block_t *dest_block, bonding_block_t *source_block_header) { sd_flash_write_sync((uint32_t *)dest_block, (uint32_t *)source_block_header, sizeof(bonding_block_t) / 4); } // Write variable-length data at end of bonding block. -STATIC void write_block_data(bonding_block_t *dest_block, uint8_t *data, uint16_t data_length) { +static void write_block_data(bonding_block_t *dest_block, uint8_t *data, uint16_t data_length) { // Minimize the number of writes. Datasheet says no more than two writes per word before erasing again. // Start writing after the current header. @@ -173,7 +173,7 @@ STATIC void write_block_data(bonding_block_t *dest_block, uint8_t *data, uint16_ } } -STATIC void write_sys_attr_block(bleio_connection_internal_t *connection) { +static void write_sys_attr_block(bleio_connection_internal_t *connection) { uint16_t length = 0; // First find out how big a buffer we need, then fetch the data. if (sd_ble_gatts_sys_attr_get(connection->conn_handle, NULL, &length, SYS_ATTR_FLAGS) != NRF_SUCCESS) { @@ -210,7 +210,7 @@ STATIC void write_sys_attr_block(bleio_connection_internal_t *connection) { return; } -STATIC void write_keys_block(bleio_connection_internal_t *connection) { +static void write_keys_block(bleio_connection_internal_t *connection) { uint16_t const ediv = connection->is_central ? connection->bonding_keys.peer_enc.master_id.ediv : connection->bonding_keys.own_enc.master_id.ediv; diff --git a/ports/espressif/common-hal/alarm/__init__.c b/ports/espressif/common-hal/alarm/__init__.c index b0037e961125e..d5c4d7625adcf 100644 --- a/ports/espressif/common-hal/alarm/__init__.c +++ b/ports/espressif/common-hal/alarm/__init__.c @@ -56,7 +56,7 @@ void alarm_reset(void) { esp_sleep_disable_wakeup_source(ESP_SLEEP_WAKEUP_ALL); } -STATIC esp_sleep_wakeup_cause_t _get_wakeup_cause(bool deep_sleep) { +static esp_sleep_wakeup_cause_t _get_wakeup_cause(bool deep_sleep) { // First check if the modules remember what last woke up if (alarm_pin_pinalarm_woke_this_cycle()) { return ESP_SLEEP_WAKEUP_GPIO; @@ -118,7 +118,7 @@ mp_obj_t common_hal_alarm_record_wake_alarm(void) { } // Set up light sleep or deep sleep alarms. -STATIC void _setup_sleep_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms) { +static void _setup_sleep_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms) { alarm_pin_pinalarm_set_alarms(deep_sleep, n_alarms, alarms); alarm_time_timealarm_set_alarms(deep_sleep, n_alarms, alarms); alarm_touch_touchalarm_set_alarm(deep_sleep, n_alarms, alarms); diff --git a/ports/espressif/common-hal/alarm/pin/PinAlarm.c b/ports/espressif/common-hal/alarm/pin/PinAlarm.c index bb38edf75d82c..302f5afca85f5 100644 --- a/ports/espressif/common-hal/alarm/pin/PinAlarm.c +++ b/ports/espressif/common-hal/alarm/pin/PinAlarm.c @@ -52,7 +52,7 @@ gpio_isr_handle_t gpio_interrupt_handle; // Low and high are relative to pin number. 32+ is high. <32 is low. static volatile uint32_t pin_31_0_status = 0; static volatile uint32_t pin_63_32_status = 0; -STATIC void gpio_interrupt(void *arg) { +static void gpio_interrupt(void *arg) { (void)arg; gpio_ll_get_intr_status(&GPIO, xPortGetCoreID(), (uint32_t *)&pin_31_0_status); diff --git a/ports/espressif/common-hal/alarm/time/TimeAlarm.c b/ports/espressif/common-hal/alarm/time/TimeAlarm.c index 8e25b42fd268e..e029336b14110 100644 --- a/ports/espressif/common-hal/alarm/time/TimeAlarm.c +++ b/ports/espressif/common-hal/alarm/time/TimeAlarm.c @@ -42,10 +42,10 @@ mp_obj_t alarm_time_timealarm_record_wake_alarm(void) { } esp_timer_handle_t pretend_sleep_timer; -STATIC bool woke_up = false; +static bool woke_up = false; // This is run in the timer task. We use it to wake the main CircuitPython task. -STATIC void timer_callback(void *arg) { +static void timer_callback(void *arg) { (void)arg; woke_up = true; port_wake_main_task(); diff --git a/ports/espressif/common-hal/alarm/touch/TouchAlarm.c b/ports/espressif/common-hal/alarm/touch/TouchAlarm.c index 545041a19cc7b..9aaa7b0a73330 100644 --- a/ports/espressif/common-hal/alarm/touch/TouchAlarm.c +++ b/ports/espressif/common-hal/alarm/touch/TouchAlarm.c @@ -65,7 +65,7 @@ mp_obj_t alarm_touch_touchalarm_record_wake_alarm(void) { } // This is used to wake the main CircuitPython task. -STATIC void touch_interrupt(void *arg) { +static void touch_interrupt(void *arg) { (void)arg; woke_up = true; port_wake_main_task_from_isr(); diff --git a/ports/espressif/common-hal/canio/CAN.c b/ports/espressif/common-hal/canio/CAN.c index 72cac7801567f..941e454b124b5 100644 --- a/ports/espressif/common-hal/canio/CAN.c +++ b/ports/espressif/common-hal/canio/CAN.c @@ -16,9 +16,9 @@ #include "hal/twai_types.h" -STATIC bool reserved_can; +static bool reserved_can; -STATIC twai_timing_config_t get_t_config(int baudrate) { +static twai_timing_config_t get_t_config(int baudrate) { switch (baudrate) { case 1000000: { // TWAI_TIMING_CONFIG_abc expands to a C designated initializer list @@ -196,7 +196,7 @@ static void can_restart(void) { } while (port_get_raw_ticks(NULL) < deadline && (info.state == TWAI_STATE_BUS_OFF || info.state == TWAI_STATE_RECOVERING)); } -STATIC void canio_maybe_auto_restart(canio_can_obj_t *self) { +static void canio_maybe_auto_restart(canio_can_obj_t *self) { if (self->auto_restart) { can_restart(); } diff --git a/ports/espressif/common-hal/canio/Listener.c b/ports/espressif/common-hal/canio/Listener.c index 1b9c4711e64d0..22a2e82dca9cc 100644 --- a/ports/espressif/common-hal/canio/Listener.c +++ b/ports/espressif/common-hal/canio/Listener.c @@ -29,26 +29,26 @@ #define FILTER16_IDE (1 << 3) #define FILTER32_IDE (1 << 2) -STATIC void install_standard_filter(canio_listener_obj_t *self, canio_match_obj_t *match) { +static void install_standard_filter(canio_listener_obj_t *self, canio_match_obj_t *match) { twai_ll_set_acc_filter(&TWAI, match->id << 21, ~(match->mask << 21), true); self->extended = false; self->standard = true; } -STATIC void install_extended_filter(canio_listener_obj_t *self, canio_match_obj_t *match) { +static void install_extended_filter(canio_listener_obj_t *self, canio_match_obj_t *match) { twai_ll_set_acc_filter(&TWAI, match->id << 3, ~(match->mask << 3), true); self->extended = true; self->standard = false; } -STATIC void install_all_match_filter(canio_listener_obj_t *self) { +static void install_all_match_filter(canio_listener_obj_t *self) { twai_ll_set_acc_filter(&TWAI, 0u, ~0u, true); self->extended = true; self->standard = true; } __attribute__((noinline, optimize("O0"))) -STATIC void set_filters(canio_listener_obj_t *self, size_t nmatch, canio_match_obj_t **matches) { +static void set_filters(canio_listener_obj_t *self, size_t nmatch, canio_match_obj_t **matches) { twai_ll_enter_reset_mode(&TWAI); if (!nmatch) { diff --git a/ports/espressif/common-hal/digitalio/DigitalInOut.c b/ports/espressif/common-hal/digitalio/DigitalInOut.c index 8d700251a7760..567f82711a5d2 100644 --- a/ports/espressif/common-hal/digitalio/DigitalInOut.c +++ b/ports/espressif/common-hal/digitalio/DigitalInOut.c @@ -11,7 +11,7 @@ #include "components/hal/include/hal/gpio_hal.h" -STATIC bool _pin_is_input(uint8_t pin_number) { +static bool _pin_is_input(uint8_t pin_number) { const uint32_t iomux = READ_PERI_REG(GPIO_PIN_MUX_REG[pin_number]); return (iomux & FUN_IE) != 0; } diff --git a/ports/espressif/common-hal/espulp/ULP.c b/ports/espressif/common-hal/espulp/ULP.c index 435506bec7fa0..b7cbf578aef8c 100644 --- a/ports/espressif/common-hal/espulp/ULP.c +++ b/ports/espressif/common-hal/espulp/ULP.c @@ -26,8 +26,8 @@ // To-do idf v5.0: remove following include #include "soc/rtc_cntl_reg.h" -STATIC bool ulp_used = false; -STATIC uint32_t pins_used = 0; +static bool ulp_used = false; +static uint32_t pins_used = 0; void espulp_reset(void) { // NOTE: This *doesn't* disable the ULP. It'll keep running even when CircuitPython isn't. diff --git a/ports/espressif/common-hal/espulp/ULPAlarm.c b/ports/espressif/common-hal/espulp/ULPAlarm.c index 4bbd6dfcad286..16cd905ea253c 100644 --- a/ports/espressif/common-hal/espulp/ULPAlarm.c +++ b/ports/espressif/common-hal/espulp/ULPAlarm.c @@ -37,7 +37,7 @@ mp_obj_t espulp_ulpalarm_record_wake_alarm(void) { } // This is used to wake the main CircuitPython task. -STATIC void ulp_interrupt(void *arg) { +static void ulp_interrupt(void *arg) { (void)arg; woke_up = true; port_wake_main_task_from_isr(); diff --git a/ports/espressif/common-hal/max3421e/Max3421E.c b/ports/espressif/common-hal/max3421e/Max3421E.c index ba707749f4a9b..2e0149b2b46d7 100644 --- a/ports/espressif/common-hal/max3421e/Max3421E.c +++ b/ports/espressif/common-hal/max3421e/Max3421E.c @@ -29,7 +29,7 @@ // task is started. TaskHandle_t usb_host_task_handle; -STATIC void usb_host_task(void *param) { +static void usb_host_task(void *param) { (void)param; // RTOS forever loop while (1) { diff --git a/ports/espressif/common-hal/mdns/Server.c b/ports/espressif/common-hal/mdns/Server.c index 2525db8720cfa..81a4415cecd86 100644 --- a/ports/espressif/common-hal/mdns/Server.c +++ b/ports/espressif/common-hal/mdns/Server.c @@ -16,7 +16,7 @@ // Track whether the underlying IDF mdns has been started so that we only // create a single inited MDNS object to CircuitPython. (After deinit, another // could be created.) -STATIC mdns_server_obj_t *_active_object = NULL; +static mdns_server_obj_t *_active_object = NULL; void mdns_server_construct(mdns_server_obj_t *self, bool workflow) { if (_active_object != NULL) { diff --git a/ports/espressif/common-hal/microcontroller/Pin.c b/ports/espressif/common-hal/microcontroller/Pin.c index 720e434041530..b5ab0a89cb438 100644 --- a/ports/espressif/common-hal/microcontroller/Pin.c +++ b/ports/espressif/common-hal/microcontroller/Pin.c @@ -13,10 +13,10 @@ #include "components/driver/gpio/include/driver/gpio.h" #include "components/hal/include/hal/gpio_hal.h" -STATIC uint64_t _never_reset_pin_mask; -STATIC uint64_t _skip_reset_once_pin_mask; -STATIC uint64_t _preserved_pin_mask; -STATIC uint64_t _in_use_pin_mask; +static uint64_t _never_reset_pin_mask; +static uint64_t _skip_reset_once_pin_mask; +static uint64_t _preserved_pin_mask; +static uint64_t _in_use_pin_mask; #define GPIO_SEL_0 (BIT(0)) /*!< Pin 0 selected */ #define GPIO_SEL_1 (BIT(1)) /*!< Pin 1 selected */ @@ -237,23 +237,23 @@ MP_WEAK bool espressif_board_reset_pin_number(gpio_num_t pin_number) { return false; } -STATIC bool _reset_forbidden(gpio_num_t pin_number) { +static bool _reset_forbidden(gpio_num_t pin_number) { return pin_mask_reset_forbidden & PIN_BIT(pin_number); } -STATIC bool _never_reset(gpio_num_t pin_number) { +static bool _never_reset(gpio_num_t pin_number) { return _never_reset_pin_mask & PIN_BIT(pin_number); } -STATIC bool _skip_reset_once(gpio_num_t pin_number) { +static bool _skip_reset_once(gpio_num_t pin_number) { return _skip_reset_once_pin_mask & PIN_BIT(pin_number); } -STATIC bool _preserved_pin(gpio_num_t pin_number) { +static bool _preserved_pin(gpio_num_t pin_number) { return _preserved_pin_mask & PIN_BIT(pin_number); } -STATIC void _reset_pin(gpio_num_t pin_number) { +static void _reset_pin(gpio_num_t pin_number) { // Never ever reset pins used for flash, RAM, and basic communication. if (_reset_forbidden(pin_number)) { return; diff --git a/ports/espressif/common-hal/microcontroller/Processor.c b/ports/espressif/common-hal/microcontroller/Processor.c index 857ed9b36db1e..5cd3ed86d0819 100644 --- a/ports/espressif/common-hal/microcontroller/Processor.c +++ b/ports/espressif/common-hal/microcontroller/Processor.c @@ -47,7 +47,7 @@ uint32_t common_hal_mcu_processor_get_frequency(void) { return CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ * 1000000; } -STATIC uint8_t swap_nibbles(uint8_t v) { +static uint8_t swap_nibbles(uint8_t v) { return ((v << 4) | (v >> 4)) & 0xff; } diff --git a/ports/espressif/common-hal/microcontroller/__init__.c b/ports/espressif/common-hal/microcontroller/__init__.c index 1dc63a4814ee2..5220230765ae9 100644 --- a/ports/espressif/common-hal/microcontroller/__init__.c +++ b/ports/espressif/common-hal/microcontroller/__init__.c @@ -166,7 +166,7 @@ watchdog_watchdogtimer_obj_t common_hal_mcu_watchdogtimer_obj = { #endif // This maps MCU pin names to pin objects. -STATIC const mp_rom_map_elem_t mcu_pin_global_dict_table[] = { +static const mp_rom_map_elem_t mcu_pin_global_dict_table[] = { #ifdef GPIO0_EXISTS { MP_ROM_QSTR(MP_QSTR_GPIO0), MP_ROM_PTR(&pin_GPIO0) }, #endif diff --git a/ports/espressif/common-hal/os/__init__.c b/ports/espressif/common-hal/os/__init__.c index 862176ff3b220..4063090fe1f96 100644 --- a/ports/espressif/common-hal/os/__init__.c +++ b/ports/espressif/common-hal/os/__init__.c @@ -15,18 +15,18 @@ #include "esp_system.h" #include "esp_random.h" -STATIC const qstr os_uname_info_fields[] = { +static const qstr os_uname_info_fields[] = { MP_QSTR_sysname, MP_QSTR_nodename, MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine }; -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, MICROPY_HW_MCU_NAME); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, MICROPY_HW_MCU_NAME); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME); +static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, MICROPY_HW_MCU_NAME); +static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, MICROPY_HW_MCU_NAME); +static const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING); +static const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE); +static const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME); -STATIC MP_DEFINE_ATTRTUPLE( +static MP_DEFINE_ATTRTUPLE( os_uname_info_obj, os_uname_info_fields, 5, diff --git a/ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c b/ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c index 000a01865bec7..17ec77700c206 100644 --- a/ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c +++ b/ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c @@ -24,7 +24,7 @@ * Current pin limitations for ESP32-S2 ParallelBus: * - data0 pin must be byte aligned */ -STATIC bool _transfer_done(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_io_event_data_t *edata, void *user_ctx) { +static bool _transfer_done(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_io_event_data_t *edata, void *user_ctx) { paralleldisplaybus_parallelbus_obj_t *self = user_ctx; self->transfer_done = true; return false; diff --git a/ports/espressif/common-hal/pwmio/PWMOut.c b/ports/espressif/common-hal/pwmio/PWMOut.c index 81040aa22abbc..e3560df60b81c 100644 --- a/ports/espressif/common-hal/pwmio/PWMOut.c +++ b/ports/espressif/common-hal/pwmio/PWMOut.c @@ -13,11 +13,11 @@ #define INDEX_EMPTY 0xFF -STATIC uint32_t reserved_timer_freq[LEDC_TIMER_MAX]; -STATIC bool varfreq_timers[LEDC_TIMER_MAX]; -STATIC uint8_t reserved_channels[LEDC_CHANNEL_MAX] = { [0 ... LEDC_CHANNEL_MAX - 1] = INDEX_EMPTY}; +static uint32_t reserved_timer_freq[LEDC_TIMER_MAX]; +static bool varfreq_timers[LEDC_TIMER_MAX]; +static uint8_t reserved_channels[LEDC_CHANNEL_MAX] = { [0 ... LEDC_CHANNEL_MAX - 1] = INDEX_EMPTY}; -STATIC uint32_t calculate_duty_cycle(uint32_t frequency) { +static uint32_t calculate_duty_cycle(uint32_t frequency) { uint32_t duty_bits = 0; uint32_t interval = APB_CLK_FREQ / frequency; for (size_t i = 0; i < 32; i++) { diff --git a/ports/espressif/common-hal/socketpool/Socket.c b/ports/espressif/common-hal/socketpool/Socket.c index 56a350833c47e..7a4634af495a2 100644 --- a/ports/espressif/common-hal/socketpool/Socket.c +++ b/ports/espressif/common-hal/socketpool/Socket.c @@ -36,17 +36,17 @@ StackType_t socket_select_stack[2 * configMINIMAL_STACK_SIZE]; #define FDSTATE_CLOSED 0 #define FDSTATE_OPEN 1 #define FDSTATE_CLOSING 2 -STATIC uint8_t socket_fd_state[CONFIG_LWIP_MAX_SOCKETS]; +static uint8_t socket_fd_state[CONFIG_LWIP_MAX_SOCKETS]; // How long to wait between checks for a socket to connect. #define SOCKET_CONNECT_POLL_INTERVAL_MS 100 -STATIC socketpool_socket_obj_t *user_socket[CONFIG_LWIP_MAX_SOCKETS]; +static socketpool_socket_obj_t *user_socket[CONFIG_LWIP_MAX_SOCKETS]; StaticTask_t socket_select_task_buffer; TaskHandle_t socket_select_task_handle; -STATIC int socket_change_fd = -1; +static int socket_change_fd = -1; -STATIC void socket_select_task(void *arg) { +static void socket_select_task(void *arg) { uint64_t signal; fd_set readfds; fd_set excptfds; @@ -146,7 +146,7 @@ void socketpool_socket_poll_resume(void) { // The writes below send an event to the socket select task so that it redoes the // select with the new open socket set. -STATIC bool register_open_socket(int fd) { +static bool register_open_socket(int fd) { if (fd < FD_SETSIZE) { socket_fd_state[fd - LWIP_SOCKET_OFFSET] = FDSTATE_OPEN; user_socket[fd - LWIP_SOCKET_OFFSET] = NULL; @@ -159,13 +159,13 @@ STATIC bool register_open_socket(int fd) { return false; } -STATIC void mark_user_socket(int fd, socketpool_socket_obj_t *obj) { +static void mark_user_socket(int fd, socketpool_socket_obj_t *obj) { socket_fd_state[fd - LWIP_SOCKET_OFFSET] = FDSTATE_OPEN; user_socket[fd - LWIP_SOCKET_OFFSET] = obj; // No need to wakeup select task } -STATIC bool _socketpool_socket(socketpool_socketpool_obj_t *self, +static bool _socketpool_socket(socketpool_socketpool_obj_t *self, socketpool_socketpool_addressfamily_t family, socketpool_socketpool_sock_t type, int proto, socketpool_socket_obj_t *sock) { diff --git a/ports/espressif/common-hal/wifi/__init__.c b/ports/espressif/common-hal/wifi/__init__.c index 9ed7f12a6c6e2..ddebc41a97386 100644 --- a/ports/espressif/common-hal/wifi/__init__.c +++ b/ports/espressif/common-hal/wifi/__init__.c @@ -39,7 +39,7 @@ wifi_radio_obj_t common_hal_wifi_radio_obj; static const char *TAG = "CP wifi"; -STATIC void schedule_background_on_cp_core(void *arg) { +static void schedule_background_on_cp_core(void *arg) { #if CIRCUITPY_STATUS_BAR supervisor_status_bar_request_update(false); #endif diff --git a/ports/espressif/supervisor/internal_flash.c b/ports/espressif/supervisor/internal_flash.c index 68fdb76393af5..a18d3fe0a0ffc 100644 --- a/ports/espressif/supervisor/internal_flash.c +++ b/ports/espressif/supervisor/internal_flash.c @@ -33,8 +33,8 @@ // TODO: Split the caching out of supervisor/shared/external_flash so we can use it. #define SECTOR_SIZE 4096 -STATIC uint8_t _cache[SECTOR_SIZE]; -STATIC uint32_t _cache_lba = 0xffffffff; +static uint8_t _cache[SECTOR_SIZE]; +static uint32_t _cache_lba = 0xffffffff; #if CIRCUITPY_STORAGE_EXTEND #if FF_MAX_SS == FF_MIN_SS @@ -42,15 +42,15 @@ STATIC uint32_t _cache_lba = 0xffffffff; #else #define SECSIZE(fs) ((fs)->ssize) #endif // FF_MAX_SS == FF_MIN_SS -STATIC DWORD fatfs_bytes(void) { +static DWORD fatfs_bytes(void) { fs_user_mount_t *fs_mount = filesystem_circuitpy(); FATFS *fatfs = &fs_mount->fatfs; return (fatfs->csize * SECSIZE(fatfs)) * (fatfs->n_fatent - 2); } -STATIC bool storage_extended = true; -STATIC const esp_partition_t *_partition[2]; +static bool storage_extended = true; +static const esp_partition_t *_partition[2]; #else -STATIC const esp_partition_t *_partition[1]; +static const esp_partition_t *_partition[1]; #endif // CIRCUITPY_STORAGE_EXTEND void supervisor_flash_init(void) { @@ -80,7 +80,7 @@ uint32_t supervisor_flash_get_block_count(void) { void port_internal_flash_flush(void) { } -STATIC void single_partition_rw(const esp_partition_t *partition, uint8_t *data, +static void single_partition_rw(const esp_partition_t *partition, uint8_t *data, const uint32_t offset, const uint32_t size_total, const bool op) { if (op == OP_READ) { esp_partition_read(partition, offset, data, size_total); @@ -91,7 +91,7 @@ STATIC void single_partition_rw(const esp_partition_t *partition, uint8_t *data, } #if CIRCUITPY_STORAGE_EXTEND -STATIC void multi_partition_rw(uint8_t *data, +static void multi_partition_rw(uint8_t *data, const uint32_t offset, const uint32_t size_total, const bool op) { if (offset > _partition[0]->size) { // only r/w partition 1 diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c index e35f293db974a..694a10669e33a 100644 --- a/ports/espressif/supervisor/port.c +++ b/ports/espressif/supervisor/port.c @@ -82,14 +82,14 @@ #include "esp_log.h" #define TAG "port" -STATIC esp_timer_handle_t _tick_timer; -STATIC esp_timer_handle_t _sleep_timer; +static esp_timer_handle_t _tick_timer; +static esp_timer_handle_t _sleep_timer; TaskHandle_t circuitpython_task = NULL; extern void esp_restart(void) NORETURN; -STATIC void tick_on_cp_core(void *arg) { +static void tick_on_cp_core(void *arg) { supervisor_tick(); // CircuitPython's VM is run in a separate FreeRTOS task from timer callbacks. So, we have to @@ -99,7 +99,7 @@ STATIC void tick_on_cp_core(void *arg) { // This function may happen on the PRO core when CP is on the APP core. So, make // sure we run on the CP core. -STATIC void tick_timer_cb(void *arg) { +static void tick_timer_cb(void *arg) { #if defined(CONFIG_FREERTOS_UNICORE) && CONFIG_FREERTOS_UNICORE tick_on_cp_core(arg); #else diff --git a/ports/espressif/supervisor/usb.c b/ports/espressif/supervisor/usb.c index 52ee510ee64df..8719a925ce7b1 100644 --- a/ports/espressif/supervisor/usb.c +++ b/ports/espressif/supervisor/usb.c @@ -47,7 +47,7 @@ static usb_phy_handle_t phy_hdl; // USB Device Driver task // This top level thread process all usb events and invoke callbacks -STATIC void usb_device_task(void *param) { +static void usb_device_task(void *param) { (void)param; // RTOS forever loop diff --git a/ports/espressif/supervisor/usb_serial_jtag.c b/ports/espressif/supervisor/usb_serial_jtag.c index 741d587d578a1..ab1e9ff41a11c 100644 --- a/ports/espressif/supervisor/usb_serial_jtag.c +++ b/ports/espressif/supervisor/usb_serial_jtag.c @@ -18,9 +18,9 @@ #define USB_SERIAL_JTAG_BUF_SIZE (64) -STATIC ringbuf_t ringbuf; -STATIC uint8_t buf[128]; -STATIC volatile bool connected; +static ringbuf_t ringbuf; +static uint8_t buf[128]; +static volatile bool connected; #if CIRCUITPY_ESP_USB_SERIAL_JTAG && defined(SOC_WIFI_PHY_NEEDS_USB_WORKAROUND) && !defined(CONFIG_ESP_PHY_ENABLE_USB) #error "CONFIG_ESP_PHY_ENABLE_USB must be enabled in sdkconfig" diff --git a/ports/litex/boards/fomu/pins.c b/ports/litex/boards/fomu/pins.c index 0b4d8aa3e7e8c..a462c31528f52 100644 --- a/ports/litex/boards/fomu/pins.c +++ b/ports/litex/boards/fomu/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_TOUCH1), MP_ROM_PTR(&pin_TOUCH1) }, diff --git a/ports/litex/common-hal/microcontroller/Pin.c b/ports/litex/common-hal/microcontroller/Pin.c index d3ba437b586c1..dea848f1ec3f3 100644 --- a/ports/litex/common-hal/microcontroller/Pin.c +++ b/ports/litex/common-hal/microcontroller/Pin.c @@ -9,7 +9,7 @@ #include "py/mphal.h" -STATIC uint8_t claimed_pins[1]; +static uint8_t claimed_pins[1]; // Mark pin as free and return it to a quiescent state. void reset_pin_number(uint8_t pin_port, uint8_t pin_number) { diff --git a/ports/litex/common-hal/microcontroller/__init__.c b/ports/litex/common-hal/microcontroller/__init__.c index 9d125b90e5022..02f3372c392c6 100644 --- a/ports/litex/common-hal/microcontroller/__init__.c +++ b/ports/litex/common-hal/microcontroller/__init__.c @@ -87,7 +87,7 @@ const mcu_pin_obj_t pin_TOUCH2 = PIN(1); const mcu_pin_obj_t pin_TOUCH3 = PIN(2); const mcu_pin_obj_t pin_TOUCH4 = PIN(3); -STATIC const mp_rom_map_elem_t mcu_pin_globals_table[] = { +static const mp_rom_map_elem_t mcu_pin_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_TOUCH1), MP_ROM_PTR(&pin_TOUCH1) }, { MP_ROM_QSTR(MP_QSTR_TOUCH2), MP_ROM_PTR(&pin_TOUCH2) }, { MP_ROM_QSTR(MP_QSTR_TOUCH3), MP_ROM_PTR(&pin_TOUCH3) }, diff --git a/ports/litex/common-hal/os/__init__.c b/ports/litex/common-hal/os/__init__.c index 247ec0010a11e..e6da1904da522 100644 --- a/ports/litex/common-hal/os/__init__.c +++ b/ports/litex/common-hal/os/__init__.c @@ -12,18 +12,18 @@ #include "shared-bindings/os/__init__.h" -STATIC const qstr os_uname_info_fields[] = { +static const qstr os_uname_info_fields[] = { MP_QSTR_sysname, MP_QSTR_nodename, MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine }; -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "litex"); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "litex"); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME); +static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "litex"); +static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "litex"); +static const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING); +static const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE); +static const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME); -STATIC MP_DEFINE_ATTRTUPLE( +static MP_DEFINE_ATTRTUPLE( os_uname_info_obj, os_uname_info_fields, 5, diff --git a/ports/mimxrt10xx/boards/adafruit_metro_m7_1011_sd/pins.c b/ports/mimxrt10xx/boards/adafruit_metro_m7_1011_sd/pins.c index c7db231eb0228..285c6efb2c50a 100644 --- a/ports/mimxrt10xx/boards/adafruit_metro_m7_1011_sd/pins.c +++ b/ports/mimxrt10xx/boards/adafruit_metro_m7_1011_sd/pins.c @@ -9,7 +9,7 @@ #include "supervisor/board.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // Analog diff --git a/ports/mimxrt10xx/boards/feather_m7_1011/pins.c b/ports/mimxrt10xx/boards/feather_m7_1011/pins.c index 0757bd2df210a..7c3de8f58c1dc 100644 --- a/ports/mimxrt10xx/boards/feather_m7_1011/pins.c +++ b/ports/mimxrt10xx/boards/feather_m7_1011/pins.c @@ -9,7 +9,7 @@ #include "supervisor/board.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // Analog diff --git a/ports/mimxrt10xx/boards/feather_mimxrt1011/pins.c b/ports/mimxrt10xx/boards/feather_mimxrt1011/pins.c index 3698f6bdb253e..24caa9e7f9005 100644 --- a/ports/mimxrt10xx/boards/feather_mimxrt1011/pins.c +++ b/ports/mimxrt10xx/boards/feather_mimxrt1011/pins.c @@ -9,7 +9,7 @@ #include "supervisor/board.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // Analog diff --git a/ports/mimxrt10xx/boards/feather_mimxrt1062/pins.c b/ports/mimxrt10xx/boards/feather_mimxrt1062/pins.c index 2f666289d5b51..e227fb84e12b5 100644 --- a/ports/mimxrt10xx/boards/feather_mimxrt1062/pins.c +++ b/ports/mimxrt10xx/boards/feather_mimxrt1062/pins.c @@ -9,7 +9,7 @@ #include "supervisor/board.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // Analog diff --git a/ports/mimxrt10xx/boards/imxrt1010_evk/pins.c b/ports/mimxrt10xx/boards/imxrt1010_evk/pins.c index 42122b88e0ad4..156577456b332 100644 --- a/ports/mimxrt10xx/boards/imxrt1010_evk/pins.c +++ b/ports/mimxrt10xx/boards/imxrt1010_evk/pins.c @@ -9,7 +9,7 @@ #include "supervisor/board.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO_09) }, diff --git a/ports/mimxrt10xx/boards/imxrt1015_evk/pins.c b/ports/mimxrt10xx/boards/imxrt1015_evk/pins.c index 6ae8c1e5092ba..b8dd2251ea4f1 100644 --- a/ports/mimxrt10xx/boards/imxrt1015_evk/pins.c +++ b/ports/mimxrt10xx/boards/imxrt1015_evk/pins.c @@ -9,7 +9,7 @@ #include "supervisor/board.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO_EMC_33) }, diff --git a/ports/mimxrt10xx/boards/imxrt1020_evk/pins.c b/ports/mimxrt10xx/boards/imxrt1020_evk/pins.c index e69540c254cd8..2800d5957da98 100644 --- a/ports/mimxrt10xx/boards/imxrt1020_evk/pins.c +++ b/ports/mimxrt10xx/boards/imxrt1020_evk/pins.c @@ -9,7 +9,7 @@ #include "supervisor/board.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO_AD_B1_09) }, diff --git a/ports/mimxrt10xx/boards/imxrt1040_evk/pins.c b/ports/mimxrt10xx/boards/imxrt1040_evk/pins.c index 3c5a3549c9df0..d2100906ee9fa 100644 --- a/ports/mimxrt10xx/boards/imxrt1040_evk/pins.c +++ b/ports/mimxrt10xx/boards/imxrt1040_evk/pins.c @@ -9,7 +9,7 @@ #include "supervisor/board.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO_SD_B1_01) }, diff --git a/ports/mimxrt10xx/boards/imxrt1050_evkb/pins.c b/ports/mimxrt10xx/boards/imxrt1050_evkb/pins.c index 16c5fbc0c3e1c..436f75bcf3308 100644 --- a/ports/mimxrt10xx/boards/imxrt1050_evkb/pins.c +++ b/ports/mimxrt10xx/boards/imxrt1050_evkb/pins.c @@ -9,7 +9,7 @@ #include "supervisor/board.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO_AD_B1_07) }, diff --git a/ports/mimxrt10xx/boards/imxrt1060_evk/pins.c b/ports/mimxrt10xx/boards/imxrt1060_evk/pins.c index 73e743733721e..7cc5d1e9c16ff 100644 --- a/ports/mimxrt10xx/boards/imxrt1060_evk/pins.c +++ b/ports/mimxrt10xx/boards/imxrt1060_evk/pins.c @@ -9,7 +9,7 @@ #include "supervisor/board.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO_AD_B1_07) }, diff --git a/ports/mimxrt10xx/boards/imxrt1060_evkb/pins.c b/ports/mimxrt10xx/boards/imxrt1060_evkb/pins.c index 4ac2ea98e983f..f81acd86aa4f5 100644 --- a/ports/mimxrt10xx/boards/imxrt1060_evkb/pins.c +++ b/ports/mimxrt10xx/boards/imxrt1060_evkb/pins.c @@ -9,7 +9,7 @@ #include "supervisor/board.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO_AD_B1_07) }, diff --git a/ports/mimxrt10xx/boards/metro_m7_1011/pins.c b/ports/mimxrt10xx/boards/metro_m7_1011/pins.c index b14c23f37f1f0..94db1d9210219 100644 --- a/ports/mimxrt10xx/boards/metro_m7_1011/pins.c +++ b/ports/mimxrt10xx/boards/metro_m7_1011/pins.c @@ -9,7 +9,7 @@ #include "supervisor/board.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // Analog diff --git a/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/pins.c b/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/pins.c index c70501b35de4a..7b70e5ae54a9f 100644 --- a/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/pins.c +++ b/ports/mimxrt10xx/boards/sparkfun_teensy_micromod/pins.c @@ -9,7 +9,7 @@ #include "supervisor/board.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // Micromod pins mapped to logical Teensy pins diff --git a/ports/mimxrt10xx/boards/teensy40/pins.c b/ports/mimxrt10xx/boards/teensy40/pins.c index 820eee5d27811..7aacdf95e15ff 100644 --- a/ports/mimxrt10xx/boards/teensy40/pins.c +++ b/ports/mimxrt10xx/boards/teensy40/pins.c @@ -9,7 +9,7 @@ #include "supervisor/board.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // With USB on left. Bottom edge. diff --git a/ports/mimxrt10xx/boards/teensy41/pins.c b/ports/mimxrt10xx/boards/teensy41/pins.c index b42e44d6e5379..64eac9e4b70c8 100644 --- a/ports/mimxrt10xx/boards/teensy41/pins.c +++ b/ports/mimxrt10xx/boards/teensy41/pins.c @@ -9,7 +9,7 @@ #include "supervisor/board.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // With USB on left. Bottom edge. diff --git a/ports/mimxrt10xx/common-hal/audiobusio/I2SOut.c b/ports/mimxrt10xx/common-hal/audiobusio/I2SOut.c index fdd66f03ef669..c785f4e090efb 100644 --- a/ports/mimxrt10xx/common-hal/audiobusio/I2SOut.c +++ b/ports/mimxrt10xx/common-hal/audiobusio/I2SOut.c @@ -26,7 +26,7 @@ // strives to adhere to. https://www.adafruit.com/blacklivesmatter #include "sdk/drivers/sai/fsl_sai.h" -STATIC void config_periph_pin(const mcu_periph_obj_t *periph) { +static void config_periph_pin(const mcu_periph_obj_t *periph) { if (!periph) { return; } diff --git a/ports/mimxrt10xx/common-hal/audiopwmio/PWMAudioOut.c b/ports/mimxrt10xx/common-hal/audiopwmio/PWMAudioOut.c index ca2188132d6ee..430d1779817c8 100644 --- a/ports/mimxrt10xx/common-hal/audiopwmio/PWMAudioOut.c +++ b/ports/mimxrt10xx/common-hal/audiopwmio/PWMAudioOut.c @@ -23,7 +23,7 @@ // strives to adhere to. https://www.adafruit.com/blacklivesmatter #include "sdk/drivers/sai/fsl_sai.h" -STATIC void config_periph_pin(const mcu_periph_obj_t *periph) { +static void config_periph_pin(const mcu_periph_obj_t *periph) { if (!periph) { return; } diff --git a/ports/mimxrt10xx/common-hal/busio/I2C.c b/ports/mimxrt10xx/common-hal/busio/I2C.c index b95002b785c35..10394a3908c71 100644 --- a/ports/mimxrt10xx/common-hal/busio/I2C.c +++ b/ports/mimxrt10xx/common-hal/busio/I2C.c @@ -26,8 +26,8 @@ #define IOMUXC_SW_MUX_CTL_PAD_MUX_MODE_ALT5 5U // arrays use 0 based numbering: I2C1 is stored at index 0 -STATIC bool reserved_i2c[MP_ARRAY_SIZE(mcu_i2c_banks)]; -STATIC bool never_reset_i2c[MP_ARRAY_SIZE(mcu_i2c_banks)]; +static bool reserved_i2c[MP_ARRAY_SIZE(mcu_i2c_banks)]; +static bool never_reset_i2c[MP_ARRAY_SIZE(mcu_i2c_banks)]; void i2c_reset(void) { for (uint i = 0; i < MP_ARRAY_SIZE(mcu_i2c_banks); i++) { @@ -205,7 +205,7 @@ void common_hal_busio_i2c_unlock(busio_i2c_obj_t *self) { self->has_lock = false; } -STATIC uint8_t _common_hal_busio_i2c_write(busio_i2c_obj_t *self, uint16_t addr, +static uint8_t _common_hal_busio_i2c_write(busio_i2c_obj_t *self, uint16_t addr, const uint8_t *data, size_t len, bool transmit_stop_bit) { lpi2c_master_transfer_t xfer = { 0 }; diff --git a/ports/mimxrt10xx/common-hal/busio/SPI.c b/ports/mimxrt10xx/common-hal/busio/SPI.c index 6318a14cb1a9f..118638af13882 100644 --- a/ports/mimxrt10xx/common-hal/busio/SPI.c +++ b/ports/mimxrt10xx/common-hal/busio/SPI.c @@ -25,14 +25,14 @@ #define MAX_SPI_BUSY_RETRIES 100 // arrays use 0 based numbering: SPI1 is stored at index 0 -STATIC bool reserved_spi[MP_ARRAY_SIZE(mcu_spi_banks)]; -STATIC bool never_reset_spi[MP_ARRAY_SIZE(mcu_spi_banks)]; +static bool reserved_spi[MP_ARRAY_SIZE(mcu_spi_banks)]; +static bool never_reset_spi[MP_ARRAY_SIZE(mcu_spi_banks)]; #if IMXRT11XX -STATIC const clock_ip_name_t s_lpspiClocks[] = LPSPI_CLOCKS; +static const clock_ip_name_t s_lpspiClocks[] = LPSPI_CLOCKS; #endif -STATIC void config_periph_pin(const mcu_periph_obj_t *periph) { +static void config_periph_pin(const mcu_periph_obj_t *periph) { IOMUXC_SetPinMux( periph->pin->mux_reg, periph->mux_mode, periph->input_reg, periph->input_idx, diff --git a/ports/mimxrt10xx/common-hal/busio/UART.c b/ports/mimxrt10xx/common-hal/busio/UART.c index 752b7a4ffc06f..d372865e8a1cd 100644 --- a/ports/mimxrt10xx/common-hal/busio/UART.c +++ b/ports/mimxrt10xx/common-hal/busio/UART.c @@ -32,8 +32,8 @@ // arrays use 0 based numbering: UART1 is stored at index 0 -STATIC bool reserved_uart[MP_ARRAY_SIZE(mcu_uart_banks)]; -STATIC bool never_reset_uart[MP_ARRAY_SIZE(mcu_uart_banks)]; +static bool reserved_uart[MP_ARRAY_SIZE(mcu_uart_banks)]; +static bool never_reset_uart[MP_ARRAY_SIZE(mcu_uart_banks)]; #if IMXRT11XX #define UART_CLOCK_FREQ (24000000) diff --git a/ports/mimxrt10xx/common-hal/microcontroller/Pin.c b/ports/mimxrt10xx/common-hal/microcontroller/Pin.c index 9474258f06e47..c20a1738af0c3 100644 --- a/ports/mimxrt10xx/common-hal/microcontroller/Pin.c +++ b/ports/mimxrt10xx/common-hal/microcontroller/Pin.c @@ -13,15 +13,15 @@ #include "py/gc.h" -STATIC bool claimed_pins[PAD_COUNT]; -STATIC bool never_reset_pins[PAD_COUNT]; +static bool claimed_pins[PAD_COUNT]; +static bool never_reset_pins[PAD_COUNT]; // Default is that no pins are forbidden to reset. MP_WEAK const mcu_pin_obj_t *mimxrt10xx_reset_forbidden_pins[] = { NULL, }; -STATIC bool _reset_forbidden(const mcu_pin_obj_t *pin) { +static bool _reset_forbidden(const mcu_pin_obj_t *pin) { const mcu_pin_obj_t **forbidden_pin = &mimxrt10xx_reset_forbidden_pins[0]; while (*forbidden_pin) { if (pin == *forbidden_pin) { diff --git a/ports/mimxrt10xx/common-hal/microcontroller/__init__.c b/ports/mimxrt10xx/common-hal/microcontroller/__init__.c index 3ab7e61265ae6..98f92c9389f1e 100644 --- a/ports/mimxrt10xx/common-hal/microcontroller/__init__.c +++ b/ports/mimxrt10xx/common-hal/microcontroller/__init__.c @@ -87,7 +87,7 @@ const nvm_bytearray_obj_t common_hal_mcu_nvm_obj = { // This maps MCU pin names to pin objects. // NOTE: for all i.MX chips, order MUST match _iomuxc_sw_mux_ctl_pad enum -STATIC const mp_rom_map_elem_t mcu_pin_global_dict_table[PIN_COUNT] = { +static const mp_rom_map_elem_t mcu_pin_global_dict_table[PIN_COUNT] = { #define FORMAT_PIN(pin_name) { MP_ROM_QSTR(MP_QSTR_##pin_name), MP_ROM_PTR(&pin_##pin_name) }, #include "pin_names.h" diff --git a/ports/mimxrt10xx/common-hal/os/__init__.c b/ports/mimxrt10xx/common-hal/os/__init__.c index 36c8c15024f57..79ae228dc4240 100644 --- a/ports/mimxrt10xx/common-hal/os/__init__.c +++ b/ports/mimxrt10xx/common-hal/os/__init__.c @@ -17,17 +17,17 @@ #include "sdk/drivers/trng/fsl_trng.h" #endif -STATIC const qstr os_uname_info_fields[] = { +static const qstr os_uname_info_fields[] = { MP_QSTR_sysname, MP_QSTR_nodename, MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine }; -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "mimxrt10xx"); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "mimxrt10xx"); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME); +static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "mimxrt10xx"); +static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "mimxrt10xx"); +static const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING); +static const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE); +static const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME); -STATIC MP_DEFINE_ATTRTUPLE( +static MP_DEFINE_ATTRTUPLE( os_uname_info_obj, os_uname_info_fields, 5, diff --git a/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c b/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c index 1bcd6da4dccfe..e1507c7fc02b7 100644 --- a/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c +++ b/ports/mimxrt10xx/common-hal/pwmio/PWMOut.c @@ -69,7 +69,7 @@ void common_hal_pwmio_pwmout_never_reset(pwmio_pwmout_obj_t *self) { common_hal_never_reset_pin(self->pin); } -STATIC void _maybe_disable_clock(uint8_t instance) { +static void _maybe_disable_clock(uint8_t instance) { if ((_flexpwms[instance]->MCTRL & PWM_MCTRL_RUN_MASK) == 0) { CLOCK_DisableClock(_flexpwm_clocks[instance][0]); } diff --git a/ports/nordic/boards/ADM_B_NRF52840_1/pins.c b/ports/nordic/boards/ADM_B_NRF52840_1/pins.c index 5eeebc5fca202..da4bdcea8f360 100644 --- a/ports/nordic/boards/ADM_B_NRF52840_1/pins.c +++ b/ports/nordic/boards/ADM_B_NRF52840_1/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS diff --git a/ports/nordic/boards/Seeed_XIAO_nRF52840_Sense/pins.c b/ports/nordic/boards/Seeed_XIAO_nRF52840_Sense/pins.c index 2e54074179c45..eeb572426f5c6 100644 --- a/ports/nordic/boards/Seeed_XIAO_nRF52840_Sense/pins.c +++ b/ports/nordic/boards/Seeed_XIAO_nRF52840_Sense/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_02) }, diff --git a/ports/nordic/boards/TG-Watch/pins.c b/ports/nordic/boards/TG-Watch/pins.c index 674abbfa02b8b..10eeb1f21cbc6 100644 --- a/ports/nordic/boards/TG-Watch/pins.c +++ b/ports/nordic/boards/TG-Watch/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS diff --git a/ports/nordic/boards/adafruit_led_glasses_nrf52840/pins.c b/ports/nordic/boards/adafruit_led_glasses_nrf52840/pins.c index a88eafe2042e6..af682f823a8a8 100644 --- a/ports/nordic/boards/adafruit_led_glasses_nrf52840/pins.c +++ b/ports/nordic/boards/adafruit_led_glasses_nrf52840/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_MICROPHONE_CLOCK), MP_ROM_PTR(&pin_P0_00) }, diff --git a/ports/nordic/boards/aramcon2_badge/pins.c b/ports/nordic/boards/aramcon2_badge/pins.c index 7013d75879162..e9dbf43f4865a 100644 --- a/ports/nordic/boards/aramcon2_badge/pins.c +++ b/ports/nordic/boards/aramcon2_badge/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_UP_BUTTON), MP_ROM_PTR(&pin_P0_31) }, diff --git a/ports/nordic/boards/aramcon_badge_2019/pins.c b/ports/nordic/boards/aramcon_badge_2019/pins.c index fc359f93edc94..db55a3a23e5e7 100644 --- a/ports/nordic/boards/aramcon_badge_2019/pins.c +++ b/ports/nordic/boards/aramcon_badge_2019/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_LEFT_BUTTON), MP_ROM_PTR(&pin_P0_02) }, diff --git a/ports/nordic/boards/arduino_nano_33_ble/pins.c b/ports/nordic/boards/arduino_nano_33_ble/pins.c index 6b25feb2ba4dd..10037c05c0d3c 100644 --- a/ports/nordic/boards/arduino_nano_33_ble/pins.c +++ b/ports/nordic/boards/arduino_nano_33_ble/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_P1_11) }, diff --git a/ports/nordic/boards/bastble/pins.c b/ports/nordic/boards/bastble/pins.c index 76ce1022128cb..bebecda1c2755 100644 --- a/ports/nordic/boards/bastble/pins.c +++ b/ports/nordic/boards/bastble/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_P1_11) }, diff --git a/ports/nordic/boards/bless_dev_board_multi_sensor/pins.c b/ports/nordic/boards/bless_dev_board_multi_sensor/pins.c index 65c35882959eb..93cf7ee4033a0 100644 --- a/ports/nordic/boards/bless_dev_board_multi_sensor/pins.c +++ b/ports/nordic/boards/bless_dev_board_multi_sensor/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_P0_02) }, // TP7 diff --git a/ports/nordic/boards/bluemicro833/pins.c b/ports/nordic/boards/bluemicro833/pins.c index a39c92fd2c5f2..e83cd15123869 100644 --- a/ports/nordic/boards/bluemicro833/pins.c +++ b/ports/nordic/boards/bluemicro833/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_P0_02), MP_ROM_PTR(&pin_P0_02) }, { MP_ROM_QSTR(MP_QSTR_P0_03), MP_ROM_PTR(&pin_P0_03) }, diff --git a/ports/nordic/boards/bluemicro840/pins.c b/ports/nordic/boards/bluemicro840/pins.c index 2679c1e2e2f10..888d0c95e4219 100644 --- a/ports/nordic/boards/bluemicro840/pins.c +++ b/ports/nordic/boards/bluemicro840/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_P0_02), MP_ROM_PTR(&pin_P0_02) }, diff --git a/ports/nordic/boards/challenger_840/pins.c b/ports/nordic/boards/challenger_840/pins.c index 4dee03208aa8a..ad31c10a4286c 100644 --- a/ports/nordic/boards/challenger_840/pins.c +++ b/ports/nordic/boards/challenger_840/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_04) }, diff --git a/ports/nordic/boards/circuitplayground_bluefruit/pins.c b/ports/nordic/boards/circuitplayground_bluefruit/pins.c index 965fbbbf6890e..65a461c9af361 100644 --- a/ports/nordic/boards/circuitplayground_bluefruit/pins.c +++ b/ports/nordic/boards/circuitplayground_bluefruit/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_AUDIO), MP_ROM_PTR(&pin_P0_26) }, diff --git a/ports/nordic/boards/clue_nrf52840_express/pins.c b/ports/nordic/boards/clue_nrf52840_express/pins.c index fc6c63ac1f0fa..f05ce0d37187e 100644 --- a/ports/nordic/boards/clue_nrf52840_express/pins.c +++ b/ports/nordic/boards/clue_nrf52840_express/pins.c @@ -9,7 +9,7 @@ #include "supervisor/board.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_P0), MP_ROM_PTR(&pin_P0_04) }, diff --git a/ports/nordic/boards/electronut_labs_blip/pins.c b/ports/nordic/boards/electronut_labs_blip/pins.c index db68e7e365bcb..5cca89a3350b8 100644 --- a/ports/nordic/boards/electronut_labs_blip/pins.c +++ b/ports/nordic/boards/electronut_labs_blip/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_03) }, diff --git a/ports/nordic/boards/electronut_labs_papyr/pins.c b/ports/nordic/boards/electronut_labs_papyr/pins.c index a6bdf5e68150e..8179f9cfeb48b 100644 --- a/ports/nordic/boards/electronut_labs_papyr/pins.c +++ b/ports/nordic/boards/electronut_labs_papyr/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_P0_05) }, diff --git a/ports/nordic/boards/espruino_banglejs2/pins.c b/ports/nordic/boards/espruino_banglejs2/pins.c index d739f178c6ebe..c84f7430161a5 100644 --- a/ports/nordic/boards/espruino_banglejs2/pins.c +++ b/ports/nordic/boards/espruino_banglejs2/pins.c @@ -9,7 +9,7 @@ #include "supervisor/board.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_PRESSURE_SCL), MP_ROM_PTR(&pin_P0_02) }, diff --git a/ports/nordic/boards/feather_bluefruit_sense/pins.c b/ports/nordic/boards/feather_bluefruit_sense/pins.c index 3c4c1fe6b940d..9c748e75b0723 100644 --- a/ports/nordic/boards/feather_bluefruit_sense/pins.c +++ b/ports/nordic/boards/feather_bluefruit_sense/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_04) }, diff --git a/ports/nordic/boards/feather_nrf52840_express/pins.c b/ports/nordic/boards/feather_nrf52840_express/pins.c index 4eb371dc19edb..24f3eafe2ac46 100644 --- a/ports/nordic/boards/feather_nrf52840_express/pins.c +++ b/ports/nordic/boards/feather_nrf52840_express/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_04) }, diff --git a/ports/nordic/boards/hiibot_bluefi/pins.c b/ports/nordic/boards/hiibot_bluefi/pins.c index 1114d18a2d3db..73f046bffad42 100644 --- a/ports/nordic/boards/hiibot_bluefi/pins.c +++ b/ports/nordic/boards/hiibot_bluefi/pins.c @@ -9,7 +9,7 @@ #include "supervisor/board.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_P0), MP_ROM_PTR(&pin_P0_28) }, diff --git a/ports/nordic/boards/ikigaisense_vita/pins.c b/ports/nordic/boards/ikigaisense_vita/pins.c index 010fc8ec901ac..f15dea8870b4e 100644 --- a/ports/nordic/boards/ikigaisense_vita/pins.c +++ b/ports/nordic/boards/ikigaisense_vita/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_29) }, diff --git a/ports/nordic/boards/itsybitsy_nrf52840_express/pins.c b/ports/nordic/boards/itsybitsy_nrf52840_express/pins.c index ef5018bce9f5a..ce01c12f9e089 100644 --- a/ports/nordic/boards/itsybitsy_nrf52840_express/pins.c +++ b/ports/nordic/boards/itsybitsy_nrf52840_express/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_04) }, diff --git a/ports/nordic/boards/makerdiary_m60_keyboard/pins.c b/ports/nordic/boards/makerdiary_m60_keyboard/pins.c index b92c81e11ab63..27b25d62d3f3d 100644 --- a/ports/nordic/boards/makerdiary_m60_keyboard/pins.c +++ b/ports/nordic/boards/makerdiary_m60_keyboard/pins.c @@ -9,7 +9,7 @@ #include "supervisor/board.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_R1), MP_ROM_PTR(&pin_P0_05) }, diff --git a/ports/nordic/boards/makerdiary_nrf52840_connectkit/pins.c b/ports/nordic/boards/makerdiary_nrf52840_connectkit/pins.c index 57030c5a25ef9..6c89d74a0681b 100644 --- a/ports/nordic/boards/makerdiary_nrf52840_connectkit/pins.c +++ b/ports/nordic/boards/makerdiary_nrf52840_connectkit/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_P3), MP_ROM_PTR(&pin_P0_03) }, diff --git a/ports/nordic/boards/makerdiary_nrf52840_m2_devkit/pins.c b/ports/nordic/boards/makerdiary_nrf52840_m2_devkit/pins.c index 9321be129b3b9..bd2b6800afd14 100644 --- a/ports/nordic/boards/makerdiary_nrf52840_m2_devkit/pins.c +++ b/ports/nordic/boards/makerdiary_nrf52840_m2_devkit/pins.c @@ -10,7 +10,7 @@ #include "supervisor/board.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_AIN0), MP_ROM_PTR(&pin_P0_02) }, diff --git a/ports/nordic/boards/makerdiary_nrf52840_mdk/pins.c b/ports/nordic/boards/makerdiary_nrf52840_mdk/pins.c index 4a8e6be919f55..d6583b1cfb068 100644 --- a/ports/nordic/boards/makerdiary_nrf52840_mdk/pins.c +++ b/ports/nordic/boards/makerdiary_nrf52840_mdk/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_AIN0), MP_ROM_PTR(&pin_P0_02) }, diff --git a/ports/nordic/boards/makerdiary_nrf52840_mdk_usb_dongle/pins.c b/ports/nordic/boards/makerdiary_nrf52840_mdk_usb_dongle/pins.c index 783b3aac927c2..92638869bb215 100644 --- a/ports/nordic/boards/makerdiary_nrf52840_mdk_usb_dongle/pins.c +++ b/ports/nordic/boards/makerdiary_nrf52840_mdk_usb_dongle/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_AIN0), MP_ROM_PTR(&pin_P0_02) }, diff --git a/ports/nordic/boards/metro_nrf52840_express/pins.c b/ports/nordic/boards/metro_nrf52840_express/pins.c index 0576656111e5a..7c3eb3557eff0 100644 --- a/ports/nordic/boards/metro_nrf52840_express/pins.c +++ b/ports/nordic/boards/metro_nrf52840_express/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_04) }, diff --git a/ports/nordic/boards/microbit_v2/pins.c b/ports/nordic/boards/microbit_v2/pins.c index 647221a62e27b..b3b00338df142 100644 --- a/ports/nordic/boards/microbit_v2/pins.c +++ b/ports/nordic/boards/microbit_v2/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_P0), MP_ROM_PTR(&pin_P0_02) }, // RING0 diff --git a/ports/nordic/boards/nice_nano/pins.c b/ports/nordic/boards/nice_nano/pins.c index 831c142b3ad50..c3e3d33765389 100644 --- a/ports/nordic/boards/nice_nano/pins.c +++ b/ports/nordic/boards/nice_nano/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_P0_02), MP_ROM_PTR(&pin_P0_02) }, diff --git a/ports/nordic/boards/ohs2020_badge/pins.c b/ports/nordic/boards/ohs2020_badge/pins.c index bbc6530600cca..8817a3fada927 100644 --- a/ports/nordic/boards/ohs2020_badge/pins.c +++ b/ports/nordic/boards/ohs2020_badge/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_MICROPHONE_CLOCK), MP_ROM_PTR(&pin_P0_25) }, diff --git a/ports/nordic/boards/particle_argon/pins.c b/ports/nordic/boards/particle_argon/pins.c index d65b34a7112ce..2f39968371b44 100644 --- a/ports/nordic/boards/particle_argon/pins.c +++ b/ports/nordic/boards/particle_argon/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_03) }, diff --git a/ports/nordic/boards/particle_boron/pins.c b/ports/nordic/boards/particle_boron/pins.c index adeca976e141e..ede07b900b65b 100644 --- a/ports/nordic/boards/particle_boron/pins.c +++ b/ports/nordic/boards/particle_boron/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_03) }, diff --git a/ports/nordic/boards/particle_xenon/pins.c b/ports/nordic/boards/particle_xenon/pins.c index e57056e1ea78e..428a86936464a 100644 --- a/ports/nordic/boards/particle_xenon/pins.c +++ b/ports/nordic/boards/particle_xenon/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_03) }, diff --git a/ports/nordic/boards/pca10056/pins.c b/ports/nordic/boards/pca10056/pins.c index 00c91699513d6..897df64eabe5d 100644 --- a/ports/nordic/boards/pca10056/pins.c +++ b/ports/nordic/boards/pca10056/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_P0_00), MP_ROM_PTR(&pin_P0_00) }, diff --git a/ports/nordic/boards/pca10059/pins.c b/ports/nordic/boards/pca10059/pins.c index a8dee4a40d98a..a0f46634bbc8f 100644 --- a/ports/nordic/boards/pca10059/pins.c +++ b/ports/nordic/boards/pca10059/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_P0_02), MP_ROM_PTR(&pin_P0_02) }, diff --git a/ports/nordic/boards/pca10100/pins.c b/ports/nordic/boards/pca10100/pins.c index e31bfdd1e5654..1cd6529051e5f 100644 --- a/ports/nordic/boards/pca10100/pins.c +++ b/ports/nordic/boards/pca10100/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_NFC1), MP_ROM_PTR(&pin_P0_09) }, diff --git a/ports/nordic/boards/pctel_wsc_1450/pins.c b/ports/nordic/boards/pctel_wsc_1450/pins.c index 809c0ba429737..6e839cc89acbc 100644 --- a/ports/nordic/boards/pctel_wsc_1450/pins.c +++ b/ports/nordic/boards/pctel_wsc_1450/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS {MP_ROM_QSTR(MP_QSTR_32KHZ_XTAL1), MP_ROM_PTR(&pin_P0_00)}, diff --git a/ports/nordic/boards/pillbug/pins.c b/ports/nordic/boards/pillbug/pins.c index 89d0007dc0dc4..8338da1eb6c8e 100644 --- a/ports/nordic/boards/pillbug/pins.c +++ b/ports/nordic/boards/pillbug/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_P0_02), MP_ROM_PTR(&pin_P0_02) }, diff --git a/ports/nordic/boards/pitaya_go/pins.c b/ports/nordic/boards/pitaya_go/pins.c index 6fef0b37e75cb..0ae8788e786ef 100644 --- a/ports/nordic/boards/pitaya_go/pins.c +++ b/ports/nordic/boards/pitaya_go/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_AIN0), MP_ROM_PTR(&pin_P0_02) }, diff --git a/ports/nordic/boards/raytac_mdbt50q-db-40/pins.c b/ports/nordic/boards/raytac_mdbt50q-db-40/pins.c index c299d0f68616d..1578c213f1f00 100644 --- a/ports/nordic/boards/raytac_mdbt50q-db-40/pins.c +++ b/ports/nordic/boards/raytac_mdbt50q-db-40/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_P0_02), MP_ROM_PTR(&pin_P0_02) }, diff --git a/ports/nordic/boards/raytac_mdbt50q-rx/pins.c b/ports/nordic/boards/raytac_mdbt50q-rx/pins.c index abb34a2b180e3..f7f86da914566 100644 --- a/ports/nordic/boards/raytac_mdbt50q-rx/pins.c +++ b/ports/nordic/boards/raytac_mdbt50q-rx/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_P0_15), MP_ROM_PTR(&pin_P0_15) }, diff --git a/ports/nordic/boards/simmel/pins.c b/ports/nordic/boards/simmel/pins.c index 554c6d8a8b3e9..72a99148cdd30 100644 --- a/ports/nordic/boards/simmel/pins.c +++ b/ports/nordic/boards/simmel/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_SPI_CSN), MP_ROM_PTR(&pin_P1_06) }, diff --git a/ports/nordic/boards/sparkfun_nrf52840_micromod/pins.c b/ports/nordic/boards/sparkfun_nrf52840_micromod/pins.c index 0e073dbc14d22..c2bbf238257c2 100644 --- a/ports/nordic/boards/sparkfun_nrf52840_micromod/pins.c +++ b/ports/nordic/boards/sparkfun_nrf52840_micromod/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // The SparkFun MicroMod spec uses a zero-based peripheral numbering scheme. // The 0th peripheral is the default and the "0" is omitted from the diff --git a/ports/nordic/boards/sparkfun_nrf52840_mini/pins.c b/ports/nordic/boards/sparkfun_nrf52840_mini/pins.c index 278cdfd671666..492358ed5a553 100644 --- a/ports/nordic/boards/sparkfun_nrf52840_mini/pins.c +++ b/ports/nordic/boards/sparkfun_nrf52840_mini/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_P1_15) }, // D1/TX diff --git a/ports/nordic/boards/ssci_isp1807_dev_board/pins.c b/ports/nordic/boards/ssci_isp1807_dev_board/pins.c index 3beaec955193e..4736b4588c18a 100644 --- a/ports/nordic/boards/ssci_isp1807_dev_board/pins.c +++ b/ports/nordic/boards/ssci_isp1807_dev_board/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_P0_02), MP_ROM_PTR(&pin_P0_02) }, diff --git a/ports/nordic/boards/ssci_isp1807_micro_board/pins.c b/ports/nordic/boards/ssci_isp1807_micro_board/pins.c index 8e80199b72bfa..007de78f4da1b 100644 --- a/ports/nordic/boards/ssci_isp1807_micro_board/pins.c +++ b/ports/nordic/boards/ssci_isp1807_micro_board/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_P0_19) }, diff --git a/ports/nordic/boards/supermini_nrf52840/pins.c b/ports/nordic/boards/supermini_nrf52840/pins.c index 831c142b3ad50..c3e3d33765389 100644 --- a/ports/nordic/boards/supermini_nrf52840/pins.c +++ b/ports/nordic/boards/supermini_nrf52840/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_P0_02), MP_ROM_PTR(&pin_P0_02) }, diff --git a/ports/nordic/boards/teknikio_bluebird/pins.c b/ports/nordic/boards/teknikio_bluebird/pins.c index 880174db3dfa3..af25e83ca73ae 100644 --- a/ports/nordic/boards/teknikio_bluebird/pins.c +++ b/ports/nordic/boards/teknikio_bluebird/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS diff --git a/ports/nordic/boards/tinkeringtech_scoutmakes_azul/pins.c b/ports/nordic/boards/tinkeringtech_scoutmakes_azul/pins.c index 2d35a27ebf994..ac5e7ba57fbf5 100644 --- a/ports/nordic/boards/tinkeringtech_scoutmakes_azul/pins.c +++ b/ports/nordic/boards/tinkeringtech_scoutmakes_azul/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_04) }, diff --git a/ports/nordic/boards/warmbit_bluepixel/pins.c b/ports/nordic/boards/warmbit_bluepixel/pins.c index b96da73c39f5f..6ac7eeecdc5b7 100644 --- a/ports/nordic/boards/warmbit_bluepixel/pins.c +++ b/ports/nordic/boards/warmbit_bluepixel/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_P0_29) }, diff --git a/ports/nordic/common-hal/_bleio/Adapter.c b/ports/nordic/common-hal/_bleio/Adapter.c index 35e6fca2449a2..82d56b9c1b811 100644 --- a/ports/nordic/common-hal/_bleio/Adapter.c +++ b/ports/nordic/common-hal/_bleio/Adapter.c @@ -70,7 +70,7 @@ const nvm_bytearray_obj_t common_hal_bleio_nvm_obj = { .len = CIRCUITPY_BLE_CONFIG_SIZE, }; -STATIC void softdevice_assert_handler(uint32_t id, uint32_t pc, uint32_t info) { +static void softdevice_assert_handler(uint32_t id, uint32_t pc, uint32_t info) { reset_into_safe_mode(SAFE_MODE_SDK_FATAL_ERROR); } @@ -78,7 +78,7 @@ bleio_connection_internal_t bleio_connections[BLEIO_TOTAL_CONNECTION_COUNT]; // Linker script provided ram start. extern uint32_t _ram_start; -STATIC uint32_t ble_stack_enable(void) { +static uint32_t ble_stack_enable(void) { nrf_clock_lf_cfg_t clock_config = { #if BOARD_HAS_32KHZ_XTAL .source = NRF_CLOCK_LF_SRC_XTAL, @@ -221,7 +221,7 @@ STATIC uint32_t ble_stack_enable(void) { return err_code; } -STATIC bool adapter_on_ble_evt(ble_evt_t *ble_evt, void *self_in) { +static bool adapter_on_ble_evt(ble_evt_t *ble_evt, void *self_in) { bleio_adapter_obj_t *self = (bleio_adapter_obj_t *)self_in; // For debugging. @@ -307,13 +307,13 @@ STATIC bool adapter_on_ble_evt(ble_evt_t *ble_evt, void *self_in) { return true; } -STATIC void get_address(bleio_adapter_obj_t *self, ble_gap_addr_t *address) { +static void get_address(bleio_adapter_obj_t *self, ble_gap_addr_t *address) { check_nrf_error(sd_ble_gap_addr_get(address)); } char default_ble_name[] = { 'C', 'I', 'R', 'C', 'U', 'I', 'T', 'P', 'Y', 0, 0, 0, 0, 0}; -STATIC void bleio_adapter_reset_name(bleio_adapter_obj_t *self) { +static void bleio_adapter_reset_name(bleio_adapter_obj_t *self) { // setup the default name ble_gap_addr_t addr; // local_address get_address(self, &addr); @@ -456,7 +456,7 @@ void common_hal_bleio_adapter_set_name(bleio_adapter_obj_t *self, const char *na sd_ble_gap_device_name_set(&sec, (const uint8_t *)name, len); } -STATIC uint32_t _update_identities(bool is_central) { +static uint32_t _update_identities(bool is_central) { const ble_gap_id_key_t *keys[BLE_GAP_DEVICE_IDENTITIES_MAX_COUNT]; // TODO: Make sure we don't store more than BLE_GAP_DEVICE_IDENTITIES_MAX_COUNT identities of // each type. Right now, we'll silently ignore those keys. @@ -472,7 +472,7 @@ STATIC uint32_t _update_identities(bool is_central) { return status; }; -STATIC bool scan_on_ble_evt(ble_evt_t *ble_evt, void *scan_results_in) { +static bool scan_on_ble_evt(ble_evt_t *ble_evt, void *scan_results_in) { bleio_scanresults_obj_t *scan_results = (bleio_scanresults_obj_t *)scan_results_in; if (ble_evt->header.evt_id == BLE_GAP_EVT_TIMEOUT && @@ -586,7 +586,7 @@ typedef struct { volatile bool done; } connect_info_t; -STATIC bool connect_on_ble_evt(ble_evt_t *ble_evt, void *info_in) { +static bool connect_on_ble_evt(ble_evt_t *ble_evt, void *info_in) { connect_info_t *info = (connect_info_t *)info_in; switch (ble_evt->header.evt_id) { @@ -609,7 +609,7 @@ STATIC bool connect_on_ble_evt(ble_evt_t *ble_evt, void *info_in) { return true; } -STATIC void _convert_address(const bleio_address_obj_t *address, ble_gap_addr_t *sd_address) { +static void _convert_address(const bleio_address_obj_t *address, ble_gap_addr_t *sd_address) { sd_address->addr_type = address->type; mp_buffer_info_t address_buf_info; mp_get_buffer_raise(address->bytes, &address_buf_info, MP_BUFFER_READ); @@ -694,7 +694,7 @@ mp_obj_t common_hal_bleio_adapter_connect(bleio_adapter_obj_t *self, bleio_addre } -STATIC void check_data_fit(size_t data_len, bool connectable) { +static void check_data_fit(size_t data_len, bool connectable) { if (data_len > BLE_GAP_ADV_SET_DATA_SIZE_EXTENDED_MAX_SUPPORTED || (connectable && data_len > BLE_GAP_ADV_SET_DATA_SIZE_EXTENDED_CONNECTABLE_MAX_SUPPORTED)) { mp_raise_ValueError(MP_ERROR_TEXT("Data too large for advertisement packet")); @@ -704,7 +704,7 @@ STATIC void check_data_fit(size_t data_len, bool connectable) { // The nRF SD 6.1.0 can only do one concurrent advertisement so share the advertising handle. uint8_t adv_handle = BLE_GAP_ADV_SET_HANDLE_NOT_SET; -STATIC bool advertising_on_ble_evt(ble_evt_t *ble_evt, void *self_in) { +static bool advertising_on_ble_evt(ble_evt_t *ble_evt, void *self_in) { bleio_adapter_obj_t *self = (bleio_adapter_obj_t *)self_in; switch (ble_evt->header.evt_id) { diff --git a/ports/nordic/common-hal/_bleio/Characteristic.c b/ports/nordic/common-hal/_bleio/Characteristic.c index 23c861e1f19c2..f3238f2fd5015 100644 --- a/ports/nordic/common-hal/_bleio/Characteristic.c +++ b/ports/nordic/common-hal/_bleio/Characteristic.c @@ -14,7 +14,7 @@ #include "common-hal/_bleio/Adapter.h" #include "common-hal/_bleio/bonding.h" -STATIC uint16_t characteristic_get_cccd(uint16_t cccd_handle, uint16_t conn_handle) { +static uint16_t characteristic_get_cccd(uint16_t cccd_handle, uint16_t conn_handle) { uint16_t cccd; ble_gatts_value_t value = { .p_value = (uint8_t *)&cccd, @@ -34,7 +34,7 @@ STATIC uint16_t characteristic_get_cccd(uint16_t cccd_handle, uint16_t conn_hand } -STATIC void characteristic_gatts_notify_indicate(uint16_t handle, uint16_t conn_handle, mp_buffer_info_t *bufinfo, uint16_t hvx_type) { +static void characteristic_gatts_notify_indicate(uint16_t handle, uint16_t conn_handle, mp_buffer_info_t *bufinfo, uint16_t hvx_type) { uint16_t hvx_len = bufinfo->len; ble_gatts_hvx_params_t hvx_params = { diff --git a/ports/nordic/common-hal/_bleio/CharacteristicBuffer.c b/ports/nordic/common-hal/_bleio/CharacteristicBuffer.c index 66987aac12b6a..4374907adf4e8 100644 --- a/ports/nordic/common-hal/_bleio/CharacteristicBuffer.c +++ b/ports/nordic/common-hal/_bleio/CharacteristicBuffer.c @@ -22,7 +22,7 @@ #include "shared-bindings/_bleio/CharacteristicBuffer.h" // Push all the data onto the ring buffer. When the buffer is full, new bytes will be dropped. -STATIC void write_to_ringbuf(bleio_characteristic_buffer_obj_t *self, uint8_t *data, uint16_t len) { +static void write_to_ringbuf(bleio_characteristic_buffer_obj_t *self, uint8_t *data, uint16_t len) { uint8_t is_nested_critical_region; sd_nvic_critical_region_enter(&is_nested_critical_region); if (self->watch_for_interrupt_char) { @@ -39,7 +39,7 @@ STATIC void write_to_ringbuf(bleio_characteristic_buffer_obj_t *self, uint8_t *d sd_nvic_critical_region_exit(is_nested_critical_region); } -STATIC bool characteristic_buffer_on_ble_evt(ble_evt_t *ble_evt, void *param) { +static bool characteristic_buffer_on_ble_evt(ble_evt_t *ble_evt, void *param) { bleio_characteristic_buffer_obj_t *self = (bleio_characteristic_buffer_obj_t *)param; switch (ble_evt->header.evt_id) { case BLE_GATTS_EVT_WRITE: { diff --git a/ports/nordic/common-hal/_bleio/Connection.c b/ports/nordic/common-hal/_bleio/Connection.c index 227f2e2afbb42..7d5988abeeb12 100644 --- a/ports/nordic/common-hal/_bleio/Connection.c +++ b/ports/nordic/common-hal/_bleio/Connection.c @@ -381,7 +381,7 @@ void common_hal_bleio_connection_set_connection_interval(bleio_connection_intern } // service_uuid may be NULL, to discover all services. -STATIC bool discover_next_services(bleio_connection_internal_t *connection, uint16_t start_handle, ble_uuid_t *service_uuid) { +static bool discover_next_services(bleio_connection_internal_t *connection, uint16_t start_handle, ble_uuid_t *service_uuid) { m_discovery_successful = false; m_discovery_in_process = true; @@ -398,7 +398,7 @@ STATIC bool discover_next_services(bleio_connection_internal_t *connection, uint return m_discovery_successful; } -STATIC bool discover_next_characteristics(bleio_connection_internal_t *connection, bleio_service_obj_t *service, uint16_t start_handle) { +static bool discover_next_characteristics(bleio_connection_internal_t *connection, bleio_service_obj_t *service, uint16_t start_handle) { m_char_discovery_service = service; ble_gattc_handle_range_t handle_range; @@ -420,7 +420,7 @@ STATIC bool discover_next_characteristics(bleio_connection_internal_t *connectio return m_discovery_successful; } -STATIC bool discover_next_descriptors(bleio_connection_internal_t *connection, bleio_characteristic_obj_t *characteristic, uint16_t start_handle, uint16_t end_handle) { +static bool discover_next_descriptors(bleio_connection_internal_t *connection, bleio_characteristic_obj_t *characteristic, uint16_t start_handle, uint16_t end_handle) { m_desc_discovery_characteristic = characteristic; ble_gattc_handle_range_t handle_range; @@ -442,7 +442,7 @@ STATIC bool discover_next_descriptors(bleio_connection_internal_t *connection, b return m_discovery_successful; } -STATIC void on_primary_srv_discovery_rsp(ble_gattc_evt_prim_srvc_disc_rsp_t *response, bleio_connection_internal_t *connection) { +static void on_primary_srv_discovery_rsp(ble_gattc_evt_prim_srvc_disc_rsp_t *response, bleio_connection_internal_t *connection) { for (size_t i = 0; i < response->count; ++i) { ble_gattc_service_t *gattc_service = &response->services[i]; @@ -478,7 +478,7 @@ STATIC void on_primary_srv_discovery_rsp(ble_gattc_evt_prim_srvc_disc_rsp_t *res m_discovery_in_process = false; } -STATIC void on_char_discovery_rsp(ble_gattc_evt_char_disc_rsp_t *response, bleio_connection_internal_t *connection) { +static void on_char_discovery_rsp(ble_gattc_evt_char_disc_rsp_t *response, bleio_connection_internal_t *connection) { for (size_t i = 0; i < response->count; ++i) { ble_gattc_char_t *gattc_char = &response->chars[i]; @@ -523,7 +523,7 @@ STATIC void on_char_discovery_rsp(ble_gattc_evt_char_disc_rsp_t *response, bleio m_discovery_in_process = false; } -STATIC void on_desc_discovery_rsp(ble_gattc_evt_desc_disc_rsp_t *response, bleio_connection_internal_t *connection) { +static void on_desc_discovery_rsp(ble_gattc_evt_desc_disc_rsp_t *response, bleio_connection_internal_t *connection) { for (size_t i = 0; i < response->count; ++i) { ble_gattc_desc_t *gattc_desc = &response->descs[i]; @@ -578,7 +578,7 @@ STATIC void on_desc_discovery_rsp(ble_gattc_evt_desc_disc_rsp_t *response, bleio m_discovery_in_process = false; } -STATIC bool discovery_on_ble_evt(ble_evt_t *ble_evt, mp_obj_t payload) { +static bool discovery_on_ble_evt(ble_evt_t *ble_evt, mp_obj_t payload) { bleio_connection_internal_t *connection = MP_OBJ_TO_PTR(payload); switch (ble_evt->header.evt_id) { case BLE_GAP_EVT_DISCONNECTED: @@ -606,7 +606,7 @@ STATIC bool discovery_on_ble_evt(ble_evt_t *ble_evt, mp_obj_t payload) { return true; } -STATIC void discover_remote_services(bleio_connection_internal_t *self, mp_obj_t service_uuids_whitelist) { +static void discover_remote_services(bleio_connection_internal_t *self, mp_obj_t service_uuids_whitelist) { ble_drv_add_event_handler(discovery_on_ble_evt, self); // Start over with an empty list. diff --git a/ports/nordic/common-hal/_bleio/PacketBuffer.c b/ports/nordic/common-hal/_bleio/PacketBuffer.c index c12a5268676e1..3e0a0a56a4f88 100644 --- a/ports/nordic/common-hal/_bleio/PacketBuffer.c +++ b/ports/nordic/common-hal/_bleio/PacketBuffer.c @@ -22,7 +22,7 @@ #include "supervisor/shared/bluetooth/serial.h" -STATIC void write_to_ringbuf(bleio_packet_buffer_obj_t *self, uint8_t *data, uint16_t len) { +static void write_to_ringbuf(bleio_packet_buffer_obj_t *self, uint8_t *data, uint16_t len) { if (len + sizeof(uint16_t) > ringbuf_size(&self->ringbuf)) { // This shouldn't happen but can if our buffer size was much smaller than // the writes the client actually makes. @@ -45,7 +45,7 @@ STATIC void write_to_ringbuf(bleio_packet_buffer_obj_t *self, uint8_t *data, uin sd_nvic_critical_region_exit(is_nested_critical_region); } -STATIC uint32_t queue_next_write(bleio_packet_buffer_obj_t *self) { +static uint32_t queue_next_write(bleio_packet_buffer_obj_t *self) { // Queue up the next outgoing buffer. We use two, one that has been passed to the SD for // transmission (when packet_queued is true) and the other is `pending` and can still be // modified. By primarily appending to the `pending` buffer we can reduce the protocol overhead @@ -87,7 +87,7 @@ STATIC uint32_t queue_next_write(bleio_packet_buffer_obj_t *self) { return NRF_SUCCESS; } -STATIC bool packet_buffer_on_ble_client_evt(ble_evt_t *ble_evt, void *param) { +static bool packet_buffer_on_ble_client_evt(ble_evt_t *ble_evt, void *param) { const uint16_t evt_id = ble_evt->header.evt_id; bleio_packet_buffer_obj_t *self = (bleio_packet_buffer_obj_t *)param; if (evt_id == BLE_GAP_EVT_DISCONNECTED && self->conn_handle == ble_evt->evt.gap_evt.conn_handle) { @@ -128,7 +128,7 @@ STATIC bool packet_buffer_on_ble_client_evt(ble_evt_t *ble_evt, void *param) { return true; } -STATIC bool packet_buffer_on_ble_server_evt(ble_evt_t *ble_evt, void *param) { +static bool packet_buffer_on_ble_server_evt(ble_evt_t *ble_evt, void *param) { bleio_packet_buffer_obj_t *self = (bleio_packet_buffer_obj_t *)param; switch (ble_evt->header.evt_id) { case BLE_GATTS_EVT_WRITE: { diff --git a/ports/nordic/common-hal/_bleio/Service.c b/ports/nordic/common-hal/_bleio/Service.c index 59c09453a2527..edd67a5fe739d 100644 --- a/ports/nordic/common-hal/_bleio/Service.c +++ b/ports/nordic/common-hal/_bleio/Service.c @@ -15,7 +15,7 @@ #include "shared-bindings/_bleio/Adapter.h" -STATIC void _indicate_service_change(uint16_t start, uint16_t end) { +static void _indicate_service_change(uint16_t start, uint16_t end) { for (size_t i = 0; i < BLEIO_TOTAL_CONNECTION_COUNT; i++) { bleio_connection_internal_t *connection = &bleio_connections[i]; uint16_t conn_handle = connection->conn_handle; @@ -85,7 +85,7 @@ bool common_hal_bleio_service_get_is_secondary(bleio_service_obj_t *self) { return self->is_secondary; } -STATIC void _expand_range(uint16_t new_value, uint16_t *start, uint16_t *end) { +static void _expand_range(uint16_t new_value, uint16_t *start, uint16_t *end) { if (new_value == 0) { return; } diff --git a/ports/nordic/common-hal/_bleio/__init__.c b/ports/nordic/common-hal/_bleio/__init__.c index 563da0a972002..1f4b81f74d805 100644 --- a/ports/nordic/common-hal/_bleio/__init__.c +++ b/ports/nordic/common-hal/_bleio/__init__.c @@ -146,7 +146,7 @@ typedef struct { volatile bool done; } read_info_t; -STATIC bool _on_gattc_read_rsp_evt(ble_evt_t *ble_evt, void *param) { +static bool _on_gattc_read_rsp_evt(ble_evt_t *ble_evt, void *param) { read_info_t *read = param; switch (ble_evt->header.evt_id) { diff --git a/ports/nordic/common-hal/_bleio/bonding.c b/ports/nordic/common-hal/_bleio/bonding.c index a4a9a8b87f0c4..a1cf0b94f0c34 100644 --- a/ports/nordic/common-hal/_bleio/bonding.c +++ b/ports/nordic/common-hal/_bleio/bonding.c @@ -50,7 +50,7 @@ void bonding_print_keys(bonding_keys_t *keys) { } #endif -STATIC size_t compute_block_size(uint16_t data_length) { +static size_t compute_block_size(uint16_t data_length) { // Round data size up to the nearest 32-bit address. return sizeof(bonding_block_t) + ((data_length + 3) & ~0x3); } @@ -73,7 +73,7 @@ void bonding_erase_storage(void) { // The last block returned is the unused block at the end. // Return NULL if we have run off the end of the bonding space. -STATIC bonding_block_t *next_block(bonding_block_t *block) { +static bonding_block_t *next_block(bonding_block_t *block) { while (1) { // Advance to next block. if (block == NULL) { @@ -101,7 +101,7 @@ STATIC bonding_block_t *next_block(bonding_block_t *block) { // Find the block with given is_central, type and ediv value. // If type == BLOCK_UNUSED, ediv is ignored and the the sole unused block at the end is returned. // If not found, return NULL. -STATIC bonding_block_t *find_existing_block(bool is_central, bonding_block_type_t type, uint16_t ediv) { +static bonding_block_t *find_existing_block(bool is_central, bonding_block_type_t type, uint16_t ediv) { bonding_block_t *block = NULL; while (1) { block = next_block(block); @@ -134,7 +134,7 @@ size_t bonding_peripheral_bond_count(void) { } // Get an empty block large enough to store data_length data. -STATIC bonding_block_t *find_unused_block(uint16_t data_length) { +static bonding_block_t *find_unused_block(uint16_t data_length) { bonding_block_t *unused_block = find_existing_block(true, BLOCK_UNUSED, EDIV_INVALID); // If no more room, erase all existing blocks and start over. if (!unused_block || @@ -147,18 +147,18 @@ STATIC bonding_block_t *find_unused_block(uint16_t data_length) { // Set the header word to all 0's, to mark the block as invalid. // We don't change data_length, so we can still skip over this block. -STATIC void invalidate_block(bonding_block_t *block) { +static void invalidate_block(bonding_block_t *block) { uint32_t zero = 0; sd_flash_write_sync((uint32_t *)block, &zero, 1); } // Write bonding block header. -STATIC void write_block_header(bonding_block_t *dest_block, bonding_block_t *source_block_header) { +static void write_block_header(bonding_block_t *dest_block, bonding_block_t *source_block_header) { sd_flash_write_sync((uint32_t *)dest_block, (uint32_t *)source_block_header, sizeof(bonding_block_t) / 4); } // Write variable-length data at end of bonding block. -STATIC void write_block_data(bonding_block_t *dest_block, uint8_t *data, uint16_t data_length) { +static void write_block_data(bonding_block_t *dest_block, uint8_t *data, uint16_t data_length) { // Minimize the number of writes. Datasheet says no more than two writes per word before erasing again. // Start writing after the current header. @@ -177,7 +177,7 @@ STATIC void write_block_data(bonding_block_t *dest_block, uint8_t *data, uint16_ } } -STATIC void write_sys_attr_block(bleio_connection_internal_t *connection) { +static void write_sys_attr_block(bleio_connection_internal_t *connection) { uint16_t length = 0; // First find out how big a buffer we need, then fetch the data. if (sd_ble_gatts_sys_attr_get(connection->conn_handle, NULL, &length, SYS_ATTR_FLAGS) != NRF_SUCCESS) { @@ -214,7 +214,7 @@ STATIC void write_sys_attr_block(bleio_connection_internal_t *connection) { return; } -STATIC void write_keys_block(bleio_connection_internal_t *connection) { +static void write_keys_block(bleio_connection_internal_t *connection) { uint16_t const ediv = connection->is_central ? connection->bonding_keys.peer_enc.master_id.ediv : connection->bonding_keys.own_enc.master_id.ediv; diff --git a/ports/nordic/common-hal/alarm/__init__.c b/ports/nordic/common-hal/alarm/__init__.c index 34e4d27f544f8..9753b0321fd06 100644 --- a/ports/nordic/common-hal/alarm/__init__.c +++ b/ports/nordic/common-hal/alarm/__init__.c @@ -48,7 +48,7 @@ void alarm_reset(void) { } extern uint32_t reset_reason_saved; -STATIC nrf_sleep_source_t _get_wakeup_cause(void) { +static nrf_sleep_source_t _get_wakeup_cause(void) { // First check if the modules remember what last woke up if (alarm_pin_pinalarm_woke_this_cycle()) { return NRF_SLEEP_WAKEUP_GPIO; @@ -120,7 +120,7 @@ mp_obj_t common_hal_alarm_record_wake_alarm(void) { } // Set up light sleep or deep sleep alarms. -STATIC void _setup_sleep_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms) { +static void _setup_sleep_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms) { sleepmem_wakeup_event = SLEEPMEM_WAKEUP_BY_NONE; sleepmem_wakeup_pin = WAKEUP_PIN_UNDEF; alarm_pin_pinalarm_set_alarms(deep_sleep, n_alarms, alarms); @@ -131,7 +131,7 @@ STATIC void _setup_sleep_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t // TODO: this handles all possible types of wakeup, which is redundant with main. // revise to extract all parts essential to enabling sleep wakeup, but leave the // alarm/non-alarm sorting to the existing main loop. -STATIC void system_on_idle_until_alarm(int64_t timediff_ms, bool wake_from_serial, uint32_t prescaler) { +static void system_on_idle_until_alarm(int64_t timediff_ms, bool wake_from_serial, uint32_t prescaler) { bool have_timeout = false; uint64_t start_tick = 0, end_tick = 0; int64_t tickdiff; diff --git a/ports/nordic/common-hal/audiobusio/I2SOut.c b/ports/nordic/common-hal/audiobusio/I2SOut.c index fc84927909b58..6e8fc2088134c 100644 --- a/ports/nordic/common-hal/audiobusio/I2SOut.c +++ b/ports/nordic/common-hal/audiobusio/I2SOut.c @@ -71,7 +71,7 @@ static void calculate_ratio_info(uint32_t target_sample_rate, struct frequency_i / target_sample_rate; } -STATIC void choose_i2s_clocking(audiobusio_i2sout_obj_t *self, uint32_t sample_rate) { +static void choose_i2s_clocking(audiobusio_i2sout_obj_t *self, uint32_t sample_rate) { struct frequency_info best = {0, 0, 0, 1.0}; for (size_t ri = 0; ri < sizeof(ratios) / sizeof(ratios[0]); ri++) { if (NRF_I2S->CONFIG.SWIDTH == I2S_CONFIG_SWIDTH_SWIDTH_16Bit diff --git a/ports/nordic/common-hal/audiopwmio/PWMAudioOut.c b/ports/nordic/common-hal/audiopwmio/PWMAudioOut.c index 6476bcbc8c173..89c83bc0669f4 100644 --- a/ports/nordic/common-hal/audiopwmio/PWMAudioOut.c +++ b/ports/nordic/common-hal/audiopwmio/PWMAudioOut.c @@ -19,7 +19,7 @@ #include "supervisor/shared/tick.h" // TODO: This should be the same size as PWMOut.c:pwms[], but there's no trivial way to accomplish that -STATIC audiopwmio_pwmaudioout_obj_t *active_audio[4]; +static audiopwmio_pwmaudioout_obj_t *active_audio[4]; #define F_TARGET (62500) #define F_PWM (16000000) @@ -30,7 +30,7 @@ STATIC audiopwmio_pwmaudioout_obj_t *active_audio[4]; // 24000: top = 222 refresh = 2 [24024.0] // 44100: top = 181 refresh = 1 [44198.8] // 48000: top = 167 refresh = 1 [47904.1] -STATIC uint32_t calculate_pwm_parameters(uint32_t sample_rate, uint32_t *top_out) { +static uint32_t calculate_pwm_parameters(uint32_t sample_rate, uint32_t *top_out) { // the desired frequency is the closest integer multiple of sample_rate not less than F_TARGET uint32_t desired_frequency = (F_TARGET + sample_rate - 1) / sample_rate * sample_rate; // The top value is the PWM frequency divided by the desired frequency (round to nearest) @@ -43,7 +43,7 @@ STATIC uint32_t calculate_pwm_parameters(uint32_t sample_rate, uint32_t *top_out return multiplier - 1; } -STATIC void activate_audiopwmout_obj(audiopwmio_pwmaudioout_obj_t *self) { +static void activate_audiopwmout_obj(audiopwmio_pwmaudioout_obj_t *self) { for (size_t i = 0; i < MP_ARRAY_SIZE(active_audio); i++) { if (!active_audio[i]) { active_audio[i] = self; @@ -52,7 +52,7 @@ STATIC void activate_audiopwmout_obj(audiopwmio_pwmaudioout_obj_t *self) { } } } -STATIC void deactivate_audiopwmout_obj(audiopwmio_pwmaudioout_obj_t *self) { +static void deactivate_audiopwmout_obj(audiopwmio_pwmaudioout_obj_t *self) { // Turn off the interrupts to the CPU. self->pwm->INTENCLR = PWM_INTENSET_SEQSTARTED0_Msk | PWM_INTENSET_SEQSTARTED1_Msk; for (size_t i = 0; i < MP_ARRAY_SIZE(active_audio); i++) { @@ -63,7 +63,7 @@ STATIC void deactivate_audiopwmout_obj(audiopwmio_pwmaudioout_obj_t *self) { } } -STATIC void fill_buffers(audiopwmio_pwmaudioout_obj_t *self, int buf) { +static void fill_buffers(audiopwmio_pwmaudioout_obj_t *self, int buf) { uint16_t *dev_buffer = self->buffers[buf]; uint8_t *buffer; uint32_t buffer_length; @@ -112,7 +112,7 @@ STATIC void fill_buffers(audiopwmio_pwmaudioout_obj_t *self, int buf) { } } -STATIC void audiopwmout_background_obj(audiopwmio_pwmaudioout_obj_t *self) { +static void audiopwmout_background_obj(audiopwmio_pwmaudioout_obj_t *self) { if (!common_hal_audiopwmio_pwmaudioout_get_playing(self)) { return; } diff --git a/ports/nordic/common-hal/busio/I2C.c b/ports/nordic/common-hal/busio/I2C.c index a71e320377c2d..b0956e7d20ab0 100644 --- a/ports/nordic/common-hal/busio/I2C.c +++ b/ports/nordic/common-hal/busio/I2C.c @@ -23,7 +23,7 @@ #define I2C_MAX_XFER_LEN MIN(((1UL << TWIM0_EASYDMA_MAXCNT_SIZE) - 1), 1024) #define I2C_TIMEOUT 1000 // 1 second timeout -STATIC twim_peripheral_t twim_peripherals[] = { +static twim_peripheral_t twim_peripherals[] = { #if NRFX_CHECK(NRFX_TWIM0_ENABLED) // SPIM0 and TWIM0 share an address. { .twim = NRFX_TWIM_INSTANCE(0), @@ -40,7 +40,7 @@ STATIC twim_peripheral_t twim_peripherals[] = { #endif }; -STATIC bool never_reset[MP_ARRAY_SIZE(twim_peripherals)]; +static bool never_reset[MP_ARRAY_SIZE(twim_peripherals)]; void i2c_reset(void) { for (size_t i = 0; i < MP_ARRAY_SIZE(twim_peripherals); i++) { @@ -234,7 +234,7 @@ void common_hal_busio_i2c_unlock(busio_i2c_obj_t *self) { self->has_lock = false; } -STATIC nrfx_err_t _twim_xfer_with_timeout(busio_i2c_obj_t *self, nrfx_twim_xfer_desc_t const *p_xfer_desc, uint32_t flags) { +static nrfx_err_t _twim_xfer_with_timeout(busio_i2c_obj_t *self, nrfx_twim_xfer_desc_t const *p_xfer_desc, uint32_t flags) { // does non-blocking transfer and raises and exception if it takes longer than I2C_TIMEOUT ms to complete uint64_t deadline = supervisor_ticks_ms64() + I2C_TIMEOUT; nrfx_err_t err = NRFX_SUCCESS; @@ -265,7 +265,7 @@ STATIC nrfx_err_t _twim_xfer_with_timeout(busio_i2c_obj_t *self, nrfx_twim_xfer_ } } -STATIC uint8_t _common_hal_busio_i2c_write(busio_i2c_obj_t *self, uint16_t addr, const uint8_t *data, size_t len, bool stopBit) { +static uint8_t _common_hal_busio_i2c_write(busio_i2c_obj_t *self, uint16_t addr, const uint8_t *data, size_t len, bool stopBit) { if (len == 0) { return common_hal_busio_i2c_probe(self, addr) ? 0 : MP_ENODEV; } diff --git a/ports/nordic/common-hal/busio/SPI.c b/ports/nordic/common-hal/busio/SPI.c index f2613b6776108..23e06c6481d1c 100644 --- a/ports/nordic/common-hal/busio/SPI.c +++ b/ports/nordic/common-hal/busio/SPI.c @@ -31,7 +31,7 @@ #endif // These are in order from highest available frequency to lowest (32MHz first, then 8MHz). -STATIC const spim_peripheral_t spim_peripherals[] = { +static const spim_peripheral_t spim_peripherals[] = { #if NRFX_CHECK(NRFX_SPIM3_ENABLED) // SPIM3 exists only on nRF52840 and supports 32MHz max. All other SPIM's are only 8MHz max. // Allocate SPIM3 first. @@ -59,11 +59,11 @@ STATIC const spim_peripheral_t spim_peripherals[] = { #endif }; -STATIC bool never_reset[MP_ARRAY_SIZE(spim_peripherals)]; +static bool never_reset[MP_ARRAY_SIZE(spim_peripherals)]; // Separate RAM area for SPIM3 transmit buffer to avoid SPIM3 hardware errata. // https://infocenter.nordicsemi.com/index.jsp?topic=%2Ferrata_nRF52840_Rev2%2FERR%2FnRF52840%2FRev2%2Flatest%2Fanomaly_840_198.html -STATIC uint8_t *spim3_transmit_buffer = (uint8_t *)SPIM3_BUFFER_RAM_START_ADDR; +static uint8_t *spim3_transmit_buffer = (uint8_t *)SPIM3_BUFFER_RAM_START_ADDR; void spi_reset(void) { for (size_t i = 0; i < MP_ARRAY_SIZE(spim_peripherals); i++) { diff --git a/ports/nordic/common-hal/microcontroller/Pin.c b/ports/nordic/common-hal/microcontroller/Pin.c index c5b687d80a365..8043d2dfd4d68 100644 --- a/ports/nordic/common-hal/microcontroller/Pin.c +++ b/ports/nordic/common-hal/microcontroller/Pin.c @@ -17,10 +17,10 @@ bool speaker_enable_in_use; #endif // Bit mask of claimed pins on each of up to two ports. nrf52832 has one port; nrf52840 has two. -STATIC uint32_t claimed_pins[GPIO_COUNT]; -STATIC uint32_t never_reset_pins[GPIO_COUNT]; +static uint32_t claimed_pins[GPIO_COUNT]; +static uint32_t never_reset_pins[GPIO_COUNT]; -STATIC void reset_speaker_enable_pin(void) { +static void reset_speaker_enable_pin(void) { #ifdef SPEAKER_ENABLE_PIN speaker_enable_in_use = false; nrf_gpio_cfg(SPEAKER_ENABLE_PIN->number, diff --git a/ports/nordic/common-hal/microcontroller/__init__.c b/ports/nordic/common-hal/microcontroller/__init__.c index ca5b82ff6bb80..69024cbb296e0 100644 --- a/ports/nordic/common-hal/microcontroller/__init__.c +++ b/ports/nordic/common-hal/microcontroller/__init__.c @@ -106,7 +106,7 @@ watchdog_watchdogtimer_obj_t common_hal_mcu_watchdogtimer_obj = { }; #endif -STATIC const mp_rom_map_elem_t mcu_pin_globals_table[] = { +static const mp_rom_map_elem_t mcu_pin_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_P0_00), MP_ROM_PTR(&pin_P0_00) }, { MP_ROM_QSTR(MP_QSTR_P0_01), MP_ROM_PTR(&pin_P0_01) }, { MP_ROM_QSTR(MP_QSTR_P0_02), MP_ROM_PTR(&pin_P0_02) }, diff --git a/ports/nordic/common-hal/os/__init__.c b/ports/nordic/common-hal/os/__init__.c index d3b5895213078..78aa1e040cf8e 100644 --- a/ports/nordic/common-hal/os/__init__.c +++ b/ports/nordic/common-hal/os/__init__.c @@ -17,18 +17,18 @@ #include "nrf_rng.h" -STATIC const qstr os_uname_info_fields[] = { +static const qstr os_uname_info_fields[] = { MP_QSTR_sysname, MP_QSTR_nodename, MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine }; -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "nrf52"); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "nrf52"); +static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "nrf52"); +static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "nrf52"); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME); +static const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING); +static const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE); +static const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME); -STATIC MP_DEFINE_ATTRTUPLE( +static MP_DEFINE_ATTRTUPLE( os_uname_info_obj, os_uname_info_fields, 5, diff --git a/ports/nordic/common-hal/pwmio/PWMOut.c b/ports/nordic/common-hal/pwmio/PWMOut.c index 2deb946aec006..6dc7ff56c7122 100644 --- a/ports/nordic/common-hal/pwmio/PWMOut.c +++ b/ports/nordic/common-hal/pwmio/PWMOut.c @@ -15,7 +15,7 @@ #define PWM_MAX_FREQ (16000000) -STATIC NRF_PWM_Type *pwms[] = { +static NRF_PWM_Type *pwms[] = { #if NRFX_CHECK(NRFX_PWM0_ENABLED) NRF_PWM0, #endif @@ -32,11 +32,11 @@ STATIC NRF_PWM_Type *pwms[] = { #define CHANNELS_PER_PWM 4 -STATIC uint16_t pwm_seq[MP_ARRAY_SIZE(pwms)][CHANNELS_PER_PWM]; +static uint16_t pwm_seq[MP_ARRAY_SIZE(pwms)][CHANNELS_PER_PWM]; static uint8_t never_reset_pwm[MP_ARRAY_SIZE(pwms)]; -STATIC int pwm_idx(NRF_PWM_Type *pwm) { +static int pwm_idx(NRF_PWM_Type *pwm) { for (size_t i = 0; i < MP_ARRAY_SIZE(pwms); i++) { if (pwms[i] == pwm) { return i; @@ -51,7 +51,7 @@ void common_hal_pwmio_pwmout_never_reset(pwmio_pwmout_obj_t *self) { common_hal_never_reset_pin(self->pin); } -STATIC void reset_single_pwmout(uint8_t i) { +static void reset_single_pwmout(uint8_t i) { NRF_PWM_Type *pwm = pwms[i]; pwm->ENABLE = 0; @@ -79,7 +79,7 @@ STATIC void reset_single_pwmout(uint8_t i) { // Find the smallest prescaler value that will allow the divisor to be in range. // This allows the most accuracy. -STATIC bool convert_frequency(uint32_t frequency, uint16_t *countertop, nrf_pwm_clk_t *base_clock) { +static bool convert_frequency(uint32_t frequency, uint16_t *countertop, nrf_pwm_clk_t *base_clock) { uint32_t divisor = 1; // Use a 32-bit number so we don't overflow the uint16_t; uint32_t tentative_countertop; diff --git a/ports/nordic/common-hal/watchdog/WatchDogTimer.c b/ports/nordic/common-hal/watchdog/WatchDogTimer.c index 86d844c38fcb1..b20aa0c06294f 100644 --- a/ports/nordic/common-hal/watchdog/WatchDogTimer.c +++ b/ports/nordic/common-hal/watchdog/WatchDogTimer.c @@ -26,12 +26,12 @@ #include "nrfx_wdt.h" #include "nrfx_timer.h" -STATIC uint8_t timer_refcount = 0; -STATIC nrfx_timer_t *timer = NULL; -STATIC nrfx_wdt_t wdt = NRFX_WDT_INSTANCE(0); -STATIC nrfx_wdt_channel_id wdt_channel_id; +static uint8_t timer_refcount = 0; +static nrfx_timer_t *timer = NULL; +static nrfx_wdt_t wdt = NRFX_WDT_INSTANCE(0); +static nrfx_wdt_channel_id wdt_channel_id; -STATIC void watchdogtimer_timer_event_handler(nrf_timer_event_t event_type, void *p_context) { +static void watchdogtimer_timer_event_handler(nrf_timer_event_t event_type, void *p_context) { watchdog_watchdogtimer_obj_t *self = MP_OBJ_TO_PTR(p_context); if (event_type != NRF_TIMER_EVENT_COMPARE0) { // Spurious event. @@ -61,7 +61,7 @@ static void timer_free(void) { // This function is called if the timer expires. The system will reboot // in 1/16384 of a second. Issue a reboot ourselves so we can do any // cleanup necessary. -STATIC void watchdogtimer_watchdog_event_handler(void) { +static void watchdogtimer_watchdog_event_handler(void) { reset_cpu(); } diff --git a/ports/nordic/peripherals/nrf/nvm.c b/ports/nordic/peripherals/nrf/nvm.c index 408c6a26c6b04..61a517f115231 100644 --- a/ports/nordic/peripherals/nrf/nvm.c +++ b/ports/nordic/peripherals/nrf/nvm.c @@ -18,7 +18,7 @@ #include "ble_drv.h" #include "nrf_sdm.h" -STATIC bool sd_is_enabled(void) { +static bool sd_is_enabled(void) { uint8_t sd_en = 0; if (__get_PRIMASK()) { return false; @@ -27,11 +27,11 @@ STATIC bool sd_is_enabled(void) { return sd_en; } -STATIC void sd_flash_operation_start(void) { +static void sd_flash_operation_start(void) { sd_flash_operation_status = SD_FLASH_OPERATION_IN_PROGRESS; } -STATIC sd_flash_operation_status_t sd_flash_operation_wait_until_done(void) { +static sd_flash_operation_status_t sd_flash_operation_wait_until_done(void) { // If the SD is not enabled, no events are generated, so just return immediately. if (sd_is_enabled()) { while (sd_flash_operation_status == SD_FLASH_OPERATION_IN_PROGRESS) { diff --git a/ports/nordic/peripherals/nrf/timers.c b/ports/nordic/peripherals/nrf/timers.c index bec70b6cb778c..ec1bde6587706 100644 --- a/ports/nordic/peripherals/nrf/timers.c +++ b/ports/nordic/peripherals/nrf/timers.c @@ -15,7 +15,7 @@ #include "py/mpconfig.h" #include "py/runtime.h" -STATIC nrfx_timer_t nrfx_timers[] = { +static nrfx_timer_t nrfx_timers[] = { #if NRFX_CHECK(NRFX_TIMER0_ENABLED) #error NRFX_TIMER0_ENABLED should not be on: TIMER0 is used by the SoftDevice NRFX_TIMER_INSTANCE(0), diff --git a/ports/nordic/supervisor/port.c b/ports/nordic/supervisor/port.c index 5722a9863f971..759cb8ed42592 100644 --- a/ports/nordic/supervisor/port.c +++ b/ports/nordic/supervisor/port.c @@ -75,7 +75,7 @@ static volatile struct { uint32_t suffix; } overflow_tracker __attribute__((section(".uninitialized"))); -STATIC void rtc_handler(nrfx_rtc_int_type_t int_type) { +static void rtc_handler(nrfx_rtc_int_type_t int_type) { if (int_type == NRFX_RTC_INT_OVERFLOW) { // Our RTC is 24 bits and we're clocking it at 32.768khz which is 32 (2 ** 5) subticks per // tick. @@ -94,7 +94,7 @@ STATIC void rtc_handler(nrfx_rtc_int_type_t int_type) { } } -STATIC void tick_init(void) { +static void tick_init(void) { if (!nrf_clock_lf_is_running(NRF_CLOCK)) { nrf_clock_task_trigger(NRF_CLOCK, NRF_CLOCK_TASK_LFCLKSTART); } @@ -115,7 +115,7 @@ STATIC void tick_init(void) { } } -STATIC void tick_uninit(void) { +static void tick_uninit(void) { nrfx_rtc_counter_clear(&rtc_instance); nrfx_rtc_disable(&rtc_instance); nrfx_rtc_uninit(&rtc_instance); diff --git a/ports/nordic/supervisor/qspi_flash.c b/ports/nordic/supervisor/qspi_flash.c index 83c8fd30a91ad..3cff8b21a155e 100644 --- a/ports/nordic/supervisor/qspi_flash.c +++ b/ports/nordic/supervisor/qspi_flash.c @@ -50,7 +50,7 @@ void qspi_disable(void) { } } -STATIC void qspi_enable(void) { +static void qspi_enable(void) { if (NRF_QSPI->ENABLE) { return; } diff --git a/ports/raspberrypi/audio_dma.c b/ports/raspberrypi/audio_dma.c index 8ea45ae8409a8..66a0d98627c6e 100644 --- a/ports/raspberrypi/audio_dma.c +++ b/ports/raspberrypi/audio_dma.c @@ -30,7 +30,7 @@ void audio_dma_reset(void) { } -STATIC size_t audio_dma_convert_samples(audio_dma_t *dma, uint8_t *input, uint32_t input_length, uint8_t *output, uint32_t output_length) { +static size_t audio_dma_convert_samples(audio_dma_t *dma, uint8_t *input, uint32_t input_length, uint8_t *output, uint32_t output_length) { #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wcast-align" @@ -115,7 +115,7 @@ STATIC size_t audio_dma_convert_samples(audio_dma_t *dma, uint8_t *input, uint32 } // buffer_idx is 0 or 1. -STATIC void audio_dma_load_next_block(audio_dma_t *dma, size_t buffer_idx) { +static void audio_dma_load_next_block(audio_dma_t *dma, size_t buffer_idx) { size_t dma_channel = dma->channel[buffer_idx]; audioio_get_buffer_result_t get_buffer_result; @@ -432,7 +432,7 @@ bool audio_dma_get_playing(audio_dma_t *dma) { // background tasks such as this and causes a stack overflow. // NOTE(dhalbert): I successfully printed from here while debugging. // So it's possible, but be careful. -STATIC void dma_callback_fun(void *arg) { +static void dma_callback_fun(void *arg) { audio_dma_t *dma = arg; if (dma == NULL) { return; diff --git a/ports/raspberrypi/bindings/cyw43/__init__.c b/ports/raspberrypi/bindings/cyw43/__init__.c index 6f3d8163d27b7..83aacdc48aedd 100644 --- a/ports/raspberrypi/bindings/cyw43/__init__.c +++ b/ports/raspberrypi/bindings/cyw43/__init__.c @@ -80,21 +80,21 @@ MP_DEFINE_CONST_OBJ_TYPE( //| usage. //| """ //| -STATIC mp_obj_t cyw43_set_power_management(const mp_obj_t value_in) { +static mp_obj_t cyw43_set_power_management(const mp_obj_t value_in) { mp_int_t value = mp_obj_get_int(value_in); power_management_value = value; bindings_cyw43_wifi_enforce_pm(); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(cyw43_set_power_management_obj, cyw43_set_power_management); +static MP_DEFINE_CONST_FUN_OBJ_1(cyw43_set_power_management_obj, cyw43_set_power_management); //| def get_power_management() -> int: //| """Retrieve the power management register""" //| -STATIC mp_obj_t cyw43_get_power_management() { +static mp_obj_t cyw43_get_power_management() { return mp_obj_new_int(power_management_value); } -STATIC MP_DEFINE_CONST_FUN_OBJ_0(cyw43_get_power_management_obj, cyw43_get_power_management); +static MP_DEFINE_CONST_FUN_OBJ_0(cyw43_get_power_management_obj, cyw43_get_power_management); const mcu_pin_obj_t *validate_obj_is_pin_including_cyw43(mp_obj_t obj, qstr arg_name) { if (!mp_obj_is_type(obj, &mcu_pin_type) && !mp_obj_is_type(obj, &cyw43_pin_type)) { @@ -117,7 +117,7 @@ const mcu_pin_obj_t *validate_obj_is_free_pin_including_cyw43(mp_obj_t obj, qstr return pin; } -STATIC const mp_rom_map_elem_t cyw43_module_globals_table[] = { +static const mp_rom_map_elem_t cyw43_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_cyw43) }, { MP_ROM_QSTR(MP_QSTR_CywPin), MP_ROM_PTR(&cyw43_pin_type) }, { MP_ROM_QSTR(MP_QSTR_set_power_management), &cyw43_set_power_management_obj }, @@ -128,7 +128,7 @@ STATIC const mp_rom_map_elem_t cyw43_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_PM_DISABLED), MP_ROM_INT(PM_DISABLED) }, }; -STATIC MP_DEFINE_CONST_DICT(cyw43_module_globals, cyw43_module_globals_table); +static MP_DEFINE_CONST_DICT(cyw43_module_globals, cyw43_module_globals_table); const mp_obj_module_t cyw43_module = { .base = { &mp_type_module }, diff --git a/ports/raspberrypi/bindings/picodvi/Framebuffer.c b/ports/raspberrypi/bindings/picodvi/Framebuffer.c index e13dccb013c44..b0ea6ef43f827 100644 --- a/ports/raspberrypi/bindings/picodvi/Framebuffer.c +++ b/ports/raspberrypi/bindings/picodvi/Framebuffer.c @@ -74,7 +74,7 @@ //| and 8 or 16 for color //| """ -STATIC mp_obj_t picodvi_framebuffer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t picodvi_framebuffer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_width, ARG_height, ARG_clk_dp, ARG_clk_dn, ARG_red_dp, ARG_red_dn, ARG_green_dp, ARG_green_dn, ARG_blue_dp, ARG_blue_dn, ARG_color_depth }; static const mp_arg_t allowed_args[] = { @@ -124,13 +124,13 @@ STATIC mp_obj_t picodvi_framebuffer_make_new(const mp_obj_type_t *type, size_t n //| `picodvi.Framebuffer` instance. After deinitialization, no further operations //| may be performed.""" //| ... -STATIC mp_obj_t picodvi_framebuffer_deinit(mp_obj_t self_in) { +static mp_obj_t picodvi_framebuffer_deinit(mp_obj_t self_in) { picodvi_framebuffer_obj_t *self = (picodvi_framebuffer_obj_t *)self_in; common_hal_picodvi_framebuffer_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(picodvi_framebuffer_deinit_obj, picodvi_framebuffer_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(picodvi_framebuffer_deinit_obj, picodvi_framebuffer_deinit); static void check_for_deinit(picodvi_framebuffer_obj_t *self) { if (common_hal_picodvi_framebuffer_deinited(self)) { @@ -140,7 +140,7 @@ static void check_for_deinit(picodvi_framebuffer_obj_t *self) { //| width: int //| """The width of the framebuffer, in pixels. It may be doubled for output.""" -STATIC mp_obj_t picodvi_framebuffer_get_width(mp_obj_t self_in) { +static mp_obj_t picodvi_framebuffer_get_width(mp_obj_t self_in) { picodvi_framebuffer_obj_t *self = (picodvi_framebuffer_obj_t *)self_in; check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_picodvi_framebuffer_get_width(self)); @@ -152,7 +152,7 @@ MP_PROPERTY_GETTER(picodvi_framebuffer_width_obj, //| height: int //| """The width of the framebuffer, in pixels. It may be doubled for output.""" //| -STATIC mp_obj_t picodvi_framebuffer_get_height(mp_obj_t self_in) { +static mp_obj_t picodvi_framebuffer_get_height(mp_obj_t self_in) { picodvi_framebuffer_obj_t *self = (picodvi_framebuffer_obj_t *)self_in; check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_picodvi_framebuffer_get_height(self)); @@ -162,59 +162,59 @@ MP_DEFINE_CONST_FUN_OBJ_1(picodvi_framebuffer_get_height_obj, picodvi_framebuffe MP_PROPERTY_GETTER(picodvi_framebuffer_height_obj, (mp_obj_t)&picodvi_framebuffer_get_height_obj); -STATIC const mp_rom_map_elem_t picodvi_framebuffer_locals_dict_table[] = { +static const mp_rom_map_elem_t picodvi_framebuffer_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&picodvi_framebuffer_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&picodvi_framebuffer_width_obj) }, { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&picodvi_framebuffer_height_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(picodvi_framebuffer_locals_dict, picodvi_framebuffer_locals_dict_table); +static MP_DEFINE_CONST_DICT(picodvi_framebuffer_locals_dict, picodvi_framebuffer_locals_dict_table); -STATIC void picodvi_framebuffer_get_bufinfo(mp_obj_t self_in, mp_buffer_info_t *bufinfo) { +static void picodvi_framebuffer_get_bufinfo(mp_obj_t self_in, mp_buffer_info_t *bufinfo) { common_hal_picodvi_framebuffer_get_buffer(self_in, bufinfo, 0); } // These versions exist so that the prototype matches the protocol, // avoiding a type cast that can hide errors -STATIC void picodvi_framebuffer_swapbuffers(mp_obj_t self_in, uint8_t *dirty_row_bitmap) { +static void picodvi_framebuffer_swapbuffers(mp_obj_t self_in, uint8_t *dirty_row_bitmap) { (void)dirty_row_bitmap; common_hal_picodvi_framebuffer_refresh(self_in); } -STATIC void picodvi_framebuffer_deinit_proto(mp_obj_t self_in) { +static void picodvi_framebuffer_deinit_proto(mp_obj_t self_in) { common_hal_picodvi_framebuffer_deinit(self_in); } -STATIC int picodvi_framebuffer_get_width_proto(mp_obj_t self_in) { +static int picodvi_framebuffer_get_width_proto(mp_obj_t self_in) { return common_hal_picodvi_framebuffer_get_width(self_in); } -STATIC int picodvi_framebuffer_get_height_proto(mp_obj_t self_in) { +static int picodvi_framebuffer_get_height_proto(mp_obj_t self_in) { return common_hal_picodvi_framebuffer_get_height(self_in); } -STATIC int picodvi_framebuffer_get_color_depth_proto(mp_obj_t self_in) { +static int picodvi_framebuffer_get_color_depth_proto(mp_obj_t self_in) { return common_hal_picodvi_framebuffer_get_color_depth(self_in); ; } -STATIC int picodvi_framebuffer_get_bytes_per_cell_proto(mp_obj_t self_in) { +static int picodvi_framebuffer_get_bytes_per_cell_proto(mp_obj_t self_in) { return 1; } -STATIC int picodvi_framebuffer_get_native_frames_per_second_proto(mp_obj_t self_in) { +static int picodvi_framebuffer_get_native_frames_per_second_proto(mp_obj_t self_in) { return 60; } -STATIC bool picodvi_framebuffer_get_pixels_in_byte_share_row_proto(mp_obj_t self_in) { +static bool picodvi_framebuffer_get_pixels_in_byte_share_row_proto(mp_obj_t self_in) { return true; } -STATIC int picodvi_framebuffer_get_row_stride_proto(mp_obj_t self_in) { +static int picodvi_framebuffer_get_row_stride_proto(mp_obj_t self_in) { return common_hal_picodvi_framebuffer_get_row_stride(self_in); } -STATIC const framebuffer_p_t picodvi_framebuffer_proto = { +static const framebuffer_p_t picodvi_framebuffer_proto = { MP_PROTO_IMPLEMENT(MP_QSTR_protocol_framebuffer) .get_bufinfo = picodvi_framebuffer_get_bufinfo, .get_width = picodvi_framebuffer_get_width_proto, diff --git a/ports/raspberrypi/bindings/picodvi/__init__.c b/ports/raspberrypi/bindings/picodvi/__init__.c index 0db3d29044d5a..43617de1a8b05 100644 --- a/ports/raspberrypi/bindings/picodvi/__init__.c +++ b/ports/raspberrypi/bindings/picodvi/__init__.c @@ -13,12 +13,12 @@ //| """Low-level routines for interacting with PicoDVI Output""" -STATIC const mp_rom_map_elem_t picodvi_module_globals_table[] = { +static const mp_rom_map_elem_t picodvi_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_picodvi) }, { MP_ROM_QSTR(MP_QSTR_Framebuffer), MP_ROM_PTR(&picodvi_framebuffer_type) }, }; -STATIC MP_DEFINE_CONST_DICT(picodvi_module_globals, picodvi_module_globals_table); +static MP_DEFINE_CONST_DICT(picodvi_module_globals, picodvi_module_globals_table); const mp_obj_module_t picodvi_module = { .base = { &mp_type_module }, diff --git a/ports/raspberrypi/bindings/rp2pio/StateMachine.c b/ports/raspberrypi/bindings/rp2pio/StateMachine.c index 14d79f1507f04..032b67db15949 100644 --- a/ports/raspberrypi/bindings/rp2pio/StateMachine.c +++ b/ports/raspberrypi/bindings/rp2pio/StateMachine.c @@ -137,7 +137,7 @@ //| """ //| ... -STATIC mp_obj_t rp2pio_statemachine_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t rp2pio_statemachine_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { rp2pio_statemachine_obj_t *self = mp_obj_malloc(rp2pio_statemachine_obj_t, &rp2pio_statemachine_type); enum { ARG_program, ARG_frequency, ARG_init, ARG_may_exec, ARG_first_out_pin, ARG_out_pin_count, ARG_initial_out_pin_state, ARG_initial_out_pin_direction, @@ -278,7 +278,7 @@ STATIC mp_obj_t rp2pio_statemachine_make_new(const mp_obj_type_t *type, size_t n //| def deinit(self) -> None: //| """Turn off the state machine and release its resources.""" //| ... -STATIC mp_obj_t rp2pio_statemachine_obj_deinit(mp_obj_t self_in) { +static mp_obj_t rp2pio_statemachine_obj_deinit(mp_obj_t self_in) { rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_rp2pio_statemachine_deinit(self); return mp_const_none; @@ -294,15 +294,15 @@ MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_deinit_obj, rp2pio_statemachine_ob //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t rp2pio_statemachine_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t rp2pio_statemachine_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_rp2pio_statemachine_deinit(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(rp2pio_statemachine_obj___exit___obj, 4, 4, rp2pio_statemachine_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(rp2pio_statemachine_obj___exit___obj, 4, 4, rp2pio_statemachine_obj___exit__); -STATIC void check_for_deinit(rp2pio_statemachine_obj_t *self) { +static void check_for_deinit(rp2pio_statemachine_obj_t *self) { if (common_hal_rp2pio_statemachine_deinited(self)) { raise_deinited_error(); } @@ -312,7 +312,7 @@ STATIC void check_for_deinit(rp2pio_statemachine_obj_t *self) { //| """Resets this state machine, runs any init and enables the clock.""" //| ... // TODO: "and any others given. They must share an underlying PIO. An exception will be raised otherwise."" -STATIC mp_obj_t rp2pio_statemachine_restart(mp_obj_t self_obj) { +static mp_obj_t rp2pio_statemachine_restart(mp_obj_t self_obj) { rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_obj); check_for_deinit(self); @@ -329,7 +329,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_restart_obj, rp2pio_statemachine_r //| This can be used to output internal state to the RX FIFO and then //| read with `readinto`.""" //| ... -STATIC mp_obj_t rp2pio_statemachine_run(mp_obj_t self_obj, mp_obj_t instruction_obj) { +static mp_obj_t rp2pio_statemachine_run(mp_obj_t self_obj, mp_obj_t instruction_obj) { rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_obj); check_for_deinit(self); @@ -347,7 +347,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(rp2pio_statemachine_run_obj, rp2pio_statemachine_run); //| def stop(self) -> None: //| """Stops the state machine clock. Use `restart` to enable it.""" //| ... -STATIC mp_obj_t rp2pio_statemachine_stop(mp_obj_t self_obj) { +static mp_obj_t rp2pio_statemachine_stop(mp_obj_t self_obj) { rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_obj); check_for_deinit(self); @@ -378,7 +378,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_stop_obj, rp2pio_statemachine_stop //| :param int end: End of the slice; this index is not included. Defaults to ``len(buffer)`` //| :param bool swap: For 2- and 4-byte elements, swap (reverse) the byte order""" //| ... -STATIC mp_obj_t rp2pio_statemachine_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t rp2pio_statemachine_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_buffer, ARG_start, ARG_end, ARG_swap }; static const mp_arg_t allowed_args[] = { { MP_QSTR_buffer, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, @@ -465,7 +465,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_write_obj, 2, rp2pio_statemachine //| """ //| ... -STATIC void fill_buf_info(sm_buf_info *info, mp_obj_t obj, size_t *stride_in_bytes) { +static void fill_buf_info(sm_buf_info *info, mp_obj_t obj, size_t *stride_in_bytes) { if (obj != mp_const_none) { info->obj = obj; mp_get_buffer_raise(obj, &info->info, MP_BUFFER_READ); @@ -482,7 +482,7 @@ STATIC void fill_buf_info(sm_buf_info *info, mp_obj_t obj, size_t *stride_in_byt } } -STATIC mp_obj_t rp2pio_statemachine_background_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t rp2pio_statemachine_background_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_once, ARG_loop, ARG_swap }; static const mp_arg_t allowed_args[] = { { MP_QSTR_once, MP_ARG_OBJ, {.u_obj = mp_const_none} }, @@ -519,7 +519,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_background_write_obj, 1, rp2pio_s //| """Immediately stop a background write, if one is in progress. Any //| DMA in progress is halted, but items already in the TX FIFO are not //| affected.""" -STATIC mp_obj_t rp2pio_statemachine_obj_stop_background_write(mp_obj_t self_in) { +static mp_obj_t rp2pio_statemachine_obj_stop_background_write(mp_obj_t self_in) { rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in); bool ok = common_hal_rp2pio_statemachine_stop_background_write(self); if (mp_hal_is_interrupted()) { @@ -534,7 +534,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_stop_background_write_obj, rp2pio_ //| writing: bool //| """Returns True if a background write is in progress""" -STATIC mp_obj_t rp2pio_statemachine_obj_get_writing(mp_obj_t self_in) { +static mp_obj_t rp2pio_statemachine_obj_get_writing(mp_obj_t self_in) { rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_bool(common_hal_rp2pio_statemachine_get_writing(self)); } @@ -552,7 +552,7 @@ const mp_obj_property_t rp2pio_statemachine_writing_obj = { //| """Returns the number of pending buffers for background writing. //| //| If the number is 0, then a `StateMachine.background_write` call will not block.""" -STATIC mp_obj_t rp2pio_statemachine_obj_get_pending(mp_obj_t self_in) { +static mp_obj_t rp2pio_statemachine_obj_get_pending(mp_obj_t self_in) { rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_int(common_hal_rp2pio_statemachine_get_pending(self)); } @@ -590,7 +590,7 @@ const mp_obj_property_t rp2pio_statemachine_pending_obj = { //| :param bool swap: For 2- and 4-byte elements, swap (reverse) the byte order""" //| ... -STATIC mp_obj_t rp2pio_statemachine_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t rp2pio_statemachine_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_buffer, ARG_start, ARG_end, ARG_swap }; static const mp_arg_t allowed_args[] = { { MP_QSTR_buffer, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, @@ -660,7 +660,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_readinto_obj, 2, rp2pio_statemach //| """ //| ... -STATIC mp_obj_t rp2pio_statemachine_write_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t rp2pio_statemachine_write_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_buffer_out, ARG_buffer_in, ARG_out_start, ARG_out_end, ARG_in_start, ARG_in_end, ARG_swap_out, ARG_swap_in }; static const mp_arg_t allowed_args[] = { { MP_QSTR_buffer_out, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, @@ -724,7 +724,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(rp2pio_statemachine_write_readinto_obj, 2, rp2pio_sta //| def clear_rxfifo(self) -> None: //| """Clears any unread bytes in the rxfifo.""" //| ... -STATIC mp_obj_t rp2pio_statemachine_obj_clear_rxfifo(mp_obj_t self_in) { +static mp_obj_t rp2pio_statemachine_obj_clear_rxfifo(mp_obj_t self_in) { rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_rp2pio_statemachine_clear_rxfifo(self); return mp_const_none; @@ -734,7 +734,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_clear_rxfifo_obj, rp2pio_statemach //| def clear_txstall(self) -> None: //| """Clears the txstall flag.""" //| ... -STATIC mp_obj_t rp2pio_statemachine_obj_clear_txstall(mp_obj_t self_in) { +static mp_obj_t rp2pio_statemachine_obj_clear_txstall(mp_obj_t self_in) { rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_rp2pio_statemachine_clear_txstall(self); return mp_const_none; @@ -746,14 +746,14 @@ MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_clear_txstall_obj, rp2pio_statemac //| """The actual state machine frequency. This may not match the frequency requested //| due to internal limitations.""" -STATIC mp_obj_t rp2pio_statemachine_obj_get_frequency(mp_obj_t self_in) { +static mp_obj_t rp2pio_statemachine_obj_get_frequency(mp_obj_t self_in) { rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_rp2pio_statemachine_get_frequency(self)); } MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_get_frequency_obj, rp2pio_statemachine_obj_get_frequency); -STATIC mp_obj_t rp2pio_statemachine_obj_set_frequency(mp_obj_t self_in, mp_obj_t frequency) { +static mp_obj_t rp2pio_statemachine_obj_set_frequency(mp_obj_t self_in, mp_obj_t frequency) { rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -770,7 +770,7 @@ MP_PROPERTY_GETSET(rp2pio_statemachine_frequency_obj, //| """True when the state machine has stalled due to a full TX FIFO since the last //| `clear_txstall` call.""" -STATIC mp_obj_t rp2pio_statemachine_obj_get_txstall(mp_obj_t self_in) { +static mp_obj_t rp2pio_statemachine_obj_get_txstall(mp_obj_t self_in) { rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_rp2pio_statemachine_get_txstall(self)); @@ -789,7 +789,7 @@ const mp_obj_property_t rp2pio_statemachine_txstall_obj = { //| """True when the state machine has stalled due to a full RX FIFO since the last //| `clear_rxfifo` call.""" -STATIC mp_obj_t rp2pio_statemachine_obj_get_rxstall(mp_obj_t self_in) { +static mp_obj_t rp2pio_statemachine_obj_get_rxstall(mp_obj_t self_in) { rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_rp2pio_statemachine_get_rxstall(self)); @@ -803,7 +803,7 @@ MP_PROPERTY_GETTER(rp2pio_statemachine_rxstall_obj, //| """The number of words available to readinto""" //| -STATIC mp_obj_t rp2pio_statemachine_obj_get_in_waiting(mp_obj_t self_in) { +static mp_obj_t rp2pio_statemachine_obj_get_in_waiting(mp_obj_t self_in) { rp2pio_statemachine_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_rp2pio_statemachine_get_in_waiting(self)); @@ -813,7 +813,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_statemachine_get_in_waiting_obj, rp2pio_statema MP_PROPERTY_GETTER(rp2pio_statemachine_in_waiting_obj, (mp_obj_t)&rp2pio_statemachine_get_in_waiting_obj); -STATIC const mp_rom_map_elem_t rp2pio_statemachine_locals_dict_table[] = { +static const mp_rom_map_elem_t rp2pio_statemachine_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&rp2pio_statemachine_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&rp2pio_statemachine_obj___exit___obj) }, @@ -837,7 +837,7 @@ STATIC const mp_rom_map_elem_t rp2pio_statemachine_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_txstall), MP_ROM_PTR(&rp2pio_statemachine_txstall_obj) }, { MP_ROM_QSTR(MP_QSTR_in_waiting), MP_ROM_PTR(&rp2pio_statemachine_in_waiting_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(rp2pio_statemachine_locals_dict, rp2pio_statemachine_locals_dict_table); +static MP_DEFINE_CONST_DICT(rp2pio_statemachine_locals_dict, rp2pio_statemachine_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( rp2pio_statemachine_type, diff --git a/ports/raspberrypi/bindings/rp2pio/__init__.c b/ports/raspberrypi/bindings/rp2pio/__init__.c index e9702cd8a7ea7..285919e0fd87e 100644 --- a/ports/raspberrypi/bindings/rp2pio/__init__.c +++ b/ports/raspberrypi/bindings/rp2pio/__init__.c @@ -24,7 +24,7 @@ //| """Return True if the pins have sequential GPIO numbers, False otherwise""" //| ... //| -STATIC mp_obj_t rp2pio_pins_are_sequential(mp_obj_t pins_obj) { +static mp_obj_t rp2pio_pins_are_sequential(mp_obj_t pins_obj) { size_t len; mp_obj_t *items; mp_obj_get_array(pins_obj, &len, &items); @@ -37,15 +37,15 @@ STATIC mp_obj_t rp2pio_pins_are_sequential(mp_obj_t pins_obj) { return mp_obj_new_bool(common_hal_rp2pio_pins_are_sequential(len, pins)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_pins_are_sequential_obj, rp2pio_pins_are_sequential); +static MP_DEFINE_CONST_FUN_OBJ_1(rp2pio_pins_are_sequential_obj, rp2pio_pins_are_sequential); -STATIC const mp_rom_map_elem_t rp2pio_module_globals_table[] = { +static const mp_rom_map_elem_t rp2pio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_rp2pio) }, { MP_ROM_QSTR(MP_QSTR_StateMachine), MP_ROM_PTR(&rp2pio_statemachine_type) }, { MP_ROM_QSTR(MP_QSTR_pins_are_sequential), MP_ROM_PTR(&rp2pio_pins_are_sequential_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(rp2pio_module_globals, rp2pio_module_globals_table); +static MP_DEFINE_CONST_DICT(rp2pio_module_globals, rp2pio_module_globals_table); const mp_obj_module_t rp2pio_module = { .base = { &mp_type_module }, diff --git a/ports/raspberrypi/boards/0xcb_helios/pins.c b/ports/raspberrypi/boards/0xcb_helios/pins.c index 2c3f663a6d002..4982d5b0bd171 100644 --- a/ports/raspberrypi/boards/0xcb_helios/pins.c +++ b/ports/raspberrypi/boards/0xcb_helios/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // Left side top to bottom diff --git a/ports/raspberrypi/boards/42keebs_frood/pins.c b/ports/raspberrypi/boards/42keebs_frood/pins.c index 9b774c63d8054..4543625051869 100644 --- a/ports/raspberrypi/boards/42keebs_frood/pins.c +++ b/ports/raspberrypi/boards/42keebs_frood/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040/pins.c b/ports/raspberrypi/boards/adafruit_feather_rp2040/pins.c index 9ec97cb38dc88..02addc9aa3510 100644 --- a/ports/raspberrypi/boards/adafruit_feather_rp2040/pins.c +++ b/ports/raspberrypi/boards/adafruit_feather_rp2040/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_can/pins.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_can/pins.c index 17eeb3d5bd32c..a856a1f5211f2 100644 --- a/ports/raspberrypi/boards/adafruit_feather_rp2040_can/pins.c +++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_can/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c index 6e8dd5f0d106e..82cbb7322e492 100644 --- a/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c +++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_dvi/pins.c @@ -8,7 +8,7 @@ #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_prop_maker/pins.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_prop_maker/pins.c index 91d3129d07a39..6691b408ad265 100644 --- a/ports/raspberrypi/boards/adafruit_feather_rp2040_prop_maker/pins.c +++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_prop_maker/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_rfm/pins.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_rfm/pins.c index fef18b262d5b4..20077900dec13 100644 --- a/ports/raspberrypi/boards/adafruit_feather_rp2040_rfm/pins.c +++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_rfm/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_scorpio/pins.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_scorpio/pins.c index 0b7bf005b60af..5ee869e075559 100644 --- a/ports/raspberrypi/boards/adafruit_feather_rp2040_scorpio/pins.c +++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_scorpio/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/pins.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/pins.c index 798f9e161922b..465b7e51f4687 100644 --- a/ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/pins.c +++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_thinkink/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040_usb_host/pins.c b/ports/raspberrypi/boards/adafruit_feather_rp2040_usb_host/pins.c index b342597c9c54b..ac4fbd595d657 100644 --- a/ports/raspberrypi/boards/adafruit_feather_rp2040_usb_host/pins.c +++ b/ports/raspberrypi/boards/adafruit_feather_rp2040_usb_host/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, diff --git a/ports/raspberrypi/boards/adafruit_floppsy_rp2040/pins.c b/ports/raspberrypi/boards/adafruit_floppsy_rp2040/pins.c index 546a9a869ae8c..800962637e5fc 100644 --- a/ports/raspberrypi/boards/adafruit_floppsy_rp2040/pins.c +++ b/ports/raspberrypi/boards/adafruit_floppsy_rp2040/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_DENSITY), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/adafruit_itsybitsy_rp2040/pins.c b/ports/raspberrypi/boards/adafruit_itsybitsy_rp2040/pins.c index 1be725d6f77f7..96b797a44c3d7 100644 --- a/ports/raspberrypi/boards/adafruit_itsybitsy_rp2040/pins.c +++ b/ports/raspberrypi/boards/adafruit_itsybitsy_rp2040/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, diff --git a/ports/raspberrypi/boards/adafruit_kb2040/pins.c b/ports/raspberrypi/boards/adafruit_kb2040/pins.c index ebdcff884b295..95d493b838feb 100644 --- a/ports/raspberrypi/boards/adafruit_kb2040/pins.c +++ b/ports/raspberrypi/boards/adafruit_kb2040/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, diff --git a/ports/raspberrypi/boards/adafruit_macropad_rp2040/pins.c b/ports/raspberrypi/boards/adafruit_macropad_rp2040/pins.c index 8b1698c5ad667..f5330dd9de0f3 100644 --- a/ports/raspberrypi/boards/adafruit_macropad_rp2040/pins.c +++ b/ports/raspberrypi/boards/adafruit_macropad_rp2040/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_KEY1), MP_ROM_PTR(&pin_GPIO1) }, diff --git a/ports/raspberrypi/boards/adafruit_metro_rp2040/pins.c b/ports/raspberrypi/boards/adafruit_metro_rp2040/pins.c index 9e8e0b869ce0c..859e7cacb08bf 100644 --- a/ports/raspberrypi/boards/adafruit_metro_rp2040/pins.c +++ b/ports/raspberrypi/boards/adafruit_metro_rp2040/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_OBJ_NEW_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, diff --git a/ports/raspberrypi/boards/adafruit_qt2040_trinkey/pins.c b/ports/raspberrypi/boards/adafruit_qt2040_trinkey/pins.c index 7de4a94529fa9..966b7d4630f02 100644 --- a/ports/raspberrypi/boards/adafruit_qt2040_trinkey/pins.c +++ b/ports/raspberrypi/boards/adafruit_qt2040_trinkey/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO16) }, diff --git a/ports/raspberrypi/boards/adafruit_qtpy_rp2040/pins.c b/ports/raspberrypi/boards/adafruit_qtpy_rp2040/pins.c index a7f5351502c3c..9018eebae783b 100644 --- a/ports/raspberrypi/boards/adafruit_qtpy_rp2040/pins.c +++ b/ports/raspberrypi/boards/adafruit_qtpy_rp2040/pins.c @@ -8,7 +8,7 @@ CIRCUITPY_BOARD_BUS_SINGLETON(stemma_i2c, i2c, 1) -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO29) }, diff --git a/ports/raspberrypi/boards/arduino_nano_rp2040_connect/pins.c b/ports/raspberrypi/boards/arduino_nano_rp2040_connect/pins.c index b691015b7decc..91e44176daed5 100644 --- a/ports/raspberrypi/boards/arduino_nano_rp2040_connect/pins.c +++ b/ports/raspberrypi/boards/arduino_nano_rp2040_connect/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/boardsource_blok/pins.c b/ports/raspberrypi/boards/boardsource_blok/pins.c index 8f62ad898715f..e2594d9fcdb38 100644 --- a/ports/raspberrypi/boards/boardsource_blok/pins.c +++ b/ports/raspberrypi/boards/boardsource_blok/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS {MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0)}, diff --git a/ports/raspberrypi/boards/bradanlanestudio_explorer_rp2040/pins.c b/ports/raspberrypi/boards/bradanlanestudio_explorer_rp2040/pins.c index 9ca4cbdfa282e..e0cb2c151b9ad 100644 --- a/ports/raspberrypi/boards/bradanlanestudio_explorer_rp2040/pins.c +++ b/ports/raspberrypi/boards/bradanlanestudio_explorer_rp2040/pins.c @@ -18,7 +18,7 @@ uint16_t vid_setting = 123; //| """Return a value set in board.c""" //| ... //| -STATIC mp_obj_t board_vid(void) { +static mp_obj_t board_vid(void) { return mp_obj_new_int(vid_setting); } MP_DEFINE_CONST_FUN_OBJ_0(board_vid_obj, board_vid); @@ -26,14 +26,14 @@ MP_DEFINE_CONST_FUN_OBJ_0(board_vid_obj, board_vid); #if 0 extern int dck01_vid_value; // will hold a computed value to identify any board variations (like different e-paper displays) -STATIC mp_obj_t board_vid(void) { +static mp_obj_t board_vid(void) { return mp_obj_new_int(dck01_vid_value); } MP_DEFINE_CONST_FUN_OBJ_0(board_vid_obj, board_vid); #endif -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/breadstick_raspberry/pins.c b/ports/raspberrypi/boards/breadstick_raspberry/pins.c index b067375b511c7..b8b005b9ccca9 100644 --- a/ports/raspberrypi/boards/breadstick_raspberry/pins.c +++ b/ports/raspberrypi/boards/breadstick_raspberry/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_D1_A1), MP_ROM_PTR(&pin_GPIO27) }, diff --git a/ports/raspberrypi/boards/bwshockley_figpi/pins.c b/ports/raspberrypi/boards/bwshockley_figpi/pins.c index 885b34085c757..abace6cc485a0 100644 --- a/ports/raspberrypi/boards/bwshockley_figpi/pins.c +++ b/ports/raspberrypi/boards/bwshockley_figpi/pins.c @@ -8,7 +8,7 @@ CIRCUITPY_BOARD_BUS_SINGLETON(stemma_i2c, i2c, 1) -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO29) }, diff --git a/ports/raspberrypi/boards/challenger_nb_rp2040_wifi/pins.c b/ports/raspberrypi/boards/challenger_nb_rp2040_wifi/pins.c index 8f06debeff4d4..2e3f3b418a525 100644 --- a/ports/raspberrypi/boards/challenger_nb_rp2040_wifi/pins.c +++ b/ports/raspberrypi/boards/challenger_nb_rp2040_wifi/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // I2C diff --git a/ports/raspberrypi/boards/challenger_rp2040_lora/pins.c b/ports/raspberrypi/boards/challenger_rp2040_lora/pins.c index efe76e48b013b..343e476c805bf 100644 --- a/ports/raspberrypi/boards/challenger_rp2040_lora/pins.c +++ b/ports/raspberrypi/boards/challenger_rp2040_lora/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/challenger_rp2040_lte/pins.c b/ports/raspberrypi/boards/challenger_rp2040_lte/pins.c index 3214d430f9179..e2908a49143b0 100644 --- a/ports/raspberrypi/boards/challenger_rp2040_lte/pins.c +++ b/ports/raspberrypi/boards/challenger_rp2040_lte/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // I2C diff --git a/ports/raspberrypi/boards/challenger_rp2040_sdrtc/pins.c b/ports/raspberrypi/boards/challenger_rp2040_sdrtc/pins.c index 2bc6669c16611..23e84b4c0fa31 100644 --- a/ports/raspberrypi/boards/challenger_rp2040_sdrtc/pins.c +++ b/ports/raspberrypi/boards/challenger_rp2040_sdrtc/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/challenger_rp2040_subghz/pins.c b/ports/raspberrypi/boards/challenger_rp2040_subghz/pins.c index e520deb455370..05b652977ac0a 100644 --- a/ports/raspberrypi/boards/challenger_rp2040_subghz/pins.c +++ b/ports/raspberrypi/boards/challenger_rp2040_subghz/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/challenger_rp2040_wifi/pins.c b/ports/raspberrypi/boards/challenger_rp2040_wifi/pins.c index a8aeabeb1473d..222a645c16a2f 100644 --- a/ports/raspberrypi/boards/challenger_rp2040_wifi/pins.c +++ b/ports/raspberrypi/boards/challenger_rp2040_wifi/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/challenger_rp2040_wifi_ble/pins.c b/ports/raspberrypi/boards/challenger_rp2040_wifi_ble/pins.c index 1a69bfd395fd8..6a6d745ab5795 100644 --- a/ports/raspberrypi/boards/challenger_rp2040_wifi_ble/pins.c +++ b/ports/raspberrypi/boards/challenger_rp2040_wifi_ble/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/cosmo_pico/pins.c b/ports/raspberrypi/boards/cosmo_pico/pins.c index 246949c652cf0..4e09dddfb1697 100644 --- a/ports/raspberrypi/boards/cosmo_pico/pins.c +++ b/ports/raspberrypi/boards/cosmo_pico/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) }, diff --git a/ports/raspberrypi/boards/cytron_edu_pico_w/pins.c b/ports/raspberrypi/boards/cytron_edu_pico_w/pins.c index 5d044a9a2d282..9ce13b8518cee 100644 --- a/ports/raspberrypi/boards/cytron_edu_pico_w/pins.c +++ b/ports/raspberrypi/boards/cytron_edu_pico_w/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/cytron_maker_nano_rp2040/pins.c b/ports/raspberrypi/boards/cytron_maker_nano_rp2040/pins.c index bfbb72ab805cd..fc29fad50a662 100644 --- a/ports/raspberrypi/boards/cytron_maker_nano_rp2040/pins.c +++ b/ports/raspberrypi/boards/cytron_maker_nano_rp2040/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/cytron_maker_pi_rp2040/pins.c b/ports/raspberrypi/boards/cytron_maker_pi_rp2040/pins.c index 7d4e42bf0254a..53fae76ac1b4f 100644 --- a/ports/raspberrypi/boards/cytron_maker_pi_rp2040/pins.c +++ b/ports/raspberrypi/boards/cytron_maker_pi_rp2040/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/cytron_maker_uno_rp2040/pins.c b/ports/raspberrypi/boards/cytron_maker_uno_rp2040/pins.c index 9f42d20c72e73..44dcc23b46cd8 100644 --- a/ports/raspberrypi/boards/cytron_maker_uno_rp2040/pins.c +++ b/ports/raspberrypi/boards/cytron_maker_uno_rp2040/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/datanoise_picoadk/pins.c b/ports/raspberrypi/boards/datanoise_picoadk/pins.c index 8ca28c4df0fb0..9f8e009e46b95 100644 --- a/ports/raspberrypi/boards/datanoise_picoadk/pins.c +++ b/ports/raspberrypi/boards/datanoise_picoadk/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO22) }, diff --git a/ports/raspberrypi/boards/e_fidget/pins.c b/ports/raspberrypi/boards/e_fidget/pins.c index ffbd5765a4126..d478da0a6b58c 100644 --- a/ports/raspberrypi/boards/e_fidget/pins.c +++ b/ports/raspberrypi/boards/e_fidget/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS {MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0)}, diff --git a/ports/raspberrypi/boards/elecfreaks_picoed/pins.c b/ports/raspberrypi/boards/elecfreaks_picoed/pins.c index 85869e85eafb1..56f34922b3ef9 100644 --- a/ports/raspberrypi/boards/elecfreaks_picoed/pins.c +++ b/ports/raspberrypi/boards/elecfreaks_picoed/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_BUZZER_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/electrolama_minik/pins.c b/ports/raspberrypi/boards/electrolama_minik/pins.c index f762d0010f760..75d94185c5542 100644 --- a/ports/raspberrypi/boards/electrolama_minik/pins.c +++ b/ports/raspberrypi/boards/electrolama_minik/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/hack_club_sprig/pins.c b/ports/raspberrypi/boards/hack_club_sprig/pins.c index 592d7f0ae5401..e5ce147839890 100644 --- a/ports/raspberrypi/boards/hack_club_sprig/pins.c +++ b/ports/raspberrypi/boards/hack_club_sprig/pins.c @@ -9,7 +9,7 @@ #include "supervisor/board.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/heiafr_picomo_v2/pins.c b/ports/raspberrypi/boards/heiafr_picomo_v2/pins.c index 082494d658748..139c5c40952fb 100644 --- a/ports/raspberrypi/boards/heiafr_picomo_v2/pins.c +++ b/ports/raspberrypi/boards/heiafr_picomo_v2/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/jpconstantineau_encoderpad_rp2040/pins.c b/ports/raspberrypi/boards/jpconstantineau_encoderpad_rp2040/pins.c index e53f8a063e825..5c85d9f17ad09 100644 --- a/ports/raspberrypi/boards/jpconstantineau_encoderpad_rp2040/pins.c +++ b/ports/raspberrypi/boards/jpconstantineau_encoderpad_rp2040/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_KEY1), MP_ROM_PTR(&pin_GPIO14) }, diff --git a/ports/raspberrypi/boards/jpconstantineau_pykey18/pins.c b/ports/raspberrypi/boards/jpconstantineau_pykey18/pins.c index 3656f1c378c19..e094a165e9381 100644 --- a/ports/raspberrypi/boards/jpconstantineau_pykey18/pins.c +++ b/ports/raspberrypi/boards/jpconstantineau_pykey18/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_COL1), MP_ROM_PTR(&pin_GPIO0) }, { MP_ROM_QSTR(MP_QSTR_COL2), MP_ROM_PTR(&pin_GPIO1) }, diff --git a/ports/raspberrypi/boards/jpconstantineau_pykey44/pins.c b/ports/raspberrypi/boards/jpconstantineau_pykey44/pins.c index 454f942048ebb..c80b8ed8e71b1 100644 --- a/ports/raspberrypi/boards/jpconstantineau_pykey44/pins.c +++ b/ports/raspberrypi/boards/jpconstantineau_pykey44/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_COL1), MP_ROM_PTR(&pin_GPIO0) }, { MP_ROM_QSTR(MP_QSTR_COL2), MP_ROM_PTR(&pin_GPIO1) }, diff --git a/ports/raspberrypi/boards/jpconstantineau_pykey60/pins.c b/ports/raspberrypi/boards/jpconstantineau_pykey60/pins.c index 01ef5ce6ee819..0912fac92330f 100644 --- a/ports/raspberrypi/boards/jpconstantineau_pykey60/pins.c +++ b/ports/raspberrypi/boards/jpconstantineau_pykey60/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_COL1), MP_ROM_PTR(&pin_GPIO0) }, { MP_ROM_QSTR(MP_QSTR_COL2), MP_ROM_PTR(&pin_GPIO1) }, diff --git a/ports/raspberrypi/boards/jpconstantineau_pykey87/pins.c b/ports/raspberrypi/boards/jpconstantineau_pykey87/pins.c index 7ad659cf94a5a..7e7ad63191e41 100644 --- a/ports/raspberrypi/boards/jpconstantineau_pykey87/pins.c +++ b/ports/raspberrypi/boards/jpconstantineau_pykey87/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_COL1), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/lilygo_t_display_rp2040/pins.c b/ports/raspberrypi/boards/lilygo_t_display_rp2040/pins.c index 2dcca5c656dd4..8b8f7ce09db9d 100644 --- a/ports/raspberrypi/boards/lilygo_t_display_rp2040/pins.c +++ b/ports/raspberrypi/boards/lilygo_t_display_rp2040/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO1) }, diff --git a/ports/raspberrypi/boards/maple_elite_pi/pins.c b/ports/raspberrypi/boards/maple_elite_pi/pins.c index 2354cac541110..5158e5666ebbb 100644 --- a/ports/raspberrypi/boards/maple_elite_pi/pins.c +++ b/ports/raspberrypi/boards/maple_elite_pi/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS {MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0)}, diff --git a/ports/raspberrypi/boards/melopero_shake_rp2040/pins.c b/ports/raspberrypi/boards/melopero_shake_rp2040/pins.c index a51856624445f..3a91698040557 100644 --- a/ports/raspberrypi/boards/melopero_shake_rp2040/pins.c +++ b/ports/raspberrypi/boards/melopero_shake_rp2040/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_global_dict_table[] = { +static const mp_rom_map_elem_t board_global_dict_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, diff --git a/ports/raspberrypi/boards/nullbits_bit_c_pro/pins.c b/ports/raspberrypi/boards/nullbits_bit_c_pro/pins.c index 12c170eed2e10..81813816fdd39 100644 --- a/ports/raspberrypi/boards/nullbits_bit_c_pro/pins.c +++ b/ports/raspberrypi/boards/nullbits_bit_c_pro/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, diff --git a/ports/raspberrypi/boards/odt_bread_2040/pins.c b/ports/raspberrypi/boards/odt_bread_2040/pins.c index 7041a217491a5..9a0388d5004cb 100644 --- a/ports/raspberrypi/boards/odt_bread_2040/pins.c +++ b/ports/raspberrypi/boards/odt_bread_2040/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_global_dict_table[] = { +static const mp_rom_map_elem_t board_global_dict_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/odt_cast_away_rp2040/pins.c b/ports/raspberrypi/boards/odt_cast_away_rp2040/pins.c index 63db93c152974..672abe1bc8370 100644 --- a/ports/raspberrypi/boards/odt_cast_away_rp2040/pins.c +++ b/ports/raspberrypi/boards/odt_cast_away_rp2040/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_global_dict_table[] = { +static const mp_rom_map_elem_t board_global_dict_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/pajenicko_picopad/pins.c b/ports/raspberrypi/boards/pajenicko_picopad/pins.c index ca9c8580501c0..4bd6d1411c70e 100644 --- a/ports/raspberrypi/boards/pajenicko_picopad/pins.c +++ b/ports/raspberrypi/boards/pajenicko_picopad/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // Default RPi Pico Pins {MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0)}, diff --git a/ports/raspberrypi/boards/pimoroni_badger2040/pins.c b/ports/raspberrypi/boards/pimoroni_badger2040/pins.c index 3ea0cc2bff06c..081cda8669100 100644 --- a/ports/raspberrypi/boards/pimoroni_badger2040/pins.c +++ b/ports/raspberrypi/boards/pimoroni_badger2040/pins.c @@ -9,7 +9,7 @@ #include "shared-module/displayio/__init__.h" #include "badger-shared.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/pimoroni_badger2040w/pins.c b/ports/raspberrypi/boards/pimoroni_badger2040w/pins.c index 7708222838cee..5b35a48a28585 100644 --- a/ports/raspberrypi/boards/pimoroni_badger2040w/pins.c +++ b/ports/raspberrypi/boards/pimoroni_badger2040w/pins.c @@ -9,7 +9,7 @@ #include "shared-module/displayio/__init__.h" #include "badger-shared.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/pins.c b/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/pins.c index 49ee7d2dc3a0c..8ff1cad58bfa7 100644 --- a/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/pins.c +++ b/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/pins.c @@ -18,7 +18,7 @@ // N.B.: labels and bit-numbers in the schematic are reversed, i.e. // SW_A on D0 has bit-number 7 -STATIC const qstr board_keycodes_fields[] = { +static const qstr board_keycodes_fields[] = { MP_QSTR_SW_A, MP_QSTR_SW_B, MP_QSTR_SW_C, @@ -29,7 +29,7 @@ STATIC const qstr board_keycodes_fields[] = { MP_QSTR_INKY_BUS }; -STATIC MP_DEFINE_ATTRTUPLE( +static MP_DEFINE_ATTRTUPLE( board_keycodes_obj, board_keycodes_fields, 8, @@ -43,7 +43,7 @@ STATIC MP_DEFINE_ATTRTUPLE( MP_ROM_INT(0) ); -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/pimoroni_inky_frame_7_3/pins.c b/ports/raspberrypi/boards/pimoroni_inky_frame_7_3/pins.c index e696429540ad7..f615be4d413c7 100644 --- a/ports/raspberrypi/boards/pimoroni_inky_frame_7_3/pins.c +++ b/ports/raspberrypi/boards/pimoroni_inky_frame_7_3/pins.c @@ -18,7 +18,7 @@ // N.B.: labels and bit-numbers in the schematic are reversed, i.e. // BUTTON_A on D0 has bit-number 7 -STATIC const qstr board_keycodes_fields[] = { +static const qstr board_keycodes_fields[] = { MP_QSTR_BUTTON_A, MP_QSTR_BUTTON_B, MP_QSTR_BUTTON_C, @@ -29,7 +29,7 @@ STATIC const qstr board_keycodes_fields[] = { MP_QSTR_INKY_BUS }; -STATIC MP_DEFINE_ATTRTUPLE( +static MP_DEFINE_ATTRTUPLE( board_keycodes_obj, board_keycodes_fields, 8, @@ -43,7 +43,7 @@ STATIC MP_DEFINE_ATTRTUPLE( MP_ROM_INT(0) ); -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/pimoroni_interstate75/pins.c b/ports/raspberrypi/boards/pimoroni_interstate75/pins.c index 75135427df7da..d5b4fd9804fe4 100644 --- a/ports/raspberrypi/boards/pimoroni_interstate75/pins.c +++ b/ports/raspberrypi/boards/pimoroni_interstate75/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_R0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/pimoroni_keybow2040/pins.c b/ports/raspberrypi/boards/pimoroni_keybow2040/pins.c index 6a0bb8cecb4bd..c069e1fb536d6 100644 --- a/ports/raspberrypi/boards/pimoroni_keybow2040/pins.c +++ b/ports/raspberrypi/boards/pimoroni_keybow2040/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/pimoroni_motor2040/pins.c b/ports/raspberrypi/boards/pimoroni_motor2040/pins.c index ea1b8e0de4c03..6c077366ee0d1 100644 --- a/ports/raspberrypi/boards/pimoroni_motor2040/pins.c +++ b/ports/raspberrypi/boards/pimoroni_motor2040/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_MOTOR_A_P), MP_ROM_PTR(&pin_GPIO4) }, diff --git a/ports/raspberrypi/boards/pimoroni_pga2040/pins.c b/ports/raspberrypi/boards/pimoroni_pga2040/pins.c index b99ba2421ea6c..47b41a6089f29 100644 --- a/ports/raspberrypi/boards/pimoroni_pga2040/pins.c +++ b/ports/raspberrypi/boards/pimoroni_pga2040/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv_base/pins.c b/ports/raspberrypi/boards/pimoroni_pico_dv_base/pins.c index a952f7f680cc8..7fde8f33e8747 100644 --- a/ports/raspberrypi/boards/pimoroni_pico_dv_base/pins.c +++ b/ports/raspberrypi/boards/pimoroni_pico_dv_base/pins.c @@ -8,7 +8,7 @@ #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/pins.c b/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/pins.c index 776f09ead8d46..f8a5a6ba6f7de 100644 --- a/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/pins.c +++ b/ports/raspberrypi/boards/pimoroni_pico_dv_base_w/pins.c @@ -8,7 +8,7 @@ #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/pimoroni_picolipo_16mb/pins.c b/ports/raspberrypi/boards/pimoroni_picolipo_16mb/pins.c index 5e149c10d5512..19c774c8d8632 100644 --- a/ports/raspberrypi/boards/pimoroni_picolipo_16mb/pins.c +++ b/ports/raspberrypi/boards/pimoroni_picolipo_16mb/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/pimoroni_picolipo_4mb/pins.c b/ports/raspberrypi/boards/pimoroni_picolipo_4mb/pins.c index 5e149c10d5512..19c774c8d8632 100644 --- a/ports/raspberrypi/boards/pimoroni_picolipo_4mb/pins.c +++ b/ports/raspberrypi/boards/pimoroni_picolipo_4mb/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/pimoroni_picosystem/pins.c b/ports/raspberrypi/boards/pimoroni_picosystem/pins.c index 71c045a6e89cc..2d00646c607b4 100644 --- a/ports/raspberrypi/boards/pimoroni_picosystem/pins.c +++ b/ports/raspberrypi/boards/pimoroni_picosystem/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/pimoroni_plasma2040/pins.c b/ports/raspberrypi/boards/pimoroni_plasma2040/pins.c index 1131180d53a70..d087a6f8dd40c 100644 --- a/ports/raspberrypi/boards/pimoroni_plasma2040/pins.c +++ b/ports/raspberrypi/boards/pimoroni_plasma2040/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_SW_A), MP_ROM_PTR(&pin_GPIO12) }, diff --git a/ports/raspberrypi/boards/pimoroni_plasma2040w/pins.c b/ports/raspberrypi/boards/pimoroni_plasma2040w/pins.c index 5c505862c3d68..e3638469dc392 100644 --- a/ports/raspberrypi/boards/pimoroni_plasma2040w/pins.c +++ b/ports/raspberrypi/boards/pimoroni_plasma2040w/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/pimoroni_servo2040/pins.c b/ports/raspberrypi/boards/pimoroni_servo2040/pins.c index d8f1102d24596..2cf0c94c0402b 100644 --- a/ports/raspberrypi/boards/pimoroni_servo2040/pins.c +++ b/ports/raspberrypi/boards/pimoroni_servo2040/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_SERVO_1), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/pimoroni_tiny2040/pins.c b/ports/raspberrypi/boards/pimoroni_tiny2040/pins.c index 4bffe100c1c0f..2d9eff9f850a8 100644 --- a/ports/raspberrypi/boards/pimoroni_tiny2040/pins.c +++ b/ports/raspberrypi/boards/pimoroni_tiny2040/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/pimoroni_tiny2040_2mb/pins.c b/ports/raspberrypi/boards/pimoroni_tiny2040_2mb/pins.c index 4bffe100c1c0f..2d9eff9f850a8 100644 --- a/ports/raspberrypi/boards/pimoroni_tiny2040_2mb/pins.c +++ b/ports/raspberrypi/boards/pimoroni_tiny2040_2mb/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/raspberry_pi_pico/pins.c b/ports/raspberrypi/boards/raspberry_pi_pico/pins.c index 6582c11da838b..5ce8ae818eb83 100644 --- a/ports/raspberrypi/boards/raspberry_pi_pico/pins.c +++ b/ports/raspberrypi/boards/raspberry_pi_pico/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/raspberry_pi_pico_w/pins.c b/ports/raspberrypi/boards/raspberry_pi_pico_w/pins.c index b1d6a0fd07e89..ce0a07233987e 100644 --- a/ports/raspberrypi/boards/raspberry_pi_pico_w/pins.c +++ b/ports/raspberrypi/boards/raspberry_pi_pico_w/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/rfguru_rp2040/pins.c b/ports/raspberrypi/boards/rfguru_rp2040/pins.c index ae6ba75264296..dbc1dd4184083 100644 --- a/ports/raspberrypi/boards/rfguru_rp2040/pins.c +++ b/ports/raspberrypi/boards/rfguru_rp2040/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) }, diff --git a/ports/raspberrypi/boards/seeeduino_xiao_rp2040/pins.c b/ports/raspberrypi/boards/seeeduino_xiao_rp2040/pins.c index 597b4ec704472..cf9f954dd8be7 100644 --- a/ports/raspberrypi/boards/seeeduino_xiao_rp2040/pins.c +++ b/ports/raspberrypi/boards/seeeduino_xiao_rp2040/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, diff --git a/ports/raspberrypi/boards/silicognition_rp2040_shim/pins.c b/ports/raspberrypi/boards/silicognition_rp2040_shim/pins.c index dff7d51c875af..880327c7b1899 100644 --- a/ports/raspberrypi/boards/silicognition_rp2040_shim/pins.c +++ b/ports/raspberrypi/boards/silicognition_rp2040_shim/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO29) }, diff --git a/ports/raspberrypi/boards/solderparty_bbq20kbd/pins.c b/ports/raspberrypi/boards/solderparty_bbq20kbd/pins.c index c055b3ab7512d..ebcf6585f3808 100644 --- a/ports/raspberrypi/boards/solderparty_bbq20kbd/pins.c +++ b/ports/raspberrypi/boards/solderparty_bbq20kbd/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_INT), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/solderparty_rp2040_stamp/pins.c b/ports/raspberrypi/boards/solderparty_rp2040_stamp/pins.c index 73be3662d4dca..b15fef8eb2afb 100644 --- a/ports/raspberrypi/boards/solderparty_rp2040_stamp/pins.c +++ b/ports/raspberrypi/boards/solderparty_rp2040_stamp/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/sparkfun_micromod_rp2040/pins.c b/ports/raspberrypi/boards/sparkfun_micromod_rp2040/pins.c index f45682a55dbe7..7f1a0be8da3c7 100644 --- a/ports/raspberrypi/boards/sparkfun_micromod_rp2040/pins.c +++ b/ports/raspberrypi/boards/sparkfun_micromod_rp2040/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // The SparkFun MicroMod spec uses a zero-based peripheral numbering scheme. // The 0th peripheral is the default and the "0" is omitted from the diff --git a/ports/raspberrypi/boards/sparkfun_pro_micro_rp2040/pins.c b/ports/raspberrypi/boards/sparkfun_pro_micro_rp2040/pins.c index bf079e01999ed..4fc7fc371c9eb 100644 --- a/ports/raspberrypi/boards/sparkfun_pro_micro_rp2040/pins.c +++ b/ports/raspberrypi/boards/sparkfun_pro_micro_rp2040/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, diff --git a/ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/pins.c b/ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/pins.c index 77b7539820121..6599b921cde26 100644 --- a/ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/pins.c +++ b/ports/raspberrypi/boards/sparkfun_thing_plus_rp2040/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // Left side breakouts, top-to-bottom, as labeled diff --git a/ports/raspberrypi/boards/splitkb_liatris/pins.c b/ports/raspberrypi/boards/splitkb_liatris/pins.c index 23770fa309ed8..2efe60ddbc419 100644 --- a/ports/raspberrypi/boards/splitkb_liatris/pins.c +++ b/ports/raspberrypi/boards/splitkb_liatris/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // Left, top->bottom diff --git a/ports/raspberrypi/boards/takayoshiotake_octave_rp2040/pins.c b/ports/raspberrypi/boards/takayoshiotake_octave_rp2040/pins.c index b68d5632ce3a6..4a33b13c45031 100644 --- a/ports/raspberrypi/boards/takayoshiotake_octave_rp2040/pins.c +++ b/ports/raspberrypi/boards/takayoshiotake_octave_rp2040/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GPIO0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/ugame22/pins.c b/ports/raspberrypi/boards/ugame22/pins.c index d2270a937cfeb..3ca97e921a928 100644 --- a/ports/raspberrypi/boards/ugame22/pins.c +++ b/ports/raspberrypi/boards/ugame22/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_TFT_RST), MP_ROM_PTR(&pin_GPIO1) }, diff --git a/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/pins.c b/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/pins.c index 64b497915746c..ec36bcff01563 100644 --- a/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/pins.c +++ b/ports/raspberrypi/boards/vcc_gnd_yd_rp2040/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/waveshare_rp2040_geek/pins.c b/ports/raspberrypi/boards/waveshare_rp2040_geek/pins.c index 33d813a1f68af..8fa4f56051e40 100644 --- a/ports/raspberrypi/boards/waveshare_rp2040_geek/pins.c +++ b/ports/raspberrypi/boards/waveshare_rp2040_geek/pins.c @@ -8,7 +8,7 @@ #include "shared-module/displayio/__init__.h" CIRCUITPY_BOARD_BUS_SINGLETON(sd_spi, spi, 1) -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // 2-3 DEBUG diff --git a/ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/pins.c b/ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/pins.c index 916988beb07d4..bd3a831034501 100644 --- a/ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/pins.c +++ b/ports/raspberrypi/boards/waveshare_rp2040_lcd_0_96/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" #include "shared-module/displayio/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/pins.c b/ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/pins.c index 315cdce888dfd..78e40ad32653f 100644 --- a/ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/pins.c +++ b/ports/raspberrypi/boards/waveshare_rp2040_lcd_1_28/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/waveshare_rp2040_plus_16mb/pins.c b/ports/raspberrypi/boards/waveshare_rp2040_plus_16mb/pins.c index 3cfbf76ebfe5b..1263586686ba0 100644 --- a/ports/raspberrypi/boards/waveshare_rp2040_plus_16mb/pins.c +++ b/ports/raspberrypi/boards/waveshare_rp2040_plus_16mb/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/waveshare_rp2040_plus_4mb/pins.c b/ports/raspberrypi/boards/waveshare_rp2040_plus_4mb/pins.c index 3cfbf76ebfe5b..1263586686ba0 100644 --- a/ports/raspberrypi/boards/waveshare_rp2040_plus_4mb/pins.c +++ b/ports/raspberrypi/boards/waveshare_rp2040_plus_4mb/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/waveshare_rp2040_tiny/pins.c b/ports/raspberrypi/boards/waveshare_rp2040_tiny/pins.c index 2540f0325f9b7..9b6f5331336c9 100644 --- a/ports/raspberrypi/boards/waveshare_rp2040_tiny/pins.c +++ b/ports/raspberrypi/boards/waveshare_rp2040_tiny/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/waveshare_rp2040_touch_lcd_1_28/pins.c b/ports/raspberrypi/boards/waveshare_rp2040_touch_lcd_1_28/pins.c index bae058c4cc142..c14fdb6e23b48 100644 --- a/ports/raspberrypi/boards/waveshare_rp2040_touch_lcd_1_28/pins.c +++ b/ports/raspberrypi/boards/waveshare_rp2040_touch_lcd_1_28/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/waveshare_rp2040_zero/pins.c b/ports/raspberrypi/boards/waveshare_rp2040_zero/pins.c index a431564c20b8d..5b172616aba2e 100644 --- a/ports/raspberrypi/boards/waveshare_rp2040_zero/pins.c +++ b/ports/raspberrypi/boards/waveshare_rp2040_zero/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/weact_studio_pico/pins.c b/ports/raspberrypi/boards/weact_studio_pico/pins.c index a82e31c903302..53e1b97f43c44 100644 --- a/ports/raspberrypi/boards/weact_studio_pico/pins.c +++ b/ports/raspberrypi/boards/weact_studio_pico/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/weact_studio_pico_16mb/pins.c b/ports/raspberrypi/boards/weact_studio_pico_16mb/pins.c index a82e31c903302..53e1b97f43c44 100644 --- a/ports/raspberrypi/boards/weact_studio_pico_16mb/pins.c +++ b/ports/raspberrypi/boards/weact_studio_pico_16mb/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/wisdpi_ardu2040m/pins.c b/ports/raspberrypi/boards/wisdpi_ardu2040m/pins.c index 9128b67c56ed1..20a4cdb7d5624 100644 --- a/ports/raspberrypi/boards/wisdpi_ardu2040m/pins.c +++ b/ports/raspberrypi/boards/wisdpi_ardu2040m/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/wisdpi_tiny_rp2040/pins.c b/ports/raspberrypi/boards/wisdpi_tiny_rp2040/pins.c index 224a4fd9f394e..e39c682b063c9 100644 --- a/ports/raspberrypi/boards/wisdpi_tiny_rp2040/pins.c +++ b/ports/raspberrypi/boards/wisdpi_tiny_rp2040/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/pins.c b/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/pins.c index 3cfbf76ebfe5b..1263586686ba0 100644 --- a/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/pins.c +++ b/ports/raspberrypi/boards/wiznet_w5100s_evb_pico/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/wiznet_w5500_evb_pico/pins.c b/ports/raspberrypi/boards/wiznet_w5500_evb_pico/pins.c index aee673a312d92..a24ff3f3a6091 100644 --- a/ports/raspberrypi/boards/wiznet_w5500_evb_pico/pins.c +++ b/ports/raspberrypi/boards/wiznet_w5500_evb_pico/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/boards/zrichard_rp2.65-f/pins.c b/ports/raspberrypi/boards/zrichard_rp2.65-f/pins.c index 7b1ff92f29314..46695b273a28f 100644 --- a/ports/raspberrypi/boards/zrichard_rp2.65-f/pins.c +++ b/ports/raspberrypi/boards/zrichard_rp2.65-f/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_ROW0), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/raspberrypi/common-hal/alarm/__init__.c b/ports/raspberrypi/common-hal/alarm/__init__.c index 54bbfdce2bebc..35af165510085 100644 --- a/ports/raspberrypi/common-hal/alarm/__init__.c +++ b/ports/raspberrypi/common-hal/alarm/__init__.c @@ -67,7 +67,7 @@ const uint32_t RP_LIGHTSLEEP_EN0_MASK_HARSH = ( ); const uint32_t RP_LIGHTSLEEP_EN1_MASK_HARSH = 0x0; -STATIC void prepare_for_dormant_xosc(void); +static void prepare_for_dormant_xosc(void); // Singleton instance of SleepMemory. const alarm_sleep_memory_obj_t alarm_sleep_memory_obj = { @@ -89,7 +89,7 @@ void alarm_reset(void) { watchdog_hw->scratch[RP_WKUP_SCRATCH_REG] = RP_SLEEP_WAKEUP_UNDEF; } -STATIC uint8_t _get_wakeup_cause(void) { +static uint8_t _get_wakeup_cause(void) { // First check if the modules remember what last woke up if (alarm_pin_pinalarm_woke_this_cycle()) { return RP_SLEEP_WAKEUP_GPIO; @@ -106,7 +106,7 @@ STATIC uint8_t _get_wakeup_cause(void) { } // Set up light sleep or deep sleep alarms. -STATIC void _setup_sleep_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms) { +static void _setup_sleep_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms) { alarm_pin_pinalarm_set_alarms(deep_sleep, n_alarms, alarms); alarm_time_timealarm_set_alarms(deep_sleep, n_alarms, alarms); } @@ -224,7 +224,7 @@ void common_hal_alarm_gc_collect(void) { gc_collect_ptr(shared_alarm_get_wake_alarm()); } -STATIC void prepare_for_dormant_xosc(void) { +static void prepare_for_dormant_xosc(void) { // TODO: add ROSC support with sleep_run_from_dormant_source when it's added to SDK uint src_hz = XOSC_MHZ * MHZ; uint clk_ref_src = CLOCKS_CLK_REF_CTRL_SRC_VALUE_XOSC_CLKSRC; diff --git a/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c b/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c index 203def52b2260..ecebb072775ed 100644 --- a/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c +++ b/ports/raspberrypi/common-hal/alarm/pin/PinAlarm.c @@ -15,14 +15,14 @@ #include "hardware/gpio.h" #include "hardware/structs/iobank0.h" -STATIC bool woke_up; -STATIC uint64_t alarm_triggered_pins; // 36 actual pins -STATIC uint64_t alarm_reserved_pins; // 36 actual pins -STATIC bool _not_yet_deep_sleeping = false; +static bool woke_up; +static uint64_t alarm_triggered_pins; // 36 actual pins +static uint64_t alarm_reserved_pins; // 36 actual pins +static bool _not_yet_deep_sleeping = false; #define GPIO_IRQ_ALL_EVENTS 0x15u -STATIC void gpio_callback(uint gpio, uint32_t events) { +static void gpio_callback(uint gpio, uint32_t events) { alarm_triggered_pins |= (1 << gpio); woke_up = true; diff --git a/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c b/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c index ae4ad9f2aa06d..1f7c3f9edaba9 100644 --- a/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c +++ b/ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c @@ -15,10 +15,10 @@ #include "hardware/gpio.h" #include "hardware/rtc.h" -STATIC bool woke_up = false; -STATIC bool _timealarm_set = false; +static bool woke_up = false; +static bool _timealarm_set = false; -STATIC void timer_callback(void) { +static void timer_callback(void) { woke_up = true; } diff --git a/ports/raspberrypi/common-hal/busio/I2C.c b/ports/raspberrypi/common-hal/busio/I2C.c index 8d0a52b68ff3a..b7db4064b15d7 100644 --- a/ports/raspberrypi/common-hal/busio/I2C.c +++ b/ports/raspberrypi/common-hal/busio/I2C.c @@ -22,8 +22,8 @@ // One second #define BUS_TIMEOUT_US 1000000 -STATIC bool never_reset_i2c[2]; -STATIC i2c_inst_t *i2c[2] = {i2c0, i2c1}; +static bool never_reset_i2c[2]; +static i2c_inst_t *i2c[2] = {i2c0, i2c1}; void reset_i2c(void) { for (size_t i = 0; i < 2; i++) { @@ -146,7 +146,7 @@ void common_hal_busio_i2c_unlock(busio_i2c_obj_t *self) { self->has_lock = false; } -STATIC uint8_t _common_hal_busio_i2c_write(busio_i2c_obj_t *self, uint16_t addr, +static uint8_t _common_hal_busio_i2c_write(busio_i2c_obj_t *self, uint16_t addr, const uint8_t *data, size_t len, bool transmit_stop_bit) { if (len == 0) { // The RP2040 I2C peripheral will not perform 0 byte writes. diff --git a/ports/raspberrypi/common-hal/busio/SPI.c b/ports/raspberrypi/common-hal/busio/SPI.c index 51de1f1abb46d..65a9d7ba95f62 100644 --- a/ports/raspberrypi/common-hal/busio/SPI.c +++ b/ports/raspberrypi/common-hal/busio/SPI.c @@ -19,8 +19,8 @@ #define NO_INSTANCE 0xff -STATIC bool never_reset_spi[2]; -STATIC spi_inst_t *spi[2] = {spi0, spi1}; +static bool never_reset_spi[2]; +static spi_inst_t *spi[2] = {spi0, spi1}; void reset_spi(void) { for (size_t i = 0; i < 2; i++) { diff --git a/ports/raspberrypi/common-hal/busio/UART.c b/ports/raspberrypi/common-hal/busio/UART.c index d9cab3838e400..1ab24c7d858a9 100644 --- a/ports/raspberrypi/common-hal/busio/UART.c +++ b/ports/raspberrypi/common-hal/busio/UART.c @@ -314,7 +314,7 @@ bool common_hal_busio_uart_ready_to_tx(busio_uart_obj_t *self) { return uart_is_writable(self->uart); } -STATIC void pin_never_reset(uint8_t pin) { +static void pin_never_reset(uint8_t pin) { if (pin != NO_PIN) { never_reset_pin_number(pin); } diff --git a/ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c b/ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c index a3c6662683ff1..4f226fe56e957 100644 --- a/ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c +++ b/ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c @@ -16,7 +16,7 @@ #include "src/rp2_common/hardware_gpio/include/hardware/gpio.h" -STATIC i2c_inst_t *i2c[2] = {i2c0, i2c1}; +static i2c_inst_t *i2c[2] = {i2c0, i2c1}; #define NO_PIN 0xff diff --git a/ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c b/ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c index f04f76209121d..a05307313b6d0 100644 --- a/ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c +++ b/ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c @@ -48,7 +48,7 @@ /* .wrap */ \ } -STATIC mcu_pin_obj_t *pin_from_number(uint8_t number) { +static mcu_pin_obj_t *pin_from_number(uint8_t number) { const mp_map_t *mcu_map = &mcu_pin_globals.map; for (uint8_t i = 0; i < mcu_map->alloc; i++) { mp_obj_t val = mcu_map->table[i].value; diff --git a/ports/raspberrypi/common-hal/mdns/Server.c b/ports/raspberrypi/common-hal/mdns/Server.c index be23f8ea9aad7..4c87dd4664077 100644 --- a/ports/raspberrypi/common-hal/mdns/Server.c +++ b/ports/raspberrypi/common-hal/mdns/Server.c @@ -19,10 +19,10 @@ // Track if we've inited the LWIP MDNS at all. It expects to only init once. // Subsequent times, we restart it. -STATIC bool inited = false; +static bool inited = false; // Track if we are globally inited. This essentially forces one inited MDNS // object at a time. (But ignores MDNS objects that are deinited.) -STATIC bool object_inited = false; +static bool object_inited = false; #define NETIF_STA (&cyw43_state.netif[CYW43_ITF_STA]) #define NETIF_AP (&cyw43_state.netif[CYW43_ITF_AP]) @@ -109,7 +109,7 @@ typedef struct { size_t out_len; } nonalloc_search_state_t; -STATIC void copy_data_into_remote_service(struct mdns_answer *answer, const char *varpart, int varlen, mdns_remoteservice_obj_t *out) { +static void copy_data_into_remote_service(struct mdns_answer *answer, const char *varpart, int varlen, mdns_remoteservice_obj_t *out) { if (varlen > 0) { if (answer->info.type == DNS_RRTYPE_A) { char *hostname = out->hostname; @@ -148,7 +148,7 @@ STATIC void copy_data_into_remote_service(struct mdns_answer *answer, const char } } -STATIC void search_result_cb(struct mdns_answer *answer, const char *varpart, int varlen, int flags, void *arg) { +static void search_result_cb(struct mdns_answer *answer, const char *varpart, int varlen, int flags, void *arg) { nonalloc_search_state_t *state = arg; state->out[state->i].base.type = &mdns_remoteservice_type; @@ -206,7 +206,7 @@ typedef struct { size_t count; } alloc_search_state_t; -STATIC void alloc_search_result_cb(struct mdns_answer *answer, const char *varpart, int varlen, int flags, void *arg) { +static void alloc_search_result_cb(struct mdns_answer *answer, const char *varpart, int varlen, int flags, void *arg) { alloc_search_state_t *state = arg; if ((flags & MDNS_SEARCH_RESULT_FIRST) != 0) { @@ -276,7 +276,7 @@ mp_obj_t common_hal_mdns_server_find(mdns_server_obj_t *self, const char *servic return MP_OBJ_FROM_PTR(tuple); } -STATIC void srv_txt_cb(struct mdns_service *service, void *ptr) { +static void srv_txt_cb(struct mdns_service *service, void *ptr) { mdns_server_obj_t *self = ptr; err_t res; for (size_t i = 0; i < self->num_txt_records; i++) { @@ -288,7 +288,7 @@ STATIC void srv_txt_cb(struct mdns_service *service, void *ptr) { } } -STATIC void assign_txt_records(mdns_server_obj_t *self, const char *txt_records[], size_t num_txt_records) { +static void assign_txt_records(mdns_server_obj_t *self, const char *txt_records[], size_t num_txt_records) { size_t allowed_num_txt_records = MDNS_MAX_TXT_RECORDS < num_txt_records ? MDNS_MAX_TXT_RECORDS : num_txt_records; self->num_txt_records = allowed_num_txt_records; for (size_t i = 0; i < allowed_num_txt_records; i++) { diff --git a/ports/raspberrypi/common-hal/microcontroller/Pin.c b/ports/raspberrypi/common-hal/microcontroller/Pin.c index 6e881ab8e390e..01526ebac3e16 100644 --- a/ports/raspberrypi/common-hal/microcontroller/Pin.c +++ b/ports/raspberrypi/common-hal/microcontroller/Pin.c @@ -25,7 +25,7 @@ void reset_pin_number_cyw(uint8_t pin_no) { } #endif -STATIC uint32_t never_reset_pins; +static uint32_t never_reset_pins; void reset_all_pins(void) { for (size_t i = 0; i < NUM_BANK0_GPIOS; i++) { diff --git a/ports/raspberrypi/common-hal/os/__init__.c b/ports/raspberrypi/common-hal/os/__init__.c index f9005288c18de..28c8ed946717e 100644 --- a/ports/raspberrypi/common-hal/os/__init__.c +++ b/ports/raspberrypi/common-hal/os/__init__.c @@ -18,18 +18,18 @@ #include -STATIC const qstr os_uname_info_fields[] = { +static const qstr os_uname_info_fields[] = { MP_QSTR_sysname, MP_QSTR_nodename, MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine }; -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "rp2040"); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "rp2040"); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME); +static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "rp2040"); +static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "rp2040"); +static const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING); +static const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE); +static const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME); -STATIC MP_DEFINE_ATTRTUPLE( +static MP_DEFINE_ATTRTUPLE( os_uname_info_obj, os_uname_info_fields, 5, diff --git a/ports/raspberrypi/common-hal/picodvi/Framebuffer.c b/ports/raspberrypi/common-hal/picodvi/Framebuffer.c index 156f350f3f82d..e3f17baf85725 100644 --- a/ports/raspberrypi/common-hal/picodvi/Framebuffer.c +++ b/ports/raspberrypi/common-hal/picodvi/Framebuffer.c @@ -24,7 +24,7 @@ picodvi_framebuffer_obj_t *active_picodvi = NULL; -STATIC PIO pio_instances[2] = {pio0, pio1}; +static PIO pio_instances[2] = {pio0, pio1}; static void __not_in_flash_func(core1_main)(void) { // The MPU is reset before this starts. @@ -300,7 +300,7 @@ void common_hal_picodvi_framebuffer_construct(picodvi_framebuffer_obj_t *self, } } -STATIC void _turn_off_dma(uint8_t channel) { +static void _turn_off_dma(uint8_t channel) { dma_channel_config c = dma_channel_get_default_config(channel); channel_config_set_enable(&c, false); dma_channel_set_config(channel, &c, false /* trigger */); diff --git a/ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c b/ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c index 6e0b3815dfdb8..a31312b6436b7 100644 --- a/ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c +++ b/ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c @@ -13,7 +13,7 @@ #include "bindings/rp2pio/__init__.h" #include "bindings/rp2pio/StateMachine.h" -STATIC const uint16_t encoder[] = { +static const uint16_t encoder[] = { // again: // in pins, 2 0x4002, @@ -32,12 +32,12 @@ STATIC const uint16_t encoder[] = { 0xa041, }; -STATIC const uint16_t encoder_init[] = { +static const uint16_t encoder_init[] = { // set y, 31 0xe05f, }; -STATIC void incrementalencoder_interrupt_handler(void *self_in); +static void incrementalencoder_interrupt_handler(void *self_in); void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencoder_obj_t *self, const mcu_pin_obj_t *pin_a, const mcu_pin_obj_t *pin_b) { @@ -99,7 +99,7 @@ void common_hal_rotaryio_incrementalencoder_deinit(rotaryio_incrementalencoder_o common_hal_rp2pio_statemachine_deinit(&self->state_machine); } -STATIC void incrementalencoder_interrupt_handler(void *self_in) { +static void incrementalencoder_interrupt_handler(void *self_in) { rotaryio_incrementalencoder_obj_t *self = self_in; while (common_hal_rp2pio_statemachine_get_in_waiting(&self->state_machine)) { diff --git a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c index 88e13ddf2f4de..8275215e0f40a 100644 --- a/ports/raspberrypi/common-hal/rp2pio/StateMachine.c +++ b/ports/raspberrypi/common-hal/rp2pio/StateMachine.c @@ -28,27 +28,27 @@ #define NO_DMA_CHANNEL (-1) // Count how many state machines are using each pin. -STATIC uint8_t _pin_reference_count[NUM_BANK0_GPIOS]; -STATIC uint32_t _current_program_id[NUM_PIOS][NUM_PIO_STATE_MACHINES]; -STATIC uint8_t _current_program_offset[NUM_PIOS][NUM_PIO_STATE_MACHINES]; -STATIC uint8_t _current_program_len[NUM_PIOS][NUM_PIO_STATE_MACHINES]; -STATIC bool _never_reset[NUM_PIOS][NUM_PIO_STATE_MACHINES]; +static uint8_t _pin_reference_count[NUM_BANK0_GPIOS]; +static uint32_t _current_program_id[NUM_PIOS][NUM_PIO_STATE_MACHINES]; +static uint8_t _current_program_offset[NUM_PIOS][NUM_PIO_STATE_MACHINES]; +static uint8_t _current_program_len[NUM_PIOS][NUM_PIO_STATE_MACHINES]; +static bool _never_reset[NUM_PIOS][NUM_PIO_STATE_MACHINES]; -STATIC uint32_t _current_pins[NUM_PIOS]; -STATIC uint32_t _current_sm_pins[NUM_PIOS][NUM_PIO_STATE_MACHINES]; -STATIC int8_t _sm_dma_plus_one[NUM_PIOS][NUM_PIO_STATE_MACHINES]; +static uint32_t _current_pins[NUM_PIOS]; +static uint32_t _current_sm_pins[NUM_PIOS][NUM_PIO_STATE_MACHINES]; +static int8_t _sm_dma_plus_one[NUM_PIOS][NUM_PIO_STATE_MACHINES]; #define SM_DMA_ALLOCATED(pio_index, sm) (_sm_dma_plus_one[(pio_index)][(sm)] != 0) #define SM_DMA_GET_CHANNEL(pio_index, sm) (_sm_dma_plus_one[(pio_index)][(sm)] - 1) #define SM_DMA_CLEAR_CHANNEL(pio_index, sm) (_sm_dma_plus_one[(pio_index)][(sm)] = 0) #define SM_DMA_SET_CHANNEL(pio_isntance, sm, channel) (_sm_dma_plus_one[(pio_index)][(sm)] = (channel) + 1) -STATIC PIO pio_instances[2] = {pio0, pio1}; +static PIO pio_instances[2] = {pio0, pio1}; typedef void (*interrupt_handler_type)(void *); -STATIC interrupt_handler_type _interrupt_handler[NUM_PIOS][NUM_PIO_STATE_MACHINES]; -STATIC void *_interrupt_arg[NUM_PIOS][NUM_PIO_STATE_MACHINES]; +static interrupt_handler_type _interrupt_handler[NUM_PIOS][NUM_PIO_STATE_MACHINES]; +static void *_interrupt_arg[NUM_PIOS][NUM_PIO_STATE_MACHINES]; -STATIC void rp2pio_statemachine_interrupt_handler(void); +static void rp2pio_statemachine_interrupt_handler(void); static void rp2pio_statemachine_set_pull(uint32_t pull_pin_up, uint32_t pull_pin_down, uint32_t pins_we_use) { for (size_t i = 0; i < NUM_BANK0_GPIOS; i++) { @@ -61,7 +61,7 @@ static void rp2pio_statemachine_set_pull(uint32_t pull_pin_up, uint32_t pull_pin } } -STATIC void rp2pio_statemachine_clear_dma(int pio_index, int sm) { +static void rp2pio_statemachine_clear_dma(int pio_index, int sm) { if (SM_DMA_ALLOCATED(pio_index, sm)) { int channel = SM_DMA_GET_CHANNEL(pio_index, sm); uint32_t channel_mask = 1u << channel; @@ -76,7 +76,7 @@ STATIC void rp2pio_statemachine_clear_dma(int pio_index, int sm) { SM_DMA_CLEAR_CHANNEL(pio_index, sm); } -STATIC void _reset_statemachine(PIO pio, uint8_t sm, bool leave_pins) { +static void _reset_statemachine(PIO pio, uint8_t sm, bool leave_pins) { uint8_t pio_index = pio_get_index(pio); rp2pio_statemachine_clear_dma(pio_index, sm); uint32_t program_id = _current_program_id[pio_index][sm]; @@ -136,7 +136,7 @@ void reset_rp2pio_statemachine(void) { } } -STATIC uint32_t _check_pins_free(const mcu_pin_obj_t *first_pin, uint8_t pin_count, bool exclusive_pin_use) { +static uint32_t _check_pins_free(const mcu_pin_obj_t *first_pin, uint8_t pin_count, bool exclusive_pin_use) { uint32_t pins_we_use = 0; if (first_pin != NULL) { for (size_t i = 0; i < pin_count; i++) { @@ -697,7 +697,7 @@ bool common_hal_rp2pio_statemachine_deinited(rp2pio_statemachine_obj_t *self) { return self->state_machine == NUM_PIO_STATE_MACHINES; } -STATIC enum dma_channel_transfer_size _stride_to_dma_size(uint8_t stride) { +static enum dma_channel_transfer_size _stride_to_dma_size(uint8_t stride) { switch (stride) { case 4: return DMA_SIZE_32; @@ -944,7 +944,7 @@ void common_hal_rp2pio_statemachine_set_interrupt_handler(rp2pio_statemachine_ob common_hal_mcu_enable_interrupts(); } -STATIC void rp2pio_statemachine_interrupt_handler(void) { +static void rp2pio_statemachine_interrupt_handler(void) { for (size_t pio_index = 0; pio_index < NUM_PIOS; pio_index++) { PIO pio = pio_instances[pio_index]; for (size_t sm = 0; sm < NUM_PIO_STATE_MACHINES; sm++) { diff --git a/ports/raspberrypi/common-hal/socketpool/Socket.c b/ports/raspberrypi/common-hal/socketpool/Socket.c index af16dab1d580c..f6122b13af86c 100644 --- a/ports/raspberrypi/common-hal/socketpool/Socket.c +++ b/ports/raspberrypi/common-hal/socketpool/Socket.c @@ -106,7 +106,7 @@ static inline void poll_sockets(void) { #endif } -STATIC struct tcp_pcb *volatile *lwip_socket_incoming_array(socketpool_socket_obj_t *socket) { +static struct tcp_pcb *volatile *lwip_socket_incoming_array(socketpool_socket_obj_t *socket) { if (socket->incoming.connection.alloc == 0) { return &socket->incoming.connection.tcp.item; } else { @@ -114,7 +114,7 @@ STATIC struct tcp_pcb *volatile *lwip_socket_incoming_array(socketpool_socket_ob } } -STATIC void lwip_socket_free_incoming(socketpool_socket_obj_t *socket) { +static void lwip_socket_free_incoming(socketpool_socket_obj_t *socket) { bool socket_is_listener = socket->type == MOD_NETWORK_SOCK_STREAM && socket->pcb.tcp->state == LISTEN; @@ -154,9 +154,9 @@ static inline void exec_user_callback(socketpool_socket_obj_t *socket) { #if MICROPY_PY_LWIP_SOCK_RAW // Callback for incoming raw packets. #if LWIP_VERSION_MAJOR < 2 -STATIC u8_t _lwip_raw_incoming(void *arg, struct raw_pcb *pcb, struct pbuf *p, ip_addr_t *addr) +static u8_t _lwip_raw_incoming(void *arg, struct raw_pcb *pcb, struct pbuf *p, ip_addr_t *addr) #else -STATIC u8_t _lwip_raw_incoming(void *arg, struct raw_pcb *pcb, struct pbuf *p, const ip_addr_t *addr) +static u8_t _lwip_raw_incoming(void *arg, struct raw_pcb *pcb, struct pbuf *p, const ip_addr_t *addr) #endif { socketpool_socket_obj_t *socket = (socketpool_socket_obj_t *)arg; @@ -174,9 +174,9 @@ STATIC u8_t _lwip_raw_incoming(void *arg, struct raw_pcb *pcb, struct pbuf *p, c // Callback for incoming UDP packets. We simply stash the packet and the source address, // in case we need it for recvfrom. #if LWIP_VERSION_MAJOR < 2 -STATIC void _lwip_udp_incoming(void *arg, struct udp_pcb *upcb, struct pbuf *p, ip_addr_t *addr, u16_t port) +static void _lwip_udp_incoming(void *arg, struct udp_pcb *upcb, struct pbuf *p, ip_addr_t *addr, u16_t port) #else -STATIC void _lwip_udp_incoming(void *arg, struct udp_pcb *upcb, struct pbuf *p, const ip_addr_t *addr, u16_t port) +static void _lwip_udp_incoming(void *arg, struct udp_pcb *upcb, struct pbuf *p, const ip_addr_t *addr, u16_t port) #endif { socketpool_socket_obj_t *socket = (socketpool_socket_obj_t *)arg; @@ -192,7 +192,7 @@ STATIC void _lwip_udp_incoming(void *arg, struct udp_pcb *upcb, struct pbuf *p, } // Callback for general tcp errors. -STATIC void _lwip_tcp_error(void *arg, err_t err) { +static void _lwip_tcp_error(void *arg, err_t err) { socketpool_socket_obj_t *socket = (socketpool_socket_obj_t *)arg; // Free any incoming buffers or connections that are stored @@ -204,7 +204,7 @@ STATIC void _lwip_tcp_error(void *arg, err_t err) { } // Callback for tcp connection requests. Error code err is unused. (See tcp.h) -STATIC err_t _lwip_tcp_connected(void *arg, struct tcp_pcb *tpcb, err_t err) { +static err_t _lwip_tcp_connected(void *arg, struct tcp_pcb *tpcb, err_t err) { socketpool_socket_obj_t *socket = (socketpool_socket_obj_t *)arg; socket->state = STATE_CONNECTED; @@ -213,7 +213,7 @@ STATIC err_t _lwip_tcp_connected(void *arg, struct tcp_pcb *tpcb, err_t err) { // Handle errors (eg connection aborted) on TCP PCBs that have been put on the // accept queue but are not yet actually accepted. -STATIC void _lwip_tcp_err_unaccepted(void *arg, err_t err) { +static void _lwip_tcp_err_unaccepted(void *arg, err_t err) { struct tcp_pcb *pcb = (struct tcp_pcb *)arg; // The ->connected entry is repurposed to store the parent socket; this is safe @@ -253,12 +253,12 @@ STATIC void _lwip_tcp_err_unaccepted(void *arg, err_t err) { // so set this handler which requests lwIP to keep pbuf's and deliver // them later. We cannot cache pbufs in child socket on Python side, // until it is created in accept(). -STATIC err_t _lwip_tcp_recv_unaccepted(void *arg, struct tcp_pcb *pcb, struct pbuf *p, err_t err) { +static err_t _lwip_tcp_recv_unaccepted(void *arg, struct tcp_pcb *pcb, struct pbuf *p, err_t err) { return ERR_BUF; } // Callback for incoming tcp connections. -STATIC err_t _lwip_tcp_accept(void *arg, struct tcp_pcb *newpcb, err_t err) { +static err_t _lwip_tcp_accept(void *arg, struct tcp_pcb *newpcb, err_t err) { // err can be ERR_MEM to notify us that there was no memory for an incoming connection if (err != ERR_OK) { return ERR_OK; @@ -295,7 +295,7 @@ STATIC err_t _lwip_tcp_accept(void *arg, struct tcp_pcb *newpcb, err_t err) { } // Callback for inbound tcp packets. -STATIC err_t _lwip_tcp_recv(void *arg, struct tcp_pcb *tcpb, struct pbuf *p, err_t err) { +static err_t _lwip_tcp_recv(void *arg, struct tcp_pcb *tcpb, struct pbuf *p, err_t err) { socketpool_socket_obj_t *socket = (socketpool_socket_obj_t *)arg; if (p == NULL) { @@ -326,7 +326,7 @@ STATIC err_t _lwip_tcp_recv(void *arg, struct tcp_pcb *tcpb, struct pbuf *p, err // these to do the work. // Helper function for send/sendto to handle raw/UDP packets. -STATIC mp_uint_t lwip_raw_udp_send(socketpool_socket_obj_t *socket, const byte *buf, mp_uint_t len, ip_addr_t *dest, uint32_t port, int *_errno) { +static mp_uint_t lwip_raw_udp_send(socketpool_socket_obj_t *socket, const byte *buf, mp_uint_t len, ip_addr_t *dest, uint32_t port, int *_errno) { if (len > 0xffff) { // Any packet that big is probably going to fail the pbuf_alloc anyway, but may as well try len = 0xffff; @@ -380,7 +380,7 @@ STATIC mp_uint_t lwip_raw_udp_send(socketpool_socket_obj_t *socket, const byte * } // Helper function for recv/recvfrom to handle raw/UDP packets -STATIC mp_uint_t lwip_raw_udp_receive(socketpool_socket_obj_t *socket, byte *buf, mp_uint_t len, byte *ip, uint32_t *port, int *_errno) { +static mp_uint_t lwip_raw_udp_receive(socketpool_socket_obj_t *socket, byte *buf, mp_uint_t len, byte *ip, uint32_t *port, int *_errno) { if (socket->incoming.pbuf == NULL) { if (socket->timeout == 0) { @@ -437,7 +437,7 @@ STATIC mp_uint_t lwip_raw_udp_receive(socketpool_socket_obj_t *socket, byte *buf // Helper function for send/sendto to handle TCP packets -STATIC mp_uint_t lwip_tcp_send(socketpool_socket_obj_t *socket, const byte *buf, mp_uint_t len, int *_errno) { +static mp_uint_t lwip_tcp_send(socketpool_socket_obj_t *socket, const byte *buf, mp_uint_t len, int *_errno) { // Check for any pending errors STREAM_ERROR_CHECK(socket); @@ -517,7 +517,7 @@ STATIC mp_uint_t lwip_tcp_send(socketpool_socket_obj_t *socket, const byte *buf, } // Helper function for recv/recvfrom to handle TCP packets -STATIC mp_uint_t lwip_tcp_receive(socketpool_socket_obj_t *socket, byte *buf, mp_uint_t len, int *_errno) { +static mp_uint_t lwip_tcp_receive(socketpool_socket_obj_t *socket, byte *buf, mp_uint_t len, int *_errno) { // Check for any pending errors STREAM_ERROR_CHECK(socket); @@ -589,8 +589,8 @@ STATIC mp_uint_t lwip_tcp_receive(socketpool_socket_obj_t *socket, byte *buf, mp } -STATIC socketpool_socket_obj_t *open_socket_objs[MAX_SOCKETS]; -STATIC bool user_socket[MAX_SOCKETS]; +static socketpool_socket_obj_t *open_socket_objs[MAX_SOCKETS]; +static bool user_socket[MAX_SOCKETS]; void socket_user_reset(void) { for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_objs); i++) { @@ -605,7 +605,7 @@ void socket_user_reset(void) { // The writes below send an event to the socket select task so that it redoes the // select with the new open socket set. -STATIC bool register_open_socket(socketpool_socket_obj_t *obj) { +static bool register_open_socket(socketpool_socket_obj_t *obj) { for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_objs); i++) { if (!open_socket_objs[i]) { open_socket_objs[i] = obj; @@ -618,7 +618,7 @@ STATIC bool register_open_socket(socketpool_socket_obj_t *obj) { return false; } -STATIC void unregister_open_socket(socketpool_socket_obj_t *obj) { +static void unregister_open_socket(socketpool_socket_obj_t *obj) { for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_objs); i++) { if (open_socket_objs[i] == obj) { DEBUG_printf("unregister_open_socket(%p) clears %d\n", obj, i); @@ -630,7 +630,7 @@ STATIC void unregister_open_socket(socketpool_socket_obj_t *obj) { DEBUG_printf("unregister_open_socket(%p) fails due to missing entry\n", obj); } -STATIC void mark_user_socket(socketpool_socket_obj_t *obj) { +static void mark_user_socket(socketpool_socket_obj_t *obj) { for (size_t i = 0; i < MP_ARRAY_SIZE(open_socket_objs); i++) { if (open_socket_objs[i] == obj) { DEBUG_printf("mark_user_socket(%p) -> %d\n", obj, i); @@ -876,7 +876,7 @@ size_t common_hal_socketpool_socket_bind(socketpool_socket_obj_t *socket, return 0; } -STATIC err_t _lwip_tcp_close_poll(void *arg, struct tcp_pcb *pcb) { +static err_t _lwip_tcp_close_poll(void *arg, struct tcp_pcb *pcb) { // Connection has not been cleanly closed so just abort it to free up memory tcp_poll(pcb, NULL, 0); tcp_abort(pcb); diff --git a/ports/raspberrypi/common-hal/socketpool/SocketPool.c b/ports/raspberrypi/common-hal/socketpool/SocketPool.c index a98bc2313dc16..cf92a622a1c71 100644 --- a/ports/raspberrypi/common-hal/socketpool/SocketPool.c +++ b/ports/raspberrypi/common-hal/socketpool/SocketPool.c @@ -26,7 +26,7 @@ typedef struct _getaddrinfo_state_t { volatile ip_addr_t ipaddr; } getaddrinfo_state_t; -STATIC void lwip_getaddrinfo_cb(const char *name, const ip_addr_t *ipaddr, void *arg) { +static void lwip_getaddrinfo_cb(const char *name, const ip_addr_t *ipaddr, void *arg) { getaddrinfo_state_t *state = arg; if (ipaddr != NULL) { state->status = 1; @@ -37,7 +37,7 @@ STATIC void lwip_getaddrinfo_cb(const char *name, const ip_addr_t *ipaddr, void } } -STATIC int socketpool_resolve_host(socketpool_socketpool_obj_t *self, const char *host, ip_addr_t *addr) { +static int socketpool_resolve_host(socketpool_socketpool_obj_t *self, const char *host, ip_addr_t *addr) { getaddrinfo_state_t state; state.status = 0; diff --git a/ports/raspberrypi/common-hal/usb_host/Port.c b/ports/raspberrypi/common-hal/usb_host/Port.c index 9f8fb016b3434..b85b56fd1875b 100644 --- a/ports/raspberrypi/common-hal/usb_host/Port.c +++ b/ports/raspberrypi/common-hal/usb_host/Port.c @@ -27,7 +27,7 @@ usb_host_port_obj_t usb_host_instance; -STATIC PIO pio_instances[2] = {pio0, pio1}; +static PIO pio_instances[2] = {pio0, pio1}; volatile bool _core1_ready = false; static void __not_in_flash_func(core1_main)(void) { @@ -61,7 +61,7 @@ static void __not_in_flash_func(core1_main)(void) { } } -STATIC uint8_t _sm_free_count(uint8_t pio_index) { +static uint8_t _sm_free_count(uint8_t pio_index) { PIO pio = pio_instances[pio_index]; uint8_t free_count = 0; for (size_t j = 0; j < NUM_PIO_STATE_MACHINES; j++) { @@ -72,7 +72,7 @@ STATIC uint8_t _sm_free_count(uint8_t pio_index) { return free_count; } -STATIC bool _has_program_room(uint8_t pio_index, uint8_t program_size) { +static bool _has_program_room(uint8_t pio_index, uint8_t program_size) { PIO pio = pio_instances[pio_index]; pio_program_t program_struct = { .instructions = NULL, diff --git a/ports/raspberrypi/supervisor/internal_flash.c b/ports/raspberrypi/supervisor/internal_flash.c index 76dde31b99026..dea61e3ed1d02 100644 --- a/ports/raspberrypi/supervisor/internal_flash.c +++ b/ports/raspberrypi/supervisor/internal_flash.c @@ -34,9 +34,9 @@ // TODO: Split the caching out of supervisor/shared/external_flash so we can use it. #define SECTOR_SIZE 4096 #define NO_CACHE 0xffffffff -STATIC uint8_t _cache[SECTOR_SIZE]; -STATIC uint32_t _cache_lba = NO_CACHE; -STATIC uint32_t _flash_size = 0; +static uint8_t _cache[SECTOR_SIZE]; +static uint32_t _cache_lba = NO_CACHE; +static uint32_t _flash_size = 0; void supervisor_flash_init(void) { bi_decl_if_func_used(bi_block_device( diff --git a/ports/raspberrypi/supervisor/port.c b/ports/raspberrypi/supervisor/port.c index 6eb43d70eb459..7d79dc9629873 100644 --- a/ports/raspberrypi/supervisor/port.c +++ b/ports/raspberrypi/supervisor/port.c @@ -62,9 +62,9 @@ critical_section_t background_queue_lock; extern volatile bool mp_msc_enabled; -STATIC void _tick_callback(uint alarm_num); +static void _tick_callback(uint alarm_num); -STATIC void _binary_info(void) { +static void _binary_info(void) { // Binary info readable with `picotool`. bi_decl(bi_program_name("CircuitPython")); bi_decl(bi_program_version_string(MICROPY_GIT_TAG)); @@ -253,7 +253,7 @@ uint64_t port_get_raw_ticks(uint8_t *subticks) { return 1024 * (microseconds / 1000000) + (microseconds % 1000000) / 977; } -STATIC void _tick_callback(uint alarm_num) { +static void _tick_callback(uint alarm_num) { if (ticks_enabled) { supervisor_tick(); hardware_alarm_set_target(0, delayed_by_us(get_absolute_time(), 977)); diff --git a/ports/raspberrypi/supervisor/usb.c b/ports/raspberrypi/supervisor/usb.c index 05ee6d4aef15c..8982a59707e6d 100644 --- a/ports/raspberrypi/supervisor/usb.c +++ b/ports/raspberrypi/supervisor/usb.c @@ -14,7 +14,7 @@ void init_usb_hardware(void) { } -STATIC void _usb_irq_wrapper(void) { +static void _usb_irq_wrapper(void) { usb_irq_handler(0); } diff --git a/ports/renode/boards/renode_cortex_m0plus/pins.c b/ports/renode/boards/renode_cortex_m0plus/pins.c index efa6d2d729e24..121d7e912bfd4 100644 --- a/ports/renode/boards/renode_cortex_m0plus/pins.c +++ b/ports/renode/boards/renode_cortex_m0plus/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) }, diff --git a/ports/renode/common-hal/os/__init__.c b/ports/renode/common-hal/os/__init__.c index cf0f0fc67028d..334742bb594e3 100644 --- a/ports/renode/common-hal/os/__init__.c +++ b/ports/renode/common-hal/os/__init__.c @@ -12,18 +12,18 @@ #include "shared-bindings/os/__init__.h" -STATIC const qstr os_uname_info_fields[] = { +static const qstr os_uname_info_fields[] = { MP_QSTR_sysname, MP_QSTR_nodename, MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine }; -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "renode"); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "renode"); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME); +static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "renode"); +static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "renode"); +static const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING); +static const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE); +static const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME); -STATIC MP_DEFINE_ATTRTUPLE( +static MP_DEFINE_ATTRTUPLE( os_uname_info_obj, os_uname_info_fields, 5, diff --git a/ports/stm/boards/espruino_pico/pins.c b/ports/stm/boards/espruino_pico/pins.c index 714ac1c7e6996..84cc8e6d8aaf1 100644 --- a/ports/stm/boards/espruino_pico/pins.c +++ b/ports/stm/boards/espruino_pico/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_B15), MP_ROM_PTR(&pin_PB15) }, diff --git a/ports/stm/boards/espruino_wifi/pins.c b/ports/stm/boards/espruino_wifi/pins.c index 125204dc76078..8a4be200fb934 100644 --- a/ports/stm/boards/espruino_wifi/pins.c +++ b/ports/stm/boards/espruino_wifi/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // P1 diff --git a/ports/stm/boards/feather_stm32f405_express/pins.c b/ports/stm/boards/feather_stm32f405_express/pins.c index 0d4131f878b17..623747d925c93 100644 --- a/ports/stm/boards/feather_stm32f405_express/pins.c +++ b/ports/stm/boards/feather_stm32f405_express/pins.c @@ -7,7 +7,7 @@ #include "py/objtuple.h" #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_obj_tuple_t sdio_data_tuple = { +static const mp_rom_obj_tuple_t sdio_data_tuple = { {&mp_type_tuple}, 4, { @@ -18,7 +18,7 @@ STATIC const mp_rom_obj_tuple_t sdio_data_tuple = { } }; -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA04) }, diff --git a/ports/stm/boards/meowbit_v121/pins.c b/ports/stm/boards/meowbit_v121/pins.c index dd5404f823e65..8460215c0906a 100644 --- a/ports/stm/boards/meowbit_v121/pins.c +++ b/ports/stm/boards/meowbit_v121/pins.c @@ -12,7 +12,7 @@ extern audiopwmio_pwmaudioout_obj_t board_buzz_obj; -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_LED_RED), MP_ROM_PTR(&pin_PB04) }, diff --git a/ports/stm/boards/nucleo_f446re/pins.c b/ports/stm/boards/nucleo_f446re/pins.c index 82e059253e766..62c460a7e9a16 100644 --- a/ports/stm/boards/nucleo_f446re/pins.c +++ b/ports/stm/boards/nucleo_f446re/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { {MP_ROM_QSTR(MP_QSTR_ID), MP_ROM_PTR(&board_module_id_obj)}, {MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA03)}, {MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PA02)}, diff --git a/ports/stm/boards/nucleo_f746zg/pins.c b/ports/stm/boards/nucleo_f746zg/pins.c index e267556ae00d4..c46bf17fc43b7 100644 --- a/ports/stm/boards/nucleo_f746zg/pins.c +++ b/ports/stm/boards/nucleo_f746zg/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA03) }, diff --git a/ports/stm/boards/nucleo_f767zi/pins.c b/ports/stm/boards/nucleo_f767zi/pins.c index 2f6d6cf993658..68bdeb65e0be2 100644 --- a/ports/stm/boards/nucleo_f767zi/pins.c +++ b/ports/stm/boards/nucleo_f767zi/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA03) }, diff --git a/ports/stm/boards/nucleo_h743zi_2/pins.c b/ports/stm/boards/nucleo_h743zi_2/pins.c index 84406e0093775..770c34e869776 100644 --- a/ports/stm/boards/nucleo_h743zi_2/pins.c +++ b/ports/stm/boards/nucleo_h743zi_2/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA03) }, diff --git a/ports/stm/boards/openmv_h7/pins.c b/ports/stm/boards/openmv_h7/pins.c index 27e82e44a663a..a2a9bc4669d4f 100644 --- a/ports/stm/boards/openmv_h7/pins.c +++ b/ports/stm/boards/openmv_h7/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_P0), MP_ROM_PTR(&pin_PB15) }, diff --git a/ports/stm/boards/pyb_nano_v2/pins.c b/ports/stm/boards/pyb_nano_v2/pins.c index 74f3eb1eb16ea..5457c83ca8e8a 100644 --- a/ports/stm/boards/pyb_nano_v2/pins.c +++ b/ports/stm/boards/pyb_nano_v2/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_Y10), MP_ROM_PTR(&pin_PA10) }, diff --git a/ports/stm/boards/pyboard_v11/pins.c b/ports/stm/boards/pyboard_v11/pins.c index cf33c4637adce..0689ddf6342fc 100644 --- a/ports/stm/boards/pyboard_v11/pins.c +++ b/ports/stm/boards/pyboard_v11/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_Y1), MP_ROM_PTR(&pin_PC06) }, diff --git a/ports/stm/boards/sparkfun_stm32_thing_plus/pins.c b/ports/stm/boards/sparkfun_stm32_thing_plus/pins.c index a08f7120f2285..953cd4c0e68fe 100644 --- a/ports/stm/boards/sparkfun_stm32_thing_plus/pins.c +++ b/ports/stm/boards/sparkfun_stm32_thing_plus/pins.c @@ -7,7 +7,7 @@ #include "py/objtuple.h" #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_obj_tuple_t sdio_data_tuple = { +static const mp_rom_obj_tuple_t sdio_data_tuple = { {&mp_type_tuple}, 4, { @@ -18,7 +18,7 @@ STATIC const mp_rom_obj_tuple_t sdio_data_tuple = { } }; -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA04) }, diff --git a/ports/stm/boards/sparkfun_stm32f405_micromod/pins.c b/ports/stm/boards/sparkfun_stm32f405_micromod/pins.c index baeda8bfff01f..247defe3bff22 100644 --- a/ports/stm/boards/sparkfun_stm32f405_micromod/pins.c +++ b/ports/stm/boards/sparkfun_stm32f405_micromod/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // The SparkFun MicroMod spec uses a zero-based peripheral numbering scheme. diff --git a/ports/stm/boards/stm32f411ce_blackpill/pins.c b/ports/stm/boards/stm32f411ce_blackpill/pins.c index 2b299930fdb32..e4ef7a7c07c50 100644 --- a/ports/stm/boards/stm32f411ce_blackpill/pins.c +++ b/ports/stm/boards/stm32f411ce_blackpill/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_B12), MP_ROM_PTR(&pin_PB12) }, diff --git a/ports/stm/boards/stm32f411ce_blackpill_with_flash/pins.c b/ports/stm/boards/stm32f411ce_blackpill_with_flash/pins.c index 2b299930fdb32..e4ef7a7c07c50 100644 --- a/ports/stm/boards/stm32f411ce_blackpill_with_flash/pins.c +++ b/ports/stm/boards/stm32f411ce_blackpill_with_flash/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_B12), MP_ROM_PTR(&pin_PB12) }, diff --git a/ports/stm/boards/stm32f411ve_discovery/pins.c b/ports/stm/boards/stm32f411ve_discovery/pins.c index 904e8477a530d..1c855b17f4ca1 100644 --- a/ports/stm/boards/stm32f411ve_discovery/pins.c +++ b/ports/stm/boards/stm32f411ve_discovery/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // P1 diff --git a/ports/stm/boards/stm32f412zg_discovery/pins.c b/ports/stm/boards/stm32f412zg_discovery/pins.c index c523e8e5212c2..4e14e9b541a25 100644 --- a/ports/stm/boards/stm32f412zg_discovery/pins.c +++ b/ports/stm/boards/stm32f412zg_discovery/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_PE02), MP_ROM_PTR(&pin_PE02) }, diff --git a/ports/stm/boards/stm32f4_discovery/pins.c b/ports/stm/boards/stm32f4_discovery/pins.c index d1513031fec8c..6fd9e2500449f 100644 --- a/ports/stm/boards/stm32f4_discovery/pins.c +++ b/ports/stm/boards/stm32f4_discovery/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS // P1 diff --git a/ports/stm/boards/stm32f746g_discovery/pins.c b/ports/stm/boards/stm32f746g_discovery/pins.c index 55c97cb39a363..ca3928ff0c7b8 100644 --- a/ports/stm/boards/stm32f746g_discovery/pins.c +++ b/ports/stm/boards/stm32f746g_discovery/pins.c @@ -7,7 +7,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA00) }, diff --git a/ports/stm/boards/swan_r5/pins.c b/ports/stm/boards/swan_r5/pins.c index 0e827e11d899d..47df9151ccd0a 100644 --- a/ports/stm/boards/swan_r5/pins.c +++ b/ports/stm/boards/swan_r5/pins.c @@ -9,7 +9,7 @@ #include "board.h" // extended pins -STATIC const mp_rom_map_elem_t board_module_carrier_table[] = { +static const mp_rom_map_elem_t board_module_carrier_table[] = { { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PD09) }, { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PD08) }, { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_PF15) }, @@ -89,7 +89,7 @@ MP_DEFINE_CONST_OBJ_TYPE( // Core Feather Pins -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_ext), MP_ROM_PTR(&carrier_type) }, diff --git a/ports/stm/boards/thunderpack_v11/pins.c b/ports/stm/boards/thunderpack_v11/pins.c index fcb04e54e4d0b..9da6fa804b091 100644 --- a/ports/stm/boards/thunderpack_v11/pins.c +++ b/ports/stm/boards/thunderpack_v11/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_PA0), MP_ROM_PTR(&pin_PA00) }, diff --git a/ports/stm/boards/thunderpack_v12/pins.c b/ports/stm/boards/thunderpack_v12/pins.c index 92a07ac0e8ef6..60a839b295537 100644 --- a/ports/stm/boards/thunderpack_v12/pins.c +++ b/ports/stm/boards/thunderpack_v12/pins.c @@ -6,7 +6,7 @@ #include "shared-bindings/board/__init__.h" -STATIC const mp_rom_map_elem_t board_module_globals_table[] = { +static const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_PA0), MP_ROM_PTR(&pin_PA00) }, diff --git a/ports/stm/common-hal/alarm/SleepMemory.c b/ports/stm/common-hal/alarm/SleepMemory.c index 74a5b418203a6..84912e5cc106c 100644 --- a/ports/stm/common-hal/alarm/SleepMemory.c +++ b/ports/stm/common-hal/alarm/SleepMemory.c @@ -23,9 +23,9 @@ #endif -STATIC bool initialized = false; +static bool initialized = false; -STATIC void lazy_init(void) { +static void lazy_init(void) { if (!initialized) { __HAL_RCC_BKPSRAM_CLK_ENABLE(); HAL_PWREx_EnableBkUpReg(); diff --git a/ports/stm/common-hal/alarm/__init__.c b/ports/stm/common-hal/alarm/__init__.c index 0526f510c0835..3d6c4466882b4 100644 --- a/ports/stm/common-hal/alarm/__init__.c +++ b/ports/stm/common-hal/alarm/__init__.c @@ -31,7 +31,7 @@ const alarm_sleep_memory_obj_t alarm_sleep_memory_obj = { // This object lives across VM instantiations, so none of these objects can contain references to the heap. alarm_wake_alarm_union_t alarm_wake_alarm; -STATIC stm_sleep_source_t true_deep_wake_reason; +static stm_sleep_source_t true_deep_wake_reason; void alarm_reset(void) { // Reset the alarm flag @@ -85,7 +85,7 @@ mp_obj_t common_hal_alarm_record_wake_alarm(void) { } // Set up light sleep or deep sleep alarms. -STATIC void _setup_sleep_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms) { +static void _setup_sleep_alarms(bool deep_sleep, size_t n_alarms, const mp_obj_t *alarms) { alarm_pin_pinalarm_set_alarms(deep_sleep, n_alarms, alarms); alarm_time_timealarm_set_alarms(deep_sleep, n_alarms, alarms); } diff --git a/ports/stm/common-hal/alarm/pin/PinAlarm.c b/ports/stm/common-hal/alarm/pin/PinAlarm.c index 45c4afa4c5cf2..93512953d312d 100644 --- a/ports/stm/common-hal/alarm/pin/PinAlarm.c +++ b/ports/stm/common-hal/alarm/pin/PinAlarm.c @@ -11,13 +11,13 @@ #include "peripherals/exti.h" -STATIC bool woke_up; +static bool woke_up; -STATIC uint16_t alarm_pin_triggered; -STATIC bool deep_wkup_enabled; -STATIC bool reserved_alarms[STM32_GPIO_PORT_SIZE]; +static uint16_t alarm_pin_triggered; +static bool deep_wkup_enabled; +static bool reserved_alarms[STM32_GPIO_PORT_SIZE]; -STATIC void pin_alarm_callback(uint8_t num) { +static void pin_alarm_callback(uint8_t num) { alarm_pin_triggered |= (1 << num); woke_up = true; HAL_GPIO_EXTI_IRQHandler(pin_mask(num)); diff --git a/ports/stm/common-hal/alarm/time/TimeAlarm.c b/ports/stm/common-hal/alarm/time/TimeAlarm.c index 545587a65f50d..ca5d0de70911c 100644 --- a/ports/stm/common-hal/alarm/time/TimeAlarm.c +++ b/ports/stm/common-hal/alarm/time/TimeAlarm.c @@ -13,8 +13,8 @@ #include STM32_HAL_H -STATIC volatile bool woke_up; -STATIC uint32_t deep_sleep_ticks; +static volatile bool woke_up; +static uint32_t deep_sleep_ticks; void common_hal_alarm_time_timealarm_construct(alarm_time_timealarm_obj_t *self, mp_float_t monotonic_time) { self->monotonic_time = monotonic_time; @@ -44,7 +44,7 @@ mp_obj_t alarm_time_timealarm_record_wake_alarm(void) { } // This is run in the timer task. We use it to wake the main CircuitPython task. -STATIC void timer_callback(void) { +static void timer_callback(void) { woke_up = true; } diff --git a/ports/stm/common-hal/analogio/AnalogOut.c b/ports/stm/common-hal/analogio/AnalogOut.c index fcf814f2287b9..44fdff5af4b78 100644 --- a/ports/stm/common-hal/analogio/AnalogOut.c +++ b/ports/stm/common-hal/analogio/AnalogOut.c @@ -33,7 +33,7 @@ DAC_HandleTypeDef handle; #endif -STATIC bool dac_on[2]; +static bool dac_on[2]; void common_hal_analogio_analogout_construct(analogio_analogout_obj_t *self, const mcu_pin_obj_t *pin) { diff --git a/ports/stm/common-hal/audiopwmio/PWMAudioOut.c b/ports/stm/common-hal/audiopwmio/PWMAudioOut.c index e22681a793b8e..9a82398aeb6f9 100644 --- a/ports/stm/common-hal/audiopwmio/PWMAudioOut.c +++ b/ports/stm/common-hal/audiopwmio/PWMAudioOut.c @@ -12,20 +12,20 @@ #include "timers.h" // TODO: support multiple concurrently active outputs. -STATIC TIM_HandleTypeDef tim_handle; -STATIC audiopwmio_pwmaudioout_obj_t *active_audio = NULL; +static TIM_HandleTypeDef tim_handle; +static audiopwmio_pwmaudioout_obj_t *active_audio = NULL; -STATIC void set_pin(uint8_t channel, GPIO_PinState state) { +static void set_pin(uint8_t channel, GPIO_PinState state) { HAL_GPIO_WritePin(pin_port(active_audio->pin[channel]->port), pin_mask(active_audio->pin[channel]->number), state); } -STATIC void toggle_pin(uint8_t channel) { +static void toggle_pin(uint8_t channel) { HAL_GPIO_TogglePin(pin_port(active_audio->pin[channel]->port), pin_mask(active_audio->pin[channel]->number)); } -STATIC void set_drive_mode(const mcu_pin_obj_t *pin, uint32_t mode) { +static void set_drive_mode(const mcu_pin_obj_t *pin, uint32_t mode) { GPIO_InitTypeDef GPIO_InitStruct = {0}; GPIO_InitStruct.Pin = pin_mask(pin->number); GPIO_InitStruct.Mode = mode; @@ -34,7 +34,7 @@ STATIC void set_drive_mode(const mcu_pin_obj_t *pin, uint32_t mode) { HAL_GPIO_Init(pin_port(pin->port), &GPIO_InitStruct); } -STATIC void start_timer(audiopwmio_pwmaudioout_obj_t *self) { +static void start_timer(audiopwmio_pwmaudioout_obj_t *self) { if (self->buffer_ptr[0] >= self->buffer_length[0]) { // no more pulses return; } @@ -55,7 +55,7 @@ STATIC void start_timer(audiopwmio_pwmaudioout_obj_t *self) { __HAL_TIM_ENABLE_IT(&tim_handle, TIM_IT_UPDATE); } -STATIC bool fill_buffers(audiopwmio_pwmaudioout_obj_t *self) { +static bool fill_buffers(audiopwmio_pwmaudioout_obj_t *self) { // Naive PCM-to-PWM conversion int16_t threshold = 0x666; // 0.05; TODO: make configurable uint8_t *buffer; @@ -131,7 +131,7 @@ STATIC bool fill_buffers(audiopwmio_pwmaudioout_obj_t *self) { return true; } -STATIC void move_to_beginning(uint16_t *buffer, uint16_t *buffer_length, uint16_t *buffer_ptr) { +static void move_to_beginning(uint16_t *buffer, uint16_t *buffer_length, uint16_t *buffer_ptr) { if (*buffer_ptr < *buffer_length) { memmove(buffer, buffer + *buffer_ptr, *buffer_length - *buffer_ptr); *buffer_length -= *buffer_ptr; @@ -141,7 +141,7 @@ STATIC void move_to_beginning(uint16_t *buffer, uint16_t *buffer_length, uint16_ *buffer_ptr = 0; } -STATIC void pwmaudioout_event_handler(void) { +static void pwmaudioout_event_handler(void) { // Detect TIM Update event if (__HAL_TIM_GET_FLAG(&tim_handle, TIM_FLAG_UPDATE) != RESET) { if (__HAL_TIM_GET_IT_SOURCE(&tim_handle, TIM_IT_UPDATE) != RESET) { @@ -213,7 +213,7 @@ bool common_hal_audiopwmio_pwmaudioout_deinited(audiopwmio_pwmaudioout_obj_t *se return !self->pin[0]; } -STATIC void free_buffers(audiopwmio_pwmaudioout_obj_t *self) { +static void free_buffers(audiopwmio_pwmaudioout_obj_t *self) { m_free(self->buffer[0]); self->buffer[0] = NULL; m_free(self->buffer[1]); diff --git a/ports/stm/common-hal/busio/I2C.c b/ports/stm/common-hal/busio/I2C.c index 92d0b8e1a9282..d7919cbd7ada0 100644 --- a/ports/stm/common-hal/busio/I2C.c +++ b/ports/stm/common-hal/busio/I2C.c @@ -40,13 +40,13 @@ // Arrays use 0 based numbering: I2C1 is stored at index 0 #define MAX_I2C 4 -STATIC bool reserved_i2c[MAX_I2C]; -STATIC bool never_reset_i2c[MAX_I2C]; +static bool reserved_i2c[MAX_I2C]; +static bool never_reset_i2c[MAX_I2C]; #define ALL_CLOCKS 0xFF -STATIC void i2c_clock_enable(uint8_t mask); -STATIC void i2c_clock_disable(uint8_t mask); -STATIC void i2c_assign_irq(busio_i2c_obj_t *self, I2C_TypeDef *I2Cx); +static void i2c_clock_enable(uint8_t mask); +static void i2c_clock_disable(uint8_t mask); +static void i2c_assign_irq(busio_i2c_obj_t *self, I2C_TypeDef *I2Cx); void i2c_reset(void) { uint16_t never_reset_mask = 0x00; @@ -224,7 +224,7 @@ void common_hal_busio_i2c_unlock(busio_i2c_obj_t *self) { self->has_lock = false; } -STATIC uint8_t _common_hal_busio_i2c_write(busio_i2c_obj_t *self, uint16_t addr, +static uint8_t _common_hal_busio_i2c_write(busio_i2c_obj_t *self, uint16_t addr, const uint8_t *data, size_t len, bool transmit_stop_bit) { HAL_StatusTypeDef result; if (!transmit_stop_bit) { @@ -281,7 +281,7 @@ uint8_t common_hal_busio_i2c_write_read(busio_i2c_obj_t *self, uint16_t addr, return common_hal_busio_i2c_read(self, addr, in_data, in_len); } -STATIC void i2c_clock_enable(uint8_t mask) { +static void i2c_clock_enable(uint8_t mask) { // Note: hard reset required due to soft reboot issue. #ifdef I2C1 if (mask & (1 << 0)) { @@ -313,7 +313,7 @@ STATIC void i2c_clock_enable(uint8_t mask) { #endif } -STATIC void i2c_clock_disable(uint8_t mask) { +static void i2c_clock_disable(uint8_t mask) { #ifdef I2C1 if (mask & (1 << 0)) { __HAL_RCC_I2C1_CLK_DISABLE(); @@ -336,7 +336,7 @@ STATIC void i2c_clock_disable(uint8_t mask) { #endif } -STATIC void i2c_assign_irq(busio_i2c_obj_t *self, I2C_TypeDef *I2Cx) { +static void i2c_assign_irq(busio_i2c_obj_t *self, I2C_TypeDef *I2Cx) { #ifdef I2C1 if (I2Cx == I2C1) { self->irq = I2C1_EV_IRQn; @@ -359,7 +359,7 @@ STATIC void i2c_assign_irq(busio_i2c_obj_t *self, I2C_TypeDef *I2Cx) { #endif } -STATIC void call_hal_irq(int i2c_num) { +static void call_hal_irq(int i2c_num) { // Create casted context pointer busio_i2c_obj_t *context = (busio_i2c_obj_t *)MP_STATE_PORT(cpy_i2c_obj_all)[i2c_num - 1]; if (context != NULL) { diff --git a/ports/stm/common-hal/busio/SPI.c b/ports/stm/common-hal/busio/SPI.c index 57300d85fd59f..e47708d94594e 100644 --- a/ports/stm/common-hal/busio/SPI.c +++ b/ports/stm/common-hal/busio/SPI.c @@ -18,14 +18,14 @@ // arrays use 0 based numbering: SPI1 is stored at index 0 #define MAX_SPI 6 -STATIC bool reserved_spi[MAX_SPI]; -STATIC bool never_reset_spi[MAX_SPI]; +static bool reserved_spi[MAX_SPI]; +static bool never_reset_spi[MAX_SPI]; #define ALL_CLOCKS 0xFF -STATIC void spi_clock_enable(uint8_t mask); -STATIC void spi_clock_disable(uint8_t mask); +static void spi_clock_enable(uint8_t mask); +static void spi_clock_disable(uint8_t mask); -STATIC uint32_t get_busclock(SPI_TypeDef *instance) { +static uint32_t get_busclock(SPI_TypeDef *instance) { #if (CPY_STM32H7) if (instance == SPI1 || instance == SPI2 || instance == SPI3) { return HAL_RCCEx_GetPeriphCLKFreq(RCC_PERIPHCLK_SPI123); @@ -50,7 +50,7 @@ STATIC uint32_t get_busclock(SPI_TypeDef *instance) { #endif } -STATIC uint32_t stm32_baud_to_spi_div(uint32_t baudrate, uint16_t *prescaler, uint32_t busclock) { +static uint32_t stm32_baud_to_spi_div(uint32_t baudrate, uint16_t *prescaler, uint32_t busclock) { static const uint32_t baud_map[8][2] = { {2, SPI_BAUDRATEPRESCALER_2}, {4, SPI_BAUDRATEPRESCALER_4}, @@ -88,7 +88,7 @@ void spi_reset(void) { spi_clock_disable(ALL_CLOCKS & ~(never_reset_mask)); } -STATIC const mcu_periph_obj_t *find_pin_function(const mcu_periph_obj_t *table, size_t sz, const mcu_pin_obj_t *pin, int periph_index) { +static const mcu_periph_obj_t *find_pin_function(const mcu_periph_obj_t *table, size_t sz, const mcu_pin_obj_t *pin, int periph_index) { for (size_t i = 0; i < sz; i++, table++) { if (periph_index == table->periph_index && pin == table->pin) { return table; @@ -98,7 +98,7 @@ STATIC const mcu_periph_obj_t *find_pin_function(const mcu_periph_obj_t *table, } // match pins to SPI objects -STATIC int check_pins(busio_spi_obj_t *self, +static int check_pins(busio_spi_obj_t *self, const mcu_pin_obj_t *sck, const mcu_pin_obj_t *mosi, const mcu_pin_obj_t *miso) { bool spi_taken = false; @@ -376,7 +376,7 @@ uint8_t common_hal_busio_spi_get_polarity(busio_spi_obj_t *self) { return self->polarity; } -STATIC void spi_clock_enable(uint8_t mask) { +static void spi_clock_enable(uint8_t mask) { #ifdef SPI1 if (mask & (1 << 0)) { __HAL_RCC_SPI1_CLK_ENABLE(); @@ -409,7 +409,7 @@ STATIC void spi_clock_enable(uint8_t mask) { #endif } -STATIC void spi_clock_disable(uint8_t mask) { +static void spi_clock_disable(uint8_t mask) { #ifdef SPI1 if (mask & (1 << 0)) { __HAL_RCC_SPI1_CLK_DISABLE(); diff --git a/ports/stm/common-hal/busio/UART.c b/ports/stm/common-hal/busio/UART.c index b39453ea6184c..e44fbc66a6c8d 100644 --- a/ports/stm/common-hal/busio/UART.c +++ b/ports/stm/common-hal/busio/UART.c @@ -19,15 +19,15 @@ #define ALL_UARTS 0xFFFF // arrays use 0 based numbering: UART1 is stored at index 0 -STATIC bool reserved_uart[MAX_UART]; -STATIC bool never_reset_uart[MAX_UART]; +static bool reserved_uart[MAX_UART]; +static bool never_reset_uart[MAX_UART]; int errflag; // Used to restart read halts -STATIC void uart_clock_enable(uint16_t mask); -STATIC void uart_clock_disable(uint16_t mask); -STATIC void uart_assign_irq(busio_uart_obj_t *self, USART_TypeDef *USARTx); +static void uart_clock_enable(uint16_t mask); +static void uart_clock_disable(uint16_t mask); +static void uart_assign_irq(busio_uart_obj_t *self, USART_TypeDef *USARTx); -STATIC USART_TypeDef *assign_uart_or_throw(busio_uart_obj_t *self, bool pin_eval, +static USART_TypeDef *assign_uart_or_throw(busio_uart_obj_t *self, bool pin_eval, int periph_index, bool uart_taken) { if (pin_eval) { // assign a root pointer pointer for IRQ @@ -418,7 +418,7 @@ bool common_hal_busio_uart_ready_to_tx(busio_uart_obj_t *self) { return __HAL_UART_GET_FLAG(&self->handle, UART_FLAG_TXE); } -STATIC void call_hal_irq(int uart_num) { +static void call_hal_irq(int uart_num) { // Create casted context pointer busio_uart_obj_t *context = (busio_uart_obj_t *)MP_STATE_PORT(cpy_uart_obj_all)[uart_num - 1]; if (context != NULL) { @@ -456,7 +456,7 @@ void USART6_IRQHandler(void) { call_hal_irq(6); } -STATIC void uart_clock_enable(uint16_t mask) { +static void uart_clock_enable(uint16_t mask) { #ifdef USART1 if (mask & (1 << 0)) { __HAL_RCC_USART1_FORCE_RESET(); @@ -529,7 +529,7 @@ STATIC void uart_clock_enable(uint16_t mask) { #endif } -STATIC void uart_clock_disable(uint16_t mask) { +static void uart_clock_disable(uint16_t mask) { #ifdef USART1 if (mask & (1 << 0)) { __HAL_RCC_USART1_FORCE_RESET(); @@ -602,7 +602,7 @@ STATIC void uart_clock_disable(uint16_t mask) { #endif } -STATIC void uart_assign_irq(busio_uart_obj_t *self, USART_TypeDef *USARTx) { +static void uart_assign_irq(busio_uart_obj_t *self, USART_TypeDef *USARTx) { #ifdef USART1 if (USARTx == USART1) { self->irq = USART1_IRQn; diff --git a/ports/stm/common-hal/canio/CAN.c b/ports/stm/common-hal/canio/CAN.c index 3e126322fd4d1..72a74a4b138c3 100644 --- a/ports/stm/common-hal/canio/CAN.c +++ b/ports/stm/common-hal/canio/CAN.c @@ -15,9 +15,9 @@ #include "shared-bindings/util.h" #include "supervisor/port.h" -STATIC bool reserved_can[MP_ARRAY_SIZE(mcu_can_banks)]; +static bool reserved_can[MP_ARRAY_SIZE(mcu_can_banks)]; -STATIC const mcu_periph_obj_t *find_pin_function(const mcu_periph_obj_t *table, size_t sz, const mcu_pin_obj_t *pin, int periph_index) { +static const mcu_periph_obj_t *find_pin_function(const mcu_periph_obj_t *table, size_t sz, const mcu_pin_obj_t *pin, int periph_index) { for (size_t i = 0; i < sz; i++, table++) { if (periph_index != -1 && periph_index != table->periph_index) { continue; diff --git a/ports/stm/common-hal/canio/Listener.c b/ports/stm/common-hal/canio/Listener.c index ec7c95a212194..bafdd4ba2c105 100644 --- a/ports/stm/common-hal/canio/Listener.c +++ b/ports/stm/common-hal/canio/Listener.c @@ -19,15 +19,15 @@ #include "supervisor/shared/tick.h" #include "supervisor/shared/safe_mode.h" -STATIC void allow_filter_change(canio_can_obj_t *can) { +static void allow_filter_change(canio_can_obj_t *can) { can->filter_hw->FMR |= CAN_FMR_FINIT; } -STATIC void prevent_filter_change(canio_can_obj_t *can) { +static void prevent_filter_change(canio_can_obj_t *can) { can->filter_hw->FMR &= ~CAN_FMR_FINIT; } -STATIC bool filter_in_use(canio_can_obj_t *can, int idx) { +static bool filter_in_use(canio_can_obj_t *can, int idx) { return can->filter_hw->FA1R & (1 << idx); } @@ -38,7 +38,7 @@ STATIC bool filter_in_use(canio_can_obj_t *can, int idx) { // * four extended ids // However, stm needs two filters to permit RTR and non-RTR messages // so we ONLY use mask-type filter banks -STATIC size_t num_filters_needed(size_t nmatch, canio_match_obj_t **matches) { +static size_t num_filters_needed(size_t nmatch, canio_match_obj_t **matches) { if (nmatch == 0) { return 1; } @@ -54,7 +54,7 @@ STATIC size_t num_filters_needed(size_t nmatch, canio_match_obj_t **matches) { return num_extended_mask + num_standard_mask / 2; } -STATIC size_t num_filters_available(canio_can_obj_t *can) { +static size_t num_filters_available(canio_can_obj_t *can) { size_t available = 0; for (size_t i = can->start_filter_bank; i < can->end_filter_bank; i++) { if (!filter_in_use(can, i)) { @@ -64,7 +64,7 @@ STATIC size_t num_filters_available(canio_can_obj_t *can) { return available; } -STATIC void clear_filters(canio_listener_obj_t *self) { +static void clear_filters(canio_listener_obj_t *self) { canio_can_obj_t *can = self->can; allow_filter_change(can); @@ -78,7 +78,7 @@ STATIC void clear_filters(canio_listener_obj_t *self) { prevent_filter_change(can); } -STATIC int next_filter(canio_can_obj_t *can) { +static int next_filter(canio_can_obj_t *can) { uint32_t fa1r = can->filter_hw->FA1R; for (size_t i = can->start_filter_bank; i < can->end_filter_bank; i++) { if (!(fa1r & (1 << i))) { @@ -93,7 +93,7 @@ STATIC int next_filter(canio_can_obj_t *can) { #define FILTER16_IDE (1 << 3) #define FILTER32_IDE (1 << 2) -STATIC void install_standard_filter(canio_listener_obj_t *self, canio_match_obj_t *match1, canio_match_obj_t *match2) { +static void install_standard_filter(canio_listener_obj_t *self, canio_match_obj_t *match1, canio_match_obj_t *match2) { int bank = next_filter(self->can); // filter is already deactivated, so we skip deactivating it here @@ -122,7 +122,7 @@ STATIC void install_standard_filter(canio_listener_obj_t *self, canio_match_obj_ SET_BIT(self->can->filter_hw->FA1R, 1 << bank); } -STATIC void install_extended_filter(canio_listener_obj_t *self, canio_match_obj_t *match) { +static void install_extended_filter(canio_listener_obj_t *self, canio_match_obj_t *match) { int bank = next_filter(self->can); // filter is already deactivated, so we skip deactivating it here @@ -149,7 +149,7 @@ STATIC void install_extended_filter(canio_listener_obj_t *self, canio_match_obj_ SET_BIT(self->can->filter_hw->FA1R, 1 << bank); } -STATIC void install_all_match_filter(canio_listener_obj_t *self) { +static void install_all_match_filter(canio_listener_obj_t *self) { int bank = next_filter(self->can); // filter is already deactivated, so we skip deactivating it here diff --git a/ports/stm/common-hal/microcontroller/Pin.c b/ports/stm/common-hal/microcontroller/Pin.c index 788274b9ddf28..e0ff3f138dfc2 100644 --- a/ports/stm/common-hal/microcontroller/Pin.c +++ b/ports/stm/common-hal/microcontroller/Pin.c @@ -26,8 +26,8 @@ GPIO_TypeDef *ports[] = {GPIOA, GPIOB, GPIOC}; #define GPIO_PORT_COUNT (MP_ARRAY_SIZE(ports)) -STATIC uint16_t claimed_pins[GPIO_PORT_COUNT]; -STATIC uint16_t __ALIGNED(4) never_reset_pins[GPIO_PORT_COUNT]; +static uint16_t claimed_pins[GPIO_PORT_COUNT]; +static uint16_t __ALIGNED(4) never_reset_pins[GPIO_PORT_COUNT]; void reset_all_pins(void) { // Reset claimed pins diff --git a/ports/stm/common-hal/microcontroller/Processor.c b/ports/stm/common-hal/microcontroller/Processor.c index 7196d289de2d3..0781f422ee121 100644 --- a/ports/stm/common-hal/microcontroller/Processor.c +++ b/ports/stm/common-hal/microcontroller/Processor.c @@ -26,9 +26,9 @@ #define VREFIN_CAL ((uint16_t *)ADC_CAL_ADDRESS) // correction factor for reference value -STATIC volatile float adc_refcor = 1.0f; +static volatile float adc_refcor = 1.0f; -STATIC void set_adc_params(ADC_HandleTypeDef *AdcHandle) { +static void set_adc_params(ADC_HandleTypeDef *AdcHandle) { AdcHandle->Instance = ADC1; AdcHandle->Init.ClockPrescaler = ADC_CLOCK_SYNC_PCLK_DIV4; AdcHandle->Init.Resolution = ADC_RESOLUTION_12B; diff --git a/ports/stm/common-hal/os/__init__.c b/ports/stm/common-hal/os/__init__.c index 5179d9ecdfefe..b3d9e67d98893 100644 --- a/ports/stm/common-hal/os/__init__.c +++ b/ports/stm/common-hal/os/__init__.c @@ -15,18 +15,18 @@ #include STM32_HAL_H #include "peripherals/periph.h" -STATIC const qstr os_uname_info_fields[] = { +static const qstr os_uname_info_fields[] = { MP_QSTR_sysname, MP_QSTR_nodename, MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine }; -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, STM32_SERIES_LOWER); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, STM32_SERIES_LOWER); +static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, STM32_SERIES_LOWER); +static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, STM32_SERIES_LOWER); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE); -STATIC const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME); +static const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING); +static const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE); +static const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME); -STATIC MP_DEFINE_ATTRTUPLE( +static MP_DEFINE_ATTRTUPLE( os_uname_info_obj, os_uname_info_fields, 5, diff --git a/ports/stm/common-hal/pulseio/PulseIn.c b/ports/stm/common-hal/pulseio/PulseIn.c index b06ed8b6e1047..593e01f9bb911 100644 --- a/ports/stm/common-hal/pulseio/PulseIn.c +++ b/ports/stm/common-hal/pulseio/PulseIn.c @@ -19,11 +19,11 @@ #include STM32_HAL_H #define STM32_GPIO_PORT_SIZE 16 -STATIC pulseio_pulsein_obj_t *callback_obj_ref[STM32_GPIO_PORT_SIZE]; +static pulseio_pulsein_obj_t *callback_obj_ref[STM32_GPIO_PORT_SIZE]; -STATIC TIM_HandleTypeDef tim_handle; -STATIC uint32_t overflow_count = 0; -STATIC uint8_t refcount = 0; +static TIM_HandleTypeDef tim_handle; +static uint32_t overflow_count = 0; +static uint8_t refcount = 0; void pulsein_timer_event_handler(void) { // Detect TIM Update event @@ -35,7 +35,7 @@ void pulsein_timer_event_handler(void) { } } -STATIC void pulsein_exti_event_handler(uint8_t num) { +static void pulsein_exti_event_handler(uint8_t num) { // Grab the current time first. uint32_t current_overflow = overflow_count; uint32_t current_count = tim_handle.Instance->CNT; diff --git a/ports/stm/common-hal/pulseio/PulseOut.c b/ports/stm/common-hal/pulseio/PulseOut.c index 49679c195c612..e2b637664d54f 100644 --- a/ports/stm/common-hal/pulseio/PulseOut.c +++ b/ports/stm/common-hal/pulseio/PulseOut.c @@ -17,21 +17,21 @@ // A single timer is shared amongst all PulseOut objects under the assumption that // the code is single threaded. -STATIC uint8_t refcount = 0; -STATIC uint16_t *pulse_array = NULL; -STATIC volatile uint16_t pulse_array_index = 0; -STATIC uint16_t pulse_array_length; +static uint8_t refcount = 0; +static uint16_t *pulse_array = NULL; +static volatile uint16_t pulse_array_index = 0; +static uint16_t pulse_array_length; // Timer is shared, must be accessible by interrupt -STATIC TIM_HandleTypeDef tim_handle; -STATIC pulseio_pulseout_obj_t *curr_pulseout = NULL; +static TIM_HandleTypeDef tim_handle; +static pulseio_pulseout_obj_t *curr_pulseout = NULL; -STATIC void turn_on(pulseio_pulseout_obj_t *pulseout) { +static void turn_on(pulseio_pulseout_obj_t *pulseout) { // Turn on PWM HAL_TIM_PWM_Start(&(pulseout->pwmout.handle), pulseout->pwmout.channel); } -STATIC void turn_off(pulseio_pulseout_obj_t *pulseout) { +static void turn_off(pulseio_pulseout_obj_t *pulseout) { // Turn off PWM HAL_TIM_PWM_Stop(&(pulseout->pwmout.handle), pulseout->pwmout.channel); // Make sure pin is low. @@ -39,7 +39,7 @@ STATIC void turn_off(pulseio_pulseout_obj_t *pulseout) { pin_mask(pulseout->pwmout.tim->pin->number), 0); } -STATIC void start_timer(void) { +static void start_timer(void) { // Set the new period tim_handle.Init.Period = pulse_array[pulse_array_index] - 1; HAL_TIM_Base_Init(&tim_handle); @@ -51,7 +51,7 @@ STATIC void start_timer(void) { __HAL_TIM_ENABLE_IT(&tim_handle, TIM_IT_UPDATE); } -STATIC void pulseout_event_handler(void) { +static void pulseout_event_handler(void) { // Detect TIM Update event if (__HAL_TIM_GET_FLAG(&tim_handle, TIM_FLAG_UPDATE) != RESET) { if (__HAL_TIM_GET_IT_SOURCE(&tim_handle, TIM_IT_UPDATE) != RESET) { diff --git a/ports/stm/common-hal/pwmio/PWMOut.c b/ports/stm/common-hal/pwmio/PWMOut.c index c3baac783240e..ed3bd67e7ec0f 100644 --- a/ports/stm/common-hal/pwmio/PWMOut.c +++ b/ports/stm/common-hal/pwmio/PWMOut.c @@ -16,16 +16,16 @@ #include "timers.h" // Bitmask of channels taken. -STATIC uint8_t tim_channels_taken[TIM_BANK_ARRAY_LEN]; +static uint8_t tim_channels_taken[TIM_BANK_ARRAY_LEN]; // Initial frequency timer is set to. -STATIC uint32_t tim_frequencies[TIM_BANK_ARRAY_LEN]; +static uint32_t tim_frequencies[TIM_BANK_ARRAY_LEN]; -STATIC uint32_t timer_get_internal_duty(uint16_t duty, uint32_t period) { +static uint32_t timer_get_internal_duty(uint16_t duty, uint32_t period) { // duty cycle is duty/0xFFFF fraction x (number of pulses per period) return (duty * period) / 0xffff; } -STATIC bool timer_get_optimal_divisors(uint32_t *period, uint32_t *prescaler, +static bool timer_get_optimal_divisors(uint32_t *period, uint32_t *prescaler, uint32_t frequency, uint32_t source_freq) { // Find the largest possible period supported by this frequency *prescaler = 0; diff --git a/ports/stm/common-hal/sdioio/SDCard.c b/ports/stm/common-hal/sdioio/SDCard.c index 6e1086e048ab4..ab0f8bb7dfce6 100644 --- a/ports/stm/common-hal/sdioio/SDCard.c +++ b/ports/stm/common-hal/sdioio/SDCard.c @@ -15,10 +15,10 @@ #include "common-hal/microcontroller/Pin.h" #include "shared-bindings/microcontroller/Pin.h" -STATIC bool reserved_sdio[MP_ARRAY_SIZE(mcu_sdio_banks)]; -STATIC bool never_reset_sdio[MP_ARRAY_SIZE(mcu_sdio_banks)]; +static bool reserved_sdio[MP_ARRAY_SIZE(mcu_sdio_banks)]; +static bool never_reset_sdio[MP_ARRAY_SIZE(mcu_sdio_banks)]; -STATIC const mcu_periph_obj_t *find_pin_function(const mcu_periph_obj_t *table, size_t sz, const mcu_pin_obj_t *pin, int periph_index) { +static const mcu_periph_obj_t *find_pin_function(const mcu_periph_obj_t *table, size_t sz, const mcu_pin_obj_t *pin, int periph_index) { for (size_t i = 0; i < sz; i++, table++) { if (periph_index == table->periph_index && pin == table->pin) { return table; @@ -28,7 +28,7 @@ STATIC const mcu_periph_obj_t *find_pin_function(const mcu_periph_obj_t *table, } // match pins to SDIO objects -STATIC int check_pins(sdioio_sdcard_obj_t *self, +static int check_pins(sdioio_sdcard_obj_t *self, const mcu_pin_obj_t *clock, const mcu_pin_obj_t *command, uint8_t num_data, const mcu_pin_obj_t **data) { bool sdio_taken = false; @@ -184,13 +184,13 @@ uint8_t common_hal_sdioio_sdcard_get_width(sdioio_sdcard_obj_t *self) { return self->num_data; } -STATIC void check_whole_block(mp_buffer_info_t *bufinfo) { +static void check_whole_block(mp_buffer_info_t *bufinfo) { if (bufinfo->len % 512) { mp_raise_ValueError(MP_ERROR_TEXT("Buffer must be a multiple of 512 bytes")); } } -STATIC void wait_write_complete(sdioio_sdcard_obj_t *self) { +static void wait_write_complete(sdioio_sdcard_obj_t *self) { if (self->state_programming) { HAL_SD_CardStateTypedef st = HAL_SD_CARD_PROGRAMMING; // This waits up to 60s for programming to complete. This seems like @@ -204,7 +204,7 @@ STATIC void wait_write_complete(sdioio_sdcard_obj_t *self) { } } -STATIC void check_for_deinit(sdioio_sdcard_obj_t *self) { +static void check_for_deinit(sdioio_sdcard_obj_t *self) { if (common_hal_sdioio_sdcard_deinited(self)) { raise_deinited_error(); } @@ -246,13 +246,13 @@ bool common_hal_sdioio_sdcard_deinited(sdioio_sdcard_obj_t *self) { return self->command == NULL; } -STATIC void never_reset_mcu_periph(const mcu_periph_obj_t *periph) { +static void never_reset_mcu_periph(const mcu_periph_obj_t *periph) { if (periph) { never_reset_pin_number(periph->pin->port, periph->pin->number); } } -STATIC void reset_mcu_periph(const mcu_periph_obj_t *periph) { +static void reset_mcu_periph(const mcu_periph_obj_t *periph) { if (periph) { reset_pin_number(periph->pin->port, periph->pin->number); } diff --git a/ports/stm/packages/TFBGA216.c b/ports/stm/packages/TFBGA216.c index 8171b6d436c2f..4ffe34422778a 100644 --- a/ports/stm/packages/TFBGA216.c +++ b/ports/stm/packages/TFBGA216.c @@ -8,7 +8,7 @@ #include "common-hal/microcontroller/Pin.h" #include "py/obj.h" -STATIC const mp_rom_map_elem_t mcu_pin_globals_table[] = { +static const mp_rom_map_elem_t mcu_pin_globals_table[] = { // Row A { MP_ROM_QSTR(MP_QSTR_PE04), MP_ROM_PTR(&pin_PE04) }, { MP_ROM_QSTR(MP_QSTR_PE03), MP_ROM_PTR(&pin_PE03) }, diff --git a/ports/stm/peripherals/exti.c b/ports/stm/peripherals/exti.c index f5203a9cd7c75..19fa3079ba01b 100644 --- a/ports/stm/peripherals/exti.c +++ b/ports/stm/peripherals/exti.c @@ -12,9 +12,9 @@ #if !(CPY_STM32H7) -STATIC bool stm_exti_reserved[STM32_GPIO_PORT_SIZE]; -STATIC bool stm_exti_never_reset[STM32_GPIO_PORT_SIZE]; -STATIC void (*stm_exti_callback[STM32_GPIO_PORT_SIZE])(uint8_t num); +static bool stm_exti_reserved[STM32_GPIO_PORT_SIZE]; +static bool stm_exti_never_reset[STM32_GPIO_PORT_SIZE]; +static void (*stm_exti_callback[STM32_GPIO_PORT_SIZE])(uint8_t num); void exti_reset(void) { for (size_t i = 0; i < STM32_GPIO_PORT_SIZE; i++) { diff --git a/ports/stm/peripherals/rtc.c b/ports/stm/peripherals/rtc.c index f570ad350ad8b..78ee4548834d1 100644 --- a/ports/stm/peripherals/rtc.c +++ b/ports/stm/peripherals/rtc.c @@ -16,12 +16,12 @@ // Based on a 32768 kHz clock #define SUBTICKS_PER_TICK 32 -STATIC RTC_HandleTypeDef hrtc; +static RTC_HandleTypeDef hrtc; #if BOARD_HAS_LOW_SPEED_CRYSTAL -STATIC uint32_t rtc_clock_frequency = LSE_VALUE; +static uint32_t rtc_clock_frequency = LSE_VALUE; #else -STATIC uint32_t rtc_clock_frequency = LSI_VALUE; +static uint32_t rtc_clock_frequency = LSI_VALUE; #endif volatile uint32_t seconds_to_date = 0; @@ -68,7 +68,7 @@ void stm32_peripherals_rtc_init(void) { // This function is called often for timing so we cache the seconds elapsed computation based on the // register value. The STM HAL always does shifts and conversion if we use it directly. -STATIC uint64_t stm32_peripherals_rtc_raw_ticks(uint8_t *subticks) { +static uint64_t stm32_peripherals_rtc_raw_ticks(uint8_t *subticks) { // Disable IRQs to ensure we read all of the RTC registers as close in time as possible. Read // SSR twice to make sure we didn't read across a tick. __disable_irq(); diff --git a/ports/stm/peripherals/timers.c b/ports/stm/peripherals/timers.c index 77a4772e542fc..9d963487a04d1 100644 --- a/ports/stm/peripherals/timers.c +++ b/ports/stm/peripherals/timers.c @@ -415,7 +415,7 @@ void tim_clock_disable(uint16_t mask) { #endif } -STATIC void callback_router(size_t index) { +static void callback_router(size_t index) { if (stm_timer_callback[index - 1]) { (*stm_timer_callback[index - 1])(); } diff --git a/ports/stm/supervisor/internal_flash.c b/ports/stm/supervisor/internal_flash.c index 24abbbca64e8c..273af300a80b3 100644 --- a/ports/stm/supervisor/internal_flash.c +++ b/ports/stm/supervisor/internal_flash.c @@ -27,7 +27,7 @@ typedef struct { #if defined(STM32F4) -STATIC const flash_layout_t flash_layout[] = { +static const flash_layout_t flash_layout[] = { { 0x08000000, 0x04000, 4 }, { 0x08010000, 0x10000, 1 }, { 0x08020000, 0x20000, 3 }, @@ -40,7 +40,7 @@ STATIC const flash_layout_t flash_layout[] = { { 0x08120000, 0x20000, 7 }, #endif }; -STATIC uint8_t _flash_cache[0x4000] __attribute__((aligned(4))); +static uint8_t _flash_cache[0x4000] __attribute__((aligned(4))); #elif defined(STM32F7) @@ -53,27 +53,27 @@ static const flash_layout_t flash_layout[] = { { 0x08010000, 0x10000, 1 }, { 0x08020000, 0x20000, 3 }, }; -STATIC uint8_t _flash_cache[0x4000] __attribute__((aligned(4))); +static uint8_t _flash_cache[0x4000] __attribute__((aligned(4))); #else static const flash_layout_t flash_layout[] = { { 0x08000000, 0x08000, 4 }, { 0x08020000, 0x20000, 1 }, { 0x08040000, 0x40000, 3 }, }; -STATIC uint8_t _flash_cache[0x8000] __attribute__((aligned(4))); +static uint8_t _flash_cache[0x8000] __attribute__((aligned(4))); #endif #elif defined(STM32H7) -STATIC const flash_layout_t flash_layout[] = { +static const flash_layout_t flash_layout[] = { { 0x08000000, 0x20000, 16 }, }; -STATIC uint8_t _flash_cache[0x20000] __attribute__((aligned(4))); +static uint8_t _flash_cache[0x20000] __attribute__((aligned(4))); #elif defined(STM32L4) -STATIC const flash_layout_t flash_layout[] = { +static const flash_layout_t flash_layout[] = { { 0x08100000, 0x1000, 256 }, }; -STATIC uint8_t _flash_cache[0x1000] __attribute__((aligned(4))); +static uint8_t _flash_cache[0x1000] __attribute__((aligned(4))); #else #error Unsupported processor @@ -83,11 +83,11 @@ STATIC uint8_t _flash_cache[0x1000] __attribute__((aligned(4))); #define MAX_CACHE 0x4000 -STATIC uint32_t _cache_flash_addr = NO_CACHE; +static uint32_t _cache_flash_addr = NO_CACHE; #if defined(STM32H7) // get the bank of a given flash address -STATIC uint32_t get_bank(uint32_t addr) { +static uint32_t get_bank(uint32_t addr) { if (READ_BIT(FLASH->OPTCR, FLASH_OPTCR_SWAP_BANK) == 0) { // no bank swap if (addr < (FLASH_BASE + FLASH_BANK_SIZE)) { diff --git a/ports/stm/supervisor/usb.c b/ports/stm/supervisor/usb.c index 5ed415d60de01..61a7d54f08b74 100644 --- a/ports/stm/supervisor/usb.c +++ b/ports/stm/supervisor/usb.c @@ -13,7 +13,7 @@ #include "common-hal/microcontroller/Pin.h" -STATIC void init_usb_vbus_sense(void) { +static void init_usb_vbus_sense(void) { #if (BOARD_NO_VBUS_SENSE) // Disable VBUS sensing diff --git a/ports/unix/displayio_min.c b/ports/unix/displayio_min.c index 809ed52cacb54..3d0d5efc3ce66 100644 --- a/ports/unix/displayio_min.c +++ b/ports/unix/displayio_min.c @@ -54,19 +54,19 @@ MAKE_ENUM_MAP(displayio_colorspace) { MAKE_ENUM_MAP_ENTRY(displayio_colorspace, BGR555_SWAPPED), MAKE_ENUM_MAP_ENTRY(displayio_colorspace, L8), }; -STATIC MP_DEFINE_CONST_DICT(displayio_colorspace_locals_dict, displayio_colorspace_locals_table); +static MP_DEFINE_CONST_DICT(displayio_colorspace_locals_dict, displayio_colorspace_locals_table); MAKE_PRINTER(displayio, displayio_colorspace); MAKE_ENUM_TYPE(displayio, ColorSpace, displayio_colorspace); -STATIC const mp_rom_map_elem_t displayio_module_globals_table[] = { +static const mp_rom_map_elem_t displayio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_displayio) }, { MP_ROM_QSTR(MP_QSTR_Bitmap), MP_ROM_PTR(&displayio_bitmap_type) }, { MP_ROM_QSTR(MP_QSTR_Colorspace), MP_ROM_PTR(&displayio_colorspace_type) }, { MP_ROM_QSTR(MP_QSTR_ColorConverter), MP_ROM_PTR(&displayio_colorconverter_type) }, { MP_ROM_QSTR(MP_QSTR_Palette), MP_ROM_PTR(&displayio_palette_type) }, }; -STATIC MP_DEFINE_CONST_DICT(displayio_module_globals, displayio_module_globals_table); +static MP_DEFINE_CONST_DICT(displayio_module_globals, displayio_module_globals_table); const mp_obj_module_t displayio_module = { .base = { &mp_type_module }, diff --git a/py/enum.h b/py/enum.h index d786fc591977c..c8676366b1873 100644 --- a/py/enum.h +++ b/py/enum.h @@ -26,7 +26,7 @@ typedef struct { { MP_ROM_QSTR(MP_QSTR_##name), MP_ROM_PTR(&prefix##_##name##_obj) } #define MAKE_PRINTER(module, typename) \ - STATIC void typename##_##print(const mp_print_t * print, mp_obj_t self_in, mp_print_kind_t kind) { \ + static void typename##_##print(const mp_print_t * print, mp_obj_t self_in, mp_print_kind_t kind) { \ cp_enum_obj_print_helper(MP_QSTR_##module, print, self_in, kind); \ } diff --git a/shared-bindings/__future__/__init__.c b/shared-bindings/__future__/__init__.c index 0ead475f8916c..5be90e21692a7 100644 --- a/shared-bindings/__future__/__init__.c +++ b/shared-bindings/__future__/__init__.c @@ -24,13 +24,13 @@ //| This is a limitation of CircuitPython and MicroPython for efficiency reasons. //| """ -STATIC const mp_rom_map_elem_t future_module_globals_table[] = { +static const mp_rom_map_elem_t future_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR___future__) }, { MP_ROM_QSTR(MP_QSTR_annotations), mp_const_true }, }; -STATIC MP_DEFINE_CONST_DICT(future_module_globals, future_module_globals_table); +static MP_DEFINE_CONST_DICT(future_module_globals, future_module_globals_table); const mp_obj_module_t future_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/_bleio/Adapter.c b/shared-bindings/_bleio/Adapter.c index bc73768b7ac10..7190594c10a73 100644 --- a/shared-bindings/_bleio/Adapter.c +++ b/shared-bindings/_bleio/Adapter.c @@ -62,7 +62,7 @@ //| Use `_bleio.adapter` to access the sole instance already available. //| """ //| ... -STATIC mp_obj_t bleio_adapter_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t bleio_adapter_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { #if CIRCUITPY_BLEIO_HCI bleio_adapter_obj_t *self = common_hal_bleio_allocate_adapter_or_raise(); @@ -93,7 +93,7 @@ STATIC mp_obj_t bleio_adapter_make_new(const mp_obj_type_t *type, size_t n_args, //| enabled: bool //| """State of the BLE adapter.""" -STATIC mp_obj_t bleio_adapter_get_enabled(mp_obj_t self) { +static mp_obj_t bleio_adapter_get_enabled(mp_obj_t self) { return mp_obj_new_bool(common_hal_bleio_adapter_get_enabled(self)); } MP_DEFINE_CONST_FUN_OBJ_1(bleio_adapter_get_enabled_obj, bleio_adapter_get_enabled); @@ -105,7 +105,7 @@ static mp_obj_t bleio_adapter_set_enabled(mp_obj_t self, mp_obj_t value) { return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(bleio_adapter_set_enabled_obj, bleio_adapter_set_enabled); +static MP_DEFINE_CONST_FUN_OBJ_2(bleio_adapter_set_enabled_obj, bleio_adapter_set_enabled); MP_PROPERTY_GETSET(bleio_adapter_enabled_obj, (mp_obj_t)&bleio_adapter_get_enabled_obj, @@ -113,13 +113,13 @@ MP_PROPERTY_GETSET(bleio_adapter_enabled_obj, //| address: Address //| """MAC address of the BLE adapter.""" -STATIC mp_obj_t bleio_adapter_get_address(mp_obj_t self) { +static mp_obj_t bleio_adapter_get_address(mp_obj_t self) { return MP_OBJ_FROM_PTR(common_hal_bleio_adapter_get_address(self)); } MP_DEFINE_CONST_FUN_OBJ_1(bleio_adapter_get_address_obj, bleio_adapter_get_address); -STATIC mp_obj_t bleio_adapter_set_address(mp_obj_t self, mp_obj_t new_address) { +static mp_obj_t bleio_adapter_set_address(mp_obj_t self, mp_obj_t new_address) { if (!common_hal_bleio_adapter_set_address(self, new_address)) { mp_raise_bleio_BluetoothError(MP_ERROR_TEXT("Could not set address")); } @@ -135,13 +135,13 @@ MP_PROPERTY_GETSET(bleio_adapter_address_obj, //| """name of the BLE adapter used once connected. //| The name is "CIRCUITPY" + the last four hex digits of ``adapter.address``, //| to make it easy to distinguish multiple CircuitPython boards.""" -STATIC mp_obj_t _bleio_adapter_get_name(mp_obj_t self) { +static mp_obj_t _bleio_adapter_get_name(mp_obj_t self) { return MP_OBJ_FROM_PTR(common_hal_bleio_adapter_get_name(self)); } MP_DEFINE_CONST_FUN_OBJ_1(bleio_adapter_get_name_obj, _bleio_adapter_get_name); -STATIC mp_obj_t bleio_adapter_set_name(mp_obj_t self, mp_obj_t new_name) { +static mp_obj_t bleio_adapter_set_name(mp_obj_t self, mp_obj_t new_name) { common_hal_bleio_adapter_set_name(self, mp_obj_str_get_str(new_name)); return mp_const_none; } @@ -181,7 +181,7 @@ MP_PROPERTY_GETSET(bleio_adapter_name_obj, //| :param int tx_power: transmitter power while advertising in dBm //| :param Address directed_to: peer to advertise directly to""" //| ... -STATIC mp_obj_t bleio_adapter_start_advertising(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bleio_adapter_start_advertising(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { bleio_adapter_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); enum { ARG_data, ARG_scan_response, ARG_connectable, ARG_anonymous, ARG_timeout, ARG_interval, ARG_tx_power, ARG_directed_to }; @@ -238,19 +238,19 @@ STATIC mp_obj_t bleio_adapter_start_advertising(mp_uint_t n_args, const mp_obj_t return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bleio_adapter_start_advertising_obj, 1, bleio_adapter_start_advertising); +static MP_DEFINE_CONST_FUN_OBJ_KW(bleio_adapter_start_advertising_obj, 1, bleio_adapter_start_advertising); //| def stop_advertising(self) -> None: //| """Stop sending advertising packets.""" //| ... -STATIC mp_obj_t bleio_adapter_stop_advertising(mp_obj_t self_in) { +static mp_obj_t bleio_adapter_stop_advertising(mp_obj_t self_in) { bleio_adapter_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_bleio_adapter_stop_advertising(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_adapter_stop_advertising_obj, bleio_adapter_stop_advertising); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_adapter_stop_advertising_obj, bleio_adapter_stop_advertising); //| def start_scan( //| self, @@ -282,7 +282,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_adapter_stop_advertising_obj, bleio_adapt //| :returns: an iterable of `_bleio.ScanEntry` objects //| :rtype: iterable""" //| ... -STATIC mp_obj_t bleio_adapter_start_scan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bleio_adapter_start_scan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_prefixes, ARG_buffer_size, ARG_extended, ARG_timeout, ARG_interval, ARG_window, ARG_minimum_rssi, ARG_active }; static const mp_arg_t allowed_args[] = { { MP_QSTR_prefixes, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, @@ -341,23 +341,23 @@ STATIC mp_obj_t bleio_adapter_start_scan(size_t n_args, const mp_obj_t *pos_args return common_hal_bleio_adapter_start_scan(self, prefix_bufinfo.buf, prefix_bufinfo.len, args[ARG_extended].u_bool, args[ARG_buffer_size].u_int, timeout, interval, window, args[ARG_minimum_rssi].u_int, args[ARG_active].u_bool); } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bleio_adapter_start_scan_obj, 1, bleio_adapter_start_scan); +static MP_DEFINE_CONST_FUN_OBJ_KW(bleio_adapter_start_scan_obj, 1, bleio_adapter_start_scan); //| def stop_scan(self) -> None: //| """Stop the current scan.""" //| ... -STATIC mp_obj_t bleio_adapter_stop_scan(mp_obj_t self_in) { +static mp_obj_t bleio_adapter_stop_scan(mp_obj_t self_in) { bleio_adapter_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_bleio_adapter_stop_scan(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_adapter_stop_scan_obj, bleio_adapter_stop_scan); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_adapter_stop_scan_obj, bleio_adapter_stop_scan); //| advertising: bool //| """True when the adapter is currently advertising. (read-only)""" -STATIC mp_obj_t bleio_adapter_get_advertising(mp_obj_t self) { +static mp_obj_t bleio_adapter_get_advertising(mp_obj_t self) { return mp_obj_new_bool(common_hal_bleio_adapter_get_advertising(self)); } @@ -369,7 +369,7 @@ MP_PROPERTY_GETTER(bleio_adapter_advertising_obj, //| connected: bool //| """True when the adapter is connected to another device regardless of who initiated the //| connection. (read-only)""" -STATIC mp_obj_t bleio_adapter_get_connected(mp_obj_t self) { +static mp_obj_t bleio_adapter_get_connected(mp_obj_t self) { return mp_obj_new_bool(common_hal_bleio_adapter_get_connected(self)); } @@ -381,7 +381,7 @@ MP_PROPERTY_GETTER(bleio_adapter_connected_obj, //| connections: Tuple[Connection] //| """Tuple of active connections including those initiated through //| :py:meth:`_bleio.Adapter.connect`. (read-only)""" -STATIC mp_obj_t bleio_adapter_get_connections(mp_obj_t self) { +static mp_obj_t bleio_adapter_get_connections(mp_obj_t self) { return common_hal_bleio_adapter_get_connections(self); } MP_DEFINE_CONST_FUN_OBJ_1(bleio_adapter_get_connections_obj, bleio_adapter_get_connections); @@ -395,7 +395,7 @@ MP_PROPERTY_GETTER(bleio_adapter_connections_obj, //| :param Address address: The address of the peripheral to connect to //| :param float/int timeout: Try to connect for timeout seconds.""" //| ... -STATIC mp_obj_t bleio_adapter_connect(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bleio_adapter_connect(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { bleio_adapter_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); enum { ARG_address, ARG_timeout }; @@ -412,22 +412,22 @@ STATIC mp_obj_t bleio_adapter_connect(mp_uint_t n_args, const mp_obj_t *pos_args return common_hal_bleio_adapter_connect(self, address, timeout); } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bleio_adapter_connect_obj, 1, bleio_adapter_connect); +static MP_DEFINE_CONST_FUN_OBJ_KW(bleio_adapter_connect_obj, 1, bleio_adapter_connect); //| def erase_bonding(self) -> None: //| """Erase all bonding information stored in flash memory.""" //| ... //| -STATIC mp_obj_t bleio_adapter_erase_bonding(mp_obj_t self_in) { +static mp_obj_t bleio_adapter_erase_bonding(mp_obj_t self_in) { bleio_adapter_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_bleio_adapter_erase_bonding(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_adapter_erase_bonding_obj, bleio_adapter_erase_bonding); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_adapter_erase_bonding_obj, bleio_adapter_erase_bonding); -STATIC const mp_rom_map_elem_t bleio_adapter_locals_dict_table[] = { +static const mp_rom_map_elem_t bleio_adapter_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_enabled), MP_ROM_PTR(&bleio_adapter_enabled_obj) }, { MP_ROM_QSTR(MP_QSTR_address), MP_ROM_PTR(&bleio_adapter_address_obj) }, { MP_ROM_QSTR(MP_QSTR_name), MP_ROM_PTR(&bleio_adapter_name_obj) }, @@ -447,7 +447,7 @@ STATIC const mp_rom_map_elem_t bleio_adapter_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_erase_bonding), MP_ROM_PTR(&bleio_adapter_erase_bonding_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(bleio_adapter_locals_dict, bleio_adapter_locals_dict_table); +static MP_DEFINE_CONST_DICT(bleio_adapter_locals_dict, bleio_adapter_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( bleio_adapter_type, diff --git a/shared-bindings/_bleio/Address.c b/shared-bindings/_bleio/Address.c index ca5a27a5b3d4e..5cedd2b4663b4 100644 --- a/shared-bindings/_bleio/Address.c +++ b/shared-bindings/_bleio/Address.c @@ -26,7 +26,7 @@ //| :param int address_type: one of the integer values: `PUBLIC`, `RANDOM_STATIC`, //| `RANDOM_PRIVATE_RESOLVABLE`, or `RANDOM_PRIVATE_NON_RESOLVABLE`.""" //| ... -STATIC mp_obj_t bleio_address_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t bleio_address_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_address, ARG_address_type }; static const mp_arg_t allowed_args[] = { { MP_QSTR_address, MP_ARG_OBJ | MP_ARG_REQUIRED }, @@ -71,7 +71,7 @@ STATIC mp_obj_t bleio_address_make_new(const mp_obj_type_t *type, size_t n_args, //|
//| >>> _bleio.adapter.address.address_bytes //| b'5\\xa8\\xed\\xf5\\x1d\\xc8'""" -STATIC mp_obj_t bleio_address_get_address_bytes(mp_obj_t self_in) { +static mp_obj_t bleio_address_get_address_bytes(mp_obj_t self_in) { bleio_address_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_bleio_address_get_address_bytes(self); @@ -86,7 +86,7 @@ MP_PROPERTY_GETTER(bleio_address_address_bytes_obj, //| //| One of the integer values: `PUBLIC`, `RANDOM_STATIC`, `RANDOM_PRIVATE_RESOLVABLE`, //| or `RANDOM_PRIVATE_NON_RESOLVABLE`.""" -STATIC mp_obj_t bleio_address_get_type(mp_obj_t self_in) { +static mp_obj_t bleio_address_get_type(mp_obj_t self_in) { bleio_address_obj_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_bleio_address_get_type(self)); @@ -99,7 +99,7 @@ MP_PROPERTY_GETTER(bleio_address_type_obj, //| def __eq__(self, other: object) -> bool: //| """Two Address objects are equal if their addresses and address types are equal.""" //| ... -STATIC mp_obj_t bleio_address_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) { +static mp_obj_t bleio_address_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) { switch (op) { // Two Addresses are equal if their address bytes and address_type are equal case MP_BINARY_OP_EQUAL: @@ -124,7 +124,7 @@ STATIC mp_obj_t bleio_address_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_o //| def __hash__(self) -> int: //| """Returns a hash for the Address data.""" //| ... -STATIC mp_obj_t bleio_address_unary_op(mp_unary_op_t op, mp_obj_t self_in) { +static mp_obj_t bleio_address_unary_op(mp_unary_op_t op, mp_obj_t self_in) { switch (op) { // Two Addresses are equal if their address bytes and address_type are equal case MP_UNARY_OP_HASH: { @@ -142,7 +142,7 @@ STATIC mp_obj_t bleio_address_unary_op(mp_unary_op_t op, mp_obj_t self_in) { } } -STATIC void bleio_address_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { +static void bleio_address_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { bleio_address_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_buffer_info_t buf_info; mp_obj_t address_bytes = common_hal_bleio_address_get_address_bytes(self); @@ -166,7 +166,7 @@ STATIC void bleio_address_print(const mp_print_t *print, mp_obj_t self_in, mp_pr //| RANDOM_PRIVATE_NON_RESOLVABLE: int //| """A randomly generated address that changes on every connection.""" //| -STATIC const mp_rom_map_elem_t bleio_address_locals_dict_table[] = { +static const mp_rom_map_elem_t bleio_address_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_address_bytes), MP_ROM_PTR(&bleio_address_address_bytes_obj) }, { MP_ROM_QSTR(MP_QSTR_type), MP_ROM_PTR(&bleio_address_type_obj) }, // These match the BLE_GAP_ADDR_TYPES values used by the nRF library. @@ -177,7 +177,7 @@ STATIC const mp_rom_map_elem_t bleio_address_locals_dict_table[] = { }; -STATIC MP_DEFINE_CONST_DICT(bleio_address_locals_dict, bleio_address_locals_dict_table); +static MP_DEFINE_CONST_DICT(bleio_address_locals_dict, bleio_address_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( bleio_address_type, diff --git a/shared-bindings/_bleio/Attribute.c b/shared-bindings/_bleio/Attribute.c index 63ab7e2dea97f..fe890d875e51c 100644 --- a/shared-bindings/_bleio/Attribute.c +++ b/shared-bindings/_bleio/Attribute.c @@ -20,7 +20,7 @@ //| """You cannot create an instance of :py:class:`~_bleio.Attribute`.""" //| ... -STATIC const mp_rom_map_elem_t bleio_attribute_locals_dict_table[] = { +static const mp_rom_map_elem_t bleio_attribute_locals_dict_table[] = { //| NO_ACCESS: int //| """security mode: access not allowed""" @@ -52,7 +52,7 @@ STATIC const mp_rom_map_elem_t bleio_attribute_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_SIGNED_WITH_MITM), MP_ROM_INT(SECURITY_MODE_SIGNED_WITH_MITM) }, }; -STATIC MP_DEFINE_CONST_DICT(bleio_attribute_locals_dict, bleio_attribute_locals_dict_table); +static MP_DEFINE_CONST_DICT(bleio_attribute_locals_dict, bleio_attribute_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( bleio_attribute_type, diff --git a/shared-bindings/_bleio/Characteristic.c b/shared-bindings/_bleio/Characteristic.c index e248cb8fefd81..6b32e39ff434c 100644 --- a/shared-bindings/_bleio/Characteristic.c +++ b/shared-bindings/_bleio/Characteristic.c @@ -60,7 +60,7 @@ //| //| :return: the new Characteristic.""" //| ... -STATIC mp_obj_t bleio_characteristic_add_to_service(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bleio_characteristic_add_to_service(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { // class is arg[0], which we can ignore. enum { ARG_service, ARG_uuid, ARG_properties, ARG_read_perm, ARG_write_perm, @@ -134,8 +134,8 @@ STATIC mp_obj_t bleio_characteristic_add_to_service(size_t n_args, const mp_obj_ return MP_OBJ_FROM_PTR(characteristic); } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bleio_characteristic_add_to_service_fun_obj, 1, bleio_characteristic_add_to_service); -STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(bleio_characteristic_add_to_service_obj, MP_ROM_PTR(&bleio_characteristic_add_to_service_fun_obj)); +static MP_DEFINE_CONST_FUN_OBJ_KW(bleio_characteristic_add_to_service_fun_obj, 1, bleio_characteristic_add_to_service); +static MP_DEFINE_CONST_CLASSMETHOD_OBJ(bleio_characteristic_add_to_service_obj, MP_ROM_PTR(&bleio_characteristic_add_to_service_fun_obj)); @@ -143,12 +143,12 @@ STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(bleio_characteristic_add_to_service_obj, //| """An int bitmask representing which properties are set, specified as bitwise or'ing of //| of these possible values. //| `BROADCAST`, `INDICATE`, `NOTIFY`, `READ`, `WRITE`, `WRITE_NO_RESPONSE`.""" -STATIC mp_obj_t bleio_characteristic_get_properties(mp_obj_t self_in) { +static mp_obj_t bleio_characteristic_get_properties(mp_obj_t self_in) { bleio_characteristic_obj_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_bleio_characteristic_get_properties(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_get_properties_obj, bleio_characteristic_get_properties); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_get_properties_obj, bleio_characteristic_get_properties); MP_PROPERTY_GETTER(bleio_characteristic_properties_obj, (mp_obj_t)&bleio_characteristic_get_properties_obj); @@ -157,29 +157,29 @@ MP_PROPERTY_GETTER(bleio_characteristic_properties_obj, //| """The UUID of this characteristic. (read-only) //| //| Will be ``None`` if the 128-bit UUID for this characteristic is not known.""" -STATIC mp_obj_t bleio_characteristic_get_uuid(mp_obj_t self_in) { +static mp_obj_t bleio_characteristic_get_uuid(mp_obj_t self_in) { bleio_characteristic_obj_t *self = MP_OBJ_TO_PTR(self_in); bleio_uuid_obj_t *uuid = common_hal_bleio_characteristic_get_uuid(self); return uuid ? MP_OBJ_FROM_PTR(uuid) : mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_get_uuid_obj, bleio_characteristic_get_uuid); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_get_uuid_obj, bleio_characteristic_get_uuid); MP_PROPERTY_GETTER(bleio_characteristic_uuid_obj, (mp_obj_t)&bleio_characteristic_get_uuid_obj); //| value: bytearray //| """The value of this characteristic.""" -STATIC mp_obj_t bleio_characteristic_get_value(mp_obj_t self_in) { +static mp_obj_t bleio_characteristic_get_value(mp_obj_t self_in) { bleio_characteristic_obj_t *self = MP_OBJ_TO_PTR(self_in); uint8_t temp[512]; size_t actual_len = common_hal_bleio_characteristic_get_value(self, temp, sizeof(temp)); return mp_obj_new_bytearray(actual_len, temp); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_get_value_obj, bleio_characteristic_get_value); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_get_value_obj, bleio_characteristic_get_value); -STATIC mp_obj_t bleio_characteristic_set_value(mp_obj_t self_in, mp_obj_t value_in) { +static mp_obj_t bleio_characteristic_set_value(mp_obj_t self_in, mp_obj_t value_in) { bleio_characteristic_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_buffer_info_t bufinfo; @@ -189,7 +189,7 @@ STATIC mp_obj_t bleio_characteristic_set_value(mp_obj_t self_in, mp_obj_t value_ return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(bleio_characteristic_set_value_obj, bleio_characteristic_set_value); +static MP_DEFINE_CONST_FUN_OBJ_2(bleio_characteristic_set_value_obj, bleio_characteristic_set_value); MP_PROPERTY_GETSET(bleio_characteristic_value_obj, (mp_obj_t)&bleio_characteristic_get_value_obj, @@ -197,37 +197,37 @@ MP_PROPERTY_GETSET(bleio_characteristic_value_obj, //| max_length: int //| """The max length of this characteristic.""" -STATIC mp_obj_t bleio_characteristic_get_max_length(mp_obj_t self_in) { +static mp_obj_t bleio_characteristic_get_max_length(mp_obj_t self_in) { bleio_characteristic_obj_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_bleio_characteristic_get_max_length(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_get_max_length_obj, bleio_characteristic_get_max_length); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_get_max_length_obj, bleio_characteristic_get_max_length); MP_PROPERTY_GETTER(bleio_characteristic_max_length_obj, (mp_obj_t)&bleio_characteristic_get_max_length_obj); //| descriptors: Descriptor //| """A tuple of :py:class:`Descriptor` objects related to this characteristic. (read-only)""" -STATIC mp_obj_t bleio_characteristic_get_descriptors(mp_obj_t self_in) { +static mp_obj_t bleio_characteristic_get_descriptors(mp_obj_t self_in) { bleio_characteristic_obj_t *self = MP_OBJ_TO_PTR(self_in); // Return list as a tuple so user won't be able to change it. return MP_OBJ_FROM_PTR(common_hal_bleio_characteristic_get_descriptors(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_get_descriptors_obj, bleio_characteristic_get_descriptors); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_get_descriptors_obj, bleio_characteristic_get_descriptors); MP_PROPERTY_GETTER(bleio_characteristic_descriptors_obj, (mp_obj_t)&bleio_characteristic_get_descriptors_obj); //| service: Service //| """The Service this Characteristic is a part of.""" -STATIC mp_obj_t bleio_characteristic_get_service(mp_obj_t self_in) { +static mp_obj_t bleio_characteristic_get_service(mp_obj_t self_in) { bleio_characteristic_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_bleio_characteristic_get_service(self); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_get_service_obj, bleio_characteristic_get_service); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_get_service_obj, bleio_characteristic_get_service); MP_PROPERTY_GETTER(bleio_characteristic_service_obj, (mp_obj_t)&bleio_characteristic_get_service_obj); @@ -239,7 +239,7 @@ MP_PROPERTY_GETTER(bleio_characteristic_service_obj, //| :param float indicate: True if Characteristic should receive indications of remote writes //| """ //| ... -STATIC mp_obj_t bleio_characteristic_set_cccd(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bleio_characteristic_set_cccd(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { bleio_characteristic_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); enum { ARG_notify, ARG_indicate }; @@ -255,9 +255,9 @@ STATIC mp_obj_t bleio_characteristic_set_cccd(mp_uint_t n_args, const mp_obj_t * return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bleio_characteristic_set_cccd_obj, 1, bleio_characteristic_set_cccd); +static MP_DEFINE_CONST_FUN_OBJ_KW(bleio_characteristic_set_cccd_obj, 1, bleio_characteristic_set_cccd); -STATIC const mp_rom_map_elem_t bleio_characteristic_locals_dict_table[] = { +static const mp_rom_map_elem_t bleio_characteristic_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_add_to_service), MP_ROM_PTR(&bleio_characteristic_add_to_service_obj) }, { MP_ROM_QSTR(MP_QSTR_descriptors), MP_ROM_PTR(&bleio_characteristic_descriptors_obj) }, { MP_ROM_QSTR(MP_QSTR_properties), MP_ROM_PTR(&bleio_characteristic_properties_obj) }, @@ -292,9 +292,9 @@ STATIC const mp_rom_map_elem_t bleio_characteristic_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_WRITE_NO_RESPONSE), MP_ROM_INT(CHAR_PROP_WRITE_NO_RESPONSE) }, }; -STATIC MP_DEFINE_CONST_DICT(bleio_characteristic_locals_dict, bleio_characteristic_locals_dict_table); +static MP_DEFINE_CONST_DICT(bleio_characteristic_locals_dict, bleio_characteristic_locals_dict_table); -STATIC void bleio_characteristic_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { +static void bleio_characteristic_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { bleio_characteristic_obj_t *self = MP_OBJ_TO_PTR(self_in); if (self->uuid) { mp_printf(print, "Characteristic("); diff --git a/shared-bindings/_bleio/CharacteristicBuffer.c b/shared-bindings/_bleio/CharacteristicBuffer.c index a562641061b70..7ef3575e3c238 100644 --- a/shared-bindings/_bleio/CharacteristicBuffer.c +++ b/shared-bindings/_bleio/CharacteristicBuffer.c @@ -15,7 +15,7 @@ #include "shared-bindings/_bleio/UUID.h" #include "shared-bindings/util.h" -STATIC void raise_error_if_not_connected(bleio_characteristic_buffer_obj_t *self) { +static void raise_error_if_not_connected(bleio_characteristic_buffer_obj_t *self) { if (!common_hal_bleio_characteristic_buffer_connected(self)) { mp_raise_ConnectionError(MP_ERROR_TEXT("Not connected")); } @@ -37,7 +37,7 @@ STATIC void raise_error_if_not_connected(bleio_characteristic_buffer_obj_t *self //| :param int buffer_size: Size of ring buffer that stores incoming data coming from client. //| Must be >= 1.""" //| ... -STATIC mp_obj_t bleio_characteristic_buffer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t bleio_characteristic_buffer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_characteristic, ARG_timeout, ARG_buffer_size, }; static const mp_arg_t allowed_args[] = { { MP_QSTR_characteristic, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -62,7 +62,7 @@ STATIC mp_obj_t bleio_characteristic_buffer_make_new(const mp_obj_type_t *type, return MP_OBJ_FROM_PTR(self); } -STATIC void check_for_deinit(bleio_characteristic_buffer_obj_t *self) { +static void check_for_deinit(bleio_characteristic_buffer_obj_t *self) { if (common_hal_bleio_characteristic_buffer_deinited(self)) { raise_deinited_error(); } @@ -95,7 +95,7 @@ STATIC void check_for_deinit(bleio_characteristic_buffer_obj_t *self) { //| ... // These three methods are used by the shared stream methods. -STATIC mp_uint_t bleio_characteristic_buffer_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) { +static mp_uint_t bleio_characteristic_buffer_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) { bleio_characteristic_buffer_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); raise_error_if_not_connected(self); @@ -109,12 +109,12 @@ STATIC mp_uint_t bleio_characteristic_buffer_read(mp_obj_t self_in, void *buf_in return common_hal_bleio_characteristic_buffer_read(self, buf, size, errcode); } -STATIC mp_uint_t bleio_characteristic_buffer_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) { +static mp_uint_t bleio_characteristic_buffer_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) { mp_raise_NotImplementedError(MP_ERROR_TEXT("CharacteristicBuffer writing not provided")); return 0; } -STATIC mp_uint_t bleio_characteristic_buffer_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) { +static mp_uint_t bleio_characteristic_buffer_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) { bleio_characteristic_buffer_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); raise_error_if_not_connected(self); @@ -138,7 +138,7 @@ STATIC mp_uint_t bleio_characteristic_buffer_ioctl(mp_obj_t self_in, mp_uint_t r //| in_waiting: int //| """The number of bytes in the input buffer, available to be read""" -STATIC mp_obj_t bleio_characteristic_buffer_obj_get_in_waiting(mp_obj_t self_in) { +static mp_obj_t bleio_characteristic_buffer_obj_get_in_waiting(mp_obj_t self_in) { bleio_characteristic_buffer_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); uint32_t available = common_hal_bleio_characteristic_buffer_rx_characters_available(self); @@ -156,26 +156,26 @@ MP_PROPERTY_GETTER(bleio_characteristic_buffer_in_waiting_obj, //| def reset_input_buffer(self) -> None: //| """Discard any unread characters in the input buffer.""" //| ... -STATIC mp_obj_t bleio_characteristic_buffer_obj_reset_input_buffer(mp_obj_t self_in) { +static mp_obj_t bleio_characteristic_buffer_obj_reset_input_buffer(mp_obj_t self_in) { bleio_characteristic_buffer_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_bleio_characteristic_buffer_clear_rx_buffer(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_buffer_reset_input_buffer_obj, bleio_characteristic_buffer_obj_reset_input_buffer); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_buffer_reset_input_buffer_obj, bleio_characteristic_buffer_obj_reset_input_buffer); //| def deinit(self) -> None: //| """Disable permanently.""" //| ... //| -STATIC mp_obj_t bleio_characteristic_buffer_deinit(mp_obj_t self_in) { +static mp_obj_t bleio_characteristic_buffer_deinit(mp_obj_t self_in) { bleio_characteristic_buffer_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_bleio_characteristic_buffer_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_buffer_deinit_obj, bleio_characteristic_buffer_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_characteristic_buffer_deinit_obj, bleio_characteristic_buffer_deinit); -STATIC const mp_rom_map_elem_t bleio_characteristic_buffer_locals_dict_table[] = { +static const mp_rom_map_elem_t bleio_characteristic_buffer_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&bleio_characteristic_buffer_deinit_obj) }, // Standard stream methods. @@ -191,9 +191,9 @@ STATIC const mp_rom_map_elem_t bleio_characteristic_buffer_locals_dict_table[] = }; -STATIC MP_DEFINE_CONST_DICT(bleio_characteristic_buffer_locals_dict, bleio_characteristic_buffer_locals_dict_table); +static MP_DEFINE_CONST_DICT(bleio_characteristic_buffer_locals_dict, bleio_characteristic_buffer_locals_dict_table); -STATIC const mp_stream_p_t characteristic_buffer_stream_p = { +static const mp_stream_p_t characteristic_buffer_stream_p = { .read = bleio_characteristic_buffer_read, .write = bleio_characteristic_buffer_write, .ioctl = bleio_characteristic_buffer_ioctl, diff --git a/shared-bindings/_bleio/Connection.c b/shared-bindings/_bleio/Connection.c index dfdcfa98f160e..becd275f761fb 100644 --- a/shared-bindings/_bleio/Connection.c +++ b/shared-bindings/_bleio/Connection.c @@ -56,19 +56,19 @@ void bleio_connection_ensure_connected(bleio_connection_obj_t *self) { //| def disconnect(self) -> None: //| """Disconnects from the remote peripheral. Does nothing if already disconnected.""" //| ... -STATIC mp_obj_t bleio_connection_disconnect(mp_obj_t self_in) { +static mp_obj_t bleio_connection_disconnect(mp_obj_t self_in) { bleio_connection_obj_t *self = MP_OBJ_TO_PTR(self_in); // common_hal_bleio_connection_disconnect() does nothing if already disconnected. common_hal_bleio_connection_disconnect(self->connection); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_connection_disconnect_obj, bleio_connection_disconnect); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_connection_disconnect_obj, bleio_connection_disconnect); //| def pair(self, *, bond: bool = True) -> None: //| """Pair to the peer to improve security.""" //| ... -STATIC mp_obj_t bleio_connection_pair(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bleio_connection_pair(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { bleio_connection_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); enum { ARG_bond }; @@ -84,7 +84,7 @@ STATIC mp_obj_t bleio_connection_pair(mp_uint_t n_args, const mp_obj_t *pos_args common_hal_bleio_connection_pair(self->connection, args[ARG_bond].u_bool); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bleio_connection_pair_obj, 1, bleio_connection_pair); +static MP_DEFINE_CONST_FUN_OBJ_KW(bleio_connection_pair_obj, 1, bleio_connection_pair); //| def discover_remote_services( //| self, service_uuids_whitelist: Optional[Iterable[UUID]] = None @@ -111,7 +111,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bleio_connection_pair_obj, 1, bleio_connection //| //| :return: A tuple of `_bleio.Service` objects provided by the remote peripheral.""" //| ... -STATIC mp_obj_t bleio_connection_discover_remote_services(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bleio_connection_discover_remote_services(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { bleio_connection_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); enum { ARG_service_uuids_whitelist }; @@ -128,16 +128,16 @@ STATIC mp_obj_t bleio_connection_discover_remote_services(mp_uint_t n_args, cons self, args[ARG_service_uuids_whitelist].u_obj)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bleio_connection_discover_remote_services_obj, 1, bleio_connection_discover_remote_services); +static MP_DEFINE_CONST_FUN_OBJ_KW(bleio_connection_discover_remote_services_obj, 1, bleio_connection_discover_remote_services); //| connected: bool //| """True if connected to the remote peer.""" -STATIC mp_obj_t bleio_connection_get_connected(mp_obj_t self_in) { +static mp_obj_t bleio_connection_get_connected(mp_obj_t self_in) { bleio_connection_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_bool(common_hal_bleio_connection_get_connected(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_connection_get_connected_obj, bleio_connection_get_connected); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_connection_get_connected_obj, bleio_connection_get_connected); MP_PROPERTY_GETTER(bleio_connection_connected_obj, (mp_obj_t)&bleio_connection_get_connected_obj); @@ -145,12 +145,12 @@ MP_PROPERTY_GETTER(bleio_connection_connected_obj, //| paired: bool //| """True if paired to the remote peer.""" -STATIC mp_obj_t bleio_connection_get_paired(mp_obj_t self_in) { +static mp_obj_t bleio_connection_get_paired(mp_obj_t self_in) { bleio_connection_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_bool(common_hal_bleio_connection_get_paired(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_connection_get_paired_obj, bleio_connection_get_paired); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_connection_get_paired_obj, bleio_connection_get_paired); MP_PROPERTY_GETTER(bleio_connection_paired_obj, (mp_obj_t)&bleio_connection_get_paired_obj); @@ -165,13 +165,13 @@ MP_PROPERTY_GETTER(bleio_connection_paired_obj, //| //| Apple has additional guidelines that dictate should be a multiple of 15ms except if HID is //| available. When HID is available Apple devices may accept 11.25ms intervals.""" -STATIC mp_obj_t bleio_connection_get_connection_interval(mp_obj_t self_in) { +static mp_obj_t bleio_connection_get_connection_interval(mp_obj_t self_in) { bleio_connection_obj_t *self = MP_OBJ_TO_PTR(self_in); bleio_connection_ensure_connected(self); return mp_obj_new_float(common_hal_bleio_connection_get_connection_interval(self->connection)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_connection_get_connection_interval_obj, bleio_connection_get_connection_interval); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_connection_get_connection_interval_obj, bleio_connection_get_connection_interval); //| max_packet_length: int //| """The maximum number of data bytes that can be sent in a single transmission, @@ -182,16 +182,16 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_connection_get_connection_interval_obj, b //| But for a regular characteristic read or write, may be sent in multiple packets, //| so this limit does not apply.""" //| -STATIC mp_obj_t bleio_connection_get_max_packet_length(mp_obj_t self_in) { +static mp_obj_t bleio_connection_get_max_packet_length(mp_obj_t self_in) { bleio_connection_obj_t *self = MP_OBJ_TO_PTR(self_in); bleio_connection_ensure_connected(self); return mp_obj_new_int(common_hal_bleio_connection_get_max_packet_length(self->connection)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_connection_get_max_packet_length_obj, bleio_connection_get_max_packet_length); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_connection_get_max_packet_length_obj, bleio_connection_get_max_packet_length); -STATIC mp_obj_t bleio_connection_set_connection_interval(mp_obj_t self_in, mp_obj_t interval_in) { +static mp_obj_t bleio_connection_set_connection_interval(mp_obj_t self_in, mp_obj_t interval_in) { bleio_connection_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_float_t interval = mp_obj_get_float(interval_in); @@ -201,7 +201,7 @@ STATIC mp_obj_t bleio_connection_set_connection_interval(mp_obj_t self_in, mp_ob return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(bleio_connection_set_connection_interval_obj, bleio_connection_set_connection_interval); +static MP_DEFINE_CONST_FUN_OBJ_2(bleio_connection_set_connection_interval_obj, bleio_connection_set_connection_interval); MP_PROPERTY_GETSET(bleio_connection_connection_interval_obj, (mp_obj_t)&bleio_connection_get_connection_interval_obj, @@ -210,7 +210,7 @@ MP_PROPERTY_GETSET(bleio_connection_connection_interval_obj, MP_PROPERTY_GETTER(bleio_connection_max_packet_length_obj, (mp_obj_t)&bleio_connection_get_max_packet_length_obj); -STATIC const mp_rom_map_elem_t bleio_connection_locals_dict_table[] = { +static const mp_rom_map_elem_t bleio_connection_locals_dict_table[] = { // Methods { MP_ROM_QSTR(MP_QSTR_pair), MP_ROM_PTR(&bleio_connection_pair_obj) }, { MP_ROM_QSTR(MP_QSTR_disconnect), MP_ROM_PTR(&bleio_connection_disconnect_obj) }, @@ -223,7 +223,7 @@ STATIC const mp_rom_map_elem_t bleio_connection_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_max_packet_length), MP_ROM_PTR(&bleio_connection_max_packet_length_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(bleio_connection_locals_dict, bleio_connection_locals_dict_table); +static MP_DEFINE_CONST_DICT(bleio_connection_locals_dict, bleio_connection_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( bleio_connection_type, diff --git a/shared-bindings/_bleio/Descriptor.c b/shared-bindings/_bleio/Descriptor.c index d942b5d764c26..f8615fd28abb5 100644 --- a/shared-bindings/_bleio/Descriptor.c +++ b/shared-bindings/_bleio/Descriptor.c @@ -55,7 +55,7 @@ //| //| :return: the new Descriptor.""" //| ... -STATIC mp_obj_t bleio_descriptor_add_to_characteristic(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bleio_descriptor_add_to_characteristic(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { // class is arg[0], which we can ignore. enum { ARG_characteristic, ARG_uuid, ARG_read_perm, ARG_write_perm, @@ -116,12 +116,12 @@ STATIC mp_obj_t bleio_descriptor_add_to_characteristic(size_t n_args, const mp_o return MP_OBJ_FROM_PTR(descriptor); } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bleio_descriptor_add_to_characteristic_fun_obj, 1, bleio_descriptor_add_to_characteristic); -STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(bleio_descriptor_add_to_characteristic_obj, MP_ROM_PTR(&bleio_descriptor_add_to_characteristic_fun_obj)); +static MP_DEFINE_CONST_FUN_OBJ_KW(bleio_descriptor_add_to_characteristic_fun_obj, 1, bleio_descriptor_add_to_characteristic); +static MP_DEFINE_CONST_CLASSMETHOD_OBJ(bleio_descriptor_add_to_characteristic_obj, MP_ROM_PTR(&bleio_descriptor_add_to_characteristic_fun_obj)); //| uuid: UUID //| """The descriptor uuid. (read-only)""" -STATIC mp_obj_t bleio_descriptor_get_uuid(mp_obj_t self_in) { +static mp_obj_t bleio_descriptor_get_uuid(mp_obj_t self_in) { bleio_descriptor_obj_t *self = MP_OBJ_TO_PTR(self_in); bleio_uuid_obj_t *uuid = common_hal_bleio_descriptor_get_uuid(self); @@ -134,12 +134,12 @@ MP_PROPERTY_GETTER(bleio_descriptor_uuid_obj, //| characteristic: Characteristic //| """The Characteristic this Descriptor is a part of.""" -STATIC mp_obj_t bleio_descriptor_get_characteristic(mp_obj_t self_in) { +static mp_obj_t bleio_descriptor_get_characteristic(mp_obj_t self_in) { bleio_descriptor_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_bleio_descriptor_get_characteristic(self); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_descriptor_get_characteristic_obj, bleio_descriptor_get_characteristic); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_descriptor_get_characteristic_obj, bleio_descriptor_get_characteristic); MP_PROPERTY_GETTER(bleio_descriptor_characteristic_obj, (mp_obj_t)&bleio_descriptor_get_characteristic_obj); @@ -147,16 +147,16 @@ MP_PROPERTY_GETTER(bleio_descriptor_characteristic_obj, //| value: bytearray //| """The value of this descriptor.""" //| -STATIC mp_obj_t bleio_descriptor_get_value(mp_obj_t self_in) { +static mp_obj_t bleio_descriptor_get_value(mp_obj_t self_in) { bleio_descriptor_obj_t *self = MP_OBJ_TO_PTR(self_in); uint8_t temp[512]; size_t actual_len = common_hal_bleio_descriptor_get_value(self, temp, sizeof(temp)); return mp_obj_new_bytearray(actual_len, temp); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_descriptor_get_value_obj, bleio_descriptor_get_value); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_descriptor_get_value_obj, bleio_descriptor_get_value); -STATIC mp_obj_t bleio_descriptor_set_value(mp_obj_t self_in, mp_obj_t value_in) { +static mp_obj_t bleio_descriptor_set_value(mp_obj_t self_in, mp_obj_t value_in) { bleio_descriptor_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_buffer_info_t bufinfo; @@ -166,22 +166,22 @@ STATIC mp_obj_t bleio_descriptor_set_value(mp_obj_t self_in, mp_obj_t value_in) return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(bleio_descriptor_set_value_obj, bleio_descriptor_set_value); +static MP_DEFINE_CONST_FUN_OBJ_2(bleio_descriptor_set_value_obj, bleio_descriptor_set_value); MP_PROPERTY_GETSET(bleio_descriptor_value_obj, (mp_obj_t)&bleio_descriptor_get_value_obj, (mp_obj_t)&bleio_descriptor_set_value_obj); -STATIC const mp_rom_map_elem_t bleio_descriptor_locals_dict_table[] = { +static const mp_rom_map_elem_t bleio_descriptor_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_add_to_characteristic), MP_ROM_PTR(&bleio_descriptor_add_to_characteristic_obj) }, { MP_ROM_QSTR(MP_QSTR_uuid), MP_ROM_PTR(&bleio_descriptor_uuid_obj) }, { MP_ROM_QSTR(MP_QSTR_characteristic), MP_ROM_PTR(&bleio_descriptor_characteristic_obj) }, { MP_ROM_QSTR(MP_QSTR_value), MP_ROM_PTR(&bleio_descriptor_value_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(bleio_descriptor_locals_dict, bleio_descriptor_locals_dict_table); +static MP_DEFINE_CONST_DICT(bleio_descriptor_locals_dict, bleio_descriptor_locals_dict_table); -STATIC void bleio_descriptor_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { +static void bleio_descriptor_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { bleio_descriptor_obj_t *self = MP_OBJ_TO_PTR(self_in); if (self->uuid) { mp_printf(print, "Descriptor("); diff --git a/shared-bindings/_bleio/PacketBuffer.c b/shared-bindings/_bleio/PacketBuffer.c index 4fa7f3bb086d8..dc89d9b33d1d6 100644 --- a/shared-bindings/_bleio/PacketBuffer.c +++ b/shared-bindings/_bleio/PacketBuffer.c @@ -39,7 +39,7 @@ //| :param int max_packet_size: Maximum size of packets. Overrides value from the characteristic. //| (Remote characteristics may not have the correct length.)""" //| ... -STATIC mp_obj_t bleio_packet_buffer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t bleio_packet_buffer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_characteristic, ARG_buffer_size, ARG_max_packet_size }; static const mp_arg_t allowed_args[] = { { MP_QSTR_characteristic, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -66,7 +66,7 @@ STATIC mp_obj_t bleio_packet_buffer_make_new(const mp_obj_type_t *type, size_t n return MP_OBJ_FROM_PTR(self); } -STATIC void check_for_deinit(bleio_packet_buffer_obj_t *self) { +static void check_for_deinit(bleio_packet_buffer_obj_t *self) { if (common_hal_bleio_packet_buffer_deinited(self)) { raise_deinited_error(); } @@ -79,7 +79,7 @@ STATIC void check_for_deinit(bleio_packet_buffer_obj_t *self) { //| :return: number of bytes read and stored into ``buf`` //| :rtype: int""" //| ... -STATIC mp_obj_t bleio_packet_buffer_readinto(mp_obj_t self_in, mp_obj_t buffer_obj) { +static mp_obj_t bleio_packet_buffer_readinto(mp_obj_t self_in, mp_obj_t buffer_obj) { bleio_packet_buffer_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -93,7 +93,7 @@ STATIC mp_obj_t bleio_packet_buffer_readinto(mp_obj_t self_in, mp_obj_t buffer_o return MP_OBJ_NEW_SMALL_INT(size); } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(bleio_packet_buffer_readinto_obj, bleio_packet_buffer_readinto); +static MP_DEFINE_CONST_FUN_OBJ_2(bleio_packet_buffer_readinto_obj, bleio_packet_buffer_readinto); //| def write(self, data: ReadableBuffer, *, header: Optional[bytes] = None) -> int: //| """Writes all bytes from data into the same outgoing packet. The bytes from header are included @@ -106,7 +106,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(bleio_packet_buffer_readinto_obj, bleio_packet_ //| ... // TODO: Add a kwarg `merge=False` to dictate whether subsequent writes are merged into a pending // one. -STATIC mp_obj_t bleio_packet_buffer_write(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bleio_packet_buffer_write(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_data, ARG_header }; static const mp_arg_t allowed_args[] = { { MP_QSTR_data, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -144,21 +144,21 @@ STATIC mp_obj_t bleio_packet_buffer_write(mp_uint_t n_args, const mp_obj_t *pos_ } return MP_OBJ_NEW_SMALL_INT(num_bytes_written); } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bleio_packet_buffer_write_obj, 1, bleio_packet_buffer_write); +static MP_DEFINE_CONST_FUN_OBJ_KW(bleio_packet_buffer_write_obj, 1, bleio_packet_buffer_write); //| def deinit(self) -> None: //| """Disable permanently.""" //| ... -STATIC mp_obj_t bleio_packet_buffer_deinit(mp_obj_t self_in) { +static mp_obj_t bleio_packet_buffer_deinit(mp_obj_t self_in) { bleio_packet_buffer_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_bleio_packet_buffer_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_packet_buffer_deinit_obj, bleio_packet_buffer_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_packet_buffer_deinit_obj, bleio_packet_buffer_deinit); //| incoming_packet_length: int //| """Maximum length in bytes of a packet we are reading.""" -STATIC mp_obj_t bleio_packet_buffer_get_incoming_packet_length(mp_obj_t self_in) { +static mp_obj_t bleio_packet_buffer_get_incoming_packet_length(mp_obj_t self_in) { bleio_packet_buffer_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_int_t size = common_hal_bleio_packet_buffer_get_incoming_packet_length(self); @@ -167,7 +167,7 @@ STATIC mp_obj_t bleio_packet_buffer_get_incoming_packet_length(mp_obj_t self_in) } return MP_OBJ_NEW_SMALL_INT(size); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_packet_buffer_get_incoming_packet_length_obj, bleio_packet_buffer_get_incoming_packet_length); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_packet_buffer_get_incoming_packet_length_obj, bleio_packet_buffer_get_incoming_packet_length); MP_PROPERTY_GETTER(bleio_packet_buffer_incoming_packet_length_obj, (mp_obj_t)&bleio_packet_buffer_get_incoming_packet_length_obj); @@ -175,7 +175,7 @@ MP_PROPERTY_GETTER(bleio_packet_buffer_incoming_packet_length_obj, //| outgoing_packet_length: int //| """Maximum length in bytes of a packet we are writing.""" //| -STATIC mp_obj_t bleio_packet_buffer_get_outgoing_packet_length(mp_obj_t self_in) { +static mp_obj_t bleio_packet_buffer_get_outgoing_packet_length(mp_obj_t self_in) { bleio_packet_buffer_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_int_t size = common_hal_bleio_packet_buffer_get_outgoing_packet_length(self); @@ -184,12 +184,12 @@ STATIC mp_obj_t bleio_packet_buffer_get_outgoing_packet_length(mp_obj_t self_in) } return MP_OBJ_NEW_SMALL_INT(size); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_packet_buffer_get_outgoing_packet_length_obj, bleio_packet_buffer_get_outgoing_packet_length); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_packet_buffer_get_outgoing_packet_length_obj, bleio_packet_buffer_get_outgoing_packet_length); MP_PROPERTY_GETTER(bleio_packet_buffer_outgoing_packet_length_obj, (mp_obj_t)&bleio_packet_buffer_get_outgoing_packet_length_obj); -STATIC const mp_rom_map_elem_t bleio_packet_buffer_locals_dict_table[] = { +static const mp_rom_map_elem_t bleio_packet_buffer_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&bleio_packet_buffer_deinit_obj) }, // Standard stream methods. @@ -200,7 +200,7 @@ STATIC const mp_rom_map_elem_t bleio_packet_buffer_locals_dict_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR_outgoing_packet_length), MP_ROM_PTR(&bleio_packet_buffer_outgoing_packet_length_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(bleio_packet_buffer_locals_dict, bleio_packet_buffer_locals_dict_table); +static MP_DEFINE_CONST_DICT(bleio_packet_buffer_locals_dict, bleio_packet_buffer_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( diff --git a/shared-bindings/_bleio/ScanEntry.c b/shared-bindings/_bleio/ScanEntry.c index e3f0f43fe8bc9..9e66b70e8e956 100644 --- a/shared-bindings/_bleio/ScanEntry.c +++ b/shared-bindings/_bleio/ScanEntry.c @@ -30,7 +30,7 @@ //| than the scan filtering which accepts any advertisements that match any of the prefixes //| where ``match_all`` is False.""" //| ... -STATIC mp_obj_t bleio_scanentry_matches(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bleio_scanentry_matches(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { bleio_scanentry_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); enum { ARG_prefixes, ARG_match_all }; @@ -48,48 +48,48 @@ STATIC mp_obj_t bleio_scanentry_matches(mp_uint_t n_args, const mp_obj_t *pos_ar mp_get_buffer_raise(args[ARG_prefixes].u_obj, &bufinfo, MP_BUFFER_READ); return mp_obj_new_bool(common_hal_bleio_scanentry_matches(self, bufinfo.buf, bufinfo.len, match_all)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bleio_scanentry_matches_obj, 1, bleio_scanentry_matches); +static MP_DEFINE_CONST_FUN_OBJ_KW(bleio_scanentry_matches_obj, 1, bleio_scanentry_matches); //| address: Address //| """The address of the device (read-only), of type `_bleio.Address`.""" -STATIC mp_obj_t bleio_scanentry_get_address(mp_obj_t self_in) { +static mp_obj_t bleio_scanentry_get_address(mp_obj_t self_in) { bleio_scanentry_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_bleio_scanentry_get_address(self); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_scanentry_get_address_obj, bleio_scanentry_get_address); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_scanentry_get_address_obj, bleio_scanentry_get_address); MP_PROPERTY_GETTER(bleio_scanentry_address_obj, (mp_obj_t)&bleio_scanentry_get_address_obj); //| advertisement_bytes: bytes //| """All the advertisement data present in the packet, returned as a ``bytes`` object. (read-only)""" -STATIC mp_obj_t scanentry_get_advertisement_bytes(mp_obj_t self_in) { +static mp_obj_t scanentry_get_advertisement_bytes(mp_obj_t self_in) { bleio_scanentry_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_bleio_scanentry_get_advertisement_bytes(self); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_scanentry_get_advertisement_bytes_obj, scanentry_get_advertisement_bytes); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_scanentry_get_advertisement_bytes_obj, scanentry_get_advertisement_bytes); MP_PROPERTY_GETTER(bleio_scanentry_advertisement_bytes_obj, (mp_obj_t)&bleio_scanentry_get_advertisement_bytes_obj); //| rssi: int //| """The signal strength of the device at the time of the scan, in integer dBm. (read-only)""" -STATIC mp_obj_t scanentry_get_rssi(mp_obj_t self_in) { +static mp_obj_t scanentry_get_rssi(mp_obj_t self_in) { bleio_scanentry_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_int(common_hal_bleio_scanentry_get_rssi(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_scanentry_get_rssi_obj, scanentry_get_rssi); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_scanentry_get_rssi_obj, scanentry_get_rssi); MP_PROPERTY_GETTER(bleio_scanentry_rssi_obj, (mp_obj_t)&bleio_scanentry_get_rssi_obj); //| connectable: bool //| """True if the device can be connected to. (read-only)""" -STATIC mp_obj_t scanentry_get_connectable(mp_obj_t self_in) { +static mp_obj_t scanentry_get_connectable(mp_obj_t self_in) { bleio_scanentry_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_bool(common_hal_bleio_scanentry_get_connectable(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_scanentry_get_connectable_obj, scanentry_get_connectable); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_scanentry_get_connectable_obj, scanentry_get_connectable); MP_PROPERTY_GETTER(bleio_scanentry_connectable_obj, (mp_obj_t)&bleio_scanentry_get_connectable_obj); @@ -97,16 +97,16 @@ MP_PROPERTY_GETTER(bleio_scanentry_connectable_obj, //| scan_response: bool //| """True if the entry was a scan response. (read-only)""" //| -STATIC mp_obj_t scanentry_get_scan_response(mp_obj_t self_in) { +static mp_obj_t scanentry_get_scan_response(mp_obj_t self_in) { bleio_scanentry_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_bool(common_hal_bleio_scanentry_get_scan_response(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_scanentry_get_scan_response_obj, scanentry_get_scan_response); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_scanentry_get_scan_response_obj, scanentry_get_scan_response); MP_PROPERTY_GETTER(bleio_scanentry_scan_response_obj, (mp_obj_t)&bleio_scanentry_get_scan_response_obj); -STATIC const mp_rom_map_elem_t bleio_scanentry_locals_dict_table[] = { +static const mp_rom_map_elem_t bleio_scanentry_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_address), MP_ROM_PTR(&bleio_scanentry_address_obj) }, { MP_ROM_QSTR(MP_QSTR_advertisement_bytes), MP_ROM_PTR(&bleio_scanentry_advertisement_bytes_obj) }, { MP_ROM_QSTR(MP_QSTR_rssi), MP_ROM_PTR(&bleio_scanentry_rssi_obj) }, @@ -115,7 +115,7 @@ STATIC const mp_rom_map_elem_t bleio_scanentry_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_matches), MP_ROM_PTR(&bleio_scanentry_matches_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(bleio_scanentry_locals_dict, bleio_scanentry_locals_dict_table); +static MP_DEFINE_CONST_DICT(bleio_scanentry_locals_dict, bleio_scanentry_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( bleio_scanentry_type, diff --git a/shared-bindings/_bleio/ScanResults.c b/shared-bindings/_bleio/ScanResults.c index 6e249394736ba..81680902e4da9 100644 --- a/shared-bindings/_bleio/ScanResults.c +++ b/shared-bindings/_bleio/ScanResults.c @@ -16,7 +16,7 @@ //| """Iterates over advertising data received while scanning. This object is always created //| by a `_bleio.Adapter`: it has no user-visible constructor.""" //| -STATIC mp_obj_t scanresults_iternext(mp_obj_t self_in) { +static mp_obj_t scanresults_iternext(mp_obj_t self_in) { mp_check_self(mp_obj_is_type(self_in, &bleio_scanresults_type)); bleio_scanresults_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_obj_t scan_entry = common_hal_bleio_scanresults_next(self); diff --git a/shared-bindings/_bleio/Service.c b/shared-bindings/_bleio/Service.c index 3774e06597480..00da34c8bce2d 100644 --- a/shared-bindings/_bleio/Service.c +++ b/shared-bindings/_bleio/Service.c @@ -27,7 +27,7 @@ //| //| :return: the new Service""" //| ... -STATIC mp_obj_t bleio_service_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t bleio_service_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_uuid, ARG_secondary }; static const mp_arg_t allowed_args[] = { { MP_QSTR_uuid, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -52,45 +52,45 @@ STATIC mp_obj_t bleio_service_make_new(const mp_obj_type_t *type, size_t n_args, //| def deinit(self) -> None: //| """Disable and deinitialise the Service.""" //| ... -STATIC mp_obj_t bleio_service_deinit(mp_obj_t self_in) { +static mp_obj_t bleio_service_deinit(mp_obj_t self_in) { bleio_service_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_bleio_service_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_service_deinit_obj, bleio_service_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_service_deinit_obj, bleio_service_deinit); //| characteristics: Tuple[Characteristic, ...] //| """A tuple of :py:class:`Characteristic` designating the characteristics that are offered by //| this service. (read-only)""" -STATIC mp_obj_t bleio_service_get_characteristics(mp_obj_t self_in) { +static mp_obj_t bleio_service_get_characteristics(mp_obj_t self_in) { bleio_service_obj_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_FROM_PTR(common_hal_bleio_service_get_characteristics(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_service_get_characteristics_obj, bleio_service_get_characteristics); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_service_get_characteristics_obj, bleio_service_get_characteristics); MP_PROPERTY_GETTER(bleio_service_characteristics_obj, (mp_obj_t)&bleio_service_get_characteristics_obj); //| remote: bool //| """True if this is a service provided by a remote device. (read-only)""" -STATIC mp_obj_t bleio_service_get_remote(mp_obj_t self_in) { +static mp_obj_t bleio_service_get_remote(mp_obj_t self_in) { bleio_service_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_bool(common_hal_bleio_service_get_is_remote(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_service_get_remote_obj, bleio_service_get_remote); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_service_get_remote_obj, bleio_service_get_remote); MP_PROPERTY_GETTER(bleio_service_remote_obj, (mp_obj_t)&bleio_service_get_remote_obj); //| secondary: bool //| """True if this is a secondary service. (read-only)""" -STATIC mp_obj_t bleio_service_get_secondary(mp_obj_t self_in) { +static mp_obj_t bleio_service_get_secondary(mp_obj_t self_in) { bleio_service_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_bool(common_hal_bleio_service_get_is_secondary(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_service_get_secondary_obj, bleio_service_get_secondary); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_service_get_secondary_obj, bleio_service_get_secondary); MP_PROPERTY_GETTER(bleio_service_secondary_obj, (mp_obj_t)&bleio_service_get_secondary_obj); @@ -100,19 +100,19 @@ MP_PROPERTY_GETTER(bleio_service_secondary_obj, //| //| Will be ``None`` if the 128-bit UUID for this service is not known.""" //| -STATIC mp_obj_t bleio_service_get_uuid(mp_obj_t self_in) { +static mp_obj_t bleio_service_get_uuid(mp_obj_t self_in) { bleio_service_obj_t *self = MP_OBJ_TO_PTR(self_in); bleio_uuid_obj_t *uuid = common_hal_bleio_service_get_uuid(self); return uuid ? MP_OBJ_FROM_PTR(uuid) : mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(bleio_service_get_uuid_obj, bleio_service_get_uuid); +static MP_DEFINE_CONST_FUN_OBJ_1(bleio_service_get_uuid_obj, bleio_service_get_uuid); MP_PROPERTY_GETTER(bleio_service_uuid_obj, (mp_obj_t)&bleio_service_get_uuid_obj); -STATIC const mp_rom_map_elem_t bleio_service_locals_dict_table[] = { +static const mp_rom_map_elem_t bleio_service_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&bleio_service_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&bleio_service_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR_characteristics), MP_ROM_PTR(&bleio_service_characteristics_obj) }, @@ -120,9 +120,9 @@ STATIC const mp_rom_map_elem_t bleio_service_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_uuid), MP_ROM_PTR(&bleio_service_uuid_obj) }, { MP_ROM_QSTR(MP_QSTR_remote), MP_ROM_PTR(&bleio_service_remote_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(bleio_service_locals_dict, bleio_service_locals_dict_table); +static MP_DEFINE_CONST_DICT(bleio_service_locals_dict, bleio_service_locals_dict_table); -STATIC void bleio_service_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { +static void bleio_service_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { bleio_service_obj_t *self = MP_OBJ_TO_PTR(self_in); if (self->uuid) { mp_printf(print, "Service("); diff --git a/shared-bindings/_bleio/UUID.c b/shared-bindings/_bleio/UUID.c index a5935b83236b2..5dac1b3ecfdea 100644 --- a/shared-bindings/_bleio/UUID.c +++ b/shared-bindings/_bleio/UUID.c @@ -30,7 +30,7 @@ //| :param value: The uuid value to encapsulate //| :type value: int, ~circuitpython_typing.ReadableBuffer or str""" //| ... -STATIC mp_obj_t bleio_uuid_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t bleio_uuid_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { mp_arg_check_num(n_args, n_kw, 1, 1, false); bleio_uuid_obj_t *self = mp_obj_malloc(bleio_uuid_obj_t, &bleio_uuid_type); @@ -102,7 +102,7 @@ STATIC mp_obj_t bleio_uuid_make_new(const mp_obj_type_t *type, size_t n_args, si //| """The 16-bit part of the UUID. (read-only) //| //| :type: int""" -STATIC mp_obj_t bleio_uuid_get_uuid16(mp_obj_t self_in) { +static mp_obj_t bleio_uuid_get_uuid16(mp_obj_t self_in) { bleio_uuid_obj_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_bleio_uuid_get_uuid16(self)); } @@ -117,7 +117,7 @@ MP_PROPERTY_GETTER(bleio_uuid_uuid16_obj, //| Raises AttributeError if this is a 16-bit UUID. (read-only) //| //| :type: bytes""" -STATIC mp_obj_t bleio_uuid_get_uuid128(mp_obj_t self_in) { +static mp_obj_t bleio_uuid_get_uuid128(mp_obj_t self_in) { bleio_uuid_obj_t *self = MP_OBJ_TO_PTR(self_in); uint8_t uuid128[16]; @@ -138,7 +138,7 @@ MP_PROPERTY_GETTER(bleio_uuid_uuid128_obj, //| 16-bit Bluetooth SIG assigned UUID. (read-only) 32-bit UUIDs are not currently supported. //| //| :type: int""" -STATIC mp_obj_t bleio_uuid_get_size(mp_obj_t self_in) { +static mp_obj_t bleio_uuid_get_size(mp_obj_t self_in) { bleio_uuid_obj_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_bleio_uuid_get_size(self)); } @@ -152,7 +152,7 @@ MP_PROPERTY_GETTER(bleio_uuid_size_obj, //| def pack_into(self, buffer: WriteableBuffer, offset: int = 0) -> None: //| """Packs the UUID into the given buffer at the given offset.""" //| ... -STATIC mp_obj_t bleio_uuid_pack_into(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bleio_uuid_pack_into(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { bleio_uuid_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); enum { ARG_buffer, ARG_offset }; @@ -176,18 +176,18 @@ STATIC mp_obj_t bleio_uuid_pack_into(mp_uint_t n_args, const mp_obj_t *pos_args, common_hal_bleio_uuid_pack_into(self, bufinfo.buf + offset); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bleio_uuid_pack_into_obj, 1, bleio_uuid_pack_into); +static MP_DEFINE_CONST_FUN_OBJ_KW(bleio_uuid_pack_into_obj, 1, bleio_uuid_pack_into); -STATIC const mp_rom_map_elem_t bleio_uuid_locals_dict_table[] = { +static const mp_rom_map_elem_t bleio_uuid_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_uuid16), MP_ROM_PTR(&bleio_uuid_uuid16_obj) }, { MP_ROM_QSTR(MP_QSTR_uuid128), MP_ROM_PTR(&bleio_uuid_uuid128_obj) }, { MP_ROM_QSTR(MP_QSTR_size), MP_ROM_PTR(&bleio_uuid_size_obj) }, { MP_ROM_QSTR(MP_QSTR_pack_into), MP_ROM_PTR(&bleio_uuid_pack_into_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(bleio_uuid_locals_dict, bleio_uuid_locals_dict_table); +static MP_DEFINE_CONST_DICT(bleio_uuid_locals_dict, bleio_uuid_locals_dict_table); -STATIC mp_obj_t bleio_uuid_unary_op(mp_unary_op_t op, mp_obj_t self_in) { +static mp_obj_t bleio_uuid_unary_op(mp_unary_op_t op, mp_obj_t self_in) { bleio_uuid_obj_t *self = MP_OBJ_TO_PTR(self_in); switch (op) { case MP_UNARY_OP_HASH: @@ -214,7 +214,7 @@ STATIC mp_obj_t bleio_uuid_unary_op(mp_unary_op_t op, mp_obj_t self_in) { //| """Two UUID objects are equal if their values match and they are both 128-bit or both 16-bit.""" //| ... //| -STATIC mp_obj_t bleio_uuid_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) { +static mp_obj_t bleio_uuid_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) { switch (op) { // Two UUID's are equal if their uuid16 values match or their uuid128 values match. case MP_BINARY_OP_EQUAL: diff --git a/shared-bindings/_bleio/__init__.c b/shared-bindings/_bleio/__init__.c index 34b01f60d81e8..2643a59618a63 100644 --- a/shared-bindings/_bleio/__init__.c +++ b/shared-bindings/_bleio/__init__.c @@ -80,19 +80,19 @@ NORETURN void mp_raise_bleio_SecurityError(mp_rom_error_text_t fmt, ...) { } // Called when _bleio is imported. -STATIC mp_obj_t bleio___init__(void) { +static mp_obj_t bleio___init__(void) { // HCI cannot be enabled on import, because we need to setup the HCI adapter first. #if !CIRCUITPY_BLEIO_HCI common_hal_bleio_adapter_set_enabled(&common_hal_bleio_adapter_obj, true); #endif return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_0(bleio___init___obj, bleio___init__); +static MP_DEFINE_CONST_FUN_OBJ_0(bleio___init___obj, bleio___init__); // Need a forward reference due to mutual references. #if CIRCUITPY_BLEIO_HCI -STATIC mp_obj_dict_t bleio_module_globals; +static mp_obj_dict_t bleio_module_globals; #endif //| def set_adapter(adapter: Optional[_bleio.Adapter]) -> None: @@ -121,10 +121,10 @@ MP_DEFINE_CONST_FUN_OBJ_1(bleio_set_adapter_obj, bleio_set_adapter); // Make the module dictionary be in RAM, so that _bleio.adapter can be set. // Use a local macro to define how table entries should be converted. #define OBJ_FROM_PTR MP_OBJ_FROM_PTR -STATIC mp_map_elem_t bleio_module_globals_table[] = { +static mp_map_elem_t bleio_module_globals_table[] = { #else #define OBJ_FROM_PTR MP_ROM_PTR -STATIC const mp_rom_map_elem_t bleio_module_globals_table[] = { +static const mp_rom_map_elem_t bleio_module_globals_table[] = { #endif // Name must be the first entry so that the exception printing below is correct. { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__bleio) }, @@ -163,9 +163,9 @@ STATIC const mp_rom_map_elem_t bleio_module_globals_table[] = { #if CIRCUITPY_BLEIO_HCI // Module dict is mutable to allow setting _bleio.adapter. -STATIC MP_DEFINE_MUTABLE_DICT(bleio_module_globals, bleio_module_globals_table); +static MP_DEFINE_MUTABLE_DICT(bleio_module_globals, bleio_module_globals_table); #else -STATIC MP_DEFINE_CONST_DICT(bleio_module_globals, bleio_module_globals_table); +static MP_DEFINE_CONST_DICT(bleio_module_globals, bleio_module_globals_table); #endif void bleio_exception_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) { diff --git a/shared-bindings/_eve/__init__.c b/shared-bindings/_eve/__init__.c index 654e6728b3efb..bbcb329203166 100644 --- a/shared-bindings/_eve/__init__.c +++ b/shared-bindings/_eve/__init__.c @@ -28,42 +28,42 @@ typedef struct _mp_obj__EVE_t { common_hal__eve_t _eve; } mp_obj__EVE_t; -STATIC const mp_obj_type_t _EVE_type; +static const mp_obj_type_t _EVE_type; #define EVEHAL(s) \ (&((mp_obj__EVE_t *)mp_obj_cast_to_native_base((s), &_EVE_type))->_eve) //| def register(self, o: object) -> None: ... -STATIC mp_obj_t _register(mp_obj_t self, mp_obj_t o) { +static mp_obj_t _register(mp_obj_t self, mp_obj_t o) { common_hal__eve_t *eve = EVEHAL(self); mp_load_method(o, MP_QSTR_write, eve->dest); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(register_obj, _register); +static MP_DEFINE_CONST_FUN_OBJ_2(register_obj, _register); //| def flush(self) -> None: //| """Send any queued drawing commands directly to the hardware. //| //| :param int width: The width of the grid in tiles, or 1 for sprites.""" //| ... -STATIC mp_obj_t _flush(mp_obj_t self) { +static mp_obj_t _flush(mp_obj_t self) { common_hal__eve_flush(EVEHAL(self)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(flush_obj, _flush); +static MP_DEFINE_CONST_FUN_OBJ_1(flush_obj, _flush); //| def cc(self, b: ReadableBuffer) -> None: //| """Append bytes to the command FIFO. //| //| :param ~circuitpython_typing.ReadableBuffer b: The bytes to add""" //| ... -STATIC mp_obj_t _cc(mp_obj_t self, mp_obj_t b) { +static mp_obj_t _cc(mp_obj_t self, mp_obj_t b) { mp_buffer_info_t buffer_info; mp_get_buffer_raise(b, &buffer_info, MP_BUFFER_READ); common_hal__eve_add(EVEHAL(self), buffer_info.len, buffer_info.buf); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(cc_obj, _cc); +static MP_DEFINE_CONST_FUN_OBJ_2(cc_obj, _cc); // { @@ -77,13 +77,13 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(cc_obj, _cc); //| """ //| ... -STATIC mp_obj_t _alphafunc(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) { +static mp_obj_t _alphafunc(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) { uint32_t func = mp_obj_get_int_truncated(a0); uint32_t ref = mp_obj_get_int_truncated(a1); common_hal__eve_AlphaFunc(EVEHAL(self), func, ref); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_3(alphafunc_obj, _alphafunc); +static MP_DEFINE_CONST_FUN_OBJ_3(alphafunc_obj, _alphafunc); //| def Begin(self, prim: int) -> None: //| """Begin drawing a graphics primitive @@ -94,12 +94,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(alphafunc_obj, _alphafunc); //| """ //| ... -STATIC mp_obj_t _begin(mp_obj_t self, mp_obj_t a0) { +static mp_obj_t _begin(mp_obj_t self, mp_obj_t a0) { uint32_t prim = mp_obj_get_int_truncated(a0); common_hal__eve_Begin(EVEHAL(self), prim); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(begin_obj, _begin); +static MP_DEFINE_CONST_FUN_OBJ_2(begin_obj, _begin); //| def BitmapExtFormat(self, format: int) -> None: //| """Set the bitmap format @@ -107,12 +107,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(begin_obj, _begin); //| :param int format: bitmap pixel format.""" //| ... -STATIC mp_obj_t _bitmapextformat(mp_obj_t self, mp_obj_t a0) { +static mp_obj_t _bitmapextformat(mp_obj_t self, mp_obj_t a0) { uint32_t fmt = mp_obj_get_int_truncated(a0); common_hal__eve_BitmapExtFormat(EVEHAL(self), fmt); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(bitmapextformat_obj, _bitmapextformat); +static MP_DEFINE_CONST_FUN_OBJ_2(bitmapextformat_obj, _bitmapextformat); //| def BitmapHandle(self, handle: int) -> None: //| """Set the bitmap handle @@ -123,12 +123,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(bitmapextformat_obj, _bitmapextformat); //| """ //| ... -STATIC mp_obj_t _bitmaphandle(mp_obj_t self, mp_obj_t a0) { +static mp_obj_t _bitmaphandle(mp_obj_t self, mp_obj_t a0) { uint32_t handle = mp_obj_get_int_truncated(a0); common_hal__eve_BitmapHandle(EVEHAL(self), handle); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(bitmaphandle_obj, _bitmaphandle); +static MP_DEFINE_CONST_FUN_OBJ_2(bitmaphandle_obj, _bitmaphandle); //| def BitmapLayoutH(self, linestride: int, height: int) -> None: //| """Set the source bitmap memory format and layout for the current handle. high bits for large bitmaps @@ -137,13 +137,13 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(bitmaphandle_obj, _bitmaphandle); //| :param int height: high part of bitmap height, in lines. Range 0-3""" //| ... -STATIC mp_obj_t _bitmaplayouth(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) { +static mp_obj_t _bitmaplayouth(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) { uint32_t linestride = mp_obj_get_int_truncated(a0); uint32_t height = mp_obj_get_int_truncated(a1); common_hal__eve_BitmapLayoutH(EVEHAL(self), linestride, height); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_3(bitmaplayouth_obj, _bitmaplayouth); +static MP_DEFINE_CONST_FUN_OBJ_3(bitmaplayouth_obj, _bitmaplayouth); //| def BitmapLayout(self, format: int, linestride: int, height: int) -> None: //| """Set the source bitmap memory format and layout for the current handle @@ -153,14 +153,14 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(bitmaplayouth_obj, _bitmaplayouth); //| :param int height: bitmap height, in lines. Range 0-511""" //| ... -STATIC mp_obj_t _bitmaplayout(size_t n_args, const mp_obj_t *args) { +static mp_obj_t _bitmaplayout(size_t n_args, const mp_obj_t *args) { uint32_t format = mp_obj_get_int_truncated(args[1]); uint32_t linestride = mp_obj_get_int_truncated(args[2]); uint32_t height = mp_obj_get_int_truncated(args[3]); common_hal__eve_BitmapLayout(EVEHAL(args[0]), format, linestride, height); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitmaplayout_obj, 4, 4, _bitmaplayout); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitmaplayout_obj, 4, 4, _bitmaplayout); //| def BitmapSizeH(self, width: int, height: int) -> None: //| """Set the screen drawing of bitmaps for the current handle. high bits for large bitmaps @@ -169,13 +169,13 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitmaplayout_obj, 4, 4, _bitmaplayout //| :param int height: high part of drawn bitmap height, in pixels. Range 0-3""" //| ... -STATIC mp_obj_t _bitmapsizeh(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) { +static mp_obj_t _bitmapsizeh(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) { uint32_t width = mp_obj_get_int_truncated(a0); uint32_t height = mp_obj_get_int_truncated(a1); common_hal__eve_BitmapSizeH(EVEHAL(self), width, height); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_3(bitmapsizeh_obj, _bitmapsizeh); +static MP_DEFINE_CONST_FUN_OBJ_3(bitmapsizeh_obj, _bitmapsizeh); //| def BitmapSize(self, filter: int, wrapx: int, wrapy: int, width: int, height: int) -> None: //| """Set the screen drawing of bitmaps for the current handle @@ -187,7 +187,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(bitmapsizeh_obj, _bitmapsizeh); //| :param int height: drawn bitmap height, in pixels. Range 0-511""" //| ... -STATIC mp_obj_t _bitmapsize(size_t n_args, const mp_obj_t *args) { +static mp_obj_t _bitmapsize(size_t n_args, const mp_obj_t *args) { uint32_t filter = mp_obj_get_int_truncated(args[1]); uint32_t wrapx = mp_obj_get_int_truncated(args[2]); uint32_t wrapy = mp_obj_get_int_truncated(args[3]); @@ -196,7 +196,7 @@ STATIC mp_obj_t _bitmapsize(size_t n_args, const mp_obj_t *args) { common_hal__eve_BitmapSize(EVEHAL(args[0]), filter, wrapx, wrapy, width, height); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitmapsize_obj, 6, 6, _bitmapsize); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitmapsize_obj, 6, 6, _bitmapsize); //| def BitmapSource(self, addr: int) -> None: //| """Set the source address for bitmap graphics @@ -205,12 +205,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitmapsize_obj, 6, 6, _bitmapsize); //| """ //| ... -STATIC mp_obj_t _bitmapsource(mp_obj_t self, mp_obj_t a0) { +static mp_obj_t _bitmapsource(mp_obj_t self, mp_obj_t a0) { uint32_t addr = mp_obj_get_int_truncated(a0); common_hal__eve_BitmapSource(EVEHAL(self), addr); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(bitmapsource_obj, _bitmapsource); +static MP_DEFINE_CONST_FUN_OBJ_2(bitmapsource_obj, _bitmapsource); //| def BitmapSwizzle(self, r: int, g: int, b: int, a: int) -> None: //| """Set the source for the r,g,b and a channels of a bitmap @@ -221,7 +221,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(bitmapsource_obj, _bitmapsource); //| :param int a: alpha component source channel. Range 0-7""" //| ... -STATIC mp_obj_t _bitmapswizzle(size_t n_args, const mp_obj_t *args) { +static mp_obj_t _bitmapswizzle(size_t n_args, const mp_obj_t *args) { uint32_t r = mp_obj_get_int_truncated(args[1]); uint32_t g = mp_obj_get_int_truncated(args[2]); uint32_t b = mp_obj_get_int_truncated(args[3]); @@ -229,7 +229,7 @@ STATIC mp_obj_t _bitmapswizzle(size_t n_args, const mp_obj_t *args) { common_hal__eve_BitmapSwizzle(EVEHAL(args[0]), r, g, b, a); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitmapswizzle_obj, 5, 5, _bitmapswizzle); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitmapswizzle_obj, 5, 5, _bitmapswizzle); //| def BitmapTransformA(self, p: int, v: int) -> None: //| """Set the :math:`a` component of the bitmap transform matrix @@ -243,13 +243,13 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitmapswizzle_obj, 5, 5, _bitmapswizz //| """ //| ... -STATIC mp_obj_t _bitmaptransforma(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) { +static mp_obj_t _bitmaptransforma(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) { uint32_t p = mp_obj_get_int_truncated(a0); uint32_t v = mp_obj_get_int_truncated(a1); common_hal__eve_BitmapTransformA(EVEHAL(self), p, v); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_3(bitmaptransforma_obj, _bitmaptransforma); +static MP_DEFINE_CONST_FUN_OBJ_3(bitmaptransforma_obj, _bitmaptransforma); //| def BitmapTransformB(self, p: int, v: int) -> None: //| """Set the :math:`b` component of the bitmap transform matrix @@ -263,13 +263,13 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(bitmaptransforma_obj, _bitmaptransforma); //| """ //| ... -STATIC mp_obj_t _bitmaptransformb(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) { +static mp_obj_t _bitmaptransformb(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) { uint32_t p = mp_obj_get_int_truncated(a0); uint32_t v = mp_obj_get_int_truncated(a1); common_hal__eve_BitmapTransformB(EVEHAL(self), p, v); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_3(bitmaptransformb_obj, _bitmaptransformb); +static MP_DEFINE_CONST_FUN_OBJ_3(bitmaptransformb_obj, _bitmaptransformb); //| def BitmapTransformC(self, v: int) -> None: //| """Set the :math:`c` component of the bitmap transform matrix @@ -280,12 +280,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(bitmaptransformb_obj, _bitmaptransformb); //| """ //| ... -STATIC mp_obj_t _bitmaptransformc(mp_obj_t self, mp_obj_t a0) { +static mp_obj_t _bitmaptransformc(mp_obj_t self, mp_obj_t a0) { uint32_t v = mp_obj_get_int_truncated(a0); common_hal__eve_BitmapTransformC(EVEHAL(self), v); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(bitmaptransformc_obj, _bitmaptransformc); +static MP_DEFINE_CONST_FUN_OBJ_2(bitmaptransformc_obj, _bitmaptransformc); //| def BitmapTransformD(self, p: int, v: int) -> None: //| """Set the :math:`d` component of the bitmap transform matrix @@ -299,13 +299,13 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(bitmaptransformc_obj, _bitmaptransformc); //| """ //| ... -STATIC mp_obj_t _bitmaptransformd(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) { +static mp_obj_t _bitmaptransformd(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) { uint32_t p = mp_obj_get_int_truncated(a0); uint32_t v = mp_obj_get_int_truncated(a1); common_hal__eve_BitmapTransformD(EVEHAL(self), p, v); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_3(bitmaptransformd_obj, _bitmaptransformd); +static MP_DEFINE_CONST_FUN_OBJ_3(bitmaptransformd_obj, _bitmaptransformd); //| def BitmapTransformE(self, p: int, v: int) -> None: //| """Set the :math:`e` component of the bitmap transform matrix @@ -319,13 +319,13 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(bitmaptransformd_obj, _bitmaptransformd); //| """ //| ... -STATIC mp_obj_t _bitmaptransforme(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) { +static mp_obj_t _bitmaptransforme(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) { uint32_t p = mp_obj_get_int_truncated(a0); uint32_t v = mp_obj_get_int_truncated(a1); common_hal__eve_BitmapTransformE(EVEHAL(self), p, v); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_3(bitmaptransforme_obj, _bitmaptransforme); +static MP_DEFINE_CONST_FUN_OBJ_3(bitmaptransforme_obj, _bitmaptransforme); //| def BitmapTransformF(self, v: int) -> None: //| """Set the :math:`f` component of the bitmap transform matrix @@ -336,12 +336,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(bitmaptransforme_obj, _bitmaptransforme); //| """ //| ... -STATIC mp_obj_t _bitmaptransformf(mp_obj_t self, mp_obj_t a0) { +static mp_obj_t _bitmaptransformf(mp_obj_t self, mp_obj_t a0) { uint32_t v = mp_obj_get_int_truncated(a0); common_hal__eve_BitmapTransformF(EVEHAL(self), v); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(bitmaptransformf_obj, _bitmaptransformf); +static MP_DEFINE_CONST_FUN_OBJ_2(bitmaptransformf_obj, _bitmaptransformf); //| def BlendFunc(self, src: int, dst: int) -> None: //| """Set pixel arithmetic @@ -353,13 +353,13 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(bitmaptransformf_obj, _bitmaptransformf); //| """ //| ... -STATIC mp_obj_t _blendfunc(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) { +static mp_obj_t _blendfunc(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) { uint32_t src = mp_obj_get_int_truncated(a0); uint32_t dst = mp_obj_get_int_truncated(a1); common_hal__eve_BlendFunc(EVEHAL(self), src, dst); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_3(blendfunc_obj, _blendfunc); +static MP_DEFINE_CONST_FUN_OBJ_3(blendfunc_obj, _blendfunc); //| def Call(self, dest: int) -> None: //| """Execute a sequence of commands at another location in the display list @@ -367,12 +367,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(blendfunc_obj, _blendfunc); //| :param int dest: display list address. Range 0-65535""" //| ... -STATIC mp_obj_t _call(mp_obj_t self, mp_obj_t a0) { +static mp_obj_t _call(mp_obj_t self, mp_obj_t a0) { uint32_t dest = mp_obj_get_int_truncated(a0); common_hal__eve_Call(EVEHAL(self), dest); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(call_obj, _call); +static MP_DEFINE_CONST_FUN_OBJ_2(call_obj, _call); //| def Cell(self, cell: int) -> None: //| """Set the bitmap cell number for the vertex2f command @@ -383,12 +383,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(call_obj, _call); //| """ //| ... -STATIC mp_obj_t _cell(mp_obj_t self, mp_obj_t a0) { +static mp_obj_t _cell(mp_obj_t self, mp_obj_t a0) { uint32_t cell = mp_obj_get_int_truncated(a0); common_hal__eve_Cell(EVEHAL(self), cell); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(cell_obj, _cell); +static MP_DEFINE_CONST_FUN_OBJ_2(cell_obj, _cell); //| def ClearColorA(self, alpha: int) -> None: //| """Set clear value for the alpha channel @@ -399,12 +399,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(cell_obj, _cell); //| """ //| ... -STATIC mp_obj_t _clearcolora(mp_obj_t self, mp_obj_t a0) { +static mp_obj_t _clearcolora(mp_obj_t self, mp_obj_t a0) { uint32_t alpha = mp_obj_get_int_truncated(a0); common_hal__eve_ClearColorA(EVEHAL(self), alpha); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(clearcolora_obj, _clearcolora); +static MP_DEFINE_CONST_FUN_OBJ_2(clearcolora_obj, _clearcolora); //| def ClearColorRGB(self, red: int, green: int, blue: int) -> None: //| """Set clear values for red, green and blue channels @@ -417,14 +417,14 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(clearcolora_obj, _clearcolora); //| """ //| ... -STATIC mp_obj_t _clearcolorrgb(size_t n_args, const mp_obj_t *args) { +static mp_obj_t _clearcolorrgb(size_t n_args, const mp_obj_t *args) { uint32_t red = mp_obj_get_int_truncated(args[1]); uint32_t green = mp_obj_get_int_truncated(args[2]); uint32_t blue = mp_obj_get_int_truncated(args[3]); common_hal__eve_ClearColorRGB(EVEHAL(args[0]), red, green, blue); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(clearcolorrgb_obj, 4, 4, _clearcolorrgb); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(clearcolorrgb_obj, 4, 4, _clearcolorrgb); //| def Clear(self, c: int, s: int, t: int) -> None: //| """Clear buffers to preset values @@ -434,14 +434,14 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(clearcolorrgb_obj, 4, 4, _clearcolorr //| :param int t: clear tag buffer. Range 0-1""" //| ... -STATIC mp_obj_t _clear(size_t n_args, const mp_obj_t *args) { +static mp_obj_t _clear(size_t n_args, const mp_obj_t *args) { uint32_t c = (n_args > 1) ? mp_obj_get_int_truncated(args[1]) : 1; uint32_t s = (n_args > 2) ? mp_obj_get_int_truncated(args[2]) : 1; uint32_t t = (n_args > 3) ? mp_obj_get_int_truncated(args[3]) : 1; common_hal__eve_Clear(EVEHAL(args[0]), c, s, t); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(clear_obj, 1, 4, _clear); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(clear_obj, 1, 4, _clear); //| def ClearStencil(self, s: int) -> None: //| """Set clear value for the stencil buffer @@ -452,12 +452,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(clear_obj, 1, 4, _clear); //| """ //| ... -STATIC mp_obj_t _clearstencil(mp_obj_t self, mp_obj_t a0) { +static mp_obj_t _clearstencil(mp_obj_t self, mp_obj_t a0) { uint32_t s = mp_obj_get_int_truncated(a0); common_hal__eve_ClearStencil(EVEHAL(self), s); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(clearstencil_obj, _clearstencil); +static MP_DEFINE_CONST_FUN_OBJ_2(clearstencil_obj, _clearstencil); //| def ClearTag(self, s: int) -> None: //| """Set clear value for the tag buffer @@ -467,12 +467,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(clearstencil_obj, _clearstencil); //| This value is part of the graphics context and is saved and restored by :meth:`SaveContext` and :meth:`RestoreContext`. //| """ -STATIC mp_obj_t _cleartag(mp_obj_t self, mp_obj_t a0) { +static mp_obj_t _cleartag(mp_obj_t self, mp_obj_t a0) { uint32_t s = mp_obj_get_int_truncated(a0); common_hal__eve_ClearTag(EVEHAL(self), s); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(cleartag_obj, _cleartag); +static MP_DEFINE_CONST_FUN_OBJ_2(cleartag_obj, _cleartag); //| def ColorA(self, alpha: int) -> None: //| """Set the current color alpha @@ -483,12 +483,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(cleartag_obj, _cleartag); //| """ //| ... -STATIC mp_obj_t _colora(mp_obj_t self, mp_obj_t a0) { +static mp_obj_t _colora(mp_obj_t self, mp_obj_t a0) { uint32_t alpha = mp_obj_get_int_truncated(a0); common_hal__eve_ColorA(EVEHAL(self), alpha); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(colora_obj, _colora); +static MP_DEFINE_CONST_FUN_OBJ_2(colora_obj, _colora); //| def ColorMask(self, r: int, g: int, b: int, a: int) -> None: //| """Enable and disable writing of frame buffer color components @@ -502,7 +502,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(colora_obj, _colora); //| """ //| ... -STATIC mp_obj_t _colormask(size_t n_args, const mp_obj_t *args) { +static mp_obj_t _colormask(size_t n_args, const mp_obj_t *args) { uint32_t r = mp_obj_get_int_truncated(args[1]); uint32_t g = mp_obj_get_int_truncated(args[2]); uint32_t b = mp_obj_get_int_truncated(args[3]); @@ -510,7 +510,7 @@ STATIC mp_obj_t _colormask(size_t n_args, const mp_obj_t *args) { common_hal__eve_ColorMask(EVEHAL(args[0]), r, g, b, a); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(colormask_obj, 5, 5, _colormask); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(colormask_obj, 5, 5, _colormask); //| def ColorRGB(self, red: int, green: int, blue: int) -> None: //| """Set the drawing color @@ -523,25 +523,25 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(colormask_obj, 5, 5, _colormask); //| """ //| ... -STATIC mp_obj_t _colorrgb(size_t n_args, const mp_obj_t *args) { +static mp_obj_t _colorrgb(size_t n_args, const mp_obj_t *args) { uint32_t red = mp_obj_get_int_truncated(args[1]); uint32_t green = mp_obj_get_int_truncated(args[2]); uint32_t blue = mp_obj_get_int_truncated(args[3]); common_hal__eve_ColorRGB(EVEHAL(args[0]), red, green, blue); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(colorrgb_obj, 4, 4, _colorrgb); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(colorrgb_obj, 4, 4, _colorrgb); //| def Display(self) -> None: //| """End the display list""" //| ... -STATIC mp_obj_t _display(mp_obj_t self) { +static mp_obj_t _display(mp_obj_t self) { common_hal__eve_Display(EVEHAL(self)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(display_obj, _display); +static MP_DEFINE_CONST_FUN_OBJ_1(display_obj, _display); //| def End(self) -> None: //| """End drawing a graphics primitive @@ -550,12 +550,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(display_obj, _display); //| """ //| ... -STATIC mp_obj_t _end(mp_obj_t self) { +static mp_obj_t _end(mp_obj_t self) { common_hal__eve_End(EVEHAL(self)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(end_obj, _end); +static MP_DEFINE_CONST_FUN_OBJ_1(end_obj, _end); //| def Jump(self, dest: int) -> None: //| """Execute commands at another location in the display list @@ -563,12 +563,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(end_obj, _end); //| :param int dest: display list address. Range 0-65535""" //| ... -STATIC mp_obj_t _jump(mp_obj_t self, mp_obj_t a0) { +static mp_obj_t _jump(mp_obj_t self, mp_obj_t a0) { uint32_t dest = mp_obj_get_int_truncated(a0); common_hal__eve_Jump(EVEHAL(self), dest); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(jump_obj, _jump); +static MP_DEFINE_CONST_FUN_OBJ_2(jump_obj, _jump); //| def Macro(self, m: int) -> None: //| """Execute a single command from a macro register @@ -576,23 +576,23 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(jump_obj, _jump); //| :param int m: macro register to read. Range 0-1""" //| ... -STATIC mp_obj_t _macro(mp_obj_t self, mp_obj_t a0) { +static mp_obj_t _macro(mp_obj_t self, mp_obj_t a0) { uint32_t m = mp_obj_get_int_truncated(a0); common_hal__eve_Macro(EVEHAL(self), m); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(macro_obj, _macro); +static MP_DEFINE_CONST_FUN_OBJ_2(macro_obj, _macro); //| def Nop(self) -> None: //| """No operation""" //| ... -STATIC mp_obj_t _nop(mp_obj_t self) { +static mp_obj_t _nop(mp_obj_t self) { common_hal__eve_Nop(EVEHAL(self)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(nop_obj, _nop); +static MP_DEFINE_CONST_FUN_OBJ_1(nop_obj, _nop); //| def PaletteSource(self, addr: int) -> None: //| """Set the base address of the palette @@ -603,45 +603,45 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(nop_obj, _nop); //| """ //| ... -STATIC mp_obj_t _palettesource(mp_obj_t self, mp_obj_t a0) { +static mp_obj_t _palettesource(mp_obj_t self, mp_obj_t a0) { uint32_t addr = mp_obj_get_int_truncated(a0); common_hal__eve_PaletteSource(EVEHAL(self), addr); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(palettesource_obj, _palettesource); +static MP_DEFINE_CONST_FUN_OBJ_2(palettesource_obj, _palettesource); //| def RestoreContext(self) -> None: //| """Restore the current graphics context from the context stack""" //| ... -STATIC mp_obj_t _restorecontext(mp_obj_t self) { +static mp_obj_t _restorecontext(mp_obj_t self) { common_hal__eve_RestoreContext(EVEHAL(self)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(restorecontext_obj, _restorecontext); +static MP_DEFINE_CONST_FUN_OBJ_1(restorecontext_obj, _restorecontext); //| def Return(self) -> None: //| """Return from a previous call command""" //| ... -STATIC mp_obj_t _return(mp_obj_t self) { +static mp_obj_t _return(mp_obj_t self) { common_hal__eve_Return(EVEHAL(self)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(return_obj, _return); +static MP_DEFINE_CONST_FUN_OBJ_1(return_obj, _return); //| def SaveContext(self) -> None: //| """Push the current graphics context on the context stack""" //| ... -STATIC mp_obj_t _savecontext(mp_obj_t self) { +static mp_obj_t _savecontext(mp_obj_t self) { common_hal__eve_SaveContext(EVEHAL(self)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(savecontext_obj, _savecontext); +static MP_DEFINE_CONST_FUN_OBJ_1(savecontext_obj, _savecontext); //| def ScissorSize(self, width: int, height: int) -> None: //| """Set the size of the scissor clip rectangle @@ -653,13 +653,13 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(savecontext_obj, _savecontext); //| """ //| ... -STATIC mp_obj_t _scissorsize(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) { +static mp_obj_t _scissorsize(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) { uint32_t width = mp_obj_get_int_truncated(a0); uint32_t height = mp_obj_get_int_truncated(a1); common_hal__eve_ScissorSize(EVEHAL(self), width, height); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_3(scissorsize_obj, _scissorsize); +static MP_DEFINE_CONST_FUN_OBJ_3(scissorsize_obj, _scissorsize); //| def ScissorXY(self, x: int, y: int) -> None: //| """Set the top left corner of the scissor clip rectangle @@ -671,13 +671,13 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(scissorsize_obj, _scissorsize); //| """ //| ... -STATIC mp_obj_t _scissorxy(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) { +static mp_obj_t _scissorxy(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) { uint32_t x = mp_obj_get_int_truncated(a0); uint32_t y = mp_obj_get_int_truncated(a1); common_hal__eve_ScissorXY(EVEHAL(self), x, y); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_3(scissorxy_obj, _scissorxy); +static MP_DEFINE_CONST_FUN_OBJ_3(scissorxy_obj, _scissorxy); //| def StencilFunc(self, func: int, ref: int, mask: int) -> None: //| """Set function and reference value for stencil testing @@ -690,14 +690,14 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(scissorxy_obj, _scissorxy); //| """ //| ... -STATIC mp_obj_t _stencilfunc(size_t n_args, const mp_obj_t *args) { +static mp_obj_t _stencilfunc(size_t n_args, const mp_obj_t *args) { uint32_t func = mp_obj_get_int_truncated(args[1]); uint32_t ref = mp_obj_get_int_truncated(args[2]); uint32_t mask = mp_obj_get_int_truncated(args[3]); common_hal__eve_StencilFunc(EVEHAL(args[0]), func, ref, mask); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(stencilfunc_obj, 4, 4, _stencilfunc); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(stencilfunc_obj, 4, 4, _stencilfunc); //| def StencilMask(self, mask: int) -> None: //| """Control the writing of individual bits in the stencil planes @@ -708,12 +708,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(stencilfunc_obj, 4, 4, _stencilfunc); //| """ //| ... -STATIC mp_obj_t _stencilmask(mp_obj_t self, mp_obj_t a0) { +static mp_obj_t _stencilmask(mp_obj_t self, mp_obj_t a0) { uint32_t mask = mp_obj_get_int_truncated(a0); common_hal__eve_StencilMask(EVEHAL(self), mask); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(stencilmask_obj, _stencilmask); +static MP_DEFINE_CONST_FUN_OBJ_2(stencilmask_obj, _stencilmask); //| def StencilOp(self, sfail: int, spass: int) -> None: //| """Set stencil test actions @@ -725,13 +725,13 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(stencilmask_obj, _stencilmask); //| """ //| ... -STATIC mp_obj_t _stencilop(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) { +static mp_obj_t _stencilop(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) { uint32_t sfail = mp_obj_get_int_truncated(a0); uint32_t spass = mp_obj_get_int_truncated(a1); common_hal__eve_StencilOp(EVEHAL(self), sfail, spass); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_3(stencilop_obj, _stencilop); +static MP_DEFINE_CONST_FUN_OBJ_3(stencilop_obj, _stencilop); //| def TagMask(self, mask: int) -> None: //| """Control the writing of the tag buffer @@ -742,12 +742,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(stencilop_obj, _stencilop); //| """ //| ... -STATIC mp_obj_t _tagmask(mp_obj_t self, mp_obj_t a0) { +static mp_obj_t _tagmask(mp_obj_t self, mp_obj_t a0) { uint32_t mask = mp_obj_get_int_truncated(a0); common_hal__eve_TagMask(EVEHAL(self), mask); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(tagmask_obj, _tagmask); +static MP_DEFINE_CONST_FUN_OBJ_2(tagmask_obj, _tagmask); //| def Tag(self, s: int) -> None: //| """Set the current tag value @@ -758,19 +758,19 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(tagmask_obj, _tagmask); //| """ //| ... -STATIC mp_obj_t _tag(mp_obj_t self, mp_obj_t a0) { +static mp_obj_t _tag(mp_obj_t self, mp_obj_t a0) { uint32_t s = mp_obj_get_int_truncated(a0); common_hal__eve_Tag(EVEHAL(self), s); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(tag_obj, _tag); +static MP_DEFINE_CONST_FUN_OBJ_2(tag_obj, _tag); -STATIC mp_obj_t _vertexformat(mp_obj_t self, mp_obj_t a0) { +static mp_obj_t _vertexformat(mp_obj_t self, mp_obj_t a0) { uint32_t frac = mp_obj_get_int_truncated(a0); common_hal__eve_VertexFormat(EVEHAL(self), frac); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(vertexformat_obj, _vertexformat); +static MP_DEFINE_CONST_FUN_OBJ_2(vertexformat_obj, _vertexformat); //| def Vertex2ii(self, x: int, y: int, handle: int, cell: int) -> None: //| """:param int x: x-coordinate in pixels. Range 0-511 @@ -781,7 +781,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(vertexformat_obj, _vertexformat); //| This method is an alternative to :meth:`Vertex2f`.""" //| ... -STATIC mp_obj_t _vertex2ii(size_t n_args, const mp_obj_t *args) { +static mp_obj_t _vertex2ii(size_t n_args, const mp_obj_t *args) { uint32_t x = mp_obj_get_int_truncated(args[1]); uint32_t y = mp_obj_get_int_truncated(args[2]); uint32_t handle = (n_args > 3) ? mp_obj_get_int_truncated(args[3]) : 0; @@ -789,7 +789,7 @@ STATIC mp_obj_t _vertex2ii(size_t n_args, const mp_obj_t *args) { common_hal__eve_Vertex2ii(EVEHAL(args[0]), x, y, handle, cell); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(vertex2ii_obj, 3, 5, _vertex2ii); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(vertex2ii_obj, 3, 5, _vertex2ii); #define ROM_DECLS \ { MP_ROM_QSTR(MP_QSTR_AlphaFunc), MP_ROM_PTR(&alphafunc_obj) }, \ @@ -852,13 +852,13 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(vertex2ii_obj, 3, 5, _vertex2ii); //| :param float x: pixel x-coordinate //| :param float y: pixel y-coordinate""" //| ... -STATIC mp_obj_t _vertex2f(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) { +static mp_obj_t _vertex2f(mp_obj_t self, mp_obj_t a0, mp_obj_t a1) { mp_float_t x = mp_obj_get_float(a0); mp_float_t y = mp_obj_get_float(a1); common_hal__eve_Vertex2f(EVEHAL(self), x, y); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_3(vertex2f_obj, _vertex2f); +static MP_DEFINE_CONST_FUN_OBJ_3(vertex2f_obj, _vertex2f); //| def LineWidth(self, width: float) -> None: //| """Set the width of rasterized lines @@ -869,12 +869,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(vertex2f_obj, _vertex2f); //| """ //| ... -STATIC mp_obj_t _linewidth(mp_obj_t self, mp_obj_t a0) { +static mp_obj_t _linewidth(mp_obj_t self, mp_obj_t a0) { mp_float_t width = mp_obj_get_float(a0); common_hal__eve_LineWidth(EVEHAL(self), width); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(linewidth_obj, _linewidth); +static MP_DEFINE_CONST_FUN_OBJ_2(linewidth_obj, _linewidth); //| def PointSize(self, size: float) -> None: //| """Set the diameter of rasterized points @@ -885,12 +885,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(linewidth_obj, _linewidth); //| """ //| ... -STATIC mp_obj_t _pointsize(mp_obj_t self, mp_obj_t a0) { +static mp_obj_t _pointsize(mp_obj_t self, mp_obj_t a0) { mp_float_t size = mp_obj_get_float(a0); common_hal__eve_PointSize(EVEHAL(self), size); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(pointsize_obj, _pointsize); +static MP_DEFINE_CONST_FUN_OBJ_2(pointsize_obj, _pointsize); //| def VertexTranslateX(self, x: float) -> None: //| """Set the vertex transformation's x translation component @@ -901,12 +901,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(pointsize_obj, _pointsize); //| """ //| ... -STATIC mp_obj_t _vertextranslatex(mp_obj_t self, mp_obj_t a0) { +static mp_obj_t _vertextranslatex(mp_obj_t self, mp_obj_t a0) { mp_float_t x = mp_obj_get_float(a0); common_hal__eve_VertexTranslateX(EVEHAL(self), x); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(vertextranslatex_obj, _vertextranslatex); +static MP_DEFINE_CONST_FUN_OBJ_2(vertextranslatex_obj, _vertextranslatex); //| def VertexTranslateY(self, y: float) -> None: //| """Set the vertex transformation's y translation component @@ -918,12 +918,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(vertextranslatex_obj, _vertextranslatex); //| ... -STATIC mp_obj_t _vertextranslatey(mp_obj_t self, mp_obj_t a0) { +static mp_obj_t _vertextranslatey(mp_obj_t self, mp_obj_t a0) { mp_float_t y = mp_obj_get_float(a0); common_hal__eve_VertexTranslateY(EVEHAL(self), y); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(vertextranslatey_obj, _vertextranslatey); +static MP_DEFINE_CONST_FUN_OBJ_2(vertextranslatey_obj, _vertextranslatey); //| def VertexFormat(self, frac: int) -> None: //| """Set the precision of vertex2f coordinates @@ -949,12 +949,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(vertextranslatey_obj, _vertextranslatey); //| commands to the FIFO.""" //| ... -STATIC mp_obj_t _cmd0(mp_obj_t self, mp_obj_t n) { +static mp_obj_t _cmd0(mp_obj_t self, mp_obj_t n) { uint32_t code = 0xffffff00 | mp_obj_get_int_truncated(n); ADD_X(self, code); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(cmd0_obj, _cmd0); +static MP_DEFINE_CONST_FUN_OBJ_2(cmd0_obj, _cmd0); //| def cmd(self, n: int, fmt: str, args: Tuple[str, ...]) -> None: //| """Append a command packet to the FIFO. @@ -970,7 +970,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(cmd0_obj, _cmd0); //| commands to the FIFO.""" //| ... //| -STATIC mp_obj_t _cmd(size_t n_args, const mp_obj_t *args) { +static mp_obj_t _cmd(size_t n_args, const mp_obj_t *args) { mp_obj_t self = args[0]; mp_obj_t num = args[1]; mp_buffer_info_t fmt; @@ -1023,9 +1023,9 @@ STATIC mp_obj_t _cmd(size_t n_args, const mp_obj_t *args) { common_hal__eve_add(EVEHAL(self), sizeof(uint32_t) * (1 + n), buf); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(cmd_obj, 4, 4, _cmd); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(cmd_obj, 4, 4, _cmd); -STATIC const mp_rom_map_elem_t _EVE_locals_dict_table[] = { +static const mp_rom_map_elem_t _EVE_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_register), MP_ROM_PTR(®ister_obj) }, { MP_ROM_QSTR(MP_QSTR_cc), MP_ROM_PTR(&cc_obj) }, { MP_ROM_QSTR(MP_QSTR_flush), MP_ROM_PTR(&flush_obj) }, @@ -1034,9 +1034,9 @@ STATIC const mp_rom_map_elem_t _EVE_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_cmd0), MP_ROM_PTR(&cmd0_obj) }, ROM_DECLS }; -STATIC MP_DEFINE_CONST_DICT(_EVE_locals_dict, _EVE_locals_dict_table); +static MP_DEFINE_CONST_DICT(_EVE_locals_dict, _EVE_locals_dict_table); -STATIC mp_obj_t _EVE_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { +static mp_obj_t _EVE_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { // mp_arg_check_num(n_args, kw_args, 1, 1, false); mp_obj__EVE_t *o = mp_obj_malloc(mp_obj__EVE_t, &_EVE_type); o->_eve.n = 0; @@ -1044,7 +1044,7 @@ STATIC mp_obj_t _EVE_make_new(const mp_obj_type_t *type, size_t n_args, size_t n return MP_OBJ_FROM_PTR(o); } -STATIC MP_DEFINE_CONST_OBJ_TYPE( +static MP_DEFINE_CONST_OBJ_TYPE( _EVE_type, MP_QSTR__EVE, MP_TYPE_FLAG_NONE, @@ -1052,12 +1052,12 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE( locals_dict, &_EVE_locals_dict ); -STATIC const mp_rom_map_elem_t mp_module__eve_globals_table[] = { +static const mp_rom_map_elem_t mp_module__eve_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__eve) }, { MP_ROM_QSTR(MP_QSTR__EVE), MP_OBJ_FROM_PTR(&_EVE_type) }, }; -STATIC MP_DEFINE_CONST_DICT(mp_module__eve_globals, mp_module__eve_globals_table); +static MP_DEFINE_CONST_DICT(mp_module__eve_globals, mp_module__eve_globals_table); const mp_obj_module_t _eve_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/_pew/PewPew.c b/shared-bindings/_pew/PewPew.c index fcaf1a526dba7..af10b47ca6777 100644 --- a/shared-bindings/_pew/PewPew.c +++ b/shared-bindings/_pew/PewPew.c @@ -41,7 +41,7 @@ //| buttons are connected to rows of the matrix).""" //| ... //| -STATIC mp_obj_t pewpew_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t pewpew_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_buffer, ARG_rows, ARG_cols, ARG_buttons }; static const mp_arg_t allowed_args[] = { { MP_QSTR_buffer, MP_ARG_OBJ | MP_ARG_REQUIRED }, @@ -106,9 +106,9 @@ STATIC mp_obj_t pewpew_make_new(const mp_obj_type_t *type, size_t n_args, size_t } -STATIC const mp_rom_map_elem_t pewpew_locals_dict_table[] = { +static const mp_rom_map_elem_t pewpew_locals_dict_table[] = { }; -STATIC MP_DEFINE_CONST_DICT(pewpew_locals_dict, pewpew_locals_dict_table); +static MP_DEFINE_CONST_DICT(pewpew_locals_dict, pewpew_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( pewpew_type, diff --git a/shared-bindings/_pew/__init__.c b/shared-bindings/_pew/__init__.c index 8003a8409e457..002255f1154b2 100644 --- a/shared-bindings/_pew/__init__.c +++ b/shared-bindings/_pew/__init__.c @@ -10,7 +10,7 @@ #include "common-hal/_pew/PewPew.h" -STATIC mp_obj_t get_pressed(void) { +static mp_obj_t get_pressed(void) { pew_obj_t *pew = MP_STATE_VM(pew_singleton); if (!pew) { return mp_const_none; @@ -19,23 +19,23 @@ STATIC mp_obj_t get_pressed(void) { pew->pressed = 0; return mp_obj_new_int(pressed); } -STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_pressed_obj, get_pressed); +static MP_DEFINE_CONST_FUN_OBJ_0(get_pressed_obj, get_pressed); -STATIC mp_obj_t get_ticks(void) { +static mp_obj_t get_ticks(void) { return mp_obj_new_int(pew_get_ticks()); } -STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_ticks_obj, get_ticks); +static MP_DEFINE_CONST_FUN_OBJ_0(get_ticks_obj, get_ticks); //| """LED matrix driver""" -STATIC const mp_rom_map_elem_t pew_module_globals_table[] = { +static const mp_rom_map_elem_t pew_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__pew) }, { MP_OBJ_NEW_QSTR(MP_QSTR_PewPew), MP_ROM_PTR(&pewpew_type)}, { MP_OBJ_NEW_QSTR(MP_QSTR_get_pressed), MP_ROM_PTR(&get_pressed_obj)}, { MP_OBJ_NEW_QSTR(MP_QSTR_get_ticks), MP_ROM_PTR(&get_ticks_obj)}, }; -STATIC MP_DEFINE_CONST_DICT(pew_module_globals, +static MP_DEFINE_CONST_DICT(pew_module_globals, pew_module_globals_table); const mp_obj_module_t pew_module = { diff --git a/shared-bindings/_pixelmap/PixelMap.c b/shared-bindings/_pixelmap/PixelMap.c index 7ffa40e43bc42..6bddeaac9c3f5 100644 --- a/shared-bindings/_pixelmap/PixelMap.c +++ b/shared-bindings/_pixelmap/PixelMap.c @@ -19,7 +19,7 @@ //| def __init__(self, pixelbuf: PixelBuf, indices: Tuple[Union[int, Tuple[int]]]) -> None: //| """Construct a PixelMap object that uses the given indices of the underlying pixelbuf""" -STATIC mp_obj_t pixelmap_pixelmap_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t pixelmap_pixelmap_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_pixelbuf, ARG_indices }; static const mp_arg_t allowed_args[] = { { MP_QSTR_pixelbuf, MP_ARG_REQUIRED }, @@ -75,13 +75,13 @@ STATIC mp_obj_t pixelmap_pixelmap_make_new(const mp_obj_type_t *type, size_t n_a //| auto_write: bool //| """True if updates should be automatically written""" -STATIC mp_obj_t pixelmap_pixelmap_auto_write_get(const mp_obj_t self_in) { +static mp_obj_t pixelmap_pixelmap_auto_write_get(const mp_obj_t self_in) { pixelmap_pixelmap_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_bool(shared_module_pixelmap_pixelmap_auto_write_get(self)); } MP_DEFINE_CONST_FUN_OBJ_1(pixelmap_pixelmap_auto_write_get_obj, pixelmap_pixelmap_auto_write_get); -STATIC mp_obj_t pixelmap_pixelmap_auto_write_set(const mp_obj_t self_in, const mp_obj_t arg) { +static mp_obj_t pixelmap_pixelmap_auto_write_set(const mp_obj_t self_in, const mp_obj_t arg) { pixelmap_pixelmap_obj_t *self = MP_OBJ_TO_PTR(self_in); shared_module_pixelmap_pixelmap_auto_write_set(self, mp_obj_is_true(arg)); return mp_const_none; @@ -94,7 +94,7 @@ MP_PROPERTY_GETSET(pixelmap_pixelmap_auto_write_obj, //| bpp: int //| """The number of bytes per pixel in the buffer (read-only)""" -STATIC mp_obj_t pixelmap_pixelmap_obj_get_bpp(mp_obj_t self_in) { +static mp_obj_t pixelmap_pixelmap_obj_get_bpp(mp_obj_t self_in) { pixelmap_pixelmap_obj_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_adafruit_pixelbuf_pixelbuf_get_bpp(self->pixelbuf)); } @@ -105,7 +105,7 @@ MP_PROPERTY_GETTER(pixelmap_pixelmap_bpp_obj, //| byteorder: str //| """byteorder string for the buffer (read-only)""" -STATIC mp_obj_t pixelmap_pixelmap_obj_get_byteorder(mp_obj_t self_in) { +static mp_obj_t pixelmap_pixelmap_obj_get_byteorder(mp_obj_t self_in) { pixelmap_pixelmap_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_adafruit_pixelbuf_pixelbuf_get_byteorder_string(self->pixelbuf); } @@ -116,7 +116,7 @@ MP_PROPERTY_GETTER(pixelmap_pixelmap_byteorder_obj, //| //| def fill(self, color: PixelType) -> None: //| """Fill all the pixels in the map with the given color""" -STATIC mp_obj_t pixelmap_pixelmap_fill(const mp_obj_t self_in, const mp_obj_t color) { +static mp_obj_t pixelmap_pixelmap_fill(const mp_obj_t self_in, const mp_obj_t color) { pixelmap_pixelmap_obj_t *self = MP_OBJ_TO_PTR(self_in); shared_module_pixelmap_pixelmap_fill(self, color); @@ -127,7 +127,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(pixelmap_pixelmap_fill_obj, pixelmap_pixelmap_fill); //| //| def indices(self, index: int) -> Tuple[int]: //| """Return the PixelBuf indices for a PixelMap index""" -STATIC mp_obj_t pixelmap_pixelmap_indices(const mp_obj_t self_in, const mp_obj_t index) { +static mp_obj_t pixelmap_pixelmap_indices(const mp_obj_t self_in, const mp_obj_t index) { pixelmap_pixelmap_obj_t *self = MP_OBJ_TO_PTR(self_in); return shared_module_pixelmap_pixelmap_indices(self, mp_obj_get_int(index)); @@ -156,7 +156,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(pixelmap_pixelmap_indices_obj, pixelmap_pixelmap_indic //| For RGBW byteorders, if given only RGB values either as an int or as a tuple, the white value //| is used instead when the red, green, and blue values are the same.""" //| ... -STATIC mp_obj_t pixelmap_pixelmap_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) { +static mp_obj_t pixelmap_pixelmap_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) { pixelmap_pixelmap_obj_t *self = MP_OBJ_TO_PTR(self_in); if (value == MP_OBJ_NULL) { // delete @@ -200,7 +200,7 @@ STATIC mp_obj_t pixelmap_pixelmap_subscr(mp_obj_t self_in, mp_obj_t index_in, mp //| def __len__(self) -> int: //| """Length of the map""" -STATIC mp_obj_t pixelmap_pixelmap_unary_op(mp_unary_op_t op, mp_obj_t self_in) { +static mp_obj_t pixelmap_pixelmap_unary_op(mp_unary_op_t op, mp_obj_t self_in) { pixelmap_pixelmap_obj_t *self = MP_OBJ_TO_PTR(self_in); switch (op) { case MP_UNARY_OP_BOOL: @@ -218,14 +218,14 @@ STATIC mp_obj_t pixelmap_pixelmap_unary_op(mp_unary_op_t op, mp_obj_t self_in) { //| ... //| -STATIC mp_obj_t pixelmap_pixelmap_show(mp_obj_t self_in) { +static mp_obj_t pixelmap_pixelmap_show(mp_obj_t self_in) { pixelmap_pixelmap_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_adafruit_pixelbuf_pixelbuf_show(self->pixelbuf); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(pixelmap_pixelmap_show_obj, pixelmap_pixelmap_show); +static MP_DEFINE_CONST_FUN_OBJ_1(pixelmap_pixelmap_show_obj, pixelmap_pixelmap_show); -STATIC const mp_rom_map_elem_t pixelmap_pixelmap_locals_dict_table[] = { +static const mp_rom_map_elem_t pixelmap_pixelmap_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_auto_write), MP_ROM_PTR(&pixelmap_pixelmap_auto_write_obj) }, { MP_ROM_QSTR(MP_QSTR_bpp), MP_ROM_PTR(&pixelmap_pixelmap_bpp_obj) }, { MP_ROM_QSTR(MP_QSTR_byteorder), MP_ROM_PTR(&pixelmap_pixelmap_byteorder_obj) }, @@ -234,7 +234,7 @@ STATIC const mp_rom_map_elem_t pixelmap_pixelmap_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_show), MP_ROM_PTR(&pixelmap_pixelmap_show_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(pixelmap_pixelmap_locals_dict, pixelmap_pixelmap_locals_dict_table); +static MP_DEFINE_CONST_DICT(pixelmap_pixelmap_locals_dict, pixelmap_pixelmap_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( diff --git a/shared-bindings/_pixelmap/__init__.c b/shared-bindings/_pixelmap/__init__.c index 6ce5e60903f40..0f1a359fdc556 100644 --- a/shared-bindings/_pixelmap/__init__.c +++ b/shared-bindings/_pixelmap/__init__.c @@ -27,12 +27,12 @@ //| PixelType = Union[int, PixelReturnType] //| PixelSequence = Union[Tuple[PixelType], List[PixelType]] -STATIC const mp_rom_map_elem_t pixelmap_module_globals_table[] = { +static const mp_rom_map_elem_t pixelmap_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__pixelmap) }, { MP_ROM_QSTR(MP_QSTR_PixelMap), MP_ROM_PTR(&pixelmap_pixelmap_type) }, }; -STATIC MP_DEFINE_CONST_DICT(pixelmap_module_globals, pixelmap_module_globals_table); +static MP_DEFINE_CONST_DICT(pixelmap_module_globals, pixelmap_module_globals_table); const mp_obj_module_t pixelmap_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/_stage/Layer.c b/shared-bindings/_stage/Layer.c index a2ac6a5c93dda..3958b4c7f1c19 100644 --- a/shared-bindings/_stage/Layer.c +++ b/shared-bindings/_stage/Layer.c @@ -33,7 +33,7 @@ //| This class is intended for internal use in the ``stage`` library and //| it shouldn't be used on its own.""" //| ... -STATIC mp_obj_t layer_make_new(const mp_obj_type_t *type, size_t n_args, +static mp_obj_t layer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { mp_arg_check_num(n_args, n_kw, 4, 5, false); @@ -75,34 +75,34 @@ STATIC mp_obj_t layer_make_new(const mp_obj_type_t *type, size_t n_args, //| def move(self, x: int, y: int) -> None: //| """Set the offset of the layer to the specified values.""" //| ... -STATIC mp_obj_t layer_move(mp_obj_t self_in, mp_obj_t x_in, mp_obj_t y_in) { +static mp_obj_t layer_move(mp_obj_t self_in, mp_obj_t x_in, mp_obj_t y_in) { layer_obj_t *self = MP_OBJ_TO_PTR(self_in); self->x = mp_obj_get_int(x_in); self->y = mp_obj_get_int(y_in); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_3(layer_move_obj, layer_move); +static MP_DEFINE_CONST_FUN_OBJ_3(layer_move_obj, layer_move); //| def frame(self, frame: int, rotation: int) -> None: //| """Set the animation frame of the sprite, and optionally rotation its //| graphic.""" //| ... //| -STATIC mp_obj_t layer_frame(mp_obj_t self_in, mp_obj_t frame_in, +static mp_obj_t layer_frame(mp_obj_t self_in, mp_obj_t frame_in, mp_obj_t rotation_in) { layer_obj_t *self = MP_OBJ_TO_PTR(self_in); self->frame = mp_obj_get_int(frame_in); self->rotation = mp_obj_get_int(rotation_in); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_3(layer_frame_obj, layer_frame); +static MP_DEFINE_CONST_FUN_OBJ_3(layer_frame_obj, layer_frame); -STATIC const mp_rom_map_elem_t layer_locals_dict_table[] = { +static const mp_rom_map_elem_t layer_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_move), MP_ROM_PTR(&layer_move_obj) }, { MP_ROM_QSTR(MP_QSTR_frame), MP_ROM_PTR(&layer_frame_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(layer_locals_dict, layer_locals_dict_table); +static MP_DEFINE_CONST_DICT(layer_locals_dict, layer_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( mp_type_layer, diff --git a/shared-bindings/_stage/Text.c b/shared-bindings/_stage/Text.c index 2f24e951077bc..53abf03b77365 100644 --- a/shared-bindings/_stage/Text.c +++ b/shared-bindings/_stage/Text.c @@ -33,7 +33,7 @@ //| This class is intended for internal use in the ``stage`` library and //| it shouldn't be used on its own.""" //| ... -STATIC mp_obj_t text_make_new(const mp_obj_type_t *type, size_t n_args, +static mp_obj_t text_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { mp_arg_check_num(n_args, n_kw, 5, 5, false); @@ -70,19 +70,19 @@ STATIC mp_obj_t text_make_new(const mp_obj_type_t *type, size_t n_args, //| """Set the offset of the text to the specified values.""" //| ... //| -STATIC mp_obj_t text_move(mp_obj_t self_in, mp_obj_t x_in, mp_obj_t y_in) { +static mp_obj_t text_move(mp_obj_t self_in, mp_obj_t x_in, mp_obj_t y_in) { text_obj_t *self = MP_OBJ_TO_PTR(self_in); self->x = mp_obj_get_int(x_in); self->y = mp_obj_get_int(y_in); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_3(text_move_obj, text_move); +static MP_DEFINE_CONST_FUN_OBJ_3(text_move_obj, text_move); -STATIC const mp_rom_map_elem_t text_locals_dict_table[] = { +static const mp_rom_map_elem_t text_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_move), MP_ROM_PTR(&text_move_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(text_locals_dict, text_locals_dict_table); +static MP_DEFINE_CONST_DICT(text_locals_dict, text_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( mp_type_text, diff --git a/shared-bindings/_stage/__init__.c b/shared-bindings/_stage/__init__.c index 0ab1b89b2ee2e..06e103e2441b6 100644 --- a/shared-bindings/_stage/__init__.c +++ b/shared-bindings/_stage/__init__.c @@ -50,7 +50,7 @@ //| This function is intended for internal use in the ``stage`` library //| and all the necessary checks are performed there.""" //| -STATIC mp_obj_t stage_render(size_t n_args, const mp_obj_t *args) { +static mp_obj_t stage_render(size_t n_args, const mp_obj_t *args) { uint16_t x0 = mp_obj_get_int(args[0]); uint16_t y0 = mp_obj_get_int(args[1]); uint16_t x1 = mp_obj_get_int(args[2]); @@ -84,14 +84,14 @@ STATIC mp_obj_t stage_render(size_t n_args, const mp_obj_t *args) { MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(stage_render_obj, 10, 10, stage_render); -STATIC const mp_rom_map_elem_t stage_module_globals_table[] = { +static const mp_rom_map_elem_t stage_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__stage) }, { MP_ROM_QSTR(MP_QSTR_Layer), MP_ROM_PTR(&mp_type_layer) }, { MP_ROM_QSTR(MP_QSTR_Text), MP_ROM_PTR(&mp_type_text) }, { MP_ROM_QSTR(MP_QSTR_render), MP_ROM_PTR(&stage_render_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(stage_module_globals, stage_module_globals_table); +static MP_DEFINE_CONST_DICT(stage_module_globals, stage_module_globals_table); const mp_obj_module_t stage_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/adafruit_bus_device/__init__.c b/shared-bindings/adafruit_bus_device/__init__.c index f21f299018290..5be8883dda25a 100644 --- a/shared-bindings/adafruit_bus_device/__init__.c +++ b/shared-bindings/adafruit_bus_device/__init__.c @@ -15,22 +15,22 @@ #include "shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.h" #include "shared-bindings/adafruit_bus_device/spi_device/SPIDevice.h" -STATIC const mp_rom_map_elem_t adafruit_bus_device_i2c_device_globals_table[] = { +static const mp_rom_map_elem_t adafruit_bus_device_i2c_device_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_i2c_device) }, { MP_ROM_QSTR(MP_QSTR_I2CDevice), MP_ROM_PTR(&adafruit_bus_device_i2cdevice_type) }, }; -STATIC MP_DEFINE_CONST_DICT(adafruit_bus_device_i2c_device_globals, adafruit_bus_device_i2c_device_globals_table); +static MP_DEFINE_CONST_DICT(adafruit_bus_device_i2c_device_globals, adafruit_bus_device_i2c_device_globals_table); const mp_obj_module_t adafruit_bus_device_i2c_device_module = { .base = { &mp_type_module }, .globals = (mp_obj_dict_t *)&adafruit_bus_device_i2c_device_globals, }; -STATIC const mp_rom_map_elem_t adafruit_bus_device_spi_device_globals_table[] = { +static const mp_rom_map_elem_t adafruit_bus_device_spi_device_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_spi_device) }, { MP_ROM_QSTR(MP_QSTR_SPIDevice), MP_ROM_PTR(&adafruit_bus_device_spidevice_type) }, }; -STATIC MP_DEFINE_CONST_DICT(adafruit_bus_device_spi_device_globals, adafruit_bus_device_spi_device_globals_table); +static MP_DEFINE_CONST_DICT(adafruit_bus_device_spi_device_globals, adafruit_bus_device_spi_device_globals_table); const mp_obj_module_t adafruit_bus_device_spi_device_module = { .base = { &mp_type_module }, @@ -43,13 +43,13 @@ const mp_obj_module_t adafruit_bus_device_spi_device_module = { //| For example, they manage locking the bus to prevent other concurrent access. For SPI //| devices, it manages the chip select and protocol changes such as mode. For I2C, it //| manages the device address.""" -STATIC const mp_rom_map_elem_t adafruit_bus_device_module_globals_table[] = { +static const mp_rom_map_elem_t adafruit_bus_device_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_adafruit_bus_device) }, { MP_ROM_QSTR(MP_QSTR_i2c_device), MP_ROM_PTR(&adafruit_bus_device_i2c_device_module) }, { MP_ROM_QSTR(MP_QSTR_spi_device), MP_ROM_PTR(&adafruit_bus_device_spi_device_module) }, }; -STATIC MP_DEFINE_CONST_DICT(adafruit_bus_device_module_globals, adafruit_bus_device_module_globals_table); +static MP_DEFINE_CONST_DICT(adafruit_bus_device_module_globals, adafruit_bus_device_module_globals_table); const mp_obj_module_t adafruit_bus_device_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.c b/shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.c index 00988704e4fb6..737ff419ddaa1 100644 --- a/shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.c +++ b/shared-bindings/adafruit_bus_device/i2c_device/I2CDevice.c @@ -44,7 +44,7 @@ //| device.write(bytes_read) //| """ //| ... -STATIC mp_obj_t adafruit_bus_device_i2cdevice_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t adafruit_bus_device_i2cdevice_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { adafruit_bus_device_i2cdevice_obj_t *self = mp_obj_malloc(adafruit_bus_device_i2cdevice_obj_t, &adafruit_bus_device_i2cdevice_type); enum { ARG_i2c, ARG_device_address, ARG_probe }; @@ -69,21 +69,21 @@ STATIC mp_obj_t adafruit_bus_device_i2cdevice_make_new(const mp_obj_type_t *type //| def __enter__(self) -> I2CDevice: //| """Context manager entry to lock bus.""" //| ... -STATIC mp_obj_t adafruit_bus_device_i2cdevice_obj___enter__(mp_obj_t self_in) { +static mp_obj_t adafruit_bus_device_i2cdevice_obj___enter__(mp_obj_t self_in) { adafruit_bus_device_i2cdevice_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_adafruit_bus_device_i2cdevice_lock(self); return self; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(adafruit_bus_device_i2cdevice___enter___obj, adafruit_bus_device_i2cdevice_obj___enter__); +static MP_DEFINE_CONST_FUN_OBJ_1(adafruit_bus_device_i2cdevice___enter___obj, adafruit_bus_device_i2cdevice_obj___enter__); //| def __exit__(self) -> None: //| """Automatically unlocks the bus on exit.""" //| ... -STATIC mp_obj_t adafruit_bus_device_i2cdevice_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t adafruit_bus_device_i2cdevice_obj___exit__(size_t n_args, const mp_obj_t *args) { common_hal_adafruit_bus_device_i2cdevice_unlock(MP_OBJ_TO_PTR(args[0])); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(adafruit_bus_device_i2cdevice___exit___obj, 4, 4, adafruit_bus_device_i2cdevice_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(adafruit_bus_device_i2cdevice___exit___obj, 4, 4, adafruit_bus_device_i2cdevice_obj___exit__); //| import sys //| def readinto( @@ -100,7 +100,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(adafruit_bus_device_i2cdevice___exit_ //| :param int end: end of buffer slice; if not specified, use ``len(buffer)`` //| """ //| ... -STATIC mp_obj_t adafruit_bus_device_i2cdevice_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t adafruit_bus_device_i2cdevice_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_buffer, ARG_start, ARG_end }; static const mp_arg_t allowed_args[] = { { MP_QSTR_buffer, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -131,7 +131,7 @@ STATIC mp_obj_t adafruit_bus_device_i2cdevice_readinto(size_t n_args, const mp_o return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(adafruit_bus_device_i2cdevice_readinto_obj, 1, adafruit_bus_device_i2cdevice_readinto); +static MP_DEFINE_CONST_FUN_OBJ_KW(adafruit_bus_device_i2cdevice_readinto_obj, 1, adafruit_bus_device_i2cdevice_readinto); //| import sys //| def write(self, buffer: ReadableBuffer, *, start: int = 0, end: int = sys.maxsize) -> None: @@ -146,7 +146,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(adafruit_bus_device_i2cdevice_readinto_obj, 1, //| :param int end: end of buffer slice; if not specified, use ``len(buffer)`` //| """ //| ... -STATIC mp_obj_t adafruit_bus_device_i2cdevice_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t adafruit_bus_device_i2cdevice_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_buffer, ARG_start, ARG_end }; static const mp_arg_t allowed_args[] = { { MP_QSTR_buffer, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -210,7 +210,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(adafruit_bus_device_i2cdevice_write_obj, 1, adafruit_ //| """ //| ... //| -STATIC mp_obj_t adafruit_bus_device_i2cdevice_write_then_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t adafruit_bus_device_i2cdevice_write_then_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_out_buffer, ARG_in_buffer, ARG_out_start, ARG_out_end, ARG_in_start, ARG_in_end }; static const mp_arg_t allowed_args[] = { { MP_QSTR_out_buffer, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -254,7 +254,7 @@ STATIC mp_obj_t adafruit_bus_device_i2cdevice_write_then_readinto(size_t n_args, } MP_DEFINE_CONST_FUN_OBJ_KW(adafruit_bus_device_i2cdevice_write_then_readinto_obj, 1, adafruit_bus_device_i2cdevice_write_then_readinto); -STATIC const mp_rom_map_elem_t adafruit_bus_device_i2cdevice_locals_dict_table[] = { +static const mp_rom_map_elem_t adafruit_bus_device_i2cdevice_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&adafruit_bus_device_i2cdevice___enter___obj) }, { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&adafruit_bus_device_i2cdevice___exit___obj) }, { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&adafruit_bus_device_i2cdevice_readinto_obj) }, @@ -262,7 +262,7 @@ STATIC const mp_rom_map_elem_t adafruit_bus_device_i2cdevice_locals_dict_table[] { MP_ROM_QSTR(MP_QSTR_write_then_readinto), MP_ROM_PTR(&adafruit_bus_device_i2cdevice_write_then_readinto_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(adafruit_bus_device_i2cdevice_locals_dict, adafruit_bus_device_i2cdevice_locals_dict_table); +static MP_DEFINE_CONST_DICT(adafruit_bus_device_i2cdevice_locals_dict, adafruit_bus_device_i2cdevice_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( adafruit_bus_device_i2cdevice_type, diff --git a/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c b/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c index 6306085272ff8..6336b0cd12276 100644 --- a/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c +++ b/shared-bindings/adafruit_bus_device/spi_device/SPIDevice.c @@ -56,7 +56,7 @@ //| with device as spi: //| spi.write(bytes_read)""" //| ... -STATIC mp_obj_t adafruit_bus_device_spidevice_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t adafruit_bus_device_spidevice_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { adafruit_bus_device_spidevice_obj_t *self = mp_obj_malloc(adafruit_bus_device_spidevice_obj_t, &adafruit_bus_device_spidevice_type); enum { ARG_spi, ARG_chip_select, ARG_cs_active_value, ARG_baudrate, ARG_polarity, ARG_phase, ARG_extra_clocks }; @@ -97,11 +97,11 @@ STATIC mp_obj_t adafruit_bus_device_spidevice_make_new(const mp_obj_type_t *type //| def __enter__(self) -> busio.SPI: //| """Starts a SPI transaction by configuring the SPI and asserting chip select.""" //| ... -STATIC mp_obj_t adafruit_bus_device_spidevice_obj___enter__(mp_obj_t self_in) { +static mp_obj_t adafruit_bus_device_spidevice_obj___enter__(mp_obj_t self_in) { adafruit_bus_device_spidevice_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_adafruit_bus_device_spidevice_enter(self); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(adafruit_bus_device_spidevice___enter___obj, adafruit_bus_device_spidevice_obj___enter__); +static MP_DEFINE_CONST_FUN_OBJ_1(adafruit_bus_device_spidevice___enter___obj, adafruit_bus_device_spidevice_obj___enter__); //| def __exit__(self) -> None: @@ -109,18 +109,18 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(adafruit_bus_device_spidevice___enter___obj, ad //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... //| -STATIC mp_obj_t adafruit_bus_device_spidevice_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t adafruit_bus_device_spidevice_obj___exit__(size_t n_args, const mp_obj_t *args) { common_hal_adafruit_bus_device_spidevice_exit(MP_OBJ_TO_PTR(args[0])); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(adafruit_bus_device_spidevice___exit___obj, 4, 4, adafruit_bus_device_spidevice_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(adafruit_bus_device_spidevice___exit___obj, 4, 4, adafruit_bus_device_spidevice_obj___exit__); -STATIC const mp_rom_map_elem_t adafruit_bus_device_spidevice_locals_dict_table[] = { +static const mp_rom_map_elem_t adafruit_bus_device_spidevice_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&adafruit_bus_device_spidevice___enter___obj) }, { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&adafruit_bus_device_spidevice___exit___obj) }, }; -STATIC MP_DEFINE_CONST_DICT(adafruit_bus_device_spidevice_locals_dict, adafruit_bus_device_spidevice_locals_dict_table); +static MP_DEFINE_CONST_DICT(adafruit_bus_device_spidevice_locals_dict, adafruit_bus_device_spidevice_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( adafruit_bus_device_spidevice_type, diff --git a/shared-bindings/adafruit_pixelbuf/PixelBuf.c b/shared-bindings/adafruit_pixelbuf/PixelBuf.c index dd6588087534c..95b353611f734 100644 --- a/shared-bindings/adafruit_pixelbuf/PixelBuf.c +++ b/shared-bindings/adafruit_pixelbuf/PixelBuf.c @@ -61,7 +61,7 @@ static void parse_byteorder(mp_obj_t byteorder_obj, pixelbuf_byteorder_details_t //| :param ~circuitpython_typing.ReadableBuffer trailer: Sequence of bytes to always send after pixel values. //| """ //| ... -STATIC mp_obj_t pixelbuf_pixelbuf_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t pixelbuf_pixelbuf_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_size, ARG_byteorder, ARG_brightness, ARG_auto_write, ARG_header, ARG_trailer }; static const mp_arg_t allowed_args[] = { { MP_QSTR_size, MP_ARG_REQUIRED | MP_ARG_INT }, @@ -145,7 +145,7 @@ static void parse_byteorder(mp_obj_t byteorder_obj, pixelbuf_byteorder_details_t //| bpp: int //| """The number of bytes per pixel in the buffer (read-only)""" -STATIC mp_obj_t pixelbuf_pixelbuf_obj_get_bpp(mp_obj_t self_in) { +static mp_obj_t pixelbuf_pixelbuf_obj_get_bpp(mp_obj_t self_in) { return MP_OBJ_NEW_SMALL_INT(common_hal_adafruit_pixelbuf_pixelbuf_get_bpp(self_in)); } MP_DEFINE_CONST_FUN_OBJ_1(pixelbuf_pixelbuf_get_bpp_obj, pixelbuf_pixelbuf_obj_get_bpp); @@ -159,13 +159,13 @@ MP_PROPERTY_GETTER(pixelbuf_pixelbuf_bpp_obj, //| //| When brightness is less than 1.0, a second buffer will be used to store the color values //| before they are adjusted for brightness.""" -STATIC mp_obj_t pixelbuf_pixelbuf_obj_get_brightness(mp_obj_t self_in) { +static mp_obj_t pixelbuf_pixelbuf_obj_get_brightness(mp_obj_t self_in) { return mp_obj_new_float(common_hal_adafruit_pixelbuf_pixelbuf_get_brightness(self_in)); } MP_DEFINE_CONST_FUN_OBJ_1(pixelbuf_pixelbuf_get_brightness_obj, pixelbuf_pixelbuf_obj_get_brightness); -STATIC mp_obj_t pixelbuf_pixelbuf_obj_set_brightness(mp_obj_t self_in, mp_obj_t value) { +static mp_obj_t pixelbuf_pixelbuf_obj_set_brightness(mp_obj_t self_in, mp_obj_t value) { mp_float_t brightness = mp_obj_get_float(value); if (brightness > 1) { brightness = 1; @@ -183,13 +183,13 @@ MP_PROPERTY_GETSET(pixelbuf_pixelbuf_brightness_obj, //| auto_write: bool //| """Whether to automatically write the pixels after each update.""" -STATIC mp_obj_t pixelbuf_pixelbuf_obj_get_auto_write(mp_obj_t self_in) { +static mp_obj_t pixelbuf_pixelbuf_obj_get_auto_write(mp_obj_t self_in) { return mp_obj_new_bool(common_hal_adafruit_pixelbuf_pixelbuf_get_auto_write(self_in)); } MP_DEFINE_CONST_FUN_OBJ_1(pixelbuf_pixelbuf_get_auto_write_obj, pixelbuf_pixelbuf_obj_get_auto_write); -STATIC mp_obj_t pixelbuf_pixelbuf_obj_set_auto_write(mp_obj_t self_in, mp_obj_t value) { +static mp_obj_t pixelbuf_pixelbuf_obj_set_auto_write(mp_obj_t self_in, mp_obj_t value) { common_hal_adafruit_pixelbuf_pixelbuf_set_auto_write(self_in, mp_obj_is_true(value)); return mp_const_none; } @@ -201,7 +201,7 @@ MP_PROPERTY_GETSET(pixelbuf_pixelbuf_auto_write_obj, //| byteorder: str //| """byteorder string for the buffer (read-only)""" -STATIC mp_obj_t pixelbuf_pixelbuf_obj_get_byteorder(mp_obj_t self_in) { +static mp_obj_t pixelbuf_pixelbuf_obj_get_byteorder(mp_obj_t self_in) { return common_hal_adafruit_pixelbuf_pixelbuf_get_byteorder_string(self_in); } MP_DEFINE_CONST_FUN_OBJ_1(pixelbuf_pixelbuf_get_byteorder_str, pixelbuf_pixelbuf_obj_get_byteorder); @@ -209,7 +209,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(pixelbuf_pixelbuf_get_byteorder_str, pixelbuf_pixelbuf MP_PROPERTY_GETTER(pixelbuf_pixelbuf_byteorder_str, (mp_obj_t)&pixelbuf_pixelbuf_get_byteorder_str); -STATIC mp_obj_t pixelbuf_pixelbuf_unary_op(mp_unary_op_t op, mp_obj_t self_in) { +static mp_obj_t pixelbuf_pixelbuf_unary_op(mp_unary_op_t op, mp_obj_t self_in) { switch (op) { case MP_UNARY_OP_BOOL: return mp_const_true; @@ -225,22 +225,22 @@ STATIC mp_obj_t pixelbuf_pixelbuf_unary_op(mp_unary_op_t op, mp_obj_t self_in) { //| when `auto_write` is True.""" //| ... -STATIC mp_obj_t pixelbuf_pixelbuf_show(mp_obj_t self_in) { +static mp_obj_t pixelbuf_pixelbuf_show(mp_obj_t self_in) { common_hal_adafruit_pixelbuf_pixelbuf_show(self_in); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(pixelbuf_pixelbuf_show_obj, pixelbuf_pixelbuf_show); +static MP_DEFINE_CONST_FUN_OBJ_1(pixelbuf_pixelbuf_show_obj, pixelbuf_pixelbuf_show); //| def fill(self, color: PixelType) -> None: //| """Fills the given pixelbuf with the given color.""" //| ... -STATIC mp_obj_t pixelbuf_pixelbuf_fill(mp_obj_t self_in, mp_obj_t value) { +static mp_obj_t pixelbuf_pixelbuf_fill(mp_obj_t self_in, mp_obj_t value) { common_hal_adafruit_pixelbuf_pixelbuf_fill(self_in, value); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(pixelbuf_pixelbuf_fill_obj, pixelbuf_pixelbuf_fill); +static MP_DEFINE_CONST_FUN_OBJ_2(pixelbuf_pixelbuf_fill_obj, pixelbuf_pixelbuf_fill); //| @overload //| def __getitem__(self, index: slice) -> PixelReturnSequence: @@ -267,7 +267,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(pixelbuf_pixelbuf_fill_obj, pixelbuf_pixelbuf_f //| is used instead when the red, green, and blue values are the same.""" //| ... //| -STATIC mp_obj_t pixelbuf_pixelbuf_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) { +static mp_obj_t pixelbuf_pixelbuf_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) { if (value == MP_OBJ_NULL) { // delete item // slice deletion @@ -338,7 +338,7 @@ STATIC mp_obj_t pixelbuf_pixelbuf_subscr(mp_obj_t self_in, mp_obj_t index_in, mp } } -STATIC const mp_rom_map_elem_t pixelbuf_pixelbuf_locals_dict_table[] = { +static const mp_rom_map_elem_t pixelbuf_pixelbuf_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_auto_write), MP_ROM_PTR(&pixelbuf_pixelbuf_auto_write_obj)}, { MP_ROM_QSTR(MP_QSTR_bpp), MP_ROM_PTR(&pixelbuf_pixelbuf_bpp_obj)}, { MP_ROM_QSTR(MP_QSTR_brightness), MP_ROM_PTR(&pixelbuf_pixelbuf_brightness_obj)}, @@ -347,7 +347,7 @@ STATIC const mp_rom_map_elem_t pixelbuf_pixelbuf_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_fill), MP_ROM_PTR(&pixelbuf_pixelbuf_fill_obj)}, }; -STATIC MP_DEFINE_CONST_DICT(pixelbuf_pixelbuf_locals_dict, pixelbuf_pixelbuf_locals_dict_table); +static MP_DEFINE_CONST_DICT(pixelbuf_pixelbuf_locals_dict, pixelbuf_pixelbuf_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( diff --git a/shared-bindings/adafruit_pixelbuf/__init__.c b/shared-bindings/adafruit_pixelbuf/__init__.c index 34d6919a5de7e..5cdc2822a3584 100644 --- a/shared-bindings/adafruit_pixelbuf/__init__.c +++ b/shared-bindings/adafruit_pixelbuf/__init__.c @@ -30,12 +30,12 @@ //| PixelSequence = Union[Tuple[PixelType], List[PixelType]] // TODO: Pull in docs from adafruit_pixelbuf. -STATIC const mp_rom_map_elem_t pixelbuf_module_globals_table[] = { +static const mp_rom_map_elem_t pixelbuf_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_adafruit_pixelbuf) }, { MP_ROM_QSTR(MP_QSTR_PixelBuf), MP_ROM_PTR(&pixelbuf_pixelbuf_type) }, }; -STATIC MP_DEFINE_CONST_DICT(pixelbuf_module_globals, pixelbuf_module_globals_table); +static MP_DEFINE_CONST_DICT(pixelbuf_module_globals, pixelbuf_module_globals_table); const mp_obj_module_t pixelbuf_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/aesio/__init__.c b/shared-bindings/aesio/__init__.c index 345948b6bd7e3..bf20f471b8484 100644 --- a/shared-bindings/aesio/__init__.c +++ b/shared-bindings/aesio/__init__.c @@ -21,7 +21,7 @@ //| """ -STATIC const mp_obj_tuple_t mp_aes_key_size_obj = { +static const mp_obj_tuple_t mp_aes_key_size_obj = { {&mp_type_tuple}, 3, { @@ -31,7 +31,7 @@ STATIC const mp_obj_tuple_t mp_aes_key_size_obj = { } }; -STATIC const mp_rom_map_elem_t aesio_module_globals_table[] = { +static const mp_rom_map_elem_t aesio_module_globals_table[] = { {MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_aesio)}, {MP_ROM_QSTR(MP_QSTR_AES), MP_ROM_PTR(&aesio_aes_type) }, {MP_ROM_QSTR(MP_QSTR_MODE_ECB), MP_ROM_INT(AES_MODE_ECB)}, @@ -41,7 +41,7 @@ STATIC const mp_rom_map_elem_t aesio_module_globals_table[] = { {MP_ROM_QSTR(MP_QSTR_key_size), (mp_obj_t)&mp_aes_key_size_obj}, }; -STATIC MP_DEFINE_CONST_DICT(aesio_module_globals, aesio_module_globals_table); +static MP_DEFINE_CONST_DICT(aesio_module_globals, aesio_module_globals_table); const mp_obj_module_t aesio_module = { .base = {&mp_type_module}, diff --git a/shared-bindings/aesio/aes.c b/shared-bindings/aesio/aes.c index 6316c4643e922..33f2a3356329c 100644 --- a/shared-bindings/aesio/aes.c +++ b/shared-bindings/aesio/aes.c @@ -51,7 +51,7 @@ //| hexlify(outp)""" //| ... -STATIC mp_obj_t aesio_aes_make_new(const mp_obj_type_t *type, size_t n_args, +static mp_obj_t aesio_aes_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { aesio_aes_obj_t *self = mp_obj_malloc(aesio_aes_obj_t, &aesio_aes_type); @@ -114,7 +114,7 @@ STATIC mp_obj_t aesio_aes_make_new(const mp_obj_type_t *type, size_t n_args, //| :param ~circuitpython_typing.ReadableBuffer IV: Initialization vector to use //| for CBC or CTR mode""" //| ... -STATIC mp_obj_t aesio_aes_rekey(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t aesio_aes_rekey(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { aesio_aes_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); enum { ARG_key, ARG_IV }; static const mp_arg_t allowed_args[] = { @@ -147,7 +147,7 @@ STATIC mp_obj_t aesio_aes_rekey(size_t n_args, const mp_obj_t *pos_args, mp_map_ } MP_DEFINE_CONST_FUN_OBJ_KW(aesio_aes_rekey_obj, 1, aesio_aes_rekey); -STATIC void validate_length(aesio_aes_obj_t *self, size_t src_length, +static void validate_length(aesio_aes_obj_t *self, size_t src_length, size_t dest_length) { if (src_length != dest_length) { mp_raise_ValueError( @@ -177,7 +177,7 @@ STATIC void validate_length(aesio_aes_obj_t *self, size_t src_length, //| buffers must be a multiple of 16 bytes, and must be equal length. For //| CTR mode, there are no restrictions.""" //| ... -STATIC mp_obj_t aesio_aes_encrypt_into(mp_obj_t self_in, mp_obj_t src, mp_obj_t dest) { +static mp_obj_t aesio_aes_encrypt_into(mp_obj_t self_in, mp_obj_t src, mp_obj_t dest) { aesio_aes_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_buffer_info_t srcbufinfo, destbufinfo; @@ -191,7 +191,7 @@ STATIC mp_obj_t aesio_aes_encrypt_into(mp_obj_t self_in, mp_obj_t src, mp_obj_t return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_3(aesio_aes_encrypt_into_obj, aesio_aes_encrypt_into); +static MP_DEFINE_CONST_FUN_OBJ_3(aesio_aes_encrypt_into_obj, aesio_aes_encrypt_into); //| def decrypt_into(self, src: ReadableBuffer, dest: WriteableBuffer) -> None: //| """Decrypt the buffer from ``src`` into ``dest``. @@ -200,7 +200,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(aesio_aes_encrypt_into_obj, aesio_aes_encrypt_i //| CTR mode, there are no restrictions.""" //| ... //| -STATIC mp_obj_t aesio_aes_decrypt_into(mp_obj_t self_in, mp_obj_t src, mp_obj_t dest) { +static mp_obj_t aesio_aes_decrypt_into(mp_obj_t self_in, mp_obj_t src, mp_obj_t dest) { aesio_aes_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_buffer_info_t srcbufinfo, destbufinfo; @@ -214,16 +214,16 @@ STATIC mp_obj_t aesio_aes_decrypt_into(mp_obj_t self_in, mp_obj_t src, mp_obj_t return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_3(aesio_aes_decrypt_into_obj, aesio_aes_decrypt_into); +static MP_DEFINE_CONST_FUN_OBJ_3(aesio_aes_decrypt_into_obj, aesio_aes_decrypt_into); -STATIC mp_obj_t aesio_aes_get_mode(mp_obj_t self_in) { +static mp_obj_t aesio_aes_get_mode(mp_obj_t self_in) { aesio_aes_obj_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_NEW_SMALL_INT(self->mode); } MP_DEFINE_CONST_FUN_OBJ_1(aesio_aes_get_mode_obj, aesio_aes_get_mode); -STATIC mp_obj_t aesio_aes_set_mode(mp_obj_t self_in, mp_obj_t mode_obj) { +static mp_obj_t aesio_aes_set_mode(mp_obj_t self_in, mp_obj_t mode_obj) { aesio_aes_obj_t *self = MP_OBJ_TO_PTR(self_in); int mode = mp_obj_get_int(mode_obj); @@ -245,7 +245,7 @@ MP_PROPERTY_GETSET(aesio_aes_mode_obj, (mp_obj_t)&aesio_aes_get_mode_obj, (mp_obj_t)&aesio_aes_set_mode_obj); -STATIC const mp_rom_map_elem_t aesio_locals_dict_table[] = { +static const mp_rom_map_elem_t aesio_locals_dict_table[] = { // Methods {MP_ROM_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_AES)}, {MP_ROM_QSTR(MP_QSTR_encrypt_into), (mp_obj_t)&aesio_aes_encrypt_into_obj}, @@ -253,7 +253,7 @@ STATIC const mp_rom_map_elem_t aesio_locals_dict_table[] = { {MP_ROM_QSTR(MP_QSTR_rekey), (mp_obj_t)&aesio_aes_rekey_obj}, {MP_ROM_QSTR(MP_QSTR_mode), (mp_obj_t)&aesio_aes_mode_obj}, }; -STATIC MP_DEFINE_CONST_DICT(aesio_locals_dict, aesio_locals_dict_table); +static MP_DEFINE_CONST_DICT(aesio_locals_dict, aesio_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( aesio_aes_type, diff --git a/shared-bindings/alarm/SleepMemory.c b/shared-bindings/alarm/SleepMemory.c index 9a003420215a7..cf1b211c6853f 100644 --- a/shared-bindings/alarm/SleepMemory.c +++ b/shared-bindings/alarm/SleepMemory.c @@ -43,7 +43,7 @@ //| def __len__(self) -> int: //| """Return the length. This is used by (`len`)""" //| ... -STATIC mp_obj_t alarm_sleep_memory_unary_op(mp_unary_op_t op, mp_obj_t self_in) { +static mp_obj_t alarm_sleep_memory_unary_op(mp_unary_op_t op, mp_obj_t self_in) { alarm_sleep_memory_obj_t *self = MP_OBJ_TO_PTR(self_in); uint16_t len = common_hal_alarm_sleep_memory_get_length(self); switch (op) { @@ -56,10 +56,10 @@ STATIC mp_obj_t alarm_sleep_memory_unary_op(mp_unary_op_t op, mp_obj_t self_in) } } -STATIC const mp_rom_map_elem_t alarm_sleep_memory_locals_dict_table[] = { +static const mp_rom_map_elem_t alarm_sleep_memory_locals_dict_table[] = { }; -STATIC MP_DEFINE_CONST_DICT(alarm_sleep_memory_locals_dict, alarm_sleep_memory_locals_dict_table); +static MP_DEFINE_CONST_DICT(alarm_sleep_memory_locals_dict, alarm_sleep_memory_locals_dict_table); //| @overload //| def __getitem__(self, index: slice) -> bytearray: ... @@ -75,7 +75,7 @@ STATIC MP_DEFINE_CONST_DICT(alarm_sleep_memory_locals_dict, alarm_sleep_memory_l //| """Set the value at the given index.""" //| ... //| -STATIC mp_obj_t alarm_sleep_memory_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) { +static mp_obj_t alarm_sleep_memory_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) { if (value == MP_OBJ_NULL) { // delete item // slice deletion diff --git a/shared-bindings/alarm/__init__.c b/shared-bindings/alarm/__init__.c index f617395f08e02..c74b162d0a3ff 100644 --- a/shared-bindings/alarm/__init__.c +++ b/shared-bindings/alarm/__init__.c @@ -57,7 +57,7 @@ // wake_alarm is implemented as a dictionary entry, so there's no code here. -STATIC void validate_objs_are_alarms(size_t n_args, const mp_obj_t *objs) { +static void validate_objs_are_alarms(size_t n_args, const mp_obj_t *objs) { for (size_t i = 0; i < n_args; i++) { if (mp_obj_is_type(objs[i], &alarm_pin_pinalarm_type) || mp_obj_is_type(objs[i], &alarm_time_timealarm_type) || @@ -88,7 +88,7 @@ STATIC void validate_objs_are_alarms(size_t n_args, const mp_obj_t *objs) { //| """ //| ... //| -STATIC mp_obj_t alarm_light_sleep_until_alarms(size_t n_args, const mp_obj_t *args) { +static mp_obj_t alarm_light_sleep_until_alarms(size_t n_args, const mp_obj_t *args) { if (n_args == 0) { return mp_const_none; } @@ -170,7 +170,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(alarm_light_sleep_until_alarms_obj, 1, MP_OB //| """ //| ... //| -STATIC mp_obj_t alarm_exit_and_deep_sleep_until_alarms(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t alarm_exit_and_deep_sleep_until_alarms(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_preserve_dios }; static const mp_arg_t allowed_args[] = { { MP_QSTR_preserve_dios, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_empty_tuple} }, @@ -201,46 +201,46 @@ STATIC mp_obj_t alarm_exit_and_deep_sleep_until_alarms(size_t n_args, const mp_o } MP_DEFINE_CONST_FUN_OBJ_KW(alarm_exit_and_deep_sleep_until_alarms_obj, 0, alarm_exit_and_deep_sleep_until_alarms); -STATIC const mp_map_elem_t alarm_pin_globals_table[] = { +static const mp_map_elem_t alarm_pin_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_pin) }, { MP_ROM_QSTR(MP_QSTR_PinAlarm), MP_OBJ_FROM_PTR(&alarm_pin_pinalarm_type) }, }; -STATIC MP_DEFINE_CONST_DICT(alarm_pin_globals, alarm_pin_globals_table); +static MP_DEFINE_CONST_DICT(alarm_pin_globals, alarm_pin_globals_table); -STATIC const mp_obj_module_t alarm_pin_module = { +static const mp_obj_module_t alarm_pin_module = { .base = { &mp_type_module }, .globals = (mp_obj_dict_t *)&alarm_pin_globals, }; -STATIC const mp_map_elem_t alarm_time_globals_table[] = { +static const mp_map_elem_t alarm_time_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_time) }, { MP_ROM_QSTR(MP_QSTR_TimeAlarm), MP_OBJ_FROM_PTR(&alarm_time_timealarm_type) }, }; -STATIC MP_DEFINE_CONST_DICT(alarm_time_globals, alarm_time_globals_table); +static MP_DEFINE_CONST_DICT(alarm_time_globals, alarm_time_globals_table); -STATIC const mp_obj_module_t alarm_time_module = { +static const mp_obj_module_t alarm_time_module = { .base = { &mp_type_module }, .globals = (mp_obj_dict_t *)&alarm_time_globals, }; -STATIC const mp_map_elem_t alarm_touch_globals_table[] = { +static const mp_map_elem_t alarm_touch_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_touch) }, { MP_ROM_QSTR(MP_QSTR_TouchAlarm), MP_OBJ_FROM_PTR(&alarm_touch_touchalarm_type) }, }; -STATIC MP_DEFINE_CONST_DICT(alarm_touch_globals, alarm_touch_globals_table); +static MP_DEFINE_CONST_DICT(alarm_touch_globals, alarm_touch_globals_table); -STATIC const mp_obj_module_t alarm_touch_module = { +static const mp_obj_module_t alarm_touch_module = { .base = { &mp_type_module }, .globals = (mp_obj_dict_t *)&alarm_touch_globals, }; // The module table is mutable because .wake_alarm is a mutable attribute. -STATIC mp_map_elem_t alarm_module_globals_table[] = { +static mp_map_elem_t alarm_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_alarm) }, // wake_alarm is a mutable attribute. @@ -257,7 +257,7 @@ STATIC mp_map_elem_t alarm_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_SleepMemory), MP_OBJ_FROM_PTR(&alarm_sleep_memory_type) }, { MP_ROM_QSTR(MP_QSTR_sleep_memory), MP_OBJ_FROM_PTR(&alarm_sleep_memory_obj) }, }; -STATIC MP_DEFINE_MUTABLE_DICT(alarm_module_globals, alarm_module_globals_table); +static MP_DEFINE_MUTABLE_DICT(alarm_module_globals, alarm_module_globals_table); // Fetch value from module dict. mp_obj_t shared_alarm_get_wake_alarm(void) { diff --git a/shared-bindings/alarm/pin/PinAlarm.c b/shared-bindings/alarm/pin/PinAlarm.c index 4574a8798ecd5..9c786766f6ca5 100644 --- a/shared-bindings/alarm/pin/PinAlarm.c +++ b/shared-bindings/alarm/pin/PinAlarm.c @@ -40,7 +40,7 @@ //| pulls it high. //| """ //| ... -STATIC mp_obj_t alarm_pin_pinalarm_make_new(const mp_obj_type_t *type, mp_uint_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t alarm_pin_pinalarm_make_new(const mp_obj_type_t *type, mp_uint_t n_args, size_t n_kw, const mp_obj_t *all_args) { alarm_pin_pinalarm_obj_t *self = mp_obj_malloc(alarm_pin_pinalarm_obj_t, &alarm_pin_pinalarm_type); enum { ARG_pin, ARG_value, ARG_edge, ARG_pull }; static const mp_arg_t allowed_args[] = { @@ -65,7 +65,7 @@ STATIC mp_obj_t alarm_pin_pinalarm_make_new(const mp_obj_type_t *type, mp_uint_t //| pin: microcontroller.Pin //| """The trigger pin.""" -STATIC mp_obj_t alarm_pin_pinalarm_obj_get_pin(mp_obj_t self_in) { +static mp_obj_t alarm_pin_pinalarm_obj_get_pin(mp_obj_t self_in) { alarm_pin_pinalarm_obj_t *self = MP_OBJ_TO_PTR(self_in); const mcu_pin_obj_t *pin = common_hal_alarm_pin_pinalarm_get_pin(self); if (pin == NULL) { @@ -81,7 +81,7 @@ MP_PROPERTY_GETTER(alarm_pin_pinalarm_pin_obj, //| value: bool //| """The value on which to trigger.""" //| -STATIC mp_obj_t alarm_pin_pinalarm_obj_get_value(mp_obj_t self_in) { +static mp_obj_t alarm_pin_pinalarm_obj_get_value(mp_obj_t self_in) { alarm_pin_pinalarm_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_bool(common_hal_alarm_pin_pinalarm_get_value(self)); } @@ -90,12 +90,12 @@ MP_DEFINE_CONST_FUN_OBJ_1(alarm_pin_pinalarm_get_value_obj, alarm_pin_pinalarm_o MP_PROPERTY_GETTER(alarm_pin_pinalarm_value_obj, (mp_obj_t)&alarm_pin_pinalarm_get_value_obj); -STATIC const mp_rom_map_elem_t alarm_pin_pinalarm_locals_dict_table[] = { +static const mp_rom_map_elem_t alarm_pin_pinalarm_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_pin), MP_ROM_PTR(&alarm_pin_pinalarm_pin_obj) }, { MP_ROM_QSTR(MP_QSTR_value), MP_ROM_PTR(&alarm_pin_pinalarm_value_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(alarm_pin_pinalarm_locals_dict, alarm_pin_pinalarm_locals_dict_table); +static MP_DEFINE_CONST_DICT(alarm_pin_pinalarm_locals_dict, alarm_pin_pinalarm_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( alarm_pin_pinalarm_type, diff --git a/shared-bindings/alarm/time/TimeAlarm.c b/shared-bindings/alarm/time/TimeAlarm.c index 4eae17f6cd932..012ca602a11bf 100644 --- a/shared-bindings/alarm/time/TimeAlarm.c +++ b/shared-bindings/alarm/time/TimeAlarm.c @@ -37,7 +37,7 @@ mp_obj_t MP_WEAK rtc_get_time_source_time(void) { //| due to this time alarm. //| """ //| ... -STATIC mp_obj_t alarm_time_timealarm_make_new(const mp_obj_type_t *type, +static mp_obj_t alarm_time_timealarm_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { alarm_time_timealarm_obj_t *self = mp_obj_malloc(alarm_time_timealarm_obj_t, &alarm_time_timealarm_type); @@ -96,7 +96,7 @@ STATIC mp_obj_t alarm_time_timealarm_make_new(const mp_obj_type_t *type, //| by this property only as a `time.monotonic()` time. //| """ //| -STATIC mp_obj_t alarm_time_timealarm_obj_get_monotonic_time(mp_obj_t self_in) { +static mp_obj_t alarm_time_timealarm_obj_get_monotonic_time(mp_obj_t self_in) { alarm_time_timealarm_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_float(common_hal_alarm_time_timealarm_get_monotonic_time(self)); } @@ -105,11 +105,11 @@ MP_DEFINE_CONST_FUN_OBJ_1(alarm_time_timealarm_get_monotonic_time_obj, alarm_tim MP_PROPERTY_GETTER(alarm_time_timealarm_monotonic_time_obj, (mp_obj_t)&alarm_time_timealarm_get_monotonic_time_obj); -STATIC const mp_rom_map_elem_t alarm_time_timealarm_locals_dict_table[] = { +static const mp_rom_map_elem_t alarm_time_timealarm_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_monotonic_time), MP_ROM_PTR(&alarm_time_timealarm_monotonic_time_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(alarm_time_timealarm_locals_dict, alarm_time_timealarm_locals_dict_table); +static MP_DEFINE_CONST_DICT(alarm_time_timealarm_locals_dict, alarm_time_timealarm_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( alarm_time_timealarm_type, diff --git a/shared-bindings/alarm/touch/TouchAlarm.c b/shared-bindings/alarm/touch/TouchAlarm.c index 69caaeb574853..c4fd595efea32 100644 --- a/shared-bindings/alarm/touch/TouchAlarm.c +++ b/shared-bindings/alarm/touch/TouchAlarm.c @@ -23,7 +23,7 @@ //| **Limitations:** Not available on SAMD, Nordic, or RP2040. //| """ //| ... -STATIC mp_obj_t alarm_touch_touchalarm_make_new(const mp_obj_type_t *type, +static mp_obj_t alarm_touch_touchalarm_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { alarm_touch_touchalarm_obj_t *self = mp_obj_malloc(alarm_touch_touchalarm_obj_t, &alarm_touch_touchalarm_type); @@ -45,7 +45,7 @@ STATIC mp_obj_t alarm_touch_touchalarm_make_new(const mp_obj_type_t *type, //| pin: microcontroller.Pin //| """The trigger pin.""" //| -STATIC mp_obj_t alarm_touch_touchalarm_obj_get_pin(mp_obj_t self_in) { +static mp_obj_t alarm_touch_touchalarm_obj_get_pin(mp_obj_t self_in) { alarm_touch_touchalarm_obj_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_FROM_PTR(self->pin); } @@ -54,10 +54,10 @@ MP_DEFINE_CONST_FUN_OBJ_1(alarm_touch_touchalarm_get_pin_obj, alarm_touch_toucha MP_PROPERTY_GETTER(alarm_touch_touchalarm_pin_obj, (mp_obj_t)&alarm_touch_touchalarm_get_pin_obj); -STATIC const mp_rom_map_elem_t alarm_touch_touchalarm_locals_dict_table[] = { +static const mp_rom_map_elem_t alarm_touch_touchalarm_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_pin), MP_ROM_PTR(&alarm_touch_touchalarm_pin_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(alarm_touch_touchalarm_locals_dict, alarm_touch_touchalarm_locals_dict_table); +static MP_DEFINE_CONST_DICT(alarm_touch_touchalarm_locals_dict, alarm_touch_touchalarm_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( alarm_touch_touchalarm_type, diff --git a/shared-bindings/analogbufio/BufferedIn.c b/shared-bindings/analogbufio/BufferedIn.c index 8e3d0546d94c6..d240a3d1da94f 100644 --- a/shared-bindings/analogbufio/BufferedIn.c +++ b/shared-bindings/analogbufio/BufferedIn.c @@ -43,7 +43,7 @@ //| :param ~microcontroller.Pin pin: the pin to read from //| :param ~int sample_rate: rate: sampling frequency, in samples per second""" //| ... -STATIC mp_obj_t analogbufio_bufferedin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t analogbufio_bufferedin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_pin, ARG_sample_rate }; static const mp_arg_t allowed_args[] = { { MP_QSTR_pin, MP_ARG_OBJ | MP_ARG_REQUIRED }, @@ -68,14 +68,14 @@ STATIC mp_obj_t analogbufio_bufferedin_make_new(const mp_obj_type_t *type, size_ //| def deinit(self) -> None: //| """Shut down the `BufferedIn` and release the pin for other use.""" //| ... -STATIC mp_obj_t analogbufio_bufferedin_deinit(mp_obj_t self_in) { +static mp_obj_t analogbufio_bufferedin_deinit(mp_obj_t self_in) { analogbufio_bufferedin_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_analogbufio_bufferedin_deinit(self); return mp_const_none; } MP_DEFINE_CONST_FUN_OBJ_1(analogbufio_bufferedin_deinit_obj, analogbufio_bufferedin_deinit); -STATIC void check_for_deinit(analogbufio_bufferedin_obj_t *self) { +static void check_for_deinit(analogbufio_bufferedin_obj_t *self) { if (common_hal_analogbufio_bufferedin_deinited(self)) { raise_deinited_error(); } @@ -89,12 +89,12 @@ STATIC void check_for_deinit(analogbufio_bufferedin_obj_t *self) { //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t analogbufio_bufferedin___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t analogbufio_bufferedin___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_analogbufio_bufferedin_deinit(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(analogbufio_bufferedin___exit___obj, 4, 4, analogbufio_bufferedin___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(analogbufio_bufferedin___exit___obj, 4, 4, analogbufio_bufferedin___exit__); //| def readinto(self, buffer: WriteableBuffer) -> int: //| """Fills the provided buffer with ADC voltage values. @@ -108,7 +108,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(analogbufio_bufferedin___exit___obj, //| :param ~circuitpython_typing.WriteableBuffer buffer: buffer: A buffer for samples""" //| ... //| -STATIC mp_obj_t analogbufio_bufferedin_obj_readinto(mp_obj_t self_in, mp_obj_t buffer_obj) { +static mp_obj_t analogbufio_bufferedin_obj_readinto(mp_obj_t self_in, mp_obj_t buffer_obj) { analogbufio_bufferedin_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -130,7 +130,7 @@ STATIC mp_obj_t analogbufio_bufferedin_obj_readinto(mp_obj_t self_in, mp_obj_t b } MP_DEFINE_CONST_FUN_OBJ_2(analogbufio_bufferedin_readinto_obj, analogbufio_bufferedin_obj_readinto); -STATIC const mp_rom_map_elem_t analogbufio_bufferedin_locals_dict_table[] = { +static const mp_rom_map_elem_t analogbufio_bufferedin_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&analogbufio_bufferedin_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&analogbufio_bufferedin_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, @@ -139,7 +139,7 @@ STATIC const mp_rom_map_elem_t analogbufio_bufferedin_locals_dict_table[] = { }; -STATIC MP_DEFINE_CONST_DICT(analogbufio_bufferedin_locals_dict, analogbufio_bufferedin_locals_dict_table); +static MP_DEFINE_CONST_DICT(analogbufio_bufferedin_locals_dict, analogbufio_bufferedin_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( analogbufio_bufferedin_type, diff --git a/shared-bindings/analogbufio/__init__.c b/shared-bindings/analogbufio/__init__.c index d1f925d362b73..b99f39b445999 100644 --- a/shared-bindings/analogbufio/__init__.c +++ b/shared-bindings/analogbufio/__init__.c @@ -27,12 +27,12 @@ //| `_ //| """ -STATIC const mp_rom_map_elem_t analogbufio_module_globals_table[] = { +static const mp_rom_map_elem_t analogbufio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_analogbufio) }, { MP_ROM_QSTR(MP_QSTR_BufferedIn), MP_ROM_PTR(&analogbufio_bufferedin_type) }, }; -STATIC MP_DEFINE_CONST_DICT(analogbufio_module_globals, analogbufio_module_globals_table); +static MP_DEFINE_CONST_DICT(analogbufio_module_globals, analogbufio_module_globals_table); const mp_obj_module_t analogbufio_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/analogio/AnalogIn.c b/shared-bindings/analogio/AnalogIn.c index 3d2806421544b..d46975b43743e 100644 --- a/shared-bindings/analogio/AnalogIn.c +++ b/shared-bindings/analogio/AnalogIn.c @@ -45,7 +45,7 @@ MP_WEAK const mcu_pin_obj_t *common_hal_analogio_analogin_validate_pin(mp_obj_t //| when you read a value. You can retry the read. //| """ //| ... -STATIC mp_obj_t analogio_analogin_make_new(const mp_obj_type_t *type, +static mp_obj_t analogio_analogin_make_new(const mp_obj_type_t *type, mp_uint_t n_args, size_t n_kw, const mp_obj_t *args) { // check number of arguments mp_arg_check_num(n_args, n_kw, 1, 1, false); @@ -61,14 +61,14 @@ STATIC mp_obj_t analogio_analogin_make_new(const mp_obj_type_t *type, //| def deinit(self) -> None: //| """Turn off the AnalogIn and release the pin for other use.""" //| ... -STATIC mp_obj_t analogio_analogin_deinit(mp_obj_t self_in) { +static mp_obj_t analogio_analogin_deinit(mp_obj_t self_in) { analogio_analogin_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_analogio_analogin_deinit(self); return mp_const_none; } MP_DEFINE_CONST_FUN_OBJ_1(analogio_analogin_deinit_obj, analogio_analogin_deinit); -STATIC void check_for_deinit(analogio_analogin_obj_t *self) { +static void check_for_deinit(analogio_analogin_obj_t *self) { if (common_hal_analogio_analogin_deinited(self)) { raise_deinited_error(); } @@ -82,19 +82,19 @@ STATIC void check_for_deinit(analogio_analogin_obj_t *self) { //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t analogio_analogin___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t analogio_analogin___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_analogio_analogin_deinit(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(analogio_analogin___exit___obj, 4, 4, analogio_analogin___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(analogio_analogin___exit___obj, 4, 4, analogio_analogin___exit__); //| value: int //| """The value on the analog pin between 0 and 65535 inclusive (16-bit). (read-only) //| //| Even if the underlying analog to digital converter (ADC) is lower //| resolution, the value is 16-bit.""" -STATIC mp_obj_t analogio_analogin_obj_get_value(mp_obj_t self_in) { +static mp_obj_t analogio_analogin_obj_get_value(mp_obj_t self_in) { analogio_analogin_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_analogio_analogin_get_value(self)); @@ -109,7 +109,7 @@ MP_PROPERTY_GETTER(analogio_analogin_value_obj, //| ``float`` in Volts. Note the ADC value may not scale to the actual voltage linearly //| at ends of the analog range.""" //| -STATIC mp_obj_t analogio_analogin_obj_get_reference_voltage(mp_obj_t self_in) { +static mp_obj_t analogio_analogin_obj_get_reference_voltage(mp_obj_t self_in) { analogio_analogin_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -126,7 +126,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(analogio_analogin_get_reference_voltage_obj, MP_PROPERTY_GETTER(analogio_analogin_reference_voltage_obj, (mp_obj_t)&analogio_analogin_get_reference_voltage_obj); -STATIC const mp_rom_map_elem_t analogio_analogin_locals_dict_table[] = { +static const mp_rom_map_elem_t analogio_analogin_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&analogio_analogin_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&analogio_analogin___exit___obj) }, @@ -134,7 +134,7 @@ STATIC const mp_rom_map_elem_t analogio_analogin_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_reference_voltage), MP_ROM_PTR(&analogio_analogin_reference_voltage_obj)}, }; -STATIC MP_DEFINE_CONST_DICT(analogio_analogin_locals_dict, analogio_analogin_locals_dict_table); +static MP_DEFINE_CONST_DICT(analogio_analogin_locals_dict, analogio_analogin_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( analogio_analogin_type, diff --git a/shared-bindings/analogio/AnalogOut.c b/shared-bindings/analogio/AnalogOut.c index d7d21a0f368a7..ab0b018a23755 100644 --- a/shared-bindings/analogio/AnalogOut.c +++ b/shared-bindings/analogio/AnalogOut.c @@ -36,7 +36,7 @@ //| //| """ //| ... -STATIC mp_obj_t analogio_analogout_make_new(const mp_obj_type_t *type, mp_uint_t n_args, size_t n_kw, const mp_obj_t *args) { +static mp_obj_t analogio_analogout_make_new(const mp_obj_type_t *type, mp_uint_t n_args, size_t n_kw, const mp_obj_t *args) { // check arguments mp_arg_check_num(n_args, n_kw, 1, 1, false); @@ -51,14 +51,14 @@ STATIC mp_obj_t analogio_analogout_make_new(const mp_obj_type_t *type, mp_uint_t //| def deinit(self) -> None: //| """Turn off the AnalogOut and release the pin for other use.""" //| ... -STATIC mp_obj_t analogio_analogout_deinit(mp_obj_t self_in) { +static mp_obj_t analogio_analogout_deinit(mp_obj_t self_in) { analogio_analogout_obj_t *self = self_in; common_hal_analogio_analogout_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(analogio_analogout_deinit_obj, analogio_analogout_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(analogio_analogout_deinit_obj, analogio_analogout_deinit); //| def __enter__(self) -> AnalogOut: //| """No-op used by Context Managers.""" @@ -69,12 +69,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(analogio_analogout_deinit_obj, analogio_analogo //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t analogio_analogout___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t analogio_analogout___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_analogio_analogout_deinit(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(analogio_analogout___exit___obj, 4, 4, analogio_analogout___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(analogio_analogout___exit___obj, 4, 4, analogio_analogout___exit__); //| value: int //| """The value on the analog pin between 0 and 65535 inclusive (16-bit). (write-only) @@ -82,7 +82,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(analogio_analogout___exit___obj, 4, 4 //| Even if the underlying digital to analog converter (DAC) is lower //| resolution, the value is 16-bit.""" //| -STATIC mp_obj_t analogio_analogout_obj_set_value(mp_obj_t self_in, mp_obj_t value) { +static mp_obj_t analogio_analogout_obj_set_value(mp_obj_t self_in, mp_obj_t value) { analogio_analogout_obj_t *self = MP_OBJ_TO_PTR(self_in); if (common_hal_analogio_analogout_deinited(self)) { raise_deinited_error(); @@ -98,7 +98,7 @@ MP_PROPERTY_GETSET(analogio_analogout_value_obj, MP_ROM_NONE, (mp_obj_t)&analogio_analogout_set_value_obj); -STATIC const mp_rom_map_elem_t analogio_analogout_locals_dict_table[] = { +static const mp_rom_map_elem_t analogio_analogout_locals_dict_table[] = { // instance methods { MP_OBJ_NEW_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&analogio_analogout_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, @@ -108,7 +108,7 @@ STATIC const mp_rom_map_elem_t analogio_analogout_locals_dict_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR_value), (mp_obj_t)&analogio_analogout_value_obj }, }; -STATIC MP_DEFINE_CONST_DICT(analogio_analogout_locals_dict, analogio_analogout_locals_dict_table); +static MP_DEFINE_CONST_DICT(analogio_analogout_locals_dict, analogio_analogout_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( analogio_analogout_type, diff --git a/shared-bindings/analogio/__init__.c b/shared-bindings/analogio/__init__.c index 2ce976e6200fd..bdf2507b0cbbc 100644 --- a/shared-bindings/analogio/__init__.c +++ b/shared-bindings/analogio/__init__.c @@ -46,13 +46,13 @@ //| `_ //| """ -STATIC const mp_rom_map_elem_t analogio_module_globals_table[] = { +static const mp_rom_map_elem_t analogio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_analogio) }, { MP_ROM_QSTR(MP_QSTR_AnalogIn), MP_ROM_PTR(&analogio_analogin_type) }, { MP_ROM_QSTR(MP_QSTR_AnalogOut), MP_ROM_PTR(&analogio_analogout_type) }, }; -STATIC MP_DEFINE_CONST_DICT(analogio_module_globals, analogio_module_globals_table); +static MP_DEFINE_CONST_DICT(analogio_module_globals, analogio_module_globals_table); const mp_obj_module_t analogio_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/atexit/__init__.c b/shared-bindings/atexit/__init__.c index 296fcf3148a7d..b18e26f2476e2 100644 --- a/shared-bindings/atexit/__init__.c +++ b/shared-bindings/atexit/__init__.c @@ -38,11 +38,11 @@ //| """ //| ... //| -STATIC mp_obj_t atexit_register(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t atexit_register(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { shared_module_atexit_register(pos_args[0], (n_args - 1), ((n_args > 1) ? &pos_args[1] : NULL), kw_args); return pos_args[0]; } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(atexit_register_obj, 1, atexit_register); +static MP_DEFINE_CONST_FUN_OBJ_KW(atexit_register_obj, 1, atexit_register); //| def unregister(func: Callable[..., Any]) -> None: //| """Remove func from the list of functions to be run at termination. @@ -53,20 +53,20 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(atexit_register_obj, 1, atexit_register); //| """ //| ... //| -STATIC mp_obj_t atexit_unregister(const mp_obj_t self_in) { +static mp_obj_t atexit_unregister(const mp_obj_t self_in) { shared_module_atexit_unregister(&self_in); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(atexit_unregister_obj, atexit_unregister); +static MP_DEFINE_CONST_FUN_OBJ_1(atexit_unregister_obj, atexit_unregister); -STATIC const mp_rom_map_elem_t atexit_module_globals_table[] = { +static const mp_rom_map_elem_t atexit_module_globals_table[] = { // module name { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_atexit) }, // module functions { MP_ROM_QSTR(MP_QSTR_register), MP_ROM_PTR(&atexit_register_obj) }, { MP_ROM_QSTR(MP_QSTR_unregister), MP_ROM_PTR(&atexit_unregister_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(atexit_module_globals, atexit_module_globals_table); +static MP_DEFINE_CONST_DICT(atexit_module_globals, atexit_module_globals_table); const mp_obj_module_t atexit_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/audiobusio/I2SOut.c b/shared-bindings/audiobusio/I2SOut.c index e97520521c579..4b6d57ba18d4d 100644 --- a/shared-bindings/audiobusio/I2SOut.c +++ b/shared-bindings/audiobusio/I2SOut.c @@ -76,7 +76,7 @@ //| pass //| print("stopped")""" //| ... -STATIC mp_obj_t audiobusio_i2sout_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t audiobusio_i2sout_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { #if !CIRCUITPY_AUDIOBUSIO_I2SOUT mp_raise_NotImplementedError_varg(MP_ERROR_TEXT("%q"), MP_QSTR_I2SOut); return NULL; // Not reachable. @@ -110,15 +110,15 @@ STATIC mp_obj_t audiobusio_i2sout_make_new(const mp_obj_type_t *type, size_t n_a //| def deinit(self) -> None: //| """Deinitialises the I2SOut and releases any hardware resources for reuse.""" //| ... -STATIC mp_obj_t audiobusio_i2sout_deinit(mp_obj_t self_in) { +static mp_obj_t audiobusio_i2sout_deinit(mp_obj_t self_in) { audiobusio_i2sout_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_audiobusio_i2sout_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(audiobusio_i2sout_deinit_obj, audiobusio_i2sout_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(audiobusio_i2sout_deinit_obj, audiobusio_i2sout_deinit); -STATIC void check_for_deinit(audiobusio_i2sout_obj_t *self) { +static void check_for_deinit(audiobusio_i2sout_obj_t *self) { if (common_hal_audiobusio_i2sout_deinited(self)) { raise_deinited_error(); } @@ -132,12 +132,12 @@ STATIC void check_for_deinit(audiobusio_i2sout_obj_t *self) { //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t audiobusio_i2sout_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t audiobusio_i2sout_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_audiobusio_i2sout_deinit(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audiobusio_i2sout___exit___obj, 4, 4, audiobusio_i2sout_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audiobusio_i2sout___exit___obj, 4, 4, audiobusio_i2sout_obj___exit__); //| def play(self, sample: circuitpython_typing.AudioSample, *, loop: bool = False) -> None: @@ -148,7 +148,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audiobusio_i2sout___exit___obj, 4, 4, //| //| The sample itself should consist of 8 bit or 16 bit samples.""" //| ... -STATIC mp_obj_t audiobusio_i2sout_obj_play(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t audiobusio_i2sout_obj_play(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_sample, ARG_loop }; static const mp_arg_t allowed_args[] = { { MP_QSTR_sample, MP_ARG_OBJ | MP_ARG_REQUIRED }, @@ -169,7 +169,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(audiobusio_i2sout_play_obj, 1, audiobusio_i2sout_obj_ //| def stop(self) -> None: //| """Stops playback.""" //| ... -STATIC mp_obj_t audiobusio_i2sout_obj_stop(mp_obj_t self_in) { +static mp_obj_t audiobusio_i2sout_obj_stop(mp_obj_t self_in) { audiobusio_i2sout_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_audiobusio_i2sout_stop(self); @@ -179,7 +179,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiobusio_i2sout_stop_obj, audiobusio_i2sout_obj_stop //| playing: bool //| """True when the audio sample is being output. (read-only)""" -STATIC mp_obj_t audiobusio_i2sout_obj_get_playing(mp_obj_t self_in) { +static mp_obj_t audiobusio_i2sout_obj_get_playing(mp_obj_t self_in) { audiobusio_i2sout_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return mp_obj_new_bool(common_hal_audiobusio_i2sout_get_playing(self)); @@ -192,7 +192,7 @@ MP_PROPERTY_GETTER(audiobusio_i2sout_playing_obj, //| def pause(self) -> None: //| """Stops playback temporarily while remembering the position. Use `resume` to resume playback.""" //| ... -STATIC mp_obj_t audiobusio_i2sout_obj_pause(mp_obj_t self_in) { +static mp_obj_t audiobusio_i2sout_obj_pause(mp_obj_t self_in) { audiobusio_i2sout_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -207,7 +207,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiobusio_i2sout_pause_obj, audiobusio_i2sout_obj_pau //| def resume(self) -> None: //| """Resumes sample playback after :py:func:`pause`.""" //| ... -STATIC mp_obj_t audiobusio_i2sout_obj_resume(mp_obj_t self_in) { +static mp_obj_t audiobusio_i2sout_obj_resume(mp_obj_t self_in) { audiobusio_i2sout_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -222,7 +222,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiobusio_i2sout_resume_obj, audiobusio_i2sout_obj_re //| paused: bool //| """True when playback is paused. (read-only)""" //| -STATIC mp_obj_t audiobusio_i2sout_obj_get_paused(mp_obj_t self_in) { +static mp_obj_t audiobusio_i2sout_obj_get_paused(mp_obj_t self_in) { audiobusio_i2sout_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return mp_obj_new_bool(common_hal_audiobusio_i2sout_get_paused(self)); @@ -233,7 +233,7 @@ MP_PROPERTY_GETTER(audiobusio_i2sout_paused_obj, (mp_obj_t)&audiobusio_i2sout_get_paused_obj); #endif // CIRCUITPY_AUDIOBUSIO_I2SOUT -STATIC const mp_rom_map_elem_t audiobusio_i2sout_locals_dict_table[] = { +static const mp_rom_map_elem_t audiobusio_i2sout_locals_dict_table[] = { // Methods #if CIRCUITPY_AUDIOBUSIO_I2SOUT { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&audiobusio_i2sout_deinit_obj) }, @@ -250,7 +250,7 @@ STATIC const mp_rom_map_elem_t audiobusio_i2sout_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_paused), MP_ROM_PTR(&audiobusio_i2sout_paused_obj) }, #endif // CIRCUITPY_AUDIOBUSIO_I2SOUT }; -STATIC MP_DEFINE_CONST_DICT(audiobusio_i2sout_locals_dict, audiobusio_i2sout_locals_dict_table); +static MP_DEFINE_CONST_DICT(audiobusio_i2sout_locals_dict, audiobusio_i2sout_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( audiobusio_i2sout_type, diff --git a/shared-bindings/audiobusio/PDMIn.c b/shared-bindings/audiobusio/PDMIn.c index cbf4ed2438f70..12428e20034c9 100644 --- a/shared-bindings/audiobusio/PDMIn.c +++ b/shared-bindings/audiobusio/PDMIn.c @@ -71,7 +71,7 @@ //| mic.record(b, len(b)) //| """ //| ... -STATIC mp_obj_t audiobusio_pdmin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t audiobusio_pdmin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { #if !CIRCUITPY_AUDIOBUSIO_PDMIN mp_raise_NotImplementedError_varg(MP_ERROR_TEXT("%q"), MP_QSTR_PDMIn); #else @@ -127,14 +127,14 @@ STATIC mp_obj_t audiobusio_pdmin_make_new(const mp_obj_type_t *type, size_t n_ar //| def deinit(self) -> None: //| """Deinitialises the PDMIn and releases any hardware resources for reuse.""" //| ... -STATIC mp_obj_t audiobusio_pdmin_deinit(mp_obj_t self_in) { +static mp_obj_t audiobusio_pdmin_deinit(mp_obj_t self_in) { audiobusio_pdmin_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_audiobusio_pdmin_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(audiobusio_pdmin_deinit_obj, audiobusio_pdmin_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(audiobusio_pdmin_deinit_obj, audiobusio_pdmin_deinit); -STATIC void check_for_deinit(audiobusio_pdmin_obj_t *self) { +static void check_for_deinit(audiobusio_pdmin_obj_t *self) { if (common_hal_audiobusio_pdmin_deinited(self)) { raise_deinited_error(); } @@ -147,12 +147,12 @@ STATIC void check_for_deinit(audiobusio_pdmin_obj_t *self) { //| def __exit__(self) -> None: //| """Automatically deinitializes the hardware when exiting a context.""" //| ... -STATIC mp_obj_t audiobusio_pdmin_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t audiobusio_pdmin_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_audiobusio_pdmin_deinit(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audiobusio_pdmin___exit___obj, 4, 4, audiobusio_pdmin_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audiobusio_pdmin___exit___obj, 4, 4, audiobusio_pdmin_obj___exit__); //| def record(self, destination: WriteableBuffer, destination_length: int) -> None: @@ -166,7 +166,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audiobusio_pdmin___exit___obj, 4, 4, //| :return: The number of samples recorded. If this is less than ``destination_length``, //| some samples were missed due to processing time.""" //| ... -STATIC mp_obj_t audiobusio_pdmin_obj_record(mp_obj_t self_obj, mp_obj_t destination, mp_obj_t destination_length) { +static mp_obj_t audiobusio_pdmin_obj_record(mp_obj_t self_obj, mp_obj_t destination, mp_obj_t destination_length) { audiobusio_pdmin_obj_t *self = MP_OBJ_TO_PTR(self_obj); check_for_deinit(self); uint32_t length = mp_arg_validate_type_int(destination_length, MP_QSTR_length); @@ -198,7 +198,7 @@ MP_DEFINE_CONST_FUN_OBJ_3(audiobusio_pdmin_record_obj, audiobusio_pdmin_obj_reco //| """The actual sample_rate of the recording. This may not match the constructed //| sample rate due to internal clock limitations.""" //| -STATIC mp_obj_t audiobusio_pdmin_obj_get_sample_rate(mp_obj_t self_in) { +static mp_obj_t audiobusio_pdmin_obj_get_sample_rate(mp_obj_t self_in) { audiobusio_pdmin_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_audiobusio_pdmin_get_sample_rate(self)); @@ -208,7 +208,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiobusio_pdmin_get_sample_rate_obj, audiobusio_pdmin MP_PROPERTY_GETTER(audiobusio_pdmin_sample_rate_obj, (mp_obj_t)&audiobusio_pdmin_get_sample_rate_obj); -STATIC const mp_rom_map_elem_t audiobusio_pdmin_locals_dict_table[] = { +static const mp_rom_map_elem_t audiobusio_pdmin_locals_dict_table[] = { // Methods { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&audiobusio_pdmin_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, @@ -216,7 +216,7 @@ STATIC const mp_rom_map_elem_t audiobusio_pdmin_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_record), MP_ROM_PTR(&audiobusio_pdmin_record_obj) }, { MP_ROM_QSTR(MP_QSTR_sample_rate), MP_ROM_PTR(&audiobusio_pdmin_sample_rate_obj) } }; -STATIC MP_DEFINE_CONST_DICT(audiobusio_pdmin_locals_dict, audiobusio_pdmin_locals_dict_table); +static MP_DEFINE_CONST_DICT(audiobusio_pdmin_locals_dict, audiobusio_pdmin_locals_dict_table); #endif MP_DEFINE_CONST_OBJ_TYPE( diff --git a/shared-bindings/audiobusio/__init__.c b/shared-bindings/audiobusio/__init__.c index ddfe641b4cf39..70680b1cf16e4 100644 --- a/shared-bindings/audiobusio/__init__.c +++ b/shared-bindings/audiobusio/__init__.c @@ -25,13 +25,13 @@ //| are no longer needed. To do so, either call :py:meth:`!deinit` or use a //| context manager.""" -STATIC const mp_rom_map_elem_t audiobusio_module_globals_table[] = { +static const mp_rom_map_elem_t audiobusio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_audiobusio) }, { MP_ROM_QSTR(MP_QSTR_I2SOut), MP_ROM_PTR(&audiobusio_i2sout_type) }, { MP_ROM_QSTR(MP_QSTR_PDMIn), MP_ROM_PTR(&audiobusio_pdmin_type) }, }; -STATIC MP_DEFINE_CONST_DICT(audiobusio_module_globals, audiobusio_module_globals_table); +static MP_DEFINE_CONST_DICT(audiobusio_module_globals, audiobusio_module_globals_table); const mp_obj_module_t audiobusio_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/audiocore/RawSample.c b/shared-bindings/audiocore/RawSample.c index 33390431b3867..26df89b116445 100644 --- a/shared-bindings/audiocore/RawSample.c +++ b/shared-bindings/audiocore/RawSample.c @@ -49,7 +49,7 @@ //| time.sleep(1) //| dac.stop()""" //| ... -STATIC mp_obj_t audioio_rawsample_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t audioio_rawsample_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_buffer, ARG_channel_count, ARG_sample_rate }; static const mp_arg_t allowed_args[] = { { MP_QSTR_buffer, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_obj = MP_OBJ_NULL } }, @@ -79,14 +79,14 @@ STATIC mp_obj_t audioio_rawsample_make_new(const mp_obj_type_t *type, size_t n_a //| def deinit(self) -> None: //| """Deinitialises the RawSample and releases any hardware resources for reuse.""" //| ... -STATIC mp_obj_t audioio_rawsample_deinit(mp_obj_t self_in) { +static mp_obj_t audioio_rawsample_deinit(mp_obj_t self_in) { audioio_rawsample_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_audioio_rawsample_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(audioio_rawsample_deinit_obj, audioio_rawsample_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(audioio_rawsample_deinit_obj, audioio_rawsample_deinit); -STATIC void check_for_deinit(audioio_rawsample_obj_t *self) { +static void check_for_deinit(audioio_rawsample_obj_t *self) { if (common_hal_audioio_rawsample_deinited(self)) { raise_deinited_error(); } @@ -101,12 +101,12 @@ STATIC void check_for_deinit(audioio_rawsample_obj_t *self) { //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t audioio_rawsample_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t audioio_rawsample_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_audioio_rawsample_deinit(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audioio_rawsample___exit___obj, 4, 4, audioio_rawsample_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audioio_rawsample___exit___obj, 4, 4, audioio_rawsample_obj___exit__); //| sample_rate: Optional[int] //| """32 bit value that dictates how quickly samples are played in Hertz (cycles per second). @@ -114,14 +114,14 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audioio_rawsample___exit___obj, 4, 4, //| sample. This will not change the sample rate of any active playback. Call ``play`` again to //| change it.""" //| -STATIC mp_obj_t audioio_rawsample_obj_get_sample_rate(mp_obj_t self_in) { +static mp_obj_t audioio_rawsample_obj_get_sample_rate(mp_obj_t self_in) { audioio_rawsample_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_audioio_rawsample_get_sample_rate(self)); } MP_DEFINE_CONST_FUN_OBJ_1(audioio_rawsample_get_sample_rate_obj, audioio_rawsample_obj_get_sample_rate); -STATIC mp_obj_t audioio_rawsample_obj_set_sample_rate(mp_obj_t self_in, mp_obj_t sample_rate) { +static mp_obj_t audioio_rawsample_obj_set_sample_rate(mp_obj_t self_in, mp_obj_t sample_rate) { audioio_rawsample_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_audioio_rawsample_set_sample_rate(self, mp_obj_get_int(sample_rate)); @@ -133,7 +133,7 @@ MP_PROPERTY_GETSET(audioio_rawsample_sample_rate_obj, (mp_obj_t)&audioio_rawsample_get_sample_rate_obj, (mp_obj_t)&audioio_rawsample_set_sample_rate_obj); -STATIC const mp_rom_map_elem_t audioio_rawsample_locals_dict_table[] = { +static const mp_rom_map_elem_t audioio_rawsample_locals_dict_table[] = { // Methods { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&audioio_rawsample_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, @@ -142,9 +142,9 @@ STATIC const mp_rom_map_elem_t audioio_rawsample_locals_dict_table[] = { // Properties { MP_ROM_QSTR(MP_QSTR_sample_rate), MP_ROM_PTR(&audioio_rawsample_sample_rate_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(audioio_rawsample_locals_dict, audioio_rawsample_locals_dict_table); +static MP_DEFINE_CONST_DICT(audioio_rawsample_locals_dict, audioio_rawsample_locals_dict_table); -STATIC const audiosample_p_t audioio_rawsample_proto = { +static const audiosample_p_t audioio_rawsample_proto = { MP_PROTO_IMPLEMENT(MP_QSTR_protocol_audiosample) .sample_rate = (audiosample_sample_rate_fun)common_hal_audioio_rawsample_get_sample_rate, .bits_per_sample = (audiosample_bits_per_sample_fun)common_hal_audioio_rawsample_get_bits_per_sample, diff --git a/shared-bindings/audiocore/WaveFile.c b/shared-bindings/audiocore/WaveFile.c index 925b895d70b2a..372330577f960 100644 --- a/shared-bindings/audiocore/WaveFile.c +++ b/shared-bindings/audiocore/WaveFile.c @@ -50,7 +50,7 @@ //| print("stopped") //| """ //| ... -STATIC mp_obj_t audioio_wavefile_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { +static mp_obj_t audioio_wavefile_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { mp_arg_check_num(n_args, n_kw, 1, 2, false); mp_obj_t arg = args[0]; @@ -79,14 +79,14 @@ STATIC mp_obj_t audioio_wavefile_make_new(const mp_obj_type_t *type, size_t n_ar //| def deinit(self) -> None: //| """Deinitialises the WaveFile and releases all memory resources for reuse.""" //| ... -STATIC mp_obj_t audioio_wavefile_deinit(mp_obj_t self_in) { +static mp_obj_t audioio_wavefile_deinit(mp_obj_t self_in) { audioio_wavefile_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_audioio_wavefile_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(audioio_wavefile_deinit_obj, audioio_wavefile_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(audioio_wavefile_deinit_obj, audioio_wavefile_deinit); -STATIC void check_for_deinit(audioio_wavefile_obj_t *self) { +static void check_for_deinit(audioio_wavefile_obj_t *self) { if (common_hal_audioio_wavefile_deinited(self)) { raise_deinited_error(); } @@ -101,25 +101,25 @@ STATIC void check_for_deinit(audioio_wavefile_obj_t *self) { //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t audioio_wavefile_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t audioio_wavefile_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_audioio_wavefile_deinit(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audioio_wavefile___exit___obj, 4, 4, audioio_wavefile_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audioio_wavefile___exit___obj, 4, 4, audioio_wavefile_obj___exit__); //| sample_rate: int //| """32 bit value that dictates how quickly samples are loaded into the DAC //| in Hertz (cycles per second). When the sample is looped, this can change //| the pitch output without changing the underlying sample.""" -STATIC mp_obj_t audioio_wavefile_obj_get_sample_rate(mp_obj_t self_in) { +static mp_obj_t audioio_wavefile_obj_get_sample_rate(mp_obj_t self_in) { audioio_wavefile_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_audioio_wavefile_get_sample_rate(self)); } MP_DEFINE_CONST_FUN_OBJ_1(audioio_wavefile_get_sample_rate_obj, audioio_wavefile_obj_get_sample_rate); -STATIC mp_obj_t audioio_wavefile_obj_set_sample_rate(mp_obj_t self_in, mp_obj_t sample_rate) { +static mp_obj_t audioio_wavefile_obj_set_sample_rate(mp_obj_t self_in, mp_obj_t sample_rate) { audioio_wavefile_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_audioio_wavefile_set_sample_rate(self, mp_obj_get_int(sample_rate)); @@ -133,7 +133,7 @@ MP_PROPERTY_GETSET(audioio_wavefile_sample_rate_obj, //| bits_per_sample: int //| """Bits per sample. (read only)""" -STATIC mp_obj_t audioio_wavefile_obj_get_bits_per_sample(mp_obj_t self_in) { +static mp_obj_t audioio_wavefile_obj_get_bits_per_sample(mp_obj_t self_in) { audioio_wavefile_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_audioio_wavefile_get_bits_per_sample(self)); @@ -145,7 +145,7 @@ MP_PROPERTY_GETTER(audioio_wavefile_bits_per_sample_obj, //| channel_count: int //| """Number of audio channels. (read only)""" //| -STATIC mp_obj_t audioio_wavefile_obj_get_channel_count(mp_obj_t self_in) { +static mp_obj_t audioio_wavefile_obj_get_channel_count(mp_obj_t self_in) { audioio_wavefile_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_audioio_wavefile_get_channel_count(self)); @@ -156,7 +156,7 @@ MP_PROPERTY_GETTER(audioio_wavefile_channel_count_obj, (mp_obj_t)&audioio_wavefile_get_channel_count_obj); -STATIC const mp_rom_map_elem_t audioio_wavefile_locals_dict_table[] = { +static const mp_rom_map_elem_t audioio_wavefile_locals_dict_table[] = { // Methods { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&audioio_wavefile_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, @@ -167,9 +167,9 @@ STATIC const mp_rom_map_elem_t audioio_wavefile_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_bits_per_sample), MP_ROM_PTR(&audioio_wavefile_bits_per_sample_obj) }, { MP_ROM_QSTR(MP_QSTR_channel_count), MP_ROM_PTR(&audioio_wavefile_channel_count_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(audioio_wavefile_locals_dict, audioio_wavefile_locals_dict_table); +static MP_DEFINE_CONST_DICT(audioio_wavefile_locals_dict, audioio_wavefile_locals_dict_table); -STATIC const audiosample_p_t audioio_wavefile_proto = { +static const audiosample_p_t audioio_wavefile_proto = { MP_PROTO_IMPLEMENT(MP_QSTR_protocol_audiosample) .sample_rate = (audiosample_sample_rate_fun)common_hal_audioio_wavefile_get_sample_rate, .bits_per_sample = (audiosample_bits_per_sample_fun)common_hal_audioio_wavefile_get_bits_per_sample, diff --git a/shared-bindings/audiocore/__init__.c b/shared-bindings/audiocore/__init__.c index 2753fb24a229e..4eff83bcfdbfc 100644 --- a/shared-bindings/audiocore/__init__.c +++ b/shared-bindings/audiocore/__init__.c @@ -19,7 +19,7 @@ #if CIRCUITPY_AUDIOCORE_DEBUG // (no docstrings so that the debug functions are not shown on docs.circuitpython.org) -STATIC mp_obj_t audiocore_get_buffer(mp_obj_t sample_in) { +static mp_obj_t audiocore_get_buffer(mp_obj_t sample_in) { uint8_t *buffer = NULL; uint32_t buffer_length = 0; audioio_get_buffer_result_t gbr = audiosample_get_buffer(sample_in, false, 0, &buffer, &buffer_length); @@ -48,9 +48,9 @@ STATIC mp_obj_t audiocore_get_buffer(mp_obj_t sample_in) { return mp_obj_new_tuple(2, result); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(audiocore_get_buffer_obj, audiocore_get_buffer); +static MP_DEFINE_CONST_FUN_OBJ_1(audiocore_get_buffer_obj, audiocore_get_buffer); -STATIC mp_obj_t audiocore_get_structure(mp_obj_t sample_in) { +static mp_obj_t audiocore_get_structure(mp_obj_t sample_in) { bool single_buffer, samples_signed; uint32_t max_buffer_length; uint8_t spacing; @@ -64,17 +64,17 @@ STATIC mp_obj_t audiocore_get_structure(mp_obj_t sample_in) { }; return mp_obj_new_tuple(4, result); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(audiocore_get_structure_obj, audiocore_get_structure); +static MP_DEFINE_CONST_FUN_OBJ_1(audiocore_get_structure_obj, audiocore_get_structure); -STATIC mp_obj_t audiocore_reset_buffer(mp_obj_t sample_in) { +static mp_obj_t audiocore_reset_buffer(mp_obj_t sample_in) { audiosample_reset_buffer(sample_in, false, 0); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(audiocore_reset_buffer_obj, audiocore_reset_buffer); +static MP_DEFINE_CONST_FUN_OBJ_1(audiocore_reset_buffer_obj, audiocore_reset_buffer); #endif -STATIC const mp_rom_map_elem_t audiocore_module_globals_table[] = { +static const mp_rom_map_elem_t audiocore_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_audiocore) }, { MP_ROM_QSTR(MP_QSTR_RawSample), MP_ROM_PTR(&audioio_rawsample_type) }, { MP_ROM_QSTR(MP_QSTR_WaveFile), MP_ROM_PTR(&audioio_wavefile_type) }, @@ -85,7 +85,7 @@ STATIC const mp_rom_map_elem_t audiocore_module_globals_table[] = { #endif }; -STATIC MP_DEFINE_CONST_DICT(audiocore_module_globals, audiocore_module_globals_table); +static MP_DEFINE_CONST_DICT(audiocore_module_globals, audiocore_module_globals_table); const mp_obj_module_t audiocore_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/audioio/AudioOut.c b/shared-bindings/audioio/AudioOut.c index da49fd72324f5..ceeaf1f399077 100644 --- a/shared-bindings/audioio/AudioOut.c +++ b/shared-bindings/audioio/AudioOut.c @@ -74,7 +74,7 @@ //| pass //| print("stopped")""" //| ... -STATIC mp_obj_t audioio_audioout_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t audioio_audioout_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_left_channel, ARG_right_channel, ARG_quiescent_value }; static const mp_arg_t allowed_args[] = { { MP_QSTR_left_channel, MP_ARG_OBJ | MP_ARG_REQUIRED }, @@ -100,14 +100,14 @@ STATIC mp_obj_t audioio_audioout_make_new(const mp_obj_type_t *type, size_t n_ar //| def deinit(self) -> None: //| """Deinitialises the AudioOut and releases any hardware resources for reuse.""" //| ... -STATIC mp_obj_t audioio_audioout_deinit(mp_obj_t self_in) { +static mp_obj_t audioio_audioout_deinit(mp_obj_t self_in) { audioio_audioout_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_audioio_audioout_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(audioio_audioout_deinit_obj, audioio_audioout_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(audioio_audioout_deinit_obj, audioio_audioout_deinit); -STATIC void check_for_deinit(audioio_audioout_obj_t *self) { +static void check_for_deinit(audioio_audioout_obj_t *self) { if (common_hal_audioio_audioout_deinited(self)) { raise_deinited_error(); } @@ -121,12 +121,12 @@ STATIC void check_for_deinit(audioio_audioout_obj_t *self) { //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t audioio_audioout_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t audioio_audioout_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_audioio_audioout_deinit(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audioio_audioout___exit___obj, 4, 4, audioio_audioout_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audioio_audioout___exit___obj, 4, 4, audioio_audioout_obj___exit__); //| def play(self, sample: circuitpython_typing.AudioSample, *, loop: bool = False) -> None: @@ -139,7 +139,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audioio_audioout___exit___obj, 4, 4, //| resolution will use the highest order bits to output. For example, the SAMD21 has a 10 bit //| DAC that ignores the lowest 6 bits when playing 16 bit samples.""" //| ... -STATIC mp_obj_t audioio_audioout_obj_play(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t audioio_audioout_obj_play(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_sample, ARG_loop }; static const mp_arg_t allowed_args[] = { { MP_QSTR_sample, MP_ARG_OBJ | MP_ARG_REQUIRED }, @@ -160,7 +160,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(audioio_audioout_play_obj, 1, audioio_audioout_obj_pl //| def stop(self) -> None: //| """Stops playback and resets to the start of the sample.""" //| ... -STATIC mp_obj_t audioio_audioout_obj_stop(mp_obj_t self_in) { +static mp_obj_t audioio_audioout_obj_stop(mp_obj_t self_in) { audioio_audioout_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_audioio_audioout_stop(self); @@ -170,7 +170,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audioio_audioout_stop_obj, audioio_audioout_obj_stop); //| playing: bool //| """True when an audio sample is being output even if `paused`. (read-only)""" -STATIC mp_obj_t audioio_audioout_obj_get_playing(mp_obj_t self_in) { +static mp_obj_t audioio_audioout_obj_get_playing(mp_obj_t self_in) { audioio_audioout_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return mp_obj_new_bool(common_hal_audioio_audioout_get_playing(self)); @@ -183,7 +183,7 @@ MP_PROPERTY_GETTER(audioio_audioout_playing_obj, //| def pause(self) -> None: //| """Stops playback temporarily while remembering the position. Use `resume` to resume playback.""" //| ... -STATIC mp_obj_t audioio_audioout_obj_pause(mp_obj_t self_in) { +static mp_obj_t audioio_audioout_obj_pause(mp_obj_t self_in) { audioio_audioout_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -198,7 +198,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audioio_audioout_pause_obj, audioio_audioout_obj_pause //| def resume(self) -> None: //| """Resumes sample playback after :py:func:`pause`.""" //| ... -STATIC mp_obj_t audioio_audioout_obj_resume(mp_obj_t self_in) { +static mp_obj_t audioio_audioout_obj_resume(mp_obj_t self_in) { audioio_audioout_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -213,7 +213,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audioio_audioout_resume_obj, audioio_audioout_obj_resu //| paused: bool //| """True when playback is paused. (read-only)""" //| -STATIC mp_obj_t audioio_audioout_obj_get_paused(mp_obj_t self_in) { +static mp_obj_t audioio_audioout_obj_get_paused(mp_obj_t self_in) { audioio_audioout_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return mp_obj_new_bool(common_hal_audioio_audioout_get_paused(self)); @@ -223,7 +223,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audioio_audioout_get_paused_obj, audioio_audioout_obj_ MP_PROPERTY_GETTER(audioio_audioout_paused_obj, (mp_obj_t)&audioio_audioout_get_paused_obj); -STATIC const mp_rom_map_elem_t audioio_audioout_locals_dict_table[] = { +static const mp_rom_map_elem_t audioio_audioout_locals_dict_table[] = { // Methods { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&audioio_audioout_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&audioio_audioout_deinit_obj) }, @@ -238,7 +238,7 @@ STATIC const mp_rom_map_elem_t audioio_audioout_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_playing), MP_ROM_PTR(&audioio_audioout_playing_obj) }, { MP_ROM_QSTR(MP_QSTR_paused), MP_ROM_PTR(&audioio_audioout_paused_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(audioio_audioout_locals_dict, audioio_audioout_locals_dict_table); +static MP_DEFINE_CONST_DICT(audioio_audioout_locals_dict, audioio_audioout_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( audioio_audioout_type, diff --git a/shared-bindings/audioio/__init__.c b/shared-bindings/audioio/__init__.c index 286e505792be9..ac8a85f1d65ac 100644 --- a/shared-bindings/audioio/__init__.c +++ b/shared-bindings/audioio/__init__.c @@ -33,12 +33,12 @@ //| `audiocore` to be imported from `audioio`. This will be removed for all //| boards in a future build of CircuitPython.""" -STATIC const mp_rom_map_elem_t audioio_module_globals_table[] = { +static const mp_rom_map_elem_t audioio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_audioio) }, { MP_ROM_QSTR(MP_QSTR_AudioOut), MP_ROM_PTR(&audioio_audioout_type) }, }; -STATIC MP_DEFINE_CONST_DICT(audioio_module_globals, audioio_module_globals_table); +static MP_DEFINE_CONST_DICT(audioio_module_globals, audioio_module_globals_table); const mp_obj_module_t audioio_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/audiomixer/Mixer.c b/shared-bindings/audiomixer/Mixer.c index fbd60ec90c56c..149e98584db2c 100644 --- a/shared-bindings/audiomixer/Mixer.c +++ b/shared-bindings/audiomixer/Mixer.c @@ -62,7 +62,7 @@ //| time.sleep(1) //| print("stopped")""" //| ... -STATIC mp_obj_t audiomixer_mixer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t audiomixer_mixer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_voice_count, ARG_buffer_size, ARG_channel_count, ARG_bits_per_sample, ARG_samples_signed, ARG_sample_rate }; static const mp_arg_t allowed_args[] = { { MP_QSTR_voice_count, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 2} }, @@ -98,14 +98,14 @@ STATIC mp_obj_t audiomixer_mixer_make_new(const mp_obj_type_t *type, size_t n_ar //| def deinit(self) -> None: //| """Deinitialises the Mixer and releases any hardware resources for reuse.""" //| ... -STATIC mp_obj_t audiomixer_mixer_deinit(mp_obj_t self_in) { +static mp_obj_t audiomixer_mixer_deinit(mp_obj_t self_in) { audiomixer_mixer_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_audiomixer_mixer_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(audiomixer_mixer_deinit_obj, audiomixer_mixer_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(audiomixer_mixer_deinit_obj, audiomixer_mixer_deinit); -STATIC void check_for_deinit(audiomixer_mixer_obj_t *self) { +static void check_for_deinit(audiomixer_mixer_obj_t *self) { if (common_hal_audiomixer_mixer_deinited(self)) { raise_deinited_error(); } @@ -120,16 +120,16 @@ STATIC void check_for_deinit(audiomixer_mixer_obj_t *self) { //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t audiomixer_mixer_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t audiomixer_mixer_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_audiomixer_mixer_deinit(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audiomixer_mixer___exit___obj, 4, 4, audiomixer_mixer_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audiomixer_mixer___exit___obj, 4, 4, audiomixer_mixer_obj___exit__); //| playing: bool //| """True when any voice is being output. (read-only)""" -STATIC mp_obj_t audiomixer_mixer_obj_get_playing(mp_obj_t self_in) { +static mp_obj_t audiomixer_mixer_obj_get_playing(mp_obj_t self_in) { audiomixer_mixer_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return mp_obj_new_bool(common_hal_audiomixer_mixer_get_playing(self)); @@ -141,7 +141,7 @@ MP_PROPERTY_GETTER(audiomixer_mixer_playing_obj, //| sample_rate: int //| """32 bit value that dictates how quickly samples are played in Hertz (cycles per second).""" -STATIC mp_obj_t audiomixer_mixer_obj_get_sample_rate(mp_obj_t self_in) { +static mp_obj_t audiomixer_mixer_obj_get_sample_rate(mp_obj_t self_in) { audiomixer_mixer_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_audiomixer_mixer_get_sample_rate(self)); @@ -158,7 +158,7 @@ MP_PROPERTY_GETTER(audiomixer_mixer_sample_rate_obj, //| //| >>> mixer.voice //| (,)""" -STATIC mp_obj_t audiomixer_mixer_obj_get_voice(mp_obj_t self_in) { +static mp_obj_t audiomixer_mixer_obj_get_voice(mp_obj_t self_in) { audiomixer_mixer_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return self->voice_tuple; @@ -178,7 +178,7 @@ MP_PROPERTY_GETTER(audiomixer_mixer_voice_obj, //| //| The sample must match the Mixer's encoding settings given in the constructor.""" //| ... -STATIC mp_obj_t audiomixer_mixer_obj_play(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t audiomixer_mixer_obj_play(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_sample, ARG_voice, ARG_loop }; static const mp_arg_t allowed_args[] = { { MP_QSTR_sample, MP_ARG_OBJ | MP_ARG_REQUIRED, {} }, @@ -206,7 +206,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(audiomixer_mixer_play_obj, 1, audiomixer_mixer_obj_pl //| """Stops playback of the sample on the given voice.""" //| ... //| -STATIC mp_obj_t audiomixer_mixer_obj_stop_voice(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t audiomixer_mixer_obj_stop_voice(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_voice }; static const mp_arg_t allowed_args[] = { { MP_QSTR_voice, MP_ARG_INT, {.u_int = 0} }, @@ -227,7 +227,7 @@ STATIC mp_obj_t audiomixer_mixer_obj_stop_voice(size_t n_args, const mp_obj_t *p MP_DEFINE_CONST_FUN_OBJ_KW(audiomixer_mixer_stop_voice_obj, 1, audiomixer_mixer_obj_stop_voice); -STATIC const mp_rom_map_elem_t audiomixer_mixer_locals_dict_table[] = { +static const mp_rom_map_elem_t audiomixer_mixer_locals_dict_table[] = { // Methods { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&audiomixer_mixer_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, @@ -240,9 +240,9 @@ STATIC const mp_rom_map_elem_t audiomixer_mixer_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_sample_rate), MP_ROM_PTR(&audiomixer_mixer_sample_rate_obj) }, { MP_ROM_QSTR(MP_QSTR_voice), MP_ROM_PTR(&audiomixer_mixer_voice_obj) } }; -STATIC MP_DEFINE_CONST_DICT(audiomixer_mixer_locals_dict, audiomixer_mixer_locals_dict_table); +static MP_DEFINE_CONST_DICT(audiomixer_mixer_locals_dict, audiomixer_mixer_locals_dict_table); -STATIC const audiosample_p_t audiomixer_mixer_proto = { +static const audiosample_p_t audiomixer_mixer_proto = { MP_PROTO_IMPLEMENT(MP_QSTR_protocol_audiosample) .sample_rate = (audiosample_sample_rate_fun)common_hal_audiomixer_mixer_get_sample_rate, .bits_per_sample = (audiosample_bits_per_sample_fun)common_hal_audiomixer_mixer_get_bits_per_sample, diff --git a/shared-bindings/audiomixer/MixerVoice.c b/shared-bindings/audiomixer/MixerVoice.c index 2aad6584b6575..eed877bc789b5 100644 --- a/shared-bindings/audiomixer/MixerVoice.c +++ b/shared-bindings/audiomixer/MixerVoice.c @@ -23,7 +23,7 @@ //| """MixerVoice instance object(s) created by `audiomixer.Mixer`.""" //| ... // TODO: support mono or stereo voices -STATIC mp_obj_t audiomixer_mixervoice_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t audiomixer_mixervoice_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { mp_arg_check_num(n_args, n_kw, 0, 0, false); audiomixer_mixervoice_obj_t *self = mp_obj_malloc(audiomixer_mixervoice_obj_t, &audiomixer_mixervoice_type); @@ -41,7 +41,7 @@ STATIC mp_obj_t audiomixer_mixervoice_make_new(const mp_obj_type_t *type, size_t //| The sample must match the `audiomixer.Mixer`'s encoding settings given in the constructor. //| """ //| ... -STATIC mp_obj_t audiomixer_mixervoice_obj_play(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t audiomixer_mixervoice_obj_play(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_sample, ARG_loop }; static const mp_arg_t allowed_args[] = { { MP_QSTR_sample, MP_ARG_OBJ | MP_ARG_REQUIRED, {} }, @@ -60,7 +60,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(audiomixer_mixervoice_play_obj, 1, audiomixer_mixervo //| def stop(self) -> None: //| """Stops playback of the sample on this voice.""" //| ... -STATIC mp_obj_t audiomixer_mixervoice_obj_stop(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t audiomixer_mixervoice_obj_stop(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_voice }; static const mp_arg_t allowed_args[] = { { MP_QSTR_voice, MP_ARG_INT, {.u_int = 0} }, @@ -77,12 +77,12 @@ MP_DEFINE_CONST_FUN_OBJ_KW(audiomixer_mixervoice_stop_obj, 1, audiomixer_mixervo //| level: float //| """The volume level of a voice, as a floating point number between 0 and 1.""" -STATIC mp_obj_t audiomixer_mixervoice_obj_get_level(mp_obj_t self_in) { +static mp_obj_t audiomixer_mixervoice_obj_get_level(mp_obj_t self_in) { return mp_obj_new_float(common_hal_audiomixer_mixervoice_get_level(self_in)); } MP_DEFINE_CONST_FUN_OBJ_1(audiomixer_mixervoice_get_level_obj, audiomixer_mixervoice_obj_get_level); -STATIC mp_obj_t audiomixer_mixervoice_obj_set_level(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t audiomixer_mixervoice_obj_set_level(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_level }; static const mp_arg_t allowed_args[] = { { MP_QSTR_level, MP_ARG_OBJ | MP_ARG_REQUIRED, {} }, @@ -111,7 +111,7 @@ MP_PROPERTY_GETSET(audiomixer_mixervoice_level_obj, //| """True when this voice is being output. (read-only)""" //| -STATIC mp_obj_t audiomixer_mixervoice_obj_get_playing(mp_obj_t self_in) { +static mp_obj_t audiomixer_mixervoice_obj_get_playing(mp_obj_t self_in) { audiomixer_mixervoice_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_bool(common_hal_audiomixer_mixervoice_get_playing(self)); @@ -122,7 +122,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiomixer_mixervoice_get_playing_obj, audiomixer_mixe MP_PROPERTY_GETTER(audiomixer_mixervoice_playing_obj, (mp_obj_t)&audiomixer_mixervoice_get_playing_obj); -STATIC const mp_rom_map_elem_t audiomixer_mixervoice_locals_dict_table[] = { +static const mp_rom_map_elem_t audiomixer_mixervoice_locals_dict_table[] = { // Methods { MP_ROM_QSTR(MP_QSTR_play), MP_ROM_PTR(&audiomixer_mixervoice_play_obj) }, { MP_ROM_QSTR(MP_QSTR_stop), MP_ROM_PTR(&audiomixer_mixervoice_stop_obj) }, @@ -131,7 +131,7 @@ STATIC const mp_rom_map_elem_t audiomixer_mixervoice_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_playing), MP_ROM_PTR(&audiomixer_mixervoice_playing_obj) }, { MP_ROM_QSTR(MP_QSTR_level), MP_ROM_PTR(&audiomixer_mixervoice_level_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(audiomixer_mixervoice_locals_dict, audiomixer_mixervoice_locals_dict_table); +static MP_DEFINE_CONST_DICT(audiomixer_mixervoice_locals_dict, audiomixer_mixervoice_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( audiomixer_mixervoice_type, diff --git a/shared-bindings/audiomixer/__init__.c b/shared-bindings/audiomixer/__init__.c index bd9cf608b9f25..8ca6aab6fed96 100644 --- a/shared-bindings/audiomixer/__init__.c +++ b/shared-bindings/audiomixer/__init__.c @@ -13,12 +13,12 @@ //| """Support for audio mixing""" -STATIC const mp_rom_map_elem_t audiomixer_module_globals_table[] = { +static const mp_rom_map_elem_t audiomixer_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_audiomixer) }, { MP_ROM_QSTR(MP_QSTR_Mixer), MP_ROM_PTR(&audiomixer_mixer_type) }, }; -STATIC MP_DEFINE_CONST_DICT(audiomixer_module_globals, audiomixer_module_globals_table); +static MP_DEFINE_CONST_DICT(audiomixer_module_globals, audiomixer_module_globals_table); const mp_obj_module_t audiomixer_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/audiomp3/MP3Decoder.c b/shared-bindings/audiomp3/MP3Decoder.c index 88e7ed0cc44ec..7d33d4c36b04c 100644 --- a/shared-bindings/audiomp3/MP3Decoder.c +++ b/shared-bindings/audiomp3/MP3Decoder.c @@ -66,7 +66,7 @@ //| """ //| ... -STATIC mp_obj_t audiomp3_mp3file_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { +static mp_obj_t audiomp3_mp3file_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { mp_arg_check_num(n_args, n_kw, 1, 2, false); mp_obj_t arg = args[0]; @@ -97,14 +97,14 @@ STATIC mp_obj_t audiomp3_mp3file_make_new(const mp_obj_type_t *type, size_t n_ar //| def deinit(self) -> None: //| """Deinitialises the MP3 and releases all memory resources for reuse.""" //| ... -STATIC mp_obj_t audiomp3_mp3file_deinit(mp_obj_t self_in) { +static mp_obj_t audiomp3_mp3file_deinit(mp_obj_t self_in) { audiomp3_mp3file_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_audiomp3_mp3file_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(audiomp3_mp3file_deinit_obj, audiomp3_mp3file_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(audiomp3_mp3file_deinit_obj, audiomp3_mp3file_deinit); -STATIC void check_for_deinit(audiomp3_mp3file_obj_t *self) { +static void check_for_deinit(audiomp3_mp3file_obj_t *self) { if (common_hal_audiomp3_mp3file_deinited(self)) { raise_deinited_error(); } @@ -119,23 +119,23 @@ STATIC void check_for_deinit(audiomp3_mp3file_obj_t *self) { //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t audiomp3_mp3file_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t audiomp3_mp3file_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_audiomp3_mp3file_deinit(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audiomp3_mp3file___exit___obj, 4, 4, audiomp3_mp3file_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audiomp3_mp3file___exit___obj, 4, 4, audiomp3_mp3file_obj___exit__); //| file: typing.BinaryIO //| """File to play back.""" -STATIC mp_obj_t audiomp3_mp3file_obj_get_file(mp_obj_t self_in) { +static mp_obj_t audiomp3_mp3file_obj_get_file(mp_obj_t self_in) { audiomp3_mp3file_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return self->file; } MP_DEFINE_CONST_FUN_OBJ_1(audiomp3_mp3file_get_file_obj, audiomp3_mp3file_obj_get_file); -STATIC mp_obj_t audiomp3_mp3file_obj_set_file(mp_obj_t self_in, mp_obj_t file) { +static mp_obj_t audiomp3_mp3file_obj_set_file(mp_obj_t self_in, mp_obj_t file) { audiomp3_mp3file_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); if (!mp_obj_is_type(file, &mp_type_fileio)) { @@ -149,7 +149,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(audiomp3_mp3file_set_file_obj, audiomp3_mp3file_obj_se //| def open(self, filepath: str) -> None: //| """Takes in the name of a mp3 file, opens it, and replaces the old playback file.""" //| ... -STATIC mp_obj_t audiomp3_mp3file_obj_open(mp_obj_t self_in, mp_obj_t path) { +static mp_obj_t audiomp3_mp3file_obj_open(mp_obj_t self_in, mp_obj_t path) { audiomp3_mp3file_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -170,14 +170,14 @@ MP_PROPERTY_GETSET(audiomp3_mp3file_file_obj, //| """32 bit value that dictates how quickly samples are loaded into the DAC //| in Hertz (cycles per second). When the sample is looped, this can change //| the pitch output without changing the underlying sample.""" -STATIC mp_obj_t audiomp3_mp3file_obj_get_sample_rate(mp_obj_t self_in) { +static mp_obj_t audiomp3_mp3file_obj_get_sample_rate(mp_obj_t self_in) { audiomp3_mp3file_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_audiomp3_mp3file_get_sample_rate(self)); } MP_DEFINE_CONST_FUN_OBJ_1(audiomp3_mp3file_get_sample_rate_obj, audiomp3_mp3file_obj_get_sample_rate); -STATIC mp_obj_t audiomp3_mp3file_obj_set_sample_rate(mp_obj_t self_in, mp_obj_t sample_rate) { +static mp_obj_t audiomp3_mp3file_obj_set_sample_rate(mp_obj_t self_in, mp_obj_t sample_rate) { audiomp3_mp3file_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_audiomp3_mp3file_set_sample_rate(self, mp_obj_get_int(sample_rate)); @@ -191,7 +191,7 @@ MP_PROPERTY_GETSET(audiomp3_mp3file_sample_rate_obj, //| bits_per_sample: int //| """Bits per sample. (read only)""" -STATIC mp_obj_t audiomp3_mp3file_obj_get_bits_per_sample(mp_obj_t self_in) { +static mp_obj_t audiomp3_mp3file_obj_get_bits_per_sample(mp_obj_t self_in) { audiomp3_mp3file_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_audiomp3_mp3file_get_bits_per_sample(self)); @@ -203,7 +203,7 @@ MP_PROPERTY_GETTER(audiomp3_mp3file_bits_per_sample_obj, //| channel_count: int //| """Number of audio channels. (read only)""" -STATIC mp_obj_t audiomp3_mp3file_obj_get_channel_count(mp_obj_t self_in) { +static mp_obj_t audiomp3_mp3file_obj_get_channel_count(mp_obj_t self_in) { audiomp3_mp3file_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_audiomp3_mp3file_get_channel_count(self)); @@ -215,7 +215,7 @@ MP_PROPERTY_GETTER(audiomp3_mp3file_channel_count_obj, //| rms_level: float //| """The RMS audio level of a recently played moment of audio. (read only)""" -STATIC mp_obj_t audiomp3_mp3file_obj_get_rms_level(mp_obj_t self_in) { +static mp_obj_t audiomp3_mp3file_obj_get_rms_level(mp_obj_t self_in) { audiomp3_mp3file_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return mp_obj_new_float(common_hal_audiomp3_mp3file_get_rms_level(self)); @@ -228,7 +228,7 @@ MP_PROPERTY_GETTER(audiomp3_mp3file_rms_level_obj, //| samples_decoded: int //| """The number of audio samples decoded from the current file. (read only)""" //| -STATIC mp_obj_t audiomp3_mp3file_obj_get_samples_decoded(mp_obj_t self_in) { +static mp_obj_t audiomp3_mp3file_obj_get_samples_decoded(mp_obj_t self_in) { audiomp3_mp3file_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_audiomp3_mp3file_get_samples_decoded(self)); @@ -238,7 +238,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiomp3_mp3file_get_samples_decoded_obj, audiomp3_mp3 MP_PROPERTY_GETTER(audiomp3_mp3file_samples_decoded_obj, (mp_obj_t)&audiomp3_mp3file_get_samples_decoded_obj); -STATIC const mp_rom_map_elem_t audiomp3_mp3file_locals_dict_table[] = { +static const mp_rom_map_elem_t audiomp3_mp3file_locals_dict_table[] = { // Methods { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&audiomp3_mp3file_open_obj) }, { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&audiomp3_mp3file_deinit_obj) }, @@ -254,9 +254,9 @@ STATIC const mp_rom_map_elem_t audiomp3_mp3file_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_rms_level), MP_ROM_PTR(&audiomp3_mp3file_rms_level_obj) }, { MP_ROM_QSTR(MP_QSTR_samples_decoded), MP_ROM_PTR(&audiomp3_mp3file_samples_decoded_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(audiomp3_mp3file_locals_dict, audiomp3_mp3file_locals_dict_table); +static MP_DEFINE_CONST_DICT(audiomp3_mp3file_locals_dict, audiomp3_mp3file_locals_dict_table); -STATIC const audiosample_p_t audiomp3_mp3file_proto = { +static const audiosample_p_t audiomp3_mp3file_proto = { MP_PROTO_IMPLEMENT(MP_QSTR_protocol_audiosample) .sample_rate = (audiosample_sample_rate_fun)common_hal_audiomp3_mp3file_get_sample_rate, .bits_per_sample = (audiosample_bits_per_sample_fun)common_hal_audiomp3_mp3file_get_bits_per_sample, diff --git a/shared-bindings/audiomp3/__init__.c b/shared-bindings/audiomp3/__init__.c index 58fa9dfa10a5c..04146109a9895 100644 --- a/shared-bindings/audiomp3/__init__.c +++ b/shared-bindings/audiomp3/__init__.c @@ -18,12 +18,12 @@ //| `_. //| """ -STATIC const mp_rom_map_elem_t audiomp3_module_globals_table[] = { +static const mp_rom_map_elem_t audiomp3_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_audiomp3) }, { MP_ROM_QSTR(MP_QSTR_MP3Decoder), MP_ROM_PTR(&audiomp3_mp3file_type) }, }; -STATIC MP_DEFINE_CONST_DICT(audiomp3_module_globals, audiomp3_module_globals_table); +static MP_DEFINE_CONST_DICT(audiomp3_module_globals, audiomp3_module_globals_table); const mp_obj_module_t audiomp3_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/audiopwmio/PWMAudioOut.c b/shared-bindings/audiopwmio/PWMAudioOut.c index 0314ab41aacba..3b75df16ec457 100644 --- a/shared-bindings/audiopwmio/PWMAudioOut.c +++ b/shared-bindings/audiopwmio/PWMAudioOut.c @@ -81,7 +81,7 @@ //| pass //| print("stopped")""" //| ... -STATIC mp_obj_t audiopwmio_pwmaudioout_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t audiopwmio_pwmaudioout_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_left_channel, ARG_right_channel, ARG_quiescent_value }; static const mp_arg_t allowed_args[] = { { MP_QSTR_left_channel, MP_ARG_OBJ | MP_ARG_REQUIRED }, @@ -109,14 +109,14 @@ STATIC mp_obj_t audiopwmio_pwmaudioout_make_new(const mp_obj_type_t *type, size_ //| def deinit(self) -> None: //| """Deinitialises the PWMAudioOut and releases any hardware resources for reuse.""" //| ... -STATIC mp_obj_t audiopwmio_pwmaudioout_deinit(mp_obj_t self_in) { +static mp_obj_t audiopwmio_pwmaudioout_deinit(mp_obj_t self_in) { audiopwmio_pwmaudioout_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_audiopwmio_pwmaudioout_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(audiopwmio_pwmaudioout_deinit_obj, audiopwmio_pwmaudioout_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(audiopwmio_pwmaudioout_deinit_obj, audiopwmio_pwmaudioout_deinit); -STATIC void check_for_deinit(audiopwmio_pwmaudioout_obj_t *self) { +static void check_for_deinit(audiopwmio_pwmaudioout_obj_t *self) { if (common_hal_audiopwmio_pwmaudioout_deinited(self)) { raise_deinited_error(); } @@ -130,12 +130,12 @@ STATIC void check_for_deinit(audiopwmio_pwmaudioout_obj_t *self) { //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t audiopwmio_pwmaudioout_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t audiopwmio_pwmaudioout_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_audiopwmio_pwmaudioout_deinit(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audiopwmio_pwmaudioout___exit___obj, 4, 4, audiopwmio_pwmaudioout_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audiopwmio_pwmaudioout___exit___obj, 4, 4, audiopwmio_pwmaudioout_obj___exit__); //| def play(self, sample: circuitpython_typing.AudioSample, *, loop: bool = False) -> None: @@ -147,7 +147,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(audiopwmio_pwmaudioout___exit___obj, //| The sample itself should consist of 16 bit samples. Microcontrollers with a lower output //| resolution will use the highest order bits to output.""" //| ... -STATIC mp_obj_t audiopwmio_pwmaudioout_obj_play(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t audiopwmio_pwmaudioout_obj_play(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_sample, ARG_loop }; static const mp_arg_t allowed_args[] = { { MP_QSTR_sample, MP_ARG_OBJ | MP_ARG_REQUIRED }, @@ -168,7 +168,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(audiopwmio_pwmaudioout_play_obj, 1, audiopwmio_pwmaud //| def stop(self) -> None: //| """Stops playback and resets to the start of the sample.""" //| ... -STATIC mp_obj_t audiopwmio_pwmaudioout_obj_stop(mp_obj_t self_in) { +static mp_obj_t audiopwmio_pwmaudioout_obj_stop(mp_obj_t self_in) { audiopwmio_pwmaudioout_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_audiopwmio_pwmaudioout_stop(self); @@ -178,7 +178,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiopwmio_pwmaudioout_stop_obj, audiopwmio_pwmaudioou //| playing: bool //| """True when an audio sample is being output even if `paused`. (read-only)""" -STATIC mp_obj_t audiopwmio_pwmaudioout_obj_get_playing(mp_obj_t self_in) { +static mp_obj_t audiopwmio_pwmaudioout_obj_get_playing(mp_obj_t self_in) { audiopwmio_pwmaudioout_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return mp_obj_new_bool(common_hal_audiopwmio_pwmaudioout_get_playing(self)); @@ -191,7 +191,7 @@ MP_PROPERTY_GETTER(audiopwmio_pwmaudioout_playing_obj, //| def pause(self) -> None: //| """Stops playback temporarily while remembering the position. Use `resume` to resume playback.""" //| ... -STATIC mp_obj_t audiopwmio_pwmaudioout_obj_pause(mp_obj_t self_in) { +static mp_obj_t audiopwmio_pwmaudioout_obj_pause(mp_obj_t self_in) { audiopwmio_pwmaudioout_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -206,7 +206,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiopwmio_pwmaudioout_pause_obj, audiopwmio_pwmaudioo //| def resume(self) -> None: //| """Resumes sample playback after :py:func:`pause`.""" //| ... -STATIC mp_obj_t audiopwmio_pwmaudioout_obj_resume(mp_obj_t self_in) { +static mp_obj_t audiopwmio_pwmaudioout_obj_resume(mp_obj_t self_in) { audiopwmio_pwmaudioout_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -221,7 +221,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiopwmio_pwmaudioout_resume_obj, audiopwmio_pwmaudio //| paused: bool //| """True when playback is paused. (read-only)""" //| -STATIC mp_obj_t audiopwmio_pwmaudioout_obj_get_paused(mp_obj_t self_in) { +static mp_obj_t audiopwmio_pwmaudioout_obj_get_paused(mp_obj_t self_in) { audiopwmio_pwmaudioout_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return mp_obj_new_bool(common_hal_audiopwmio_pwmaudioout_get_paused(self)); @@ -231,7 +231,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(audiopwmio_pwmaudioout_get_paused_obj, audiopwmio_pwma MP_PROPERTY_GETTER(audiopwmio_pwmaudioout_paused_obj, (mp_obj_t)&audiopwmio_pwmaudioout_get_paused_obj); -STATIC const mp_rom_map_elem_t audiopwmio_pwmaudioout_locals_dict_table[] = { +static const mp_rom_map_elem_t audiopwmio_pwmaudioout_locals_dict_table[] = { // Methods { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&audiopwmio_pwmaudioout_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&audiopwmio_pwmaudioout_deinit_obj) }, @@ -246,7 +246,7 @@ STATIC const mp_rom_map_elem_t audiopwmio_pwmaudioout_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_playing), MP_ROM_PTR(&audiopwmio_pwmaudioout_playing_obj) }, { MP_ROM_QSTR(MP_QSTR_paused), MP_ROM_PTR(&audiopwmio_pwmaudioout_paused_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(audiopwmio_pwmaudioout_locals_dict, audiopwmio_pwmaudioout_locals_dict_table); +static MP_DEFINE_CONST_DICT(audiopwmio_pwmaudioout_locals_dict, audiopwmio_pwmaudioout_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( audiopwmio_pwmaudioout_type, diff --git a/shared-bindings/audiopwmio/__init__.c b/shared-bindings/audiopwmio/__init__.c index 2f84aaae40284..b2f8a45c36794 100644 --- a/shared-bindings/audiopwmio/__init__.c +++ b/shared-bindings/audiopwmio/__init__.c @@ -25,12 +25,12 @@ //| Since CircuitPython 5, `Mixer`, `RawSample` and `WaveFile` are moved //| to :mod:`audiocore`.""" -STATIC const mp_rom_map_elem_t audiopwmio_module_globals_table[] = { +static const mp_rom_map_elem_t audiopwmio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_audiopwmio) }, { MP_ROM_QSTR(MP_QSTR_PWMAudioOut), MP_ROM_PTR(&audiopwmio_pwmaudioout_type) }, }; -STATIC MP_DEFINE_CONST_DICT(audiopwmio_module_globals, audiopwmio_module_globals_table); +static MP_DEFINE_CONST_DICT(audiopwmio_module_globals, audiopwmio_module_globals_table); const mp_obj_module_t audiopwmio_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/bitbangio/I2C.c b/shared-bindings/bitbangio/I2C.c index 5c03dcb40f612..491833c27d45f 100644 --- a/shared-bindings/bitbangio/I2C.c +++ b/shared-bindings/bitbangio/I2C.c @@ -45,7 +45,7 @@ //| :param int frequency: The clock frequency of the bus //| :param int timeout: The maximum clock stretching timeout in microseconds""" //| ... -STATIC mp_obj_t bitbangio_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t bitbangio_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_scl, ARG_sda, ARG_frequency, ARG_timeout }; static const mp_arg_t allowed_args[] = { { MP_QSTR_scl, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -67,14 +67,14 @@ STATIC mp_obj_t bitbangio_i2c_make_new(const mp_obj_type_t *type, size_t n_args, //| def deinit(self) -> None: //| """Releases control of the underlying hardware so other classes can use it.""" //| ... -STATIC mp_obj_t bitbangio_i2c_obj_deinit(mp_obj_t self_in) { +static mp_obj_t bitbangio_i2c_obj_deinit(mp_obj_t self_in) { bitbangio_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in); shared_module_bitbangio_i2c_deinit(self); return mp_const_none; } MP_DEFINE_CONST_FUN_OBJ_1(bitbangio_i2c_deinit_obj, bitbangio_i2c_obj_deinit); -STATIC void check_for_deinit(bitbangio_i2c_obj_t *self) { +static void check_for_deinit(bitbangio_i2c_obj_t *self) { if (shared_module_bitbangio_i2c_deinited(self)) { raise_deinited_error(); } @@ -89,12 +89,12 @@ STATIC void check_for_deinit(bitbangio_i2c_obj_t *self) { //| """Automatically deinitializes the hardware on context exit. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t bitbangio_i2c_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t bitbangio_i2c_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; shared_module_bitbangio_i2c_deinit(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitbangio_i2c_obj___exit___obj, 4, 4, bitbangio_i2c_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitbangio_i2c_obj___exit___obj, 4, 4, bitbangio_i2c_obj___exit__); static void check_lock(bitbangio_i2c_obj_t *self) { if (!shared_module_bitbangio_i2c_has_lock(self)) { @@ -107,7 +107,7 @@ static void check_lock(bitbangio_i2c_obj_t *self) { //| those that respond. A device responds if it pulls the SDA line low after //| its address (including a read bit) is sent on the bus.""" //| ... -STATIC mp_obj_t bitbangio_i2c_scan(mp_obj_t self_in) { +static mp_obj_t bitbangio_i2c_scan(mp_obj_t self_in) { bitbangio_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); check_lock(self); @@ -126,7 +126,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(bitbangio_i2c_scan_obj, bitbangio_i2c_scan); //| def try_lock(self) -> bool: //| """Attempts to grab the I2C lock. Returns True on success.""" //| ... -STATIC mp_obj_t bitbangio_i2c_obj_try_lock(mp_obj_t self_in) { +static mp_obj_t bitbangio_i2c_obj_try_lock(mp_obj_t self_in) { bitbangio_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return mp_obj_new_bool(shared_module_bitbangio_i2c_try_lock(self)); @@ -136,7 +136,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(bitbangio_i2c_try_lock_obj, bitbangio_i2c_obj_try_lock //| def unlock(self) -> None: //| """Releases the I2C lock.""" //| ... -STATIC mp_obj_t bitbangio_i2c_obj_unlock(mp_obj_t self_in) { +static mp_obj_t bitbangio_i2c_obj_unlock(mp_obj_t self_in) { bitbangio_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); shared_module_bitbangio_i2c_unlock(self); @@ -162,7 +162,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(bitbangio_i2c_unlock_obj, bitbangio_i2c_obj_unlock); //| :param int end: Index to write up to but not include""" //| ... // Shared arg parsing for readfrom_into and writeto_then_readfrom. -STATIC void readfrom(bitbangio_i2c_obj_t *self, mp_int_t address, mp_obj_t buffer, int32_t start, mp_int_t end) { +static void readfrom(bitbangio_i2c_obj_t *self, mp_int_t address, mp_obj_t buffer, int32_t start, mp_int_t end) { mp_buffer_info_t bufinfo; mp_get_buffer_raise(buffer, &bufinfo, MP_BUFFER_WRITE); @@ -181,7 +181,7 @@ STATIC void readfrom(bitbangio_i2c_obj_t *self, mp_int_t address, mp_obj_t buffe } } -STATIC mp_obj_t bitbangio_i2c_readfrom_into(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bitbangio_i2c_readfrom_into(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_address, ARG_buffer, ARG_start, ARG_end }; static const mp_arg_t allowed_args[] = { { MP_QSTR_address, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} }, @@ -223,7 +223,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitbangio_i2c_readfrom_into_obj, 1, bitbangio_i2c_rea //| """ //| ... // Shared arg parsing for writeto and writeto_then_readfrom. -STATIC void writeto(bitbangio_i2c_obj_t *self, mp_int_t address, mp_obj_t buffer, int32_t start, mp_int_t end, bool stop) { +static void writeto(bitbangio_i2c_obj_t *self, mp_int_t address, mp_obj_t buffer, int32_t start, mp_int_t end, bool stop) { // get the buffer to write the data from mp_buffer_info_t bufinfo; mp_get_buffer_raise(buffer, &bufinfo, MP_BUFFER_READ); @@ -245,7 +245,7 @@ STATIC void writeto(bitbangio_i2c_obj_t *self, mp_int_t address, mp_obj_t buffer } } -STATIC mp_obj_t bitbangio_i2c_writeto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bitbangio_i2c_writeto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_address, ARG_buffer, ARG_start, ARG_end }; static const mp_arg_t allowed_args[] = { { MP_QSTR_address, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} }, @@ -263,7 +263,7 @@ STATIC mp_obj_t bitbangio_i2c_writeto(size_t n_args, const mp_obj_t *pos_args, m args[ARG_end].u_int, true); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bitbangio_i2c_writeto_obj, 1, bitbangio_i2c_writeto); +static MP_DEFINE_CONST_FUN_OBJ_KW(bitbangio_i2c_writeto_obj, 1, bitbangio_i2c_writeto); //| import sys @@ -300,7 +300,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bitbangio_i2c_writeto_obj, 1, bitbangio_i2c_wr //| """ //| ... //| -STATIC mp_obj_t bitbangio_i2c_writeto_then_readfrom(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bitbangio_i2c_writeto_then_readfrom(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_address, ARG_out_buffer, ARG_in_buffer, ARG_out_start, ARG_out_end, ARG_in_start, ARG_in_end }; static const mp_arg_t allowed_args[] = { { MP_QSTR_address, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} }, @@ -326,7 +326,7 @@ STATIC mp_obj_t bitbangio_i2c_writeto_then_readfrom(size_t n_args, const mp_obj_ } MP_DEFINE_CONST_FUN_OBJ_KW(bitbangio_i2c_writeto_then_readfrom_obj, 1, bitbangio_i2c_writeto_then_readfrom); -STATIC const mp_rom_map_elem_t bitbangio_i2c_locals_dict_table[] = { +static const mp_rom_map_elem_t bitbangio_i2c_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&bitbangio_i2c_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&bitbangio_i2c_obj___exit___obj) }, @@ -340,7 +340,7 @@ STATIC const mp_rom_map_elem_t bitbangio_i2c_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_writeto_then_readfrom), MP_ROM_PTR(&bitbangio_i2c_writeto_then_readfrom_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(bitbangio_i2c_locals_dict, bitbangio_i2c_locals_dict_table); +static MP_DEFINE_CONST_DICT(bitbangio_i2c_locals_dict, bitbangio_i2c_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( bitbangio_i2c_type, diff --git a/shared-bindings/bitbangio/SPI.c b/shared-bindings/bitbangio/SPI.c index 9682c8c6d9158..62fb1e5a2b363 100644 --- a/shared-bindings/bitbangio/SPI.c +++ b/shared-bindings/bitbangio/SPI.c @@ -54,7 +54,7 @@ //| ... // TODO(tannewt): Support LSB SPI. -STATIC mp_obj_t bitbangio_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t bitbangio_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_clock, ARG_MOSI, ARG_MISO, ARG_baudrate, ARG_polarity, ARG_phase, ARG_bits, ARG_firstbit }; static const mp_arg_t allowed_args[] = { { MP_QSTR_clock, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -76,14 +76,14 @@ STATIC mp_obj_t bitbangio_spi_make_new(const mp_obj_type_t *type, size_t n_args, //| def deinit(self) -> None: //| """Turn off the SPI bus.""" //| ... -STATIC mp_obj_t bitbangio_spi_obj_deinit(mp_obj_t self_in) { +static mp_obj_t bitbangio_spi_obj_deinit(mp_obj_t self_in) { bitbangio_spi_obj_t *self = MP_OBJ_TO_PTR(self_in); shared_module_bitbangio_spi_deinit(self); return mp_const_none; } MP_DEFINE_CONST_FUN_OBJ_1(bitbangio_spi_deinit_obj, bitbangio_spi_obj_deinit); -STATIC void check_for_deinit(bitbangio_spi_obj_t *self) { +static void check_for_deinit(bitbangio_spi_obj_t *self) { if (shared_module_bitbangio_spi_deinited(self)) { raise_deinited_error(); } @@ -98,12 +98,12 @@ STATIC void check_for_deinit(bitbangio_spi_obj_t *self) { //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t bitbangio_spi_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t bitbangio_spi_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; shared_module_bitbangio_spi_deinit(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitbangio_spi_obj___exit___obj, 4, 4, bitbangio_spi_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bitbangio_spi_obj___exit___obj, 4, 4, bitbangio_spi_obj___exit__); static void check_lock(bitbangio_spi_obj_t *self) { @@ -123,7 +123,7 @@ static void check_lock(bitbangio_spi_obj_t *self) { //| or second (1). Rising or falling depends on clock polarity. //| :param int bits: the number of bits per word""" //| ... -STATIC mp_obj_t bitbangio_spi_configure(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bitbangio_spi_configure(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_baudrate, ARG_polarity, ARG_phase, ARG_bits }; static const mp_arg_t allowed_args[] = { { MP_QSTR_baudrate, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 100000} }, @@ -153,7 +153,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitbangio_spi_configure_obj, 1, bitbangio_spi_configu //| :return: True when lock has been grabbed //| :rtype: bool""" //| ... -STATIC mp_obj_t bitbangio_spi_obj_try_lock(mp_obj_t self_in) { +static mp_obj_t bitbangio_spi_obj_try_lock(mp_obj_t self_in) { bitbangio_spi_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return mp_obj_new_bool(shared_module_bitbangio_spi_try_lock(self)); @@ -163,7 +163,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(bitbangio_spi_try_lock_obj, bitbangio_spi_obj_try_lock //| def unlock(self) -> None: //| """Releases the SPI lock.""" //| ... -STATIC mp_obj_t bitbangio_spi_obj_unlock(mp_obj_t self_in) { +static mp_obj_t bitbangio_spi_obj_unlock(mp_obj_t self_in) { bitbangio_spi_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); shared_module_bitbangio_spi_unlock(self); @@ -185,7 +185,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(bitbangio_spi_unlock_obj, bitbangio_spi_obj_unlock); //| :param int end: end of buffer slice; if not specified, use ``len(buffer)`` //| """ //| ... -STATIC mp_obj_t bitbangio_spi_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bitbangio_spi_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_buffer, ARG_start, ARG_end }; static const mp_arg_t allowed_args[] = { { MP_QSTR_buffer, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, @@ -246,7 +246,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitbangio_spi_write_obj, 1, bitbangio_spi_write); //| :param int write_value: value to write while reading //| """ //| ... -STATIC mp_obj_t bitbangio_spi_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bitbangio_spi_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_buffer, ARG_start, ARG_end, ARG_write_value }; static const mp_arg_t allowed_args[] = { { MP_QSTR_buffer, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, @@ -319,7 +319,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitbangio_spi_readinto_obj, 1, bitbangio_spi_readinto //| """ //| ... //| -STATIC mp_obj_t bitbangio_spi_write_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bitbangio_spi_write_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_out_buffer, ARG_in_buffer, ARG_out_start, ARG_out_end, ARG_in_start, ARG_in_end }; static const mp_arg_t allowed_args[] = { { MP_QSTR_out_buffer, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, @@ -375,7 +375,7 @@ STATIC mp_obj_t bitbangio_spi_write_readinto(size_t n_args, const mp_obj_t *pos_ } MP_DEFINE_CONST_FUN_OBJ_KW(bitbangio_spi_write_readinto_obj, 1, bitbangio_spi_write_readinto); -STATIC const mp_rom_map_elem_t bitbangio_spi_locals_dict_table[] = { +static const mp_rom_map_elem_t bitbangio_spi_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&bitbangio_spi_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&bitbangio_spi_obj___exit___obj) }, @@ -388,7 +388,7 @@ STATIC const mp_rom_map_elem_t bitbangio_spi_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&bitbangio_spi_write_obj) }, { MP_ROM_QSTR(MP_QSTR_write_readinto), MP_ROM_PTR(&bitbangio_spi_write_readinto_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(bitbangio_spi_locals_dict, bitbangio_spi_locals_dict_table); +static MP_DEFINE_CONST_DICT(bitbangio_spi_locals_dict, bitbangio_spi_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( bitbangio_spi_type, diff --git a/shared-bindings/bitbangio/__init__.c b/shared-bindings/bitbangio/__init__.c index 89f75a085835c..27f01ffec58fe 100644 --- a/shared-bindings/bitbangio/__init__.c +++ b/shared-bindings/bitbangio/__init__.c @@ -47,13 +47,13 @@ //| hardware. The last step is optional because CircuitPython automatically //| resets hardware after a program finishes.""" -STATIC const mp_rom_map_elem_t bitbangio_module_globals_table[] = { +static const mp_rom_map_elem_t bitbangio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_bitbangio) }, { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&bitbangio_i2c_type) }, { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&bitbangio_spi_type) }, }; -STATIC MP_DEFINE_CONST_DICT(bitbangio_module_globals, bitbangio_module_globals_table); +static MP_DEFINE_CONST_DICT(bitbangio_module_globals, bitbangio_module_globals_table); const mp_obj_module_t bitbangio_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/bitmapfilter/__init__.c b/shared-bindings/bitmapfilter/__init__.c index d46852c15497d..0bd63c20ab923 100644 --- a/shared-bindings/bitmapfilter/__init__.c +++ b/shared-bindings/bitmapfilter/__init__.c @@ -81,11 +81,11 @@ //| -STATIC mp_float_t get_m(mp_obj_t mul_obj, int sum) { +static mp_float_t get_m(mp_obj_t mul_obj, int sum) { return mul_obj != mp_const_none ? mp_obj_get_float(mul_obj) : sum ? 1 / (mp_float_t)sum : 1; } -STATIC mp_obj_t bitmapfilter_morph(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bitmapfilter_morph(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_bitmap, ARG_weights, ARG_mul, ARG_add, ARG_threshold, ARG_offset, ARG_invert, ARG_mask }; static const mp_arg_t allowed_args[] = { { MP_QSTR_bitmap, MP_ARG_REQUIRED | MP_ARG_OBJ, { .u_obj = MP_OBJ_NULL } }, @@ -351,7 +351,7 @@ static const mp_obj_namedtuple_type_t bitmapfilter_channel_mixer_offset_type = { //| Only pixels set to a non-zero value in the mask are modified. //| """ //| -STATIC mp_obj_t bitmapfilter_mix(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bitmapfilter_mix(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_bitmap, ARG_weights, ARG_mask }; static const mp_arg_t allowed_args[] = { { MP_QSTR_bitmap, MP_ARG_REQUIRED | MP_ARG_OBJ, { .u_obj = MP_OBJ_NULL } }, @@ -420,7 +420,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmapfilter_mix_obj, 0, bitmapfilter_mix); //| PIL and ImageMagic both call this "solarize". //| """ //| -STATIC mp_obj_t bitmapfilter_solarize(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bitmapfilter_solarize(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_bitmap, ARG_threshold, ARG_mask }; static const mp_arg_t allowed_args[] = { { MP_QSTR_bitmap, MP_ARG_REQUIRED | MP_ARG_OBJ, { .u_obj = MP_OBJ_NULL } }, @@ -484,13 +484,13 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmapfilter_solarize_obj, 0, bitmapfilter_solarize); //| """ //| -STATIC int scaled_lut(int maxval, mp_obj_t func, int i) { +static int scaled_lut(int maxval, mp_obj_t func, int i) { mp_obj_t obj = mp_call_function_1(func, mp_obj_new_float(i / (mp_float_t)maxval)); mp_float_t val = mp_obj_get_float(obj); return (int)MICROPY_FLOAT_C_FUN(round)(val * maxval); } -STATIC mp_obj_t bitmapfilter_lookup(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bitmapfilter_lookup(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_bitmap, ARG_lookup, ARG_mask }; static const mp_arg_t allowed_args[] = { { MP_QSTR_bitmap, MP_ARG_REQUIRED | MP_ARG_OBJ, { .u_obj = MP_OBJ_NULL } }, @@ -562,7 +562,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmapfilter_lookup_obj, 0, bitmapfilter_lookup); //| Only pixels set to a non-zero value in the mask are modified. //| """ //| -STATIC mp_obj_t bitmapfilter_false_color(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bitmapfilter_false_color(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_bitmap, ARG_palette, ARG_mask }; static const mp_arg_t allowed_args[] = { { MP_QSTR_bitmap, MP_ARG_REQUIRED | MP_ARG_OBJ, { .u_obj = MP_OBJ_NULL } }, @@ -591,7 +591,7 @@ STATIC mp_obj_t bitmapfilter_false_color(size_t n_args, const mp_obj_t *pos_args MP_DEFINE_CONST_FUN_OBJ_KW(bitmapfilter_false_color_obj, 0, bitmapfilter_false_color); #define BLEND_TABLE_SIZE (4096) -STATIC uint8_t *get_blend_table(mp_obj_t lookup, int mode) { +static uint8_t *get_blend_table(mp_obj_t lookup, int mode) { mp_buffer_info_t lookup_buf; if (!mp_get_buffer(lookup, &lookup_buf, mode) || lookup_buf.len != BLEND_TABLE_SIZE) { return NULL; @@ -624,7 +624,7 @@ STATIC uint8_t *get_blend_table(mp_obj_t lookup, int mode) { //| return a * .33 + b * .67 //| """ //| -STATIC mp_obj_t blend_precompute(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t blend_precompute(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_lookup, ARG_table }; static const mp_arg_t allowed_args[] = { { MP_QSTR_lookup, MP_ARG_REQUIRED | MP_ARG_OBJ, { .u_obj = MP_OBJ_NULL } }, @@ -670,7 +670,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmapfilter_blend_precompute_obj, 0, blend_precomput //| """ //| -STATIC mp_obj_t bitmapfilter_blend(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bitmapfilter_blend(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_dest, ARG_src1, ARG_src2, ARG_lookup, ARG_mask }; static const mp_arg_t allowed_args[] = { { MP_QSTR_dest, MP_ARG_REQUIRED | MP_ARG_OBJ, { .u_obj = MP_OBJ_NULL } }, @@ -713,7 +713,7 @@ STATIC mp_obj_t bitmapfilter_blend(size_t n_args, const mp_obj_t *pos_args, mp_m } MP_DEFINE_CONST_FUN_OBJ_KW(bitmapfilter_blend_obj, 0, bitmapfilter_blend); -STATIC const mp_rom_map_elem_t bitmapfilter_module_globals_table[] = { +static const mp_rom_map_elem_t bitmapfilter_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_bitmapfilter) }, { MP_ROM_QSTR(MP_QSTR_morph), MP_ROM_PTR(&bitmapfilter_morph_obj) }, { MP_ROM_QSTR(MP_QSTR_mix), MP_ROM_PTR(&bitmapfilter_mix_obj) }, @@ -727,7 +727,7 @@ STATIC const mp_rom_map_elem_t bitmapfilter_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_blend), MP_ROM_PTR(&bitmapfilter_blend_obj) }, { MP_ROM_QSTR(MP_QSTR_blend_precompute), MP_ROM_PTR(&bitmapfilter_blend_precompute_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(bitmapfilter_module_globals, bitmapfilter_module_globals_table); +static MP_DEFINE_CONST_DICT(bitmapfilter_module_globals, bitmapfilter_module_globals_table); const mp_obj_module_t bitmapfilter_module = { .base = {&mp_type_module }, diff --git a/shared-bindings/bitmaptools/__init__.c b/shared-bindings/bitmaptools/__init__.c index 16735179c64d5..de44b5164bb6e 100644 --- a/shared-bindings/bitmaptools/__init__.c +++ b/shared-bindings/bitmaptools/__init__.c @@ -24,7 +24,7 @@ #endif // This assigns to [0] and [2] because the order is x1, y1, x2, y2 -STATIC void bitmaptools_validate_coord_range(int16_t out[3], const mp_arg_val_t in[3], int lim, const qstr what[2]) { +static void bitmaptools_validate_coord_range(int16_t out[3], const mp_arg_val_t in[3], int lim, const qstr what[2]) { out[0] = mp_arg_validate_int_range(mp_arg_validate_type_int(in[0].u_obj, what[0]), 0, lim, what[0]); if (in[2].u_obj == mp_const_none) { out[2] = lim; @@ -53,7 +53,7 @@ bitmaptools_rect_t bitmaptools_validate_coord_range_pair(const mp_arg_val_t in[4 //| """ //| -STATIC int16_t validate_point(mp_obj_t point, int16_t default_value) { +static int16_t validate_point(mp_obj_t point, int16_t default_value) { // Checks if point is None and returns default_value, otherwise decodes integer value if (point == mp_const_none) { return default_value; @@ -61,7 +61,7 @@ STATIC int16_t validate_point(mp_obj_t point, int16_t default_value) { return mp_obj_get_int(point); } -STATIC void extract_tuple(mp_obj_t xy_tuple, int16_t *x, int16_t *y, int16_t x_default, int16_t y_default) { +static void extract_tuple(mp_obj_t xy_tuple, int16_t *x, int16_t *y, int16_t x_default, int16_t y_default) { // Helper function for rotozoom // Extract x,y values from a tuple or default if None if (xy_tuple == mp_const_none) { @@ -77,7 +77,7 @@ STATIC void extract_tuple(mp_obj_t xy_tuple, int16_t *x, int16_t *y, int16_t x_d } } -STATIC void validate_clip_region(displayio_bitmap_t *bitmap, mp_obj_t clip0_tuple, int16_t *clip0_x, int16_t *clip0_y, +static void validate_clip_region(displayio_bitmap_t *bitmap, mp_obj_t clip0_tuple, int16_t *clip0_x, int16_t *clip0_y, mp_obj_t clip1_tuple, int16_t *clip1_x, int16_t *clip1_y) { // Helper function for rotozoom // 1. Extract the clip x,y points from the two clip tuples @@ -176,7 +176,7 @@ STATIC void validate_clip_region(displayio_bitmap_t *bitmap, mp_obj_t clip0_tupl //| set to None to copy all pixels""" //| ... //| -STATIC mp_obj_t bitmaptools_obj_rotozoom(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bitmaptools_obj_rotozoom(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum {ARG_dest_bitmap, ARG_source_bitmap, ARG_ox, ARG_oy, ARG_dest_clip0, ARG_dest_clip1, ARG_px, ARG_py, ARG_source_clip0, ARG_source_clip1, @@ -291,7 +291,7 @@ MAKE_ENUM_MAP(bitmaptools_blendmode) { MAKE_ENUM_MAP_ENTRY(bitmaptools_blendmode, Normal), MAKE_ENUM_MAP_ENTRY(bitmaptools_blendmode, Screen), }; -STATIC MP_DEFINE_CONST_DICT(bitmaptools_blendmode_locals_dict, bitmaptools_blendmode_locals_table); +static MP_DEFINE_CONST_DICT(bitmaptools_blendmode_locals_dict, bitmaptools_blendmode_locals_table); MAKE_PRINTER(bitmaptools, bitmaptools_blendmode); MAKE_ENUM_TYPE(bitmaptools, BlendMode, bitmaptools_blendmode); @@ -328,7 +328,7 @@ MAKE_ENUM_TYPE(bitmaptools, BlendMode, bitmaptools_blendmode); //| For the RGB colorspaces, they must have a bits-per-value of 16.""" //| -STATIC mp_obj_t bitmaptools_alphablend(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bitmaptools_alphablend(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum {ARG_dest_bitmap, ARG_source_bitmap_1, ARG_source_bitmap_2, ARG_colorspace, ARG_factor_1, ARG_factor_2, ARG_blendmode, ARG_skip_source1_index, ARG_skip_source2_index}; static const mp_arg_t allowed_args[] = { @@ -429,7 +429,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_alphablend_obj, 0, bitmaptools_alphablend //| fill region in the destination bitmap""" //| ... //| -STATIC mp_obj_t bitmaptools_obj_fill_region(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bitmaptools_obj_fill_region(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum {ARG_dest_bitmap, ARGS_X1_Y1_X2_Y2, ARG_value}; static const mp_arg_t allowed_args[] = { @@ -477,7 +477,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_fill_region_obj, 0, bitmaptools_obj_fill_ //| value color in the enclosed area in the destination bitmap""" //| ... //| -STATIC mp_obj_t bitmaptools_obj_boundary_fill(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bitmaptools_obj_boundary_fill(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum {ARG_dest_bitmap, ARG_x, ARG_y, ARG_fill_color_value, ARG_replaced_color_value}; static const mp_arg_t allowed_args[] = { @@ -537,7 +537,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_boundary_fill_obj, 0, bitmaptools_obj_bou //| line in the destination bitmap""" //| ... //| -STATIC mp_obj_t bitmaptools_obj_draw_line(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bitmaptools_obj_draw_line(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum {ARG_dest_bitmap, ARG_x1, ARG_y1, ARG_x2, ARG_y2, ARG_value}; static const mp_arg_t allowed_args[] = { @@ -623,7 +623,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_draw_line_obj, 0, bitmaptools_obj_draw_li //| """ //| ... //| -STATIC mp_obj_t bitmaptools_obj_draw_polygon(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bitmaptools_obj_draw_polygon(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum {ARG_dest_bitmap, ARG_xs, ARG_ys, ARG_value, ARG_close}; static const mp_arg_t allowed_args[] = { @@ -705,7 +705,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_draw_polygon_obj, 0, bitmaptools_obj_draw //| """ //| ... //| -STATIC mp_obj_t bitmaptools_arrayblit(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bitmaptools_arrayblit(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_bitmap, ARG_data, ARGS_X1_Y1_X2_Y2, ARG_skip_index }; static const mp_arg_t allowed_args[] = { { MP_QSTR_bitmap, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, @@ -769,7 +769,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_arrayblit_obj, 0, bitmaptools_arrayblit); //| ... //| -STATIC mp_obj_t bitmaptools_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bitmaptools_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_bitmap, ARG_file, ARG_bits_per_pixel, ARG_element_size, ARG_reverse_pixels_in_element, ARG_swap_bytes_in_element, ARG_reverse_rows }; static const mp_arg_t allowed_args[] = { { MP_QSTR_bitmap, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, @@ -837,7 +837,7 @@ MAKE_ENUM_MAP(bitmaptools_dither_algorithm) { MAKE_ENUM_MAP_ENTRY(dither_algorithm, Atkinson), MAKE_ENUM_MAP_ENTRY(dither_algorithm, FloydStenberg), }; -STATIC MP_DEFINE_CONST_DICT(bitmaptools_dither_algorithm_locals_dict, bitmaptools_dither_algorithm_locals_table); +static MP_DEFINE_CONST_DICT(bitmaptools_dither_algorithm_locals_dict, bitmaptools_dither_algorithm_locals_table); MAKE_PRINTER(bitmaptools, bitmaptools_dither_algorithm); @@ -858,7 +858,7 @@ MAKE_ENUM_TYPE(bitmaptools, DitherAlgorithm, bitmaptools_dither_algorithm); //| """ //| ... //| -STATIC mp_obj_t bitmaptools_dither(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bitmaptools_dither(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_dest_bitmap, ARG_source_bitmap, ARG_source_colorspace, ARG_algorithm }; static const mp_arg_t allowed_args[] = { { MP_QSTR_dest_bitmap, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, @@ -951,7 +951,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_dither_obj, 0, bitmaptools_dither); //| //| ... //| -STATIC mp_obj_t bitmaptools_obj_draw_circle(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bitmaptools_obj_draw_circle(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum {ARG_dest_bitmap, ARG_x, ARG_y, ARG_radius, ARG_value}; static const mp_arg_t allowed_args[] = { @@ -1021,7 +1021,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_draw_circle_obj, 0, bitmaptools_obj_draw_ //| by the pixels from the source""" //| ... //| -STATIC mp_obj_t bitmaptools_obj_blit(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bitmaptools_obj_blit(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum {ARG_destination, ARG_source, ARG_x, ARG_y, ARG_x1, ARG_y1, ARG_x2, ARG_y2, ARG_skip_source_index, ARG_skip_dest_index}; static const mp_arg_t allowed_args[] = { {MP_QSTR_dest_bitmap, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, @@ -1083,7 +1083,7 @@ STATIC mp_obj_t bitmaptools_obj_blit(size_t n_args, const mp_obj_t *pos_args, mp MP_DEFINE_CONST_FUN_OBJ_KW(bitmaptools_blit_obj, 1, bitmaptools_obj_blit); -STATIC const mp_rom_map_elem_t bitmaptools_module_globals_table[] = { +static const mp_rom_map_elem_t bitmaptools_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_bitmaptools) }, { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&bitmaptools_readinto_obj) }, { MP_ROM_QSTR(MP_QSTR_rotozoom), MP_ROM_PTR(&bitmaptools_rotozoom_obj) }, @@ -1099,7 +1099,7 @@ STATIC const mp_rom_map_elem_t bitmaptools_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_BlendMode), MP_ROM_PTR(&bitmaptools_blendmode_type) }, { MP_ROM_QSTR(MP_QSTR_DitherAlgorithm), MP_ROM_PTR(&bitmaptools_dither_algorithm_type) }, }; -STATIC MP_DEFINE_CONST_DICT(bitmaptools_module_globals, bitmaptools_module_globals_table); +static MP_DEFINE_CONST_DICT(bitmaptools_module_globals, bitmaptools_module_globals_table); const mp_obj_module_t bitmaptools_module = { .base = {&mp_type_module }, diff --git a/shared-bindings/bitops/__init__.c b/shared-bindings/bitops/__init__.c index 9aabfb5f4f591..dc07436866a30 100644 --- a/shared-bindings/bitops/__init__.c +++ b/shared-bindings/bitops/__init__.c @@ -36,7 +36,7 @@ //| ... //| -STATIC mp_obj_t bit_transpose(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t bit_transpose(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_input, ARG_output, ARG_width }; static const mp_arg_t allowed_args[] = { { MP_QSTR_input, MP_ARG_OBJ | MP_ARG_REQUIRED }, @@ -65,14 +65,14 @@ STATIC mp_obj_t bit_transpose(size_t n_args, const mp_obj_t *pos_args, mp_map_t common_hal_bitops_bit_transpose(output_bufinfo.buf, input_bufinfo.buf, inlen, width); return args[ARG_output].u_obj; } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bitops_bit_transpose_obj, 0, bit_transpose); +static MP_DEFINE_CONST_FUN_OBJ_KW(bitops_bit_transpose_obj, 0, bit_transpose); -STATIC const mp_rom_map_elem_t bitops_module_globals_table[] = { +static const mp_rom_map_elem_t bitops_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_bitops) }, { MP_ROM_QSTR(MP_QSTR_bit_transpose), MP_ROM_PTR(&bitops_bit_transpose_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(bitops_module_globals, bitops_module_globals_table); +static MP_DEFINE_CONST_DICT(bitops_module_globals, bitops_module_globals_table); const mp_obj_module_t bitops_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/board/__init__.c b/shared-bindings/board/__init__.c index ba257032ad679..1a2721a91c4f5 100644 --- a/shared-bindings/board/__init__.c +++ b/shared-bindings/board/__init__.c @@ -47,11 +47,11 @@ //| ... //| #if CIRCUITPY_BOARD_I2C -STATIC mp_obj_t board_i2c_0(void) { +static mp_obj_t board_i2c_0(void) { return common_hal_board_create_i2c(0); } #else -STATIC mp_obj_t board_i2c_0(void) { +static mp_obj_t board_i2c_0(void) { mp_raise_NotImplementedError_varg(MP_ERROR_TEXT("No default %q bus"), MP_QSTR_I2C); return MP_ROM_NONE; } @@ -65,11 +65,11 @@ MP_DEFINE_CONST_FUN_OBJ_0(board_i2c_obj, board_i2c_0); //| ... //| #if CIRCUITPY_BOARD_SPI -STATIC mp_obj_t board_spi_0(void) { +static mp_obj_t board_spi_0(void) { return common_hal_board_create_spi(0); } #else -STATIC mp_obj_t board_spi_0(void) { +static mp_obj_t board_spi_0(void) { mp_raise_NotImplementedError_varg(MP_ERROR_TEXT("No default %q bus"), MP_QSTR_SPI); return MP_ROM_NONE; } @@ -83,11 +83,11 @@ MP_DEFINE_CONST_FUN_OBJ_0(board_spi_obj, board_spi_0); //| ... //| #if CIRCUITPY_BOARD_UART -STATIC mp_obj_t board_uart_0(void) { +static mp_obj_t board_uart_0(void) { return common_hal_board_create_uart(0); } #else -STATIC mp_obj_t board_uart_0(void) { +static mp_obj_t board_uart_0(void) { mp_raise_NotImplementedError_varg(MP_ERROR_TEXT("No default %q bus"), MP_QSTR_UART); return MP_ROM_NONE; } diff --git a/shared-bindings/board/__init__.h b/shared-bindings/board/__init__.h index 004ece1eaf343..7c9a59d2dbd0d 100644 --- a/shared-bindings/board/__init__.h +++ b/shared-bindings/board/__init__.h @@ -12,7 +12,7 @@ #include "shared-bindings/microcontroller/Pin.h" // for the pin definitions extern const mp_obj_dict_t board_module_globals; -STATIC const MP_DEFINE_STR_OBJ(board_module_id_obj, CIRCUITPY_BOARD_ID); +static const MP_DEFINE_STR_OBJ(board_module_id_obj, CIRCUITPY_BOARD_ID); bool common_hal_board_is_i2c(mp_obj_t obj); mp_obj_t common_hal_board_get_i2c(const mp_int_t instance); @@ -33,7 +33,7 @@ mp_obj_t board_uart(size_t n_args, const mp_obj_t *args); MP_DECLARE_CONST_FUN_OBJ_0(board_uart_obj); #define CIRCUITPY_BOARD_BUS_SINGLETON(name, bus, instance) \ - STATIC mp_obj_t board_##name(void) { \ + static mp_obj_t board_##name(void) { \ return common_hal_board_create_##bus(instance); \ } \ MP_DEFINE_CONST_FUN_OBJ_0(board_##name##_obj, board_##name); diff --git a/shared-bindings/busdisplay/BusDisplay.c b/shared-bindings/busdisplay/BusDisplay.c index 0247010f4f296..1b9a1a70c7e92 100644 --- a/shared-bindings/busdisplay/BusDisplay.c +++ b/shared-bindings/busdisplay/BusDisplay.c @@ -125,7 +125,7 @@ //| :param int backlight_pwm_frequency: The frequency to use to drive the PWM for backlight brightness control. Default is 50000. //| """ //| ... -STATIC mp_obj_t busdisplay_busdisplay_make_new(const mp_obj_type_t *type, size_t n_args, +static mp_obj_t busdisplay_busdisplay_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_display_bus, ARG_init_sequence, ARG_width, ARG_height, ARG_colstart, ARG_rowstart, ARG_rotation, ARG_color_depth, ARG_grayscale, ARG_pixels_in_byte_share_row, @@ -226,7 +226,7 @@ static busdisplay_busdisplay_obj_t *native_display(mp_obj_t display_obj) { } // Undocumented show() implementation with a friendly error message. -STATIC mp_obj_t busdisplay_busdisplay_obj_show(mp_obj_t self_in, mp_obj_t group_in) { +static mp_obj_t busdisplay_busdisplay_obj_show(mp_obj_t self_in, mp_obj_t group_in) { mp_raise_AttributeError(MP_ERROR_TEXT(".show(x) removed. Use .root_group = x")); return mp_const_none; } @@ -258,7 +258,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(busdisplay_busdisplay_show_obj, busdisplay_busdisplay_ //| :param int minimum_frames_per_second: The minimum number of times the screen should be updated per second. //| """ //| ... -STATIC mp_obj_t busdisplay_busdisplay_obj_refresh(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t busdisplay_busdisplay_obj_refresh(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_target_frames_per_second, ARG_minimum_frames_per_second }; static const mp_arg_t allowed_args[] = { { MP_QSTR_target_frames_per_second, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none} }, @@ -289,13 +289,13 @@ MP_DEFINE_CONST_FUN_OBJ_KW(busdisplay_busdisplay_refresh_obj, 1, busdisplay_busd //| auto_refresh: bool //| """True when the display is refreshed automatically.""" -STATIC mp_obj_t busdisplay_busdisplay_obj_get_auto_refresh(mp_obj_t self_in) { +static mp_obj_t busdisplay_busdisplay_obj_get_auto_refresh(mp_obj_t self_in) { busdisplay_busdisplay_obj_t *self = native_display(self_in); return mp_obj_new_bool(common_hal_busdisplay_busdisplay_get_auto_refresh(self)); } MP_DEFINE_CONST_FUN_OBJ_1(busdisplay_busdisplay_get_auto_refresh_obj, busdisplay_busdisplay_obj_get_auto_refresh); -STATIC mp_obj_t busdisplay_busdisplay_obj_set_auto_refresh(mp_obj_t self_in, mp_obj_t auto_refresh) { +static mp_obj_t busdisplay_busdisplay_obj_set_auto_refresh(mp_obj_t self_in, mp_obj_t auto_refresh) { busdisplay_busdisplay_obj_t *self = native_display(self_in); common_hal_busdisplay_busdisplay_set_auto_refresh(self, mp_obj_is_true(auto_refresh)); @@ -310,7 +310,7 @@ MP_PROPERTY_GETSET(busdisplay_busdisplay_auto_refresh_obj, //| brightness: float //| """The brightness of the display as a float. 0.0 is off and 1.0 is full brightness.""" -STATIC mp_obj_t busdisplay_busdisplay_obj_get_brightness(mp_obj_t self_in) { +static mp_obj_t busdisplay_busdisplay_obj_get_brightness(mp_obj_t self_in) { busdisplay_busdisplay_obj_t *self = native_display(self_in); mp_float_t brightness = common_hal_busdisplay_busdisplay_get_brightness(self); if (brightness < 0) { @@ -320,7 +320,7 @@ STATIC mp_obj_t busdisplay_busdisplay_obj_get_brightness(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(busdisplay_busdisplay_get_brightness_obj, busdisplay_busdisplay_obj_get_brightness); -STATIC mp_obj_t busdisplay_busdisplay_obj_set_brightness(mp_obj_t self_in, mp_obj_t brightness_obj) { +static mp_obj_t busdisplay_busdisplay_obj_set_brightness(mp_obj_t self_in, mp_obj_t brightness_obj) { busdisplay_busdisplay_obj_t *self = native_display(self_in); mp_float_t brightness = mp_obj_get_float(brightness_obj); if (brightness < 0 || brightness > 1.0) { @@ -340,7 +340,7 @@ MP_PROPERTY_GETSET(busdisplay_busdisplay_brightness_obj, //| width: int //| """Gets the width of the board""" -STATIC mp_obj_t busdisplay_busdisplay_obj_get_width(mp_obj_t self_in) { +static mp_obj_t busdisplay_busdisplay_obj_get_width(mp_obj_t self_in) { busdisplay_busdisplay_obj_t *self = native_display(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_busdisplay_busdisplay_get_width(self)); } @@ -351,7 +351,7 @@ MP_PROPERTY_GETTER(busdisplay_busdisplay_width_obj, //| height: int //| """Gets the height of the board""" -STATIC mp_obj_t busdisplay_busdisplay_obj_get_height(mp_obj_t self_in) { +static mp_obj_t busdisplay_busdisplay_obj_get_height(mp_obj_t self_in) { busdisplay_busdisplay_obj_t *self = native_display(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_busdisplay_busdisplay_get_height(self)); } @@ -362,12 +362,12 @@ MP_PROPERTY_GETTER(busdisplay_busdisplay_height_obj, //| rotation: int //| """The rotation of the display as an int in degrees.""" -STATIC mp_obj_t busdisplay_busdisplay_obj_get_rotation(mp_obj_t self_in) { +static mp_obj_t busdisplay_busdisplay_obj_get_rotation(mp_obj_t self_in) { busdisplay_busdisplay_obj_t *self = native_display(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_busdisplay_busdisplay_get_rotation(self)); } MP_DEFINE_CONST_FUN_OBJ_1(busdisplay_busdisplay_get_rotation_obj, busdisplay_busdisplay_obj_get_rotation); -STATIC mp_obj_t busdisplay_busdisplay_obj_set_rotation(mp_obj_t self_in, mp_obj_t value) { +static mp_obj_t busdisplay_busdisplay_obj_set_rotation(mp_obj_t self_in, mp_obj_t value) { busdisplay_busdisplay_obj_t *self = native_display(self_in); common_hal_busdisplay_busdisplay_set_rotation(self, mp_obj_get_int(value)); return mp_const_none; @@ -381,7 +381,7 @@ MP_PROPERTY_GETSET(busdisplay_busdisplay_rotation_obj, //| bus: _DisplayBus //| """The bus being used by the display""" -STATIC mp_obj_t busdisplay_busdisplay_obj_get_bus(mp_obj_t self_in) { +static mp_obj_t busdisplay_busdisplay_obj_get_bus(mp_obj_t self_in) { busdisplay_busdisplay_obj_t *self = native_display(self_in); return common_hal_busdisplay_busdisplay_get_bus(self); } @@ -395,13 +395,13 @@ MP_PROPERTY_GETTER(busdisplay_busdisplay_bus_obj, //| If the root group is set to `displayio.CIRCUITPYTHON_TERMINAL`, the default CircuitPython terminal will be shown. //| If the root group is set to ``None``, no output will be shown. //| """ -STATIC mp_obj_t busdisplay_busdisplay_obj_get_root_group(mp_obj_t self_in) { +static mp_obj_t busdisplay_busdisplay_obj_get_root_group(mp_obj_t self_in) { busdisplay_busdisplay_obj_t *self = native_display(self_in); return common_hal_busdisplay_busdisplay_get_root_group(self); } MP_DEFINE_CONST_FUN_OBJ_1(busdisplay_busdisplay_get_root_group_obj, busdisplay_busdisplay_obj_get_root_group); -STATIC mp_obj_t busdisplay_busdisplay_obj_set_root_group(mp_obj_t self_in, mp_obj_t group_in) { +static mp_obj_t busdisplay_busdisplay_obj_set_root_group(mp_obj_t self_in, mp_obj_t group_in) { busdisplay_busdisplay_obj_t *self = native_display(self_in); displayio_group_t *group = NULL; if (group_in != mp_const_none) { @@ -426,7 +426,7 @@ MP_PROPERTY_GETSET(busdisplay_busdisplay_root_group_obj, //| """ //| ... //| -STATIC mp_obj_t busdisplay_busdisplay_obj_fill_row(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t busdisplay_busdisplay_obj_fill_row(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_y, ARG_buffer }; static const mp_arg_t allowed_args[] = { { MP_QSTR_y, MP_ARG_INT | MP_ARG_REQUIRED, {.u_int = -1} }, @@ -477,7 +477,7 @@ STATIC mp_obj_t busdisplay_busdisplay_obj_fill_row(size_t n_args, const mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_KW(busdisplay_busdisplay_fill_row_obj, 1, busdisplay_busdisplay_obj_fill_row); -STATIC const mp_rom_map_elem_t busdisplay_busdisplay_locals_dict_table[] = { +static const mp_rom_map_elem_t busdisplay_busdisplay_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_show), MP_ROM_PTR(&busdisplay_busdisplay_show_obj) }, { MP_ROM_QSTR(MP_QSTR_refresh), MP_ROM_PTR(&busdisplay_busdisplay_refresh_obj) }, { MP_ROM_QSTR(MP_QSTR_fill_row), MP_ROM_PTR(&busdisplay_busdisplay_fill_row_obj) }, @@ -492,7 +492,7 @@ STATIC const mp_rom_map_elem_t busdisplay_busdisplay_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_bus), MP_ROM_PTR(&busdisplay_busdisplay_bus_obj) }, { MP_ROM_QSTR(MP_QSTR_root_group), MP_ROM_PTR(&busdisplay_busdisplay_root_group_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(busdisplay_busdisplay_locals_dict, busdisplay_busdisplay_locals_dict_table); +static MP_DEFINE_CONST_DICT(busdisplay_busdisplay_locals_dict, busdisplay_busdisplay_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( busdisplay_busdisplay_type, diff --git a/shared-bindings/busdisplay/__init__.c b/shared-bindings/busdisplay/__init__.c index 2751f70bb2ab7..88cd48ee3fb43 100644 --- a/shared-bindings/busdisplay/__init__.c +++ b/shared-bindings/busdisplay/__init__.c @@ -18,12 +18,12 @@ //| //| """ -STATIC const mp_rom_map_elem_t busdisplay_module_globals_table[] = { +static const mp_rom_map_elem_t busdisplay_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_displayio) }, { MP_ROM_QSTR(MP_QSTR_BusDisplay), MP_ROM_PTR(&busdisplay_busdisplay_type) }, }; -STATIC MP_DEFINE_CONST_DICT(busdisplay_module_globals, busdisplay_module_globals_table); +static MP_DEFINE_CONST_DICT(busdisplay_module_globals, busdisplay_module_globals_table); const mp_obj_module_t busdisplay_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/busio/I2C.c b/shared-bindings/busio/I2C.c index ca22f048faaf4..8a1b832a7a8d8 100644 --- a/shared-bindings/busio/I2C.c +++ b/shared-bindings/busio/I2C.c @@ -46,7 +46,7 @@ //| :class:`bitbangio.I2C`; ignored for :class:`busio.I2C`) //| """ //| ... -STATIC mp_obj_t busio_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t busio_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { #if CIRCUITPY_BUSIO_I2C busio_i2c_obj_t *self = mp_obj_malloc(busio_i2c_obj_t, &busio_i2c_type); enum { ARG_scl, ARG_sda, ARG_frequency, ARG_timeout }; @@ -74,14 +74,14 @@ STATIC mp_obj_t busio_i2c_make_new(const mp_obj_type_t *type, size_t n_args, siz //| def deinit(self) -> None: //| """Releases control of the underlying hardware so other classes can use it.""" //| ... -STATIC mp_obj_t busio_i2c_obj_deinit(mp_obj_t self_in) { +static mp_obj_t busio_i2c_obj_deinit(mp_obj_t self_in) { busio_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_busio_i2c_deinit(self); return mp_const_none; } MP_DEFINE_CONST_FUN_OBJ_1(busio_i2c_deinit_obj, busio_i2c_obj_deinit); -STATIC void check_for_deinit(busio_i2c_obj_t *self) { +static void check_for_deinit(busio_i2c_obj_t *self) { if (common_hal_busio_i2c_deinited(self)) { raise_deinited_error(); } @@ -96,12 +96,12 @@ STATIC void check_for_deinit(busio_i2c_obj_t *self) { //| """Automatically deinitializes the hardware on context exit. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t busio_i2c_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t busio_i2c_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_busio_i2c_deinit(MP_OBJ_TO_PTR(args[0])); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(busio_i2c___exit___obj, 4, 4, busio_i2c_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(busio_i2c___exit___obj, 4, 4, busio_i2c_obj___exit__); static void check_lock(busio_i2c_obj_t *self) { asm (""); @@ -117,7 +117,7 @@ static void check_lock(busio_i2c_obj_t *self) { //| :return: List of device ids on the I2C bus //| :rtype: list""" //| ... -STATIC mp_obj_t busio_i2c_scan(mp_obj_t self_in) { +static mp_obj_t busio_i2c_scan(mp_obj_t self_in) { busio_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); check_lock(self); @@ -139,7 +139,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(busio_i2c_scan_obj, busio_i2c_scan); //| :return: True when lock has been grabbed //| :rtype: bool""" //| ... -STATIC mp_obj_t busio_i2c_obj_try_lock(mp_obj_t self_in) { +static mp_obj_t busio_i2c_obj_try_lock(mp_obj_t self_in) { busio_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return mp_obj_new_bool(common_hal_busio_i2c_try_lock(self)); @@ -149,7 +149,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(busio_i2c_try_lock_obj, busio_i2c_obj_try_lock); //| def unlock(self) -> None: //| """Releases the I2C lock.""" //| ... -STATIC mp_obj_t busio_i2c_obj_unlock(mp_obj_t self_in) { +static mp_obj_t busio_i2c_obj_unlock(mp_obj_t self_in) { busio_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_busio_i2c_unlock(self); @@ -173,7 +173,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(busio_i2c_unlock_obj, busio_i2c_obj_unlock); //| :param int start: beginning of buffer slice //| :param int end: end of buffer slice; if not specified, use ``len(buffer)``""" //| ... -STATIC mp_obj_t busio_i2c_readfrom_into(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t busio_i2c_readfrom_into(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_address, ARG_buffer, ARG_start, ARG_end }; static const mp_arg_t allowed_args[] = { { MP_QSTR_address, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} }, @@ -233,7 +233,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(busio_i2c_readfrom_into_obj, 1, busio_i2c_readfrom_in //| :param int end: end of buffer slice; if not specified, use ``len(buffer)`` //| """ //| ... -STATIC mp_obj_t busio_i2c_writeto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t busio_i2c_writeto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_address, ARG_buffer, ARG_start, ARG_end }; static const mp_arg_t allowed_args[] = { { MP_QSTR_address, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} }, @@ -272,7 +272,7 @@ STATIC mp_obj_t busio_i2c_writeto(size_t n_args, const mp_obj_t *pos_args, mp_ma return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(busio_i2c_writeto_obj, 1, busio_i2c_writeto); +static MP_DEFINE_CONST_FUN_OBJ_KW(busio_i2c_writeto_obj, 1, busio_i2c_writeto); //| import sys //| def writeto_then_readfrom( @@ -308,7 +308,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(busio_i2c_writeto_obj, 1, busio_i2c_writeto); //| """ //| ... //| -STATIC mp_obj_t busio_i2c_writeto_then_readfrom(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t busio_i2c_writeto_then_readfrom(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_address, ARG_out_buffer, ARG_in_buffer, ARG_out_start, ARG_out_end, ARG_in_start, ARG_in_end }; static const mp_arg_t allowed_args[] = { { MP_QSTR_address, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} }, @@ -359,7 +359,7 @@ STATIC mp_obj_t busio_i2c_writeto_then_readfrom(size_t n_args, const mp_obj_t *p MP_DEFINE_CONST_FUN_OBJ_KW(busio_i2c_writeto_then_readfrom_obj, 1, busio_i2c_writeto_then_readfrom); #endif // CIRCUITPY_BUSIO_I2C -STATIC const mp_rom_map_elem_t busio_i2c_locals_dict_table[] = { +static const mp_rom_map_elem_t busio_i2c_locals_dict_table[] = { #if CIRCUITPY_BUSIO_I2C { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&busio_i2c_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, @@ -375,7 +375,7 @@ STATIC const mp_rom_map_elem_t busio_i2c_locals_dict_table[] = { #endif // CIRCUITPY_BUSIO_I2C }; -STATIC MP_DEFINE_CONST_DICT(busio_i2c_locals_dict, busio_i2c_locals_dict_table); +static MP_DEFINE_CONST_DICT(busio_i2c_locals_dict, busio_i2c_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( busio_i2c_type, diff --git a/shared-bindings/busio/SPI.c b/shared-bindings/busio/SPI.c index 42dc9389c8c44..2e52486cabe86 100644 --- a/shared-bindings/busio/SPI.c +++ b/shared-bindings/busio/SPI.c @@ -83,7 +83,7 @@ // TODO(tannewt): Support LSB SPI. -STATIC mp_obj_t busio_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t busio_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { #if CIRCUITPY_BUSIO_SPI busio_spi_obj_t *self = mp_obj_malloc(busio_spi_obj_t, &busio_spi_type); enum { ARG_clock, ARG_MOSI, ARG_MISO, ARG_half_duplex }; @@ -115,7 +115,7 @@ STATIC mp_obj_t busio_spi_make_new(const mp_obj_type_t *type, size_t n_args, siz //| def deinit(self) -> None: //| """Turn off the SPI bus.""" //| ... -STATIC mp_obj_t busio_spi_obj_deinit(mp_obj_t self_in) { +static mp_obj_t busio_spi_obj_deinit(mp_obj_t self_in) { busio_spi_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_busio_spi_deinit(self); return mp_const_none; @@ -131,21 +131,21 @@ MP_DEFINE_CONST_FUN_OBJ_1(busio_spi_deinit_obj, busio_spi_obj_deinit); //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t busio_spi_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t busio_spi_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_busio_spi_deinit(MP_OBJ_TO_PTR(args[0])); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(busio_spi_obj___exit___obj, 4, 4, busio_spi_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(busio_spi_obj___exit___obj, 4, 4, busio_spi_obj___exit__); -STATIC void check_lock(busio_spi_obj_t *self) { +static void check_lock(busio_spi_obj_t *self) { asm (""); if (!common_hal_busio_spi_has_lock(self)) { mp_raise_RuntimeError(MP_ERROR_TEXT("Function requires lock")); } } -STATIC void check_for_deinit(busio_spi_obj_t *self) { +static void check_for_deinit(busio_spi_obj_t *self) { if (common_hal_busio_spi_deinited(self)) { raise_deinited_error(); } @@ -176,7 +176,7 @@ STATIC void check_for_deinit(busio_spi_obj_t *self) { //| which allows only one (to allow for an additional I2C object).""" //| ... -STATIC mp_obj_t busio_spi_configure(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t busio_spi_configure(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_baudrate, ARG_polarity, ARG_phase, ARG_bits }; static const mp_arg_t allowed_args[] = { { MP_QSTR_baudrate, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 100000} }, @@ -209,7 +209,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(busio_spi_configure_obj, 1, busio_spi_configure); //| :rtype: bool""" //| ... -STATIC mp_obj_t busio_spi_obj_try_lock(mp_obj_t self_in) { +static mp_obj_t busio_spi_obj_try_lock(mp_obj_t self_in) { busio_spi_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_bool(common_hal_busio_spi_try_lock(self)); } @@ -219,7 +219,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(busio_spi_try_lock_obj, busio_spi_obj_try_lock); //| """Releases the SPI lock.""" //| ... -STATIC mp_obj_t busio_spi_obj_unlock(mp_obj_t self_in) { +static mp_obj_t busio_spi_obj_unlock(mp_obj_t self_in) { busio_spi_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_busio_spi_unlock(self); @@ -242,7 +242,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(busio_spi_unlock_obj, busio_spi_obj_unlock); //| """ //| ... -STATIC mp_obj_t busio_spi_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t busio_spi_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_buffer, ARG_start, ARG_end }; static const mp_arg_t allowed_args[] = { { MP_QSTR_buffer, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, @@ -306,7 +306,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(busio_spi_write_obj, 1, busio_spi_write); //| """ //| ... -STATIC mp_obj_t busio_spi_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t busio_spi_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_buffer, ARG_start, ARG_end, ARG_write_value }; static const mp_arg_t allowed_args[] = { { MP_QSTR_buffer, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, @@ -379,7 +379,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(busio_spi_readinto_obj, 1, busio_spi_readinto); //| """ //| ... -STATIC mp_obj_t busio_spi_write_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t busio_spi_write_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_out_buffer, ARG_in_buffer, ARG_out_start, ARG_out_end, ARG_in_start, ARG_in_end }; static const mp_arg_t allowed_args[] = { { MP_QSTR_out_buffer, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, @@ -439,7 +439,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(busio_spi_write_readinto_obj, 1, busio_spi_write_read //| due to internal limitations.""" //| -STATIC mp_obj_t busio_spi_obj_get_frequency(mp_obj_t self_in) { +static mp_obj_t busio_spi_obj_get_frequency(mp_obj_t self_in) { busio_spi_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_busio_spi_get_frequency(self)); @@ -451,7 +451,7 @@ MP_PROPERTY_GETTER(busio_spi_frequency_obj, #endif // CIRCUITPY_BUSIO_SPI -STATIC const mp_rom_map_elem_t busio_spi_locals_dict_table[] = { +static const mp_rom_map_elem_t busio_spi_locals_dict_table[] = { #if CIRCUITPY_BUSIO_SPI { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&busio_spi_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, @@ -467,7 +467,7 @@ STATIC const mp_rom_map_elem_t busio_spi_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_frequency), MP_ROM_PTR(&busio_spi_frequency_obj) } #endif // CIRCUITPY_BUSIO_SPI }; -STATIC MP_DEFINE_CONST_DICT(busio_spi_locals_dict, busio_spi_locals_dict_table); +static MP_DEFINE_CONST_DICT(busio_spi_locals_dict, busio_spi_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( busio_spi_type, diff --git a/shared-bindings/busio/UART.c b/shared-bindings/busio/UART.c index 9e4f09d9cbc19..3a7a602848573 100644 --- a/shared-bindings/busio/UART.c +++ b/shared-bindings/busio/UART.c @@ -90,12 +90,12 @@ extern const busio_uart_parity_obj_t busio_uart_parity_even_obj; extern const busio_uart_parity_obj_t busio_uart_parity_odd_obj; #if CIRCUITPY_BUSIO_UART -STATIC void validate_timeout(mp_float_t timeout) { +static void validate_timeout(mp_float_t timeout) { mp_arg_validate_int_range((int)timeout, 0, 100, MP_QSTR_timeout); } #endif // CIRCUITPY_BUSIO_UART -STATIC mp_obj_t busio_uart_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t busio_uart_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { #if CIRCUITPY_BUSIO_UART enum { ARG_tx, ARG_rx, ARG_baudrate, ARG_bits, ARG_parity, ARG_stop, ARG_timeout, ARG_receiver_buffer_size, ARG_rts, ARG_cts, ARG_rs485_dir, ARG_rs485_invert}; @@ -166,7 +166,7 @@ STATIC mp_obj_t busio_uart_make_new(const mp_obj_type_t *type, size_t n_args, si #if CIRCUITPY_BUSIO_UART // Helper to ensure we have the native super class instead of a subclass. -STATIC busio_uart_obj_t *native_uart(mp_obj_t uart_obj) { +static busio_uart_obj_t *native_uart(mp_obj_t uart_obj) { mp_obj_t native_uart = mp_obj_cast_to_native_base(uart_obj, MP_OBJ_FROM_PTR(&busio_uart_type)); if (native_uart == MP_OBJ_NULL) { mp_raise_ValueError_varg(MP_ERROR_TEXT("Must be a %q subclass."), MP_QSTR_UART); @@ -179,14 +179,14 @@ STATIC busio_uart_obj_t *native_uart(mp_obj_t uart_obj) { //| def deinit(self) -> None: //| """Deinitialises the UART and releases any hardware resources for reuse.""" //| ... -STATIC mp_obj_t busio_uart_obj_deinit(mp_obj_t self_in) { +static mp_obj_t busio_uart_obj_deinit(mp_obj_t self_in) { busio_uart_obj_t *self = native_uart(self_in); common_hal_busio_uart_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(busio_uart_deinit_obj, busio_uart_obj_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(busio_uart_deinit_obj, busio_uart_obj_deinit); -STATIC void check_for_deinit(busio_uart_obj_t *self) { +static void check_for_deinit(busio_uart_obj_t *self) { if (common_hal_busio_uart_deinited(self)) { raise_deinited_error(); } @@ -201,12 +201,12 @@ STATIC void check_for_deinit(busio_uart_obj_t *self) { //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t busio_uart_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t busio_uart_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_busio_uart_deinit(MP_OBJ_TO_PTR(args[0])); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(busio_uart___exit___obj, 4, 4, busio_uart_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(busio_uart___exit___obj, 4, 4, busio_uart_obj___exit__); // These are standard stream methods. Code is in py/stream.c. // @@ -253,7 +253,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(busio_uart___exit___obj, 4, 4, busio_ //| ... // These three methods are used by the shared stream methods. -STATIC mp_uint_t busio_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) { +static mp_uint_t busio_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) { STREAM_DEBUG("busio_uart_read stream %d\n", size); busio_uart_obj_t *self = native_uart(self_in); check_for_deinit(self); @@ -267,7 +267,7 @@ STATIC mp_uint_t busio_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, return common_hal_busio_uart_read(self, buf, size, errcode); } -STATIC mp_uint_t busio_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) { +static mp_uint_t busio_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) { busio_uart_obj_t *self = native_uart(self_in); check_for_deinit(self); const byte *buf = buf_in; @@ -275,7 +275,7 @@ STATIC mp_uint_t busio_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_ return common_hal_busio_uart_write(self, buf, size, errcode); } -STATIC mp_uint_t busio_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) { +static mp_uint_t busio_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) { busio_uart_obj_t *self = native_uart(self_in); check_for_deinit(self); mp_uint_t ret; @@ -297,14 +297,14 @@ STATIC mp_uint_t busio_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t //| baudrate: int //| """The current baudrate.""" -STATIC mp_obj_t busio_uart_obj_get_baudrate(mp_obj_t self_in) { +static mp_obj_t busio_uart_obj_get_baudrate(mp_obj_t self_in) { busio_uart_obj_t *self = native_uart(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_busio_uart_get_baudrate(self)); } MP_DEFINE_CONST_FUN_OBJ_1(busio_uart_get_baudrate_obj, busio_uart_obj_get_baudrate); -STATIC mp_obj_t busio_uart_obj_set_baudrate(mp_obj_t self_in, mp_obj_t baudrate) { +static mp_obj_t busio_uart_obj_set_baudrate(mp_obj_t self_in, mp_obj_t baudrate) { busio_uart_obj_t *self = native_uart(self_in); check_for_deinit(self); common_hal_busio_uart_set_baudrate(self, mp_obj_get_int(baudrate)); @@ -319,7 +319,7 @@ MP_PROPERTY_GETSET(busio_uart_baudrate_obj, //| in_waiting: int //| """The number of bytes in the input buffer, available to be read""" -STATIC mp_obj_t busio_uart_obj_get_in_waiting(mp_obj_t self_in) { +static mp_obj_t busio_uart_obj_get_in_waiting(mp_obj_t self_in) { busio_uart_obj_t *self = native_uart(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_busio_uart_rx_characters_available(self)); @@ -331,14 +331,14 @@ MP_PROPERTY_GETTER(busio_uart_in_waiting_obj, //| timeout: float //| """The current timeout, in seconds (float).""" -STATIC mp_obj_t busio_uart_obj_get_timeout(mp_obj_t self_in) { +static mp_obj_t busio_uart_obj_get_timeout(mp_obj_t self_in) { busio_uart_obj_t *self = native_uart(self_in); check_for_deinit(self); return mp_obj_new_float(common_hal_busio_uart_get_timeout(self)); } MP_DEFINE_CONST_FUN_OBJ_1(busio_uart_get_timeout_obj, busio_uart_obj_get_timeout); -STATIC mp_obj_t busio_uart_obj_set_timeout(mp_obj_t self_in, mp_obj_t timeout) { +static mp_obj_t busio_uart_obj_set_timeout(mp_obj_t self_in, mp_obj_t timeout) { busio_uart_obj_t *self = native_uart(self_in); check_for_deinit(self); mp_float_t timeout_float = mp_obj_get_float(timeout); @@ -357,13 +357,13 @@ MP_PROPERTY_GETSET(busio_uart_timeout_obj, //| """Discard any unread characters in the input buffer.""" //| ... //| -STATIC mp_obj_t busio_uart_obj_reset_input_buffer(mp_obj_t self_in) { +static mp_obj_t busio_uart_obj_reset_input_buffer(mp_obj_t self_in) { busio_uart_obj_t *self = native_uart(self_in); check_for_deinit(self); common_hal_busio_uart_clear_rx_buffer(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(busio_uart_reset_input_buffer_obj, busio_uart_obj_reset_input_buffer); +static MP_DEFINE_CONST_FUN_OBJ_1(busio_uart_reset_input_buffer_obj, busio_uart_obj_reset_input_buffer); //| class Parity: //| """Enum-like class to define the parity used to verify correct data transfer.""" //| @@ -383,13 +383,13 @@ const busio_uart_parity_obj_t busio_uart_parity_even_obj = { { &busio_uart_parity_type }, }; -STATIC const mp_rom_map_elem_t busio_uart_parity_locals_dict_table[] = { +static const mp_rom_map_elem_t busio_uart_parity_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_ODD), MP_ROM_PTR(&busio_uart_parity_odd_obj) }, { MP_ROM_QSTR(MP_QSTR_EVEN), MP_ROM_PTR(&busio_uart_parity_even_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(busio_uart_parity_locals_dict, busio_uart_parity_locals_dict_table); +static MP_DEFINE_CONST_DICT(busio_uart_parity_locals_dict, busio_uart_parity_locals_dict_table); -STATIC void busio_uart_parity_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { +static void busio_uart_parity_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { qstr parity = MP_QSTR_ODD; if (self_in == MP_ROM_PTR(&busio_uart_parity_even_obj)) { parity = MP_QSTR_EVEN; @@ -407,7 +407,7 @@ MP_DEFINE_CONST_OBJ_TYPE( #endif // CIRCUITPY_BUSIO_UART -STATIC const mp_rom_map_elem_t busio_uart_locals_dict_table[] = { +static const mp_rom_map_elem_t busio_uart_locals_dict_table[] = { #if CIRCUITPY_BUSIO_UART { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&busio_uart_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&busio_uart_deinit_obj) }, @@ -432,10 +432,10 @@ STATIC const mp_rom_map_elem_t busio_uart_locals_dict_table[] = { #endif // CIRCUITPY_BUSIO_UART }; -STATIC MP_DEFINE_CONST_DICT(busio_uart_locals_dict, busio_uart_locals_dict_table); +static MP_DEFINE_CONST_DICT(busio_uart_locals_dict, busio_uart_locals_dict_table); #if CIRCUITPY_BUSIO_UART -STATIC const mp_stream_p_t uart_stream_p = { +static const mp_stream_p_t uart_stream_p = { .read = busio_uart_read, .write = busio_uart_write, .ioctl = busio_uart_ioctl, diff --git a/shared-bindings/busio/__init__.c b/shared-bindings/busio/__init__.c index a491ae0802197..028d73d9c368f 100644 --- a/shared-bindings/busio/__init__.c +++ b/shared-bindings/busio/__init__.c @@ -64,14 +64,14 @@ //| .. jinja //| """ -STATIC const mp_rom_map_elem_t busio_module_globals_table[] = { +static const mp_rom_map_elem_t busio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_busio) }, { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&busio_i2c_type) }, { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&busio_spi_type) }, { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&busio_uart_type) }, }; -STATIC MP_DEFINE_CONST_DICT(busio_module_globals, busio_module_globals_table); +static MP_DEFINE_CONST_DICT(busio_module_globals, busio_module_globals_table); const mp_obj_module_t busio_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/camera/Camera.c b/shared-bindings/camera/Camera.c index 449d0aec7e908..a0be953222b06 100644 --- a/shared-bindings/camera/Camera.c +++ b/shared-bindings/camera/Camera.c @@ -39,7 +39,7 @@ //| def __init__(self) -> None: //| """Initialize camera.""" //| ... -STATIC mp_obj_t camera_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t camera_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { camera_obj_t *self = mp_obj_malloc(camera_obj_t, &camera_type); // No arguments mp_arg_check_num(n_args, n_kw, 0, 0, false); @@ -51,14 +51,14 @@ STATIC mp_obj_t camera_make_new(const mp_obj_type_t *type, size_t n_args, size_t //| def deinit(self) -> None: //| """De-initialize camera.""" //| ... -STATIC mp_obj_t camera_obj_deinit(mp_obj_t self_in) { +static mp_obj_t camera_obj_deinit(mp_obj_t self_in) { camera_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_camera_deinit(self); return mp_const_none; } MP_DEFINE_CONST_FUN_OBJ_1(camera_deinit_obj, camera_obj_deinit); -STATIC void check_for_deinit(camera_obj_t *self) { +static void check_for_deinit(camera_obj_t *self) { if (common_hal_camera_deinited(self)) { raise_deinited_error(); } @@ -72,7 +72,7 @@ STATIC void check_for_deinit(camera_obj_t *self) { //| :rtype: int""" //| ... //| -STATIC mp_obj_t camera_obj_take_picture(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t camera_obj_take_picture(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_buffer, ARG_width, ARG_height, ARG_format }; static const mp_arg_t allowed_args[] = { { MP_QSTR_buffer, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -94,11 +94,11 @@ STATIC mp_obj_t camera_obj_take_picture(size_t n_args, const mp_obj_t *pos_args, } MP_DEFINE_CONST_FUN_OBJ_KW(camera_take_picture_obj, 1, camera_obj_take_picture); -STATIC const mp_rom_map_elem_t camera_locals_dict_table[] = { +static const mp_rom_map_elem_t camera_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&camera_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR_take_picture), MP_ROM_PTR(&camera_take_picture_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(camera_locals_dict, camera_locals_dict_table); +static MP_DEFINE_CONST_DICT(camera_locals_dict, camera_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( camera_type, diff --git a/shared-bindings/camera/ImageFormat.c b/shared-bindings/camera/ImageFormat.c index 9fc290cd2e8ed..ad436b4b39e32 100644 --- a/shared-bindings/camera/ImageFormat.c +++ b/shared-bindings/camera/ImageFormat.c @@ -47,13 +47,13 @@ mp_obj_t camera_imageformat_type_to_obj(camera_imageformat_t format) { } } -STATIC const mp_rom_map_elem_t camera_imageformat_locals_dict_table[] = { +static const mp_rom_map_elem_t camera_imageformat_locals_dict_table[] = { {MP_ROM_QSTR(MP_QSTR_JPG), MP_ROM_PTR(&camera_imageformat_jpg_obj)}, {MP_ROM_QSTR(MP_QSTR_RGB565), MP_ROM_PTR(&camera_imageformat_rgb565_obj)}, }; -STATIC MP_DEFINE_CONST_DICT(camera_imageformat_locals_dict, camera_imageformat_locals_dict_table); +static MP_DEFINE_CONST_DICT(camera_imageformat_locals_dict, camera_imageformat_locals_dict_table); -STATIC void camera_imageformat_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { +static void camera_imageformat_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { qstr format = MP_QSTR_None; if (MP_OBJ_TO_PTR(self_in) == MP_ROM_PTR(&camera_imageformat_jpg_obj)) { format = MP_QSTR_JPG; diff --git a/shared-bindings/camera/__init__.c b/shared-bindings/camera/__init__.c index 96a97710f0f34..dbdd40755b0a2 100644 --- a/shared-bindings/camera/__init__.c +++ b/shared-bindings/camera/__init__.c @@ -13,7 +13,7 @@ //| """Support for camera input //| //| The `camera` module contains classes to control the camera and take pictures.""" -STATIC const mp_rom_map_elem_t camera_module_globals_table[] = { +static const mp_rom_map_elem_t camera_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_camera) }, { MP_ROM_QSTR(MP_QSTR_Camera), MP_ROM_PTR(&camera_type) }, @@ -21,7 +21,7 @@ STATIC const mp_rom_map_elem_t camera_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_ImageFormat), MP_ROM_PTR(&camera_imageformat_type) }, }; -STATIC MP_DEFINE_CONST_DICT(camera_module_globals, camera_module_globals_table); +static MP_DEFINE_CONST_DICT(camera_module_globals, camera_module_globals_table); const mp_obj_module_t camera_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/canio/CAN.c b/shared-bindings/canio/CAN.c index a9c8de0641411..82bf86dd97b2d 100644 --- a/shared-bindings/canio/CAN.c +++ b/shared-bindings/canio/CAN.c @@ -42,7 +42,7 @@ //| :param bool auto_restart: If True, will restart communications after entering bus-off state //| """ //| ... -STATIC mp_obj_t canio_can_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t canio_can_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_tx, ARG_rx, ARG_baudrate, ARG_loopback, ARG_silent, ARG_auto_restart, NUM_ARGS }; static const mp_arg_t allowed_args[] = { { MP_QSTR_tx, MP_ARG_OBJ | MP_ARG_REQUIRED }, @@ -74,14 +74,14 @@ STATIC mp_obj_t canio_can_make_new(const mp_obj_type_t *type, size_t n_args, siz //| auto_restart: bool //| """If True, will restart communications after entering bus-off state""" -STATIC mp_obj_t canio_can_auto_restart_get(mp_obj_t self_in) { +static mp_obj_t canio_can_auto_restart_get(mp_obj_t self_in) { canio_can_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_canio_can_check_for_deinit(self); return mp_obj_new_bool(common_hal_canio_can_auto_restart_get(self)); } MP_DEFINE_CONST_FUN_OBJ_1(canio_can_auto_restart_get_obj, canio_can_auto_restart_get); -STATIC mp_obj_t canio_can_auto_restart_set(mp_obj_t self_in, mp_obj_t flag_in) { +static mp_obj_t canio_can_auto_restart_set(mp_obj_t self_in, mp_obj_t flag_in) { canio_can_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_canio_can_check_for_deinit(self); common_hal_canio_can_auto_restart_set(self, mp_obj_is_true(flag_in)); @@ -96,7 +96,7 @@ MP_PROPERTY_GETSET(canio_can_auto_restart_obj, //| baudrate: int //| """The baud rate (read-only)""" -STATIC mp_obj_t canio_can_baudrate_get(mp_obj_t self_in) { +static mp_obj_t canio_can_baudrate_get(mp_obj_t self_in) { canio_can_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_canio_can_check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_canio_can_baudrate_get(self)); @@ -108,7 +108,7 @@ MP_PROPERTY_GETTER(canio_can_baudrate_obj, //| transmit_error_count: int //| """The number of transmit errors (read-only). Increased for a detected transmission error, decreased for successful transmission. Limited to the range from 0 to 255 inclusive. Also called TEC.""" -STATIC mp_obj_t canio_can_transmit_error_count_get(mp_obj_t self_in) { +static mp_obj_t canio_can_transmit_error_count_get(mp_obj_t self_in) { canio_can_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_canio_can_check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_canio_can_transmit_error_count_get(self)); @@ -120,7 +120,7 @@ MP_PROPERTY_GETTER(canio_can_transmit_error_count_obj, //| receive_error_count: int //| """The number of receive errors (read-only). Increased for a detected reception error, decreased for successful reception. Limited to the range from 0 to 255 inclusive. Also called REC.""" -STATIC mp_obj_t canio_can_receive_error_count_get(mp_obj_t self_in) { +static mp_obj_t canio_can_receive_error_count_get(mp_obj_t self_in) { canio_can_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_canio_can_check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_canio_can_receive_error_count_get(self)); @@ -132,7 +132,7 @@ MP_PROPERTY_GETTER(canio_can_receive_error_count_obj, //| state: BusState //| """The current state of the bus. (read-only)""" -STATIC mp_obj_t canio_can_state_get(mp_obj_t self_in) { +static mp_obj_t canio_can_state_get(mp_obj_t self_in) { canio_can_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_canio_can_check_for_deinit(self); return cp_enum_find(&canio_bus_state_type, common_hal_canio_can_state_get(self)); @@ -147,13 +147,13 @@ MP_PROPERTY_GETTER(canio_can_state_obj, //| def restart(self) -> None: //| """If the device is in the bus off state, restart it.""" //| ... -STATIC mp_obj_t canio_can_restart(mp_obj_t self_in) { +static mp_obj_t canio_can_restart(mp_obj_t self_in) { canio_can_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_canio_can_check_for_deinit(self); common_hal_canio_can_restart(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(canio_can_restart_obj, canio_can_restart); +static MP_DEFINE_CONST_FUN_OBJ_1(canio_can_restart_obj, canio_can_restart); //| def listen( //| self, matches: Optional[Sequence[Match]] = None, *, timeout: float = 10 @@ -189,7 +189,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(canio_can_restart_obj, canio_can_restart); //| standard address with mask or an extended address with mask. //| """ //| ... -STATIC mp_obj_t canio_can_listen(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t canio_can_listen(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { canio_can_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); common_hal_canio_can_check_for_deinit(self); @@ -226,7 +226,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(canio_can_listen_obj, 1, canio_can_listen); //| loopback: bool //| """True if the device was created in loopback mode, False //| otherwise (read-only)""" -STATIC mp_obj_t canio_can_loopback_get(mp_obj_t self_in) { +static mp_obj_t canio_can_loopback_get(mp_obj_t self_in) { canio_can_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_canio_can_check_for_deinit(self); return mp_obj_new_bool(common_hal_canio_can_loopback_get(self)); @@ -242,7 +242,7 @@ MP_PROPERTY_GETTER(canio_can_loopback_obj, //| If the message could not be sent due to a full fifo or a bus error condition, RuntimeError is raised. //| """ //| ... -STATIC mp_obj_t canio_can_send(mp_obj_t self_in, mp_obj_t message_in) { +static mp_obj_t canio_can_send(mp_obj_t self_in, mp_obj_t message_in) { canio_can_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_canio_can_check_for_deinit(self); const mp_obj_type_t *message_type = mp_obj_get_type(message_in); @@ -259,7 +259,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(canio_can_send_obj, canio_can_send); //| silent: bool //| """True if the device was created in silent mode, False //| otherwise (read-only)""" -STATIC mp_obj_t canio_can_silent_get(mp_obj_t self_in) { +static mp_obj_t canio_can_silent_get(mp_obj_t self_in) { canio_can_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_canio_can_check_for_deinit(self); return mp_obj_new_bool(common_hal_canio_can_silent_get(self)); @@ -273,22 +273,22 @@ MP_PROPERTY_GETTER(canio_can_silent_obj, //| def deinit(self) -> None: //| """Deinitialize this object, freeing its hardware resources""" //| ... -STATIC mp_obj_t canio_can_deinit(mp_obj_t self_in) { +static mp_obj_t canio_can_deinit(mp_obj_t self_in) { canio_can_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_canio_can_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(canio_can_deinit_obj, canio_can_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(canio_can_deinit_obj, canio_can_deinit); //| def __enter__(self) -> CAN: //| """Returns self, to allow the object to be used in a `with` statement for resource control""" //| ... -STATIC mp_obj_t canio_can_enter(mp_obj_t self_in) { +static mp_obj_t canio_can_enter(mp_obj_t self_in) { canio_can_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_canio_can_check_for_deinit(self); return self_in; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(canio_can_enter_obj, canio_can_enter); +static MP_DEFINE_CONST_FUN_OBJ_1(canio_can_enter_obj, canio_can_enter); //| def __exit__( //| self, @@ -299,14 +299,14 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(canio_can_enter_obj, canio_can_enter); //| """Calls deinit()""" //| ... //| -STATIC mp_obj_t canio_can_exit(size_t num_args, const mp_obj_t args[]) { +static mp_obj_t canio_can_exit(size_t num_args, const mp_obj_t args[]) { canio_can_obj_t *self = MP_OBJ_TO_PTR(args[0]); common_hal_canio_can_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(canio_can_exit_obj, 4, 4, canio_can_exit); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(canio_can_exit_obj, 4, 4, canio_can_exit); -STATIC const mp_rom_map_elem_t canio_can_locals_dict_table[] = { +static const mp_rom_map_elem_t canio_can_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&canio_can_enter_obj) }, { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&canio_can_exit_obj) }, { MP_ROM_QSTR(MP_QSTR_auto_restart), MP_ROM_PTR(&canio_can_auto_restart_obj) }, @@ -321,7 +321,7 @@ STATIC const mp_rom_map_elem_t canio_can_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_state), MP_ROM_PTR(&canio_can_state_obj) }, { MP_ROM_QSTR(MP_QSTR_transmit_error_count), MP_ROM_PTR(&canio_can_transmit_error_count_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(canio_can_locals_dict, canio_can_locals_dict_table); +static MP_DEFINE_CONST_DICT(canio_can_locals_dict, canio_can_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( canio_can_type, diff --git a/shared-bindings/canio/Listener.c b/shared-bindings/canio/Listener.c index 9c0840e6293a3..26b5fb2cbb2ac 100644 --- a/shared-bindings/canio/Listener.c +++ b/shared-bindings/canio/Listener.c @@ -29,7 +29,7 @@ //| If no message is received in time, `None` is returned. Otherwise, //| a `Message` or `RemoteTransmissionRequest` is returned.""" //| ... -STATIC mp_obj_t canio_listener_receive(mp_obj_t self_in) { +static mp_obj_t canio_listener_receive(mp_obj_t self_in) { canio_listener_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_canio_listener_check_for_deinit(self); @@ -41,18 +41,18 @@ STATIC mp_obj_t canio_listener_receive(mp_obj_t self_in) { } return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(canio_listener_receive_obj, canio_listener_receive); +static MP_DEFINE_CONST_FUN_OBJ_1(canio_listener_receive_obj, canio_listener_receive); //| def in_waiting(self) -> int: //| """Returns the number of messages (including remote //| transmission requests) waiting""" //| ... -STATIC mp_obj_t canio_listener_in_waiting(mp_obj_t self_in) { +static mp_obj_t canio_listener_in_waiting(mp_obj_t self_in) { canio_listener_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_canio_listener_check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_canio_listener_in_waiting(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(canio_listener_in_waiting_obj, canio_listener_in_waiting); +static MP_DEFINE_CONST_FUN_OBJ_1(canio_listener_in_waiting_obj, canio_listener_in_waiting); //| def __iter__(self) -> Listener: //| """Returns self @@ -70,7 +70,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(canio_listener_in_waiting_obj, canio_listener_i //| This method enables the `Listener` to be used as an //| iterable, for instance in a for-loop.""" //| ... -STATIC mp_obj_t canio_iternext(mp_obj_t self_in) { +static mp_obj_t canio_iternext(mp_obj_t self_in) { mp_obj_t result = canio_listener_receive(self_in); if (result == mp_const_none) { return MP_OBJ_STOP_ITERATION; @@ -81,22 +81,22 @@ STATIC mp_obj_t canio_iternext(mp_obj_t self_in) { //| def deinit(self) -> None: //| """Deinitialize this object, freeing its hardware resources""" //| ... -STATIC mp_obj_t canio_listener_deinit(mp_obj_t self_in) { +static mp_obj_t canio_listener_deinit(mp_obj_t self_in) { canio_listener_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_canio_listener_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(canio_listener_deinit_obj, canio_listener_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(canio_listener_deinit_obj, canio_listener_deinit); //| def __enter__(self) -> CAN: //| """Returns self, to allow the object to be used in a `with` statement for resource control""" //| ... -STATIC mp_obj_t canio_listener_enter(mp_obj_t self_in) { +static mp_obj_t canio_listener_enter(mp_obj_t self_in) { canio_listener_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_canio_listener_check_for_deinit(self); return self_in; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(canio_listener_enter_obj, canio_listener_enter); +static MP_DEFINE_CONST_FUN_OBJ_1(canio_listener_enter_obj, canio_listener_enter); //| def __exit__( //| self, @@ -106,30 +106,30 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(canio_listener_enter_obj, canio_listener_enter) //| ) -> None: //| """Calls deinit()""" //| ... -STATIC mp_obj_t canio_listener_exit(size_t num_args, const mp_obj_t args[]) { +static mp_obj_t canio_listener_exit(size_t num_args, const mp_obj_t args[]) { canio_listener_obj_t *self = MP_OBJ_TO_PTR(args[0]); common_hal_canio_listener_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(canio_listener_exit_obj, 4, 4, canio_listener_exit); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(canio_listener_exit_obj, 4, 4, canio_listener_exit); //| timeout: float //| -STATIC mp_obj_t canio_listener_timeout_get(mp_obj_t self_in) { +static mp_obj_t canio_listener_timeout_get(mp_obj_t self_in) { canio_listener_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_canio_listener_check_for_deinit(self); return mp_obj_new_float(common_hal_canio_listener_get_timeout(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(canio_listener_timeout_get_obj, canio_listener_timeout_get); +static MP_DEFINE_CONST_FUN_OBJ_1(canio_listener_timeout_get_obj, canio_listener_timeout_get); -STATIC mp_obj_t canio_listener_timeout_set(mp_obj_t self_in, mp_obj_t timeout_in) { +static mp_obj_t canio_listener_timeout_set(mp_obj_t self_in, mp_obj_t timeout_in) { canio_listener_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_canio_listener_check_for_deinit(self); common_hal_canio_listener_set_timeout(self, mp_obj_get_float(timeout_in)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(canio_listener_timeout_set_obj, canio_listener_timeout_set); +static MP_DEFINE_CONST_FUN_OBJ_2(canio_listener_timeout_set_obj, canio_listener_timeout_set); MP_PROPERTY_GETSET(canio_listener_timeout_obj, (mp_obj_t)&canio_listener_timeout_get_obj, @@ -137,7 +137,7 @@ MP_PROPERTY_GETSET(canio_listener_timeout_obj, -STATIC const mp_rom_map_elem_t canio_listener_locals_dict_table[] = { +static const mp_rom_map_elem_t canio_listener_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&canio_listener_enter_obj) }, { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&canio_listener_exit_obj) }, { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&canio_listener_deinit_obj) }, @@ -145,7 +145,7 @@ STATIC const mp_rom_map_elem_t canio_listener_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_receive), MP_ROM_PTR(&canio_listener_receive_obj) }, { MP_ROM_QSTR(MP_QSTR_timeout), MP_ROM_PTR(&canio_listener_timeout_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(canio_listener_locals_dict, canio_listener_locals_dict_table); +static MP_DEFINE_CONST_DICT(canio_listener_locals_dict, canio_listener_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( canio_listener_type, diff --git a/shared-bindings/canio/Match.c b/shared-bindings/canio/Match.c index 376da69d5ca8d..7594b03ee933e 100644 --- a/shared-bindings/canio/Match.c +++ b/shared-bindings/canio/Match.c @@ -20,7 +20,7 @@ //| If extended is true then only extended ids are matched, otherwise //| only standard ids are matched.""" -STATIC mp_obj_t canio_match_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t canio_match_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_id, ARG_mask, ARG_extended, NUM_ARGS }; static const mp_arg_t allowed_args[] = { { MP_QSTR_id, MP_ARG_INT | MP_ARG_REQUIRED }, @@ -52,7 +52,7 @@ STATIC mp_obj_t canio_match_make_new(const mp_obj_type_t *type, size_t n_args, s //| id: int //| """The id to match""" -STATIC mp_obj_t canio_match_id_get(mp_obj_t self_in) { +static mp_obj_t canio_match_id_get(mp_obj_t self_in) { canio_match_obj_t *self = self_in; return MP_OBJ_NEW_SMALL_INT(common_hal_canio_match_get_id(self)); } @@ -64,7 +64,7 @@ MP_PROPERTY_GETTER(canio_match_id_obj, //| mask: int //| """The optional mask of ids to match""" -STATIC mp_obj_t canio_match_mask_get(mp_obj_t self_in) { +static mp_obj_t canio_match_mask_get(mp_obj_t self_in) { canio_match_obj_t *self = self_in; return MP_OBJ_NEW_SMALL_INT(common_hal_canio_match_get_mask(self)); } @@ -77,7 +77,7 @@ MP_PROPERTY_GETTER(canio_match_mask_obj, //| """True to match extended ids, False to match standard ides""" //| -STATIC mp_obj_t canio_match_extended_get(mp_obj_t self_in) { +static mp_obj_t canio_match_extended_get(mp_obj_t self_in) { canio_match_obj_t *self = self_in; return mp_obj_new_bool(common_hal_canio_match_get_extended(self)); } @@ -86,12 +86,12 @@ MP_DEFINE_CONST_FUN_OBJ_1(canio_match_extended_get_obj, canio_match_extended_get MP_PROPERTY_GETTER(canio_match_extended_obj, (mp_obj_t)&canio_match_extended_get_obj); -STATIC const mp_rom_map_elem_t canio_match_locals_dict_table[] = { +static const mp_rom_map_elem_t canio_match_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_id), MP_ROM_PTR(&canio_match_id_obj) }, { MP_ROM_QSTR(MP_QSTR_mask), MP_ROM_PTR(&canio_match_mask_obj) }, { MP_ROM_QSTR(MP_QSTR_extended), MP_ROM_PTR(&canio_match_extended_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(canio_match_locals_dict, canio_match_locals_dict_table); +static MP_DEFINE_CONST_DICT(canio_match_locals_dict, canio_match_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( canio_match_type, diff --git a/shared-bindings/canio/Message.c b/shared-bindings/canio/Message.c index 6f4acd4adbd4c..78665f91d2ac5 100644 --- a/shared-bindings/canio/Message.c +++ b/shared-bindings/canio/Message.c @@ -21,7 +21,7 @@ //| In CAN, messages can have a length from 0 to 8 bytes. //| """ //| ... -STATIC mp_obj_t canio_message_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t canio_message_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_id, ARG_data, ARG_extended, NUM_ARGS }; static const mp_arg_t allowed_args[] = { { MP_QSTR_id, MP_ARG_INT | MP_ARG_REQUIRED }, @@ -45,13 +45,13 @@ STATIC mp_obj_t canio_message_make_new(const mp_obj_type_t *type, size_t n_args, //| id: int //| """The numeric ID of the message""" -STATIC mp_obj_t canio_message_id_get(const mp_obj_t self_in) { +static mp_obj_t canio_message_id_get(const mp_obj_t self_in) { canio_message_obj_t *self = self_in; return MP_OBJ_NEW_SMALL_INT(common_hal_canio_message_get_id(self)); } MP_DEFINE_CONST_FUN_OBJ_1(canio_message_id_get_obj, canio_message_id_get); -STATIC mp_obj_t canio_message_id_set(const mp_obj_t self_in, const mp_obj_t id) { +static mp_obj_t canio_message_id_set(const mp_obj_t self_in, const mp_obj_t id) { canio_message_obj_t *self = self_in; common_hal_canio_message_set_id(self, mp_obj_get_int(id)); return mp_const_none; @@ -64,13 +64,13 @@ MP_PROPERTY_GETSET(canio_message_id_obj, //| data: bytes //| """The content of the message""" -STATIC mp_obj_t canio_message_data_get(const mp_obj_t self_in) { +static mp_obj_t canio_message_data_get(const mp_obj_t self_in) { canio_message_obj_t *self = self_in; return mp_obj_new_bytes((const byte *)common_hal_canio_message_get_data(self), common_hal_canio_message_get_length(self)); } MP_DEFINE_CONST_FUN_OBJ_1(canio_message_data_get_obj, canio_message_data_get); -STATIC mp_obj_t canio_message_data_set(const mp_obj_t self_in, const mp_obj_t data_in) { +static mp_obj_t canio_message_data_set(const mp_obj_t self_in, const mp_obj_t data_in) { canio_message_obj_t *self = self_in; mp_buffer_info_t data; mp_get_buffer_raise(data_in, &data, MP_BUFFER_READ); @@ -91,13 +91,13 @@ MP_PROPERTY_GETSET(canio_message_data_obj, //| extended: bool //| """True if the message's id is an extended id""" //| -STATIC mp_obj_t canio_message_extended_get(const mp_obj_t self_in) { +static mp_obj_t canio_message_extended_get(const mp_obj_t self_in) { canio_message_obj_t *self = self_in; return mp_obj_new_bool(common_hal_canio_message_get_extended(self)); } MP_DEFINE_CONST_FUN_OBJ_1(canio_message_extended_get_obj, canio_message_extended_get); -STATIC mp_obj_t canio_message_extended_set(const mp_obj_t self_in, const mp_obj_t extended) { +static mp_obj_t canio_message_extended_set(const mp_obj_t self_in, const mp_obj_t extended) { canio_message_obj_t *self = self_in; common_hal_canio_message_set_extended(self, mp_obj_is_true(extended)); return mp_const_none; @@ -109,12 +109,12 @@ MP_PROPERTY_GETSET(canio_message_extended_obj, (mp_obj_t)&canio_message_extended_get_obj, (mp_obj_t)&canio_message_extended_set_obj); -STATIC const mp_rom_map_elem_t canio_message_locals_dict_table[] = { +static const mp_rom_map_elem_t canio_message_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_id), MP_ROM_PTR(&canio_message_id_obj) }, { MP_ROM_QSTR(MP_QSTR_data), MP_ROM_PTR(&canio_message_data_obj) }, { MP_ROM_QSTR(MP_QSTR_extended), MP_ROM_PTR(&canio_message_extended_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(canio_message_locals_dict, canio_message_locals_dict_table); +static MP_DEFINE_CONST_DICT(canio_message_locals_dict, canio_message_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( canio_message_type, diff --git a/shared-bindings/canio/RemoteTransmissionRequest.c b/shared-bindings/canio/RemoteTransmissionRequest.c index cb7ad2c5d2646..ba936b9a94946 100644 --- a/shared-bindings/canio/RemoteTransmissionRequest.c +++ b/shared-bindings/canio/RemoteTransmissionRequest.c @@ -21,7 +21,7 @@ //| In CAN, messages can have a length from 0 to 8 bytes. //| """ //| ... -STATIC mp_obj_t canio_remote_transmission_request_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t canio_remote_transmission_request_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_id, ARG_length, ARG_extended, NUM_ARGS }; static const mp_arg_t allowed_args[] = { { MP_QSTR_id, MP_ARG_INT | MP_ARG_REQUIRED }, @@ -47,13 +47,13 @@ STATIC mp_obj_t canio_remote_transmission_request_make_new(const mp_obj_type_t * //| id: int //| """The numeric ID of the message""" -STATIC mp_obj_t canio_remote_transmission_request_id_get(const mp_obj_t self_in) { +static mp_obj_t canio_remote_transmission_request_id_get(const mp_obj_t self_in) { canio_remote_transmission_request_obj_t *self = self_in; return MP_OBJ_NEW_SMALL_INT(common_hal_canio_remote_transmission_request_get_id(self)); } MP_DEFINE_CONST_FUN_OBJ_1(canio_remote_transmission_request_id_get_obj, canio_remote_transmission_request_id_get); -STATIC mp_obj_t canio_remote_transmission_request_id_set(const mp_obj_t self_in, const mp_obj_t id) { +static mp_obj_t canio_remote_transmission_request_id_set(const mp_obj_t self_in, const mp_obj_t id) { canio_remote_transmission_request_obj_t *self = self_in; common_hal_canio_remote_transmission_request_set_id(self, mp_obj_get_int(id)); return mp_const_none; @@ -66,13 +66,13 @@ MP_PROPERTY_GETSET(canio_remote_transmission_request_id_obj, //| extended: bool //| """True if the message's id is an extended id""" -STATIC mp_obj_t canio_remote_transmission_request_extended_get(const mp_obj_t self_in) { +static mp_obj_t canio_remote_transmission_request_extended_get(const mp_obj_t self_in) { canio_remote_transmission_request_obj_t *self = self_in; return mp_obj_new_bool(common_hal_canio_remote_transmission_request_get_extended(self)); } MP_DEFINE_CONST_FUN_OBJ_1(canio_remote_transmission_request_extended_get_obj, canio_remote_transmission_request_extended_get); -STATIC mp_obj_t canio_remote_transmission_request_extended_set(const mp_obj_t self_in, const mp_obj_t extended) { +static mp_obj_t canio_remote_transmission_request_extended_set(const mp_obj_t self_in, const mp_obj_t extended) { canio_remote_transmission_request_obj_t *self = self_in; common_hal_canio_remote_transmission_request_set_extended(self, mp_obj_is_true(extended)); return mp_const_none; @@ -87,13 +87,13 @@ MP_PROPERTY_GETSET(canio_remote_transmission_request_extended_obj, //| length: int //| """The length of the requested message.""" //| -STATIC mp_obj_t canio_remote_transmission_request_length_get(const mp_obj_t self_in) { +static mp_obj_t canio_remote_transmission_request_length_get(const mp_obj_t self_in) { canio_remote_transmission_request_obj_t *self = self_in; return MP_OBJ_NEW_SMALL_INT(common_hal_canio_remote_transmission_request_get_length(self)); } MP_DEFINE_CONST_FUN_OBJ_1(canio_remote_transmission_request_length_get_obj, canio_remote_transmission_request_length_get); -STATIC mp_obj_t canio_remote_transmission_request_length_set(const mp_obj_t self_in, const mp_obj_t length_in) { +static mp_obj_t canio_remote_transmission_request_length_set(const mp_obj_t self_in, const mp_obj_t length_in) { canio_remote_transmission_request_obj_t *self = self_in; int length = mp_obj_get_int(length_in); if (length < 0 || length > 8) { @@ -109,12 +109,12 @@ MP_PROPERTY_GETSET(canio_remote_transmission_request_length_obj, (mp_obj_t)&canio_remote_transmission_request_length_get_obj, (mp_obj_t)&canio_remote_transmission_request_length_set_obj); -STATIC const mp_rom_map_elem_t canio_remote_transmission_request_locals_dict_table[] = { +static const mp_rom_map_elem_t canio_remote_transmission_request_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_id), MP_ROM_PTR(&canio_remote_transmission_request_id_obj) }, { MP_ROM_QSTR(MP_QSTR_length), MP_ROM_PTR(&canio_remote_transmission_request_length_obj) }, { MP_ROM_QSTR(MP_QSTR_extended), MP_ROM_PTR(&canio_remote_transmission_request_extended_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(canio_remote_transmission_request_locals_dict, canio_remote_transmission_request_locals_dict_table); +static MP_DEFINE_CONST_DICT(canio_remote_transmission_request_locals_dict, canio_remote_transmission_request_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( canio_remote_transmission_request_type, diff --git a/shared-bindings/canio/__init__.c b/shared-bindings/canio/__init__.c index 5f3685580af26..991d37c8d2566 100644 --- a/shared-bindings/canio/__init__.c +++ b/shared-bindings/canio/__init__.c @@ -87,13 +87,13 @@ MAKE_ENUM_MAP(canio_bus_state) { MAKE_ENUM_MAP_ENTRY(bus_state, ERROR_WARNING), MAKE_ENUM_MAP_ENTRY(bus_state, BUS_OFF), }; -STATIC MP_DEFINE_CONST_DICT(canio_bus_state_locals_dict, canio_bus_state_locals_table); +static MP_DEFINE_CONST_DICT(canio_bus_state_locals_dict, canio_bus_state_locals_table); MAKE_PRINTER(canio, canio_bus_state); MAKE_ENUM_TYPE(canio, BusState, canio_bus_state); -STATIC const mp_rom_map_elem_t canio_module_globals_table[] = { +static const mp_rom_map_elem_t canio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_canio) }, { MP_ROM_QSTR(MP_QSTR_BusState), MP_ROM_PTR(&canio_bus_state_type) }, { MP_ROM_QSTR(MP_QSTR_CAN), MP_ROM_PTR(&canio_can_type) }, @@ -104,7 +104,7 @@ STATIC const mp_rom_map_elem_t canio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__canio) }, }; -STATIC MP_DEFINE_CONST_DICT(canio_module_globals, canio_module_globals_table); +static MP_DEFINE_CONST_DICT(canio_module_globals, canio_module_globals_table); const mp_obj_module_t canio_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/codeop/__init__.c b/shared-bindings/codeop/__init__.c index df215d3bc1a4e..4ddd792be6637 100644 --- a/shared-bindings/codeop/__init__.c +++ b/shared-bindings/codeop/__init__.c @@ -10,7 +10,7 @@ #include "py/runtime.h" #include "py/repl.h" -STATIC const char *get_arg_str(mp_obj_t arg, qstr name) { +static const char *get_arg_str(mp_obj_t arg, qstr name) { return mp_obj_str_get_str(mp_arg_validate_type_string(arg, name)); } @@ -25,7 +25,7 @@ STATIC const char *get_arg_str(mp_obj_t arg, qstr name) { //| In particular, it's important that the code not end with a newline character //| or it is likely to be treated as a complete command.""" //| -STATIC mp_obj_t compile_command(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t compile_command(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_source, ARG_filename, ARG_symbol }; static const mp_arg_t allowed_args[] = { { MP_QSTR_source, MP_ARG_REQUIRED | MP_ARG_OBJ, { .u_obj = mp_const_none } }, @@ -44,12 +44,12 @@ STATIC mp_obj_t compile_command(mp_uint_t n_args, const mp_obj_t *pos_args, mp_m } MP_DEFINE_CONST_FUN_OBJ_KW(compile_command_obj, 1, compile_command); -STATIC const mp_rom_map_elem_t codeop_module_globals_table[] = { +static const mp_rom_map_elem_t codeop_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_codeop) }, { MP_ROM_QSTR(MP_QSTR_compile_command), MP_ROM_PTR(&compile_command_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(codeop_module_globals, codeop_module_globals_table); +static MP_DEFINE_CONST_DICT(codeop_module_globals, codeop_module_globals_table); const mp_obj_module_t codeop_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/countio/Counter.c b/shared-bindings/countio/Counter.c index a25ae2d9e6b6f..5fa2a7a30fa22 100644 --- a/shared-bindings/countio/Counter.c +++ b/shared-bindings/countio/Counter.c @@ -52,7 +52,7 @@ //| See the pin assignments for your board to see which pins can be used. //| """ //| ... -STATIC mp_obj_t countio_counter_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t countio_counter_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_pin, ARG_edge, ARG_pull }; static const mp_arg_t allowed_args[] = { { MP_QSTR_pin, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -75,14 +75,14 @@ STATIC mp_obj_t countio_counter_make_new(const mp_obj_type_t *type, size_t n_arg //| def deinit(self) -> None: //| """Deinitializes the Counter and releases any hardware resources for reuse.""" -STATIC mp_obj_t countio_counter_deinit(mp_obj_t self_in) { +static mp_obj_t countio_counter_deinit(mp_obj_t self_in) { countio_counter_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_countio_counter_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(countio_counter_deinit_obj, countio_counter_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(countio_counter_deinit_obj, countio_counter_deinit); -STATIC void check_for_deinit(countio_counter_obj_t *self) { +static void check_for_deinit(countio_counter_obj_t *self) { if (common_hal_countio_counter_deinited(self)) { raise_deinited_error(); } @@ -95,17 +95,17 @@ STATIC void check_for_deinit(countio_counter_obj_t *self) { //| def __exit__(self) -> None: //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" -STATIC mp_obj_t countio_counter_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t countio_counter_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_countio_counter_deinit(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(countio_counter___exit___obj, 4, 4, countio_counter_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(countio_counter___exit___obj, 4, 4, countio_counter_obj___exit__); //| count: int //| """The current count in terms of pulses.""" -STATIC mp_obj_t countio_counter_obj_get_count(mp_obj_t self_in) { +static mp_obj_t countio_counter_obj_get_count(mp_obj_t self_in) { countio_counter_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -113,7 +113,7 @@ STATIC mp_obj_t countio_counter_obj_get_count(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(countio_counter_get_count_obj, countio_counter_obj_get_count); -STATIC mp_obj_t countio_counter_obj_set_count(mp_obj_t self_in, mp_obj_t new_count) { +static mp_obj_t countio_counter_obj_set_count(mp_obj_t self_in, mp_obj_t new_count) { countio_counter_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -129,7 +129,7 @@ MP_PROPERTY_GETSET(countio_counter_count_obj, //| def reset(self) -> None: //| """Resets the count back to 0.""" //| -STATIC mp_obj_t countio_counter_reset(mp_obj_t self_in) { +static mp_obj_t countio_counter_reset(mp_obj_t self_in) { countio_counter_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_countio_counter_set_count(self, 0); @@ -139,7 +139,7 @@ STATIC mp_obj_t countio_counter_reset(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(countio_counter_reset_obj, countio_counter_reset); -STATIC const mp_rom_map_elem_t countio_counter_locals_dict_table[] = { +static const mp_rom_map_elem_t countio_counter_locals_dict_table[] = { // Methods { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&countio_counter_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&countio_counter_deinit_obj) }, @@ -148,7 +148,7 @@ STATIC const mp_rom_map_elem_t countio_counter_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_count), MP_ROM_PTR(&countio_counter_count_obj) }, { MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&countio_counter_reset_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(countio_counter_locals_dict, countio_counter_locals_dict_table); +static MP_DEFINE_CONST_DICT(countio_counter_locals_dict, countio_counter_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( countio_counter_type, diff --git a/shared-bindings/countio/Edge.c b/shared-bindings/countio/Edge.c index b2379e42edd7a..b7ec25078aeee 100644 --- a/shared-bindings/countio/Edge.c +++ b/shared-bindings/countio/Edge.c @@ -38,7 +38,7 @@ MAKE_ENUM_MAP(countio_edge) { MAKE_ENUM_MAP_ENTRY(edge, RISE_AND_FALL), }; -STATIC MP_DEFINE_CONST_DICT(countio_edge_locals_dict, countio_edge_locals_table); +static MP_DEFINE_CONST_DICT(countio_edge_locals_dict, countio_edge_locals_table); MAKE_PRINTER(countio, countio_edge); diff --git a/shared-bindings/countio/__init__.c b/shared-bindings/countio/__init__.c index a7ded118f8509..b611d706eaeb0 100644 --- a/shared-bindings/countio/__init__.c +++ b/shared-bindings/countio/__init__.c @@ -27,13 +27,13 @@ //| call :py:meth:`!deinit` or use a context manager. See //| :ref:`lifetime-and-contextmanagers` for more info.""" -STATIC const mp_rom_map_elem_t countio_module_globals_table[] = { +static const mp_rom_map_elem_t countio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_countio) }, { MP_ROM_QSTR(MP_QSTR_Counter), MP_ROM_PTR(&countio_counter_type) }, { MP_ROM_QSTR(MP_QSTR_Edge), MP_ROM_PTR(&countio_edge_type) }, }; -STATIC MP_DEFINE_CONST_DICT(countio_module_globals, countio_module_globals_table); +static MP_DEFINE_CONST_DICT(countio_module_globals, countio_module_globals_table); const mp_obj_module_t countio_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/digitalio/DigitalInOut.c b/shared-bindings/digitalio/DigitalInOut.c index 50360fdd12d39..6bbdc68be5233 100644 --- a/shared-bindings/digitalio/DigitalInOut.c +++ b/shared-bindings/digitalio/DigitalInOut.c @@ -26,7 +26,7 @@ #include "bindings/cyw43/__init__.h" #endif -STATIC void check_result(digitalinout_result_t result) { +static void check_result(digitalinout_result_t result) { switch (result) { case DIGITALINOUT_OK: return; @@ -65,7 +65,7 @@ MP_WEAK const mcu_pin_obj_t *common_hal_digitalio_validate_pin(mp_obj_t obj) { //| //| :param ~microcontroller.Pin pin: The pin to control""" //| ... -STATIC mp_obj_t digitalio_digitalinout_make_new(const mp_obj_type_t *type, +static mp_obj_t digitalio_digitalinout_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { mp_arg_check_num(n_args, n_kw, 1, 1, false); @@ -80,7 +80,7 @@ STATIC mp_obj_t digitalio_digitalinout_make_new(const mp_obj_type_t *type, //| def deinit(self) -> None: //| """Turn off the DigitalInOut and release the pin for other use.""" //| ... -STATIC mp_obj_t digitalio_digitalinout_obj_deinit(mp_obj_t self_in) { +static mp_obj_t digitalio_digitalinout_obj_deinit(mp_obj_t self_in) { digitalio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_digitalio_digitalinout_deinit(self); return mp_const_none; @@ -96,14 +96,14 @@ MP_DEFINE_CONST_FUN_OBJ_1(digitalio_digitalinout_deinit_obj, digitalio_digitalin //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t digitalio_digitalinout_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t digitalio_digitalinout_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_digitalio_digitalinout_deinit(MP_OBJ_TO_PTR(args[0])); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(digitalio_digitalinout_obj___exit___obj, 4, 4, digitalio_digitalinout_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(digitalio_digitalinout_obj___exit___obj, 4, 4, digitalio_digitalinout_obj___exit__); -STATIC inline void check_for_deinit(digitalio_digitalinout_obj_t *self) { +static inline void check_for_deinit(digitalio_digitalinout_obj_t *self) { if (common_hal_digitalio_digitalinout_deinited(self)) { raise_deinited_error(); } @@ -119,7 +119,7 @@ STATIC inline void check_for_deinit(digitalio_digitalinout_obj_t *self) { //| :param ~digitalio.DriveMode drive_mode: drive mode for the output //| """ //| ... -STATIC mp_obj_t digitalio_digitalinout_switch_to_output(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t digitalio_digitalinout_switch_to_output(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_value, ARG_drive_mode }; static const mp_arg_t allowed_args[] = { { MP_QSTR_value, MP_ARG_BOOL, {.u_bool = false} }, @@ -156,7 +156,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(digitalio_digitalinout_switch_to_output_obj, 1, digit //| switch.pull = digitalio.Pull.UP //| print(switch.value)""" //| ... -STATIC mp_obj_t digitalio_digitalinout_switch_to_input(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t digitalio_digitalinout_switch_to_input(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_pull }; static const mp_arg_t allowed_args[] = { { MP_QSTR_pull, MP_ARG_OBJ, {.u_rom_obj = mp_const_none} }, @@ -184,7 +184,7 @@ typedef struct { extern const digitalio_digitalio_direction_obj_t digitalio_digitalio_direction_in_obj; extern const digitalio_digitalio_direction_obj_t digitalio_digitalio_direction_out_obj; -STATIC mp_obj_t digitalio_digitalinout_obj_get_direction(mp_obj_t self_in) { +static mp_obj_t digitalio_digitalinout_obj_get_direction(mp_obj_t self_in) { digitalio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); digitalio_direction_t direction = common_hal_digitalio_digitalinout_get_direction(self); @@ -195,7 +195,7 @@ STATIC mp_obj_t digitalio_digitalinout_obj_get_direction(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(digitalio_digitalinout_get_direction_obj, digitalio_digitalinout_obj_get_direction); -STATIC mp_obj_t digitalio_digitalinout_obj_set_direction(mp_obj_t self_in, mp_obj_t value) { +static mp_obj_t digitalio_digitalinout_obj_set_direction(mp_obj_t self_in, mp_obj_t value) { digitalio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); if (value == MP_ROM_PTR(&digitalio_direction_input_obj)) { @@ -215,7 +215,7 @@ MP_PROPERTY_GETSET(digitalio_digitalio_direction_obj, //| value: bool //| """The digital logic level of the pin.""" -STATIC mp_obj_t digitalio_digitalinout_obj_get_value(mp_obj_t self_in) { +static mp_obj_t digitalio_digitalinout_obj_get_value(mp_obj_t self_in) { digitalio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); bool value = common_hal_digitalio_digitalinout_get_value(self); @@ -223,7 +223,7 @@ STATIC mp_obj_t digitalio_digitalinout_obj_get_value(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(digitalio_digitalinout_get_value_obj, digitalio_digitalinout_obj_get_value); -STATIC mp_obj_t digitalio_digitalinout_obj_set_value(mp_obj_t self_in, mp_obj_t value) { +static mp_obj_t digitalio_digitalinout_obj_set_value(mp_obj_t self_in, mp_obj_t value) { digitalio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); if (common_hal_digitalio_digitalinout_get_direction(self) == DIRECTION_INPUT) { @@ -244,7 +244,7 @@ MP_PROPERTY_GETSET(digitalio_digitalinout_value_obj, //| //| - `digitalio.DriveMode.PUSH_PULL` //| - `digitalio.DriveMode.OPEN_DRAIN`""" -STATIC mp_obj_t digitalio_digitalinout_obj_get_drive_mode(mp_obj_t self_in) { +static mp_obj_t digitalio_digitalinout_obj_get_drive_mode(mp_obj_t self_in) { digitalio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); if (common_hal_digitalio_digitalinout_get_direction(self) == DIRECTION_INPUT) { @@ -259,7 +259,7 @@ STATIC mp_obj_t digitalio_digitalinout_obj_get_drive_mode(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(digitalio_digitalinout_get_drive_mode_obj, digitalio_digitalinout_obj_get_drive_mode); -STATIC mp_obj_t digitalio_digitalinout_obj_set_drive_mode(mp_obj_t self_in, mp_obj_t drive_mode) { +static mp_obj_t digitalio_digitalinout_obj_set_drive_mode(mp_obj_t self_in, mp_obj_t drive_mode) { digitalio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); if (common_hal_digitalio_digitalinout_get_direction(self) == DIRECTION_INPUT) { @@ -288,7 +288,7 @@ MP_PROPERTY_GETSET(digitalio_digitalio_drive_mode_obj, //| //| :raises AttributeError: if `direction` is :py:data:`~digitalio.Direction.OUTPUT`.""" //| -STATIC mp_obj_t digitalio_digitalinout_obj_get_pull(mp_obj_t self_in) { +static mp_obj_t digitalio_digitalinout_obj_get_pull(mp_obj_t self_in) { digitalio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); if (common_hal_digitalio_digitalinout_get_direction(self) == DIRECTION_OUTPUT) { @@ -305,7 +305,7 @@ STATIC mp_obj_t digitalio_digitalinout_obj_get_pull(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(digitalio_digitalinout_get_pull_obj, digitalio_digitalinout_obj_get_pull); -STATIC mp_obj_t digitalio_digitalinout_obj_set_pull(mp_obj_t self_in, mp_obj_t pull_obj) { +static mp_obj_t digitalio_digitalinout_obj_set_pull(mp_obj_t self_in, mp_obj_t pull_obj) { digitalio_digitalinout_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); if (common_hal_digitalio_digitalinout_get_direction(self) == DIRECTION_OUTPUT) { @@ -322,7 +322,7 @@ MP_PROPERTY_GETSET(digitalio_digitalio_pull_obj, (mp_obj_t)&digitalio_digitalinout_get_pull_obj, (mp_obj_t)&digitalio_digitalinout_set_pull_obj); -STATIC const mp_rom_map_elem_t digitalio_digitalinout_locals_dict_table[] = { +static const mp_rom_map_elem_t digitalio_digitalinout_locals_dict_table[] = { // instance methods { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&digitalio_digitalinout_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, @@ -337,7 +337,7 @@ STATIC const mp_rom_map_elem_t digitalio_digitalinout_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_pull), MP_ROM_PTR(&digitalio_digitalio_pull_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(digitalio_digitalinout_locals_dict, digitalio_digitalinout_locals_dict_table); +static MP_DEFINE_CONST_DICT(digitalio_digitalinout_locals_dict, digitalio_digitalinout_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( digitalio_digitalinout_type, diff --git a/shared-bindings/digitalio/Direction.c b/shared-bindings/digitalio/Direction.c index 242b10115deaa..442d2dcd35992 100644 --- a/shared-bindings/digitalio/Direction.c +++ b/shared-bindings/digitalio/Direction.c @@ -41,13 +41,13 @@ const digitalio_direction_obj_t digitalio_direction_output_obj = { { &digitalio_direction_type }, }; -STATIC const mp_rom_map_elem_t digitalio_direction_locals_dict_table[] = { +static const mp_rom_map_elem_t digitalio_direction_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_INPUT), MP_ROM_PTR(&digitalio_direction_input_obj) }, { MP_ROM_QSTR(MP_QSTR_OUTPUT), MP_ROM_PTR(&digitalio_direction_output_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(digitalio_direction_locals_dict, digitalio_direction_locals_dict_table); +static MP_DEFINE_CONST_DICT(digitalio_direction_locals_dict, digitalio_direction_locals_dict_table); -STATIC void digitalio_direction_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { +static void digitalio_direction_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { qstr direction = MP_QSTR_INPUT; if (self_in == MP_ROM_PTR(&digitalio_direction_output_obj)) { direction = MP_QSTR_OUTPUT; diff --git a/shared-bindings/digitalio/DriveMode.c b/shared-bindings/digitalio/DriveMode.c index 56410f03461da..78ced01df2510 100644 --- a/shared-bindings/digitalio/DriveMode.c +++ b/shared-bindings/digitalio/DriveMode.c @@ -30,13 +30,13 @@ const digitalio_drive_mode_obj_t digitalio_drive_mode_open_drain_obj = { { &digitalio_drive_mode_type }, }; -STATIC const mp_rom_map_elem_t digitalio_drive_mode_locals_dict_table[] = { +static const mp_rom_map_elem_t digitalio_drive_mode_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_PUSH_PULL), MP_ROM_PTR(&digitalio_drive_mode_push_pull_obj) }, { MP_ROM_QSTR(MP_QSTR_OPEN_DRAIN), MP_ROM_PTR(&digitalio_drive_mode_open_drain_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(digitalio_drive_mode_locals_dict, digitalio_drive_mode_locals_dict_table); +static MP_DEFINE_CONST_DICT(digitalio_drive_mode_locals_dict, digitalio_drive_mode_locals_dict_table); -STATIC void digitalio_drive_mode_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { +static void digitalio_drive_mode_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { qstr drive_mode = MP_QSTR_PUSH_PULL; if (self_in == MP_ROM_PTR(&digitalio_drive_mode_open_drain_obj)) { drive_mode = MP_QSTR_OPEN_DRAIN; diff --git a/shared-bindings/digitalio/Pull.c b/shared-bindings/digitalio/Pull.c index e4d74afe27490..7a02564354a10 100644 --- a/shared-bindings/digitalio/Pull.c +++ b/shared-bindings/digitalio/Pull.c @@ -32,13 +32,13 @@ const digitalio_pull_obj_t digitalio_pull_down_obj = { { &digitalio_pull_type }, }; -STATIC const mp_rom_map_elem_t digitalio_pull_locals_dict_table[] = { +static const mp_rom_map_elem_t digitalio_pull_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_UP), MP_ROM_PTR(&digitalio_pull_up_obj) }, { MP_ROM_QSTR(MP_QSTR_DOWN), MP_ROM_PTR(&digitalio_pull_down_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(digitalio_pull_locals_dict, digitalio_pull_locals_dict_table); +static MP_DEFINE_CONST_DICT(digitalio_pull_locals_dict, digitalio_pull_locals_dict_table); -STATIC void digitalio_pull_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { +static void digitalio_pull_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { qstr pull = MP_QSTR_UP; if (self_in == MP_ROM_PTR(&digitalio_pull_down_obj)) { pull = MP_QSTR_DOWN; diff --git a/shared-bindings/digitalio/__init__.c b/shared-bindings/digitalio/__init__.c index cc7a705534e3a..d241bbe0ebbe6 100644 --- a/shared-bindings/digitalio/__init__.c +++ b/shared-bindings/digitalio/__init__.c @@ -60,7 +60,7 @@ //| `_ //| """ -STATIC const mp_rom_map_elem_t digitalio_module_globals_table[] = { +static const mp_rom_map_elem_t digitalio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_digitalio) }, { MP_ROM_QSTR(MP_QSTR_DigitalInOut), MP_ROM_PTR(&digitalio_digitalinout_type) }, @@ -70,7 +70,7 @@ STATIC const mp_rom_map_elem_t digitalio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_Pull), MP_ROM_PTR(&digitalio_pull_type) }, }; -STATIC MP_DEFINE_CONST_DICT(digitalio_module_globals, digitalio_module_globals_table); +static MP_DEFINE_CONST_DICT(digitalio_module_globals, digitalio_module_globals_table); const mp_obj_module_t digitalio_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/displayio/Bitmap.c b/shared-bindings/displayio/Bitmap.c index f7e40a27bf4bf..4c8fc97345cf4 100644 --- a/shared-bindings/displayio/Bitmap.c +++ b/shared-bindings/displayio/Bitmap.c @@ -39,7 +39,7 @@ //| :param int height: The number of values high //| :param int value_count: The number of possible pixel values.""" //| ... -STATIC mp_obj_t displayio_bitmap_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t displayio_bitmap_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { mp_arg_check_num(n_args, n_kw, 3, 3, false); uint32_t width = mp_arg_validate_int_range(mp_obj_get_int(all_args[0]), 0, 32767, MP_QSTR_width); uint32_t height = mp_arg_validate_int_range(mp_obj_get_int(all_args[1]), 0, 32767, MP_QSTR_height); @@ -60,7 +60,7 @@ STATIC mp_obj_t displayio_bitmap_make_new(const mp_obj_type_t *type, size_t n_ar return MP_OBJ_FROM_PTR(self); } -STATIC void check_for_deinit(displayio_bitmap_t *self) { +static void check_for_deinit(displayio_bitmap_t *self) { if (common_hal_displayio_bitmap_deinited(self)) { raise_deinited_error(); } @@ -68,7 +68,7 @@ STATIC void check_for_deinit(displayio_bitmap_t *self) { //| width: int //| """Width of the bitmap. (read only)""" -STATIC mp_obj_t displayio_bitmap_obj_get_width(mp_obj_t self_in) { +static mp_obj_t displayio_bitmap_obj_get_width(mp_obj_t self_in) { displayio_bitmap_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -82,7 +82,7 @@ MP_PROPERTY_GETTER(displayio_bitmap_width_obj, //| height: int //| """Height of the bitmap. (read only)""" -STATIC mp_obj_t displayio_bitmap_obj_get_height(mp_obj_t self_in) { +static mp_obj_t displayio_bitmap_obj_get_height(mp_obj_t self_in) { displayio_bitmap_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -96,7 +96,7 @@ MP_PROPERTY_GETTER(displayio_bitmap_height_obj, //| bits_per_value: int //| """Bits per Pixel of the bitmap. (read only)""" -STATIC mp_obj_t displayio_bitmap_obj_get_bits_per_value(mp_obj_t self_in) { +static mp_obj_t displayio_bitmap_obj_get_bits_per_value(mp_obj_t self_in) { displayio_bitmap_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -126,7 +126,7 @@ MP_PROPERTY_GETTER(displayio_bitmap_bits_per_value_obj, //| //| bitmap[0,1] = 3""" //| ... -STATIC mp_obj_t bitmap_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value_obj) { +static mp_obj_t bitmap_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value_obj) { if (value_obj == mp_const_none) { // delete item mp_raise_AttributeError(MP_ERROR_TEXT("Cannot delete values")); @@ -183,7 +183,7 @@ STATIC mp_obj_t bitmap_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t val //| def fill(self, value: int) -> None: //| """Fills the bitmap with the supplied palette index value.""" //| ... -STATIC mp_obj_t displayio_bitmap_obj_fill(mp_obj_t self_in, mp_obj_t value_obj) { +static mp_obj_t displayio_bitmap_obj_fill(mp_obj_t self_in, mp_obj_t value_obj) { displayio_bitmap_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -213,7 +213,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(displayio_bitmap_fill_obj, displayio_bitmap_obj_fill); //| notified of the "dirty rectangle" that encloses all modified //| pixels.""" //| ... -STATIC mp_obj_t displayio_bitmap_obj_dirty(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t displayio_bitmap_obj_dirty(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { displayio_bitmap_t *self = MP_OBJ_TO_PTR(pos_args[0]); check_for_deinit(self); @@ -244,14 +244,14 @@ MP_DEFINE_CONST_FUN_OBJ_KW(displayio_bitmap_dirty_obj, 0, displayio_bitmap_obj_d //| """Release resources allocated by Bitmap.""" //| ... //| -STATIC mp_obj_t displayio_bitmap_obj_deinit(mp_obj_t self_in) { +static mp_obj_t displayio_bitmap_obj_deinit(mp_obj_t self_in) { displayio_bitmap_t *self = MP_OBJ_TO_PTR(self_in); common_hal_displayio_bitmap_deinit(self); return mp_const_none; } MP_DEFINE_CONST_FUN_OBJ_1(displayio_bitmap_deinit_obj, displayio_bitmap_obj_deinit); -STATIC const mp_rom_map_elem_t displayio_bitmap_locals_dict_table[] = { +static const mp_rom_map_elem_t displayio_bitmap_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&displayio_bitmap_height_obj) }, { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&displayio_bitmap_width_obj) }, { MP_ROM_QSTR(MP_QSTR_bits_per_value), MP_ROM_PTR(&displayio_bitmap_bits_per_value_obj) }, @@ -259,10 +259,10 @@ STATIC const mp_rom_map_elem_t displayio_bitmap_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_dirty), MP_ROM_PTR(&displayio_bitmap_dirty_obj) }, { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&displayio_bitmap_deinit_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(displayio_bitmap_locals_dict, displayio_bitmap_locals_dict_table); +static MP_DEFINE_CONST_DICT(displayio_bitmap_locals_dict, displayio_bitmap_locals_dict_table); // (the get_buffer protocol returns 0 for success, 1 for failure) -STATIC mp_int_t bitmap_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) { +static mp_int_t bitmap_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) { displayio_bitmap_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_displayio_bitmap_get_buffer(self, bufinfo, flags); } diff --git a/shared-bindings/displayio/ColorConverter.c b/shared-bindings/displayio/ColorConverter.c index 6f2342b28426c..1f973b5a42ab9 100644 --- a/shared-bindings/displayio/ColorConverter.c +++ b/shared-bindings/displayio/ColorConverter.c @@ -27,7 +27,7 @@ //| :param bool dither: Adds random noise to dither the output image""" //| ... -STATIC mp_obj_t displayio_colorconverter_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t displayio_colorconverter_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_dither, ARG_input_colorspace }; static const mp_arg_t allowed_args[] = { @@ -47,7 +47,7 @@ STATIC mp_obj_t displayio_colorconverter_make_new(const mp_obj_type_t *type, siz //| def convert(self, color: int) -> int: //| """Converts the given color to RGB565 according to the Colorspace""" //| ... -STATIC mp_obj_t displayio_colorconverter_obj_convert(mp_obj_t self_in, mp_obj_t color_obj) { +static mp_obj_t displayio_colorconverter_obj_convert(mp_obj_t self_in, mp_obj_t color_obj) { displayio_colorconverter_t *self = MP_OBJ_TO_PTR(self_in); mp_int_t color = mp_arg_validate_type_int(color_obj, MP_QSTR_color); @@ -60,13 +60,13 @@ MP_DEFINE_CONST_FUN_OBJ_2(displayio_colorconverter_convert_obj, displayio_colorc //| dither: bool //| """When `True` the ColorConverter dithers the output by adding random noise when //| truncating to display bitdepth""" -STATIC mp_obj_t displayio_colorconverter_obj_get_dither(mp_obj_t self_in) { +static mp_obj_t displayio_colorconverter_obj_get_dither(mp_obj_t self_in) { displayio_colorconverter_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_bool(common_hal_displayio_colorconverter_get_dither(self)); } MP_DEFINE_CONST_FUN_OBJ_1(displayio_colorconverter_get_dither_obj, displayio_colorconverter_obj_get_dither); -STATIC mp_obj_t displayio_colorconverter_obj_set_dither(mp_obj_t self_in, mp_obj_t dither) { +static mp_obj_t displayio_colorconverter_obj_set_dither(mp_obj_t self_in, mp_obj_t dither) { displayio_colorconverter_t *self = MP_OBJ_TO_PTR(self_in); common_hal_displayio_colorconverter_set_dither(self, mp_obj_is_true(dither)); @@ -84,7 +84,7 @@ MP_PROPERTY_GETSET(displayio_colorconverter_dither_obj, //| raise an Exception if there is already a selected transparent index. //| //| :param int color: The color to be transparent""" -STATIC mp_obj_t displayio_colorconverter_make_transparent(mp_obj_t self_in, mp_obj_t transparent_color_obj) { +static mp_obj_t displayio_colorconverter_make_transparent(mp_obj_t self_in, mp_obj_t transparent_color_obj) { displayio_colorconverter_t *self = MP_OBJ_TO_PTR(self_in); mp_int_t transparent_color = mp_obj_get_int(transparent_color_obj); @@ -98,7 +98,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(displayio_colorconverter_make_transparent_obj, display //| //| :param int color: [IGNORED] Use any value""" //| -STATIC mp_obj_t displayio_colorconverter_make_opaque(mp_obj_t self_in, mp_obj_t transparent_color_obj) { +static mp_obj_t displayio_colorconverter_make_opaque(mp_obj_t self_in, mp_obj_t transparent_color_obj) { displayio_colorconverter_t *self = MP_OBJ_TO_PTR(self_in); mp_int_t transparent_color = mp_obj_get_int(transparent_color_obj); @@ -107,13 +107,13 @@ STATIC mp_obj_t displayio_colorconverter_make_opaque(mp_obj_t self_in, mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_2(displayio_colorconverter_make_opaque_obj, displayio_colorconverter_make_opaque); -STATIC const mp_rom_map_elem_t displayio_colorconverter_locals_dict_table[] = { +static const mp_rom_map_elem_t displayio_colorconverter_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_convert), MP_ROM_PTR(&displayio_colorconverter_convert_obj) }, { MP_ROM_QSTR(MP_QSTR_dither), MP_ROM_PTR(&displayio_colorconverter_dither_obj) }, { MP_ROM_QSTR(MP_QSTR_make_transparent), MP_ROM_PTR(&displayio_colorconverter_make_transparent_obj) }, { MP_ROM_QSTR(MP_QSTR_make_opaque), MP_ROM_PTR(&displayio_colorconverter_make_opaque_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(displayio_colorconverter_locals_dict, displayio_colorconverter_locals_dict_table); +static MP_DEFINE_CONST_DICT(displayio_colorconverter_locals_dict, displayio_colorconverter_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( displayio_colorconverter_type, diff --git a/shared-bindings/displayio/Colorspace.c b/shared-bindings/displayio/Colorspace.c index 4b3c589d20429..f4677b25a9086 100644 --- a/shared-bindings/displayio/Colorspace.c +++ b/shared-bindings/displayio/Colorspace.c @@ -51,7 +51,7 @@ MAKE_ENUM_MAP(displayio_colorspace) { MAKE_ENUM_MAP_ENTRY(displayio_colorspace, BGR555_SWAPPED), MAKE_ENUM_MAP_ENTRY(displayio_colorspace, L8), }; -STATIC MP_DEFINE_CONST_DICT(displayio_colorspace_locals_dict, displayio_colorspace_locals_table); +static MP_DEFINE_CONST_DICT(displayio_colorspace_locals_dict, displayio_colorspace_locals_table); MAKE_PRINTER(displayio, displayio_colorspace); MAKE_ENUM_TYPE(displayio, ColorSpace, displayio_colorspace); diff --git a/shared-bindings/displayio/Group.c b/shared-bindings/displayio/Group.c index 17748b872b6da..73c3d06988c8d 100644 --- a/shared-bindings/displayio/Group.c +++ b/shared-bindings/displayio/Group.c @@ -25,7 +25,7 @@ //| :param int x: Initial x position within the parent. //| :param int y: Initial y position within the parent.""" //| ... -STATIC mp_obj_t displayio_group_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t displayio_group_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_scale, ARG_x, ARG_y }; static const mp_arg_t allowed_args[] = { { MP_QSTR_scale, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 1} }, @@ -56,13 +56,13 @@ displayio_group_t *native_group(mp_obj_t group_obj) { //| hidden: bool //| """True when the Group and all of its layers are not visible. When False, the Group's layers //| are visible if they haven't been hidden.""" -STATIC mp_obj_t displayio_group_obj_get_hidden(mp_obj_t self_in) { +static mp_obj_t displayio_group_obj_get_hidden(mp_obj_t self_in) { displayio_group_t *self = native_group(self_in); return mp_obj_new_bool(common_hal_displayio_group_get_hidden(self)); } MP_DEFINE_CONST_FUN_OBJ_1(displayio_group_get_hidden_obj, displayio_group_obj_get_hidden); -STATIC mp_obj_t displayio_group_obj_set_hidden(mp_obj_t self_in, mp_obj_t hidden_obj) { +static mp_obj_t displayio_group_obj_set_hidden(mp_obj_t self_in, mp_obj_t hidden_obj) { displayio_group_t *self = native_group(self_in); common_hal_displayio_group_set_hidden(self, mp_obj_is_true(hidden_obj)); @@ -77,13 +77,13 @@ MP_PROPERTY_GETSET(displayio_group_hidden_obj, //| scale: int //| """Scales each pixel within the Group in both directions. For example, when scale=2 each pixel //| will be represented by 2x2 pixels.""" -STATIC mp_obj_t displayio_group_obj_get_scale(mp_obj_t self_in) { +static mp_obj_t displayio_group_obj_get_scale(mp_obj_t self_in) { displayio_group_t *self = native_group(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_group_get_scale(self)); } MP_DEFINE_CONST_FUN_OBJ_1(displayio_group_get_scale_obj, displayio_group_obj_get_scale); -STATIC mp_obj_t displayio_group_obj_set_scale(mp_obj_t self_in, mp_obj_t scale_obj) { +static mp_obj_t displayio_group_obj_set_scale(mp_obj_t self_in, mp_obj_t scale_obj) { displayio_group_t *self = native_group(self_in); mp_int_t scale = mp_arg_validate_int_min(mp_obj_get_int(scale_obj), 1, MP_QSTR_scale); @@ -99,13 +99,13 @@ MP_PROPERTY_GETSET(displayio_group_scale_obj, //| x: int //| """X position of the Group in the parent.""" -STATIC mp_obj_t displayio_group_obj_get_x(mp_obj_t self_in) { +static mp_obj_t displayio_group_obj_get_x(mp_obj_t self_in) { displayio_group_t *self = native_group(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_group_get_x(self)); } MP_DEFINE_CONST_FUN_OBJ_1(displayio_group_get_x_obj, displayio_group_obj_get_x); -STATIC mp_obj_t displayio_group_obj_set_x(mp_obj_t self_in, mp_obj_t x_obj) { +static mp_obj_t displayio_group_obj_set_x(mp_obj_t self_in, mp_obj_t x_obj) { displayio_group_t *self = native_group(self_in); mp_int_t x = mp_obj_get_int(x_obj); @@ -120,13 +120,13 @@ MP_PROPERTY_GETSET(displayio_group_x_obj, //| y: int //| """Y position of the Group in the parent.""" -STATIC mp_obj_t displayio_group_obj_get_y(mp_obj_t self_in) { +static mp_obj_t displayio_group_obj_get_y(mp_obj_t self_in) { displayio_group_t *self = native_group(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_group_get_y(self)); } MP_DEFINE_CONST_FUN_OBJ_1(displayio_group_get_y_obj, displayio_group_obj_get_y); -STATIC mp_obj_t displayio_group_obj_set_y(mp_obj_t self_in, mp_obj_t y_obj) { +static mp_obj_t displayio_group_obj_set_y(mp_obj_t self_in, mp_obj_t y_obj) { displayio_group_t *self = native_group(self_in); mp_int_t y = mp_obj_get_int(y_obj); @@ -145,7 +145,7 @@ MP_PROPERTY_GETSET(displayio_group_y_obj, //| ) -> None: //| """Append a layer to the group. It will be drawn above other layers.""" //| ... -STATIC mp_obj_t displayio_group_obj_append(mp_obj_t self_in, mp_obj_t layer) { +static mp_obj_t displayio_group_obj_append(mp_obj_t self_in, mp_obj_t layer) { displayio_group_t *self = native_group(self_in); common_hal_displayio_group_insert(self, common_hal_displayio_group_get_len(self), layer); return mp_const_none; @@ -159,7 +159,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(displayio_group_append_obj, displayio_group_obj_append //| ) -> None: //| """Insert a layer into the group.""" //| ... -STATIC mp_obj_t displayio_group_obj_insert(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t layer) { +static mp_obj_t displayio_group_obj_insert(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t layer) { displayio_group_t *self = native_group(self_in); if ((size_t)MP_OBJ_SMALL_INT_VALUE(index_obj) == common_hal_displayio_group_get_len(self)) { return displayio_group_obj_append(self_in, layer); @@ -177,7 +177,7 @@ MP_DEFINE_CONST_FUN_OBJ_3(displayio_group_insert_obj, displayio_group_obj_insert //| ) -> int: //| """Returns the index of the first copy of layer. Raises ValueError if not found.""" //| ... -STATIC mp_obj_t displayio_group_obj_index(mp_obj_t self_in, mp_obj_t layer) { +static mp_obj_t displayio_group_obj_index(mp_obj_t self_in, mp_obj_t layer) { displayio_group_t *self = native_group(self_in); mp_int_t index = common_hal_displayio_group_index(self, layer); if (index < 0) { @@ -192,7 +192,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(displayio_group_index_obj, displayio_group_obj_index); //| ) -> Union[vectorio.Circle, vectorio.Rectangle, vectorio.Polygon, Group, TileGrid]: //| """Remove the ith item and return it.""" //| ... -STATIC mp_obj_t displayio_group_obj_pop(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t displayio_group_obj_pop(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_i }; static const mp_arg_t allowed_args[] = { { MP_QSTR_i, MP_ARG_INT, {.u_int = -1} }, @@ -217,7 +217,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(displayio_group_pop_obj, 1, displayio_group_obj_pop); //| ) -> None: //| """Remove the first copy of layer. Raises ValueError if it is not present.""" //| ... -STATIC mp_obj_t displayio_group_obj_remove(mp_obj_t self_in, mp_obj_t layer) { +static mp_obj_t displayio_group_obj_remove(mp_obj_t self_in, mp_obj_t layer) { mp_obj_t index = displayio_group_obj_index(self_in, layer); displayio_group_t *self = native_group(self_in); @@ -239,7 +239,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(displayio_group_remove_obj, displayio_group_obj_remove //| def __len__(self) -> int: //| """Returns the number of layers in a Group""" //| ... -STATIC mp_obj_t group_unary_op(mp_unary_op_t op, mp_obj_t self_in) { +static mp_obj_t group_unary_op(mp_unary_op_t op, mp_obj_t self_in) { displayio_group_t *self = native_group(self_in); uint16_t len = common_hal_displayio_group_get_len(self); switch (op) { @@ -281,7 +281,7 @@ STATIC mp_obj_t group_unary_op(mp_unary_op_t op, mp_obj_t self_in) { //| //| del group[0]""" //| ... -STATIC mp_obj_t group_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value) { +static mp_obj_t group_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value) { displayio_group_t *self = native_group(self_in); if (mp_obj_is_type(index_obj, &mp_type_slice)) { @@ -305,7 +305,7 @@ STATIC mp_obj_t group_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t valu //| """Sort the members of the group.""" //| ... //| -STATIC mp_obj_t displayio_group_obj_sort(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t displayio_group_obj_sort(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { displayio_group_t *self = native_group(pos_args[0]); mp_obj_t *args = m_new(mp_obj_t, n_args); for (size_t i = 1; i < n_args; ++i) { @@ -316,7 +316,7 @@ STATIC mp_obj_t displayio_group_obj_sort(size_t n_args, const mp_obj_t *pos_args } MP_DEFINE_CONST_FUN_OBJ_KW(displayio_group_sort_obj, 1, displayio_group_obj_sort); -STATIC const mp_rom_map_elem_t displayio_group_locals_dict_table[] = { +static const mp_rom_map_elem_t displayio_group_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_hidden), MP_ROM_PTR(&displayio_group_hidden_obj) }, { MP_ROM_QSTR(MP_QSTR_scale), MP_ROM_PTR(&displayio_group_scale_obj) }, { MP_ROM_QSTR(MP_QSTR_x), MP_ROM_PTR(&displayio_group_x_obj) }, @@ -328,7 +328,7 @@ STATIC const mp_rom_map_elem_t displayio_group_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&displayio_group_remove_obj) }, { MP_ROM_QSTR(MP_QSTR_sort), MP_ROM_PTR(&displayio_group_sort_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(displayio_group_locals_dict, displayio_group_locals_dict_table); +static MP_DEFINE_CONST_DICT(displayio_group_locals_dict, displayio_group_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( displayio_group_type, diff --git a/shared-bindings/displayio/OnDiskBitmap.c b/shared-bindings/displayio/OnDiskBitmap.c index e9e281ebbb96d..fea3763657e86 100644 --- a/shared-bindings/displayio/OnDiskBitmap.c +++ b/shared-bindings/displayio/OnDiskBitmap.c @@ -58,7 +58,7 @@ //| of CircuitPython will remove the ability to pass in an opened file. //| """ //| ... -STATIC mp_obj_t displayio_ondiskbitmap_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t displayio_ondiskbitmap_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { mp_arg_check_num(n_args, n_kw, 1, 1, false); mp_obj_t arg = all_args[0]; @@ -77,7 +77,7 @@ STATIC mp_obj_t displayio_ondiskbitmap_make_new(const mp_obj_type_t *type, size_ //| width: int //| """Width of the bitmap. (read only)""" -STATIC mp_obj_t displayio_ondiskbitmap_obj_get_width(mp_obj_t self_in) { +static mp_obj_t displayio_ondiskbitmap_obj_get_width(mp_obj_t self_in) { displayio_ondiskbitmap_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_ondiskbitmap_get_width(self)); @@ -90,7 +90,7 @@ MP_PROPERTY_GETTER(displayio_ondiskbitmap_width_obj, //| height: int //| """Height of the bitmap. (read only)""" -STATIC mp_obj_t displayio_ondiskbitmap_obj_get_height(mp_obj_t self_in) { +static mp_obj_t displayio_ondiskbitmap_obj_get_height(mp_obj_t self_in) { displayio_ondiskbitmap_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_ondiskbitmap_get_height(self)); @@ -106,7 +106,7 @@ MP_PROPERTY_GETTER(displayio_ondiskbitmap_height_obj, //| bitmap's structure. The pixel shader can be modified (e.g., to set the //| transparent pixel or, for palette shaded images, to update the palette.)""" //| -STATIC mp_obj_t displayio_ondiskbitmap_obj_get_pixel_shader(mp_obj_t self_in) { +static mp_obj_t displayio_ondiskbitmap_obj_get_pixel_shader(mp_obj_t self_in) { displayio_ondiskbitmap_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_displayio_ondiskbitmap_get_pixel_shader(self); } @@ -121,12 +121,12 @@ const mp_obj_property_t displayio_ondiskbitmap_pixel_shader_obj = { }; -STATIC const mp_rom_map_elem_t displayio_ondiskbitmap_locals_dict_table[] = { +static const mp_rom_map_elem_t displayio_ondiskbitmap_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&displayio_ondiskbitmap_height_obj) }, { MP_ROM_QSTR(MP_QSTR_pixel_shader), MP_ROM_PTR(&displayio_ondiskbitmap_pixel_shader_obj) }, { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&displayio_ondiskbitmap_width_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(displayio_ondiskbitmap_locals_dict, displayio_ondiskbitmap_locals_dict_table); +static MP_DEFINE_CONST_DICT(displayio_ondiskbitmap_locals_dict, displayio_ondiskbitmap_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( displayio_ondiskbitmap_type, diff --git a/shared-bindings/displayio/Palette.c b/shared-bindings/displayio/Palette.c index 58b4980187589..528df88ec4e7e 100644 --- a/shared-bindings/displayio/Palette.c +++ b/shared-bindings/displayio/Palette.c @@ -28,7 +28,7 @@ // TODO(tannewt): Add support for other color formats. // TODO(tannewt): Add support for 8-bit alpha blending. //| -STATIC mp_obj_t displayio_palette_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t displayio_palette_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_color_count, ARG_dither }; static const mp_arg_t allowed_args[] = { { MP_QSTR_color_count, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0 } }, @@ -46,13 +46,13 @@ STATIC mp_obj_t displayio_palette_make_new(const mp_obj_type_t *type, size_t n_a //| dither: bool //| """When `True` the Palette dithers the output color by adding random //| noise when truncating to display bitdepth""" -STATIC mp_obj_t displayio_palette_obj_get_dither(mp_obj_t self_in) { +static mp_obj_t displayio_palette_obj_get_dither(mp_obj_t self_in) { displayio_palette_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_bool(common_hal_displayio_palette_get_dither(self)); } MP_DEFINE_CONST_FUN_OBJ_1(displayio_palette_get_dither_obj, displayio_palette_obj_get_dither); -STATIC mp_obj_t displayio_palette_obj_set_dither(mp_obj_t self_in, mp_obj_t dither) { +static mp_obj_t displayio_palette_obj_set_dither(mp_obj_t self_in, mp_obj_t dither) { displayio_palette_t *self = MP_OBJ_TO_PTR(self_in); common_hal_displayio_palette_set_dither(self, mp_obj_is_true(dither)); @@ -69,7 +69,7 @@ MP_PROPERTY_GETSET(displayio_palette_dither_obj, //| def __len__(self) -> int: //| """Returns the number of colors in a Palette""" //| ... -STATIC mp_obj_t group_unary_op(mp_unary_op_t op, mp_obj_t self_in) { +static mp_obj_t group_unary_op(mp_unary_op_t op, mp_obj_t self_in) { displayio_palette_t *self = MP_OBJ_TO_PTR(self_in); switch (op) { case MP_UNARY_OP_BOOL: @@ -102,7 +102,7 @@ STATIC mp_obj_t group_unary_op(mp_unary_op_t op, mp_obj_t self_in) { //| palette[3] = bytearray(b'\x00\x00\xFF') # set using a bytearay of 3 or 4 bytes //| palette[4] = (10, 20, 30) # set using a tuple of 3 integers""" //| ... -STATIC mp_obj_t palette_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) { +static mp_obj_t palette_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) { if (value == MP_OBJ_NULL) { // delete item return MP_OBJ_NULL; // op not supported @@ -150,7 +150,7 @@ STATIC mp_obj_t palette_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t val } //| def make_transparent(self, palette_index: int) -> None: ... -STATIC mp_obj_t displayio_palette_obj_make_transparent(mp_obj_t self_in, mp_obj_t palette_index_obj) { +static mp_obj_t displayio_palette_obj_make_transparent(mp_obj_t self_in, mp_obj_t palette_index_obj) { displayio_palette_t *self = MP_OBJ_TO_PTR(self_in); mp_int_t palette_index = mp_arg_validate_type_int(palette_index_obj, MP_QSTR_palette_index); @@ -162,7 +162,7 @@ STATIC mp_obj_t displayio_palette_obj_make_transparent(mp_obj_t self_in, mp_obj_ MP_DEFINE_CONST_FUN_OBJ_2(displayio_palette_make_transparent_obj, displayio_palette_obj_make_transparent); //| def make_opaque(self, palette_index: int) -> None: ... -STATIC mp_obj_t displayio_palette_obj_make_opaque(mp_obj_t self_in, mp_obj_t palette_index_obj) { +static mp_obj_t displayio_palette_obj_make_opaque(mp_obj_t self_in, mp_obj_t palette_index_obj) { displayio_palette_t *self = MP_OBJ_TO_PTR(self_in); mp_int_t palette_index = mp_arg_validate_type_int(palette_index_obj, MP_QSTR_palette_index); @@ -177,7 +177,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(displayio_palette_make_opaque_obj, displayio_palette_o //| """Returns `True` if the palette index is transparent. Returns `False` if opaque.""" //| ... //| -STATIC mp_obj_t displayio_palette_obj_is_transparent(mp_obj_t self_in, mp_obj_t palette_index_obj) { +static mp_obj_t displayio_palette_obj_is_transparent(mp_obj_t self_in, mp_obj_t palette_index_obj) { displayio_palette_t *self = MP_OBJ_TO_PTR(self_in); mp_int_t palette_index = mp_arg_validate_type_int(palette_index_obj, MP_QSTR_palette_index); @@ -187,13 +187,13 @@ STATIC mp_obj_t displayio_palette_obj_is_transparent(mp_obj_t self_in, mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_2(displayio_palette_is_transparent_obj, displayio_palette_obj_is_transparent); -STATIC const mp_rom_map_elem_t displayio_palette_locals_dict_table[] = { +static const mp_rom_map_elem_t displayio_palette_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_dither), MP_ROM_PTR(&displayio_palette_dither_obj) }, { MP_ROM_QSTR(MP_QSTR_make_transparent), MP_ROM_PTR(&displayio_palette_make_transparent_obj) }, { MP_ROM_QSTR(MP_QSTR_make_opaque), MP_ROM_PTR(&displayio_palette_make_opaque_obj) }, { MP_ROM_QSTR(MP_QSTR_is_transparent), MP_ROM_PTR(&displayio_palette_is_transparent_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(displayio_palette_locals_dict, displayio_palette_locals_dict_table); +static MP_DEFINE_CONST_DICT(displayio_palette_locals_dict, displayio_palette_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( displayio_palette_type, diff --git a/shared-bindings/displayio/TileGrid.c b/shared-bindings/displayio/TileGrid.c index ecaf40b1d2976..9800480b22a45 100644 --- a/shared-bindings/displayio/TileGrid.c +++ b/shared-bindings/displayio/TileGrid.c @@ -56,7 +56,7 @@ //| :param int default_tile: Default tile index to show. //| :param int x: Initial x position of the left edge within the parent. //| :param int y: Initial y position of the top edge within the parent.""" -STATIC mp_obj_t displayio_tilegrid_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t displayio_tilegrid_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_bitmap, ARG_pixel_shader, ARG_width, ARG_height, ARG_tile_width, ARG_tile_height, ARG_default_tile, ARG_x, ARG_y }; static const mp_arg_t allowed_args[] = { { MP_QSTR_bitmap, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -127,13 +127,13 @@ static displayio_tilegrid_t *native_tilegrid(mp_obj_t tilegrid_obj) { //| hidden: bool //| """True when the TileGrid is hidden. This may be False even when a part of a hidden Group.""" -STATIC mp_obj_t displayio_tilegrid_obj_get_hidden(mp_obj_t self_in) { +static mp_obj_t displayio_tilegrid_obj_get_hidden(mp_obj_t self_in) { displayio_tilegrid_t *self = native_tilegrid(self_in); return mp_obj_new_bool(common_hal_displayio_tilegrid_get_hidden(self)); } MP_DEFINE_CONST_FUN_OBJ_1(displayio_tilegrid_get_hidden_obj, displayio_tilegrid_obj_get_hidden); -STATIC mp_obj_t displayio_tilegrid_obj_set_hidden(mp_obj_t self_in, mp_obj_t hidden_obj) { +static mp_obj_t displayio_tilegrid_obj_set_hidden(mp_obj_t self_in, mp_obj_t hidden_obj) { displayio_tilegrid_t *self = native_tilegrid(self_in); common_hal_displayio_tilegrid_set_hidden(self, mp_obj_is_true(hidden_obj)); @@ -147,13 +147,13 @@ MP_PROPERTY_GETSET(displayio_tilegrid_hidden_obj, //| x: int //| """X position of the left edge in the parent.""" -STATIC mp_obj_t displayio_tilegrid_obj_get_x(mp_obj_t self_in) { +static mp_obj_t displayio_tilegrid_obj_get_x(mp_obj_t self_in) { displayio_tilegrid_t *self = native_tilegrid(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_tilegrid_get_x(self)); } MP_DEFINE_CONST_FUN_OBJ_1(displayio_tilegrid_get_x_obj, displayio_tilegrid_obj_get_x); -STATIC mp_obj_t displayio_tilegrid_obj_set_x(mp_obj_t self_in, mp_obj_t x_obj) { +static mp_obj_t displayio_tilegrid_obj_set_x(mp_obj_t self_in, mp_obj_t x_obj) { displayio_tilegrid_t *self = native_tilegrid(self_in); mp_int_t x = mp_obj_get_int(x_obj); @@ -168,13 +168,13 @@ MP_PROPERTY_GETSET(displayio_tilegrid_x_obj, //| y: int //| """Y position of the top edge in the parent.""" -STATIC mp_obj_t displayio_tilegrid_obj_get_y(mp_obj_t self_in) { +static mp_obj_t displayio_tilegrid_obj_get_y(mp_obj_t self_in) { displayio_tilegrid_t *self = native_tilegrid(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_tilegrid_get_y(self)); } MP_DEFINE_CONST_FUN_OBJ_1(displayio_tilegrid_get_y_obj, displayio_tilegrid_obj_get_y); -STATIC mp_obj_t displayio_tilegrid_obj_set_y(mp_obj_t self_in, mp_obj_t y_obj) { +static mp_obj_t displayio_tilegrid_obj_set_y(mp_obj_t self_in, mp_obj_t y_obj) { displayio_tilegrid_t *self = native_tilegrid(self_in); mp_int_t y = mp_obj_get_int(y_obj); @@ -189,7 +189,7 @@ MP_PROPERTY_GETSET(displayio_tilegrid_y_obj, //| width: int //| """Width of the tilegrid in tiles.""" -STATIC mp_obj_t displayio_tilegrid_obj_get_width(mp_obj_t self_in) { +static mp_obj_t displayio_tilegrid_obj_get_width(mp_obj_t self_in) { displayio_tilegrid_t *self = native_tilegrid(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_tilegrid_get_width(self)); } @@ -200,7 +200,7 @@ MP_PROPERTY_GETTER(displayio_tilegrid_width_obj, //| height: int //| """Height of the tilegrid in tiles.""" -STATIC mp_obj_t displayio_tilegrid_obj_get_height(mp_obj_t self_in) { +static mp_obj_t displayio_tilegrid_obj_get_height(mp_obj_t self_in) { displayio_tilegrid_t *self = native_tilegrid(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_tilegrid_get_height(self)); } @@ -211,7 +211,7 @@ MP_PROPERTY_GETTER(displayio_tilegrid_height_obj, //| tile_width: int //| """Width of a single tile in pixels.""" -STATIC mp_obj_t displayio_tilegrid_obj_get_tile_width(mp_obj_t self_in) { +static mp_obj_t displayio_tilegrid_obj_get_tile_width(mp_obj_t self_in) { displayio_tilegrid_t *self = native_tilegrid(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_tilegrid_get_tile_width(self)); } @@ -222,7 +222,7 @@ MP_PROPERTY_GETTER(displayio_tilegrid_tile_width_obj, //| tile_height: int //| """Height of a single tile in pixels.""" -STATIC mp_obj_t displayio_tilegrid_obj_get_tile_height(mp_obj_t self_in) { +static mp_obj_t displayio_tilegrid_obj_get_tile_height(mp_obj_t self_in) { displayio_tilegrid_t *self = native_tilegrid(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_displayio_tilegrid_get_tile_height(self)); } @@ -233,13 +233,13 @@ MP_PROPERTY_GETTER(displayio_tilegrid_tile_height_obj, //| flip_x: bool //| """If true, the left edge rendered will be the right edge of the right-most tile.""" -STATIC mp_obj_t displayio_tilegrid_obj_get_flip_x(mp_obj_t self_in) { +static mp_obj_t displayio_tilegrid_obj_get_flip_x(mp_obj_t self_in) { displayio_tilegrid_t *self = native_tilegrid(self_in); return mp_obj_new_bool(common_hal_displayio_tilegrid_get_flip_x(self)); } MP_DEFINE_CONST_FUN_OBJ_1(displayio_tilegrid_get_flip_x_obj, displayio_tilegrid_obj_get_flip_x); -STATIC mp_obj_t displayio_tilegrid_obj_set_flip_x(mp_obj_t self_in, mp_obj_t flip_x_obj) { +static mp_obj_t displayio_tilegrid_obj_set_flip_x(mp_obj_t self_in, mp_obj_t flip_x_obj) { displayio_tilegrid_t *self = native_tilegrid(self_in); common_hal_displayio_tilegrid_set_flip_x(self, mp_obj_is_true(flip_x_obj)); @@ -253,13 +253,13 @@ MP_PROPERTY_GETSET(displayio_tilegrid_flip_x_obj, //| flip_y: bool //| """If true, the top edge rendered will be the bottom edge of the bottom-most tile.""" -STATIC mp_obj_t displayio_tilegrid_obj_get_flip_y(mp_obj_t self_in) { +static mp_obj_t displayio_tilegrid_obj_get_flip_y(mp_obj_t self_in) { displayio_tilegrid_t *self = native_tilegrid(self_in); return mp_obj_new_bool(common_hal_displayio_tilegrid_get_flip_y(self)); } MP_DEFINE_CONST_FUN_OBJ_1(displayio_tilegrid_get_flip_y_obj, displayio_tilegrid_obj_get_flip_y); -STATIC mp_obj_t displayio_tilegrid_obj_set_flip_y(mp_obj_t self_in, mp_obj_t flip_y_obj) { +static mp_obj_t displayio_tilegrid_obj_set_flip_y(mp_obj_t self_in, mp_obj_t flip_y_obj) { displayio_tilegrid_t *self = native_tilegrid(self_in); common_hal_displayio_tilegrid_set_flip_y(self, mp_obj_is_true(flip_y_obj)); @@ -275,13 +275,13 @@ MP_PROPERTY_GETSET(displayio_tilegrid_flip_y_obj, //| transpose_xy: bool //| """If true, the TileGrid's axis will be swapped. When combined with mirroring, any 90 degree //| rotation can be achieved along with the corresponding mirrored version.""" -STATIC mp_obj_t displayio_tilegrid_obj_get_transpose_xy(mp_obj_t self_in) { +static mp_obj_t displayio_tilegrid_obj_get_transpose_xy(mp_obj_t self_in) { displayio_tilegrid_t *self = native_tilegrid(self_in); return mp_obj_new_bool(common_hal_displayio_tilegrid_get_transpose_xy(self)); } MP_DEFINE_CONST_FUN_OBJ_1(displayio_tilegrid_get_transpose_xy_obj, displayio_tilegrid_obj_get_transpose_xy); -STATIC mp_obj_t displayio_tilegrid_obj_set_transpose_xy(mp_obj_t self_in, mp_obj_t transpose_xy_obj) { +static mp_obj_t displayio_tilegrid_obj_set_transpose_xy(mp_obj_t self_in, mp_obj_t transpose_xy_obj) { displayio_tilegrid_t *self = native_tilegrid(self_in); common_hal_displayio_tilegrid_set_transpose_xy(self, mp_obj_is_true(transpose_xy_obj)); @@ -296,7 +296,7 @@ MP_PROPERTY_GETSET(displayio_tilegrid_transpose_xy_obj, //| def contains(self, touch_tuple: tuple) -> bool: //| """Returns True if the first two values in ``touch_tuple`` represent an x,y coordinate //| inside the tilegrid rectangle bounds.""" -STATIC mp_obj_t displayio_tilegrid_obj_contains(mp_obj_t self_in, mp_obj_t touch_tuple) { +static mp_obj_t displayio_tilegrid_obj_contains(mp_obj_t self_in, mp_obj_t touch_tuple) { displayio_tilegrid_t *self = MP_OBJ_TO_PTR(self_in); mp_obj_t *touch_tuple_items; @@ -312,13 +312,13 @@ MP_DEFINE_CONST_FUN_OBJ_2(displayio_tilegrid_contains_obj, displayio_tilegrid_ob //| pixel_shader: Union[ColorConverter, Palette] //| """The pixel shader of the tilegrid.""" -STATIC mp_obj_t displayio_tilegrid_obj_get_pixel_shader(mp_obj_t self_in) { +static mp_obj_t displayio_tilegrid_obj_get_pixel_shader(mp_obj_t self_in) { displayio_tilegrid_t *self = native_tilegrid(self_in); return common_hal_displayio_tilegrid_get_pixel_shader(self); } MP_DEFINE_CONST_FUN_OBJ_1(displayio_tilegrid_get_pixel_shader_obj, displayio_tilegrid_obj_get_pixel_shader); -STATIC mp_obj_t displayio_tilegrid_obj_set_pixel_shader(mp_obj_t self_in, mp_obj_t pixel_shader) { +static mp_obj_t displayio_tilegrid_obj_set_pixel_shader(mp_obj_t self_in, mp_obj_t pixel_shader) { displayio_tilegrid_t *self = native_tilegrid(self_in); if (!mp_obj_is_type(pixel_shader, &displayio_palette_type) && !mp_obj_is_type(pixel_shader, &displayio_colorconverter_type)) { mp_raise_TypeError_varg(MP_ERROR_TEXT("unsupported %q type"), MP_QSTR_pixel_shader); @@ -336,13 +336,13 @@ MP_PROPERTY_GETSET(displayio_tilegrid_pixel_shader_obj, //| bitmap: Union[Bitmap, OnDiskBitmap] //| """The bitmap of the tilegrid.""" -STATIC mp_obj_t displayio_tilegrid_obj_get_bitmap(mp_obj_t self_in) { +static mp_obj_t displayio_tilegrid_obj_get_bitmap(mp_obj_t self_in) { displayio_tilegrid_t *self = native_tilegrid(self_in); return common_hal_displayio_tilegrid_get_bitmap(self); } MP_DEFINE_CONST_FUN_OBJ_1(displayio_tilegrid_get_bitmap_obj, displayio_tilegrid_obj_get_bitmap); -STATIC mp_obj_t displayio_tilegrid_obj_set_bitmap(mp_obj_t self_in, mp_obj_t bitmap) { +static mp_obj_t displayio_tilegrid_obj_set_bitmap(mp_obj_t self_in, mp_obj_t bitmap) { displayio_tilegrid_t *self = native_tilegrid(self_in); uint16_t new_bitmap_width; @@ -403,7 +403,7 @@ MP_PROPERTY_GETSET(displayio_tilegrid_bitmap_obj, //| grid[0,0] = 10""" //| ... //| -STATIC mp_obj_t tilegrid_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value_obj) { +static mp_obj_t tilegrid_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value_obj) { displayio_tilegrid_t *self = native_tilegrid(self_in); @@ -443,7 +443,7 @@ STATIC mp_obj_t tilegrid_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t v return mp_const_none; } -STATIC const mp_rom_map_elem_t displayio_tilegrid_locals_dict_table[] = { +static const mp_rom_map_elem_t displayio_tilegrid_locals_dict_table[] = { // Properties { MP_ROM_QSTR(MP_QSTR_hidden), MP_ROM_PTR(&displayio_tilegrid_hidden_obj) }, { MP_ROM_QSTR(MP_QSTR_x), MP_ROM_PTR(&displayio_tilegrid_x_obj) }, @@ -459,7 +459,7 @@ STATIC const mp_rom_map_elem_t displayio_tilegrid_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_pixel_shader), MP_ROM_PTR(&displayio_tilegrid_pixel_shader_obj) }, { MP_ROM_QSTR(MP_QSTR_bitmap), MP_ROM_PTR(&displayio_tilegrid_bitmap_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(displayio_tilegrid_locals_dict, displayio_tilegrid_locals_dict_table); +static MP_DEFINE_CONST_DICT(displayio_tilegrid_locals_dict, displayio_tilegrid_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( displayio_tilegrid_type, diff --git a/shared-bindings/displayio/__init__.c b/shared-bindings/displayio/__init__.c index db36b5e0c2d97..acd48f5ea3cac 100644 --- a/shared-bindings/displayio/__init__.c +++ b/shared-bindings/displayio/__init__.c @@ -63,14 +63,14 @@ //| initialization so the display is active as long as possible.""" //| ... //| -STATIC mp_obj_t displayio_release_displays(void) { +static mp_obj_t displayio_release_displays(void) { common_hal_displayio_release_displays(); return mp_const_none; } MP_DEFINE_CONST_FUN_OBJ_0(displayio_release_displays_obj, displayio_release_displays); -STATIC const mp_rom_map_elem_t displayio_module_globals_table[] = { +static const mp_rom_map_elem_t displayio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_displayio) }, { MP_ROM_QSTR(MP_QSTR_Bitmap), MP_ROM_PTR(&displayio_bitmap_type) }, { MP_ROM_QSTR(MP_QSTR_ColorConverter), MP_ROM_PTR(&displayio_colorconverter_type) }, @@ -97,7 +97,7 @@ STATIC const mp_rom_map_elem_t displayio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_release_displays), MP_ROM_PTR(&displayio_release_displays_obj) }, { MP_ROM_QSTR(MP_QSTR_CIRCUITPYTHON_TERMINAL), MP_ROM_PTR(&circuitpython_splash) }, }; -STATIC MP_DEFINE_CONST_DICT(displayio_module_globals, displayio_module_globals_table); +static MP_DEFINE_CONST_DICT(displayio_module_globals, displayio_module_globals_table); const mp_obj_module_t displayio_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/dotclockframebuffer/DotClockFramebuffer.c b/shared-bindings/dotclockframebuffer/DotClockFramebuffer.c index e423cd61a61af..6b7aeefcfb789 100644 --- a/shared-bindings/dotclockframebuffer/DotClockFramebuffer.c +++ b/shared-bindings/dotclockframebuffer/DotClockFramebuffer.c @@ -93,7 +93,7 @@ //| #:param int overscan_right: Allocate additional non-visible columns right of the last display column //| #:param int overscan_bottom: Allocate additional non-visible rows below the last display row //| ... -STATIC mp_obj_t dotclockframebuffer_framebuffer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t dotclockframebuffer_framebuffer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_de, ARG_vsync, ARG_hsync, ARG_dclk, ARG_red, ARG_green, ARG_blue, ARG_frequency, ARG_width, ARG_height, ARG_hsync_pulse_width, ARG_hsync_back_porch, ARG_hsync_front_porch, ARG_hsync_idle_low, @@ -176,7 +176,7 @@ static void check_for_deinit(dotclockframebuffer_framebuffer_obj_t *self) { //| If this function is not called, the results are unpredictable; updates may be partially shown. //| """ //| ... -STATIC mp_obj_t dotclockframebuffer_framebuffer_refresh(mp_obj_t self_in) { +static mp_obj_t dotclockframebuffer_framebuffer_refresh(mp_obj_t self_in) { dotclockframebuffer_framebuffer_obj_t *self = (dotclockframebuffer_framebuffer_obj_t *)self_in; check_for_deinit(self); common_hal_dotclockframebuffer_framebuffer_refresh(self); @@ -187,7 +187,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(dotclockframebuffer_framebuffer_refresh_obj, dotclockf //| refresh_rate: float //| """The pixel refresh rate of the display, in Hz""" -STATIC mp_obj_t dotclockframebuffer_framebuffer_get_refresh_rate(mp_obj_t self_in) { +static mp_obj_t dotclockframebuffer_framebuffer_get_refresh_rate(mp_obj_t self_in) { dotclockframebuffer_framebuffer_obj_t *self = (dotclockframebuffer_framebuffer_obj_t *)self_in; check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_dotclockframebuffer_framebuffer_get_refresh_rate(self)); @@ -198,7 +198,7 @@ MP_PROPERTY_GETTER(dotclockframebuffer_framebuffer_refresh_rate_obj, //| frequency: int //| """The pixel frequency of the display, in Hz""" -STATIC mp_obj_t dotclockframebuffer_framebuffer_get_frequency(mp_obj_t self_in) { +static mp_obj_t dotclockframebuffer_framebuffer_get_frequency(mp_obj_t self_in) { dotclockframebuffer_framebuffer_obj_t *self = (dotclockframebuffer_framebuffer_obj_t *)self_in; check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_dotclockframebuffer_framebuffer_get_frequency(self)); @@ -209,7 +209,7 @@ MP_PROPERTY_GETTER(dotclockframebuffer_framebuffer_frequency_obj, //| width: int //| """The width of the display, in pixels""" -STATIC mp_obj_t dotclockframebuffer_framebuffer_get_width(mp_obj_t self_in) { +static mp_obj_t dotclockframebuffer_framebuffer_get_width(mp_obj_t self_in) { dotclockframebuffer_framebuffer_obj_t *self = (dotclockframebuffer_framebuffer_obj_t *)self_in; check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_dotclockframebuffer_framebuffer_get_width(self)); @@ -221,7 +221,7 @@ MP_PROPERTY_GETTER(dotclockframebuffer_framebuffer_width_obj, //| height: int //| """The height of the display, in pixels""" //| -STATIC mp_obj_t dotclockframebuffer_framebuffer_get_height(mp_obj_t self_in) { +static mp_obj_t dotclockframebuffer_framebuffer_get_height(mp_obj_t self_in) { dotclockframebuffer_framebuffer_obj_t *self = (dotclockframebuffer_framebuffer_obj_t *)self_in; check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_dotclockframebuffer_framebuffer_get_height(self)); @@ -239,7 +239,7 @@ MP_PROPERTY_GETTER(dotclockframebuffer_framebuffer_height_obj, //| //| On Espressif this value is **guaranteed** to be a multiple of the 2 (i.e., it is a whole number of pixels)""" //| -STATIC mp_obj_t dotclockframebuffer_framebuffer_get_row_stride(mp_obj_t self_in) { +static mp_obj_t dotclockframebuffer_framebuffer_get_row_stride(mp_obj_t self_in) { dotclockframebuffer_framebuffer_obj_t *self = (dotclockframebuffer_framebuffer_obj_t *)self_in; check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_dotclockframebuffer_framebuffer_get_row_stride(self)); @@ -257,7 +257,7 @@ MP_PROPERTY_GETTER(dotclockframebuffer_framebuffer_row_stride_obj, //| //| On Espressif this value is **guaranteed** to be a multiple of the 2 (i.e., it is a whole number of pixels)""" //| -STATIC mp_obj_t dotclockframebuffer_framebuffer_get_first_pixel_offset(mp_obj_t self_in) { +static mp_obj_t dotclockframebuffer_framebuffer_get_first_pixel_offset(mp_obj_t self_in) { dotclockframebuffer_framebuffer_obj_t *self = (dotclockframebuffer_framebuffer_obj_t *)self_in; check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_dotclockframebuffer_framebuffer_get_first_pixel_offset(self)); @@ -267,7 +267,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(dotclockframebuffer_framebuffer_get_first_pixel_offset MP_PROPERTY_GETTER(dotclockframebuffer_framebuffer_first_pixel_offset_obj, (mp_obj_t)&dotclockframebuffer_framebuffer_get_first_pixel_offset_obj); -STATIC mp_int_t dotclockframebuffer_framebuffer_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) { +static mp_int_t dotclockframebuffer_framebuffer_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) { dotclockframebuffer_framebuffer_obj_t *self = (dotclockframebuffer_framebuffer_obj_t *)self_in; // a readonly framebuffer would be unusual but not impossible if ((flags & MP_BUFFER_WRITE) && !(self->bufinfo.typecode & MP_OBJ_ARRAY_TYPECODE_FLAG_RW)) { @@ -280,61 +280,61 @@ STATIC mp_int_t dotclockframebuffer_framebuffer_get_buffer(mp_obj_t self_in, mp_ // These version exists so that the prototype matches the protocol, // avoiding a type cast that can hide errors -STATIC void dotclockframebuffer_framebuffer_swapbuffers(mp_obj_t self_in, uint8_t *dirty_row_bitmap) { +static void dotclockframebuffer_framebuffer_swapbuffers(mp_obj_t self_in, uint8_t *dirty_row_bitmap) { (void)dirty_row_bitmap; dotclockframebuffer_framebuffer_obj_t *self = (dotclockframebuffer_framebuffer_obj_t *)self_in; common_hal_dotclockframebuffer_framebuffer_refresh(self); } -STATIC void dotclockframebuffer_framebuffer_deinit_proto(mp_obj_t self_in) { +static void dotclockframebuffer_framebuffer_deinit_proto(mp_obj_t self_in) { common_hal_dotclockframebuffer_framebuffer_deinit(self_in); } -STATIC float dotclockframebuffer_framebuffer_get_brightness_proto(mp_obj_t self_in) { +static float dotclockframebuffer_framebuffer_get_brightness_proto(mp_obj_t self_in) { return 1.0f; } -STATIC bool dotclockframebuffer_framebuffer_set_brightness_proto(mp_obj_t self_in, mp_float_t value) { +static bool dotclockframebuffer_framebuffer_set_brightness_proto(mp_obj_t self_in, mp_float_t value) { return false; } -STATIC int dotclockframebuffer_framebuffer_get_width_proto(mp_obj_t self_in) { +static int dotclockframebuffer_framebuffer_get_width_proto(mp_obj_t self_in) { return common_hal_dotclockframebuffer_framebuffer_get_width(self_in); } -STATIC int dotclockframebuffer_framebuffer_get_height_proto(mp_obj_t self_in) { +static int dotclockframebuffer_framebuffer_get_height_proto(mp_obj_t self_in) { return common_hal_dotclockframebuffer_framebuffer_get_height(self_in); } -STATIC int dotclockframebuffer_framebuffer_get_color_depth_proto(mp_obj_t self_in) { +static int dotclockframebuffer_framebuffer_get_color_depth_proto(mp_obj_t self_in) { return 16; } -STATIC int dotclockframebuffer_framebuffer_get_bytes_per_cell_proto(mp_obj_t self_in) { +static int dotclockframebuffer_framebuffer_get_bytes_per_cell_proto(mp_obj_t self_in) { return 1; } -STATIC int dotclockframebuffer_framebuffer_get_native_frames_per_second_proto(mp_obj_t self_in) { +static int dotclockframebuffer_framebuffer_get_native_frames_per_second_proto(mp_obj_t self_in) { return common_hal_dotclockframebuffer_framebuffer_get_refresh_rate(self_in); } -STATIC void dotclockframebuffer_framebuffer_get_bufinfo(mp_obj_t self_in, mp_buffer_info_t *bufinfo) { +static void dotclockframebuffer_framebuffer_get_bufinfo(mp_obj_t self_in, mp_buffer_info_t *bufinfo) { dotclockframebuffer_framebuffer_obj_t *self = (dotclockframebuffer_framebuffer_obj_t *)self_in; *bufinfo = self->bufinfo; } -STATIC int dotclockframebuffer_framebuffer_get_row_stride_proto(mp_obj_t self_in) { +static int dotclockframebuffer_framebuffer_get_row_stride_proto(mp_obj_t self_in) { dotclockframebuffer_framebuffer_obj_t *self = (dotclockframebuffer_framebuffer_obj_t *)self_in; return common_hal_dotclockframebuffer_framebuffer_get_row_stride(self); } -STATIC int dotclockframebuffer_framebuffer_get_first_pixel_offset_proto(mp_obj_t self_in) { +static int dotclockframebuffer_framebuffer_get_first_pixel_offset_proto(mp_obj_t self_in) { dotclockframebuffer_framebuffer_obj_t *self = (dotclockframebuffer_framebuffer_obj_t *)self_in; return common_hal_dotclockframebuffer_framebuffer_get_first_pixel_offset(self); } -STATIC const framebuffer_p_t dotclockframebuffer_framebuffer_proto = { +static const framebuffer_p_t dotclockframebuffer_framebuffer_proto = { MP_PROTO_IMPLEMENT(MP_QSTR_protocol_framebuffer) .get_bufinfo = dotclockframebuffer_framebuffer_get_bufinfo, .set_brightness = dotclockframebuffer_framebuffer_set_brightness_proto, @@ -351,7 +351,7 @@ STATIC const framebuffer_p_t dotclockframebuffer_framebuffer_proto = { }; -STATIC const mp_rom_map_elem_t dotclockframebuffer_framebuffer_locals_dict_table[] = { +static const mp_rom_map_elem_t dotclockframebuffer_framebuffer_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&dotclockframebuffer_framebuffer_width_obj) }, { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&dotclockframebuffer_framebuffer_height_obj) }, { MP_ROM_QSTR(MP_QSTR_row_stride), MP_ROM_PTR(&dotclockframebuffer_framebuffer_row_stride_obj) }, @@ -360,7 +360,7 @@ STATIC const mp_rom_map_elem_t dotclockframebuffer_framebuffer_locals_dict_table { MP_ROM_QSTR(MP_QSTR_refresh_rate), MP_ROM_PTR(&dotclockframebuffer_framebuffer_refresh_rate_obj) }, { MP_ROM_QSTR(MP_QSTR_refresh), MP_ROM_PTR(&dotclockframebuffer_framebuffer_refresh_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(dotclockframebuffer_framebuffer_locals_dict, dotclockframebuffer_framebuffer_locals_dict_table); +static MP_DEFINE_CONST_DICT(dotclockframebuffer_framebuffer_locals_dict, dotclockframebuffer_framebuffer_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( dotclockframebuffer_framebuffer_type, diff --git a/shared-bindings/dotclockframebuffer/__init__.c b/shared-bindings/dotclockframebuffer/__init__.c index b9af98cf5ce3a..d05c57cddf590 100644 --- a/shared-bindings/dotclockframebuffer/__init__.c +++ b/shared-bindings/dotclockframebuffer/__init__.c @@ -62,7 +62,7 @@ //| """ //| -STATIC mp_obj_t ioexpander_send_init_sequence(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t ioexpander_send_init_sequence(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_bus, ARG_init_sequence, ARG_i2c_address, ARG_gpio_address, ARG_gpio_data_len, ARG_gpio_data, ARG_cs_bit, ARG_mosi_bit, ARG_clk_bit, ARG_reset_bit, ARG_i2c_init_sequence, NUM_ARGS }; static const mp_arg_t allowed_args[] = { @@ -130,15 +130,15 @@ STATIC mp_obj_t ioexpander_send_init_sequence(size_t n_args, const mp_obj_t *pos return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(ioexpander_send_init_sequence_obj, 0, ioexpander_send_init_sequence); +static MP_DEFINE_CONST_FUN_OBJ_KW(ioexpander_send_init_sequence_obj, 0, ioexpander_send_init_sequence); -STATIC const mp_rom_map_elem_t dotclockframebuffer_module_globals_table[] = { +static const mp_rom_map_elem_t dotclockframebuffer_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_dotclockframebuffer) }, { MP_ROM_QSTR(MP_QSTR_DotClockFramebuffer), MP_ROM_PTR(&dotclockframebuffer_framebuffer_type) }, { MP_ROM_QSTR(MP_QSTR_ioexpander_send_init_sequence), MP_ROM_PTR(&ioexpander_send_init_sequence_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(dotclockframebuffer_module_globals, dotclockframebuffer_module_globals_table); +static MP_DEFINE_CONST_DICT(dotclockframebuffer_module_globals, dotclockframebuffer_module_globals_table); const mp_obj_module_t dotclockframebuffer_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/dualbank/__init__.c b/shared-bindings/dualbank/__init__.c index 78f7feab285ed..2f7f5776d6835 100644 --- a/shared-bindings/dualbank/__init__.c +++ b/shared-bindings/dualbank/__init__.c @@ -48,7 +48,7 @@ //| #if CIRCUITPY_STORAGE_EXTEND -STATIC void raise_error_if_storage_extended(void) { +static void raise_error_if_storage_extended(void) { if (supervisor_flash_get_extended()) { mp_raise_msg_varg(&mp_type_RuntimeError, MP_ERROR_TEXT("%q is %q"), MP_QSTR_storage, MP_QSTR_extended); } @@ -65,7 +65,7 @@ STATIC void raise_error_if_storage_extended(void) { //| """ //| ... //| -STATIC mp_obj_t dualbank_flash(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t dualbank_flash(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_buffer, ARG_offset }; static const mp_arg_t allowed_args[] = { { MP_QSTR_buffer, MP_ARG_OBJ | MP_ARG_REQUIRED }, @@ -89,7 +89,7 @@ STATIC mp_obj_t dualbank_flash(size_t n_args, const mp_obj_t *pos_args, mp_map_t common_hal_dualbank_flash(bufinfo.buf, bufinfo.len, args[ARG_offset].u_int); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(dualbank_flash_obj, 0, dualbank_flash); +static MP_DEFINE_CONST_FUN_OBJ_KW(dualbank_flash_obj, 0, dualbank_flash); //| def switch() -> None: //| """Switches to the next-update partition. @@ -98,23 +98,23 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(dualbank_flash_obj, 0, dualbank_flash); //| """ //| ... //| -STATIC mp_obj_t dualbank_switch(void) { +static mp_obj_t dualbank_switch(void) { #if CIRCUITPY_STORAGE_EXTEND raise_error_if_storage_extended(); #endif common_hal_dualbank_switch(); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_0(dualbank_switch_obj, dualbank_switch); +static MP_DEFINE_CONST_FUN_OBJ_0(dualbank_switch_obj, dualbank_switch); -STATIC const mp_rom_map_elem_t dualbank_module_globals_table[] = { +static const mp_rom_map_elem_t dualbank_module_globals_table[] = { // module name { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_dualbank) }, // module functions { MP_ROM_QSTR(MP_QSTR_flash), MP_ROM_PTR(&dualbank_flash_obj) }, { MP_ROM_QSTR(MP_QSTR_switch), MP_ROM_PTR(&dualbank_switch_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(dualbank_module_globals, dualbank_module_globals_table); +static MP_DEFINE_CONST_DICT(dualbank_module_globals, dualbank_module_globals_table); const mp_obj_module_t dualbank_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/epaperdisplay/EPaperDisplay.c b/shared-bindings/epaperdisplay/EPaperDisplay.c index 19a3568f0564c..ff7c1670ddf57 100644 --- a/shared-bindings/epaperdisplay/EPaperDisplay.c +++ b/shared-bindings/epaperdisplay/EPaperDisplay.c @@ -107,7 +107,7 @@ //| :param bool address_little_endian: Send the least significant byte (not bit) of multi-byte addresses first. Ignored when ram is addressed with one byte //| """ //| ... -STATIC mp_obj_t epaperdisplay_epaperdisplay_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t epaperdisplay_epaperdisplay_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_display_bus, ARG_start_sequence, ARG_stop_sequence, ARG_width, ARG_height, ARG_ram_width, ARG_ram_height, ARG_colstart, ARG_rowstart, ARG_rotation, ARG_set_column_window_command, ARG_set_row_window_command, ARG_set_current_column_command, @@ -227,7 +227,7 @@ static epaperdisplay_epaperdisplay_obj_t *native_display(mp_obj_t display_obj) { } // Undocumented show() implementation with a friendly error message. -STATIC mp_obj_t epaperdisplay_epaperdisplay_obj_show(mp_obj_t self_in, mp_obj_t group_in) { +static mp_obj_t epaperdisplay_epaperdisplay_obj_show(mp_obj_t self_in, mp_obj_t group_in) { mp_raise_AttributeError(MP_ERROR_TEXT(".show(x) removed. Use .root_group = x")); return mp_const_none; } @@ -238,7 +238,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(epaperdisplay_epaperdisplay_show_obj, epaperdisplay_ep //| ) -> None: //| """Updates the ``start_sequence`` and ``seconds_per_frame`` parameters to enable //| varying the refresh mode of the display.""" -STATIC mp_obj_t epaperdisplay_epaperdisplay_update_refresh_mode(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t epaperdisplay_epaperdisplay_update_refresh_mode(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_start_sequence, ARG_seconds_per_frame }; static const mp_arg_t allowed_args[] = { { MP_QSTR_start_sequence, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -263,7 +263,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(epaperdisplay_epaperdisplay_update_refresh_mode_obj, //| """Refreshes the display immediately or raises an exception if too soon. Use //| ``time.sleep(display.time_to_refresh)`` to sleep until a refresh can occur.""" //| ... -STATIC mp_obj_t epaperdisplay_epaperdisplay_obj_refresh(mp_obj_t self_in) { +static mp_obj_t epaperdisplay_epaperdisplay_obj_refresh(mp_obj_t self_in) { epaperdisplay_epaperdisplay_obj_t *self = native_display(self_in); bool ok = common_hal_epaperdisplay_epaperdisplay_refresh(self); if (!ok) { @@ -275,7 +275,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(epaperdisplay_epaperdisplay_refresh_obj, epaperdisplay //| time_to_refresh: float //| """Time, in fractional seconds, until the ePaper display can be refreshed.""" -STATIC mp_obj_t epaperdisplay_epaperdisplay_obj_get_time_to_refresh(mp_obj_t self_in) { +static mp_obj_t epaperdisplay_epaperdisplay_obj_get_time_to_refresh(mp_obj_t self_in) { epaperdisplay_epaperdisplay_obj_t *self = native_display(self_in); // band aid fix for // sleeping for display.time_to_refresh might not be long enough due to rounding error (?) @@ -290,7 +290,7 @@ MP_PROPERTY_GETTER(epaperdisplay_epaperdisplay_time_to_refresh_obj, //| busy: bool //| """True when the display is refreshing. This uses the ``busy_pin`` when available or the //| ``refresh_time`` otherwise.""" -STATIC mp_obj_t epaperdisplay_epaperdisplay_obj_get_busy(mp_obj_t self_in) { +static mp_obj_t epaperdisplay_epaperdisplay_obj_get_busy(mp_obj_t self_in) { epaperdisplay_epaperdisplay_obj_t *self = native_display(self_in); return mp_obj_new_bool(common_hal_epaperdisplay_epaperdisplay_get_busy(self)); } @@ -301,7 +301,7 @@ MP_PROPERTY_GETTER(epaperdisplay_epaperdisplay_busy_obj, //| width: int //| """Gets the width of the display in pixels""" -STATIC mp_obj_t epaperdisplay_epaperdisplay_obj_get_width(mp_obj_t self_in) { +static mp_obj_t epaperdisplay_epaperdisplay_obj_get_width(mp_obj_t self_in) { epaperdisplay_epaperdisplay_obj_t *self = native_display(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_epaperdisplay_epaperdisplay_get_width(self)); } @@ -312,7 +312,7 @@ MP_PROPERTY_GETTER(epaperdisplay_epaperdisplay_width_obj, //| height: int //| """Gets the height of the display in pixels""" -STATIC mp_obj_t epaperdisplay_epaperdisplay_obj_get_height(mp_obj_t self_in) { +static mp_obj_t epaperdisplay_epaperdisplay_obj_get_height(mp_obj_t self_in) { epaperdisplay_epaperdisplay_obj_t *self = native_display(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_epaperdisplay_epaperdisplay_get_height(self)); } @@ -323,12 +323,12 @@ MP_PROPERTY_GETTER(epaperdisplay_epaperdisplay_height_obj, //| rotation: int //| """The rotation of the display as an int in degrees.""" -STATIC mp_obj_t epaperdisplay_epaperdisplay_obj_get_rotation(mp_obj_t self_in) { +static mp_obj_t epaperdisplay_epaperdisplay_obj_get_rotation(mp_obj_t self_in) { epaperdisplay_epaperdisplay_obj_t *self = native_display(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_epaperdisplay_epaperdisplay_get_rotation(self)); } MP_DEFINE_CONST_FUN_OBJ_1(epaperdisplay_epaperdisplay_get_rotation_obj, epaperdisplay_epaperdisplay_obj_get_rotation); -STATIC mp_obj_t epaperdisplay_epaperdisplay_obj_set_rotation(mp_obj_t self_in, mp_obj_t value) { +static mp_obj_t epaperdisplay_epaperdisplay_obj_set_rotation(mp_obj_t self_in, mp_obj_t value) { epaperdisplay_epaperdisplay_obj_t *self = native_display(self_in); common_hal_epaperdisplay_epaperdisplay_set_rotation(self, mp_obj_get_int(value)); return mp_const_none; @@ -343,7 +343,7 @@ MP_PROPERTY_GETSET(epaperdisplay_epaperdisplay_rotation_obj, //| bus: _DisplayBus //| """The bus being used by the display""" //| -STATIC mp_obj_t epaperdisplay_epaperdisplay_obj_get_bus(mp_obj_t self_in) { +static mp_obj_t epaperdisplay_epaperdisplay_obj_get_bus(mp_obj_t self_in) { epaperdisplay_epaperdisplay_obj_t *self = native_display(self_in); return common_hal_epaperdisplay_epaperdisplay_get_bus(self); } @@ -358,13 +358,13 @@ MP_PROPERTY_GETTER(epaperdisplay_epaperdisplay_bus_obj, //| If the root group is set to ``None``, no output will be shown. //| """ //| -STATIC mp_obj_t epaperdisplay_epaperdisplay_obj_get_root_group(mp_obj_t self_in) { +static mp_obj_t epaperdisplay_epaperdisplay_obj_get_root_group(mp_obj_t self_in) { epaperdisplay_epaperdisplay_obj_t *self = native_display(self_in); return common_hal_epaperdisplay_epaperdisplay_get_root_group(self); } MP_DEFINE_CONST_FUN_OBJ_1(epaperdisplay_epaperdisplay_get_root_group_obj, epaperdisplay_epaperdisplay_obj_get_root_group); -STATIC mp_obj_t epaperdisplay_epaperdisplay_obj_set_root_group(mp_obj_t self_in, mp_obj_t group_in) { +static mp_obj_t epaperdisplay_epaperdisplay_obj_set_root_group(mp_obj_t self_in, mp_obj_t group_in) { epaperdisplay_epaperdisplay_obj_t *self = native_display(self_in); displayio_group_t *group = NULL; if (group_in != mp_const_none) { @@ -380,7 +380,7 @@ MP_PROPERTY_GETSET(epaperdisplay_epaperdisplay_root_group_obj, (mp_obj_t)&epaperdisplay_epaperdisplay_get_root_group_obj, (mp_obj_t)&epaperdisplay_epaperdisplay_set_root_group_obj); -STATIC const mp_rom_map_elem_t epaperdisplay_epaperdisplay_locals_dict_table[] = { +static const mp_rom_map_elem_t epaperdisplay_epaperdisplay_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_show), MP_ROM_PTR(&epaperdisplay_epaperdisplay_show_obj) }, { MP_ROM_QSTR(MP_QSTR_update_refresh_mode), MP_ROM_PTR(&epaperdisplay_epaperdisplay_update_refresh_mode_obj) }, { MP_ROM_QSTR(MP_QSTR_refresh), MP_ROM_PTR(&epaperdisplay_epaperdisplay_refresh_obj) }, @@ -393,7 +393,7 @@ STATIC const mp_rom_map_elem_t epaperdisplay_epaperdisplay_locals_dict_table[] = { MP_ROM_QSTR(MP_QSTR_time_to_refresh), MP_ROM_PTR(&epaperdisplay_epaperdisplay_time_to_refresh_obj) }, { MP_ROM_QSTR(MP_QSTR_root_group), MP_ROM_PTR(&epaperdisplay_epaperdisplay_root_group_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(epaperdisplay_epaperdisplay_locals_dict, epaperdisplay_epaperdisplay_locals_dict_table); +static MP_DEFINE_CONST_DICT(epaperdisplay_epaperdisplay_locals_dict, epaperdisplay_epaperdisplay_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( epaperdisplay_epaperdisplay_type, diff --git a/shared-bindings/epaperdisplay/__init__.c b/shared-bindings/epaperdisplay/__init__.c index f657e3e665c7d..1b18212a35a39 100644 --- a/shared-bindings/epaperdisplay/__init__.c +++ b/shared-bindings/epaperdisplay/__init__.c @@ -17,12 +17,12 @@ //| //| """ -STATIC const mp_rom_map_elem_t epaperdisplay_module_globals_table[] = { +static const mp_rom_map_elem_t epaperdisplay_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_displayio) }, { MP_ROM_QSTR(MP_QSTR_EPaperDisplay), MP_ROM_PTR(&epaperdisplay_epaperdisplay_type) }, }; -STATIC MP_DEFINE_CONST_DICT(epaperdisplay_module_globals, epaperdisplay_module_globals_table); +static MP_DEFINE_CONST_DICT(epaperdisplay_module_globals, epaperdisplay_module_globals_table); const mp_obj_module_t epaperdisplay_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/floppyio/__init__.c b/shared-bindings/floppyio/__init__.c index 2982981e9e36d..ab166f1354e89 100644 --- a/shared-bindings/floppyio/__init__.c +++ b/shared-bindings/floppyio/__init__.c @@ -40,7 +40,7 @@ //| """ //| ... //| -STATIC mp_obj_t floppyio_flux_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t floppyio_flux_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { #if CIRCUITPY_DIGITALIO enum { ARG_buffer, ARG_data, ARG_index, ARG_index_wait }; static const mp_arg_t allowed_args[] = { @@ -119,7 +119,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(floppyio_flux_readinto_obj, 0, floppyio_flux_readinto //| """ //| ... //| -STATIC mp_obj_t floppyio_mfm_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t floppyio_mfm_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_buffer, ARG_flux, ARG_t2_max, ARG_t3_max, ARG_validity, ARG_clear_validity }; static const mp_arg_t allowed_args[] = { { MP_QSTR_buffer, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, @@ -163,13 +163,13 @@ MP_DEFINE_CONST_FUN_OBJ_KW(floppyio_mfm_readinto_obj, 0, floppyio_mfm_readinto); //| samplerate: int //| """The approximate sample rate in Hz used by flux_readinto.""" -STATIC const mp_rom_map_elem_t floppyio_module_globals_table[] = { +static const mp_rom_map_elem_t floppyio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_floppyio) }, { MP_ROM_QSTR(MP_QSTR_flux_readinto), MP_ROM_PTR(&floppyio_flux_readinto_obj) }, { MP_ROM_QSTR(MP_QSTR_mfm_readinto), MP_ROM_PTR(&floppyio_mfm_readinto_obj) }, { MP_ROM_QSTR(MP_QSTR_samplerate), MP_ROM_INT(FLOPPYIO_SAMPLERATE) }, }; -STATIC MP_DEFINE_CONST_DICT(floppyio_module_globals, floppyio_module_globals_table); +static MP_DEFINE_CONST_DICT(floppyio_module_globals, floppyio_module_globals_table); const mp_obj_module_t floppyio_module = { .base = {&mp_type_module }, diff --git a/shared-bindings/fontio/BuiltinFont.c b/shared-bindings/fontio/BuiltinFont.c index ca31198a07568..9d3f30675b9ea 100644 --- a/shared-bindings/fontio/BuiltinFont.c +++ b/shared-bindings/fontio/BuiltinFont.c @@ -48,7 +48,7 @@ //| """Bitmap containing all font glyphs starting with ASCII and followed by unicode. Use //| `get_glyph` in most cases. This is useful for use with `displayio.TileGrid` and //| `terminalio.Terminal`.""" -STATIC mp_obj_t fontio_builtinfont_obj_get_bitmap(mp_obj_t self_in) { +static mp_obj_t fontio_builtinfont_obj_get_bitmap(mp_obj_t self_in) { fontio_builtinfont_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_fontio_builtinfont_get_bitmap(self); } @@ -60,7 +60,7 @@ MP_PROPERTY_GETTER(fontio_builtinfont_bitmap_obj, //| def get_bounding_box(self) -> Tuple[int, int]: //| """Returns the maximum bounds of all glyphs in the font in a tuple of two values: width, height.""" //| ... -STATIC mp_obj_t fontio_builtinfont_obj_get_bounding_box(mp_obj_t self_in) { +static mp_obj_t fontio_builtinfont_obj_get_bounding_box(mp_obj_t self_in) { fontio_builtinfont_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_fontio_builtinfont_get_bounding_box(self); @@ -72,7 +72,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(fontio_builtinfont_get_bounding_box_obj, fontio_builti //| """Returns a `fontio.Glyph` for the given codepoint or None if no glyph is available.""" //| ... //| -STATIC mp_obj_t fontio_builtinfont_obj_get_glyph(mp_obj_t self_in, mp_obj_t codepoint_obj) { +static mp_obj_t fontio_builtinfont_obj_get_glyph(mp_obj_t self_in, mp_obj_t codepoint_obj) { fontio_builtinfont_t *self = MP_OBJ_TO_PTR(self_in); mp_int_t codepoint = mp_arg_validate_type_int(codepoint_obj, MP_QSTR_codepoint); @@ -80,12 +80,12 @@ STATIC mp_obj_t fontio_builtinfont_obj_get_glyph(mp_obj_t self_in, mp_obj_t code } MP_DEFINE_CONST_FUN_OBJ_2(fontio_builtinfont_get_glyph_obj, fontio_builtinfont_obj_get_glyph); -STATIC const mp_rom_map_elem_t fontio_builtinfont_locals_dict_table[] = { +static const mp_rom_map_elem_t fontio_builtinfont_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_bitmap), MP_ROM_PTR(&fontio_builtinfont_bitmap_obj) }, { MP_ROM_QSTR(MP_QSTR_get_bounding_box), MP_ROM_PTR(&fontio_builtinfont_get_bounding_box_obj) }, { MP_ROM_QSTR(MP_QSTR_get_glyph), MP_ROM_PTR(&fontio_builtinfont_get_glyph_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(fontio_builtinfont_locals_dict, fontio_builtinfont_locals_dict_table); +static MP_DEFINE_CONST_DICT(fontio_builtinfont_locals_dict, fontio_builtinfont_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( fontio_builtinfont_type, diff --git a/shared-bindings/fontio/__init__.c b/shared-bindings/fontio/__init__.c index 648dcfada9d96..57b91ea200e5e 100644 --- a/shared-bindings/fontio/__init__.c +++ b/shared-bindings/fontio/__init__.c @@ -23,13 +23,13 @@ //| //| """ -STATIC const mp_rom_map_elem_t fontio_module_globals_table[] = { +static const mp_rom_map_elem_t fontio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_fontio) }, { MP_ROM_QSTR(MP_QSTR_BuiltinFont), MP_ROM_PTR(&fontio_builtinfont_type) }, { MP_ROM_QSTR(MP_QSTR_Glyph), MP_ROM_PTR(&fontio_glyph_type) }, }; -STATIC MP_DEFINE_CONST_DICT(fontio_module_globals, fontio_module_globals_table); +static MP_DEFINE_CONST_DICT(fontio_module_globals, fontio_module_globals_table); const mp_obj_module_t fontio_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/fourwire/FourWire.c b/shared-bindings/fourwire/FourWire.c index 5d62ba311aa32..bddd772c2e6e1 100644 --- a/shared-bindings/fourwire/FourWire.c +++ b/shared-bindings/fourwire/FourWire.c @@ -54,7 +54,7 @@ //| :param int phase: the edge of the clock that data is captured. First (0) //| or second (1). Rising or falling depends on clock polarity.""" //| ... -STATIC mp_obj_t fourwire_fourwire_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t fourwire_fourwire_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_spi_bus, ARG_command, ARG_chip_select, ARG_reset, ARG_baudrate, ARG_polarity, ARG_phase }; static const mp_arg_t allowed_args[] = { { MP_QSTR_spi_bus, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -89,7 +89,7 @@ STATIC mp_obj_t fourwire_fourwire_make_new(const mp_obj_type_t *type, size_t n_a //| """Performs a hardware reset via the reset pin. Raises an exception if called when no reset pin //| is available.""" //| ... -STATIC mp_obj_t fourwire_fourwire_obj_reset(mp_obj_t self_in) { +static mp_obj_t fourwire_fourwire_obj_reset(mp_obj_t self_in) { fourwire_fourwire_obj_t *self = self_in; if (!common_hal_fourwire_fourwire_reset(self)) { @@ -106,7 +106,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(fourwire_fourwire_reset_obj, fourwire_fourwire_obj_res //| vertical scroll, set via ``send`` may or may not be reset once the code is done.""" //| ... //| -STATIC mp_obj_t fourwire_fourwire_obj_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t fourwire_fourwire_obj_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_command, ARG_data, ARG_toggle_every_byte }; static const mp_arg_t allowed_args[] = { { MP_QSTR_command, MP_ARG_INT | MP_ARG_REQUIRED }, @@ -139,11 +139,11 @@ STATIC mp_obj_t fourwire_fourwire_obj_send(size_t n_args, const mp_obj_t *pos_ar } MP_DEFINE_CONST_FUN_OBJ_KW(fourwire_fourwire_send_obj, 1, fourwire_fourwire_obj_send); -STATIC const mp_rom_map_elem_t fourwire_fourwire_locals_dict_table[] = { +static const mp_rom_map_elem_t fourwire_fourwire_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&fourwire_fourwire_reset_obj) }, { MP_ROM_QSTR(MP_QSTR_send), MP_ROM_PTR(&fourwire_fourwire_send_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(fourwire_fourwire_locals_dict, fourwire_fourwire_locals_dict_table); +static MP_DEFINE_CONST_DICT(fourwire_fourwire_locals_dict, fourwire_fourwire_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( fourwire_fourwire_type, diff --git a/shared-bindings/fourwire/__init__.c b/shared-bindings/fourwire/__init__.c index 6e952363b0523..34542db97a7e1 100644 --- a/shared-bindings/fourwire/__init__.c +++ b/shared-bindings/fourwire/__init__.c @@ -17,12 +17,12 @@ //| //| """ -STATIC const mp_rom_map_elem_t fourwire_module_globals_table[] = { +static const mp_rom_map_elem_t fourwire_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_fourwire) }, { MP_ROM_QSTR(MP_QSTR_FourWire), MP_ROM_PTR(&fourwire_fourwire_type) }, }; -STATIC MP_DEFINE_CONST_DICT(fourwire_module_globals, fourwire_module_globals_table); +static MP_DEFINE_CONST_DICT(fourwire_module_globals, fourwire_module_globals_table); const mp_obj_module_t fourwire_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/framebufferio/FramebufferDisplay.c b/shared-bindings/framebufferio/FramebufferDisplay.c index cef206da35a75..29242d3a632b0 100644 --- a/shared-bindings/framebufferio/FramebufferDisplay.c +++ b/shared-bindings/framebufferio/FramebufferDisplay.c @@ -40,7 +40,7 @@ //| :param int rotation: The rotation of the display in degrees clockwise. Must be in 90 degree increments (0, 90, 180, 270) //| """ //| ... -STATIC mp_obj_t framebufferio_framebufferdisplay_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t framebufferio_framebufferdisplay_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_framebuffer, ARG_rotation, ARG_auto_refresh, NUM_ARGS }; static const mp_arg_t allowed_args[] = { { MP_QSTR_framebuffer, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -79,7 +79,7 @@ static framebufferio_framebufferdisplay_obj_t *native_display(mp_obj_t display_o } // Undocumented show() implementation with a friendly error message. -STATIC mp_obj_t framebufferio_framebufferdisplay_obj_show(mp_obj_t self_in, mp_obj_t group_in) { +static mp_obj_t framebufferio_framebufferdisplay_obj_show(mp_obj_t self_in, mp_obj_t group_in) { mp_raise_AttributeError(MP_ERROR_TEXT(".show(x) removed. Use .root_group = x")); return mp_const_none; } @@ -111,7 +111,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(framebufferio_framebufferdisplay_show_obj, framebuffer //| :param int minimum_frames_per_second: The minimum number of times the screen should be updated per second. //| """ //| ... -STATIC mp_obj_t framebufferio_framebufferdisplay_obj_refresh(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t framebufferio_framebufferdisplay_obj_refresh(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_target_frames_per_second, ARG_minimum_frames_per_second }; static const mp_arg_t allowed_args[] = { { MP_QSTR_target_frames_per_second, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none} }, @@ -140,13 +140,13 @@ MP_DEFINE_CONST_FUN_OBJ_KW(framebufferio_framebufferdisplay_refresh_obj, 1, fram //| auto_refresh: bool //| """True when the display is refreshed automatically.""" -STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_auto_refresh(mp_obj_t self_in) { +static mp_obj_t framebufferio_framebufferdisplay_obj_get_auto_refresh(mp_obj_t self_in) { framebufferio_framebufferdisplay_obj_t *self = native_display(self_in); return mp_obj_new_bool(common_hal_framebufferio_framebufferdisplay_get_auto_refresh(self)); } MP_DEFINE_CONST_FUN_OBJ_1(framebufferio_framebufferdisplay_get_auto_refresh_obj, framebufferio_framebufferdisplay_obj_get_auto_refresh); -STATIC mp_obj_t framebufferio_framebufferdisplay_obj_set_auto_refresh(mp_obj_t self_in, mp_obj_t auto_refresh) { +static mp_obj_t framebufferio_framebufferdisplay_obj_set_auto_refresh(mp_obj_t self_in, mp_obj_t auto_refresh) { framebufferio_framebufferdisplay_obj_t *self = native_display(self_in); common_hal_framebufferio_framebufferdisplay_set_auto_refresh(self, mp_obj_is_true(auto_refresh)); @@ -161,7 +161,7 @@ MP_PROPERTY_GETSET(framebufferio_framebufferdisplay_auto_refresh_obj, //| brightness: float //| """The brightness of the display as a float. 0.0 is off and 1.0 is full brightness.""" -STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_brightness(mp_obj_t self_in) { +static mp_obj_t framebufferio_framebufferdisplay_obj_get_brightness(mp_obj_t self_in) { framebufferio_framebufferdisplay_obj_t *self = native_display(self_in); mp_float_t brightness = common_hal_framebufferio_framebufferdisplay_get_brightness(self); if (brightness < 0) { @@ -171,7 +171,7 @@ STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_brightness(mp_obj_t sel } MP_DEFINE_CONST_FUN_OBJ_1(framebufferio_framebufferdisplay_get_brightness_obj, framebufferio_framebufferdisplay_obj_get_brightness); -STATIC mp_obj_t framebufferio_framebufferdisplay_obj_set_brightness(mp_obj_t self_in, mp_obj_t brightness_obj) { +static mp_obj_t framebufferio_framebufferdisplay_obj_set_brightness(mp_obj_t self_in, mp_obj_t brightness_obj) { framebufferio_framebufferdisplay_obj_t *self = native_display(self_in); mp_float_t brightness = mp_obj_get_float(brightness_obj); if (brightness < 0.0f || brightness > 1.0f) { @@ -191,7 +191,7 @@ MP_PROPERTY_GETSET(framebufferio_framebufferdisplay_brightness_obj, //| width: int //| """Gets the width of the framebuffer""" -STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_width(mp_obj_t self_in) { +static mp_obj_t framebufferio_framebufferdisplay_obj_get_width(mp_obj_t self_in) { framebufferio_framebufferdisplay_obj_t *self = native_display(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_framebufferio_framebufferdisplay_get_width(self)); } @@ -202,7 +202,7 @@ MP_PROPERTY_GETTER(framebufferio_framebufferdisplay_width_obj, //| height: int //| """Gets the height of the framebuffer""" -STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_height(mp_obj_t self_in) { +static mp_obj_t framebufferio_framebufferdisplay_obj_get_height(mp_obj_t self_in) { framebufferio_framebufferdisplay_obj_t *self = native_display(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_framebufferio_framebufferdisplay_get_height(self)); } @@ -213,12 +213,12 @@ MP_PROPERTY_GETTER(framebufferio_framebufferdisplay_height_obj, //| rotation: int //| """The rotation of the display as an int in degrees.""" -STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_rotation(mp_obj_t self_in) { +static mp_obj_t framebufferio_framebufferdisplay_obj_get_rotation(mp_obj_t self_in) { framebufferio_framebufferdisplay_obj_t *self = native_display(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_framebufferio_framebufferdisplay_get_rotation(self)); } MP_DEFINE_CONST_FUN_OBJ_1(framebufferio_framebufferdisplay_get_rotation_obj, framebufferio_framebufferdisplay_obj_get_rotation); -STATIC mp_obj_t framebufferio_framebufferdisplay_obj_set_rotation(mp_obj_t self_in, mp_obj_t value) { +static mp_obj_t framebufferio_framebufferdisplay_obj_set_rotation(mp_obj_t self_in, mp_obj_t value) { framebufferio_framebufferdisplay_obj_t *self = native_display(self_in); common_hal_framebufferio_framebufferdisplay_set_rotation(self, mp_obj_get_int(value)); return mp_const_none; @@ -232,7 +232,7 @@ MP_PROPERTY_GETSET(framebufferio_framebufferdisplay_rotation_obj, //| framebuffer: circuitpython_typing.FrameBuffer //| """The framebuffer being used by the display""" -STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_framebuffer(mp_obj_t self_in) { +static mp_obj_t framebufferio_framebufferdisplay_obj_get_framebuffer(mp_obj_t self_in) { framebufferio_framebufferdisplay_obj_t *self = native_display(self_in); return common_hal_framebufferio_framebufferdisplay_get_framebuffer(self); } @@ -249,7 +249,7 @@ MP_PROPERTY_GETTER(framebufferio_framebufferframebuffer_obj, //| :param ~circuitpython_typing.WriteableBuffer buffer: The buffer in which to place the pixel data //| """ //| ... -STATIC mp_obj_t framebufferio_framebufferdisplay_obj_fill_row(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t framebufferio_framebufferdisplay_obj_fill_row(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_y, ARG_buffer }; static const mp_arg_t allowed_args[] = { { MP_QSTR_y, MP_ARG_INT | MP_ARG_REQUIRED, {.u_int = -1} }, @@ -309,13 +309,13 @@ MP_DEFINE_CONST_FUN_OBJ_KW(framebufferio_framebufferdisplay_fill_row_obj, 1, fra //| If the root group is set to ``None``, no output will be shown. //| """ //| -STATIC mp_obj_t framebufferio_framebufferdisplay_obj_get_root_group(mp_obj_t self_in) { +static mp_obj_t framebufferio_framebufferdisplay_obj_get_root_group(mp_obj_t self_in) { framebufferio_framebufferdisplay_obj_t *self = native_display(self_in); return common_hal_framebufferio_framebufferdisplay_get_root_group(self); } MP_DEFINE_CONST_FUN_OBJ_1(framebufferio_framebufferdisplay_get_root_group_obj, framebufferio_framebufferdisplay_obj_get_root_group); -STATIC mp_obj_t framebufferio_framebufferdisplay_obj_set_root_group(mp_obj_t self_in, mp_obj_t group_in) { +static mp_obj_t framebufferio_framebufferdisplay_obj_set_root_group(mp_obj_t self_in, mp_obj_t group_in) { framebufferio_framebufferdisplay_obj_t *self = native_display(self_in); displayio_group_t *group = NULL; if (group_in != mp_const_none) { @@ -334,7 +334,7 @@ MP_PROPERTY_GETSET(framebufferio_framebufferdisplay_root_group_obj, (mp_obj_t)&framebufferio_framebufferdisplay_get_root_group_obj, (mp_obj_t)&framebufferio_framebufferdisplay_set_root_group_obj); -STATIC const mp_rom_map_elem_t framebufferio_framebufferdisplay_locals_dict_table[] = { +static const mp_rom_map_elem_t framebufferio_framebufferdisplay_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_show), MP_ROM_PTR(&framebufferio_framebufferdisplay_show_obj) }, { MP_ROM_QSTR(MP_QSTR_refresh), MP_ROM_PTR(&framebufferio_framebufferdisplay_refresh_obj) }, { MP_ROM_QSTR(MP_QSTR_fill_row), MP_ROM_PTR(&framebufferio_framebufferdisplay_fill_row_obj) }, @@ -349,7 +349,7 @@ STATIC const mp_rom_map_elem_t framebufferio_framebufferdisplay_locals_dict_tabl { MP_ROM_QSTR(MP_QSTR_framebuffer), MP_ROM_PTR(&framebufferio_framebufferframebuffer_obj) }, { MP_ROM_QSTR(MP_QSTR_root_group), MP_ROM_PTR(&framebufferio_framebufferdisplay_root_group_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(framebufferio_framebufferdisplay_locals_dict, framebufferio_framebufferdisplay_locals_dict_table); +static MP_DEFINE_CONST_DICT(framebufferio_framebufferdisplay_locals_dict, framebufferio_framebufferdisplay_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( framebufferio_framebufferdisplay_type, diff --git a/shared-bindings/framebufferio/__init__.c b/shared-bindings/framebufferio/__init__.c index b53571de22cc6..1b08cf1920313 100644 --- a/shared-bindings/framebufferio/__init__.c +++ b/shared-bindings/framebufferio/__init__.c @@ -22,7 +22,7 @@ static const mp_rom_map_elem_t framebufferio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_FramebufferDisplay), MP_ROM_PTR(&framebufferio_framebufferdisplay_type) }, }; -STATIC MP_DEFINE_CONST_DICT(framebufferio_module_globals, framebufferio_module_globals_table); +static MP_DEFINE_CONST_DICT(framebufferio_module_globals, framebufferio_module_globals_table); const mp_obj_module_t framebufferio_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/frequencyio/FrequencyIn.c b/shared-bindings/frequencyio/FrequencyIn.c index 11feb4545f4f4..5bd18658d70b8 100644 --- a/shared-bindings/frequencyio/FrequencyIn.c +++ b/shared-bindings/frequencyio/FrequencyIn.c @@ -49,7 +49,7 @@ //| # as the value. //| frequency.clear()""" //| ... -STATIC mp_obj_t frequencyio_frequencyin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t frequencyio_frequencyin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { mp_arg_check_num(n_args, n_kw, 1, 1, true); enum { ARG_pin, ARG_capture_period }; @@ -74,14 +74,14 @@ STATIC mp_obj_t frequencyio_frequencyin_make_new(const mp_obj_type_t *type, size //| def deinit(self) -> None: //| """Deinitialises the FrequencyIn and releases any hardware resources for reuse.""" //| ... -STATIC mp_obj_t frequencyio_frequencyin_deinit(mp_obj_t self_in) { +static mp_obj_t frequencyio_frequencyin_deinit(mp_obj_t self_in) { frequencyio_frequencyin_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_frequencyio_frequencyin_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(frequencyio_frequencyin_deinit_obj, frequencyio_frequencyin_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(frequencyio_frequencyin_deinit_obj, frequencyio_frequencyin_deinit); -STATIC void check_for_deinit(frequencyio_frequencyin_obj_t *self) { +static void check_for_deinit(frequencyio_frequencyin_obj_t *self) { if (common_hal_frequencyio_frequencyin_deinited(self)) { raise_deinited_error(); } @@ -96,17 +96,17 @@ STATIC void check_for_deinit(frequencyio_frequencyin_obj_t *self) { //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t frequencyio_frequencyin_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t frequencyio_frequencyin_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_frequencyio_frequencyin_deinit(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(frequencyio_frequencyin___exit___obj, 4, 4, frequencyio_frequencyin_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(frequencyio_frequencyin___exit___obj, 4, 4, frequencyio_frequencyin_obj___exit__); //| def pause(self) -> None: //| """Pause frequency capture.""" //| ... -STATIC mp_obj_t frequencyio_frequencyin_obj_pause(mp_obj_t self_in) { +static mp_obj_t frequencyio_frequencyin_obj_pause(mp_obj_t self_in) { frequencyio_frequencyin_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -118,7 +118,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(frequencyio_frequencyin_pause_obj, frequencyio_frequen //| def resume(self) -> None: //| """Resumes frequency capture.""" //| ... -STATIC mp_obj_t frequencyio_frequencyin_obj_resume(mp_obj_t self_in) { +static mp_obj_t frequencyio_frequencyin_obj_resume(mp_obj_t self_in) { frequencyio_frequencyin_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -131,7 +131,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(frequencyio_frequencyin_resume_obj, frequencyio_freque //| """Clears the last detected frequency capture value.""" //| ... -STATIC mp_obj_t frequencyio_frequencyin_obj_clear(mp_obj_t self_in) { +static mp_obj_t frequencyio_frequencyin_obj_clear(mp_obj_t self_in) { frequencyio_frequencyin_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -147,7 +147,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(frequencyio_frequencyin_clear_obj, frequencyio_frequen //| //| .. note:: When setting a new ``capture_period``, all previous capture information is //| cleared with a call to ``clear()``.""" -STATIC mp_obj_t frequencyio_frequencyin_obj_get_capture_period(mp_obj_t self_in) { +static mp_obj_t frequencyio_frequencyin_obj_get_capture_period(mp_obj_t self_in) { frequencyio_frequencyin_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -155,7 +155,7 @@ STATIC mp_obj_t frequencyio_frequencyin_obj_get_capture_period(mp_obj_t self_in) } MP_DEFINE_CONST_FUN_OBJ_1(frequencyio_frequency_get_capture_period_obj, frequencyio_frequencyin_obj_get_capture_period); -STATIC mp_obj_t frequencyio_frequencyin_obj_set_capture_period(mp_obj_t self_in, mp_obj_t capture_period) { +static mp_obj_t frequencyio_frequencyin_obj_set_capture_period(mp_obj_t self_in, mp_obj_t capture_period) { frequencyio_frequencyin_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -172,7 +172,7 @@ MP_PROPERTY_GETSET(frequencyio_frequencyin_capture_period_obj, //| """Returns the value of the last frequency captured.""" //| ... //| -STATIC mp_obj_t frequencyio_frequencyin_obj_get_value(mp_obj_t self_in) { +static mp_obj_t frequencyio_frequencyin_obj_get_value(mp_obj_t self_in) { frequencyio_frequencyin_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -184,7 +184,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(frequencyio_frequencyin_get_value_obj, frequencyio_fre MP_PROPERTY_GETTER(frequencyio_frequencyin_value_obj, (mp_obj_t)&frequencyio_frequencyin_get_value_obj); -STATIC const mp_rom_map_elem_t frequencyio_frequencyin_locals_dict_table[] = { +static const mp_rom_map_elem_t frequencyio_frequencyin_locals_dict_table[] = { // Methods { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&frequencyio_frequencyin_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&frequencyio_frequencyin_deinit_obj) }, @@ -196,7 +196,7 @@ STATIC const mp_rom_map_elem_t frequencyio_frequencyin_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_clear), MP_ROM_PTR(&frequencyio_frequencyin_clear_obj) }, { MP_ROM_QSTR(MP_QSTR_capture_period), MP_ROM_PTR(&frequencyio_frequencyin_capture_period_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(frequencyio_frequencyin_locals_dict, frequencyio_frequencyin_locals_dict_table); +static MP_DEFINE_CONST_DICT(frequencyio_frequencyin_locals_dict, frequencyio_frequencyin_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( frequencyio_frequencyin_type, diff --git a/shared-bindings/frequencyio/__init__.c b/shared-bindings/frequencyio/__init__.c index 05ea811c5dea4..f021cbcecb562 100644 --- a/shared-bindings/frequencyio/__init__.c +++ b/shared-bindings/frequencyio/__init__.c @@ -39,12 +39,12 @@ //| hardware after program completion. Use ``deinit()`` or a ``with`` statement //| to do it yourself.""" -STATIC const mp_rom_map_elem_t frequencyio_module_globals_table[] = { +static const mp_rom_map_elem_t frequencyio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_frequencyio) }, { MP_ROM_QSTR(MP_QSTR_FrequencyIn), MP_ROM_PTR(&frequencyio_frequencyin_type) }, }; -STATIC MP_DEFINE_CONST_DICT(frequencyio_module_globals, frequencyio_module_globals_table); +static MP_DEFINE_CONST_DICT(frequencyio_module_globals, frequencyio_module_globals_table); const mp_obj_module_t frequencyio_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/getpass/__init__.c b/shared-bindings/getpass/__init__.c index adbd728512c6b..b779311f5fc36 100644 --- a/shared-bindings/getpass/__init__.c +++ b/shared-bindings/getpass/__init__.c @@ -24,7 +24,7 @@ //| """ //| ... //| -STATIC mp_obj_t getpass_getpass(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t getpass_getpass(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_prompt, ARG_stream }; static const mp_arg_t allowed_args[] = { { MP_QSTR_prompt, MP_ARG_OBJ, {.u_obj = mp_const_none} }, @@ -49,15 +49,15 @@ STATIC mp_obj_t getpass_getpass(size_t n_args, const mp_obj_t *pos_args, mp_map_ return shared_module_getpass_getpass(prompt, ((print.data) ? &print : NULL)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(getpass_getpass_obj, 0, getpass_getpass); +static MP_DEFINE_CONST_FUN_OBJ_KW(getpass_getpass_obj, 0, getpass_getpass); -STATIC const mp_rom_map_elem_t getpass_module_globals_table[] = { +static const mp_rom_map_elem_t getpass_module_globals_table[] = { // module name { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_getpass) }, // module functions { MP_ROM_QSTR(MP_QSTR_getpass), MP_ROM_PTR(&getpass_getpass_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(getpass_module_globals, getpass_module_globals_table); +static MP_DEFINE_CONST_DICT(getpass_module_globals, getpass_module_globals_table); const mp_obj_module_t getpass_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/gifio/GifWriter.c b/shared-bindings/gifio/GifWriter.c index fc6fa3115596b..c1a2c69c59926 100644 --- a/shared-bindings/gifio/GifWriter.c +++ b/shared-bindings/gifio/GifWriter.c @@ -128,7 +128,7 @@ static mp_obj_t gifio_gifwriter_add_frame(size_t n_args, const mp_obj_t *pos_arg } MP_DEFINE_CONST_FUN_OBJ_KW(gifio_gifwriter_add_frame_obj, 1, gifio_gifwriter_add_frame); -STATIC const mp_rom_map_elem_t gifio_gifwriter_locals_table[] = { +static const mp_rom_map_elem_t gifio_gifwriter_locals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_GifWriter) }, { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&gifio_gifwriter___exit___obj) }, @@ -136,7 +136,7 @@ STATIC const mp_rom_map_elem_t gifio_gifwriter_locals_table[] = { { MP_ROM_QSTR(MP_QSTR_add_frame), MP_ROM_PTR(&gifio_gifwriter_add_frame_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(gifio_gifwriter_locals, gifio_gifwriter_locals_table); +static MP_DEFINE_CONST_DICT(gifio_gifwriter_locals, gifio_gifwriter_locals_table); MP_DEFINE_CONST_OBJ_TYPE( gifio_gifwriter_type, diff --git a/shared-bindings/gifio/OnDiskGif.c b/shared-bindings/gifio/OnDiskGif.c index ea20a38b1d850..10913233f871d 100644 --- a/shared-bindings/gifio/OnDiskGif.c +++ b/shared-bindings/gifio/OnDiskGif.c @@ -101,7 +101,7 @@ //| is not limited but images that are too large will cause a memory exception. //| """ //| ... -STATIC mp_obj_t gifio_ondiskgif_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t gifio_ondiskgif_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_filename, ARG_use_palette, NUM_ARGS }; static const mp_arg_t allowed_args[] = { { MP_QSTR_filename, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -126,7 +126,7 @@ STATIC mp_obj_t gifio_ondiskgif_make_new(const mp_obj_type_t *type, size_t n_arg return MP_OBJ_FROM_PTR(self); } -STATIC void check_for_deinit(gifio_ondiskgif_t *self) { +static void check_for_deinit(gifio_ondiskgif_t *self) { if (common_hal_gifio_ondiskgif_deinited(self)) { raise_deinited_error(); } @@ -141,16 +141,16 @@ STATIC void check_for_deinit(gifio_ondiskgif_t *self) { //| """Automatically deinitializes the GIF when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t gifio_ondiskgif_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t gifio_ondiskgif_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_gifio_ondiskgif_deinit(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(gifio_ondiskgif___exit___obj, 4, 4, gifio_ondiskgif_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(gifio_ondiskgif___exit___obj, 4, 4, gifio_ondiskgif_obj___exit__); //| width: int //| """Width of the gif. (read only)""" -STATIC mp_obj_t gifio_ondiskgif_obj_get_width(mp_obj_t self_in) { +static mp_obj_t gifio_ondiskgif_obj_get_width(mp_obj_t self_in) { gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -164,7 +164,7 @@ MP_PROPERTY_GETTER(gifio_ondiskgif_width_obj, //| height: int //| """Height of the gif. (read only)""" -STATIC mp_obj_t gifio_ondiskgif_obj_get_height(mp_obj_t self_in) { +static mp_obj_t gifio_ondiskgif_obj_get_height(mp_obj_t self_in) { gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -178,7 +178,7 @@ MP_PROPERTY_GETTER(gifio_ondiskgif_height_obj, //| bitmap: displayio.Bitmap //| """The bitmap used to hold the current frame.""" -STATIC mp_obj_t gifio_ondiskgif_obj_get_bitmap(mp_obj_t self_in) { +static mp_obj_t gifio_ondiskgif_obj_get_bitmap(mp_obj_t self_in) { gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -192,7 +192,7 @@ MP_PROPERTY_GETTER(gifio_ondiskgif_bitmap_obj, //| palette: Optional[displayio.Palette] //| """The palette for the current frame if it exists.""" -STATIC mp_obj_t gifio_ondiskgif_obj_get_palette(mp_obj_t self_in) { +static mp_obj_t gifio_ondiskgif_obj_get_palette(mp_obj_t self_in) { gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -206,7 +206,7 @@ MP_PROPERTY_GETTER(gifio_ondiskgif_palette_obj, //| def next_frame(self) -> float: //| """Loads the next frame. Returns expected delay before the next frame in seconds.""" -STATIC mp_obj_t gifio_ondiskgif_obj_next_frame(mp_obj_t self_in) { +static mp_obj_t gifio_ondiskgif_obj_next_frame(mp_obj_t self_in) { gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -218,7 +218,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(gifio_ondiskgif_next_frame_obj, gifio_ondiskgif_obj_ne //| duration: float //| """Returns the total duration of the GIF in seconds. (read only)""" -STATIC mp_obj_t gifio_ondiskgif_obj_get_duration(mp_obj_t self_in) { +static mp_obj_t gifio_ondiskgif_obj_get_duration(mp_obj_t self_in) { gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -232,7 +232,7 @@ MP_PROPERTY_GETTER(gifio_ondiskgif_duration_obj, //| frame_count: int //| """Returns the number of frames in the GIF. (read only)""" -STATIC mp_obj_t gifio_ondiskgif_obj_get_frame_count(mp_obj_t self_in) { +static mp_obj_t gifio_ondiskgif_obj_get_frame_count(mp_obj_t self_in) { gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -246,7 +246,7 @@ MP_PROPERTY_GETTER(gifio_ondiskgif_frame_count_obj, //| min_delay: float //| """The minimum delay found between frames. (read only)""" -STATIC mp_obj_t gifio_ondiskgif_obj_get_min_delay(mp_obj_t self_in) { +static mp_obj_t gifio_ondiskgif_obj_get_min_delay(mp_obj_t self_in) { gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -261,7 +261,7 @@ MP_PROPERTY_GETTER(gifio_ondiskgif_min_delay_obj, //| max_delay: float //| """The maximum delay found between frames. (read only)""" //| -STATIC mp_obj_t gifio_ondiskgif_obj_get_max_delay(mp_obj_t self_in) { +static mp_obj_t gifio_ondiskgif_obj_get_max_delay(mp_obj_t self_in) { gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -277,14 +277,14 @@ MP_PROPERTY_GETTER(gifio_ondiskgif_max_delay_obj, //| """Release resources allocated by OnDiskGif.""" //| ... //| -STATIC mp_obj_t gifio_ondiskgif_obj_deinit(mp_obj_t self_in) { +static mp_obj_t gifio_ondiskgif_obj_deinit(mp_obj_t self_in) { gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in); common_hal_gifio_ondiskgif_deinit(self); return mp_const_none; } MP_DEFINE_CONST_FUN_OBJ_1(gifio_ondiskgif_deinit_obj, gifio_ondiskgif_obj_deinit); -STATIC const mp_rom_map_elem_t gifio_ondiskgif_locals_dict_table[] = { +static const mp_rom_map_elem_t gifio_ondiskgif_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&gifio_ondiskgif_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&gifio_ondiskgif___exit___obj) }, @@ -298,7 +298,7 @@ STATIC const mp_rom_map_elem_t gifio_ondiskgif_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_min_delay), MP_ROM_PTR(&gifio_ondiskgif_min_delay_obj) }, { MP_ROM_QSTR(MP_QSTR_max_delay), MP_ROM_PTR(&gifio_ondiskgif_max_delay_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(gifio_ondiskgif_locals_dict, gifio_ondiskgif_locals_dict_table); +static MP_DEFINE_CONST_DICT(gifio_ondiskgif_locals_dict, gifio_ondiskgif_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( gifio_ondiskgif_type, diff --git a/shared-bindings/gifio/__init__.c b/shared-bindings/gifio/__init__.c index 30998e1d14f27..057d18ce82d47 100644 --- a/shared-bindings/gifio/__init__.c +++ b/shared-bindings/gifio/__init__.c @@ -12,13 +12,13 @@ //| """Access GIF-format images //| """ -STATIC const mp_rom_map_elem_t gifio_module_globals_table[] = { +static const mp_rom_map_elem_t gifio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_gifio) }, { MP_OBJ_NEW_QSTR(MP_QSTR_GifWriter), MP_ROM_PTR(&gifio_gifwriter_type)}, { MP_ROM_QSTR(MP_QSTR_OnDiskGif), MP_ROM_PTR(&gifio_ondiskgif_type) }, }; -STATIC MP_DEFINE_CONST_DICT(gifio_module_globals, gifio_module_globals_table); +static MP_DEFINE_CONST_DICT(gifio_module_globals, gifio_module_globals_table); const mp_obj_module_t gifio_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/hashlib/Hash.c b/shared-bindings/hashlib/Hash.c index a26636c280164..68930b137e4ea 100644 --- a/shared-bindings/hashlib/Hash.c +++ b/shared-bindings/hashlib/Hash.c @@ -18,7 +18,7 @@ //| digest_size: int //| """Digest size in bytes""" -STATIC mp_obj_t hashlib_hash_digest_size_get(mp_obj_t self_in) { +static mp_obj_t hashlib_hash_digest_size_get(mp_obj_t self_in) { mp_check_self(mp_obj_is_type(self_in, &hashlib_hash_type)); hashlib_hash_obj_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_hashlib_hash_get_digest_size(self)); @@ -42,13 +42,13 @@ mp_obj_t hashlib_hash_update(mp_obj_t self_in, mp_obj_t buf_in) { common_hal_hashlib_hash_update(self, bufinfo.buf, bufinfo.len); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(hashlib_hash_update_obj, hashlib_hash_update); +static MP_DEFINE_CONST_FUN_OBJ_2(hashlib_hash_update_obj, hashlib_hash_update); //| def digest(self) -> bytes: //| """Returns the current digest as bytes() with a length of `hashlib.Hash.digest_size`.""" //| ... //| -STATIC mp_obj_t hashlib_hash_digest(mp_obj_t self_in) { +static mp_obj_t hashlib_hash_digest(mp_obj_t self_in) { mp_check_self(mp_obj_is_type(self_in, &hashlib_hash_type)); hashlib_hash_obj_t *self = MP_OBJ_TO_PTR(self_in); @@ -59,15 +59,15 @@ STATIC mp_obj_t hashlib_hash_digest(mp_obj_t self_in) { common_hal_hashlib_hash_digest(self, (uint8_t *)o->data, size); return obj; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(hashlib_hash_digest_obj, hashlib_hash_digest); +static MP_DEFINE_CONST_FUN_OBJ_1(hashlib_hash_digest_obj, hashlib_hash_digest); -STATIC const mp_rom_map_elem_t hashlib_hash_locals_dict_table[] = { +static const mp_rom_map_elem_t hashlib_hash_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_digest_size), MP_ROM_PTR(&hashlib_hash_digest_size_obj) }, { MP_ROM_QSTR(MP_QSTR_update), MP_ROM_PTR(&hashlib_hash_update_obj) }, { MP_ROM_QSTR(MP_QSTR_digest), MP_ROM_PTR(&hashlib_hash_digest_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(hashlib_hash_locals_dict, hashlib_hash_locals_dict_table); +static MP_DEFINE_CONST_DICT(hashlib_hash_locals_dict, hashlib_hash_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( hashlib_hash_type, diff --git a/shared-bindings/hashlib/__init__.c b/shared-bindings/hashlib/__init__.c index 6b256cc436c6f..fa3b1b1872527 100644 --- a/shared-bindings/hashlib/__init__.c +++ b/shared-bindings/hashlib/__init__.c @@ -25,7 +25,7 @@ //| :rtype: hashlib.Hash""" //| ... //| -STATIC mp_obj_t hashlib_new(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t hashlib_new(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_name, ARG_data }; static const mp_arg_t allowed_args[] = { { MP_QSTR_name, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -47,9 +47,9 @@ STATIC mp_obj_t hashlib_new(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k } return self; } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(hashlib_new_obj, 1, hashlib_new); +static MP_DEFINE_CONST_FUN_OBJ_KW(hashlib_new_obj, 1, hashlib_new); -STATIC const mp_rom_map_elem_t hashlib_module_globals_table[] = { +static const mp_rom_map_elem_t hashlib_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_hashlib) }, { MP_ROM_QSTR(MP_QSTR_new), MP_ROM_PTR(&hashlib_new_obj) }, @@ -58,7 +58,7 @@ STATIC const mp_rom_map_elem_t hashlib_module_globals_table[] = { // object on `hashlib` only the internal `_hashlib`. }; -STATIC MP_DEFINE_CONST_DICT(hashlib_module_globals, hashlib_module_globals_table); +static MP_DEFINE_CONST_DICT(hashlib_module_globals, hashlib_module_globals_table); const mp_obj_module_t hashlib_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/i2cdisplaybus/I2CDisplayBus.c b/shared-bindings/i2cdisplaybus/I2CDisplayBus.c index d4e2f1d4832cd..065baa782fcc9 100644 --- a/shared-bindings/i2cdisplaybus/I2CDisplayBus.c +++ b/shared-bindings/i2cdisplaybus/I2CDisplayBus.c @@ -40,7 +40,7 @@ //| :param microcontroller.Pin reset: Reset pin. When None only software reset can be used //| """ //| ... -STATIC mp_obj_t i2cdisplaybus_i2cdisplaybus_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t i2cdisplaybus_i2cdisplaybus_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_i2c_bus, ARG_device_address, ARG_reset }; static const mp_arg_t allowed_args[] = { { MP_QSTR_i2c_bus, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -65,7 +65,7 @@ STATIC mp_obj_t i2cdisplaybus_i2cdisplaybus_make_new(const mp_obj_type_t *type, //| """Performs a hardware reset via the reset pin. Raises an exception if called when no reset pin //| is available.""" //| ... -STATIC mp_obj_t i2cdisplaybus_i2cdisplaybus_obj_reset(mp_obj_t self_in) { +static mp_obj_t i2cdisplaybus_i2cdisplaybus_obj_reset(mp_obj_t self_in) { i2cdisplaybus_i2cdisplaybus_obj_t *self = self_in; if (!common_hal_i2cdisplaybus_i2cdisplaybus_reset(self)) { @@ -80,7 +80,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(i2cdisplaybus_i2cdisplaybus_reset_obj, i2cdisplaybus_i //| vertical scroll, set via ``send`` may or may not be reset once the code is done.""" //| ... //| -STATIC mp_obj_t i2cdisplaybus_i2cdisplaybus_obj_send(mp_obj_t self, mp_obj_t command_obj, mp_obj_t data_obj) { +static mp_obj_t i2cdisplaybus_i2cdisplaybus_obj_send(mp_obj_t self, mp_obj_t command_obj, mp_obj_t data_obj) { mp_int_t command_int = mp_obj_get_int(command_obj); mp_arg_validate_int_range(command_int, 0, 255, MP_QSTR_command); @@ -102,11 +102,11 @@ STATIC mp_obj_t i2cdisplaybus_i2cdisplaybus_obj_send(mp_obj_t self, mp_obj_t com } MP_DEFINE_CONST_FUN_OBJ_3(i2cdisplaybus_i2cdisplaybus_send_obj, i2cdisplaybus_i2cdisplaybus_obj_send); -STATIC const mp_rom_map_elem_t i2cdisplaybus_i2cdisplaybus_locals_dict_table[] = { +static const mp_rom_map_elem_t i2cdisplaybus_i2cdisplaybus_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&i2cdisplaybus_i2cdisplaybus_reset_obj) }, { MP_ROM_QSTR(MP_QSTR_send), MP_ROM_PTR(&i2cdisplaybus_i2cdisplaybus_send_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(i2cdisplaybus_i2cdisplaybus_locals_dict, i2cdisplaybus_i2cdisplaybus_locals_dict_table); +static MP_DEFINE_CONST_DICT(i2cdisplaybus_i2cdisplaybus_locals_dict, i2cdisplaybus_i2cdisplaybus_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( i2cdisplaybus_i2cdisplaybus_type, diff --git a/shared-bindings/i2cdisplaybus/__init__.c b/shared-bindings/i2cdisplaybus/__init__.c index f1a622a5f9703..45be89668f028 100644 --- a/shared-bindings/i2cdisplaybus/__init__.c +++ b/shared-bindings/i2cdisplaybus/__init__.c @@ -17,12 +17,12 @@ //| //| """ -STATIC const mp_rom_map_elem_t i2cdisplaybus_module_globals_table[] = { +static const mp_rom_map_elem_t i2cdisplaybus_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_i2cdisplaybus) }, { MP_ROM_QSTR(MP_QSTR_I2CDisplayBus), MP_ROM_PTR(&i2cdisplaybus_i2cdisplaybus_type) }, }; -STATIC MP_DEFINE_CONST_DICT(i2cdisplaybus_module_globals, i2cdisplaybus_module_globals_table); +static MP_DEFINE_CONST_DICT(i2cdisplaybus_module_globals, i2cdisplaybus_module_globals_table); const mp_obj_module_t i2cdisplaybus_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/i2ctarget/I2CTarget.c b/shared-bindings/i2ctarget/I2CTarget.c index fcc63c376894b..2a3749fdb286b 100644 --- a/shared-bindings/i2ctarget/I2CTarget.c +++ b/shared-bindings/i2ctarget/I2CTarget.c @@ -19,7 +19,7 @@ #include "py/objproperty.h" #include "py/runtime.h" -STATIC mp_obj_t mp_obj_new_i2ctarget_i2c_target_request(i2ctarget_i2c_target_obj_t *target, uint8_t address, bool is_read, bool is_restart) { +static mp_obj_t mp_obj_new_i2ctarget_i2c_target_request(i2ctarget_i2c_target_obj_t *target, uint8_t address, bool is_read, bool is_restart) { i2ctarget_i2c_target_request_obj_t *self = mp_obj_malloc(i2ctarget_i2c_target_request_obj_t, &i2ctarget_i2c_target_request_type); self->target = target; @@ -48,7 +48,7 @@ STATIC mp_obj_t mp_obj_new_i2ctarget_i2c_target_request(i2ctarget_i2c_target_obj //| :type addresses: list[int] //| :param bool smbus: Use SMBUS timings if the hardware supports it""" //| ... -STATIC mp_obj_t i2ctarget_i2c_target_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t i2ctarget_i2c_target_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { i2ctarget_i2c_target_obj_t *self = mp_obj_malloc(i2ctarget_i2c_target_obj_t, &i2ctarget_i2c_target_type); enum { ARG_scl, ARG_sda, ARG_addresses, ARG_smbus }; static const mp_arg_t allowed_args[] = { @@ -84,7 +84,7 @@ STATIC mp_obj_t i2ctarget_i2c_target_make_new(const mp_obj_type_t *type, size_t //| def deinit(self) -> None: //| """Releases control of the underlying hardware so other classes can use it.""" //| ... -STATIC mp_obj_t i2ctarget_i2c_target_obj_deinit(mp_obj_t self_in) { +static mp_obj_t i2ctarget_i2c_target_obj_deinit(mp_obj_t self_in) { mp_check_self(mp_obj_is_type(self_in, &i2ctarget_i2c_target_type)); i2ctarget_i2c_target_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_i2ctarget_i2c_target_deinit(self); @@ -101,13 +101,13 @@ MP_DEFINE_CONST_FUN_OBJ_1(i2ctarget_i2c_target_deinit_obj, i2ctarget_i2c_target_ //| """Automatically deinitializes the hardware on context exit. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t i2ctarget_i2c_target_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t i2ctarget_i2c_target_obj___exit__(size_t n_args, const mp_obj_t *args) { mp_check_self(mp_obj_is_type(args[0], &i2ctarget_i2c_target_type)); i2ctarget_i2c_target_obj_t *self = MP_OBJ_TO_PTR(args[0]); common_hal_i2ctarget_i2c_target_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(i2ctarget_i2c_target___exit___obj, 4, 4, i2ctarget_i2c_target_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(i2ctarget_i2c_target___exit___obj, 4, 4, i2ctarget_i2c_target_obj___exit__); //| def request(self, *, timeout: float = -1) -> I2CTargetRequest: //| """Wait for an I2C request. @@ -116,7 +116,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(i2ctarget_i2c_target___exit___obj, 4, //| :return: I2CTargetRequest or None if timeout=-1 and there's no request //| :rtype: ~i2ctarget.I2CTargetRequest""" //| -STATIC mp_obj_t i2ctarget_i2c_target_request(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t i2ctarget_i2c_target_request(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { mp_check_self(mp_obj_is_type(pos_args[0], &i2ctarget_i2c_target_type)); i2ctarget_i2c_target_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); if (common_hal_i2ctarget_i2c_target_deinited(self)) { @@ -182,9 +182,9 @@ STATIC mp_obj_t i2ctarget_i2c_target_request(size_t n_args, const mp_obj_t *pos_ } return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(i2ctarget_i2c_target_request_obj, 1, i2ctarget_i2c_target_request); +static MP_DEFINE_CONST_FUN_OBJ_KW(i2ctarget_i2c_target_request_obj, 1, i2ctarget_i2c_target_request); -STATIC const mp_rom_map_elem_t i2ctarget_i2c_target_locals_dict_table[] = { +static const mp_rom_map_elem_t i2ctarget_i2c_target_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&i2ctarget_i2c_target_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&i2ctarget_i2c_target___exit___obj) }, @@ -192,7 +192,7 @@ STATIC const mp_rom_map_elem_t i2ctarget_i2c_target_locals_dict_table[] = { }; -STATIC MP_DEFINE_CONST_DICT(i2ctarget_i2c_target_locals_dict, i2ctarget_i2c_target_locals_dict_table); +static MP_DEFINE_CONST_DICT(i2ctarget_i2c_target_locals_dict, i2ctarget_i2c_target_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( i2ctarget_i2c_target_type, @@ -213,7 +213,7 @@ MP_DEFINE_CONST_OBJ_TYPE( //| :param address: I2C address //| :param is_read: True if the main target is requesting data //| :param is_restart: Repeated Start Condition""" -STATIC mp_obj_t i2ctarget_i2c_target_request_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { +static mp_obj_t i2ctarget_i2c_target_request_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { mp_arg_check_num(n_args, n_kw, 4, 4, false); return mp_obj_new_i2ctarget_i2c_target_request(args[0], mp_obj_get_int(args[1]), mp_obj_is_true(args[2]), mp_obj_is_true(args[3])); } @@ -226,17 +226,17 @@ STATIC mp_obj_t i2ctarget_i2c_target_request_make_new(const mp_obj_type_t *type, //| def __exit__(self) -> None: //| """Close the request.""" //| ... -STATIC mp_obj_t i2ctarget_i2c_target_request_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t i2ctarget_i2c_target_request_obj___exit__(size_t n_args, const mp_obj_t *args) { mp_check_self(mp_obj_is_type(args[0], &i2ctarget_i2c_target_request_type)); i2ctarget_i2c_target_request_obj_t *self = MP_OBJ_TO_PTR(args[0]); common_hal_i2ctarget_i2c_target_close(self->target); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(i2ctarget_i2c_target_request___exit___obj, 4, 4, i2ctarget_i2c_target_request_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(i2ctarget_i2c_target_request___exit___obj, 4, 4, i2ctarget_i2c_target_request_obj___exit__); //| address: int //| """The I2C address of the request.""" -STATIC mp_obj_t i2ctarget_i2c_target_request_get_address(mp_obj_t self_in) { +static mp_obj_t i2ctarget_i2c_target_request_get_address(mp_obj_t self_in) { mp_check_self(mp_obj_is_type(self_in, &i2ctarget_i2c_target_request_type)); i2ctarget_i2c_target_request_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_int(self->address); @@ -245,7 +245,7 @@ MP_DEFINE_CONST_PROP_GET(i2ctarget_i2c_target_request_address_obj, i2ctarget_i2c //| is_read: bool //| """The I2C main controller is reading from this target.""" -STATIC mp_obj_t i2ctarget_i2c_target_request_get_is_read(mp_obj_t self_in) { +static mp_obj_t i2ctarget_i2c_target_request_get_is_read(mp_obj_t self_in) { mp_check_self(mp_obj_is_type(self_in, &i2ctarget_i2c_target_request_type)); i2ctarget_i2c_target_request_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_bool(self->is_read); @@ -254,7 +254,7 @@ MP_DEFINE_CONST_PROP_GET(i2ctarget_i2c_target_request_is_read_obj, i2ctarget_i2c //| is_restart: bool //| """Is Repeated Start Condition.""" -STATIC mp_obj_t i2ctarget_i2c_target_request_get_is_restart(mp_obj_t self_in) { +static mp_obj_t i2ctarget_i2c_target_request_get_is_restart(mp_obj_t self_in) { mp_check_self(mp_obj_is_type(self_in, &i2ctarget_i2c_target_request_type)); i2ctarget_i2c_target_request_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_bool(self->is_restart); @@ -269,7 +269,7 @@ MP_DEFINE_CONST_PROP_GET(i2ctarget_i2c_target_request_is_restart_obj, i2ctarget_ //| :param ack: Whether or not to send an ACK after the n'th byte //| :return: Bytes read""" //| ... -STATIC mp_obj_t i2ctarget_i2c_target_request_read(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t i2ctarget_i2c_target_request_read(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { mp_check_self(mp_obj_is_type(pos_args[0], &i2ctarget_i2c_target_request_type)); i2ctarget_i2c_target_request_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); enum { ARG_n, ARG_ack }; @@ -326,7 +326,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(i2ctarget_i2c_target_request_read_obj, 1, i2ctarget_i //| :param ~circuitpython_typing.ReadableBuffer buffer: Write out the data in this buffer //| :return: Number of bytes written""" //| ... -STATIC mp_obj_t i2ctarget_i2c_target_request_write(mp_obj_t self_in, mp_obj_t buf_in) { +static mp_obj_t i2ctarget_i2c_target_request_write(mp_obj_t self_in, mp_obj_t buf_in) { mp_check_self(mp_obj_is_type(self_in, &i2ctarget_i2c_target_request_type)); i2ctarget_i2c_target_request_obj_t *self = MP_OBJ_TO_PTR(self_in); @@ -351,7 +351,7 @@ STATIC mp_obj_t i2ctarget_i2c_target_request_write(mp_obj_t self_in, mp_obj_t bu return mp_obj_new_int(bufinfo.len); } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(i2ctarget_i2c_target_request_write_obj, i2ctarget_i2c_target_request_write); +static MP_DEFINE_CONST_FUN_OBJ_2(i2ctarget_i2c_target_request_write_obj, i2ctarget_i2c_target_request_write); //| def ack(self, ack: bool = True) -> None: //| """Acknowledge or Not Acknowledge last byte received. @@ -360,7 +360,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(i2ctarget_i2c_target_request_write_obj, i2ctarg //| :param ack: Whether to send an ACK or NACK""" //| ... //| -STATIC mp_obj_t i2ctarget_i2c_target_request_ack(uint n_args, const mp_obj_t *args) { +static mp_obj_t i2ctarget_i2c_target_request_ack(uint n_args, const mp_obj_t *args) { mp_check_self(mp_obj_is_type(args[0], &i2ctarget_i2c_target_request_type)); i2ctarget_i2c_target_request_obj_t *self = MP_OBJ_TO_PTR(args[0]); bool ack = (n_args == 1) ? true : mp_obj_is_true(args[1]); @@ -374,16 +374,16 @@ STATIC mp_obj_t i2ctarget_i2c_target_request_ack(uint n_args, const mp_obj_t *ar } MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(i2ctarget_i2c_target_request_ack_obj, 1, 2, i2ctarget_i2c_target_request_ack); -STATIC mp_obj_t i2ctarget_i2c_target_request_close(mp_obj_t self_in) { +static mp_obj_t i2ctarget_i2c_target_request_close(mp_obj_t self_in) { mp_check_self(mp_obj_is_type(self_in, &i2ctarget_i2c_target_request_type)); i2ctarget_i2c_target_request_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_i2ctarget_i2c_target_close(self->target); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(i2ctarget_i2c_target_request_close_obj, i2ctarget_i2c_target_request_close); +static MP_DEFINE_CONST_FUN_OBJ_1(i2ctarget_i2c_target_request_close_obj, i2ctarget_i2c_target_request_close); -STATIC const mp_rom_map_elem_t i2ctarget_i2c_target_request_locals_dict_table[] = { +static const mp_rom_map_elem_t i2ctarget_i2c_target_request_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&i2ctarget_i2c_target_request___exit___obj) }, { MP_ROM_QSTR(MP_QSTR_address), MP_ROM_PTR(&i2ctarget_i2c_target_request_address_obj) }, @@ -395,7 +395,7 @@ STATIC const mp_rom_map_elem_t i2ctarget_i2c_target_request_locals_dict_table[] { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&i2ctarget_i2c_target_request_close_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(i2ctarget_i2c_target_request_locals_dict, i2ctarget_i2c_target_request_locals_dict_table); +static MP_DEFINE_CONST_DICT(i2ctarget_i2c_target_request_locals_dict, i2ctarget_i2c_target_request_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( i2ctarget_i2c_target_request_type, diff --git a/shared-bindings/i2ctarget/__init__.c b/shared-bindings/i2ctarget/__init__.c index 9a0939a66a4bc..f4b1dd71ed6c8 100644 --- a/shared-bindings/i2ctarget/__init__.c +++ b/shared-bindings/i2ctarget/__init__.c @@ -219,12 +219,12 @@ //| This can be worked around by using the ``i2c-gpio`` bit banging driver. //| Since the RPi firmware uses the hw i2c, it's not possible to emulate a HAT eeprom.""" -STATIC const mp_rom_map_elem_t i2ctarget_module_globals_table[] = { +static const mp_rom_map_elem_t i2ctarget_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_i2ctarget) }, { MP_ROM_QSTR(MP_QSTR_I2CTarget), MP_ROM_PTR(&i2ctarget_i2c_target_type) }, }; -STATIC MP_DEFINE_CONST_DICT(i2ctarget_module_globals, i2ctarget_module_globals_table); +static MP_DEFINE_CONST_DICT(i2ctarget_module_globals, i2ctarget_module_globals_table); const mp_obj_module_t i2ctarget_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/imagecapture/ParallelImageCapture.c b/shared-bindings/imagecapture/ParallelImageCapture.c index c8a60e43ffcd3..d1964c7175330 100644 --- a/shared-bindings/imagecapture/ParallelImageCapture.c +++ b/shared-bindings/imagecapture/ParallelImageCapture.c @@ -34,7 +34,7 @@ //| :param microcontroller.Pin href: The horizontal reference input, which is high whenever the camera is transmitting valid pixel information. //| """ //| ... -STATIC mp_obj_t imagecapture_parallelimagecapture_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t imagecapture_parallelimagecapture_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_data_pins, ARG_clock, ARG_vsync, ARG_href, NUM_ARGS }; static const mp_arg_t allowed_args[] = { @@ -68,13 +68,13 @@ STATIC mp_obj_t imagecapture_parallelimagecapture_make_new(const mp_obj_type_t * //| //| This will stop a continuous-mode capture, if one is in progress.""" //| ... -STATIC mp_obj_t imagecapture_parallelimagecapture_capture(mp_obj_t self_in, mp_obj_t buffer) { +static mp_obj_t imagecapture_parallelimagecapture_capture(mp_obj_t self_in, mp_obj_t buffer) { imagecapture_parallelimagecapture_obj_t *self = (imagecapture_parallelimagecapture_obj_t *)self_in; common_hal_imagecapture_parallelimagecapture_singleshot_capture(self, buffer); return buffer; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(imagecapture_parallelimagecapture_capture_obj, imagecapture_parallelimagecapture_capture); +static MP_DEFINE_CONST_FUN_OBJ_2(imagecapture_parallelimagecapture_capture_obj, imagecapture_parallelimagecapture_capture); //| def continuous_capture_start( //| self, buffer1: WriteableBuffer, buffer2: WriteableBuffer, / @@ -88,22 +88,22 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(imagecapture_parallelimagecapture_capture_obj, //| `ParallelImageCapture` object keeps references to ``buffer1`` and //| ``buffer2``, so the objects will not be garbage collected.""" //| ... -STATIC mp_obj_t imagecapture_parallelimagecapture_continuous_capture_start(mp_obj_t self_in, mp_obj_t buffer1, mp_obj_t buffer2) { +static mp_obj_t imagecapture_parallelimagecapture_continuous_capture_start(mp_obj_t self_in, mp_obj_t buffer1, mp_obj_t buffer2) { imagecapture_parallelimagecapture_obj_t *self = (imagecapture_parallelimagecapture_obj_t *)self_in; common_hal_imagecapture_parallelimagecapture_continuous_capture_start(self, buffer1, buffer2); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_3(imagecapture_parallelimagecapture_continuous_capture_start_obj, imagecapture_parallelimagecapture_continuous_capture_start); +static MP_DEFINE_CONST_FUN_OBJ_3(imagecapture_parallelimagecapture_continuous_capture_start_obj, imagecapture_parallelimagecapture_continuous_capture_start); //| def continuous_capture_get_frame(self) -> WriteableBuffer: //| """Return the next available frame, one of the two buffers passed to `continuous_capture_start`""" //| ... -STATIC mp_obj_t imagecapture_parallelimagecapture_continuous_capture_get_frame(mp_obj_t self_in) { +static mp_obj_t imagecapture_parallelimagecapture_continuous_capture_get_frame(mp_obj_t self_in) { imagecapture_parallelimagecapture_obj_t *self = (imagecapture_parallelimagecapture_obj_t *)self_in; return common_hal_imagecapture_parallelimagecapture_continuous_capture_get_frame(self); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(imagecapture_parallelimagecapture_continuous_capture_get_frame_obj, imagecapture_parallelimagecapture_continuous_capture_get_frame); +static MP_DEFINE_CONST_FUN_OBJ_1(imagecapture_parallelimagecapture_continuous_capture_get_frame_obj, imagecapture_parallelimagecapture_continuous_capture_get_frame); @@ -114,13 +114,13 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(imagecapture_parallelimagecapture_continuous_ca //| references to the buffers passed to `continuous_capture_start`, //| potentially allowing the objects to be garbage collected.""" //| ... -STATIC mp_obj_t imagecapture_parallelimagecapture_continuous_capture_stop(mp_obj_t self_in) { +static mp_obj_t imagecapture_parallelimagecapture_continuous_capture_stop(mp_obj_t self_in) { imagecapture_parallelimagecapture_obj_t *self = (imagecapture_parallelimagecapture_obj_t *)self_in; common_hal_imagecapture_parallelimagecapture_continuous_capture_stop(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(imagecapture_parallelimagecapture_continuous_capture_stop_obj, imagecapture_parallelimagecapture_continuous_capture_stop); +static MP_DEFINE_CONST_FUN_OBJ_1(imagecapture_parallelimagecapture_continuous_capture_stop_obj, imagecapture_parallelimagecapture_continuous_capture_stop); @@ -128,13 +128,13 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(imagecapture_parallelimagecapture_continuous_ca //| def deinit(self) -> None: //| """Deinitialize this instance""" //| ... -STATIC mp_obj_t imagecapture_parallelimagecapture_deinit(mp_obj_t self_in) { +static mp_obj_t imagecapture_parallelimagecapture_deinit(mp_obj_t self_in) { imagecapture_parallelimagecapture_obj_t *self = (imagecapture_parallelimagecapture_obj_t *)self_in; common_hal_imagecapture_parallelimagecapture_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(imagecapture_parallelimagecapture_deinit_obj, imagecapture_parallelimagecapture_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(imagecapture_parallelimagecapture_deinit_obj, imagecapture_parallelimagecapture_deinit); //| def __enter__(self) -> ParallelImageCapture: //| """No-op used in Context Managers.""" @@ -146,16 +146,16 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(imagecapture_parallelimagecapture_deinit_obj, i //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... //| -STATIC mp_obj_t imagecapture_parallelimagecapture___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t imagecapture_parallelimagecapture___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_imagecapture_parallelimagecapture_deinit(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(imagecapture_parallelimagecapture___exit___obj, 4, 4, imagecapture_parallelimagecapture___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(imagecapture_parallelimagecapture___exit___obj, 4, 4, imagecapture_parallelimagecapture___exit__); -STATIC const mp_rom_map_elem_t imagecapture_parallelimagecapture_locals_dict_table[] = { +static const mp_rom_map_elem_t imagecapture_parallelimagecapture_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&imagecapture_parallelimagecapture_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&imagecapture_parallelimagecapture___exit___obj) }, @@ -166,7 +166,7 @@ STATIC const mp_rom_map_elem_t imagecapture_parallelimagecapture_locals_dict_tab { MP_ROM_QSTR(MP_QSTR_continuous_capture_get_frame), MP_ROM_PTR(&imagecapture_parallelimagecapture_continuous_capture_get_frame_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(imagecapture_parallelimagecapture_locals_dict, imagecapture_parallelimagecapture_locals_dict_table); +static MP_DEFINE_CONST_DICT(imagecapture_parallelimagecapture_locals_dict, imagecapture_parallelimagecapture_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( imagecapture_parallelimagecapture_type, diff --git a/shared-bindings/imagecapture/__init__.c b/shared-bindings/imagecapture/__init__.c index 0d4294c771cc6..2cc60d6da203e 100644 --- a/shared-bindings/imagecapture/__init__.c +++ b/shared-bindings/imagecapture/__init__.c @@ -18,12 +18,12 @@ //| Espressif microcontrollers use the `espcamera` module together. //| //| """ -STATIC const mp_rom_map_elem_t imagecapture_module_globals_table[] = { +static const mp_rom_map_elem_t imagecapture_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_imagecapture) }, { MP_ROM_QSTR(MP_QSTR_ParallelImageCapture), MP_ROM_PTR(&imagecapture_parallelimagecapture_type) }, }; -STATIC MP_DEFINE_CONST_DICT(imagecapture_module_globals, imagecapture_module_globals_table); +static MP_DEFINE_CONST_DICT(imagecapture_module_globals, imagecapture_module_globals_table); const mp_obj_module_t imagecapture_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/ipaddress/IPv4Address.c b/shared-bindings/ipaddress/IPv4Address.c index 17110b6401601..bf18eda0f790a 100644 --- a/shared-bindings/ipaddress/IPv4Address.c +++ b/shared-bindings/ipaddress/IPv4Address.c @@ -24,7 +24,7 @@ //| //| The value itself can either be bytes or a string formatted address.""" //| ... -STATIC mp_obj_t ipaddress_ipv4address_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t ipaddress_ipv4address_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_address }; static const mp_arg_t allowed_args[] = { { MP_QSTR_address, MP_ARG_OBJ | MP_ARG_REQUIRED }, @@ -66,7 +66,7 @@ STATIC mp_obj_t ipaddress_ipv4address_make_new(const mp_obj_type_t *type, size_t //| packed: bytes //| """The bytes that make up the address (read-only).""" -STATIC mp_obj_t ipaddress_ipv4address_get_packed(mp_obj_t self_in) { +static mp_obj_t ipaddress_ipv4address_get_packed(mp_obj_t self_in) { ipaddress_ipv4address_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_ipaddress_ipv4address_get_packed(self); @@ -78,7 +78,7 @@ MP_PROPERTY_GETTER(ipaddress_ipv4address_packed_obj, //| version: int //| """4 for IPv4, 6 for IPv6""" -STATIC mp_obj_t ipaddress_ipv4address_get_version(mp_obj_t self_in) { +static mp_obj_t ipaddress_ipv4address_get_version(mp_obj_t self_in) { ipaddress_ipv4address_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_buffer_info_t buf_info; mp_obj_t address_bytes = common_hal_ipaddress_ipv4address_get_packed(self); @@ -98,7 +98,7 @@ MP_PROPERTY_GETTER(ipaddress_ipv4address_version_obj, //| def __eq__(self, other: object) -> bool: //| """Two Address objects are equal if their addresses and address types are equal.""" //| ... -STATIC mp_obj_t ipaddress_ipv4address_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) { +static mp_obj_t ipaddress_ipv4address_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) { switch (op) { // Two Addresses are equal if their address bytes and address_type are equal case MP_BINARY_OP_EQUAL: @@ -122,7 +122,7 @@ STATIC mp_obj_t ipaddress_ipv4address_binary_op(mp_binary_op_t op, mp_obj_t lhs_ //| """Returns a hash for the IPv4Address data.""" //| ... //| -STATIC mp_obj_t ipaddress_ipv4address_unary_op(mp_unary_op_t op, mp_obj_t self_in) { +static mp_obj_t ipaddress_ipv4address_unary_op(mp_unary_op_t op, mp_obj_t self_in) { switch (op) { // Two Addresses are equal if their address bytes and address_type are equal case MP_UNARY_OP_HASH: { @@ -139,7 +139,7 @@ STATIC mp_obj_t ipaddress_ipv4address_unary_op(mp_unary_op_t op, mp_obj_t self_i } } -STATIC void ipaddress_ipv4address_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { +static void ipaddress_ipv4address_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { ipaddress_ipv4address_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_buffer_info_t buf_info; mp_obj_t address_bytes = common_hal_ipaddress_ipv4address_get_packed(self); @@ -149,11 +149,11 @@ STATIC void ipaddress_ipv4address_print(const mp_print_t *print, mp_obj_t self_i mp_printf(print, "%d.%d.%d.%d", buf[0], buf[1], buf[2], buf[3]); } -STATIC const mp_rom_map_elem_t ipaddress_ipv4address_locals_dict_table[] = { +static const mp_rom_map_elem_t ipaddress_ipv4address_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_packed), MP_ROM_PTR(&ipaddress_ipv4address_packed_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(ipaddress_ipv4address_locals_dict, ipaddress_ipv4address_locals_dict_table); +static MP_DEFINE_CONST_DICT(ipaddress_ipv4address_locals_dict, ipaddress_ipv4address_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( ipaddress_ipv4address_type, diff --git a/shared-bindings/ipaddress/__init__.c b/shared-bindings/ipaddress/__init__.c index 00d6075edf91d..75892f6f2ea04 100644 --- a/shared-bindings/ipaddress/__init__.c +++ b/shared-bindings/ipaddress/__init__.c @@ -61,7 +61,7 @@ bool ipaddress_parse_ipv4address(const char *str_data, size_t str_len, uint32_t //| ... //| -STATIC mp_obj_t ipaddress_ip_address(mp_obj_t ip_in) { +static mp_obj_t ipaddress_ip_address(mp_obj_t ip_in) { uint32_t value; if (mp_obj_get_int_maybe(ip_in, (mp_int_t *)&value)) { // We're done. @@ -78,13 +78,13 @@ STATIC mp_obj_t ipaddress_ip_address(mp_obj_t ip_in) { } MP_DEFINE_CONST_FUN_OBJ_1(ipaddress_ip_address_obj, ipaddress_ip_address); -STATIC const mp_rom_map_elem_t ipaddress_module_globals_table[] = { +static const mp_rom_map_elem_t ipaddress_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ipaddress) }, { MP_ROM_QSTR(MP_QSTR_ip_address), MP_ROM_PTR(&ipaddress_ip_address_obj) }, { MP_ROM_QSTR(MP_QSTR_IPv4Address), MP_ROM_PTR(&ipaddress_ipv4address_type) }, }; -STATIC MP_DEFINE_CONST_DICT(ipaddress_module_globals, ipaddress_module_globals_table); +static MP_DEFINE_CONST_DICT(ipaddress_module_globals, ipaddress_module_globals_table); const mp_obj_module_t ipaddress_module = { diff --git a/shared-bindings/is31fl3741/FrameBuffer.c b/shared-bindings/is31fl3741/FrameBuffer.c index 34b8bba6f71ab..b197f4447cb62 100644 --- a/shared-bindings/is31fl3741/FrameBuffer.c +++ b/shared-bindings/is31fl3741/FrameBuffer.c @@ -51,7 +51,7 @@ //| :param bool scale: if True display is scaled down by 3 when displayed //| :param bool gamma: if True apply gamma correction to all LEDs""" //| ... -STATIC mp_obj_t is31fl3741_framebuffer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t is31fl3741_framebuffer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_is31, ARG_width, ARG_height, ARG_mapping, ARG_framebuffer, ARG_scale, ARG_gamma }; static const mp_arg_t allowed_args[] = { { MP_QSTR_is31, MP_ARG_OBJ | MP_ARG_REQUIRED }, @@ -111,12 +111,12 @@ STATIC mp_obj_t is31fl3741_framebuffer_make_new(const mp_obj_type_t *type, size_ //| IS31FL3741 instance. After deinitialization, no further operations //| may be performed.""" //| ... -STATIC mp_obj_t is31fl3741_framebuffer_deinit(mp_obj_t self_in) { +static mp_obj_t is31fl3741_framebuffer_deinit(mp_obj_t self_in) { is31fl3741_framebuffer_obj_t *self = (is31fl3741_framebuffer_obj_t *)self_in; common_hal_is31fl3741_framebuffer_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(is31fl3741_framebuffer_deinit_obj, is31fl3741_framebuffer_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(is31fl3741_framebuffer_deinit_obj, is31fl3741_framebuffer_deinit); static void check_for_deinit(is31fl3741_framebuffer_obj_t *self) { if (self->framebuffer == NULL) { @@ -127,7 +127,7 @@ static void check_for_deinit(is31fl3741_framebuffer_obj_t *self) { //| brightness: float //| """In the current implementation, 0.0 turns the display off entirely //| and any other value up to 1.0 turns the display on fully.""" -STATIC mp_obj_t is31fl3741_framebuffer_get_brightness(mp_obj_t self_in) { +static mp_obj_t is31fl3741_framebuffer_get_brightness(mp_obj_t self_in) { is31fl3741_framebuffer_obj_t *self = (is31fl3741_framebuffer_obj_t *)self_in; check_for_deinit(self); uint8_t current = common_hal_is31fl3741_get_current(self->is31fl3741); @@ -137,7 +137,7 @@ STATIC mp_obj_t is31fl3741_framebuffer_get_brightness(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(is31fl3741_framebuffer_get_brightness_obj, is31fl3741_framebuffer_get_brightness); -STATIC mp_obj_t is31fl3741_framebuffer_set_brightness(mp_obj_t self_in, mp_obj_t value_in) { +static mp_obj_t is31fl3741_framebuffer_set_brightness(mp_obj_t self_in, mp_obj_t value_in) { is31fl3741_framebuffer_obj_t *self = (is31fl3741_framebuffer_obj_t *)self_in; check_for_deinit(self); mp_float_t brightness = mp_obj_get_float(value_in); @@ -160,7 +160,7 @@ MP_PROPERTY_GETSET(is31fl3741_framebuffer_brightness_obj, //| """Transmits the color data in the buffer to the pixels so that //| they are shown.""" //| ... -STATIC mp_obj_t is31fl3741_framebuffer_refresh(mp_obj_t self_in) { +static mp_obj_t is31fl3741_framebuffer_refresh(mp_obj_t self_in) { is31fl3741_framebuffer_obj_t *self = (is31fl3741_framebuffer_obj_t *)self_in; check_for_deinit(self); common_hal_is31fl3741_framebuffer_refresh(self, 0); @@ -170,7 +170,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(is31fl3741_framebuffer_refresh_obj, is31fl3741_framebu //| width: int //| """The width of the display, in pixels""" -STATIC mp_obj_t is31fl3741_framebuffer_get_width(mp_obj_t self_in) { +static mp_obj_t is31fl3741_framebuffer_get_width(mp_obj_t self_in) { is31fl3741_framebuffer_obj_t *self = (is31fl3741_framebuffer_obj_t *)self_in; check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_is31fl3741_framebuffer_get_width(self)); @@ -182,7 +182,7 @@ MP_PROPERTY_GETTER(is31fl3741_framebuffer_width_obj, //| height: int //| """The height of the display, in pixels""" //| -STATIC mp_obj_t is31fl3741_framebuffer_get_height(mp_obj_t self_in) { +static mp_obj_t is31fl3741_framebuffer_get_height(mp_obj_t self_in) { is31fl3741_framebuffer_obj_t *self = (is31fl3741_framebuffer_obj_t *)self_in; check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_is31fl3741_framebuffer_get_height(self)); @@ -191,63 +191,63 @@ MP_DEFINE_CONST_FUN_OBJ_1(is31fl3741_framebuffer_get_height_obj, is31fl3741_fram MP_PROPERTY_GETTER(is31fl3741_framebuffer_height_obj, (mp_obj_t)&is31fl3741_framebuffer_get_height_obj); -STATIC const mp_rom_map_elem_t is31fl3741_framebuffer_locals_dict_table[] = { +static const mp_rom_map_elem_t is31fl3741_framebuffer_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&is31fl3741_framebuffer_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR_brightness), MP_ROM_PTR(&is31fl3741_framebuffer_brightness_obj) }, { MP_ROM_QSTR(MP_QSTR_refresh), MP_ROM_PTR(&is31fl3741_framebuffer_refresh_obj) }, { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&is31fl3741_framebuffer_width_obj) }, { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&is31fl3741_framebuffer_height_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(is31fl3741_framebuffer_locals_dict, is31fl3741_framebuffer_locals_dict_table); +static MP_DEFINE_CONST_DICT(is31fl3741_framebuffer_locals_dict, is31fl3741_framebuffer_locals_dict_table); -STATIC void is31fl3741_framebuffer_get_bufinfo(mp_obj_t self_in, mp_buffer_info_t *bufinfo) { +static void is31fl3741_framebuffer_get_bufinfo(mp_obj_t self_in, mp_buffer_info_t *bufinfo) { is31fl3741_framebuffer_obj_t *self = (is31fl3741_framebuffer_obj_t *)self_in; check_for_deinit(self); *bufinfo = self->bufinfo; } -STATIC void is31fl3741_framebuffer_swapbuffers(mp_obj_t self_in, uint8_t *dirty_row_bitmap) { +static void is31fl3741_framebuffer_swapbuffers(mp_obj_t self_in, uint8_t *dirty_row_bitmap) { common_hal_is31fl3741_framebuffer_refresh(self_in, dirty_row_bitmap); } -STATIC void is31fl3741_framebuffer_deinit_proto(mp_obj_t self_in) { +static void is31fl3741_framebuffer_deinit_proto(mp_obj_t self_in) { common_hal_is31fl3741_framebuffer_deinit(self_in); } -STATIC float is31fl3741_framebuffer_get_brightness_proto(mp_obj_t self_in) { +static float is31fl3741_framebuffer_get_brightness_proto(mp_obj_t self_in) { return common_hal_is31fl3741_framebuffer_get_paused(self_in) ? 0.0f : 1.0f; } -STATIC bool is31fl3741_framebuffer_set_brightness_proto(mp_obj_t self_in, mp_float_t value) { +static bool is31fl3741_framebuffer_set_brightness_proto(mp_obj_t self_in, mp_float_t value) { common_hal_is31fl3741_framebuffer_set_paused(self_in, value <= 0); return true; } -STATIC int is31fl3741_framebuffer_get_width_proto(mp_obj_t self_in) { +static int is31fl3741_framebuffer_get_width_proto(mp_obj_t self_in) { return common_hal_is31fl3741_framebuffer_get_width(self_in); } -STATIC int is31fl3741_framebuffer_get_height_proto(mp_obj_t self_in) { +static int is31fl3741_framebuffer_get_height_proto(mp_obj_t self_in) { return common_hal_is31fl3741_framebuffer_get_height(self_in); } -STATIC int is31fl3741_framebuffer_get_color_depth_proto(mp_obj_t self_in) { +static int is31fl3741_framebuffer_get_color_depth_proto(mp_obj_t self_in) { // The way displayio works depth is used to calculate bytes // We use an uint32_t for color already so setting to 24 causes // more changes required return 32; } -STATIC int is31fl3741_framebuffer_get_bytes_per_cell_proto(mp_obj_t self_in) { +static int is31fl3741_framebuffer_get_bytes_per_cell_proto(mp_obj_t self_in) { return 1; } -STATIC int is31fl3741_framebuffer_get_native_frames_per_second_proto(mp_obj_t self_in) { +static int is31fl3741_framebuffer_get_native_frames_per_second_proto(mp_obj_t self_in) { return 60; // This was just chosen may vary based on LEDs used? } -STATIC const framebuffer_p_t is31fl3741_framebuffer_proto = { +static const framebuffer_p_t is31fl3741_framebuffer_proto = { MP_PROTO_IMPLEMENT(MP_QSTR_protocol_framebuffer) .get_bufinfo = is31fl3741_framebuffer_get_bufinfo, .set_brightness = is31fl3741_framebuffer_set_brightness_proto, @@ -261,7 +261,7 @@ STATIC const framebuffer_p_t is31fl3741_framebuffer_proto = { .deinit = is31fl3741_framebuffer_deinit_proto, }; -STATIC mp_int_t is31fl3741_framebuffer_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) { +static mp_int_t is31fl3741_framebuffer_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) { is31fl3741_framebuffer_obj_t *self = (is31fl3741_framebuffer_obj_t *)self_in; // a readonly framebuffer would be unusual but not impossible if ((flags & MP_BUFFER_WRITE) && !(self->bufinfo.typecode & MP_OBJ_ARRAY_TYPECODE_FLAG_RW)) { diff --git a/shared-bindings/is31fl3741/IS31FL3741.c b/shared-bindings/is31fl3741/IS31FL3741.c index 5dcc6f38f8be5..7815a2ac809de 100644 --- a/shared-bindings/is31fl3741/IS31FL3741.c +++ b/shared-bindings/is31fl3741/IS31FL3741.c @@ -25,7 +25,7 @@ //| :param ~busio.I2C i2c: I2C bus the IS31FL3741 is on //| :param int addr: device address""" //| ... -STATIC mp_obj_t is31fl3741_IS31FL3741_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t is31fl3741_IS31FL3741_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_i2c, ARG_addr }; static const mp_arg_t allowed_args[] = { { MP_QSTR_i2c, MP_ARG_OBJ | MP_ARG_REQUIRED }, @@ -52,18 +52,18 @@ STATIC mp_obj_t is31fl3741_IS31FL3741_make_new(const mp_obj_type_t *type, size_t //| may be performed.""" //| ... //| -STATIC mp_obj_t is31fl3741_IS31FL3741_deinit(mp_obj_t self_in) { +static mp_obj_t is31fl3741_IS31FL3741_deinit(mp_obj_t self_in) { is31fl3741_IS31FL3741_obj_t *self = (is31fl3741_IS31FL3741_obj_t *)self_in; common_hal_is31fl3741_IS31FL3741_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(is31fl3741_IS31FL3741_deinit_obj, is31fl3741_IS31FL3741_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(is31fl3741_IS31FL3741_deinit_obj, is31fl3741_IS31FL3741_deinit); //| def reset(self) -> None: //| """Resets the IS31FL3741 chip.""" //| ... //| -STATIC mp_obj_t is31fl3741_IS31FL3741_reset(mp_obj_t self_in) { +static mp_obj_t is31fl3741_IS31FL3741_reset(mp_obj_t self_in) { is31fl3741_IS31FL3741_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_is31fl3741_send_reset(self); return mp_const_none; @@ -74,7 +74,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(is31fl3741_IS31FL3741_reset_obj, is31fl3741_IS31FL3741 //| """Enables the IS31FL3741 chip.""" //| ... //| -STATIC mp_obj_t is31fl3741_IS31FL3741_enable(mp_obj_t self_in) { +static mp_obj_t is31fl3741_IS31FL3741_enable(mp_obj_t self_in) { is31fl3741_IS31FL3741_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_is31fl3741_send_enable(self); return mp_const_none; @@ -87,7 +87,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(is31fl3741_IS31FL3741_enable_obj, is31fl3741_IS31FL374 //| :param int current: global current value 0x00 to 0xFF""" //| ... //| -STATIC mp_obj_t is31fl3741_IS31FL3741_set_global_current(mp_obj_t self_in, mp_obj_t value) { +static mp_obj_t is31fl3741_IS31FL3741_set_global_current(mp_obj_t self_in, mp_obj_t value) { is31fl3741_IS31FL3741_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_int_t current = mp_obj_get_int(value); common_hal_is31fl3741_set_current(self, current); @@ -105,7 +105,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(is31fl3741_IS31FL3741_set_global_current_obj, is31fl37 //| of 0 or 2)""" //| ... //| -STATIC mp_obj_t is31fl3741_IS31FL3741_set_led(size_t n_args, const mp_obj_t *args) { +static mp_obj_t is31fl3741_IS31FL3741_set_led(size_t n_args, const mp_obj_t *args) { is31fl3741_IS31FL3741_obj_t *self = MP_OBJ_TO_PTR(args[0]); mp_int_t led = mp_obj_get_int(args[1]); mp_int_t value = mp_obj_get_int(args[2]); @@ -123,7 +123,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(is31fl3741_IS31FL3741_set_led_obj, 4, 4, is3 //| """ //| ... //| -STATIC mp_obj_t is31fl3741_IS31FL3741_write(mp_obj_t self_in, mp_obj_t mapping, mp_obj_t buffer) { +static mp_obj_t is31fl3741_IS31FL3741_write(mp_obj_t self_in, mp_obj_t mapping, mp_obj_t buffer) { is31fl3741_IS31FL3741_obj_t *self = MP_OBJ_TO_PTR(self_in); if (!mp_obj_is_tuple_compatible(mapping)) { mp_raise_ValueError(MP_ERROR_TEXT("Mapping must be a tuple")); @@ -141,7 +141,7 @@ STATIC mp_obj_t is31fl3741_IS31FL3741_write(mp_obj_t self_in, mp_obj_t mapping, } MP_DEFINE_CONST_FUN_OBJ_3(is31fl3741_IS31FL3741_write_obj, is31fl3741_IS31FL3741_write); -STATIC const mp_rom_map_elem_t is31fl3741_IS31FL3741_locals_dict_table[] = { +static const mp_rom_map_elem_t is31fl3741_IS31FL3741_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&is31fl3741_IS31FL3741_deinit_obj) }, { MP_OBJ_NEW_QSTR(MP_QSTR_write), (mp_obj_t)&is31fl3741_IS31FL3741_write_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_reset), (mp_obj_t)&is31fl3741_IS31FL3741_reset_obj }, @@ -149,7 +149,7 @@ STATIC const mp_rom_map_elem_t is31fl3741_IS31FL3741_locals_dict_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR_set_global_current), (mp_obj_t)&is31fl3741_IS31FL3741_set_global_current_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_set_led), (mp_obj_t)&is31fl3741_IS31FL3741_set_led_obj }, }; -STATIC MP_DEFINE_CONST_DICT(is31fl3741_IS31FL3741_locals_dict, is31fl3741_IS31FL3741_locals_dict_table); +static MP_DEFINE_CONST_DICT(is31fl3741_IS31FL3741_locals_dict, is31fl3741_IS31FL3741_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( is31fl3741_IS31FL3741_type, diff --git a/shared-bindings/is31fl3741/__init__.c b/shared-bindings/is31fl3741/__init__.c index efc6e4c8b76dc..b023f8cf75b31 100644 --- a/shared-bindings/is31fl3741/__init__.c +++ b/shared-bindings/is31fl3741/__init__.c @@ -14,13 +14,13 @@ #include "shared-bindings/is31fl3741/IS31FL3741.h" #include "shared-bindings/is31fl3741/FrameBuffer.h" -STATIC const mp_rom_map_elem_t is31fl3741_module_globals_table[] = { +static const mp_rom_map_elem_t is31fl3741_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_is31fl3741) }, { MP_ROM_QSTR(MP_QSTR_IS31FL3741), MP_ROM_PTR(&is31fl3741_IS31FL3741_type) }, { MP_ROM_QSTR(MP_QSTR_IS31FL3741_FrameBuffer), MP_ROM_PTR(&is31fl3741_framebuffer_type) }, }; -STATIC MP_DEFINE_CONST_DICT(is31fl3741_module_globals, is31fl3741_module_globals_table); +static MP_DEFINE_CONST_DICT(is31fl3741_module_globals, is31fl3741_module_globals_table); const mp_obj_module_t is31fl3741_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/jpegio/JpegDecoder.c b/shared-bindings/jpegio/JpegDecoder.c index 3fecb2af5d6ba..d045e178bddc2 100644 --- a/shared-bindings/jpegio/JpegDecoder.c +++ b/shared-bindings/jpegio/JpegDecoder.c @@ -34,7 +34,7 @@ //| //| def __init__(self) -> None: ... //| -STATIC mp_obj_t jpegio_jpegdecoder_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t jpegio_jpegdecoder_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { static const mp_arg_t allowed_args[] = { }; mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; @@ -62,7 +62,7 @@ STATIC mp_obj_t jpegio_jpegdecoder_make_new(const mp_obj_type_t *type, size_t n_ //| not shown in the function signature in the documentation. //| //| Returns the image size as the tuple ``(width, height)``.""" -STATIC mp_obj_t jpegio_jpegdecoder_open(mp_obj_t self_in, mp_obj_t arg) { +static mp_obj_t jpegio_jpegdecoder_open(mp_obj_t self_in, mp_obj_t arg) { jpegio_jpegdecoder_obj_t *self = MP_OBJ_TO_PTR(self_in); if (mp_obj_is_str(arg)) { arg = mp_call_function_2( @@ -132,7 +132,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(jpegio_jpegdecoder_open_obj, jpegio_jpegdecoder_open); //| by the pixels from the source //| """ //| -STATIC mp_obj_t jpegio_jpegdecoder_decode(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t jpegio_jpegdecoder_decode(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { jpegio_jpegdecoder_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); enum { ARG_bitmap, ARG_scale, ARG_x, ARG_y, ARGS_X1_Y1_X2_Y2, ARG_skip_source_index, ARG_skip_dest_index }; @@ -184,13 +184,13 @@ STATIC mp_obj_t jpegio_jpegdecoder_decode(mp_uint_t n_args, const mp_obj_t *pos_ return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(jpegio_jpegdecoder_decode_obj, 1, jpegio_jpegdecoder_decode); +static MP_DEFINE_CONST_FUN_OBJ_KW(jpegio_jpegdecoder_decode_obj, 1, jpegio_jpegdecoder_decode); -STATIC const mp_rom_map_elem_t jpegio_jpegdecoder_locals_dict_table[] = { +static const mp_rom_map_elem_t jpegio_jpegdecoder_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&jpegio_jpegdecoder_open_obj) }, { MP_ROM_QSTR(MP_QSTR_decode), MP_ROM_PTR(&jpegio_jpegdecoder_decode_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(jpegio_jpegdecoder_locals_dict, jpegio_jpegdecoder_locals_dict_table); +static MP_DEFINE_CONST_DICT(jpegio_jpegdecoder_locals_dict, jpegio_jpegdecoder_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( jpegio_jpegdecoder_type, diff --git a/shared-bindings/jpegio/__init__.c b/shared-bindings/jpegio/__init__.c index b22edad960ccc..3016e98d2e99a 100644 --- a/shared-bindings/jpegio/__init__.c +++ b/shared-bindings/jpegio/__init__.c @@ -11,12 +11,12 @@ //| """Support for JPEG image decoding""" //| -STATIC const mp_rom_map_elem_t jpegio_module_globals_table[] = { +static const mp_rom_map_elem_t jpegio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_jpegio) }, { MP_ROM_QSTR(MP_QSTR_JpegDecoder), MP_ROM_PTR(&jpegio_jpegdecoder_type) }, }; -STATIC MP_DEFINE_CONST_DICT(jpegio_module_globals, jpegio_module_globals_table); +static MP_DEFINE_CONST_DICT(jpegio_module_globals, jpegio_module_globals_table); const mp_obj_module_t jpegio_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/keypad/Event.c b/shared-bindings/keypad/Event.c index d58ac32077dbf..53c36a76dfb37 100644 --- a/shared-bindings/keypad/Event.c +++ b/shared-bindings/keypad/Event.c @@ -24,7 +24,7 @@ //| :param int timestamp: The time in milliseconds that the keypress occurred in the `supervisor.ticks_ms` time system. If specified as None, the current value of `supervisor.ticks_ms` is used. //| """ //| ... -STATIC mp_obj_t keypad_event_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t keypad_event_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { keypad_event_obj_t *self = mp_obj_malloc(keypad_event_obj_t, &keypad_event_type); enum { ARG_key_number, ARG_pressed, ARG_timestamp }; static const mp_arg_t allowed_args[] = { @@ -50,7 +50,7 @@ STATIC mp_obj_t keypad_event_make_new(const mp_obj_type_t *type, size_t n_args, //| key_number: int //| """The key number.""" -STATIC mp_obj_t keypad_event_get_key_number(mp_obj_t self_in) { +static mp_obj_t keypad_event_get_key_number(mp_obj_t self_in) { keypad_event_obj_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_keypad_event_get_key_number(self)); } @@ -63,7 +63,7 @@ MP_PROPERTY_GETTER(keypad_event_key_number_obj, //| """``True`` if the event represents a key down (pressed) transition. //| The opposite of `released`. //| """ -STATIC mp_obj_t keypad_event_get_pressed(mp_obj_t self_in) { +static mp_obj_t keypad_event_get_pressed(mp_obj_t self_in) { keypad_event_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_bool(common_hal_keypad_event_get_pressed(self)); } @@ -76,7 +76,7 @@ MP_PROPERTY_GETTER(keypad_event_pressed_obj, //| """``True`` if the event represents a key up (released) transition. //| The opposite of `pressed`. //| """ -STATIC mp_obj_t keypad_event_get_released(mp_obj_t self_in) { +static mp_obj_t keypad_event_get_released(mp_obj_t self_in) { keypad_event_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_bool(common_hal_keypad_event_get_released(self)); } @@ -87,7 +87,7 @@ MP_PROPERTY_GETTER(keypad_event_released_obj, //| timestamp: int //| """The timestamp.""" -STATIC mp_obj_t keypad_event_get_timestamp(mp_obj_t self_in) { +static mp_obj_t keypad_event_get_timestamp(mp_obj_t self_in) { keypad_event_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_keypad_event_get_timestamp(self); } @@ -103,7 +103,7 @@ MP_PROPERTY_GETTER(keypad_event_timestamp_obj, //| Note that this does not compare the event timestamps. //| """ //| ... -STATIC mp_obj_t keypad_event_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) { +static mp_obj_t keypad_event_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) { switch (op) { case MP_BINARY_OP_EQUAL: if (mp_obj_is_type(rhs_in, &keypad_event_type)) { @@ -131,7 +131,7 @@ STATIC mp_obj_t keypad_event_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_ob //| """ //| ... //| -STATIC mp_obj_t keypad_event_unary_op(mp_unary_op_t op, mp_obj_t self_in) { +static mp_obj_t keypad_event_unary_op(mp_unary_op_t op, mp_obj_t self_in) { keypad_event_obj_t *self = MP_OBJ_TO_PTR(self_in); switch (op) { case MP_UNARY_OP_HASH: { @@ -144,21 +144,21 @@ STATIC mp_obj_t keypad_event_unary_op(mp_unary_op_t op, mp_obj_t self_in) { } } -STATIC void keypad_event_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { +static void keypad_event_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { keypad_event_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_printf(print, "", common_hal_keypad_event_get_key_number(self), common_hal_keypad_event_get_pressed(self) ? MP_QSTR_pressed : MP_QSTR_released); } -STATIC const mp_rom_map_elem_t keypad_event_locals_dict_table[] = { +static const mp_rom_map_elem_t keypad_event_locals_dict_table[] = { // Properties { MP_ROM_QSTR(MP_QSTR_key_number), MP_ROM_PTR(&keypad_event_key_number_obj) }, { MP_ROM_QSTR(MP_QSTR_pressed), MP_ROM_PTR(&keypad_event_pressed_obj) }, { MP_ROM_QSTR(MP_QSTR_released), MP_ROM_PTR(&keypad_event_released_obj) }, { MP_ROM_QSTR(MP_QSTR_timestamp), MP_ROM_PTR(&keypad_event_timestamp_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(keypad_event_locals_dict, keypad_event_locals_dict_table); +static MP_DEFINE_CONST_DICT(keypad_event_locals_dict, keypad_event_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( keypad_event_type, diff --git a/shared-bindings/keypad/EventQueue.c b/shared-bindings/keypad/EventQueue.c index a7010ce341cab..e15b19df3b8f8 100644 --- a/shared-bindings/keypad/EventQueue.c +++ b/shared-bindings/keypad/EventQueue.c @@ -33,7 +33,7 @@ //| :rtype: Optional[Event] //| """ //| ... -STATIC mp_obj_t keypad_eventqueue_get(mp_obj_t self_in) { +static mp_obj_t keypad_eventqueue_get(mp_obj_t self_in) { keypad_eventqueue_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_keypad_eventqueue_get(self); @@ -55,7 +55,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(keypad_eventqueue_get_obj, keypad_eventqueue_get); //| :rtype: bool //| """ //| ... -STATIC mp_obj_t keypad_eventqueue_get_into(mp_obj_t self_in, mp_obj_t event_in) { +static mp_obj_t keypad_eventqueue_get_into(mp_obj_t self_in, mp_obj_t event_in) { keypad_eventqueue_obj_t *self = MP_OBJ_TO_PTR(self_in); keypad_event_obj_t *event = MP_OBJ_TO_PTR(mp_arg_validate_type(event_in, &keypad_event_type, MP_QSTR_event)); @@ -67,7 +67,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(keypad_eventqueue_get_into_obj, keypad_eventqueue_get_ //| def clear(self) -> None: //| """Clear any queued key transition events. Also sets `overflowed` to ``False``.""" //| ... -STATIC mp_obj_t keypad_eventqueue_clear(mp_obj_t self_in) { +static mp_obj_t keypad_eventqueue_clear(mp_obj_t self_in) { keypad_eventqueue_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_keypad_eventqueue_clear(self); @@ -84,7 +84,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(keypad_eventqueue_clear_obj, keypad_eventqueue_clear); //| def __len__(self) -> int: //| """Return the number of events currently in the queue. Used to implement ``len()``.""" //| ... -STATIC mp_obj_t keypad_eventqueue_unary_op(mp_unary_op_t op, mp_obj_t self_in) { +static mp_obj_t keypad_eventqueue_unary_op(mp_unary_op_t op, mp_obj_t self_in) { keypad_eventqueue_obj_t *self = MP_OBJ_TO_PTR(self_in); uint16_t len = common_hal_keypad_eventqueue_get_length(self); switch (op) { @@ -102,7 +102,7 @@ STATIC mp_obj_t keypad_eventqueue_unary_op(mp_unary_op_t op, mp_obj_t self_in) { //| Set to ``False`` by `clear()`. //| """ //| -STATIC mp_obj_t keypad_eventqueue_get_overflowed(mp_obj_t self_in) { +static mp_obj_t keypad_eventqueue_get_overflowed(mp_obj_t self_in) { keypad_eventqueue_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_bool(common_hal_keypad_eventqueue_get_overflowed(self)); } @@ -111,17 +111,17 @@ MP_DEFINE_CONST_FUN_OBJ_1(keypad_eventqueue_get_overflowed_obj, keypad_eventqueu MP_PROPERTY_GETTER(keypad_eventqueue_overflowed_obj, (mp_obj_t)&keypad_eventqueue_get_overflowed_obj); -STATIC const mp_rom_map_elem_t keypad_eventqueue_locals_dict_table[] = { +static const mp_rom_map_elem_t keypad_eventqueue_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_clear), MP_ROM_PTR(&keypad_eventqueue_clear_obj) }, { MP_ROM_QSTR(MP_QSTR_get), MP_ROM_PTR(&keypad_eventqueue_get_obj) }, { MP_ROM_QSTR(MP_QSTR_get_into), MP_ROM_PTR(&keypad_eventqueue_get_into_obj) }, { MP_ROM_QSTR(MP_QSTR_overflowed), MP_ROM_PTR(&keypad_eventqueue_overflowed_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(keypad_eventqueue_locals_dict, keypad_eventqueue_locals_dict_table); +static MP_DEFINE_CONST_DICT(keypad_eventqueue_locals_dict, keypad_eventqueue_locals_dict_table); #if MICROPY_PY_SELECT -STATIC mp_uint_t eventqueue_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) { +static mp_uint_t eventqueue_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) { (void)errcode; keypad_eventqueue_obj_t *self = MP_OBJ_TO_PTR(self_in); switch (request) { @@ -139,7 +139,7 @@ STATIC mp_uint_t eventqueue_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t } } -STATIC const mp_stream_p_t eventqueue_p = { +static const mp_stream_p_t eventqueue_p = { .ioctl = eventqueue_ioctl, }; #endif diff --git a/shared-bindings/keypad/KeyMatrix.c b/shared-bindings/keypad/KeyMatrix.c index aad017d9be290..7a8bb97247a5a 100644 --- a/shared-bindings/keypad/KeyMatrix.c +++ b/shared-bindings/keypad/KeyMatrix.c @@ -70,7 +70,7 @@ //| """ //| ... -STATIC mp_obj_t keypad_keymatrix_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t keypad_keymatrix_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { #if CIRCUITPY_KEYPAD_KEYMATRIX keypad_keymatrix_obj_t *self = mp_obj_malloc(keypad_keymatrix_obj_t, &keypad_keymatrix_type); enum { ARG_row_pins, ARG_column_pins, ARG_columns_to_anodes, ARG_interval, ARG_max_events, ARG_debounce_threshold }; @@ -126,7 +126,7 @@ STATIC mp_obj_t keypad_keymatrix_make_new(const mp_obj_type_t *type, size_t n_ar //| def deinit(self) -> None: //| """Stop scanning and release the pins.""" //| ... -STATIC mp_obj_t keypad_keymatrix_deinit(mp_obj_t self_in) { +static mp_obj_t keypad_keymatrix_deinit(mp_obj_t self_in) { keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_keypad_keymatrix_deinit(self); return MP_ROM_NONE; @@ -142,14 +142,14 @@ MP_DEFINE_CONST_FUN_OBJ_1(keypad_keymatrix_deinit_obj, keypad_keymatrix_deinit); //| """Automatically deinitializes when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t keypad_keymatrix___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t keypad_keymatrix___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_keypad_keymatrix_deinit(args[0]); return MP_ROM_NONE; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(keypad_keymatrix___exit___obj, 4, 4, keypad_keymatrix___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(keypad_keymatrix___exit___obj, 4, 4, keypad_keymatrix___exit__); -STATIC void check_for_deinit(keypad_keymatrix_obj_t *self) { +static void check_for_deinit(keypad_keymatrix_obj_t *self) { if (common_hal_keypad_deinited(self)) { raise_deinited_error(); } @@ -175,7 +175,7 @@ STATIC void check_for_deinit(keypad_keymatrix_obj_t *self) { //| :rtype: Tuple[int] //| """ //| ... -STATIC mp_obj_t keypad_keymatrix_key_number_to_row_column(mp_obj_t self_in, mp_obj_t key_number_in) { +static mp_obj_t keypad_keymatrix_key_number_to_row_column(mp_obj_t self_in, mp_obj_t key_number_in) { keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -201,7 +201,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(keypad_keymatrix_key_number_to_row_column_obj, keypad_ //| The key number is ``row * len(column_pins) + column``. //| """ //| ... -STATIC mp_obj_t keypad_keymatrix_row_column_to_key_number(mp_obj_t self_in, mp_obj_t row_in, mp_obj_t column_in) { +static mp_obj_t keypad_keymatrix_row_column_to_key_number(mp_obj_t self_in, mp_obj_t row_in, mp_obj_t column_in) { keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -221,7 +221,7 @@ MP_DEFINE_CONST_FUN_OBJ_3(keypad_keymatrix_row_column_to_key_number_obj, keypad_ //| """ //| -STATIC const mp_rom_map_elem_t keypad_keymatrix_locals_dict_table[] = { +static const mp_rom_map_elem_t keypad_keymatrix_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&keypad_keymatrix_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&keypad_keymatrix___exit___obj) }, @@ -233,7 +233,7 @@ STATIC const mp_rom_map_elem_t keypad_keymatrix_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_row_column_to_key_number), MP_ROM_PTR(&keypad_keymatrix_row_column_to_key_number_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(keypad_keymatrix_locals_dict, keypad_keymatrix_locals_dict_table); +static MP_DEFINE_CONST_DICT(keypad_keymatrix_locals_dict, keypad_keymatrix_locals_dict_table); #endif diff --git a/shared-bindings/keypad/Keys.c b/shared-bindings/keypad/Keys.c index 6571c658bb86b..208bc0a62d497 100644 --- a/shared-bindings/keypad/Keys.c +++ b/shared-bindings/keypad/Keys.c @@ -72,7 +72,7 @@ //| """ //| ... -STATIC mp_obj_t keypad_keys_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t keypad_keys_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { #if CIRCUITPY_KEYPAD_KEYS keypad_keys_obj_t *self = mp_obj_malloc(keypad_keys_obj_t, &keypad_keys_type); enum { ARG_pins, ARG_value_when_pressed, ARG_pull, ARG_interval, ARG_max_events, ARG_debounce_threshold }; @@ -118,7 +118,7 @@ STATIC mp_obj_t keypad_keys_make_new(const mp_obj_type_t *type, size_t n_args, s //| def deinit(self) -> None: //| """Stop scanning and release the pins.""" //| ... -STATIC mp_obj_t keypad_keys_deinit(mp_obj_t self_in) { +static mp_obj_t keypad_keys_deinit(mp_obj_t self_in) { keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_keypad_keys_deinit(self); @@ -135,12 +135,12 @@ MP_DEFINE_CONST_FUN_OBJ_1(keypad_keys_deinit_obj, keypad_keys_deinit); //| """Automatically deinitializes when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t keypad_keys___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t keypad_keys___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_keypad_keys_deinit(args[0]); return MP_ROM_NONE; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(keypad_keys___exit___obj, 4, 4, keypad_keys___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(keypad_keys___exit___obj, 4, 4, keypad_keys___exit__); //| def reset(self) -> None: @@ -158,7 +158,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(keypad_keys___exit___obj, 4, 4, keypa //| """The `EventQueue` associated with this `Keys` object. (read-only) //| """ //| -STATIC const mp_rom_map_elem_t keypad_keys_locals_dict_table[] = { +static const mp_rom_map_elem_t keypad_keys_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&keypad_keys_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&keypad_keys___exit___obj) }, @@ -168,7 +168,7 @@ STATIC const mp_rom_map_elem_t keypad_keys_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&keypad_generic_reset_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(keypad_keys_locals_dict, keypad_keys_locals_dict_table); +static MP_DEFINE_CONST_DICT(keypad_keys_locals_dict, keypad_keys_locals_dict_table); #endif MP_DEFINE_CONST_OBJ_TYPE( diff --git a/shared-bindings/keypad/ShiftRegisterKeys.c b/shared-bindings/keypad/ShiftRegisterKeys.c index 956a90763f6ee..a0bcde96e94cf 100644 --- a/shared-bindings/keypad/ShiftRegisterKeys.c +++ b/shared-bindings/keypad/ShiftRegisterKeys.c @@ -83,7 +83,7 @@ //| """ //| ... -STATIC mp_obj_t keypad_shiftregisterkeys_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t keypad_shiftregisterkeys_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { #if CIRCUITPY_KEYPAD_SHIFTREGISTERKEYS keypad_shiftregisterkeys_obj_t *self = mp_obj_malloc(keypad_shiftregisterkeys_obj_t, &keypad_shiftregisterkeys_type); @@ -170,7 +170,7 @@ STATIC mp_obj_t keypad_shiftregisterkeys_make_new(const mp_obj_type_t *type, siz //| def deinit(self) -> None: //| """Stop scanning and release the pins.""" //| ... -STATIC mp_obj_t keypad_shiftregisterkeys_deinit(mp_obj_t self_in) { +static mp_obj_t keypad_shiftregisterkeys_deinit(mp_obj_t self_in) { keypad_shiftregisterkeys_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_keypad_shiftregisterkeys_deinit(self); @@ -187,12 +187,12 @@ MP_DEFINE_CONST_FUN_OBJ_1(keypad_shiftregisterkeys_deinit_obj, keypad_shiftregis //| """Automatically deinitializes when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t keypad_shiftregisterkeys___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t keypad_shiftregisterkeys___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_keypad_shiftregisterkeys_deinit(args[0]); return MP_ROM_NONE; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(keypad_shiftregisterkeys___exit___obj, 4, 4, keypad_shiftregisterkeys___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(keypad_shiftregisterkeys___exit___obj, 4, 4, keypad_shiftregisterkeys___exit__); //| def reset(self) -> None: //| """Reset the internal state of the scanner to assume that all keys are now released. @@ -210,7 +210,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(keypad_shiftregisterkeys___exit___obj //| """ //| -STATIC const mp_rom_map_elem_t keypad_shiftregisterkeys_locals_dict_table[] = { +static const mp_rom_map_elem_t keypad_shiftregisterkeys_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&keypad_shiftregisterkeys_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&keypad_shiftregisterkeys___exit___obj) }, @@ -220,7 +220,7 @@ STATIC const mp_rom_map_elem_t keypad_shiftregisterkeys_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&keypad_generic_reset_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(keypad_shiftregisterkeys_locals_dict, keypad_shiftregisterkeys_locals_dict_table); +static MP_DEFINE_CONST_DICT(keypad_shiftregisterkeys_locals_dict, keypad_shiftregisterkeys_locals_dict_table); #endif MP_DEFINE_CONST_OBJ_TYPE( diff --git a/shared-bindings/keypad/__init__.c b/shared-bindings/keypad/__init__.c index b9282e7f0b21f..4c65d98a085ca 100644 --- a/shared-bindings/keypad/__init__.c +++ b/shared-bindings/keypad/__init__.c @@ -14,13 +14,13 @@ #include "shared-bindings/keypad/ShiftRegisterKeys.h" #include "shared-bindings/util.h" -STATIC void check_for_deinit(keypad_keymatrix_obj_t *self) { +static void check_for_deinit(keypad_keymatrix_obj_t *self) { if (common_hal_keypad_deinited(self)) { raise_deinited_error(); } } -STATIC mp_obj_t keypad_generic_reset(mp_obj_t self_in) { +static mp_obj_t keypad_generic_reset(mp_obj_t self_in) { keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -29,7 +29,7 @@ STATIC mp_obj_t keypad_generic_reset(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(keypad_generic_reset_obj, keypad_generic_reset); -STATIC mp_obj_t keypad_generic_get_key_count(mp_obj_t self_in) { +static mp_obj_t keypad_generic_get_key_count(mp_obj_t self_in) { keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -44,7 +44,7 @@ const mp_obj_property_t keypad_generic_key_count_obj = { MP_ROM_NONE}, }; -STATIC mp_obj_t keypad_generic_get_events(mp_obj_t self_in) { +static mp_obj_t keypad_generic_get_events(mp_obj_t self_in) { keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -73,7 +73,7 @@ const mp_obj_property_t keypad_generic_events_obj = { //| .. jinja //| """ -STATIC mp_rom_map_elem_t keypad_module_globals_table[] = { +static mp_rom_map_elem_t keypad_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_keypad) }, { MP_ROM_QSTR(MP_QSTR_Event), MP_OBJ_FROM_PTR(&keypad_event_type) }, { MP_ROM_QSTR(MP_QSTR_EventQueue), MP_OBJ_FROM_PTR(&keypad_eventqueue_type) }, @@ -82,7 +82,7 @@ STATIC mp_rom_map_elem_t keypad_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_ShiftRegisterKeys), MP_OBJ_FROM_PTR(&keypad_shiftregisterkeys_type) }, }; -STATIC MP_DEFINE_CONST_DICT(keypad_module_globals, keypad_module_globals_table); +static MP_DEFINE_CONST_DICT(keypad_module_globals, keypad_module_globals_table); const mp_obj_module_t keypad_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/keypad_demux/DemuxKeyMatrix.c b/shared-bindings/keypad_demux/DemuxKeyMatrix.c index 1092b0e8cd8a4..9f6d65c3dd335 100644 --- a/shared-bindings/keypad_demux/DemuxKeyMatrix.c +++ b/shared-bindings/keypad_demux/DemuxKeyMatrix.c @@ -65,7 +65,7 @@ //| """ //| ... -STATIC mp_obj_t keypad_demux_demuxkeymatrix_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t keypad_demux_demuxkeymatrix_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { keypad_demux_demuxkeymatrix_obj_t *self = mp_obj_malloc(keypad_demux_demuxkeymatrix_obj_t, &keypad_demux_demuxkeymatrix_type); enum { ARG_row_addr_pins, ARG_column_pins, ARG_interval, ARG_max_events, ARG_debounce_threshold }; static const mp_arg_t allowed_args[] = { @@ -114,7 +114,7 @@ STATIC mp_obj_t keypad_demux_demuxkeymatrix_make_new(const mp_obj_type_t *type, //| def deinit(self) -> None: //| """Stop scanning and release the pins.""" //| ... -STATIC mp_obj_t keypad_demux_demuxkeymatrix_deinit(mp_obj_t self_in) { +static mp_obj_t keypad_demux_demuxkeymatrix_deinit(mp_obj_t self_in) { keypad_demux_demuxkeymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_keypad_demux_demuxkeymatrix_deinit(self); return MP_ROM_NONE; @@ -130,14 +130,14 @@ MP_DEFINE_CONST_FUN_OBJ_1(keypad_demux_demuxkeymatrix_deinit_obj, keypad_demux_d //| """Automatically deinitializes when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t keypad_demux_demuxkeymatrix___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t keypad_demux_demuxkeymatrix___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_keypad_demux_demuxkeymatrix_deinit(args[0]); return MP_ROM_NONE; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(keypad_demux_demuxkeymatrix___exit___obj, 4, 4, keypad_demux_demuxkeymatrix___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(keypad_demux_demuxkeymatrix___exit___obj, 4, 4, keypad_demux_demuxkeymatrix___exit__); -STATIC void check_for_deinit(keypad_demux_demuxkeymatrix_obj_t *self) { +static void check_for_deinit(keypad_demux_demuxkeymatrix_obj_t *self) { if (common_hal_keypad_deinited(self)) { raise_deinited_error(); } @@ -163,7 +163,7 @@ STATIC void check_for_deinit(keypad_demux_demuxkeymatrix_obj_t *self) { //| :rtype: Tuple[int] //| """ //| ... -STATIC mp_obj_t keypad_demux_demuxkeymatrix_key_number_to_row_column(mp_obj_t self_in, mp_obj_t key_number_in) { +static mp_obj_t keypad_demux_demuxkeymatrix_key_number_to_row_column(mp_obj_t self_in, mp_obj_t key_number_in) { keypad_demux_demuxkeymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -189,7 +189,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(keypad_demux_demuxkeymatrix_key_number_to_row_column_o //| The key number is ``row * len(column_pins) + column``. //| """ //| ... -STATIC mp_obj_t keypad_demux_demuxkeymatrix_row_column_to_key_number(mp_obj_t self_in, mp_obj_t row_in, mp_obj_t column_in) { +static mp_obj_t keypad_demux_demuxkeymatrix_row_column_to_key_number(mp_obj_t self_in, mp_obj_t row_in, mp_obj_t column_in) { keypad_demux_demuxkeymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -209,7 +209,7 @@ MP_DEFINE_CONST_FUN_OBJ_3(keypad_demux_demuxkeymatrix_row_column_to_key_number_o //| """ //| -STATIC const mp_rom_map_elem_t keypad_demux_demuxkeymatrix_locals_dict_table[] = { +static const mp_rom_map_elem_t keypad_demux_demuxkeymatrix_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&keypad_demux_demuxkeymatrix_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&keypad_demux_demuxkeymatrix___exit___obj) }, @@ -221,7 +221,7 @@ STATIC const mp_rom_map_elem_t keypad_demux_demuxkeymatrix_locals_dict_table[] = { MP_ROM_QSTR(MP_QSTR_row_column_to_key_number), MP_ROM_PTR(&keypad_demux_demuxkeymatrix_row_column_to_key_number_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(keypad_demux_demuxkeymatrix_locals_dict, keypad_demux_demuxkeymatrix_locals_dict_table); +static MP_DEFINE_CONST_DICT(keypad_demux_demuxkeymatrix_locals_dict, keypad_demux_demuxkeymatrix_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( keypad_demux_demuxkeymatrix_type, diff --git a/shared-bindings/keypad_demux/__init__.c b/shared-bindings/keypad_demux/__init__.c index d3abf462e87f8..c1359b2515926 100644 --- a/shared-bindings/keypad_demux/__init__.c +++ b/shared-bindings/keypad_demux/__init__.c @@ -17,12 +17,12 @@ //| .. jinja //| """ -STATIC mp_rom_map_elem_t keypad_demux_module_globals_table[] = { +static mp_rom_map_elem_t keypad_demux_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_keypad_demux) }, { MP_ROM_QSTR(MP_QSTR_DemuxKeyMatrix), MP_OBJ_FROM_PTR(&keypad_demux_demuxkeymatrix_type) }, }; -STATIC MP_DEFINE_CONST_DICT(keypad_demux_module_globals, keypad_demux_module_globals_table); +static MP_DEFINE_CONST_DICT(keypad_demux_module_globals, keypad_demux_module_globals_table); const mp_obj_module_t keypad_demux_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/locale/__init__.c b/shared-bindings/locale/__init__.c index c4d1be24f3d29..e3201c13a1978 100644 --- a/shared-bindings/locale/__init__.c +++ b/shared-bindings/locale/__init__.c @@ -18,7 +18,7 @@ //| Differences from CPython: No ``LC_*`` argument is permitted. //| """ //| -STATIC mp_obj_t getlocale(void) { +static mp_obj_t getlocale(void) { mp_rom_error_text_t locale_msg = MP_ERROR_TEXT("en_US"); size_t len_with_nul = decompress_length(locale_msg); @@ -34,12 +34,12 @@ STATIC mp_obj_t getlocale(void) { } MP_DEFINE_CONST_FUN_OBJ_0(getlocale_obj, getlocale); -STATIC const mp_rom_map_elem_t locale_module_globals_table[] = { +static const mp_rom_map_elem_t locale_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_locale) }, { MP_ROM_QSTR(MP_QSTR_getlocale), MP_ROM_PTR(&getlocale_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(locale_module_globals, locale_module_globals_table); +static MP_DEFINE_CONST_DICT(locale_module_globals, locale_module_globals_table); const mp_obj_module_t locale_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/math/__init__.c b/shared-bindings/math/__init__.c index 49a34d247bca3..a4dcafc9587ee 100644 --- a/shared-bindings/math/__init__.c +++ b/shared-bindings/math/__init__.c @@ -25,35 +25,35 @@ //| |see_cpython_module| :mod:`cpython:math`. //| """ -STATIC NORETURN void math_error(void) { +static NORETURN void math_error(void) { mp_raise_ValueError(MP_ERROR_TEXT("math domain error")); } #define MATH_FUN_1(py_name, c_name) \ - STATIC mp_obj_t mp_math_##py_name(mp_obj_t x_obj) { return mp_obj_new_float(MICROPY_FLOAT_C_FUN(c_name)(mp_obj_get_float(x_obj))); } \ - STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_math_##py_name##_obj, mp_math_##py_name); + static mp_obj_t mp_math_##py_name(mp_obj_t x_obj) { return mp_obj_new_float(MICROPY_FLOAT_C_FUN(c_name)(mp_obj_get_float(x_obj))); } \ + static MP_DEFINE_CONST_FUN_OBJ_1(mp_math_##py_name##_obj, mp_math_##py_name); #define MATH_FUN_2(py_name, c_name) \ - STATIC mp_obj_t mp_math_##py_name(mp_obj_t x_obj, mp_obj_t y_obj) { return mp_obj_new_float(MICROPY_FLOAT_C_FUN(c_name)(mp_obj_get_float(x_obj), mp_obj_get_float(y_obj))); } \ - STATIC MP_DEFINE_CONST_FUN_OBJ_2(mp_math_##py_name##_obj, mp_math_##py_name); + static mp_obj_t mp_math_##py_name(mp_obj_t x_obj, mp_obj_t y_obj) { return mp_obj_new_float(MICROPY_FLOAT_C_FUN(c_name)(mp_obj_get_float(x_obj), mp_obj_get_float(y_obj))); } \ + static MP_DEFINE_CONST_FUN_OBJ_2(mp_math_##py_name##_obj, mp_math_##py_name); #define MATH_FUN_1_TO_BOOL(py_name, c_name) \ - STATIC mp_obj_t mp_math_##py_name(mp_obj_t x_obj) { return mp_obj_new_bool(c_name(mp_obj_get_float(x_obj))); } \ - STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_math_##py_name##_obj, mp_math_##py_name); + static mp_obj_t mp_math_##py_name(mp_obj_t x_obj) { return mp_obj_new_bool(c_name(mp_obj_get_float(x_obj))); } \ + static MP_DEFINE_CONST_FUN_OBJ_1(mp_math_##py_name##_obj, mp_math_##py_name); #define MATH_FUN_1_TO_INT(py_name, c_name) \ - STATIC mp_obj_t mp_math_##py_name(mp_obj_t x_obj) { return mp_obj_new_int_from_float(MICROPY_FLOAT_C_FUN(c_name)(mp_obj_get_float(x_obj))); } \ - STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_math_##py_name##_obj, mp_math_##py_name); + static mp_obj_t mp_math_##py_name(mp_obj_t x_obj) { return mp_obj_new_int_from_float(MICROPY_FLOAT_C_FUN(c_name)(mp_obj_get_float(x_obj))); } \ + static MP_DEFINE_CONST_FUN_OBJ_1(mp_math_##py_name##_obj, mp_math_##py_name); #define MATH_FUN_1_ERRCOND(py_name, c_name, error_condition) \ - STATIC mp_obj_t mp_math_##py_name(mp_obj_t x_obj) { \ + static mp_obj_t mp_math_##py_name(mp_obj_t x_obj) { \ mp_float_t x = mp_obj_get_float(x_obj); \ if (error_condition) { \ math_error(); \ } \ return mp_obj_new_float(MICROPY_FLOAT_C_FUN(c_name)(x)); \ } \ - STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_math_##py_name##_obj, mp_math_##py_name); + static MP_DEFINE_CONST_FUN_OBJ_1(mp_math_##py_name##_obj, mp_math_##py_name); #ifdef MP_NEED_LOG2 // 1.442695040888963407354163704 is 1/_M_LN2 @@ -334,7 +334,7 @@ MATH_FUN_1(lgamma, lgamma) // Function that takes a variable number of arguments // log(x[, base]) -STATIC mp_obj_t mp_math_log(size_t n_args, const mp_obj_t *args) { +static mp_obj_t mp_math_log(size_t n_args, const mp_obj_t *args) { mp_float_t x = mp_obj_get_float(args[0]); if (x <= (mp_float_t)0.0) { math_error(); @@ -356,12 +356,12 @@ STATIC mp_obj_t mp_math_log(size_t n_args, const mp_obj_t *args) { return mp_obj_new_float(l / MICROPY_FLOAT_C_FUN(log)(base)); } } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_math_log_obj, 1, 2, mp_math_log); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_math_log_obj, 1, 2, mp_math_log); // Functions that return a tuple -STATIC mp_obj_t mp_math_frexp(mp_obj_t x_obj) { +static mp_obj_t mp_math_frexp(mp_obj_t x_obj) { int int_exponent = 0; mp_float_t significand = MICROPY_FLOAT_C_FUN(frexp)(mp_obj_get_float(x_obj), &int_exponent); mp_obj_t tuple[2]; @@ -369,9 +369,9 @@ STATIC mp_obj_t mp_math_frexp(mp_obj_t x_obj) { tuple[1] = mp_obj_new_int(int_exponent); return mp_obj_new_tuple(2, tuple); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_math_frexp_obj, mp_math_frexp); +static MP_DEFINE_CONST_FUN_OBJ_1(mp_math_frexp_obj, mp_math_frexp); -STATIC mp_obj_t mp_math_modf(mp_obj_t x_obj) { +static mp_obj_t mp_math_modf(mp_obj_t x_obj) { mp_float_t int_part = 0.0; mp_float_t fractional_part = MICROPY_FLOAT_C_FUN(modf)(mp_obj_get_float(x_obj), &int_part); mp_obj_t tuple[2]; @@ -379,23 +379,23 @@ STATIC mp_obj_t mp_math_modf(mp_obj_t x_obj) { tuple[1] = mp_obj_new_float(int_part); return mp_obj_new_tuple(2, tuple); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_math_modf_obj, mp_math_modf); +static MP_DEFINE_CONST_FUN_OBJ_1(mp_math_modf_obj, mp_math_modf); // Angular conversions -STATIC mp_obj_t mp_math_radians(mp_obj_t x_obj) { +static mp_obj_t mp_math_radians(mp_obj_t x_obj) { return mp_obj_new_float(mp_obj_get_float(x_obj) * (MP_PI / MICROPY_FLOAT_CONST(180.0))); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_math_radians_obj, mp_math_radians); +static MP_DEFINE_CONST_FUN_OBJ_1(mp_math_radians_obj, mp_math_radians); -STATIC mp_obj_t mp_math_degrees(mp_obj_t x_obj) { +static mp_obj_t mp_math_degrees(mp_obj_t x_obj) { return mp_obj_new_float(mp_obj_get_float(x_obj) * (MICROPY_FLOAT_CONST(180.0) / MP_PI)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_math_degrees_obj, mp_math_degrees); +static MP_DEFINE_CONST_FUN_OBJ_1(mp_math_degrees_obj, mp_math_degrees); -STATIC const mp_rom_map_elem_t mp_module_math_globals_table[] = { +static const mp_rom_map_elem_t mp_module_math_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_math) }, { MP_ROM_QSTR(MP_QSTR_e), mp_const_float_e }, { MP_ROM_QSTR(MP_QSTR_pi), mp_const_float_pi }, @@ -445,7 +445,7 @@ STATIC const mp_rom_map_elem_t mp_module_math_globals_table[] = { #endif }; -STATIC MP_DEFINE_CONST_DICT(mp_module_math_globals, mp_module_math_globals_table); +static MP_DEFINE_CONST_DICT(mp_module_math_globals, mp_module_math_globals_table); const mp_obj_module_t math_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/max3421e/Max3421E.c b/shared-bindings/max3421e/Max3421E.c index ffb75c56fd5a5..e7de988a67819 100644 --- a/shared-bindings/max3421e/Max3421E.c +++ b/shared-bindings/max3421e/Max3421E.c @@ -31,7 +31,7 @@ //| :param microcontroller.Pin irq: Interrupt pin //| :param int baudrate: Maximum baudrate to talk to the Max chip in Hz""" //| ... -STATIC mp_obj_t max3421e_max3421e_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t max3421e_max3421e_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_spi_bus, ARG_chip_select, ARG_irq, ARG_baudrate }; static const mp_arg_t allowed_args[] = { { MP_QSTR_spi_bus, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -58,7 +58,7 @@ STATIC mp_obj_t max3421e_max3421e_make_new(const mp_obj_type_t *type, size_t n_a //| """Shuts down USB host functionality and releases chip_select and irq pins.""" //| ... //| -STATIC mp_obj_t max3421e_max3421e_obj_deinit(mp_obj_t self_in) { +static mp_obj_t max3421e_max3421e_obj_deinit(mp_obj_t self_in) { max3421e_max3421e_obj_t *self = self_in; if (common_hal_max3421e_max3421e_deinited(self)) { return mp_const_none; @@ -68,11 +68,11 @@ STATIC mp_obj_t max3421e_max3421e_obj_deinit(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(max3421e_max3421e_deinit_obj, max3421e_max3421e_obj_deinit); -STATIC const mp_rom_map_elem_t max3421e_max3421e_locals_dict_table[] = { +static const mp_rom_map_elem_t max3421e_max3421e_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&max3421e_max3421e_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&max3421e_max3421e_deinit_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(max3421e_max3421e_locals_dict, max3421e_max3421e_locals_dict_table); +static MP_DEFINE_CONST_DICT(max3421e_max3421e_locals_dict, max3421e_max3421e_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( max3421e_max3421e_type, diff --git a/shared-bindings/max3421e/__init__.c b/shared-bindings/max3421e/__init__.c index 2eb7b53e23f54..9713f96451f8b 100644 --- a/shared-bindings/max3421e/__init__.c +++ b/shared-bindings/max3421e/__init__.c @@ -38,12 +38,12 @@ //| //| """ -STATIC const mp_rom_map_elem_t max3421e_module_globals_table[] = { +static const mp_rom_map_elem_t max3421e_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_max3421e) }, { MP_ROM_QSTR(MP_QSTR_Max3421E), MP_ROM_PTR(&max3421e_max3421e_type) }, }; -STATIC MP_DEFINE_CONST_DICT(max3421e_module_globals, max3421e_module_globals_table); +static MP_DEFINE_CONST_DICT(max3421e_module_globals, max3421e_module_globals_table); const mp_obj_module_t max3421e_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/mdns/RemoteService.c b/shared-bindings/mdns/RemoteService.c index 5b907b8ddfb13..d1eddc6961118 100644 --- a/shared-bindings/mdns/RemoteService.c +++ b/shared-bindings/mdns/RemoteService.c @@ -23,66 +23,66 @@ //| hostname: str //| """The hostname of the device (read-only),.""" -STATIC mp_obj_t mdns_remoteservice_get_hostname(mp_obj_t self_in) { +static mp_obj_t mdns_remoteservice_get_hostname(mp_obj_t self_in) { mdns_remoteservice_obj_t *self = MP_OBJ_TO_PTR(self_in); const char *hostname = common_hal_mdns_remoteservice_get_hostname(self); return mp_obj_new_str(hostname, strlen(hostname)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(mdns_remoteservice_get_hostname_obj, mdns_remoteservice_get_hostname); +static MP_DEFINE_CONST_FUN_OBJ_1(mdns_remoteservice_get_hostname_obj, mdns_remoteservice_get_hostname); MP_PROPERTY_GETTER(mdns_remoteservice_hostname_obj, (mp_obj_t)&mdns_remoteservice_get_hostname_obj); //| instance_name: str //| """The human readable instance name for the service. (read-only)""" -STATIC mp_obj_t remoteservice_get_instance_name(mp_obj_t self_in) { +static mp_obj_t remoteservice_get_instance_name(mp_obj_t self_in) { mdns_remoteservice_obj_t *self = MP_OBJ_TO_PTR(self_in); const char *instance_name = common_hal_mdns_remoteservice_get_instance_name(self); return mp_obj_new_str(instance_name, strlen(instance_name)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(mdns_remoteservice_get_instance_name_obj, remoteservice_get_instance_name); +static MP_DEFINE_CONST_FUN_OBJ_1(mdns_remoteservice_get_instance_name_obj, remoteservice_get_instance_name); MP_PROPERTY_GETTER(mdns_remoteservice_instance_name_obj, (mp_obj_t)&mdns_remoteservice_get_instance_name_obj); //| service_type: str //| """The service type string such as ``_http``. (read-only)""" -STATIC mp_obj_t remoteservice_get_service_type(mp_obj_t self_in) { +static mp_obj_t remoteservice_get_service_type(mp_obj_t self_in) { mdns_remoteservice_obj_t *self = MP_OBJ_TO_PTR(self_in); const char *service_type = common_hal_mdns_remoteservice_get_service_type(self); return mp_obj_new_str(service_type, strlen(service_type)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(mdns_remoteservice_get_service_type_obj, remoteservice_get_service_type); +static MP_DEFINE_CONST_FUN_OBJ_1(mdns_remoteservice_get_service_type_obj, remoteservice_get_service_type); MP_PROPERTY_GETTER(mdns_remoteservice_service_type_obj, (mp_obj_t)&mdns_remoteservice_get_service_type_obj); //| protocol: str //| """The protocol string such as ``_tcp``. (read-only)""" -STATIC mp_obj_t remoteservice_get_protocol(mp_obj_t self_in) { +static mp_obj_t remoteservice_get_protocol(mp_obj_t self_in) { mdns_remoteservice_obj_t *self = MP_OBJ_TO_PTR(self_in); const char *protocol = common_hal_mdns_remoteservice_get_protocol(self); return mp_obj_new_str(protocol, strlen(protocol)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(mdns_remoteservice_get_protocol_obj, remoteservice_get_protocol); +static MP_DEFINE_CONST_FUN_OBJ_1(mdns_remoteservice_get_protocol_obj, remoteservice_get_protocol); MP_PROPERTY_GETTER(mdns_remoteservice_protocol_obj, (mp_obj_t)&mdns_remoteservice_get_protocol_obj); //| port: int //| """Port number used for the service. (read-only)""" -STATIC mp_obj_t remoteservice_get_port(mp_obj_t self_in) { +static mp_obj_t remoteservice_get_port(mp_obj_t self_in) { mdns_remoteservice_obj_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_mdns_remoteservice_get_port(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(mdns_remoteservice_get_port_obj, remoteservice_get_port); +static MP_DEFINE_CONST_FUN_OBJ_1(mdns_remoteservice_get_port_obj, remoteservice_get_port); MP_PROPERTY_GETTER(mdns_remoteservice_port_obj, (mp_obj_t)&mdns_remoteservice_get_port_obj); //| ipv4_address: Optional[ipaddress.IPv4Address] //| """IP v4 Address of the remote service. None if no A records are found.""" -STATIC mp_obj_t _mdns_remoteservice_get_ipv4_address(mp_obj_t self) { +static mp_obj_t _mdns_remoteservice_get_ipv4_address(mp_obj_t self) { return common_hal_mdns_remoteservice_get_ipv4_address(self); } @@ -95,14 +95,14 @@ MP_PROPERTY_GETTER(mdns_remoteservice_ipv4_address_obj, //| """Deletes the RemoteService object.""" //| ... //| -STATIC mp_obj_t mdns_remoteservice_obj_deinit(mp_obj_t self_in) { +static mp_obj_t mdns_remoteservice_obj_deinit(mp_obj_t self_in) { mdns_remoteservice_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_mdns_remoteservice_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(mdns_remoteservice_deinit_obj, mdns_remoteservice_obj_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(mdns_remoteservice_deinit_obj, mdns_remoteservice_obj_deinit); -STATIC const mp_rom_map_elem_t mdns_remoteservice_locals_dict_table[] = { +static const mp_rom_map_elem_t mdns_remoteservice_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_hostname), MP_ROM_PTR(&mdns_remoteservice_hostname_obj) }, { MP_ROM_QSTR(MP_QSTR_instance_name), MP_ROM_PTR(&mdns_remoteservice_instance_name_obj) }, { MP_ROM_QSTR(MP_QSTR_service_type), MP_ROM_PTR(&mdns_remoteservice_service_type_obj) }, @@ -113,7 +113,7 @@ STATIC const mp_rom_map_elem_t mdns_remoteservice_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&mdns_remoteservice_deinit_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(mdns_remoteservice_locals_dict, mdns_remoteservice_locals_dict_table); +static MP_DEFINE_CONST_DICT(mdns_remoteservice_locals_dict, mdns_remoteservice_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( mdns_remoteservice_type, diff --git a/shared-bindings/mdns/Server.c b/shared-bindings/mdns/Server.c index 3d6b6adbb2607..247c96254fbb7 100644 --- a/shared-bindings/mdns/Server.c +++ b/shared-bindings/mdns/Server.c @@ -30,7 +30,7 @@ //| may already be using it.) Only native interfaces are currently supported. //| """ //| ... -STATIC mp_obj_t mdns_server_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t mdns_server_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_network_interface }; static const mp_arg_t allowed_args[] = { { MP_QSTR_network_interface, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -56,14 +56,14 @@ STATIC mp_obj_t mdns_server_make_new(const mp_obj_type_t *type, size_t n_args, s //| def deinit(self) -> None: //| """Stops the server""" //| ... -STATIC mp_obj_t mdns_server_obj_deinit(mp_obj_t self_in) { +static mp_obj_t mdns_server_obj_deinit(mp_obj_t self_in) { mdns_server_obj_t *self = (mdns_server_obj_t *)self_in; common_hal_mdns_server_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(mdns_server_deinit_obj, mdns_server_obj_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(mdns_server_deinit_obj, mdns_server_obj_deinit); -STATIC void check_for_deinit(mdns_server_obj_t *self) { +static void check_for_deinit(mdns_server_obj_t *self) { if (common_hal_mdns_server_deinited(self)) { raise_deinited_error(); } @@ -73,7 +73,7 @@ STATIC void check_for_deinit(mdns_server_obj_t *self) { //| """Hostname resolvable as ``.local`` in addition to ``circuitpython.local``. Make //| sure this is unique across all devices on the network. It defaults to ``cpy-######`` //| where ``######`` is the hex digits of the last three bytes of the mac address.""" -STATIC mp_obj_t mdns_server_get_hostname(mp_obj_t self) { +static mp_obj_t mdns_server_get_hostname(mp_obj_t self) { check_for_deinit(self); const char *hostname = common_hal_mdns_server_get_hostname(self); return mp_obj_new_str(hostname, strlen(hostname)); @@ -86,7 +86,7 @@ static mp_obj_t mdns_server_set_hostname(mp_obj_t self, mp_obj_t hostname) { return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(mdns_server_set_hostname_obj, mdns_server_set_hostname); +static MP_DEFINE_CONST_FUN_OBJ_2(mdns_server_set_hostname_obj, mdns_server_set_hostname); MP_PROPERTY_GETSET(mdns_server_hostname_obj, (mp_obj_t)&mdns_server_get_hostname_obj, @@ -94,14 +94,14 @@ MP_PROPERTY_GETSET(mdns_server_hostname_obj, //| instance_name: str //| """Human readable name to describe the device.""" -STATIC mp_obj_t mdns_server_get_instance_name(mp_obj_t self) { +static mp_obj_t mdns_server_get_instance_name(mp_obj_t self) { check_for_deinit(self); const char *instance_name = common_hal_mdns_server_get_instance_name(self); return mp_obj_new_str(instance_name, strlen(instance_name)); } MP_DEFINE_CONST_FUN_OBJ_1(mdns_server_get_instance_name_obj, mdns_server_get_instance_name); -STATIC mp_obj_t mdns_server_set_instance_name(mp_obj_t self, mp_obj_t new_instance_name) { +static mp_obj_t mdns_server_set_instance_name(mp_obj_t self, mp_obj_t new_instance_name) { check_for_deinit(self); common_hal_mdns_server_set_instance_name(self, mp_obj_str_get_str(new_instance_name)); return mp_const_none; @@ -125,7 +125,7 @@ MP_PROPERTY_GETSET(mdns_server_instance_name_obj, //| :param str protocol: The service protocol such as "_tcp" //| :param float/int timeout: Time to wait for responses""" //| ... -STATIC mp_obj_t _mdns_server_find(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t _mdns_server_find(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { mdns_server_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); check_for_deinit(self); @@ -145,7 +145,7 @@ STATIC mp_obj_t _mdns_server_find(mp_uint_t n_args, const mp_obj_t *pos_args, mp return common_hal_mdns_server_find(self, service_type, protocol, timeout); } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mdns_server_find_obj, 1, _mdns_server_find); +static MP_DEFINE_CONST_FUN_OBJ_KW(mdns_server_find_obj, 1, _mdns_server_find); //| def advertise_service(self, *, service_type: str, protocol: str, port: int) -> None: //| """Respond to queries for the given service with the given port. @@ -165,7 +165,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mdns_server_find_obj, 1, _mdns_server_find); //| """ //| ... //| -STATIC mp_obj_t mdns_server_advertise_service(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t mdns_server_advertise_service(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { mdns_server_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); check_for_deinit(self); @@ -200,9 +200,9 @@ STATIC mp_obj_t mdns_server_advertise_service(mp_uint_t n_args, const mp_obj_t * common_hal_mdns_server_advertise_service(self, service_type, protocol, args[ARG_port].u_int, txt_records_array, num_txt_records); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mdns_server_advertise_service_obj, 1, mdns_server_advertise_service); +static MP_DEFINE_CONST_FUN_OBJ_KW(mdns_server_advertise_service_obj, 1, mdns_server_advertise_service); -STATIC const mp_rom_map_elem_t mdns_server_locals_dict_table[] = { +static const mp_rom_map_elem_t mdns_server_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_hostname), MP_ROM_PTR(&mdns_server_hostname_obj) }, { MP_ROM_QSTR(MP_QSTR_instance_name), MP_ROM_PTR(&mdns_server_instance_name_obj) }, @@ -213,7 +213,7 @@ STATIC const mp_rom_map_elem_t mdns_server_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&mdns_server_deinit_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(mdns_server_locals_dict, mdns_server_locals_dict_table); +static MP_DEFINE_CONST_DICT(mdns_server_locals_dict, mdns_server_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( mdns_server_type, diff --git a/shared-bindings/mdns/__init__.c b/shared-bindings/mdns/__init__.c index 52b3219d0c754..1e8073b08b892 100644 --- a/shared-bindings/mdns/__init__.c +++ b/shared-bindings/mdns/__init__.c @@ -19,13 +19,13 @@ //| also supports DNS Service Discovery that allows for discovering other hosts //| that provide a desired service.""" -STATIC const mp_rom_map_elem_t mdns_module_globals_table[] = { +static const mp_rom_map_elem_t mdns_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_mdns) }, { MP_ROM_QSTR(MP_QSTR_Server), MP_ROM_PTR(&mdns_server_type) }, { MP_ROM_QSTR(MP_QSTR_RemoteService), MP_ROM_PTR(&mdns_remoteservice_type) }, }; -STATIC MP_DEFINE_CONST_DICT(mdns_module_globals, mdns_module_globals_table); +static MP_DEFINE_CONST_DICT(mdns_module_globals, mdns_module_globals_table); const mp_obj_module_t mdns_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/memorymap/AddressRange.c b/shared-bindings/memorymap/AddressRange.c index 74d1a153bec61..3b742ce463bed 100644 --- a/shared-bindings/memorymap/AddressRange.c +++ b/shared-bindings/memorymap/AddressRange.c @@ -59,7 +59,7 @@ //| ``start + length``. An exception will be raised if any of the //| addresses are invalid or protected.""" //| ... -STATIC mp_obj_t memorymap_addressrange_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t memorymap_addressrange_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_start, ARG_length }; static const mp_arg_t allowed_args[] = { { MP_QSTR_start, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -97,7 +97,7 @@ STATIC mp_obj_t memorymap_addressrange_make_new(const mp_obj_type_t *type, size_ //| def __len__(self) -> int: //| """Return the length. This is used by (`len`)""" //| ... -STATIC mp_obj_t memorymap_addressrange_unary_op(mp_unary_op_t op, mp_obj_t self_in) { +static mp_obj_t memorymap_addressrange_unary_op(mp_unary_op_t op, mp_obj_t self_in) { memorymap_addressrange_obj_t *self = MP_OBJ_TO_PTR(self_in); uint16_t len = common_hal_memorymap_addressrange_get_length(self); switch (op) { @@ -110,10 +110,10 @@ STATIC mp_obj_t memorymap_addressrange_unary_op(mp_unary_op_t op, mp_obj_t self_ } } -STATIC const mp_rom_map_elem_t memorymap_addressrange_locals_dict_table[] = { +static const mp_rom_map_elem_t memorymap_addressrange_locals_dict_table[] = { }; -STATIC MP_DEFINE_CONST_DICT(memorymap_addressrange_locals_dict, memorymap_addressrange_locals_dict_table); +static MP_DEFINE_CONST_DICT(memorymap_addressrange_locals_dict, memorymap_addressrange_locals_dict_table); //| @overload //| def __getitem__(self, index: slice) -> bytearray: ... @@ -137,7 +137,7 @@ STATIC MP_DEFINE_CONST_DICT(memorymap_addressrange_locals_dict, memorymap_addres //| All others may use multiple transactions.""" //| ... //| -STATIC mp_obj_t memorymap_addressrange_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) { +static mp_obj_t memorymap_addressrange_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) { if (value == MP_OBJ_NULL) { // delete item // slice deletion diff --git a/shared-bindings/memorymap/__init__.c b/shared-bindings/memorymap/__init__.c index 8d30104bbe1a0..9e404d1649732 100644 --- a/shared-bindings/memorymap/__init__.c +++ b/shared-bindings/memorymap/__init__.c @@ -17,12 +17,12 @@ //| address space seen from the processor running CircuitPython. It is usually //| the physical address space. //| """ -STATIC const mp_rom_map_elem_t memorymap_module_globals_table[] = { +static const mp_rom_map_elem_t memorymap_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_memorymap) }, { MP_ROM_QSTR(MP_QSTR_AddressRange), MP_ROM_PTR(&memorymap_addressrange_type) }, }; -STATIC MP_DEFINE_CONST_DICT(memorymap_module_globals, memorymap_module_globals_table); +static MP_DEFINE_CONST_DICT(memorymap_module_globals, memorymap_module_globals_table); const mp_obj_module_t memorymap_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/memorymonitor/AllocationAlarm.c b/shared-bindings/memorymonitor/AllocationAlarm.c index 417c31fe2e617..9fa07376b2c4f 100644 --- a/shared-bindings/memorymonitor/AllocationAlarm.c +++ b/shared-bindings/memorymonitor/AllocationAlarm.c @@ -33,7 +33,7 @@ //| //| """ //| ... -STATIC mp_obj_t memorymonitor_allocationalarm_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *all_args, mp_map_t *kw_args) { +static mp_obj_t memorymonitor_allocationalarm_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *all_args, mp_map_t *kw_args) { enum { ARG_minimum_block_count }; static const mp_arg_t allowed_args[] = { { MP_QSTR_minimum_block_count, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1} }, @@ -64,7 +64,7 @@ STATIC mp_obj_t memorymonitor_allocationalarm_make_new(const mp_obj_type_t *type //| x = bytearray(20) //| """ //| ... -STATIC mp_obj_t memorymonitor_allocationalarm_obj_ignore(mp_obj_t self_in, mp_obj_t count_obj) { +static mp_obj_t memorymonitor_allocationalarm_obj_ignore(mp_obj_t self_in, mp_obj_t count_obj) { mp_int_t count = mp_obj_get_int(count_obj); mp_arg_validate_int_min(count, 0, MP_QSTR_count); @@ -76,7 +76,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(memorymonitor_allocationalarm_ignore_obj, memorymonito //| def __enter__(self) -> AllocationAlarm: //| """Enables the alarm.""" //| ... -STATIC mp_obj_t memorymonitor_allocationalarm_obj___enter__(mp_obj_t self_in) { +static mp_obj_t memorymonitor_allocationalarm_obj___enter__(mp_obj_t self_in) { common_hal_memorymonitor_allocationalarm_resume(self_in); return self_in; } @@ -87,21 +87,21 @@ MP_DEFINE_CONST_FUN_OBJ_1(memorymonitor_allocationalarm___enter___obj, memorymon //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... //| -STATIC mp_obj_t memorymonitor_allocationalarm_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t memorymonitor_allocationalarm_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_memorymonitor_allocationalarm_set_ignore(args[0], 0); common_hal_memorymonitor_allocationalarm_pause(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(memorymonitor_allocationalarm___exit___obj, 4, 4, memorymonitor_allocationalarm_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(memorymonitor_allocationalarm___exit___obj, 4, 4, memorymonitor_allocationalarm_obj___exit__); -STATIC const mp_rom_map_elem_t memorymonitor_allocationalarm_locals_dict_table[] = { +static const mp_rom_map_elem_t memorymonitor_allocationalarm_locals_dict_table[] = { // Methods { MP_ROM_QSTR(MP_QSTR_ignore), MP_ROM_PTR(&memorymonitor_allocationalarm_ignore_obj) }, { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&memorymonitor_allocationalarm___enter___obj) }, { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&memorymonitor_allocationalarm___exit___obj) }, }; -STATIC MP_DEFINE_CONST_DICT(memorymonitor_allocationalarm_locals_dict, memorymonitor_allocationalarm_locals_dict_table); +static MP_DEFINE_CONST_DICT(memorymonitor_allocationalarm_locals_dict, memorymonitor_allocationalarm_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( memorymonitor_allocationalarm_type, diff --git a/shared-bindings/memorymonitor/AllocationSize.c b/shared-bindings/memorymonitor/AllocationSize.c index 198dc658bf690..34f1d3e3f3b94 100644 --- a/shared-bindings/memorymonitor/AllocationSize.c +++ b/shared-bindings/memorymonitor/AllocationSize.c @@ -40,7 +40,7 @@ //| //| """ //| ... -STATIC mp_obj_t memorymonitor_allocationsize_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *all_args, mp_map_t *kw_args) { +static mp_obj_t memorymonitor_allocationsize_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *all_args, mp_map_t *kw_args) { memorymonitor_allocationsize_obj_t *self = m_new_obj(memorymonitor_allocationsize_obj_t, &memorymonitor_allocationsize_type); @@ -52,7 +52,7 @@ STATIC mp_obj_t memorymonitor_allocationsize_make_new(const mp_obj_type_t *type, //| def __enter__(self) -> AllocationSize: //| """Clears counts and resumes tracking.""" //| ... -STATIC mp_obj_t memorymonitor_allocationsize_obj___enter__(mp_obj_t self_in) { +static mp_obj_t memorymonitor_allocationsize_obj___enter__(mp_obj_t self_in) { common_hal_memorymonitor_allocationsize_clear(self_in); common_hal_memorymonitor_allocationsize_resume(self_in); return self_in; @@ -63,16 +63,16 @@ MP_DEFINE_CONST_FUN_OBJ_1(memorymonitor_allocationsize___enter___obj, memorymoni //| """Automatically pauses allocation tracking when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t memorymonitor_allocationsize_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t memorymonitor_allocationsize_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_memorymonitor_allocationsize_pause(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(memorymonitor_allocationsize___exit___obj, 4, 4, memorymonitor_allocationsize_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(memorymonitor_allocationsize___exit___obj, 4, 4, memorymonitor_allocationsize_obj___exit__); //| bytes_per_block: int //| """Number of bytes per block""" -STATIC mp_obj_t memorymonitor_allocationsize_obj_get_bytes_per_block(mp_obj_t self_in) { +static mp_obj_t memorymonitor_allocationsize_obj_get_bytes_per_block(mp_obj_t self_in) { memorymonitor_allocationsize_obj_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_memorymonitor_allocationsize_get_bytes_per_block(self)); @@ -90,7 +90,7 @@ MP_PROPERTY_GETTER(memorymonitor_allocationsize_bytes_per_block_obj, //| mm = memorymonitor.AllocationSize() //| print(len(mm))""" //| ... -STATIC mp_obj_t memorymonitor_allocationsize_unary_op(mp_unary_op_t op, mp_obj_t self_in) { +static mp_obj_t memorymonitor_allocationsize_unary_op(mp_unary_op_t op, mp_obj_t self_in) { memorymonitor_allocationsize_obj_t *self = MP_OBJ_TO_PTR(self_in); uint16_t len = common_hal_memorymonitor_allocationsize_get_len(self); switch (op) { @@ -112,7 +112,7 @@ STATIC mp_obj_t memorymonitor_allocationsize_unary_op(mp_unary_op_t op, mp_obj_t //| print(mm[0])""" //| ... //| -STATIC mp_obj_t memorymonitor_allocationsize_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value) { +static mp_obj_t memorymonitor_allocationsize_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value) { if (value == mp_const_none) { // delete item mp_raise_AttributeError(MP_ERROR_TEXT("Cannot delete values")); @@ -134,7 +134,7 @@ STATIC mp_obj_t memorymonitor_allocationsize_subscr(mp_obj_t self_in, mp_obj_t i return mp_const_none; } -STATIC const mp_rom_map_elem_t memorymonitor_allocationsize_locals_dict_table[] = { +static const mp_rom_map_elem_t memorymonitor_allocationsize_locals_dict_table[] = { // Methods { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&memorymonitor_allocationsize___enter___obj) }, { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&memorymonitor_allocationsize___exit___obj) }, @@ -142,7 +142,7 @@ STATIC const mp_rom_map_elem_t memorymonitor_allocationsize_locals_dict_table[] // Properties { MP_ROM_QSTR(MP_QSTR_bytes_per_block), MP_ROM_PTR(&memorymonitor_allocationsize_bytes_per_block_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(memorymonitor_allocationsize_locals_dict, memorymonitor_allocationsize_locals_dict_table); +static MP_DEFINE_CONST_DICT(memorymonitor_allocationsize_locals_dict, memorymonitor_allocationsize_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( memorymonitor_allocationsize_type, diff --git a/shared-bindings/memorymonitor/__init__.c b/shared-bindings/memorymonitor/__init__.c index afe2726100e01..e925eb54e7466 100644 --- a/shared-bindings/memorymonitor/__init__.c +++ b/shared-bindings/memorymonitor/__init__.c @@ -31,7 +31,7 @@ NORETURN void mp_raise_memorymonitor_AllocationError(mp_rom_error_text_t fmt, .. nlr_raise(exception); } -STATIC const mp_rom_map_elem_t memorymonitor_module_globals_table[] = { +static const mp_rom_map_elem_t memorymonitor_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_memorymonitor) }, { MP_ROM_QSTR(MP_QSTR_AllocationAlarm), MP_ROM_PTR(&memorymonitor_allocationalarm_type) }, { MP_ROM_QSTR(MP_QSTR_AllocationSize), MP_ROM_PTR(&memorymonitor_allocationsize_type) }, @@ -40,7 +40,7 @@ STATIC const mp_rom_map_elem_t memorymonitor_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_AllocationError), MP_ROM_PTR(&mp_type_memorymonitor_AllocationError) }, }; -STATIC MP_DEFINE_CONST_DICT(memorymonitor_module_globals, memorymonitor_module_globals_table); +static MP_DEFINE_CONST_DICT(memorymonitor_module_globals, memorymonitor_module_globals_table); void memorymonitor_exception_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) { mp_print_kind_t k = kind & ~PRINT_EXC_SUBCLASS; diff --git a/shared-bindings/microcontroller/Processor.c b/shared-bindings/microcontroller/Processor.c index 4e0372dbdf1e2..bf9f808db9583 100644 --- a/shared-bindings/microcontroller/Processor.c +++ b/shared-bindings/microcontroller/Processor.c @@ -58,7 +58,7 @@ //| """ #if CIRCUITPY_SETTABLE_PROCESSOR_FREQUENCY -STATIC mp_obj_t mcu_processor_set_frequency(mp_obj_t self, mp_obj_t freq) { +static mp_obj_t mcu_processor_set_frequency(mp_obj_t self, mp_obj_t freq) { uint32_t value_of_freq = (uint32_t)mp_arg_validate_int_min(mp_obj_get_int(freq), 0, MP_QSTR_frequency); common_hal_mcu_processor_set_frequency(self, value_of_freq); return mp_const_none; @@ -68,7 +68,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(mcu_processor_set_frequency_obj, mcu_processor_set_fre #endif -STATIC mp_obj_t mcu_processor_get_frequency(mp_obj_t self) { +static mp_obj_t mcu_processor_get_frequency(mp_obj_t self) { return mp_obj_new_int_from_uint(common_hal_mcu_processor_get_frequency()); } @@ -85,7 +85,7 @@ MP_PROPERTY_GETTER(mcu_processor_frequency_obj, //| reset_reason: microcontroller.ResetReason //| """The reason the microcontroller started up from reset state.""" -STATIC mp_obj_t mcu_processor_get_reset_reason(mp_obj_t self) { +static mp_obj_t mcu_processor_get_reset_reason(mp_obj_t self) { return cp_enum_find(&mcu_reset_reason_type, common_hal_mcu_processor_get_reset_reason()); } @@ -102,7 +102,7 @@ MP_PROPERTY_GETTER(mcu_processor_reset_reason_obj, //| **Limitations:** Not available on ESP32 or ESP32-S3. On small SAMD21 builds without external flash, //| the reported temperature has reduced accuracy and precision, to save code space. //| """ -STATIC mp_obj_t mcu_processor_get_temperature(mp_obj_t self) { +static mp_obj_t mcu_processor_get_temperature(mp_obj_t self) { float temperature = common_hal_mcu_processor_get_temperature(); return isnan(temperature) ? mp_const_none : mp_obj_new_float(temperature); } @@ -114,7 +114,7 @@ MP_PROPERTY_GETTER(mcu_processor_temperature_obj, //| uid: bytearray //| """The unique id (aka serial number) of the chip as a `bytearray`. (read-only)""" -STATIC mp_obj_t mcu_processor_get_uid(mp_obj_t self) { +static mp_obj_t mcu_processor_get_uid(mp_obj_t self) { uint8_t raw_id[COMMON_HAL_MCU_PROCESSOR_UID_LENGTH]; common_hal_mcu_processor_get_uid(raw_id); return mp_obj_new_bytearray(sizeof(raw_id), raw_id); @@ -130,7 +130,7 @@ MP_PROPERTY_GETTER(mcu_processor_uid_obj, //| //| Is `None` if the voltage is not available.""" //| -STATIC mp_obj_t mcu_processor_get_voltage(mp_obj_t self) { +static mp_obj_t mcu_processor_get_voltage(mp_obj_t self) { float voltage = common_hal_mcu_processor_get_voltage(); return isnan(voltage) ? mp_const_none : mp_obj_new_float(voltage); } @@ -140,7 +140,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(mcu_processor_get_voltage_obj, mcu_processor_get_volta MP_PROPERTY_GETTER(mcu_processor_voltage_obj, (mp_obj_t)&mcu_processor_get_voltage_obj); -STATIC const mp_rom_map_elem_t mcu_processor_locals_dict_table[] = { +static const mp_rom_map_elem_t mcu_processor_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_frequency), MP_ROM_PTR(&mcu_processor_frequency_obj) }, { MP_ROM_QSTR(MP_QSTR_reset_reason), MP_ROM_PTR(&mcu_processor_reset_reason_obj) }, { MP_ROM_QSTR(MP_QSTR_temperature), MP_ROM_PTR(&mcu_processor_temperature_obj) }, @@ -148,7 +148,7 @@ STATIC const mp_rom_map_elem_t mcu_processor_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_voltage), MP_ROM_PTR(&mcu_processor_voltage_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(mcu_processor_locals_dict, mcu_processor_locals_dict_table); +static MP_DEFINE_CONST_DICT(mcu_processor_locals_dict, mcu_processor_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( mcu_processor_type, diff --git a/shared-bindings/microcontroller/ResetReason.c b/shared-bindings/microcontroller/ResetReason.c index e67f640f340ec..301205d84f369 100644 --- a/shared-bindings/microcontroller/ResetReason.c +++ b/shared-bindings/microcontroller/ResetReason.c @@ -55,7 +55,7 @@ MAKE_ENUM_MAP(mcu_reset_reason) { MAKE_ENUM_MAP_ENTRY(reset_reason, UNKNOWN), MAKE_ENUM_MAP_ENTRY(reset_reason, RESCUE_DEBUG), }; -STATIC MP_DEFINE_CONST_DICT(mcu_reset_reason_locals_dict, mcu_reset_reason_locals_table); +static MP_DEFINE_CONST_DICT(mcu_reset_reason_locals_dict, mcu_reset_reason_locals_table); MAKE_PRINTER(microcontroller, mcu_reset_reason); diff --git a/shared-bindings/microcontroller/RunMode.c b/shared-bindings/microcontroller/RunMode.c index 456bc1053c7fa..95979e5533c5a 100644 --- a/shared-bindings/microcontroller/RunMode.c +++ b/shared-bindings/microcontroller/RunMode.c @@ -51,15 +51,15 @@ const mcu_runmode_obj_t mcu_runmode_bootloader_obj = { { &mcu_runmode_type }, }; -STATIC const mp_rom_map_elem_t mcu_runmode_locals_dict_table[] = { +static const mp_rom_map_elem_t mcu_runmode_locals_dict_table[] = { {MP_ROM_QSTR(MP_QSTR_UF2), MP_ROM_PTR(&mcu_runmode_uf2_obj)}, {MP_ROM_QSTR(MP_QSTR_NORMAL), MP_ROM_PTR(&mcu_runmode_normal_obj)}, {MP_ROM_QSTR(MP_QSTR_SAFE_MODE), MP_ROM_PTR(&mcu_runmode_safe_mode_obj)}, {MP_ROM_QSTR(MP_QSTR_BOOTLOADER), MP_ROM_PTR(&mcu_runmode_bootloader_obj)}, }; -STATIC MP_DEFINE_CONST_DICT(mcu_runmode_locals_dict, mcu_runmode_locals_dict_table); +static MP_DEFINE_CONST_DICT(mcu_runmode_locals_dict, mcu_runmode_locals_dict_table); -STATIC void mcu_runmode_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { +static void mcu_runmode_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { qstr runmode = MP_QSTR_NORMAL; if (self_in == MP_ROM_PTR(&mcu_runmode_uf2_obj)) { runmode = MP_QSTR_UF2; diff --git a/shared-bindings/microcontroller/__init__.c b/shared-bindings/microcontroller/__init__.c index 73ce4ccb7c1b0..eb2fc79ec33ee 100644 --- a/shared-bindings/microcontroller/__init__.c +++ b/shared-bindings/microcontroller/__init__.c @@ -49,34 +49,34 @@ //| `time.sleep()`.""" //| ... //| -STATIC mp_obj_t mcu_delay_us(mp_obj_t delay_obj) { +static mp_obj_t mcu_delay_us(mp_obj_t delay_obj) { uint32_t delay = mp_obj_get_int(delay_obj); common_hal_mcu_delay_us(delay); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(mcu_delay_us_obj, mcu_delay_us); +static MP_DEFINE_CONST_FUN_OBJ_1(mcu_delay_us_obj, mcu_delay_us); //| def disable_interrupts() -> None: //| """Disable all interrupts. Be very careful, this can stall everything.""" //| ... //| -STATIC mp_obj_t mcu_disable_interrupts(void) { +static mp_obj_t mcu_disable_interrupts(void) { common_hal_mcu_disable_interrupts(); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_0(mcu_disable_interrupts_obj, mcu_disable_interrupts); +static MP_DEFINE_CONST_FUN_OBJ_0(mcu_disable_interrupts_obj, mcu_disable_interrupts); //| def enable_interrupts() -> None: //| """Enable the interrupts that were enabled at the last disable.""" //| ... //| -STATIC mp_obj_t mcu_enable_interrupts(void) { +static mp_obj_t mcu_enable_interrupts(void) { common_hal_mcu_enable_interrupts(); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_0(mcu_enable_interrupts_obj, mcu_enable_interrupts); +static MP_DEFINE_CONST_FUN_OBJ_0(mcu_enable_interrupts_obj, mcu_enable_interrupts); //| def on_next_reset(run_mode: microcontroller.RunMode) -> None: //| """Configure the run mode used the next time the microcontroller is reset but @@ -85,7 +85,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mcu_enable_interrupts_obj, mcu_enable_interrupt //| :param ~microcontroller.RunMode run_mode: The next run mode""" //| ... //| -STATIC mp_obj_t mcu_on_next_reset(mp_obj_t run_mode_obj) { +static mp_obj_t mcu_on_next_reset(mp_obj_t run_mode_obj) { mcu_runmode_t run_mode; if (run_mode_obj == MP_OBJ_FROM_PTR(&mcu_runmode_uf2_obj)) { run_mode = RUNMODE_UF2; @@ -101,7 +101,7 @@ STATIC mp_obj_t mcu_on_next_reset(mp_obj_t run_mode_obj) { common_hal_mcu_on_next_reset(run_mode); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(mcu_on_next_reset_obj, mcu_on_next_reset); +static MP_DEFINE_CONST_FUN_OBJ_1(mcu_on_next_reset_obj, mcu_on_next_reset); //| def reset() -> None: //| """Reset the microcontroller. After reset, the microcontroller will enter the @@ -112,12 +112,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mcu_on_next_reset_obj, mcu_on_next_reset); //| "Safely removed" on Windows or "ejected" on Mac OSX and Linux.""" //| ... //| -STATIC mp_obj_t mcu_reset(void) { +static mp_obj_t mcu_reset(void) { common_hal_mcu_reset(); // We won't actually get here because we're resetting. return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_0(mcu_reset_obj, mcu_reset); +static MP_DEFINE_CONST_FUN_OBJ_0(mcu_reset_obj, mcu_reset); //| nvm: Optional[ByteArray] //| """Available non-volatile memory. @@ -134,7 +134,7 @@ const mp_obj_module_t mcu_pin_module = { .globals = (mp_obj_dict_t *)&mcu_pin_globals, }; -STATIC const mp_rom_map_elem_t mcu_module_globals_table[] = { +static const mp_rom_map_elem_t mcu_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_microcontroller) }, { MP_ROM_QSTR(MP_QSTR_cpu), MP_ROM_PTR(&common_hal_mcu_processor_obj) }, #if CIRCUITPY_PROCESSOR_COUNT > 1 @@ -163,7 +163,7 @@ STATIC const mp_rom_map_elem_t mcu_module_globals_table[] = { }; -STATIC MP_DEFINE_CONST_DICT(mcu_module_globals, mcu_module_globals_table); +static MP_DEFINE_CONST_DICT(mcu_module_globals, mcu_module_globals_table); const mp_obj_module_t microcontroller_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/msgpack/ExtType.c b/shared-bindings/msgpack/ExtType.c index 2bf2560b021da..7cee4b9b0d3f9 100644 --- a/shared-bindings/msgpack/ExtType.c +++ b/shared-bindings/msgpack/ExtType.c @@ -16,7 +16,7 @@ //| """Constructor //| :param int code: type code in range 0~127. //| :param bytes data: representation.""" -STATIC mp_obj_t mod_msgpack_exttype_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t mod_msgpack_exttype_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { mod_msgpack_extype_obj_t *self = mp_obj_malloc(mod_msgpack_extype_obj_t, &mod_msgpack_exttype_type); enum { ARG_code, ARG_data }; static const mp_arg_t allowed_args[] = { @@ -39,13 +39,13 @@ STATIC mp_obj_t mod_msgpack_exttype_make_new(const mp_obj_type_t *type, size_t n //| code: int //| """The type code, in range 0~127.""" //| ... -STATIC mp_obj_t mod_msgpack_exttype_get_code(mp_obj_t self_in) { +static mp_obj_t mod_msgpack_exttype_get_code(mp_obj_t self_in) { mod_msgpack_extype_obj_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_NEW_SMALL_INT(self->code); } MP_DEFINE_CONST_FUN_OBJ_1(mod_msgpack_exttype_get_code_obj, mod_msgpack_exttype_get_code); -STATIC mp_obj_t mod_msgpack_exttype_set_code(mp_obj_t self_in, mp_obj_t code_in) { +static mp_obj_t mod_msgpack_exttype_set_code(mp_obj_t self_in, mp_obj_t code_in) { mod_msgpack_extype_obj_t *self = MP_OBJ_TO_PTR(self_in); int code = mp_obj_get_int(code_in); if (code < 0 || code > 127) { @@ -64,13 +64,13 @@ MP_PROPERTY_GETSET(mod_msgpack_exttype_code_obj, //| """Data.""" //| ... //| -STATIC mp_obj_t mod_msgpack_exttype_get_data(mp_obj_t self_in) { +static mp_obj_t mod_msgpack_exttype_get_data(mp_obj_t self_in) { mod_msgpack_extype_obj_t *self = MP_OBJ_TO_PTR(self_in); return self->data; } MP_DEFINE_CONST_FUN_OBJ_1(mod_msgpack_exttype_get_data_obj, mod_msgpack_exttype_get_data); -STATIC mp_obj_t mod_msgpack_exttype_set_data(mp_obj_t self_in, mp_obj_t data_in) { +static mp_obj_t mod_msgpack_exttype_set_data(mp_obj_t self_in, mp_obj_t data_in) { mod_msgpack_extype_obj_t *self = MP_OBJ_TO_PTR(self_in); self->data = data_in; return mp_const_none; @@ -81,12 +81,12 @@ MP_PROPERTY_GETSET(mod_msgpack_exttype_data_obj, (mp_obj_t)&mod_msgpack_exttype_get_data_obj, (mp_obj_t)&mod_msgpack_exttype_set_data_obj); -STATIC mp_rom_map_elem_t mod_msgpack_exttype_locals_dict_table[] = { +static mp_rom_map_elem_t mod_msgpack_exttype_locals_dict_table[] = { // Properties { MP_ROM_QSTR(MP_QSTR_code), MP_ROM_PTR(&mod_msgpack_exttype_code_obj) }, { MP_ROM_QSTR(MP_QSTR_data), MP_ROM_PTR(&mod_msgpack_exttype_data_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(mod_msgpack_exttype_locals_dict, mod_msgpack_exttype_locals_dict_table); +static MP_DEFINE_CONST_DICT(mod_msgpack_exttype_locals_dict, mod_msgpack_exttype_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( mod_msgpack_exttype_type, diff --git a/shared-bindings/msgpack/__init__.c b/shared-bindings/msgpack/__init__.c index ea42f96e72874..eaa1cfb98ba6c 100644 --- a/shared-bindings/msgpack/__init__.c +++ b/shared-bindings/msgpack/__init__.c @@ -82,9 +82,9 @@ //| """ //| ... //| -STATIC mp_obj_t mod_msgpack_pack(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t mod_msgpack_pack(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_obj, ARG_buffer, ARG_default }; - STATIC const mp_arg_t allowed_args[] = { + static const mp_arg_t allowed_args[] = { { MP_QSTR_obj, MP_ARG_REQUIRED | MP_ARG_OBJ }, { MP_QSTR_stream, MP_ARG_REQUIRED | MP_ARG_OBJ }, { MP_QSTR_default, MP_ARG_KW_ONLY | MP_ARG_OBJ, { .u_obj = mp_const_none } }, @@ -120,9 +120,9 @@ MP_DEFINE_CONST_FUN_OBJ_KW(mod_msgpack_pack_obj, 0, mod_msgpack_pack); //| """ //| ... //| -STATIC mp_obj_t mod_msgpack_unpack(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t mod_msgpack_unpack(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_buffer, ARG_ext_hook, ARG_use_list }; - STATIC const mp_arg_t allowed_args[] = { + static const mp_arg_t allowed_args[] = { { MP_QSTR_stream, MP_ARG_REQUIRED | MP_ARG_OBJ, }, { MP_QSTR_ext_hook, MP_ARG_KW_ONLY | MP_ARG_OBJ, { .u_obj = mp_const_none } }, { MP_QSTR_use_list, MP_ARG_KW_ONLY | MP_ARG_BOOL, { .u_bool = true } }, @@ -140,14 +140,14 @@ STATIC mp_obj_t mod_msgpack_unpack(size_t n_args, const mp_obj_t *pos_args, mp_m MP_DEFINE_CONST_FUN_OBJ_KW(mod_msgpack_unpack_obj, 0, mod_msgpack_unpack); -STATIC const mp_rom_map_elem_t msgpack_module_globals_table[] = { +static const mp_rom_map_elem_t msgpack_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_msgpack) }, { MP_ROM_QSTR(MP_QSTR_ExtType), MP_ROM_PTR(&mod_msgpack_exttype_type) }, { MP_ROM_QSTR(MP_QSTR_pack), MP_ROM_PTR(&mod_msgpack_pack_obj) }, { MP_ROM_QSTR(MP_QSTR_unpack), MP_ROM_PTR(&mod_msgpack_unpack_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(msgpack_module_globals, msgpack_module_globals_table); +static MP_DEFINE_CONST_DICT(msgpack_module_globals, msgpack_module_globals_table); const mp_obj_module_t msgpack_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/neopixel_write/__init__.c b/shared-bindings/neopixel_write/__init__.c index f3e953046a875..9f221ddd5ac11 100644 --- a/shared-bindings/neopixel_write/__init__.c +++ b/shared-bindings/neopixel_write/__init__.c @@ -47,7 +47,7 @@ // But the ports vary based on implementation considerations; the proof is in the testing. // https://adafru.it/5225 is more sensitive to timing and should be included in testing. -STATIC void check_for_deinit(digitalio_digitalinout_obj_t *self) { +static void check_for_deinit(digitalio_digitalinout_obj_t *self) { if (common_hal_digitalio_digitalinout_deinited(self)) { raise_deinited_error(); } @@ -92,7 +92,7 @@ STATIC void check_for_deinit(digitalio_digitalinout_obj_t *self) { //| """ //| ... //| -STATIC mp_obj_t neopixel_write_neopixel_write_(mp_obj_t digitalinout_obj, mp_obj_t buf) { +static mp_obj_t neopixel_write_neopixel_write_(mp_obj_t digitalinout_obj, mp_obj_t buf) { const digitalio_digitalinout_obj_t *digitalinout = mp_arg_validate_type(digitalinout_obj, &digitalio_digitalinout_type, MP_QSTR_digitalinout); @@ -105,14 +105,14 @@ STATIC mp_obj_t neopixel_write_neopixel_write_(mp_obj_t digitalinout_obj, mp_obj common_hal_neopixel_write(digitalinout, (uint8_t *)bufinfo.buf, bufinfo.len); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(neopixel_write_neopixel_write_obj, neopixel_write_neopixel_write_); +static MP_DEFINE_CONST_FUN_OBJ_2(neopixel_write_neopixel_write_obj, neopixel_write_neopixel_write_); -STATIC const mp_rom_map_elem_t neopixel_write_module_globals_table[] = { +static const mp_rom_map_elem_t neopixel_write_module_globals_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_neopixel_write) }, { MP_OBJ_NEW_QSTR(MP_QSTR_neopixel_write), (mp_obj_t)&neopixel_write_neopixel_write_obj }, }; -STATIC MP_DEFINE_CONST_DICT(neopixel_write_module_globals, neopixel_write_module_globals_table); +static MP_DEFINE_CONST_DICT(neopixel_write_module_globals, neopixel_write_module_globals_table); const mp_obj_module_t neopixel_write_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/nvm/ByteArray.c b/shared-bindings/nvm/ByteArray.c index 9a37f4bc90eb8..7549023247eca 100644 --- a/shared-bindings/nvm/ByteArray.c +++ b/shared-bindings/nvm/ByteArray.c @@ -31,7 +31,7 @@ //| def __len__(self) -> int: //| """Return the length. This is used by (`len`)""" //| ... -STATIC mp_obj_t nvm_bytearray_unary_op(mp_unary_op_t op, mp_obj_t self_in) { +static mp_obj_t nvm_bytearray_unary_op(mp_unary_op_t op, mp_obj_t self_in) { nvm_bytearray_obj_t *self = MP_OBJ_TO_PTR(self_in); uint16_t len = common_hal_nvm_bytearray_get_length(self); switch (op) { @@ -44,10 +44,10 @@ STATIC mp_obj_t nvm_bytearray_unary_op(mp_unary_op_t op, mp_obj_t self_in) { } } -STATIC const mp_rom_map_elem_t nvm_bytearray_locals_dict_table[] = { +static const mp_rom_map_elem_t nvm_bytearray_locals_dict_table[] = { }; -STATIC MP_DEFINE_CONST_DICT(nvm_bytearray_locals_dict, nvm_bytearray_locals_dict_table); +static MP_DEFINE_CONST_DICT(nvm_bytearray_locals_dict, nvm_bytearray_locals_dict_table); //| @overload //| def __getitem__(self, index: slice) -> bytearray: ... @@ -63,7 +63,7 @@ STATIC MP_DEFINE_CONST_DICT(nvm_bytearray_locals_dict, nvm_bytearray_locals_dict //| """Set the value at the given index.""" //| ... //| -STATIC mp_obj_t nvm_bytearray_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) { +static mp_obj_t nvm_bytearray_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) { if (value == MP_OBJ_NULL) { // delete item // slice deletion diff --git a/shared-bindings/nvm/__init__.c b/shared-bindings/nvm/__init__.c index 6402612df4396..c86862f481728 100644 --- a/shared-bindings/nvm/__init__.c +++ b/shared-bindings/nvm/__init__.c @@ -19,12 +19,12 @@ //| Note that this module can't be imported and used directly. The sole //| instance of :class:`ByteArray` is available at //| :attr:`microcontroller.nvm`.""" -STATIC const mp_rom_map_elem_t nvm_module_globals_table[] = { +static const mp_rom_map_elem_t nvm_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_nvm) }, { MP_ROM_QSTR(MP_QSTR_ByteArray), MP_ROM_PTR(&nvm_bytearray_type) }, }; -STATIC MP_DEFINE_CONST_DICT(nvm_module_globals, nvm_module_globals_table); +static MP_DEFINE_CONST_DICT(nvm_module_globals, nvm_module_globals_table); const mp_obj_module_t nvm_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/onewireio/OneWire.c b/shared-bindings/onewireio/OneWire.c index d2d525dc0ba2c..d2cb379ab4f84 100644 --- a/shared-bindings/onewireio/OneWire.c +++ b/shared-bindings/onewireio/OneWire.c @@ -32,7 +32,7 @@ //| onewire.write_bit(False) //| print(onewire.read_bit())""" //| ... -STATIC mp_obj_t onewireio_onewire_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t onewireio_onewire_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_pin }; static const mp_arg_t allowed_args[] = { { MP_QSTR_pin, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -50,14 +50,14 @@ STATIC mp_obj_t onewireio_onewire_make_new(const mp_obj_type_t *type, size_t n_a //| def deinit(self) -> None: //| """Deinitialize the OneWire bus and release any hardware resources for reuse.""" //| ... -STATIC mp_obj_t onewireio_onewire_deinit(mp_obj_t self_in) { +static mp_obj_t onewireio_onewire_deinit(mp_obj_t self_in) { onewireio_onewire_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_onewireio_onewire_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(onewireio_onewire_deinit_obj, onewireio_onewire_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(onewireio_onewire_deinit_obj, onewireio_onewire_deinit); -STATIC void check_for_deinit(onewireio_onewire_obj_t *self) { +static void check_for_deinit(onewireio_onewire_obj_t *self) { if (common_hal_onewireio_onewire_deinited(self)) { raise_deinited_error(); } @@ -72,12 +72,12 @@ STATIC void check_for_deinit(onewireio_onewire_obj_t *self) { //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t onewireio_onewire_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t onewireio_onewire_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_onewireio_onewire_deinit(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(onewireio_onewire___exit___obj, 4, 4, onewireio_onewire_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(onewireio_onewire___exit___obj, 4, 4, onewireio_onewire_obj___exit__); //| def reset(self) -> bool: //| """Reset the OneWire bus and read presence @@ -85,7 +85,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(onewireio_onewire___exit___obj, 4, 4, //| :returns: False when at least one device is present //| :rtype: bool""" //| ... -STATIC mp_obj_t onewireio_onewire_obj_reset(mp_obj_t self_in) { +static mp_obj_t onewireio_onewire_obj_reset(mp_obj_t self_in) { onewireio_onewire_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -99,7 +99,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(onewireio_onewire_reset_obj, onewireio_onewire_obj_res //| :returns: bit state read //| :rtype: bool""" //| ... -STATIC mp_obj_t onewireio_onewire_obj_read_bit(mp_obj_t self_in) { +static mp_obj_t onewireio_onewire_obj_read_bit(mp_obj_t self_in) { onewireio_onewire_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -111,7 +111,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(onewireio_onewire_read_bit_obj, onewireio_onewire_obj_ //| """Write out a bit based on value.""" //| ... //| -STATIC mp_obj_t onewireio_onewire_obj_write_bit(mp_obj_t self_in, mp_obj_t bool_obj) { +static mp_obj_t onewireio_onewire_obj_write_bit(mp_obj_t self_in, mp_obj_t bool_obj) { onewireio_onewire_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -120,7 +120,7 @@ STATIC mp_obj_t onewireio_onewire_obj_write_bit(mp_obj_t self_in, mp_obj_t bool_ } MP_DEFINE_CONST_FUN_OBJ_2(onewireio_onewire_write_bit_obj, onewireio_onewire_obj_write_bit); -STATIC const mp_rom_map_elem_t onewireio_onewire_locals_dict_table[] = { +static const mp_rom_map_elem_t onewireio_onewire_locals_dict_table[] = { // Methods { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&onewireio_onewire_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, @@ -129,7 +129,7 @@ STATIC const mp_rom_map_elem_t onewireio_onewire_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_read_bit), MP_ROM_PTR(&onewireio_onewire_read_bit_obj) }, { MP_ROM_QSTR(MP_QSTR_write_bit), MP_ROM_PTR(&onewireio_onewire_write_bit_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(onewireio_onewire_locals_dict, onewireio_onewire_locals_dict_table); +static MP_DEFINE_CONST_DICT(onewireio_onewire_locals_dict, onewireio_onewire_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( onewireio_onewire_type, diff --git a/shared-bindings/onewireio/__init__.c b/shared-bindings/onewireio/__init__.c index f4c8f9fea9299..bce56326b1ad9 100644 --- a/shared-bindings/onewireio/__init__.c +++ b/shared-bindings/onewireio/__init__.c @@ -19,12 +19,12 @@ //| //| Protocol definition is here: https://www.analog.com/en/technical-articles/1wire-communication-through-software.html""" -STATIC const mp_rom_map_elem_t onewireio_module_globals_table[] = { +static const mp_rom_map_elem_t onewireio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_onewireio) }, { MP_ROM_QSTR(MP_QSTR_OneWire), MP_ROM_PTR(&onewireio_onewire_type) }, }; -STATIC MP_DEFINE_CONST_DICT(onewireio_module_globals, onewireio_module_globals_table); +static MP_DEFINE_CONST_DICT(onewireio_module_globals, onewireio_module_globals_table); const mp_obj_module_t onewireio_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/os/__init__.c b/shared-bindings/os/__init__.c index 1ebd7faa701aa..37dea4290759e 100644 --- a/shared-bindings/os/__init__.c +++ b/shared-bindings/os/__init__.c @@ -41,16 +41,16 @@ //| version: str //| machine: str //| -STATIC mp_obj_t os_uname(void) { +static mp_obj_t os_uname(void) { return common_hal_os_uname(); } -STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_uname_obj, os_uname); +static MP_DEFINE_CONST_FUN_OBJ_0(os_uname_obj, os_uname); //| def chdir(path: str) -> None: //| """Change current directory.""" //| ... //| -STATIC mp_obj_t os_chdir(mp_obj_t path_in) { +static mp_obj_t os_chdir(mp_obj_t path_in) { const char *path = mp_obj_str_get_str(path_in); common_hal_os_chdir(path); return mp_const_none; @@ -61,7 +61,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(os_chdir_obj, os_chdir); //| """Get the current directory.""" //| ... //| -STATIC mp_obj_t os_getcwd(void) { +static mp_obj_t os_getcwd(void) { return common_hal_os_getcwd(); } MP_DEFINE_CONST_FUN_OBJ_0(os_getcwd_obj, os_getcwd); @@ -89,7 +89,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(os_getcwd_obj, os_getcwd); //| """ //| ... //| -STATIC mp_obj_t os_getenv(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t os_getenv(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { #if CIRCUITPY_OS_GETENV enum { ARG_key, ARG_default }; static const mp_arg_t allowed_args[] = { @@ -104,13 +104,13 @@ STATIC mp_obj_t os_getenv(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ mp_raise_NotImplementedError(NULL); #endif } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(os_getenv_obj, 1, os_getenv); +static MP_DEFINE_CONST_FUN_OBJ_KW(os_getenv_obj, 1, os_getenv); //| def listdir(dir: str) -> str: //| """With no argument, list the current directory. Otherwise list the given directory.""" //| ... //| -STATIC mp_obj_t os_listdir(size_t n_args, const mp_obj_t *args) { +static mp_obj_t os_listdir(size_t n_args, const mp_obj_t *args) { const char *path; if (n_args == 1) { path = mp_obj_str_get_str(args[0]); @@ -125,7 +125,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(os_listdir_obj, 0, 1, os_listdir); //| """Create a new directory.""" //| ... //| -STATIC mp_obj_t os_mkdir(mp_obj_t path_in) { +static mp_obj_t os_mkdir(mp_obj_t path_in) { const char *path = mp_obj_str_get_str(path_in); common_hal_os_mkdir(path); return mp_const_none; @@ -136,7 +136,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(os_mkdir_obj, os_mkdir); //| """Remove a file.""" //| ... //| -STATIC mp_obj_t os_remove(mp_obj_t path_in) { +static mp_obj_t os_remove(mp_obj_t path_in) { const char *path = mp_obj_str_get_str(path_in); common_hal_os_remove(path); return mp_const_none; @@ -147,7 +147,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(os_remove_obj, os_remove); //| """Remove a directory.""" //| ... //| -STATIC mp_obj_t os_rename(mp_obj_t old_path_in, mp_obj_t new_path_in) { +static mp_obj_t os_rename(mp_obj_t old_path_in, mp_obj_t new_path_in) { const char *old_path = mp_obj_str_get_str(old_path_in); const char *new_path = mp_obj_str_get_str(new_path_in); common_hal_os_rename(old_path, new_path); @@ -159,7 +159,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(os_rename_obj, os_rename); //| """Rename a file.""" //| ... //| -STATIC mp_obj_t os_rmdir(mp_obj_t path_in) { +static mp_obj_t os_rmdir(mp_obj_t path_in) { const char *path = mp_obj_str_get_str(path_in); common_hal_os_rmdir(path); return mp_const_none; @@ -189,7 +189,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(os_rmdir_obj, os_rmdir); //| which is the number of seconds corresponding to 1999-12-31.""" //| ... //| -STATIC mp_obj_t os_stat(mp_obj_t path_in) { +static mp_obj_t os_stat(mp_obj_t path_in) { const char *path = mp_obj_str_get_str(path_in); return common_hal_os_stat(path); } @@ -216,7 +216,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(os_stat_obj, os_stat); //| in a port-specific implementation.""" //| ... //| -STATIC mp_obj_t os_statvfs(mp_obj_t path_in) { +static mp_obj_t os_statvfs(mp_obj_t path_in) { const char *path = mp_obj_str_get_str(path_in); return common_hal_os_statvfs(path); } @@ -226,7 +226,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(os_statvfs_obj, os_statvfs); //| """Sync all filesystems.""" //| ... //| -STATIC mp_obj_t os_sync(void) { +static mp_obj_t os_sync(void) { for (mp_vfs_mount_t *vfs = MP_STATE_VM(vfs_mount_table); vfs != NULL; vfs = vfs->next) { // this assumes that vfs->obj is fs_user_mount_t with block device functions disk_ioctl(MP_OBJ_TO_PTR(vfs->obj), CTRL_SYNC, NULL); @@ -243,7 +243,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(os_sync_obj, os_sync); //| """ //| ... //| -STATIC mp_obj_t os_urandom(mp_obj_t size_in) { +static mp_obj_t os_urandom(mp_obj_t size_in) { mp_int_t size = mp_obj_get_int(size_in); mp_obj_str_t *result = MP_OBJ_TO_PTR(mp_obj_new_bytes_of_zeros(size)); if (!common_hal_os_urandom((uint8_t *)result->data, size)) { @@ -257,14 +257,14 @@ MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom); //| """Change the timestamp of a file.""" //| ... //| -STATIC mp_obj_t os_utime(mp_obj_t path_in, mp_obj_t times_in) { +static mp_obj_t os_utime(mp_obj_t path_in, mp_obj_t times_in) { const char *path = mp_obj_str_get_str(path_in); common_hal_os_utime(path, times_in); return mp_const_none; } MP_DEFINE_CONST_FUN_OBJ_2(os_utime_obj, os_utime); -STATIC const mp_rom_map_elem_t os_module_globals_table[] = { +static const mp_rom_map_elem_t os_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_os) }, { MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&os_uname_obj) }, @@ -291,7 +291,7 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_sep), MP_ROM_QSTR(MP_QSTR__slash_) }, }; -STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table); +static MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table); const mp_obj_module_t os_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/paralleldisplaybus/ParallelBus.c b/shared-bindings/paralleldisplaybus/ParallelBus.c index 7c3146e98f207..0a674920a0c38 100644 --- a/shared-bindings/paralleldisplaybus/ParallelBus.c +++ b/shared-bindings/paralleldisplaybus/ParallelBus.c @@ -49,7 +49,7 @@ //| :param microcontroller.Pin reset: Reset pin, optional //| :param int frequency: The communication frequency in Hz for the display on the bus""" //| ... -STATIC mp_obj_t paralleldisplaybus_parallelbus_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t paralleldisplaybus_parallelbus_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_data0, ARG_data_pins, ARG_command, ARG_chip_select, ARG_write, ARG_read, ARG_reset, ARG_frequency }; static const mp_arg_t allowed_args[] = { { MP_QSTR_data0, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none } }, @@ -97,7 +97,7 @@ STATIC mp_obj_t paralleldisplaybus_parallelbus_make_new(const mp_obj_type_t *typ //| is available.""" //| ... -STATIC mp_obj_t paralleldisplaybus_parallelbus_obj_reset(mp_obj_t self_in) { +static mp_obj_t paralleldisplaybus_parallelbus_obj_reset(mp_obj_t self_in) { paralleldisplaybus_parallelbus_obj_t *self = self_in; if (!common_hal_paralleldisplaybus_parallelbus_reset(self)) { @@ -112,7 +112,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(paralleldisplaybus_parallelbus_reset_obj, paralleldisp //| vertical scroll, set via ``send`` may or may not be reset once the code is done.""" //| ... //| -STATIC mp_obj_t paralleldisplaybus_parallelbus_obj_send(mp_obj_t self, mp_obj_t command_obj, mp_obj_t data_obj) { +static mp_obj_t paralleldisplaybus_parallelbus_obj_send(mp_obj_t self, mp_obj_t command_obj, mp_obj_t data_obj) { mp_int_t command_int = mp_arg_validate_int_range(mp_obj_get_int(command_obj), 0, 255, MP_QSTR_command); uint8_t command = command_int; @@ -131,11 +131,11 @@ STATIC mp_obj_t paralleldisplaybus_parallelbus_obj_send(mp_obj_t self, mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_3(paralleldisplaybus_parallelbus_send_obj, paralleldisplaybus_parallelbus_obj_send); -STATIC const mp_rom_map_elem_t paralleldisplaybus_parallelbus_locals_dict_table[] = { +static const mp_rom_map_elem_t paralleldisplaybus_parallelbus_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(¶lleldisplaybus_parallelbus_reset_obj) }, { MP_ROM_QSTR(MP_QSTR_send), MP_ROM_PTR(¶lleldisplaybus_parallelbus_send_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(paralleldisplaybus_parallelbus_locals_dict, paralleldisplaybus_parallelbus_locals_dict_table); +static MP_DEFINE_CONST_DICT(paralleldisplaybus_parallelbus_locals_dict, paralleldisplaybus_parallelbus_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( paralleldisplaybus_parallelbus_type, diff --git a/shared-bindings/paralleldisplaybus/__init__.c b/shared-bindings/paralleldisplaybus/__init__.c index 76c403602370b..24d968c9e3111 100644 --- a/shared-bindings/paralleldisplaybus/__init__.c +++ b/shared-bindings/paralleldisplaybus/__init__.c @@ -16,12 +16,12 @@ //| """Native helpers for driving parallel displays""" -STATIC const mp_rom_map_elem_t paralleldisplaybus_module_globals_table[] = { +static const mp_rom_map_elem_t paralleldisplaybus_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_paralleldisplaybus) }, { MP_ROM_QSTR(MP_QSTR_ParallelBus), MP_ROM_PTR(¶lleldisplaybus_parallelbus_type) }, }; -STATIC MP_DEFINE_CONST_DICT(paralleldisplaybus_module_globals, paralleldisplaybus_module_globals_table); +static MP_DEFINE_CONST_DICT(paralleldisplaybus_module_globals, paralleldisplaybus_module_globals_table); const mp_obj_module_t paralleldisplaybus_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/ps2io/Ps2.c b/shared-bindings/ps2io/Ps2.c index 83791d6596a7b..f92d5f0dd88cf 100644 --- a/shared-bindings/ps2io/Ps2.c +++ b/shared-bindings/ps2io/Ps2.c @@ -44,7 +44,7 @@ //| print(kbd.sendcmd(0xed)) //| print(kbd.sendcmd(0x01))""" //| ... -STATIC mp_obj_t ps2io_ps2_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t ps2io_ps2_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_data_pin, ARG_clock_pin }; static const mp_arg_t allowed_args[] = { { MP_QSTR_data_pin, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -66,14 +66,14 @@ STATIC mp_obj_t ps2io_ps2_make_new(const mp_obj_type_t *type, size_t n_args, siz //| def deinit(self) -> None: //| """Deinitialises the Ps2 and releases any hardware resources for reuse.""" //| ... -STATIC mp_obj_t ps2io_ps2_deinit(mp_obj_t self_in) { +static mp_obj_t ps2io_ps2_deinit(mp_obj_t self_in) { ps2io_ps2_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_ps2io_ps2_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(ps2io_ps2_deinit_obj, ps2io_ps2_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(ps2io_ps2_deinit_obj, ps2io_ps2_deinit); -STATIC void check_for_deinit(ps2io_ps2_obj_t *self) { +static void check_for_deinit(ps2io_ps2_obj_t *self) { if (common_hal_ps2io_ps2_deinited(self)) { raise_deinited_error(); } @@ -88,19 +88,19 @@ STATIC void check_for_deinit(ps2io_ps2_obj_t *self) { //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t ps2io_ps2_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t ps2io_ps2_obj___exit__(size_t n_args, const mp_obj_t *args) { mp_check_self(mp_obj_is_type(args[0], &ps2io_ps2_type)); ps2io_ps2_obj_t *self = MP_OBJ_TO_PTR(args[0]); common_hal_ps2io_ps2_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(ps2io_ps2___exit___obj, 4, 4, ps2io_ps2_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(ps2io_ps2___exit___obj, 4, 4, ps2io_ps2_obj___exit__); //| def popleft(self) -> int: //| """Removes and returns the oldest received byte. When buffer //| is empty, raises an IndexError exception.""" //| ... -STATIC mp_obj_t ps2io_ps2_obj_popleft(mp_obj_t self_in) { +static mp_obj_t ps2io_ps2_obj_popleft(mp_obj_t self_in) { ps2io_ps2_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -124,7 +124,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(ps2io_ps2_popleft_obj, ps2io_ps2_obj_popleft); //| //| :param int byte: byte value of the command""" //| ... -STATIC mp_obj_t ps2io_ps2_obj_sendcmd(mp_obj_t self_in, mp_obj_t ob) { +static mp_obj_t ps2io_ps2_obj_sendcmd(mp_obj_t self_in, mp_obj_t ob) { ps2io_ps2_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); mp_int_t cmd = mp_obj_get_int(ob) & 0xff; @@ -165,7 +165,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(ps2io_ps2_sendcmd_obj, ps2io_ps2_obj_sendcmd); //| //| 0x2000: device didn't send a response byte in time""" //| ... -STATIC mp_obj_t ps2io_ps2_obj_clear_errors(mp_obj_t self_in) { +static mp_obj_t ps2io_ps2_obj_clear_errors(mp_obj_t self_in) { ps2io_ps2_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -179,7 +179,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(ps2io_ps2_clear_errors_obj, ps2io_ps2_obj_clear_errors //| to :py:func:`popleft()`.""" //| ... //| -STATIC mp_obj_t ps2_unary_op(mp_unary_op_t op, mp_obj_t self_in) { +static mp_obj_t ps2_unary_op(mp_unary_op_t op, mp_obj_t self_in) { ps2io_ps2_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); uint16_t len = common_hal_ps2io_ps2_get_len(self); @@ -193,7 +193,7 @@ STATIC mp_obj_t ps2_unary_op(mp_unary_op_t op, mp_obj_t self_in) { } } -STATIC const mp_rom_map_elem_t ps2io_ps2_locals_dict_table[] = { +static const mp_rom_map_elem_t ps2io_ps2_locals_dict_table[] = { // Methods { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&ps2io_ps2_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, @@ -202,7 +202,7 @@ STATIC const mp_rom_map_elem_t ps2io_ps2_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_sendcmd), MP_ROM_PTR(&ps2io_ps2_sendcmd_obj) }, { MP_ROM_QSTR(MP_QSTR_clear_errors), MP_ROM_PTR(&ps2io_ps2_clear_errors_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(ps2io_ps2_locals_dict, ps2io_ps2_locals_dict_table); +static MP_DEFINE_CONST_DICT(ps2io_ps2_locals_dict, ps2io_ps2_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( ps2io_ps2_type, diff --git a/shared-bindings/ps2io/__init__.c b/shared-bindings/ps2io/__init__.c index a23f803cb6a67..3d345ec1d2f81 100644 --- a/shared-bindings/ps2io/__init__.c +++ b/shared-bindings/ps2io/__init__.c @@ -25,12 +25,12 @@ //| call :py:meth:`!deinit` or use a context manager. See //| :ref:`lifetime-and-contextmanagers` for more info.""" -STATIC const mp_rom_map_elem_t ps2io_module_globals_table[] = { +static const mp_rom_map_elem_t ps2io_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ps2io) }, { MP_ROM_QSTR(MP_QSTR_Ps2), MP_ROM_PTR(&ps2io_ps2_type) }, }; -STATIC MP_DEFINE_CONST_DICT(ps2io_module_globals, ps2io_module_globals_table); +static MP_DEFINE_CONST_DICT(ps2io_module_globals, ps2io_module_globals_table); const mp_obj_module_t ps2io_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/pulseio/PulseIn.c b/shared-bindings/pulseio/PulseIn.c index ba48d242694af..38b63873c70ff 100644 --- a/shared-bindings/pulseio/PulseIn.c +++ b/shared-bindings/pulseio/PulseIn.c @@ -56,7 +56,7 @@ //| # Resume with an 80 microsecond active pulse //| pulses.resume(80)""" //| ... -STATIC mp_obj_t pulseio_pulsein_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t pulseio_pulsein_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_pin, ARG_maxlen, ARG_idle_state }; static const mp_arg_t allowed_args[] = { { MP_QSTR_pin, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -79,14 +79,14 @@ STATIC mp_obj_t pulseio_pulsein_make_new(const mp_obj_type_t *type, size_t n_arg //| def deinit(self) -> None: //| """Deinitialises the PulseIn and releases any hardware resources for reuse.""" //| ... -STATIC mp_obj_t pulseio_pulsein_deinit(mp_obj_t self_in) { +static mp_obj_t pulseio_pulsein_deinit(mp_obj_t self_in) { pulseio_pulsein_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_pulseio_pulsein_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(pulseio_pulsein_deinit_obj, pulseio_pulsein_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(pulseio_pulsein_deinit_obj, pulseio_pulsein_deinit); -STATIC void check_for_deinit(pulseio_pulsein_obj_t *self) { +static void check_for_deinit(pulseio_pulsein_obj_t *self) { if (common_hal_pulseio_pulsein_deinited(self)) { raise_deinited_error(); } @@ -101,17 +101,17 @@ STATIC void check_for_deinit(pulseio_pulsein_obj_t *self) { //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t pulseio_pulsein_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t pulseio_pulsein_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_pulseio_pulsein_deinit(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pulseio_pulsein___exit___obj, 4, 4, pulseio_pulsein_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pulseio_pulsein___exit___obj, 4, 4, pulseio_pulsein_obj___exit__); //| def pause(self) -> None: //| """Pause pulse capture""" //| ... -STATIC mp_obj_t pulseio_pulsein_obj_pause(mp_obj_t self_in) { +static mp_obj_t pulseio_pulsein_obj_pause(mp_obj_t self_in) { pulseio_pulsein_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -130,7 +130,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(pulseio_pulsein_pause_obj, pulseio_pulsein_obj_pause); //| //| :param int trigger_duration: trigger pulse duration in microseconds""" //| ... -STATIC mp_obj_t pulseio_pulsein_obj_resume(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t pulseio_pulsein_obj_resume(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_trigger_duration }; static const mp_arg_t allowed_args[] = { { MP_QSTR_trigger_duration, MP_ARG_INT, {.u_int = 0} }, @@ -149,7 +149,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(pulseio_pulsein_resume_obj, 1, pulseio_pulsein_obj_re //| def clear(self) -> None: //| """Clears all captured pulses""" //| ... -STATIC mp_obj_t pulseio_pulsein_obj_clear(mp_obj_t self_in) { +static mp_obj_t pulseio_pulsein_obj_clear(mp_obj_t self_in) { pulseio_pulsein_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -161,7 +161,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(pulseio_pulsein_clear_obj, pulseio_pulsein_obj_clear); //| def popleft(self) -> int: //| """Removes and returns the oldest read pulse duration in microseconds.""" //| ... -STATIC mp_obj_t pulseio_pulsein_obj_popleft(mp_obj_t self_in) { +static mp_obj_t pulseio_pulsein_obj_popleft(mp_obj_t self_in) { pulseio_pulsein_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -172,7 +172,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(pulseio_pulsein_popleft_obj, pulseio_pulsein_obj_pople //| maxlen: int //| """The maximum length of the PulseIn. When len() is equal to maxlen, //| it is unclear which pulses are active and which are idle.""" -STATIC mp_obj_t pulseio_pulsein_obj_get_maxlen(mp_obj_t self_in) { +static mp_obj_t pulseio_pulsein_obj_get_maxlen(mp_obj_t self_in) { pulseio_pulsein_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -186,7 +186,7 @@ MP_PROPERTY_GETTER(pulseio_pulsein_maxlen_obj, //| paused: bool //| """True when pulse capture is paused as a result of :py:func:`pause` or an error during capture //| such as a signal that is too fast.""" -STATIC mp_obj_t pulseio_pulsein_obj_get_paused(mp_obj_t self_in) { +static mp_obj_t pulseio_pulsein_obj_get_paused(mp_obj_t self_in) { pulseio_pulsein_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -206,7 +206,7 @@ MP_PROPERTY_GETTER(pulseio_pulsein_paused_obj, //| pulses = pulseio.PulseIn(pin) //| print(len(pulses))""" //| ... -STATIC mp_obj_t pulsein_unary_op(mp_unary_op_t op, mp_obj_t self_in) { +static mp_obj_t pulsein_unary_op(mp_unary_op_t op, mp_obj_t self_in) { pulseio_pulsein_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); uint16_t len = common_hal_pulseio_pulsein_get_len(self); @@ -229,7 +229,7 @@ STATIC mp_obj_t pulsein_unary_op(mp_unary_op_t op, mp_obj_t self_in) { //| print(pulses[0])""" //| ... //| -STATIC mp_obj_t pulsein_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value) { +static mp_obj_t pulsein_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value) { if (value == mp_const_none) { // delete item mp_raise_AttributeError(MP_ERROR_TEXT("Cannot delete values")); @@ -252,7 +252,7 @@ STATIC mp_obj_t pulsein_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t va return mp_const_none; } -STATIC const mp_rom_map_elem_t pulseio_pulsein_locals_dict_table[] = { +static const mp_rom_map_elem_t pulseio_pulsein_locals_dict_table[] = { // Methods { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&pulseio_pulsein_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&pulseio_pulsein_deinit_obj) }, @@ -267,7 +267,7 @@ STATIC const mp_rom_map_elem_t pulseio_pulsein_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_maxlen), MP_ROM_PTR(&pulseio_pulsein_maxlen_obj) }, { MP_ROM_QSTR(MP_QSTR_paused), MP_ROM_PTR(&pulseio_pulsein_paused_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(pulseio_pulsein_locals_dict, pulseio_pulsein_locals_dict_table); +static MP_DEFINE_CONST_DICT(pulseio_pulsein_locals_dict, pulseio_pulsein_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( pulseio_pulsein_type, diff --git a/shared-bindings/pulseio/PulseOut.c b/shared-bindings/pulseio/PulseOut.c index d7903af18d23b..663eb1dfafe5b 100644 --- a/shared-bindings/pulseio/PulseOut.c +++ b/shared-bindings/pulseio/PulseOut.c @@ -44,7 +44,7 @@ //| pulses[0] = 200 //| pulse.send(pulses)""" //| ... -STATIC mp_obj_t pulseio_pulseout_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t pulseio_pulseout_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { #if CIRCUITPY_PULSEIO_PULSEOUT enum { ARG_pin, ARG_frequency, ARG_duty_cycle}; static const mp_arg_t allowed_args[] = { @@ -72,12 +72,12 @@ STATIC mp_obj_t pulseio_pulseout_make_new(const mp_obj_type_t *type, size_t n_ar //| def deinit(self) -> None: //| """Deinitialises the PulseOut and releases any hardware resources for reuse.""" //| ... -STATIC mp_obj_t pulseio_pulseout_deinit(mp_obj_t self_in) { +static mp_obj_t pulseio_pulseout_deinit(mp_obj_t self_in) { pulseio_pulseout_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_pulseio_pulseout_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(pulseio_pulseout_deinit_obj, pulseio_pulseout_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(pulseio_pulseout_deinit_obj, pulseio_pulseout_deinit); //| def __enter__(self) -> PulseOut: //| """No-op used by Context Managers.""" @@ -88,12 +88,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(pulseio_pulseout_deinit_obj, pulseio_pulseout_d //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t pulseio_pulseout_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t pulseio_pulseout_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_pulseio_pulseout_deinit(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pulseio_pulseout___exit___obj, 4, 4, pulseio_pulseout_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pulseio_pulseout___exit___obj, 4, 4, pulseio_pulseout_obj___exit__); //| def send(self, pulses: ReadableBuffer) -> None: //| """Pulse alternating on and off durations in microseconds starting with on. @@ -106,7 +106,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pulseio_pulseout___exit___obj, 4, 4, //| :param array.array pulses: pulse durations in microseconds""" //| ... //| -STATIC mp_obj_t pulseio_pulseout_obj_send(mp_obj_t self_in, mp_obj_t pulses) { +static mp_obj_t pulseio_pulseout_obj_send(mp_obj_t self_in, mp_obj_t pulses) { pulseio_pulseout_obj_t *self = MP_OBJ_TO_PTR(self_in); if (common_hal_pulseio_pulseout_deinited(self)) { raise_deinited_error(); @@ -123,7 +123,7 @@ STATIC mp_obj_t pulseio_pulseout_obj_send(mp_obj_t self_in, mp_obj_t pulses) { MP_DEFINE_CONST_FUN_OBJ_2(pulseio_pulseout_send_obj, pulseio_pulseout_obj_send); #endif // CIRCUITPY_PULSEIO_PULSEOUT -STATIC const mp_rom_map_elem_t pulseio_pulseout_locals_dict_table[] = { +static const mp_rom_map_elem_t pulseio_pulseout_locals_dict_table[] = { // Methods #if CIRCUITPY_PULSEIO_PULSEOUT { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&pulseio_pulseout_deinit_obj) }, @@ -133,7 +133,7 @@ STATIC const mp_rom_map_elem_t pulseio_pulseout_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_send), MP_ROM_PTR(&pulseio_pulseout_send_obj) }, #endif // CIRCUITPY_PULSEIO_PULSEOUT }; -STATIC MP_DEFINE_CONST_DICT(pulseio_pulseout_locals_dict, pulseio_pulseout_locals_dict_table); +static MP_DEFINE_CONST_DICT(pulseio_pulseout_locals_dict, pulseio_pulseout_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( pulseio_pulseout_type, diff --git a/shared-bindings/pulseio/__init__.c b/shared-bindings/pulseio/__init__.c index 547a78035e5a1..201a8e2661c6f 100644 --- a/shared-bindings/pulseio/__init__.c +++ b/shared-bindings/pulseio/__init__.c @@ -25,13 +25,13 @@ //| call :py:meth:`!deinit` or use a context manager. See //| :ref:`lifetime-and-contextmanagers` for more info.""" -STATIC const mp_rom_map_elem_t pulseio_module_globals_table[] = { +static const mp_rom_map_elem_t pulseio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_pulseio) }, { MP_ROM_QSTR(MP_QSTR_PulseIn), MP_ROM_PTR(&pulseio_pulsein_type) }, { MP_ROM_QSTR(MP_QSTR_PulseOut), MP_ROM_PTR(&pulseio_pulseout_type) }, }; -STATIC MP_DEFINE_CONST_DICT(pulseio_module_globals, pulseio_module_globals_table); +static MP_DEFINE_CONST_DICT(pulseio_module_globals, pulseio_module_globals_table); const mp_obj_module_t pulseio_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/pwmio/PWMOut.c b/shared-bindings/pwmio/PWMOut.c index 7e23c4d8adbe6..e312d4d8facdb 100644 --- a/shared-bindings/pwmio/PWMOut.c +++ b/shared-bindings/pwmio/PWMOut.c @@ -131,7 +131,7 @@ void common_hal_pwmio_pwmout_raise_error(pwmout_result_t result) { //| //| """ //| ... -STATIC mp_obj_t pwmio_pwmout_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { +static mp_obj_t pwmio_pwmout_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { enum { ARG_pin, ARG_duty_cycle, ARG_frequency, ARG_variable_frequency }; static const mp_arg_t allowed_args[] = { { MP_QSTR_pin, MP_ARG_REQUIRED | MP_ARG_OBJ, }, @@ -160,14 +160,14 @@ STATIC mp_obj_t pwmio_pwmout_make_new(const mp_obj_type_t *type, size_t n_args, //| def deinit(self) -> None: //| """Deinitialises the PWMOut and releases any hardware resources for reuse.""" //| ... -STATIC mp_obj_t pwmio_pwmout_deinit(mp_obj_t self_in) { +static mp_obj_t pwmio_pwmout_deinit(mp_obj_t self_in) { pwmio_pwmout_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_pwmio_pwmout_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(pwmio_pwmout_deinit_obj, pwmio_pwmout_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(pwmio_pwmout_deinit_obj, pwmio_pwmout_deinit); -STATIC void check_for_deinit(pwmio_pwmout_obj_t *self) { +static void check_for_deinit(pwmio_pwmout_obj_t *self) { if (common_hal_pwmio_pwmout_deinited(self)) { raise_deinited_error(); } @@ -182,12 +182,12 @@ STATIC void check_for_deinit(pwmio_pwmout_obj_t *self) { //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t pwmio_pwmout_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t pwmio_pwmout_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_pwmio_pwmout_deinit(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pwmio_pwmout___exit___obj, 4, 4, pwmio_pwmout_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pwmio_pwmout___exit___obj, 4, 4, pwmio_pwmout_obj___exit__); //| duty_cycle: int //| """16 bit value that dictates how much of one cycle is high (1) versus low @@ -198,14 +198,14 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pwmio_pwmout___exit___obj, 4, 4, pwmi //| representation for duty cycle might have less than 16 bits of resolution. //| Reading this property will return the value from the internal representation, //| so it may differ from the value set.""" -STATIC mp_obj_t pwmio_pwmout_obj_get_duty_cycle(mp_obj_t self_in) { +static mp_obj_t pwmio_pwmout_obj_get_duty_cycle(mp_obj_t self_in) { pwmio_pwmout_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_pwmio_pwmout_get_duty_cycle(self)); } MP_DEFINE_CONST_FUN_OBJ_1(pwmio_pwmout_get_duty_cycle_obj, pwmio_pwmout_obj_get_duty_cycle); -STATIC mp_obj_t pwmio_pwmout_obj_set_duty_cycle(mp_obj_t self_in, mp_obj_t duty_cycle) { +static mp_obj_t pwmio_pwmout_obj_set_duty_cycle(mp_obj_t self_in, mp_obj_t duty_cycle) { pwmio_pwmout_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); mp_int_t duty = mp_obj_get_int(duty_cycle); @@ -232,14 +232,14 @@ MP_PROPERTY_GETSET(pwmio_pwmout_duty_cycle_obj, //| to manually re-set the duty cycle. However, an output glitch may occur during the adjustment. //| """ //| -STATIC mp_obj_t pwmio_pwmout_obj_get_frequency(mp_obj_t self_in) { +static mp_obj_t pwmio_pwmout_obj_get_frequency(mp_obj_t self_in) { pwmio_pwmout_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_pwmio_pwmout_get_frequency(self)); } MP_DEFINE_CONST_FUN_OBJ_1(pwmio_pwmout_get_frequency_obj, pwmio_pwmout_obj_get_frequency); -STATIC mp_obj_t pwmio_pwmout_obj_set_frequency(mp_obj_t self_in, mp_obj_t frequency) { +static mp_obj_t pwmio_pwmout_obj_set_frequency(mp_obj_t self_in, mp_obj_t frequency) { pwmio_pwmout_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); if (!common_hal_pwmio_pwmout_get_variable_frequency(self)) { @@ -258,7 +258,7 @@ MP_PROPERTY_GETSET(pwmio_pwmout_frequency_obj, (mp_obj_t)&pwmio_pwmout_get_frequency_obj, (mp_obj_t)&pwmio_pwmout_set_frequency_obj); -STATIC const mp_rom_map_elem_t pwmio_pwmout_locals_dict_table[] = { +static const mp_rom_map_elem_t pwmio_pwmout_locals_dict_table[] = { // Methods { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&pwmio_pwmout_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&pwmio_pwmout_deinit_obj) }, @@ -271,7 +271,7 @@ STATIC const mp_rom_map_elem_t pwmio_pwmout_locals_dict_table[] = { // TODO(tannewt): Add enabled to determine whether the signal is output // without giving up the resources. Useful for IR output. }; -STATIC MP_DEFINE_CONST_DICT(pwmio_pwmout_locals_dict, pwmio_pwmout_locals_dict_table); +static MP_DEFINE_CONST_DICT(pwmio_pwmout_locals_dict, pwmio_pwmout_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( pwmio_pwmout_type, diff --git a/shared-bindings/pwmio/__init__.c b/shared-bindings/pwmio/__init__.c index ab5bf7c21fe72..4287e5373dd8c 100644 --- a/shared-bindings/pwmio/__init__.c +++ b/shared-bindings/pwmio/__init__.c @@ -42,12 +42,12 @@ //| Learn guide `_. //| """ -STATIC const mp_rom_map_elem_t pwmio_module_globals_table[] = { +static const mp_rom_map_elem_t pwmio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_pwmio) }, { MP_ROM_QSTR(MP_QSTR_PWMOut), MP_ROM_PTR(&pwmio_pwmout_type) }, }; -STATIC MP_DEFINE_CONST_DICT(pwmio_module_globals, pwmio_module_globals_table); +static MP_DEFINE_CONST_DICT(pwmio_module_globals, pwmio_module_globals_table); const mp_obj_module_t pwmio_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/qrio/PixelPolicy.c b/shared-bindings/qrio/PixelPolicy.c index e086f5da09ba8..b8a422c40fda3 100644 --- a/shared-bindings/qrio/PixelPolicy.c +++ b/shared-bindings/qrio/PixelPolicy.c @@ -39,7 +39,7 @@ MAKE_ENUM_MAP(qrio_pixel_policy) { MAKE_ENUM_MAP_ENTRY(qrio_pixel_policy, EVEN_BYTES), MAKE_ENUM_MAP_ENTRY(qrio_pixel_policy, ODD_BYTES), }; -STATIC MP_DEFINE_CONST_DICT(qrio_pixel_policy_locals_dict, qrio_pixel_policy_locals_table); +static MP_DEFINE_CONST_DICT(qrio_pixel_policy_locals_dict, qrio_pixel_policy_locals_table); MAKE_PRINTER(qrio, qrio_pixel_policy); diff --git a/shared-bindings/qrio/QRDecoder.c b/shared-bindings/qrio/QRDecoder.c index 7ef8a84fa4b33..d9a7b31708dd9 100644 --- a/shared-bindings/qrio/QRDecoder.c +++ b/shared-bindings/qrio/QRDecoder.c @@ -21,7 +21,7 @@ //| """ //| ... -STATIC mp_obj_t qrio_qrdecoder_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args_in) { +static mp_obj_t qrio_qrdecoder_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args_in) { enum { ARG_width, ARG_height }; static const mp_arg_t allowed_args[] = { { MP_QSTR_width, MP_ARG_INT | MP_ARG_REQUIRED, {.u_int = 0} }, @@ -37,7 +37,7 @@ STATIC mp_obj_t qrio_qrdecoder_make_new(const mp_obj_type_t *type, size_t n_args } -STATIC void verify_buffer_size(qrio_qrdecoder_obj_t *self, mp_obj_t *buffer, size_t len, qrio_pixel_policy_t policy) { +static void verify_buffer_size(qrio_qrdecoder_obj_t *self, mp_obj_t *buffer, size_t len, qrio_pixel_policy_t policy) { int width = shared_module_qrio_qrdecoder_get_width(self); int height = shared_module_qrio_qrdecoder_get_height(self); @@ -53,7 +53,7 @@ STATIC void verify_buffer_size(qrio_qrdecoder_obj_t *self, mp_obj_t *buffer, siz //| self, buffer: ReadableBuffer, pixel_policy: PixelPolicy = PixelPolicy.EVERY_BYTE //| ) -> List[QRInfo]: //| """Decode zero or more QR codes from the given image. The size of the buffer must be at least ``length``×``width`` bytes for `EVERY_BYTE`, and 2×``length``×``width`` bytes for `EVEN_BYTES` or `ODD_BYTES`.""" -STATIC mp_obj_t qrio_qrdecoder_decode(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t qrio_qrdecoder_decode(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { qrio_qrdecoder_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); enum { ARG_buffer, ARG_pixel_policy }; @@ -78,7 +78,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(qrio_qrdecoder_decode_obj, 1, qrio_qrdecoder_decode); //| self, buffer: ReadableBuffer, pixel_policy: PixelPolicy = PixelPolicy.EVERY_BYTE //| ) -> List[QRPosition]: //| """Find all visible QR codes from the given image. The size of the buffer must be at least ``length``×``width`` bytes for `EVERY_BYTE`, and 2×``length``×``width`` bytes for `EVEN_BYTES` or `ODD_BYTES`.""" -STATIC mp_obj_t qrio_qrdecoder_find(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t qrio_qrdecoder_find(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { qrio_qrdecoder_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); enum { ARG_buffer, ARG_pixel_policy }; @@ -101,13 +101,13 @@ MP_DEFINE_CONST_FUN_OBJ_KW(qrio_qrdecoder_find_obj, 1, qrio_qrdecoder_find); //| width: int //| """The width of image the decoder expects""" -STATIC mp_obj_t qrio_qrdecoder_get_width(mp_obj_t self_in) { +static mp_obj_t qrio_qrdecoder_get_width(mp_obj_t self_in) { qrio_qrdecoder_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_int(shared_module_qrio_qrdecoder_get_width(self)); } MP_DEFINE_CONST_FUN_OBJ_1(qrio_qrdecoder_get_width_obj, qrio_qrdecoder_get_width); -STATIC mp_obj_t qrio_qrdecoder_set_width(mp_obj_t self_in, mp_obj_t width_in) { +static mp_obj_t qrio_qrdecoder_set_width(mp_obj_t self_in, mp_obj_t width_in) { qrio_qrdecoder_obj_t *self = MP_OBJ_TO_PTR(self_in); int width = mp_obj_get_int(width_in); shared_module_qrio_qrdecoder_set_width(self, width); @@ -122,13 +122,13 @@ MP_PROPERTY_GETSET(qrio_qrdecoder_width_obj, //| height: int //| """The height of image the decoder expects""" //| -STATIC mp_obj_t qrio_qrdecoder_get_height(mp_obj_t self_in) { +static mp_obj_t qrio_qrdecoder_get_height(mp_obj_t self_in) { qrio_qrdecoder_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_int(shared_module_qrio_qrdecoder_get_height(self)); } MP_DEFINE_CONST_FUN_OBJ_1(qrio_qrdecoder_get_height_obj, qrio_qrdecoder_get_height); -STATIC mp_obj_t qrio_qrdecoder_set_height(mp_obj_t self_in, mp_obj_t height_in) { +static mp_obj_t qrio_qrdecoder_set_height(mp_obj_t self_in, mp_obj_t height_in) { qrio_qrdecoder_obj_t *self = MP_OBJ_TO_PTR(self_in); int height = mp_obj_get_int(height_in); shared_module_qrio_qrdecoder_set_height(self, height); @@ -140,7 +140,7 @@ MP_PROPERTY_GETSET(qrio_qrdecoder_height_obj, (mp_obj_t)&qrio_qrdecoder_get_height_obj, (mp_obj_t)&qrio_qrdecoder_set_height_obj); -STATIC const mp_rom_map_elem_t qrio_qrdecoder_locals_table[] = { +static const mp_rom_map_elem_t qrio_qrdecoder_locals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_QRDecoder) }, { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&qrio_qrdecoder_width_obj) }, { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&qrio_qrdecoder_height_obj) }, @@ -148,7 +148,7 @@ STATIC const mp_rom_map_elem_t qrio_qrdecoder_locals_table[] = { { MP_ROM_QSTR(MP_QSTR_find), MP_ROM_PTR(&qrio_qrdecoder_find_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(qrio_qrdecoder_locals, qrio_qrdecoder_locals_table); +static MP_DEFINE_CONST_DICT(qrio_qrdecoder_locals, qrio_qrdecoder_locals_table); MP_DEFINE_CONST_OBJ_TYPE( qrio_qrdecoder_type_obj, diff --git a/shared-bindings/qrio/__init__.c b/shared-bindings/qrio/__init__.c index b3093c6b4eca2..5b8f2b901ca7b 100644 --- a/shared-bindings/qrio/__init__.c +++ b/shared-bindings/qrio/__init__.c @@ -21,14 +21,14 @@ //| to generate a QR code, use the //| `adafruit_miniqr library `_""" -STATIC const mp_rom_map_elem_t qrio_module_globals_table[] = { +static const mp_rom_map_elem_t qrio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_qrio) }, { MP_ROM_QSTR(MP_QSTR_QRInfo), MP_ROM_PTR(&qrio_qrinfo_type_obj) }, { MP_ROM_QSTR(MP_QSTR_QRDecoder), MP_ROM_PTR(&qrio_qrdecoder_type_obj) }, { MP_ROM_QSTR(MP_QSTR_PixelPolicy), MP_ROM_PTR(&qrio_pixel_policy_type) }, }; -STATIC MP_DEFINE_CONST_DICT(qrio_module_globals, qrio_module_globals_table); +static MP_DEFINE_CONST_DICT(qrio_module_globals, qrio_module_globals_table); const mp_obj_module_t qrio_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/rainbowio/__init__.c b/shared-bindings/rainbowio/__init__.c index dc20c1416f1d0..ad32f091ad1e3 100644 --- a/shared-bindings/rainbowio/__init__.c +++ b/shared-bindings/rainbowio/__init__.c @@ -17,18 +17,18 @@ //| """ //| ... //| -STATIC mp_obj_t rainbowio_colorwheel(mp_obj_t n) { +static mp_obj_t rainbowio_colorwheel(mp_obj_t n) { mp_float_t f = mp_obj_get_float(n); return MP_OBJ_NEW_SMALL_INT(colorwheel(f)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(rainbowio_colorwheel_obj, rainbowio_colorwheel); +static MP_DEFINE_CONST_FUN_OBJ_1(rainbowio_colorwheel_obj, rainbowio_colorwheel); -STATIC const mp_rom_map_elem_t rainbowio_module_globals_table[] = { +static const mp_rom_map_elem_t rainbowio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_rainbowio) }, { MP_ROM_QSTR(MP_QSTR_colorwheel), MP_ROM_PTR(&rainbowio_colorwheel_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(rainbowio_module_globals, rainbowio_module_globals_table); +static MP_DEFINE_CONST_DICT(rainbowio_module_globals, rainbowio_module_globals_table); const mp_obj_module_t rainbowio_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/random/__init__.c b/shared-bindings/random/__init__.c index 3185a439fe565..e255174fc1b6c 100644 --- a/shared-bindings/random/__init__.c +++ b/shared-bindings/random/__init__.c @@ -33,25 +33,25 @@ //| `random` will return deterministic results afterwards.""" //| ... //| -STATIC mp_obj_t random_seed(mp_obj_t seed_in) { +static mp_obj_t random_seed(mp_obj_t seed_in) { mp_uint_t seed = mp_obj_get_int_truncated(seed_in); shared_modules_random_seed(seed); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(random_seed_obj, random_seed); +static MP_DEFINE_CONST_FUN_OBJ_1(random_seed_obj, random_seed); //| def getrandbits(k: int) -> int: //| """Returns an integer with *k* random bits.""" //| ... //| -STATIC mp_obj_t random_getrandbits(mp_obj_t num_in) { +static mp_obj_t random_getrandbits(mp_obj_t num_in) { mp_int_t n = mp_obj_get_int(num_in); if (n > 32 || n < 0) { mp_raise_ValueError(NULL); } return mp_obj_new_int_from_uint(shared_modules_random_getrandbits((uint8_t)n)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(random_getrandbits_obj, random_getrandbits); +static MP_DEFINE_CONST_FUN_OBJ_1(random_getrandbits_obj, random_getrandbits); //| @overload //| def randrange(stop: int) -> int: ... @@ -62,7 +62,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(random_getrandbits_obj, random_getrandbits); //| """Returns a randomly selected integer from ``range(start[, stop[, step]])``.""" //| ... //| -STATIC mp_obj_t random_randrange(size_t n_args, const mp_obj_t *args) { +static mp_obj_t random_randrange(size_t n_args, const mp_obj_t *args) { mp_int_t start = 0; mp_int_t stop = mp_obj_get_int(args[0]); mp_int_t step = 1; @@ -98,14 +98,14 @@ STATIC mp_obj_t random_randrange(size_t n_args, const mp_obj_t *args) { return mp_obj_new_int(shared_modules_random_randrange(start, stop, step)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(random_randrange_obj, 1, 3, random_randrange); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(random_randrange_obj, 1, 3, random_randrange); //| def randint(a: int, b: int) -> int: //| """Returns a randomly selected integer between a and b inclusive. Equivalent //| to ``randrange(a, b + 1, 1)``""" //| ... //| -STATIC mp_obj_t random_randint(mp_obj_t a_in, mp_obj_t b_in) { +static mp_obj_t random_randint(mp_obj_t a_in, mp_obj_t b_in) { mp_int_t a = mp_obj_get_int(a_in); mp_int_t b = mp_obj_get_int(b_in); if (a > b) { @@ -113,44 +113,44 @@ STATIC mp_obj_t random_randint(mp_obj_t a_in, mp_obj_t b_in) { } return mp_obj_new_int(shared_modules_random_randrange(a, b + 1, 1)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(random_randint_obj, random_randint); +static MP_DEFINE_CONST_FUN_OBJ_2(random_randint_obj, random_randint); //| def choice(seq: Sequence[_T]) -> _T: //| """Returns a randomly selected element from the given sequence. Raises //| IndexError when the sequence is empty.""" //| ... //| -STATIC mp_obj_t random_choice(mp_obj_t seq) { +static mp_obj_t random_choice(mp_obj_t seq) { mp_int_t len = mp_obj_get_int(mp_obj_len(seq)); if (len == 0) { mp_raise_IndexError(MP_ERROR_TEXT("empty sequence")); } return mp_obj_subscr(seq, mp_obj_new_int(shared_modules_random_randrange(0, len, 1)), MP_OBJ_SENTINEL); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(random_choice_obj, random_choice); +static MP_DEFINE_CONST_FUN_OBJ_1(random_choice_obj, random_choice); //| def random() -> float: //| """Returns a random float between 0 and 1.0.""" //| ... //| -STATIC mp_obj_t random_random(void) { +static mp_obj_t random_random(void) { return mp_obj_new_float(shared_modules_random_random()); } -STATIC MP_DEFINE_CONST_FUN_OBJ_0(random_random_obj, random_random); +static MP_DEFINE_CONST_FUN_OBJ_0(random_random_obj, random_random); //| def uniform(a: float, b: float) -> float: //| """Returns a random float between a and b. It may or may not be inclusive //| depending on float rounding.""" //| ... //| -STATIC mp_obj_t random_uniform(mp_obj_t a_in, mp_obj_t b_in) { +static mp_obj_t random_uniform(mp_obj_t a_in, mp_obj_t b_in) { mp_float_t a = mp_obj_get_float(a_in); mp_float_t b = mp_obj_get_float(b_in); return mp_obj_new_float(shared_modules_random_uniform(a, b)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(random_uniform_obj, random_uniform); +static MP_DEFINE_CONST_FUN_OBJ_2(random_uniform_obj, random_uniform); -STATIC const mp_rom_map_elem_t mp_module_random_globals_table[] = { +static const mp_rom_map_elem_t mp_module_random_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_random) }, { MP_ROM_QSTR(MP_QSTR_seed), MP_ROM_PTR(&random_seed_obj) }, { MP_ROM_QSTR(MP_QSTR_getrandbits), MP_ROM_PTR(&random_getrandbits_obj) }, @@ -161,7 +161,7 @@ STATIC const mp_rom_map_elem_t mp_module_random_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_uniform), MP_ROM_PTR(&random_uniform_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(mp_module_random_globals, mp_module_random_globals_table); +static MP_DEFINE_CONST_DICT(mp_module_random_globals, mp_module_random_globals_table); const mp_obj_module_t random_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/rgbmatrix/RGBMatrix.c b/shared-bindings/rgbmatrix/RGBMatrix.c index b602e8468bbe3..bb4b5093330ef 100644 --- a/shared-bindings/rgbmatrix/RGBMatrix.c +++ b/shared-bindings/rgbmatrix/RGBMatrix.c @@ -24,24 +24,24 @@ extern Protomatter_core *_PM_protoPtr; -STATIC uint8_t validate_pin(mp_obj_t obj, qstr arg_name) { +static uint8_t validate_pin(mp_obj_t obj, qstr arg_name) { const mcu_pin_obj_t *result = validate_obj_is_free_pin(obj, arg_name); return common_hal_mcu_pin_number(result); } -STATIC void claim_and_never_reset_pin(mp_obj_t pin) { +static void claim_and_never_reset_pin(mp_obj_t pin) { common_hal_mcu_pin_claim(pin); common_hal_never_reset_pin(pin); } -STATIC void claim_and_never_reset_pins(mp_obj_t seq) { +static void claim_and_never_reset_pins(mp_obj_t seq) { mp_int_t len = MP_OBJ_SMALL_INT_VALUE(mp_obj_len(seq)); for (mp_int_t i = 0; i < len; i++) { claim_and_never_reset_pin(mp_obj_subscr(seq, MP_OBJ_NEW_SMALL_INT(i), MP_OBJ_SENTINEL)); } } -STATIC void preflight_pins_or_throw(uint8_t clock_pin, uint8_t *rgb_pins, uint8_t rgb_pin_count, bool allow_inefficient) { +static void preflight_pins_or_throw(uint8_t clock_pin, uint8_t *rgb_pins, uint8_t rgb_pin_count, bool allow_inefficient) { if (rgb_pin_count <= 0 || rgb_pin_count % 6 != 0 || rgb_pin_count > 30) { mp_raise_ValueError_varg(MP_ERROR_TEXT("The length of rgb_pins must be 6, 12, 18, 24, or 30")); } @@ -194,7 +194,7 @@ STATIC void preflight_pins_or_throw(uint8_t clock_pin, uint8_t *rgb_pins, uint8_ //| :param int height: The optional overall height of the whole matrix in pixels. This value is not required because it can be calculated as described above. //| """ -STATIC mp_obj_t rgbmatrix_rgbmatrix_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t rgbmatrix_rgbmatrix_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_width, ARG_bit_depth, ARG_rgb_list, ARG_addr_list, ARG_clock_pin, ARG_latch_pin, ARG_output_enable_pin, ARG_doublebuffer, ARG_framebuffer, ARG_height, ARG_tile, ARG_serpentine }; static const mp_arg_t allowed_args[] = { @@ -269,13 +269,13 @@ STATIC mp_obj_t rgbmatrix_rgbmatrix_make_new(const mp_obj_type_t *type, size_t n //| rgbmatrix instance. After deinitialization, no further operations //| may be performed.""" //| ... -STATIC mp_obj_t rgbmatrix_rgbmatrix_deinit(mp_obj_t self_in) { +static mp_obj_t rgbmatrix_rgbmatrix_deinit(mp_obj_t self_in) { rgbmatrix_rgbmatrix_obj_t *self = (rgbmatrix_rgbmatrix_obj_t *)self_in; common_hal_rgbmatrix_rgbmatrix_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(rgbmatrix_rgbmatrix_deinit_obj, rgbmatrix_rgbmatrix_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(rgbmatrix_rgbmatrix_deinit_obj, rgbmatrix_rgbmatrix_deinit); static void check_for_deinit(rgbmatrix_rgbmatrix_obj_t *self) { if (!self->protomatter.rgbPins) { @@ -286,14 +286,14 @@ static void check_for_deinit(rgbmatrix_rgbmatrix_obj_t *self) { //| brightness: float //| """In the current implementation, 0.0 turns the display off entirely //| and any other value up to 1.0 turns the display on fully.""" -STATIC mp_obj_t rgbmatrix_rgbmatrix_get_brightness(mp_obj_t self_in) { +static mp_obj_t rgbmatrix_rgbmatrix_get_brightness(mp_obj_t self_in) { rgbmatrix_rgbmatrix_obj_t *self = (rgbmatrix_rgbmatrix_obj_t *)self_in; check_for_deinit(self); return mp_obj_new_float(common_hal_rgbmatrix_rgbmatrix_get_paused(self)? 0.0f : 1.0f); } MP_DEFINE_CONST_FUN_OBJ_1(rgbmatrix_rgbmatrix_get_brightness_obj, rgbmatrix_rgbmatrix_get_brightness); -STATIC mp_obj_t rgbmatrix_rgbmatrix_set_brightness(mp_obj_t self_in, mp_obj_t value_in) { +static mp_obj_t rgbmatrix_rgbmatrix_set_brightness(mp_obj_t self_in, mp_obj_t value_in) { rgbmatrix_rgbmatrix_obj_t *self = (rgbmatrix_rgbmatrix_obj_t *)self_in; check_for_deinit(self); mp_float_t brightness = mp_obj_get_float(value_in); @@ -314,7 +314,7 @@ MP_PROPERTY_GETSET(rgbmatrix_rgbmatrix_brightness_obj, //| """Transmits the color data in the buffer to the pixels so that //| they are shown.""" //| ... -STATIC mp_obj_t rgbmatrix_rgbmatrix_refresh(mp_obj_t self_in) { +static mp_obj_t rgbmatrix_rgbmatrix_refresh(mp_obj_t self_in) { rgbmatrix_rgbmatrix_obj_t *self = (rgbmatrix_rgbmatrix_obj_t *)self_in; check_for_deinit(self); common_hal_rgbmatrix_rgbmatrix_refresh(self); @@ -324,7 +324,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(rgbmatrix_rgbmatrix_refresh_obj, rgbmatrix_rgbmatrix_r //| width: int //| """The width of the display, in pixels""" -STATIC mp_obj_t rgbmatrix_rgbmatrix_get_width(mp_obj_t self_in) { +static mp_obj_t rgbmatrix_rgbmatrix_get_width(mp_obj_t self_in) { rgbmatrix_rgbmatrix_obj_t *self = (rgbmatrix_rgbmatrix_obj_t *)self_in; check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_rgbmatrix_rgbmatrix_get_width(self)); @@ -336,7 +336,7 @@ MP_PROPERTY_GETTER(rgbmatrix_rgbmatrix_width_obj, //| height: int //| """The height of the display, in pixels""" //| -STATIC mp_obj_t rgbmatrix_rgbmatrix_get_height(mp_obj_t self_in) { +static mp_obj_t rgbmatrix_rgbmatrix_get_height(mp_obj_t self_in) { rgbmatrix_rgbmatrix_obj_t *self = (rgbmatrix_rgbmatrix_obj_t *)self_in; check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_rgbmatrix_rgbmatrix_get_height(self)); @@ -346,61 +346,61 @@ MP_DEFINE_CONST_FUN_OBJ_1(rgbmatrix_rgbmatrix_get_height_obj, rgbmatrix_rgbmatri MP_PROPERTY_GETTER(rgbmatrix_rgbmatrix_height_obj, (mp_obj_t)&rgbmatrix_rgbmatrix_get_height_obj); -STATIC const mp_rom_map_elem_t rgbmatrix_rgbmatrix_locals_dict_table[] = { +static const mp_rom_map_elem_t rgbmatrix_rgbmatrix_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&rgbmatrix_rgbmatrix_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR_brightness), MP_ROM_PTR(&rgbmatrix_rgbmatrix_brightness_obj) }, { MP_ROM_QSTR(MP_QSTR_refresh), MP_ROM_PTR(&rgbmatrix_rgbmatrix_refresh_obj) }, { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&rgbmatrix_rgbmatrix_width_obj) }, { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&rgbmatrix_rgbmatrix_height_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(rgbmatrix_rgbmatrix_locals_dict, rgbmatrix_rgbmatrix_locals_dict_table); +static MP_DEFINE_CONST_DICT(rgbmatrix_rgbmatrix_locals_dict, rgbmatrix_rgbmatrix_locals_dict_table); -STATIC void rgbmatrix_rgbmatrix_get_bufinfo(mp_obj_t self_in, mp_buffer_info_t *bufinfo) { +static void rgbmatrix_rgbmatrix_get_bufinfo(mp_obj_t self_in, mp_buffer_info_t *bufinfo) { common_hal_rgbmatrix_rgbmatrix_get_bufinfo(self_in, bufinfo); } // These version exists so that the prototype matches the protocol, // avoiding a type cast that can hide errors -STATIC void rgbmatrix_rgbmatrix_swapbuffers(mp_obj_t self_in, uint8_t *dirty_row_bitmap) { +static void rgbmatrix_rgbmatrix_swapbuffers(mp_obj_t self_in, uint8_t *dirty_row_bitmap) { (void)dirty_row_bitmap; common_hal_rgbmatrix_rgbmatrix_refresh(self_in); } -STATIC void rgbmatrix_rgbmatrix_deinit_proto(mp_obj_t self_in) { +static void rgbmatrix_rgbmatrix_deinit_proto(mp_obj_t self_in) { common_hal_rgbmatrix_rgbmatrix_deinit(self_in); } -STATIC float rgbmatrix_rgbmatrix_get_brightness_proto(mp_obj_t self_in) { +static float rgbmatrix_rgbmatrix_get_brightness_proto(mp_obj_t self_in) { return common_hal_rgbmatrix_rgbmatrix_get_paused(self_in) ? 0.0f : 1.0f; } -STATIC bool rgbmatrix_rgbmatrix_set_brightness_proto(mp_obj_t self_in, mp_float_t value) { +static bool rgbmatrix_rgbmatrix_set_brightness_proto(mp_obj_t self_in, mp_float_t value) { common_hal_rgbmatrix_rgbmatrix_set_paused(self_in, value <= 0); return true; } -STATIC int rgbmatrix_rgbmatrix_get_width_proto(mp_obj_t self_in) { +static int rgbmatrix_rgbmatrix_get_width_proto(mp_obj_t self_in) { return common_hal_rgbmatrix_rgbmatrix_get_width(self_in); } -STATIC int rgbmatrix_rgbmatrix_get_height_proto(mp_obj_t self_in) { +static int rgbmatrix_rgbmatrix_get_height_proto(mp_obj_t self_in) { return common_hal_rgbmatrix_rgbmatrix_get_height(self_in); } -STATIC int rgbmatrix_rgbmatrix_get_color_depth_proto(mp_obj_t self_in) { +static int rgbmatrix_rgbmatrix_get_color_depth_proto(mp_obj_t self_in) { return 16; } -STATIC int rgbmatrix_rgbmatrix_get_bytes_per_cell_proto(mp_obj_t self_in) { +static int rgbmatrix_rgbmatrix_get_bytes_per_cell_proto(mp_obj_t self_in) { return 1; } -STATIC int rgbmatrix_rgbmatrix_get_native_frames_per_second_proto(mp_obj_t self_in) { +static int rgbmatrix_rgbmatrix_get_native_frames_per_second_proto(mp_obj_t self_in) { return 250; } -STATIC const framebuffer_p_t rgbmatrix_rgbmatrix_proto = { +static const framebuffer_p_t rgbmatrix_rgbmatrix_proto = { MP_PROTO_IMPLEMENT(MP_QSTR_protocol_framebuffer) .get_bufinfo = rgbmatrix_rgbmatrix_get_bufinfo, .set_brightness = rgbmatrix_rgbmatrix_set_brightness_proto, @@ -414,7 +414,7 @@ STATIC const framebuffer_p_t rgbmatrix_rgbmatrix_proto = { .deinit = rgbmatrix_rgbmatrix_deinit_proto, }; -STATIC mp_int_t rgbmatrix_rgbmatrix_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) { +static mp_int_t rgbmatrix_rgbmatrix_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) { rgbmatrix_rgbmatrix_obj_t *self = (rgbmatrix_rgbmatrix_obj_t *)self_in; // a readonly framebuffer would be unusual but not impossible if ((flags & MP_BUFFER_WRITE) && !(self->bufinfo.typecode & MP_OBJ_ARRAY_TYPECODE_FLAG_RW)) { diff --git a/shared-bindings/rgbmatrix/__init__.c b/shared-bindings/rgbmatrix/__init__.c index 60865df560774..f6e0c43fb9315 100644 --- a/shared-bindings/rgbmatrix/__init__.c +++ b/shared-bindings/rgbmatrix/__init__.c @@ -17,12 +17,12 @@ //| `the dedicated learn guide `_. //| """ -STATIC const mp_rom_map_elem_t rgbmatrix_module_globals_table[] = { +static const mp_rom_map_elem_t rgbmatrix_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_rgbmatrix) }, { MP_ROM_QSTR(MP_QSTR_RGBMatrix), MP_ROM_PTR(&rgbmatrix_RGBMatrix_type) }, }; -STATIC MP_DEFINE_CONST_DICT(rgbmatrix_module_globals, rgbmatrix_module_globals_table); +static MP_DEFINE_CONST_DICT(rgbmatrix_module_globals, rgbmatrix_module_globals_table); const mp_obj_module_t rgbmatrix_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/rotaryio/IncrementalEncoder.c b/shared-bindings/rotaryio/IncrementalEncoder.c index 2310b82bc2587..9b92daf13a05d 100644 --- a/shared-bindings/rotaryio/IncrementalEncoder.c +++ b/shared-bindings/rotaryio/IncrementalEncoder.c @@ -44,7 +44,7 @@ //| print(position) //| last_position = position""" //| ... -STATIC mp_obj_t rotaryio_incrementalencoder_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t rotaryio_incrementalencoder_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_pin_a, ARG_pin_b, ARG_divisor }; static const mp_arg_t allowed_args[] = { { MP_QSTR_pin_a, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -69,14 +69,14 @@ STATIC mp_obj_t rotaryio_incrementalencoder_make_new(const mp_obj_type_t *type, //| def deinit(self) -> None: //| """Deinitializes the IncrementalEncoder and releases any hardware resources for reuse.""" //| ... -STATIC mp_obj_t rotaryio_incrementalencoder_deinit(mp_obj_t self_in) { +static mp_obj_t rotaryio_incrementalencoder_deinit(mp_obj_t self_in) { rotaryio_incrementalencoder_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_rotaryio_incrementalencoder_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(rotaryio_incrementalencoder_deinit_obj, rotaryio_incrementalencoder_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(rotaryio_incrementalencoder_deinit_obj, rotaryio_incrementalencoder_deinit); -STATIC void check_for_deinit(rotaryio_incrementalencoder_obj_t *self) { +static void check_for_deinit(rotaryio_incrementalencoder_obj_t *self) { if (common_hal_rotaryio_incrementalencoder_deinited(self)) { raise_deinited_error(); } @@ -91,19 +91,19 @@ STATIC void check_for_deinit(rotaryio_incrementalencoder_obj_t *self) { //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t rotaryio_incrementalencoder_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t rotaryio_incrementalencoder_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_rotaryio_incrementalencoder_deinit(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(rotaryio_incrementalencoder___exit___obj, 4, 4, rotaryio_incrementalencoder_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(rotaryio_incrementalencoder___exit___obj, 4, 4, rotaryio_incrementalencoder_obj___exit__); //| divisor: int //| """The divisor of the quadrature signal. Use 1 for encoders without //| detents, or encoders with 4 detents per cycle. Use 2 for encoders with 2 //| detents per cycle. Use 4 for encoders with 1 detent per cycle.""" -STATIC mp_obj_t rotaryio_incrementalencoder_obj_get_divisor(mp_obj_t self_in) { +static mp_obj_t rotaryio_incrementalencoder_obj_get_divisor(mp_obj_t self_in) { rotaryio_incrementalencoder_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -111,7 +111,7 @@ STATIC mp_obj_t rotaryio_incrementalencoder_obj_get_divisor(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(rotaryio_incrementalencoder_get_divisor_obj, rotaryio_incrementalencoder_obj_get_divisor); -STATIC mp_obj_t rotaryio_incrementalencoder_obj_set_divisor(mp_obj_t self_in, mp_obj_t new_divisor) { +static mp_obj_t rotaryio_incrementalencoder_obj_set_divisor(mp_obj_t self_in, mp_obj_t new_divisor) { rotaryio_incrementalencoder_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -128,7 +128,7 @@ MP_PROPERTY_GETSET(rotaryio_incrementalencoder_divisor_obj, //| """The current position in terms of pulses. The number of pulses per rotation is defined by the //| specific hardware and by the divisor.""" //| -STATIC mp_obj_t rotaryio_incrementalencoder_obj_get_position(mp_obj_t self_in) { +static mp_obj_t rotaryio_incrementalencoder_obj_get_position(mp_obj_t self_in) { rotaryio_incrementalencoder_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -136,7 +136,7 @@ STATIC mp_obj_t rotaryio_incrementalencoder_obj_get_position(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(rotaryio_incrementalencoder_get_position_obj, rotaryio_incrementalencoder_obj_get_position); -STATIC mp_obj_t rotaryio_incrementalencoder_obj_set_position(mp_obj_t self_in, mp_obj_t new_position) { +static mp_obj_t rotaryio_incrementalencoder_obj_set_position(mp_obj_t self_in, mp_obj_t new_position) { rotaryio_incrementalencoder_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); @@ -149,7 +149,7 @@ MP_PROPERTY_GETSET(rotaryio_incrementalencoder_position_obj, (mp_obj_t)&rotaryio_incrementalencoder_get_position_obj, (mp_obj_t)&rotaryio_incrementalencoder_set_position_obj); -STATIC const mp_rom_map_elem_t rotaryio_incrementalencoder_locals_dict_table[] = { +static const mp_rom_map_elem_t rotaryio_incrementalencoder_locals_dict_table[] = { // Methods { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&rotaryio_incrementalencoder_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&rotaryio_incrementalencoder_deinit_obj) }, @@ -158,7 +158,7 @@ STATIC const mp_rom_map_elem_t rotaryio_incrementalencoder_locals_dict_table[] = { MP_ROM_QSTR(MP_QSTR_position), MP_ROM_PTR(&rotaryio_incrementalencoder_position_obj) }, { MP_ROM_QSTR(MP_QSTR_divisor), MP_ROM_PTR(&rotaryio_incrementalencoder_divisor_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(rotaryio_incrementalencoder_locals_dict, rotaryio_incrementalencoder_locals_dict_table); +static MP_DEFINE_CONST_DICT(rotaryio_incrementalencoder_locals_dict, rotaryio_incrementalencoder_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( rotaryio_incrementalencoder_type, diff --git a/shared-bindings/rotaryio/__init__.c b/shared-bindings/rotaryio/__init__.c index 62f1f5b0fb477..7f31811e149c4 100644 --- a/shared-bindings/rotaryio/__init__.c +++ b/shared-bindings/rotaryio/__init__.c @@ -27,12 +27,12 @@ //| call :py:meth:`!deinit` or use a context manager. See //| :ref:`lifetime-and-contextmanagers` for more info.""" -STATIC const mp_rom_map_elem_t rotaryio_module_globals_table[] = { +static const mp_rom_map_elem_t rotaryio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_rotaryio) }, { MP_ROM_QSTR(MP_QSTR_IncrementalEncoder), MP_ROM_PTR(&rotaryio_incrementalencoder_type) }, }; -STATIC MP_DEFINE_CONST_DICT(rotaryio_module_globals, rotaryio_module_globals_table); +static MP_DEFINE_CONST_DICT(rotaryio_module_globals, rotaryio_module_globals_table); const mp_obj_module_t rotaryio_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/rtc/RTC.c b/shared-bindings/rtc/RTC.c index f56467ee575f0..01686a75d9fd3 100644 --- a/shared-bindings/rtc/RTC.c +++ b/shared-bindings/rtc/RTC.c @@ -23,7 +23,7 @@ const rtc_rtc_obj_t rtc_rtc_obj = {{&rtc_rtc_type}}; //| def __init__(self) -> None: //| """This class represents the onboard Real Time Clock. It is a singleton and will always return the same instance.""" //| ... -STATIC mp_obj_t rtc_rtc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { +static mp_obj_t rtc_rtc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { // No arguments mp_arg_check_num(n_args, n_kw, 0, 0, false); @@ -49,14 +49,14 @@ STATIC mp_obj_t rtc_rtc_make_new(const mp_obj_type_t *type, size_t n_args, size_ //| current_time = r.datetime //| print(current_time) //| # struct_time(tm_year=2019, tm_month=5, ...)""" -STATIC mp_obj_t rtc_rtc_obj_get_datetime(mp_obj_t self_in) { +static mp_obj_t rtc_rtc_obj_get_datetime(mp_obj_t self_in) { timeutils_struct_time_t tm; common_hal_rtc_get_time(&tm); return struct_time_from_tm(&tm); } MP_DEFINE_CONST_FUN_OBJ_1(rtc_rtc_get_datetime_obj, rtc_rtc_obj_get_datetime); -STATIC mp_obj_t rtc_rtc_obj_set_datetime(mp_obj_t self_in, mp_obj_t datetime) { +static mp_obj_t rtc_rtc_obj_set_datetime(mp_obj_t self_in, mp_obj_t datetime) { timeutils_struct_time_t tm; struct_time_to_tm(datetime, &tm); common_hal_rtc_set_time(&tm); @@ -83,13 +83,13 @@ MP_PROPERTY_GETSET(rtc_rtc_datetime_obj, //| r = rtc.RTC() //| r.calibration = 1""" //| -STATIC mp_obj_t rtc_rtc_obj_get_calibration(mp_obj_t self_in) { +static mp_obj_t rtc_rtc_obj_get_calibration(mp_obj_t self_in) { int calibration = common_hal_rtc_get_calibration(); return mp_obj_new_int(calibration); } MP_DEFINE_CONST_FUN_OBJ_1(rtc_rtc_get_calibration_obj, rtc_rtc_obj_get_calibration); -STATIC mp_obj_t rtc_rtc_obj_set_calibration(mp_obj_t self_in, mp_obj_t calibration) { +static mp_obj_t rtc_rtc_obj_set_calibration(mp_obj_t self_in, mp_obj_t calibration) { common_hal_rtc_set_calibration(mp_obj_get_int(calibration)); return mp_const_none; } @@ -99,11 +99,11 @@ MP_PROPERTY_GETSET(rtc_rtc_calibration_obj, (mp_obj_t)&rtc_rtc_get_calibration_obj, (mp_obj_t)&rtc_rtc_set_calibration_obj); -STATIC const mp_rom_map_elem_t rtc_rtc_locals_dict_table[] = { +static const mp_rom_map_elem_t rtc_rtc_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_datetime), MP_ROM_PTR(&rtc_rtc_datetime_obj) }, { MP_ROM_QSTR(MP_QSTR_calibration), MP_ROM_PTR(&rtc_rtc_calibration_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(rtc_rtc_locals_dict, rtc_rtc_locals_dict_table); +static MP_DEFINE_CONST_DICT(rtc_rtc_locals_dict, rtc_rtc_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( rtc_rtc_type, diff --git a/shared-bindings/rtc/__init__.c b/shared-bindings/rtc/__init__.c index e89a550dd64e7..16158413d1875 100644 --- a/shared-bindings/rtc/__init__.c +++ b/shared-bindings/rtc/__init__.c @@ -47,20 +47,20 @@ mp_obj_t rtc_get_time_source_time(void) { //| rtc.set_time_source(r)""" //| ... //| -STATIC mp_obj_t rtc_set_time_source(mp_obj_t time_source) { +static mp_obj_t rtc_set_time_source(mp_obj_t time_source) { MP_STATE_VM(rtc_time_source) = time_source; return mp_const_none; } MP_DEFINE_CONST_FUN_OBJ_1(rtc_set_time_source_obj, rtc_set_time_source); -STATIC const mp_rom_map_elem_t rtc_module_globals_table[] = { +static const mp_rom_map_elem_t rtc_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_rtc) }, { MP_ROM_QSTR(MP_QSTR_set_time_source), MP_ROM_PTR(&rtc_set_time_source_obj) }, { MP_ROM_QSTR(MP_QSTR_RTC), MP_ROM_PTR(&rtc_rtc_type) }, }; -STATIC MP_DEFINE_CONST_DICT(rtc_module_globals, rtc_module_globals_table); +static MP_DEFINE_CONST_DICT(rtc_module_globals, rtc_module_globals_table); const mp_obj_module_t rtc_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/sdcardio/SDCard.c b/shared-bindings/sdcardio/SDCard.c index bc5fb1d5ed201..97bd51c001932 100644 --- a/shared-bindings/sdcardio/SDCard.c +++ b/shared-bindings/sdcardio/SDCard.c @@ -57,7 +57,7 @@ //| storage.mount(vfs, '/sd') //| os.listdir('/sd')""" -STATIC mp_obj_t sdcardio_sdcard_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t sdcardio_sdcard_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_spi, ARG_cs, ARG_baudrate, NUM_ARGS }; static const mp_arg_t allowed_args[] = { { MP_QSTR_spi, MP_ARG_OBJ, {.u_obj = mp_const_none } }, @@ -85,7 +85,7 @@ STATIC mp_obj_t sdcardio_sdcard_make_new(const mp_obj_type_t *type, size_t n_arg //| Due to technical limitations, this is a function and not a property. //| //| :return: The number of 512-byte blocks, as a number""" -STATIC mp_obj_t sdcardio_sdcard_count(mp_obj_t self_in) { +static mp_obj_t sdcardio_sdcard_count(mp_obj_t self_in) { sdcardio_sdcard_obj_t *self = (sdcardio_sdcard_obj_t *)self_in; return mp_obj_new_int_from_ull(common_hal_sdcardio_sdcard_get_blockcount(self)); } @@ -95,7 +95,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(sdcardio_sdcard_count_obj, sdcardio_sdcard_count); //| """Disable permanently. //| //| :return: None""" -STATIC mp_obj_t sdcardio_sdcard_deinit(mp_obj_t self_in) { +static mp_obj_t sdcardio_sdcard_deinit(mp_obj_t self_in) { sdcardio_sdcard_obj_t *self = (sdcardio_sdcard_obj_t *)self_in; common_hal_sdcardio_sdcard_deinit(self); return mp_const_none; @@ -111,7 +111,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(sdcardio_sdcard_deinit_obj, sdcardio_sdcard_deinit); //| //| :return: None""" -STATIC mp_obj_t _sdcardio_sdcard_readblocks(mp_obj_t self_in, mp_obj_t start_block_in, mp_obj_t buf_in) { +static mp_obj_t _sdcardio_sdcard_readblocks(mp_obj_t self_in, mp_obj_t start_block_in, mp_obj_t buf_in) { uint32_t start_block = mp_obj_get_int(start_block_in); mp_buffer_info_t bufinfo; mp_get_buffer_raise(buf_in, &bufinfo, MP_BUFFER_WRITE); @@ -130,7 +130,7 @@ MP_DEFINE_CONST_FUN_OBJ_3(sdcardio_sdcard_readblocks_obj, _sdcardio_sdcard_readb //| //| :return: None""" //| ... -STATIC mp_obj_t sdcardio_sdcard_sync(mp_obj_t self_in) { +static mp_obj_t sdcardio_sdcard_sync(mp_obj_t self_in) { sdcardio_sdcard_obj_t *self = (sdcardio_sdcard_obj_t *)self_in; int result = common_hal_sdcardio_sdcard_sync(self); if (result < 0) { @@ -151,7 +151,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(sdcardio_sdcard_sync_obj, sdcardio_sdcard_sync); //| :return: None""" //| -STATIC mp_obj_t _sdcardio_sdcard_writeblocks(mp_obj_t self_in, mp_obj_t start_block_in, mp_obj_t buf_in) { +static mp_obj_t _sdcardio_sdcard_writeblocks(mp_obj_t self_in, mp_obj_t start_block_in, mp_obj_t buf_in) { uint32_t start_block = mp_obj_get_int(start_block_in); mp_buffer_info_t bufinfo; mp_get_buffer_raise(buf_in, &bufinfo, MP_BUFFER_READ); @@ -164,14 +164,14 @@ STATIC mp_obj_t _sdcardio_sdcard_writeblocks(mp_obj_t self_in, mp_obj_t start_bl } MP_DEFINE_CONST_FUN_OBJ_3(sdcardio_sdcard_writeblocks_obj, _sdcardio_sdcard_writeblocks); -STATIC const mp_rom_map_elem_t sdcardio_sdcard_locals_dict_table[] = { +static const mp_rom_map_elem_t sdcardio_sdcard_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_count), MP_ROM_PTR(&sdcardio_sdcard_count_obj) }, { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&sdcardio_sdcard_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR_readblocks), MP_ROM_PTR(&sdcardio_sdcard_readblocks_obj) }, { MP_ROM_QSTR(MP_QSTR_sync), MP_ROM_PTR(&sdcardio_sdcard_sync_obj) }, { MP_ROM_QSTR(MP_QSTR_writeblocks), MP_ROM_PTR(&sdcardio_sdcard_writeblocks_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(sdcardio_sdcard_locals_dict, sdcardio_sdcard_locals_dict_table); +static MP_DEFINE_CONST_DICT(sdcardio_sdcard_locals_dict, sdcardio_sdcard_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( sdcardio_SDCard_type, diff --git a/shared-bindings/sdcardio/__init__.c b/shared-bindings/sdcardio/__init__.c index 6df3d3c758913..7fb230189788f 100644 --- a/shared-bindings/sdcardio/__init__.c +++ b/shared-bindings/sdcardio/__init__.c @@ -14,12 +14,12 @@ //| """Interface to an SD card via the SPI bus""" -STATIC const mp_rom_map_elem_t sdcardio_module_globals_table[] = { +static const mp_rom_map_elem_t sdcardio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_sdcardio) }, { MP_ROM_QSTR(MP_QSTR_SDCard), MP_ROM_PTR(&sdcardio_SDCard_type) }, }; -STATIC MP_DEFINE_CONST_DICT(sdcardio_module_globals, sdcardio_module_globals_table); +static MP_DEFINE_CONST_DICT(sdcardio_module_globals, sdcardio_module_globals_table); const mp_obj_module_t sdcardio_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/sdioio/SDCard.c b/shared-bindings/sdioio/SDCard.c index 3994d83364cc4..7c3874cec8eef 100644 --- a/shared-bindings/sdioio/SDCard.c +++ b/shared-bindings/sdioio/SDCard.c @@ -62,7 +62,7 @@ //| os.listdir('/sd')""" //| ... -STATIC mp_obj_t sdioio_sdcard_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t sdioio_sdcard_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { sdioio_sdcard_obj_t *self = mp_obj_malloc(sdioio_sdcard_obj_t, &sdioio_SDCard_type); enum { ARG_clock, ARG_command, ARG_data, ARG_frequency, NUM_ARGS }; static const mp_arg_t allowed_args[] = { @@ -86,7 +86,7 @@ STATIC mp_obj_t sdioio_sdcard_make_new(const mp_obj_type_t *type, size_t n_args, return MP_OBJ_FROM_PTR(self); } -STATIC void check_for_deinit(sdioio_sdcard_obj_t *self) { +static void check_for_deinit(sdioio_sdcard_obj_t *self) { if (common_hal_sdioio_sdcard_deinited(self)) { raise_deinited_error(); } @@ -99,7 +99,7 @@ STATIC void check_for_deinit(sdioio_sdcard_obj_t *self) { //| :param int width: the number of data lines to use. Must be 1 or 4 and must also not exceed the number of data lines at construction //| //| .. note:: Leaving a value unspecified or 0 means the current setting is kept""" -STATIC mp_obj_t sdioio_sdcard_configure(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t sdioio_sdcard_configure(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_frequency, ARG_width, NUM_ARGS }; static const mp_arg_t allowed_args[] = { { MP_QSTR_frequency, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} }, @@ -130,7 +130,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(sdioio_sdcard_configure_obj, 1, sdioio_sdcard_configu //| Due to technical limitations, this is a function and not a property. //| //| :return: The number of 512-byte blocks, as a number""" -STATIC mp_obj_t sdioio_sdcard_count(mp_obj_t self_in) { +static mp_obj_t sdioio_sdcard_count(mp_obj_t self_in) { sdioio_sdcard_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_sdioio_sdcard_get_count(self)); @@ -144,7 +144,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(sdioio_sdcard_count_obj, sdioio_sdcard_count); //| :param ~circuitpython_typing.WriteableBuffer buf: The buffer to write into. Length must be multiple of 512. //| //| :return: None""" -STATIC mp_obj_t _sdioio_sdcard_readblocks(mp_obj_t self_in, mp_obj_t start_block_in, mp_obj_t buf_in) { +static mp_obj_t _sdioio_sdcard_readblocks(mp_obj_t self_in, mp_obj_t start_block_in, mp_obj_t buf_in) { uint32_t start_block = mp_obj_get_int(start_block_in); mp_buffer_info_t bufinfo; mp_get_buffer_raise(buf_in, &bufinfo, MP_BUFFER_WRITE); @@ -165,7 +165,7 @@ MP_DEFINE_CONST_FUN_OBJ_3(sdioio_sdcard_readblocks_obj, _sdioio_sdcard_readblock //| :param ~circuitpython_typing.ReadableBuffer buf: The buffer to read from. Length must be multiple of 512. //| //| :return: None""" -STATIC mp_obj_t _sdioio_sdcard_writeblocks(mp_obj_t self_in, mp_obj_t start_block_in, mp_obj_t buf_in) { +static mp_obj_t _sdioio_sdcard_writeblocks(mp_obj_t self_in, mp_obj_t start_block_in, mp_obj_t buf_in) { uint32_t start_block = mp_obj_get_int(start_block_in); mp_buffer_info_t bufinfo; mp_get_buffer_raise(buf_in, &bufinfo, MP_BUFFER_READ); @@ -182,7 +182,7 @@ MP_DEFINE_CONST_FUN_OBJ_3(sdioio_sdcard_writeblocks_obj, _sdioio_sdcard_writeblo //| frequency: int //| """The actual SDIO bus frequency. This may not match the frequency //| requested due to internal limitations.""" -STATIC mp_obj_t sdioio_sdcard_obj_get_frequency(mp_obj_t self_in) { +static mp_obj_t sdioio_sdcard_obj_get_frequency(mp_obj_t self_in) { sdioio_sdcard_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_sdioio_sdcard_get_frequency(self)); @@ -194,7 +194,7 @@ MP_PROPERTY_GETTER(sdioio_sdcard_frequency_obj, //| width: int //| """The actual SDIO bus width, in bits""" -STATIC mp_obj_t sdioio_sdcard_obj_get_width(mp_obj_t self_in) { +static mp_obj_t sdioio_sdcard_obj_get_width(mp_obj_t self_in) { sdioio_sdcard_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_sdioio_sdcard_get_width(self)); @@ -208,7 +208,7 @@ MP_PROPERTY_GETTER(sdioio_sdcard_width_obj, //| """Disable permanently. //| //| :return: None""" -STATIC mp_obj_t sdioio_sdcard_obj_deinit(mp_obj_t self_in) { +static mp_obj_t sdioio_sdcard_obj_deinit(mp_obj_t self_in) { sdioio_sdcard_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_sdioio_sdcard_deinit(self); return mp_const_none; @@ -225,14 +225,14 @@ MP_DEFINE_CONST_FUN_OBJ_1(sdioio_sdcard_deinit_obj, sdioio_sdcard_obj_deinit); //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... //| -STATIC mp_obj_t sdioio_sdcard_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t sdioio_sdcard_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_sdioio_sdcard_deinit(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(sdioio_sdcard_obj___exit___obj, 4, 4, sdioio_sdcard_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(sdioio_sdcard_obj___exit___obj, 4, 4, sdioio_sdcard_obj___exit__); -STATIC const mp_rom_map_elem_t sdioio_sdcard_locals_dict_table[] = { +static const mp_rom_map_elem_t sdioio_sdcard_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&sdioio_sdcard_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&sdioio_sdcard_obj___exit___obj) }, @@ -245,7 +245,7 @@ STATIC const mp_rom_map_elem_t sdioio_sdcard_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_readblocks), MP_ROM_PTR(&sdioio_sdcard_readblocks_obj) }, { MP_ROM_QSTR(MP_QSTR_writeblocks), MP_ROM_PTR(&sdioio_sdcard_writeblocks_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(sdioio_sdcard_locals_dict, sdioio_sdcard_locals_dict_table); +static MP_DEFINE_CONST_DICT(sdioio_sdcard_locals_dict, sdioio_sdcard_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( sdioio_SDCard_type, diff --git a/shared-bindings/sdioio/__init__.c b/shared-bindings/sdioio/__init__.c index 4a761e8a9dd52..45f1219f95a3d 100644 --- a/shared-bindings/sdioio/__init__.c +++ b/shared-bindings/sdioio/__init__.c @@ -14,12 +14,12 @@ //| """Interface to an SD card via the SDIO bus""" -STATIC const mp_rom_map_elem_t sdioio_module_globals_table[] = { +static const mp_rom_map_elem_t sdioio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_sdio) }, { MP_ROM_QSTR(MP_QSTR_SDCard), MP_ROM_PTR(&sdioio_SDCard_type) }, }; -STATIC MP_DEFINE_CONST_DICT(sdioio_module_globals, sdioio_module_globals_table); +static MP_DEFINE_CONST_DICT(sdioio_module_globals, sdioio_module_globals_table); const mp_obj_module_t sdioio_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/sharpdisplay/SharpMemoryFramebuffer.c b/shared-bindings/sharpdisplay/SharpMemoryFramebuffer.c index 14c123c0fe305..3dd4e2717e2d5 100644 --- a/shared-bindings/sharpdisplay/SharpMemoryFramebuffer.c +++ b/shared-bindings/sharpdisplay/SharpMemoryFramebuffer.c @@ -40,7 +40,7 @@ //| :param bool jdi_display: When True, work with an 8-color JDI display. Otherwise, a monochrome Sharp display. //| """ //| ... -STATIC mp_obj_t sharpdisplay_framebuffer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t sharpdisplay_framebuffer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_spi_bus, ARG_chip_select, ARG_width, ARG_height, ARG_baudrate, ARG_jdi_display, NUM_ARGS }; static const mp_arg_t allowed_args[] = { { MP_QSTR_spi_bus, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_obj = MP_OBJ_NULL} }, @@ -67,7 +67,7 @@ STATIC mp_obj_t sharpdisplay_framebuffer_make_new(const mp_obj_type_t *type, siz } -STATIC mp_int_t sharpdisplay_framebuffer_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) { +static mp_int_t sharpdisplay_framebuffer_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) { sharpdisplay_framebuffer_obj_t *self = (sharpdisplay_framebuffer_obj_t *)self_in; // a readonly framebuffer would be unusual but not impossible if ((flags & MP_BUFFER_WRITE) && !(self->bufinfo.typecode & MP_OBJ_ARRAY_TYPECODE_FLAG_RW)) { @@ -83,18 +83,18 @@ STATIC mp_int_t sharpdisplay_framebuffer_get_buffer(mp_obj_t self_in, mp_buffer_ //| may be performed.""" //| ... //| -STATIC mp_obj_t sharpdisplay_framebuffer_deinit(mp_obj_t self_in) { +static mp_obj_t sharpdisplay_framebuffer_deinit(mp_obj_t self_in) { sharpdisplay_framebuffer_obj_t *self = (sharpdisplay_framebuffer_obj_t *)self_in; common_hal_sharpdisplay_framebuffer_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(sharpdisplay_framebuffer_deinit_obj, sharpdisplay_framebuffer_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(sharpdisplay_framebuffer_deinit_obj, sharpdisplay_framebuffer_deinit); -STATIC const mp_rom_map_elem_t sharpdisplay_framebuffer_locals_dict_table[] = { +static const mp_rom_map_elem_t sharpdisplay_framebuffer_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&sharpdisplay_framebuffer_deinit_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(sharpdisplay_framebuffer_locals_dict, sharpdisplay_framebuffer_locals_dict_table); +static MP_DEFINE_CONST_DICT(sharpdisplay_framebuffer_locals_dict, sharpdisplay_framebuffer_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( sharpdisplay_framebuffer_type, diff --git a/shared-bindings/sharpdisplay/__init__.c b/shared-bindings/sharpdisplay/__init__.c index 47f7b7b9553d0..94b68e4ce90fb 100644 --- a/shared-bindings/sharpdisplay/__init__.c +++ b/shared-bindings/sharpdisplay/__init__.c @@ -16,12 +16,12 @@ //| For more information about working with Sharp Memory Displays, //| see `this Learn guide `_. //| """ -STATIC const mp_rom_map_elem_t sharpdisplay_module_globals_table[] = { +static const mp_rom_map_elem_t sharpdisplay_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_sharpdisplay) }, { MP_ROM_QSTR(MP_QSTR_SharpMemoryFramebuffer), MP_ROM_PTR(&sharpdisplay_framebuffer_type) }, }; -STATIC MP_DEFINE_CONST_DICT(sharpdisplay_module_globals, sharpdisplay_module_globals_table); +static MP_DEFINE_CONST_DICT(sharpdisplay_module_globals, sharpdisplay_module_globals_table); const mp_obj_module_t sharpdisplay_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/socketpool/Socket.c b/shared-bindings/socketpool/Socket.c index b8db8184490cd..dfc3c98f4374f 100644 --- a/shared-bindings/socketpool/Socket.c +++ b/shared-bindings/socketpool/Socket.c @@ -44,18 +44,18 @@ //| """Automatically closes the Socket when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t socketpool_socket___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t socketpool_socket___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_socketpool_socket_close(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socketpool_socket___exit___obj, 4, 4, socketpool_socket___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socketpool_socket___exit___obj, 4, 4, socketpool_socket___exit__); //| def accept(self) -> Tuple[Socket, Tuple[str, int]]: //| """Accept a connection on a listening socket of type SOCK_STREAM, //| creating a new socket of type SOCK_STREAM. //| Returns a tuple of (new_socket, remote_address)""" -STATIC mp_obj_t _socketpool_socket_accept(mp_obj_t self_in) { +static mp_obj_t _socketpool_socket_accept(mp_obj_t self_in) { socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in); uint8_t ip[4]; uint32_t port; @@ -67,14 +67,14 @@ STATIC mp_obj_t _socketpool_socket_accept(mp_obj_t self_in) { tuple_contents[1] = netutils_format_inet_addr(ip, port, NETUTILS_BIG); return mp_obj_new_tuple(2, tuple_contents); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(socketpool_socket_accept_obj, _socketpool_socket_accept); +static MP_DEFINE_CONST_FUN_OBJ_1(socketpool_socket_accept_obj, _socketpool_socket_accept); //| def bind(self, address: Tuple[str, int]) -> None: //| """Bind a socket to an address //| //| :param ~tuple address: tuple of (remote_address, remote_port)""" //| ... -STATIC mp_obj_t socketpool_socket_bind(mp_obj_t self_in, mp_obj_t addr_in) { +static mp_obj_t socketpool_socket_bind(mp_obj_t self_in, mp_obj_t addr_in) { socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_obj_t *addr_items; @@ -94,23 +94,23 @@ STATIC mp_obj_t socketpool_socket_bind(mp_obj_t self_in, mp_obj_t addr_in) { return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_bind_obj, socketpool_socket_bind); +static MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_bind_obj, socketpool_socket_bind); //| def close(self) -> None: //| """Closes this Socket and makes its resources available to its SocketPool.""" -STATIC mp_obj_t _socketpool_socket_close(mp_obj_t self_in) { +static mp_obj_t _socketpool_socket_close(mp_obj_t self_in) { socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_socketpool_socket_close(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(socketpool_socket_close_obj, _socketpool_socket_close); +static MP_DEFINE_CONST_FUN_OBJ_1(socketpool_socket_close_obj, _socketpool_socket_close); //| def connect(self, address: Tuple[str, int]) -> None: //| """Connect a socket to a remote address //| //| :param ~tuple address: tuple of (remote_address, remote_port)""" //| ... -STATIC mp_obj_t socketpool_socket_connect(mp_obj_t self_in, mp_obj_t addr_in) { +static mp_obj_t socketpool_socket_connect(mp_obj_t self_in, mp_obj_t addr_in) { socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_obj_t *addr_items; @@ -127,14 +127,14 @@ STATIC mp_obj_t socketpool_socket_connect(mp_obj_t self_in, mp_obj_t addr_in) { return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_connect_obj, socketpool_socket_connect); +static MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_connect_obj, socketpool_socket_connect); //| def listen(self, backlog: int) -> None: //| """Set socket to listen for incoming connections //| //| :param ~int backlog: length of backlog queue for waiting connections""" //| ... -STATIC mp_obj_t socketpool_socket_listen(mp_obj_t self_in, mp_obj_t backlog_in) { +static mp_obj_t socketpool_socket_listen(mp_obj_t self_in, mp_obj_t backlog_in) { socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in); int backlog = mp_obj_get_int(backlog_in); @@ -142,7 +142,7 @@ STATIC mp_obj_t socketpool_socket_listen(mp_obj_t self_in, mp_obj_t backlog_in) common_hal_socketpool_socket_listen(self, backlog); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_listen_obj, socketpool_socket_listen); +static MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_listen_obj, socketpool_socket_listen); //| def recvfrom_into(self, buffer: WriteableBuffer) -> Tuple[int, Tuple[str, int]]: //| """Reads some bytes from a remote address. @@ -153,7 +153,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_listen_obj, socketpool_socket //| //| :param object buffer: buffer to read into""" //| ... -STATIC mp_obj_t socketpool_socket_recvfrom_into(mp_obj_t self_in, mp_obj_t data_in) { +static mp_obj_t socketpool_socket_recvfrom_into(mp_obj_t self_in, mp_obj_t data_in) { socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_buffer_info_t bufinfo; mp_get_buffer_raise(data_in, &bufinfo, MP_BUFFER_WRITE); @@ -167,7 +167,7 @@ STATIC mp_obj_t socketpool_socket_recvfrom_into(mp_obj_t self_in, mp_obj_t data_ tuple_contents[1] = netutils_format_inet_addr(ip, port, NETUTILS_BIG); return mp_obj_new_tuple(2, tuple_contents); } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_recvfrom_into_obj, socketpool_socket_recvfrom_into); +static MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_recvfrom_into_obj, socketpool_socket_recvfrom_into); //| def recv_into(self, buffer: WriteableBuffer, bufsize: int) -> int: //| """Reads some bytes from the connected remote address, writing @@ -182,7 +182,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_recvfrom_into_obj, socketpool //| :param bytearray buffer: buffer to receive into //| :param int bufsize: optionally, a maximum number of bytes to read.""" //| ... -STATIC mp_obj_t _socketpool_socket_recv_into(size_t n_args, const mp_obj_t *args) { +static mp_obj_t _socketpool_socket_recv_into(size_t n_args, const mp_obj_t *args) { socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(args[0]); if (common_hal_socketpool_socket_get_closed(self)) { // Bad file number. @@ -212,7 +212,7 @@ STATIC mp_obj_t _socketpool_socket_recv_into(size_t n_args, const mp_obj_t *args mp_int_t ret = common_hal_socketpool_socket_recv_into(self, (byte *)bufinfo.buf, len); return mp_obj_new_int_from_uint(ret); } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socketpool_socket_recv_into_obj, 2, 3, _socketpool_socket_recv_into); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socketpool_socket_recv_into_obj, 2, 3, _socketpool_socket_recv_into); //| def send(self, bytes: ReadableBuffer) -> int: //| """Send some bytes to the connected remote address. @@ -220,7 +220,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socketpool_socket_recv_into_obj, 2, 3 //| //| :param ~bytes bytes: some bytes to send""" //| ... -STATIC mp_obj_t _socketpool_socket_send(mp_obj_t self_in, mp_obj_t buf_in) { +static mp_obj_t _socketpool_socket_send(mp_obj_t self_in, mp_obj_t buf_in) { socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in); if (common_hal_socketpool_socket_get_closed(self)) { // Bad file number. @@ -237,7 +237,7 @@ STATIC mp_obj_t _socketpool_socket_send(mp_obj_t self_in, mp_obj_t buf_in) { } return mp_obj_new_int_from_uint(ret); } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_send_obj, _socketpool_socket_send); +static MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_send_obj, _socketpool_socket_send); //| def sendall(self, bytes: ReadableBuffer) -> None: //| """Send some bytes to the connected remote address. @@ -249,7 +249,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_send_obj, _socketpool_socket_ //| //| :param ~bytes bytes: some bytes to send""" //| ... -STATIC mp_obj_t _socketpool_socket_sendall(mp_obj_t self_in, mp_obj_t buf_in) { +static mp_obj_t _socketpool_socket_sendall(mp_obj_t self_in, mp_obj_t buf_in) { socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in); if (common_hal_socketpool_socket_get_closed(self)) { // Bad file number. @@ -277,7 +277,7 @@ STATIC mp_obj_t _socketpool_socket_sendall(mp_obj_t self_in, mp_obj_t buf_in) { } return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_sendall_obj, _socketpool_socket_sendall); +static MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_sendall_obj, _socketpool_socket_sendall); //| def sendto(self, bytes: ReadableBuffer, address: Tuple[str, int]) -> int: //| """Send some bytes to a specific address. @@ -286,7 +286,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_sendall_obj, _socketpool_sock //| :param ~bytes bytes: some bytes to send //| :param ~tuple address: tuple of (remote_address, remote_port)""" //| ... -STATIC mp_obj_t socketpool_socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_obj_t addr_in) { +static mp_obj_t socketpool_socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_obj_t addr_in) { socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in); // get the data @@ -307,7 +307,7 @@ STATIC mp_obj_t socketpool_socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_ return mp_obj_new_int_from_uint(ret); } -STATIC MP_DEFINE_CONST_FUN_OBJ_3(socketpool_socket_sendto_obj, socketpool_socket_sendto); +static MP_DEFINE_CONST_FUN_OBJ_3(socketpool_socket_sendto_obj, socketpool_socket_sendto); //| def setblocking(self, flag: bool) -> Optional[int]: //| """Set the blocking behaviour of this socket. @@ -315,7 +315,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(socketpool_socket_sendto_obj, socketpool_socket //| :param ~bool flag: False means non-blocking, True means block indefinitely.""" //| ... // method socket.setblocking(flag) -STATIC mp_obj_t socketpool_socket_setblocking(mp_obj_t self_in, mp_obj_t blocking) { +static mp_obj_t socketpool_socket_setblocking(mp_obj_t self_in, mp_obj_t blocking) { socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in); if (mp_obj_is_true(blocking)) { common_hal_socketpool_socket_settimeout(self, -1); @@ -324,12 +324,12 @@ STATIC mp_obj_t socketpool_socket_setblocking(mp_obj_t self_in, mp_obj_t blockin } return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_setblocking_obj, socketpool_socket_setblocking); +static MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_setblocking_obj, socketpool_socket_setblocking); //| def setsockopt(self, level: int, optname: int, value: int) -> None: //| """Sets socket options""" //| ... -STATIC mp_obj_t socketpool_socket_setsockopt(size_t n_args, const mp_obj_t *args) { +static mp_obj_t socketpool_socket_setsockopt(size_t n_args, const mp_obj_t *args) { socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(args[0]); mp_int_t level = mp_obj_get_int(args[1]); mp_int_t opt = mp_obj_get_int(args[2]); @@ -355,7 +355,7 @@ STATIC mp_obj_t socketpool_socket_setsockopt(size_t n_args, const mp_obj_t *args return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socketpool_socket_setsockopt_obj, 4, 4, socketpool_socket_setsockopt); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socketpool_socket_setsockopt_obj, 4, 4, socketpool_socket_setsockopt); //| def settimeout(self, value: int) -> None: @@ -364,7 +364,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socketpool_socket_setsockopt_obj, 4, //| :param ~int value: timeout in seconds. 0 means non-blocking. None means block indefinitely. //| """ //| ... -STATIC mp_obj_t socketpool_socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) { +static mp_obj_t socketpool_socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) { socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_uint_t timeout_ms; if (timeout_in == mp_const_none) { @@ -379,12 +379,12 @@ STATIC mp_obj_t socketpool_socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_ common_hal_socketpool_socket_settimeout(self, timeout_ms); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_settimeout_obj, socketpool_socket_settimeout); +static MP_DEFINE_CONST_FUN_OBJ_2(socketpool_socket_settimeout_obj, socketpool_socket_settimeout); //| type: int //| """Read-only access to the socket type""" //| -STATIC mp_obj_t socketpool_socket_obj_get_type(mp_obj_t self_in) { +static mp_obj_t socketpool_socket_obj_get_type(mp_obj_t self_in) { socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_socketpool_socket_get_type(self)); } @@ -393,7 +393,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(socketpool_socket_get_type_obj, socketpool_socket_obj_ MP_PROPERTY_GETTER(socketpool_socket_type_obj, (mp_obj_t)&socketpool_socket_get_type_obj); -STATIC const mp_rom_map_elem_t socketpool_socket_locals_dict_table[] = { +static const mp_rom_map_elem_t socketpool_socket_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&socketpool_socket___exit___obj) }, { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&socketpool_socket_close_obj) }, @@ -415,9 +415,9 @@ STATIC const mp_rom_map_elem_t socketpool_socket_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_type), MP_ROM_PTR(&socketpool_socket_type_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(socketpool_socket_locals_dict, socketpool_socket_locals_dict_table); +static MP_DEFINE_CONST_DICT(socketpool_socket_locals_dict, socketpool_socket_locals_dict_table); -STATIC mp_uint_t socket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errorcode) { +static mp_uint_t socket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errorcode) { socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_int_t ret = socketpool_socket_recv_into(self, buf, size); if (ret < 0) { @@ -427,7 +427,7 @@ STATIC mp_uint_t socket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *e return ret; } -STATIC mp_uint_t socket_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errorcode) { +static mp_uint_t socket_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errorcode) { socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_int_t ret = socketpool_socket_send(self, buf, size); if (ret < 0) { @@ -437,7 +437,7 @@ STATIC mp_uint_t socket_write(mp_obj_t self_in, const void *buf, mp_uint_t size, return ret; } -STATIC mp_uint_t socket_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) { +static mp_uint_t socket_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) { socketpool_socket_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_uint_t ret; if (request == MP_STREAM_POLL) { @@ -456,7 +456,7 @@ STATIC mp_uint_t socket_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg return ret; } -STATIC const mp_stream_p_t socket_stream_p = { +static const mp_stream_p_t socket_stream_p = { .read = socket_read, .write = socket_write, .ioctl = socket_ioctl, diff --git a/shared-bindings/socketpool/SocketPool.c b/shared-bindings/socketpool/SocketPool.c index 417a76a2e696e..2b4623323fa8e 100644 --- a/shared-bindings/socketpool/SocketPool.c +++ b/shared-bindings/socketpool/SocketPool.c @@ -33,7 +33,7 @@ //| """ //| ... //| -STATIC mp_obj_t socketpool_socketpool_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { +static mp_obj_t socketpool_socketpool_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { mp_arg_check_num(n_args, n_kw, 1, 1, false); socketpool_socketpool_obj_t *s = m_new_obj_with_finaliser(socketpool_socketpool_obj_t); @@ -87,7 +87,7 @@ MP_DEFINE_EXCEPTION(gaierror, OSError) //| in CPython is not supported. //| """ //| ... -STATIC mp_obj_t socketpool_socketpool_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t socketpool_socketpool_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_family, ARG_type, ARG_proto }; static const mp_arg_t allowed_args[] = { { MP_QSTR_family, MP_ARG_INT, {.u_int = SOCKETPOOL_AF_INET} }, @@ -127,7 +127,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(socketpool_socketpool_socket_obj, 1, socketpool_socke //| as a tuple.""" //| ... //| -STATIC mp_obj_t socketpool_socketpool_getaddrinfo(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t socketpool_socketpool_getaddrinfo(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_host, ARG_port, ARG_family, ARG_type, ARG_proto, ARG_flags }; static const mp_arg_t allowed_args[] = { { MP_QSTR_host, MP_ARG_OBJ | MP_ARG_REQUIRED }, @@ -165,9 +165,9 @@ STATIC mp_obj_t socketpool_socketpool_getaddrinfo(size_t n_args, const mp_obj_t tuple->items[4] = MP_OBJ_FROM_PTR(sockaddr); return mp_obj_new_list(1, (mp_obj_t *)&tuple); } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(socketpool_socketpool_getaddrinfo_obj, 1, socketpool_socketpool_getaddrinfo); +static MP_DEFINE_CONST_FUN_OBJ_KW(socketpool_socketpool_getaddrinfo_obj, 1, socketpool_socketpool_getaddrinfo); -STATIC const mp_rom_map_elem_t socketpool_socketpool_locals_dict_table[] = { +static const mp_rom_map_elem_t socketpool_socketpool_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_socket), MP_ROM_PTR(&socketpool_socketpool_socket_obj) }, { MP_ROM_QSTR(MP_QSTR_getaddrinfo), MP_ROM_PTR(&socketpool_socketpool_getaddrinfo_obj) }, { MP_ROM_QSTR(MP_QSTR_gaierror), MP_ROM_PTR(&mp_type_gaierror) }, @@ -197,7 +197,7 @@ STATIC const mp_rom_map_elem_t socketpool_socketpool_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_EAI_NONAME), MP_ROM_INT(SOCKETPOOL_EAI_NONAME) }, }; -STATIC MP_DEFINE_CONST_DICT(socketpool_socketpool_locals_dict, socketpool_socketpool_locals_dict_table); +static MP_DEFINE_CONST_DICT(socketpool_socketpool_locals_dict, socketpool_socketpool_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( socketpool_socketpool_type, diff --git a/shared-bindings/socketpool/__init__.c b/shared-bindings/socketpool/__init__.c index 64774272f13b0..59d55bf3f8369 100644 --- a/shared-bindings/socketpool/__init__.c +++ b/shared-bindings/socketpool/__init__.c @@ -20,14 +20,14 @@ //| https://docs.python.org/3/library/socket.html //| """ -STATIC const mp_rom_map_elem_t socketpool_globals_table[] = { +static const mp_rom_map_elem_t socketpool_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_socketpool) }, { MP_ROM_QSTR(MP_QSTR_SocketPool), MP_ROM_PTR(&socketpool_socketpool_type) }, { MP_ROM_QSTR(MP_QSTR_Socket), MP_ROM_PTR(&socketpool_socket_type) }, }; -STATIC MP_DEFINE_CONST_DICT(socketpool_globals, socketpool_globals_table); +static MP_DEFINE_CONST_DICT(socketpool_globals, socketpool_globals_table); const mp_obj_module_t socketpool_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/ssl/SSLContext.c b/shared-bindings/ssl/SSLContext.c index b82cb31ee804c..9c7f098cc4ac7 100644 --- a/shared-bindings/ssl/SSLContext.c +++ b/shared-bindings/ssl/SSLContext.c @@ -22,7 +22,7 @@ //| rather than all of them.""" //| -STATIC mp_obj_t ssl_sslcontext_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { +static mp_obj_t ssl_sslcontext_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { mp_arg_check_num(n_args, n_kw, 0, 1, false); ssl_sslcontext_obj_t *s = mp_obj_malloc(ssl_sslcontext_obj_t, &ssl_sslcontext_type); @@ -41,7 +41,7 @@ STATIC mp_obj_t ssl_sslcontext_make_new(const mp_obj_type_t *type, size_t n_args //| must point to a file containing the private key. //| """ -STATIC void get_file_contents(mp_obj_t name_obj, mp_buffer_info_t *bufinfo) { +static void get_file_contents(mp_obj_t name_obj, mp_buffer_info_t *bufinfo) { mp_obj_t file = mp_call_function_2(MP_OBJ_FROM_PTR(&mp_builtin_open_obj), name_obj, MP_OBJ_NEW_QSTR(MP_QSTR_rb)); mp_obj_t dest[2]; mp_load_method(file, MP_QSTR_read, dest); @@ -49,7 +49,7 @@ STATIC void get_file_contents(mp_obj_t name_obj, mp_buffer_info_t *bufinfo) { mp_get_buffer_raise(result, bufinfo, MP_BUFFER_READ); } -STATIC mp_obj_t ssl_sslcontext_load_cert_chain(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t ssl_sslcontext_load_cert_chain(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_certfile, ARG_keyfile }; static const mp_arg_t allowed_args[] = { { MP_QSTR_certfile, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = mp_const_none} }, @@ -71,7 +71,7 @@ STATIC mp_obj_t ssl_sslcontext_load_cert_chain(size_t n_args, const mp_obj_t *po common_hal_ssl_sslcontext_load_cert_chain(self, &cert_buf, &key_buf); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(ssl_sslcontext_load_cert_chain_obj, 1, ssl_sslcontext_load_cert_chain); +static MP_DEFINE_CONST_FUN_OBJ_KW(ssl_sslcontext_load_cert_chain_obj, 1, ssl_sslcontext_load_cert_chain); //| def load_verify_locations( //| self, @@ -88,7 +88,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(ssl_sslcontext_load_cert_chain_obj, 1, ssl_ssl //| :param str cadata: A single CA certificate in PEM format. **Limitation**: CPython allows one //| or more certificates, but this implementation is limited to one. //| """ -STATIC mp_obj_t ssl_sslcontext_load_verify_locations(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t ssl_sslcontext_load_verify_locations(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_cafile, ARG_capath, ARG_cadata }; static const mp_arg_t allowed_args[] = { { MP_QSTR_cafile, MP_ARG_OBJ, {.u_obj = mp_const_none} }, @@ -113,36 +113,36 @@ STATIC mp_obj_t ssl_sslcontext_load_verify_locations(size_t n_args, const mp_obj common_hal_ssl_sslcontext_load_verify_locations(self, cadata); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(ssl_sslcontext_load_verify_locations_obj, 1, ssl_sslcontext_load_verify_locations); +static MP_DEFINE_CONST_FUN_OBJ_KW(ssl_sslcontext_load_verify_locations_obj, 1, ssl_sslcontext_load_verify_locations); //| def set_default_verify_paths(self) -> None: //| """Load a set of default certification authority (CA) certificates.""" -STATIC mp_obj_t ssl_sslcontext_set_default_verify_paths(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t ssl_sslcontext_set_default_verify_paths(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { ssl_sslcontext_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); common_hal_ssl_sslcontext_set_default_verify_paths(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(ssl_sslcontext_set_default_verify_paths_obj, 1, ssl_sslcontext_set_default_verify_paths); +static MP_DEFINE_CONST_FUN_OBJ_KW(ssl_sslcontext_set_default_verify_paths_obj, 1, ssl_sslcontext_set_default_verify_paths); //| check_hostname: bool //| """Whether to match the peer certificate's hostname.""" -STATIC mp_obj_t ssl_sslcontext_get_check_hostname(mp_obj_t self_in) { +static mp_obj_t ssl_sslcontext_get_check_hostname(mp_obj_t self_in) { ssl_sslcontext_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_bool(common_hal_ssl_sslcontext_get_check_hostname(self)); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(ssl_sslcontext_get_check_hostname_obj, ssl_sslcontext_get_check_hostname); +static MP_DEFINE_CONST_FUN_OBJ_1(ssl_sslcontext_get_check_hostname_obj, ssl_sslcontext_get_check_hostname); -STATIC mp_obj_t ssl_sslcontext_set_check_hostname(mp_obj_t self_in, mp_obj_t value) { +static mp_obj_t ssl_sslcontext_set_check_hostname(mp_obj_t self_in, mp_obj_t value) { ssl_sslcontext_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_ssl_sslcontext_set_check_hostname(self, mp_obj_is_true(value)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslcontext_set_check_hostname_obj, ssl_sslcontext_set_check_hostname); +static MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslcontext_set_check_hostname_obj, ssl_sslcontext_set_check_hostname); MP_PROPERTY_GETSET(ssl_sslcontext_check_hostname_obj, (mp_obj_t)&ssl_sslcontext_get_check_hostname_obj, @@ -159,7 +159,7 @@ MP_PROPERTY_GETSET(ssl_sslcontext_check_hostname_obj, //| The socket must be of type SOCK_STREAM.""" //| -STATIC mp_obj_t ssl_sslcontext_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t ssl_sslcontext_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_sock, ARG_server_side, ARG_server_hostname }; static const mp_arg_t allowed_args[] = { { MP_QSTR_sock, MP_ARG_OBJ | MP_ARG_REQUIRED }, @@ -184,9 +184,9 @@ STATIC mp_obj_t ssl_sslcontext_wrap_socket(size_t n_args, const mp_obj_t *pos_ar return common_hal_ssl_sslcontext_wrap_socket(self, sock_obj, server_side, server_hostname); } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(ssl_sslcontext_wrap_socket_obj, 1, ssl_sslcontext_wrap_socket); +static MP_DEFINE_CONST_FUN_OBJ_KW(ssl_sslcontext_wrap_socket_obj, 1, ssl_sslcontext_wrap_socket); -STATIC const mp_rom_map_elem_t ssl_sslcontext_locals_dict_table[] = { +static const mp_rom_map_elem_t ssl_sslcontext_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_wrap_socket), MP_ROM_PTR(&ssl_sslcontext_wrap_socket_obj) }, { MP_ROM_QSTR(MP_QSTR_load_cert_chain), MP_ROM_PTR(&ssl_sslcontext_load_cert_chain_obj) }, { MP_ROM_QSTR(MP_QSTR_load_verify_locations), MP_ROM_PTR(&ssl_sslcontext_load_verify_locations_obj) }, @@ -194,7 +194,7 @@ STATIC const mp_rom_map_elem_t ssl_sslcontext_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_check_hostname), MP_ROM_PTR(&ssl_sslcontext_check_hostname_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(ssl_sslcontext_locals_dict, ssl_sslcontext_locals_dict_table); +static MP_DEFINE_CONST_DICT(ssl_sslcontext_locals_dict, ssl_sslcontext_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( ssl_sslcontext_type, diff --git a/shared-bindings/ssl/SSLSocket.c b/shared-bindings/ssl/SSLSocket.c index 5f0337a2e802b..e244f77c76a9c 100644 --- a/shared-bindings/ssl/SSLSocket.c +++ b/shared-bindings/ssl/SSLSocket.c @@ -40,29 +40,29 @@ //| """Automatically closes the Socket when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t ssl_sslsocket___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t ssl_sslsocket___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_ssl_sslsocket_close(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(ssl_sslsocket___exit___obj, 4, 4, ssl_sslsocket___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(ssl_sslsocket___exit___obj, 4, 4, ssl_sslsocket___exit__); //| def accept(self) -> Tuple[SSLSocket, Tuple[str, int]]: //| """Accept a connection on a listening socket of type SOCK_STREAM, //| creating a new socket of type SOCK_STREAM. //| Returns a tuple of (new_socket, remote_address)""" -STATIC mp_obj_t ssl_sslsocket_accept(mp_obj_t self_in) { +static mp_obj_t ssl_sslsocket_accept(mp_obj_t self_in) { ssl_sslsocket_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_ssl_sslsocket_accept(self); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(ssl_sslsocket_accept_obj, ssl_sslsocket_accept); +static MP_DEFINE_CONST_FUN_OBJ_1(ssl_sslsocket_accept_obj, ssl_sslsocket_accept); //| def bind(self, address: Tuple[str, int]) -> None: //| """Bind a socket to an address //| //| :param ~tuple address: tuple of (remote_address, remote_port)""" //| ... -STATIC mp_obj_t ssl_sslsocket_bind(mp_obj_t self_in, mp_obj_t addr_in) { +static mp_obj_t ssl_sslsocket_bind(mp_obj_t self_in, mp_obj_t addr_in) { ssl_sslsocket_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_obj_t *addr_items; @@ -71,36 +71,36 @@ STATIC mp_obj_t ssl_sslsocket_bind(mp_obj_t self_in, mp_obj_t addr_in) { common_hal_ssl_sslsocket_bind(self, addr_in); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslsocket_bind_obj, ssl_sslsocket_bind); +static MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslsocket_bind_obj, ssl_sslsocket_bind); //| def close(self) -> None: //| """Closes this Socket""" -STATIC mp_obj_t ssl_sslsocket_close(mp_obj_t self_in) { +static mp_obj_t ssl_sslsocket_close(mp_obj_t self_in) { ssl_sslsocket_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_ssl_sslsocket_close(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(ssl_sslsocket_close_obj, ssl_sslsocket_close); +static MP_DEFINE_CONST_FUN_OBJ_1(ssl_sslsocket_close_obj, ssl_sslsocket_close); //| def connect(self, address: Tuple[str, int]) -> None: //| """Connect a socket to a remote address //| //| :param ~tuple address: tuple of (remote_address, remote_port)""" //| ... -STATIC mp_obj_t ssl_sslsocket_connect(mp_obj_t self_in, mp_obj_t addr_in) { +static mp_obj_t ssl_sslsocket_connect(mp_obj_t self_in, mp_obj_t addr_in) { ssl_sslsocket_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_ssl_sslsocket_connect(self, addr_in); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslsocket_connect_obj, ssl_sslsocket_connect); +static MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslsocket_connect_obj, ssl_sslsocket_connect); //| def listen(self, backlog: int) -> None: //| """Set socket to listen for incoming connections //| //| :param ~int backlog: length of backlog queue for waiting connetions""" //| ... -STATIC mp_obj_t ssl_sslsocket_listen(mp_obj_t self_in, mp_obj_t backlog_in) { +static mp_obj_t ssl_sslsocket_listen(mp_obj_t self_in, mp_obj_t backlog_in) { ssl_sslsocket_obj_t *self = MP_OBJ_TO_PTR(self_in); int backlog = mp_obj_get_int(backlog_in); @@ -108,7 +108,7 @@ STATIC mp_obj_t ssl_sslsocket_listen(mp_obj_t self_in, mp_obj_t backlog_in) { common_hal_ssl_sslsocket_listen(self, backlog); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslsocket_listen_obj, ssl_sslsocket_listen); +static MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslsocket_listen_obj, ssl_sslsocket_listen); //| def recv_into(self, buffer: WriteableBuffer, bufsize: int) -> int: //| """Reads some bytes from the connected remote address, writing @@ -123,7 +123,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslsocket_listen_obj, ssl_sslsocket_listen) //| :param bytearray buffer: buffer to receive into //| :param int bufsize: optionally, a maximum number of bytes to read.""" //| ... -STATIC mp_obj_t ssl_sslsocket_recv_into(size_t n_args, const mp_obj_t *args) { +static mp_obj_t ssl_sslsocket_recv_into(size_t n_args, const mp_obj_t *args) { ssl_sslsocket_obj_t *self = MP_OBJ_TO_PTR(args[0]); if (common_hal_ssl_sslsocket_get_closed(self)) { // Bad file number. @@ -153,7 +153,7 @@ STATIC mp_obj_t ssl_sslsocket_recv_into(size_t n_args, const mp_obj_t *args) { mp_int_t ret = common_hal_ssl_sslsocket_recv_into(self, (byte *)bufinfo.buf, len); return mp_obj_new_int_from_uint(ret); } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(ssl_sslsocket_recv_into_obj, 2, 3, ssl_sslsocket_recv_into); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(ssl_sslsocket_recv_into_obj, 2, 3, ssl_sslsocket_recv_into); //| def send(self, bytes: ReadableBuffer) -> int: //| """Send some bytes to the connected remote address. @@ -161,7 +161,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(ssl_sslsocket_recv_into_obj, 2, 3, ss //| //| :param ~bytes bytes: some bytes to send""" //| ... -STATIC mp_obj_t ssl_sslsocket_send(mp_obj_t self_in, mp_obj_t buf_in) { +static mp_obj_t ssl_sslsocket_send(mp_obj_t self_in, mp_obj_t buf_in) { ssl_sslsocket_obj_t *self = MP_OBJ_TO_PTR(self_in); if (common_hal_ssl_sslsocket_get_closed(self)) { // Bad file number. @@ -178,13 +178,13 @@ STATIC mp_obj_t ssl_sslsocket_send(mp_obj_t self_in, mp_obj_t buf_in) { } return mp_obj_new_int_from_uint(ret); } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslsocket_send_obj, ssl_sslsocket_send); +static MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslsocket_send_obj, ssl_sslsocket_send); // //| def setsockopt(self, level: int, optname: int, value: int | ReadableBuffer) -> None: // //| """Sets socket options""" // //| ... // //| -STATIC mp_obj_t ssl_sslsocket_setsockopt(size_t n_args, const mp_obj_t *args) { +static mp_obj_t ssl_sslsocket_setsockopt(size_t n_args, const mp_obj_t *args) { ssl_sslsocket_obj_t *self = MP_OBJ_TO_PTR(args[0]); mp_obj_t level = args[1]; mp_obj_t optname = args[2]; @@ -195,7 +195,7 @@ STATIC mp_obj_t ssl_sslsocket_setsockopt(size_t n_args, const mp_obj_t *args) { return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(ssl_sslsocket_setsockopt_obj, 4, 4, ssl_sslsocket_setsockopt); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(ssl_sslsocket_setsockopt_obj, 4, 4, ssl_sslsocket_setsockopt); //| def settimeout(self, value: int) -> None: //| """Set the timeout value for this socket. @@ -203,12 +203,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(ssl_sslsocket_setsockopt_obj, 4, 4, s //| :param ~int value: timeout in seconds. 0 means non-blocking. None means block indefinitely. //| """ //| ... -STATIC mp_obj_t ssl_sslsocket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) { +static mp_obj_t ssl_sslsocket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) { ssl_sslsocket_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_ssl_sslsocket_settimeout(self, timeout_in); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslsocket_settimeout_obj, ssl_sslsocket_settimeout); +static MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslsocket_settimeout_obj, ssl_sslsocket_settimeout); //| def setblocking(self, flag: bool) -> Optional[int]: //| """Set the blocking behaviour of this socket. @@ -217,7 +217,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslsocket_settimeout_obj, ssl_sslsocket_set //| ... //| // method socket.setblocking(flag) -STATIC mp_obj_t ssl_sslsocket_setblocking(mp_obj_t self_in, mp_obj_t blocking) { +static mp_obj_t ssl_sslsocket_setblocking(mp_obj_t self_in, mp_obj_t blocking) { ssl_sslsocket_obj_t *self = MP_OBJ_TO_PTR(self_in); if (mp_obj_is_true(blocking)) { common_hal_ssl_sslsocket_settimeout(self, mp_const_none); @@ -226,9 +226,9 @@ STATIC mp_obj_t ssl_sslsocket_setblocking(mp_obj_t self_in, mp_obj_t blocking) { } return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslsocket_setblocking_obj, ssl_sslsocket_setblocking); +static MP_DEFINE_CONST_FUN_OBJ_2(ssl_sslsocket_setblocking_obj, ssl_sslsocket_setblocking); -STATIC const mp_rom_map_elem_t ssl_sslsocket_locals_dict_table[] = { +static const mp_rom_map_elem_t ssl_sslsocket_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&ssl_sslsocket___exit___obj) }, { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&ssl_sslsocket_close_obj) }, @@ -245,7 +245,7 @@ STATIC const mp_rom_map_elem_t ssl_sslsocket_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_settimeout), MP_ROM_PTR(&ssl_sslsocket_settimeout_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(ssl_sslsocket_locals_dict, ssl_sslsocket_locals_dict_table); +static MP_DEFINE_CONST_DICT(ssl_sslsocket_locals_dict, ssl_sslsocket_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( ssl_sslsocket_type, diff --git a/shared-bindings/ssl/__init__.c b/shared-bindings/ssl/__init__.c index 2af83a328df05..9a5f94636a8df 100644 --- a/shared-bindings/ssl/__init__.c +++ b/shared-bindings/ssl/__init__.c @@ -23,7 +23,7 @@ //| ... //| -STATIC mp_obj_t ssl_create_default_context(void) { +static mp_obj_t ssl_create_default_context(void) { ssl_sslcontext_obj_t *s = mp_obj_malloc(ssl_sslcontext_obj_t, &ssl_sslcontext_type); common_hal_ssl_create_default_context(s); @@ -31,7 +31,7 @@ STATIC mp_obj_t ssl_create_default_context(void) { } MP_DEFINE_CONST_FUN_OBJ_0(ssl_create_default_context_obj, ssl_create_default_context); -STATIC const mp_rom_map_elem_t ssl_globals_table[] = { +static const mp_rom_map_elem_t ssl_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ssl) }, { MP_ROM_QSTR(MP_QSTR_create_default_context), MP_ROM_PTR(&ssl_create_default_context_obj) }, @@ -39,7 +39,7 @@ STATIC const mp_rom_map_elem_t ssl_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_SSLContext), MP_ROM_PTR(&ssl_sslcontext_type) }, }; -STATIC MP_DEFINE_CONST_DICT(ssl_globals, ssl_globals_table); +static MP_DEFINE_CONST_DICT(ssl_globals, ssl_globals_table); const mp_obj_module_t ssl_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/storage/__init__.c b/shared-bindings/storage/__init__.c index 77c5441336de9..e046c11879744 100644 --- a/shared-bindings/storage/__init__.c +++ b/shared-bindings/storage/__init__.c @@ -38,7 +38,7 @@ //| """ //| ... //| -STATIC mp_obj_t storage_mount(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t storage_mount(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_filesystem, ARG_mount_path, ARG_readonly }; static const mp_arg_t allowed_args[] = { { MP_QSTR_filesystem, MP_ARG_OBJ | MP_ARG_REQUIRED }, @@ -75,7 +75,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(storage_mount_obj, 0, storage_mount); //| This is the CircuitPython analog to the UNIX ``umount`` command.""" //| ... //| -STATIC mp_obj_t storage_umount(mp_obj_t mnt_in) { +static mp_obj_t storage_umount(mp_obj_t mnt_in) { if (mp_obj_is_str(mnt_in)) { common_hal_storage_umount_path(mp_obj_str_get_str(mnt_in)); } else { @@ -102,7 +102,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(storage_umount_obj, storage_umount); //| filesystem will be corrupted.""" //| ... //| -STATIC mp_obj_t storage_remount(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t storage_remount(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_mount_path, ARG_readonly, ARG_disable_concurrent_write_protection }; static const mp_arg_t allowed_args[] = { { MP_QSTR_mount_path, MP_ARG_OBJ | MP_ARG_REQUIRED }, @@ -125,7 +125,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(storage_remount_obj, 0, storage_remount); //| """Retrieves the mount object associated with the mount path""" //| ... //| -STATIC mp_obj_t storage_getmount(const mp_obj_t mnt_in) { +static mp_obj_t storage_getmount(const mp_obj_t mnt_in) { return common_hal_storage_getmount(mp_obj_str_get_str(mnt_in)); } MP_DEFINE_CONST_FUN_OBJ_1(storage_getmount_obj, storage_getmount); @@ -153,7 +153,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(storage_getmount_obj, storage_getmount); //| ... //| -STATIC mp_obj_t storage_erase_filesystem(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t storage_erase_filesystem(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_extended }; static const mp_arg_t allowed_args[] = { { MP_QSTR_extended, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} }, @@ -182,7 +182,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(storage_erase_filesystem_obj, 0, storage_erase_filesy //| Can be called in ``boot.py``, before USB is connected.""" //| ... //| -STATIC mp_obj_t storage_disable_usb_drive(void) { +static mp_obj_t storage_disable_usb_drive(void) { #if CIRCUITPY_USB_DEVICE && CIRCUITPY_USB_MSC if (!common_hal_storage_disable_usb_drive()) { #else @@ -207,7 +207,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(storage_disable_usb_drive_obj, storage_disable_usb_dri //| """ //| ... //| -STATIC mp_obj_t storage_enable_usb_drive(void) { +static mp_obj_t storage_enable_usb_drive(void) { #if CIRCUITPY_USB_DEVICE && CIRCUITPY_USB_MSC if (!common_hal_storage_enable_usb_drive()) { #else @@ -219,7 +219,7 @@ STATIC mp_obj_t storage_enable_usb_drive(void) { } MP_DEFINE_CONST_FUN_OBJ_0(storage_enable_usb_drive_obj, storage_enable_usb_drive); -STATIC const mp_rom_map_elem_t storage_module_globals_table[] = { +static const mp_rom_map_elem_t storage_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_storage) }, { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&storage_mount_obj) }, @@ -294,7 +294,7 @@ STATIC const mp_rom_map_elem_t storage_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) }, }; -STATIC MP_DEFINE_CONST_DICT(storage_module_globals, storage_module_globals_table); +static MP_DEFINE_CONST_DICT(storage_module_globals, storage_module_globals_table); const mp_obj_module_t storage_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/struct/__init__.c b/shared-bindings/struct/__init__.c index 93b7666bf992f..eded8b1a3daba 100644 --- a/shared-bindings/struct/__init__.c +++ b/shared-bindings/struct/__init__.c @@ -33,7 +33,7 @@ //| ... //| -STATIC mp_obj_t struct_calcsize(mp_obj_t fmt_in) { +static mp_obj_t struct_calcsize(mp_obj_t fmt_in) { return MP_OBJ_NEW_SMALL_INT(shared_modules_struct_calcsize(fmt_in)); } @@ -45,7 +45,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(struct_calcsize_obj, struct_calcsize); //| ... //| -STATIC mp_obj_t struct_pack(size_t n_args, const mp_obj_t *args) { +static mp_obj_t struct_pack(size_t n_args, const mp_obj_t *args) { mp_int_t size = MP_OBJ_SMALL_INT_VALUE(struct_calcsize(args[0])); vstr_t vstr; vstr_init_len(&vstr, size); @@ -63,7 +63,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(struct_pack_obj, 1, MP_OBJ_FUN_ARGS_MAX, str //| ... //| -STATIC mp_obj_t struct_pack_into(size_t n_args, const mp_obj_t *args) { +static mp_obj_t struct_pack_into(size_t n_args, const mp_obj_t *args) { mp_buffer_info_t bufinfo; mp_get_buffer_raise(args[1], &bufinfo, MP_BUFFER_WRITE); mp_int_t offset = mp_obj_get_int(args[2]); @@ -90,7 +90,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(struct_pack_into_obj, 3, MP_OBJ_FUN_ARGS_MAX //| ... //| -STATIC mp_obj_t struct_unpack(size_t n_args, const mp_obj_t *args) { +static mp_obj_t struct_unpack(size_t n_args, const mp_obj_t *args) { mp_buffer_info_t bufinfo; mp_get_buffer_raise(args[1], &bufinfo, MP_BUFFER_READ); byte *p = bufinfo.buf; @@ -109,7 +109,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(struct_unpack_obj, 2, 3, struct_unpack); //| ... //| -STATIC mp_obj_t struct_unpack_from(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t struct_unpack_from(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_format, ARG_buffer, ARG_offset }; static const mp_arg_t allowed_args[] = { { MP_QSTR_format, MP_ARG_REQUIRED | MP_ARG_OBJ, {} }, @@ -141,7 +141,7 @@ STATIC mp_obj_t struct_unpack_from(size_t n_args, const mp_obj_t *pos_args, mp_m } MP_DEFINE_CONST_FUN_OBJ_KW(struct_unpack_from_obj, 0, struct_unpack_from); -STATIC const mp_rom_map_elem_t mp_module_struct_globals_table[] = { +static const mp_rom_map_elem_t mp_module_struct_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_struct) }, { MP_ROM_QSTR(MP_QSTR_calcsize), MP_ROM_PTR(&struct_calcsize_obj) }, { MP_ROM_QSTR(MP_QSTR_pack), MP_ROM_PTR(&struct_pack_obj) }, @@ -150,7 +150,7 @@ STATIC const mp_rom_map_elem_t mp_module_struct_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_unpack_from), MP_ROM_PTR(&struct_unpack_from_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(mp_module_struct_globals, mp_module_struct_globals_table); +static MP_DEFINE_CONST_DICT(mp_module_struct_globals, mp_module_struct_globals_table); const mp_obj_module_t struct_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/supervisor/RunReason.c b/shared-bindings/supervisor/RunReason.c index 4d25d7be3f642..5fc29fa27b6aa 100644 --- a/shared-bindings/supervisor/RunReason.c +++ b/shared-bindings/supervisor/RunReason.c @@ -35,7 +35,7 @@ MAKE_ENUM_MAP(supervisor_run_reason) { MAKE_ENUM_MAP_ENTRY(run_reason, SUPERVISOR_RELOAD), MAKE_ENUM_MAP_ENTRY(run_reason, REPL_RELOAD), }; -STATIC MP_DEFINE_CONST_DICT(supervisor_run_reason_locals_dict, supervisor_run_reason_locals_table); +static MP_DEFINE_CONST_DICT(supervisor_run_reason_locals_dict, supervisor_run_reason_locals_table); MAKE_PRINTER(supervisor, supervisor_run_reason); diff --git a/shared-bindings/supervisor/Runtime.c b/shared-bindings/supervisor/Runtime.c index 3a63816ccf4d3..5c4754b85f2e4 100644 --- a/shared-bindings/supervisor/Runtime.c +++ b/shared-bindings/supervisor/Runtime.c @@ -24,7 +24,7 @@ #include "tusb.h" #endif -STATIC supervisor_run_reason_t _run_reason; +static supervisor_run_reason_t _run_reason; // TODO: add REPL to description once it is operational @@ -45,7 +45,7 @@ STATIC supervisor_run_reason_t _run_reason; //| usb_connected: bool //| """Returns the USB enumeration status (read-only).""" -STATIC mp_obj_t supervisor_runtime_get_usb_connected(mp_obj_t self) { +static mp_obj_t supervisor_runtime_get_usb_connected(mp_obj_t self) { #if CIRCUITPY_USB_DEVICE return mp_obj_new_bool(tud_ready()); #else @@ -59,7 +59,7 @@ MP_PROPERTY_GETTER(supervisor_runtime_usb_connected_obj, //| serial_connected: bool //| """Returns the USB serial communication status (read-only).""" -STATIC mp_obj_t supervisor_runtime_get_serial_connected(mp_obj_t self) { +static mp_obj_t supervisor_runtime_get_serial_connected(mp_obj_t self) { return mp_obj_new_bool(serial_connected()); } MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_serial_connected_obj, supervisor_runtime_get_serial_connected); @@ -81,7 +81,7 @@ MP_PROPERTY_GETTER(supervisor_runtime_serial_connected_obj, //| Since ``0`` acts as ``False``, ``if supervisor.runtime.serial_byes_available:`` //| will still work. //| """ -STATIC mp_obj_t supervisor_runtime_get_serial_bytes_available(mp_obj_t self) { +static mp_obj_t supervisor_runtime_get_serial_bytes_available(mp_obj_t self) { return MP_OBJ_NEW_SMALL_INT(serial_bytes_available()); } MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_serial_bytes_available_obj, supervisor_runtime_get_serial_bytes_available); @@ -99,7 +99,7 @@ void supervisor_set_run_reason(supervisor_run_reason_t run_reason) { //| run_reason: RunReason //| """Why CircuitPython started running this particular time (read-only).""" -STATIC mp_obj_t supervisor_runtime_get_run_reason(mp_obj_t self) { +static mp_obj_t supervisor_runtime_get_run_reason(mp_obj_t self) { return cp_enum_find(&supervisor_run_reason_type, _run_reason); } MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_run_reason_obj, supervisor_runtime_get_run_reason); @@ -112,7 +112,7 @@ MP_PROPERTY_GETTER(supervisor_runtime_run_reason_obj, //| //| **Limitations**: Raises ``NotImplementedError`` on builds that do not implement ``safemode.py``. //| """ -STATIC mp_obj_t supervisor_runtime_get_safe_mode_reason(mp_obj_t self) { +static mp_obj_t supervisor_runtime_get_safe_mode_reason(mp_obj_t self) { #if CIRCUITPY_SAFEMODE_PY return cp_enum_find(&supervisor_safe_mode_reason_type, get_safe_mode()); #else @@ -127,12 +127,12 @@ MP_PROPERTY_GETTER(supervisor_runtime_safe_mode_reason_obj, //| autoreload: bool //| """Whether CircuitPython may autoreload based on workflow writes to the filesystem.""" //| -STATIC mp_obj_t supervisor_runtime_get_autoreload(mp_obj_t self) { +static mp_obj_t supervisor_runtime_get_autoreload(mp_obj_t self) { return mp_obj_new_bool(autoreload_is_enabled()); } MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_autoreload_obj, supervisor_runtime_get_autoreload); -STATIC mp_obj_t supervisor_runtime_set_autoreload(mp_obj_t self, mp_obj_t state_in) { +static mp_obj_t supervisor_runtime_set_autoreload(mp_obj_t self, mp_obj_t state_in) { if (mp_obj_is_true(state_in)) { autoreload_enable(); } else { @@ -150,7 +150,7 @@ MP_PROPERTY_GETSET(supervisor_runtime_autoreload_obj, //| """Enable/Disable ble workflow until a reset. This prevents BLE advertising outside of the VM and //| the services used for it.""" //| -STATIC mp_obj_t supervisor_runtime_get_ble_workflow(mp_obj_t self) { +static mp_obj_t supervisor_runtime_get_ble_workflow(mp_obj_t self) { #if CIRCUITPY_BLE_FILE_SERVICE && CIRCUITPY_SERIAL_BLE return mp_obj_new_bool(supervisor_bluetooth_workflow_is_enabled()); #else @@ -159,7 +159,7 @@ STATIC mp_obj_t supervisor_runtime_get_ble_workflow(mp_obj_t self) { } MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_ble_workflow_obj, supervisor_runtime_get_ble_workflow); -STATIC mp_obj_t supervisor_runtime_set_ble_workflow(mp_obj_t self, mp_obj_t state_in) { +static mp_obj_t supervisor_runtime_set_ble_workflow(mp_obj_t self, mp_obj_t state_in) { #if CIRCUITPY_BLE_FILE_SERVICE && CIRCUITPY_SERIAL_BLE if (mp_obj_is_true(state_in)) { supervisor_bluetooth_enable_workflow(); @@ -182,12 +182,12 @@ MP_PROPERTY_GETSET(supervisor_runtime_ble_workflow_obj, //| after the current code finishes and the status LED is used to show //| the finish state.""" //| -STATIC mp_obj_t supervisor_runtime_get_rgb_status_brightness(mp_obj_t self) { +static mp_obj_t supervisor_runtime_get_rgb_status_brightness(mp_obj_t self) { return MP_OBJ_NEW_SMALL_INT(get_status_brightness()); } MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_rgb_status_brightness_obj, supervisor_runtime_get_rgb_status_brightness); -STATIC mp_obj_t supervisor_runtime_set_rgb_status_brightness(mp_obj_t self, mp_obj_t lvl) { +static mp_obj_t supervisor_runtime_set_rgb_status_brightness(mp_obj_t self, mp_obj_t lvl) { #if CIRCUITPY_STATUS_LED // This must be int. If cast to uint8_t first, will never raise a ValueError. set_status_brightness((uint8_t)mp_arg_validate_int_range(mp_obj_get_int(lvl), 0, 255, MP_QSTR_brightness)); @@ -202,7 +202,7 @@ MP_PROPERTY_GETSET(supervisor_runtime_rgb_status_brightness_obj, (mp_obj_t)&supervisor_runtime_get_rgb_status_brightness_obj, (mp_obj_t)&supervisor_runtime_set_rgb_status_brightness_obj); -STATIC const mp_rom_map_elem_t supervisor_runtime_locals_dict_table[] = { +static const mp_rom_map_elem_t supervisor_runtime_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_usb_connected), MP_ROM_PTR(&supervisor_runtime_usb_connected_obj) }, { MP_ROM_QSTR(MP_QSTR_serial_connected), MP_ROM_PTR(&supervisor_runtime_serial_connected_obj) }, { MP_ROM_QSTR(MP_QSTR_serial_bytes_available), MP_ROM_PTR(&supervisor_runtime_serial_bytes_available_obj) }, @@ -213,7 +213,7 @@ STATIC const mp_rom_map_elem_t supervisor_runtime_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_rgb_status_brightness), MP_ROM_PTR(&supervisor_runtime_rgb_status_brightness_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(supervisor_runtime_locals_dict, supervisor_runtime_locals_dict_table); +static MP_DEFINE_CONST_DICT(supervisor_runtime_locals_dict, supervisor_runtime_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( supervisor_runtime_type, diff --git a/shared-bindings/supervisor/SafeModeReason.c b/shared-bindings/supervisor/SafeModeReason.c index e974cf34dd1aa..e2cbac3b9a7d5 100644 --- a/shared-bindings/supervisor/SafeModeReason.c +++ b/shared-bindings/supervisor/SafeModeReason.c @@ -131,7 +131,7 @@ MAKE_ENUM_MAP(supervisor_safe_mode_reason) { MAKE_ENUM_MAP_ENTRY(safe_mode_reason, WATCHDOG), }; -STATIC MP_DEFINE_CONST_DICT(supervisor_safe_mode_reason_locals_dict, supervisor_safe_mode_reason_locals_table); +static MP_DEFINE_CONST_DICT(supervisor_safe_mode_reason_locals_dict, supervisor_safe_mode_reason_locals_table); MAKE_PRINTER(supervisor, supervisor_safe_mode_reason); diff --git a/shared-bindings/supervisor/StatusBar.c b/shared-bindings/supervisor/StatusBar.c index af041facf46fb..46e7962cf0571 100644 --- a/shared-bindings/supervisor/StatusBar.c +++ b/shared-bindings/supervisor/StatusBar.c @@ -33,7 +33,7 @@ //| If set to ``False``, status bar will be cleared and then disabled. //| May be set in ``boot.py`` or later. Persists across soft restarts. //| """ -STATIC mp_obj_t supervisor_status_bar_get_console(mp_obj_t self_in) { +static mp_obj_t supervisor_status_bar_get_console(mp_obj_t self_in) { #if CIRCUITPY_STATUS_BAR supervisor_status_bar_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_bool(shared_module_supervisor_status_bar_get_console(self)); @@ -43,7 +43,7 @@ STATIC mp_obj_t supervisor_status_bar_get_console(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(supervisor_status_bar_get_console_obj, supervisor_status_bar_get_console); -STATIC mp_obj_t supervisor_status_bar_set_console(mp_obj_t self_in, mp_obj_t state_in) { +static mp_obj_t supervisor_status_bar_set_console(mp_obj_t self_in, mp_obj_t state_in) { #if CIRCUITPY_STATUS_BAR supervisor_status_bar_obj_t *self = MP_OBJ_TO_PTR(self_in); shared_module_supervisor_status_bar_set_console(self, mp_obj_is_true(state_in)); @@ -65,7 +65,7 @@ MP_PROPERTY_GETSET(supervisor_status_bar_console_obj, //| Not available if `terminalio` is not available. //| """ //| -STATIC mp_obj_t supervisor_status_bar_get_display(mp_obj_t self_in) { +static mp_obj_t supervisor_status_bar_get_display(mp_obj_t self_in) { #if CIRCUITPY_STATUS_BAR && CIRCUITPY_TERMINALIO supervisor_status_bar_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_bool(shared_module_supervisor_status_bar_get_display(self)); @@ -75,7 +75,7 @@ STATIC mp_obj_t supervisor_status_bar_get_display(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(supervisor_status_bar_get_display_obj, supervisor_status_bar_get_display); -STATIC mp_obj_t supervisor_status_bar_set_display(mp_obj_t self_in, mp_obj_t state_in) { +static mp_obj_t supervisor_status_bar_set_display(mp_obj_t self_in, mp_obj_t state_in) { #if CIRCUITPY_STATUS_BAR && CIRCUITPY_TERMINALIO supervisor_status_bar_obj_t *self = MP_OBJ_TO_PTR(self_in); shared_module_supervisor_status_bar_set_display(self, mp_obj_is_true(state_in)); @@ -91,12 +91,12 @@ MP_PROPERTY_GETSET(supervisor_status_bar_display_obj, (mp_obj_t)&supervisor_status_bar_set_display_obj); -STATIC const mp_rom_map_elem_t supervisor_status_bar_locals_dict_table[] = { +static const mp_rom_map_elem_t supervisor_status_bar_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_console), MP_ROM_PTR(&supervisor_status_bar_console_obj) }, { MP_ROM_QSTR(MP_QSTR_display), MP_ROM_PTR(&supervisor_status_bar_display_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(supervisor_status_bar_locals_dict, supervisor_status_bar_locals_dict_table); +static MP_DEFINE_CONST_DICT(supervisor_status_bar_locals_dict, supervisor_status_bar_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( supervisor_status_bar_type, diff --git a/shared-bindings/supervisor/__init__.c b/shared-bindings/supervisor/__init__.c index e026fd91d4824..e09094ff88e72 100644 --- a/shared-bindings/supervisor/__init__.c +++ b/shared-bindings/supervisor/__init__.c @@ -45,7 +45,7 @@ //| """Reload the main Python code and run it (equivalent to hitting Ctrl-D at the REPL).""" //| ... //| -STATIC mp_obj_t supervisor_reload(void) { +static mp_obj_t supervisor_reload(void) { reload_initiate(RUN_REASON_SUPERVISOR_RELOAD); return mp_const_none; } @@ -92,7 +92,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(supervisor_reload_obj, supervisor_reload); //| reset to the standard search sequence.""" //| ... //| -STATIC mp_obj_t supervisor_set_next_code_file(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t supervisor_set_next_code_file(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { static const mp_arg_t allowed_args[] = { { MP_QSTR_filename, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_rom_obj = mp_const_none} }, { MP_QSTR_reload_on_success, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} }, @@ -210,7 +210,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(supervisor_ticks_ms_obj, supervisor_ticks_ms); //| Only code (main or boot) runs are considered, not REPL runs.""" //| ... //| -STATIC mp_obj_t supervisor_get_previous_traceback(void) { +static mp_obj_t supervisor_get_previous_traceback(void) { if (prev_traceback_string) { size_t len = strlen(prev_traceback_string); if (len > 0) { @@ -230,7 +230,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(supervisor_get_previous_traceback_obj, supervisor_get_ //| """Reset the CircuitPython serial terminal with new dimensions.""" //| ... //| -STATIC mp_obj_t supervisor_reset_terminal(mp_obj_t x_pixels, mp_obj_t y_pixels) { +static mp_obj_t supervisor_reset_terminal(mp_obj_t x_pixels, mp_obj_t y_pixels) { #if CIRCUITPY_DISPLAYIO supervisor_stop_terminal(); supervisor_start_terminal(mp_obj_get_int(x_pixels), mp_obj_get_int(y_pixels)); @@ -258,7 +258,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(supervisor_reset_terminal_obj, supervisor_reset_termin //| """ //| ... //| -STATIC mp_obj_t supervisor_set_usb_identification(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t supervisor_set_usb_identification(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { #if CIRCUITPY_USB_DEVICE && CIRCUITPY_USB_IDENTIFICATION static const mp_arg_t allowed_args[] = { { MP_QSTR_manufacturer, MP_ARG_OBJ, {.u_rom_obj = mp_const_none} }, @@ -310,7 +310,7 @@ STATIC mp_obj_t supervisor_set_usb_identification(size_t n_args, const mp_obj_t } MP_DEFINE_CONST_FUN_OBJ_KW(supervisor_set_usb_identification_obj, 0, supervisor_set_usb_identification); -STATIC const mp_rom_map_elem_t supervisor_module_globals_table[] = { +static const mp_rom_map_elem_t supervisor_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_supervisor) }, { MP_ROM_QSTR(MP_QSTR_runtime), MP_ROM_PTR(&common_hal_supervisor_runtime_obj) }, { MP_ROM_QSTR(MP_QSTR_reload), MP_ROM_PTR(&supervisor_reload_obj) }, @@ -328,7 +328,7 @@ STATIC const mp_rom_map_elem_t supervisor_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_status_bar), MP_ROM_PTR(&shared_module_supervisor_status_bar_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(supervisor_module_globals, supervisor_module_globals_table); +static MP_DEFINE_CONST_DICT(supervisor_module_globals, supervisor_module_globals_table); const mp_obj_module_t supervisor_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/synthio/Biquad.c b/shared-bindings/synthio/Biquad.c index a687c759d1db8..79a9fa4593f4d 100644 --- a/shared-bindings/synthio/Biquad.c +++ b/shared-bindings/synthio/Biquad.c @@ -49,7 +49,7 @@ static const mp_arg_t biquad_properties[] = { //| https://github.com/WebAudio/Audio-EQ-Cookbook/blob/main/Audio-EQ-Cookbook.txt //| """ //| -STATIC mp_obj_t synthio_biquad_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t synthio_biquad_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { mp_arg_val_t args[MP_ARRAY_SIZE(biquad_properties)]; mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(biquad_properties), biquad_properties, args); diff --git a/shared-bindings/synthio/LFO.c b/shared-bindings/synthio/LFO.c index 93951aa6ac2e3..328050e783f51 100644 --- a/shared-bindings/synthio/LFO.c +++ b/shared-bindings/synthio/LFO.c @@ -13,7 +13,7 @@ #include "shared-bindings/synthio/LFO.h" #include "shared-module/synthio/LFO.h" -STATIC const uint16_t triangle[] = {0, 32767, 0, -32767}; +static const uint16_t triangle[] = {0, 32767, 0, -32767}; //| class LFO: //| """A low-frequency oscillator block @@ -88,7 +88,7 @@ static const mp_arg_t lfo_properties[] = { { MP_QSTR_interpolate, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = MP_ROM_INT(1) } }, }; -STATIC mp_obj_t synthio_lfo_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t synthio_lfo_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_waveform }; // others never directly referred to by argument number mp_arg_val_t args[MP_ARRAY_SIZE(lfo_properties)]; @@ -117,7 +117,7 @@ STATIC mp_obj_t synthio_lfo_make_new(const mp_obj_type_t *type_in, size_t n_args //| waveform: Optional[ReadableBuffer] //| """The waveform of this lfo. (read-only, but the values in the buffer may be modified dynamically)""" -STATIC mp_obj_t synthio_lfo_get_waveform(mp_obj_t self_in) { +static mp_obj_t synthio_lfo_get_waveform(mp_obj_t self_in) { synthio_lfo_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_synthio_lfo_get_waveform_obj(self); } @@ -128,13 +128,13 @@ MP_PROPERTY_GETTER(synthio_lfo_waveform_obj, //| rate: BlockInput //| """The rate (in Hz) at which the LFO cycles through its waveform""" -STATIC mp_obj_t synthio_lfo_get_rate(mp_obj_t self_in) { +static mp_obj_t synthio_lfo_get_rate(mp_obj_t self_in) { synthio_lfo_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_synthio_lfo_get_rate_obj(self); } MP_DEFINE_CONST_FUN_OBJ_1(synthio_lfo_get_rate_obj, synthio_lfo_get_rate); -STATIC mp_obj_t synthio_lfo_set_rate(mp_obj_t self_in, mp_obj_t arg) { +static mp_obj_t synthio_lfo_set_rate(mp_obj_t self_in, mp_obj_t arg) { synthio_lfo_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_synthio_lfo_set_rate_obj(self, arg); return mp_const_none; @@ -147,13 +147,13 @@ MP_PROPERTY_GETSET(synthio_lfo_rate_obj, //| offset: BlockInput //| """An additive value applied to the LFO's output""" -STATIC mp_obj_t synthio_lfo_get_offset(mp_obj_t self_in) { +static mp_obj_t synthio_lfo_get_offset(mp_obj_t self_in) { synthio_lfo_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_synthio_lfo_get_offset_obj(self); } MP_DEFINE_CONST_FUN_OBJ_1(synthio_lfo_get_offset_obj, synthio_lfo_get_offset); -STATIC mp_obj_t synthio_lfo_set_offset(mp_obj_t self_in, mp_obj_t arg) { +static mp_obj_t synthio_lfo_set_offset(mp_obj_t self_in, mp_obj_t arg) { synthio_lfo_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_synthio_lfo_set_offset_obj(self, arg); return mp_const_none; @@ -165,13 +165,13 @@ MP_PROPERTY_GETSET(synthio_lfo_offset_obj, //| phase_offset: BlockInput //| """An additive value applied to the LFO's phase""" -STATIC mp_obj_t synthio_lfo_get_phase_offset(mp_obj_t self_in) { +static mp_obj_t synthio_lfo_get_phase_offset(mp_obj_t self_in) { synthio_lfo_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_synthio_lfo_get_phase_offset_obj(self); } MP_DEFINE_CONST_FUN_OBJ_1(synthio_lfo_get_phase_offset_obj, synthio_lfo_get_phase_offset); -STATIC mp_obj_t synthio_lfo_set_phase_offset(mp_obj_t self_in, mp_obj_t arg) { +static mp_obj_t synthio_lfo_set_phase_offset(mp_obj_t self_in, mp_obj_t arg) { synthio_lfo_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_synthio_lfo_set_phase_offset_obj(self, arg); return mp_const_none; @@ -183,13 +183,13 @@ MP_PROPERTY_GETSET(synthio_lfo_phase_offset_obj, //| scale: BlockInput //| """An multiplier value applied to the LFO's output""" -STATIC mp_obj_t synthio_lfo_get_scale(mp_obj_t self_in) { +static mp_obj_t synthio_lfo_get_scale(mp_obj_t self_in) { synthio_lfo_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_synthio_lfo_get_scale_obj(self); } MP_DEFINE_CONST_FUN_OBJ_1(synthio_lfo_get_scale_obj, synthio_lfo_get_scale); -STATIC mp_obj_t synthio_lfo_set_scale(mp_obj_t self_in, mp_obj_t arg) { +static mp_obj_t synthio_lfo_set_scale(mp_obj_t self_in, mp_obj_t arg) { synthio_lfo_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_synthio_lfo_set_scale_obj(self, arg); return mp_const_none; @@ -204,13 +204,13 @@ MP_PROPERTY_GETSET(synthio_lfo_scale_obj, //| """True if the waveform should stop when it reaches its last output value, false if it should re-start at the beginning of its waveform //| //| This applies to the ``phase`` *before* the addition of any ``phase_offset`` """ -STATIC mp_obj_t synthio_lfo_get_once(mp_obj_t self_in) { +static mp_obj_t synthio_lfo_get_once(mp_obj_t self_in) { synthio_lfo_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_bool(common_hal_synthio_lfo_get_once(self)); } MP_DEFINE_CONST_FUN_OBJ_1(synthio_lfo_get_once_obj, synthio_lfo_get_once); -STATIC mp_obj_t synthio_lfo_set_once(mp_obj_t self_in, mp_obj_t arg) { +static mp_obj_t synthio_lfo_set_once(mp_obj_t self_in, mp_obj_t arg) { synthio_lfo_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_synthio_lfo_set_once(self, mp_obj_is_true(arg)); return mp_const_none; @@ -224,13 +224,13 @@ MP_PROPERTY_GETSET(synthio_lfo_once_obj, //| //| interpolate: bool //| """True if the waveform should perform linear interpolation between values""" -STATIC mp_obj_t synthio_lfo_get_interpolate(mp_obj_t self_in) { +static mp_obj_t synthio_lfo_get_interpolate(mp_obj_t self_in) { synthio_lfo_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_bool(common_hal_synthio_lfo_get_interpolate(self)); } MP_DEFINE_CONST_FUN_OBJ_1(synthio_lfo_get_interpolate_obj, synthio_lfo_get_interpolate); -STATIC mp_obj_t synthio_lfo_set_interpolate(mp_obj_t self_in, mp_obj_t arg) { +static mp_obj_t synthio_lfo_set_interpolate(mp_obj_t self_in, mp_obj_t arg) { synthio_lfo_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_synthio_lfo_set_interpolate(self, mp_obj_is_true(arg)); return mp_const_none; @@ -244,7 +244,7 @@ MP_PROPERTY_GETSET(synthio_lfo_interpolate_obj, //| //| phase: float //| """The phase of the oscillator, in the range 0 to 1 (read-only)""" -STATIC mp_obj_t synthio_lfo_get_phase(mp_obj_t self_in) { +static mp_obj_t synthio_lfo_get_phase(mp_obj_t self_in) { synthio_lfo_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_float(common_hal_synthio_lfo_get_phase(self)); } @@ -257,7 +257,7 @@ MP_PROPERTY_GETTER(synthio_lfo_phase_obj, //| //| value: float //| """The value of the oscillator (read-only)""" -STATIC mp_obj_t synthio_lfo_get_value(mp_obj_t self_in) { +static mp_obj_t synthio_lfo_get_value(mp_obj_t self_in) { synthio_lfo_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_float(common_hal_synthio_lfo_get_value(self)); } @@ -271,7 +271,7 @@ MP_PROPERTY_GETTER(synthio_lfo_value_obj, //| def retrigger(self): //| """Reset the LFO's internal index to the start of the waveform. Most useful when it its `once` property is `True`.""" //| -STATIC mp_obj_t synthio_lfo_retrigger(mp_obj_t self_in) { +static mp_obj_t synthio_lfo_retrigger(mp_obj_t self_in) { synthio_lfo_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_synthio_lfo_retrigger(self); return mp_const_none; @@ -283,7 +283,7 @@ static void lfo_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t properties_print_helper(print, self_in, lfo_properties, MP_ARRAY_SIZE(lfo_properties)); } -STATIC const mp_rom_map_elem_t synthio_lfo_locals_dict_table[] = { +static const mp_rom_map_elem_t synthio_lfo_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_waveform), MP_ROM_PTR(&synthio_lfo_waveform_obj) }, { MP_ROM_QSTR(MP_QSTR_rate), MP_ROM_PTR(&synthio_lfo_rate_obj) }, { MP_ROM_QSTR(MP_QSTR_scale), MP_ROM_PTR(&synthio_lfo_scale_obj) }, @@ -295,10 +295,10 @@ STATIC const mp_rom_map_elem_t synthio_lfo_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_phase), MP_ROM_PTR(&synthio_lfo_phase_obj) }, { MP_ROM_QSTR(MP_QSTR_retrigger), MP_ROM_PTR(&synthio_lfo_retrigger_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(synthio_lfo_locals_dict, synthio_lfo_locals_dict_table); +static MP_DEFINE_CONST_DICT(synthio_lfo_locals_dict, synthio_lfo_locals_dict_table); -STATIC const synthio_block_proto_t lfo_proto = { +static const synthio_block_proto_t lfo_proto = { MP_PROTO_IMPLEMENT(MP_QSTR_synthio_block) .tick = common_hal_synthio_lfo_tick, }; diff --git a/shared-bindings/synthio/Math.c b/shared-bindings/synthio/Math.c index 0a3b8a875b147..e2c7e40900a00 100644 --- a/shared-bindings/synthio/Math.c +++ b/shared-bindings/synthio/Math.c @@ -14,7 +14,7 @@ #include "shared-module/synthio/Math.h" static const mp_arg_t math_properties[4]; -STATIC mp_obj_t synthio_math_make_new_common(mp_arg_val_t args[MP_ARRAY_SIZE(math_properties)]); +static mp_obj_t synthio_math_make_new_common(mp_arg_val_t args[MP_ARRAY_SIZE(math_properties)]); MAKE_ENUM_VALUE(synthio_math_operation_type, math_op, SUM, OP_SUM); MAKE_ENUM_VALUE(synthio_math_operation_type, math_op, ADD_SUB, OP_ADD_SUB); @@ -96,14 +96,14 @@ MAKE_ENUM_MAP(synthio_math_operation) { }; -STATIC mp_obj_t mathop_call(mp_obj_t fun, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t mathop_call(mp_obj_t fun, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { mp_arg_val_t args[4]; args[0].u_obj = fun; mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(math_properties) - 1, math_properties + 1, &args[1]); return synthio_math_make_new_common(args); } -STATIC MP_DEFINE_CONST_DICT(synthio_math_operation_locals_dict, synthio_math_operation_locals_table); +static MP_DEFINE_CONST_DICT(synthio_math_operation_locals_dict, synthio_math_operation_locals_table); MAKE_PRINTER(synthio, synthio_math_operation); MAKE_ENUM_TYPE(synthio, MathOperation, synthio_math_operation, call, mathop_call @@ -142,14 +142,14 @@ static const mp_arg_t math_properties[] = { { MP_QSTR_c, MP_ARG_OBJ, {.u_obj = MP_ROM_INT(1) } }, }; -STATIC mp_obj_t synthio_math_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t synthio_math_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { mp_arg_val_t args[MP_ARRAY_SIZE(math_properties)]; mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(math_properties), math_properties, args); return synthio_math_make_new_common(args); } -STATIC mp_obj_t synthio_math_make_new_common(mp_arg_val_t args[MP_ARRAY_SIZE(math_properties)]) { +static mp_obj_t synthio_math_make_new_common(mp_arg_val_t args[MP_ARRAY_SIZE(math_properties)]) { synthio_math_obj_t *self = mp_obj_malloc(synthio_math_obj_t, &synthio_math_type); self->base.last_tick = synthio_global_tick; @@ -162,13 +162,13 @@ STATIC mp_obj_t synthio_math_make_new_common(mp_arg_val_t args[MP_ARRAY_SIZE(mat //| a: BlockInput //| """The first input to the operation""" -STATIC mp_obj_t synthio_math_get_a(mp_obj_t self_in) { +static mp_obj_t synthio_math_get_a(mp_obj_t self_in) { synthio_math_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_synthio_math_get_input_obj(self, 0); } MP_DEFINE_CONST_FUN_OBJ_1(synthio_math_get_a_obj, synthio_math_get_a); -STATIC mp_obj_t synthio_math_set_a(mp_obj_t self_in, mp_obj_t arg) { +static mp_obj_t synthio_math_set_a(mp_obj_t self_in, mp_obj_t arg) { synthio_math_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_synthio_math_set_input_obj(self, 0, arg, MP_QSTR_a); return mp_const_none; @@ -181,13 +181,13 @@ MP_PROPERTY_GETSET(synthio_math_a_obj, //| b: BlockInput //| """The second input to the operation""" -STATIC mp_obj_t synthio_math_get_b(mp_obj_t self_in) { +static mp_obj_t synthio_math_get_b(mp_obj_t self_in) { synthio_math_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_synthio_math_get_input_obj(self, 1); } MP_DEFINE_CONST_FUN_OBJ_1(synthio_math_get_b_obj, synthio_math_get_b); -STATIC mp_obj_t synthio_math_set_b(mp_obj_t self_in, mp_obj_t arg) { +static mp_obj_t synthio_math_set_b(mp_obj_t self_in, mp_obj_t arg) { synthio_math_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_synthio_math_set_input_obj(self, 1, arg, MP_QSTR_b); return mp_const_none; @@ -200,13 +200,13 @@ MP_PROPERTY_GETSET(synthio_math_b_obj, //| c: BlockInput //| """The third input to the operation""" -STATIC mp_obj_t synthio_math_get_c(mp_obj_t self_in) { +static mp_obj_t synthio_math_get_c(mp_obj_t self_in) { synthio_math_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_synthio_math_get_input_obj(self, 2); } MP_DEFINE_CONST_FUN_OBJ_1(synthio_math_get_c_obj, synthio_math_get_c); -STATIC mp_obj_t synthio_math_set_c(mp_obj_t self_in, mp_obj_t arg) { +static mp_obj_t synthio_math_set_c(mp_obj_t self_in, mp_obj_t arg) { synthio_math_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_synthio_math_set_input_obj(self, 2, arg, MP_QSTR_c); return mp_const_none; @@ -219,13 +219,13 @@ MP_PROPERTY_GETSET(synthio_math_c_obj, //| operation: MathOperation //| """The function to compute""" -STATIC mp_obj_t synthio_math_get_operation(mp_obj_t self_in) { +static mp_obj_t synthio_math_get_operation(mp_obj_t self_in) { synthio_math_obj_t *self = MP_OBJ_TO_PTR(self_in); return cp_enum_find(&synthio_math_operation_type, common_hal_synthio_math_get_operation(self)); } MP_DEFINE_CONST_FUN_OBJ_1(synthio_math_get_operation_obj, synthio_math_get_operation); -STATIC mp_obj_t synthio_math_set_operation(mp_obj_t self_in, mp_obj_t arg) { +static mp_obj_t synthio_math_set_operation(mp_obj_t self_in, mp_obj_t arg) { synthio_math_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_synthio_math_set_operation(self, cp_enum_value(&synthio_math_operation_type, arg, MP_QSTR_operation)); return mp_const_none; @@ -241,7 +241,7 @@ MP_PROPERTY_GETSET(synthio_math_operation_obj, //| value: float //| """The value of the oscillator (read-only)""" //| -STATIC mp_obj_t synthio_math_get_value(mp_obj_t self_in) { +static mp_obj_t synthio_math_get_value(mp_obj_t self_in) { synthio_math_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_float(common_hal_synthio_math_get_value(self)); } @@ -256,17 +256,17 @@ static void math_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_ properties_print_helper(print, self_in, math_properties, MP_ARRAY_SIZE(math_properties)); } -STATIC const mp_rom_map_elem_t synthio_math_locals_dict_table[] = { +static const mp_rom_map_elem_t synthio_math_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_a), MP_ROM_PTR(&synthio_math_a_obj) }, { MP_ROM_QSTR(MP_QSTR_b), MP_ROM_PTR(&synthio_math_b_obj) }, { MP_ROM_QSTR(MP_QSTR_c), MP_ROM_PTR(&synthio_math_c_obj) }, { MP_ROM_QSTR(MP_QSTR_operation), MP_ROM_PTR(&synthio_math_operation_obj) }, { MP_ROM_QSTR(MP_QSTR_value), MP_ROM_PTR(&synthio_math_value_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(synthio_math_locals_dict, synthio_math_locals_dict_table); +static MP_DEFINE_CONST_DICT(synthio_math_locals_dict, synthio_math_locals_dict_table); -STATIC const synthio_block_proto_t math_proto = { +static const synthio_block_proto_t math_proto = { MP_PROTO_IMPLEMENT(MP_QSTR_synthio_block) .tick = common_hal_synthio_math_tick, }; diff --git a/shared-bindings/synthio/MidiTrack.c b/shared-bindings/synthio/MidiTrack.c index da1ebac70efe6..dee42770630f2 100644 --- a/shared-bindings/synthio/MidiTrack.c +++ b/shared-bindings/synthio/MidiTrack.c @@ -52,7 +52,7 @@ //| pass //| print("stopped")""" //| ... -STATIC mp_obj_t synthio_miditrack_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t synthio_miditrack_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_buffer, ARG_tempo, ARG_sample_rate, ARG_waveform, ARG_envelope }; static const mp_arg_t allowed_args[] = { { MP_QSTR_buffer, MP_ARG_OBJ | MP_ARG_REQUIRED, {} }, @@ -84,14 +84,14 @@ STATIC mp_obj_t synthio_miditrack_make_new(const mp_obj_type_t *type, size_t n_a //| def deinit(self) -> None: //| """Deinitialises the MidiTrack and releases any hardware resources for reuse.""" //| ... -STATIC mp_obj_t synthio_miditrack_deinit(mp_obj_t self_in) { +static mp_obj_t synthio_miditrack_deinit(mp_obj_t self_in) { synthio_miditrack_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_synthio_miditrack_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(synthio_miditrack_deinit_obj, synthio_miditrack_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(synthio_miditrack_deinit_obj, synthio_miditrack_deinit); -STATIC void check_for_deinit(synthio_miditrack_obj_t *self) { +static void check_for_deinit(synthio_miditrack_obj_t *self) { if (common_hal_synthio_miditrack_deinited(self)) { raise_deinited_error(); } @@ -106,17 +106,17 @@ STATIC void check_for_deinit(synthio_miditrack_obj_t *self) { //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t synthio_miditrack_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t synthio_miditrack_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_synthio_miditrack_deinit(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(synthio_miditrack___exit___obj, 4, 4, synthio_miditrack_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(synthio_miditrack___exit___obj, 4, 4, synthio_miditrack_obj___exit__); //| sample_rate: int //| """32 bit value that tells how quickly samples are played in Hertz (cycles per second).""" //| -STATIC mp_obj_t synthio_miditrack_obj_get_sample_rate(mp_obj_t self_in) { +static mp_obj_t synthio_miditrack_obj_get_sample_rate(mp_obj_t self_in) { synthio_miditrack_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_synthio_miditrack_get_sample_rate(self)); @@ -129,7 +129,7 @@ MP_PROPERTY_GETTER(synthio_miditrack_sample_rate_obj, //| error_location: Optional[int] //| """Offset, in bytes within the midi data, of a decoding error""" //| -STATIC mp_obj_t synthio_miditrack_obj_get_error_location(mp_obj_t self_in) { +static mp_obj_t synthio_miditrack_obj_get_error_location(mp_obj_t self_in) { synthio_miditrack_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); mp_int_t location = common_hal_synthio_miditrack_get_error_location(self); @@ -143,7 +143,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(synthio_miditrack_get_error_location_obj, synthio_midi MP_PROPERTY_GETTER(synthio_miditrack_error_location_obj, (mp_obj_t)&synthio_miditrack_get_error_location_obj); -STATIC const mp_rom_map_elem_t synthio_miditrack_locals_dict_table[] = { +static const mp_rom_map_elem_t synthio_miditrack_locals_dict_table[] = { // Methods { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&synthio_miditrack_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, @@ -153,9 +153,9 @@ STATIC const mp_rom_map_elem_t synthio_miditrack_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_sample_rate), MP_ROM_PTR(&synthio_miditrack_sample_rate_obj) }, { MP_ROM_QSTR(MP_QSTR_error_location), MP_ROM_PTR(&synthio_miditrack_error_location_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(synthio_miditrack_locals_dict, synthio_miditrack_locals_dict_table); +static MP_DEFINE_CONST_DICT(synthio_miditrack_locals_dict, synthio_miditrack_locals_dict_table); -STATIC const audiosample_p_t synthio_miditrack_proto = { +static const audiosample_p_t synthio_miditrack_proto = { MP_PROTO_IMPLEMENT(MP_QSTR_protocol_audiosample) .sample_rate = (audiosample_sample_rate_fun)common_hal_synthio_miditrack_get_sample_rate, .bits_per_sample = (audiosample_bits_per_sample_fun)common_hal_synthio_miditrack_get_bits_per_sample, diff --git a/shared-bindings/synthio/Note.c b/shared-bindings/synthio/Note.c index 174cce8a3a38c..c886f106a4cfd 100644 --- a/shared-bindings/synthio/Note.c +++ b/shared-bindings/synthio/Note.c @@ -55,7 +55,7 @@ static const mp_arg_t note_properties[] = { //| //| If the same Note object is played on multiple Synthesizer objects, the result is undefined. //| """ -STATIC mp_obj_t synthio_note_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t synthio_note_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { mp_arg_val_t args[MP_ARRAY_SIZE(note_properties)]; mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(note_properties), note_properties, args); @@ -69,13 +69,13 @@ STATIC mp_obj_t synthio_note_make_new(const mp_obj_type_t *type_in, size_t n_arg //| frequency: float //| """The base frequency of the note, in Hz.""" -STATIC mp_obj_t synthio_note_get_frequency(mp_obj_t self_in) { +static mp_obj_t synthio_note_get_frequency(mp_obj_t self_in) { synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_float(common_hal_synthio_note_get_frequency(self)); } MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_frequency_obj, synthio_note_get_frequency); -STATIC mp_obj_t synthio_note_set_frequency(mp_obj_t self_in, mp_obj_t arg) { +static mp_obj_t synthio_note_set_frequency(mp_obj_t self_in, mp_obj_t arg) { synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_synthio_note_set_frequency(self, mp_obj_get_float(arg)); return mp_const_none; @@ -91,13 +91,13 @@ MP_PROPERTY_GETSET(synthio_note_frequency_obj, //| Construct an appropriate filter by calling a filter-making method on the //| `Synthesizer` object where you plan to play the note, as filter coefficients depend //| on the sample rate""" -STATIC mp_obj_t synthio_note_get_filter(mp_obj_t self_in) { +static mp_obj_t synthio_note_get_filter(mp_obj_t self_in) { synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_synthio_note_get_filter_obj(self); } MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_filter_obj, synthio_note_get_filter); -STATIC mp_obj_t synthio_note_set_filter(mp_obj_t self_in, mp_obj_t arg) { +static mp_obj_t synthio_note_set_filter(mp_obj_t self_in, mp_obj_t arg) { synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_synthio_note_set_filter(self, arg); return mp_const_none; @@ -114,13 +114,13 @@ MP_PROPERTY_GETSET(synthio_note_filter_obj, //| For fractional values, the note plays at full amplitude in one channel //| and partial amplitude in the other channel. For instance -.5 plays at full //| amplitude in the left channel and 1/2 amplitude in the right channel.""" -STATIC mp_obj_t synthio_note_get_panning(mp_obj_t self_in) { +static mp_obj_t synthio_note_get_panning(mp_obj_t self_in) { synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_synthio_note_get_panning(self); } MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_panning_obj, synthio_note_get_panning); -STATIC mp_obj_t synthio_note_set_panning(mp_obj_t self_in, mp_obj_t arg) { +static mp_obj_t synthio_note_set_panning(mp_obj_t self_in, mp_obj_t arg) { synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_synthio_note_set_panning(self, arg); return mp_const_none; @@ -138,13 +138,13 @@ MP_PROPERTY_GETSET(synthio_note_panning_obj, //| the value from the note's envelope. //| //| To achieve a tremolo effect, attach an LFO here.""" -STATIC mp_obj_t synthio_note_get_amplitude(mp_obj_t self_in) { +static mp_obj_t synthio_note_get_amplitude(mp_obj_t self_in) { synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_synthio_note_get_amplitude(self); } MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_amplitude_obj, synthio_note_get_amplitude); -STATIC mp_obj_t synthio_note_set_amplitude(mp_obj_t self_in, mp_obj_t arg) { +static mp_obj_t synthio_note_set_amplitude(mp_obj_t self_in, mp_obj_t arg) { synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_synthio_note_set_amplitude(self, arg); return mp_const_none; @@ -164,13 +164,13 @@ MP_PROPERTY_GETSET(synthio_note_amplitude_obj, //| //| To achieve a vibrato or sweep effect, attach an LFO here. //| """ -STATIC mp_obj_t synthio_note_get_bend(mp_obj_t self_in) { +static mp_obj_t synthio_note_get_bend(mp_obj_t self_in) { synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_synthio_note_get_bend(self); } MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_bend_obj, synthio_note_get_bend); -STATIC mp_obj_t synthio_note_set_bend(mp_obj_t self_in, mp_obj_t arg) { +static mp_obj_t synthio_note_set_bend(mp_obj_t self_in, mp_obj_t arg) { synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_synthio_note_set_bend(self, arg); return mp_const_none; @@ -182,13 +182,13 @@ MP_PROPERTY_GETSET(synthio_note_bend_obj, //| waveform: Optional[ReadableBuffer] //| """The waveform of this note. Setting the waveform to a buffer of a different size resets the note's phase.""" -STATIC mp_obj_t synthio_note_get_waveform(mp_obj_t self_in) { +static mp_obj_t synthio_note_get_waveform(mp_obj_t self_in) { synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_synthio_note_get_waveform_obj(self); } MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_waveform_obj, synthio_note_get_waveform); -STATIC mp_obj_t synthio_note_set_waveform(mp_obj_t self_in, mp_obj_t arg) { +static mp_obj_t synthio_note_set_waveform(mp_obj_t self_in, mp_obj_t arg) { synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_synthio_note_set_waveform(self, arg); return mp_const_none; @@ -204,13 +204,13 @@ MP_PROPERTY_GETSET(synthio_note_waveform_obj, //| Values outside the range ``0`` to ``waveform_max_length-1`` (inclusive) are rejected with a `ValueError`. //| //| Values greater than or equal to the actual waveform length are treated as 0.""" -STATIC mp_obj_t synthio_note_get_waveform_loop_start(mp_obj_t self_in) { +static mp_obj_t synthio_note_get_waveform_loop_start(mp_obj_t self_in) { synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_int(common_hal_synthio_note_get_waveform_loop_start(self)); } MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_waveform_loop_start_obj, synthio_note_get_waveform_loop_start); -STATIC mp_obj_t synthio_note_set_waveform_loop_start(mp_obj_t self_in, mp_obj_t arg) { +static mp_obj_t synthio_note_set_waveform_loop_start(mp_obj_t self_in, mp_obj_t arg) { synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_synthio_note_set_waveform_loop_start(self, mp_obj_get_int(arg)); return mp_const_none; @@ -229,13 +229,13 @@ MP_PROPERTY_GETSET(synthio_note_waveform_loop_start_obj, //| //| Use the `synthio.waveform_max_length` constant to set the loop point at the end of the wave form, no matter its length.""" //| -STATIC mp_obj_t synthio_note_get_waveform_loop_end(mp_obj_t self_in) { +static mp_obj_t synthio_note_get_waveform_loop_end(mp_obj_t self_in) { synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_int(common_hal_synthio_note_get_waveform_loop_end(self)); } MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_waveform_loop_end_obj, synthio_note_get_waveform_loop_end); -STATIC mp_obj_t synthio_note_set_waveform_loop_end(mp_obj_t self_in, mp_obj_t arg) { +static mp_obj_t synthio_note_set_waveform_loop_end(mp_obj_t self_in, mp_obj_t arg) { synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_synthio_note_set_waveform_loop_end(self, mp_obj_get_int(arg)); return mp_const_none; @@ -249,13 +249,13 @@ MP_PROPERTY_GETSET(synthio_note_waveform_loop_end_obj, //| envelope: Envelope //| """The envelope of this note""" //| -STATIC mp_obj_t synthio_note_get_envelope(mp_obj_t self_in) { +static mp_obj_t synthio_note_get_envelope(mp_obj_t self_in) { synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_synthio_note_get_envelope_obj(self); } MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_envelope_obj, synthio_note_get_envelope); -STATIC mp_obj_t synthio_note_set_envelope(mp_obj_t self_in, mp_obj_t arg) { +static mp_obj_t synthio_note_set_envelope(mp_obj_t self_in, mp_obj_t arg) { synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_synthio_note_set_envelope(self, arg); return mp_const_none; @@ -269,13 +269,13 @@ MP_PROPERTY_GETSET(synthio_note_envelope_obj, //| """The ring frequency of the note, in Hz. Zero disables. //| //| For ring to take effect, both ``ring_frequency`` and ``ring_waveform`` must be set.""" -STATIC mp_obj_t synthio_note_get_ring_frequency(mp_obj_t self_in) { +static mp_obj_t synthio_note_get_ring_frequency(mp_obj_t self_in) { synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_float(common_hal_synthio_note_get_ring_frequency(self)); } MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_ring_frequency_obj, synthio_note_get_ring_frequency); -STATIC mp_obj_t synthio_note_set_ring_frequency(mp_obj_t self_in, mp_obj_t arg) { +static mp_obj_t synthio_note_set_ring_frequency(mp_obj_t self_in, mp_obj_t arg) { synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_synthio_note_set_ring_frequency(self, mp_obj_get_float(arg)); return mp_const_none; @@ -294,13 +294,13 @@ MP_PROPERTY_GETSET(synthio_note_ring_frequency_obj, //| //| To achieve a vibrato or sweep effect on the ring waveform, attach an LFO here. //| """ -STATIC mp_obj_t synthio_note_get_ring_bend(mp_obj_t self_in) { +static mp_obj_t synthio_note_get_ring_bend(mp_obj_t self_in) { synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_synthio_note_get_ring_bend(self); } MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_ring_bend_obj, synthio_note_get_ring_bend); -STATIC mp_obj_t synthio_note_set_ring_bend(mp_obj_t self_in, mp_obj_t arg) { +static mp_obj_t synthio_note_set_ring_bend(mp_obj_t self_in, mp_obj_t arg) { synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_synthio_note_set_ring_bend(self, arg); return mp_const_none; @@ -315,13 +315,13 @@ MP_PROPERTY_GETSET(synthio_note_ring_bend_obj, //| //| For ring to take effect, both ``ring_frequency`` and ``ring_waveform`` must be set.""" //| -STATIC mp_obj_t synthio_note_get_ring_waveform(mp_obj_t self_in) { +static mp_obj_t synthio_note_get_ring_waveform(mp_obj_t self_in) { synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_synthio_note_get_ring_waveform_obj(self); } MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_ring_waveform_obj, synthio_note_get_ring_waveform); -STATIC mp_obj_t synthio_note_set_ring_waveform(mp_obj_t self_in, mp_obj_t arg) { +static mp_obj_t synthio_note_set_ring_waveform(mp_obj_t self_in, mp_obj_t arg) { synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_synthio_note_set_ring_waveform(self, arg); return mp_const_none; @@ -337,13 +337,13 @@ MP_PROPERTY_GETSET(synthio_note_ring_waveform_obj, //| Values outside the range ``0`` to ``waveform_max_length-1`` (inclusive) are rejected with a `ValueError`. //| //| Values greater than or equal to the actual waveform length are treated as 0.""" -STATIC mp_obj_t synthio_note_get_ring_waveform_loop_start(mp_obj_t self_in) { +static mp_obj_t synthio_note_get_ring_waveform_loop_start(mp_obj_t self_in) { synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_int(common_hal_synthio_note_get_ring_waveform_loop_start(self)); } MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_ring_waveform_loop_start_obj, synthio_note_get_ring_waveform_loop_start); -STATIC mp_obj_t synthio_note_set_ring_waveform_loop_start(mp_obj_t self_in, mp_obj_t arg) { +static mp_obj_t synthio_note_set_ring_waveform_loop_start(mp_obj_t self_in, mp_obj_t arg) { synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_synthio_note_set_ring_waveform_loop_start(self, mp_obj_get_int(arg)); return mp_const_none; @@ -362,13 +362,13 @@ MP_PROPERTY_GETSET(synthio_note_ring_waveform_loop_start_obj, //| //| Use the `synthio.waveform_max_length` constant to set the loop point at the end of the wave form, no matter its length.""" //| -STATIC mp_obj_t synthio_note_get_ring_waveform_loop_end(mp_obj_t self_in) { +static mp_obj_t synthio_note_get_ring_waveform_loop_end(mp_obj_t self_in) { synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_int(common_hal_synthio_note_get_ring_waveform_loop_end(self)); } MP_DEFINE_CONST_FUN_OBJ_1(synthio_note_get_ring_waveform_loop_end_obj, synthio_note_get_ring_waveform_loop_end); -STATIC mp_obj_t synthio_note_set_ring_waveform_loop_end(mp_obj_t self_in, mp_obj_t arg) { +static mp_obj_t synthio_note_set_ring_waveform_loop_end(mp_obj_t self_in, mp_obj_t arg) { synthio_note_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_synthio_note_set_ring_waveform_loop_end(self, mp_obj_get_int(arg)); return mp_const_none; @@ -385,7 +385,7 @@ static void note_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_ properties_print_helper(print, self_in, note_properties, MP_ARRAY_SIZE(note_properties)); } -STATIC const mp_rom_map_elem_t synthio_note_locals_dict_table[] = { +static const mp_rom_map_elem_t synthio_note_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_frequency), MP_ROM_PTR(&synthio_note_frequency_obj) }, { MP_ROM_QSTR(MP_QSTR_filter), MP_ROM_PTR(&synthio_note_filter_obj) }, { MP_ROM_QSTR(MP_QSTR_panning), MP_ROM_PTR(&synthio_note_panning_obj) }, @@ -401,7 +401,7 @@ STATIC const mp_rom_map_elem_t synthio_note_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_ring_waveform_loop_start), MP_ROM_PTR(&synthio_note_ring_waveform_loop_start_obj) }, { MP_ROM_QSTR(MP_QSTR_ring_waveform_loop_end), MP_ROM_PTR(&synthio_note_ring_waveform_loop_end_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(synthio_note_locals_dict, synthio_note_locals_dict_table); +static MP_DEFINE_CONST_DICT(synthio_note_locals_dict, synthio_note_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( synthio_note_type, diff --git a/shared-bindings/synthio/Synthesizer.c b/shared-bindings/synthio/Synthesizer.c index e117792d70472..cd5c3847e64bf 100644 --- a/shared-bindings/synthio/Synthesizer.c +++ b/shared-bindings/synthio/Synthesizer.c @@ -47,7 +47,7 @@ //| :param ReadableBuffer waveform: A single-cycle waveform. Default is a 50% duty cycle square wave. If specified, must be a ReadableBuffer of type 'h' (signed 16 bit) //| :param Optional[Envelope] envelope: An object that defines the loudness of a note over time. The default envelope, `None` provides no ramping, voices turn instantly on and off. //| """ -STATIC mp_obj_t synthio_synthesizer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t synthio_synthesizer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_sample_rate, ARG_channel_count, ARG_waveform, ARG_envelope }; static const mp_arg_t allowed_args[] = { { MP_QSTR_sample_rate, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 11025} }, @@ -69,7 +69,7 @@ STATIC mp_obj_t synthio_synthesizer_make_new(const mp_obj_type_t *type, size_t n return MP_OBJ_FROM_PTR(self); } -STATIC void check_for_deinit(synthio_synthesizer_obj_t *self) { +static void check_for_deinit(synthio_synthesizer_obj_t *self) { if (common_hal_synthio_synthesizer_deinited(self)) { raise_deinited_error(); } @@ -81,26 +81,26 @@ STATIC void check_for_deinit(synthio_synthesizer_obj_t *self) { //| Pressing a note that was already pressed has no effect. //| //| :param NoteOrNoteSequence press: Any sequence of notes.""" -STATIC mp_obj_t synthio_synthesizer_press(mp_obj_t self_in, mp_obj_t press) { +static mp_obj_t synthio_synthesizer_press(mp_obj_t self_in, mp_obj_t press) { synthio_synthesizer_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_synthio_synthesizer_press(self, press); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(synthio_synthesizer_press_obj, synthio_synthesizer_press); +static MP_DEFINE_CONST_FUN_OBJ_2(synthio_synthesizer_press_obj, synthio_synthesizer_press); //| def release(self, /, release: NoteOrNoteSequence = ()) -> None: //| """Turn some notes off. //| //| Releasing a note that was already released has no effect. //| //| :param NoteOrNoteSequence release: Any sequence of notes.""" -STATIC mp_obj_t synthio_synthesizer_release(mp_obj_t self_in, mp_obj_t release) { +static mp_obj_t synthio_synthesizer_release(mp_obj_t self_in, mp_obj_t release) { synthio_synthesizer_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_synthio_synthesizer_release(self, release); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(synthio_synthesizer_release_obj, synthio_synthesizer_release); +static MP_DEFINE_CONST_FUN_OBJ_2(synthio_synthesizer_release_obj, synthio_synthesizer_release); //| def change( //| self, @@ -127,7 +127,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(synthio_synthesizer_release_obj, synthio_synthe //| //| Note: for compatibility, ``release_then_press`` may be used as an alias //| for this function. This compatibility name will be removed in 9.0.""" -STATIC mp_obj_t synthio_synthesizer_change(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t synthio_synthesizer_change(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_release, ARG_press, ARG_retrigger }; static const mp_arg_t allowed_args[] = { { MP_QSTR_release, MP_ARG_OBJ, {.u_obj = mp_const_empty_tuple } }, @@ -145,7 +145,7 @@ STATIC mp_obj_t synthio_synthesizer_change(mp_uint_t n_args, const mp_obj_t *pos common_hal_synthio_synthesizer_retrigger(self, args[ARG_retrigger].u_obj); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(synthio_synthesizer_change_obj, 1, synthio_synthesizer_change); +static MP_DEFINE_CONST_FUN_OBJ_KW(synthio_synthesizer_change_obj, 1, synthio_synthesizer_change); // //| def release_all_then_press(self, /, press: NoteOrNoteSequence) -> None: @@ -155,35 +155,35 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(synthio_synthesizer_change_obj, 1, synthio_syn //| attack phase with an initial amplitude of 0. //| //| :param NoteOrNoteSequence press: Any sequence of notes.""" -STATIC mp_obj_t synthio_synthesizer_release_all_then_press(mp_obj_t self_in, mp_obj_t press) { +static mp_obj_t synthio_synthesizer_release_all_then_press(mp_obj_t self_in, mp_obj_t press) { synthio_synthesizer_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_synthio_synthesizer_release_all(self); common_hal_synthio_synthesizer_press(self, press); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(synthio_synthesizer_release_all_then_press_obj, synthio_synthesizer_release_all_then_press); +static MP_DEFINE_CONST_FUN_OBJ_2(synthio_synthesizer_release_all_then_press_obj, synthio_synthesizer_release_all_then_press); // //| def release_all(self) -> None: //| """Turn any currently-playing notes off""" -STATIC mp_obj_t synthio_synthesizer_release_all(mp_obj_t self_in) { +static mp_obj_t synthio_synthesizer_release_all(mp_obj_t self_in) { synthio_synthesizer_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); common_hal_synthio_synthesizer_release_all(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(synthio_synthesizer_release_all_obj, synthio_synthesizer_release_all); +static MP_DEFINE_CONST_FUN_OBJ_1(synthio_synthesizer_release_all_obj, synthio_synthesizer_release_all); //| def deinit(self) -> None: //| """Deinitialises the object and releases any memory resources for reuse.""" //| ... -STATIC mp_obj_t synthio_synthesizer_deinit(mp_obj_t self_in) { +static mp_obj_t synthio_synthesizer_deinit(mp_obj_t self_in) { synthio_synthesizer_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_synthio_synthesizer_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(synthio_synthesizer_deinit_obj, synthio_synthesizer_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(synthio_synthesizer_deinit_obj, synthio_synthesizer_deinit); //| def __enter__(self) -> Synthesizer: //| """No-op used by Context Managers.""" @@ -194,23 +194,23 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(synthio_synthesizer_deinit_obj, synthio_synthes //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t synthio_synthesizer_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t synthio_synthesizer_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_synthio_synthesizer_deinit(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(synthio_synthesizer___exit___obj, 4, 4, synthio_synthesizer_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(synthio_synthesizer___exit___obj, 4, 4, synthio_synthesizer_obj___exit__); //| envelope: Optional[Envelope] //| """The envelope to apply to all notes. `None`, the default envelope, instantly turns notes on and off. The envelope may be changed dynamically, but it affects all notes (even currently playing notes)""" -STATIC mp_obj_t synthio_synthesizer_obj_get_envelope(mp_obj_t self_in) { +static mp_obj_t synthio_synthesizer_obj_get_envelope(mp_obj_t self_in) { synthio_synthesizer_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return synthio_synth_envelope_get(&self->synth); } MP_DEFINE_CONST_FUN_OBJ_1(synthio_synthesizer_get_envelope_obj, synthio_synthesizer_obj_get_envelope); -STATIC mp_obj_t synthio_synthesizer_obj_set_envelope(mp_obj_t self_in, mp_obj_t envelope) { +static mp_obj_t synthio_synthesizer_obj_set_envelope(mp_obj_t self_in, mp_obj_t envelope) { synthio_synthesizer_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); synthio_synth_envelope_set(&self->synth, envelope); @@ -224,7 +224,7 @@ MP_PROPERTY_GETSET(synthio_synthesizer_envelope_obj, //| sample_rate: int //| """32 bit value that tells how quickly samples are played in Hertz (cycles per second).""" -STATIC mp_obj_t synthio_synthesizer_obj_get_sample_rate(mp_obj_t self_in) { +static mp_obj_t synthio_synthesizer_obj_get_sample_rate(mp_obj_t self_in) { synthio_synthesizer_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_synthio_synthesizer_get_sample_rate(self)); @@ -239,7 +239,7 @@ MP_PROPERTY_GETTER(synthio_synthesizer_sample_rate_obj, //| //| This does not include notes in the release phase of the envelope.""" //| -STATIC mp_obj_t synthio_synthesizer_obj_get_pressed(mp_obj_t self_in) { +static mp_obj_t synthio_synthesizer_obj_get_pressed(mp_obj_t self_in) { synthio_synthesizer_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return common_hal_synthio_synthesizer_get_pressed_notes(self); @@ -255,7 +255,7 @@ MP_PROPERTY_GETTER(synthio_synthesizer_pressed_obj, //| If the note is currently playing (including in the release phase), the returned value gives the current envelope state and the current envelope value. //| //| If the note is not playing on this synthesizer, returns the tuple ``(None, 0.0)``.""" -STATIC mp_obj_t synthio_synthesizer_obj_note_info(mp_obj_t self_in, mp_obj_t note) { +static mp_obj_t synthio_synthesizer_obj_note_info(mp_obj_t self_in, mp_obj_t note) { synthio_synthesizer_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); mp_float_t vol = MICROPY_FLOAT_CONST(0.0); @@ -273,7 +273,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(synthio_synthesizer_note_info_obj, synthio_synthesizer //| //| This property is read-only but its contents may be modified by e.g., calling ``synth.blocks.append()`` or ``synth.blocks.remove()``. It is initially an empty list.""" //| -STATIC mp_obj_t synthio_synthesizer_obj_get_blocks(mp_obj_t self_in) { +static mp_obj_t synthio_synthesizer_obj_get_blocks(mp_obj_t self_in) { synthio_synthesizer_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return common_hal_synthio_synthesizer_get_blocks(self); @@ -307,7 +307,7 @@ static const mp_arg_t passfilter_properties[] = { { MP_QSTR_Q, MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL } }, }; -STATIC mp_obj_t synthio_synthesizer_lpf(size_t n_pos, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t synthio_synthesizer_lpf(size_t n_pos, const mp_obj_t *pos_args, mp_map_t *kw_args) { mp_arg_val_t args[MP_ARRAY_SIZE(passfilter_properties)]; mp_obj_t self_in = pos_args[0]; @@ -339,7 +339,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(synthio_synthesizer_lpf_fun_obj, 1, synthio_synthesiz //| ``q_factor``, called ``Q`` in the cookbook. Controls how peaked the response will be at the cutoff frequency. A large value makes the response more peaked. //| """ -STATIC mp_obj_t synthio_synthesizer_hpf(size_t n_pos, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t synthio_synthesizer_hpf(size_t n_pos, const mp_obj_t *pos_args, mp_map_t *kw_args) { mp_arg_val_t args[MP_ARRAY_SIZE(passfilter_properties)]; mp_obj_t self_in = pos_args[0]; @@ -374,7 +374,7 @@ STATIC mp_obj_t synthio_synthesizer_hpf(size_t n_pos, const mp_obj_t *pos_args, MP_DEFINE_CONST_FUN_OBJ_KW(synthio_synthesizer_hpf_fun_obj, 1, synthio_synthesizer_hpf); -STATIC mp_obj_t synthio_synthesizer_bpf(size_t n_pos, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t synthio_synthesizer_bpf(size_t n_pos, const mp_obj_t *pos_args, mp_map_t *kw_args) { mp_arg_val_t args[MP_ARRAY_SIZE(passfilter_properties)]; mp_obj_t self_in = pos_args[0]; @@ -395,7 +395,7 @@ STATIC mp_obj_t synthio_synthesizer_bpf(size_t n_pos, const mp_obj_t *pos_args, MP_DEFINE_CONST_FUN_OBJ_KW(synthio_synthesizer_bpf_fun_obj, 1, synthio_synthesizer_bpf); -STATIC const mp_rom_map_elem_t synthio_synthesizer_locals_dict_table[] = { +static const mp_rom_map_elem_t synthio_synthesizer_locals_dict_table[] = { // Methods { MP_ROM_QSTR(MP_QSTR_press), MP_ROM_PTR(&synthio_synthesizer_press_obj) }, { MP_ROM_QSTR(MP_QSTR_release), MP_ROM_PTR(&synthio_synthesizer_release_obj) }, @@ -418,9 +418,9 @@ STATIC const mp_rom_map_elem_t synthio_synthesizer_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_note_info), MP_ROM_PTR(&synthio_synthesizer_note_info_obj) }, { MP_ROM_QSTR(MP_QSTR_blocks), MP_ROM_PTR(&synthio_synthesizer_blocks_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(synthio_synthesizer_locals_dict, synthio_synthesizer_locals_dict_table); +static MP_DEFINE_CONST_DICT(synthio_synthesizer_locals_dict, synthio_synthesizer_locals_dict_table); -STATIC const audiosample_p_t synthio_synthesizer_proto = { +static const audiosample_p_t synthio_synthesizer_proto = { MP_PROTO_IMPLEMENT(MP_QSTR_protocol_audiosample) .sample_rate = (audiosample_sample_rate_fun)common_hal_synthio_synthesizer_get_sample_rate, .bits_per_sample = (audiosample_bits_per_sample_fun)common_hal_synthio_synthesizer_get_bits_per_sample, diff --git a/shared-bindings/synthio/__init__.c b/shared-bindings/synthio/__init__.c index 3109b0a903993..fbc5cd559afb5 100644 --- a/shared-bindings/synthio/__init__.c +++ b/shared-bindings/synthio/__init__.c @@ -54,7 +54,7 @@ MAKE_ENUM_MAP(synthio_note_state) { MAKE_ENUM_MAP_ENTRY(note_state, RELEASE), }; -STATIC MP_DEFINE_CONST_DICT(synthio_note_state_locals_dict, synthio_note_state_locals_table); +static MP_DEFINE_CONST_DICT(synthio_note_state_locals_dict, synthio_note_state_locals_table); MAKE_PRINTER(synthio, synthio_note_state); MAKE_ENUM_TYPE(synthio, EnvelopeState, synthio_note_state); @@ -118,7 +118,7 @@ static const mp_arg_t envelope_properties[] = { //| """The level, in the range ``0.0`` to ``1.0`` of the volume of the sustain phase relative to the attack level""" //| -STATIC mp_obj_t synthio_envelope_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t synthio_envelope_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { mp_arg_val_t args[MP_ARRAY_SIZE(envelope_properties)]; enum { ARG_attack_time, ARG_decay_time, ARG_release_time, ARG_attack_level, ARG_sustain_level }; mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(envelope_properties), envelope_properties, args); @@ -194,7 +194,7 @@ const mp_obj_namedtuple_type_t synthio_envelope_type_obj = { //| print("stopped")""" //| ... //| -STATIC mp_obj_t synthio_from_file(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t synthio_from_file(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_file, ARG_sample_rate, ARG_waveform, ARG_envelope }; static const mp_arg_t allowed_args[] = { { MP_QSTR_file, MP_ARG_OBJ | MP_ARG_REQUIRED, {} }, @@ -266,7 +266,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(synthio_from_file_obj, 1, synthio_from_file); //| """Converts the given midi note (60 = middle C, 69 = concert A) to Hz""" //| -STATIC mp_obj_t midi_to_hz(mp_obj_t arg) { +static mp_obj_t midi_to_hz(mp_obj_t arg) { mp_float_t note = mp_arg_validate_type_float(arg, MP_QSTR_note); return mp_obj_new_float(common_hal_synthio_midi_to_hz_float(note)); } @@ -278,7 +278,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(synthio_midi_to_hz_obj, midi_to_hz); //| 24/12 (2.0) corresponds to middle C, 33/12 (2.75) is concert A.""" //| -STATIC mp_obj_t voct_to_hz(mp_obj_t arg) { +static mp_obj_t voct_to_hz(mp_obj_t arg) { mp_float_t note = mp_arg_validate_obj_float_range(arg, -11, 11, MP_QSTR_ctrl); return mp_obj_new_float(common_hal_synthio_voct_to_hz_float(note)); } @@ -290,7 +290,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(synthio_voct_to_hz_obj, voct_to_hz); //| #if CIRCUITPY_AUDIOCORE_DEBUG -STATIC mp_obj_t synthio_lfo_tick(size_t n, const mp_obj_t *args) { +static mp_obj_t synthio_lfo_tick(size_t n, const mp_obj_t *args) { shared_bindings_synthio_lfo_tick(48000); mp_obj_t result[n]; for (size_t i = 0; i < n; i++) { @@ -304,7 +304,7 @@ STATIC mp_obj_t synthio_lfo_tick(size_t n, const mp_obj_t *args) { MP_DEFINE_CONST_FUN_OBJ_VAR(synthio_lfo_tick_obj, 1, synthio_lfo_tick); #endif -STATIC const mp_rom_map_elem_t synthio_module_globals_table[] = { +static const mp_rom_map_elem_t synthio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_synthio) }, { MP_ROM_QSTR(MP_QSTR_Biquad), MP_ROM_PTR(&synthio_biquad_type_obj) }, { MP_ROM_QSTR(MP_QSTR_Math), MP_ROM_PTR(&synthio_math_type) }, @@ -324,7 +324,7 @@ STATIC const mp_rom_map_elem_t synthio_module_globals_table[] = { #endif }; -STATIC MP_DEFINE_CONST_DICT(synthio_module_globals, synthio_module_globals_table); +static MP_DEFINE_CONST_DICT(synthio_module_globals, synthio_module_globals_table); const mp_obj_module_t synthio_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/terminalio/Terminal.c b/shared-bindings/terminalio/Terminal.c index 745b3f3a8f7f4..1173cbbe244d8 100644 --- a/shared-bindings/terminalio/Terminal.c +++ b/shared-bindings/terminalio/Terminal.c @@ -46,7 +46,7 @@ //| a `fontio.BuiltinFont` and the TileGrid's bitmap should match the font's bitmap.""" //| ... -STATIC mp_obj_t terminalio_terminal_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t terminalio_terminal_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_scroll_area, ARG_font, ARG_status_bar }; static const mp_arg_t allowed_args[] = { { MP_QSTR_scroll_area, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -82,14 +82,14 @@ STATIC mp_obj_t terminalio_terminal_make_new(const mp_obj_type_t *type, size_t n //| :rtype: int or None""" //| ... //| -STATIC mp_uint_t terminalio_terminal_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) { +static mp_uint_t terminalio_terminal_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) { terminalio_terminal_obj_t *self = MP_OBJ_TO_PTR(self_in); const byte *buf = buf_in; return common_hal_terminalio_terminal_write(self, buf, size, errcode); } -STATIC mp_uint_t terminalio_terminal_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) { +static mp_uint_t terminalio_terminal_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) { terminalio_terminal_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_uint_t ret; if (request == MP_STREAM_POLL) { @@ -105,13 +105,13 @@ STATIC mp_uint_t terminalio_terminal_ioctl(mp_obj_t self_in, mp_uint_t request, return ret; } -STATIC const mp_rom_map_elem_t terminalio_terminal_locals_dict_table[] = { +static const mp_rom_map_elem_t terminalio_terminal_locals_dict_table[] = { // Standard stream methods. { MP_OBJ_NEW_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(terminalio_terminal_locals_dict, terminalio_terminal_locals_dict_table); +static MP_DEFINE_CONST_DICT(terminalio_terminal_locals_dict, terminalio_terminal_locals_dict_table); -STATIC const mp_stream_p_t terminalio_terminal_stream_p = { +static const mp_stream_p_t terminalio_terminal_stream_p = { .read = NULL, .write = terminalio_terminal_write, .ioctl = terminalio_terminal_ioctl, diff --git a/shared-bindings/terminalio/__init__.c b/shared-bindings/terminalio/__init__.c index 81256dab58e7d..c3760c1d48122 100644 --- a/shared-bindings/terminalio/__init__.c +++ b/shared-bindings/terminalio/__init__.c @@ -27,14 +27,14 @@ //| //| FONT: fontio.BuiltinFont //| """The built in font""" -STATIC const mp_rom_map_elem_t terminalio_module_globals_table[] = { +static const mp_rom_map_elem_t terminalio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_terminalio) }, { MP_ROM_QSTR(MP_QSTR_Terminal), MP_OBJ_FROM_PTR(&terminalio_terminal_type) }, { MP_ROM_QSTR(MP_QSTR_FONT), MP_ROM_PTR(&supervisor_terminal_font) }, }; -STATIC MP_DEFINE_CONST_DICT(terminalio_module_globals, terminalio_module_globals_table); +static MP_DEFINE_CONST_DICT(terminalio_module_globals, terminalio_module_globals_table); const mp_obj_module_t terminalio_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/time/__init__.c b/shared-bindings/time/__init__.c index 0ce8e68280f84..dbf626180358c 100644 --- a/shared-bindings/time/__init__.c +++ b/shared-bindings/time/__init__.c @@ -43,7 +43,7 @@ //| :rtype: float""" //| ... //| -STATIC mp_obj_t time_monotonic(void) { +static mp_obj_t time_monotonic(void) { uint64_t ticks_ms = common_hal_time_monotonic_ms(); return mp_obj_new_float(uint64_to_float(ticks_ms) / MICROPY_FLOAT_CONST(1000.0)); } @@ -55,7 +55,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(time_monotonic_obj, time_monotonic); //| :param float seconds: the time to sleep in fractional seconds""" //| ... //| -STATIC mp_obj_t time_sleep(mp_obj_t seconds_o) { +static mp_obj_t time_sleep(mp_obj_t seconds_o) { #if MICROPY_PY_BUILTINS_FLOAT mp_float_t seconds = mp_obj_get_float(seconds_o); mp_float_t msecs = MICROPY_FLOAT_CONST(1000.0) * seconds + MICROPY_FLOAT_CONST(0.5); @@ -70,7 +70,7 @@ STATIC mp_obj_t time_sleep(mp_obj_t seconds_o) { MP_DEFINE_CONST_FUN_OBJ_1(time_sleep_obj, time_sleep); #if MICROPY_PY_COLLECTIONS -STATIC mp_obj_t struct_time_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { +static mp_obj_t struct_time_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { mp_arg_check_num(n_args, n_kw, 1, 1, false); size_t len; mp_obj_t *items; @@ -161,7 +161,7 @@ void struct_time_to_tm(mp_obj_t t, timeutils_struct_time_t *tm) { #if MICROPY_LONGINT_IMPL == MICROPY_LONGINT_IMPL_NONE // Function to return a NotImplementedError on platforms that don't // support long integers -STATIC mp_obj_t time_not_implemented(void) { +static mp_obj_t time_not_implemented(void) { mp_raise_NotImplementedError(MP_ERROR_TEXT("No long integer support")); } MP_DEFINE_CONST_FUN_OBJ_0(time_not_implemented_obj, time_not_implemented); @@ -179,7 +179,7 @@ mp_obj_t MP_WEAK rtc_get_time_source_time(void) { //| :rtype: int""" //| ... //| -STATIC mp_obj_t time_time(void) { +static mp_obj_t time_time(void) { timeutils_struct_time_t tm; struct_time_to_tm(rtc_get_time_source_time(), &tm); mp_uint_t secs = timeutils_seconds_since_epoch(tm.tm_year, tm.tm_mon, tm.tm_mday, @@ -198,7 +198,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time); //| :rtype: int""" //| ... //| -STATIC mp_obj_t time_monotonic_ns(void) { +static mp_obj_t time_monotonic_ns(void) { uint64_t time64 = common_hal_time_monotonic_ns(); return mp_obj_new_int_from_ll((long long)time64); } @@ -214,7 +214,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(time_monotonic_ns_obj, time_monotonic_ns); //| :rtype: time.struct_time""" //| ... //| -STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) { +static mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) { if (n_args == 0 || args[0] == mp_const_none) { return rtc_get_time_source_time(); } @@ -251,7 +251,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(time_localtime_obj, 0, 1, time_localtime); //| :rtype: int""" //| ... //| -STATIC mp_obj_t time_mktime(mp_obj_t t) { +static mp_obj_t time_mktime(mp_obj_t t) { mp_obj_t *elem; size_t len; @@ -276,7 +276,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(time_mktime_obj, time_mktime); #endif // MICROPY_LONGINT_IMPL #endif // MICROPY_PY_COLLECTIONS -STATIC const mp_rom_map_elem_t time_module_globals_table[] = { +static const mp_rom_map_elem_t time_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_time) }, { MP_ROM_QSTR(MP_QSTR_monotonic), MP_ROM_PTR(&time_monotonic_obj) }, @@ -300,7 +300,7 @@ STATIC const mp_rom_map_elem_t time_module_globals_table[] = { #endif }; -STATIC MP_DEFINE_CONST_DICT(time_module_globals, time_module_globals_table); +static MP_DEFINE_CONST_DICT(time_module_globals, time_module_globals_table); const mp_obj_module_t time_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/touchio/TouchIn.c b/shared-bindings/touchio/TouchIn.c index 34739236e3b81..d435ae250c800 100644 --- a/shared-bindings/touchio/TouchIn.c +++ b/shared-bindings/touchio/TouchIn.c @@ -36,7 +36,7 @@ //| //| :param ~microcontroller.Pin pin: the pin to read from""" //| ... -STATIC mp_obj_t touchio_touchin_make_new(const mp_obj_type_t *type, +static mp_obj_t touchio_touchin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { // check number of arguments mp_arg_check_num(n_args, n_kw, 1, 1, false); @@ -53,14 +53,14 @@ STATIC mp_obj_t touchio_touchin_make_new(const mp_obj_type_t *type, //| def deinit(self) -> None: //| """Deinitialises the TouchIn and releases any hardware resources for reuse.""" //| ... -STATIC mp_obj_t touchio_touchin_deinit(mp_obj_t self_in) { +static mp_obj_t touchio_touchin_deinit(mp_obj_t self_in) { touchio_touchin_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_touchio_touchin_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(touchio_touchin_deinit_obj, touchio_touchin_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(touchio_touchin_deinit_obj, touchio_touchin_deinit); -STATIC void check_for_deinit(touchio_touchin_obj_t *self) { +static void check_for_deinit(touchio_touchin_obj_t *self) { if (common_hal_touchio_touchin_deinited(self)) { raise_deinited_error(); } @@ -75,18 +75,18 @@ STATIC void check_for_deinit(touchio_touchin_obj_t *self) { //| """Automatically deinitializes the hardware when exiting a context. See //| :ref:`lifetime-and-contextmanagers` for more info.""" //| ... -STATIC mp_obj_t touchio_touchin_obj___exit__(size_t n_args, const mp_obj_t *args) { +static mp_obj_t touchio_touchin_obj___exit__(size_t n_args, const mp_obj_t *args) { (void)n_args; common_hal_touchio_touchin_deinit(args[0]); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(touchio_touchin___exit___obj, 4, 4, touchio_touchin_obj___exit__); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(touchio_touchin___exit___obj, 4, 4, touchio_touchin_obj___exit__); //| value: bool //| """Whether the touch pad is being touched or not. (read-only) //| //| True when `raw_value` > `threshold`.""" -STATIC mp_obj_t touchio_touchin_obj_get_value(mp_obj_t self_in) { +static mp_obj_t touchio_touchin_obj_get_value(mp_obj_t self_in) { touchio_touchin_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return mp_obj_new_bool(common_hal_touchio_touchin_get_value(self)); @@ -99,7 +99,7 @@ MP_PROPERTY_GETTER(touchio_touchin_value_obj, //| raw_value: int //| """The raw touch measurement as an `int`. (read-only)""" -STATIC mp_obj_t touchio_touchin_obj_get_raw_value(mp_obj_t self_in) { +static mp_obj_t touchio_touchin_obj_get_raw_value(mp_obj_t self_in) { touchio_touchin_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_touchio_touchin_get_raw_value(self)); @@ -125,7 +125,7 @@ MP_PROPERTY_GETTER(touchio_touchin_raw_value_obj, //| touch = touchio.TouchIn(board.A1) //| touch.threshold = 7300""" //| -STATIC mp_obj_t touchio_touchin_obj_get_threshold(mp_obj_t self_in) { +static mp_obj_t touchio_touchin_obj_get_threshold(mp_obj_t self_in) { touchio_touchin_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(common_hal_touchio_touchin_get_threshold(self)); @@ -133,7 +133,7 @@ STATIC mp_obj_t touchio_touchin_obj_get_threshold(mp_obj_t self_in) { MP_DEFINE_CONST_FUN_OBJ_1(touchio_touchin_get_threshold_obj, touchio_touchin_obj_get_threshold); -STATIC mp_obj_t touchio_touchin_obj_set_threshold(mp_obj_t self_in, mp_obj_t threshold_obj) { +static mp_obj_t touchio_touchin_obj_set_threshold(mp_obj_t self_in, mp_obj_t threshold_obj) { touchio_touchin_obj_t *self = MP_OBJ_TO_PTR(self_in); check_for_deinit(self); uint32_t new_threshold = mp_obj_get_int(threshold_obj); @@ -149,7 +149,7 @@ MP_PROPERTY_GETSET(touchio_touchin_threshold_obj, (mp_obj_t)&touchio_touchin_set_threshold_obj); -STATIC const mp_rom_map_elem_t touchio_touchin_locals_dict_table[] = { +static const mp_rom_map_elem_t touchio_touchin_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&touchio_touchin___exit___obj) }, { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&touchio_touchin_deinit_obj) }, @@ -159,7 +159,7 @@ STATIC const mp_rom_map_elem_t touchio_touchin_locals_dict_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR_threshold), MP_ROM_PTR(&touchio_touchin_threshold_obj)}, }; -STATIC MP_DEFINE_CONST_DICT(touchio_touchin_locals_dict, touchio_touchin_locals_dict_table); +static MP_DEFINE_CONST_DICT(touchio_touchin_locals_dict, touchio_touchin_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( touchio_touchin_type, diff --git a/shared-bindings/touchio/__init__.c b/shared-bindings/touchio/__init__.c index ee1cc19f72f5d..804e55b4117d6 100644 --- a/shared-bindings/touchio/__init__.c +++ b/shared-bindings/touchio/__init__.c @@ -39,12 +39,12 @@ //| This example will initialize the the device, and print the //| :py:data:`~touchio.TouchIn.value`.""" -STATIC const mp_rom_map_elem_t touchio_module_globals_table[] = { +static const mp_rom_map_elem_t touchio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_touchio) }, { MP_ROM_QSTR(MP_QSTR_TouchIn), MP_ROM_PTR(&touchio_touchin_type) }, }; -STATIC MP_DEFINE_CONST_DICT(touchio_module_globals, touchio_module_globals_table); +static MP_DEFINE_CONST_DICT(touchio_module_globals, touchio_module_globals_table); const mp_obj_module_t touchio_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/traceback/__init__.c b/shared-bindings/traceback/__init__.c index 587cf43aed9ff..d1cf33070502a 100644 --- a/shared-bindings/traceback/__init__.c +++ b/shared-bindings/traceback/__init__.c @@ -19,7 +19,7 @@ //| ... //| -STATIC void traceback_exception_common(bool is_print_exception, mp_print_t *print, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static void traceback_exception_common(bool is_print_exception, mp_print_t *print, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_exc, ARG_value, ARG_tb, ARG_limit, ARG_file, ARG_chain }; static const mp_arg_t allowed_args[] = { { MP_QSTR_, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_obj = MP_OBJ_NULL} }, @@ -133,7 +133,7 @@ STATIC void traceback_exception_common(bool is_print_exception, mp_print_t *prin //| :param bool chain: If `True` then chained exceptions will be printed. //| """ //| -STATIC mp_obj_t traceback_format_exception(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t traceback_format_exception(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { mp_print_t print; vstr_t vstr; vstr_init_print(&vstr, 0, &print); @@ -142,7 +142,7 @@ STATIC mp_obj_t traceback_format_exception(size_t n_args, const mp_obj_t *pos_ar return mp_obj_new_list(1, &output); } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(traceback_format_exception_obj, 0, traceback_format_exception); +static MP_DEFINE_CONST_FUN_OBJ_KW(traceback_format_exception_obj, 0, traceback_format_exception); //| def print_exception( //| exc: BaseException | Type[BaseException], @@ -177,21 +177,21 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(traceback_format_exception_obj, 0, traceback_f //| ... //| -STATIC mp_obj_t traceback_print_exception(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t traceback_print_exception(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { mp_print_t print = mp_plat_print; traceback_exception_common(true, &print, n_args, pos_args, kw_args); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(traceback_print_exception_obj, 0, traceback_print_exception); +static MP_DEFINE_CONST_FUN_OBJ_KW(traceback_print_exception_obj, 0, traceback_print_exception); -STATIC const mp_rom_map_elem_t traceback_module_globals_table[] = { +static const mp_rom_map_elem_t traceback_module_globals_table[] = { // module name { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_traceback) }, // module functions { MP_ROM_QSTR(MP_QSTR_format_exception), MP_ROM_PTR(&traceback_format_exception_obj) }, { MP_ROM_QSTR(MP_QSTR_print_exception), MP_ROM_PTR(&traceback_print_exception_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(traceback_module_globals, traceback_module_globals_table); +static MP_DEFINE_CONST_DICT(traceback_module_globals, traceback_module_globals_table); const mp_obj_module_t traceback_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/uheap/__init__.c b/shared-bindings/uheap/__init__.c index f80235df7d036..0170c56c04b58 100644 --- a/shared-bindings/uheap/__init__.c +++ b/shared-bindings/uheap/__init__.c @@ -19,19 +19,19 @@ //| estimated size.""" //| ... //| -STATIC mp_obj_t uheap_info(mp_obj_t obj) { +static mp_obj_t uheap_info(mp_obj_t obj) { uint32_t size = shared_module_uheap_info(obj); return MP_OBJ_NEW_SMALL_INT(size); } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(uheap_info_obj, uheap_info); +static MP_DEFINE_CONST_FUN_OBJ_1(uheap_info_obj, uheap_info); -STATIC const mp_rom_map_elem_t uheap_module_globals_table[] = { +static const mp_rom_map_elem_t uheap_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uheap) }, { MP_ROM_QSTR(MP_QSTR_info), MP_ROM_PTR(&uheap_info_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(uheap_module_globals, uheap_module_globals_table); +static MP_DEFINE_CONST_DICT(uheap_module_globals, uheap_module_globals_table); const mp_obj_module_t uheap_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/usb/__init__.c b/shared-bindings/usb/__init__.c index afa70940bad7a..d1a61be7bc4fd 100644 --- a/shared-bindings/usb/__init__.c +++ b/shared-bindings/usb/__init__.c @@ -18,12 +18,12 @@ //| """ //| -STATIC mp_rom_map_elem_t usb_module_globals_table[] = { +static mp_rom_map_elem_t usb_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_usb) }, { MP_ROM_QSTR(MP_QSTR_core), MP_OBJ_FROM_PTR(&usb_core_module) }, }; -STATIC MP_DEFINE_CONST_DICT(usb_module_globals, usb_module_globals_table); +static MP_DEFINE_CONST_DICT(usb_module_globals, usb_module_globals_table); const mp_obj_module_t usb_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/usb/core/Device.c b/shared-bindings/usb/core/Device.c index 6ff038581b82a..813b89a896c59 100644 --- a/shared-bindings/usb/core/Device.c +++ b/shared-bindings/usb/core/Device.c @@ -50,7 +50,7 @@ //| idVendor: int //| """The USB vendor ID of the device""" -STATIC mp_obj_t usb_core_device_obj_get_idVendor(mp_obj_t self_in) { +static mp_obj_t usb_core_device_obj_get_idVendor(mp_obj_t self_in) { usb_core_device_obj_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_usb_core_device_get_idVendor(self)); } @@ -61,7 +61,7 @@ MP_PROPERTY_GETTER(usb_core_device_idVendor_obj, //| idProduct: int //| """The USB product ID of the device""" -STATIC mp_obj_t usb_core_device_obj_get_idProduct(mp_obj_t self_in) { +static mp_obj_t usb_core_device_obj_get_idProduct(mp_obj_t self_in) { usb_core_device_obj_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_usb_core_device_get_idProduct(self)); } @@ -72,7 +72,7 @@ MP_PROPERTY_GETTER(usb_core_device_idProduct_obj, //| serial_number: str //| """The USB device's serial number string.""" -STATIC mp_obj_t usb_core_device_obj_get_serial_number(mp_obj_t self_in) { +static mp_obj_t usb_core_device_obj_get_serial_number(mp_obj_t self_in) { usb_core_device_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_usb_core_device_get_serial_number(self); } @@ -83,7 +83,7 @@ MP_PROPERTY_GETTER(usb_core_device_serial_number_obj, //| product: str //| """The USB device's product string.""" -STATIC mp_obj_t usb_core_device_obj_get_product(mp_obj_t self_in) { +static mp_obj_t usb_core_device_obj_get_product(mp_obj_t self_in) { usb_core_device_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_usb_core_device_get_product(self); } @@ -94,7 +94,7 @@ MP_PROPERTY_GETTER(usb_core_device_product_obj, //| manufacturer: str //| """The USB device's manufacturer string.""" -STATIC mp_obj_t usb_core_device_obj_get_manufacturer(mp_obj_t self_in) { +static mp_obj_t usb_core_device_obj_get_manufacturer(mp_obj_t self_in) { usb_core_device_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_usb_core_device_get_manufacturer(self); } @@ -113,7 +113,7 @@ MP_PROPERTY_GETTER(usb_core_device_manufacturer_obj, //| without arguments is enough to get the device ready. //| """ //| ... -STATIC mp_obj_t usb_core_device_set_configuration(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t usb_core_device_set_configuration(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_configuration }; static const mp_arg_t allowed_args[] = { { MP_QSTR_configuration, MP_ARG_INT, {.u_int = 1} }, @@ -136,7 +136,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(usb_core_device_set_configuration_obj, 1, usb_core_de //| :returns: the number of bytes written //| """ //| ... -STATIC mp_obj_t usb_core_device_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t usb_core_device_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_endpoint, ARG_data, ARG_timeout }; static const mp_arg_t allowed_args[] = { { MP_QSTR_endpoint, MP_ARG_REQUIRED | MP_ARG_INT }, @@ -166,7 +166,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(usb_core_device_write_obj, 2, usb_core_device_write); //| :returns: the number of bytes read //| """ //| ... -STATIC mp_obj_t usb_core_device_read(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t usb_core_device_read(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_endpoint, ARG_size_or_buffer, ARG_timeout }; static const mp_arg_t allowed_args[] = { { MP_QSTR_endpoint, MP_ARG_REQUIRED | MP_ARG_INT }, @@ -211,7 +211,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(usb_core_device_read_obj, 2, usb_core_device_read); //| number of bytes read. //| """ //| ... -STATIC mp_obj_t usb_core_device_ctrl_transfer(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t usb_core_device_ctrl_transfer(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_bmRequestType, ARG_bRequest, ARG_wValue, ARG_wIndex, ARG_data_or_wLength, ARG_timeout }; static const mp_arg_t allowed_args[] = { { MP_QSTR_bmRequestType, MP_ARG_REQUIRED | MP_ARG_INT }, @@ -252,7 +252,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(usb_core_device_ctrl_transfer_obj, 2, usb_core_device //| :param int interface: the device interface number to check //| """ //| ... -STATIC mp_obj_t usb_core_device_is_kernel_driver_active(mp_obj_t self_in, mp_obj_t interface_in) { +static mp_obj_t usb_core_device_is_kernel_driver_active(mp_obj_t self_in, mp_obj_t interface_in) { usb_core_device_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_int_t interface = mp_obj_get_int(interface_in); bool active = common_hal_usb_core_device_is_kernel_driver_active(self, interface); @@ -268,7 +268,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(usb_core_device_is_kernel_driver_active_obj, usb_core_ //| :param int interface: the device interface number to stop CircuitPython on //| """ //| ... -STATIC mp_obj_t usb_core_device_detach_kernel_driver(mp_obj_t self_in, mp_obj_t interface_in) { +static mp_obj_t usb_core_device_detach_kernel_driver(mp_obj_t self_in, mp_obj_t interface_in) { usb_core_device_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_int_t interface = mp_obj_get_int(interface_in); common_hal_usb_core_device_detach_kernel_driver(self, interface); @@ -283,7 +283,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(usb_core_device_detach_kernel_driver_obj, usb_core_dev //| """ //| ... //| -STATIC mp_obj_t usb_core_device_attach_kernel_driver(mp_obj_t self_in, mp_obj_t interface_in) { +static mp_obj_t usb_core_device_attach_kernel_driver(mp_obj_t self_in, mp_obj_t interface_in) { usb_core_device_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_int_t interface = mp_obj_get_int(interface_in); common_hal_usb_core_device_attach_kernel_driver(self, interface); @@ -292,7 +292,7 @@ STATIC mp_obj_t usb_core_device_attach_kernel_driver(mp_obj_t self_in, mp_obj_t MP_DEFINE_CONST_FUN_OBJ_2(usb_core_device_attach_kernel_driver_obj, usb_core_device_attach_kernel_driver); -STATIC const mp_rom_map_elem_t usb_core_device_locals_dict_table[] = { +static const mp_rom_map_elem_t usb_core_device_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_idVendor), MP_ROM_PTR(&usb_core_device_idVendor_obj) }, { MP_ROM_QSTR(MP_QSTR_idProduct), MP_ROM_PTR(&usb_core_device_idProduct_obj) }, { MP_ROM_QSTR(MP_QSTR_serial_number), MP_ROM_PTR(&usb_core_device_serial_number_obj) }, @@ -309,7 +309,7 @@ STATIC const mp_rom_map_elem_t usb_core_device_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_attach_kernel_driver), MP_ROM_PTR(&usb_core_device_attach_kernel_driver_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(usb_core_device_locals_dict, usb_core_device_locals_dict_table); +static MP_DEFINE_CONST_DICT(usb_core_device_locals_dict, usb_core_device_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( usb_core_device_type, diff --git a/shared-bindings/usb/core/__init__.c b/shared-bindings/usb/core/__init__.c index b1f0056dd8635..99be3888bf877 100644 --- a/shared-bindings/usb/core/__init__.c +++ b/shared-bindings/usb/core/__init__.c @@ -69,7 +69,7 @@ typedef struct { } usb_core_devices_obj_t; // This is an internal iterator type to use with find. -STATIC mp_obj_t _next_device(usb_core_devices_obj_t *iter) { +static mp_obj_t _next_device(usb_core_devices_obj_t *iter) { // Brute force check all possible device numbers for one that matches. usb_core_device_obj_t temp_device; for (size_t i = iter->next_index; i < 256; i++) { @@ -96,7 +96,7 @@ STATIC mp_obj_t _next_device(usb_core_devices_obj_t *iter) { return mp_const_none; } -STATIC mp_obj_t usb_core_devices_iternext(mp_obj_t self_in) { +static mp_obj_t usb_core_devices_iternext(mp_obj_t self_in) { mp_check_self(mp_obj_is_type(self_in, &usb_core_devices_type)); usb_core_devices_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_obj_t device = _next_device(self); @@ -113,7 +113,7 @@ MP_DEFINE_CONST_OBJ_TYPE( iter, usb_core_devices_iternext ); -STATIC mp_obj_t usb_core_find(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t usb_core_find(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_find_all, ARG_idVendor, ARG_idProduct }; static const mp_arg_t allowed_args[] = { { MP_QSTR_find_all, MP_ARG_BOOL, {.u_bool = false} }, @@ -146,7 +146,7 @@ STATIC mp_obj_t usb_core_find(size_t n_args, const mp_obj_t *pos_args, mp_map_t MP_DEFINE_CONST_FUN_OBJ_KW(usb_core_find_obj, 0, usb_core_find); -STATIC mp_rom_map_elem_t usb_core_module_globals_table[] = { +static mp_rom_map_elem_t usb_core_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_usb_dot_core) }, // Functions { MP_ROM_QSTR(MP_QSTR_find), MP_OBJ_FROM_PTR(&usb_core_find_obj) }, @@ -159,7 +159,7 @@ STATIC mp_rom_map_elem_t usb_core_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_USBTimeoutError), MP_OBJ_FROM_PTR(&mp_type_usb_core_USBTimeoutError) }, }; -STATIC MP_DEFINE_CONST_DICT(usb_core_module_globals, usb_core_module_globals_table); +static MP_DEFINE_CONST_DICT(usb_core_module_globals, usb_core_module_globals_table); void usb_core_exception_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) { mp_print_kind_t k = kind & ~PRINT_EXC_SUBCLASS; diff --git a/shared-bindings/usb_cdc/Serial.c b/shared-bindings/usb_cdc/Serial.c index ae77d793a169a..9fc5de21bcda1 100644 --- a/shared-bindings/usb_cdc/Serial.c +++ b/shared-bindings/usb_cdc/Serial.c @@ -76,7 +76,7 @@ //| ... // These three methods are used by the shared stream methods. -STATIC mp_uint_t usb_cdc_serial_read_stream(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) { +static mp_uint_t usb_cdc_serial_read_stream(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) { usb_cdc_serial_obj_t *self = MP_OBJ_TO_PTR(self_in); byte *buf = buf_in; @@ -88,14 +88,14 @@ STATIC mp_uint_t usb_cdc_serial_read_stream(mp_obj_t self_in, void *buf_in, mp_u return common_hal_usb_cdc_serial_read(self, buf, size, errcode); } -STATIC mp_uint_t usb_cdc_serial_write_stream(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) { +static mp_uint_t usb_cdc_serial_write_stream(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) { usb_cdc_serial_obj_t *self = MP_OBJ_TO_PTR(self_in); const byte *buf = buf_in; return common_hal_usb_cdc_serial_write(self, buf, size, errcode); } -STATIC mp_uint_t usb_cdc_serial_ioctl_stream(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) { +static mp_uint_t usb_cdc_serial_ioctl_stream(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) { usb_cdc_serial_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_uint_t ret = 0; switch (request) { @@ -129,7 +129,7 @@ STATIC mp_uint_t usb_cdc_serial_ioctl_stream(mp_obj_t self_in, mp_uint_t request //| Most terminal programs and ``pyserial`` assert DTR when opening a serial connection. //| However, the C# ``SerialPort`` API does not. You must set ``SerialPort.DtrEnable``. //| """ -STATIC mp_obj_t usb_cdc_serial_get_connected(mp_obj_t self_in) { +static mp_obj_t usb_cdc_serial_get_connected(mp_obj_t self_in) { usb_cdc_serial_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_bool(common_hal_usb_cdc_serial_get_connected(self)); } @@ -140,7 +140,7 @@ MP_PROPERTY_GETTER(usb_cdc_serial_connected_obj, //| in_waiting: int //| """Returns the number of bytes waiting to be read on the USB serial input. (read-only)""" -STATIC mp_obj_t usb_cdc_serial_get_in_waiting(mp_obj_t self_in) { +static mp_obj_t usb_cdc_serial_get_in_waiting(mp_obj_t self_in) { usb_cdc_serial_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_int(common_hal_usb_cdc_serial_get_in_waiting(self)); } @@ -151,7 +151,7 @@ MP_PROPERTY_GETTER(usb_cdc_serial_in_waiting_obj, //| out_waiting: int //| """Returns the number of bytes waiting to be written on the USB serial output. (read-only)""" -STATIC mp_obj_t usb_cdc_serial_get_out_waiting(mp_obj_t self_in) { +static mp_obj_t usb_cdc_serial_get_out_waiting(mp_obj_t self_in) { usb_cdc_serial_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_int(common_hal_usb_cdc_serial_get_out_waiting(self)); } @@ -163,7 +163,7 @@ MP_PROPERTY_GETTER(usb_cdc_serial_out_waiting_obj, //| def reset_input_buffer(self) -> None: //| """Clears any unread bytes.""" //| ... -STATIC mp_obj_t usb_cdc_serial_reset_input_buffer(mp_obj_t self_in) { +static mp_obj_t usb_cdc_serial_reset_input_buffer(mp_obj_t self_in) { usb_cdc_serial_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_usb_cdc_serial_reset_input_buffer(self); return mp_const_none; @@ -173,7 +173,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(usb_cdc_serial_reset_input_buffer_obj, usb_cdc_serial_ //| def reset_output_buffer(self) -> None: //| """Clears any unwritten bytes.""" //| ... -STATIC mp_obj_t usb_cdc_serial_reset_output_buffer(mp_obj_t self_in) { +static mp_obj_t usb_cdc_serial_reset_output_buffer(mp_obj_t self_in) { usb_cdc_serial_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_usb_cdc_serial_reset_output_buffer(self); return mp_const_none; @@ -183,14 +183,14 @@ MP_DEFINE_CONST_FUN_OBJ_1(usb_cdc_serial_reset_output_buffer_obj, usb_cdc_serial //| timeout: Optional[float] //| """The initial value of `timeout` is ``None``. If ``None``, wait indefinitely to satisfy //| the conditions of a read operation. If 0, do not wait. If > 0, wait only ``timeout`` seconds.""" -STATIC mp_obj_t usb_cdc_serial_get_timeout(mp_obj_t self_in) { +static mp_obj_t usb_cdc_serial_get_timeout(mp_obj_t self_in) { usb_cdc_serial_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_float_t timeout = common_hal_usb_cdc_serial_get_timeout(self); return (timeout < 0.0f) ? mp_const_none : mp_obj_new_float(self->timeout); } MP_DEFINE_CONST_FUN_OBJ_1(usb_cdc_serial_get_timeout_obj, usb_cdc_serial_get_timeout); -STATIC mp_obj_t usb_cdc_serial_set_timeout(mp_obj_t self_in, mp_obj_t timeout_in) { +static mp_obj_t usb_cdc_serial_set_timeout(mp_obj_t self_in, mp_obj_t timeout_in) { usb_cdc_serial_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_usb_cdc_serial_set_timeout(self, timeout_in == mp_const_none ? -1.0f : mp_obj_get_float(timeout_in)); @@ -207,14 +207,14 @@ MP_PROPERTY_GETSET(usb_cdc_serial_timeout_obj, //| writing all the bytes passed to ``write()``.If 0, do not wait. //| If > 0, wait only ``write_timeout`` seconds.""" //| -STATIC mp_obj_t usb_cdc_serial_get_write_timeout(mp_obj_t self_in) { +static mp_obj_t usb_cdc_serial_get_write_timeout(mp_obj_t self_in) { usb_cdc_serial_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_float_t write_timeout = common_hal_usb_cdc_serial_get_write_timeout(self); return (write_timeout < 0.0f) ? mp_const_none : mp_obj_new_float(self->write_timeout); } MP_DEFINE_CONST_FUN_OBJ_1(usb_cdc_serial_get_write_timeout_obj, usb_cdc_serial_get_write_timeout); -STATIC mp_obj_t usb_cdc_serial_set_write_timeout(mp_obj_t self_in, mp_obj_t write_timeout_in) { +static mp_obj_t usb_cdc_serial_set_write_timeout(mp_obj_t self_in, mp_obj_t write_timeout_in) { usb_cdc_serial_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_usb_cdc_serial_set_write_timeout(self, write_timeout_in == mp_const_none ? -1.0f : mp_obj_get_float(write_timeout_in)); @@ -227,7 +227,7 @@ MP_PROPERTY_GETSET(usb_cdc_serial_write_timeout_obj, (mp_obj_t)&usb_cdc_serial_set_write_timeout_obj); -STATIC const mp_rom_map_elem_t usb_cdc_serial_locals_dict_table[] = { +static const mp_rom_map_elem_t usb_cdc_serial_locals_dict_table[] = { // Standard stream methods. { MP_ROM_QSTR(MP_QSTR_flush), MP_ROM_PTR(&mp_stream_flush_obj) }, { MP_OBJ_NEW_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) }, @@ -250,9 +250,9 @@ STATIC const mp_rom_map_elem_t usb_cdc_serial_locals_dict_table[] = { }; -STATIC MP_DEFINE_CONST_DICT(usb_cdc_serial_locals_dict, usb_cdc_serial_locals_dict_table); +static MP_DEFINE_CONST_DICT(usb_cdc_serial_locals_dict, usb_cdc_serial_locals_dict_table); -STATIC const mp_stream_p_t usb_cdc_serial_stream_p = { +static const mp_stream_p_t usb_cdc_serial_stream_p = { .read = usb_cdc_serial_read_stream, .write = usb_cdc_serial_write_stream, .ioctl = usb_cdc_serial_ioctl_stream, diff --git a/shared-bindings/usb_cdc/__init__.c b/shared-bindings/usb_cdc/__init__.c index cde90ecbc31ee..3a2c43c3e922a 100644 --- a/shared-bindings/usb_cdc/__init__.c +++ b/shared-bindings/usb_cdc/__init__.c @@ -47,7 +47,7 @@ //| Equivalent to ``usb_cdc.enable(console=False, data=False)``.""" //| ... //| -STATIC mp_obj_t usb_cdc_disable(void) { +static mp_obj_t usb_cdc_disable(void) { if (!common_hal_usb_cdc_disable()) { mp_raise_RuntimeError(MP_ERROR_TEXT("Cannot change USB devices now")); } @@ -70,7 +70,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(usb_cdc_disable_obj, usb_cdc_disable); //| """ //| ... //| -STATIC mp_obj_t usb_cdc_enable(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t usb_cdc_enable(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_console, ARG_data }; static const mp_arg_t allowed_args[] = { { MP_QSTR_console, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true } }, diff --git a/shared-bindings/usb_hid/Device.c b/shared-bindings/usb_hid/Device.c index 6b300a522c0e2..1afdda509f41e 100644 --- a/shared-bindings/usb_hid/Device.c +++ b/shared-bindings/usb_hid/Device.c @@ -72,7 +72,7 @@ //| """Consumer Control device supporting sent values from 1-652, with no rollover. //| Uses Report ID 3 for its IN report.""" -STATIC mp_obj_t usb_hid_device_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t usb_hid_device_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { usb_hid_device_obj_t *self = mp_obj_malloc(usb_hid_device_obj_t, &usb_hid_device_type); enum { ARG_report_descriptor, ARG_usage_page, ARG_usage, ARG_report_ids, ARG_in_report_lengths, ARG_out_report_lengths }; static const mp_arg_t allowed_args[] = { @@ -161,7 +161,7 @@ STATIC mp_obj_t usb_hid_device_make_new(const mp_obj_type_t *type, size_t n_args //| In addition, there may be USB wakeup settings in the host computer BIOS/UEFI. //| """ //| ... -STATIC mp_obj_t usb_hid_device_send_report(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t usb_hid_device_send_report(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { usb_hid_device_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); enum { ARG_report, ARG_report_id }; @@ -195,7 +195,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(usb_hid_device_send_report_obj, 1, usb_hid_device_sen //| will return `None` until next report is received. //| """ //| ... -STATIC mp_obj_t usb_hid_device_get_last_received_report(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t usb_hid_device_get_last_received_report(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { usb_hid_device_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]); enum { ARG_report_id }; @@ -218,7 +218,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(usb_hid_device_get_last_received_report_obj, 1, usb_h //| usage_page: int //| """The device usage page identifier, which designates a category of device. (read-only)""" -STATIC mp_obj_t usb_hid_device_obj_get_usage_page(mp_obj_t self_in) { +static mp_obj_t usb_hid_device_obj_get_usage_page(mp_obj_t self_in) { usb_hid_device_obj_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_usb_hid_device_get_usage_page(self)); } @@ -233,7 +233,7 @@ MP_PROPERTY_GETTER(usb_hid_device_usage_page_obj, //| For example, Keyboard is 0x06 within the generic desktop usage page 0x01. //| Mouse is 0x02 within the same usage page.""" //| -STATIC mp_obj_t usb_hid_device_obj_get_usage(mp_obj_t self_in) { +static mp_obj_t usb_hid_device_obj_get_usage(mp_obj_t self_in) { usb_hid_device_obj_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_NEW_SMALL_INT(common_hal_usb_hid_device_get_usage(self)); } @@ -243,7 +243,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(usb_hid_device_get_usage_obj, MP_PROPERTY_GETTER(usb_hid_device_usage_obj, (mp_obj_t)&usb_hid_device_get_usage_obj); -STATIC const mp_rom_map_elem_t usb_hid_device_locals_dict_table[] = { +static const mp_rom_map_elem_t usb_hid_device_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_send_report), MP_ROM_PTR(&usb_hid_device_send_report_obj) }, { MP_ROM_QSTR(MP_QSTR_get_last_received_report), MP_ROM_PTR(&usb_hid_device_get_last_received_report_obj) }, { MP_ROM_QSTR(MP_QSTR_usage_page), MP_ROM_PTR(&usb_hid_device_usage_page_obj) }, @@ -254,7 +254,7 @@ STATIC const mp_rom_map_elem_t usb_hid_device_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_CONSUMER_CONTROL), MP_ROM_PTR(&usb_hid_device_consumer_control_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(usb_hid_device_locals_dict, usb_hid_device_locals_dict_table); +static MP_DEFINE_CONST_DICT(usb_hid_device_locals_dict, usb_hid_device_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( usb_hid_device_type, diff --git a/shared-bindings/usb_hid/__init__.c b/shared-bindings/usb_hid/__init__.c index 321cea30470a3..49a9662c95628 100644 --- a/shared-bindings/usb_hid/__init__.c +++ b/shared-bindings/usb_hid/__init__.c @@ -36,7 +36,7 @@ //| as `usb_cdc` or `storage` to free up endpoints for use by `usb_hid`. //| """ //| -STATIC mp_obj_t usb_hid_disable(void) { +static mp_obj_t usb_hid_disable(void) { if (!common_hal_usb_hid_disable()) { mp_raise_RuntimeError(MP_ERROR_TEXT("Cannot change USB devices now")); } @@ -88,7 +88,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(usb_hid_disable_obj, usb_hid_disable); //| """ //| ... //| -STATIC mp_obj_t usb_hid_enable(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t usb_hid_enable(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_devices, ARG_boot_device }; static const mp_arg_t allowed_args[] = { { MP_QSTR_devices, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -130,7 +130,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(usb_hid_enable_obj, 1, usb_hid_enable); //| :rtype int: //| """ //| -STATIC mp_obj_t usb_hid_get_boot_device(void) { +static mp_obj_t usb_hid_get_boot_device(void) { return MP_OBJ_NEW_SMALL_INT(common_hal_usb_hid_get_boot_device()); } MP_DEFINE_CONST_FUN_OBJ_0(usb_hid_get_boot_device_obj, usb_hid_get_boot_device); @@ -147,7 +147,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(usb_hid_get_boot_device_obj, usb_hid_get_boot_device); //| """ //| ... //| -STATIC mp_obj_t usb_hid_set_interface_name(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t usb_hid_set_interface_name(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { static const mp_arg_t allowed_args[] = { { MP_QSTR_interface_name, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_rom_obj = mp_const_none} } }; @@ -169,7 +169,7 @@ STATIC mp_obj_t usb_hid_set_interface_name(size_t n_args, const mp_obj_t *pos_ar MP_DEFINE_CONST_FUN_OBJ_KW(usb_hid_set_interface_name_obj, 1, usb_hid_set_interface_name); // usb_hid.devices is set once the usb devices are determined, after boot.py runs. -STATIC mp_map_elem_t usb_hid_module_globals_table[] = { +static mp_map_elem_t usb_hid_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_usb_hid) }, { MP_ROM_QSTR(MP_QSTR_Device), MP_OBJ_FROM_PTR(&usb_hid_device_type) }, { MP_ROM_QSTR(MP_QSTR_devices), mp_const_none }, @@ -179,7 +179,7 @@ STATIC mp_map_elem_t usb_hid_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_set_interface_name), MP_OBJ_FROM_PTR(&usb_hid_set_interface_name_obj) }, }; -STATIC MP_DEFINE_MUTABLE_DICT(usb_hid_module_globals, usb_hid_module_globals_table); +static MP_DEFINE_MUTABLE_DICT(usb_hid_module_globals, usb_hid_module_globals_table); const mp_obj_module_t usb_hid_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/usb_host/Port.c b/shared-bindings/usb_host/Port.c index ae0852bb0dfd1..10e38c8f3a670 100644 --- a/shared-bindings/usb_host/Port.c +++ b/shared-bindings/usb_host/Port.c @@ -28,7 +28,7 @@ //| """ //| ... //| -STATIC mp_obj_t usb_host_port_make_new(const mp_obj_type_t *type, +static mp_obj_t usb_host_port_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { // check number of arguments mp_arg_check_num(n_args, n_kw, 2, 2, false); @@ -44,10 +44,10 @@ STATIC mp_obj_t usb_host_port_make_new(const mp_obj_type_t *type, return (mp_obj_t)self; } -STATIC const mp_rom_map_elem_t usb_host_port_locals_dict_table[] = { +static const mp_rom_map_elem_t usb_host_port_locals_dict_table[] = { }; -STATIC MP_DEFINE_CONST_DICT(usb_host_port_locals_dict, usb_host_port_locals_dict_table); +static MP_DEFINE_CONST_DICT(usb_host_port_locals_dict, usb_host_port_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( usb_host_port_type, diff --git a/shared-bindings/usb_host/__init__.c b/shared-bindings/usb_host/__init__.c index e311db3105766..d71231aef15dc 100644 --- a/shared-bindings/usb_host/__init__.c +++ b/shared-bindings/usb_host/__init__.c @@ -40,7 +40,7 @@ //| This function is a CircuitPython extension not present in PyUSB //| """ //| -STATIC mp_obj_t usb_set_user_keymap(mp_obj_t buf_in) { +static mp_obj_t usb_set_user_keymap(mp_obj_t buf_in) { mp_buffer_info_t bufinfo; mp_get_buffer_raise(buf_in, &bufinfo, MP_BUFFER_READ); usb_keymap_set(bufinfo.buf, bufinfo.len); @@ -49,13 +49,13 @@ STATIC mp_obj_t usb_set_user_keymap(mp_obj_t buf_in) { MP_DEFINE_CONST_FUN_OBJ_1(usb_set_user_keymap_obj, usb_set_user_keymap); -STATIC mp_map_elem_t usb_host_module_globals_table[] = { +static mp_map_elem_t usb_host_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_usb_host) }, { MP_ROM_QSTR(MP_QSTR_Port), MP_OBJ_FROM_PTR(&usb_host_port_type) }, { MP_ROM_QSTR(MP_QSTR_set_user_keymap), MP_OBJ_FROM_PTR(&usb_set_user_keymap_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(usb_host_module_globals, usb_host_module_globals_table); +static MP_DEFINE_CONST_DICT(usb_host_module_globals, usb_host_module_globals_table); const mp_obj_module_t usb_host_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/usb_midi/PortIn.c b/shared-bindings/usb_midi/PortIn.c index a200af01bae51..38662a4468cd2 100644 --- a/shared-bindings/usb_midi/PortIn.c +++ b/shared-bindings/usb_midi/PortIn.c @@ -46,7 +46,7 @@ //| // These three methods are used by the shared stream methods. -STATIC mp_uint_t usb_midi_portin_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) { +static mp_uint_t usb_midi_portin_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) { usb_midi_portin_obj_t *self = MP_OBJ_TO_PTR(self_in); byte *buf = buf_in; @@ -58,7 +58,7 @@ STATIC mp_uint_t usb_midi_portin_read(mp_obj_t self_in, void *buf_in, mp_uint_t return common_hal_usb_midi_portin_read(self, buf, size, errcode); } -STATIC mp_uint_t usb_midi_portin_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) { +static mp_uint_t usb_midi_portin_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) { usb_midi_portin_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_uint_t ret; if (request == MP_STREAM_POLL) { @@ -74,14 +74,14 @@ STATIC mp_uint_t usb_midi_portin_ioctl(mp_obj_t self_in, mp_uint_t request, mp_u return ret; } -STATIC const mp_rom_map_elem_t usb_midi_portin_locals_dict_table[] = { +static const mp_rom_map_elem_t usb_midi_portin_locals_dict_table[] = { // Standard stream methods. { MP_OBJ_NEW_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) }, { MP_OBJ_NEW_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(usb_midi_portin_locals_dict, usb_midi_portin_locals_dict_table); +static MP_DEFINE_CONST_DICT(usb_midi_portin_locals_dict, usb_midi_portin_locals_dict_table); -STATIC const mp_stream_p_t usb_midi_portin_stream_p = { +static const mp_stream_p_t usb_midi_portin_stream_p = { .read = usb_midi_portin_read, .write = NULL, .ioctl = usb_midi_portin_ioctl, diff --git a/shared-bindings/usb_midi/PortOut.c b/shared-bindings/usb_midi/PortOut.c index 1fbba74d66d0a..c39683c3f09de 100644 --- a/shared-bindings/usb_midi/PortOut.c +++ b/shared-bindings/usb_midi/PortOut.c @@ -33,14 +33,14 @@ //| ... //| -STATIC mp_uint_t usb_midi_portout_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) { +static mp_uint_t usb_midi_portout_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) { usb_midi_portout_obj_t *self = MP_OBJ_TO_PTR(self_in); const byte *buf = buf_in; return common_hal_usb_midi_portout_write(self, buf, size, errcode); } -STATIC mp_uint_t usb_midi_portout_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) { +static mp_uint_t usb_midi_portout_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) { usb_midi_portout_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_uint_t ret; if (request == MP_STREAM_POLL) { @@ -56,13 +56,13 @@ STATIC mp_uint_t usb_midi_portout_ioctl(mp_obj_t self_in, mp_uint_t request, mp_ return ret; } -STATIC const mp_rom_map_elem_t usb_midi_portout_locals_dict_table[] = { +static const mp_rom_map_elem_t usb_midi_portout_locals_dict_table[] = { // Standard stream methods. { MP_OBJ_NEW_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(usb_midi_portout_locals_dict, usb_midi_portout_locals_dict_table); +static MP_DEFINE_CONST_DICT(usb_midi_portout_locals_dict, usb_midi_portout_locals_dict_table); -STATIC const mp_stream_p_t usb_midi_portout_stream_p = { +static const mp_stream_p_t usb_midi_portout_stream_p = { .read = NULL, .write = usb_midi_portout_write, .ioctl = usb_midi_portout_ioctl, diff --git a/shared-bindings/usb_midi/__init__.c b/shared-bindings/usb_midi/__init__.c index e4372fa91311b..c29cb3b4414f4 100644 --- a/shared-bindings/usb_midi/__init__.c +++ b/shared-bindings/usb_midi/__init__.c @@ -30,7 +30,7 @@ //| Can be called in ``boot.py``, before USB is connected.""" //| ... //| -STATIC mp_obj_t usb_midi_disable(void) { +static mp_obj_t usb_midi_disable(void) { if (!common_hal_usb_midi_disable()) { mp_raise_RuntimeError(MP_ERROR_TEXT("Cannot change USB devices now")); } @@ -50,7 +50,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(usb_midi_disable_obj, usb_midi_disable); //| """ //| ... //| -STATIC mp_obj_t usb_midi_enable(void) { +static mp_obj_t usb_midi_enable(void) { if (!common_hal_usb_midi_enable()) { mp_raise_RuntimeError(MP_ERROR_TEXT("Cannot change USB devices now")); } @@ -96,7 +96,7 @@ static void set_name(mp_obj_t name_obj, qstr arg_name_qstr, char **custom_name_p //| """ //| ... //| -STATIC mp_obj_t usb_midi_set_names(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t usb_midi_set_names(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_streaming_interface_name, ARG_audio_control_interface_name, ARG_in_jack_name, ARG_out_jack_name }; static const mp_arg_t allowed_args[] = { { MP_QSTR_streaming_interface_name, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = mp_const_none} }, diff --git a/shared-bindings/usb_video/USBFramebuffer.c b/shared-bindings/usb_video/USBFramebuffer.c index 9bbcdde674154..f89424fa88c79 100644 --- a/shared-bindings/usb_video/USBFramebuffer.c +++ b/shared-bindings/usb_video/USBFramebuffer.c @@ -33,7 +33,7 @@ static void check_for_deinit(usb_video_uvcframebuffer_obj_t *self) { //| //| def __new__(self): //| """Returns the singleton framebuffer object, if USB video is enabled""" -STATIC mp_obj_t usb_video_uvcframebuffer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t usb_video_uvcframebuffer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { static const mp_arg_t allowed_args[] = {}; mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); @@ -45,7 +45,7 @@ STATIC mp_obj_t usb_video_uvcframebuffer_make_new(const mp_obj_type_t *type, siz //| """Transmits the color data in the buffer to the pixels so that //| they are shown.""" //| ... -STATIC mp_obj_t usb_video_uvcframebuffer_refresh(mp_obj_t self_in) { +static mp_obj_t usb_video_uvcframebuffer_refresh(mp_obj_t self_in) { usb_video_uvcframebuffer_obj_t *self = (usb_video_uvcframebuffer_obj_t *)self_in; check_for_deinit(self); shared_module_usb_video_uvcframebuffer_refresh(self); @@ -55,7 +55,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(usb_video_uvcframebuffer_refresh_obj, usb_video_uvcfra //| width: int //| """The width of the display, in pixels""" -STATIC mp_obj_t usb_video_uvcframebuffer_get_width(mp_obj_t self_in) { +static mp_obj_t usb_video_uvcframebuffer_get_width(mp_obj_t self_in) { usb_video_uvcframebuffer_obj_t *self = (usb_video_uvcframebuffer_obj_t *)self_in; check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(shared_module_usb_video_uvcframebuffer_get_width(self)); @@ -67,7 +67,7 @@ MP_PROPERTY_GETTER(usb_video_uvcframebuffer_width_obj, //| height: int //| """The height of the display, in pixels""" //| -STATIC mp_obj_t usb_video_uvcframebuffer_get_height(mp_obj_t self_in) { +static mp_obj_t usb_video_uvcframebuffer_get_height(mp_obj_t self_in) { usb_video_uvcframebuffer_obj_t *self = (usb_video_uvcframebuffer_obj_t *)self_in; check_for_deinit(self); return MP_OBJ_NEW_SMALL_INT(shared_module_usb_video_uvcframebuffer_get_height(self)); @@ -77,46 +77,46 @@ MP_DEFINE_CONST_FUN_OBJ_1(usb_video_uvcframebuffer_get_height_obj, usb_video_uvc MP_PROPERTY_GETTER(usb_video_uvcframebuffer_height_obj, (mp_obj_t)&usb_video_uvcframebuffer_get_height_obj); -STATIC const mp_rom_map_elem_t usb_video_uvcframebuffer_locals_dict_table[] = { +static const mp_rom_map_elem_t usb_video_uvcframebuffer_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_refresh), MP_ROM_PTR(&usb_video_uvcframebuffer_refresh_obj) }, { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&usb_video_uvcframebuffer_width_obj) }, { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&usb_video_uvcframebuffer_height_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(usb_video_uvcframebuffer_locals_dict, usb_video_uvcframebuffer_locals_dict_table); +static MP_DEFINE_CONST_DICT(usb_video_uvcframebuffer_locals_dict, usb_video_uvcframebuffer_locals_dict_table); -STATIC void usb_video_uvcframebuffer_get_bufinfo(mp_obj_t self_in, mp_buffer_info_t *bufinfo) { +static void usb_video_uvcframebuffer_get_bufinfo(mp_obj_t self_in, mp_buffer_info_t *bufinfo) { shared_module_usb_video_uvcframebuffer_get_bufinfo(self_in, bufinfo); } // These version exists so that the prototype matches the protocol, // avoiding a type cast that can hide errors -STATIC void usb_video_uvcframebuffer_swapbuffers(mp_obj_t self_in, uint8_t *dirty_row_bitmap) { +static void usb_video_uvcframebuffer_swapbuffers(mp_obj_t self_in, uint8_t *dirty_row_bitmap) { (void)dirty_row_bitmap; shared_module_usb_video_uvcframebuffer_refresh(self_in); } -STATIC void usb_video_uvcframebuffer_deinit_proto(mp_obj_t self_in) { +static void usb_video_uvcframebuffer_deinit_proto(mp_obj_t self_in) { /* NOTHING */ } -STATIC int usb_video_uvcframebuffer_get_width_proto(mp_obj_t self_in) { +static int usb_video_uvcframebuffer_get_width_proto(mp_obj_t self_in) { return shared_module_usb_video_uvcframebuffer_get_width(self_in); } -STATIC int usb_video_uvcframebuffer_get_height_proto(mp_obj_t self_in) { +static int usb_video_uvcframebuffer_get_height_proto(mp_obj_t self_in) { return shared_module_usb_video_uvcframebuffer_get_height(self_in); } -STATIC int usb_video_uvcframebuffer_get_native_frames_per_second_proto(mp_obj_t self_in) { +static int usb_video_uvcframebuffer_get_native_frames_per_second_proto(mp_obj_t self_in) { return 10; } -STATIC bool usb_video_uvcframebuffer_get_reverse_pixels_in_word_proto(mp_obj_t self_in) { +static bool usb_video_uvcframebuffer_get_reverse_pixels_in_word_proto(mp_obj_t self_in) { return true; } -STATIC const framebuffer_p_t usb_video_uvcframebuffer_proto = { +static const framebuffer_p_t usb_video_uvcframebuffer_proto = { MP_PROTO_IMPLEMENT(MP_QSTR_protocol_framebuffer) .get_bufinfo = usb_video_uvcframebuffer_get_bufinfo, .get_width = usb_video_uvcframebuffer_get_width_proto, @@ -127,7 +127,7 @@ STATIC const framebuffer_p_t usb_video_uvcframebuffer_proto = { .get_reverse_pixels_in_word = usb_video_uvcframebuffer_get_reverse_pixels_in_word_proto, }; -STATIC mp_int_t usb_video_uvcframebuffer_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) { +static mp_int_t usb_video_uvcframebuffer_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) { shared_module_usb_video_uvcframebuffer_get_bufinfo(self_in, bufinfo); bufinfo->typecode = 'H'; return 0; diff --git a/shared-bindings/usb_video/__init__.c b/shared-bindings/usb_video/__init__.c index bcf8a108d4b11..189acd9109c6f 100644 --- a/shared-bindings/usb_video/__init__.c +++ b/shared-bindings/usb_video/__init__.c @@ -60,7 +60,7 @@ //| This message can be seen in ``boot_out.txt``.""" //| -STATIC mp_obj_t usb_video_enable_framebuffer(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t usb_video_enable_framebuffer(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_width, ARG_height }; static const mp_arg_t allowed_args[] = { { MP_QSTR_width, MP_ARG_REQUIRED | MP_ARG_INT, { .u_int = 0 } }, @@ -78,7 +78,7 @@ STATIC mp_obj_t usb_video_enable_framebuffer(size_t n_args, const mp_obj_t *pos_ return mp_const_none; }; -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(usb_video_enable_framebuffer_obj, 0, usb_video_enable_framebuffer); +static MP_DEFINE_CONST_FUN_OBJ_KW(usb_video_enable_framebuffer_obj, 0, usb_video_enable_framebuffer); static const mp_rom_map_elem_t usb_video_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_usb_video) }, diff --git a/shared-bindings/ustack/__init__.c b/shared-bindings/ustack/__init__.c index ec61f1629cb0d..3002254db2584 100644 --- a/shared-bindings/ustack/__init__.c +++ b/shared-bindings/ustack/__init__.c @@ -22,10 +22,10 @@ //| """Return the maximum excursion of the stack so far.""" //| ... //| -STATIC mp_obj_t max_stack_usage(void) { +static mp_obj_t max_stack_usage(void) { return MP_OBJ_NEW_SMALL_INT(shared_module_ustack_max_stack_usage()); } -STATIC MP_DEFINE_CONST_FUN_OBJ_0(max_stack_usage_obj, max_stack_usage); +static MP_DEFINE_CONST_FUN_OBJ_0(max_stack_usage_obj, max_stack_usage); #endif // MICROPY_MAX_STACK_USAGE @@ -35,22 +35,22 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(max_stack_usage_obj, max_stack_usage); //| of just printing it.""" //| ... //| -STATIC mp_obj_t stack_size(void) { +static mp_obj_t stack_size(void) { return MP_OBJ_NEW_SMALL_INT(shared_module_ustack_stack_size()); } -STATIC MP_DEFINE_CONST_FUN_OBJ_0(stack_size_obj, stack_size); +static MP_DEFINE_CONST_FUN_OBJ_0(stack_size_obj, stack_size); //| def stack_usage() -> int: //| """Return how much stack is currently in use. //| Same as micropython.stack_use(); duplicated here for convenience.""" //| ... //| -STATIC mp_obj_t stack_usage(void) { +static mp_obj_t stack_usage(void) { return MP_OBJ_NEW_SMALL_INT(shared_module_ustack_stack_usage()); } -STATIC MP_DEFINE_CONST_FUN_OBJ_0(stack_usage_obj, stack_usage); +static MP_DEFINE_CONST_FUN_OBJ_0(stack_usage_obj, stack_usage); -STATIC const mp_rom_map_elem_t ustack_module_globals_table[] = { +static const mp_rom_map_elem_t ustack_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ustack) }, #if MICROPY_MAX_STACK_USAGE { MP_ROM_QSTR(MP_QSTR_max_stack_usage), MP_ROM_PTR(&max_stack_usage_obj) }, @@ -59,7 +59,7 @@ STATIC const mp_rom_map_elem_t ustack_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_stack_usage), MP_ROM_PTR(&stack_usage_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(ustack_module_globals, ustack_module_globals_table); +static MP_DEFINE_CONST_DICT(ustack_module_globals, ustack_module_globals_table); const mp_obj_module_t ustack_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/vectorio/Circle.c b/shared-bindings/vectorio/Circle.c index 0d3d0681bfbb7..d2f31d6b86d82 100644 --- a/shared-bindings/vectorio/Circle.c +++ b/shared-bindings/vectorio/Circle.c @@ -60,7 +60,7 @@ static mp_obj_t vectorio_circle_make_new(const mp_obj_type_t *type, size_t n_arg return MP_OBJ_FROM_PTR(self); } -STATIC const vectorio_draw_protocol_t circle_draw_protocol = { +static const vectorio_draw_protocol_t circle_draw_protocol = { MP_PROTO_IMPLEMENT(MP_QSTR_protocol_draw) .draw_get_protocol_self = (draw_get_protocol_self_fun)common_hal_vectorio_circle_get_draw_protocol, .draw_protocol_impl = &vectorio_vector_shape_draw_protocol_impl @@ -69,13 +69,13 @@ STATIC const vectorio_draw_protocol_t circle_draw_protocol = { //| radius: int //| """The radius of the circle in pixels.""" -STATIC mp_obj_t vectorio_circle_obj_get_radius(mp_obj_t self_in) { +static mp_obj_t vectorio_circle_obj_get_radius(mp_obj_t self_in) { vectorio_circle_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_int(common_hal_vectorio_circle_get_radius(self)); } MP_DEFINE_CONST_FUN_OBJ_1(vectorio_circle_get_radius_obj, vectorio_circle_obj_get_radius); -STATIC mp_obj_t vectorio_circle_obj_set_radius(mp_obj_t self_in, mp_obj_t radius) { +static mp_obj_t vectorio_circle_obj_set_radius(mp_obj_t self_in, mp_obj_t radius) { vectorio_circle_t *self = MP_OBJ_TO_PTR(self_in); common_hal_vectorio_circle_set_radius(self, mp_obj_get_int(radius)); return mp_const_none; @@ -88,13 +88,13 @@ MP_PROPERTY_GETSET(vectorio_circle_radius_obj, //| color_index: int //| """The color_index of the circle as 0 based index of the palette.""" -STATIC mp_obj_t vectorio_circle_obj_get_color_index(mp_obj_t self_in) { +static mp_obj_t vectorio_circle_obj_get_color_index(mp_obj_t self_in) { vectorio_circle_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_int(common_hal_vectorio_circle_get_color_index(self)); } MP_DEFINE_CONST_FUN_OBJ_1(vectorio_circle_get_color_index_obj, vectorio_circle_obj_get_color_index); -STATIC mp_obj_t vectorio_circle_obj_set_color_index(mp_obj_t self_in, mp_obj_t color_index) { +static mp_obj_t vectorio_circle_obj_set_color_index(mp_obj_t self_in, mp_obj_t color_index) { vectorio_circle_t *self = MP_OBJ_TO_PTR(self_in); common_hal_vectorio_circle_set_color_index(self, mp_obj_get_int(color_index)); return mp_const_none; @@ -124,7 +124,7 @@ MP_PROPERTY_GETSET(vectorio_circle_color_index_obj, //| """The pixel shader of the circle.""" //| -STATIC const mp_rom_map_elem_t vectorio_circle_locals_dict_table[] = { +static const mp_rom_map_elem_t vectorio_circle_locals_dict_table[] = { // Functions { MP_ROM_QSTR(MP_QSTR_contains), MP_ROM_PTR(&vectorio_vector_shape_contains_obj) }, // Properties @@ -136,7 +136,7 @@ STATIC const mp_rom_map_elem_t vectorio_circle_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_location), MP_ROM_PTR(&vectorio_vector_shape_location_obj) }, { MP_ROM_QSTR(MP_QSTR_pixel_shader), MP_ROM_PTR(&vectorio_vector_shape_pixel_shader_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(vectorio_circle_locals_dict, vectorio_circle_locals_dict_table); +static MP_DEFINE_CONST_DICT(vectorio_circle_locals_dict, vectorio_circle_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( vectorio_circle_type, diff --git a/shared-bindings/vectorio/Polygon.c b/shared-bindings/vectorio/Polygon.c index 2a5236c3f022c..05228465f6c16 100644 --- a/shared-bindings/vectorio/Polygon.c +++ b/shared-bindings/vectorio/Polygon.c @@ -68,7 +68,7 @@ static mp_obj_t vectorio_polygon_make_new(const mp_obj_type_t *type, size_t n_ar return MP_OBJ_FROM_PTR(self); } -STATIC const vectorio_draw_protocol_t polygon_draw_protocol = { +static const vectorio_draw_protocol_t polygon_draw_protocol = { MP_PROTO_IMPLEMENT(MP_QSTR_protocol_draw) .draw_get_protocol_self = (draw_get_protocol_self_fun)common_hal_vectorio_polygon_get_draw_protocol, .draw_protocol_impl = &vectorio_vector_shape_draw_protocol_impl @@ -77,13 +77,13 @@ STATIC const vectorio_draw_protocol_t polygon_draw_protocol = { //| points: List[Tuple[int, int]] //| """Vertices for the polygon.""" -STATIC mp_obj_t vectorio_polygon_obj_get_points(mp_obj_t self_in) { +static mp_obj_t vectorio_polygon_obj_get_points(mp_obj_t self_in) { vectorio_polygon_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_vectorio_polygon_get_points(self); } MP_DEFINE_CONST_FUN_OBJ_1(vectorio_polygon_get_points_obj, vectorio_polygon_obj_get_points); -STATIC mp_obj_t vectorio_polygon_obj_set_points(mp_obj_t self_in, mp_obj_t points) { +static mp_obj_t vectorio_polygon_obj_set_points(mp_obj_t self_in, mp_obj_t points) { vectorio_polygon_t *self = MP_OBJ_TO_PTR(self_in); common_hal_vectorio_polygon_set_points(self, points); @@ -97,13 +97,13 @@ MP_PROPERTY_GETSET(vectorio_polygon_points_obj, //| color_index: int //| """The color_index of the polygon as 0 based index of the palette.""" -STATIC mp_obj_t vectorio_polygon_obj_get_color_index(mp_obj_t self_in) { +static mp_obj_t vectorio_polygon_obj_get_color_index(mp_obj_t self_in) { vectorio_polygon_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_int(common_hal_vectorio_polygon_get_color_index(self)); } MP_DEFINE_CONST_FUN_OBJ_1(vectorio_polygon_get_color_index_obj, vectorio_polygon_obj_get_color_index); -STATIC mp_obj_t vectorio_polygon_obj_set_color_index(mp_obj_t self_in, mp_obj_t color_index) { +static mp_obj_t vectorio_polygon_obj_set_color_index(mp_obj_t self_in, mp_obj_t color_index) { vectorio_polygon_t *self = MP_OBJ_TO_PTR(self_in); common_hal_vectorio_polygon_set_color_index(self, mp_obj_get_int(color_index)); return mp_const_none; @@ -133,7 +133,7 @@ MP_PROPERTY_GETSET(vectorio_polygon_color_index_obj, //| """The pixel shader of the polygon.""" //| -STATIC const mp_rom_map_elem_t vectorio_polygon_locals_dict_table[] = { +static const mp_rom_map_elem_t vectorio_polygon_locals_dict_table[] = { // Functions { MP_ROM_QSTR(MP_QSTR_contains), MP_ROM_PTR(&vectorio_vector_shape_contains_obj) }, // Properties @@ -145,7 +145,7 @@ STATIC const mp_rom_map_elem_t vectorio_polygon_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_location), MP_ROM_PTR(&vectorio_vector_shape_location_obj) }, { MP_ROM_QSTR(MP_QSTR_pixel_shader), MP_ROM_PTR(&vectorio_vector_shape_pixel_shader_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(vectorio_polygon_locals_dict, vectorio_polygon_locals_dict_table); +static MP_DEFINE_CONST_DICT(vectorio_polygon_locals_dict, vectorio_polygon_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( vectorio_polygon_type, diff --git a/shared-bindings/vectorio/Rectangle.c b/shared-bindings/vectorio/Rectangle.c index 5f51dfb39d59d..d1f2e6193ce3e 100644 --- a/shared-bindings/vectorio/Rectangle.c +++ b/shared-bindings/vectorio/Rectangle.c @@ -64,7 +64,7 @@ static mp_obj_t vectorio_rectangle_make_new(const mp_obj_type_t *type, size_t n_ return MP_OBJ_FROM_PTR(self); } -STATIC const vectorio_draw_protocol_t rectangle_draw_protocol = { +static const vectorio_draw_protocol_t rectangle_draw_protocol = { MP_PROTO_IMPLEMENT(MP_QSTR_protocol_draw) .draw_get_protocol_self = (draw_get_protocol_self_fun)common_hal_vectorio_rectangle_get_draw_protocol, .draw_protocol_impl = &vectorio_vector_shape_draw_protocol_impl @@ -72,13 +72,13 @@ STATIC const vectorio_draw_protocol_t rectangle_draw_protocol = { //| width: int //| """The width of the rectangle in pixels.""" -STATIC mp_obj_t vectorio_rectangle_obj_get_width(mp_obj_t self_in) { +static mp_obj_t vectorio_rectangle_obj_get_width(mp_obj_t self_in) { vectorio_rectangle_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_int(common_hal_vectorio_rectangle_get_width(self)); } MP_DEFINE_CONST_FUN_OBJ_1(vectorio_rectangle_get_width_obj, vectorio_rectangle_obj_get_width); -STATIC mp_obj_t vectorio_rectangle_obj_set_width(mp_obj_t self_in, mp_obj_t width) { +static mp_obj_t vectorio_rectangle_obj_set_width(mp_obj_t self_in, mp_obj_t width) { vectorio_rectangle_t *self = MP_OBJ_TO_PTR(self_in); common_hal_vectorio_rectangle_set_width(self, mp_obj_get_int(width)); return mp_const_none; @@ -94,13 +94,13 @@ const mp_obj_property_t vectorio_rectangle_width_obj = { //| height: int //| """The height of the rectangle in pixels.""" -STATIC mp_obj_t vectorio_rectangle_obj_get_height(mp_obj_t self_in) { +static mp_obj_t vectorio_rectangle_obj_get_height(mp_obj_t self_in) { vectorio_rectangle_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_int(common_hal_vectorio_rectangle_get_height(self)); } MP_DEFINE_CONST_FUN_OBJ_1(vectorio_rectangle_get_height_obj, vectorio_rectangle_obj_get_height); -STATIC mp_obj_t vectorio_rectangle_obj_set_height(mp_obj_t self_in, mp_obj_t height) { +static mp_obj_t vectorio_rectangle_obj_set_height(mp_obj_t self_in, mp_obj_t height) { vectorio_rectangle_t *self = MP_OBJ_TO_PTR(self_in); common_hal_vectorio_rectangle_set_height(self, mp_obj_get_int(height)); return mp_const_none; @@ -116,13 +116,13 @@ const mp_obj_property_t vectorio_rectangle_height_obj = { //| color_index: int //| """The color_index of the rectangle in 1 based index of the palette.""" -STATIC mp_obj_t vectorio_rectangle_obj_get_color_index(mp_obj_t self_in) { +static mp_obj_t vectorio_rectangle_obj_get_color_index(mp_obj_t self_in) { vectorio_rectangle_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_int(common_hal_vectorio_rectangle_get_color_index(self)); } MP_DEFINE_CONST_FUN_OBJ_1(vectorio_rectangle_get_color_index_obj, vectorio_rectangle_obj_get_color_index); -STATIC mp_obj_t vectorio_rectangle_obj_set_color_index(mp_obj_t self_in, mp_obj_t color_index) { +static mp_obj_t vectorio_rectangle_obj_set_color_index(mp_obj_t self_in, mp_obj_t color_index) { vectorio_rectangle_t *self = MP_OBJ_TO_PTR(self_in); common_hal_vectorio_rectangle_set_color_index(self, mp_obj_get_int(color_index)); return mp_const_none; @@ -154,7 +154,7 @@ const mp_obj_property_t vectorio_rectangle_color_index_obj = { //| """The pixel shader of the rectangle.""" //| -STATIC const mp_rom_map_elem_t vectorio_rectangle_locals_dict_table[] = { +static const mp_rom_map_elem_t vectorio_rectangle_locals_dict_table[] = { // Functions { MP_ROM_QSTR(MP_QSTR_contains), MP_ROM_PTR(&vectorio_vector_shape_contains_obj) }, // Properties @@ -167,7 +167,7 @@ STATIC const mp_rom_map_elem_t vectorio_rectangle_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_location), MP_ROM_PTR(&vectorio_vector_shape_location_obj) }, { MP_ROM_QSTR(MP_QSTR_pixel_shader), MP_ROM_PTR(&vectorio_vector_shape_pixel_shader_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(vectorio_rectangle_locals_dict, vectorio_rectangle_locals_dict_table); +static MP_DEFINE_CONST_DICT(vectorio_rectangle_locals_dict, vectorio_rectangle_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( vectorio_rectangle_type, diff --git a/shared-bindings/vectorio/VectorShape.c b/shared-bindings/vectorio/VectorShape.c index 83ecca8b23db2..041600bff4e49 100644 --- a/shared-bindings/vectorio/VectorShape.c +++ b/shared-bindings/vectorio/VectorShape.c @@ -89,7 +89,7 @@ vectorio_draw_protocol_impl_t vectorio_vector_shape_draw_protocol_impl = { // y: int // """true if x,y lies inside the shape.""" // -STATIC mp_obj_t vectorio_vector_shape_obj_contains(mp_obj_t wrapper_shape, mp_obj_t x_obj, mp_obj_t y_obj) { +static mp_obj_t vectorio_vector_shape_obj_contains(mp_obj_t wrapper_shape, mp_obj_t x_obj, mp_obj_t y_obj) { // Relies on the fact that only vector_shape impl gets matched with a VectorShape. const vectorio_draw_protocol_t *draw_protocol = mp_proto_get(MP_QSTR_protocol_draw, wrapper_shape); vectorio_vector_shape_t *self = MP_OBJ_TO_PTR(draw_protocol->draw_get_protocol_self(wrapper_shape)); @@ -104,7 +104,7 @@ MP_DEFINE_CONST_FUN_OBJ_3(vectorio_vector_shape_contains_obj, vectorio_vector_sh // x: int // """X position of the center point of the shape in the parent.""" // -STATIC mp_obj_t vectorio_vector_shape_obj_get_x(mp_obj_t wrapper_shape) { +static mp_obj_t vectorio_vector_shape_obj_get_x(mp_obj_t wrapper_shape) { // Relies on the fact that only vector_shape impl gets matched with a VectorShape. const vectorio_draw_protocol_t *draw_protocol = mp_proto_get(MP_QSTR_protocol_draw, wrapper_shape); vectorio_vector_shape_t *self = MP_OBJ_TO_PTR(draw_protocol->draw_get_protocol_self(wrapper_shape)); @@ -113,7 +113,7 @@ STATIC mp_obj_t vectorio_vector_shape_obj_get_x(mp_obj_t wrapper_shape) { } MP_DEFINE_CONST_FUN_OBJ_1(vectorio_vector_shape_get_x_obj, vectorio_vector_shape_obj_get_x); -STATIC mp_obj_t vectorio_vector_shape_obj_set_x(mp_obj_t wrapper_shape, mp_obj_t x_obj) { +static mp_obj_t vectorio_vector_shape_obj_set_x(mp_obj_t wrapper_shape, mp_obj_t x_obj) { // Relies on the fact that only vector_shape impl gets matched with a VectorShape. const vectorio_draw_protocol_t *draw_protocol = mp_proto_get(MP_QSTR_protocol_draw, wrapper_shape); vectorio_vector_shape_t *self = MP_OBJ_TO_PTR(draw_protocol->draw_get_protocol_self(wrapper_shape)); @@ -132,7 +132,7 @@ MP_PROPERTY_GETSET(vectorio_vector_shape_x_obj, // y: int // """Y position of the center point of the shape in the parent.""" // -STATIC mp_obj_t vectorio_vector_shape_obj_get_y(mp_obj_t wrapper_shape) { +static mp_obj_t vectorio_vector_shape_obj_get_y(mp_obj_t wrapper_shape) { // Relies on the fact that only vector_shape impl gets matched with a VectorShape. const vectorio_draw_protocol_t *draw_protocol = mp_proto_get(MP_QSTR_protocol_draw, wrapper_shape); vectorio_vector_shape_t *self = MP_OBJ_TO_PTR(draw_protocol->draw_get_protocol_self(wrapper_shape)); @@ -141,7 +141,7 @@ STATIC mp_obj_t vectorio_vector_shape_obj_get_y(mp_obj_t wrapper_shape) { } MP_DEFINE_CONST_FUN_OBJ_1(vectorio_vector_shape_get_y_obj, vectorio_vector_shape_obj_get_y); -STATIC mp_obj_t vectorio_vector_shape_obj_set_y(mp_obj_t wrapper_shape, mp_obj_t y_obj) { +static mp_obj_t vectorio_vector_shape_obj_set_y(mp_obj_t wrapper_shape, mp_obj_t y_obj) { // Relies on the fact that only vector_shape impl gets matched with a VectorShape. const vectorio_draw_protocol_t *draw_protocol = mp_proto_get(MP_QSTR_protocol_draw, wrapper_shape); vectorio_vector_shape_t *self = MP_OBJ_TO_PTR(draw_protocol->draw_get_protocol_self(wrapper_shape)); @@ -160,7 +160,7 @@ MP_PROPERTY_GETSET(vectorio_vector_shape_y_obj, // location: Tuple[int, int] // """location of the center point of the shape in the parent.""" // -STATIC mp_obj_t vectorio_vector_shape_obj_get_location(mp_obj_t wrapper_shape) { +static mp_obj_t vectorio_vector_shape_obj_get_location(mp_obj_t wrapper_shape) { // Relies on the fact that only vector_shape impl gets matched with a VectorShape. const vectorio_draw_protocol_t *draw_protocol = mp_proto_get(MP_QSTR_protocol_draw, wrapper_shape); vectorio_vector_shape_t *self = MP_OBJ_TO_PTR(draw_protocol->draw_get_protocol_self(wrapper_shape)); @@ -169,7 +169,7 @@ STATIC mp_obj_t vectorio_vector_shape_obj_get_location(mp_obj_t wrapper_shape) { } MP_DEFINE_CONST_FUN_OBJ_1(vectorio_vector_shape_get_location_obj, vectorio_vector_shape_obj_get_location); -STATIC mp_obj_t vectorio_vector_shape_obj_set_location(mp_obj_t wrapper_shape, mp_obj_t location_obj) { +static mp_obj_t vectorio_vector_shape_obj_set_location(mp_obj_t wrapper_shape, mp_obj_t location_obj) { // Relies on the fact that only vector_shape impl gets matched with a VectorShape. const vectorio_draw_protocol_t *draw_protocol = mp_proto_get(MP_QSTR_protocol_draw, wrapper_shape); vectorio_vector_shape_t *self = MP_OBJ_TO_PTR(draw_protocol->draw_get_protocol_self(wrapper_shape)); @@ -188,7 +188,7 @@ MP_PROPERTY_GETSET(vectorio_vector_shape_location_obj, // hidden: bool // """Hide the shape or not.""" // -STATIC mp_obj_t vectorio_vector_shape_obj_get_hidden(mp_obj_t wrapper_shape) { +static mp_obj_t vectorio_vector_shape_obj_get_hidden(mp_obj_t wrapper_shape) { // Relies on the fact that only vector_shape impl gets matched with a VectorShape. const vectorio_draw_protocol_t *draw_protocol = mp_proto_get(MP_QSTR_protocol_draw, wrapper_shape); vectorio_vector_shape_t *self = MP_OBJ_TO_PTR(draw_protocol->draw_get_protocol_self(wrapper_shape)); @@ -196,7 +196,7 @@ STATIC mp_obj_t vectorio_vector_shape_obj_get_hidden(mp_obj_t wrapper_shape) { } MP_DEFINE_CONST_FUN_OBJ_1(vectorio_vector_shape_get_hidden_obj, vectorio_vector_shape_obj_get_hidden); -STATIC mp_obj_t vectorio_vector_shape_obj_set_hidden(mp_obj_t wrapper_shape, mp_obj_t hidden_obj) { +static mp_obj_t vectorio_vector_shape_obj_set_hidden(mp_obj_t wrapper_shape, mp_obj_t hidden_obj) { // Relies on the fact that only vector_shape impl gets matched with a VectorShape. const vectorio_draw_protocol_t *draw_protocol = mp_proto_get(MP_QSTR_protocol_draw, wrapper_shape); vectorio_vector_shape_t *self = MP_OBJ_TO_PTR(draw_protocol->draw_get_protocol_self(wrapper_shape)); @@ -214,7 +214,7 @@ MP_PROPERTY_GETSET(vectorio_vector_shape_hidden_obj, // pixel_shader: Union[ColorConverter, Palette] // """The pixel shader of the shape.""" // -STATIC mp_obj_t vectorio_vector_shape_obj_get_pixel_shader(mp_obj_t wrapper_shape) { +static mp_obj_t vectorio_vector_shape_obj_get_pixel_shader(mp_obj_t wrapper_shape) { // Relies on the fact that only vector_shape impl gets matched with a VectorShape. const vectorio_draw_protocol_t *draw_protocol = mp_proto_get(MP_QSTR_protocol_draw, wrapper_shape); vectorio_vector_shape_t *self = MP_OBJ_TO_PTR(draw_protocol->draw_get_protocol_self(wrapper_shape)); @@ -223,7 +223,7 @@ STATIC mp_obj_t vectorio_vector_shape_obj_get_pixel_shader(mp_obj_t wrapper_shap } MP_DEFINE_CONST_FUN_OBJ_1(vectorio_vector_shape_get_pixel_shader_obj, vectorio_vector_shape_obj_get_pixel_shader); -STATIC mp_obj_t vectorio_vector_shape_obj_set_pixel_shader(mp_obj_t wrapper_shape, mp_obj_t pixel_shader) { +static mp_obj_t vectorio_vector_shape_obj_set_pixel_shader(mp_obj_t wrapper_shape, mp_obj_t pixel_shader) { // Relies on the fact that only vector_shape impl gets matched with a VectorShape. const vectorio_draw_protocol_t *draw_protocol = mp_proto_get(MP_QSTR_protocol_draw, wrapper_shape); vectorio_vector_shape_t *self = MP_OBJ_TO_PTR(draw_protocol->draw_get_protocol_self(wrapper_shape)); @@ -243,9 +243,9 @@ MP_PROPERTY_GETSET(vectorio_vector_shape_pixel_shader_obj, (mp_obj_t)&vectorio_vector_shape_set_pixel_shader_obj); -STATIC const mp_rom_map_elem_t vectorio_vector_shape_locals_dict_table[] = { +static const mp_rom_map_elem_t vectorio_vector_shape_locals_dict_table[] = { }; -STATIC MP_DEFINE_CONST_DICT(vectorio_vector_shape_locals_dict, vectorio_vector_shape_locals_dict_table); +static MP_DEFINE_CONST_DICT(vectorio_vector_shape_locals_dict, vectorio_vector_shape_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( vectorio_vector_shape_type, diff --git a/shared-bindings/vectorio/__init__.c b/shared-bindings/vectorio/__init__.c index cc95012171825..7e9473eefdcb5 100644 --- a/shared-bindings/vectorio/__init__.c +++ b/shared-bindings/vectorio/__init__.c @@ -37,14 +37,14 @@ //| //| """ -STATIC const mp_rom_map_elem_t vectorio_module_globals_table[] = { +static const mp_rom_map_elem_t vectorio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_vectorio) }, { MP_ROM_QSTR(MP_QSTR_Circle), MP_ROM_PTR(&vectorio_circle_type) }, { MP_ROM_QSTR(MP_QSTR_Polygon), MP_ROM_PTR(&vectorio_polygon_type) }, { MP_ROM_QSTR(MP_QSTR_Rectangle), MP_ROM_PTR(&vectorio_rectangle_type) }, }; -STATIC MP_DEFINE_CONST_DICT(vectorio_module_globals, vectorio_module_globals_table); +static MP_DEFINE_CONST_DICT(vectorio_module_globals, vectorio_module_globals_table); const mp_obj_module_t vectorio_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/warnings/__init__.c b/shared-bindings/warnings/__init__.c index b19229ab64689..1d726bc61a8a8 100644 --- a/shared-bindings/warnings/__init__.c +++ b/shared-bindings/warnings/__init__.c @@ -33,7 +33,7 @@ //| """ //| ... //| -STATIC mp_obj_t warnings_warn(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t warnings_warn(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_message, ARG_category }; static const mp_arg_t allowed_args[] = { { MP_QSTR_message, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -51,14 +51,14 @@ STATIC mp_obj_t warnings_warn(size_t n_args, const mp_obj_t *pos_args, mp_map_t common_hal_warnings_warn(mp_obj_str_get_str(args[ARG_message].u_obj), MP_OBJ_TO_PTR(category_obj)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(warnings_warn_obj, 1, warnings_warn); +static MP_DEFINE_CONST_FUN_OBJ_KW(warnings_warn_obj, 1, warnings_warn); //| def simplefilter(action: str) -> None: //| """Set the action to take on all warnings. This is a subset of the CPython //| behavior because it allows for per-category changes.""" //| ... //| -STATIC mp_obj_t warnings_simplefilter(mp_obj_t action_in) { +static mp_obj_t warnings_simplefilter(mp_obj_t action_in) { const char *action_str = mp_obj_str_get_str(action_in); warnings_action_t action; if (strcmp(action_str, "error") == 0) { @@ -75,14 +75,14 @@ STATIC mp_obj_t warnings_simplefilter(mp_obj_t action_in) { } MP_DEFINE_CONST_FUN_OBJ_1(warnings_simplefilter_obj, warnings_simplefilter); -STATIC const mp_rom_map_elem_t warnings_module_globals_table[] = { +static const mp_rom_map_elem_t warnings_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_warnings) }, { MP_ROM_QSTR(MP_QSTR_warn), MP_ROM_PTR(&warnings_warn_obj) }, { MP_ROM_QSTR(MP_QSTR_simplefilter), MP_ROM_PTR(&warnings_simplefilter_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(warnings_module_globals, warnings_module_globals_table); +static MP_DEFINE_CONST_DICT(warnings_module_globals, warnings_module_globals_table); const mp_obj_module_t warnings_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/watchdog/WatchDogMode.c b/shared-bindings/watchdog/WatchDogMode.c index b3747a032c24f..3aee1203d38fb 100644 --- a/shared-bindings/watchdog/WatchDogMode.c +++ b/shared-bindings/watchdog/WatchDogMode.c @@ -24,7 +24,7 @@ MAKE_ENUM_MAP(watchdog_watchdogmode) { MAKE_ENUM_MAP_ENTRY(watchdogmode, RAISE), MAKE_ENUM_MAP_ENTRY(watchdogmode, RESET), }; -STATIC MP_DEFINE_CONST_DICT(watchdog_watchdogmode_locals_dict, watchdog_watchdogmode_locals_table); +static MP_DEFINE_CONST_DICT(watchdog_watchdogmode_locals_dict, watchdog_watchdogmode_locals_table); MAKE_PRINTER(watchdog, watchdog_watchdogmode); diff --git a/shared-bindings/watchdog/WatchDogTimer.c b/shared-bindings/watchdog/WatchDogTimer.c index 103e667a7b2d0..8ff8ba2f9c282 100644 --- a/shared-bindings/watchdog/WatchDogTimer.c +++ b/shared-bindings/watchdog/WatchDogTimer.c @@ -37,14 +37,14 @@ //| """Feed the watchdog timer. This must be called regularly, otherwise //| the timer will expire. Silently does nothing if the watchdog isn't active.""" //| ... -STATIC mp_obj_t watchdog_watchdogtimer_feed(mp_obj_t self_in) { +static mp_obj_t watchdog_watchdogtimer_feed(mp_obj_t self_in) { watchdog_watchdogtimer_obj_t *self = MP_OBJ_TO_PTR(self_in); if (common_hal_watchdog_get_mode(self) != WATCHDOGMODE_NONE) { common_hal_watchdog_feed(self); } return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(watchdog_watchdogtimer_feed_obj, watchdog_watchdogtimer_feed); +static MP_DEFINE_CONST_FUN_OBJ_1(watchdog_watchdogtimer_feed_obj, watchdog_watchdogtimer_feed); //| def deinit(self) -> None: //| """Stop the watchdog timer. @@ -56,23 +56,23 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(watchdog_watchdogtimer_feed_obj, watchdog_watch //| //| """ //| ... -STATIC mp_obj_t watchdog_watchdogtimer_deinit(mp_obj_t self_in) { +static mp_obj_t watchdog_watchdogtimer_deinit(mp_obj_t self_in) { watchdog_watchdogtimer_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_watchdog_deinit(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(watchdog_watchdogtimer_deinit_obj, watchdog_watchdogtimer_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(watchdog_watchdogtimer_deinit_obj, watchdog_watchdogtimer_deinit); //| timeout: float //| """The maximum number of seconds that can elapse between calls //| to `feed()`. Setting the timeout will also feed the watchdog.""" -STATIC mp_obj_t watchdog_watchdogtimer_obj_get_timeout(mp_obj_t self_in) { +static mp_obj_t watchdog_watchdogtimer_obj_get_timeout(mp_obj_t self_in) { watchdog_watchdogtimer_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_float(common_hal_watchdog_get_timeout(self)); } MP_DEFINE_CONST_FUN_OBJ_1(watchdog_watchdogtimer_get_timeout_obj, watchdog_watchdogtimer_obj_get_timeout); -STATIC mp_obj_t watchdog_watchdogtimer_obj_set_timeout(mp_obj_t self_in, mp_obj_t timeout_obj) { +static mp_obj_t watchdog_watchdogtimer_obj_set_timeout(mp_obj_t self_in, mp_obj_t timeout_obj) { watchdog_watchdogtimer_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_float_t timeout = mp_obj_get_float(timeout_obj); @@ -102,13 +102,13 @@ MP_PROPERTY_GETSET(watchdog_watchdogtimer_timeout_obj, //| //| Once set, the `WatchDogTimer` will perform the specified action if the timer expires.""" //| -STATIC mp_obj_t watchdog_watchdogtimer_obj_get_mode(mp_obj_t self_in) { +static mp_obj_t watchdog_watchdogtimer_obj_get_mode(mp_obj_t self_in) { watchdog_watchdogtimer_obj_t *self = MP_OBJ_TO_PTR(self_in); return cp_enum_find(&watchdog_watchdogmode_type, common_hal_watchdog_get_mode(self)); } MP_DEFINE_CONST_FUN_OBJ_1(watchdog_watchdogtimer_get_mode_obj, watchdog_watchdogtimer_obj_get_mode); -STATIC mp_obj_t watchdog_watchdogtimer_obj_set_mode(mp_obj_t self_in, mp_obj_t obj) { +static mp_obj_t watchdog_watchdogtimer_obj_set_mode(mp_obj_t self_in, mp_obj_t obj) { watchdog_watchdogtimer_obj_t *self = MP_OBJ_TO_PTR(self_in); watchdog_watchdogmode_t mode = (obj == mp_const_none) ? WATCHDOGMODE_NONE : cp_enum_value(&watchdog_watchdogmode_type, obj, MP_QSTR_mode); common_hal_watchdog_set_mode(self, mode); @@ -120,13 +120,13 @@ MP_PROPERTY_GETSET(watchdog_watchdogtimer_mode_obj, (mp_obj_t)&watchdog_watchdogtimer_get_mode_obj, (mp_obj_t)&watchdog_watchdogtimer_set_mode_obj); -STATIC const mp_rom_map_elem_t watchdog_watchdogtimer_locals_dict_table[] = { +static const mp_rom_map_elem_t watchdog_watchdogtimer_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_feed), MP_ROM_PTR(&watchdog_watchdogtimer_feed_obj) }, { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&watchdog_watchdogtimer_deinit_obj) }, { MP_ROM_QSTR(MP_QSTR_timeout), MP_ROM_PTR(&watchdog_watchdogtimer_timeout_obj) }, { MP_ROM_QSTR(MP_QSTR_mode), MP_ROM_PTR(&watchdog_watchdogtimer_mode_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(watchdog_watchdogtimer_locals_dict, watchdog_watchdogtimer_locals_dict_table); +static MP_DEFINE_CONST_DICT(watchdog_watchdogtimer_locals_dict, watchdog_watchdogtimer_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( watchdog_watchdogtimer_type, diff --git a/shared-bindings/watchdog/__init__.c b/shared-bindings/watchdog/__init__.c index a5d6a40c9e105..4e338844a0a18 100644 --- a/shared-bindings/watchdog/__init__.c +++ b/shared-bindings/watchdog/__init__.c @@ -74,13 +74,13 @@ mp_obj_exception_t mp_watchdog_timeout_exception = { .traceback = (mp_obj_traceback_t *)&mp_const_empty_traceback_obj, }; -STATIC const mp_rom_map_elem_t watchdog_module_globals_table[] = { +static const mp_rom_map_elem_t watchdog_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_watchdog) }, { MP_ROM_QSTR(MP_QSTR_WatchDogMode), MP_ROM_PTR(&watchdog_watchdogmode_type) }, { MP_ROM_QSTR(MP_QSTR_WatchDogTimeout), MP_ROM_PTR(&mp_type_WatchDogTimeout) }, }; -STATIC MP_DEFINE_CONST_DICT(watchdog_module_globals, watchdog_module_globals_table); +static MP_DEFINE_CONST_DICT(watchdog_module_globals, watchdog_module_globals_table); const mp_obj_module_t watchdog_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/wifi/AuthMode.c b/shared-bindings/wifi/AuthMode.c index 422bbd10ecdfc..c2c653727d6f5 100644 --- a/shared-bindings/wifi/AuthMode.c +++ b/shared-bindings/wifi/AuthMode.c @@ -49,7 +49,7 @@ MAKE_ENUM_MAP(wifi_authmode) { MAKE_ENUM_MAP_ENTRY(authmode, PSK), MAKE_ENUM_MAP_ENTRY(authmode, ENTERPRISE), }; -STATIC MP_DEFINE_CONST_DICT(wifi_authmode_locals_dict, wifi_authmode_locals_table); +static MP_DEFINE_CONST_DICT(wifi_authmode_locals_dict, wifi_authmode_locals_table); MAKE_PRINTER(wifi, wifi_authmode); diff --git a/shared-bindings/wifi/Monitor.c b/shared-bindings/wifi/Monitor.c index dfacaed4f54fa..a2e91dca4b4ac 100644 --- a/shared-bindings/wifi/Monitor.c +++ b/shared-bindings/wifi/Monitor.c @@ -24,7 +24,7 @@ //| //| """ //| ... -STATIC mp_obj_t wifi_monitor_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { +static mp_obj_t wifi_monitor_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { enum { ARG_channel, ARG_queue }; static const mp_arg_t allowed_args[] = { { MP_QSTR_channel, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 1} }, @@ -49,12 +49,12 @@ STATIC mp_obj_t wifi_monitor_make_new(const mp_obj_type_t *type, size_t n_args, //| channel: int //| """The WiFi channel to scan.""" -STATIC mp_obj_t wifi_monitor_obj_get_channel(mp_obj_t self_in) { +static mp_obj_t wifi_monitor_obj_get_channel(mp_obj_t self_in) { return common_hal_wifi_monitor_get_channel(self_in); } MP_DEFINE_CONST_FUN_OBJ_1(wifi_monitor_get_channel_obj, wifi_monitor_obj_get_channel); -STATIC mp_obj_t wifi_monitor_obj_set_channel(mp_obj_t self_in, mp_obj_t channel) { +static mp_obj_t wifi_monitor_obj_set_channel(mp_obj_t self_in, mp_obj_t channel) { mp_int_t c = mp_obj_get_int(channel); if (c < 1 || c > 13) { mp_raise_ValueError_varg(MP_ERROR_TEXT("%q out of bounds"), MP_QSTR_channel); @@ -70,7 +70,7 @@ MP_PROPERTY_GETSET(wifi_monitor_channel_obj, //| queue: int //| """The queue size for buffering the packet.""" -STATIC mp_obj_t wifi_monitor_obj_get_queue(mp_obj_t self_in) { +static mp_obj_t wifi_monitor_obj_get_queue(mp_obj_t self_in) { return common_hal_wifi_monitor_get_queue(self_in); } MP_DEFINE_CONST_FUN_OBJ_1(wifi_monitor_get_queue_obj, wifi_monitor_obj_get_queue); @@ -81,16 +81,16 @@ MP_PROPERTY_GETTER(wifi_monitor_queue_obj, //| def deinit(self) -> None: //| """De-initialize `wifi.Monitor` singleton.""" //| ... -STATIC mp_obj_t wifi_monitor_obj_deinit(mp_obj_t self_in) { +static mp_obj_t wifi_monitor_obj_deinit(mp_obj_t self_in) { common_hal_wifi_monitor_deinit(self_in); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(wifi_monitor_deinit_obj, wifi_monitor_obj_deinit); +static MP_DEFINE_CONST_FUN_OBJ_1(wifi_monitor_deinit_obj, wifi_monitor_obj_deinit); //| def lost(self) -> int: //| """Returns the packet loss count. The counter resets after each poll.""" //| ... -STATIC mp_obj_t wifi_monitor_obj_get_lost(mp_obj_t self_in) { +static mp_obj_t wifi_monitor_obj_get_lost(mp_obj_t self_in) { return common_hal_wifi_monitor_get_lost(self_in); } MP_DEFINE_CONST_FUN_OBJ_1(wifi_monitor_lost_obj, wifi_monitor_obj_get_lost); @@ -98,7 +98,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_monitor_lost_obj, wifi_monitor_obj_get_lost); //| def queued(self) -> int: //| """Returns the packet queued count.""" //| ... -STATIC mp_obj_t wifi_monitor_obj_get_queued(mp_obj_t self_in) { +static mp_obj_t wifi_monitor_obj_get_queued(mp_obj_t self_in) { if (common_hal_wifi_monitor_deinited()) { return mp_obj_new_int_from_uint(0); } @@ -110,7 +110,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_monitor_queued_obj, wifi_monitor_obj_get_queued); //| """Returns the monitor packet.""" //| ... //| -STATIC mp_obj_t wifi_monitor_obj_get_packet(mp_obj_t self_in) { +static mp_obj_t wifi_monitor_obj_get_packet(mp_obj_t self_in) { if (common_hal_wifi_monitor_deinited()) { raise_deinited_error(); } @@ -118,7 +118,7 @@ STATIC mp_obj_t wifi_monitor_obj_get_packet(mp_obj_t self_in) { } MP_DEFINE_CONST_FUN_OBJ_1(wifi_monitor_packet_obj, wifi_monitor_obj_get_packet); -STATIC const mp_rom_map_elem_t wifi_monitor_locals_dict_table[] = { +static const mp_rom_map_elem_t wifi_monitor_locals_dict_table[] = { // properties { MP_ROM_QSTR(MP_QSTR_channel), MP_ROM_PTR(&wifi_monitor_channel_obj) }, { MP_ROM_QSTR(MP_QSTR_queue), MP_ROM_PTR(&wifi_monitor_queue_obj) }, @@ -129,7 +129,7 @@ STATIC const mp_rom_map_elem_t wifi_monitor_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_queued), MP_ROM_PTR(&wifi_monitor_queued_obj) }, { MP_ROM_QSTR(MP_QSTR_packet), MP_ROM_PTR(&wifi_monitor_packet_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(wifi_monitor_locals_dict, wifi_monitor_locals_dict_table); +static MP_DEFINE_CONST_DICT(wifi_monitor_locals_dict, wifi_monitor_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( wifi_monitor_type, diff --git a/shared-bindings/wifi/Network.c b/shared-bindings/wifi/Network.c index 195757f538938..3b9c0b6116c1b 100644 --- a/shared-bindings/wifi/Network.c +++ b/shared-bindings/wifi/Network.c @@ -20,7 +20,7 @@ //| ssid: str //| """String id of the network""" -STATIC mp_obj_t wifi_network_get_ssid(mp_obj_t self) { +static mp_obj_t wifi_network_get_ssid(mp_obj_t self) { return common_hal_wifi_network_get_ssid(self); } @@ -32,7 +32,7 @@ MP_PROPERTY_GETTER(wifi_network_ssid_obj, //| bssid: bytes //| """BSSID of the network (usually the AP's MAC address)""" -STATIC mp_obj_t wifi_network_get_bssid(mp_obj_t self) { +static mp_obj_t wifi_network_get_bssid(mp_obj_t self) { return common_hal_wifi_network_get_bssid(self); } @@ -44,7 +44,7 @@ MP_PROPERTY_GETTER(wifi_network_bssid_obj, //| rssi: int //| """Signal strength of the network""" -STATIC mp_obj_t wifi_network_get_rssi(mp_obj_t self) { +static mp_obj_t wifi_network_get_rssi(mp_obj_t self) { return common_hal_wifi_network_get_rssi(self); } @@ -56,7 +56,7 @@ MP_PROPERTY_GETTER(wifi_network_rssi_obj, //| channel: int //| """Channel number the network is operating on""" -STATIC mp_obj_t wifi_network_get_channel(mp_obj_t self) { +static mp_obj_t wifi_network_get_channel(mp_obj_t self) { return common_hal_wifi_network_get_channel(self); } @@ -67,7 +67,7 @@ MP_PROPERTY_GETTER(wifi_network_channel_obj, //| country: str //| """String id of the country code""" -STATIC mp_obj_t wifi_network_get_country(mp_obj_t self) { +static mp_obj_t wifi_network_get_country(mp_obj_t self) { return common_hal_wifi_network_get_country(self); } @@ -79,7 +79,7 @@ MP_PROPERTY_GETTER(wifi_network_country_obj, //| authmode: str //| """String id of the authmode""" //| -STATIC mp_obj_t wifi_network_get_authmode(mp_obj_t self) { +static mp_obj_t wifi_network_get_authmode(mp_obj_t self) { return common_hal_wifi_network_get_authmode(self); } @@ -88,7 +88,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_network_get_authmode_obj, wifi_network_get_authmo MP_PROPERTY_GETTER(wifi_network_authmode_obj, (mp_obj_t)&wifi_network_get_authmode_obj); -STATIC const mp_rom_map_elem_t wifi_network_locals_dict_table[] = { +static const mp_rom_map_elem_t wifi_network_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_ssid), MP_ROM_PTR(&wifi_network_ssid_obj) }, { MP_ROM_QSTR(MP_QSTR_bssid), MP_ROM_PTR(&wifi_network_bssid_obj) }, { MP_ROM_QSTR(MP_QSTR_rssi), MP_ROM_PTR(&wifi_network_rssi_obj) }, @@ -97,7 +97,7 @@ STATIC const mp_rom_map_elem_t wifi_network_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_authmode), MP_ROM_PTR(&wifi_network_authmode_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(wifi_network_locals_dict, wifi_network_locals_dict_table); +static MP_DEFINE_CONST_DICT(wifi_network_locals_dict, wifi_network_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( wifi_network_type, diff --git a/shared-bindings/wifi/Packet.c b/shared-bindings/wifi/Packet.c index df383f13f76d7..9d7befa7a8aaf 100644 --- a/shared-bindings/wifi/Packet.c +++ b/shared-bindings/wifi/Packet.c @@ -34,7 +34,7 @@ MAKE_ENUM_MAP(wifi_packet) { MAKE_ENUM_MAP_ENTRY(packet, RAW), MAKE_ENUM_MAP_ENTRY(packet, RSSI), }; -STATIC MP_DEFINE_CONST_DICT(wifi_packet_locals_dict, wifi_packet_locals_table); +static MP_DEFINE_CONST_DICT(wifi_packet_locals_dict, wifi_packet_locals_table); MAKE_PRINTER(wifi, wifi_packet); diff --git a/shared-bindings/wifi/Radio.c b/shared-bindings/wifi/Radio.c index c58d09e42e362..3dcea68a20b2f 100644 --- a/shared-bindings/wifi/Radio.c +++ b/shared-bindings/wifi/Radio.c @@ -15,7 +15,7 @@ #define MAC_ADDRESS_LENGTH 6 -STATIC bool hostname_valid(const char *ptr, size_t len) { +static bool hostname_valid(const char *ptr, size_t len) { #if 0 // validated by mp_arg_validate_length_range if (len == 0 || len > 253) { // at most 253 characters long @@ -51,7 +51,7 @@ STATIC bool hostname_valid(const char *ptr, size_t len) { return !(partlen > 63); } -STATIC void validate_hex_password(const uint8_t *buf, size_t len) { +static void validate_hex_password(const uint8_t *buf, size_t len) { for (size_t i = 0; i < len; i++) { if (!unichar_isxdigit(buf[i])) { mp_raise_ValueError_varg(MP_ERROR_TEXT("Invalid hex password")); @@ -78,7 +78,7 @@ STATIC void validate_hex_password(const uint8_t *buf, size_t len) { //| """``True`` when the wifi radio is enabled. //| If you set the value to ``False``, any open sockets will be closed. //| """ -STATIC mp_obj_t wifi_radio_get_enabled(mp_obj_t self) { +static mp_obj_t wifi_radio_get_enabled(mp_obj_t self) { return mp_obj_new_bool(common_hal_wifi_radio_get_enabled(self)); } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_enabled_obj, wifi_radio_get_enabled); @@ -90,7 +90,7 @@ static mp_obj_t wifi_radio_set_enabled(mp_obj_t self, mp_obj_t value) { return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(wifi_radio_set_enabled_obj, wifi_radio_set_enabled); +static MP_DEFINE_CONST_FUN_OBJ_2(wifi_radio_set_enabled_obj, wifi_radio_set_enabled); MP_PROPERTY_GETSET(wifi_radio_enabled_obj, (mp_obj_t)&wifi_radio_get_enabled_obj, @@ -99,13 +99,13 @@ MP_PROPERTY_GETSET(wifi_radio_enabled_obj, //| hostname: Union[str | ReadableBuffer] //| """Hostname for wifi interface. When the hostname is altered after interface started/connected //| the changes would only be reflected once the interface restarts/reconnects.""" -STATIC mp_obj_t wifi_radio_get_hostname(mp_obj_t self_in) { +static mp_obj_t wifi_radio_get_hostname(mp_obj_t self_in) { wifi_radio_obj_t *self = MP_OBJ_TO_PTR(self_in); return common_hal_wifi_radio_get_hostname(self); } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_hostname_obj, wifi_radio_get_hostname); -STATIC mp_obj_t wifi_radio_set_hostname(mp_obj_t self_in, mp_obj_t hostname_in) { +static mp_obj_t wifi_radio_set_hostname(mp_obj_t self_in, mp_obj_t hostname_in) { mp_buffer_info_t hostname; mp_get_buffer_raise(hostname_in, &hostname, MP_BUFFER_READ); @@ -134,14 +134,14 @@ MP_PROPERTY_GETSET(wifi_radio_hostname_obj, //| """ -STATIC mp_obj_t _wifi_radio_get_mac_address(mp_obj_t self_in) { +static mp_obj_t _wifi_radio_get_mac_address(mp_obj_t self_in) { wifi_radio_obj_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_FROM_PTR(common_hal_wifi_radio_get_mac_address(self)); } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_mac_address_obj, _wifi_radio_get_mac_address); #if CIRCUITPY_WIFI_RADIO_SETTABLE_MAC_ADDRESS -STATIC mp_obj_t wifi_radio_set_mac_address(mp_obj_t self_in, mp_obj_t mac_address_in) { +static mp_obj_t wifi_radio_set_mac_address(mp_obj_t self_in, mp_obj_t mac_address_in) { mp_buffer_info_t mac_address; mp_get_buffer_raise(mac_address_in, &mac_address, MP_BUFFER_READ); @@ -168,13 +168,13 @@ MP_PROPERTY_GETTER(wifi_radio_mac_address_obj, //| tx_power: float //| """Wifi transmission power, in dBm.""" -STATIC mp_obj_t wifi_radio_get_tx_power(mp_obj_t self_in) { +static mp_obj_t wifi_radio_get_tx_power(mp_obj_t self_in) { wifi_radio_obj_t *self = MP_OBJ_TO_PTR(self_in); return mp_obj_new_float(common_hal_wifi_radio_get_tx_power(self)); } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_tx_power_obj, wifi_radio_get_tx_power); -STATIC mp_obj_t wifi_radio_set_tx_power(mp_obj_t self_in, mp_obj_t tx_power_in) { +static mp_obj_t wifi_radio_set_tx_power(mp_obj_t self_in, mp_obj_t tx_power_in) { mp_float_t tx_power = mp_obj_get_float(tx_power_in); wifi_radio_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_wifi_radio_set_tx_power(self, tx_power); @@ -192,14 +192,14 @@ MP_PROPERTY_GETSET(wifi_radio_tx_power_obj, //| //| **Limitations:** Not settable on RP2040 CYW43 boards, such as Pi Pico W. //| """ -STATIC mp_obj_t wifi_radio_get_mac_address_ap(mp_obj_t self_in) { +static mp_obj_t wifi_radio_get_mac_address_ap(mp_obj_t self_in) { wifi_radio_obj_t *self = MP_OBJ_TO_PTR(self_in); return MP_OBJ_FROM_PTR(common_hal_wifi_radio_get_mac_address_ap(self)); } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_mac_address_ap_obj, wifi_radio_get_mac_address_ap); #if CIRCUITPY_WIFI_RADIO_SETTABLE_MAC_ADDRESS -STATIC mp_obj_t wifi_radio_set_mac_address_ap(mp_obj_t self_in, mp_obj_t mac_address_in) { +static mp_obj_t wifi_radio_set_mac_address_ap(mp_obj_t self_in, mp_obj_t mac_address_in) { mp_buffer_info_t mac_address; mp_get_buffer_raise(mac_address_in, &mac_address, MP_BUFFER_READ); @@ -234,7 +234,7 @@ MP_PROPERTY_GETTER(wifi_radio_mac_address_ap_obj, //| In the raspberrypi port (RP2040 CYW43), ``start_channel`` and ``stop_channel`` are ignored. //| """ //| ... -STATIC mp_obj_t wifi_radio_start_scanning_networks(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t wifi_radio_start_scanning_networks(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_start_channel, ARG_stop_channel }; static const mp_arg_t allowed_args[] = { { MP_QSTR_start_channel, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1} }, @@ -258,24 +258,24 @@ STATIC mp_obj_t wifi_radio_start_scanning_networks(size_t n_args, const mp_obj_t return common_hal_wifi_radio_start_scanning_networks(self, start_channel, stop_channel); } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_start_scanning_networks_obj, 1, wifi_radio_start_scanning_networks); +static MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_start_scanning_networks_obj, 1, wifi_radio_start_scanning_networks); //| def stop_scanning_networks(self) -> None: //| """Stop scanning for Wifi networks and free any resources used to do it.""" //| ... -STATIC mp_obj_t wifi_radio_stop_scanning_networks(mp_obj_t self_in) { +static mp_obj_t wifi_radio_stop_scanning_networks(mp_obj_t self_in) { wifi_radio_obj_t *self = MP_OBJ_TO_PTR(self_in); common_hal_wifi_radio_stop_scanning_networks(self); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_stop_scanning_networks_obj, wifi_radio_stop_scanning_networks); +static MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_stop_scanning_networks_obj, wifi_radio_stop_scanning_networks); //| def start_station(self) -> None: //| """Starts a Station.""" //| ... -STATIC mp_obj_t wifi_radio_start_station(mp_obj_t self) { +static mp_obj_t wifi_radio_start_station(mp_obj_t self) { common_hal_wifi_radio_start_station(self); return mp_const_none; } @@ -284,7 +284,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_start_station_obj, wifi_radio_start_station //| def stop_station(self) -> None: //| """Stops the Station.""" //| ... -STATIC mp_obj_t wifi_radio_stop_station(mp_obj_t self) { +static mp_obj_t wifi_radio_stop_station(mp_obj_t self) { common_hal_wifi_radio_stop_station(self); return mp_const_none; } @@ -327,7 +327,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_stop_station_obj, wifi_radio_stop_station); //| In the raspberrypi port (RP2040 CYW43), ``max_connections`` is ignored. //| """ //| ... -STATIC mp_obj_t wifi_radio_start_ap(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t wifi_radio_start_ap(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_ssid, ARG_password, ARG_channel, ARG_authmode, ARG_max_connections }; static const mp_arg_t allowed_args[] = { { MP_QSTR_ssid, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -379,12 +379,12 @@ STATIC mp_obj_t wifi_radio_start_ap(size_t n_args, const mp_obj_t *pos_args, mp_ common_hal_wifi_radio_start_ap(self, ssid.buf, ssid.len, password.buf, password.len, channel, authmode, args[ARG_max_connections].u_int); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_start_ap_obj, 1, wifi_radio_start_ap); +static MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_start_ap_obj, 1, wifi_radio_start_ap); //| def stop_ap(self) -> None: //| """Stops the access point.""" //| ... -STATIC mp_obj_t wifi_radio_stop_ap(mp_obj_t self) { +static mp_obj_t wifi_radio_stop_ap(mp_obj_t self) { common_hal_wifi_radio_stop_ap(self); return mp_const_none; } @@ -392,7 +392,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_stop_ap_obj, wifi_radio_stop_ap); //| ap_active: bool //| """True if running as an access point. (read-only)""" -STATIC mp_obj_t wifi_radio_get_ap_active(mp_obj_t self) { +static mp_obj_t wifi_radio_get_ap_active(mp_obj_t self) { return mp_obj_new_bool(common_hal_wifi_radio_get_ap_active(self)); } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ap_active_obj, wifi_radio_get_ap_active); @@ -425,7 +425,7 @@ MP_PROPERTY_GETTER(wifi_radio_ap_active_obj, //| If ``bssid`` is given and not None, the scan will start at the first channel or the one given and //| connect to the AP with the given ``bssid`` and ``ssid``.""" //| ... -STATIC mp_obj_t wifi_radio_connect(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t wifi_radio_connect(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_ssid, ARG_password, ARG_channel, ARG_bssid, ARG_timeout }; static const mp_arg_t allowed_args[] = { { MP_QSTR_ssid, MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -484,11 +484,11 @@ STATIC mp_obj_t wifi_radio_connect(size_t n_args, const mp_obj_t *pos_args, mp_m return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_connect_obj, 1, wifi_radio_connect); +static MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_connect_obj, 1, wifi_radio_connect); //| connected: bool //| """True if connected to an access point (read-only).""" -STATIC mp_obj_t wifi_radio_get_connected(mp_obj_t self) { +static mp_obj_t wifi_radio_get_connected(mp_obj_t self) { return mp_obj_new_bool(common_hal_wifi_radio_get_connected(self)); } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_connected_obj, wifi_radio_get_connected); @@ -498,7 +498,7 @@ MP_PROPERTY_GETTER(wifi_radio_connected_obj, //| ipv4_gateway: Optional[ipaddress.IPv4Address] //| """IP v4 Address of the station gateway when connected to an access point. None otherwise. (read-only)""" -STATIC mp_obj_t wifi_radio_get_ipv4_gateway(mp_obj_t self) { +static mp_obj_t wifi_radio_get_ipv4_gateway(mp_obj_t self) { return common_hal_wifi_radio_get_ipv4_gateway(self); } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_gateway_obj, wifi_radio_get_ipv4_gateway); @@ -508,7 +508,7 @@ MP_PROPERTY_GETTER(wifi_radio_ipv4_gateway_obj, //| ipv4_gateway_ap: Optional[ipaddress.IPv4Address] //| """IP v4 Address of the access point gateway, when enabled. None otherwise. (read-only)""" -STATIC mp_obj_t wifi_radio_get_ipv4_gateway_ap(mp_obj_t self) { +static mp_obj_t wifi_radio_get_ipv4_gateway_ap(mp_obj_t self) { return common_hal_wifi_radio_get_ipv4_gateway_ap(self); } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_gateway_ap_obj, wifi_radio_get_ipv4_gateway_ap); @@ -518,7 +518,7 @@ MP_PROPERTY_GETTER(wifi_radio_ipv4_gateway_ap_obj, //| ipv4_subnet: Optional[ipaddress.IPv4Address] //| """IP v4 Address of the station subnet when connected to an access point. None otherwise. (read-only)""" -STATIC mp_obj_t wifi_radio_get_ipv4_subnet(mp_obj_t self) { +static mp_obj_t wifi_radio_get_ipv4_subnet(mp_obj_t self) { return common_hal_wifi_radio_get_ipv4_subnet(self); } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_subnet_obj, wifi_radio_get_ipv4_subnet); @@ -528,7 +528,7 @@ MP_PROPERTY_GETTER(wifi_radio_ipv4_subnet_obj, //| ipv4_subnet_ap: Optional[ipaddress.IPv4Address] //| """IP v4 Address of the access point subnet, when enabled. None otherwise. (read-only)""" -STATIC mp_obj_t wifi_radio_get_ipv4_subnet_ap(mp_obj_t self) { +static mp_obj_t wifi_radio_get_ipv4_subnet_ap(mp_obj_t self) { return common_hal_wifi_radio_get_ipv4_subnet_ap(self); } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_subnet_ap_obj, wifi_radio_get_ipv4_subnet_ap); @@ -552,7 +552,7 @@ MP_PROPERTY_GETTER(wifi_radio_ipv4_subnet_ap_obj, //| In the raspberrypi port (RP2040 CYW43), the access point needs to be started before the IP v4 address can be set. //| """ //| ... -STATIC mp_obj_t wifi_radio_set_ipv4_address(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t wifi_radio_set_ipv4_address(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_ipv4, ARG_netmask, ARG_gateway, ARG_ipv4_dns }; static const mp_arg_t allowed_args[] = { { MP_QSTR_ipv4, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, }, @@ -568,7 +568,7 @@ STATIC mp_obj_t wifi_radio_set_ipv4_address(size_t n_args, const mp_obj_t *pos_a common_hal_wifi_radio_set_ipv4_address(self, args[ARG_ipv4].u_obj, args[ARG_netmask].u_obj, args[ARG_gateway].u_obj, args[ARG_ipv4_dns].u_obj); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_set_ipv4_address_obj, 1, wifi_radio_set_ipv4_address); +static MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_set_ipv4_address_obj, 1, wifi_radio_set_ipv4_address); //| def set_ipv4_address_ap( //| self, @@ -579,7 +579,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_set_ipv4_address_obj, 1, wifi_radio //| ) -> None: //| """Sets the IP v4 address of the access point. Must include the netmask and gateway.""" //| ... -STATIC mp_obj_t wifi_radio_set_ipv4_address_ap(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t wifi_radio_set_ipv4_address_ap(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_ipv4, ARG_netmask, ARG_gateway }; static const mp_arg_t allowed_args[] = { { MP_QSTR_ipv4, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, }, @@ -594,11 +594,11 @@ STATIC mp_obj_t wifi_radio_set_ipv4_address_ap(size_t n_args, const mp_obj_t *po common_hal_wifi_radio_set_ipv4_address_ap(self, args[ARG_ipv4].u_obj, args[ARG_netmask].u_obj, args[ARG_gateway].u_obj); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_set_ipv4_address_ap_obj, 1, wifi_radio_set_ipv4_address_ap); +static MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_set_ipv4_address_ap_obj, 1, wifi_radio_set_ipv4_address_ap); //| ipv4_address: Optional[ipaddress.IPv4Address] //| """IP v4 Address of the station when connected to an access point. None otherwise. (read-only)""" -STATIC mp_obj_t _wifi_radio_get_ipv4_address(mp_obj_t self) { +static mp_obj_t _wifi_radio_get_ipv4_address(mp_obj_t self) { return common_hal_wifi_radio_get_ipv4_address(self); } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_address_obj, _wifi_radio_get_ipv4_address); @@ -608,7 +608,7 @@ MP_PROPERTY_GETTER(wifi_radio_ipv4_address_obj, //| ipv4_address_ap: Optional[ipaddress.IPv4Address] //| """IP v4 Address of the access point, when enabled. None otherwise. (read-only)""" -STATIC mp_obj_t wifi_radio_get_ipv4_address_ap(mp_obj_t self) { +static mp_obj_t wifi_radio_get_ipv4_address_ap(mp_obj_t self) { return common_hal_wifi_radio_get_ipv4_address_ap(self); } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_address_ap_obj, wifi_radio_get_ipv4_address_ap); @@ -618,12 +618,12 @@ MP_PROPERTY_GETTER(wifi_radio_ipv4_address_ap_obj, //| ipv4_dns: ipaddress.IPv4Address //| """IP v4 Address of the DNS server to be used.""" -STATIC mp_obj_t wifi_radio_get_ipv4_dns(mp_obj_t self) { +static mp_obj_t wifi_radio_get_ipv4_dns(mp_obj_t self) { return common_hal_wifi_radio_get_ipv4_dns(self); } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ipv4_dns_obj, wifi_radio_get_ipv4_dns); -STATIC mp_obj_t wifi_radio_set_ipv4_dns(mp_obj_t self, mp_obj_t ipv4_dns_addr) { +static mp_obj_t wifi_radio_set_ipv4_dns(mp_obj_t self, mp_obj_t ipv4_dns_addr) { common_hal_wifi_radio_set_ipv4_dns(self, ipv4_dns_addr); return mp_const_none; @@ -636,7 +636,7 @@ MP_PROPERTY_GETSET(wifi_radio_ipv4_dns_obj, //| ap_info: Optional[Network] //| """Network object containing BSSID, SSID, authmode, channel, country and RSSI when connected to an access point. None otherwise.""" -STATIC mp_obj_t wifi_radio_get_ap_info(mp_obj_t self) { +static mp_obj_t wifi_radio_get_ap_info(mp_obj_t self) { return common_hal_wifi_radio_get_ap_info(self); } MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ap_info_obj, wifi_radio_get_ap_info); @@ -646,7 +646,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_ap_info_obj, wifi_radio_get_ap_info); //| mac: bytearray (read-only) //| rssi: int (read-only, None on Raspberry Pi Pico W) //| ipv4_address: ipv4_address (read-only, None if station connected but no address assigned yet or self-assigned address)""" -STATIC mp_obj_t wifi_radio_get_stations_ap(mp_obj_t self) { +static mp_obj_t wifi_radio_get_stations_ap(mp_obj_t self) { return common_hal_wifi_radio_get_stations_ap(self); } @@ -658,7 +658,7 @@ MP_PROPERTY_GETTER(wifi_radio_stations_ap_obj, //| def start_dhcp(self) -> None: //| """Starts the station DHCP client.""" //| ... -STATIC mp_obj_t wifi_radio_start_dhcp_client(mp_obj_t self) { +static mp_obj_t wifi_radio_start_dhcp_client(mp_obj_t self) { common_hal_wifi_radio_start_dhcp_client(self); return mp_const_none; } @@ -667,7 +667,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_start_dhcp_client_obj, wifi_radio_start_dhc //| def stop_dhcp(self) -> None: //| """Stops the station DHCP client. Needed to assign a static IP address.""" //| ... -STATIC mp_obj_t wifi_radio_stop_dhcp_client(mp_obj_t self) { +static mp_obj_t wifi_radio_stop_dhcp_client(mp_obj_t self) { common_hal_wifi_radio_stop_dhcp_client(self); return mp_const_none; } @@ -676,7 +676,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_stop_dhcp_client_obj, wifi_radio_stop_dhcp_ //| def start_dhcp_ap(self) -> None: //| """Starts the access point DHCP server.""" //| ... -STATIC mp_obj_t wifi_radio_start_dhcp_server(mp_obj_t self) { +static mp_obj_t wifi_radio_start_dhcp_server(mp_obj_t self) { common_hal_wifi_radio_start_dhcp_server(self); return mp_const_none; } @@ -685,7 +685,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_start_dhcp_server_obj, wifi_radio_start_dhc //| def stop_dhcp_ap(self) -> None: //| """Stops the access point DHCP server. Needed to assign a static IP address.""" //| ... -STATIC mp_obj_t wifi_radio_stop_dhcp_server(mp_obj_t self) { +static mp_obj_t wifi_radio_stop_dhcp_server(mp_obj_t self) { common_hal_wifi_radio_stop_dhcp_server(self); return mp_const_none; } @@ -701,7 +701,7 @@ MP_PROPERTY_GETTER(wifi_radio_ap_info_obj, //| Returns None when it times out.""" //| ... //| -STATIC mp_obj_t wifi_radio_ping(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { +static mp_obj_t wifi_radio_ping(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { enum { ARG_ip, ARG_timeout }; static const mp_arg_t allowed_args[] = { { MP_QSTR_ip, MP_ARG_REQUIRED | MP_ARG_OBJ, }, @@ -724,9 +724,9 @@ STATIC mp_obj_t wifi_radio_ping(size_t n_args, const mp_obj_t *pos_args, mp_map_ return mp_obj_new_float(time_ms / 1000.0); } -STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_ping_obj, 1, wifi_radio_ping); +static MP_DEFINE_CONST_FUN_OBJ_KW(wifi_radio_ping_obj, 1, wifi_radio_ping); -STATIC const mp_rom_map_elem_t wifi_radio_locals_dict_table[] = { +static const mp_rom_map_elem_t wifi_radio_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_enabled), MP_ROM_PTR(&wifi_radio_enabled_obj) }, { MP_ROM_QSTR(MP_QSTR_hostname), MP_ROM_PTR(&wifi_radio_hostname_obj) }, @@ -770,7 +770,7 @@ STATIC const mp_rom_map_elem_t wifi_radio_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_ping), MP_ROM_PTR(&wifi_radio_ping_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(wifi_radio_locals_dict, wifi_radio_locals_dict_table); +static MP_DEFINE_CONST_DICT(wifi_radio_locals_dict, wifi_radio_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( wifi_radio_type, diff --git a/shared-bindings/wifi/ScannedNetworks.c b/shared-bindings/wifi/ScannedNetworks.c index 5b44d466ccd32..dea3474d423e1 100644 --- a/shared-bindings/wifi/ScannedNetworks.c +++ b/shared-bindings/wifi/ScannedNetworks.c @@ -16,7 +16,7 @@ //| """Iterates over all `wifi.Network` objects found while scanning. This object is always created //| by a `wifi.Radio`: it has no user-visible constructor.""" //| -STATIC mp_obj_t scannednetworks_iternext(mp_obj_t self_in) { +static mp_obj_t scannednetworks_iternext(mp_obj_t self_in) { mp_check_self(mp_obj_is_type(self_in, &wifi_scannednetworks_type)); wifi_scannednetworks_obj_t *self = MP_OBJ_TO_PTR(self_in); mp_obj_t network = common_hal_wifi_scannednetworks_next(self); diff --git a/shared-bindings/wifi/__init__.c b/shared-bindings/wifi/__init__.c index 0bd9e8c7b64a9..988b07147c2d2 100644 --- a/shared-bindings/wifi/__init__.c +++ b/shared-bindings/wifi/__init__.c @@ -20,13 +20,13 @@ //| This object is the sole instance of `wifi.Radio`.""" // Called when wifi is imported. -STATIC mp_obj_t wifi___init__(void) { +static mp_obj_t wifi___init__(void) { common_hal_wifi_init(true); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_0(wifi___init___obj, wifi___init__); +static MP_DEFINE_CONST_FUN_OBJ_0(wifi___init___obj, wifi___init__); -STATIC const mp_rom_map_elem_t wifi_module_globals_table[] = { +static const mp_rom_map_elem_t wifi_module_globals_table[] = { // Name { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_wifi) }, @@ -44,7 +44,7 @@ STATIC const mp_rom_map_elem_t wifi_module_globals_table[] = { // Properties { MP_ROM_QSTR(MP_QSTR_radio), MP_ROM_PTR(&common_hal_wifi_radio_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(wifi_module_globals, wifi_module_globals_table); +static MP_DEFINE_CONST_DICT(wifi_module_globals, wifi_module_globals_table); const mp_obj_module_t wifi_module = { .base = { &mp_type_module }, diff --git a/shared-bindings/zlib/__init__.c b/shared-bindings/zlib/__init__.c index 237c68f3b7627..f9db723c4fc3c 100644 --- a/shared-bindings/zlib/__init__.c +++ b/shared-bindings/zlib/__init__.c @@ -48,7 +48,7 @@ //| """ //| ... //| -STATIC mp_obj_t zlib_decompress(size_t n_args, const mp_obj_t *args) { +static mp_obj_t zlib_decompress(size_t n_args, const mp_obj_t *args) { mp_int_t wbits = 0; if (n_args > 1) { wbits = MP_OBJ_SMALL_INT_VALUE(args[1]); @@ -56,14 +56,14 @@ STATIC mp_obj_t zlib_decompress(size_t n_args, const mp_obj_t *args) { return common_hal_zlib_decompress(args[0], wbits); } -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(zlib_decompress_obj, 1, 3, zlib_decompress); +static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(zlib_decompress_obj, 1, 3, zlib_decompress); -STATIC const mp_rom_map_elem_t zlib_globals_table[] = { +static const mp_rom_map_elem_t zlib_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_zlib) }, { MP_ROM_QSTR(MP_QSTR_decompress), MP_ROM_PTR(&zlib_decompress_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(zlib_globals, zlib_globals_table); +static MP_DEFINE_CONST_DICT(zlib_globals, zlib_globals_table); const mp_obj_module_t zlib_module = { .base = { &mp_type_module }, diff --git a/shared-module/_eve/__init__.c b/shared-module/_eve/__init__.c index c2d81ce76aa1b..881528ca0da0e 100644 --- a/shared-module/_eve/__init__.c +++ b/shared-module/_eve/__init__.c @@ -10,7 +10,7 @@ #include "shared-bindings/_eve/__init__.h" #include "shared-module/_eve/__init__.h" -STATIC void write(common_hal__eve_t *eve, size_t len, void *buf) { +static void write(common_hal__eve_t *eve, size_t len, void *buf) { eve->dest[2] = mp_obj_new_bytearray_by_ref(len, buf); mp_call_method_n_kw(1, 0, eve->dest); } diff --git a/shared-module/adafruit_pixelbuf/PixelBuf.c b/shared-module/adafruit_pixelbuf/PixelBuf.c index 8f5aa434ccd25..0eb1afe9adb1c 100644 --- a/shared-module/adafruit_pixelbuf/PixelBuf.c +++ b/shared-module/adafruit_pixelbuf/PixelBuf.c @@ -120,7 +120,7 @@ void common_hal_adafruit_pixelbuf_pixelbuf_set_brightness(mp_obj_t self_in, mp_f } } -STATIC uint8_t _pixelbuf_get_as_uint8(mp_obj_t obj) { +static uint8_t _pixelbuf_get_as_uint8(mp_obj_t obj) { if (mp_obj_is_small_int(obj)) { return MP_OBJ_SMALL_INT_VALUE(obj); #if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE @@ -224,7 +224,7 @@ void common_hal_adafruit_pixelbuf_pixelbuf_set_pixel_color(mp_obj_t self_in, siz pixelbuf_set_pixel_color(self, index, r, g, b, w); } -STATIC void _pixelbuf_set_pixel(pixelbuf_pixelbuf_obj_t *self, size_t index, mp_obj_t value) { +static void _pixelbuf_set_pixel(pixelbuf_pixelbuf_obj_t *self, size_t index, mp_obj_t value) { uint8_t r; uint8_t g; uint8_t b; diff --git a/shared-module/audiomp3/MP3Decoder.c b/shared-module/audiomp3/MP3Decoder.c index 70ee318fd9651..d42e0477dafed 100644 --- a/shared-module/audiomp3/MP3Decoder.c +++ b/shared-module/audiomp3/MP3Decoder.c @@ -30,7 +30,7 @@ * * Sets self->eof if any read of the file returns 0 bytes */ -STATIC bool mp3file_update_inbuf_always(audiomp3_mp3file_obj_t *self) { +static bool mp3file_update_inbuf_always(audiomp3_mp3file_obj_t *self) { // If we didn't previously reach the end of file, we can try reading now if (!self->eof && self->inbuf_offset != 0) { @@ -69,7 +69,7 @@ STATIC bool mp3file_update_inbuf_always(audiomp3_mp3file_obj_t *self) { * This variant is introduced so that at the site of the * add_background_callback_core call, the prototype matches. */ -STATIC void mp3file_update_inbuf_cb(void *self) { +static void mp3file_update_inbuf_cb(void *self) { mp3file_update_inbuf_always(self); } @@ -77,7 +77,7 @@ STATIC void mp3file_update_inbuf_cb(void *self) { * * Returns the same as mp3file_update_inbuf_always. */ -STATIC bool mp3file_update_inbuf_half(audiomp3_mp3file_obj_t *self) { +static bool mp3file_update_inbuf_half(audiomp3_mp3file_obj_t *self) { // If buffer is over half full, do nothing if (self->inbuf_offset < self->inbuf_length / 2) { return true; @@ -92,7 +92,7 @@ STATIC bool mp3file_update_inbuf_half(audiomp3_mp3file_obj_t *self) { // http://id3.org/d3v2.3.0 // http://id3.org/id3v2.3.0 -STATIC void mp3file_skip_id3v2(audiomp3_mp3file_obj_t *self) { +static void mp3file_skip_id3v2(audiomp3_mp3file_obj_t *self) { mp3file_update_inbuf_half(self); if (BYTES_LEFT(self) < 10) { return; @@ -126,7 +126,7 @@ STATIC void mp3file_skip_id3v2(audiomp3_mp3file_obj_t *self) { /* If a sync word can be found, advance to it and return true. Otherwise, * return false. */ -STATIC bool mp3file_find_sync_word(audiomp3_mp3file_obj_t *self) { +static bool mp3file_find_sync_word(audiomp3_mp3file_obj_t *self) { do { mp3file_update_inbuf_half(self); int offset = MP3FindSyncWord(READ_PTR(self), BYTES_LEFT(self)); @@ -140,7 +140,7 @@ STATIC bool mp3file_find_sync_word(audiomp3_mp3file_obj_t *self) { return false; } -STATIC bool mp3file_get_next_frame_info(audiomp3_mp3file_obj_t *self, MP3FrameInfo *fi) { +static bool mp3file_get_next_frame_info(audiomp3_mp3file_obj_t *self, MP3FrameInfo *fi) { int err; do { err = MP3GetNextFrameInfo(self->decoder, fi, READ_PTR(self)); diff --git a/shared-module/bitbangio/I2C.c b/shared-module/bitbangio/I2C.c index 0b062608203a6..0089bdc1e1e1e 100644 --- a/shared-module/bitbangio/I2C.c +++ b/shared-module/bitbangio/I2C.c @@ -13,17 +13,17 @@ #include "shared-bindings/microcontroller/__init__.h" #include "shared-bindings/digitalio/DigitalInOut.h" -STATIC void delay(bitbangio_i2c_obj_t *self) { +static void delay(bitbangio_i2c_obj_t *self) { // We need to use an accurate delay to get acceptable I2C // speeds (eg 1us should be not much more than 1us). common_hal_mcu_delay_us(self->us_delay); } -STATIC void scl_low(bitbangio_i2c_obj_t *self) { +static void scl_low(bitbangio_i2c_obj_t *self) { common_hal_digitalio_digitalinout_set_value(&self->scl, false); } -STATIC void scl_release(bitbangio_i2c_obj_t *self) { +static void scl_release(bitbangio_i2c_obj_t *self) { common_hal_digitalio_digitalinout_set_value(&self->scl, true); uint32_t count = self->us_timeout; delay(self); @@ -39,22 +39,22 @@ STATIC void scl_release(bitbangio_i2c_obj_t *self) { } } -STATIC void sda_low(bitbangio_i2c_obj_t *self) { +static void sda_low(bitbangio_i2c_obj_t *self) { common_hal_digitalio_digitalinout_set_value(&self->sda, false); } -STATIC void sda_release(bitbangio_i2c_obj_t *self) { +static void sda_release(bitbangio_i2c_obj_t *self) { common_hal_digitalio_digitalinout_set_value(&self->sda, true); } -STATIC bool sda_read(bitbangio_i2c_obj_t *self) { +static bool sda_read(bitbangio_i2c_obj_t *self) { common_hal_digitalio_digitalinout_switch_to_input(&self->sda, PULL_UP); bool value = common_hal_digitalio_digitalinout_get_value(&self->sda); common_hal_digitalio_digitalinout_switch_to_output(&self->sda, true, DRIVE_MODE_OPEN_DRAIN); return value; } -STATIC void start(bitbangio_i2c_obj_t *self) { +static void start(bitbangio_i2c_obj_t *self) { sda_release(self); delay(self); scl_release(self); @@ -62,7 +62,7 @@ STATIC void start(bitbangio_i2c_obj_t *self) { delay(self); } -STATIC void stop(bitbangio_i2c_obj_t *self) { +static void stop(bitbangio_i2c_obj_t *self) { delay(self); sda_low(self); delay(self); @@ -71,7 +71,7 @@ STATIC void stop(bitbangio_i2c_obj_t *self) { delay(self); } -STATIC int write_byte(bitbangio_i2c_obj_t *self, uint8_t val) { +static int write_byte(bitbangio_i2c_obj_t *self, uint8_t val) { delay(self); scl_low(self); @@ -97,7 +97,7 @@ STATIC int write_byte(bitbangio_i2c_obj_t *self, uint8_t val) { return !ret; } -STATIC bool read_byte(bitbangio_i2c_obj_t *self, uint8_t *val, bool ack) { +static bool read_byte(bitbangio_i2c_obj_t *self, uint8_t *val, bool ack) { delay(self); scl_low(self); delay(self); diff --git a/shared-module/bitmaptools/__init__.c b/shared-module/bitmaptools/__init__.c index df329aacf1c29..8a41e387e513a 100644 --- a/shared-module/bitmaptools/__init__.c +++ b/shared-module/bitmaptools/__init__.c @@ -372,7 +372,7 @@ void common_hal_bitmaptools_boundary_fill(displayio_bitmap_t *destination, } -STATIC void draw_line(displayio_bitmap_t *destination, +static void draw_line(displayio_bitmap_t *destination, int16_t x0, int16_t y0, int16_t x1, int16_t y1, uint32_t value) { @@ -484,7 +484,7 @@ void common_hal_bitmaptools_draw_line(displayio_bitmap_t *destination, draw_line(destination, x0, y0, x1, y1, value); } -STATIC int32_t ith(void *data, size_t i, int element_size) { +static int32_t ith(void *data, size_t i, int element_size) { switch (element_size) { default: case 1: @@ -685,7 +685,7 @@ enum { SWAP_RB = 1 << 1, }; -STATIC void fill_row(displayio_bitmap_t *bitmap, int swap, int16_t *luminance_data, int y, int mx) { +static void fill_row(displayio_bitmap_t *bitmap, int swap, int16_t *luminance_data, int y, int mx) { if (y >= bitmap->height) { return; } @@ -973,7 +973,7 @@ void common_hal_bitmaptools_alphablend(displayio_bitmap_t *dest, displayio_bitma } } -STATIC void draw_circle(displayio_bitmap_t *destination, +static void draw_circle(displayio_bitmap_t *destination, int16_t x, int16_t y, int16_t radius, uint32_t value) { diff --git a/shared-module/busdisplay/BusDisplay.c b/shared-module/busdisplay/BusDisplay.c index 603ade26f8336..001f2f20c03e3 100644 --- a/shared-module/busdisplay/BusDisplay.c +++ b/shared-module/busdisplay/BusDisplay.c @@ -196,7 +196,7 @@ mp_obj_t common_hal_busdisplay_busdisplay_get_root_group(busdisplay_busdisplay_o return self->core.current_group; } -STATIC const displayio_area_t *_get_refresh_areas(busdisplay_busdisplay_obj_t *self) { +static const displayio_area_t *_get_refresh_areas(busdisplay_busdisplay_obj_t *self) { if (self->core.full_refresh) { self->core.area.next = NULL; return &self->core.area; @@ -206,14 +206,14 @@ STATIC const displayio_area_t *_get_refresh_areas(busdisplay_busdisplay_obj_t *s return NULL; } -STATIC void _send_pixels(busdisplay_busdisplay_obj_t *self, uint8_t *pixels, uint32_t length) { +static void _send_pixels(busdisplay_busdisplay_obj_t *self, uint8_t *pixels, uint32_t length) { if (!self->bus.data_as_commands) { self->bus.send(self->bus.bus, DISPLAY_COMMAND, CHIP_SELECT_TOGGLE_EVERY_BYTE, &self->write_ram_command, 1); } self->bus.send(self->bus.bus, DISPLAY_DATA, CHIP_SELECT_UNTOUCHED, pixels, length); } -STATIC bool _refresh_area(busdisplay_busdisplay_obj_t *self, const displayio_area_t *area) { +static bool _refresh_area(busdisplay_busdisplay_obj_t *self, const displayio_area_t *area) { uint16_t buffer_size = 128; // In uint32_ts displayio_area_t clipped; @@ -305,7 +305,7 @@ STATIC bool _refresh_area(busdisplay_busdisplay_obj_t *self, const displayio_are return true; } -STATIC void _refresh_display(busdisplay_busdisplay_obj_t *self) { +static void _refresh_display(busdisplay_busdisplay_obj_t *self) { if (!displayio_display_bus_is_free(&self->bus)) { // A refresh on this bus is already in progress. Try next display. return; diff --git a/shared-module/displayio/TileGrid.c b/shared-module/displayio/TileGrid.c index 923065d7c5462..137dc02250e03 100644 --- a/shared-module/displayio/TileGrid.c +++ b/shared-module/displayio/TileGrid.c @@ -89,7 +89,7 @@ bool displayio_tilegrid_get_previous_area(displayio_tilegrid_t *self, displayio_ return true; } -STATIC void _update_current_x(displayio_tilegrid_t *self) { +static void _update_current_x(displayio_tilegrid_t *self) { uint16_t width; if (self->transpose_xy) { width = self->pixel_height; @@ -122,7 +122,7 @@ STATIC void _update_current_x(displayio_tilegrid_t *self) { } } -STATIC void _update_current_y(displayio_tilegrid_t *self) { +static void _update_current_y(displayio_tilegrid_t *self) { uint16_t height; if (self->transpose_xy) { height = self->pixel_width; diff --git a/shared-module/displayio/__init__.c b/shared-module/displayio/__init__.c index fe4a4cc84a3fa..42865f0f4cc94 100644 --- a/shared-module/displayio/__init__.c +++ b/shared-module/displayio/__init__.c @@ -55,7 +55,7 @@ displayio_buffer_transform_t null_transform = { }; #if CIRCUITPY_RGBMATRIX || CIRCUITPY_IS31FL3741 || CIRCUITPY_VIDEOCORE -STATIC bool any_display_uses_this_framebuffer(mp_obj_base_t *obj) { +static bool any_display_uses_this_framebuffer(mp_obj_base_t *obj) { for (uint8_t i = 0; i < CIRCUITPY_DISPLAY_LIMIT; i++) { if (displays[i].display_base.type == &framebufferio_framebufferdisplay_type) { framebufferio_framebufferdisplay_obj_t *display = &displays[i].framebuffer_display; diff --git a/shared-module/epaperdisplay/EPaperDisplay.c b/shared-module/epaperdisplay/EPaperDisplay.c index 23a69d7f320d3..fc6abdbb4c321 100644 --- a/shared-module/epaperdisplay/EPaperDisplay.c +++ b/shared-module/epaperdisplay/EPaperDisplay.c @@ -102,7 +102,7 @@ bool common_hal_epaperdisplay_epaperdisplay_set_root_group(epaperdisplay_epaperd return displayio_display_core_set_root_group(&self->core, root_group); } -STATIC const displayio_area_t *epaperdisplay_epaperdisplay_get_refresh_areas(epaperdisplay_epaperdisplay_obj_t *self) { +static const displayio_area_t *epaperdisplay_epaperdisplay_get_refresh_areas(epaperdisplay_epaperdisplay_obj_t *self) { if (self->core.full_refresh) { self->core.area.next = NULL; return &self->core.area; @@ -127,7 +127,7 @@ uint16_t common_hal_epaperdisplay_epaperdisplay_get_height(epaperdisplay_epaperd return displayio_display_core_get_height(&self->core); } -STATIC void wait_for_busy(epaperdisplay_epaperdisplay_obj_t *self) { +static void wait_for_busy(epaperdisplay_epaperdisplay_obj_t *self) { if (self->busy.base.type == &mp_type_NoneType) { return; } @@ -136,7 +136,7 @@ STATIC void wait_for_busy(epaperdisplay_epaperdisplay_obj_t *self) { } } -STATIC void send_command_sequence(epaperdisplay_epaperdisplay_obj_t *self, +static void send_command_sequence(epaperdisplay_epaperdisplay_obj_t *self, bool should_wait_for_busy, const uint8_t *sequence, uint32_t sequence_len) { uint32_t i = 0; while (i < sequence_len) { @@ -179,7 +179,7 @@ void epaperdisplay_epaperdisplay_change_refresh_mode_parameters(epaperdisplay_ep self->milliseconds_per_frame = seconds_per_frame * 1000; } -STATIC void epaperdisplay_epaperdisplay_start_refresh(epaperdisplay_epaperdisplay_obj_t *self) { +static void epaperdisplay_epaperdisplay_start_refresh(epaperdisplay_epaperdisplay_obj_t *self) { if (!displayio_display_bus_is_free(&self->bus)) { // Can't acquire display bus; skip updating this display. Try next display. return; @@ -206,7 +206,7 @@ uint32_t common_hal_epaperdisplay_epaperdisplay_get_time_to_refresh(epaperdispla return self->milliseconds_per_frame - elapsed_time; } -STATIC void epaperdisplay_epaperdisplay_finish_refresh(epaperdisplay_epaperdisplay_obj_t *self) { +static void epaperdisplay_epaperdisplay_finish_refresh(epaperdisplay_epaperdisplay_obj_t *self) { // Actually refresh the display now that all pixel RAM has been updated. send_command_sequence(self, false, self->refresh_sequence, self->refresh_sequence_len); @@ -249,7 +249,7 @@ mp_obj_t common_hal_epaperdisplay_epaperdisplay_get_root_group(epaperdisplay_epa return self->core.current_group; } -STATIC bool epaperdisplay_epaperdisplay_refresh_area(epaperdisplay_epaperdisplay_obj_t *self, const displayio_area_t *area) { +static bool epaperdisplay_epaperdisplay_refresh_area(epaperdisplay_epaperdisplay_obj_t *self, const displayio_area_t *area) { uint16_t buffer_size = 128; // In uint32_ts displayio_area_t clipped; @@ -364,7 +364,7 @@ STATIC bool epaperdisplay_epaperdisplay_refresh_area(epaperdisplay_epaperdisplay return true; } -STATIC bool _clean_area(epaperdisplay_epaperdisplay_obj_t *self) { +static bool _clean_area(epaperdisplay_epaperdisplay_obj_t *self) { uint16_t width = displayio_display_core_get_width(&self->core); uint16_t height = displayio_display_core_get_height(&self->core); diff --git a/shared-module/framebufferio/FramebufferDisplay.c b/shared-module/framebufferio/FramebufferDisplay.c index 348d8c0e646ac..c9fe52e0e40b1 100644 --- a/shared-module/framebufferio/FramebufferDisplay.c +++ b/shared-module/framebufferio/FramebufferDisplay.c @@ -105,7 +105,7 @@ mp_obj_t common_hal_framebufferio_framebufferdisplay_get_framebuffer(framebuffer return self->framebuffer; } -STATIC const displayio_area_t *_get_refresh_areas(framebufferio_framebufferdisplay_obj_t *self) { +static const displayio_area_t *_get_refresh_areas(framebufferio_framebufferdisplay_obj_t *self) { if (self->core.full_refresh) { self->core.area.next = NULL; return &self->core.area; @@ -116,7 +116,7 @@ STATIC const displayio_area_t *_get_refresh_areas(framebufferio_framebufferdispl } #define MARK_ROW_DIRTY(r) (dirty_row_bitmask[r / 8] |= (1 << (r & 7))) -STATIC bool _refresh_area(framebufferio_framebufferdisplay_obj_t *self, const displayio_area_t *area, uint8_t *dirty_row_bitmask) { +static bool _refresh_area(framebufferio_framebufferdisplay_obj_t *self, const displayio_area_t *area, uint8_t *dirty_row_bitmask) { uint16_t buffer_size = CIRCUITPY_DISPLAY_AREA_BUFFER_SIZE / sizeof(uint32_t); // In uint32_ts displayio_area_t clipped; @@ -210,7 +210,7 @@ STATIC bool _refresh_area(framebufferio_framebufferdisplay_obj_t *self, const di return true; } -STATIC void _refresh_display(framebufferio_framebufferdisplay_obj_t *self) { +static void _refresh_display(framebufferio_framebufferdisplay_obj_t *self) { self->framebuffer_protocol->get_bufinfo(self->framebuffer, &self->bufinfo); if (!self->bufinfo.buf) { return; @@ -297,7 +297,7 @@ void common_hal_framebufferio_framebufferdisplay_set_auto_refresh(framebufferio_ self->auto_refresh = auto_refresh; } -STATIC void _update_backlight(framebufferio_framebufferdisplay_obj_t *self) { +static void _update_backlight(framebufferio_framebufferdisplay_obj_t *self) { // TODO(tannewt): Fade the backlight based on it's existing value and a target value. The target // should account for ambient light when possible. } diff --git a/shared-module/msgpack/__init__.c b/shared-module/msgpack/__init__.c index f686dbc6e3cc1..a98fb02de39dd 100644 --- a/shared-module/msgpack/__init__.c +++ b/shared-module/msgpack/__init__.c @@ -30,7 +30,7 @@ typedef struct _msgpack_stream_t { int errcode; } msgpack_stream_t; -STATIC msgpack_stream_t get_stream(mp_obj_t stream_obj, int flags) { +static msgpack_stream_t get_stream(mp_obj_t stream_obj, int flags) { const mp_stream_p_t *stream_p = mp_get_stream_raise(stream_obj, flags); msgpack_stream_t s = {stream_obj, stream_p->read, stream_p->write, 0}; return s; @@ -39,7 +39,7 @@ STATIC msgpack_stream_t get_stream(mp_obj_t stream_obj, int flags) { //////////////////////////////////////////////////////////////// // readers -STATIC void read(msgpack_stream_t *s, void *buf, mp_uint_t size) { +static void read(msgpack_stream_t *s, void *buf, mp_uint_t size) { if (size == 0) { return; } @@ -55,13 +55,13 @@ STATIC void read(msgpack_stream_t *s, void *buf, mp_uint_t size) { } } -STATIC uint8_t read1(msgpack_stream_t *s) { +static uint8_t read1(msgpack_stream_t *s) { uint8_t res = 0; read(s, &res, 1); return res; } -STATIC uint16_t read2(msgpack_stream_t *s) { +static uint16_t read2(msgpack_stream_t *s) { uint16_t res = 0; read(s, &res, 2); int n = 1; @@ -71,7 +71,7 @@ STATIC uint16_t read2(msgpack_stream_t *s) { return res; } -STATIC uint32_t read4(msgpack_stream_t *s) { +static uint32_t read4(msgpack_stream_t *s) { uint32_t res = 0; read(s, &res, 4); int n = 1; @@ -81,7 +81,7 @@ STATIC uint32_t read4(msgpack_stream_t *s) { return res; } -STATIC uint64_t read8(msgpack_stream_t *s) { +static uint64_t read8(msgpack_stream_t *s) { uint64_t res = 0; read(s, &res, 8); int n = 1; @@ -91,7 +91,7 @@ STATIC uint64_t read8(msgpack_stream_t *s) { return res; } -STATIC size_t read_size(msgpack_stream_t *s, uint8_t len_index) { +static size_t read_size(msgpack_stream_t *s, uint8_t len_index) { size_t res = 0; switch (len_index) { case 0: @@ -110,7 +110,7 @@ STATIC size_t read_size(msgpack_stream_t *s, uint8_t len_index) { //////////////////////////////////////////////////////////////// // writers -STATIC void write(msgpack_stream_t *s, const void *buf, mp_uint_t size) { +static void write(msgpack_stream_t *s, const void *buf, mp_uint_t size) { mp_uint_t ret = s->write(s->stream_obj, buf, size, &s->errcode); if (s->errcode != 0) { mp_raise_OSError(s->errcode); @@ -120,11 +120,11 @@ STATIC void write(msgpack_stream_t *s, const void *buf, mp_uint_t size) { } } -STATIC void write1(msgpack_stream_t *s, uint8_t obj) { +static void write1(msgpack_stream_t *s, uint8_t obj) { write(s, &obj, 1); } -STATIC void write2(msgpack_stream_t *s, uint16_t obj) { +static void write2(msgpack_stream_t *s, uint16_t obj) { int n = 1; if (*(char *)&n == 1) { obj = __builtin_bswap16(obj); @@ -132,7 +132,7 @@ STATIC void write2(msgpack_stream_t *s, uint16_t obj) { write(s, &obj, 2); } -STATIC void write4(msgpack_stream_t *s, uint32_t obj) { +static void write4(msgpack_stream_t *s, uint32_t obj) { int n = 1; if (*(char *)&n == 1) { obj = __builtin_bswap32(obj); @@ -141,7 +141,7 @@ STATIC void write4(msgpack_stream_t *s, uint32_t obj) { } // compute and write msgpack size code (array structures) -STATIC void write_size(msgpack_stream_t *s, uint8_t code, size_t size) { +static void write_size(msgpack_stream_t *s, uint8_t code, size_t size) { if ((uint8_t)size == size) { write1(s, code); write1(s, size); @@ -160,7 +160,7 @@ STATIC void write_size(msgpack_stream_t *s, uint8_t code, size_t size) { // This is a helper function to iterate through a dictionary. The state of // the iteration is held in *cur and should be initialised with zero for the // first call. Will return NULL when no more elements are available. -STATIC mp_map_elem_t *dict_iter_next(mp_obj_dict_t *dict, size_t *cur) { +static mp_map_elem_t *dict_iter_next(mp_obj_dict_t *dict, size_t *cur) { size_t max = dict->map.alloc; mp_map_t *map = &dict->map; @@ -174,7 +174,7 @@ STATIC mp_map_elem_t *dict_iter_next(mp_obj_dict_t *dict, size_t *cur) { return NULL; } -STATIC void pack_int(msgpack_stream_t *s, int32_t x) { +static void pack_int(msgpack_stream_t *s, int32_t x) { if (x > -32 && x < 128) { write1(s, x); } else if ((int8_t)x == x) { @@ -189,14 +189,14 @@ STATIC void pack_int(msgpack_stream_t *s, int32_t x) { } } -STATIC void pack_bin(msgpack_stream_t *s, const uint8_t *data, size_t len) { +static void pack_bin(msgpack_stream_t *s, const uint8_t *data, size_t len) { write_size(s, 0xc4, len); if (len > 0) { write(s, data, len); } } -STATIC void pack_ext(msgpack_stream_t *s, int8_t code, const uint8_t *data, size_t len) { +static void pack_ext(msgpack_stream_t *s, int8_t code, const uint8_t *data, size_t len) { if (len == 1) { write1(s, 0xd4); } else if (len == 2) { @@ -216,7 +216,7 @@ STATIC void pack_ext(msgpack_stream_t *s, int8_t code, const uint8_t *data, size } } -STATIC void pack_str(msgpack_stream_t *s, const char *str, size_t len) { +static void pack_str(msgpack_stream_t *s, const char *str, size_t len) { if (len < 32) { write1(s, 0b10100000 | (uint8_t)len); } else { @@ -227,7 +227,7 @@ STATIC void pack_str(msgpack_stream_t *s, const char *str, size_t len) { } } -STATIC void pack_array(msgpack_stream_t *s, size_t len) { +static void pack_array(msgpack_stream_t *s, size_t len) { // only writes the header, manually write the objects after calling pack_array! if (len < 16) { write1(s, 0b10010000 | (uint8_t)len); @@ -240,7 +240,7 @@ STATIC void pack_array(msgpack_stream_t *s, size_t len) { } } -STATIC void pack_dict(msgpack_stream_t *s, size_t len) { +static void pack_dict(msgpack_stream_t *s, size_t len) { // only writes the header, manually write the objects after calling pack_array! if (len < 16) { write1(s, 0b10000000 | (uint8_t)len); @@ -253,7 +253,7 @@ STATIC void pack_dict(msgpack_stream_t *s, size_t len) { } } -STATIC void pack(mp_obj_t obj, msgpack_stream_t *s, mp_obj_t default_handler) { +static void pack(mp_obj_t obj, msgpack_stream_t *s, mp_obj_t default_handler) { if (mp_obj_is_small_int(obj)) { // int int32_t x = MP_OBJ_SMALL_INT_VALUE(obj); @@ -324,9 +324,9 @@ STATIC void pack(mp_obj_t obj, msgpack_stream_t *s, mp_obj_t default_handler) { //////////////////////////////////////////////////////////////// // unpacker -STATIC mp_obj_t unpack(msgpack_stream_t *s, mp_obj_t ext_hook, bool use_list); +static mp_obj_t unpack(msgpack_stream_t *s, mp_obj_t ext_hook, bool use_list); -STATIC mp_obj_t unpack_array_elements(msgpack_stream_t *s, size_t size, mp_obj_t ext_hook, bool use_list) { +static mp_obj_t unpack_array_elements(msgpack_stream_t *s, size_t size, mp_obj_t ext_hook, bool use_list) { if (use_list) { mp_obj_list_t *t = MP_OBJ_TO_PTR(mp_obj_new_list(size, NULL)); for (size_t i = 0; i < size; i++) { @@ -342,7 +342,7 @@ STATIC mp_obj_t unpack_array_elements(msgpack_stream_t *s, size_t size, mp_obj_t } } -STATIC mp_obj_t unpack_bytes(msgpack_stream_t *s, size_t size) { +static mp_obj_t unpack_bytes(msgpack_stream_t *s, size_t size) { vstr_t vstr; vstr_init_len(&vstr, size); byte *p = (byte *)vstr.buf; @@ -358,7 +358,7 @@ STATIC mp_obj_t unpack_bytes(msgpack_stream_t *s, size_t size) { return mp_obj_new_bytes_from_vstr(&vstr); } -STATIC mp_obj_t unpack_ext(msgpack_stream_t *s, size_t size, mp_obj_t ext_hook) { +static mp_obj_t unpack_ext(msgpack_stream_t *s, size_t size, mp_obj_t ext_hook) { int8_t code = read1(s); mp_obj_t data = unpack_bytes(s, size); if (ext_hook != mp_const_none) { @@ -371,7 +371,7 @@ STATIC mp_obj_t unpack_ext(msgpack_stream_t *s, size_t size, mp_obj_t ext_hook) } } -STATIC mp_obj_t unpack(msgpack_stream_t *s, mp_obj_t ext_hook, bool use_list) { +static mp_obj_t unpack(msgpack_stream_t *s, mp_obj_t ext_hook, bool use_list) { uint8_t code = read1(s); if (((code & 0b10000000) == 0) || ((code & 0b11100000) == 0b11100000)) { // int diff --git a/shared-module/os/__init__.c b/shared-module/os/__init__.c index fbe720a89c8b4..81296db854cd3 100644 --- a/shared-module/os/__init__.c +++ b/shared-module/os/__init__.c @@ -20,7 +20,7 @@ // as needed. It does not provide uname. // Version of mp_vfs_lookup_path that takes and returns uPy string objects. -STATIC mp_vfs_mount_t *lookup_path(const char *path, mp_obj_t *path_out) { +static mp_vfs_mount_t *lookup_path(const char *path, mp_obj_t *path_out) { const char *p_out; *path_out = mp_const_none; mp_vfs_mount_t *vfs = mp_vfs_lookup_path(path, &p_out); @@ -32,7 +32,7 @@ STATIC mp_vfs_mount_t *lookup_path(const char *path, mp_obj_t *path_out) { } // Strip off trailing slashes to please underlying libraries -STATIC mp_vfs_mount_t *lookup_dir_path(const char *path, mp_obj_t *path_out) { +static mp_vfs_mount_t *lookup_dir_path(const char *path, mp_obj_t *path_out) { const char *p_out; *path_out = mp_const_none; mp_vfs_mount_t *vfs = mp_vfs_lookup_path(path, &p_out); @@ -46,7 +46,7 @@ STATIC mp_vfs_mount_t *lookup_dir_path(const char *path, mp_obj_t *path_out) { return vfs; } -STATIC mp_obj_t mp_vfs_proxy_call(mp_vfs_mount_t *vfs, qstr meth_name, size_t n_args, const mp_obj_t *args) { +static mp_obj_t mp_vfs_proxy_call(mp_vfs_mount_t *vfs, qstr meth_name, size_t n_args, const mp_obj_t *args) { if (vfs == MP_VFS_NONE) { // mount point not found mp_raise_OSError(MP_ENODEV); diff --git a/shared-module/os/getenv.c b/shared-module/os/getenv.c index 55872eff7a714..39c3b4cee4ac7 100644 --- a/shared-module/os/getenv.c +++ b/shared-module/os/getenv.c @@ -28,7 +28,7 @@ #include "extmod/vfs.h" #include "extmod/vfs_fat.h" typedef FIL file_arg; -STATIC bool open_file(const char *name, file_arg *active_file) { +static bool open_file(const char *name, file_arg *active_file) { #if defined(UNIX) nlr_buf_t nlr; if (nlr_push(&nlr) == 0) { @@ -51,27 +51,27 @@ STATIC bool open_file(const char *name, file_arg *active_file) { return result == FR_OK; #endif } -STATIC void close_file(file_arg *active_file) { +static void close_file(file_arg *active_file) { // nothing } -STATIC bool is_eof(file_arg *active_file) { +static bool is_eof(file_arg *active_file) { return f_eof(active_file) || f_error(active_file); } // Return 0 if there is no next character (EOF). -STATIC uint8_t get_next_byte(FIL *active_file) { +static uint8_t get_next_byte(FIL *active_file) { uint8_t character = 0; UINT quantity_read; // If there's an error or quantity_read is 0, character will remain 0. f_read(active_file, &character, 1, &quantity_read); return character; } -STATIC void seek_eof(file_arg *active_file) { +static void seek_eof(file_arg *active_file) { f_lseek(active_file, f_size(active_file)); } // For a fixed buffer, record the required size rather than throwing -STATIC void vstr_add_byte_nonstd(vstr_t *vstr, byte b) { +static void vstr_add_byte_nonstd(vstr_t *vstr, byte b) { if (!vstr->fixed_buf || vstr->alloc > vstr->len) { vstr_add_byte(vstr, b); } else { @@ -80,7 +80,7 @@ STATIC void vstr_add_byte_nonstd(vstr_t *vstr, byte b) { } // For a fixed buffer, record the required size rather than throwing -STATIC void vstr_add_char_nonstd(vstr_t *vstr, unichar c) { +static void vstr_add_char_nonstd(vstr_t *vstr, unichar c) { size_t ulen = (c < 0x80) ? 1 : (c < 0x800) ? 2 : @@ -92,7 +92,7 @@ STATIC void vstr_add_char_nonstd(vstr_t *vstr, unichar c) { } } -STATIC void next_line(file_arg *active_file) { +static void next_line(file_arg *active_file) { uint8_t character; do { character = get_next_byte(active_file); @@ -101,7 +101,7 @@ STATIC void next_line(file_arg *active_file) { // Discard whitespace, except for newlines, returning the next character after the whitespace. // Return 0 if there is no next character (EOF). -STATIC uint8_t consume_whitespace(file_arg *active_file) { +static uint8_t consume_whitespace(file_arg *active_file) { uint8_t character; do { character = get_next_byte(active_file); @@ -115,7 +115,7 @@ STATIC uint8_t consume_whitespace(file_arg *active_file) { // If result is true, the key matches and file pointer is pointing just after the "=". // If the result is false, the key does NOT match and the file pointer is // pointing at the start of the next line, if any -STATIC bool key_matches(file_arg *active_file, const char *key) { +static bool key_matches(file_arg *active_file, const char *key) { uint8_t character; character = consume_whitespace(active_file); if (character == '[' || character == 0) { @@ -151,7 +151,7 @@ STATIC bool key_matches(file_arg *active_file, const char *key) { return true; } -STATIC os_getenv_err_t read_unicode_escape(file_arg *active_file, int sz, vstr_t *buf) { +static os_getenv_err_t read_unicode_escape(file_arg *active_file, int sz, vstr_t *buf) { char hex_buf[sz + 1]; for (int i = 0; i < sz; i++) { hex_buf[i] = get_next_byte(active_file); @@ -170,7 +170,7 @@ STATIC os_getenv_err_t read_unicode_escape(file_arg *active_file, int sz, vstr_t } // Read a quoted string -STATIC os_getenv_err_t read_string_value(file_arg *active_file, vstr_t *buf) { +static os_getenv_err_t read_string_value(file_arg *active_file, vstr_t *buf) { while (true) { int character = get_next_byte(active_file); switch (character) { @@ -236,7 +236,7 @@ STATIC os_getenv_err_t read_string_value(file_arg *active_file, vstr_t *buf) { } // Read a numeric value (non-quoted value) as a string -STATIC os_getenv_err_t read_bare_value(file_arg *active_file, vstr_t *buf, int first_character) { +static os_getenv_err_t read_bare_value(file_arg *active_file, vstr_t *buf, int first_character) { int character = first_character; while (true) { switch (character) { @@ -253,7 +253,7 @@ STATIC os_getenv_err_t read_bare_value(file_arg *active_file, vstr_t *buf, int f } } -STATIC mp_int_t read_value(file_arg *active_file, vstr_t *buf, bool *quoted) { +static mp_int_t read_value(file_arg *active_file, vstr_t *buf, bool *quoted) { uint8_t character; character = consume_whitespace(active_file); *quoted = (character == '"'); @@ -265,7 +265,7 @@ STATIC mp_int_t read_value(file_arg *active_file, vstr_t *buf, bool *quoted) { } } -STATIC os_getenv_err_t os_getenv_vstr(const char *path, const char *key, vstr_t *buf, bool *quoted) { +static os_getenv_err_t os_getenv_vstr(const char *path, const char *key, vstr_t *buf, bool *quoted) { file_arg active_file; if (!open_file(path, &active_file)) { return GETENV_ERR_OPEN; @@ -282,7 +282,7 @@ STATIC os_getenv_err_t os_getenv_vstr(const char *path, const char *key, vstr_t return result; } -STATIC os_getenv_err_t os_getenv_buf_terminated(const char *key, char *value, size_t value_len, bool *quoted) { +static os_getenv_err_t os_getenv_buf_terminated(const char *key, char *value, size_t value_len, bool *quoted) { vstr_t buf; vstr_init_fixed_buf(&buf, value_len, value); os_getenv_err_t result = os_getenv_vstr(GETENV_PATH, key, &buf, quoted); @@ -297,7 +297,7 @@ STATIC os_getenv_err_t os_getenv_buf_terminated(const char *key, char *value, si return result; } -STATIC void print_dont_raise(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, ...) { +static void print_dont_raise(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, ...) { va_list argptr; va_start(argptr, fmt); mp_vcprintf(&mp_plat_print, fmt, argptr); @@ -305,7 +305,7 @@ STATIC void print_dont_raise(const mp_obj_type_t *exc_type, mp_rom_error_text_t va_end(argptr); } -STATIC void handle_getenv_error(os_getenv_err_t error, void (*handle)(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, ...)) { +static void handle_getenv_error(os_getenv_err_t error, void (*handle)(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, ...)) { if (error == GETENV_OK) { return; } @@ -340,14 +340,14 @@ STATIC void handle_getenv_error(os_getenv_err_t error, void (*handle)(const mp_o } } -STATIC void common_hal_os_getenv_showerr(const char *key, os_getenv_err_t result) { +static void common_hal_os_getenv_showerr(const char *key, os_getenv_err_t result) { if (result != GETENV_OK && result != GETENV_ERR_OPEN && result != GETENV_ERR_NOT_FOUND) { mp_cprintf(&mp_plat_print, MP_ERROR_TEXT("An error occurred while retrieving '%s':\n"), key); handle_getenv_error(result, print_dont_raise); } } -STATIC +static os_getenv_err_t common_hal_os_getenv_str_inner(const char *key, char *value, size_t value_len) { bool quoted; os_getenv_err_t result = os_getenv_buf_terminated(key, value, value_len, "ed); @@ -385,7 +385,7 @@ mp_obj_t common_hal_os_getenv(const char *key, mp_obj_t default_) { return common_hal_os_getenv_path(GETENV_PATH, key, default_); } -STATIC os_getenv_err_t common_hal_os_getenv_int_inner(const char *key, mp_int_t *value) { +static os_getenv_err_t common_hal_os_getenv_int_inner(const char *key, mp_int_t *value) { char buf[16]; bool quoted; os_getenv_err_t result = os_getenv_buf_terminated(key, buf, sizeof(buf), "ed); diff --git a/shared-module/qrio/QRDecoder.c b/shared-module/qrio/QRDecoder.c index 73f3a052e166a..f3559f72c3747 100644 --- a/shared-module/qrio/QRDecoder.c +++ b/shared-module/qrio/QRDecoder.c @@ -42,7 +42,7 @@ void shared_module_qrio_qrdecoder_set_width(qrdecoder_qrdecoder_obj_t *self, int } } -STATIC mp_obj_t data_type(int type) { +static mp_obj_t data_type(int type) { switch (type) { case QUIRC_ECI_ISO_8859_1: return MP_OBJ_NEW_QSTR(MP_QSTR_iso_8859_hyphen_1); @@ -78,7 +78,7 @@ STATIC mp_obj_t data_type(int type) { return mp_obj_new_int(type); } -STATIC void quirc_fill_buffer(qrdecoder_qrdecoder_obj_t *self, void *buf, qrio_pixel_policy_t policy) { +static void quirc_fill_buffer(qrdecoder_qrdecoder_obj_t *self, void *buf, qrio_pixel_policy_t policy) { int width, height; uint8_t *framebuffer = quirc_begin(self->quirc, &width, &height); uint8_t *src = buf; diff --git a/shared-module/random/__init__.c b/shared-module/random/__init__.c index 9a6e050850aef..26d11313962f9 100644 --- a/shared-module/random/__init__.c +++ b/shared-module/random/__init__.c @@ -18,10 +18,10 @@ // http://www.literatecode.com/yasmarang // Public Domain -STATIC uint32_t yasmarang_pad = 0xeda4baba, yasmarang_n = 69, yasmarang_d = 233; -STATIC uint8_t yasmarang_dat = 0; +static uint32_t yasmarang_pad = 0xeda4baba, yasmarang_n = 69, yasmarang_d = 233; +static uint8_t yasmarang_dat = 0; -STATIC uint32_t yasmarang(void) { +static uint32_t yasmarang(void) { if (yasmarang_pad == 0xeda4baba) { if (!common_hal_os_urandom((uint8_t *)&yasmarang_pad, sizeof(uint32_t))) { yasmarang_pad = common_hal_time_monotonic_ms() & 0xffffffff; @@ -40,7 +40,7 @@ STATIC uint32_t yasmarang(void) { // returns an unsigned integer below the given argument // n must not be zero -STATIC uint32_t yasmarang_randbelow(uint32_t n) { +static uint32_t yasmarang_randbelow(uint32_t n) { uint32_t mask = 1; while ((n & mask) < n) { mask = (mask << 1) | 1; @@ -80,7 +80,7 @@ mp_int_t shared_modules_random_randrange(mp_int_t start, mp_int_t stop, mp_int_t } // returns a number in the range [0..1) using Yasmarang to fill in the fraction bits -STATIC mp_float_t yasmarang_float(void) { +static mp_float_t yasmarang_float(void) { #if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE typedef uint64_t mp_float_int_t; #elif MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT diff --git a/shared-module/rgbmatrix/RGBMatrix.c b/shared-module/rgbmatrix/RGBMatrix.c index 86028b358e823..db14c6a6b0dda 100644 --- a/shared-module/rgbmatrix/RGBMatrix.c +++ b/shared-module/rgbmatrix/RGBMatrix.c @@ -22,7 +22,7 @@ extern Protomatter_core *_PM_protoPtr; -STATIC void common_hal_rgbmatrix_rgbmatrix_construct1(rgbmatrix_rgbmatrix_obj_t *self, mp_obj_t framebuffer); +static void common_hal_rgbmatrix_rgbmatrix_construct1(rgbmatrix_rgbmatrix_obj_t *self, mp_obj_t framebuffer); void common_hal_rgbmatrix_rgbmatrix_construct(rgbmatrix_rgbmatrix_obj_t *self, int width, int bit_depth, uint8_t rgb_count, uint8_t *rgb_pins, uint8_t addr_count, uint8_t *addr_pins, uint8_t clock_pin, uint8_t latch_pin, uint8_t oe_pin, bool doublebuffer, mp_obj_t framebuffer, int8_t tile, bool serpentine, void *timer) { self->width = width; @@ -49,7 +49,7 @@ void common_hal_rgbmatrix_rgbmatrix_construct(rgbmatrix_rgbmatrix_obj_t *self, i common_hal_rgbmatrix_rgbmatrix_construct1(self, framebuffer); } -STATIC void common_hal_rgbmatrix_rgbmatrix_construct1(rgbmatrix_rgbmatrix_obj_t *self, mp_obj_t framebuffer) { +static void common_hal_rgbmatrix_rgbmatrix_construct1(rgbmatrix_rgbmatrix_obj_t *self, mp_obj_t framebuffer) { if (framebuffer != mp_const_none) { mp_get_buffer_raise(self->framebuffer, &self->bufinfo, MP_BUFFER_READ); if (mp_get_buffer(self->framebuffer, &self->bufinfo, MP_BUFFER_RW)) { @@ -114,21 +114,21 @@ STATIC void common_hal_rgbmatrix_rgbmatrix_construct1(rgbmatrix_rgbmatrix_obj_t self->paused = 0; } -STATIC void free_pin(uint8_t *pin) { +static void free_pin(uint8_t *pin) { if (*pin != COMMON_HAL_MCU_NO_PIN) { common_hal_mcu_pin_reset_number(*pin); } *pin = COMMON_HAL_MCU_NO_PIN; } -STATIC void free_pin_seq(uint8_t *seq, int count) { +static void free_pin_seq(uint8_t *seq, int count) { for (int i = 0; i < count; i++) { free_pin(&seq[i]); } } extern int pm_row_count; -STATIC void common_hal_rgbmatrix_rgbmatrix_deinit1(rgbmatrix_rgbmatrix_obj_t *self) { +static void common_hal_rgbmatrix_rgbmatrix_deinit1(rgbmatrix_rgbmatrix_obj_t *self) { common_hal_rgbmatrix_timer_disable(self->timer); if (_PM_protoPtr == &self->protomatter) { diff --git a/shared-module/sdcardio/SDCard.c b/shared-module/sdcardio/SDCard.c index 38c2a59935d37..48df8823f962a 100644 --- a/shared-module/sdcardio/SDCard.c +++ b/shared-module/sdcardio/SDCard.c @@ -32,7 +32,7 @@ #define TOKEN_STOP_TRAN (0xFD) #define TOKEN_DATA (0xFE) -STATIC bool lock_and_configure_bus(sdcardio_sdcard_obj_t *self) { +static bool lock_and_configure_bus(sdcardio_sdcard_obj_t *self) { if (!common_hal_busio_spi_try_lock(self->bus)) { return false; } @@ -41,13 +41,13 @@ STATIC bool lock_and_configure_bus(sdcardio_sdcard_obj_t *self) { return true; } -STATIC void lock_bus_or_throw(sdcardio_sdcard_obj_t *self) { +static void lock_bus_or_throw(sdcardio_sdcard_obj_t *self) { if (!lock_and_configure_bus(self)) { mp_raise_OSError(EAGAIN); } } -STATIC void clock_card(sdcardio_sdcard_obj_t *self, int bytes) { +static void clock_card(sdcardio_sdcard_obj_t *self, int bytes) { uint8_t buf[] = {0xff}; common_hal_digitalio_digitalinout_set_value(&self->cs, true); for (int i = 0; i < bytes; i++) { @@ -55,7 +55,7 @@ STATIC void clock_card(sdcardio_sdcard_obj_t *self, int bytes) { } } -STATIC void extraclock_and_unlock_bus(sdcardio_sdcard_obj_t *self) { +static void extraclock_and_unlock_bus(sdcardio_sdcard_obj_t *self) { clock_card(self, 1); common_hal_busio_spi_unlock(self->bus); } @@ -76,7 +76,7 @@ static uint8_t CRC7(const uint8_t *data, uint8_t n) { } #define READY_TIMEOUT_NS (300 * 1000 * 1000) // 300ms -STATIC int wait_for_ready(sdcardio_sdcard_obj_t *self) { +static int wait_for_ready(sdcardio_sdcard_obj_t *self) { uint64_t deadline = common_hal_time_monotonic_ns() + READY_TIMEOUT_NS; while (common_hal_time_monotonic_ns() < deadline) { uint8_t b; @@ -89,7 +89,7 @@ STATIC int wait_for_ready(sdcardio_sdcard_obj_t *self) { } // Note: this is never called while "in cmd25" (in fact, it's only used by `exit_cmd25`) -STATIC bool cmd_nodata(sdcardio_sdcard_obj_t *self, int cmd, int response) { +static bool cmd_nodata(sdcardio_sdcard_obj_t *self, int cmd, int response) { uint8_t cmdbuf[2] = {cmd, 0xff}; assert(!self->in_cmd25); @@ -107,7 +107,7 @@ STATIC bool cmd_nodata(sdcardio_sdcard_obj_t *self, int cmd, int response) { } -STATIC int exit_cmd25(sdcardio_sdcard_obj_t *self) { +static int exit_cmd25(sdcardio_sdcard_obj_t *self) { if (self->in_cmd25) { DEBUG_PRINT("exit cmd25\n"); self->in_cmd25 = false; @@ -117,7 +117,7 @@ STATIC int exit_cmd25(sdcardio_sdcard_obj_t *self) { } // In Python API, defaults are response=None, data_block=True, wait=True -STATIC int cmd(sdcardio_sdcard_obj_t *self, int cmd, int arg, void *response_buf, size_t response_len, bool data_block, bool wait) { +static int cmd(sdcardio_sdcard_obj_t *self, int cmd, int arg, void *response_buf, size_t response_len, bool data_block, bool wait) { int r = exit_cmd25(self); if (r < 0) { return r; @@ -177,11 +177,11 @@ STATIC int cmd(sdcardio_sdcard_obj_t *self, int cmd, int arg, void *response_buf return cmdbuf[0]; } -STATIC int block_cmd(sdcardio_sdcard_obj_t *self, int cmd_, int block, void *response_buf, size_t response_len, bool data_block, bool wait) { +static int block_cmd(sdcardio_sdcard_obj_t *self, int cmd_, int block, void *response_buf, size_t response_len, bool data_block, bool wait) { return cmd(self, cmd_, block * self->cdv, response_buf, response_len, true, true); } -STATIC mp_rom_error_text_t init_card_v1(sdcardio_sdcard_obj_t *self) { +static mp_rom_error_text_t init_card_v1(sdcardio_sdcard_obj_t *self) { for (int i = 0; i < CMD_TIMEOUT; i++) { if (cmd(self, 41, 0, NULL, 0, true, true) == 0) { return NULL; @@ -190,7 +190,7 @@ STATIC mp_rom_error_text_t init_card_v1(sdcardio_sdcard_obj_t *self) { return MP_ERROR_TEXT("timeout waiting for v1 card"); } -STATIC mp_rom_error_text_t init_card_v2(sdcardio_sdcard_obj_t *self) { +static mp_rom_error_text_t init_card_v2(sdcardio_sdcard_obj_t *self) { for (int i = 0; i < CMD_TIMEOUT; i++) { uint8_t ocr[4]; common_hal_time_delay_ms(50); @@ -207,7 +207,7 @@ STATIC mp_rom_error_text_t init_card_v2(sdcardio_sdcard_obj_t *self) { return MP_ERROR_TEXT("timeout waiting for v2 card"); } -STATIC mp_rom_error_text_t init_card(sdcardio_sdcard_obj_t *self) { +static mp_rom_error_text_t init_card(sdcardio_sdcard_obj_t *self) { clock_card(self, 10); common_hal_digitalio_digitalinout_set_value(&self->cs, false); @@ -316,7 +316,7 @@ void common_hal_sdcardio_sdcard_deinit(sdcardio_sdcard_obj_t *self) { common_hal_digitalio_digitalinout_deinit(&self->cs); } -STATIC void common_hal_sdcardio_check_for_deinit(sdcardio_sdcard_obj_t *self) { +static void common_hal_sdcardio_check_for_deinit(sdcardio_sdcard_obj_t *self) { if (!self->bus) { raise_deinited_error(); } @@ -327,7 +327,7 @@ int common_hal_sdcardio_sdcard_get_blockcount(sdcardio_sdcard_obj_t *self) { return self->sectors; } -STATIC int readinto(sdcardio_sdcard_obj_t *self, void *buf, size_t size) { +static int readinto(sdcardio_sdcard_obj_t *self, void *buf, size_t size) { uint8_t aux[2] = {0, 0}; while (aux[0] != 0xfe) { common_hal_busio_spi_read(self->bus, aux, 1, 0xff); @@ -388,7 +388,7 @@ int common_hal_sdcardio_sdcard_readblocks(sdcardio_sdcard_obj_t *self, uint32_t return sdcardio_sdcard_readblocks(MP_OBJ_FROM_PTR(self), buf->buf, start_block, buf->len / 512); } -STATIC int _write(sdcardio_sdcard_obj_t *self, uint8_t token, void *buf, size_t size) { +static int _write(sdcardio_sdcard_obj_t *self, uint8_t token, void *buf, size_t size) { wait_for_ready(self); uint8_t cmd[2]; diff --git a/shared-module/sharpdisplay/SharpMemoryFramebuffer.c b/shared-module/sharpdisplay/SharpMemoryFramebuffer.c index 04846723f5b80..3c6eaf065df72 100644 --- a/shared-module/sharpdisplay/SharpMemoryFramebuffer.c +++ b/shared-module/sharpdisplay/SharpMemoryFramebuffer.c @@ -18,7 +18,7 @@ #define JDI_BIT_WRITECMD_LSB (0x90) #define SHARPMEM_BIT_VCOM_LSB (0x40) -STATIC uint8_t bitrev(uint8_t n) { +static uint8_t bitrev(uint8_t n) { uint8_t r = 0; for (int i = 0; i < 8; i++) {r |= ((n >> i) & 1) << (7 - i); } @@ -33,7 +33,7 @@ int common_hal_sharpdisplay_framebuffer_get_height(sharpdisplay_framebuffer_obj_ return self->height; } -STATIC int common_hal_sharpdisplay_framebuffer_get_row_stride(sharpdisplay_framebuffer_obj_t *self) { +static int common_hal_sharpdisplay_framebuffer_get_row_stride(sharpdisplay_framebuffer_obj_t *self) { if (self->jdi_display) { return (self->width + 1) / 2 + 2; } else { @@ -41,15 +41,15 @@ STATIC int common_hal_sharpdisplay_framebuffer_get_row_stride(sharpdisplay_frame } } -STATIC int common_hal_sharpdisplay_framebuffer_get_first_pixel_offset(sharpdisplay_framebuffer_obj_t *self) { +static int common_hal_sharpdisplay_framebuffer_get_first_pixel_offset(sharpdisplay_framebuffer_obj_t *self) { return 2; } -STATIC bool common_hal_sharpdisplay_framebuffer_get_reverse_pixels_in_byte(sharpdisplay_framebuffer_obj_t *self) { +static bool common_hal_sharpdisplay_framebuffer_get_reverse_pixels_in_byte(sharpdisplay_framebuffer_obj_t *self) { return true; } -STATIC bool common_hal_sharpdisplay_framebuffer_get_pixels_in_byte_share_row(sharpdisplay_framebuffer_obj_t *self) { +static bool common_hal_sharpdisplay_framebuffer_get_pixels_in_byte_share_row(sharpdisplay_framebuffer_obj_t *self) { return true; } @@ -139,7 +139,7 @@ void common_hal_sharpdisplay_framebuffer_construct( common_hal_sharpdisplay_framebuffer_get_bufinfo(self, NULL); } -STATIC void common_hal_sharpdisplay_framebuffer_swapbuffers(sharpdisplay_framebuffer_obj_t *self, uint8_t *dirty_row_bitmask) { +static void common_hal_sharpdisplay_framebuffer_swapbuffers(sharpdisplay_framebuffer_obj_t *self, uint8_t *dirty_row_bitmask) { // claim SPI bus if (!common_hal_busio_spi_try_lock(self->bus)) { return; @@ -177,57 +177,57 @@ STATIC void common_hal_sharpdisplay_framebuffer_swapbuffers(sharpdisplay_framebu self->full_refresh = false; } -STATIC void sharpdisplay_framebuffer_deinit(mp_obj_t self_in) { +static void sharpdisplay_framebuffer_deinit(mp_obj_t self_in) { sharpdisplay_framebuffer_obj_t *self = self_in; common_hal_sharpdisplay_framebuffer_deinit(self); } -STATIC void sharpdisplay_framebuffer_get_bufinfo(mp_obj_t self_in, mp_buffer_info_t *bufinfo) { +static void sharpdisplay_framebuffer_get_bufinfo(mp_obj_t self_in, mp_buffer_info_t *bufinfo) { sharpdisplay_framebuffer_obj_t *self = self_in; common_hal_sharpdisplay_framebuffer_get_bufinfo(self, bufinfo); } -STATIC int sharpdisplay_framebuffer_get_color_depth(mp_obj_t self_in) { +static int sharpdisplay_framebuffer_get_color_depth(mp_obj_t self_in) { sharpdisplay_framebuffer_obj_t *self = MP_OBJ_TO_PTR(self_in); return self->jdi_display ? 4 : 1; } -STATIC bool sharpdisplay_framebuffer_get_grayscale(mp_obj_t self_in) { +static bool sharpdisplay_framebuffer_get_grayscale(mp_obj_t self_in) { sharpdisplay_framebuffer_obj_t *self = MP_OBJ_TO_PTR(self_in); return !self->jdi_display; } -STATIC int sharpdisplay_framebuffer_get_height(mp_obj_t self_in) { +static int sharpdisplay_framebuffer_get_height(mp_obj_t self_in) { sharpdisplay_framebuffer_obj_t *self = self_in; return common_hal_sharpdisplay_framebuffer_get_height(self); } -STATIC int sharpdisplay_framebuffer_get_width(mp_obj_t self_in) { +static int sharpdisplay_framebuffer_get_width(mp_obj_t self_in) { sharpdisplay_framebuffer_obj_t *self = self_in; return common_hal_sharpdisplay_framebuffer_get_width(self); } -STATIC int sharpdisplay_framebuffer_get_first_pixel_offset(mp_obj_t self_in) { +static int sharpdisplay_framebuffer_get_first_pixel_offset(mp_obj_t self_in) { sharpdisplay_framebuffer_obj_t *self = self_in; return common_hal_sharpdisplay_framebuffer_get_first_pixel_offset(self); } -STATIC bool sharpdisplay_framebuffer_get_pixels_in_byte_share_row(mp_obj_t self_in) { +static bool sharpdisplay_framebuffer_get_pixels_in_byte_share_row(mp_obj_t self_in) { sharpdisplay_framebuffer_obj_t *self = self_in; return common_hal_sharpdisplay_framebuffer_get_pixels_in_byte_share_row(self); } -STATIC bool sharpdisplay_framebuffer_get_reverse_pixels_in_byte(mp_obj_t self_in) { +static bool sharpdisplay_framebuffer_get_reverse_pixels_in_byte(mp_obj_t self_in) { sharpdisplay_framebuffer_obj_t *self = self_in; return common_hal_sharpdisplay_framebuffer_get_reverse_pixels_in_byte(self); } -STATIC int sharpdisplay_framebuffer_get_row_stride(mp_obj_t self_in) { +static int sharpdisplay_framebuffer_get_row_stride(mp_obj_t self_in) { sharpdisplay_framebuffer_obj_t *self = self_in; return common_hal_sharpdisplay_framebuffer_get_row_stride(self); } -STATIC void sharpdisplay_framebuffer_swapbuffers(mp_obj_t self_in, uint8_t *dirty_row_bitmask) { +static void sharpdisplay_framebuffer_swapbuffers(mp_obj_t self_in, uint8_t *dirty_row_bitmask) { sharpdisplay_framebuffer_obj_t *self = self_in; common_hal_sharpdisplay_framebuffer_swapbuffers(self, dirty_row_bitmask); } diff --git a/shared-module/ssl/SSLSocket.c b/shared-module/ssl/SSLSocket.c index 71f671529cdee..9303964af7191 100644 --- a/shared-module/ssl/SSLSocket.c +++ b/shared-module/ssl/SSLSocket.c @@ -32,7 +32,7 @@ #ifdef MBEDTLS_DEBUG_C #include "mbedtls/debug.h" -STATIC void mbedtls_debug(void *ctx, int level, const char *file, int line, const char *str) { +static void mbedtls_debug(void *ctx, int level, const char *file, int line, const char *str) { (void)ctx; (void)level; mp_printf(&mp_plat_print, "DBG:%s:%04d: %s\n", file, line, str); @@ -42,7 +42,7 @@ STATIC void mbedtls_debug(void *ctx, int level, const char *file, int line, cons #define DEBUG_PRINT(...) do {} while (0) #endif -STATIC NORETURN void mbedtls_raise_error(int err) { +static NORETURN void mbedtls_raise_error(int err) { // _mbedtls_ssl_send and _mbedtls_ssl_recv (below) turn positive error codes from the // underlying socket into negative codes to pass them through mbedtls. Here we turn them // positive again so they get interpreted as the OSError they really are. The @@ -90,7 +90,7 @@ STATIC NORETURN void mbedtls_raise_error(int err) { // it is not OK to exit them by raising an exception (nlr_jump'ing through // foreign code is not permitted). Instead, preserve the error number of any OSError // and turn anything else into -MP_EINVAL. -STATIC int call_method_errno(size_t n_args, const mp_obj_t *args) { +static int call_method_errno(size_t n_args, const mp_obj_t *args) { nlr_buf_t nlr; mp_int_t result = -MP_EINVAL; if (nlr_push(&nlr) == 0) { @@ -168,7 +168,7 @@ static mp_obj_t ssl_socket_accept(ssl_sslsocket_obj_t *self) { return mp_call_method_n_kw(0, 0, self->accept_args); } -STATIC int _mbedtls_ssl_send(void *ctx, const byte *buf, size_t len) { +static int _mbedtls_ssl_send(void *ctx, const byte *buf, size_t len) { ssl_sslsocket_obj_t *self = (ssl_sslsocket_obj_t *)ctx; mp_int_t out_sz = ssl_socket_send(self, buf, len); @@ -183,7 +183,7 @@ STATIC int _mbedtls_ssl_send(void *ctx, const byte *buf, size_t len) { return out_sz; } -STATIC int _mbedtls_ssl_recv(void *ctx, byte *buf, size_t len) { +static int _mbedtls_ssl_recv(void *ctx, byte *buf, size_t len) { ssl_sslsocket_obj_t *self = (ssl_sslsocket_obj_t *)ctx; mp_int_t out_sz = ssl_socket_recv_into(self, buf, len); @@ -376,7 +376,7 @@ void common_hal_ssl_sslsocket_close(ssl_sslsocket_obj_t *self) { mbedtls_entropy_free(&self->entropy); } -STATIC void do_handshake(ssl_sslsocket_obj_t *self) { +static void do_handshake(ssl_sslsocket_obj_t *self) { int ret; while ((ret = mbedtls_ssl_handshake(&self->ssl)) != 0) { if (ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE) { diff --git a/shared-module/storage/__init__.c b/shared-module/storage/__init__.c index e859d41094185..12486aff752f3 100644 --- a/shared-module/storage/__init__.c +++ b/shared-module/storage/__init__.c @@ -131,7 +131,7 @@ bool common_hal_storage_enable_usb_drive(void) { } #endif // CIRCUITPY_USB_MSC -STATIC mp_obj_t mp_vfs_proxy_call(mp_vfs_mount_t *vfs, qstr meth_name, size_t n_args, const mp_obj_t *args) { +static mp_obj_t mp_vfs_proxy_call(mp_vfs_mount_t *vfs, qstr meth_name, size_t n_args, const mp_obj_t *args) { if (vfs == MP_VFS_NONE) { // mount point not found mp_raise_OSError(MP_ENODEV); @@ -223,7 +223,7 @@ void common_hal_storage_umount_object(mp_obj_t vfs_obj) { mp_vfs_proxy_call(vfs, MP_QSTR_umount, 0, NULL); } -STATIC mp_obj_t storage_object_from_path(const char *mount_path) { +static mp_obj_t storage_object_from_path(const char *mount_path) { for (mp_vfs_mount_t **vfsp = &MP_STATE_VM(vfs_mount_table); *vfsp != NULL; vfsp = &(*vfsp)->next) { if (strcmp(mount_path, (*vfsp)->str) == 0) { return (*vfsp)->obj; diff --git a/shared-module/struct/__init__.c b/shared-module/struct/__init__.c index 57468044e429f..715b504302115 100644 --- a/shared-module/struct/__init__.c +++ b/shared-module/struct/__init__.c @@ -13,7 +13,7 @@ #include "py/parsenum.h" #include "shared-bindings/struct/__init__.h" -STATIC void struct_validate_format(char fmt) { +static void struct_validate_format(char fmt) { #if MICROPY_NONSTANDARD_TYPECODES if (fmt == 'S' || fmt == 'O') { mp_raise_RuntimeError(MP_ERROR_TEXT("'S' and 'O' are not supported format types")); @@ -21,7 +21,7 @@ STATIC void struct_validate_format(char fmt) { #endif } -STATIC char get_fmt_type(const char **fmt) { +static char get_fmt_type(const char **fmt) { char t = **fmt; switch (t) { case '!': @@ -40,7 +40,7 @@ STATIC char get_fmt_type(const char **fmt) { return t; } -STATIC mp_uint_t get_fmt_num(const char **p) { +static mp_uint_t get_fmt_num(const char **p) { const char *num = *p; uint len = 1; while (unichar_isdigit(*++num)) { @@ -51,7 +51,7 @@ STATIC mp_uint_t get_fmt_num(const char **p) { return val; } -STATIC mp_uint_t calcsize_items(const char *fmt) { +static mp_uint_t calcsize_items(const char *fmt) { mp_uint_t cnt = 0; while (*fmt) { int num = 1; diff --git a/shared-module/synthio/Biquad.c b/shared-module/synthio/Biquad.c index f821d583812c5..366d516455224 100644 --- a/shared-module/synthio/Biquad.c +++ b/shared-module/synthio/Biquad.c @@ -75,7 +75,7 @@ mp_obj_t common_hal_synthio_new_bpf(mp_float_t w0, mp_float_t Q) { } #define BIQUAD_SHIFT (15) -STATIC int32_t biquad_scale_arg_obj(mp_obj_t arg) { +static int32_t biquad_scale_arg_obj(mp_obj_t arg) { return (int32_t)MICROPY_FLOAT_C_FUN(round)(MICROPY_FLOAT_C_FUN(ldexp)(mp_obj_get_float(arg), BIQUAD_SHIFT)); } void synthio_biquad_filter_assign(biquad_filter_state *st, mp_obj_t biquad_obj) { diff --git a/shared-module/synthio/MidiTrack.c b/shared-module/synthio/MidiTrack.c index 9c70bbb009e02..2391a8bb7c7cd 100644 --- a/shared-module/synthio/MidiTrack.c +++ b/shared-module/synthio/MidiTrack.c @@ -8,12 +8,12 @@ #include "shared-bindings/synthio/MidiTrack.h" -STATIC void record_midi_stream_error(synthio_miditrack_obj_t *self) { +static void record_midi_stream_error(synthio_miditrack_obj_t *self) { self->error_location = self->pos; self->pos = self->track.len; } -STATIC mp_obj_t parse_note(synthio_miditrack_obj_t *self) { +static mp_obj_t parse_note(synthio_miditrack_obj_t *self) { uint8_t *buffer = self->track.buf; size_t len = self->track.len; if (self->pos + 1 >= len) { @@ -84,7 +84,7 @@ static void decode_until_pause(synthio_miditrack_obj_t *self) { } while (self->pos < len && self->synth.span.dur == 0); } -STATIC void start_parse(synthio_miditrack_obj_t *self) { +static void start_parse(synthio_miditrack_obj_t *self) { self->pos = 0; self->error_location = -1; self->synth.span.dur = decode_duration(self); diff --git a/shared-module/synthio/Note.c b/shared-module/synthio/Note.c index 724ca8c411831..49dfbb7f429d3 100644 --- a/shared-module/synthio/Note.c +++ b/shared-module/synthio/Note.c @@ -176,9 +176,9 @@ void synthio_note_start(synthio_note_obj_t *self, int32_t sample_rate) { #define BEND_SCALE (32768) #define BEND_OFFSET (BEND_SCALE) -STATIC uint16_t pitch_bend_table[] = { 0, 1948, 4013, 6200, 8517, 10972, 13573, 16329, 19248, 22341, 25618, 29090, 32768 }; +static uint16_t pitch_bend_table[] = { 0, 1948, 4013, 6200, 8517, 10972, 13573, 16329, 19248, 22341, 25618, 29090, 32768 }; -STATIC uint32_t pitch_bend(uint32_t frequency_scaled, int32_t bend_value) { +static uint32_t pitch_bend(uint32_t frequency_scaled, int32_t bend_value) { int octave = bend_value >> 15; bend_value &= 0x7fff; uint32_t bend_value_semitone = (uint32_t)bend_value * 24; // 65536/semitone diff --git a/shared-module/synthio/Synthesizer.c b/shared-module/synthio/Synthesizer.c index 44d6aa93c5768..e4b343f6ba215 100644 --- a/shared-module/synthio/Synthesizer.c +++ b/shared-module/synthio/Synthesizer.c @@ -80,11 +80,11 @@ void common_hal_synthio_synthesizer_release_all(synthio_synthesizer_obj_t *self) } } -STATIC bool is_note(mp_obj_t note_in) { +static bool is_note(mp_obj_t note_in) { return mp_obj_is_small_int(note_in) || mp_obj_is_type(note_in, &synthio_note_type); } -STATIC mp_obj_t validate_note(mp_obj_t note_in) { +static mp_obj_t validate_note(mp_obj_t note_in) { if (mp_obj_is_small_int(note_in)) { mp_arg_validate_int_range(mp_obj_get_int(note_in), 0, 127, MP_QSTR_note); } else { diff --git a/shared-module/synthio/__init__.c b/shared-module/synthio/__init__.c index e86d737a02e7e..630c3de86988c 100644 --- a/shared-module/synthio/__init__.c +++ b/shared-module/synthio/__init__.c @@ -16,13 +16,13 @@ mp_float_t synthio_global_rate_scale; uint8_t synthio_global_tick; -STATIC const int16_t square_wave[] = {-32768, 32767}; +static const int16_t square_wave[] = {-32768, 32767}; -STATIC const uint16_t notes[] = {8372, 8870, 9397, 9956, 10548, 11175, 11840, +static const uint16_t notes[] = {8372, 8870, 9397, 9956, 10548, 11175, 11840, 12544, 13290, 14080, 14917, 15804}; // 9th octave -STATIC int64_t round_float_to_int64(mp_float_t f) { +static int64_t round_float_to_int64(mp_float_t f) { return (int64_t)(f + MICROPY_FLOAT_CONST(0.5)); } @@ -34,7 +34,7 @@ mp_float_t common_hal_synthio_voct_to_hz_float(mp_float_t octave) { return notes[0] * MICROPY_FLOAT_C_FUN(pow)(2., octave - 7); } -STATIC int16_t convert_time_to_rate(uint32_t sample_rate, mp_obj_t time_in, int16_t difference) { +static int16_t convert_time_to_rate(uint32_t sample_rate, mp_obj_t time_in, int16_t difference) { mp_float_t time = mp_obj_get_float(time_in); int num_samples = (int)MICROPY_FLOAT_C_FUN(round)(time * sample_rate); if (num_samples == 0) { @@ -75,7 +75,7 @@ void synthio_envelope_definition_set(synthio_envelope_definition_t *envelope, mp : envelope->attack_level); } -STATIC void synthio_envelope_state_step(synthio_envelope_state_t *state, synthio_envelope_definition_t *def, size_t n_steps) { +static void synthio_envelope_state_step(synthio_envelope_state_t *state, synthio_envelope_definition_t *def, size_t n_steps) { state->substep += n_steps; while (state->substep >= SYNTHIO_MAX_DUR) { // max n_steps should be SYNTHIO_MAX_DUR so this loop executes at most @@ -102,7 +102,7 @@ STATIC void synthio_envelope_state_step(synthio_envelope_state_t *state, synthio } } -STATIC void synthio_envelope_state_init(synthio_envelope_state_t *state, synthio_envelope_definition_t *def) { +static void synthio_envelope_state_init(synthio_envelope_state_t *state, synthio_envelope_definition_t *def) { state->level = 0; state->substep = 0; state->state = SYNTHIO_ENVELOPE_STATE_ATTACK; @@ -110,11 +110,11 @@ STATIC void synthio_envelope_state_init(synthio_envelope_state_t *state, synthio synthio_envelope_state_step(state, def, SYNTHIO_MAX_DUR); } -STATIC void synthio_envelope_state_release(synthio_envelope_state_t *state, synthio_envelope_definition_t *def) { +static void synthio_envelope_state_release(synthio_envelope_state_t *state, synthio_envelope_definition_t *def) { state->state = SYNTHIO_ENVELOPE_STATE_RELEASE; } -STATIC synthio_envelope_definition_t *synthio_synth_get_note_envelope(synthio_synth_t *synth, mp_obj_t note_obj) { +static synthio_envelope_definition_t *synthio_synth_get_note_envelope(synthio_synth_t *synth, mp_obj_t note_obj) { synthio_envelope_definition_t *def = &synth->global_envelope_definition; if (!mp_obj_is_small_int(note_obj)) { synthio_note_obj_t *note = MP_OBJ_TO_PTR(note_obj); @@ -142,7 +142,7 @@ STATIC synthio_envelope_definition_t *synthio_synth_get_note_envelope(synthio_sy // much additional processing. // // https://en.wikipedia.org/wiki/Dynamic_range_compression -STATIC +static int16_t mix_down_sample(int32_t sample) { if (sample < RANGE_LOW) { sample = (((sample - RANGE_LOW) * RANGE_SCALE) >> RANGE_SHIFT) + RANGE_LOW; @@ -267,7 +267,7 @@ static bool synth_note_into_buffer(synthio_synth_t *synth, int chan, int32_t *ou return true; } -STATIC mp_obj_t synthio_synth_get_note_filter(mp_obj_t note_obj) { +static mp_obj_t synthio_synth_get_note_filter(mp_obj_t note_obj) { if (note_obj == mp_const_none) { return mp_const_none; } @@ -278,7 +278,7 @@ STATIC mp_obj_t synthio_synth_get_note_filter(mp_obj_t note_obj) { return mp_const_none; } -STATIC void sum_with_loudness(int32_t *out_buffer32, int32_t *tmp_buffer32, int16_t loudness[2], size_t dur, int synth_chan) { +static void sum_with_loudness(int32_t *out_buffer32, int32_t *tmp_buffer32, int16_t loudness[2], size_t dur, int synth_chan) { if (synth_chan == 1) { for (size_t i = 0; i < dur; i++) { *out_buffer32++ += (*tmp_buffer32++ *loudness[0]) >> 16; @@ -417,7 +417,7 @@ void synthio_synth_get_buffer_structure(synthio_synth_t *synth, bool single_chan } } -STATIC void parse_common(mp_buffer_info_t *bufinfo, mp_obj_t o, int16_t what, mp_int_t max_len) { +static void parse_common(mp_buffer_info_t *bufinfo, mp_obj_t o, int16_t what, mp_int_t max_len) { if (o != mp_const_none) { mp_get_buffer_raise(o, bufinfo, MP_BUFFER_READ); if (bufinfo->typecode != 'h') { @@ -433,7 +433,7 @@ void synthio_synth_parse_waveform(mp_buffer_info_t *bufinfo_waveform, mp_obj_t w parse_common(bufinfo_waveform, waveform_obj, MP_QSTR_waveform, SYNTHIO_WAVEFORM_SIZE); } -STATIC int find_channel_with_note(synthio_synth_t *synth, mp_obj_t note) { +static int find_channel_with_note(synthio_synth_t *synth, mp_obj_t note) { for (int i = 0; i < CIRCUITPY_SYNTHIO_MAX_CHANNELS; i++) { if (synth->span.note_obj[i] == note) { return i; diff --git a/shared-module/usb/core/Device.c b/shared-module/usb/core/Device.c index b7cbee9192ce8..4ed0d410523e4 100644 --- a/shared-module/usb/core/Device.c +++ b/shared-module/usb/core/Device.c @@ -18,7 +18,7 @@ // Track what device numbers are mounted. We can't use tuh_ready() because it is // true before enumeration completes and TinyUSB drivers are started. -STATIC size_t _mounted_devices = 0; +static size_t _mounted_devices = 0; void tuh_mount_cb(uint8_t dev_addr) { _mounted_devices |= 1 << dev_addr; @@ -28,8 +28,8 @@ void tuh_umount_cb(uint8_t dev_addr) { _mounted_devices &= ~(1 << dev_addr); } -STATIC xfer_result_t _xfer_result; -STATIC size_t _actual_len; +static xfer_result_t _xfer_result; +static size_t _actual_len; bool common_hal_usb_core_device_construct(usb_core_device_obj_t *self, uint8_t device_number) { if (!tuh_inited()) { mp_raise_RuntimeError(MP_ERROR_TEXT("No usb host port initialized")); @@ -61,7 +61,7 @@ uint16_t common_hal_usb_core_device_get_idProduct(usb_core_device_obj_t *self) { return pid; } -STATIC void _transfer_done_cb(tuh_xfer_t *xfer) { +static void _transfer_done_cb(tuh_xfer_t *xfer) { // Store the result so we stop waiting for the transfer. _xfer_result = xfer->result; // The passed in xfer is not the original one we passed in, so we need to @@ -69,7 +69,7 @@ STATIC void _transfer_done_cb(tuh_xfer_t *xfer) { _actual_len = xfer->actual_len; } -STATIC bool _wait_for_callback(void) { +static bool _wait_for_callback(void) { while (!mp_hal_is_interrupted() && _xfer_result == 0xff) { // The background tasks include TinyUSB which will call the function @@ -81,7 +81,7 @@ STATIC bool _wait_for_callback(void) { return result == XFER_RESULT_SUCCESS; } -STATIC mp_obj_t _get_string(const uint16_t *temp_buf) { +static mp_obj_t _get_string(const uint16_t *temp_buf) { size_t utf16_len = ((temp_buf[0] & 0xff) - 2) / sizeof(uint16_t); if (utf16_len == 0) { return mp_const_none; @@ -89,7 +89,7 @@ STATIC mp_obj_t _get_string(const uint16_t *temp_buf) { return utf16le_to_string(temp_buf + 1, utf16_len); } -STATIC void _get_langid(usb_core_device_obj_t *self) { +static void _get_langid(usb_core_device_obj_t *self) { if (self->first_langid != 0) { return; } @@ -155,7 +155,7 @@ void common_hal_usb_core_device_set_configuration(usb_core_device_obj_t *self, m _wait_for_callback(); } -STATIC size_t _xfer(tuh_xfer_t *xfer, mp_int_t timeout) { +static size_t _xfer(tuh_xfer_t *xfer, mp_int_t timeout) { _xfer_result = 0xff; xfer->complete_cb = _transfer_done_cb; if (!tuh_edpt_xfer(xfer)) { @@ -189,7 +189,7 @@ STATIC size_t _xfer(tuh_xfer_t *xfer, mp_int_t timeout) { return 0; } -STATIC bool _open_endpoint(usb_core_device_obj_t *self, mp_int_t endpoint) { +static bool _open_endpoint(usb_core_device_obj_t *self, mp_int_t endpoint) { bool endpoint_open = false; size_t open_size = sizeof(self->open_endpoints); size_t first_free = open_size; diff --git a/shared-module/usb/utf16le.c b/shared-module/usb/utf16le.c index 8c7208a3325a4..358b7615f4934 100644 --- a/shared-module/usb/utf16le.c +++ b/shared-module/usb/utf16le.c @@ -11,14 +11,14 @@ typedef struct { size_t len; } utf16_str; -STATIC uint32_t utf16str_peek_unit(utf16_str *utf) { +static uint32_t utf16str_peek_unit(utf16_str *utf) { if (!utf->len) { return 0; } return *utf->buf; } -STATIC uint32_t utf16str_next_unit(utf16_str *utf) { +static uint32_t utf16str_next_unit(utf16_str *utf) { uint32_t result = utf16str_peek_unit(utf); if (utf->len) { utf->len--; @@ -26,7 +26,7 @@ STATIC uint32_t utf16str_next_unit(utf16_str *utf) { } return result; } -STATIC uint32_t utf16str_next_codepoint(utf16_str *utf) { +static uint32_t utf16str_next_codepoint(utf16_str *utf) { uint32_t unichr = utf16str_next_unit(utf); if (unichr >= 0xd800 && unichr < 0xdc00) { uint32_t low_surrogate = utf16str_peek_unit(utf); @@ -38,7 +38,7 @@ STATIC uint32_t utf16str_next_codepoint(utf16_str *utf) { return unichr; } -STATIC void _convert_utf16le_to_utf8(vstr_t *vstr, utf16_str *utf) { +static void _convert_utf16le_to_utf8(vstr_t *vstr, utf16_str *utf) { while (utf->len) { vstr_add_char(vstr, utf16str_next_codepoint(utf)); } diff --git a/shared-module/usb_hid/Device.c b/shared-module/usb_hid/Device.c index 82393ba602f09..437f5e6c57155 100644 --- a/shared-module/usb_hid/Device.c +++ b/shared-module/usb_hid/Device.c @@ -146,7 +146,7 @@ const usb_hid_device_obj_t usb_hid_device_consumer_control_obj = { char *custom_usb_hid_interface_name; -STATIC size_t get_report_id_idx(usb_hid_device_obj_t *self, size_t report_id) { +static size_t get_report_id_idx(usb_hid_device_obj_t *self, size_t report_id) { for (size_t i = 0; i < self->num_report_ids; i++) { if (report_id == self->report_ids[i]) { return i; diff --git a/shared-module/usb_video/__init__.c b/shared-module/usb_video/__init__.c index 98298f722fb57..241c9d768f843 100644 --- a/shared-module/usb_video/__init__.c +++ b/shared-module/usb_video/__init__.c @@ -142,7 +142,7 @@ size_t usb_video_add_descriptor(uint8_t *descriptor_buf, descriptor_counts_t *de background_callback_t usb_video_cb; -STATIC void usb_video_cb_fun(void *unused) { +static void usb_video_cb_fun(void *unused) { (void)unused; static unsigned start_ms = 0; diff --git a/shared/runtime/context_manager_helpers.c b/shared/runtime/context_manager_helpers.c index df8f2d41bec9f..56955da089c32 100644 --- a/shared/runtime/context_manager_helpers.c +++ b/shared/runtime/context_manager_helpers.c @@ -8,7 +8,7 @@ #include "py/obj.h" -STATIC mp_obj_t default___enter__(mp_obj_t self_in) { +static mp_obj_t default___enter__(mp_obj_t self_in) { return self_in; } MP_DEFINE_CONST_FUN_OBJ_1(default___enter___obj, default___enter__); diff --git a/supervisor/shared/background_callback.c b/supervisor/shared/background_callback.c index dc0560c50a526..309210b7a12ae 100644 --- a/supervisor/shared/background_callback.c +++ b/supervisor/shared/background_callback.c @@ -14,7 +14,7 @@ #include "supervisor/shared/tick.h" #include "shared-bindings/microcontroller/__init__.h" -STATIC volatile background_callback_t *volatile callback_head, *volatile callback_tail; +static volatile background_callback_t *volatile callback_head, *volatile callback_tail; #ifndef CALLBACK_CRITICAL_BEGIN #define CALLBACK_CRITICAL_BEGIN (common_hal_mcu_disable_interrupts()) diff --git a/supervisor/shared/bluetooth/bluetooth.c b/supervisor/shared/bluetooth/bluetooth.c index 920e88b4a3353..b1b116b9c01f9 100644 --- a/supervisor/shared/bluetooth/bluetooth.c +++ b/supervisor/shared/bluetooth/bluetooth.c @@ -65,22 +65,22 @@ const uint8_t private_advertising_data[] = { 0x02, 0x01, 0x06, // 0-2 Flags uint8_t circuitpython_scan_response_data[31]; #if CIRCUITPY_BLE_FILE_SERVICE || CIRCUITPY_SERIAL_BLE -STATIC bool boot_in_discovery_mode = false; -STATIC bool advertising = false; -STATIC bool _private_advertising = false; -STATIC bool ble_started = false; +static bool boot_in_discovery_mode = false; +static bool advertising = false; +static bool _private_advertising = false; +static bool ble_started = false; #define WORKFLOW_UNSET 0 #define WORKFLOW_ENABLED 1 #define WORKFLOW_DISABLED 2 -STATIC uint8_t workflow_state = WORKFLOW_UNSET; -STATIC bool was_connected = false; +static uint8_t workflow_state = WORKFLOW_UNSET; +static bool was_connected = false; #if CIRCUITPY_STATUS_BAR // To detect when the title bar changes. -STATIC bool _last_connected = false; -STATIC bool _last_advertising = false; +static bool _last_connected = false; +static bool _last_advertising = false; #endif #if CIRCUITPY_STATUS_BAR @@ -113,7 +113,7 @@ void supervisor_bluetooth_status(void) { } #endif -STATIC void supervisor_bluetooth_start_advertising(void) { +static void supervisor_bluetooth_start_advertising(void) { if (workflow_state != WORKFLOW_ENABLED) { return; } diff --git a/supervisor/shared/bluetooth/file_transfer.c b/supervisor/shared/bluetooth/file_transfer.c index 1157b231bb577..de21d7e71e95b 100644 --- a/supervisor/shared/bluetooth/file_transfer.c +++ b/supervisor/shared/bluetooth/file_transfer.c @@ -23,26 +23,26 @@ #include "supervisor/shared/bluetooth/file_transfer_protocol.h" #include "supervisor/shared/workflow.h" -STATIC bleio_service_obj_t supervisor_ble_service; -STATIC bleio_uuid_obj_t supervisor_ble_service_uuid; -STATIC bleio_characteristic_obj_t supervisor_ble_version_characteristic; -STATIC bleio_uuid_obj_t supervisor_ble_version_uuid; -STATIC bleio_characteristic_obj_t supervisor_ble_transfer_characteristic; -STATIC bleio_uuid_obj_t supervisor_ble_transfer_uuid; +static bleio_service_obj_t supervisor_ble_service; +static bleio_uuid_obj_t supervisor_ble_service_uuid; +static bleio_characteristic_obj_t supervisor_ble_version_characteristic; +static bleio_uuid_obj_t supervisor_ble_version_uuid; +static bleio_characteristic_obj_t supervisor_ble_transfer_characteristic; +static bleio_uuid_obj_t supervisor_ble_transfer_uuid; // This is the base UUID for the file transfer service. const uint8_t file_transfer_base_uuid[16] = {0x72, 0x65, 0x66, 0x73, 0x6e, 0x61, 0x72, 0x54, 0x65, 0x6c, 0x69, 0x46, 0x00, 0x00, 0xaf, 0xad }; -STATIC mp_obj_list_t characteristic_list; -STATIC mp_obj_t characteristic_list_items[2]; +static mp_obj_list_t characteristic_list; +static mp_obj_t characteristic_list_items[2]; // 2 * 10 ringbuf packets, 512 for a disk sector and 12 for the file transfer write header. #define PACKET_BUFFER_SIZE (2 * 10 + 512 + 12) // uint32_t so its aligned -STATIC uint32_t _buffer[PACKET_BUFFER_SIZE / 4 + 1]; -STATIC uint32_t _outgoing1[BLE_GATTS_VAR_ATTR_LEN_MAX / 4]; -STATIC uint32_t _outgoing2[BLE_GATTS_VAR_ATTR_LEN_MAX / 4]; -STATIC ble_drv_evt_handler_entry_t static_handler_entry; -STATIC bleio_packet_buffer_obj_t _transfer_packet_buffer; +static uint32_t _buffer[PACKET_BUFFER_SIZE / 4 + 1]; +static uint32_t _outgoing1[BLE_GATTS_VAR_ATTR_LEN_MAX / 4]; +static uint32_t _outgoing2[BLE_GATTS_VAR_ATTR_LEN_MAX / 4]; +static ble_drv_evt_handler_entry_t static_handler_entry; +static bleio_packet_buffer_obj_t _transfer_packet_buffer; void supervisor_start_bluetooth_file_transfer(void) { supervisor_ble_service_uuid.base.type = &bleio_uuid_type; @@ -108,7 +108,7 @@ void supervisor_start_bluetooth_file_transfer(void) { // FATFS has a two second timestamp resolution but the BLE API allows for nanosecond resolution. // This function truncates the time the time to a resolution storable by FATFS and fills in the // FATFS encoded version into fattime. -STATIC uint64_t truncate_time(uint64_t input_time, DWORD *fattime) { +static uint64_t truncate_time(uint64_t input_time, DWORD *fattime) { timeutils_struct_time_t tm; uint64_t seconds_since_epoch = timeutils_seconds_since_epoch_from_nanoseconds_since_1970(input_time); timeutils_seconds_since_epoch_to_struct_time(seconds_since_epoch, &tm); @@ -120,9 +120,9 @@ STATIC uint64_t truncate_time(uint64_t input_time, DWORD *fattime) { } // Used by read and write. -STATIC FIL active_file; -STATIC fs_user_mount_t *active_mount; -STATIC uint8_t _process_read(const uint8_t *raw_buf, size_t command_len) { +static FIL active_file; +static fs_user_mount_t *active_mount; +static uint8_t _process_read(const uint8_t *raw_buf, size_t command_len) { struct read_command *command = (struct read_command *)raw_buf; size_t header_size = sizeof(struct read_command); size_t response_size = sizeof(struct read_data); @@ -187,7 +187,7 @@ STATIC uint8_t _process_read(const uint8_t *raw_buf, size_t command_len) { return READ_PACING; } -STATIC uint8_t _process_read_pacing(const uint8_t *raw_buf, size_t command_len) { +static uint8_t _process_read_pacing(const uint8_t *raw_buf, size_t command_len) { struct read_pacing *command = (struct read_pacing *)raw_buf; struct read_data response; response.command = READ_DATA; @@ -226,10 +226,10 @@ STATIC uint8_t _process_read_pacing(const uint8_t *raw_buf, size_t command_len) } // Used by write and write data to know when the write is complete. -STATIC size_t total_write_length; -STATIC uint64_t _truncated_time; +static size_t total_write_length; +static uint64_t _truncated_time; -STATIC uint8_t _process_write(const uint8_t *raw_buf, size_t command_len) { +static uint8_t _process_write(const uint8_t *raw_buf, size_t command_len) { struct write_command *command = (struct write_command *)raw_buf; size_t header_size = sizeof(struct write_command); struct write_pacing response; @@ -301,7 +301,7 @@ STATIC uint8_t _process_write(const uint8_t *raw_buf, size_t command_len) { return WRITE_DATA; } -STATIC uint8_t _process_write_data(const uint8_t *raw_buf, size_t command_len) { +static uint8_t _process_write_data(const uint8_t *raw_buf, size_t command_len) { struct write_data *command = (struct write_data *)raw_buf; size_t header_size = sizeof(struct write_data); struct write_pacing response; @@ -350,7 +350,7 @@ STATIC uint8_t _process_write_data(const uint8_t *raw_buf, size_t command_len) { return WRITE_DATA; } -STATIC uint8_t _process_delete(const uint8_t *raw_buf, size_t command_len) { +static uint8_t _process_delete(const uint8_t *raw_buf, size_t command_len) { const struct delete_command *command = (struct delete_command *)raw_buf; size_t header_size = sizeof(struct delete_command); struct delete_status response; @@ -388,7 +388,7 @@ STATIC uint8_t _process_delete(const uint8_t *raw_buf, size_t command_len) { // NULL-terminate the path and remove any trailing /. Older versions of the // protocol require it but newer ones do not. -STATIC void _terminate_path(char *path, size_t path_length) { +static void _terminate_path(char *path, size_t path_length) { // -1 because fatfs doesn't want a trailing / if (path[path_length - 1] == '/') { path[path_length - 1] = '\0'; @@ -397,7 +397,7 @@ STATIC void _terminate_path(char *path, size_t path_length) { } } -STATIC uint8_t _process_mkdir(const uint8_t *raw_buf, size_t command_len) { +static uint8_t _process_mkdir(const uint8_t *raw_buf, size_t command_len) { const struct mkdir_command *command = (struct mkdir_command *)raw_buf; size_t header_size = sizeof(struct mkdir_command); struct mkdir_status response; @@ -430,7 +430,7 @@ STATIC uint8_t _process_mkdir(const uint8_t *raw_buf, size_t command_len) { return ANY_COMMAND; } -STATIC void send_listdir_entry_header(const struct listdir_entry *entry, mp_int_t max_packet_size) { +static void send_listdir_entry_header(const struct listdir_entry *entry, mp_int_t max_packet_size) { mp_int_t response_size = sizeof(struct listdir_entry); if (max_packet_size >= response_size) { common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, (const uint8_t *)entry, response_size, NULL, 0); @@ -441,7 +441,7 @@ STATIC void send_listdir_entry_header(const struct listdir_entry *entry, mp_int_ common_hal_bleio_packet_buffer_write(&_transfer_packet_buffer, ((const uint8_t *)entry) + 16, response_size - 16, NULL, 0); } -STATIC uint8_t _process_listdir(uint8_t *raw_buf, size_t command_len) { +static uint8_t _process_listdir(uint8_t *raw_buf, size_t command_len) { const struct listdir_command *command = (struct listdir_command *)raw_buf; struct listdir_entry *entry = (struct listdir_entry *)raw_buf; size_t header_size = sizeof(struct listdir_command); @@ -540,7 +540,7 @@ STATIC uint8_t _process_listdir(uint8_t *raw_buf, size_t command_len) { return ANY_COMMAND; } -STATIC uint8_t _process_move(const uint8_t *raw_buf, size_t command_len) { +static uint8_t _process_move(const uint8_t *raw_buf, size_t command_len) { const struct move_command *command = (struct move_command *)raw_buf; size_t header_size = sizeof(struct move_command); struct move_status response; @@ -581,10 +581,10 @@ STATIC uint8_t _process_move(const uint8_t *raw_buf, size_t command_len) { // Background state that must live across background calls. After the _process // helpers to force them to not use them. -STATIC uint8_t current_command[COMMAND_SIZE] __attribute__ ((aligned(4))); -STATIC volatile size_t current_offset; -STATIC uint8_t next_command; -STATIC bool running = false; +static uint8_t current_command[COMMAND_SIZE] __attribute__ ((aligned(4))); +static volatile size_t current_offset; +static uint8_t next_command; +static bool running = false; void supervisor_bluetooth_file_transfer_background(void) { if (running) { return; diff --git a/supervisor/shared/bluetooth/serial.c b/supervisor/shared/bluetooth/serial.c index 09428939ce550..179bd23cacfb5 100644 --- a/supervisor/shared/bluetooth/serial.c +++ b/supervisor/shared/bluetooth/serial.c @@ -21,31 +21,31 @@ #include "py/mpstate.h" -STATIC bleio_service_obj_t supervisor_ble_circuitpython_service; -STATIC bleio_uuid_obj_t supervisor_ble_circuitpython_service_uuid; -STATIC bleio_characteristic_obj_t supervisor_ble_circuitpython_rx_characteristic; -STATIC bleio_uuid_obj_t supervisor_ble_circuitpython_rx_uuid; -STATIC bleio_characteristic_obj_t supervisor_ble_circuitpython_tx_characteristic; -STATIC bleio_uuid_obj_t supervisor_ble_circuitpython_tx_uuid; -STATIC bleio_characteristic_obj_t supervisor_ble_circuitpython_version_characteristic; -STATIC bleio_uuid_obj_t supervisor_ble_circuitpython_version_uuid; +static bleio_service_obj_t supervisor_ble_circuitpython_service; +static bleio_uuid_obj_t supervisor_ble_circuitpython_service_uuid; +static bleio_characteristic_obj_t supervisor_ble_circuitpython_rx_characteristic; +static bleio_uuid_obj_t supervisor_ble_circuitpython_rx_uuid; +static bleio_characteristic_obj_t supervisor_ble_circuitpython_tx_characteristic; +static bleio_uuid_obj_t supervisor_ble_circuitpython_tx_uuid; +static bleio_characteristic_obj_t supervisor_ble_circuitpython_version_characteristic; +static bleio_uuid_obj_t supervisor_ble_circuitpython_version_uuid; // This is the base UUID for the CircuitPython service. const uint8_t circuitpython_base_uuid[16] = {0x6e, 0x68, 0x74, 0x79, 0x50, 0x74, 0x69, 0x75, 0x63, 0x72, 0x69, 0x43, 0x00, 0x00, 0xaf, 0xad }; -STATIC mp_obj_list_t characteristic_list; -STATIC mp_obj_t characteristic_list_items[3]; +static mp_obj_list_t characteristic_list; +static mp_obj_t characteristic_list_items[3]; -STATIC uint32_t _outgoing1[BLE_GATTS_VAR_ATTR_LEN_MAX / 4]; -STATIC uint32_t _outgoing2[BLE_GATTS_VAR_ATTR_LEN_MAX / 4]; -STATIC ble_drv_evt_handler_entry_t rx_static_handler_entry; -STATIC ble_drv_evt_handler_entry_t tx_static_handler_entry; -STATIC bleio_packet_buffer_obj_t _tx_packet_buffer; -STATIC uint32_t _incoming[64]; -STATIC bleio_characteristic_buffer_obj_t _rx_buffer; +static uint32_t _outgoing1[BLE_GATTS_VAR_ATTR_LEN_MAX / 4]; +static uint32_t _outgoing2[BLE_GATTS_VAR_ATTR_LEN_MAX / 4]; +static ble_drv_evt_handler_entry_t rx_static_handler_entry; +static ble_drv_evt_handler_entry_t tx_static_handler_entry; +static bleio_packet_buffer_obj_t _tx_packet_buffer; +static uint32_t _incoming[64]; +static bleio_characteristic_buffer_obj_t _rx_buffer; // Internal enabling so we can disable while printing BLE debugging. -STATIC bool _enabled; +static bool _enabled; void supervisor_start_bluetooth_serial(void) { supervisor_ble_circuitpython_service_uuid.base.type = &bleio_uuid_type; diff --git a/supervisor/shared/external_flash/external_flash.c b/supervisor/shared/external_flash/external_flash.c index 0b2a02c2d28b1..b029286fa418e 100644 --- a/supervisor/shared/external_flash/external_flash.c +++ b/supervisor/shared/external_flash/external_flash.c @@ -25,7 +25,7 @@ // The currently cached sector in the cache, ram or flash based. static uint32_t current_sector; -STATIC const external_flash_device possible_devices[] = {EXTERNAL_FLASH_DEVICES}; +static const external_flash_device possible_devices[] = {EXTERNAL_FLASH_DEVICES}; #define EXTERNAL_FLASH_DEVICE_COUNT MP_ARRAY_SIZE(possible_devices) static const external_flash_device *flash_device = NULL; diff --git a/supervisor/shared/flash.c b/supervisor/shared/flash.c index 4af62cb30c2a4..37fba60ae8b34 100644 --- a/supervisor/shared/flash.c +++ b/supervisor/shared/flash.c @@ -17,9 +17,9 @@ // there is a singleton Flash object const mp_obj_type_t supervisor_flash_type; -STATIC const mp_obj_base_t supervisor_flash_obj = {&supervisor_flash_type}; +static const mp_obj_base_t supervisor_flash_obj = {&supervisor_flash_type}; -STATIC mp_obj_t supervisor_flash_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { +static mp_obj_t supervisor_flash_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { // check arguments mp_arg_check_num(n_args, n_kw, 0, 0, false); @@ -127,23 +127,23 @@ void PLACE_IN_ITCM(supervisor_flash_flush)(void) { filesystem_dirty = false; } -STATIC mp_obj_t supervisor_flash_obj_readblocks(mp_obj_t self, mp_obj_t block_num, mp_obj_t buf) { +static mp_obj_t supervisor_flash_obj_readblocks(mp_obj_t self, mp_obj_t block_num, mp_obj_t buf) { mp_buffer_info_t bufinfo; mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_WRITE); mp_uint_t ret = flash_read_blocks(self, bufinfo.buf, mp_obj_get_int(block_num), bufinfo.len / FILESYSTEM_BLOCK_SIZE); return MP_OBJ_NEW_SMALL_INT(ret); } -STATIC MP_DEFINE_CONST_FUN_OBJ_3(supervisor_flash_obj_readblocks_obj, supervisor_flash_obj_readblocks); +static MP_DEFINE_CONST_FUN_OBJ_3(supervisor_flash_obj_readblocks_obj, supervisor_flash_obj_readblocks); -STATIC mp_obj_t supervisor_flash_obj_writeblocks(mp_obj_t self, mp_obj_t block_num, mp_obj_t buf) { +static mp_obj_t supervisor_flash_obj_writeblocks(mp_obj_t self, mp_obj_t block_num, mp_obj_t buf) { mp_buffer_info_t bufinfo; mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_READ); mp_uint_t ret = flash_write_blocks(self, bufinfo.buf, mp_obj_get_int(block_num), bufinfo.len / FILESYSTEM_BLOCK_SIZE); return MP_OBJ_NEW_SMALL_INT(ret); } -STATIC MP_DEFINE_CONST_FUN_OBJ_3(supervisor_flash_obj_writeblocks_obj, supervisor_flash_obj_writeblocks); +static MP_DEFINE_CONST_FUN_OBJ_3(supervisor_flash_obj_writeblocks_obj, supervisor_flash_obj_writeblocks); -STATIC bool flash_ioctl(mp_obj_t self_in, size_t cmd, size_t arg, mp_int_t *out_value) { +static bool flash_ioctl(mp_obj_t self_in, size_t cmd, size_t arg, mp_int_t *out_value) { if (out_value != NULL) { *out_value = 0; } @@ -169,7 +169,7 @@ STATIC bool flash_ioctl(mp_obj_t self_in, size_t cmd, size_t arg, mp_int_t *out_ return true; } -STATIC mp_obj_t supervisor_flash_obj_ioctl(mp_obj_t self, mp_obj_t cmd_in, mp_obj_t arg_in) { +static mp_obj_t supervisor_flash_obj_ioctl(mp_obj_t self, mp_obj_t cmd_in, mp_obj_t arg_in) { mp_int_t cmd = mp_obj_get_int(cmd_in); mp_int_t arg = mp_obj_get_int(arg_in); mp_int_t out_value; @@ -178,15 +178,15 @@ STATIC mp_obj_t supervisor_flash_obj_ioctl(mp_obj_t self, mp_obj_t cmd_in, mp_ob } return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_3(supervisor_flash_obj_ioctl_obj, supervisor_flash_obj_ioctl); +static MP_DEFINE_CONST_FUN_OBJ_3(supervisor_flash_obj_ioctl_obj, supervisor_flash_obj_ioctl); -STATIC const mp_rom_map_elem_t supervisor_flash_obj_locals_dict_table[] = { +static const mp_rom_map_elem_t supervisor_flash_obj_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_readblocks), MP_ROM_PTR(&supervisor_flash_obj_readblocks_obj) }, { MP_ROM_QSTR(MP_QSTR_writeblocks), MP_ROM_PTR(&supervisor_flash_obj_writeblocks_obj) }, { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&supervisor_flash_obj_ioctl_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(supervisor_flash_obj_locals_dict, supervisor_flash_obj_locals_dict_table); +static MP_DEFINE_CONST_DICT(supervisor_flash_obj_locals_dict, supervisor_flash_obj_locals_dict_table); MP_DEFINE_CONST_OBJ_TYPE( supervisor_flash_type, diff --git a/supervisor/shared/serial.c b/supervisor/shared/serial.c index b8d6e2d28f08b..068525f4a4159 100644 --- a/supervisor/shared/serial.c +++ b/supervisor/shared/serial.c @@ -64,7 +64,7 @@ static bool _serial_console_write_disabled; static bool _serial_display_write_disabled; #if CIRCUITPY_CONSOLE_UART -STATIC void console_uart_print_strn(void *env, const char *str, size_t len) { +static void console_uart_print_strn(void *env, const char *str, size_t len) { (void)env; int uart_errcode; common_hal_busio_uart_write(&console_uart, (const uint8_t *)str, len, &uart_errcode); diff --git a/supervisor/shared/translate/translate.c b/supervisor/shared/translate/translate.c index 00083347c9cd6..958e0a2144f9b 100644 --- a/supervisor/shared/translate/translate.c +++ b/supervisor/shared/translate/translate.c @@ -23,7 +23,7 @@ void serial_write_compressed(mp_rom_error_text_t compressed) { mp_printf(MP_PYTHON_PRINTER, "%S", compressed); } -STATIC void get_word(int n, const mchar_t **pos, const mchar_t **end) { +static void get_word(int n, const mchar_t **pos, const mchar_t **end) { int len = minlen; int i = 0; *pos = words; @@ -37,7 +37,7 @@ STATIC void get_word(int n, const mchar_t **pos, const mchar_t **end) { *end = *pos + len; } -STATIC void put_utf8(vstr_t *vstr, int u) { +static void put_utf8(vstr_t *vstr, int u) { if (u >= translation_offstart) { u += translation_offset; } diff --git a/supervisor/shared/usb/host_keyboard.c b/supervisor/shared/usb/host_keyboard.c index 0aaecbd3b218c..78c3f3673ba02 100644 --- a/supervisor/shared/usb/host_keyboard.c +++ b/supervisor/shared/usb/host_keyboard.c @@ -20,19 +20,19 @@ // Buffer the incoming serial data in the background so that we can look for the // interrupt character. -STATIC ringbuf_t _incoming_ringbuf; -STATIC uint8_t _buf[16]; +static ringbuf_t _incoming_ringbuf; +static uint8_t _buf[16]; -STATIC uint8_t _dev_addr; -STATIC uint8_t _interface; +static uint8_t _dev_addr; +static uint8_t _interface; #define FLAG_SHIFT (1) #define FLAG_NUMLOCK (2) #define FLAG_CTRL (4) #define FLAG_STRING (8) -STATIC uint8_t user_keymap[384]; -STATIC size_t user_keymap_len = 0; +static uint8_t user_keymap[384]; +static size_t user_keymap_len = 0; void usb_keymap_set(const uint8_t *buf, size_t len) { user_keymap_len = len = MIN(len, sizeof(user_keymap)); @@ -100,7 +100,7 @@ struct keycode_mapper { #define CTRL_F12 "\e[24;5~" -STATIC struct keycode_mapper keycode_to_ascii[] = { +static struct keycode_mapper keycode_to_ascii[] = { { HID_KEY_A, HID_KEY_Z, 'a', 0, NULL}, { HID_KEY_1, HID_KEY_9, 0, FLAG_SHIFT, "!@#$%^&*()" }, @@ -126,7 +126,7 @@ STATIC struct keycode_mapper keycode_to_ascii[] = { }; -STATIC bool report_contains(const hid_keyboard_report_t *report, uint8_t key) { +static bool report_contains(const hid_keyboard_report_t *report, uint8_t key) { for (int i = 0; i < 6; i++) { if (report->keycode[i] == key) { return true; @@ -135,20 +135,20 @@ STATIC bool report_contains(const hid_keyboard_report_t *report, uint8_t key) { return false; } -STATIC const char *old_buf = NULL; -STATIC size_t buf_size = 0; +static const char *old_buf = NULL; +static size_t buf_size = 0; // this matches Linux default of 500ms to first repeat, 1/20s thereafter enum { initial_repeat_time = 500, default_repeat_time = 50 }; -STATIC uint64_t repeat_deadline; -STATIC void repeat_f(void *unused); +static uint64_t repeat_deadline; +static void repeat_f(void *unused); background_callback_t repeat_cb = {repeat_f, NULL, NULL, NULL}; -STATIC void set_repeat_deadline(uint64_t new_deadline) { +static void set_repeat_deadline(uint64_t new_deadline) { repeat_deadline = new_deadline; background_callback_add_core(&repeat_cb); } -STATIC void send_bufn_core(const char *buf, size_t n) { +static void send_bufn_core(const char *buf, size_t n) { old_buf = buf; buf_size = n; // repeat_timeout = millis() + repeat_time; @@ -166,22 +166,22 @@ STATIC void send_bufn_core(const char *buf, size_t n) { } } -STATIC void send_bufn(const char *buf, size_t n) { +static void send_bufn(const char *buf, size_t n) { send_bufn_core(buf, n); set_repeat_deadline(supervisor_ticks_ms64() + initial_repeat_time); } -STATIC void send_bufz(const char *buf) { +static void send_bufz(const char *buf) { send_bufn(buf, strlen(buf)); } -STATIC void send_byte(uint8_t code) { +static void send_byte(uint8_t code) { static char buf[1]; buf[0] = code; send_bufn(buf, 1); } -STATIC void send_repeat(void) { +static void send_repeat(void) { if (old_buf) { uint64_t now = supervisor_ticks_ms64(); if (now >= repeat_deadline) { @@ -193,20 +193,20 @@ STATIC void send_repeat(void) { } } -STATIC void repeat_f(void *unused) { +static void repeat_f(void *unused) { send_repeat(); } hid_keyboard_report_t old_report; -STATIC const char *skip_nuls(const char *buf, size_t n) { +static const char *skip_nuls(const char *buf, size_t n) { while (n--) { buf += strlen(buf) + 1; } return buf; } -STATIC void process_event(uint8_t dev_addr, uint8_t instance, const hid_keyboard_report_t *report) { +static void process_event(uint8_t dev_addr, uint8_t instance, const hid_keyboard_report_t *report) { bool has_altgr = (user_keymap_len > 256); bool altgr = has_altgr && report->modifier & 0x40; bool alt = has_altgr ? report->modifier & 0x4 : report->modifier & 0x44; diff --git a/supervisor/shared/usb/usb_msc_flash.c b/supervisor/shared/usb/usb_msc_flash.c index 45ec7cb5aaa23..201a818c0bf71 100644 --- a/supervisor/shared/usb/usb_msc_flash.c +++ b/supervisor/shared/usb/usb_msc_flash.c @@ -40,7 +40,7 @@ static fs_user_mount_t *get_vfs(int lun) { return current_mount->obj; } -STATIC void _usb_msc_uneject(void) { +static void _usb_msc_uneject(void) { for (uint8_t i = 0; i < sizeof(ejected); i++) { ejected[i] = false; locked[i] = false; diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c index a03338c90f9e5..71dbd29ebba43 100644 --- a/supervisor/shared/web_workflow/web_workflow.c +++ b/supervisor/shared/web_workflow/web_workflow.c @@ -171,7 +171,7 @@ static bool _base64_in_place(char *buf, size_t in_len, size_t out_len) { return true; } -STATIC void _update_encoded_ip(void) { +static void _update_encoded_ip(void) { uint32_t ipv4_address = 0; if (common_hal_wifi_radio_get_enabled(&common_hal_wifi_radio_obj)) { ipv4_address = wifi_radio_get_ipv4_address(&common_hal_wifi_radio_obj); @@ -381,7 +381,7 @@ void web_workflow_send_raw(socketpool_socket_obj_t *socket, bool flush, const ui } } -STATIC void _print_raw(void *env, const char *str, size_t len) { +static void _print_raw(void *env, const char *str, size_t len) { web_workflow_send_raw((socketpool_socket_obj_t *)env, false, (const uint8_t *)str, (size_t)len); } @@ -421,7 +421,7 @@ static void _send_chunk(socketpool_socket_obj_t *socket, const char *chunk) { web_workflow_send_raw(socket, strlen(chunk) == 0, (const uint8_t *)"\r\n", 2); } -STATIC void _print_chunk(void *env, const char *str, size_t len) { +static void _print_chunk(void *env, const char *str, size_t len) { mp_print_t _socket_print = {env, _print_raw}; mp_printf(&_socket_print, "%X\r\n", len); web_workflow_send_raw((socketpool_socket_obj_t *)env, false, (const uint8_t *)str, len); @@ -925,7 +925,7 @@ static void _reply_with_diskinfo_json(socketpool_socket_obj_t *socket, _request // FATFS has a two second timestamp resolution but the BLE API allows for nanosecond resolution. // This function truncates the time the time to a resolution storable by FATFS and fills in the // FATFS encoded version into fattime. -STATIC uint64_t truncate_time(uint64_t input_time, DWORD *fattime) { +static uint64_t truncate_time(uint64_t input_time, DWORD *fattime) { timeutils_struct_time_t tm; uint64_t seconds_since_epoch = timeutils_seconds_since_epoch_from_nanoseconds_since_1970(input_time); timeutils_seconds_since_epoch_to_struct_time(seconds_since_epoch, &tm); @@ -936,7 +936,7 @@ STATIC uint64_t truncate_time(uint64_t input_time, DWORD *fattime) { return truncated_time; } -STATIC void _discard_incoming(socketpool_socket_obj_t *socket, size_t amount) { +static void _discard_incoming(socketpool_socket_obj_t *socket, size_t amount) { size_t discarded = 0; while (discarded < amount) { uint8_t bytes[64]; diff --git a/supervisor/shared/web_workflow/websocket.c b/supervisor/shared/web_workflow/websocket.c index 4ee06791097ca..accd2398e1e59 100644 --- a/supervisor/shared/web_workflow/websocket.c +++ b/supervisor/shared/web_workflow/websocket.c @@ -29,10 +29,10 @@ typedef struct { // Buffer the incoming serial data in the background so that we can look for the // interrupt character. -STATIC ringbuf_t _incoming_ringbuf; -STATIC uint8_t _buf[16]; +static ringbuf_t _incoming_ringbuf; +static uint8_t _buf[16]; // make sure background is not called recursively -STATIC bool in_web_background = false; +static bool in_web_background = false; static _websocket cp_serial; diff --git a/supervisor/shared/workflow.c b/supervisor/shared/workflow.c index 7c5046ffe61dc..152e67b27b1e6 100644 --- a/supervisor/shared/workflow.c +++ b/supervisor/shared/workflow.c @@ -174,7 +174,7 @@ FRESULT supervisor_workflow_mkdir_parents(DWORD fattime, char *path) { return result; } -STATIC FRESULT supervisor_workflow_delete_directory_contents(FATFS *fs, const TCHAR *path) { +static FRESULT supervisor_workflow_delete_directory_contents(FATFS *fs, const TCHAR *path) { FF_DIR dir; FILINFO file_info; // Check the stack since we're putting paths on it. 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