Changes in uspace/drv/ns8250/ns8250.c [33dbbd2:be942bc] in mainline

File:

• uspace/drv/ns8250/ns8250.c (modified) (6 diffs)

uspace/drv/ns8250/ns8250.c

@@ -274 +274 @@
         
         /* Gain control over port's registers. */
-        if (pio_enable((void *) data->io_addr, REG_COUNT,
+        if (pio_enable((void *)(uintptr_t) data->io_addr, REG_COUNT,
             (void **) &data->port)) {
-                printf(NAME ": error - cannot gain the port %lx for device "
+                printf(NAME ": error - cannot gain the port %#" PRIx32 " for device "
                     "%s.\n", data->io_addr, dev->name);
                 return false;
@@ -342 +342 @@
                 printf(NAME ": failed to connect to the parent driver of the "
                     "device %s.\n", dev->name);
-                ret = EPARTY;   /* FIXME: use another EC */
+                ret = dev->parent_phone;
                 goto failed;
         }
         
         /* Get hw resources. */
-        if (!get_hw_resources(dev->parent_phone, &hw_resources)) {
+        ret = get_hw_resources(dev->parent_phone, &hw_resources);
+        if (ret != EOK) {
                 printf(NAME ": failed to get hw resources for the device "
                     "%s.\n", dev->name);
-                ret = EPARTY;   /* FIXME: use another EC */
                 goto failed;
         }
@@ -374 +374 @@
                                 printf(NAME ": i/o range assigned to the device "
                                     "%s is too small.\n", dev->name);
-                                ret = EPARTY;   /* FIXME: use another EC */
+                                ret = ELIMIT;
                                 goto failed;
                         }
@@ -390 +390 @@
                 printf(NAME ": missing hw resource(s) for the device %s.\n",
                     dev->name);
-                ret = EPARTY;   /* FIXME: use another EC */
+                ret = ENOENT;
                 goto failed;
         }
@@ -727 +727 @@
 {
         printf(NAME ": ns8250_add_device %s (handle = %d)\n",
-            dev->name, dev->handle);
+            dev->name, (int) dev->handle);
         
         int res = ns8250_dev_initialize(dev);
@@ -887 +887 @@
     ipc_call_t *call)
 {
-        ipcarg_t method = IPC_GET_METHOD(*call);
+        sysarg_t method = IPC_GET_IMETHOD(*call);
         int ret;
         unsigned int baud_rate, parity, word_length, stop_bits;