apache-mynewt-bot commented on issue #2206: Update nrfx to 2.1.0 URL: https://github.com/apache/mynewt-core/pull/2206#issuecomment-590906069 <!-- style-bot --> ## Style check summary ### Our coding style is [here!](https://github.com/apache/mynewt-core/blob/master/CODING_STANDARDS.md) #### hw/drivers/adc/adc_nrf52/src/adc_nrf52.c <details> ```diff @@ -106,7 +106,7 @@ * Unconfigures the device registers */ static void -clear_device_regs(void ) +clear_device_regs(void) { int cnum; nrf_saadc_channel_config_t default_ch = { @@ -151,7 +151,7 @@ int rc = 0; int unlock = 0; struct adc_dev *dev = (struct adc_dev *) odev; - struct adc_dev_cfg *adc_config = (struct adc_dev_cfg*) arg; + struct adc_dev_cfg *adc_config = (struct adc_dev_cfg *) arg; if (os_started()) { rc = os_mutex_pend(&dev->ad_lock, wait); @@ -291,7 +291,7 @@ static int nrf52_adc_configure_channel(struct adc_dev *dev, uint8_t cnum, void *cfgdata) { - struct adc_chan_cfg *cfg = (struct adc_chan_cfg*) cfgdata; + struct adc_chan_cfg *cfg = (struct adc_chan_cfg *) cfgdata; uint16_t refmv; nrf_saadc_resolution_t res; @@ -331,12 +331,12 @@ switch (cfg->reference) { case ADC_REFERENCE_INTERNAL: g_drv_instance.channels[cnum].nrf_chan.reference = - NRF_SAADC_REFERENCE_INTERNAL; + NRF_SAADC_REFERENCE_INTERNAL; refmv = 600; /* 0.6V for NRF52 */ break; case ADC_REFERENCE_VDD_DIV_4: g_drv_instance.channels[cnum].nrf_chan.reference = - NRF_SAADC_REFERENCE_VDD4; + NRF_SAADC_REFERENCE_VDD4; refmv = init_cfg->nadc_refmv / 4; break; default: @@ -345,35 +345,35 @@ /* Adjust reference voltage for gain. */ switch (cfg->gain) { - case ADC_GAIN1_6: - refmv *= 6; - break; - case ADC_GAIN1_5: - refmv *= 5; - break; - case ADC_GAIN1_4: - refmv *= 4; - break; - case ADC_GAIN1_3: - refmv *= 3; - break; - case ADC_GAIN1_2: - refmv *= 2; - break; - case ADC_GAIN2: - refmv /= 2; - break; - case ADC_GAIN4: - refmv /= 4; - break; - default: - break; + case ADC_GAIN1_6: + refmv *= 6; + break; + case ADC_GAIN1_5: + refmv *= 5; + break; + case ADC_GAIN1_4: + refmv *= 4; + break; + case ADC_GAIN1_3: + refmv *= 3; + break; + case ADC_GAIN1_2: + refmv *= 2; + break; + case ADC_GAIN2: + refmv /= 2; + break; + case ADC_GAIN4: + refmv /= 4; + break; + default: + break; } g_drv_instance.channels[cnum].pin_p = cfg->pin; if (cfg->differential) { g_drv_instance.channels[cnum].nrf_chan.mode = - NRF_SAADC_MODE_DIFFERENTIAL; + NRF_SAADC_MODE_DIFFERENTIAL; g_drv_instance.channels[cnum].pin_n = cfg->pin_negative; } @@ -466,8 +466,8 @@ assert(used_chans > 0); if (g_drv_instance.primary_size < (used_chans * sizeof(nrf_saadc_value_t))) { - return OS_ENOMEM; - } + return OS_ENOMEM; + } if ((used_chans == 1) && (g_drv_instance.oversample != NRF_SAADC_OVERSAMPLE_DISABLED)) { @@ -497,7 +497,7 @@ nrf_saadc_task_trigger(NRF_SAADC, NRF_SAADC_TASK_SAMPLE); } - return 0; + return 0; } /** @@ -593,7 +593,7 @@ nrf52_saadc_irq_handler(void) { adc_event_type_t ev = ADC_EVENT_CALIBRATED; - void* buf = NULL; + void * buf = NULL; int bufsize = 0; if (global_adc_dev == NULL || !global_adc_dev->ad_event_handler_func) { ``` </details> #### hw/drivers/pwm/pwm_nrf52/src/pwm_nrf52.c <details> ```diff @@ -125,20 +124,20 @@ }; #if MYNEWT_VAL(PWM_0) -static void handler_0(nrfx_pwm_evt_type_t event_type, void *unused) -{ - switch (event_type) - { - case NRFX_PWM_EVT_END_SEQ0 : - case NRFX_PWM_EVT_END_SEQ1 : +static void +handler_0(nrfx_pwm_evt_type_t event_type, void *unused) +{ + switch (event_type) { + case NRFX_PWM_EVT_END_SEQ0: + case NRFX_PWM_EVT_END_SEQ1: instances[0].cycle_handler(instances[0].cycle_data); break; - case NRFX_PWM_EVT_FINISHED : + case NRFX_PWM_EVT_FINISHED: instances[0].seq_end_handler(instances[0].seq_end_data); break; - case NRFX_PWM_EVT_STOPPED : + case NRFX_PWM_EVT_STOPPED: break; default: @@ -148,20 +147,20 @@ #endif #if MYNEWT_VAL(PWM_1) -static void handler_1(nrfx_pwm_evt_type_t event_type, void *unused) -{ - switch (event_type) - { - case NRFX_PWM_EVT_END_SEQ0 : - case NRFX_PWM_EVT_END_SEQ1 : +static void +handler_1(nrfx_pwm_evt_type_t event_type, void *unused) +{ + switch (event_type) { + case NRFX_PWM_EVT_END_SEQ0: + case NRFX_PWM_EVT_END_SEQ1: instances[1].cycle_handler(instances[1].cycle_data); break; - case NRFX_PWM_EVT_FINISHED : + case NRFX_PWM_EVT_FINISHED: instances[1].seq_end_handler(instances[1].seq_end_data); break; - case NRFX_PWM_EVT_STOPPED : + case NRFX_PWM_EVT_STOPPED: break; default: @@ -171,20 +170,20 @@ #endif #if MYNEWT_VAL(PWM_2) -static void handler_2(nrfx_pwm_evt_type_t event_type, void *unused) -{ - switch (event_type) - { - case NRFX_PWM_EVT_END_SEQ0 : - case NRFX_PWM_EVT_END_SEQ1 : +static void +handler_2(nrfx_pwm_evt_type_t event_type, void *unused) +{ + switch (event_type) { + case NRFX_PWM_EVT_END_SEQ0: + case NRFX_PWM_EVT_END_SEQ1: instances[2].cycle_handler(instances[2].cycle_data); break; - case NRFX_PWM_EVT_FINISHED : + case NRFX_PWM_EVT_FINISHED: instances[2].seq_end_handler(instances[2].seq_end_data); break; - case NRFX_PWM_EVT_STOPPED : + case NRFX_PWM_EVT_STOPPED: break; default: @@ -195,20 +194,20 @@ #endif #if MYNEWT_VAL(PWM_3) -static void handler_3(nrfx_pwm_evt_type_t event_type, void *unused) -{ - switch (event_type) - { - case NRFX_PWM_EVT_END_SEQ0 : - case NRFX_PWM_EVT_END_SEQ1 : +static void +handler_3(nrfx_pwm_evt_type_t event_type, void *unused) +{ + switch (event_type) { + case NRFX_PWM_EVT_END_SEQ0: + case NRFX_PWM_EVT_END_SEQ1: instances[3].cycle_handler(instances[3].cycle_data); break; - case NRFX_PWM_EVT_FINISHED : + case NRFX_PWM_EVT_FINISHED: instances[3].seq_end_handler(instances[3].seq_end_data); break; - case NRFX_PWM_EVT_STOPPED : + case NRFX_PWM_EVT_STOPPED: break; default: @@ -255,11 +254,11 @@ config->output_pins[2] = NRFX_PWM_PIN_NOT_USED; config->output_pins[3] = NRFX_PWM_PIN_NOT_USED; config->irq_priority = 3; /* APP_IRQ_PRIORITY_LOW */ - config->base_clock = NRF_PWM_CLK_1MHz; - config->count_mode = NRF_PWM_MODE_UP; - config->top_value = 10000; - config->load_mode = NRF_PWM_LOAD_INDIVIDUAL; - config->step_mode = NRF_PWM_STEP_AUTO; + config->base_clock = NRF_PWM_CLK_1MHz; + config->count_mode = NRF_PWM_MODE_UP; + config->top_value = 10000; + config->load_mode = NRF_PWM_LOAD_INDIVIDUAL; + config->step_mode = NRF_PWM_STEP_AUTO; config->skip_gpio_cfg = false; } else { memcpy(config, init_conf, sizeof(nrfx_pwm_config_t)); ``` </details>
---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
