Commit 121b4d2d authored by Daniel Leung's avatar Daniel Leung Committed by Fabio Baltieri
Browse files

tests: drivers: rename shadow variables 



Renames shadow variables found by -Wshadow.

Signed-off-by: default avatarDaniel Leung <daniel.leung@intel.com>
parent 174caf0c

tests/drivers/adc/adc_api/src/test_adc.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static void init_adc(void) 


	zassert_true(adc_is_ready_dt(&adc_channels[0]), "ADC device is not ready");



	for (int i = 0; i < adc_channels_count; i++) {

	for (i = 0; i < adc_channels_count; i++) {

		ret = adc_channel_setup_dt(&adc_channels[i]);

		zassert_equal(ret, 0, "Setting up of channel %d failed with code %d", i, ret);

	}

tests/drivers/clock_control/nrf_lf_clock_start/src/main.c

+6 −6
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ 
#include <hal/nrf_clock.h>

#include <zephyr/drivers/clock_control/nrf_clock_control.h>



static nrf_clock_lfclk_t type;

static bool on;

static nrf_clock_lfclk_t clk_type;

static bool clk_on;

static uint32_t rtc_cnt;



static void xtal_check(bool on, nrf_clock_lfclk_t type)
@@ -58,11 +58,11 @@ ZTEST(nrf_lf_clock_start, test_clock_check) 
		IS_ENABLED(CONFIG_CLOCK_CONTROL_NRF_K32SRC_EXT_FULL_SWING);



	if (xtal) {

		xtal_check(on, type);

		xtal_check(clk_on, clk_type);

	} else if (IS_ENABLED(CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC)) {

		rc_check(on, type);

		rc_check(clk_on, clk_type);

	} else {

		synth_check(on, type);

		synth_check(clk_on, clk_type);

	}

}
@@ -121,7 +121,7 @@ static int get_lfclk_state(void) 
	 * not valid, in that case read system clock to check if it has

	 * progressed.

	 */

	on = nrf_clock_is_running(NRF_CLOCK, NRF_CLOCK_DOMAIN_LFCLK, &type);

	clk_on = nrf_clock_is_running(NRF_CLOCK, NRF_CLOCK_DOMAIN_LFCLK, &clk_type);

	k_busy_wait(100);

	rtc_cnt = k_cycle_get_32();

tests/drivers/counter/counter_basic_api/src/test_counter.c

+24 −24
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ static void top_handler(const struct device *dev, void *user_data); 


void *exp_user_data = (void *)199;



struct counter_alarm_cfg alarm_cfg;

struct counter_alarm_cfg alarm_cfg2;

struct counter_alarm_cfg cntr_alarm_cfg;

struct counter_alarm_cfg cntr_alarm_cfg2;



#define DEVICE_DT_GET_AND_COMMA(node_id) DEVICE_DT_GET(node_id),

/* Generate a list of devices for all instances of the "compat" */
@@ -340,7 +340,7 @@ static void alarm_handler(const struct device *dev, uint8_t chan_id, 
			counter, now, top, processing_limit_us);



	if (user_data) {

		zassert_true(&alarm_cfg == user_data,

		zassert_true(&cntr_alarm_cfg == user_data,

			"%s: Unexpected callback", dev->name);

	}
@@ -369,9 +369,9 @@ static void test_single_shot_alarm_instance(const struct device *dev, bool set_t 
	ticks = counter_us_to_ticks(dev, counter_period_us);

	top_cfg.ticks = ticks;



	alarm_cfg.flags = 0;

	alarm_cfg.callback = alarm_handler;

	alarm_cfg.user_data = &alarm_cfg;

	cntr_alarm_cfg.flags = 0;

	cntr_alarm_cfg.callback = alarm_handler;

	cntr_alarm_cfg.user_data = &cntr_alarm_cfg;



	k_sem_reset(&alarm_cnt_sem);

	alarm_cnt = 0;
@@ -390,16 +390,16 @@ static void test_single_shot_alarm_instance(const struct device *dev, bool set_t 
		zassert_equal(0, err,

			     "%s: Counter failed to set top value", dev->name);



		alarm_cfg.ticks = ticks + 1;

		err = counter_set_channel_alarm(dev, 0, &alarm_cfg);

		cntr_alarm_cfg.ticks = ticks + 1;

		err = counter_set_channel_alarm(dev, 0, &cntr_alarm_cfg);

		zassert_equal(-EINVAL, err,

			      "%s: Counter should return error because ticks"

			      " exceeded the limit set alarm", dev->name);

		alarm_cfg.ticks = ticks - 1;

		cntr_alarm_cfg.ticks = ticks - 1;

	}



	alarm_cfg.ticks = ticks;

	err = counter_set_channel_alarm(dev, 0, &alarm_cfg);

	cntr_alarm_cfg.ticks = ticks;

	err = counter_set_channel_alarm(dev, 0, &cntr_alarm_cfg);

	zassert_equal(0, err, "%s: Counter set alarm failed (err: %d)",

			dev->name, err);
@@ -509,15 +509,15 @@ static void test_multiple_alarms_instance(const struct device *dev) 
	zassert_equal(0, err, "%s: Counter get value failed", dev->name);

	top_cfg.ticks += ticks;



	alarm_cfg.flags = COUNTER_ALARM_CFG_ABSOLUTE;

	alarm_cfg.ticks = counter_us_to_ticks(dev, 2000);

	alarm_cfg.callback = alarm_handler2;

	alarm_cfg.user_data = &alarm_cfg;

	cntr_alarm_cfg.flags = COUNTER_ALARM_CFG_ABSOLUTE;

	cntr_alarm_cfg.ticks = counter_us_to_ticks(dev, 2000);

	cntr_alarm_cfg.callback = alarm_handler2;

	cntr_alarm_cfg.user_data = &cntr_alarm_cfg;



	alarm_cfg2.flags = 0;

	alarm_cfg2.ticks = counter_us_to_ticks(dev, 2000);

	alarm_cfg2.callback = alarm_handler2;

	alarm_cfg2.user_data = &alarm_cfg2;

	cntr_alarm_cfg2.flags = 0;

	cntr_alarm_cfg2.ticks = counter_us_to_ticks(dev, 2000);

	cntr_alarm_cfg2.callback = alarm_handler2;

	cntr_alarm_cfg2.user_data = &cntr_alarm_cfg2;



	k_sem_reset(&alarm_cnt_sem);

	alarm_cnt = 0;
@@ -541,12 +541,12 @@ static void test_multiple_alarms_instance(const struct device *dev) 
		return;

	}



	k_busy_wait(3*(uint32_t)counter_ticks_to_us(dev, alarm_cfg.ticks));

	k_busy_wait(3*(uint32_t)counter_ticks_to_us(dev, cntr_alarm_cfg.ticks));



	err = counter_set_channel_alarm(dev, 0, &alarm_cfg);

	err = counter_set_channel_alarm(dev, 0, &cntr_alarm_cfg);

	zassert_equal(0, err, "%s: Counter set alarm failed", dev->name);



	err = counter_set_channel_alarm(dev, 1, &alarm_cfg2);

	err = counter_set_channel_alarm(dev, 1, &cntr_alarm_cfg2);

	zassert_equal(0, err, "%s: Counter set alarm failed", dev->name);



	k_busy_wait(1.2 * counter_ticks_to_us(dev, ticks * 2U));
@@ -557,10 +557,10 @@ static void test_multiple_alarms_instance(const struct device *dev) 
			"%s: Invalid number of callbacks %d (expected: %d)",

			dev->name, cnt, 2);



	zassert_equal(&alarm_cfg2, clbk_data[0],

	zassert_equal(&cntr_alarm_cfg2, clbk_data[0],

			"%s: Expected different order or callbacks",

			dev->name);

	zassert_equal(&alarm_cfg, clbk_data[1],

	zassert_equal(&cntr_alarm_cfg, clbk_data[1],

			"%s: Expected different order or callbacks",

			dev->name);

tests/drivers/entropy/api/src/main.c

+4 −4
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ 


#ifdef CONFIG_RANDOM_BUFFER_NOCACHED

__attribute__((__section__(".nocache")))

static uint8_t buffer[BUFFER_LENGTH] = {0};

static uint8_t entropy_buffer[BUFFER_LENGTH] = {0};

#else

static uint8_t buffer[BUFFER_LENGTH] = {0};

static uint8_t entropy_buffer[BUFFER_LENGTH] = {0};

#endif



static int random_entropy(const struct device *dev, char *buffer, char num)
@@ -86,7 +86,7 @@ static int get_entropy(void) 
	TC_PRINT("random device is %p, name is %s\n",

		 dev, dev->name);



	ret = random_entropy(dev, buffer, 0);

	ret = random_entropy(dev, entropy_buffer, 0);



	/* Check whether 20% or more of buffer still filled with default

	 * value(0), if yes then recheck again by filling nonzero value(0xa5)
@@ -94,7 +94,7 @@ static int get_entropy(void) 
	 * of buffer filled with value(0xa5) or not.

	 */

	if (ret == RECHECK_RANDOM_ENTROPY) {

		ret = random_entropy(dev, buffer, 0xa5);

		ret = random_entropy(dev, entropy_buffer, 0xa5);

		if (ret == RECHECK_RANDOM_ENTROPY) {

			return TC_FAIL;

		} else {

tests/drivers/flash/stm32/src/main.c

+3 −3
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ static uint32_t sector_mask; 
static uint8_t __aligned(4) expected[EXPECTED_SIZE];



static int sector_mask_from_offset(const struct device *dev, off_t offset,

				   size_t size, uint32_t *sector_mask)

				   size_t size, uint32_t *mask)

{

	struct flash_pages_info start_page, end_page;
@@ -34,7 +34,7 @@ static int sector_mask_from_offset(const struct device *dev, off_t offset, 
		return -EINVAL;

	}



	*sector_mask = ((1UL << (end_page.index + 1)) - 1) &

	*mask = ((1UL << (end_page.index + 1)) - 1) &

		~((1UL << start_page.index) - 1);



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE