Multiple device support

src/dev.c

@@ -61,45 +61,6 @@ int check_range(int number, int low, int high)
     return 0;
 }
 
-/**
- * @brief Accept an string input like 123:456 and splits them into two ids
- *
- * @param input input string
- * @param id1 the first (left) id
- * @param id2 the secound it
- * @return int 0 if successfull, or 1 if not two ids provided
- */
-static int get_two_ids(char* input, int* id1, int* id2)
-{
-    const char* delim = " :.,";
-
-    size_t sz = strlen(input);
-    char* str = (char*)malloc(sz + 1);
-    strcpy(str, input);
-
-    char* token = strtok(input, delim);
-    int i       = 0;
-    while (token) {
-        char* endptr;
-        long int val = strtol(token, &endptr, 0);
-
-        if (i == 0)
-            *id1 = val;
-        else if (i == 1)
-            *id2 = val;
-
-        i++;
-        token = strtok(NULL, delim);
-    }
-
-    free(str);
-
-    if (i != 2) // not exactly supplied two ids
-        return 1;
-
-    return 0;
-}
-
 static void print_help()
 {
     printf("HeadsetControl Developer menu. Take caution.\n\n");

src/device.c

@@ -57,3 +57,15 @@ const char capabilities_str_short[NUM_CAPABILITIES]
           [CAP_BT_WHEN_POWERED_ON] = '\0',
           [CAP_BT_CALL_VOLUME]     = '\0'
       };
+
+bool device_check_ids(struct device* device, uint16_t vid, uint16_t pid)
+{
+    return device->idVendor == vid && device->idProduct == pid;
+}
+
+bool device_has_capability(struct device* device, enum capabilities cap)
+{
+    if (device == NULL)
+        return false;
+    return (device->capabilities & B(cap)) == B(cap);
+}

src/device.h

@@ -54,11 +54,6 @@ extern const char capabilities_str_short[NUM_CAPABILITIES];
 /// Enum name of every capability
 extern const char* const capabilities_str_enum[NUM_CAPABILITIES];
 
-static inline bool has_capability(int device_capabilities, enum capabilities cap)
-{
-    return (device_capabilities & B(cap)) == B(cap);
-}
-
 struct capability_detail {
     // Usage page, only used when usageid is not 0; HID Protocol specific
     uint16_t usagepage;
@@ -394,3 +389,18 @@ struct device {
      */
     int (*send_bluetooth_call_volume)(hid_device* hid_device, uint8_t num);
 };
+
+/**
+ * @brief Node structure for a linked list of devices.
+ *
+ * This structure represents a node in a linked list where each node contains a pointer to a device
+ * and a pointer to the next node in the list.
+ */
+typedef struct DeviceListNode {
+    struct device* element;
+    struct DeviceListNode* next;
+} DeviceListNode;
+
+bool device_check_ids(struct device* device, uint16_t vid, uint16_t pid);
+
+bool device_has_capability(struct device* device, enum capabilities cap);

src/hid_utility.c

@@ -97,10 +97,9 @@ char* get_hid_path(uint16_t vid, uint16_t pid, int iid, uint16_t usagepageid, ui
 }
 
 /**
- *  Helper freeing HID data and terminating HID usage.
+ *  Helper freeing HID data.
  */
-/* This function is explicitly called terminate_hid to avoid HIDAPI clashes. */
-void terminate_hid(hid_device** handle, char** path)
+void terminate_device_hid(hid_device** handle, char** path)
 {
     if (handle) {
         if (*handle) {
@@ -112,7 +111,18 @@ void terminate_hid(hid_device** handle, char** path)
 
     if (path) {
         free(*path);
+
+        *path = NULL;
     }
+}
+
+/**
+ *  Helper freeing HID data and terminating HID usage.
+ */
+/* This function is explicitly called terminate_hid to avoid HIDAPI clashes. */
+void terminate_hid(hid_device** handle, char** path)
+{
+    terminate_device_hid(handle, path);
 
     hid_exit();
 }

src/hid_utility.h

@@ -25,6 +25,11 @@
  */
 char* get_hid_path(uint16_t vid, uint16_t pid, int iid, uint16_t usagepageid, uint16_t usageid);
 
+/**
+ *  Helper freeing HID data.
+ */
+void terminate_device_hid(hid_device** handle, char** path);
+
 /**
  *  Helper freeing HID data and terminating HID usage.
  */