Context Navigation

← Previous Changeset
Next Changeset →

Changeset 858fc90 in mainline

Timestamp:

2010-03-15T19:35:25Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial

Children:

6092b56e

Parents:

92307f1 (diff), 4684368 (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 from bzr://bzr.helenos.org/head.

Files:

: 2 added
: 149 edited

boot/Makefile.common (modified) (view diffs)
kernel/arch/arm32/src/dummy.S (modified) (view diffs)
uspace/lib/libc/generic/io/io.c (modified) (view diffs)
uspace/lib/libc/include/stdio.h (modified) (view diffs)
uspace/srv/net/Doxyfile (modified) (view diffs)
uspace/srv/net/Makefile (modified) (view diffs)
uspace/srv/net/app/echo/echo.c (modified) (view diffs)
uspace/srv/net/app/nettest.c (added)
uspace/srv/net/app/nettest.h (added)
uspace/srv/net/app/nettest1/Makefile (modified) (view diffs)
uspace/srv/net/app/nettest1/nettest1.c (modified) (view diffs)
uspace/srv/net/app/nettest2/Makefile (modified) (view diffs)
uspace/srv/net/app/nettest2/nettest2.c (modified) (view diffs)
uspace/srv/net/app/parse.c (modified) (view diffs)
uspace/srv/net/app/parse.h (modified) (view diffs)
uspace/srv/net/app/ping/ping.c (modified) (view diffs)
uspace/srv/net/app/print_error.c (modified) (view diffs)
uspace/srv/net/app/print_error.h (modified) (view diffs)
uspace/srv/net/cfg/modular/general (modified) (view diffs)
uspace/srv/net/cfg/module/general (modified) (view diffs)
uspace/srv/net/checksum.c (modified) (view diffs)
uspace/srv/net/configuration.h (modified) (view diffs)
uspace/srv/net/err.h (modified) (view diffs)
uspace/srv/net/il/arp/arp.c (modified) (view diffs)
uspace/srv/net/il/arp/arp.h (modified) (view diffs)
uspace/srv/net/il/arp/arp_header.h (modified) (view diffs)
uspace/srv/net/il/arp/arp_messages.h (modified) (view diffs)
uspace/srv/net/il/arp/arp_module.c (modified) (view diffs)
uspace/srv/net/il/arp/arp_module.h (modified) (view diffs)
uspace/srv/net/il/arp/arp_oc.h (modified) (view diffs)
uspace/srv/net/il/arp/arp_remote.c (modified) (view diffs)
uspace/srv/net/il/il_messages.h (modified) (view diffs)
uspace/srv/net/il/ip/ip.c (modified) (view diffs)
uspace/srv/net/il/ip/ip.h (modified) (view diffs)
uspace/srv/net/il/ip/ip_client.c (modified) (view diffs)
uspace/srv/net/il/ip/ip_header.h (modified) (view diffs)
uspace/srv/net/il/ip/ip_messages.h (modified) (view diffs)
uspace/srv/net/il/ip/ip_module.c (modified) (view diffs)
uspace/srv/net/il/ip/ip_module.h (modified) (view diffs)
uspace/srv/net/il/ip/ip_remote.c (modified) (view diffs)
uspace/srv/net/include/arp_interface.h (modified) (view diffs)
uspace/srv/net/include/byteorder.h (modified) (view diffs)
uspace/srv/net/include/checksum.h (modified) (view diffs)
uspace/srv/net/include/device.h (modified) (view diffs)
uspace/srv/net/include/ethernet_lsap.h (modified) (view diffs)
uspace/srv/net/include/ethernet_protocols.h (modified) (view diffs)
uspace/srv/net/include/icmp_api.h (modified) (view diffs)
uspace/srv/net/include/icmp_client.h (modified) (view diffs)
uspace/srv/net/include/icmp_common.h (modified) (view diffs)
uspace/srv/net/include/icmp_interface.h (modified) (view diffs)
uspace/srv/net/include/il_interface.h (modified) (view diffs)
uspace/srv/net/include/in.h (modified) (view diffs)
uspace/srv/net/include/in6.h (modified) (view diffs)
uspace/srv/net/include/inet.h (modified) (view diffs)
uspace/srv/net/include/ip_client.h (modified) (view diffs)
uspace/srv/net/include/ip_codes.h (modified) (view diffs)
uspace/srv/net/include/ip_interface.h (modified) (view diffs)
uspace/srv/net/include/ip_protocols.h (modified) (view diffs)
uspace/srv/net/include/net_interface.h (modified) (view diffs)
uspace/srv/net/include/netdb.h (modified) (view diffs)
uspace/srv/net/include/netif_interface.h (modified) (view diffs)
uspace/srv/net/include/nil_interface.h (modified) (view diffs)
uspace/srv/net/include/protocol_map.h (modified) (view diffs)
uspace/srv/net/include/socket.h (modified) (view diffs)
uspace/srv/net/include/socket_codes.h (modified) (view diffs)
uspace/srv/net/include/tl_interface.h (modified) (view diffs)
uspace/srv/net/inet.c (modified) (view diffs)
uspace/srv/net/messages.h (modified) (view diffs)
uspace/srv/net/module.c (modified) (view diffs)
uspace/srv/net/modules.c (modified) (view diffs)
uspace/srv/net/modules.h (modified) (view diffs)
uspace/srv/net/net/net.c (modified) (view diffs)
uspace/srv/net/net/net.h (modified) (view diffs)
uspace/srv/net/net/net_bundle.c (modified) (view diffs)
uspace/srv/net/net/net_remote.c (modified) (view diffs)
uspace/srv/net/net/net_standalone.c (modified) (view diffs)
uspace/srv/net/net/start/netstart.c (modified) (view diffs)
uspace/srv/net/netif/dp8390/dp8390.c (modified) (view diffs)
uspace/srv/net/netif/dp8390/dp8390.h (modified) (view diffs)
uspace/srv/net/netif/dp8390/dp8390_drv.h (modified) (view diffs)
uspace/srv/net/netif/dp8390/dp8390_module.c (modified) (view diffs)
uspace/srv/net/netif/dp8390/dp8390_port.h (modified) (view diffs)
uspace/srv/net/netif/dp8390/local.h (modified) (view diffs)
uspace/srv/net/netif/dp8390/ne2000.c (modified) (view diffs)
uspace/srv/net/netif/lo/lo.c (modified) (view diffs)
uspace/srv/net/netif/netif.c (modified) (view diffs)
uspace/srv/net/netif/netif.h (modified) (view diffs)
uspace/srv/net/netif/netif_messages.h (modified) (view diffs)
uspace/srv/net/netif/netif_module.h (modified) (view diffs)
uspace/srv/net/netif/netif_nil_bundle.c (modified) (view diffs)
uspace/srv/net/netif/netif_remote.c (modified) (view diffs)
uspace/srv/net/netif/netif_standalone.c (modified) (view diffs)
uspace/srv/net/nil/eth/eth.c (modified) (view diffs)
uspace/srv/net/nil/eth/eth.h (modified) (view diffs)
uspace/srv/net/nil/eth/eth_header.h (modified) (view diffs)
uspace/srv/net/nil/eth/eth_module.c (modified) (view diffs)
uspace/srv/net/nil/nil_messages.h (modified) (view diffs)
uspace/srv/net/nil/nil_module.h (modified) (view diffs)
uspace/srv/net/nil/nil_remote.c (modified) (view diffs)
uspace/srv/net/nil/nildummy/nildummy.c (modified) (view diffs)
uspace/srv/net/nil/nildummy/nildummy.h (modified) (view diffs)
uspace/srv/net/nil/nildummy/nildummy_module.c (modified) (view diffs)
uspace/srv/net/self_test.c (modified) (view diffs)
uspace/srv/net/self_test.h (modified) (view diffs)
uspace/srv/net/socket/socket_client.c (modified) (view diffs)
uspace/srv/net/socket/socket_core.c (modified) (view diffs)
uspace/srv/net/socket/socket_core.h (modified) (view diffs)
uspace/srv/net/socket/socket_messages.h (modified) (view diffs)
uspace/srv/net/structures/char_map.c (modified) (view diffs)
uspace/srv/net/structures/char_map.h (modified) (view diffs)
uspace/srv/net/structures/dynamic_fifo.c (modified) (view diffs)
uspace/srv/net/structures/dynamic_fifo.h (modified) (view diffs)
uspace/srv/net/structures/generic_char_map.h (modified) (view diffs)
uspace/srv/net/structures/generic_field.h (modified) (view diffs)
uspace/srv/net/structures/int_map.h (modified) (view diffs)
uspace/srv/net/structures/measured_strings.c (modified) (view diffs)
uspace/srv/net/structures/measured_strings.h (modified) (view diffs)
uspace/srv/net/structures/module_map.c (modified) (view diffs)
uspace/srv/net/structures/module_map.h (modified) (view diffs)
uspace/srv/net/structures/packet/packet.c (modified) (view diffs)
uspace/srv/net/structures/packet/packet.h (modified) (view diffs)
uspace/srv/net/structures/packet/packet_client.c (modified) (view diffs)
uspace/srv/net/structures/packet/packet_client.h (modified) (view diffs)
uspace/srv/net/structures/packet/packet_header.h (modified) (view diffs)
uspace/srv/net/structures/packet/packet_messages.h (modified) (view diffs)
uspace/srv/net/structures/packet/packet_remote.c (modified) (view diffs)
uspace/srv/net/structures/packet/packet_server.c (modified) (view diffs)
uspace/srv/net/structures/packet/packet_server.h (modified) (view diffs)
uspace/srv/net/tl/icmp/icmp.c (modified) (view diffs)
uspace/srv/net/tl/icmp/icmp.h (modified) (view diffs)
uspace/srv/net/tl/icmp/icmp_api.c (modified) (view diffs)
uspace/srv/net/tl/icmp/icmp_client.c (modified) (view diffs)
uspace/srv/net/tl/icmp/icmp_common.c (modified) (view diffs)
uspace/srv/net/tl/icmp/icmp_header.h (modified) (view diffs)
uspace/srv/net/tl/icmp/icmp_messages.h (modified) (view diffs)
uspace/srv/net/tl/icmp/icmp_module.c (modified) (view diffs)
uspace/srv/net/tl/icmp/icmp_module.h (modified) (view diffs)
uspace/srv/net/tl/icmp/icmp_remote.c (modified) (view diffs)
uspace/srv/net/tl/tcp/tcp.c (modified) (view diffs)
uspace/srv/net/tl/tcp/tcp.h (modified) (view diffs)
uspace/srv/net/tl/tcp/tcp_header.h (modified) (view diffs)
uspace/srv/net/tl/tcp/tcp_module.c (modified) (view diffs)
uspace/srv/net/tl/tcp/tcp_module.h (modified) (view diffs)
uspace/srv/net/tl/tl_common.c (modified) (view diffs)
uspace/srv/net/tl/tl_common.h (modified) (view diffs)
uspace/srv/net/tl/udp/udp.c (modified) (view diffs)
uspace/srv/net/tl/udp/udp.h (modified) (view diffs)
uspace/srv/net/tl/udp/udp_header.h (modified) (view diffs)
uspace/srv/net/tl/udp/udp_module.c (modified) (view diffs)
uspace/srv/net/tl/udp/udp_module.h (modified) (view diffs)
version (modified) (view diffs)

Changeset view not shown, since the total size (2.1 MB) exceeds 976.6 KB

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 858fc90 in mainline

Download in other formats: