Changeset 1a4ea01d in mainline

Timestamp:

2011-10-12T15:35:23Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

96646a6

Parents:

49a98c8

Message:

usb: Rename add_device ⇒ device_add

Location:

uspace

Files:

• drv/bus/usb/usbflbk/main.c (modified) (2 diffs)
• drv/bus/usb/usbhid/main.c (modified) (2 diffs)
• drv/bus/usb/usbhub/main.c (modified) (1 diff)
• drv/bus/usb/usbhub/usbhub.c (modified) (1 diff)
• drv/bus/usb/usbhub/usbhub.h (modified) (1 diff)
• drv/bus/usb/usbmast/main.c (modified) (2 diffs)
• drv/bus/usb/usbmid/main.c (modified) (2 diffs)
• drv/bus/usb/usbmouse/main.c (modified) (2 diffs)
• lib/usbdev/include/usb/dev/driver.h (modified) (1 diff)
• lib/usbdev/src/devdrv.c (modified) (3 diffs)

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

@@ -46 +46 @@
  * @return Error code.
  */
-static int usbfallback_add_device(usb_device_t *dev)
+static int usbfallback_device_add(usb_device_t *dev)
 {
         int rc;
@@ -74 +74 @@
 /** USB fallback driver ops. */
 static usb_driver_ops_t usbfallback_driver_ops = {
-        .add_device = usbfallback_add_device,
+        .device_add = usbfallback_device_add,
 };
 

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

@@ -150 +150 @@
  * @retval EREFUSED if the device is not supported.
  */
-static int usb_hid_add_device(usb_device_t *dev)
+static int usb_hid_device_add(usb_device_t *dev)
 {
-        usb_log_debug("usb_hid_add_device()\n");
+        usb_log_debug("usb_hid_device_add()\n");
         
         if (dev == NULL) {
@@ -185 +185 @@
  * supports unplug, more callbacks will be added. */
 static usb_driver_ops_t usb_hid_driver_ops = {
-        .add_device = usb_hid_add_device,
+        .device_add = usb_hid_device_add,
 };
 

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

@@ -59 +59 @@
  * USB hub driver operations
  *
- * The most important one is add_device, which is set to usb_hub_add_device.
+ * The most important one is device_add, which is set to usb_hub_device_add.
  */
 static usb_driver_ops_t usb_hub_driver_ops = {
-        .add_device = usb_hub_add_device
+        .device_add = usb_hub_device_add
 };
 

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -84 +84 @@
  * @return error code
  */
-int usb_hub_add_device(usb_device_t *usb_dev)
+int usb_hub_device_add(usb_device_t *usb_dev)
 {
         assert(usb_dev);

uspace/drv/bus/usb/usbhub/usbhub.h

@@ -78 +78 @@
 };
 
-int usb_hub_add_device(usb_device_t *usb_dev);
+int usb_hub_device_add(usb_device_t *usb_dev);
 
 bool hub_port_changes_callback(usb_device_t *dev,

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

@@ -87 +87 @@
  * @return Error code.
  */
-static int usbmast_add_device(usb_device_t *dev)
+static int usbmast_device_add(usb_device_t *dev)
 {
         int rc;
@@ -295 +295 @@
 /** USB mass storage driver ops. */
 static usb_driver_ops_t usbmast_driver_ops = {
-        .add_device = usbmast_add_device,
+        .device_add = usbmast_device_add,
 };
 

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

@@ -49 +49 @@
  * @return Error code.
  */
-static int usbmid_add_device(usb_device_t *dev)
+static int usbmid_device_add(usb_device_t *dev)
 {
         usb_log_info("Taking care of new MID `%s'.\n", dev->ddf_dev->name);
@@ -68 +68 @@
 /** USB MID driver ops. */
 static usb_driver_ops_t mid_driver_ops = {
-        .add_device = usbmid_add_device,
+        .device_add = usbmid_device_add,
 };
 

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

@@ -50 +50 @@
  *
  */
-static int usbmouse_add_device(usb_device_t *dev)
+static int usbmouse_device_add(usb_device_t *dev)
 {
         int rc = usb_mouse_create(dev);
@@ -80 +80 @@
 /** USB mouse driver ops. */
 static usb_driver_ops_t mouse_driver_ops = {
-        .add_device = usbmouse_add_device,
+        .device_add = usbmouse_device_add,
 };
 

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

@@ -112 +112 @@
 /** USB driver ops. */
 typedef struct {
-        /** Callback when new device is about to be controlled by the driver. */
-        int (*add_device)(usb_device_t *);
+        /** Callback when a new device was added to the system. */
+        int (*device_add)(usb_device_t *);
 } usb_driver_ops_t;
 

uspace/lib/usbdev/src/devdrv.c

@@ -41 +41 @@
 #include <assert.h>
 
-static int generic_add_device(ddf_dev_t *);
+static int generic_device_add(ddf_dev_t *);
 
 static driver_ops_t generic_driver_ops = {
-        .add_device = generic_add_device
+        .add_device = generic_device_add
 };
 static driver_t generic_driver = {
@@ -131 +131 @@
  * @return Error code.
  */
-int generic_add_device(ddf_dev_t *gen_dev)
+int generic_device_add(ddf_dev_t *gen_dev)
 {
         assert(driver);
         assert(driver->ops);
-        assert(driver->ops->add_device);
+        assert(driver->ops->device_add);
 
         int rc;
@@ -148 +148 @@
         }
 
-        return driver->ops->add_device(dev);
+        return driver->ops->device_add(dev);
 }