Changeset b8e72fd1 in mainline

Timestamp:

2013-05-30T17:13:02Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

98abd40

Parents:

be2bb4f (diff), 94dfb92 (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:

• HelenOS.config (modified) (view diffs)
• boot/Makefile.common (modified) (view diffs)
• kernel/Makefile (modified) (view diffs)
• kernel/arch/amd64/Makefile.inc (modified) (view diffs)
• kernel/arch/amd64/include/arch/pm.h (modified) (view diffs)
• kernel/arch/amd64/src/pm.c (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/ia32/Makefile.inc (modified) (view diffs)
• kernel/arch/ia32/include/arch/pm.h (modified) (view diffs)
• kernel/arch/ia32/src/boot/vesa_real.inc (modified) (view diffs)
• kernel/arch/ia32/src/pm.c (modified) (view diffs)
• kernel/genarch/Makefile.inc (modified) (view diffs)
• kernel/genarch/include/genarch/drivers/am335x/uart.h (modified) (view diffs)
• kernel/genarch/include/genarch/drivers/am335x/uart_regs.h (deleted)
• kernel/genarch/include/genarch/drivers/amdm37x/uart.h (modified) (view diffs)
• kernel/genarch/include/genarch/drivers/amdm37x/uart_regs.h (deleted)
• kernel/genarch/include/genarch/drivers/omap/uart.h (added)
• kernel/genarch/include/genarch/drivers/omap/uart_regs.h (added)
• kernel/genarch/src/drivers/amdm37x/uart.c (deleted)
• kernel/genarch/src/drivers/omap/uart.c (moved) (moved from kernel/genarch/src/drivers/am335x/uart.c ) (view diffs)
• kernel/generic/include/debug.h (modified) (view diffs)
• kernel/generic/include/printf/verify.h (modified) (view diffs)
• kernel/generic/src/main/main.c (modified) (view diffs)
• tools/autotool.py (modified) (view diffs)
• tools/ew.py (modified) (view diffs)
• uspace/Makefile (modified) (view diffs)
• uspace/Makefile.common (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/cmp/cmp.c (modified) (view diffs)
• uspace/app/dnscfg/Makefile (added)
• uspace/app/dnscfg/dnscfg.c (added)
• uspace/app/dnsres/Makefile (added)
• uspace/app/dnsres/dnsres.c (added)
• uspace/app/inet/inet.c (modified) (view diffs)
• uspace/app/init/init.c (modified) (view diffs)
• uspace/app/nettest1/nettest1.c (modified) (view diffs)
• uspace/app/nettest2/nettest2.c (modified) (view diffs)
• uspace/app/nettest3/nettest3.c (modified) (view diffs)
• uspace/app/nterm/conn.c (modified) (view diffs)
• uspace/app/nterm/nterm.c (modified) (view diffs)
• uspace/app/ping/ping.c (modified) (view diffs)
• uspace/drv/block/ahci/ahci.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/pci/pciintel/pci_regs.h (modified) (view diffs)
• uspace/drv/bus/usb/ohci/hc.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/hw_struct/hcca.h (modified) (view diffs)
• uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.c (modified) (view diffs)
• uspace/drv/bus/usb/uhci/uhci_batch.c (modified) (view diffs)
• uspace/drv/bus/usb/usbmast/scsi_ms.c (modified) (view diffs)
• uspace/drv/char/i8042/buffer.h (modified) (view diffs)
• uspace/drv/nic/e1k/e1k.c (modified) (view diffs)
• uspace/drv/nic/ne2k/dp8390.c (modified) (view diffs)
• uspace/drv/nic/rtl8139/driver.c (modified) (view diffs)
• uspace/lib/bithenge/src/blob.c (modified) (view diffs)
• uspace/lib/c/Makefile (modified) (view diffs)
• uspace/lib/c/arch/amd64/Makefile.common (modified) (view diffs)
• uspace/lib/c/arch/ia32/Makefile.common (modified) (view diffs)
• uspace/lib/c/generic/device/hw_res_parsed.c (modified) (view diffs)
• uspace/lib/c/generic/dnsr.c (added)
• uspace/lib/c/generic/inet/addr.c (added)
• uspace/lib/c/generic/mem.c (modified) (view diffs)
• uspace/lib/c/generic/net/inet.c (modified) (view diffs)
• uspace/lib/c/generic/net/socket_client.c (modified) (view diffs)
• uspace/lib/c/include/device/hw_res_parsed.h (modified) (view diffs)
• uspace/lib/c/include/inet/addr.h (added)
• uspace/lib/c/include/inet/dnsr.h (added)
• uspace/lib/c/include/inet/inet.h (modified) (view diffs)
• uspace/lib/c/include/inet/inetcfg.h (modified) (view diffs)
• uspace/lib/c/include/io/verify.h (modified) (view diffs)
• uspace/lib/c/include/ipc/dnsr.h (added)
• uspace/lib/c/include/ipc/services.h (modified) (view diffs)
• uspace/lib/c/include/mem.h (modified) (view diffs)
• uspace/lib/drv/generic/remote_nic.c (modified) (view diffs)
• uspace/lib/ext4/libext4_directory.c (modified) (view diffs)
• uspace/lib/nic/src/nic_addr_db.c (modified) (view diffs)
• uspace/lib/nic/src/nic_driver.c (modified) (view diffs)
• uspace/lib/nic/src/nic_impl.c (modified) (view diffs)
• uspace/lib/nic/src/nic_rx_control.c (modified) (view diffs)
• uspace/lib/nic/src/nic_wol_virtues.c (modified) (view diffs)
• uspace/lib/posix/source/strings.c (modified) (view diffs)
• uspace/lib/usb/src/debug.c (modified) (view diffs)
• uspace/srv/fs/cdfs/cdfs_ops.c (modified) (view diffs)
• uspace/srv/fs/fat/fat_directory.c (modified) (view diffs)
• uspace/srv/fs/fat/fat_ops.c (modified) (view diffs)
• uspace/srv/fs/mfs/mfs_dentry.c (modified) (view diffs)
• uspace/srv/fs/mfs/mfs_ops.c (modified) (view diffs)
• uspace/srv/fs/udf/udf_volume.c (modified) (view diffs)
• uspace/srv/net/dnsrsrv/Makefile (added)
• uspace/srv/net/dnsrsrv/dns_msg.c (added)
• uspace/srv/net/dnsrsrv/dns_msg.h (added)
• uspace/srv/net/dnsrsrv/dns_std.h (added)
• uspace/srv/net/dnsrsrv/dns_type.h (added)
• uspace/srv/net/dnsrsrv/dnsrsrv.c (added)
• uspace/srv/net/dnsrsrv/query.c (added)
• uspace/srv/net/dnsrsrv/query.h (added)
• uspace/srv/net/dnsrsrv/transport.c (added)
• uspace/srv/net/dnsrsrv/transport.h (added)
• uspace/srv/net/inetsrv/addrobj.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/udp/assoc.c (modified) (view diffs)
• uspace/srv/net/udp/assoc.h (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_type.h (modified) (view diffs)