Changeset 312e5ff in mainline

Timestamp:

2014-08-29T20:28:55Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

75751db6

Parents:

293703e

Message:

DDFize IntegratorCP keyboard driver.

Files:

• boot/arch/arm32/Makefile.inc (modified) (1 diff)
• uspace/Makefile (modified) (2 diffs)
• uspace/drv/char/pl050/Makefile (added)
• uspace/drv/char/pl050/pl050.c (added)
• uspace/drv/char/pl050/pl050.ma (added)
• uspace/drv/char/xtkbd/xtkbd.c (modified) (7 diffs)
• uspace/drv/platform/icp/Makefile (added)
• uspace/drv/platform/icp/icp.c (added)
• uspace/drv/platform/icp/icp.ma (added)
• uspace/srv/hid/input/Makefile (modified) (2 diffs)
• uspace/srv/hid/input/ctl/pc.c (deleted)
• uspace/srv/hid/input/input.c (modified) (1 diff)
• uspace/srv/hid/input/kbd_ctl.h (modified) (1 diff)
• uspace/srv/hid/input/kbd_port.h (modified) (1 diff)
• uspace/srv/hid/input/port/pl050.c (deleted)

boot/arch/arm32/Makefile.inc

@@ -60 +60 @@
 
 ifeq ($(MACHINE), gta02)
-RD_SRVS_ESSENTIAL += \
-        $(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24xx_ts \
-        $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24ser
+        RD_SRVS_ESSENTIAL += \
+                $(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24xx_ts \
+                $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24ser
+endif
+
+ifeq ($(MACHINE), $(filter $(MACHINE),beagleboardxm beaglebone))
+        RD_DRVS_ESSENTIAL += \
+                platform/amdm37x \
+                fb/amdm37x_dispc
+endif
+
+ifeq ($(MACHINE), integratorcp)
+        RD_DRVS_ESSENTIAL += \
+                char/pl050 \
+                char/xtkbd \
+                platform/icp
 endif
 
 RD_DRVS_ESSENTIAL += \
-        platform/amdm37x \
-        fb/amdm37x_dispc \
         bus/usb/ehci \
         bus/usb/ohci \

uspace/Makefile

@@ -136 +136 @@
         drv/block/ata_bd \
         drv/char/i8042 \
+        drv/char/pl050 \
         drv/char/ps2mouse \
         drv/char/xtkbd \
@@ -155 +156 @@
         drv/nic/e1k \
         drv/nic/rtl8139 \
-        drv/nic/rtl8169
+        drv/nic/rtl8169 \
+        drv/platform/icp
 
 ## Platform-specific hardware support

uspace/drv/char/xtkbd/xtkbd.c

@@ -199 +199 @@
  * @param dev DDF device structure.
  *
- * Connects to parent, creates mouse function, starts polling fibril.
+ * Connects to parent, creates keyboard function, starts polling fibril.
  */
 int xt_kbd_init(xt_kbd_t *kbd, ddf_dev_t *dev)
@@ -207 +207 @@
         kbd->client_sess = NULL;
         kbd->parent_sess = ddf_dev_parent_sess_create(dev, EXCHANGE_SERIALIZE);
-        if (!kbd->parent_sess)
-                return ENOMEM;
+        if (!kbd->parent_sess) {
+                ddf_msg(LVL_ERROR, "Failed creating parent session.");
+                return EIO;
+        }
 
         kbd->kbd_fun = ddf_fun_create(dev, fun_exposed, "kbd");
         if (!kbd->kbd_fun) {
+                ddf_msg(LVL_ERROR, "Failed creating function 'kbd'.");
                 return ENOMEM;
         }
@@ -218 +221 @@
         int ret = ddf_fun_bind(kbd->kbd_fun);
         if (ret != EOK) {
+                ddf_msg(LVL_ERROR, "Failed binding function 'kbd'.");
                 ddf_fun_destroy(kbd->kbd_fun);
-                return ENOMEM;
+                return EEXIST;
         }
 
         ret = ddf_fun_add_to_category(kbd->kbd_fun, "keyboard");
         if (ret != EOK) {
+                ddf_msg(LVL_ERROR, "Failed adding function 'kbd' to category "
+                    "'keyboard'.");
                 ddf_fun_unbind(kbd->kbd_fun);
                 ddf_fun_destroy(kbd->kbd_fun);
@@ -231 +237 @@
         kbd->polling_fibril = fibril_create(polling, kbd);
         if (!kbd->polling_fibril) {
+                ddf_msg(LVL_ERROR, "Failed creating polling fibril.");
                 ddf_fun_unbind(kbd->kbd_fun);
                 ddf_fun_destroy(kbd->kbd_fun);
                 return ENOMEM;
         }
+
         fibril_add_ready(kbd->polling_fibril);
         return EOK;
@@ -241 +249 @@
 /** Get data and parse scancodes.
  * @param arg Pointer to xt_kbd_t structure.
- * @return Never.
+ * @return EIO on error.
  */
 int polling(void *arg)
@@ -259 +267 @@
                 uint8_t code = 0;
                 ssize_t size = chardev_read(parent_exch, &code, 1);
+                if (size != 1)
+                        return EIO;
 
                 /** Ignore AT command reply */
@@ -269 +279 @@
                         map_size = sizeof(scanmap_e0) / sizeof(int);
                         size = chardev_read(parent_exch, &code, 1);
+                        if (size != 1)
+                                return EIO;
+
                         // TODO handle print screen
                 }
-
-                /* Invalid read. */
-                if (size != 1) {
-                        continue;
-                }
-
 
                 /* Bit 7 indicates press/release */

uspace/srv/hid/input/Makefile

@@ -42 +42 @@
         port/niagara.c \
         port/ns16550.c \
-        port/pl050.c \
         port/ski.c \
         proto/adb.c \
@@ -48 +47 @@
         ctl/apple.c \
         ctl/kbdev.c \
-        ctl/pc.c \
         ctl/stty.c \
         ctl/sun.c \

uspace/srv/hid/input/input.c

@@ -539 +539 @@
         kbd_add_dev(&chardev_port, &stty_ctl);
 #endif
-#if defined(UARCH_arm32) && defined(MACHINE_integratorcp)
-        kbd_add_dev(&pl050_port, &pc_ctl);
-#endif
 #if defined(MACHINE_ski)
         kbd_add_dev(&ski_port, &stty_ctl);

uspace/srv/hid/input/kbd_ctl.h

@@ -50 +50 @@
 extern kbd_ctl_ops_t apple_ctl;
 extern kbd_ctl_ops_t kbdev_ctl;
-extern kbd_ctl_ops_t pc_ctl;
 extern kbd_ctl_ops_t stty_ctl;
 extern kbd_ctl_ops_t sun_ctl;

uspace/srv/hid/input/kbd_port.h

@@ -52 +52 @@
 extern kbd_port_ops_t niagara_port;
 extern kbd_port_ops_t ns16550_port;
-extern kbd_port_ops_t pl050_port;
 extern kbd_port_ops_t ski_port;