Change in simtrace2[master]: firmware/sniffer: Group global variables in structs