Split iface into iface and iface_list

Split iface.[hc] into iface.[hc] and iface_list.[hc].

7 files changed, 296 insertions, 223 deletions

diff --git a/include/uhd/Makefile.am b/include/uhd/Makefile.am
index 71d6e8c..7a84851 100644
--- a/include/uhd/Makefile.am
+++ b/include/uhd/Makefile.am
@@ -18,5 +18,6 @@
 
 noinst_HEADERS = \
     iface.h         \
+    iface_list.h    \
     libusb.h        \
     str.h
diff --git a/include/uhd/iface.h b/include/uhd/iface.h
index cc25361..b87e6db 100644
--- a/include/uhd/iface.h
+++ b/include/uhd/iface.h
@@ -166,78 +166,6 @@ extern enum libusb_error uhd_iface_clear_halt(uhd_iface *iface);
  */
 extern enum libusb_error uhd_iface_release(uhd_iface *iface);
 
-/**
- * Check if an interface list is valid.
- *
- * @param list  Interface list to check.
- *
- * @return True if the interface list is valid, false otherwise.
- */
-extern bool uhd_iface_list_valid(const uhd_iface *list);
-
-/**
- * Check if an interface list is empty.
- *
- * @param list  Interface list to check.
- *
- * @return True if the interface list is empty, false otherwise.
- */
-static inline bool
-uhd_iface_list_empty(const uhd_iface *list)
-{
-    return list == NULL;
-}
-
-/**
- * Calculate length of an interface list.
- *
- * @param list  The list to calculate length of.
- *
- * @return The list length.
- */
-extern size_t uhd_iface_list_len(const uhd_iface *list);
-
-/**
- * Free an interface list.
- *
- * @param list  The interface list to free.
- */
-extern void uhd_iface_list_free(uhd_iface *list);
-
-/**
- * Iterate over an interface list.
- *
- * @param _iface    Loop interface variable.
- * @param _list     Interface list to iterate over.
- */
-#define UHD_IFACE_LIST_FOR_EACH(_iface, _list) \
-    for (_iface = _list; _iface != NULL; _iface = _iface->next)
-
-/**
- * Fetch a list of HID interfaces from a device.
- *
- * @param handle        The device handle to fetch interface list from.
- * @param plist         Location for the resulting list head; could be NULL.
- *
- * @return Libusb error code.
- */
-enum libusb_error
-uhd_iface_list_new_from_dev(libusb_device_handle   *handle,
-                            uhd_iface             **plist);
-
-/**
- * Filter an interface list by an optional interface number, resulting
- * either in an empty, a single-interface, or an unmodified list.
- *
- * @param plist     The original list head.
- * @param number    The interface number to match against, or a negative
- *                  integer meaning there is no restriction.
- *
- * @return The resulting list head
- */
-extern uhd_iface *uhd_iface_list_fltr_by_num(uhd_iface *list,
-                                             int        number);
-
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
diff --git a/include/uhd/iface_list.h b/include/uhd/iface_list.h
new file mode 100644
index 0000000..c93a3da
--- /dev/null
+++ b/include/uhd/iface_list.h
@@ -0,0 +1,112 @@
+/** @file
+ * @brief usbhid-dump - interface list
+ *
+ * Copyright (C) 2010 Nikolai Kondrashov
+ *
+ * This file is part of usbhid-dump.
+ *
+ * Usbhid-dump is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Usbhid-dump is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with usbhid-dump; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @author Nikolai Kondrashov <spbnick@gmail.com>
+ *
+ * @(#) $Id$
+ */
+
+#ifndef __UHD_IFACE_LIST_H__
+#define __UHD_IFACE_LIST_H__
+
+#include "uhd/iface.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Check if an interface list is valid.
+ *
+ * @param list  Interface list to check.
+ *
+ * @return True if the interface list is valid, false otherwise.
+ */
+extern bool uhd_iface_list_valid(const uhd_iface *list);
+
+/**
+ * Check if an interface list is empty.
+ *
+ * @param list  Interface list to check.
+ *
+ * @return True if the interface list is empty, false otherwise.
+ */
+static inline bool
+uhd_iface_list_empty(const uhd_iface *list)
+{
+    return list == NULL;
+}
+
+/**
+ * Calculate length of an interface list.
+ *
+ * @param list  The list to calculate length of.
+ *
+ * @return The list length.
+ */
+extern size_t uhd_iface_list_len(const uhd_iface *list);
+
+/**
+ * Free an interface list.
+ *
+ * @param list  The interface list to free.
+ */
+extern void uhd_iface_list_free(uhd_iface *list);
+
+/**
+ * Iterate over an interface list.
+ *
+ * @param _iface    Loop interface variable.
+ * @param _list     Interface list to iterate over.
+ */
+#define UHD_IFACE_LIST_FOR_EACH(_iface, _list) \
+    for (_iface = _list; _iface != NULL; _iface = _iface->next)
+
+/**
+ * Fetch a list of HID interfaces from a device.
+ *
+ * @param handle        The device handle to fetch interface list from.
+ * @param plist         Location for the resulting list head; could be NULL.
+ *
+ * @return Libusb error code.
+ */
+enum libusb_error
+uhd_iface_list_new_from_dev(libusb_device_handle   *handle,
+                            uhd_iface             **plist);
+
+/**
+ * Filter an interface list by an optional interface number, resulting
+ * either in an empty, a single-interface, or an unmodified list.
+ *
+ * @param plist     The original list head.
+ * @param number    The interface number to match against, or a negative
+ *                  integer meaning there is no restriction.
+ *
+ * @return The resulting list head
+ */
+extern uhd_iface *uhd_iface_list_fltr_by_num(uhd_iface *list,
+                                             int        number);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* __UHD_IFACE_LIST_H__ */
diff --git a/lib/Makefile.am b/lib/Makefile.am
index e3188c8..5422448 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -20,5 +20,6 @@ noinst_LTLIBRARIES = libuhd.la
 
 libuhd_la_SOURCES = \
     iface.c         \
+    iface_list.c    \
     libusb.c        \
     str.c
diff --git a/lib/iface.c b/lib/iface.c
index 85dfcd8..445d902 100644
--- a/lib/iface.c
+++ b/lib/iface.c
@@ -223,153 +223,3 @@ uhd_iface_set_protocol(const uhd_iface    *iface,
 }
 
 
-bool
-uhd_iface_list_valid(const uhd_iface *list)
-{
-    for (; list != NULL; list = list->next)
-        if (!uhd_iface_valid(list))
-            return false;
-
-    return true;
-}
-
-
-size_t
-uhd_iface_list_len(const uhd_iface *list)
-{
-    size_t  len = 0;
-
-    for (; list != NULL; list = list->next)
-        len++;
-
-    return len;
-}
-
-
-void
-uhd_iface_list_free(uhd_iface *list)
-{
-    uhd_iface *next;
-
-    for (; list != NULL; list = next)
-    {
-        next = list->next;
-        uhd_iface_free(list);
-    }
-}
-
-
-enum libusb_error
-uhd_iface_list_new_from_dev(libusb_device_handle   *handle,
-                            uhd_iface             **plist)
-{
-    enum libusb_error                           err = LIBUSB_ERROR_OTHER;
-
-    struct libusb_config_descriptor            *config          = NULL;
-    const struct libusb_interface              *libusb_iface;
-    const struct libusb_endpoint_descriptor    *ep_list;
-    uint8_t                                     ep_num;
-    const struct libusb_endpoint_descriptor    *ep;
-    uhd_iface                                  *list            = NULL;
-    uhd_iface                                  *last            = NULL;
-    uhd_iface                                  *iface;
-
-    assert(handle != NULL);
-
-    /* Retrieve active configuration descriptor */
-    err = libusb_get_active_config_descriptor(libusb_get_device(handle),
-                                              &config);
-    if (err != LIBUSB_SUCCESS)
-        goto cleanup;
-
-    /* Build the matching interface list */
-    for (libusb_iface = config->interface;
-         libusb_iface - config->interface < config->bNumInterfaces;
-         libusb_iface++)
-    {
-        if (libusb_iface->num_altsetting != 1 ||
-            libusb_iface->altsetting->bInterfaceClass != LIBUSB_CLASS_HID)
-            continue;
-
-        ep_list = libusb_iface->altsetting->endpoint;
-        ep_num = libusb_iface->altsetting->bNumEndpoints;
-
-        for (ep = ep_list; (ep - ep_list) < ep_num; ep++)
-        {
-            if ((ep->bmAttributes & LIBUSB_TRANSFER_TYPE_MASK) !=
-                LIBUSB_TRANSFER_TYPE_INTERRUPT ||
-                (ep->bEndpointAddress & LIBUSB_ENDPOINT_DIR_MASK) !=
-                LIBUSB_ENDPOINT_IN)
-                continue;
-
-            iface = uhd_iface_new(
-                        handle,
-                        libusb_iface->altsetting->bInterfaceNumber,
-                        ep->bEndpointAddress, ep->wMaxPacketSize);
-            if (iface == NULL)
-            {
-                err = LIBUSB_ERROR_NO_MEM;
-                goto cleanup;
-            }
-
-            if (last == NULL)
-                list = iface;
-            else
-                last->next = iface;
-            last = iface;
-
-            break;
-        }
-    }
-
-    /* Output the resulting list, if requested */
-    if (plist != NULL)
-    {
-        *plist = list;
-        list = NULL;
-    }
-
-cleanup:
-
-    uhd_iface_list_free(list);
-
-    if (config != NULL)
-        libusb_free_config_descriptor(config);
-
-    return err;
-}
-
-
-uhd_iface *
-uhd_iface_list_fltr_by_num(uhd_iface   *list,
-                           int          number)
-{
-    uhd_iface  *prev;
-    uhd_iface  *iface;
-    uhd_iface  *next;
-
-    assert(uhd_iface_list_valid(list));
-    assert(number < UINT8_MAX);
-
-    if (number < 0)
-        return list;
-
-    for (prev = NULL, iface = list; iface != NULL; iface = next)
-    {
-        next = iface->next;
-        if (iface->number == (uint8_t)number)
-            prev = iface;
-        else
-        {
-            if (prev == NULL)
-                list = next;
-            else
-                prev->next = next;
-            free(iface);
-        }
-    }
-
-    return list;
-}
-
-
diff --git a/lib/iface_list.c b/lib/iface_list.c
new file mode 100644
index 0000000..9a0c862
--- /dev/null
+++ b/lib/iface_list.c
@@ -0,0 +1,181 @@
+/** @file
+ * @brief usbhid-dump - interface list
+ *
+ * Copyright (C) 2010 Nikolai Kondrashov
+ *
+ * This file is part of usbhid-dump.
+ *
+ * Usbhid-dump is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Usbhid-dump is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with usbhid-dump; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @author Nikolai Kondrashov <spbnick@gmail.com>
+ *
+ * @(#) $Id$
+ */
+
+#include "uhd/iface_list.h"
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+bool
+uhd_iface_list_valid(const uhd_iface *list)
+{
+    for (; list != NULL; list = list->next)
+        if (!uhd_iface_valid(list))
+            return false;
+
+    return true;
+}
+
+
+size_t
+uhd_iface_list_len(const uhd_iface *list)
+{
+    size_t  len = 0;
+
+    for (; list != NULL; list = list->next)
+        len++;
+
+    return len;
+}
+
+
+void
+uhd_iface_list_free(uhd_iface *list)
+{
+    uhd_iface *next;
+
+    for (; list != NULL; list = next)
+    {
+        next = list->next;
+        uhd_iface_free(list);
+    }
+}
+
+
+enum libusb_error
+uhd_iface_list_new_from_dev(libusb_device_handle   *handle,
+                            uhd_iface             **plist)
+{
+    enum libusb_error                           err = LIBUSB_ERROR_OTHER;
+
+    struct libusb_config_descriptor            *config          = NULL;
+    const struct libusb_interface              *libusb_iface;
+    const struct libusb_endpoint_descriptor    *ep_list;
+    uint8_t                                     ep_num;
+    const struct libusb_endpoint_descriptor    *ep;
+    uhd_iface                                  *list            = NULL;
+    uhd_iface                                  *last            = NULL;
+    uhd_iface                                  *iface;
+
+    assert(handle != NULL);
+
+    /* Retrieve active configuration descriptor */
+    err = libusb_get_active_config_descriptor(libusb_get_device(handle),
+                                              &config);
+    if (err != LIBUSB_SUCCESS)
+        goto cleanup;
+
+    /* Build the matching interface list */
+    for (libusb_iface = config->interface;
+         libusb_iface - config->interface < config->bNumInterfaces;
+         libusb_iface++)
+    {
+        if (libusb_iface->num_altsetting != 1 ||
+            libusb_iface->altsetting->bInterfaceClass != LIBUSB_CLASS_HID)
+            continue;
+
+        ep_list = libusb_iface->altsetting->endpoint;
+        ep_num = libusb_iface->altsetting->bNumEndpoints;
+
+        for (ep = ep_list; (ep - ep_list) < ep_num; ep++)
+        {
+            if ((ep->bmAttributes & LIBUSB_TRANSFER_TYPE_MASK) !=
+                LIBUSB_TRANSFER_TYPE_INTERRUPT ||
+                (ep->bEndpointAddress & LIBUSB_ENDPOINT_DIR_MASK) !=
+                LIBUSB_ENDPOINT_IN)
+                continue;
+
+            iface = uhd_iface_new(
+                        handle,
+                        libusb_iface->altsetting->bInterfaceNumber,
+                        ep->bEndpointAddress, ep->wMaxPacketSize);
+            if (iface == NULL)
+            {
+                err = LIBUSB_ERROR_NO_MEM;
+                goto cleanup;
+            }
+
+            if (last == NULL)
+                list = iface;
+            else
+                last->next = iface;
+            last = iface;
+
+            break;
+        }
+    }
+
+    /* Output the resulting list, if requested */
+    if (plist != NULL)
+    {
+        *plist = list;
+        list = NULL;
+    }
+
+cleanup:
+
+    uhd_iface_list_free(list);
+
+    if (config != NULL)
+        libusb_free_config_descriptor(config);
+
+    return err;
+}
+
+
+uhd_iface *
+uhd_iface_list_fltr_by_num(uhd_iface   *list,
+                           int          number)
+{
+    uhd_iface  *prev;
+    uhd_iface  *iface;
+    uhd_iface  *next;
+
+    assert(uhd_iface_list_valid(list));
+    assert(number < UINT8_MAX);
+
+    if (number < 0)
+        return list;
+
+    for (prev = NULL, iface = list; iface != NULL; iface = next)
+    {
+        next = iface->next;
+        if (iface->number == (uint8_t)number)
+            prev = iface;
+        else
+        {
+            if (prev == NULL)
+                list = next;
+            else
+                prev->next = next;
+            free(iface);
+        }
+    }
+
+    return list;
+}
+
+
diff --git a/src/usbhid-dump.c b/src/usbhid-dump.c
index 194a912..466c874 100644
--- a/src/usbhid-dump.c
+++ b/src/usbhid-dump.c
@@ -24,7 +24,7 @@
  * @(#) $Id$
  */
 
-#include "uhd/iface.h"
+#include "uhd/iface_list.h"
 #include "uhd/str.h"
 #include "uhd/libusb.h"