Changeset 75fe97b in mainline

Timestamp:

2014-09-03T10:52:10Z (10 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.

Files:

• boot/arch/arm32/Makefile.inc (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/app/init/init.c (modified) (1 diff)
• uspace/drv/char/pl050/pl050.c (modified) (16 diffs)
• uspace/drv/char/pl050/pl050_hw.h (added)
• uspace/drv/platform/icp/icp.c (modified) (5 diffs)
• uspace/lib/c/generic/irc.c (modified) (1 diff)
• uspace/srv/hw/irc/icp-ic/Makefile (added)
• uspace/srv/hw/irc/icp-ic/icp-ic.c (added)
• uspace/srv/hw/irc/icp-ic/icp-ic_hw.h (added)

boot/arch/arm32/Makefile.inc

@@ -75 +75 @@
                 char/pl050 \
                 char/xtkbd \
+                char/ps2mouse \
                 platform/icp
+        RD_SRVS_ESSENTIAL += \
+                $(USPACE_PATH)/srv/hw/irc/icp-ic/icp-ic
 endif
 

uspace/Makefile

@@ -196 +196 @@
         DIRS += \
                 drv/platform/amdm37x \
-                drv/fb/amdm37x_dispc
+                drv/fb/amdm37x_dispc \
+                srv/hw/irc/icp-ic
 endif
 

uspace/app/init/init.c

@@ -331 +331 @@
         srv_start("/srv/apic");
         srv_start("/srv/i8259");
+        srv_start("/srv/icp-ic");
         srv_start("/srv/obio");
         srv_start("/srv/cuda_adb");

uspace/drv/char/pl050/pl050.c

@@ -32 +32 @@
 
 #include <assert.h>
+#include <bitops.h>
 #include <stdio.h>
 #include <errno.h>
@@ -39 +40 @@
 #include <device/hw_res_parsed.h>
 #include <io/chardev_srv.h>
+#include <irc.h>
+
+#include "pl050_hw.h"
 
 #define NAME "pl050"
-
-#define PL050_STAT      4
-#define PL050_DATA      8
-
-#define PL050_STAT_RXFULL  (1 << 4)
 
 enum {
@@ -77 +76 @@
         async_sess_t *parent_sess;
         ddf_dev_t *dev;
+        char *name;
 
         ddf_fun_t *fun_a;
@@ -83 +83 @@
         uintptr_t iobase;
         size_t iosize;
+        kmi_regs_t *regs;
         uint8_t buffer[buffer_size];
         size_t buf_rp;
@@ -105 +106 @@
         {
                 .cmd = CMD_AND,
-                .value = PL050_STAT_RXFULL,
+                .value = BIT_V(uint8_t, kmi_stat_rxfull),
                 .srcarg = 1,
                 .dstarg = 3
@@ -159 +160 @@
 {
         hw_res_list_parsed_t res;
+        void *regs;
         int rc;
 
@@ -190 +192 @@
 
         pl050_irq_code.ranges[0].base = pl050->iobase;
-        pl050_irq_code.cmds[0].addr = (void *) pl050->iobase + PL050_STAT;
-        pl050_irq_code.cmds[3].addr = (void *) pl050->iobase + PL050_DATA;
+        kmi_regs_t *regsphys = (kmi_regs_t *) pl050->iobase;
+        pl050_irq_code.cmds[0].addr = &regsphys->stat;
+        pl050_irq_code.cmds[3].addr = &regsphys->data;
 
         if (res.irqs.count != 1) {
@@ -202 +205 @@
             res.irqs.irqs[0]);
 
+        rc = pio_enable((void *)pl050->iobase, sizeof(kmi_regs_t), &regs);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Error enabling PIO");
+                goto error;
+        }
+
+        pl050->regs = regs;
+
         rc = register_interrupt_handler(pl050->dev, res.irqs.irqs[0],
             pl050_interrupt, &pl050_irq_code);
@@ -209 +220 @@
                 goto error;
         }
+
+        rc = irc_enable_interrupt(res.irqs.irqs[0]);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed enabling interrupt. (%d)", rc);
+                goto error;
+        }
+
+        pio_write_8(&pl050->regs->cr,
+            BIT_V(uint8_t, kmi_cr_enable) |
+            BIT_V(uint8_t, kmi_cr_rxintr));
 
         return EOK;
@@ -220 +241 @@
         uint8_t *bp = buffer;
         size_t left;
+
         fibril_mutex_lock(&pl050->buf_lock);
 
@@ -238 +260 @@
 static int pl050_write(chardev_srv_t *srv, const void *data, size_t size)
 {
+        pl050_t *pl050 = (pl050_t *)srv->srvs->sarg;
+        uint8_t *dp = (uint8_t *)data;
+        uint8_t status;
+        size_t i;
+
+        ddf_msg(LVL_NOTE, "%s/pl050_write(%zu bytes)", pl050->name, size);
+        for (i = 0; i < size; i++) {
+                while (true) {
+                        status = pio_read_8(&pl050->regs->stat);
+                        if ((status & BIT_V(uint8_t, kmi_stat_txempty)) != 0)
+                                break;
+                }
+                pio_write_8(&pl050->regs->data, dp[i]);
+        }
+        ddf_msg(LVL_NOTE, "%s/pl050_write() success", pl050->name);
+
         return size;
 }
@@ -252 +290 @@
 {
         ddf_fun_t *fun_a;
-        pl050_t *pl050;
+        pl050_t *pl050 = NULL;
+        const char *mname;
         int rc;
 
@@ -264 +303 @@
         }
 
+        pl050->name = (char *)ddf_dev_get_name(dev);
+        if (pl050->name == NULL) {
+                rc = ENOMEM;
+                goto error;
+        }
+
         fun_a = ddf_fun_create(dev, fun_inner, "a");
         if (fun_a == NULL) {
@@ -278 +323 @@
                 goto error;
 
-        rc = ddf_fun_add_match_id(fun_a, "char/xtkbd", 10);
+        if (str_cmp(pl050->name, "kbd") == 0)
+                mname = "char/xtkbd";
+        else
+                mname = "char/ps2mouse";
+
+        rc = ddf_fun_add_match_id(fun_a, mname, 10);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed adding match IDs to function %s",
@@ -284 +334 @@
                 goto error;
         }
-
 
         chardev_srvs_init(&pl050->cds);
@@ -302 +351 @@
         return EOK;
 error:
+        if (pl050 != NULL)
+                free(pl050->name);
         return rc;
 }

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;
 }
 

uspace/lib/c/generic/irc.c

@@ -49 +49 @@
 static int irc_init(void)
 {
-        sysarg_t apic;
-        sysarg_t i8259;
-
         assert(irc_sess == NULL);
 
-        if (((sysinfo_get_value("apic", &apic) == EOK) && (apic))
-            || ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259))) {
-                irc_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
-                    SERVICE_IRC, 0, 0);
-        }
+        irc_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
+            SERVICE_IRC, 0, 0);
 
         if (irc_sess == NULL)