Changeset cb569e6 in mainline for uspace

Timestamp:

2010-11-18T21:58:27Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4e5c7ba

Parents:

69e0d6d (diff), 45f04f8 (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:

• app/bdsh/cmds/modules/bdd/bdd.c (modified) (view diffs)
• app/bdsh/cmds/modules/help/help.c (modified) (view diffs)
• app/bdsh/scli.c (modified) (view diffs)
• app/getterm/Makefile (modified) (view diffs)
• app/getterm/getterm.c (modified) (view diffs)
• app/getterm/version.c (modified) (view diffs)
• app/getterm/welcome.c (added)
• app/getterm/welcome.h (added)
• app/init/init.c (modified) (view diffs)
• app/mkfat/mkfat.c (modified) (view diffs)
• app/netecho/netecho.c (modified) (view diffs)
• app/netstart/Makefile (modified) (view diffs)
• app/nettest1/nettest1.c (modified) (view diffs)
• app/nettest2/nettest2.c (modified) (view diffs)
• app/test_serial/test_serial.c (modified) (view diffs)
• lib/block/libblock.c (modified) (view diffs)
• lib/block/libblock.h (modified) (view diffs)
• lib/c/generic/adt/measured_strings.c (modified) (view diffs)
• lib/c/generic/devman.c (modified) (view diffs)
• lib/c/generic/devmap.c (modified) (view diffs)
• lib/c/generic/net/modules.c (modified) (view diffs)
• lib/c/generic/net/packet.c (modified) (view diffs)
• lib/c/generic/net/socket_client.c (modified) (view diffs)
• lib/c/generic/vfs/vfs.c (modified) (view diffs)
• lib/c/include/adt/generic_char_map.h (modified) (view diffs)
• lib/c/include/devman.h (modified) (view diffs)
• lib/c/include/devmap.h (modified) (view diffs)
• lib/c/include/err.h (modified) (view diffs)
• lib/c/include/ipc/devman.h (modified) (view diffs)
• lib/c/include/ipc/devmap.h (modified) (view diffs)
• lib/c/include/ipc/serial.h (deleted)
• lib/c/include/stdio.h (modified) (view diffs)
• lib/c/include/sys/stat.h (modified) (view diffs)
• lib/c/include/unistd.h (modified) (view diffs)
• lib/c/include/vfs/vfs.h (modified) (view diffs)
• lib/drv/generic/driver.c (modified) (view diffs)
• lib/drv/include/driver.h (modified) (view diffs)
• lib/fs/libfs.c (modified) (view diffs)
• lib/fs/libfs.h (modified) (view diffs)
• lib/net/adt/module_map.c (modified) (view diffs)
• lib/net/generic/packet_remote.c (modified) (view diffs)
• lib/net/netif/netif_local.c (modified) (view diffs)
• lib/net/tl/socket_core.c (modified) (view diffs)
• lib/net/tl/tl_common.c (modified) (view diffs)
• lib/packet/generic/packet_server.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 (modified) (view diffs)
• srv/fs/devfs/devfs_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/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/adb_mouse/adb_mouse.c (modified) (view diffs)
• srv/hid/char_mouse/char_mouse.c (modified) (view diffs)
• srv/hid/console/console.c (modified) (view diffs)
• srv/hid/kbd/generic/kbd.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/netif/DRIVER_REMOVAL (added)
• srv/hw/netif/dp8390/dp8390.h (modified) (view diffs)
• srv/hw/netif/dp8390/dp8390_module.c (modified) (view diffs)
• srv/net/il/arp/arp.c (modified) (view diffs)
• srv/net/il/arp/arp_module.c (modified) (view diffs)
• srv/net/net/net.c (modified) (view diffs)
• srv/net/net/net_standalone.c (modified) (view diffs)
• srv/net/netif/lo/lo.c (modified) (view diffs)
• srv/net/nil/eth/eth.c (modified) (view diffs)
• srv/net/nil/eth/eth_module.c (modified) (view diffs)
• srv/net/nil/nildummy/nildummy.c (modified) (view diffs)
• srv/net/nil/nildummy/nildummy_module.c (modified) (view diffs)
• srv/net/tl/icmp/icmp.c (modified) (view diffs)
• srv/net/tl/icmp/icmp_module.c (modified) (view diffs)
• srv/net/tl/tcp/tcp.c (modified) (view diffs)
• srv/net/tl/tcp/tcp_module.c (modified) (view diffs)
• srv/net/tl/udp/udp.c (modified) (view diffs)
• srv/net/tl/udp/udp_module.c (modified) (view diffs)
• srv/vfs/vfs.h (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)