Changeset 357b5f5 in mainline for uspace

Timestamp:

2011-01-23T20:09:13Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (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/edit/edit.c (modified) (view diffs)
• app/init/init.c (modified) (view diffs)
• app/kill/Makefile (added)
• app/kill/kill.c (moved) (moved from uspace/srv/net/il/arp/arp_module.h ) (view diffs)
• app/killall/Makefile (moved) (moved from uspace/srv/net/cfg/Makefile ) (view diffs)
• app/killall/killall.c (moved) (moved from uspace/srv/net/nil/eth/eth_module.c ) (view diffs)
• app/netecho/netecho.c (modified) (view diffs)
• app/netecho/print_error.c (modified) (view diffs)
• app/ping/ping.c (modified) (view diffs)
• app/sysinfo/Makefile (added)
• app/sysinfo/sysinfo.c (added)
• app/taskdump/taskdump.c (modified) (view diffs)
• app/tester/Makefile (modified) (view diffs)
• app/tester/hw/misc/virtchar1.c (added)
• app/tester/hw/misc/virtchar1.def (added)
• app/tester/hw/serial/serial1.c (modified) (view diffs)
• app/tester/ipc/connect.c (deleted)
• app/tester/ipc/connect.def (deleted)
• app/tester/ipc/register.def (deleted)
• app/tester/tester.c (modified) (view diffs)
• app/tester/tester.h (modified) (view diffs)
• app/tester/vfs/vfs1.c (modified) (view diffs)
• app/tetris/input.c (modified) (view diffs)
• app/tetris/screen.c (modified) (view diffs)
• app/tetris/screen.h (modified) (view diffs)
• app/top/input.c (modified) (view diffs)
• app/top/screen.c (modified) (view diffs)
• app/trace/ipcp.c (modified) (view diffs)
• app/trace/proto.c (modified) (view diffs)
• app/trace/syscalls.c (modified) (view diffs)
• app/trace/trace.c (modified) (view diffs)
• app/websrv/Makefile (added)
• app/websrv/websrv.c (added)
• doc/doxygroups.h (modified) (view diffs)
• drv/isa/isa.c (modified) (view diffs)
• drv/ns8250/ns8250.c (modified) (view diffs)
• drv/pciintel/pci.c (modified) (view diffs)
• drv/root/root.c (modified) (view diffs)
• drv/rootia32/rootia32.ma (deleted)
• drv/rootpc/Makefile (moved) (moved from uspace/drv/rootia32/Makefile ) (view diffs)
• drv/rootpc/rootpc.c (moved) (moved from uspace/drv/rootia32/rootia32.c ) (view diffs)
• drv/rootpc/rootpc.ma (added)
• drv/rootvirt/Makefile (added)
• drv/rootvirt/devices.def (added)
• drv/rootvirt/rootvirt.c (added)
• drv/rootvirt/rootvirt.ma (added)
• drv/test1/Makefile (added)
• drv/test1/char.c (moved) (moved from uspace/srv/net/il/arp/arp_oc.h ) (view diffs)
• drv/test1/test1.c (added)
• drv/test1/test1.h (moved) (moved from uspace/lib/c/include/async_rel.h ) (view diffs)
• drv/test1/test1.ma (added)
• drv/test2/Makefile (added)
• drv/test2/test2.c (added)
• drv/test2/test2.ma (added)
• lib/block/libblock.c (modified) (view diffs)
• lib/c/Makefile (modified) (view diffs)
• lib/c/arch/abs32le/include/inttypes.h (modified) (view diffs)
• lib/c/arch/amd64/include/inttypes.h (modified) (view diffs)
• lib/c/arch/arm32/include/inttypes.h (modified) (view diffs)
• lib/c/arch/ia32/include/inttypes.h (modified) (view diffs)
• lib/c/arch/ia64/include/inttypes.h (modified) (view diffs)
• lib/c/arch/mips32/include/inttypes.h (modified) (view diffs)
• lib/c/arch/ppc32/include/inttypes.h (modified) (view diffs)
• lib/c/arch/sparc64/include/inttypes.h (modified) (view diffs)
• lib/c/generic/adt/char_map.c (modified) (view diffs)
• lib/c/generic/adt/measured_strings.c (modified) (view diffs)
• lib/c/generic/async.c (modified) (view diffs)
• lib/c/generic/async_rel.c (deleted)
• lib/c/generic/async_sess.c (added)
• lib/c/generic/cap.c (modified) (view diffs)
• lib/c/generic/clipboard.c (modified) (view diffs)
• lib/c/generic/ddi.c (modified) (view diffs)
• lib/c/generic/device/char_dev.c (moved) (moved from uspace/lib/c/generic/device/char.c ) (view diffs)
• lib/c/generic/device/hw_res.c (modified) (view diffs)
• lib/c/generic/devman.c (modified) (view diffs)
• lib/c/generic/devmap.c (modified) (view diffs)
• lib/c/generic/event.c (modified) (view diffs)
• lib/c/generic/fibril.c (modified) (view diffs)
• lib/c/generic/fibril_synch.c (modified) (view diffs)
• lib/c/generic/io/console.c (modified) (view diffs)
• lib/c/generic/io/screenbuffer.c (modified) (view diffs)
• lib/c/generic/io/vprintf.c (modified) (view diffs)
• lib/c/generic/ipc.c (modified) (view diffs)
• lib/c/generic/libc.c (modified) (view diffs)
• lib/c/generic/loader.c (modified) (view diffs)
• lib/c/generic/mem.c (modified) (view diffs)
• lib/c/generic/net/icmp_api.c (modified) (view diffs)
• lib/c/generic/net/icmp_common.c (modified) (view diffs)
• lib/c/generic/net/inet.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/task.c (modified) (view diffs)
• lib/c/generic/udebug.c (modified) (view diffs)
• lib/c/generic/vfs/vfs.c (modified) (view diffs)
• lib/c/include/adt/char_map.h (modified) (view diffs)
• lib/c/include/adt/generic_char_map.h (modified) (view diffs)
• lib/c/include/adt/generic_field.h (modified) (view diffs)
• lib/c/include/adt/hash_table.h (modified) (view diffs)
• lib/c/include/adt/measured_strings.h (modified) (view diffs)
• lib/c/include/async.h (modified) (view diffs)
• lib/c/include/async_sess.h (moved) (moved from kernel/generic/include/syscall/sysarg64.h ) (view diffs)
• lib/c/include/ddi.h (modified) (view diffs)
• lib/c/include/device/char_dev.h (moved) (moved from uspace/lib/c/include/device/char.h ) (view diffs)
• lib/c/include/device/hw_res.h (modified) (view diffs)
• lib/c/include/devmap.h (modified) (view diffs)
• lib/c/include/errno.h (modified) (view diffs)
• lib/c/include/event.h (modified) (view diffs)
• lib/c/include/fibril.h (modified) (view diffs)
• lib/c/include/fibril_synch.h (modified) (view diffs)
• lib/c/include/io/console.h (modified) (view diffs)
• lib/c/include/io/screenbuffer.h (modified) (view diffs)
• lib/c/include/ipc/arp.h (modified) (view diffs)
• lib/c/include/ipc/dev_iface.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/icmp.h (modified) (view diffs)
• lib/c/include/ipc/il.h (modified) (view diffs)
• lib/c/include/ipc/ip.h (modified) (view diffs)
• lib/c/include/ipc/ipc.h (modified) (view diffs)
• lib/c/include/ipc/irc.h (moved) (moved from uspace/lib/c/include/ipc/bus.h ) (view diffs)
• lib/c/include/ipc/net.h (modified) (view diffs)
• lib/c/include/ipc/netif.h (modified) (view diffs)
• lib/c/include/ipc/nil.h (modified) (view diffs)
• lib/c/include/ipc/packet.h (modified) (view diffs)
• lib/c/include/ipc/services.h (modified) (view diffs)
• lib/c/include/ipc/socket.h (modified) (view diffs)
• lib/c/include/libc.h (modified) (view diffs)
• lib/c/include/mem.h (modified) (view diffs)
• lib/c/include/net/icmp_common.h (modified) (view diffs)
• lib/c/include/net/in.h (modified) (view diffs)
• lib/c/include/net/modules.h (modified) (view diffs)
• lib/c/include/net/socket.h (modified) (view diffs)
• lib/c/include/stdlib.h (modified) (view diffs)
• lib/c/include/task.h (modified) (view diffs)
• lib/clui/tinput.c (modified) (view diffs)
• lib/clui/tinput.h (modified) (view diffs)
• lib/drv/Makefile (modified) (view diffs)
• lib/drv/generic/dev_iface.c (modified) (view diffs)
• lib/drv/generic/driver.c (modified) (view diffs)
• lib/drv/generic/remote_char_dev.c (moved) (moved from uspace/lib/drv/generic/remote_char.c ) (view diffs)
• lib/drv/generic/remote_hw_res.c (moved) (moved from uspace/lib/drv/generic/remote_res.c ) (view diffs)
• lib/drv/include/dev_iface.h (modified) (view diffs)
• lib/drv/include/driver.h (modified) (view diffs)
• lib/drv/include/ops/char_dev.h (moved) (moved from uspace/lib/drv/include/char.h ) (view diffs)
• lib/drv/include/ops/hw_res.h (moved) (moved from uspace/lib/drv/include/resource.h ) (view diffs)
• lib/drv/include/remote_char_dev.h (moved) (moved from uspace/lib/drv/include/remote_res.h ) (view diffs)
• lib/drv/include/remote_hw_res.h (moved) (moved from uspace/lib/drv/include/remote_char.h ) (view diffs)
• lib/fs/libfs.c (modified) (view diffs)
• lib/fs/libfs.h (modified) (view diffs)
• lib/net/Makefile (modified) (view diffs)
• lib/net/adt/module_map.c (modified) (view diffs)
• lib/net/generic/generic.c (modified) (view diffs)
• lib/net/generic/net_remote.c (modified) (view diffs)
• lib/net/generic/packet_remote.c (modified) (view diffs)
• lib/net/generic/protocol_map.c (modified) (view diffs)
• lib/net/il/arp_remote.c (modified) (view diffs)
• lib/net/il/il_remote.c (moved) (moved from uspace/lib/net/il/il_interface.c ) (view diffs)
• lib/net/il/il_skel.c (added)
• lib/net/il/ip_remote.c (modified) (view diffs)
• lib/net/include/adt/module_map.h (modified) (view diffs)
• lib/net/include/arp_interface.h (modified) (view diffs)
• lib/net/include/generic.h (modified) (view diffs)
• lib/net/include/icmp_header.h (modified) (view diffs)
• lib/net/include/icmp_remote.h (moved) (moved from uspace/lib/net/include/icmp_interface.h ) (view diffs)
• lib/net/include/il_local.h (deleted)
• lib/net/include/il_remote.h (moved) (moved from uspace/lib/net/include/il_interface.h ) (view diffs)
• lib/net/include/il_skel.h (moved) (moved from uspace/srv/net/tl/tcp/tcp_module.c ) (view diffs)
• lib/net/include/net_interface.h (modified) (view diffs)
• lib/net/include/netif_interface.h (deleted)
• lib/net/include/netif_remote.h (modified) (view diffs)
• lib/net/include/netif_skel.h (moved) (moved from uspace/lib/net/include/netif_local.h ) (view diffs)
• lib/net/include/nil_interface.h (deleted)
• lib/net/include/nil_local.h (deleted)
• lib/net/include/nil_remote.h (modified) (view diffs)
• lib/net/include/nil_skel.h (added)
• lib/net/include/socket_core.h (modified) (view diffs)
• lib/net/include/tl_remote.h (moved) (moved from uspace/lib/net/include/tl_interface.h ) (view diffs)
• lib/net/include/tl_skel.h (moved) (moved from uspace/lib/net/include/tl_local.h ) (view diffs)
• lib/net/netif/netif_remote.c (modified) (view diffs)
• lib/net/netif/netif_skel.c (moved) (moved from uspace/lib/net/netif/netif_local.c ) (view diffs)
• lib/net/nil/nil_remote.c (modified) (view diffs)
• lib/net/nil/nil_skel.c (added)
• lib/net/tl/icmp_remote.c (modified) (view diffs)
• lib/net/tl/socket_core.c (modified) (view diffs)
• lib/net/tl/tl_common.c (modified) (view diffs)
• lib/net/tl/tl_remote.c (moved) (moved from uspace/lib/net/tl/tl_interface.c ) (view diffs)
• lib/net/tl/tl_skel.c (added)
• lib/packet/generic/packet_server.c (modified) (view diffs)
• lib/packet/include/packet_server.h (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/ata_bd/ata_hw.h (added)
• 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/clip/clip.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/devman/match.c (modified) (view diffs)
• srv/devmap/devmap.c (modified) (view diffs)
• srv/fs/devfs/devfs.c (modified) (view diffs)
• srv/fs/devfs/devfs_ops.c (modified) (view diffs)
• srv/fs/fat/fat.c (modified) (view diffs)
• srv/fs/fat/fat_ops.c (modified) (view diffs)
• srv/fs/tmpfs/tmpfs.c (modified) (view diffs)
• srv/hid/adb_mouse/adb_dev.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/char_mouse/chardev.c (modified) (view diffs)
• srv/hid/console/console.c (modified) (view diffs)
• srv/hid/console/gcons.c (modified) (view diffs)
• srv/hid/fb/ega.c (modified) (view diffs)
• srv/hid/fb/fb.c (modified) (view diffs)
• srv/hid/fb/main.c (modified) (view diffs)
• srv/hid/fb/serial_console.c (modified) (view diffs)
• srv/hid/fb/serial_console.h (modified) (view diffs)
• srv/hid/kbd/generic/kbd.c (modified) (view diffs)
• srv/hid/kbd/port/adb.c (modified) (view diffs)
• srv/hid/kbd/port/chardev.c (modified) (view diffs)
• srv/hid/kbd/port/ns16550.c (modified) (view diffs)
• srv/hid/kbd/port/z8530.c (modified) (view diffs)
• srv/hid/s3c24xx_ts/s3c24xx_ts.c (modified) (view diffs)
• srv/hw/bus/cuda_adb/cuda_adb.c (modified) (view diffs)
• srv/hw/char/i8042/i8042.c (modified) (view diffs)
• srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (view diffs)
• srv/hw/irc/apic/Makefile (added)
• srv/hw/irc/apic/apic.c (moved) (moved from uspace/app/tester/ipc/register.c ) (view diffs)
• srv/hw/irc/fhc/Makefile (moved) (moved from uspace/srv/hw/cir/fhc/Makefile ) (view diffs)
• srv/hw/irc/fhc/fhc.c (moved) (moved from uspace/srv/hw/cir/fhc/fhc.c ) (view diffs)
• srv/hw/irc/i8259/Makefile (added)
• srv/hw/irc/i8259/i8259.c (added)
• srv/hw/irc/obio/Makefile (moved) (moved from uspace/srv/hw/cir/obio/Makefile ) (view diffs)
• srv/hw/irc/obio/obio.c (moved) (moved from uspace/srv/hw/cir/obio/obio.c ) (view diffs)
• srv/hw/netif/DRIVER_REMOVAL (deleted)
• srv/hw/netif/dp8390/dp8390.c (deleted)
• srv/hw/netif/dp8390/dp8390.h (deleted)
• srv/hw/netif/dp8390/dp8390_module.c (deleted)
• srv/hw/netif/dp8390/ne2000.c (deleted)
• srv/hw/netif/ne2000/Makefile (moved) (moved from uspace/srv/hw/netif/dp8390/Makefile ) (view diffs)
• srv/hw/netif/ne2000/dp8390.c (added)
• srv/hw/netif/ne2000/dp8390.h (added)
• srv/hw/netif/ne2000/dp8390_drv.h (moved) (moved from uspace/srv/hw/netif/dp8390/dp8390_drv.h ) (view diffs)
• srv/hw/netif/ne2000/dp8390_port.h (moved) (moved from uspace/srv/hw/netif/dp8390/dp8390_port.h ) (view diffs)
• srv/hw/netif/ne2000/local.h (moved) (moved from uspace/srv/hw/netif/dp8390/local.h ) (view diffs)
• srv/hw/netif/ne2000/ne2000.c (added)
• srv/hw/netif/ne2000/ne2000.h (moved) (moved from uspace/srv/hw/netif/dp8390/ne2000.h ) (view diffs)
• srv/loader/main.c (modified) (view diffs)
• srv/net/cfg/lo (moved) (moved from uspace/srv/net/cfg/lo.netif_standalone ) (view diffs)
• srv/net/cfg/lo.netif_nil_bundle (deleted)
• srv/net/cfg/ne2k (moved) (moved from uspace/srv/net/cfg/ne2k.netif_standalone ) (view diffs)
• srv/net/cfg/ne2k.netif_nil_bundle (deleted)
• srv/net/il/arp/Makefile (modified) (view diffs)
• srv/net/il/arp/arp.c (modified) (view diffs)
• srv/net/il/arp/arp.h (modified) (view diffs)
• srv/net/il/arp/arp_header.h (deleted)
• srv/net/il/arp/arp_module.c (deleted)
• srv/net/il/ip/Makefile (modified) (view diffs)
• srv/net/il/ip/ip.c (modified) (view diffs)
• srv/net/il/ip/ip.h (modified) (view diffs)
• srv/net/il/ip/ip_module.c (deleted)
• srv/net/il/ip/ip_module.h (deleted)
• srv/net/net/net.c (modified) (view diffs)
• srv/net/net/net.h (modified) (view diffs)
• srv/net/net/net_standalone.c (modified) (view diffs)
• srv/net/netif/lo/Makefile (modified) (view diffs)
• srv/net/netif/lo/lo.c (modified) (view diffs)
• srv/net/nil/eth/Makefile (modified) (view diffs)
• srv/net/nil/eth/eth.c (modified) (view diffs)
• srv/net/nil/eth/eth.h (modified) (view diffs)
• srv/net/nil/eth/eth_header.h (deleted)
• srv/net/nil/nildummy/Makefile (modified) (view diffs)
• srv/net/nil/nildummy/nildummy.c (modified) (view diffs)
• srv/net/nil/nildummy/nildummy.h (modified) (view diffs)
• srv/net/nil/nildummy/nildummy_module.c (deleted)
• srv/net/tl/icmp/Makefile (modified) (view diffs)
• srv/net/tl/icmp/icmp.c (modified) (view diffs)
• srv/net/tl/icmp/icmp.h (deleted)
• srv/net/tl/icmp/icmp_module.c (deleted)
• srv/net/tl/icmp/icmp_module.h (deleted)
• srv/net/tl/tcp/Makefile (modified) (view diffs)
• srv/net/tl/tcp/tcp.c (modified) (view diffs)
• srv/net/tl/tcp/tcp_module.h (deleted)
• srv/net/tl/udp/Makefile (modified) (view diffs)
• srv/net/tl/udp/udp.c (modified) (view diffs)
• srv/net/tl/udp/udp_module.c (deleted)
• srv/net/tl/udp/udp_module.h (deleted)
• srv/ns/clonable.c (modified) (view diffs)
• srv/ns/clonable.h (modified) (view diffs)
• srv/ns/ns.c (modified) (view diffs)
• srv/ns/service.c (modified) (view diffs)
• srv/ns/service.h (modified) (view diffs)
• srv/ns/task.c (modified) (view diffs)
• srv/vfs/vfs.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)
• srv/vfs/vfs_register.c (modified) (view diffs)