catarrh/simtrace2
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-03-20 07:18:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

conf_func: Use named struct initializers and named array subscripts

Browse Source 
As part of this, we also do away with the '-1' based array subscripts
This commit is contained in:
Harald Welte
2015-11-07 18:19:11 +01:00
parent 15d72cc631
commit fefd571701
1 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
firmware/src_simtrace/main.c
View File

@@ -20,10 +20,31 @@ typedef struct {
} conf_func; } conf_func;
conf_func config_func_ptrs[] = { conf_func config_func_ptrs[] = {
{Sniffer_configure, Sniffer_init, Sniffer_exit, Sniffer_run}, /* CFG_NUM_SNIFF */ /* array slot 0 is empty, usb configs start at 1 */
{CCID_configure, CCID_init, CCID_exit, CCID_run}, /* CFG_NUM_CCID */ [CFG_NUM_SNIFF] = {
{Phone_configure, Phone_init, Phone_exit, Phone_run}, /* CFG_NUM_PHONE */ .configure = Sniffer_configure,
{MITM_configure, MITM_init, MITM_exit, MITM_run}, /* CFG_NUM_MITM */ .init = Sniffer_init,
.exit = Sniffer_exit,
.run = Sniffer_run,
},
[CFG_NUM_CCID] = {
.configure = CCID_configure,
.init = CCID_init,
.exit = CCID_exit,
.run = CCID_run,
},
[CFG_NUM_PHONE] = {
.configure = Phone_configure,
.init = Phone_init,
.exit = Phone_exit,
.run = Phone_run,
},
[CFG_NUM_MITM] = {
.configure = MITM_configure,
.init = MITM_init,
.exit = MITM_exit,
.run = MITM_run
},
}; };
@@ -62,12 +83,12 @@ extern int main( void )
i++; i++;
} }
for (i = 0; i < sizeof(config_func_ptrs)/sizeof(config_func_ptrs[0]); ++i) for (i = 1; i < sizeof(config_func_ptrs)/sizeof(config_func_ptrs[0]); ++i)
{ {
config_func_ptrs[i].configure(); config_func_ptrs[i].configure();
} }
config_func_ptrs[simtrace_config-1].init(); config_func_ptrs[simtrace_config].init();
last_simtrace_config = simtrace_config; last_simtrace_config = simtrace_config;
printf("%s", "Start\n\r"); printf("%s", "Start\n\r");
@@ -89,11 +110,11 @@ extern int main( void )
if (last_simtrace_config != simtrace_config) { if (last_simtrace_config != simtrace_config) {
config_func_ptrs[last_simtrace_config-1].exit(); config_func_ptrs[last_simtrace_config].exit();
config_func_ptrs[simtrace_config-1].init(); config_func_ptrs[simtrace_config].init();
last_simtrace_config = simtrace_config; last_simtrace_config = simtrace_config;
} else { } else {
config_func_ptrs[simtrace_config-1].run(); config_func_ptrs[simtrace_config].run();
} }
} }
} }