Changeset 7aaed09 in mainline for uspace/drv/char/ns8250/ns8250.c

Timestamp:

2011-12-18T14:02:30Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c868e2d

Parents:

3b71e84d (diff), 1761268 (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/char/ns8250/ns8250.c (modified) (4 diffs)

uspace/drv/char/ns8250/ns8250.c

@@ -223 +223 @@
 };
 
-static int ns8250_add_device(ddf_dev_t *dev);
+static int ns8250_dev_add(ddf_dev_t *dev);
 static int ns8250_dev_remove(ddf_dev_t *dev);
 
 /** The serial port device driver's standard operations. */
 static driver_ops_t ns8250_ops = {
-        .add_device = &ns8250_add_device,
+        .dev_add = &ns8250_dev_add,
         .dev_remove = &ns8250_dev_remove
 };
@@ -717 +717 @@
 }
 
-/** The add_device callback method of the serial port driver.
+/** The dev_add callback method of the serial port driver.
  *
  * Probe and initialize the newly added device.
@@ -723 +723 @@
  * @param dev           The serial port device.
  */
-static int ns8250_add_device(ddf_dev_t *dev)
+static int ns8250_dev_add(ddf_dev_t *dev)
 {
         ns8250_t *ns = NULL;
@@ -730 +730 @@
         int rc;
         
-        ddf_msg(LVL_DEBUG, "ns8250_add_device %s (handle = %d)",
+        ddf_msg(LVL_DEBUG, "ns8250_dev_add %s (handle = %d)",
             dev->name, (int) dev->handle);