Changeset efedee77 in mainline for uspace

Timestamp:

2010-11-02T22:38:46Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

af894a21

Parents:

aab02fb (diff), e06ef614 (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)
• Makefile.common (modified) (view diffs)
• app/init/init.c (modified) (view diffs)
• app/netecho/Makefile (modified) (view diffs)
• app/netecho/netecho.c (modified) (view diffs)
• app/netecho/print_error.c (modified) (view diffs)
• app/nettest1/Makefile (modified) (view diffs)
• app/nettest1/nettest.c (modified) (view diffs)
• app/nettest1/nettest.h (modified) (view diffs)
• app/nettest1/nettest1.c (modified) (view diffs)
• app/nettest2/Makefile (modified) (view diffs)
• app/nettest2/nettest2.c (modified) (view diffs)
• app/ping/Makefile (modified) (view diffs)
• app/ping/ping.c (modified) (view diffs)
• app/test_serial/Makefile (added)
• app/test_serial/test_serial.c (added)
• app/trace/syscalls.c (modified) (view diffs)
• drv/isa/Makefile (added)
• drv/isa/isa.c (added)
• drv/isa/isa.dev (added)
• drv/isa/isa.ma (added)
• drv/ns8250/Makefile (added)
• drv/ns8250/cyclic_buffer.h (added)
• drv/ns8250/ns8250.c (added)
• drv/ns8250/ns8250.ma (added)
• drv/pciintel/Makefile (added)
• drv/pciintel/pci.c (added)
• drv/pciintel/pci.h (added)
• drv/pciintel/pci_regs.h (added)
• drv/pciintel/pciintel.ma (added)
• drv/root/Makefile (added)
• drv/root/root.c (added)
• drv/root/root.ma (added)
• drv/rootia32/Makefile (added)
• drv/rootia32/rootia32.c (added)
• drv/rootia32/rootia32.ma (added)
• lib/c/Makefile (modified) (view diffs)
• lib/c/arch/abs32le/include/fibril.h (modified) (view diffs)
• lib/c/arch/abs32le/include/istate.h (modified) (view diffs)
• lib/c/arch/amd64/include/fibril.h (modified) (view diffs)
• lib/c/arch/amd64/include/istate.h (modified) (view diffs)
• lib/c/arch/amd64/src/entry.s (modified) (view diffs)
• lib/c/arch/amd64/src/fibril.S (modified) (view diffs)
• lib/c/arch/arm32/include/fibril.h (modified) (view diffs)
• lib/c/arch/arm32/include/istate.h (modified) (view diffs)
• lib/c/arch/ia32/include/fibril.h (modified) (view diffs)
• lib/c/arch/ia32/include/istate.h (modified) (view diffs)
• lib/c/arch/ia64/include/fibril.h (modified) (view diffs)
• lib/c/arch/ia64/include/istate.h (modified) (view diffs)
• lib/c/arch/mips32/include/fibril.h (modified) (view diffs)
• lib/c/arch/mips32/include/istate.h (modified) (view diffs)
• lib/c/arch/ppc32/include/fibril.h (modified) (view diffs)
• lib/c/arch/sparc64/include/fibril.h (modified) (view diffs)
• lib/c/arch/sparc64/include/istate.h (modified) (view diffs)
• lib/c/generic/adt/char_map.c (added)
• lib/c/generic/adt/dynamic_fifo.c (added)
• lib/c/generic/adt/measured_strings.c (added)
• lib/c/generic/async_rel.c (added)
• lib/c/generic/ddi.c (modified) (view diffs)
• lib/c/generic/device/char.c (added)
• lib/c/generic/device/hw_res.c (moved) (moved from uspace/lib/net/include/ip_local.h ) (view diffs)
• lib/c/generic/devman.c (added)
• lib/c/generic/fibril.c (modified) (view diffs)
• lib/c/generic/fibril_synch.c (modified) (view diffs)
• lib/c/generic/libc.c (modified) (view diffs)
• lib/c/generic/net/icmp_api.c (added)
• lib/c/generic/net/icmp_common.c (moved) (moved from uspace/lib/socket/generic/icmp_common.c ) (view diffs)
• lib/c/generic/net/inet.c (added)
• lib/c/generic/net/modules.c (added)
• lib/c/generic/net/packet.c (added)
• lib/c/generic/net/socket_client.c (added)
• lib/c/generic/net/socket_parse.c (moved) (moved from uspace/lib/socket/generic/socket_parse.c ) (view diffs)
• lib/c/include/adt/char_map.h (added)
• lib/c/include/adt/dynamic_fifo.h (added)
• lib/c/include/adt/generic_char_map.h (added)
• lib/c/include/adt/generic_field.h (added)
• lib/c/include/adt/int_map.h (added)
• lib/c/include/adt/measured_strings.h (added)
• lib/c/include/async_rel.h (added)
• lib/c/include/byteorder.h (modified) (view diffs)
• lib/c/include/ddi.h (modified) (view diffs)
• lib/c/include/device/char.h (added)
• lib/c/include/device/hw_res.h (added)
• lib/c/include/devman.h (added)
• lib/c/include/err.h (modified) (view diffs)
• lib/c/include/errno.h (modified) (view diffs)
• lib/c/include/fibril.h (modified) (view diffs)
• lib/c/include/fibril_synch.h (modified) (view diffs)
• lib/c/include/ipc/arp.h (moved) (moved from uspace/lib/net/include/arp_messages.h ) (view diffs)
• lib/c/include/ipc/dev_iface.h (added)
• lib/c/include/ipc/devman.h (added)
• lib/c/include/ipc/driver.h (added)
• lib/c/include/ipc/icmp.h (moved) (moved from uspace/lib/socket/include/icmp_messages.h ) (view diffs)
• lib/c/include/ipc/il.h (moved) (moved from uspace/lib/net/include/il_messages.h ) (view diffs)
• lib/c/include/ipc/ip.h (moved) (moved from uspace/lib/net/include/ip_messages.h ) (view diffs)
• lib/c/include/ipc/net.h (added)
• lib/c/include/ipc/net_net.h (moved) (moved from uspace/lib/net/include/net_net_messages.h ) (view diffs)
• lib/c/include/ipc/netif.h (moved) (moved from uspace/lib/net/include/netif_messages.h ) (view diffs)
• lib/c/include/ipc/nil.h (moved) (moved from uspace/lib/net/include/nil_messages.h ) (view diffs)
• lib/c/include/ipc/packet.h (moved) (moved from uspace/lib/socket/include/packet/packet_messages.h ) (view diffs)
• lib/c/include/ipc/serial.h (added)
• lib/c/include/ipc/serial_ctl.h (added)
• lib/c/include/ipc/services.h (modified) (view diffs)
• lib/c/include/ipc/socket.h (moved) (moved from uspace/lib/socket/include/socket_messages.h ) (view diffs)
• lib/c/include/ipc/tl.h (moved) (moved from uspace/lib/net/include/tl_messages.h ) (view diffs)
• lib/c/include/net/device.h (moved) (moved from uspace/lib/socket/include/net_device.h ) (view diffs)
• lib/c/include/net/icmp_api.h (added)
• lib/c/include/net/icmp_codes.h (moved) (moved from uspace/lib/socket/include/icmp_codes.h ) (view diffs)
• lib/c/include/net/icmp_common.h (moved) (moved from uspace/lib/socket/include/icmp_common.h ) (view diffs)
• lib/c/include/net/in.h (moved) (moved from uspace/lib/socket/include/in.h ) (view diffs)
• lib/c/include/net/in6.h (moved) (moved from uspace/lib/socket/include/in6.h ) (view diffs)
• lib/c/include/net/inet.h (added)
• lib/c/include/net/ip_codes.h (added)
• lib/c/include/net/ip_protocols.h (added)
• lib/c/include/net/modules.h (added)
• lib/c/include/net/packet.h (added)
• lib/c/include/net/packet_header.h (moved) (moved from uspace/lib/socket/include/packet/packet_header.h ) (view diffs)
• lib/c/include/net/socket.h (added)
• lib/c/include/net/socket_codes.h (added)
• lib/c/include/net/socket_parse.h (moved) (moved from uspace/lib/socket/include/socket_parse.h ) (view diffs)
• lib/c/include/sys/time.h (modified) (view diffs)
• lib/c/include/unistd.h (modified) (view diffs)
• lib/drv/Makefile (moved) (moved from uspace/lib/socket/Makefile ) (view diffs)
• lib/drv/generic/dev_iface.c (added)
• lib/drv/generic/driver.c (added)
• lib/drv/generic/remote_char.c (added)
• lib/drv/generic/remote_res.c (added)
• lib/drv/include/char.h (added)
• lib/drv/include/dev_iface.h (added)
• lib/drv/include/driver.h (added)
• lib/drv/include/remote_char.h (added)
• lib/drv/include/remote_res.h (added)
• lib/drv/include/resource.h (added)
• lib/net/Makefile (modified) (view diffs)
• lib/net/adt/module_map.c (modified) (view diffs)
• lib/net/generic/generic.c (added)
• lib/net/generic/net_checksum.c (modified) (view diffs)
• lib/net/generic/net_remote.c (modified) (view diffs)
• lib/net/generic/packet_client.c (added)
• lib/net/generic/packet_remote.c (modified) (view diffs)
• lib/net/generic/protocol_map.c (added)
• lib/net/il/arp_remote.c (modified) (view diffs)
• lib/net/il/il_interface.c (added)
• lib/net/il/ip_client.c (modified) (view diffs)
• 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/ethernet_lsap.h (modified) (view diffs)
• lib/net/include/ethernet_protocols.h (modified) (view diffs)
• lib/net/include/generic.h (moved) (moved from uspace/lib/socket/generic/icmp_api.c ) (view diffs)
• lib/net/include/icmp_client.h (modified) (view diffs)
• lib/net/include/icmp_header.h (modified) (view diffs)
• lib/net/include/icmp_interface.h (modified) (view diffs)
• lib/net/include/il_interface.h (modified) (view diffs)
• lib/net/include/il_local.h (modified) (view diffs)
• lib/net/include/ip_client.h (modified) (view diffs)
• lib/net/include/ip_header.h (modified) (view diffs)
• lib/net/include/ip_interface.h (modified) (view diffs)
• lib/net/include/ip_remote.h (modified) (view diffs)
• lib/net/include/net_checksum.h (modified) (view diffs)
• lib/net/include/net_hardware.h (modified) (view diffs)
• lib/net/include/net_interface.h (modified) (view diffs)
• lib/net/include/netif_interface.h (modified) (view diffs)
• lib/net/include/netif_local.h (modified) (view diffs)
• lib/net/include/netif_remote.h (modified) (view diffs)
• lib/net/include/nil_interface.h (modified) (view diffs)
• lib/net/include/nil_local.h (modified) (view diffs)
• lib/net/include/nil_remote.h (modified) (view diffs)
• lib/net/include/packet_client.h (added)
• lib/net/include/packet_remote.h (modified) (view diffs)
• lib/net/include/protocol_map.h (modified) (view diffs)
• lib/net/include/socket_core.h (added)
• lib/net/include/tl_common.h (modified) (view diffs)
• lib/net/include/tl_interface.h (modified) (view diffs)
• lib/net/include/tl_local.h (modified) (view diffs)
• lib/net/netif/netif_local.c (modified) (view diffs)
• lib/net/netif/netif_nil_bundle.c (deleted)
• lib/net/netif/netif_remote.c (modified) (view diffs)
• lib/net/nil/nil_remote.c (modified) (view diffs)
• lib/net/tl/icmp_client.c (modified) (view diffs)
• lib/net/tl/icmp_remote.c (modified) (view diffs)
• lib/net/tl/socket_core.c (added)
• lib/net/tl/tl_common.c (modified) (view diffs)
• lib/net/tl/tl_interface.c (added)
• lib/packet/Makefile (moved) (moved from uspace/srv/hw/bus/pci/Makefile ) (view diffs)
• lib/packet/generic/packet_server.c (added)
• lib/packet/include/net_byteorder.h (moved) (moved from uspace/lib/socket/include/net_byteorder.h ) (view diffs)
• lib/packet/include/net_err.h (moved) (moved from uspace/lib/socket/include/net_err.h ) (view diffs)
• lib/packet/include/netdb.h (moved) (moved from uspace/lib/socket/include/netdb.h ) (view diffs)
• lib/packet/include/packet_local.h (added)
• lib/packet/include/packet_server.h (added)
• lib/packet/include/socket_errno.h (moved) (moved from uspace/lib/socket/include/socket_errno.h ) (view diffs)
• lib/packet/include/tcp_codes.h (moved) (moved from uspace/lib/socket/include/tcp_codes.h ) (view diffs)
• lib/pci/COPYING (deleted)
• lib/pci/VERSION (deleted)
• lib/pci/access.c (deleted)
• lib/pci/generic.c (deleted)
• lib/pci/header.h (deleted)
• lib/pci/i386-ports.c (deleted)
• lib/pci/internal.h (deleted)
• lib/pci/names.c (deleted)
• lib/pci/pci.h (deleted)
• lib/pci/pci_ids.h (deleted)
• lib/pci/sysdep.h (deleted)
• lib/pci/types.h (deleted)
• lib/socket/adt/char_map.c (deleted)
• lib/socket/adt/dynamic_fifo.c (deleted)
• lib/socket/adt/measured_strings.c (deleted)
• lib/socket/generic/inet.c (deleted)
• lib/socket/generic/net_modules.c (deleted)
• lib/socket/generic/socket_client.c (deleted)
• lib/socket/generic/socket_core.c (deleted)
• lib/socket/include/adt/char_map.h (deleted)
• lib/socket/include/adt/dynamic_fifo.h (deleted)
• lib/socket/include/adt/generic_char_map.h (deleted)
• lib/socket/include/adt/generic_field.h (deleted)
• lib/socket/include/adt/int_map.h (deleted)
• lib/socket/include/adt/measured_strings.h (deleted)
• lib/socket/include/icmp_api.h (deleted)
• lib/socket/include/inet.h (deleted)
• lib/socket/include/ip_codes.h (deleted)
• lib/socket/include/ip_protocols.h (deleted)
• lib/socket/include/net_messages.h (deleted)
• lib/socket/include/net_modules.h (deleted)
• lib/socket/include/packet/packet.h (deleted)
• lib/socket/include/packet/packet_client.h (deleted)
• lib/socket/include/packet/packet_server.h (deleted)
• lib/socket/include/socket.h (deleted)
• lib/socket/include/socket_codes.h (deleted)
• lib/socket/include/socket_core.h (deleted)
• lib/socket/packet/packet.c (deleted)
• lib/socket/packet/packet_client.c (deleted)
• lib/socket/packet/packet_server.c (deleted)
• srv/devman/Makefile (moved) (moved from uspace/lib/pci/Makefile ) (view diffs)
• srv/devman/devman.c (added)
• srv/devman/devman.h (added)
• srv/devman/main.c (added)
• srv/devman/match.c (added)
• srv/devman/util.c (added)
• srv/devman/util.h (added)
• srv/fs/fat/fat_fat.c (modified) (view diffs)
• srv/fs/fat/fat_ops.c (modified) (view diffs)
• srv/hid/console/gcons.c (modified) (view diffs)
• srv/hid/fb/fb.c (modified) (view diffs)
• srv/hid/s3c24xx_ts/Makefile (added)
• srv/hid/s3c24xx_ts/s3c24xx_ts.c (added)
• srv/hid/s3c24xx_ts/s3c24xx_ts.h (added)
• srv/hw/bus/pci/pci.c (deleted)
• srv/hw/bus/pci/update-ids (deleted)
• 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/dp8390/Makefile (modified) (view diffs)
• srv/hw/netif/dp8390/dp8390.c (modified) (view diffs)
• srv/hw/netif/dp8390/dp8390.h (modified) (view diffs)
• srv/hw/netif/dp8390/dp8390_module.c (modified) (view diffs)
• 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 (modified) (view diffs)
• srv/net/il/arp/arp_module.c (modified) (view diffs)
• srv/net/il/arp/arp_module.h (modified) (view diffs)
• srv/net/il/arp/arp_oc.h (modified) (view diffs)
• 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 (modified) (view diffs)
• srv/net/il/ip/ip_module.h (modified) (view diffs)
• srv/net/net/Makefile (modified) (view diffs)
• srv/net/net/net.c (modified) (view diffs)
• srv/net/net/net.h (modified) (view diffs)
• srv/net/net/net_bundle.c (deleted)
• 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/netstart/Makefile (modified) (view diffs)
• srv/net/netstart/netstart.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 (modified) (view diffs)
• srv/net/nil/eth/eth_module.c (modified) (view diffs)
• 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 (modified) (view diffs)
• srv/net/tl/icmp/Makefile (modified) (view diffs)
• srv/net/tl/icmp/icmp.c (modified) (view diffs)
• srv/net/tl/icmp/icmp.h (modified) (view diffs)
• srv/net/tl/icmp/icmp_module.c (modified) (view diffs)
• srv/net/tl/tcp/Makefile (modified) (view diffs)
• srv/net/tl/tcp/tcp.c (modified) (view diffs)
• srv/net/tl/tcp/tcp.h (modified) (view diffs)
• srv/net/tl/tcp/tcp_module.c (modified) (view diffs)
• srv/net/tl/udp/Makefile (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)
• srv/vfs/vfs_register.c (modified) (view diffs)