Changeset 7aa94304 in mainline

Timestamp:

2017-11-10T18:59:18Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

19397be

Parents:

3a37751

Message:

Move receiving side of Niagara console to a separate driver.

Files:

• boot/arch/sparc64/Makefile.inc (modified) (2 diffs)
• uspace/Makefile (modified) (2 diffs)
• uspace/drv/char/msim-con/msim-con.c (modified) (8 diffs)
• uspace/drv/char/sun4v-con/Makefile (added)
• uspace/drv/char/sun4v-con/main.c (added)
• uspace/drv/char/sun4v-con/sun4v-con.c (added)
• uspace/drv/char/sun4v-con/sun4v-con.h (added)
• uspace/drv/char/sun4v-con/sun4v-con.ma (added)
• uspace/drv/platform/sun4u/sun4u.ma (modified) (1 diff)
• uspace/drv/platform/sun4v/Makefile (added)
• uspace/drv/platform/sun4v/sun4v.c (added)
• uspace/drv/platform/sun4v/sun4v.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) (1 diff)
• uspace/srv/hid/input/port/niagara.c (deleted)

boot/arch/sparc64/Makefile.inc

@@ -39 +39 @@
 EXTRA_CFLAGS = -mcpu=ultrasparc -m64 -mno-fpu -mcmodel=medlow
 
+ifeq ($(PROCESSOR), sun4v)
+RD_DRVS_ESSENTIAL += \
+        platform/sun4v \
+        char/sun4v-con
+else
 RD_DRVS_ESSENTIAL += \
         platform/sun4u \
@@ -48 +53 @@
 RD_DRV_CFG += \
         bus/isa
+endif
 
 SOURCES = \

uspace/Makefile

@@ -161 +161 @@
         drv/char/ps2mouse \
         drv/char/ski-con \
+        drv/char/sun4v-con \
         drv/char/xtkbd \
         drv/test/test1 \
@@ -183 +184 @@
         drv/platform/pc \
         drv/platform/ski \
+        drv/platform/sun4v \
         drv/time/cmos-rtc
 

uspace/drv/char/msim-con/msim-con.c

@@ -68 +68 @@
         msim_cmds
 };
-#include <stdio.h>
+
 static void msim_irq_handler(ipc_callid_t iid, ipc_call_t *call, void *arg)
 {
@@ -75 +75 @@
 
         c = IPC_GET_ARG2(*call);
-        printf("key=%d\n", c);
+
         if (con->client_sess != NULL) {
                 async_exch_t *exch = async_exchange_begin(con->client_sess);
@@ -90 +90 @@
         int rc;
 
-        printf("msim_con_add\n");
         fun = ddf_fun_create(con->dev, fun_exposed, "a");
         if (fun == NULL) {
@@ -112 +111 @@
         }
 
-        printf("msim_con_add: irq subscribe\n");
-
         msim_ranges[0].base = paddr;
         msim_cmds[0].addr = (void *) paddr;
@@ -119 +116 @@
         subscribed = true;
 
-        printf("msim_con_add: bind\n");
         rc = ddf_fun_bind(fun);
         if (rc != EOK) {
@@ -126 +122 @@
         }
 
-        printf("msim_con_add: DONE\n");
         return EOK;
 error:
@@ -162 +157 @@
         async_answer_0(iid, EOK);
 
-        printf("msim_con_connection\n");
-
         con = (msim_con_t *)ddf_dev_data_get(ddf_fun_get_dev((ddf_fun_t *)arg));
 
@@ -185 +178 @@
                         } else
                                 async_answer_0(callid, ELIMIT);
-                        printf("msim_con_connection: set client_sess\n");
                 } else {
                         switch (method) {

uspace/drv/platform/sun4u/sun4u.ma

@@ -1 +1 @@
 10 platform/sun4u
+10 platform/sun4v

uspace/srv/hid/input/Makefile

@@ -40 +40 @@
         port/adb_mouse.c \
         port/chardev.c \
-        port/niagara.c \
         proto/adb.c \
         proto/mousedev.c \

uspace/srv/hid/input/input.c

@@ -647 +647 @@
 #endif
 #if defined(UARCH_sparc64) && defined(PROCESSOR_sun4v)
-        kbd_add_dev(&niagara_port, &stty_ctl);
+        kbd_add_dev(&chardev_port, &stty_ctl);
 #endif
         /* Silence warning on abs32le about kbd_add_dev() being unused */

uspace/srv/hid/input/kbd_port.h

@@ -49 +49 @@
 extern kbd_port_ops_t adb_port;
 extern kbd_port_ops_t chardev_port;
-extern kbd_port_ops_t niagara_port;
 extern kbd_port_ops_t ns16550_port;
 

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

@@ -61 +61 @@
         /** S3C24xx UART - Openmoko debug console */
         "char/s3c24xx_uart",
-        /** Ski console, MSIM console */
+        /** Ski console, MSIM console, Sun4v console */
         "devices/\\hw\\console\\a"
 };