Changeset 0c0f823b in mainline for uspace/drv/bus

Timestamp:

2011-11-14T20:50:08Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

765678f, d5ba17f

Parents:

612ad864

Message:

Rename DDF entry point add_device to dev_add.

Location:

uspace/drv/bus

Files:

• isa/isa.c (modified) (3 diffs)
• pci/pciintel/pci.c (modified) (6 diffs)
• usb/ehci/main.c (modified) (2 diffs)
• usb/ohci/main.c (modified) (2 diffs)
• usb/uhci/main.c (modified) (2 diffs)
• usb/uhcirh/main.c (modified) (2 diffs)
• usb/vhc/main.c (modified) (2 diffs)

uspace/drv/bus/isa/isa.c

@@ -108 +108 @@
 static ddf_dev_ops_t isa_fun_ops;
 
-static int isa_add_device(ddf_dev_t *dev);
+static int isa_dev_add(ddf_dev_t *dev);
 static int isa_dev_remove(ddf_dev_t *dev);
 static int isa_fun_online(ddf_fun_t *fun);
@@ -115 +115 @@
 /** The isa device driver's standard operations */
 static driver_ops_t isa_ops = {
-        .add_device = &isa_add_device,
+        .dev_add = &isa_dev_add,
         .dev_remove = &isa_dev_remove,
         .fun_online = &isa_fun_online,
@@ -494 +494 @@
 }
 
-static int isa_add_device(ddf_dev_t *dev)
+static int isa_dev_add(ddf_dev_t *dev)
 {
         isa_bus_t *isa;
 
-        ddf_msg(LVL_DEBUG, "isa_add_device, device handle = %d",
+        ddf_msg(LVL_DEBUG, "isa_dev_add, device handle = %d",
             (int) dev->handle);
 

uspace/drv/bus/pci/pciintel/pci.c

@@ -205 +205 @@
 };
 
-static int pci_add_device(ddf_dev_t *);
+static int pci_dev_add(ddf_dev_t *);
 static int pci_fun_online(ddf_fun_t *);
 static int pci_fun_offline(ddf_fun_t *);
@@ -211 +211 @@
 /** PCI bus driver standard operations */
 static driver_ops_t pci_ops = {
-        .add_device = &pci_add_device,
+        .dev_add = &pci_dev_add,
         .fun_online = &pci_fun_online,
         .fun_offline = &pci_fun_offline,
@@ -610 +610 @@
 }
 
-static int pci_add_device(ddf_dev_t *dnode)
+static int pci_dev_add(ddf_dev_t *dnode)
 {
         pci_bus_t *bus = NULL;
@@ -617 +617 @@
         int rc;
         
-        ddf_msg(LVL_DEBUG, "pci_add_device");
+        ddf_msg(LVL_DEBUG, "pci_dev_add");
         dnode->parent_sess = NULL;
         
         bus = ddf_dev_data_alloc(dnode, sizeof(pci_bus_t));
         if (bus == NULL) {
-                ddf_msg(LVL_ERROR, "pci_add_device allocation failed.");
+                ddf_msg(LVL_ERROR, "pci_dev_add allocation failed.");
                 rc = ENOMEM;
                 goto fail;
@@ -634 +634 @@
             dnode->handle, IPC_FLAG_BLOCKING);
         if (!dnode->parent_sess) {
-                ddf_msg(LVL_ERROR, "pci_add_device failed to connect to the "
+                ddf_msg(LVL_ERROR, "pci_dev_add failed to connect to the "
                     "parent driver.");
                 rc = ENOENT;
@@ -644 +644 @@
         rc = hw_res_get_resource_list(dnode->parent_sess, &hw_resources);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "pci_add_device failed to get hw resources "
+                ddf_msg(LVL_ERROR, "pci_dev_add failed to get hw resources "
                     "for the device.");
                 goto fail;

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

@@ -46 +46 @@
 #include "ehci.h"
 
-static int ehci_add_device(ddf_dev_t *device);
+static int ehci_dev_add(ddf_dev_t *device);
 /*----------------------------------------------------------------------------*/
 static driver_ops_t ehci_driver_ops = {
-        .add_device = ehci_add_device,
+        .dev_add = ehci_dev_add,
 };
 /*----------------------------------------------------------------------------*/
@@ -66 +66 @@
  * @return Error code.
  */
-static int ehci_add_device(ddf_dev_t *device)
+static int ehci_dev_add(ddf_dev_t *device)
 {
         assert(device);

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

@@ -48 +48 @@
  * @return Error code.
  */
-static int ohci_add_device(ddf_dev_t *device)
+static int ohci_dev_add(ddf_dev_t *device)
 {
-        usb_log_debug("ohci_add_device() called\n");
+        usb_log_debug("ohci_dev_add() called\n");
         assert(device);
 
@@ -65 +65 @@
 /*----------------------------------------------------------------------------*/
 static driver_ops_t ohci_driver_ops = {
-        .add_device = ohci_add_device,
+        .dev_add = ohci_dev_add,
 };
 /*----------------------------------------------------------------------------*/

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

@@ -43 +43 @@
 #define NAME "uhci"
 
-static int uhci_add_device(ddf_dev_t *device);
+static int uhci_dev_add(ddf_dev_t *device);
 /*----------------------------------------------------------------------------*/
 static driver_ops_t uhci_driver_ops = {
-        .add_device = uhci_add_device,
+        .dev_add = uhci_dev_add,
 };
 /*----------------------------------------------------------------------------*/
@@ -59 +59 @@
  * @return Error code.
  */
-int uhci_add_device(ddf_dev_t *device)
+int uhci_dev_add(ddf_dev_t *device)
 {
-        usb_log_debug2("uhci_add_device() called\n");
+        usb_log_debug2("uhci_dev_add() called\n");
         assert(device);
 

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

@@ -51 +51 @@
     uintptr_t *io_reg_address, size_t *io_reg_size);
 
-static int uhci_rh_add_device(ddf_dev_t *device);
+static int uhci_rh_dev_add(ddf_dev_t *device);
 
 static driver_ops_t uhci_rh_driver_ops = {
-        .add_device = uhci_rh_add_device,
+        .dev_add = uhci_rh_dev_add,
 };
 
@@ -82 +82 @@
  * @return Error code.
  */
-static int uhci_rh_add_device(ddf_dev_t *device)
+static int uhci_rh_dev_add(ddf_dev_t *device)
 {
         if (!device)
                 return EINVAL;
 
-        usb_log_debug2("uhci_rh_add_device(handle=%" PRIun ")\n",
+        usb_log_debug2("uhci_rh_dev_add(handle=%" PRIun ")\n",
             device->handle);
 

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

@@ -58 +58 @@
 };
 
-static int vhc_add_device(ddf_dev_t *dev)
+static int vhc_dev_add(ddf_dev_t *dev)
 {
         static int vhc_count = 0;
@@ -131 +131 @@
 
 static driver_ops_t vhc_driver_ops = {
-        .add_device = vhc_add_device,
+        .dev_add = vhc_dev_add,
 };