Changeset 80cd7cd in mainline for uspace/srv

Timestamp:

2011-01-13T20:58:24Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

87e373b

Parents:

eaef141 (diff), a613fea1 (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)
• bd/file_bd/file_bd.c (modified) (view diffs)
• bd/gxe_bd/gxe_bd.c (modified) (view diffs)
• bd/part/guid_part/guid_part.c (modified) (view diffs)
• bd/part/mbr_part/mbr_part.c (modified) (view diffs)
• bd/rd/rd.c (modified) (view diffs)
• devman/devman.c (modified) (view diffs)
• fs/devfs/devfs_ops.c (modified) (view diffs)
• hid/console/console.c (modified) (view diffs)
• hid/kbd/port/ns16550.c (modified) (view diffs)
• hid/kbd/port/z8530.c (modified) (view diffs)
• hid/s3c24xx_ts/s3c24xx_ts.c (modified) (view diffs)
• hw/bus/cuda_adb/cuda_adb.c (modified) (view diffs)
• hw/char/i8042/i8042.c (modified) (view diffs)
• hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (view diffs)
• hw/irc/apic/Makefile (added)
• hw/irc/apic/apic.c (added)
• 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/DRIVER_REMOVAL (deleted)
• hw/netif/dp8390/dp8390.c (deleted)
• hw/netif/dp8390/dp8390.h (deleted)
• hw/netif/dp8390/dp8390_module.c (deleted)
• hw/netif/dp8390/ne2000.c (deleted)
• hw/netif/ne2000/Makefile (moved) (moved from uspace/srv/hw/netif/dp8390/Makefile ) (view diffs)
• hw/netif/ne2000/dp8390.c (added)
• hw/netif/ne2000/dp8390.h (added)
• hw/netif/ne2000/dp8390_drv.h (moved) (moved from uspace/srv/hw/netif/dp8390/dp8390_drv.h ) (view diffs)
• hw/netif/ne2000/dp8390_port.h (moved) (moved from uspace/srv/hw/netif/dp8390/dp8390_port.h ) (view diffs)
• hw/netif/ne2000/local.h (moved) (moved from uspace/srv/hw/netif/dp8390/local.h ) (view diffs)
• hw/netif/ne2000/ne2000.c (added)
• hw/netif/ne2000/ne2000.h (moved) (moved from uspace/srv/hw/netif/dp8390/ne2000.h ) (view diffs)
• net/cfg/lo (moved) (moved from uspace/srv/net/cfg/lo.netif_standalone ) (view diffs)
• net/cfg/ne2k (moved) (moved from uspace/srv/net/cfg/ne2k.netif_standalone ) (view diffs)
• net/il/arp/Makefile (modified) (view diffs)
• net/il/arp/arp.c (modified) (view diffs)
• net/il/arp/arp.h (modified) (view diffs)
• net/il/arp/arp_header.h (deleted)
• net/il/arp/arp_module.c (deleted)
• net/il/arp/arp_oc.h (deleted)
• net/il/ip/Makefile (modified) (view diffs)
• net/il/ip/ip.c (modified) (view diffs)
• net/il/ip/ip.h (modified) (view diffs)
• net/il/ip/ip_module.c (deleted)
• net/il/ip/ip_module.h (deleted)
• 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/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/eth/eth_header.h (deleted)
• net/nil/nildummy/Makefile (modified) (view diffs)
• net/nil/nildummy/nildummy.c (modified) (view diffs)
• net/nil/nildummy/nildummy.h (modified) (view diffs)
• net/nil/nildummy/nildummy_module.c (deleted)
• net/tl/icmp/Makefile (modified) (view diffs)
• net/tl/icmp/icmp.c (modified) (view diffs)
• net/tl/icmp/icmp_module.c (deleted)
• net/tl/icmp/icmp_module.h (deleted)
• net/tl/tcp/Makefile (modified) (view diffs)
• net/tl/tcp/tcp.c (modified) (view diffs)
• net/tl/tcp/tcp_module.h (deleted)
• net/tl/udp/Makefile (modified) (view diffs)
• net/tl/udp/udp.c (modified) (view diffs)
• net/tl/udp/udp_module.c (deleted)
• net/tl/udp/udp_module.h (deleted)
• vfs/vfs_register.c (modified) (view diffs)