michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Revert "boards: bsim: fix bug with single settings file for few bsim devices"

Browse source 
This reverts commit 4b5cd92312.

global_device_nbr is used by many bsim tests.
And many of those are now off tree in preparation of the LE-Audio
work. Removing this for cleanliness now is not nice on others.
=> Revert

Signed-off-by: Alberto Escolar Piedras <alpi@oticon.com>
This commit is contained in:
Alberto Escolar Piedras 2021-08-24 09:51:32 +02:00 • committed by Alberto Escolar
commit 26d7d7c8c8
7 changed files with 26 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

10
boards/posix/nrf52_bsim/argparse.c
View file

@ -226,15 +226,5 @@ void nrfbsim_cleanup_args(void)
bs_cleanup_dynargs(&args_struct);
}
char *get_simid(void)
{
return arg.s_id;
}
unsigned int get_device_nbr(void)
{
return arg.global_device_nbr;
}
NATIVE_TASK(nrfbsim_register_args, PRE_BOOT_1, 0);
NATIVE_TASK(nrfbsim_cleanup_args, ON_EXIT, 10);

2
boards/posix/nrf52_bsim/argparse.h
View file

@ -26,8 +26,6 @@ struct NRF_bsim_args_t {
struct NRF_bsim_args_t *nrfbsim_argsparse(int argc, char *argv[]);
void bs_add_extra_dynargs(bs_args_struct_t *args_struct_toadd);
char *get_simid(void);
unsigned int get_device_nbr(void);
#ifdef __cplusplus
}

3
boards/posix/nrf52_bsim/main.c
View file

@ -57,6 +57,8 @@ void posix_exit(int exit_code)
exit(inner_main_clean_up(exit_code));
}
uint global_device_nbr;
int main(int argc, char *argv[])
{
/*
@ -77,6 +79,7 @@ int main(int argc, char *argv[])
struct NRF_bsim_args_t *args;
args = nrfbsim_argsparse(argc, argv);
global_device_nbr = args->global_device_nbr;
bs_read_function_names_from_Tsymbols(argv[0]);