Changes in uspace/drv/platform/icp/icp.c [a416d070:75fe97b] in mainline

File:

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

uspace/drv/platform/icp/icp.c

@@ -39 +39 @@
 #include <stdio.h>
 #include <errno.h>
-#include <irc.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -54 +53 @@
         icp_kbd_irq = 3,
         icp_mouse_base = 0x19000000,
-        icp_mouse_irq = 4,
-        icp_ic_base = 0x14000000
+        icp_mouse_irq = 4
 };
 
@@ -109 +107 @@
 };
 
-static hw_resource_t icp_ic_res[] = {
-        {
-                .type = MEM_RANGE,
-                .res.mem_range = {
-                        .address = icp_ic_base,
-                        .size = 40,
-                        .relative = false,
-                        .endianness = LITTLE_ENDIAN
-                }
-        }
-};
-
 static pio_window_t icp_pio_window = {
         .mem = {
@@ -142 +128 @@
 };
 
-static icp_fun_t icp_ic_fun_proto = {
-        .hw_resources = {
-                sizeof(icp_ic_res) / sizeof(icp_ic_res[0]),
-                icp_ic_res
-        },
-};
-
 /** Obtain function soft-state from DDF function node */
 static icp_fun_t *icp_fun(ddf_fun_t *fnode)
@@ -163 +142 @@
 }
 
-static bool icp_fun_owns_interrupt(icp_fun_t *fun, int irq)
-{
-        const hw_resource_list_t *res = &fun->hw_resources;
-
-        /* Check that specified irq really belongs to the function */
-        for (size_t i = 0; i < res->count; ++i) {
-                if (res->resources[i].type == INTERRUPT &&
-                    res->resources[i].res.interrupt.irq == irq) {
-                        return true;
-                }
-        }
-
+static bool icp_enable_interrupt(ddf_fun_t *fun)
+{
+        /* TODO */
         return false;
-}
-
-static int icp_fun_enable_interrupt(ddf_fun_t *fnode, int irq)
-{
-        icp_fun_t *fun = icp_fun(fnode);
-
-        if (!icp_fun_owns_interrupt(fun, irq))
-                return EINVAL;
-
-        return irc_enable_interrupt(irq);
-}
-
-static int icp_fun_disable_interrupt(ddf_fun_t *fnode, int irq)
-{
-        icp_fun_t *fun = icp_fun(fnode);
-
-        if (!icp_fun_owns_interrupt(fun, irq))
-                return EINVAL;
-
-        return irc_disable_interrupt(irq);
-}
-
-static int icp_fun_clear_interrupt(ddf_fun_t *fnode, int irq)
-{
-        icp_fun_t *fun = icp_fun(fnode);
-
-        if (!icp_fun_owns_interrupt(fun, irq))
-                return EINVAL;
-
-        return irc_clear_interrupt(irq);
 }
 
@@ -215 +155 @@
 static hw_res_ops_t icp_hw_res_ops = {
         .get_resource_list = &icp_get_resources,
-        .enable_interrupt = &icp_fun_enable_interrupt,
-        .disable_interrupt = &icp_fun_disable_interrupt,
-        .clear_interrupt = &icp_fun_clear_interrupt
+        .enable_interrupt = &icp_enable_interrupt,
 };
 
@@ -287 +225 @@
                 return rc;
 
-        rc = icp_add_fun(dev, "intctl", "integratorcp/intctl",
-            &icp_ic_fun_proto);
-        if (rc != EOK)
-                return rc;
-
         return EOK;
 }