Changeset 2b0db98 in mainline for uspace

Timestamp:

2011-01-07T14:02:56Z (15 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

6986418

Parents:

d99120f (diff), 0f191a2 (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:

Merged development into lelian/hidd

Location:

uspace

Files:

• Makefile (modified) (view diffs)
• app/init/init.c (modified) (view diffs)
• app/kill/Makefile (added)
• app/kill/kill.c (moved) (moved from uspace/app/tester/ipc/register.c ) (view diffs)
• app/killall/Makefile (moved) (moved from uspace/srv/net/cfg/Makefile ) (view diffs)
• app/killall/killall.c (moved) (moved from uspace/app/tester/ipc/connect.c ) (view diffs)
• app/netecho/netecho.c (modified) (view diffs)
• app/sysinfo/Makefile (added)
• app/sysinfo/sysinfo.c (added)
• app/taskdump/taskdump.c (modified) (view diffs)
• app/tester/Makefile (modified) (view diffs)
• app/tester/hw/misc/virtchar1.c (added)
• app/tester/hw/misc/virtchar1.def (added)
• app/tester/ipc/connect.def (deleted)
• app/tester/ipc/register.def (deleted)
• app/tester/tester.c (modified) (view diffs)
• app/tester/tester.h (modified) (view diffs)
• app/tester/vfs/vfs1.c (modified) (view diffs)
• app/websrv/Makefile (added)
• app/websrv/websrv.c (added)
• drv/ns8250/ns8250.c (modified) (view diffs)
• drv/pciintel/pci.c (modified) (view diffs)
• drv/root/root.c (modified) (view diffs)
• drv/rootpc/rootpc.c (modified) (view diffs)
• drv/rootpc/rootpc.ma (modified) (view diffs)
• drv/rootvirt/devices.def (modified) (view diffs)
• drv/test1/Makefile (modified) (view diffs)
• drv/test1/char.c (added)
• drv/test1/test1.c (modified) (view diffs)
• drv/test1/test1.h (added)
• drv/uhci/main.c (modified) (view diffs)
• drv/usbhub/Makefile (modified) (view diffs)
• drv/usbhub/main.c (modified) (view diffs)
• drv/usbhub/usbhub.c (added)
• drv/usbhub/usbhub_private.h (modified) (view diffs)
• drv/usbhub/usblist.c (added)
• drv/usbhub/usblist.h (added)
• drv/usbhub/utils.c (modified) (view diffs)
• drv/usbkbd/main.c (modified) (view diffs)
• drv/vhc/hcd.c (modified) (view diffs)
• drv/vhc/hub.c (modified) (view diffs)
• lib/c/Makefile (modified) (view diffs)
• lib/c/generic/async.c (modified) (view diffs)
• lib/c/generic/async_rel.c (deleted)
• lib/c/generic/async_sess.c (added)
• lib/c/generic/device/hw_res.c (modified) (view diffs)
• lib/c/generic/devmap.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 (modified) (view diffs)
• lib/c/generic/net/inet.c (modified) (view diffs)
• lib/c/generic/net/modules.c (modified) (view diffs)
• lib/c/generic/net/packet.c (modified) (view diffs)
• lib/c/generic/net/socket_client.c (modified) (view diffs)
• lib/c/generic/task.c (modified) (view diffs)
• lib/c/include/async.h (modified) (view diffs)
• lib/c/include/async_sess.h (added)
• lib/c/include/device/hw_res.h (modified) (view diffs)
• lib/c/include/devmap.h (modified) (view diffs)
• lib/c/include/fibril_synch.h (modified) (view diffs)
• lib/c/include/ipc/dev_iface.h (modified) (view diffs)
• lib/c/include/ipc/devman.h (modified) (view diffs)
• lib/c/include/ipc/kbd.h (modified) (view diffs)
• lib/c/include/net/modules.h (modified) (view diffs)
• lib/c/include/net/socket.h (modified) (view diffs)
• lib/c/include/task.h (modified) (view diffs)
• lib/drv/Makefile (modified) (view diffs)
• lib/drv/generic/dev_iface.c (modified) (view diffs)
• lib/drv/generic/remote_usb.c (added)
• lib/drv/generic/remote_usbhc.c (modified) (view diffs)
• lib/drv/include/remote_usb.h (moved) (moved from uspace/lib/c/include/async_rel.h ) (view diffs)
• lib/drv/include/usb_iface.h (added)
• lib/drv/include/usbhc_iface.h (modified) (view diffs)
• lib/packet/generic/packet_server.c (modified) (view diffs)
• lib/usb/include/usb/hcdhubd.h (modified) (view diffs)
• lib/usb/include/usb/usbdrv.h (modified) (view diffs)
• lib/usb/src/hcdhubd.c (modified) (view diffs)
• lib/usb/src/recognise.c (modified) (view diffs)
• lib/usb/src/usbdrv.c (modified) (view diffs)
• srv/bd/ata_bd/ata_bd.c (modified) (view diffs)
• srv/bd/ata_bd/ata_bd.h (modified) (view diffs)
• srv/bd/ata_bd/ata_hw.h (added)
• srv/devman/devman.c (modified) (view diffs)
• srv/devman/main.c (modified) (view diffs)
• srv/devmap/devmap.c (modified) (view diffs)
• srv/fs/devfs/devfs_ops.c (modified) (view diffs)
• srv/hid/console/console.c (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_drv.h (modified) (view diffs)
• srv/hw/netif/dp8390/dp8390_module.c (modified) (view diffs)
• srv/hw/netif/dp8390/dp8390_port.h (modified) (view diffs)
• srv/hw/netif/dp8390/local.h (deleted)
• srv/hw/netif/dp8390/ne2000.c (modified) (view diffs)
• srv/hw/netif/dp8390/ne2000.h (modified) (view diffs)
• srv/net/cfg/lo (moved) (moved from uspace/srv/net/cfg/lo.netif_standalone ) (view diffs)
• srv/net/cfg/lo.netif_nil_bundle (deleted)
• srv/net/cfg/ne2k (moved) (moved from uspace/srv/net/cfg/ne2k.netif_standalone ) (view diffs)
• srv/net/cfg/ne2k.netif_nil_bundle (deleted)
• srv/net/il/arp/arp.c (modified) (view diffs)
• srv/net/il/arp/arp_module.c (modified) (view diffs)
• srv/net/il/ip/ip.c (modified) (view diffs)
• srv/net/il/ip/ip_module.c (modified) (view diffs)
• srv/net/net/net.c (modified) (view diffs)
• srv/net/netif/lo/Makefile (modified) (view diffs)
• srv/net/netif/lo/lo.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_module.c (modified) (view diffs)
• srv/net/nil/nildummy/Makefile (modified) (view diffs)
• srv/net/nil/nildummy/nildummy_module.c (modified) (view diffs)
• srv/net/tl/icmp/icmp.c (modified) (view diffs)
• srv/net/tl/icmp/icmp_module.c (modified) (view diffs)
• srv/net/tl/tcp/tcp.c (modified) (view diffs)
• srv/net/tl/tcp/tcp_module.c (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_register.c (modified) (view diffs)