Changeset a9b5b5f in mainline

Timestamp:

2010-07-27T19:00:20Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3d9d948

Parents:

ecf083dd

Message:

Userspace S3C24xx UART driver. Use for kbd input from gta02 serial console.

Files:

• boot/arch/arm32/Makefile.inc (modified) (1 diff)
• kernel/arch/arm32/src/mach/gta02/gta02.c (modified) (2 diffs)
• uspace/Makefile (modified) (1 diff)
• uspace/app/init/init.c (modified) (1 diff)
• uspace/srv/hid/kbd/Makefile (modified) (1 diff)
• uspace/srv/hid/kbd/port/chardev.c (modified) (3 diffs)
• uspace/srv/hw/char/s3c24xx_uart/Makefile (added)
• uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (added)
• uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.h (added)

boot/arch/arm32/Makefile.inc

@@ -41 +41 @@
 PAGE_SIZE = 4096
 
-RD_SRVS_ESSENTIAL +=
+RD_SRVS_ESSENTIAL += \
+        $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24ser
 
 RD_SRVS_NON_ESSENTIAL += \

kernel/arch/arm32/src/mach/gta02/gta02.c

@@ -44 +44 @@
 #include <genarch/drivers/s3c24xx_timer/s3c24xx_timer.h>
 #include <genarch/srln/srln.h>
+#include <sysinfo/sysinfo.h>
 #include <interrupt.h>
 #include <ddi/ddi.h>
@@ -185 +186 @@
                 stdout_wire(gta02_scons_dev);
         }
+
+        /*
+         * This is the necessary evil until the userspace driver is entirely
+         * self-sufficient.
+         */
+        sysinfo_set_item_val("s3c24xx_uart", NULL, true);
+        sysinfo_set_item_val("s3c24xx_uart.inr", NULL, S3C24XX_INT_UART2);
+        sysinfo_set_item_val("s3c24xx_uart.address.physical", NULL,
+            (uintptr_t) GTA02_SCONS_BASE);
+
 }
 

uspace/Makefile

@@ -69 +69 @@
         srv/hid/kbd \
         srv/hw/char/i8042 \
+        srv/hw/char/s3c24xx_uart \
         srv/hw/netif/dp8390 \
         srv/net/cfg \

uspace/app/init/init.c

@@ -274 +274 @@
         srv_start("/srv/cuda_adb");
         srv_start("/srv/i8042");
+        srv_start("/srv/s3c24ser");
         srv_start("/srv/adb_ms");
         srv_start("/srv/char_ms");

uspace/srv/hid/kbd/Makefile

@@ -60 +60 @@
         ifeq ($(MACHINE),gta02)
                 SOURCES += \
-                        port/dummy.c \
-                        ctl/pc.c
+                        port/chardev.c \
+                        ctl/stty.c
         endif
         ifeq ($(MACHINE),testarm)

uspace/srv/hid/kbd/port/chardev.c

@@ -41 +41 @@
 #include <kbd.h>
 #include <vfs/vfs.h>
+#include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
@@ -50 +51 @@
 #define NAME "kbd"
 
+/** List of devices to try connecting to. */
+static const char *in_devs[] = {
+        "/dev/char/ps2a",
+        "/dev/char/s3c24ser"
+};
+
+static const int num_devs = sizeof(in_devs) / sizeof(in_devs[0]);
+
 int kbd_port_init(void)
 {
-        const char *input = "/dev/char/ps2a";
         int input_fd;
+        int i;
 
-        printf(NAME ": open %s\n", input);
+        input_fd = -1;
+        for (i = 0; i < num_devs; i++) {
+                struct stat s;
 
-        input_fd = open(input, O_RDONLY);
+                if (stat(in_devs[i], &s) == EOK)
+                        break;
+        }
+
+        if (i >= num_devs) {
+                printf(NAME ": Could not find any suitable input device.\n");
+                return -1;
+        }
+
+        input_fd = open(in_devs[i], O_RDONLY);
         if (input_fd < 0) {
-                printf(NAME ": Failed opening %s (%d)\n", input, input_fd);
-                return false;
+                printf(NAME ": failed opening device %s (%d).\n", in_devs[i],
+                    input_fd);
+                return -1;
         }
 
         dev_phone = fd_phone(input_fd);
         if (dev_phone < 0) {
-                printf(NAME ": Failed to connect to device\n");
-                return false;
+                printf(NAME ": Failed connecting to device\n");
+                return -1;
         }
 
@@ -73 +94 @@
         if (ipc_connect_to_me(dev_phone, 0, 0, 0, &phonehash) != 0) {
                 printf(NAME ": Failed to create callback from device\n");
-                return false;
+                return -1;
         }