Changeset 3781092 in mainline for uspace/srv

Timestamp:

2011-09-09T18:22:33Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

40a2af3

Parents:

980671e7 (diff), 5da7199 (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

Files:

• hid/console/Makefile (modified) (view diffs)
• hid/console/console.c (modified) (view diffs)
• hid/console/console.h (modified) (view diffs)
• hid/console/gcons.c (deleted)
• hid/console/gfx/anim_1.tga (modified) (view diffs)
• hid/console/gfx/anim_2.tga (modified) (view diffs)
• hid/console/gfx/anim_3.tga (modified) (view diffs)
• hid/console/gfx/anim_4.tga (modified) (view diffs)
• hid/console/gfx/cons_data.tga (moved) (moved from uspace/srv/hid/console/gfx/cons_has_data.tga ) (view diffs)
• hid/console/gfx/cons_dis.tga (added)
• hid/console/gfx/cons_dis_sel.tga (added)
• hid/console/gfx/cons_kernel.tga (modified) (view diffs)
• hid/console/gfx/cons_sel.tga (moved) (moved from uspace/srv/hid/console/gfx/cons_selected.tga ) (view diffs)
• hid/console/keybuffer.c (deleted)
• hid/fb/Makefile (modified) (view diffs)
• hid/fb/ctl/serial.c (added)
• hid/fb/ctl/serial.h (moved) (moved from uspace/srv/hid/fb/msim.h ) (view diffs)
• hid/fb/ega.c (deleted)
• hid/fb/fb.c (modified) (view diffs)
• hid/fb/fb.h (modified) (view diffs)
• hid/fb/gfx/font-8x16.c (moved) (moved from uspace/srv/hid/fb/font-8x16.c ) (view diffs)
• hid/fb/gfx/font-8x16.h (moved) (moved from uspace/srv/hid/fb/font-8x16.h ) (view diffs)
• hid/fb/main.c (deleted)
• hid/fb/pointer.xbm (deleted)
• hid/fb/pointer_mask.xbm (deleted)
• hid/fb/port/ega.c (added)
• hid/fb/port/ega.h (moved) (moved from uspace/srv/hid/fb/ega.h ) (view diffs)
• hid/fb/port/kchar.c (moved) (moved from uspace/srv/hid/fb/msim.c ) (view diffs)
• hid/fb/port/kchar.h (moved) (moved from uspace/srv/hid/fb/main.h ) (view diffs)
• hid/fb/port/kfb.c (added)
• hid/fb/port/kfb.h (moved) (moved from uspace/lib/c/include/ns_obsolete.h ) (view diffs)
• hid/fb/port/niagara.c (moved) (moved from uspace/srv/hid/fb/niagara.c ) (view diffs)
• hid/fb/port/niagara.h (moved) (moved from uspace/srv/hid/fb/niagara.h ) (view diffs)
• hid/fb/port/ski.c (moved) (moved from uspace/srv/hid/fb/ski.c ) (view diffs)
• hid/fb/port/ski.h (moved) (moved from uspace/srv/hid/fb/ski.h ) (view diffs)
• hid/fb/proto/vt100.c (added)
• hid/fb/proto/vt100.h (added)
• hid/fb/serial_console.c (deleted)
• hid/input/generic/input.c (modified) (view diffs)
• hid/input/include/input.h (modified) (view diffs)
• hid/input/port/ns16550.c (modified) (view diffs)
• hid/s3c24xx_ts/s3c24xx_ts.c (modified) (view diffs)
• hid/s3c24xx_ts/s3c24xx_ts.h (modified) (view diffs)
• hw/bus/cuda_adb/cuda_adb.c (modified) (view diffs)
• hw/bus/cuda_adb/cuda_adb.h (modified) (view diffs)
• hw/char/i8042/i8042.c (modified) (view diffs)
• hw/char/i8042/i8042.h (modified) (view diffs)
• hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (view diffs)
• hw/char/s3c24xx_uart/s3c24xx_uart.h (modified) (view diffs)
• vfs/vfs_ops.c (modified) (view diffs)