Changeset 6d15572 in mainline

Timestamp:

2017-11-08T08:04:08Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f5b6fb5

Parents:

cecba66e

Message:

Move receiving side of ski console support to a separate driver, ski-con. Add ski platform driver.

Files:

• boot/arch/ia64/Makefile.inc (modified) (2 diffs)
• uspace/Makefile (modified) (2 diffs)
• uspace/drv/char/ski-con/Makefile (added)
• uspace/drv/char/ski-con/main.c (added)
• uspace/drv/char/ski-con/ski-con.c (added)
• uspace/drv/char/ski-con/ski-con.h (added)
• uspace/drv/char/ski-con/ski-con.ma (added)
• uspace/drv/platform/ski/Makefile (added)
• uspace/drv/platform/ski/ski.c (added)
• uspace/drv/platform/ski/ski.ma (added)
• uspace/srv/hid/input/Makefile (modified) (1 diff)
• uspace/srv/hid/input/input.c (modified) (1 diff)
• uspace/srv/hid/input/kbd_port.h (modified) (1 diff)
• uspace/srv/hid/input/port/chardev.c (modified) (3 diffs)
• uspace/srv/hid/input/port/ski.c (deleted)

boot/arch/ia64/Makefile.inc

@@ -66 +66 @@
 endif
 
+ifeq ($(MACHINE),i460GX)
 RD_DRVS_ESSENTIAL += \
         platform/pc \
@@ -88 +89 @@
 RD_DRV_CFG += \
         bus/isa
+endif
+
+ifeq ($(MACHINE),ski)
+RD_DRVS_ESSENTIAL += \
+        char/ski-con \
+        platform/ski
+endif
 
 PRE_DEPEND = $(COMPS).s $(COMPS).h $(COMPS)_desc.c $(COMPONENTS_DEFLATE)

uspace/Makefile

@@ -155 +155 @@
         drv/bus/usb/usbmid \
         drv/bus/usb/vhc \
+        drv/char/atkbd \
         drv/char/i8042 \
         drv/char/ns8250 \
         drv/char/pl050 \
         drv/char/ps2mouse \
-        drv/char/atkbd \
+        drv/char/ski-con \
         drv/char/xtkbd \
         drv/test/test1 \
@@ -181 +182 @@
         drv/platform/msim \
         drv/platform/pc \
+        drv/platform/ski \
         drv/time/cmos-rtc
 

uspace/srv/hid/input/Makefile

@@ -42 +42 @@
         port/msim.c \
         port/niagara.c \
-        port/ski.c \
         proto/adb.c \
         proto/mousedev.c \

uspace/srv/hid/input/input.c

@@ -637 +637 @@
         kbd_add_dev(&chardev_port, &stty_ctl);
 #endif
-#if defined(MACHINE_ski)
-        kbd_add_dev(&ski_port, &stty_ctl);
+#if defined(UARCH_ia64) && defined(MACHINE_ski)
+        kbd_add_dev(&chardev_port, &stty_ctl);
 #endif
 #if defined(MACHINE_msim)

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 ski_port;
 
 #endif

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

@@ -59 +59 @@
 /** List of devices to try connecting to. */
 static const char *in_devs[] = {
-        "char/s3c24xx_uart"
+        /** S3C24xx UART - Openmoko debug console */
+        "char/s3c24xx_uart",
+        /** Ski console */
+        "devices/\\hw\\console\\a"
 };
 
@@ -74 +77 @@
         
         for (i = 0; i < num_devs; i++) {
+                printf("%s: Probe service '%s'\n", NAME, in_devs[i]);
                 rc = loc_service_get_id(in_devs[i], &service_id, 0);
-                if (rc == EOK)
+                if (rc == EOK) {
+                        printf("%s: success \n", NAME);
                         break;
+                }
         }
         
@@ -109 +115 @@
                 return -1;
         }
+        printf("%s: Connected input device\n", NAME);
         
         return 0;