Changeset 43c3937 in mainline

Timestamp:

2011-01-07T10:43:15Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

5097bed4

Parents:

5f7d96e (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:

merge with usb/development

Files:

• .bzrignore (modified) (view diffs)
• boot/Makefile.common (modified) (view diffs)
• boot/arch/ia64/Makefile.inc (modified) (view diffs)
• contrib/conf/net-qe.sh (modified) (view diffs)
• defaults/amd64/Makefile.config (modified) (view diffs)
• defaults/arm32/Makefile.config (modified) (view diffs)
• defaults/ia32/Makefile.config (modified) (view diffs)
• defaults/ia64/Makefile.config (modified) (view diffs)
• defaults/mips32/Makefile.config (modified) (view diffs)
• defaults/ppc32/Makefile.config (modified) (view diffs)
• defaults/sparc64/Makefile.config (modified) (view diffs)
• defaults/special/Makefile.config (modified) (view diffs)
• kernel/arch/ia32/include/interrupt.h (modified) (view diffs)
• kernel/generic/include/ddi/irq.h (modified) (view diffs)
• kernel/generic/include/interrupt.h (modified) (view diffs)
• kernel/generic/include/proc/task.h (modified) (view diffs)
• kernel/generic/include/syscall/syscall.h (modified) (view diffs)
• kernel/generic/src/interrupt/interrupt.c (modified) (view diffs)
• kernel/generic/src/ipc/irq.c (modified) (view diffs)
• kernel/generic/src/main/main.c (modified) (view diffs)
• kernel/generic/src/proc/task.c (modified) (view diffs)
• kernel/generic/src/syscall/syscall.c (modified) (view diffs)
• uspace/Makefile (modified) (view diffs)
• uspace/app/init/init.c (modified) (view diffs)
• uspace/app/kill/Makefile (added)
• uspace/app/kill/kill.c (added)
• uspace/app/killall/Makefile (moved) (moved from uspace/srv/net/cfg/Makefile ) (view diffs)
• uspace/app/killall/killall.c (added)
• uspace/app/netecho/netecho.c (modified) (view diffs)
• uspace/app/taskdump/taskdump.c (modified) (view diffs)
• uspace/app/websrv/Makefile (added)
• uspace/app/websrv/websrv.c (added)
• uspace/drv/uhci/main.c (modified) (view diffs)
• uspace/drv/usbhub/usbhub.c (modified) (view diffs)
• uspace/drv/usbkbd/main.c (modified) (view diffs)
• uspace/drv/vhc/hcd.c (modified) (view diffs)
• uspace/drv/vhc/hub.c (modified) (view diffs)
• uspace/lib/c/Makefile (modified) (view diffs)
• uspace/lib/c/generic/async.c (modified) (view diffs)
• uspace/lib/c/generic/async_rel.c (deleted)
• uspace/lib/c/generic/async_sess.c (added)
• uspace/lib/c/generic/libc.c (modified) (view diffs)
• uspace/lib/c/generic/net/icmp_api.c (modified) (view diffs)
• uspace/lib/c/generic/net/inet.c (modified) (view diffs)
• uspace/lib/c/generic/net/modules.c (modified) (view diffs)
• uspace/lib/c/generic/net/packet.c (modified) (view diffs)
• uspace/lib/c/generic/net/socket_client.c (modified) (view diffs)
• uspace/lib/c/generic/task.c (modified) (view diffs)
• uspace/lib/c/include/async.h (modified) (view diffs)
• uspace/lib/c/include/async_sess.h (added)
• uspace/lib/c/include/ipc/dev_iface.h (modified) (view diffs)
• uspace/lib/c/include/net/socket.h (modified) (view diffs)
• uspace/lib/c/include/task.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/remote_usb.c (added)
• uspace/lib/drv/generic/remote_usbhc.c (modified) (view diffs)
• uspace/lib/drv/include/remote_usb.h (moved) (moved from uspace/lib/c/include/async_rel.h ) (view diffs)
• uspace/lib/drv/include/usb_iface.h (added)
• uspace/lib/drv/include/usbhc_iface.h (modified) (view diffs)
• uspace/lib/usb/include/usb/usbdrv.h (modified) (view diffs)
• uspace/lib/usb/src/hcdhubd.c (modified) (view diffs)
• uspace/lib/usb/src/recognise.c (modified) (view diffs)
• uspace/lib/usb/src/usbdrv.c (modified) (view diffs)
• uspace/srv/bd/ata_bd/ata_bd.c (modified) (view diffs)
• uspace/srv/bd/ata_bd/ata_bd.h (modified) (view diffs)
• uspace/srv/bd/ata_bd/ata_hw.h (added)
• uspace/srv/devman/main.c (modified) (view diffs)
• uspace/srv/hid/console/console.c (modified) (view diffs)
• uspace/srv/hw/netif/dp8390/Makefile (modified) (view diffs)
• uspace/srv/hw/netif/dp8390/dp8390.c (modified) (view diffs)
• uspace/srv/hw/netif/dp8390/dp8390.h (modified) (view diffs)
• uspace/srv/hw/netif/dp8390/dp8390_drv.h (modified) (view diffs)
• uspace/srv/hw/netif/dp8390/dp8390_module.c (modified) (view diffs)
• uspace/srv/hw/netif/dp8390/dp8390_port.h (modified) (view diffs)
• uspace/srv/hw/netif/dp8390/local.h (deleted)
• uspace/srv/hw/netif/dp8390/ne2000.c (modified) (view diffs)
• uspace/srv/hw/netif/dp8390/ne2000.h (modified) (view diffs)
• uspace/srv/net/cfg/lo (moved) (moved from uspace/srv/net/cfg/lo.netif_standalone ) (view diffs)
• uspace/srv/net/cfg/lo.netif_nil_bundle (deleted)
• uspace/srv/net/cfg/ne2k (moved) (moved from uspace/srv/net/cfg/ne2k.netif_standalone ) (view diffs)
• uspace/srv/net/cfg/ne2k.netif_nil_bundle (deleted)
• uspace/srv/net/netif/lo/Makefile (modified) (view diffs)
• uspace/srv/net/nil/eth/Makefile (modified) (view diffs)
• uspace/srv/net/nil/nildummy/Makefile (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/vfs/vfs.h (modified) (view diffs)
• uspace/srv/vfs/vfs_register.c (modified) (view diffs)