8000 mimxrt/machine_encoder.c: Replace "STATIC" with "static". · micropython/micropython@030e4e7 · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit 030e4e7

Browse files
robert-hhrobert-hh
committed
mimxrt/machine_encoder.c: Replace "STATIC" with "static".
That's only required for new files. Signed-off-by: robert-hh <robert@hammelrath.com>
1 parent a871d7a commit 030e4e7

File tree

1 file changed

+30
-30
lines changed

1 file changed

+30
-30
lines changed

‎ports/mimxrt/machine_encoder.c

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ typedef struct _encoder_xbar_signal_t {
7979
#define MODE_ENCODER (0)
8080
#define MODE_COUNTER (1)
8181

82-
STATIC void encoder_deinit_single(machine_encoder_obj_t *self);
82+
static void encoder_deinit_single(machine_encoder_obj_t *self);
8383

8484
#if defined MIMXRT117x_SERIES
8585

@@ -212,7 +212,7 @@ __attribute__((section(".ram_functions"))) void ENC4_IRQHandler(void) {
212212
#endif
213213
#endif
214214

215-
STATIC void mp_machine_encoder_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
215+
static void mp_machine_encoder_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
216216
machine_encoder_obj_t *self = MP_OBJ_TO_PTR(self_in);
217217
mp_printf(print,
218218
self->is_signed ? "%s %d cpc=%lu match=%ld filter=%luns>\n" : "%s %d cpc=%lu match=%lu filter=%luns>\n",
@@ -223,13 +223,13 @@ STATIC void mp_machine_encoder_print(const mp_print_t *print, mp_obj_t self_in,
223223
// Utility functions
224224
//
225225

226-
STATIC void encoder_set_iomux(const machine_pin_obj_t *pin, const machine_pin_af_obj_t *af) {
226+
static void encoder_set_iomux(const machine_pin_obj_t *pin, const machine_pin_af_obj_t *af) {
227227
IOMUXC_SetPinMux(pin->muxRegister, af->af_mode, af->input_register, af->input_daisy, pin->configRegister, 0U);
228228
IOMUXC_SetPinConfig(pin->muxRegister, af->af_mode, af->input_register, af->input_daisy, pin->configRegister, 0x10B0U);
229229
}
230230

231231
// decode the AF objects module and Port numer. Returns NULL if it is not a XBAR object
232-
STATIC const machine_pin_af_obj_t *af_name_decode_xbar(const machine_pin_af_obj_t *af_obj,
232+
static const machine_pin_af_obj_t *af_name_decode_xbar(const machine_pin_af_obj_t *af_obj,
233233
xbar_input_signal_t *io_number) {
234234
const char *str;
235235
size_t len;
@@ -244,7 +244,7 @@ STATIC const machine_pin_af_obj_t *af_name_decode_xbar(const machine_pin_af_obj_
244244
return af_obj;
245245
}
246246

247-
STATIC const machine_pin_af_obj_t *find_xbar_af(const machine_pin_obj_t *pin, xbar_input_signal_t *io_number) {
247+
static const machine_pin_af_obj_t *find_xbar_af(const machine_pin_obj_t *pin, xbar_input_signal_t *io_number) {
248248
const machine_pin_af_obj_t *af = NULL;
249249
for (int i = 0; i < pin->af_list_len; ++i) {
250250
af = af_name_decode_xbar(&(pin->af_list[i]), io_number);
@@ -255,7 +255,7 @@ STATIC const machine_pin_af_obj_t *find_xbar_af(const machine_pin_obj_t *pin, xb
255255
mp_raise_ValueError(MP_ERROR_TEXT("invalid input Pin"));
256256
}
257257

258-
STATIC uint8_t connect_pin_to_encoder(mp_obj_t desc, xbar_output_signal_t encoder_signal, uint8_t direction) {
258+
static uint8_t connect_pin_to_encoder(mp_obj_t desc, xbar_output_signal_t encoder_signal, uint8_t direction) {
259259
xbar_input_signal_t xbar_pin;
260260
const machine_pin_obj_t *pin = pin_find(desc);
261261
const machine_pin_af_obj_t *af = find_xbar_af(pin, &xbar_pin);
@@ -288,7 +288,7 @@ STATIC uint8_t connect_pin_to_encoder(mp_obj_t desc, xbar_output_signal_t encode
288288
return xbar_pin;
289289
}
290290

291-
STATIC void clear_encoder_registers(machine_encoder_obj_t *self) {
291+
static void clear_encoder_registers(machine_encoder_obj_t *self) {
292292
// Create a High pulse on the Trigger input, clearing Position, Revolution and Hold registers.
293293
XBARA_SetSignalsConnection(XBARA1, kXBARA1_InputLogicHigh, xbar_signal_table[self->id].enc_trigger);
294294
XBARA_SetSignalsConnection(XBARA1, kXBARA1_InputLogicLow, xbar_signal_table[self->id].enc_trigger);
@@ -300,7 +300,7 @@ STATIC void clear_encoder_registers(machine_encoder_obj_t *self) {
300300
// Calculate the filter parameters based on a filter_ns value, telling the shortest
301301
// pulse that will be detected.
302302
//
303-
STATIC uint32_t calc_filter(uint32_t filter_ns, uint16_t *count, uint16_t *period) {
303+
static uint32_t calc_filter(uint32_t filter_ns, uint16_t *count, uint16_t *period) {
304304

305305
#if defined MIMXRT117x_SERIES
306306
uint32_t freq_khz = CLOCK_GetRootClockFreq(kCLOCK_Root_Bus) / 1000;
@@ -334,7 +334,7 @@ STATIC uint32_t calc_filter(uint32_t filter_ns, uint16_t *count, uint16_t *perio
334334

335335
// Micropython API functions
336336
//
337-
STATIC void mp_machine_encoder_init_helper_common(machine_encoder_obj_t *self,
337+
static void mp_machine_encoder_init_helper_common(machine_encoder_obj_t *self,
338338
mp_arg_val_t args[], enc_config_t *enc_config) {
339339

340340
enum { ARG_match_pin, ARG_filter_ns, ARG_cpc, ARG_signed, ARG_index };
@@ -400,7 +400,7 @@ STATIC void mp_machine_encoder_init_helper_common(machine_encoder_obj_t *self,
400400
self->active = true;
401401
}
402402

403-
STATIC void mp_machine_encoder_init_helper(machine_encoder_obj_t *self,
403+
static void mp_machine_encoder_init_helper(machine_encoder_obj_t *self,
404404
size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
405405
enum { ARG_phase_a, ARG_phase_b, ARG_home,
406406
ARG_match_pin, ARG_filter_ns, ARG_cpc, ARG_signed, ARG_index};
@@ -449,7 +449,7 @@ STATIC void mp_machine_encoder_init_helper(machine_encoder_obj_t *self,
449449
}
450450

451451
// Qencoder(id, input_a, input_b, [args])
452-
STATIC mp_obj_t mp_machine_encoder_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
452+
static mp_obj_t mp_machine_encoder_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
453453
// Check number of arguments
454454
mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
455455

@@ -496,7 +496,7 @@ STATIC mp_obj_t mp_machine_encoder_make_new(const mp_obj_type_t *type, size_t n_
496496
return MP_OBJ_FROM_PTR(self);
497497
}
498498

499-
STATIC void encoder_deinit_single(machine_encoder_obj_t *self) {
499+
static void encoder_deinit_single(machine_encoder_obj_t *self) {
500500
if (self->active) {
501501
if (self->irq && self->irq->handler) {
502502
DisableIRQ(enc_irqn[self->id + 1]);
@@ -530,21 +530,21 @@ void machine_encoder_deinit_all(void) {
530530
}
531531

532532
// encoder.deinit()
533-
STATIC mp_obj_t machine_encoder_deinit(mp_obj_t self_in) {
533+
static mp_obj_t machine_encoder_deinit(mp_obj_t self_in) {
534534
encoder_deinit_single(MP_OBJ_TO_PTR(self_in));
535535
return mp_const_none;
536536
}
537-
STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_encoder_deinit_obj, machine_encoder_deinit);
537+
static MP_DEFINE_CONST_FUN_OBJ_1(machine_encoder_deinit_obj, machine_encoder_deinit);
538538

539539
// encoder.status()
540540
mp_obj_t machine_encoder_status(mp_obj_t self_in) {
541541
machine_encoder_obj_t *self = MP_OBJ_TO_PTR(self_in);
542542
return MP_OBJ_NEW_SMALL_INT(self->status & (self->requested_irq | kENC_LastCountDirectionFlag));
543543
}
544-
STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_encoder_status_obj, machine_encoder_status);
544+
static MP_DEFINE_CONST_FUN_OBJ_1(machine_encoder_status_obj, machine_encoder_status);
545545

546546
// encoder.value([value])
547-
STATIC mp_obj_t machine_encoder_value(size_t n_args, const mp_obj_t *args) {
547+
static mp_obj_t machine_encoder_value(size_t n_args, const mp_obj_t *args) {
548548
machine_encoder_obj_t *self = MP_OBJ_TO_PTR(args[0]);
549549
if (!self->active) {
550550
mp_raise_ValueError(MP_ERROR_TEXT("device stopped"));
@@ -567,10 +567,10 @@ STATIC mp_obj_t machine_encoder_value(size_t n_args, const mp_obj_t *args) {
567567
return mp_obj_new_int_from_uint(actual_value);
568568
}
569569
}
570-
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_encoder_value_obj, 1, 2, machine_encoder_value);
570+
static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_encoder_value_obj, 1, 2, machine_encoder_value);
571571

572572
// encoder.cycles([value])
573-
STATIC mp_obj_t machine_encoder_cycles(size_t n_args, const mp_obj_t *args) {
573+
static mp_obj_t machine_encoder_cycles(size_t n_args, const mp_obj_t *args) {
574574
machine_encoder_obj_t *self = MP_OBJ_TO_PTR(args[0]);
575575
if (!self->active) {
576576
mp_raise_ValueError(MP_ERROR_TEXT("device stopped"));
@@ -583,10 +583,10 @@ STATIC mp_obj_t machine_encoder_cycles(size_t n_args, const mp_obj_t *args) {
583583
}
584584
return MP_OBJ_NEW_SMALL_INT(cycles);
585585
}
586-
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_encoder_cycles_obj, 1, 2, machine_encoder_cycles);
586+
static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_encoder_cycles_obj, 1, 2, machine_encoder_cycles);
587587

588588
// encoder.irq(trigger=ENCODER.IRQ_MATCH, value=nnn, handler=None, hard=False)
589-
STATIC mp_obj_t machine_encoder_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
589+
static mp_obj_t machine_encoder_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
590590
enum { ARG_trigger, ARG_value, ARG_handler, ARG_hard };
591591
static const mp_arg_t allowed_args[] = {
592592
{ MP_QSTR_trigger, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
@@ -638,20 +638,20 @@ STATIC mp_obj_t machine_encoder_irq(size_t n_args, const mp_obj_t *pos_args, mp_
638638
MP_DEFINE_CONST_FUN_OBJ_KW(machine_encoder_irq_obj, 1, machine_encoder_irq);
639639

640640
// encoder.init([kwargs])
641-
STATIC mp_obj_t machine_encoder_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
641+
static mp_obj_t machine_encoder_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
642642
mp_machine_encoder_init_helper(args[0], n_args - 1, args + 1, kw_args);
643643
return mp_const_none;
644644
}
645645
MP_DEFINE_CONST_FUN_OBJ_KW(machine_encoder_init_obj, 1, machine_encoder_init);
646646

647647
// encoder.id()
648-
STATIC mp_obj_t machine_encoder_id(mp_obj_t self_in) {
648+
static mp_obj_t machine_encoder_id(mp_obj_t self_in) {
649649
machine_encoder_obj_t *self = MP_OBJ_TO_PTR(self_in);
650650
return MP_OBJ_NEW_SMALL_INT(self->id);
651651
}
652-
STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_encoder_id_obj, machine_encoder_id);
652+
static MP_DEFINE_CONST_FUN_OBJ_1(machine_encoder_id_obj, machine_encoder_id);
653653

654-
STATIC const mp_rom_map_elem_t machine_encoder_locals_dict_table[] = {
654+
static const mp_rom_map_elem_t machine_encoder_locals_dict_table[] = {
655655
{ MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_encoder_deinit_obj) },
656656
{ MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_encoder_init_obj) },
657657
{ MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&machine_encoder_irq_obj) },
@@ -664,7 +664,7 @@ STATIC const mp_rom_map_elem_t machine_encoder_locals_dict_table[] = {
664664
{ MP_ROM_QSTR(MP_QSTR_IRQ_ROLL_UNDER), MP_ROM_INT(ENCODER_TRIGGER_ROLL_UNDER) },
665665
{ MP_ROM_QSTR(MP_QSTR_IRQ_ROLL_OVER), MP_ROM_INT(ENCODER_TRIGGER_ROLL_OVER) },
666666
};
667-
STATIC MP_DEFINE_CONST_DICT(machine_encoder_locals_dict, machine_encoder_locals_dict_table);
667+
static MP_DEFINE_CONST_DICT(machine_encoder_locals_dict, machine_encoder_locals_dict_table);
668668

669669
MP_DEFINE_CONST_OBJ_TYPE(
670670
machine_encoder_type,
@@ -678,7 +678,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
678678

679679
// --- Counter class code ----------
680680

681-
STATIC void mp_machine_counter_init_helper(machine_encoder_obj_t *self,
681+
static void mp_machine_counter_init_helper(machine_encoder_obj_t *self,
682682
size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
683683
enum { ARG_src, ARG_direction, ARG_match_pin, ARG_filter_ns, ARG_cpc, ARG_signed, ARG_index };
684684
static const mp_arg_t allowed_args[] = {
@@ -718,7 +718,7 @@ STATIC void mp_machine_counter_init_helper(machine_encoder_obj_t *self,
718718
}
719719

720720
// Counter(id, input, [args])
721-
STATIC mp_obj_t mp_machine_counter_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
721+
static mp_obj_t mp_machine_counter_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
722722
// Check number of arguments
723723
mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
724724

@@ -770,13 +770,13 @@ STATIC mp_obj_t mp_machine_counter_make_new(const mp_obj_type_t *type, size_t n_
770770
}
771771

772772
// counter.init([kwargs])
773-
STATIC mp_obj_t machine_counter_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
773+
static mp_obj_t machine_counter_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
774774
mp_machine_counter_init_helper(args[0], n_args - 1, args + 1, kw_args);
775775
return mp_const_none;
776776
}
777777
MP_DEFINE_CONST_FUN_OBJ_KW(machine_counter_init_obj, 1, machine_counter_init);
778778

779-
STATIC const mp_rom_map_elem_t machine_counter_locals_dict_table[] = {
779+
static const mp_rom_map_elem_t machine_counter_locals_dict_table[] = {
780780
{ MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_encoder_deinit_obj) },
781781
{ MP_ROM_QSTR(MP_QSTR_value), MP_ROM_PTR(&machine_encoder_value_obj) },
782782
{ MP_ROM_QSTR(MP_QSTR_cycles), MP_ROM_PTR(&machine_encoder_cycles_obj) },
@@ -791,7 +791,7 @@ STATIC const mp_rom_map_elem_t machine_counter_locals_dict_table[] = {
791791
{ MP_ROM_QSTR(MP_QSTR_UP), MP_ROM_INT(COUNTER_UP) },
792792
{ MP_ROM_QSTR(MP_QSTR_DOWN), MP_ROM_INT(COUNTER_DOWN) },
793793
};
794-
STATIC MP_DEFINE_CONST_DICT(machine_counter_locals_dict, machine_counter_locals_dict_table);
794+
static MP_DEFINE_CONST_DICT(machine_counter_locals_dict, machine_counter_locals_dict_table);
795795

796796
MP_DEFINE_CONST_OBJ_TYPE(
797797
machine_counter_type,

0 commit comments

Comments
 (0)
0