Changeset 7a68fe5 in mainline

Timestamp:

2011-10-10T06:58:55Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

2ea6392

Parents:

e68c834 (diff), 80099c19 (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 with mainline

Files:

• boot/Makefile.common (modified) (view diffs)
• uspace/Makefile (modified) (view diffs)
• uspace/Makefile.common (modified) (view diffs)
• uspace/app/init/init.c (modified) (view diffs)
• uspace/doc/doxygroups.h (modified) (view diffs)
• uspace/drv/infrastructure/rootvirt/devices.def (modified) (view diffs)
• uspace/drv/nic/lo/Makefile (moved) (moved from uspace/lib/packet/Makefile ) (view diffs)
• uspace/drv/nic/lo/lo.c (added)
• uspace/drv/nic/lo/lo.ma (added)
• uspace/drv/nic/ne2k/Makefile (moved) (moved from uspace/srv/net/netif/lo/Makefile ) (view diffs)
• uspace/drv/nic/ne2k/dp8390.c (moved) (moved from uspace/srv/hw/netif/ne2000/dp8390.c ) (view diffs)
• uspace/drv/nic/ne2k/dp8390.h (moved) (moved from uspace/srv/hw/netif/ne2000/dp8390.h ) (view diffs)
• uspace/drv/nic/ne2k/ne2k.c (added)
• uspace/drv/nic/ne2k/ne2k.ma (added)
• uspace/lib/c/Makefile (modified) (view diffs)
• uspace/lib/c/generic/adt/hash_set.c (added)
• uspace/lib/c/generic/adt/hash_table.c (modified) (view diffs)
• uspace/lib/c/generic/device/hw_res_parsed.c (added)
• uspace/lib/c/generic/device/nic.c (added)
• uspace/lib/c/generic/net/packet.c (modified) (view diffs)
• uspace/lib/c/generic/ns.c (modified) (view diffs)
• uspace/lib/c/include/adt/hash_set.h (added)
• uspace/lib/c/include/adt/hash_table.h (modified) (view diffs)
• uspace/lib/c/include/device/hw_res_parsed.h (added)
• uspace/lib/c/include/device/nic.h (added)
• uspace/lib/c/include/ipc/dev_iface.h (modified) (view diffs)
• uspace/lib/c/include/ipc/devman.h (modified) (view diffs)
• uspace/lib/c/include/ipc/il.h (modified) (view diffs)
• uspace/lib/c/include/ipc/net.h (modified) (view diffs)
• uspace/lib/c/include/ipc/net_net.h (modified) (view diffs)
• uspace/lib/c/include/ipc/nil.h (modified) (view diffs)
• uspace/lib/c/include/ipc/services.h (modified) (view diffs)
• uspace/lib/c/include/net/device.h (modified) (view diffs)
• uspace/lib/c/include/net/eth_phys.h (added)
• uspace/lib/c/include/net/packet.h (modified) (view diffs)
• uspace/lib/c/include/net/packet_header.h (modified) (view diffs)
• uspace/lib/drv/Makefile (modified) (view diffs)
• uspace/lib/drv/generic/dev_iface.c (modified) (view diffs)
• uspace/lib/drv/generic/driver.c (modified) (view diffs)
• uspace/lib/drv/generic/remote_nic.c (added)
• uspace/lib/drv/include/ddf/driver.h (modified) (view diffs)
• uspace/lib/drv/include/ops/nic.h (added)
• uspace/lib/drv/include/remote_nic.h (moved) (moved from uspace/lib/net/include/netif_remote.h ) (view diffs)
• uspace/lib/net/Makefile (modified) (view diffs)
• uspace/lib/net/generic/generic.c (modified) (view diffs)
• uspace/lib/net/generic/net_checksum.c (modified) (view diffs)
• uspace/lib/net/generic/net_remote.c (modified) (view diffs)
• uspace/lib/net/generic/packet_remote.c (modified) (view diffs)
• uspace/lib/net/generic/protocol_map.c (modified) (view diffs)
• uspace/lib/net/il/arp_remote.c (modified) (view diffs)
• uspace/lib/net/il/il_remote.c (modified) (view diffs)
• uspace/lib/net/il/ip_remote.c (modified) (view diffs)
• uspace/lib/net/include/arp_interface.h (modified) (view diffs)
• uspace/lib/net/include/generic.h (modified) (view diffs)
• uspace/lib/net/include/il_remote.h (modified) (view diffs)
• uspace/lib/net/include/ip_interface.h (modified) (view diffs)
• uspace/lib/net/include/ip_remote.h (modified) (view diffs)
• uspace/lib/net/include/net_checksum.h (modified) (view diffs)
• uspace/lib/net/include/net_interface.h (modified) (view diffs)
• uspace/lib/net/include/netif_skel.h (deleted)
• uspace/lib/net/include/nil_remote.h (modified) (view diffs)
• uspace/lib/net/include/nil_skel.h (modified) (view diffs)
• uspace/lib/net/include/tl_common.h (modified) (view diffs)
• uspace/lib/net/include/tl_remote.h (modified) (view diffs)
• uspace/lib/net/netif/netif_remote.c (deleted)
• uspace/lib/net/netif/netif_skel.c (deleted)
• uspace/lib/net/nil/nil_remote.c (modified) (view diffs)
• uspace/lib/net/tl/icmp_client.c (modified) (view diffs)
• uspace/lib/net/tl/tl_common.c (modified) (view diffs)
• uspace/lib/net/tl/tl_remote.c (modified) (view diffs)
• uspace/lib/net/tl/tl_skel.c (modified) (view diffs)
• uspace/lib/nic/Makefile (moved) (moved from uspace/srv/hw/netif/ne2000/Makefile ) (view diffs)
• uspace/lib/nic/include/nic.h (added)
• uspace/lib/nic/include/nic_addr_db.h (added)
• uspace/lib/nic/include/nic_driver.h (added)
• uspace/lib/nic/include/nic_impl.h (added)
• uspace/lib/nic/include/nic_rx_control.h (added)
• uspace/lib/nic/include/nic_wol_virtues.h (added)
• uspace/lib/nic/src/nic_addr_db.c (added)
• uspace/lib/nic/src/nic_driver.c (added)
• uspace/lib/nic/src/nic_impl.c (added)
• uspace/lib/nic/src/nic_rx_control.c (added)
• uspace/lib/nic/src/nic_wol_virtues.c (added)
• uspace/srv/devman/devman.c (modified) (view diffs)
• uspace/srv/hw/netif/ne2000/ne2000.c (deleted)
• uspace/srv/loc/loc.c (modified) (view diffs)
• uspace/srv/net/cfg/lo.nic (moved) (moved from uspace/srv/net/cfg/lo ) (view diffs)
• uspace/srv/net/cfg/ne2k.nic (moved) (moved from uspace/srv/net/cfg/ne2k ) (view diffs)
• uspace/srv/net/documentation.txt (deleted)
• uspace/srv/net/il/arp/arp.c (modified) (view diffs)
• uspace/srv/net/il/arp/arp.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/net/Makefile (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_standalone.c (deleted)
• uspace/srv/net/net/packet_server.c (moved) (moved from uspace/lib/packet/generic/packet_server.c ) (view diffs)
• uspace/srv/net/net/packet_server.h (moved) (moved from uspace/lib/packet/include/packet_server.h ) (view diffs)
• uspace/srv/net/netif/lo/lo.c (deleted)
• uspace/srv/net/nil/eth/eth.c (modified) (view diffs)
• uspace/srv/net/nil/eth/eth.h (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/tl/icmp/icmp.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/udp/udp.c (modified) (view diffs)