Changeset 0bd2879 in mainline for uspace/drv/uhci/utils/usb_device.c

Timestamp:

2011-01-08T21:51:41Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

977fcea

Parents:

602eac5

Message:

Refactoring move usb generics to usb_device.c

File:

• uspace/drv/uhci/utils/usb_device.c (moved) (moved from uspace/drv/uhci/utils/identify.c ) (3 diffs)

uspace/drv/uhci/utils/usb_device.c

@@ -32 +32 @@
 #include <usb/usbdrv.h>
 
-#include "identify.h"
+#include "debug.h"
+#include "usb_device.h"
 
+/*----------------------------------------------------------------------------*/
+#define CHECK_RET_RETURN(ret, child, message, args...)\
+  if (ret < 0) { \
+    uhci_print_error("Failed(%d) to "message, ret, ##args); \
+    return ret; \
+  } else (void)0
+
+int usb_device_init(device_t *device, device_t *hc, usb_address_t address,
+  int hub_port)
+{
+        assert(device);
+        assert(hc);
+
+        int ret = 0;
+  char *name;
+
+  /* create name */
+  ret = asprintf(&name, "usbdevice on hc%p/root_hub[%d]/%#x",
+          hc, hub_port, address);
+  CHECK_RET_RETURN(ret, child, "create device name.\n");
+
+  device->name = name;
+
+        /* use descriptors to identify the device */
+  ret = usb_device_identify(device, hc, address);
+  CHECK_RET_RETURN(ret, child, "identify device.\n");
+
+        return EOK;
+}
+/*----------------------------------------------------------------------------*/
 struct device_descriptor_packet
 {
@@ -66 +97 @@
         }
 /*----------------------------------------------------------------------------*/
-int identify_device(device_t *hc, device_t *child, usb_address_t address)
+int usb_device_identify(device_t *device, device_t *hc, usb_address_t address)
 {
+        assert(device);
+        assert(hc);
+
         struct device_descriptor_packet packet =
           DEVICE_DESCRIPTOR_PACKET_INITIALIZER;
@@ -73 +107 @@
   packet.descriptor.device_class = USB_CLASS_HUB;
   usb_drv_create_match_ids_from_device_descriptor(
-          &child->match_ids, &packet.descriptor );
+          &device->match_ids, &packet.descriptor );
 
         return 0;
 }
+/*----------------------------------------------------------------------------*/