Changeset beb9336 in mainline for uspace/srv

Timestamp:

2012-08-24T14:07:52Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

041ab64

Parents:

bd29f9c9 (diff), db81577 (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 with mainline

Location:

uspace/srv

Files:

• bd/ata_bd/ata_bd.c (modified) (view diffs)
• bd/ata_bd/ata_bd.h (modified) (view diffs)
• bd/file_bd/file_bd.c (modified) (view diffs)
• bd/gxe_bd/gxe_bd.c (modified) (view diffs)
• bd/part/guid_part/guid_part.c (modified) (view diffs)
• bd/part/mbr_part/mbr_part.c (modified) (view diffs)
• bd/rd/rd.c (modified) (view diffs)
• bd/sata_bd/sata_bd.c (modified) (view diffs)
• bd/sata_bd/sata_bd.h (modified) (view diffs)
• devman/devman.c (modified) (view diffs)
• devman/devman.h (modified) (view diffs)
• devman/main.c (modified) (view diffs)
• fs/cdfs/cdfs_ops.c (modified) (view diffs)
• fs/exfat/exfat_bitmap.c (modified) (view diffs)
• fs/exfat/exfat_directory.c (modified) (view diffs)
• fs/exfat/exfat_fat.c (modified) (view diffs)
• fs/exfat/exfat_fat.h (modified) (view diffs)
• fs/exfat/exfat_ops.c (modified) (view diffs)
• fs/ext2fs/ext2fs_ops.c (modified) (view diffs)
• fs/ext4fs/Makefile (modified) (view diffs)
• fs/ext4fs/ext4fs.c (modified) (view diffs)
• fs/ext4fs/ext4fs.h (modified) (view diffs)
• fs/ext4fs/ext4fs_ops.c (modified) (view diffs)
• fs/fat/fat_directory.c (modified) (view diffs)
• fs/fat/fat_fat.c (modified) (view diffs)
• fs/fat/fat_fat.h (modified) (view diffs)
• fs/fat/fat_ops.c (modified) (view diffs)
• fs/mfs/mfs.h (modified) (view diffs)
• fs/tmpfs/tmpfs_dump.c (modified) (view diffs)
• hid/compositor/Makefile (added)
• hid/compositor/compositor.c (added)
• hid/compositor/compositor.h (added)
• hid/compositor/gfx/helenos.tga (moved) (moved from uspace/srv/hid/console/gfx/helenos.tga ) (view diffs)
• hid/compositor/gfx/nameic.tga (moved) (moved from uspace/srv/hid/console/gfx/nameic.tga ) (view diffs)
• hid/console/Makefile (modified) (view diffs)
• hid/console/console.c (modified) (view diffs)
• hid/console/gfx/anim_1.tga (deleted)
• hid/console/gfx/anim_2.tga (deleted)
• hid/console/gfx/anim_3.tga (deleted)
• hid/console/gfx/anim_4.tga (deleted)
• hid/console/gfx/cons_data.tga (deleted)
• hid/console/gfx/cons_dis.tga (deleted)
• hid/console/gfx/cons_dis_sel.tga (deleted)
• hid/console/gfx/cons_idle.tga (deleted)
• hid/console/gfx/cons_kernel.tga (deleted)
• hid/console/gfx/cons_sel.tga (deleted)
• hid/fb/fb.c (deleted)
• hid/fb/fb.h (deleted)
• hid/input/Makefile (modified) (view diffs)
• hid/input/ctl/apple.c (modified) (view diffs)
• hid/input/ctl/gxe_fb.c (modified) (view diffs)
• hid/input/ctl/kbdev.c (modified) (view diffs)
• hid/input/ctl/pc.c (modified) (view diffs)
• hid/input/ctl/stty.c (modified) (view diffs)
• hid/input/ctl/sun.c (modified) (view diffs)
• hid/input/gsp.c (moved) (moved from uspace/srv/hid/input/generic/gsp.c ) (view diffs)
• hid/input/gsp.h (moved) (moved from uspace/srv/hid/input/include/gsp.h ) (view diffs)
• hid/input/input.c (moved) (moved from uspace/srv/hid/input/generic/input.c ) (view diffs)
• hid/input/input.h (moved) (moved from uspace/srv/hid/input/include/input.h ) (view diffs)
• hid/input/kbd.h (moved) (moved from uspace/srv/hid/input/include/kbd.h ) (view diffs)
• hid/input/kbd_ctl.h (moved) (moved from uspace/srv/hid/input/include/kbd_ctl.h ) (view diffs)
• hid/input/kbd_port.h (moved) (moved from uspace/srv/hid/input/include/kbd_port.h ) (view diffs)
• hid/input/layout.c (moved) (moved from uspace/srv/hid/input/generic/layout.c ) (view diffs)
• hid/input/layout.h (moved) (moved from uspace/srv/hid/input/include/layout.h ) (view diffs)
• hid/input/layout/cz.c (modified) (view diffs)
• hid/input/layout/us_dvorak.c (modified) (view diffs)
• hid/input/layout/us_qwerty.c (modified) (view diffs)
• hid/input/mouse.h (moved) (moved from uspace/srv/hid/input/include/mouse.h ) (view diffs)
• hid/input/mouse_port.h (moved) (moved from uspace/srv/hid/input/include/mouse_port.h ) (view diffs)
• hid/input/mouse_proto.h (moved) (moved from uspace/srv/hid/input/include/mouse_proto.h ) (view diffs)
• hid/input/port/adb.c (modified) (view diffs)
• hid/input/port/adb_mouse.c (modified) (view diffs)
• hid/input/port/chardev.c (modified) (view diffs)
• hid/input/port/gxemul.c (modified) (view diffs)
• hid/input/port/msim.c (modified) (view diffs)
• hid/input/port/niagara.c (modified) (view diffs)
• hid/input/port/ns16550.c (modified) (view diffs)
• hid/input/port/pl050.c (modified) (view diffs)
• hid/input/port/ski.c (modified) (view diffs)
• hid/input/proto/adb.c (modified) (view diffs)
• hid/input/proto/mousedev.c (modified) (view diffs)
• hid/input/stroke.c (moved) (moved from uspace/srv/hid/input/generic/stroke.c ) (view diffs)
• hid/input/stroke.h (moved) (moved from uspace/srv/hid/input/include/stroke.h ) (view diffs)
• hid/isdv4_tablet/Makefile (added)
• hid/isdv4_tablet/isdv4.c (added)
• hid/isdv4_tablet/isdv4.h (added)
• hid/isdv4_tablet/main.c (added)
• hid/output/Makefile (moved) (moved from uspace/srv/hid/fb/Makefile ) (view diffs)
• hid/output/ctl/serial.c (moved) (moved from uspace/srv/hid/fb/ctl/serial.c ) (view diffs)
• hid/output/ctl/serial.h (moved) (moved from uspace/srv/hid/fb/ctl/serial.h ) (view diffs)
• hid/output/gfx/font-8x16.c (added)
• hid/output/gfx/font-8x16.h (added)
• hid/output/output.c (added)
• hid/output/output.h (added)
• hid/output/port/ega.c (moved) (moved from uspace/srv/hid/fb/port/ega.c ) (view diffs)
• hid/output/port/ega.h (moved) (moved from uspace/srv/hid/fb/port/ega.h ) (view diffs)
• hid/output/port/kchar.c (moved) (moved from uspace/srv/hid/fb/port/kchar.c ) (view diffs)
• hid/output/port/kchar.h (moved) (moved from uspace/srv/hid/fb/port/kchar.h ) (view diffs)
• hid/output/port/kfb.c (moved) (moved from uspace/srv/hid/fb/port/kfb.c ) (view diffs)
• hid/output/port/kfb.h (moved) (moved from uspace/srv/hid/fb/port/kfb.h ) (view diffs)
• hid/output/port/niagara.c (moved) (moved from uspace/srv/hid/fb/port/niagara.c ) (view diffs)
• hid/output/port/niagara.h (moved) (moved from uspace/srv/hid/fb/port/niagara.h ) (view diffs)
• hid/output/port/ski.c (moved) (moved from uspace/srv/hid/fb/port/ski.c ) (view diffs)
• hid/output/port/ski.h (moved) (moved from uspace/srv/hid/fb/port/ski.h ) (view diffs)
• hid/output/proto/vt100.c (moved) (moved from uspace/srv/hid/fb/proto/vt100.c ) (view diffs)
• hid/output/proto/vt100.h (moved) (moved from uspace/srv/hid/fb/proto/vt100.h ) (view diffs)
• hid/remcons/remcons.c (modified) (view diffs)
• locsrv/locsrv.c (modified) (view diffs)
• net/ethip/pdu.c (modified) (view diffs)
• net/tcp/conn.c (modified) (view diffs)
• net/tcp/segment.c (modified) (view diffs)
• net/tcp/sock.c (modified) (view diffs)
• net/tcp/tqueue.c (modified) (view diffs)
• net/udp/sock.c (modified) (view diffs)