Changeset b0f00a9 in mainline for uspace/srv/hid

Timestamp:

2011-11-06T22:21:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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:

• adb_mouse/adb_mouse.c (deleted)
• char_mouse/char_mouse.c (deleted)
• console/Makefile (modified) (view diffs)
• console/console.c (modified) (view diffs)
• console/console.h (modified) (view diffs)
• console/gcons.c (deleted)
• console/gfx/anim_1.ppm (deleted)
• console/gfx/anim_1.tga (added)
• console/gfx/anim_2.ppm (deleted)
• console/gfx/anim_2.tga (added)
• console/gfx/anim_3.ppm (deleted)
• console/gfx/anim_3.tga (added)
• console/gfx/anim_4.ppm (deleted)
• console/gfx/anim_4.tga (added)
• console/gfx/cons_data.tga (added)
• console/gfx/cons_dis.tga (added)
• console/gfx/cons_dis_sel.tga (added)
• console/gfx/cons_has_data.ppm (deleted)
• console/gfx/cons_idle.ppm (deleted)
• console/gfx/cons_idle.tga (added)
• console/gfx/cons_kernel.ppm (deleted)
• console/gfx/cons_kernel.tga (added)
• console/gfx/cons_sel.tga (added)
• console/gfx/cons_selected.ppm (deleted)
• console/gfx/helenos.ppm (deleted)
• console/gfx/helenos.tga (added)
• console/gfx/nameic.ppm (deleted)
• console/gfx/nameic.tga (added)
• console/keybuffer.c (deleted)
• fb/Makefile (modified) (view diffs)
• fb/ctl/serial.c (added)
• fb/ctl/serial.h (added)
• fb/ega.c (deleted)
• fb/fb.c (modified) (view diffs)
• fb/fb.h (modified) (view diffs)
• fb/gfx/font-8x16.c (moved) (moved from uspace/srv/hid/fb/font-8x16.c ) (view diffs)
• fb/gfx/font-8x16.h (moved) (moved from uspace/srv/hid/fb/font-8x16.h ) (view diffs)
• fb/main.c (deleted)
• fb/pointer.xbm (deleted)
• fb/pointer_mask.xbm (deleted)
• fb/port/ega.c (added)
• fb/port/ega.h (moved) (moved from uspace/srv/hid/fb/ega.h ) (view diffs)
• fb/port/kchar.c (added)
• fb/port/kchar.h (moved) (moved from uspace/srv/hid/fb/main.h ) (view diffs)
• fb/port/kfb.c (added)
• fb/port/kfb.h (added)
• fb/port/niagara.c (moved) (moved from uspace/srv/hid/fb/niagara.c ) (view diffs)
• fb/port/niagara.h (moved) (moved from uspace/srv/hid/fb/niagara.h ) (view diffs)
• fb/port/ski.c (moved) (moved from uspace/srv/hid/fb/ski.c ) (view diffs)
• fb/port/ski.h (moved) (moved from uspace/srv/hid/fb/ski.h ) (view diffs)
• fb/ppm.c (deleted)
• fb/proto/vt100.c (added)
• fb/proto/vt100.h (added)
• fb/serial_console.c (deleted)
• fb/sgcn.c (deleted)
• input/Makefile (added)
• input/ctl/apple.c (moved) (moved from uspace/srv/hid/kbd/ctl/apple.c ) (view diffs)
• input/ctl/gxe_fb.c (moved) (moved from uspace/srv/hid/kbd/ctl/gxe_fb.c ) (view diffs)
• input/ctl/kbdev.c (added)
• input/ctl/pc.c (moved) (moved from uspace/srv/hid/kbd/ctl/pc.c ) (view diffs)
• input/ctl/stty.c (moved) (moved from uspace/srv/hid/kbd/ctl/stty.c ) (view diffs)
• input/ctl/sun.c (moved) (moved from uspace/srv/hid/kbd/ctl/sun.c ) (view diffs)
• input/generic/gsp.c (moved) (moved from uspace/srv/hid/kbd/genarch/gsp.c ) (view diffs)
• input/generic/input.c (added)
• input/generic/layout.c (added)
• input/generic/stroke.c (moved) (moved from uspace/srv/hid/kbd/genarch/stroke.c ) (view diffs)
• input/include/gsp.h (moved) (moved from uspace/srv/hid/kbd/include/gsp.h ) (view diffs)
• input/include/input.h (moved) (moved from uspace/srv/hid/kbd/include/kbd.h ) (view diffs)
• input/include/kbd.h (added)
• input/include/kbd_ctl.h (moved) (moved from uspace/srv/hid/kbd/include/kbd_ctl.h ) (view diffs)
• input/include/kbd_port.h (added)
• input/include/layout.h (added)
• input/include/mouse.h (added)
• input/include/mouse_port.h (moved) (moved from uspace/srv/hid/char_mouse/include/mouse_port.h ) (view diffs)
• input/include/mouse_proto.h (moved) (moved from uspace/srv/hid/char_mouse/include/mouse_proto.h ) (view diffs)
• input/include/stroke.h (moved) (moved from uspace/srv/hid/kbd/include/stroke.h ) (view diffs)
• input/include/sun.h (moved) (moved from uspace/srv/hid/kbd/include/sun.h ) (view diffs)
• input/layout/cz.c (moved) (moved from uspace/srv/hid/kbd/layout/cz.c ) (view diffs)
• input/layout/us_dvorak.c (moved) (moved from uspace/srv/hid/kbd/layout/us_dvorak.c ) (view diffs)
• input/layout/us_qwerty.c (moved) (moved from uspace/srv/hid/kbd/layout/us_qwerty.c ) (view diffs)
• input/port/adb.c (moved) (moved from uspace/srv/hid/kbd/port/adb.c ) (view diffs)
• input/port/adb_mouse.c (moved) (moved from uspace/srv/hid/char_mouse/chardev.c ) (view diffs)
• input/port/chardev.c (moved) (moved from uspace/srv/hid/kbd/port/chardev.c ) (view diffs)
• input/port/chardev_mouse.c (added)
• input/port/dummy.c (moved) (moved from uspace/srv/hid/kbd/port/dummy.c ) (view diffs)
• input/port/gxemul.c (moved) (moved from uspace/srv/hid/kbd/port/gxemul.c ) (view diffs)
• input/port/msim.c (moved) (moved from uspace/srv/hid/kbd/port/msim.c ) (view diffs)
• input/port/niagara.c (moved) (moved from uspace/srv/hid/kbd/port/niagara.c ) (view diffs)
• input/port/ns16550.c (moved) (moved from uspace/srv/hid/kbd/port/ns16550.c ) (view diffs)
• input/port/pl050.c (moved) (moved from uspace/srv/hid/kbd/port/pl050.c ) (view diffs)
• input/port/sgcn.c (moved) (moved from uspace/srv/hid/kbd/port/sgcn.c ) (view diffs)
• input/port/ski.c (moved) (moved from uspace/srv/hid/kbd/port/ski.c ) (view diffs)
• input/port/sun.c (moved) (moved from uspace/srv/hid/kbd/port/sun.c ) (view diffs)
• input/port/z8530.c (moved) (moved from uspace/srv/hid/kbd/port/z8530.c ) (view diffs)
• input/proto/adb.c (added)
• input/proto/mousedev.c (added)
• input/proto/ps2.c (moved) (moved from uspace/srv/hid/char_mouse/proto/ps2.c ) (view diffs)
• kbd/Makefile (deleted)
• kbd/generic/kbd.c (deleted)
• s3c24xx_ts/s3c24xx_ts.c (modified) (view diffs)
• s3c24xx_ts/s3c24xx_ts.h (modified) (view diffs)