Changeset b446b02 in mainline for uspace/drv/platform/icp/icp.c

Timestamp:

2017-10-17T17:47:11Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b1efe3e

Parents:

a416d070

Message:

Enumerate APIC and i8259 via DDF.

File:

• uspace/drv/platform/icp/icp.c (modified) (2 diffs)

uspace/drv/platform/icp/icp.c

@@ -279 +279 @@
         int rc;
 
-        rc = icp_add_fun(dev, "kbd", "arm/pl050", &icp_kbd_fun_proto);
-        if (rc != EOK)
-                return rc;
-
-        rc = icp_add_fun(dev, "mouse", "arm/pl050", &icp_mouse_fun_proto);
-        if (rc != EOK)
-                return rc;
-
         rc = icp_add_fun(dev, "intctl", "integratorcp/intctl",
             &icp_ic_fun_proto);
@@ -292 +284 @@
                 return rc;
 
+        rc = icp_add_fun(dev, "kbd", "arm/pl050", &icp_kbd_fun_proto);
+        if (rc != EOK)
+                return rc;
+
+        rc = icp_add_fun(dev, "mouse", "arm/pl050", &icp_mouse_fun_proto);
+        if (rc != EOK)
+                return rc;
+
         return EOK;
 }