Consolidate opening the two interfaces

Author: Ben Blumer

AirAPI_Windows.cpp

@@ -213,49 +213,7 @@ process_accel(const int32_t in_accel[3], float out_vec[])
 
 }
 
-
-static hid_device*
-open_device()
-{
-	struct hid_device_info* devs = NULL;
-	struct hid_device_info* devs_1 = hid_enumerate(AIR_VID, AIR_PID);
-	struct hid_device_info* devs_2 = hid_enumerate(AIR_VID, AIR_2_PID);
-	struct hid_device_info* devs_2_pro = hid_enumerate(AIR_VID, AIR_2_PRO_PID);
-	
-	struct hid_device_info* cur_dev = NULL;
-
-	if (devs_1 != NULL) {
-		cur_dev = devs_1;
-		devs = devs_1;
-	}
-	else if (devs_2 != NULL) {
-		cur_dev = devs_2;
-		devs = devs_2;
-
-	}
-	else if (devs_2_pro != NULL) {
-		cur_dev = devs_2_pro;
-		devs = devs_2_pro;
-	}
-
-	hid_device* device = NULL;
-
-	while (devs) {
-		if (cur_dev->interface_number == 3) {
-			device = hid_open_path(cur_dev->path);
-			std::cout << "Interface 3 bound" << std::endl;
-			break;
-		}
-
-		cur_dev = cur_dev->next;
-	}
-
-	hid_free_enumeration(devs);
-	return device;
-}
-
-static hid_device*
-open_device4()
+static hid_device* open_device_by_interface(int interface_number)
 {
 	struct hid_device_info* devs = NULL;
 	struct hid_device_info* devs_1 = hid_enumerate(AIR_VID, AIR_PID);
@@ -271,18 +229,18 @@ open_device4()
 	else if (devs_2 != NULL) {
 		cur_dev = devs_2;
 		devs = devs_2;
-
 	}
 	else if (devs_2_pro != NULL) {
 		cur_dev = devs_2_pro;
 		devs = devs_2_pro;
 	}
+
 	hid_device* device = NULL;
 
 	while (devs) {
-		if (cur_dev->interface_number == 4) {
+		if (cur_dev->interface_number == interface_number) {
 			device = hid_open_path(cur_dev->path);
-			std::cout << "Interface 4 bound" << std::endl;
+			std::cout << "Interface " << interface_number << " bound" << std::endl;
 			break;
 		}
 
@@ -449,9 +407,9 @@ int StartConnection()
 	}
 	else {
 		std::cout << "Opening Device" << std::endl;
-		// open device
-		device = open_device();
-		device4 = open_device4();
+		// open devices
+		device = open_device_by_interface(3); // for interface 3
+		device4 = open_device_by_interface(4); // for interface 4
 		if (!device || !device4) {
 			std::cout << "Unable to open device" << std::endl;
 			return 1;