Changes in uspace/drv/char/i8042/main.c [ca4730a5:2df6f6fe] in mainline

File:

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

uspace/drv/char/i8042/main.c

@@ -36 +36 @@
 
 #include <libarch/inttypes.h>
-#include <libarch/config.h>
 #include <ddf/driver.h>
+#include <devman.h>
 #include <device/hw_res_parsed.h>
 #include <errno.h>
@@ -43 +43 @@
 #include <ddf/log.h>
 #include <stdio.h>
-#include <async.h>
 #include "i8042.h"
+
+#define CHECK_RET_RETURN(ret, message...) \
+        do { \
+                if (ret != EOK) { \
+                        ddf_msg(LVL_ERROR, message); \
+                        return ret; \
+                } \
+        } while (0)
 
 /** Get address of I/O registers.
@@ -57 +64 @@
  *
  */
-static int get_my_registers(ddf_dev_t *dev, uintptr_t *io_reg_address,
+static int get_my_registers(const 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 = ddf_dev_parent_sess_create(
-            dev, EXCHANGE_SERIALIZE);
-        if (parent_sess == NULL)
+        async_sess_t *parent_sess =
+            devman_parent_device_connect(EXCHANGE_SERIALIZE, dev->handle,
+            IPC_FLAG_BLOCKING);
+        if (!parent_sess)
                 return ENOMEM;
         
@@ -70 +78 @@
         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;
@@ -104 +113 @@
 static int i8042_dev_add(ddf_dev_t *device)
 {
+        if (!device)
+                return EINVAL;
+        
         uintptr_t io_regs = 0;
         size_t io_size = 0;
         int kbd = 0;
         int mouse = 0;
-        int rc;
         
-        if (!device)
-                return EINVAL;
-        
-        rc = get_my_registers(device, &io_regs, &io_size, &kbd, &mouse);
-        if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed to get registers: %s.",
-                    str_error(rc));
-                return rc;
-        }
-        
+        int ret = get_my_registers(device, &io_regs, &io_size, &kbd, &mouse);
+        CHECK_RET_RETURN(ret, "Failed to get registers: %s.",
+            str_error(ret));
         ddf_msg(LVL_DEBUG, "I/O regs at %p (size %zuB), IRQ kbd %d, IRQ mouse %d.",
             (void *) io_regs, io_size, kbd, mouse);
         
         i8042_t *i8042 = ddf_dev_data_alloc(device, sizeof(i8042_t));
-        if (i8042 == NULL) {
-                ddf_msg(LVL_ERROR, "Out of memory.");
-                return ENOMEM;
-        }
+        ret = (i8042 == NULL) ? ENOMEM : EOK;
+        CHECK_RET_RETURN(ret, "Failed to allocate i8042 driver instance.");
         
-        rc = i8042_init(i8042, (void *) io_regs, io_size, kbd, mouse, device);
-        if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed to initialize i8042 driver: %s.",
-                    str_error(rc));
-                return rc;
-        }
+        ret = i8042_init(i8042, (void *) io_regs, io_size, kbd, mouse, device);
+        CHECK_RET_RETURN(ret, "Failed to initialize i8042 driver: %s.",
+            str_error(ret));
         
         ddf_msg(LVL_NOTE, "Controlling '%s' (%" PRIun ").",
-            ddf_dev_get_name(device), ddf_dev_get_handle(device));
+            device->name, device->handle);
         return EOK;
 }
@@ -155 +154 @@
 {
         printf("%s: HelenOS PS/2 driver.\n", NAME);
-        ddf_log_init(NAME);
-        
-        /*
-         * Alleviate the virtual memory / page table pressure caused by 
-         * interrupt storms when the default large stacks are used.
-         */
-        async_set_interrupt_handler_stack_size(PAGE_SIZE);
-
+        ddf_log_init(NAME, LVL_NOTE);
         return ddf_driver_main(&i8042_driver);
 }