Changeset c6a7b3a in mainline for uspace/srv/hid

Timestamp:

2013-03-28T20:39:16Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2d1fdcad

Parents:

cc3c27ad (diff), 5d9fce4 (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:

mainline changes

Location:

uspace/srv/hid/input

Files:

• Makefile (modified) (2 diffs)
• ctl/gxe_fb.c (deleted)
• input.c (modified) (1 diff)
• kbd_ctl.h (modified) (1 diff)
• kbd_port.h (modified) (1 diff)
• port/gxemul.c (deleted)

uspace/srv/hid/input/Makefile

@@ -39 +39 @@
         port/adb_mouse.c \
         port/chardev.c \
-        port/gxemul.c \
         port/msim.c \
         port/niagara.c \
@@ -48 +47 @@
         proto/mousedev.c \
         ctl/apple.c \
-        ctl/gxe_fb.c \
         ctl/kbdev.c \
         ctl/pc.c \

uspace/srv/hid/input/input.c

@@ -440 +440 @@
         kbd_add_dev(&msim_port, &stty_ctl);
 #endif
-#if (defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul)) && defined(CONFIG_FB)
-        kbd_add_dev(&gxemul_port, &gxe_fb_ctl);
-#endif
-#if defined(MACHINE_lgxemul) || defined(MACHINE_bgxemul) && !defined(CONFIG_FB)
-        kbd_add_dev(&gxemul_port, &stty_ctl);
-#endif
 #if defined(UARCH_ppc32)
         kbd_add_dev(&adb_port, &apple_ctl);

uspace/srv/hid/input/kbd_ctl.h

@@ -49 +49 @@
 
 extern kbd_ctl_ops_t apple_ctl;
-extern kbd_ctl_ops_t gxe_fb_ctl;
 extern kbd_ctl_ops_t kbdev_ctl;
 extern kbd_ctl_ops_t pc_ctl;

uspace/srv/hid/input/kbd_port.h

@@ -51 +51 @@
 extern kbd_port_ops_t adb_port;
 extern kbd_port_ops_t chardev_port;
-extern kbd_port_ops_t gxemul_port;
 extern kbd_port_ops_t msim_port;
 extern kbd_port_ops_t niagara_port;