Changeset f51f193 in mainline for uspace/srv/hid

Timestamp:

2011-07-12T03:00:14Z (15 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

6817eba

Parents:

eca52a8 (diff), 026793d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

uspace/srv/hid

Files:

• console/console.c (modified) (3 diffs)
• fb/Makefile (modified) (1 diff)
• fb/main.c (modified) (2 diffs)
• fb/niagara.c (modified) (1 diff)
• fb/niagara.h (modified) (1 diff)
• fb/sgcn.c (deleted)
• input/Makefile (modified) (1 diff)
• input/generic/input.c (modified) (3 diffs)
• input/include/kbd_port.h (modified) (1 diff)
• input/port/niagara.c (modified) (1 diff)
• input/port/sgcn.c (deleted)
• input/port/z8530.c (deleted)

uspace/srv/hid/console/console.c

@@ -357 +357 @@
                 console_serialize_end();
                 
-                if (__SYSCALL0(SYS_DEBUG_ENABLE_CONSOLE)) {
+                if (console_kcon()) {
                         prev_console = active_console;
                         active_console = kernel_console;
@@ -711 +711 @@
                         console_serialize_start();
                         continue;
-                case CONSOLE_KCON_ENABLE:
-                        change_console(kernel_console);
-                        break;
                 }
                 async_answer_3(callid, EOK, arg1, arg2, arg3);
@@ -833 +830 @@
         }
         
-        /* Disable kernel output to the console */
-        __SYSCALL0(SYS_DEBUG_DISABLE_CONSOLE);
-        
         /* Initialize the screen */
         console_serialize_start();

uspace/srv/hid/fb/Makefile

@@ -84 +84 @@
                 EXTRA_CFLAGS += -DNIAGARA_ENABLED
         endif
-        
-        ifeq ($(MACHINE),serengeti)
-                SOURCES += \
-                        sgcn.c \
-                        serial_console.c
-                EXTRA_CFLAGS += -DSGCN_ENABLED
-        endif
 endif
 

uspace/srv/hid/fb/main.c

@@ -40 +40 @@
 #include "msim.h"
 #include "ski.h"
-#include "sgcn.h"
 #include "niagara.h"
 #include "main.h"
@@ -92 +91 @@
         }
 #endif
-#ifdef SGCN_ENABLED
-        if ((!initialized) && (fb_kind == 4)) {
-                if (sgcn_init() == 0)
-                        initialized = true;
-        }
-#endif
 #ifdef NIAGARA_ENABLED
         if ((!initialized) && (fb_kind == 5)) {

uspace/srv/hid/fb/niagara.c

@@ -29 +29 @@
  */
 
-/** @defgroup niagarafb SGCN
+/** @defgroup niagarafb
  * @brief       userland driver of the Niagara console output
  * @{

uspace/srv/hid/fb/niagara.h

@@ -27 +27 @@
  */
 
-/** @defgroup sgcnfb SGCN
- * @brief       userland driver of the Serengeti console output
+/** @defgroup niagarafb
+ * @brief       userland driver of the Niagara console output
  * @{
  */

uspace/srv/hid/input/Makefile

@@ -49 +49 @@
         port/ns16550.c \
         port/pl050.c \
-        port/sgcn.c \
         port/ski.c \
-        port/z8530.c \
         proto/adb.c \
         proto/mousedev.c \

uspace/srv/hid/input/generic/input.c

@@ -424 +424 @@
         kbd_add_dev(&niagara_port, &stty_ctl);
 #endif
-#if defined(UARCH_sparc64) && defined(MACHINE_serengeti)
-        kbd_add_dev(&sgcn_port, &stty_ctl);
-#endif
 #if defined(UARCH_sparc64) && defined(MACHINE_generic)
-        kbd_add_dev(&z8530_port, &sun_ctl);
         kbd_add_dev(&ns16550_port, &sun_ctl);
 #endif
@@ -556 +552 @@
         printf("%s: HelenOS input service\n", NAME);
         
-        sysarg_t fhc;
         sysarg_t obio;
         
@@ -562 +557 @@
         list_initialize(&mouse_devs);
         
-        if (((sysinfo_get_value("kbd.cir.fhc", &fhc) == EOK) && (fhc))
-            || ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio)))
+        if ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio))
                 irc_service = true;
         

uspace/srv/hid/input/include/kbd_port.h

@@ -56 +56 @@
 extern kbd_port_ops_t ns16550_port;
 extern kbd_port_ops_t pl050_port;
-extern kbd_port_ops_t sgcn_port;
 extern kbd_port_ops_t ski_port;
-extern kbd_port_ops_t z8530_port;
 
 #endif

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

@@ -154 +154 @@
 
 /**
- * Thread to poll SGCN for keypresses.
+ * Thread to poll Niagara console for keypresses.
  */
 static void niagara_thread_impl(void *arg)