Modularized and cleaned up a bit.

4 files changed, 366 insertions, 0 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
new file mode 100644
index 0000000..1d31032
--- /dev/null
+++ b/lib/Makefile.am
@@ -0,0 +1,24 @@
+# Copyright (C) 2009-2010 Nikolai Kondrashov
+#
+# This file is part of hid-dump.
+#
+# Hid-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.
+#
+# Hid-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 hid-dump; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+noinst_LTLIBRARIES = libhid_dump.la
+
+libhid_dump_la_SOURCES = \
+    iface.c                 \
+    libusb.c                \
+    str.c
diff --git a/lib/iface.c b/lib/iface.c
new file mode 100644
index 0000000..4589c4a
--- /dev/null
+++ b/lib/iface.c
@@ -0,0 +1,164 @@
+/** @file
+ * @brief hid-dump - interface
+ *
+ * Copyright (C) 2010 Nikolai Kondrashov
+ *
+ * This file is part of hid-dump.
+ *
+ * Hid-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.
+ *
+ * Hid-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 hid-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 "hid_dump/iface.h"
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+hid_dump_iface *
+hid_dump_iface_new(uint8_t number)
+{
+    hid_dump_iface *iface;
+
+    iface = malloc(sizeof(*iface));
+    if (iface == NULL)
+        return NULL;
+
+    iface->next = NULL;
+    iface->number = number;
+    iface->detached = false;
+
+    return iface;
+}
+
+
+bool
+hid_dump_iface_list_valid(const hid_dump_iface *list)
+{
+    for (; list != NULL; list = list->next)
+        if (!hid_dump_iface_valid(list))
+            return false;
+
+    return true;
+}
+
+
+void
+hid_dump_iface_list_free(hid_dump_iface *list)
+{
+    hid_dump_iface *next;
+
+    for (; list != NULL; list = next)
+    {
+        next = list->next;
+        free(list);
+    }
+}
+
+
+enum libusb_error
+hid_dump_iface_list_new_by_class(libusb_device     *dev,
+                                 uint8_t            iface_class,
+                                 hid_dump_iface   **plist)
+{
+    enum libusb_error                   err             = LIBUSB_ERROR_OTHER;
+    struct libusb_config_descriptor    *config          = NULL;
+    const struct libusb_interface      *libusb_iface;
+    hid_dump_iface                     *list            = NULL;
+    hid_dump_iface                     *last            = NULL;
+    hid_dump_iface                     *iface;
+
+    assert(dev != NULL);
+
+    /* Retrieve active configuration descriptor */
+    err = libusb_get_active_config_descriptor(dev, &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 == iface_class)
+        {
+            fprintf(stderr, "%d\n",
+                    libusb_iface->altsetting->bInterfaceNumber);
+
+            iface = hid_dump_iface_new(libusb_iface->altsetting->bInterfaceNumber);
+            if (iface == NULL)
+            {
+                err = LIBUSB_ERROR_NO_MEM;
+                goto cleanup;
+            }
+
+            if (last == NULL)
+                list = iface;
+            else
+                last->next = iface;
+            last = iface;
+        }
+
+    /* Output the resulting list, if requested */
+    if (plist != NULL)
+    {
+        *plist = list;
+        list = NULL;
+    }
+
+cleanup:
+
+    hid_dump_iface_list_free(list);
+
+    if (config != NULL)
+        libusb_free_config_descriptor(config);
+
+    return err;
+}
+
+
+hid_dump_iface *
+hid_dump_iface_list_fltr_by_num(hid_dump_iface *list,
+                                int             number)
+{
+    hid_dump_iface *prev;
+    hid_dump_iface *iface;
+    hid_dump_iface *next;
+
+    assert(hid_dump_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/libusb.c b/lib/libusb.c
new file mode 100644
index 0000000..f56c88e
--- /dev/null
+++ b/lib/libusb.c
@@ -0,0 +1,141 @@
+/** @file
+ * @brief hid-dump - libusb API extensions
+ *
+ * Copyright (C) 2010 Nikolai Kondrashov
+ *
+ * This file is part of hid-dump.
+ *
+ * Hid-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.
+ *
+ * Hid-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 hid-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 "hid_dump/libusb.h"
+#include <stdbool.h>
+
+const char *
+libusb_strerror(enum libusb_error err)
+{
+    switch (err)
+    {
+        case LIBUSB_SUCCESS:
+            return "Success";
+#define MAP(_name, _desc) \
+    case LIBUSB_ERROR_##_name:          \
+        return _desc " (" #_name ")"
+	    MAP(IO,
+            "Input/output error");
+	    MAP(INVALID_PARAM,
+            "Invalid parameter");
+	    MAP(ACCESS,
+            "Access denied (insufficient permissions)");
+	    MAP(NO_DEVICE,
+            "No such device (it may have been disconnected)");
+	    MAP(NOT_FOUND,
+            "Entity not found");
+	    MAP(BUSY,
+            "Resource busy");
+	    MAP(TIMEOUT,
+            "Operation timed out");
+	    MAP(OVERFLOW,
+            "Overflow");
+	    MAP(PIPE,
+            "Pipe error");
+	    MAP(INTERRUPTED,
+            "System call interrupted (perhaps due to signal)");
+	    MAP(NO_MEM,
+            "Insufficient memory");
+	    MAP(NOT_SUPPORTED,
+            "Operation not supported or unimplemented on this platform");
+	    MAP(OTHER, "Other error");
+#undef MAP
+        default:
+            return "Unknown error code";
+    }
+}
+
+
+enum libusb_error
+libusb_open_device_with_bus_dev(libusb_context         *ctx,
+                                uint8_t                 bus_num,
+                                uint8_t                 dev_addr,
+                                libusb_device_handle  **phandle)
+{
+    enum libusb_error       err     = LIBUSB_ERROR_OTHER;
+    libusb_device         **list    = NULL;
+    ssize_t                 num;
+    ssize_t                 idx;
+    libusb_device          *dev;
+    libusb_device_handle   *handle  = NULL;
+
+    /* Retrieve device list */
+    num = libusb_get_device_list(ctx, &list);
+    if (num == LIBUSB_ERROR_NO_MEM)
+    {
+        err = num;
+        goto cleanup;
+    }
+
+    /* Find and open the device */
+    for (idx = 0; idx < num; idx++)
+    {
+        dev = list[idx];
+
+        if (libusb_get_bus_number(dev) == bus_num &&
+            libusb_get_device_address(dev) == dev_addr)
+        {
+            err = libusb_open(dev, &handle);
+            if (err != LIBUSB_SUCCESS)
+                goto cleanup;
+            break;
+        }
+    }
+
+    /* Free the device list freeing unused devices */
+    libusb_free_device_list(list, true);
+    list = NULL;
+
+    /* Check if the device is found */
+    if (handle == NULL)
+    {
+        err = LIBUSB_ERROR_NO_DEVICE;
+        goto cleanup;
+    }
+
+    /* Output the device handle */
+    if (phandle != NULL)
+    {
+        *phandle = handle;
+        handle = NULL;
+    }
+
+    err = LIBUSB_SUCCESS;
+
+cleanup:
+
+    /* Free the device */
+    if (handle != NULL)
+        libusb_close(handle);
+
+    /* Free device list along with devices */
+    if (list != NULL)
+        libusb_free_device_list(list, true);
+
+    return err;
+}
+
+
diff --git a/lib/str.c b/lib/str.c
new file mode 100644
index 0000000..26e5fcf
--- /dev/null
+++ b/lib/str.c
@@ -0,0 +1,37 @@
+/** @file
+ * @brief hid-dump - string utilities
+ *
+ * Copyright (C) 2010 Nikolai Kondrashov
+ *
+ * This file is part of hid-dump.
+ *
+ * Hid-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.
+ *
+ * Hid-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 hid-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 "hid_dump/str.h"
+#include <ctype.h>
+
+bool
+hid_dump_strisblank(const char *str)
+{
+    for (; *str != '\0'; str++)
+        if (!isblank(*str))
+            return false;
+    return true;
+}