Changeset 903bac0a in mainline for uspace

Timestamp:

2011-08-19T09:00:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e2ab36f1

Parents:

d894fbd (diff), 42a619b (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

Files:

• Makefile (modified) (view diffs)
• app/bdsh/cmds/modules/bdd/bdd.c (modified) (view diffs)
• app/blkdump/blkdump.c (modified) (view diffs)
• app/bnchmark/bnchmark.c (modified) (view diffs)
• app/ext2info/ext2info.c (modified) (view diffs)
• app/init/init.c (modified) (view diffs)
• app/locinfo/Makefile (added)
• app/locinfo/locinfo.c (moved) (moved from uspace/app/tester/devs/devman1.c ) (view diffs)
• app/lsusb/main.c (modified) (view diffs)
• app/mkbd/main.c (modified) (view diffs)
• app/mkfat/mkfat.c (modified) (view diffs)
• app/tester/Makefile (modified) (view diffs)
• app/tester/devs/devman1.def (deleted)
• app/tester/devs/devman2.c (deleted)
• app/tester/devs/devman2.def (deleted)
• app/tester/hw/misc/virtchar1.c (modified) (view diffs)
• app/tester/tester.c (modified) (view diffs)
• app/tester/vfs/vfs1.c (modified) (view diffs)
• app/testread/testread.c (modified) (view diffs)
• app/usbinfo/main.c (modified) (view diffs)
• doc/doxygroups.h (modified) (view diffs)
• drv/bus/usb/ehci/main.c (modified) (view diffs)
• drv/bus/usb/ohci/ohci.c (modified) (view diffs)
• drv/bus/usb/uhci/uhci.c (modified) (view diffs)
• drv/bus/usb/usbhid/generic/hiddev.c (modified) (view diffs)
• drv/bus/usb/usbhid/kbd/kbddev.c (modified) (view diffs)
• drv/bus/usb/usbhid/mouse/mousedev.c (modified) (view diffs)
• drv/bus/usb/usbhid/mouse/mousedev.h (modified) (view diffs)
• drv/bus/usb/usbhid/multimedia/multimedia.c (modified) (view diffs)
• drv/bus/usb/usbhub/usbhub.c (modified) (view diffs)
• drv/bus/usb/usbmouse/init.c (modified) (view diffs)
• drv/bus/usb/vhc/main.c (modified) (view diffs)
• drv/char/ns8250/ns8250.c (modified) (view diffs)
• drv/test/test1/test1.c (modified) (view diffs)
• drv/test/test2/test2.c (modified) (view diffs)
• drv/test/test3/test3.c (modified) (view diffs)
• lib/block/libblock.c (modified) (view diffs)
• lib/block/libblock.h (modified) (view diffs)
• lib/c/Makefile (modified) (view diffs)
• lib/c/generic/devman.c (modified) (view diffs)
• lib/c/generic/devmap.c (deleted)
• lib/c/generic/io/io.c (modified) (view diffs)
• lib/c/generic/loc.c (added)
• lib/c/generic/vfs/vfs.c (modified) (view diffs)
• lib/c/include/devman.h (modified) (view diffs)
• lib/c/include/ipc/devman.h (modified) (view diffs)
• lib/c/include/ipc/loc.h (moved) (moved from uspace/lib/c/include/ipc/devmap.h ) (view diffs)
• lib/c/include/ipc/services.h (modified) (view diffs)
• lib/c/include/loc.h (moved) (moved from uspace/lib/c/include/devmap.h ) (view diffs)
• lib/c/include/sys/stat.h (modified) (view diffs)
• lib/c/include/vfs/vfs.h (modified) (view diffs)
• lib/drv/generic/driver.c (modified) (view diffs)
• lib/drv/include/ddf/driver.h (modified) (view diffs)
• lib/ext2/libext2_filesystem.c (modified) (view diffs)
• lib/ext2/libext2_filesystem.h (modified) (view diffs)
• lib/ext2/libext2_superblock.c (modified) (view diffs)
• lib/ext2/libext2_superblock.h (modified) (view diffs)
• lib/fs/libfs.c (modified) (view diffs)
• lib/fs/libfs.h (modified) (view diffs)
• lib/usb/include/usb/hc.h (modified) (view diffs)
• lib/usb/include/usb/usb.h (modified) (view diffs)
• lib/usb/src/hc.c (modified) (view diffs)
• lib/usb/src/resolve.c (modified) (view diffs)
• srv/bd/ata_bd/ata_bd.c (modified) (view diffs)
• srv/bd/ata_bd/ata_bd.h (modified) (view diffs)
• srv/bd/file_bd/file_bd.c (modified) (view diffs)
• srv/bd/gxe_bd/gxe_bd.c (modified) (view diffs)
• srv/bd/part/guid_part/guid_part.c (modified) (view diffs)
• srv/bd/part/mbr_part/mbr_part.c (modified) (view diffs)
• srv/bd/rd/rd.c (modified) (view diffs)
• srv/devman/devman.c (modified) (view diffs)
• srv/devman/devman.h (modified) (view diffs)
• srv/devman/main.c (modified) (view diffs)
• srv/devmap/devmap.c (deleted)
• srv/fs/ext2fs/ext2fs_ops.c (modified) (view diffs)
• srv/fs/fat/fat.h (modified) (view diffs)
• srv/fs/fat/fat_fat.c (modified) (view diffs)
• srv/fs/fat/fat_fat.h (modified) (view diffs)
• srv/fs/fat/fat_idx.c (modified) (view diffs)
• srv/fs/fat/fat_ops.c (modified) (view diffs)
• srv/fs/locfs/Makefile (moved) (moved from uspace/srv/fs/devfs/Makefile ) (view diffs)
• srv/fs/locfs/locfs.c (moved) (moved from uspace/srv/fs/devfs/devfs.c ) (view diffs)
• srv/fs/locfs/locfs.h (moved) (moved from uspace/srv/fs/devfs/devfs.h ) (view diffs)
• srv/fs/locfs/locfs_ops.c (moved) (moved from uspace/srv/fs/devfs/devfs_ops.c ) (view diffs)
• srv/fs/locfs/locfs_ops.h (moved) (moved from uspace/srv/fs/devfs/devfs_ops.h ) (view diffs)
• srv/fs/tmpfs/tmpfs.h (modified) (view diffs)
• srv/fs/tmpfs/tmpfs_dump.c (modified) (view diffs)
• srv/fs/tmpfs/tmpfs_ops.c (modified) (view diffs)
• srv/hid/console/console.c (modified) (view diffs)
• srv/hid/input/ctl/kbdev.c (modified) (view diffs)
• srv/hid/input/generic/input.c (modified) (view diffs)
• srv/hid/input/include/kbd.h (modified) (view diffs)
• srv/hid/input/include/mouse.h (modified) (view diffs)
• srv/hid/input/port/adb.c (modified) (view diffs)
• srv/hid/input/port/adb_mouse.c (modified) (view diffs)
• srv/hid/input/port/chardev.c (modified) (view diffs)
• srv/hid/input/port/chardev_mouse.c (modified) (view diffs)
• srv/hid/input/proto/mousedev.c (modified) (view diffs)
• srv/hid/s3c24xx_ts/s3c24xx_ts.c (modified) (view diffs)
• srv/hid/s3c24xx_ts/s3c24xx_ts.h (modified) (view diffs)
• srv/hw/bus/cuda_adb/cuda_adb.c (modified) (view diffs)
• srv/hw/bus/cuda_adb/cuda_adb.h (modified) (view diffs)
• srv/hw/char/i8042/i8042.c (modified) (view diffs)
• srv/hw/char/i8042/i8042.h (modified) (view diffs)
• srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (view diffs)
• srv/hw/char/s3c24xx_uart/s3c24xx_uart.h (modified) (view diffs)
• srv/hw/irc/i8259/i8259.c (modified) (view diffs)
• srv/hw/irc/obio/obio.c (modified) (view diffs)
• srv/loc/Makefile (moved) (moved from uspace/srv/devmap/Makefile ) (view diffs)
• srv/loc/category.c (added)
• srv/loc/category.h (added)
• srv/loc/loc.c (added)
• srv/loc/loc.h (added)
• srv/vfs/vfs.h (modified) (view diffs)
• srv/vfs/vfs_file.c (modified) (view diffs)
• srv/vfs/vfs_lookup.c (modified) (view diffs)
• srv/vfs/vfs_node.c (modified) (view diffs)
• srv/vfs/vfs_ops.c (modified) (view diffs)
• srv/vfs/vfs_register.c (modified) (view diffs)