Changeset a39cfb8 in mainline

Timestamp:

2011-04-14T07:54:33Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

e05d6c3

Parents:

3f3afb9 (diff), 34e8bab (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 from development

Files:

• kernel/Makefile (modified) (view diffs)
• kernel/arch/mips32/include/atomic.h (modified) (view diffs)
• kernel/generic/include/ipc/ipc.h (modified) (view diffs)
• kernel/generic/src/ipc/sysipc.c (modified) (view diffs)
• kernel/generic/src/main/main.c (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/cat/cat.c (modified) (view diffs)
• uspace/app/trace/trace.c (modified) (view diffs)
• uspace/drv/isa/isa.c (modified) (view diffs)
• uspace/drv/ohci/Makefile (modified) (view diffs)
• uspace/drv/ohci/batch.c (modified) (view diffs)
• uspace/drv/ohci/batch.h (modified) (view diffs)
• uspace/drv/ohci/endpoint_list.c (moved) (moved from uspace/drv/ohci/transfer_list.c ) (view diffs)
• uspace/drv/ohci/endpoint_list.h (moved) (moved from uspace/drv/ohci/transfer_list.h ) (view diffs)
• uspace/drv/ohci/hc.c (modified) (view diffs)
• uspace/drv/ohci/hc.h (modified) (view diffs)
• uspace/drv/ohci/hcd_endpoint.c (moved) (moved from kernel/generic/src/proc/tasklet.c ) (view diffs)
• uspace/drv/ohci/hcd_endpoint.h (moved) (moved from kernel/generic/include/proc/tasklet.h ) (view diffs)
• uspace/drv/ohci/hw_struct/endpoint_descriptor.h (modified) (view diffs)
• uspace/drv/ohci/iface.c (modified) (view diffs)
• uspace/drv/ohci/root_hub.c (modified) (view diffs)
• uspace/drv/ohci/root_hub.h (modified) (view diffs)
• uspace/drv/uhci-hcd/batch.c (modified) (view diffs)
• uspace/drv/uhci-hcd/batch.h (modified) (view diffs)
• uspace/drv/uhci-hcd/hc.c (modified) (view diffs)
• uspace/drv/uhci-hcd/hc.h (modified) (view diffs)
• uspace/drv/uhci-hcd/hw_struct/queue_head.h (modified) (view diffs)
• uspace/drv/uhci-hcd/hw_struct/transfer_descriptor.c (modified) (view diffs)
• uspace/drv/uhci-hcd/hw_struct/transfer_descriptor.h (modified) (view diffs)
• uspace/drv/uhci-hcd/iface.c (modified) (view diffs)
• uspace/drv/uhci-hcd/main.c (modified) (view diffs)
• uspace/drv/uhci-hcd/pci.c (modified) (view diffs)
• uspace/drv/uhci-hcd/root_hub.c (modified) (view diffs)
• uspace/drv/uhci-hcd/root_hub.h (modified) (view diffs)
• uspace/drv/uhci-hcd/transfer_list.c (modified) (view diffs)
• uspace/drv/uhci-hcd/transfer_list.h (modified) (view diffs)
• uspace/drv/uhci-hcd/uhci.c (modified) (view diffs)
• uspace/drv/uhci-hcd/uhci.h (modified) (view diffs)
• uspace/lib/c/arch/mips32/include/atomic.h (modified) (view diffs)
• uspace/lib/c/generic/adt/measured_strings.c (modified) (view diffs)
• uspace/lib/c/generic/async.c (modified) (view diffs)
• uspace/lib/c/generic/vfs/vfs.c (modified) (view diffs)
• uspace/lib/c/include/async.h (modified) (view diffs)
• uspace/lib/drv/generic/driver.c (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/packet_client.c (modified) (view diffs)
• uspace/lib/net/il/ip_client.c (modified) (view diffs)
• uspace/lib/net/tl/icmp_client.c (modified) (view diffs)
• uspace/lib/net/tl/socket_core.c (modified) (view diffs)
• uspace/lib/net/tl/tl_common.c (modified) (view diffs)
• uspace/lib/packet/generic/packet_server.c (modified) (view diffs)
• uspace/lib/softint/generic/multiplication.c (modified) (view diffs)
• uspace/lib/usb/include/usb/host/batch.h (modified) (view diffs)
• uspace/lib/usb/include/usb/host/device_keeper.h (modified) (view diffs)
• uspace/lib/usb/include/usb/host/endpoint.h (modified) (view diffs)
• uspace/lib/usb/include/usb/host/usb_endpoint_manager.h (modified) (view diffs)
• uspace/lib/usb/src/host/batch.c (modified) (view diffs)
• uspace/lib/usb/src/host/device_keeper.c (modified) (view diffs)
• uspace/lib/usb/src/host/endpoint.c (modified) (view diffs)
• uspace/lib/usb/src/host/usb_endpoint_manager.c (modified) (view diffs)
• uspace/srv/bd/ata_bd/ata_bd.c (modified) (view diffs)
• uspace/srv/bd/ata_bd/ata_hw.h (modified) (view diffs)
• uspace/srv/devman/devman.c (modified) (view diffs)
• uspace/srv/devman/devman.h (modified) (view diffs)
• uspace/srv/devman/main.c (modified) (view diffs)
• uspace/srv/fs/fat/fat_ops.c (modified) (view diffs)
• uspace/srv/net/il/ip/ip.c (modified) (view diffs)
• uspace/srv/net/nil/eth/eth.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)
• uspace/srv/vfs/vfs_file.c (modified) (view diffs)