From d7bdf59860624a823dcfdfa8c2bd689980fb5ed5 Mon Sep 17 00:00:00 2001
From: Raphael Assenat <raph@raphnet.net>
Date: Sun, 23 Oct 2016 16:15:01 -0400
Subject: [PATCH] Need to initialize stuff *after* knowing the number of
 players.

---
 main.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/main.c b/main.c
index c18210a..dc97641 100644
--- a/main.c
+++ b/main.c
@@ -454,21 +454,6 @@ int main(void)
 	eeprom_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)
 	{
 		default:
@@ -513,6 +498,21 @@ int main(void)
 			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();
 	usb_init(&usb_params);