Changeset efdfebc in mainline for uspace/drv/bus/usb/usbhid/main.c

Timestamp:

2012-11-06T21:03:44Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/drv/bus/usb/usbhid/main.c (modified) (6 diffs)

uspace/drv/bus/usb/usbhid/main.c

@@ -103 +103 @@
         if (rc != EOK) {
                 usb_log_error("Failed to start polling fibril for `%s'.\n",
-                    dev->ddf_dev->name);
+                    ddf_dev_get_name(dev->ddf_dev));
                 usb_hid_deinit(hid_dev);
                 return rc;
@@ -109 +109 @@
         hid_dev->running = true;
 
-        usb_log_info("HID device `%s' ready to use.\n", dev->ddf_dev->name);
+        usb_log_info("HID device `%s' ready to use.\n",
+            ddf_dev_get_name(dev->ddf_dev));
 
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
 /**
  * Callback for a device about to be removed from the driver.
@@ -126 +127 @@
         return ENOTSUP;
 }
-/*----------------------------------------------------------------------------*/
+
 /**
  * Callback for removing a device from the driver.
@@ -149 +150 @@
 
         usb_hid_deinit(hid_dev);
-        usb_log_debug2("%s destruction complete.\n", dev->ddf_dev->name);
+        usb_log_debug2("%s destruction complete.\n", ddf_dev_get_name(dev->ddf_dev));
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
 /** USB generic driver callbacks */
 static const usb_driver_ops_t usb_hid_driver_ops = {
@@ -159 +160 @@
         .device_gone = usb_hid_device_gone,
 };
-/*----------------------------------------------------------------------------*/
+
 /** The driver itself. */
 static const usb_driver_t usb_hid_driver = {
@@ -166 +167 @@
         .endpoints = usb_hid_endpoints
 };
-/*----------------------------------------------------------------------------*/
+
 int main(int argc, char *argv[])
 {
         printf(NAME ": HelenOS USB HID driver.\n");
 
-        usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
+        log_init(NAME);
 
         return usb_driver_main(&usb_hid_driver);