Changeset 75fe97b in mainline for uspace/drv/platform/icp/icp.c

Timestamp:

2014-09-03T10:52:10Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

95b2276

Parents:

b3222a3

Message:

IntegratorCP mouse support.

File:

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

uspace/drv/platform/icp/icp.c

@@ -51 +51 @@
 enum {
         icp_kbd_base = 0x18000000,
-        icp_kbd_irq = 3
+        icp_kbd_irq = 3,
+        icp_mouse_base = 0x19000000,
+        icp_mouse_irq = 4
 };
 
@@ -69 +71 @@
 };
 
-static hw_resource_t icp_pl050_res[] = {
+static hw_resource_t icp_kbd_res[] = {
         {
                 .type = MEM_RANGE,
@@ -87 +89 @@
 };
 
+static hw_resource_t icp_mouse_res[] = {
+        {
+                .type = MEM_RANGE,
+                .res.mem_range = {
+                        .address = icp_mouse_base,
+                        .size = 9,
+                        .relative = false,
+                        .endianness = LITTLE_ENDIAN
+                }
+        },
+        {
+                .type = INTERRUPT,
+                .res.interrupt = {
+                        .irq = icp_mouse_irq
+                }
+        }
+};
+
 static pio_window_t icp_pio_window = {
         .mem = {
@@ -94 +114 @@
 };
 
-static icp_fun_t icp_pl050_fun_proto = {
+static icp_fun_t icp_kbd_fun_proto = {
         .hw_resources = {
-                sizeof(icp_pl050_res) / sizeof(icp_pl050_res[0]),
-                icp_pl050_res
+                sizeof(icp_kbd_res) / sizeof(icp_kbd_res[0]),
+                icp_kbd_res
+        },
+};
+
+static icp_fun_t icp_mouse_fun_proto = {
+        .hw_resources = {
+                sizeof(icp_mouse_res) / sizeof(icp_mouse_res[0]),
+                icp_mouse_res
         },
 };
@@ -188 +215 @@
 static int icp_add_functions(ddf_dev_t *dev)
 {
-        return icp_add_fun(dev, "pl050", "arm/pl050", &icp_pl050_fun_proto);
+        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;
+
+        return EOK;
 }