Changeset beb9336 in mainline for uspace/drv/char/i8042/main.c

Timestamp:

2012-08-24T14:07:52Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

041ab64

Parents:

bd29f9c9 (diff), db81577 (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 with mainline

File:

• uspace/drv/char/i8042/main.c (modified) (4 diffs)

uspace/drv/char/i8042/main.c

@@ -37 +37 @@
 #include <libarch/inttypes.h>
 #include <ddf/driver.h>
-#include <devman.h>
 #include <device/hw_res_parsed.h>
 #include <errno.h>
@@ -64 +63 @@
  *
  */
-static int get_my_registers(const ddf_dev_t *dev, uintptr_t *io_reg_address,
+static int get_my_registers(ddf_dev_t *dev, uintptr_t *io_reg_address,
     size_t *io_reg_size, int *kbd_irq, int *mouse_irq)
 {
         assert(dev);
         
-        async_sess_t *parent_sess =
-            devman_parent_device_connect(EXCHANGE_SERIALIZE, dev->handle,
-            IPC_FLAG_BLOCKING);
-        if (!parent_sess)
+        async_sess_t *parent_sess = ddf_dev_parent_sess_create(
+            dev, EXCHANGE_SERIALIZE);
+        if (parent_sess == NULL)
                 return ENOMEM;
         
@@ -78 +76 @@
         hw_res_list_parsed_init(&hw_resources);
         const int ret = hw_res_get_list_parsed(parent_sess, &hw_resources, 0);
-        async_hangup(parent_sess);
         if (ret != EOK)
                 return ret;
@@ -136 +133 @@
         
         ddf_msg(LVL_NOTE, "Controlling '%s' (%" PRIun ").",
-            device->name, device->handle);
+            ddf_dev_get_name(device), ddf_dev_get_handle(device));
         return EOK;
 }