Changeset db6e419 in mainline for uspace/srv

Timestamp:

2011-08-16T18:53:00Z (15 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

49160c4

Parents:

e0e922d (diff), 45058baa (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:

• 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)
• devman/devman.c (modified) (view diffs)
• devman/devman.h (modified) (view diffs)
• devman/main.c (modified) (view diffs)
• devmap/devmap.c (deleted)
• fs/ext2fs/ext2fs_ops.c (modified) (view diffs)
• fs/fat/fat.h (modified) (view diffs)
• fs/fat/fat_fat.c (modified) (view diffs)
• fs/fat/fat_fat.h (modified) (view diffs)
• fs/fat/fat_idx.c (modified) (view diffs)
• fs/fat/fat_ops.c (modified) (view diffs)
• fs/locfs/Makefile (moved) (moved from uspace/srv/fs/devfs/Makefile ) (view diffs)
• fs/locfs/locfs.c (moved) (moved from uspace/srv/fs/devfs/devfs.c ) (view diffs)
• fs/locfs/locfs.h (moved) (moved from uspace/srv/fs/devfs/devfs.h ) (view diffs)
• fs/locfs/locfs_ops.c (moved) (moved from uspace/srv/fs/devfs/devfs_ops.c ) (view diffs)
• fs/locfs/locfs_ops.h (moved) (moved from uspace/srv/fs/devfs/devfs_ops.h ) (view diffs)
• fs/tmpfs/tmpfs.h (modified) (view diffs)
• fs/tmpfs/tmpfs_dump.c (modified) (view diffs)
• fs/tmpfs/tmpfs_ops.c (modified) (view diffs)
• hid/console/Makefile (modified) (view diffs)
• hid/console/console.c (modified) (view diffs)
• hid/console/gcons.c (modified) (view diffs)
• hid/console/gfx/anim_1.ppm (deleted)
• hid/console/gfx/anim_1.tga (added)
• hid/console/gfx/anim_2.ppm (deleted)
• hid/console/gfx/anim_2.tga (added)
• hid/console/gfx/anim_3.ppm (deleted)
• hid/console/gfx/anim_3.tga (added)
• hid/console/gfx/anim_4.ppm (deleted)
• hid/console/gfx/anim_4.tga (added)
• hid/console/gfx/cons_has_data.ppm (deleted)
• hid/console/gfx/cons_has_data.tga (added)
• hid/console/gfx/cons_idle.ppm (deleted)
• hid/console/gfx/cons_idle.tga (added)
• hid/console/gfx/cons_kernel.ppm (deleted)
• hid/console/gfx/cons_kernel.tga (added)
• hid/console/gfx/cons_selected.ppm (deleted)
• hid/console/gfx/cons_selected.tga (added)
• hid/console/gfx/helenos.ppm (deleted)
• hid/console/gfx/helenos.tga (added)
• hid/console/gfx/nameic.ppm (deleted)
• hid/console/gfx/nameic.tga (added)
• hid/fb/Makefile (modified) (view diffs)
• hid/fb/ega.c (modified) (view diffs)
• hid/fb/fb.c (modified) (view diffs)
• hid/fb/fb.h (modified) (view diffs)
• hid/fb/ppm.c (deleted)
• hid/fb/serial_console.c (modified) (view diffs)
• hid/input/ctl/kbdev.c (modified) (view diffs)
• hid/input/generic/input.c (modified) (view diffs)
• hid/input/include/kbd.h (modified) (view diffs)
• hid/input/include/mouse.h (modified) (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/chardev_mouse.c (modified) (view diffs)
• hid/input/proto/mousedev.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)
• hw/irc/i8259/i8259.c (modified) (view diffs)
• hw/irc/obio/obio.c (modified) (view diffs)
• loc/Makefile (moved) (moved from uspace/srv/devmap/Makefile ) (view diffs)
• loc/category.c (added)
• loc/category.h (added)
• loc/loc.c (added)
• loc/loc.h (added)
• vfs/vfs.h (modified) (view diffs)
• vfs/vfs_file.c (modified) (view diffs)
• vfs/vfs_lookup.c (modified) (view diffs)
• vfs/vfs_node.c (modified) (view diffs)
• vfs/vfs_ops.c (modified) (view diffs)
• vfs/vfs_register.c (modified) (view diffs)