Skip to content

Commit 68d760a

Browse files
jonnorjonnor
committed
Remove use of STATIC macro
Was removed in Micropython 1.23
1 parent c0ba265 commit 68d760a

File tree

4 files changed

+41
-41
lines changed

4 files changed

+41
-41
lines changed

‎src/emliir/iir_filter.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ typedef struct _mp_obj_iir_filter_t {
4343
mp_obj_full_type_t iir_filter_type;
4444

4545
// Create a new instance
46-
STATIC mp_obj_t iir_filter_new(mp_obj_t array_obj) {
46+
static mp_obj_t iir_filter_new(mp_obj_t array_obj) {
4747

4848
// Extract buffer pointer and verify typecode
4949
mp_buffer_info_t bufinfo;
@@ -82,10 +82,10 @@ STATIC mp_obj_t iir_filter_new(mp_obj_t array_obj) {
8282

8383
return MP_OBJ_FROM_PTR(o);
8484
}
85-
STATIC MP_DEFINE_CONST_FUN_OBJ_1(iir_filter_new_obj, iir_filter_new);
85+
static MP_DEFINE_CONST_FUN_OBJ_1(iir_filter_new_obj, iir_filter_new);
8686

8787
// Delete the instance
88-
STATIC mp_obj_t iir_filter_del(mp_obj_t self_obj) {
88+
static mp_obj_t iir_filter_del(mp_obj_t self_obj) {
8989

9090
mp_obj_iir_filter_t *o = MP_OBJ_TO_PTR(self_obj);
9191
EmlIIR *self = &o->filter;
@@ -97,11 +97,11 @@ STATIC mp_obj_t iir_filter_del(mp_obj_t self_obj) {
9797

9898
return mp_const_none;
9999
}
100-
STATIC MP_DEFINE_CONST_FUN_OBJ_1(iir_filter_del_obj, iir_filter_del);
100+
static MP_DEFINE_CONST_FUN_OBJ_1(iir_filter_del_obj, iir_filter_del);
101101

102102

103103
// Add a node to the tree
104-
STATIC mp_obj_t iir_filter_run(mp_obj_t self_obj, mp_obj_t array_obj) {
104+
static mp_obj_t iir_filter_run(mp_obj_t self_obj, mp_obj_t array_obj) {
105105

106106
mp_obj_iir_filter_t *o = MP_OBJ_TO_PTR(self_obj);
107107
EmlIIR *self = &o->filter;
@@ -122,11 +122,11 @@ STATIC mp_obj_t iir_filter_run(mp_obj_t self_obj, mp_obj_t array_obj) {
122122

123123
return mp_const_none;
124124
}
125-
STATIC MP_DEFINE_CONST_FUN_OBJ_2(iir_filter_run_obj, iir_filter_run);
125+
static MP_DEFINE_CONST_FUN_OBJ_2(iir_filter_run_obj, iir_filter_run);
126126

127127

128128
mp_map_elem_t iir_locals_dict_table[2];
129-
STATIC MP_DEFINE_CONST_DICT(iir_locals_dict, iir_locals_dict_table);
129+
static MP_DEFINE_CONST_DICT(iir_locals_dict, iir_locals_dict_table);
130130

131131
// This is the entry point and is called when the module is imported
132132
mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *args) {

‎src/emlneighbors/neighbors.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ typedef struct _mp_obj_neighbors_model_t {
3434
mp_obj_full_type_t neighbors_model_type;
3535

3636
// Create a new instace
37-
STATIC mp_obj_t neighbors_model_new(mp_obj_t items_obj, mp_obj_t features_obj, mp_obj_t neighbors_obj) {
37+
static mp_obj_t neighbors_model_new(mp_obj_t items_obj, mp_obj_t features_obj, mp_obj_t neighbors_obj) {
3838

3939
mp_int_t max_items = mp_obj_get_int(items_obj);
4040
mp_int_t n_features = mp_obj_get_int(features_obj);
@@ -61,11 +61,11 @@ STATIC mp_obj_t neighbors_model_new(mp_obj_t items_obj, mp_obj_t features_obj, m
6161

6262
}
6363
// Define a Python reference to the function above
64-
STATIC MP_DEFINE_CONST_FUN_OBJ_3(neighbors_model_new_obj, neighbors_model_new);
64+
static MP_DEFINE_CONST_FUN_OBJ_3(neighbors_model_new_obj, neighbors_model_new);
6565

6666

6767
// Delete an instance
68-
STATIC mp_obj_t neighbors_model_del(mp_obj_t self_obj) {
68+
static mp_obj_t neighbors_model_del(mp_obj_t self_obj) {
6969

7070
mp_obj_neighbors_model_t *o = MP_OBJ_TO_PTR(self_obj);
7171
EmlNeighborsModel *self = &o->model;
@@ -78,11 +78,11 @@ STATIC mp_obj_t neighbors_model_del(mp_obj_t self_obj) {
7878
return mp_const_none;
7979
}
8080
// Define a Python reference to the function above
81-
STATIC MP_DEFINE_CONST_FUN_OBJ_1(neighbors_model_del_obj, neighbors_model_del);
81+
static MP_DEFINE_CONST_FUN_OBJ_1(neighbors_model_del_obj, neighbors_model_del);
8282

8383

8484
// Add data to the model
85-
STATIC mp_obj_t neighbors_model_additem(size_t n_args, const mp_obj_t *args) {
85+
static mp_obj_t neighbors_model_additem(size_t n_args, const mp_obj_t *args) {
8686

8787
mp_obj_neighbors_model_t *o = MP_OBJ_TO_PTR(args[0]);
8888
EmlNeighborsModel *self = &o->model;
@@ -106,11 +106,11 @@ STATIC mp_obj_t neighbors_model_additem(size_t n_args, const mp_obj_t *args) {
106106

107107
return mp_obj_new_int(item_idx);
108108
}
109-
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(neighbors_model_additem_obj, 3, 3, neighbors_model_additem);
109+
static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(neighbors_model_additem_obj, 3, 3, neighbors_model_additem);
110110

111111

112112
// Access data of an item
113-
STATIC mp_obj_t neighbors_model_get_item(mp_obj_t self_obj, mp_obj_t index_obj, mp_obj_t out_obj) {
113+
static mp_obj_t neighbors_model_get_item(mp_obj_t self_obj, mp_obj_t index_obj, mp_obj_t out_obj) {
114114

115115
mp_obj_neighbors_model_t *o = MP_OBJ_TO_PTR(self_obj);
116116
EmlNeighborsModel *self = &o->model;
@@ -139,13 +139,13 @@ STATIC mp_obj_t neighbors_model_get_item(mp_obj_t self_obj, mp_obj_t index_obj,
139139
return mp_const_none;
140140
}
141141
// Define a Python reference to the function above
142-
STATIC MP_DEFINE_CONST_FUN_OBJ_3(neighbors_model_get_item_obj, neighbors_model_get_item);
142+
static MP_DEFINE_CONST_FUN_OBJ_3(neighbors_model_get_item_obj, neighbors_model_get_item);
143143

144144

145145

146146

147147
// Takes a integer array
148-
STATIC mp_obj_t neighbors_model_predict(mp_obj_fun_bc_t *self_obj,
148+
static mp_obj_t neighbors_model_predict(mp_obj_fun_bc_t *self_obj,
149149
size_t n_args, size_t n_kw, mp_obj_t *args) {
150150
// Check number of arguments is valid
151151
mp_arg_check_num(n_args, n_kw, 2, 2, false);
@@ -176,7 +176,7 @@ STATIC mp_obj_t neighbors_model_predict(mp_obj_fun_bc_t *self_obj,
176176
}
177177

178178
// Access details about prediction result
179-
STATIC mp_obj_t neighbors_model_get_result(mp_obj_t self_obj, mp_obj_t index_obj) {
179+
static mp_obj_t neighbors_model_get_result(mp_obj_t self_obj, mp_obj_t index_obj) {
180180

181181
mp_obj_neighbors_model_t *o = MP_OBJ_TO_PTR(self_obj);
182182
EmlNeighborsModel *self = &o->model;
@@ -196,14 +196,14 @@ STATIC mp_obj_t neighbors_model_get_result(mp_obj_t self_obj, mp_obj_t index_obj
196196
return tuple;
197197
}
198198
// Define a Python reference to the function above
199-
STATIC MP_DEFINE_CONST_FUN_OBJ_2(neighbors_model_get_result_obj, neighbors_model_get_result);
199+
static MP_DEFINE_CONST_FUN_OBJ_2(neighbors_model_get_result_obj, neighbors_model_get_result);
200200

201201

202202

203203

204204
// Module setup
205205
mp_map_elem_t neighbors_model_locals_dict_table[5];
206-
STATIC MP_DEFINE_CONST_DICT(neighbors_model_locals_dict, neighbors_model_locals_dict_table);
206+
static MP_DEFINE_CONST_DICT(neighbors_model_locals_dict, neighbors_model_locals_dict_table);
207207

208208
// Module setup entrypoint
209209
mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *args) {

‎src/emltrees/trees.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ typedef struct _mp_obj_trees_builder_t {
3636
mp_obj_full_type_t trees_builder_type;
3737

3838
// Create a new tree builder
39-
STATIC mp_obj_t builder_new(mp_obj_t trees_obj, mp_obj_t nodes_obj, mp_obj_t leaves_obj) {
39+
static mp_obj_t builder_new(mp_obj_t trees_obj, mp_obj_t nodes_obj, mp_obj_t leaves_obj) {
4040

4141
mp_int_t max_nodes = mp_obj_get_int(nodes_obj);
4242
mp_int_t max_trees = mp_obj_get_int(trees_obj);
@@ -82,10 +82,10 @@ STATIC mp_obj_t builder_new(mp_obj_t trees_obj, mp_obj_t nodes_obj, mp_obj_t lea
8282

8383
return MP_OBJ_FROM_PTR(o);
8484
}
85-
STATIC MP_DEFINE_CONST_FUN_OBJ_3(builder_new_obj, builder_new);
85+
static MP_DEFINE_CONST_FUN_OBJ_3(builder_new_obj, builder_new);
8686

8787
// Delete a tree builder
88-
STATIC mp_obj_t builder_del(mp_obj_t trees_obj) {
88+
static mp_obj_t builder_del(mp_obj_t trees_obj) {
8989

9090
mp_obj_trees_builder_t *o = MP_OBJ_TO_PTR(trees_obj);
9191
EmlTreesBuilder *self = &o->builder;
@@ -101,10 +101,10 @@ STATIC mp_obj_t builder_del(mp_obj_t trees_obj) {
101101

102102
return mp_const_none;
103103
}
104-
STATIC MP_DEFINE_CONST_FUN_OBJ_1(builder_del_obj, builder_del);
104+
static MP_DEFINE_CONST_FUN_OBJ_1(builder_del_obj, builder_del);
105105

106106
// set number of features and classes
107-
STATIC mp_obj_t builder_setdata(mp_obj_t self_obj, mp_obj_t features_obj, mp_obj_t classes_obj) {
107+
static mp_obj_t builder_setdata(mp_obj_t self_obj, mp_obj_t features_obj, mp_obj_t classes_obj) {
108108

109109
mp_obj_trees_builder_t *o = MP_OBJ_TO_PTR(self_obj);
110110
EmlTreesBuilder *self = &o->builder;
@@ -114,11 +114,11 @@ STATIC mp_obj_t builder_setdata(mp_obj_t self_obj, mp_obj_t features_obj, mp_obj
114114

115115
return MP_OBJ_FROM_PTR(o);
116116
}
117-
STATIC MP_DEFINE_CONST_FUN_OBJ_3(builder_setdata_obj, builder_setdata);
117+
static MP_DEFINE_CONST_FUN_OBJ_3(builder_setdata_obj, builder_setdata);
118118

119119

120120
// Add a node to the tree
121-
STATIC mp_obj_t builder_addnode(size_t n_args, const mp_obj_t *args) {
121+
static mp_obj_t builder_addnode(size_t n_args, const mp_obj_t *args) {
122122

123123
mp_obj_trees_builder_t *o = MP_OBJ_TO_PTR(args[0]);
124124
EmlTreesBuilder *self = &o->builder;
@@ -148,11 +148,11 @@ STATIC mp_obj_t builder_addnode(size_t n_args, const mp_obj_t *args) {
148148

149149
return mp_const_none;
150150
}
151-
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(builder_addnode_obj, 5, 5, builder_addnode);
151+
static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(builder_addnode_obj, 5, 5, builder_addnode);
152152

153153

154154
// Add a node to the tree
155-
STATIC mp_obj_t builder_addroot(size_t n_args, const mp_obj_t *args) {
155+
static mp_obj_t builder_addroot(size_t n_args, const mp_obj_t *args) {
156156

157157
mp_obj_trees_builder_t *o = MP_OBJ_TO_PTR(args[0]);
158158
EmlTreesBuilder *self = &o->builder;
@@ -168,11 +168,11 @@ STATIC mp_obj_t builder_addroot(size_t n_args, const mp_obj_t *args) {
168168

169169
return mp_const_none;
170170
}
171-
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(builder_addroot_obj, 2, 2, builder_addroot);
171+
static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(builder_addroot_obj, 2, 2, builder_addroot);
172172

173173

174174
// Add a node to the tree
175-
STATIC mp_obj_t builder_addleaf(mp_obj_t self_obj, mp_obj_t leaf_obj) {
175+
static mp_obj_t builder_addleaf(mp_obj_t self_obj, mp_obj_t leaf_obj) {
176176

177177
mp_obj_trees_builder_t *o = MP_OBJ_TO_PTR(self_obj);
178178
EmlTreesBuilder *self = &o->builder;
@@ -188,11 +188,11 @@ STATIC mp_obj_t builder_addleaf(mp_obj_t self_obj, mp_obj_t leaf_obj) {
188188

189189
return mp_const_none;
190190
}
191-
STATIC MP_DEFINE_CONST_FUN_OBJ_2(builder_addleaf_obj, builder_addleaf);
191+
static MP_DEFINE_CONST_FUN_OBJ_2(builder_addleaf_obj, builder_addleaf);
192192

193193

194194
// Takes a float array
195-
STATIC mp_obj_t builder_predict(mp_obj_t self_obj, mp_obj_t features_obj) {
195+
static mp_obj_t builder_predict(mp_obj_t self_obj, mp_obj_t features_obj) {
196196

197197
mp_obj_trees_builder_t *o = MP_OBJ_TO_PTR(self_obj);
198198
EmlTreesBuilder *self = &o->builder;
@@ -224,11 +224,11 @@ STATIC mp_obj_t builder_predict(mp_obj_t self_obj, mp_obj_t features_obj) {
224224

225225
return mp_obj_new_int(result);
226226
}
227-
STATIC MP_DEFINE_CONST_FUN_OBJ_2(builder_predict_obj, builder_predict);
227+
static MP_DEFINE_CONST_FUN_OBJ_2(builder_predict_obj, builder_predict);
228228

229229

230230
mp_map_elem_t trees_locals_dict_table[6];
231-
STATIC MP_DEFINE_CONST_DICT(trees_locals_dict, trees_locals_dict_table);
231+
static MP_DEFINE_CONST_DICT(trees_locals_dict, trees_locals_dict_table);
232232

233233
// This is the entry point and is called when the module is imported
234234
mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *args) {

‎src/tinymaix_cnn/mod_cnn.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ mp_obj_full_type_t mod_cnn_type;
8181
// TODO: add function for getting the shape of expected input. As a tuple
8282

8383
// Create a new instance
84-
STATIC mp_obj_t mod_cnn_new(mp_obj_t model_data_obj) {
84+
static mp_obj_t mod_cnn_new(mp_obj_t model_data_obj) {
8585

8686
// Check model data
8787
mp_buffer_info_t bufinfo;
@@ -118,10 +118,10 @@ STATIC mp_obj_t mod_cnn_new(mp_obj_t model_data_obj) {
118118

119119
return MP_OBJ_FROM_PTR(o);
120120
}
121-
STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_cnn_new_obj, mod_cnn_new);
121+
static MP_DEFINE_CONST_FUN_OBJ_1(mod_cnn_new_obj, mod_cnn_new);
122122

123123
// Delete the instance
124-
STATIC mp_obj_t mod_cnn_del(mp_obj_t self_obj) {
124+
static mp_obj_t mod_cnn_del(mp_obj_t self_obj) {
125125

126126
mp_obj_mod_cnn_t *o = MP_OBJ_TO_PTR(self_obj);
127127
tm_mdl_t *model = &o->model;
@@ -132,11 +132,11 @@ STATIC mp_obj_t mod_cnn_del(mp_obj_t self_obj) {
132132

133133
return mp_const_none;
134134
}
135-
STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_cnn_del_obj, mod_cnn_del);
135+
static MP_DEFINE_CONST_FUN_OBJ_1(mod_cnn_del_obj, mod_cnn_del);
136136

137137

138138
// Add a node to the tree
139-
STATIC mp_obj_t mod_cnn_run(mp_obj_t self_obj, mp_obj_t input_obj) {
139+
static mp_obj_t mod_cnn_run(mp_obj_t self_obj, mp_obj_t input_obj) {
140140

141141
mp_obj_mod_cnn_t *o = MP_OBJ_TO_PTR(self_obj);
142142

@@ -193,11 +193,11 @@ STATIC mp_obj_t mod_cnn_run(mp_obj_t self_obj, mp_obj_t input_obj) {
193193

194194
return mp_obj_new_int(maxi);
195195
}
196-
STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_cnn_run_obj, mod_cnn_run);
196+
static MP_DEFINE_CONST_FUN_OBJ_2(mod_cnn_run_obj, mod_cnn_run);
197197

198198

199199
mp_map_elem_t mod_locals_dict_table[2];
200-
STATIC MP_DEFINE_CONST_DICT(mod_locals_dict, mod_locals_dict_table);
200+
static MP_DEFINE_CONST_DICT(mod_locals_dict, mod_locals_dict_table);
201201

202202
// This is the entry point and is called when the module is imported
203203
mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *args) {

0 commit comments

Comments
 (0)