Need to initialize stuff *after* knowing the number of players.

This commit is contained in:
Raphael Assenat 2016-10-23 16:15:01 -04:00
parent bb9e6dce17
commit d7bdf59860
1 changed files with 15 additions and 15 deletions

30
main.c
View File

@ -454,21 +454,6 @@ int main(void)
eeprom_init(); eeprom_init();
intervaltimer_init(); intervaltimer_init();
for (i=0; i<num_players; i++) {
int hid_iface_id;
usbpad_init(&usbpads[i]);
// Skip interface 1 (always used for the dataReport)
if (i>0) {
hid_iface_id = i + 1;
} else {
hid_iface_id = i;
}
usb_params.hid_params[hid_iface_id].ctx = &usbpads[i];
}
switch (g_eeprom_data.cfg.mode) switch (g_eeprom_data.cfg.mode)
{ {
default: default:
@ -513,6 +498,21 @@ int main(void)
break; break;
} }
for (i=0; i<num_players; i++) {
int hid_iface_id;
usbpad_init(&usbpads[i]);
// Skip interface 1 (always used for the dataReport)
if (i>0) {
hid_iface_id = i + 1;
} else {
hid_iface_id = i;
}
usb_params.hid_params[hid_iface_id].ctx = &usbpads[i];
}
sei(); sei();
usb_init(&usb_params); usb_init(&usb_params);