Changeset a676574 in mainline for uspace/srv

Timestamp:

2011-01-09T12:18:00Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

54de5ebd

Parents:

a3eeef45 (diff), 9d12059 (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/srv

Files:

• bd/ata_bd/ata_bd.c (modified) (view diffs)
• bd/ata_bd/ata_bd.h (modified) (view diffs)
• bd/ata_bd/ata_hw.h (added)
• devman/devman.c (modified) (view diffs)
• devmap/devmap.c (modified) (view diffs)
• fs/devfs/devfs_ops.c (modified) (view diffs)
• hid/kbd/port/ns16550.c (modified) (view diffs)
• hid/kbd/port/z8530.c (modified) (view diffs)
• hw/irc/apic/Makefile (added)
• hw/irc/apic/apic.c (moved) (moved from uspace/app/tester/ipc/register.c ) (view diffs)
• hw/irc/fhc/Makefile (moved) (moved from uspace/srv/hw/cir/fhc/Makefile ) (view diffs)
• hw/irc/fhc/fhc.c (moved) (moved from uspace/srv/hw/cir/fhc/fhc.c ) (view diffs)
• hw/irc/i8259/Makefile (added)
• hw/irc/i8259/i8259.c (added)
• hw/irc/obio/Makefile (moved) (moved from uspace/srv/hw/cir/obio/Makefile ) (view diffs)
• hw/irc/obio/obio.c (moved) (moved from uspace/srv/hw/cir/obio/obio.c ) (view diffs)
• hw/netif/dp8390/Makefile (modified) (view diffs)
• hw/netif/dp8390/dp8390.c (modified) (view diffs)
• hw/netif/dp8390/dp8390.h (modified) (view diffs)
• hw/netif/dp8390/dp8390_drv.h (modified) (view diffs)
• hw/netif/dp8390/dp8390_module.c (modified) (view diffs)
• hw/netif/dp8390/dp8390_port.h (modified) (view diffs)
• hw/netif/dp8390/local.h (deleted)
• hw/netif/dp8390/ne2000.c (modified) (view diffs)
• hw/netif/dp8390/ne2000.h (modified) (view diffs)
• net/cfg/lo (moved) (moved from uspace/srv/net/cfg/lo.netif_standalone ) (view diffs)
• net/cfg/lo.netif_nil_bundle (deleted)
• net/cfg/ne2k (moved) (moved from uspace/srv/net/cfg/ne2k.netif_standalone ) (view diffs)
• net/cfg/ne2k.netif_nil_bundle (deleted)
• net/il/arp/arp.c (modified) (view diffs)
• net/il/arp/arp.h (modified) (view diffs)
• net/il/ip/ip.c (modified) (view diffs)
• net/net/net.c (modified) (view diffs)
• net/net/net.h (modified) (view diffs)
• net/net/net_standalone.c (modified) (view diffs)
• net/netif/lo/Makefile (modified) (view diffs)
• net/netif/lo/lo.c (modified) (view diffs)
• net/nil/eth/Makefile (modified) (view diffs)
• net/nil/eth/eth.c (modified) (view diffs)
• net/nil/eth/eth.h (modified) (view diffs)
• net/nil/nildummy/Makefile (modified) (view diffs)
• net/nil/nildummy/nildummy.h (modified) (view diffs)
• net/tl/icmp/icmp.c (modified) (view diffs)
• net/tl/tcp/tcp.c (modified) (view diffs)
• net/tl/udp/udp.c (modified) (view diffs)
• vfs/vfs.h (modified) (view diffs)
• vfs/vfs_lookup.c (modified) (view diffs)
• vfs/vfs_register.c (modified) (view diffs)