Changeset 1a38701 in mainline

Timestamp:

2011-12-12T12:09:12Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

dbb7e3b

Parents:

c24c157d

Message:

libusb, libusbdev: Move usb_device_connection to separate header in libusbdev.

Location:

uspace

Files:

• app/mkbd/main.c (modified) (1 diff)
• app/usbinfo/main.c (modified) (1 diff)
• lib/usb/include/usb/dev.h (modified) (1 diff)
• lib/usb/src/dev.c (modified) (1 diff)
• lib/usbdev/include/usb/dev/pipes.h (modified) (1 diff)
• lib/usbdev/include/usb/dev/usb_device_connection.h (added)
• lib/usbdev/src/devdrv.c (modified) (1 diff)

uspace/app/mkbd/main.c

@@ -48 +48 @@
 #include <usb/dev/pipes.h>
 #include <async.h>
+#include <usb/dev.h>
 #include <usb/hid/usages/core.h>
 #include <usb/hid/hidparser.h>

uspace/app/usbinfo/main.c

@@ -44 +44 @@
 #include <loc.h>
 #include <usb/hc.h>
+#include <usb/dev.h>
 #include <usb/dev/pipes.h>
 #include "usbinfo.h"

uspace/lib/usb/include/usb/dev.h

@@ -37 +37 @@
 #include <devman.h>
 #include <usb/usb.h>
-#include <usb/hc.h>
-
-
-/** Abstraction of a physical connection to the device.
- * This type is an abstraction of the USB wire that connects the host and
- * the function (device).
- */
-typedef struct {
-        /** Connection to the host controller device is connected to. */
-        usb_hc_connection_t *hc_connection;
-        /** Address of the device. */
-        usb_address_t address;
-} usb_device_connection_t;
-
-int usb_device_connection_initialize(usb_device_connection_t *,
-    usb_hc_connection_t *, usb_address_t);
-
-/** Initialize connection to USB device on default address.
- *
- * @param dev_connection Device connection structure to be initialized.
- * @param hc_connection Initialized connection to host controller.
- * @return Error code.
- */
-static inline int usb_device_connection_initialize_on_default_address(
-    usb_device_connection_t *connection, usb_hc_connection_t *hc_conn)
-{
-        return usb_device_connection_initialize(connection, hc_conn, 0);
-}
 
 int usb_get_info_by_handle(devman_handle_t,

uspace/lib/usb/src/dev.c

@@ -106 +106 @@
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
-int usb_device_connection_initialize(usb_device_connection_t *connection,
-    usb_hc_connection_t *hc_connection, usb_address_t address)
-{
-        assert(connection);
-
-        if (hc_connection == NULL) {
-                return EBADMEM;
-        }
-
-        if ((address < 0) || (address >= USB11_ADDRESS_MAX)) {
-                return EINVAL;
-        }
-
-        connection->hc_connection = hc_connection;
-        connection->address = address;
-        return EOK;
-}

uspace/lib/usbdev/include/usb/dev/pipes.h

@@ -36 +36 @@
 
 #include <sys/types.h>
-#include <usb/usb.h>
-#include <usb/dev.h>
-#include <usb/descriptor.h>
 #include <ipc/devman.h>
 #include <ddf/driver.h>
 #include <fibril_synch.h>
 #include <async.h>
+#include <usb/usb.h>
+#include <usb/descriptor.h>
+#include <usb/dev/usb_device_connection.h>
 
 /** Abstraction of a logical connection to USB device endpoint.

uspace/lib/usbdev/src/devdrv.c

@@ -36 +36 @@
 #include <usb/dev/request.h>
 #include <usb/debug.h>
+#include <usb/dev.h>
 #include <usb/dev/dp.h>
 #include <errno.h>