diff options
| author | Daniel Tralamazza <daniel@tralamazza.com> | 2017-08-07 04:03:58 +0200 |
|---|---|---|
| committer | Daniel Tralamazza <daniel@tralamazza.com> | 2017-08-08 00:43:21 +0200 |
| commit | 3e0d3d283d5619e52e04dc8484d7bf413e66d130 (patch) | |
| tree | 1f23cb3c47e4e3fe213faa0f3fafe4e64df1fe63 | |
| parent | c017f2d2673007e9890a38514f2575e8627ad903 (diff) | |
nrf: clean compiler warnings
| -rw-r--r-- | nrf/fatfs_port.c | 2 | ||||
| -rw-r--r-- | nrf/hal/hal_adce.c | 4 | ||||
| -rw-r--r-- | nrf/modules/machine/pin.c | 24 |
3 files changed, 15 insertions, 15 deletions
diff --git a/nrf/fatfs_port.c b/nrf/fatfs_port.c index 4d44e2d1d..13ac21fb1 100644 --- a/nrf/fatfs_port.c +++ b/nrf/fatfs_port.c @@ -29,5 +29,5 @@ DWORD get_fattime(void) { // TODO: Implement this function. For now, fake it. - return ((2000 + 2016 - 1980) << 25) | ((12) << 21) | ((4) << 16) | ((00) << 11) | ((18) << 5) | (23 / 2); + return ((2016 - 1980) << 25) | ((12) << 21) | ((4) << 16) | ((00) << 11) | ((18) << 5) | (23 / 2); } diff --git a/nrf/hal/hal_adce.c b/nrf/hal/hal_adce.c index 90d42338b..0abdf07c3 100644 --- a/nrf/hal/hal_adce.c +++ b/nrf/hal/hal_adce.c @@ -43,7 +43,7 @@ static const uint32_t hal_adc_input_lookup_pos[] = { #define HAL_ADCE_PSELP_NOT_CONNECTED (SAADC_CH_PSELP_PSELP_NC << SAADC_CH_PSELP_PSELP_Pos) #define HAL_ADCE_PSELP_VDD (SAADC_CH_PSELP_PSELP_VDD << SAADC_CH_PSELP_PSELP_Pos) -static const uint32_t hal_adc_input_lookup_neg[] = { +/*static const uint32_t hal_adc_input_lookup_neg[] = { SAADC_CH_PSELN_PSELN_AnalogInput0 << SAADC_CH_PSELN_PSELN_Pos, SAADC_CH_PSELN_PSELN_AnalogInput1 << SAADC_CH_PSELN_PSELN_Pos, SAADC_CH_PSELN_PSELN_AnalogInput2 << SAADC_CH_PSELN_PSELN_Pos, @@ -52,7 +52,7 @@ static const uint32_t hal_adc_input_lookup_neg[] = { SAADC_CH_PSELN_PSELN_AnalogInput5 << SAADC_CH_PSELN_PSELN_Pos, SAADC_CH_PSELN_PSELN_AnalogInput6 << SAADC_CH_PSELN_PSELN_Pos, SAADC_CH_PSELN_PSELN_AnalogInput7 << SAADC_CH_PSELN_PSELN_Pos -}; +};*/ #define HAL_ADCE_PSELN_NOT_CONNECTED (SAADC_CH_PSELN_PSELN_NC << SAADC_CH_PSELN_PSELN_Pos) #define HAL_ADCE_PSELN_VDD (SAADC_CH_PSELN_PSELN_VDD << SAADC_CH_PSELN_PSELN_Pos) diff --git a/nrf/modules/machine/pin.c b/nrf/modules/machine/pin.c index 3ba0926a2..126ec02d3 100644 --- a/nrf/modules/machine/pin.c +++ b/nrf/modules/machine/pin.c @@ -666,30 +666,30 @@ typedef struct _pin_irq_obj_t { pin_obj_t pin; } pin_irq_obj_t; -STATIC const mp_obj_type_t pin_irq_type; +// STATIC const mp_obj_type_t pin_irq_type; -STATIC mp_obj_t pin_irq_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) { +/*STATIC mp_obj_t pin_irq_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) { pin_irq_obj_t *self = self_in; (void)self; return mp_const_none; -} +}*/ -STATIC mp_obj_t pin_irq_trigger(size_t n_args, const mp_obj_t *args) { +/*STATIC mp_obj_t pin_irq_trigger(size_t n_args, const mp_obj_t *args) { pin_irq_obj_t *self = args[0]; (void)self; return mp_const_none; -} -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pin_irq_trigger_obj, 1, 2, pin_irq_trigger); +}*/ +// STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pin_irq_trigger_obj, 1, 2, pin_irq_trigger); -STATIC const mp_rom_map_elem_t pin_irq_locals_dict_table[] = { - { MP_ROM_QSTR(MP_QSTR_trigger), MP_ROM_PTR(&pin_irq_trigger_obj) }, -}; +// STATIC const mp_rom_map_elem_t pin_irq_locals_dict_table[] = { +// { MP_ROM_QSTR(MP_QSTR_trigger), MP_ROM_PTR(&pin_irq_trigger_obj) }, +// }; -STATIC MP_DEFINE_CONST_DICT(pin_irq_locals_dict, pin_irq_locals_dict_table); +// STATIC MP_DEFINE_CONST_DICT(pin_irq_locals_dict, pin_irq_locals_dict_table); -STATIC const mp_obj_type_t pin_irq_type = { +/*STATIC const mp_obj_type_t pin_irq_type = { { &mp_type_type }, .name = MP_QSTR_IRQ, .call = pin_irq_call, .locals_dict = (mp_obj_dict_t*)&pin_irq_locals_dict, -}; +};*/ |