Changeset b5ba8f6 in mainline

Timestamp:

2013-09-13T13:11:53Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1eaa3cf

Parents:

95027b5 (diff), 1c5f6f8 (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

Files:

• .bzrignore (modified) (view diffs)
• boot/Makefile.common (modified) (view diffs)
• kernel/arch/abs32le/include/arch/mm/frame.h (modified) (view diffs)
• kernel/arch/amd64/include/arch/mm/frame.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/ia32/include/arch/mm/frame.h (modified) (view diffs)
• kernel/arch/ia32/src/ddi/ddi.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/mips32/include/arch/asm.h (modified) (view diffs)
• kernel/arch/mips32/include/arch/mm/frame.h (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/sparc64/include/arch/mm/sun4u/frame.h (modified) (view diffs)
• kernel/arch/sparc64/include/arch/mm/sun4v/frame.h (modified) (view diffs)
• kernel/generic/include/adt/bitmap.h (modified) (view diffs)
• kernel/generic/include/mm/frame.h (modified) (view diffs)
• kernel/generic/src/adt/bitmap.c (modified) (view diffs)
• kernel/generic/src/ddi/ddi.c (modified) (view diffs)
• kernel/generic/src/mm/frame.c (modified) (view diffs)
• uspace/Makefile (modified) (view diffs)
• uspace/app/netspeed/Makefile (added)
• uspace/app/netspeed/netspeed.c (added)
• uspace/app/sportdmp/sportdmp.c (modified) (view diffs)
• uspace/app/wavplay/dplay.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/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/uhcirh/main.c (modified) (view diffs)
• uspace/drv/bus/usb/uhcirh/root_hub.c (modified) (view diffs)
• uspace/drv/bus/usb/uhcirh/root_hub.h (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/infrastructure/rootmac/rootmac.c (modified) (view diffs)
• uspace/drv/infrastructure/rootmalta/rootmalta.c (modified) (view diffs)
• 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/lib/c/generic/ddi.c (modified) (view diffs)
• uspace/lib/c/generic/device/hw_res_parsed.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/net/socket_client.c (modified) (view diffs)
• 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/inet/addr.h (modified) (view diffs)
• uspace/lib/c/include/inet/inet.h (modified) (view diffs)
• uspace/lib/c/include/ipc/socket.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/srv/audio/hound/audio_device.c (modified) (view diffs)
• uspace/srv/hid/compositor/compositor.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/net/dhcp/Makefile (added)
• uspace/srv/net/dhcp/dhcp.c (added)
• uspace/srv/net/dhcp/dhcp_std.h (added)
• uspace/srv/net/dnsrsrv/dnsrsrv.c (modified) (view diffs)
• uspace/srv/net/ethip/arp.c (modified) (view diffs)
• uspace/srv/net/ethip/ethip_nic.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/inetsrv.c (modified) (view diffs)
• uspace/srv/net/inetsrv/inetsrv.h (modified) (view diffs)
• uspace/srv/net/slip/slip.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)