Changeset 6a44ee4 in mainline for uspace/srv

Timestamp:

2011-07-20T15:26:21Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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/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)
• clip/clip.c (modified) (view diffs)
• devman/devman.c (modified) (view diffs)
• devman/devman.h (modified) (view diffs)
• devman/main.c (modified) (view diffs)
• devman/match.c (modified) (view diffs)
• devmap/devmap.c (modified) (view diffs)
• fs/devfs/devfs.c (modified) (view diffs)
• fs/devfs/devfs_ops.c (modified) (view diffs)
• fs/ext2fs/Makefile (added)
• fs/ext2fs/ext2fs.c (added)
• fs/ext2fs/ext2fs.h (added)
• fs/ext2fs/ext2fs_ops.c (added)
• fs/fat/fat.c (modified) (view diffs)
• fs/fat/fat_idx.c (modified) (view diffs)
• fs/fat/fat_ops.c (modified) (view diffs)
• fs/tmpfs/tmpfs.c (modified) (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/adb_mouse/adb_mouse.c (deleted)
• hid/char_mouse/char_mouse.c (deleted)
• hid/console/console.c (modified) (view diffs)
• hid/console/gcons.c (modified) (view diffs)
• hid/console/keybuffer.c (modified) (view diffs)
• hid/console/keybuffer.h (modified) (view diffs)
• hid/fb/Makefile (modified) (view diffs)
• hid/fb/ega.c (modified) (view diffs)
• hid/fb/fb.c (modified) (view diffs)
• hid/fb/main.c (modified) (view diffs)
• hid/fb/niagara.c (modified) (view diffs)
• hid/fb/niagara.h (modified) (view diffs)
• hid/fb/serial_console.c (modified) (view diffs)
• hid/fb/serial_console.h (modified) (view diffs)
• hid/fb/sgcn.c (deleted)
• hid/input/Makefile (added)
• hid/input/ctl/apple.c (moved) (moved from uspace/srv/hid/kbd/ctl/apple.c ) (view diffs)
• hid/input/ctl/gxe_fb.c (moved) (moved from uspace/srv/hid/kbd/ctl/gxe_fb.c ) (view diffs)
• hid/input/ctl/kbdev.c (added)
• hid/input/ctl/pc.c (moved) (moved from uspace/srv/hid/kbd/ctl/pc.c ) (view diffs)
• hid/input/ctl/stty.c (moved) (moved from uspace/srv/hid/kbd/ctl/stty.c ) (view diffs)
• hid/input/ctl/sun.c (moved) (moved from uspace/srv/hid/kbd/ctl/sun.c ) (view diffs)
• hid/input/generic/gsp.c (moved) (moved from uspace/srv/hid/kbd/genarch/gsp.c ) (view diffs)
• hid/input/generic/input.c (added)
• hid/input/generic/layout.c (added)
• hid/input/generic/stroke.c (moved) (moved from uspace/srv/hid/kbd/genarch/stroke.c ) (view diffs)
• hid/input/include/gsp.h (moved) (moved from uspace/srv/hid/kbd/include/gsp.h ) (view diffs)
• hid/input/include/input.h (moved) (moved from uspace/srv/hid/kbd/include/kbd.h ) (view diffs)
• hid/input/include/kbd.h (added)
• hid/input/include/kbd_ctl.h (moved) (moved from uspace/srv/hid/kbd/include/kbd_ctl.h ) (view diffs)
• hid/input/include/kbd_port.h (added)
• hid/input/include/layout.h (added)
• hid/input/include/mouse.h (added)
• hid/input/include/mouse_port.h (moved) (moved from uspace/srv/hid/char_mouse/include/mouse_port.h ) (view diffs)
• hid/input/include/mouse_proto.h (moved) (moved from uspace/srv/hid/char_mouse/include/mouse_proto.h ) (view diffs)
• hid/input/include/stroke.h (moved) (moved from uspace/srv/hid/kbd/include/stroke.h ) (view diffs)
• hid/input/include/sun.h (moved) (moved from uspace/srv/hid/kbd/include/sun.h ) (view diffs)
• hid/input/layout/cz.c (moved) (moved from uspace/srv/hid/kbd/layout/cz.c ) (view diffs)
• hid/input/layout/us_dvorak.c (moved) (moved from uspace/srv/hid/kbd/layout/us_dvorak.c ) (view diffs)
• hid/input/layout/us_qwerty.c (moved) (moved from uspace/srv/hid/kbd/layout/us_qwerty.c ) (view diffs)
• hid/input/port/adb.c (moved) (moved from uspace/srv/hid/kbd/port/adb.c ) (view diffs)
• hid/input/port/adb_mouse.c (moved) (moved from uspace/srv/hid/char_mouse/chardev.c ) (view diffs)
• hid/input/port/chardev.c (moved) (moved from uspace/srv/hid/kbd/port/chardev.c ) (view diffs)
• hid/input/port/chardev_mouse.c (added)
• hid/input/port/dummy.c (moved) (moved from uspace/srv/hid/kbd/port/dummy.c ) (view diffs)
• hid/input/port/gxemul.c (moved) (moved from uspace/srv/hid/kbd/port/gxemul.c ) (view diffs)
• hid/input/port/msim.c (moved) (moved from uspace/srv/hid/kbd/port/msim.c ) (view diffs)
• hid/input/port/niagara.c (moved) (moved from uspace/srv/hid/kbd/port/niagara.c ) (view diffs)
• hid/input/port/ns16550.c (moved) (moved from uspace/srv/hid/kbd/port/ns16550.c ) (view diffs)
• hid/input/port/pl050.c (moved) (moved from uspace/srv/hid/kbd/port/pl050.c ) (view diffs)
• hid/input/port/sgcn.c (moved) (moved from uspace/srv/hid/kbd/port/sgcn.c ) (view diffs)
• hid/input/port/ski.c (moved) (moved from uspace/srv/hid/kbd/port/ski.c ) (view diffs)
• hid/input/port/sun.c (moved) (moved from uspace/srv/hid/kbd/port/sun.c ) (view diffs)
• hid/input/port/z8530.c (moved) (moved from uspace/srv/hid/kbd/port/z8530.c ) (view diffs)
• hid/input/proto/adb.c (added)
• hid/input/proto/mousedev.c (added)
• hid/input/proto/ps2.c (moved) (moved from uspace/srv/hid/char_mouse/proto/ps2.c ) (view diffs)
• hid/kbd/Makefile (deleted)
• hid/kbd/generic/kbd.c (deleted)
• hid/s3c24xx_ts/s3c24xx_ts.c (modified) (view diffs)
• hw/bus/cuda_adb/cuda_adb.c (modified) (view diffs)
• hw/char/i8042/i8042.c (modified) (view diffs)
• hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (view diffs)
• hw/irc/apic/apic.c (modified) (view diffs)
• hw/irc/fhc/fhc.c (deleted)
• hw/irc/i8259/i8259.c (modified) (view diffs)
• hw/irc/obio/obio.c (modified) (view diffs)
• hw/netif/ne2000/dp8390.c (modified) (view diffs)
• hw/netif/ne2000/dp8390.h (modified) (view diffs)
• hw/netif/ne2000/ne2000.c (modified) (view diffs)
• loader/main.c (modified) (view diffs)
• net/il/arp/arp.c (modified) (view diffs)
• net/il/arp/arp.h (modified) (view diffs)
• net/il/ip/ip.c (modified) (view diffs)
• net/il/ip/ip.h (modified) (view diffs)
• net/net/net.c (modified) (view diffs)
• net/netif/lo/lo.c (modified) (view diffs)
• net/nil/eth/eth.c (modified) (view diffs)
• net/nil/eth/eth.h (modified) (view diffs)
• net/nil/nildummy/nildummy.c (modified) (view diffs)
• net/nil/nildummy/nildummy.h (modified) (view diffs)
• net/tl/icmp/icmp.c (modified) (view diffs)
• net/tl/tcp/tcp.c (modified) (view diffs)
• net/tl/tcp/tcp.h (modified) (view diffs)
• net/tl/udp/udp.c (modified) (view diffs)
• net/tl/udp/udp.h (modified) (view diffs)
• ns/clonable.c (modified) (view diffs)
• ns/service.c (modified) (view diffs)
• ns/task.c (modified) (view diffs)
• taskmon/taskmon.c (modified) (view diffs)
• vfs/vfs.c (modified) (view diffs)
• 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)