Changeset 3f03199 in mainline

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

Files:

• .bzrignore (added)
• HelenOS.config (modified) (view diffs)
• boot/Makefile.common (modified) (view diffs)
• boot/arch/arm32/Makefile.inc (modified) (view diffs)
• boot/arch/arm32/src/mm.c (modified) (view diffs)
• boot/arch/mips32/Makefile.inc (modified) (view diffs)
• boot/arch/ppc32/Makefile.inc (modified) (view diffs)
• boot/arch/sparc64/src/asm.S (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/mips64/Makefile.config (modified) (view diffs)
• defaults/ppc32/Makefile.config (modified) (view diffs)
• defaults/sparc64/Makefile.config (modified) (view diffs)
• defaults/sparc64/niagara/Makefile.config (modified) (view diffs)
• defaults/special/Makefile.config (modified) (view diffs)
• kernel/Makefile (modified) (view diffs)
• kernel/arch/abs32le/include/arch/mm/frame.h (modified) (view diffs)
• kernel/arch/abs32le/include/arch/mm/page.h (modified) (view diffs)
• kernel/arch/amd64/include/arch/mm/frame.h (modified) (view diffs)
• kernel/arch/amd64/include/arch/mm/page.h (modified) (view diffs)
• kernel/arch/amd64/src/ddi/ddi.c (modified) (view diffs)
• kernel/arch/amd64/src/proc/task.c (modified) (view diffs)
• kernel/arch/arm32/include/arch/mm/frame.h (modified) (view diffs)
• kernel/arch/arm32/include/arch/mm/page.h (modified) (view diffs)
• kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c (modified) (view diffs)
• kernel/arch/arm32/src/mach/beaglebone/beaglebone.c (modified) (view diffs)
• kernel/arch/arm32/src/mm/frame.c (modified) (view diffs)
• kernel/arch/arm32/src/mm/page.c (modified) (view diffs)
• kernel/arch/arm32/src/ras.c (modified) (view diffs)
• kernel/arch/ia32/include/arch/mm/frame.h (modified) (view diffs)
• kernel/arch/ia32/include/arch/mm/page.h (modified) (view diffs)
• kernel/arch/ia32/src/ddi/ddi.c (modified) (view diffs)
• kernel/arch/ia32/src/mm/frame.c (modified) (view diffs)
• kernel/arch/ia32/src/proc/task.c (modified) (view diffs)
• kernel/arch/ia64/include/arch/mm/frame.h (modified) (view diffs)
• kernel/arch/ia64/src/ddi/ddi.c (modified) (view diffs)
• kernel/arch/ia64/src/mm/vhpt.c (modified) (view diffs)
• kernel/arch/mips32/include/arch/asm.h (modified) (view diffs)
• kernel/arch/mips32/include/arch/mm/frame.h (modified) (view diffs)
• kernel/arch/mips32/include/arch/mm/page.h (modified) (view diffs)
• kernel/arch/mips32/src/mach/malta/malta.c (modified) (view diffs)
• kernel/arch/mips32/src/mm/tlb.c (modified) (view diffs)
• kernel/arch/mips64/include/arch/mm/frame.h (modified) (view diffs)
• kernel/arch/ppc32/include/arch/mm/frame.h (modified) (view diffs)
• kernel/arch/ppc32/include/arch/mm/page.h (modified) (view diffs)
• kernel/arch/sparc64/include/arch/mm/frame.h (modified) (view diffs)
• kernel/arch/sparc64/include/arch/mm/sun4u/frame.h (modified) (view diffs)
• kernel/arch/sparc64/include/arch/mm/sun4v/frame.h (modified) (view diffs)
• kernel/arch/sparc64/include/arch/trap/sun4v/mmu.h (modified) (view diffs)
• kernel/arch/sparc64/src/mm/sun4u/as.c (modified) (view diffs)
• kernel/arch/sparc64/src/mm/sun4v/as.c (modified) (view diffs)
• kernel/arch/sparc64/src/mm/sun4v/frame.c (modified) (view diffs)
• kernel/arch/sparc64/src/mm/sun4v/tlb.c (modified) (view diffs)
• kernel/arch/sparc64/src/sun4v/start.S (modified) (view diffs)
• kernel/doc/mm (modified) (view diffs)
• kernel/genarch/include/genarch/drivers/am335x/irc.h (modified) (view diffs)
• kernel/genarch/include/genarch/drivers/amdm37x/irc.h (modified) (view diffs)
• kernel/genarch/include/genarch/drivers/omap/irc.h (added)
• kernel/genarch/include/genarch/mm/page_pt.h (modified) (view diffs)
• kernel/genarch/src/mm/as_pt.c (modified) (view diffs)
• kernel/genarch/src/mm/page_pt.c (modified) (view diffs)
• kernel/generic/include/adt/bitmap.h (modified) (view diffs)
• kernel/generic/include/adt/list.h (modified) (view diffs)
• kernel/generic/include/config.h (modified) (view diffs)
• kernel/generic/include/macros.h (modified) (view diffs)
• kernel/generic/include/mm/as.h (modified) (view diffs)
• kernel/generic/include/mm/buddy.h (deleted)
• kernel/generic/include/mm/frame.h (modified) (view diffs)
• kernel/generic/include/mm/page.h (modified) (view diffs)
• kernel/generic/include/mm/slab.h (modified) (view diffs)
• kernel/generic/src/adt/bitmap.c (modified) (view diffs)
• kernel/generic/src/adt/btree.c (modified) (view diffs)
• kernel/generic/src/adt/hash_table.c (modified) (view diffs)
• kernel/generic/src/adt/list.c (modified) (view diffs)
• kernel/generic/src/console/cmd.c (modified) (view diffs)
• kernel/generic/src/console/console.c (modified) (view diffs)
• kernel/generic/src/console/kconsole.c (modified) (view diffs)
• kernel/generic/src/cpu/cpu.c (modified) (view diffs)
• kernel/generic/src/ddi/ddi.c (modified) (view diffs)
• kernel/generic/src/debug/panic.c (modified) (view diffs)
• kernel/generic/src/debug/stacktrace.c (modified) (view diffs)
• kernel/generic/src/ipc/ipc.c (modified) (view diffs)
• kernel/generic/src/ipc/ipcrsc.c (modified) (view diffs)
• kernel/generic/src/lib/ra.c (modified) (view diffs)
• kernel/generic/src/mm/as.c (modified) (view diffs)
• kernel/generic/src/mm/backend_anon.c (modified) (view diffs)
• kernel/generic/src/mm/backend_elf.c (modified) (view diffs)
• kernel/generic/src/mm/buddy.c (deleted)
• kernel/generic/src/mm/frame.c (modified) (view diffs)
• kernel/generic/src/mm/km.c (modified) (view diffs)
• kernel/generic/src/mm/page.c (modified) (view diffs)
• kernel/generic/src/mm/slab.c (modified) (view diffs)
• kernel/generic/src/proc/scheduler.c (modified) (view diffs)
• kernel/generic/src/proc/task.c (modified) (view diffs)
• kernel/generic/src/proc/thread.c (modified) (view diffs)
• kernel/generic/src/synch/futex.c (modified) (view diffs)
• kernel/generic/src/sysinfo/stats.c (modified) (view diffs)
• kernel/generic/src/time/clock.c (modified) (view diffs)
• kernel/generic/src/udebug/udebug.c (modified) (view diffs)
• kernel/generic/src/udebug/udebug_ops.c (modified) (view diffs)
• kernel/test/mm/falloc1.c (modified) (view diffs)
• kernel/test/mm/falloc2.c (modified) (view diffs)
• kernel/test/mm/mapping1.c (modified) (view diffs)
• tools/config.py (modified) (view diffs)
• tools/toolchain.sh (modified) (view diffs)
• uspace/Makefile (modified) (view diffs)
• uspace/Makefile.common (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/mount/mount.c (modified) (view diffs)
• uspace/app/corecfg/Makefile (added)
• uspace/app/corecfg/corecfg.c (added)
• uspace/app/devctl/devctl.c (modified) (view diffs)
• uspace/app/df/Makefile (added)
• uspace/app/df/df.c (added)
• uspace/app/download/Makefile (added)
• uspace/app/download/main.c (added)
• uspace/app/edit/sheet.c (modified) (view diffs)
• uspace/app/init/init.c (modified) (view diffs)
• uspace/app/klog/klog.c (modified) (view diffs)
• uspace/app/netspeed/Makefile (added)
• uspace/app/netspeed/netspeed.c (added)
• uspace/app/sportdmp/sportdmp.c (modified) (view diffs)
• uspace/app/tester/mm/common.c (modified) (view diffs)
• uspace/app/trace/trace.c (modified) (view diffs)
• uspace/app/usbinfo/dump.c (modified) (view diffs)
• uspace/app/usbinfo/hid.c (modified) (view diffs)
• uspace/app/wavplay/dplay.c (modified) (view diffs)
• uspace/app/wavplay/drec.c (modified) (view diffs)
• uspace/app/wavplay/main.c (modified) (view diffs)
• uspace/app/wavplay/wave.c (modified) (view diffs)
• uspace/drv/audio/sb16/dsp.c (modified) (view diffs)
• uspace/drv/audio/sb16/main.c (modified) (view diffs)
• uspace/drv/audio/sb16/sb16.c (modified) (view diffs)
• uspace/drv/audio/sb16/sb16.h (modified) (view diffs)
• uspace/drv/block/ahci/ahci.c (modified) (view diffs)
• uspace/drv/block/ata_bd/main.c (modified) (view diffs)
• uspace/drv/bus/isa/i8237.c (modified) (view diffs)
• uspace/drv/bus/isa/isa.c (modified) (view diffs)
• uspace/drv/bus/pci/pciintel/pci.c (modified) (view diffs)
• uspace/drv/bus/pci/pciintel/pci.h (modified) (view diffs)
• uspace/drv/bus/usb/ehci/main.c (modified) (view diffs)
• uspace/drv/bus/usb/ehci/res.c (modified) (view diffs)
• uspace/drv/bus/usb/ehci/res.h (modified) (view diffs)
• uspace/drv/bus/usb/ohci/hc.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/hc.h (modified) (view diffs)
• uspace/drv/bus/usb/ohci/ohci.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/res.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/res.h (modified) (view diffs)
• uspace/drv/bus/usb/uhci/hc.c (modified) (view diffs)
• uspace/drv/bus/usb/uhci/hc.h (modified) (view diffs)
• uspace/drv/bus/usb/uhci/res.c (modified) (view diffs)
• uspace/drv/bus/usb/uhci/res.h (modified) (view diffs)
• uspace/drv/bus/usb/uhci/uhci.c (modified) (view diffs)
• uspace/drv/bus/usb/uhci/utils/malloc32.h (modified) (view diffs)
• uspace/drv/bus/usb/usbmid/explore.c (modified) (view diffs)
• uspace/drv/bus/usb/usbmid/usbmid.c (modified) (view diffs)
• uspace/drv/bus/usb/vhc/transfer.c (modified) (view diffs)
• uspace/drv/char/i8042/i8042.c (modified) (view diffs)
• uspace/drv/char/i8042/i8042.h (modified) (view diffs)
• uspace/drv/char/i8042/main.c (modified) (view diffs)
• uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c (modified) (view diffs)
• uspace/drv/fb/kfb/port.c (modified) (view diffs)
• uspace/drv/infrastructure/rootmac/rootmac.c (modified) (view diffs)
• uspace/drv/infrastructure/rootmalta/Makefile (added)
• uspace/drv/infrastructure/rootmalta/rootmalta.c (added)
• uspace/drv/infrastructure/rootmalta/rootmalta.ma (added)
• uspace/drv/infrastructure/rootpc/rootpc.c (modified) (view diffs)
• uspace/drv/nic/e1k/e1k.c (modified) (view diffs)
• uspace/drv/nic/ne2k/ne2k.c (modified) (view diffs)
• uspace/drv/nic/rtl8139/driver.c (modified) (view diffs)
• uspace/drv/nic/rtl8139/driver.h (modified) (view diffs)
• uspace/lib/block/block.c (modified) (view diffs)
• uspace/lib/c/Makefile (modified) (view diffs)
• uspace/lib/c/arch/sparc64/Makefile.common (modified) (view diffs)
• uspace/lib/c/generic/adt/hash_table.c (modified) (view diffs)
• uspace/lib/c/generic/adt/list.c (modified) (view diffs)
• uspace/lib/c/generic/cfg.c (modified) (view diffs)
• uspace/lib/c/generic/corecfg.c (added)
• uspace/lib/c/generic/ddi.c (modified) (view diffs)
• uspace/lib/c/generic/device/hw_res.c (modified) (view diffs)
• uspace/lib/c/generic/device/hw_res_parsed.c (modified) (view diffs)
• uspace/lib/c/generic/device/pio_window.c (added)
• uspace/lib/c/generic/devman.c (modified) (view diffs)
• uspace/lib/c/generic/futex.c (modified) (view diffs)
• uspace/lib/c/generic/inet.c (modified) (view diffs)
• uspace/lib/c/generic/inet/addr.c (modified) (view diffs)
• uspace/lib/c/generic/io/asprintf.c (modified) (view diffs)
• uspace/lib/c/generic/net/socket_client.c (modified) (view diffs)
• uspace/lib/c/generic/pio_trace.c (modified) (view diffs)
• uspace/lib/c/generic/time.c (modified) (view diffs)
• uspace/lib/c/generic/vfs/vfs.c (modified) (view diffs)
• uspace/lib/c/include/adt/list.h (modified) (view diffs)
• uspace/lib/c/include/cfg.h (modified) (view diffs)
• uspace/lib/c/include/corecfg.h (added)
• uspace/lib/c/include/ddi.h (modified) (view diffs)
• uspace/lib/c/include/device/hw_res.h (modified) (view diffs)
• uspace/lib/c/include/device/hw_res_parsed.h (modified) (view diffs)
• uspace/lib/c/include/device/pio_window.h (added)
• uspace/lib/c/include/devman.h (modified) (view diffs)
• uspace/lib/c/include/inet/addr.h (modified) (view diffs)
• uspace/lib/c/include/inet/inet.h (modified) (view diffs)
• uspace/lib/c/include/ipc/corecfg.h (added)
• uspace/lib/c/include/ipc/dev_iface.h (modified) (view diffs)
• uspace/lib/c/include/ipc/devman.h (modified) (view diffs)
• uspace/lib/c/include/ipc/services.h (modified) (view diffs)
• uspace/lib/c/include/ipc/socket.h (modified) (view diffs)
• uspace/lib/c/include/ipc/vfs.h (modified) (view diffs)
• uspace/lib/c/include/net/socket.h (modified) (view diffs)
• uspace/lib/c/include/net/socket_codes.h (modified) (view diffs)
• uspace/lib/c/include/stdio.h (modified) (view diffs)
• uspace/lib/c/include/sys/statfs.h (added)
• uspace/lib/c/include/vfs/vfs.h (modified) (view diffs)
• uspace/lib/draw/drawctx.c (modified) (view diffs)
• uspace/lib/drv/Makefile (modified) (view diffs)
• uspace/lib/drv/generic/dev_iface.c (modified) (view diffs)
• uspace/lib/drv/generic/driver.c (modified) (view diffs)
• uspace/lib/drv/generic/interrupt.c (modified) (view diffs)
• uspace/lib/drv/generic/remote_pio_window.c (added)
• uspace/lib/drv/include/ops/pio_window.h (added)
• uspace/lib/drv/include/remote_pio_window.h (added)
• uspace/lib/fs/libfs.c (modified) (view diffs)
• uspace/lib/fs/libfs.h (modified) (view diffs)
• uspace/lib/graph/graph.c (modified) (view diffs)
• uspace/lib/gui/connection.c (modified) (view diffs)
• uspace/lib/gui/grid.c (modified) (view diffs)
• uspace/lib/gui/terminal.c (modified) (view diffs)
• uspace/lib/gui/window.c (modified) (view diffs)
• uspace/lib/http/Makefile (added)
• uspace/lib/http/http.c (added)
• uspace/lib/http/http.h (added)
• uspace/lib/softfloat/softfloat.c (modified) (view diffs)
• uspace/lib/uri/Makefile (added)
• uspace/lib/uri/ctype.h (added)
• uspace/lib/uri/uri.c (added)
• uspace/lib/uri/uri.h (added)
• uspace/lib/usbhid/src/hiddescriptor.c (modified) (view diffs)
• uspace/lib/usbhid/src/hidparser.c (modified) (view diffs)
• uspace/lib/usbhid/src/hidpath.c (modified) (view diffs)
• uspace/lib/usbhost/src/ddf_helpers.c (modified) (view diffs)
• uspace/lib/usbhost/src/usb_endpoint_manager.c (modified) (view diffs)
• uspace/srv/audio/hound/audio_device.c (modified) (view diffs)
• uspace/srv/audio/hound/audio_sink.c (modified) (view diffs)
• uspace/srv/audio/hound/audio_source.c (modified) (view diffs)
• uspace/srv/audio/hound/connection.h (modified) (view diffs)
• uspace/srv/audio/hound/hound.c (modified) (view diffs)
• uspace/srv/audio/hound/hound_ctx.c (modified) (view diffs)
• uspace/srv/audio/hound/hound_ctx.h (modified) (view diffs)
• uspace/srv/bd/rd/rd.c (modified) (view diffs)
• uspace/srv/devman/Makefile (modified) (view diffs)
• uspace/srv/devman/client_conn.c (added)
• uspace/srv/devman/client_conn.h (added)
• uspace/srv/devman/dev.c (added)
• uspace/srv/devman/dev.h (added)
• uspace/srv/devman/devman.c (deleted)
• uspace/srv/devman/devman.h (modified) (view diffs)
• uspace/srv/devman/devtree.c (added)
• uspace/srv/devman/devtree.h (added)
• uspace/srv/devman/driver.c (added)
• uspace/srv/devman/driver.h (added)
• uspace/srv/devman/drv_conn.c (added)
• uspace/srv/devman/drv_conn.h (added)
• uspace/srv/devman/fun.c (added)
• uspace/srv/devman/fun.h (added)
• uspace/srv/devman/loc.c (added)
• uspace/srv/devman/loc.h (added)
• uspace/srv/devman/main.c (modified) (view diffs)
• uspace/srv/devman/main.h (added)
• uspace/srv/devman/match.c (modified) (view diffs)
• uspace/srv/devman/match.h (added)
• uspace/srv/devman/util.c (modified) (view diffs)
• uspace/srv/devman/util.h (modified) (view diffs)
• uspace/srv/fs/cdfs/cdfs_ops.c (modified) (view diffs)
• uspace/srv/fs/exfat/exfat_idx.c (modified) (view diffs)
• uspace/srv/fs/exfat/exfat_ops.c (modified) (view diffs)
• uspace/srv/fs/ext4fs/ext4fs_ops.c (modified) (view diffs)
• uspace/srv/fs/fat/fat_idx.c (modified) (view diffs)
• uspace/srv/fs/fat/fat_ops.c (modified) (view diffs)
• uspace/srv/fs/mfs/mfs.h (modified) (view diffs)
• uspace/srv/fs/mfs/mfs_balloc.c (modified) (view diffs)
• uspace/srv/fs/mfs/mfs_ops.c (modified) (view diffs)
• uspace/srv/fs/mfs/mfs_rw.c (modified) (view diffs)
• uspace/srv/fs/tmpfs/tmpfs_ops.c (modified) (view diffs)
• uspace/srv/fs/udf/udf_ops.c (modified) (view diffs)
• uspace/srv/hid/compositor/compositor.c (modified) (view diffs)
• uspace/srv/hid/input/input.c (modified) (view diffs)
• uspace/srv/hid/input/port/niagara.c (modified) (view diffs)
• uspace/srv/hid/output/output.c (modified) (view diffs)
• uspace/srv/hid/output/port/ega.c (modified) (view diffs)
• uspace/srv/hid/output/port/kchar.c (modified) (view diffs)
• uspace/srv/hid/output/port/niagara.c (modified) (view diffs)
• uspace/srv/hid/remcons/user.c (modified) (view diffs)
• uspace/srv/hid/rfb/Makefile (added)
• uspace/srv/hid/rfb/main.c (added)
• uspace/srv/hid/rfb/rfb.c (added)
• uspace/srv/hid/rfb/rfb.h (added)
• uspace/srv/hw/irc/obio/obio.c (modified) (view diffs)
• uspace/srv/locsrv/category.c (modified) (view diffs)
• uspace/srv/locsrv/locsrv.c (modified) (view diffs)
• uspace/srv/logger/logs.c (modified) (view diffs)
• uspace/srv/net/dhcp/Makefile (added)
• uspace/srv/net/dhcp/dhcp.c (added)
• uspace/srv/net/dhcp/dhcp_std.h (added)
• uspace/srv/net/dnsrsrv/dns_msg.c (modified) (view diffs)
• uspace/srv/net/dnsrsrv/dnsrsrv.c (modified) (view diffs)
• uspace/srv/net/dnsrsrv/query.c (modified) (view diffs)
• uspace/srv/net/dnsrsrv/transport.c (modified) (view diffs)
• uspace/srv/net/ethip/arp.c (modified) (view diffs)
• uspace/srv/net/ethip/atrans.c (modified) (view diffs)
• uspace/srv/net/ethip/ethip_nic.c (modified) (view diffs)
• uspace/srv/net/inetsrv/addrobj.c (modified) (view diffs)
• uspace/srv/net/inetsrv/icmp.c (modified) (view diffs)
• uspace/srv/net/inetsrv/inet_link.c (modified) (view diffs)
• uspace/srv/net/inetsrv/inetping.c (modified) (view diffs)
• uspace/srv/net/inetsrv/inetping6.c (modified) (view diffs)
• uspace/srv/net/inetsrv/inetsrv.c (modified) (view diffs)
• uspace/srv/net/inetsrv/inetsrv.h (modified) (view diffs)
• uspace/srv/net/inetsrv/ntrans.c (modified) (view diffs)
• uspace/srv/net/inetsrv/reass.c (modified) (view diffs)
• uspace/srv/net/inetsrv/sroute.c (modified) (view diffs)
• uspace/srv/net/slip/slip.c (modified) (view diffs)
• uspace/srv/net/tcp/conn.c (modified) (view diffs)
• uspace/srv/net/tcp/tcp.c (modified) (view diffs)
• uspace/srv/net/udp/assoc.c (modified) (view diffs)
• uspace/srv/net/udp/assoc.h (modified) (view diffs)
• uspace/srv/net/udp/pdu.c (modified) (view diffs)
• uspace/srv/net/udp/sock.c (modified) (view diffs)
• uspace/srv/net/udp/ucall.c (modified) (view diffs)
• uspace/srv/net/udp/ucall.h (modified) (view diffs)
• uspace/srv/net/udp/udp_inet.c (modified) (view diffs)
• uspace/srv/net/udp/udp_type.h (modified) (view diffs)
• uspace/srv/ns/service.c (modified) (view diffs)
• uspace/srv/ns/task.c (modified) (view diffs)
• uspace/srv/taskmon/taskmon.c (modified) (view diffs)
• uspace/srv/vfs/vfs.c (modified) (view diffs)
• uspace/srv/vfs/vfs.h (modified) (view diffs)
• uspace/srv/vfs/vfs_ops.c (modified) (view diffs)
• uspace/srv/vfs/vfs_register.c (modified) (view diffs)