Changeset fedac2f in mainline for uspace

Timestamp:

2012-09-16T11:27:35Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

289fa65

Parents:

8930624 (diff), 00b4a68 (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

Location:

uspace

Files:

• Makefile (modified) (view diffs)
• app/logset/Makefile (added)
• app/logset/main.c (added)
• app/tester/Makefile (modified) (view diffs)
• app/tester/ext2/ext2_1.c (moved) (moved from uspace/app/tester/libext2/libext2_1.c ) (view diffs)
• app/tester/ext2/ext2_1.def (moved) (moved from uspace/app/tester/libext2/libext2_1.def ) (view diffs)
• app/tester/float/float1.c (added)
• app/tester/float/float1.def (added)
• app/tester/float/softfloat1.c (added)
• app/tester/float/softfloat1.def (added)
• app/tester/stdio/logger1.c (added)
• app/tester/stdio/logger1.def (added)
• app/tester/stdio/logger2.c (added)
• app/tester/stdio/logger2.def (added)
• app/tester/tester.c (modified) (view diffs)
• app/tester/tester.h (modified) (view diffs)
• app/vuhid/main.c (modified) (view diffs)
• drv/block/ahci/ahci.c (modified) (view diffs)
• drv/bus/isa/isa.c (modified) (view diffs)
• drv/bus/pci/pciintel/pci.c (modified) (view diffs)
• drv/bus/usb/ehci/main.c (modified) (view diffs)
• drv/bus/usb/ohci/main.c (modified) (view diffs)
• drv/bus/usb/uhci/main.c (modified) (view diffs)
• drv/bus/usb/uhcirh/main.c (modified) (view diffs)
• drv/bus/usb/usbflbk/main.c (modified) (view diffs)
• drv/bus/usb/usbhid/main.c (modified) (view diffs)
• drv/bus/usb/usbhub/main.c (modified) (view diffs)
• drv/bus/usb/usbmast/main.c (modified) (view diffs)
• drv/bus/usb/usbmid/main.c (modified) (view diffs)
• drv/bus/usb/vhc/Makefile (modified) (view diffs)
• drv/bus/usb/vhc/main.c (modified) (view diffs)
• drv/char/i8042/i8042.c (modified) (view diffs)
• drv/char/i8042/main.c (modified) (view diffs)
• drv/char/ns8250/ns8250.c (modified) (view diffs)
• drv/char/ps2mouse/main.c (modified) (view diffs)
• drv/char/xtkbd/main.c (modified) (view diffs)
• drv/infrastructure/root/root.c (modified) (view diffs)
• drv/infrastructure/rootmac/rootmac.c (modified) (view diffs)
• drv/infrastructure/rootpc/rootpc.c (modified) (view diffs)
• drv/infrastructure/rootvirt/rootvirt.c (modified) (view diffs)
• drv/nic/e1k/e1k.c (modified) (view diffs)
• drv/nic/rtl8139/driver.c (modified) (view diffs)
• drv/test/test1/test1.c (modified) (view diffs)
• drv/test/test2/test2.c (modified) (view diffs)
• drv/test/test3/test3.c (modified) (view diffs)
• lib/c/Makefile (modified) (view diffs)
• lib/c/arch/abs32le/_link.ld.in (modified) (view diffs)
• lib/c/arch/amd64/_link.ld.in (modified) (view diffs)
• lib/c/arch/arm32/Makefile.common (modified) (view diffs)
• lib/c/arch/arm32/_link.ld.in (modified) (view diffs)
• lib/c/arch/ia32/_link.ld.in (modified) (view diffs)
• lib/c/arch/ia64/_link.ld.in (modified) (view diffs)
• lib/c/arch/mips32/_link.ld.in (modified) (view diffs)
• lib/c/arch/mips64/_link.ld.in (modified) (view diffs)
• lib/c/arch/ppc32/_link.ld.in (modified) (view diffs)
• lib/c/arch/sparc64/_link.ld.in (modified) (view diffs)
• lib/c/generic/io/log.c (modified) (view diffs)
• lib/c/generic/io/logctl.c (added)
• lib/c/include/io/log.h (modified) (view diffs)
• lib/c/include/io/logctl.h (added)
• lib/c/include/ipc/logger.h (added)
• lib/c/include/ipc/services.h (modified) (view diffs)
• lib/drv/generic/log.c (modified) (view diffs)
• lib/drv/include/ddf/log.h (modified) (view diffs)
• lib/fs/libfs.c (modified) (view diffs)
• lib/softfloat/Makefile (modified) (view diffs)
• lib/softfloat/add.c (moved) (moved from uspace/lib/softfloat/generic/add.c ) (view diffs)
• lib/softfloat/add.h (moved) (moved from uspace/lib/softfloat/include/add.h ) (view diffs)
• lib/softfloat/common.c (moved) (moved from uspace/lib/softfloat/generic/common.c ) (view diffs)
• lib/softfloat/common.h (moved) (moved from uspace/lib/softfloat/include/common.h ) (view diffs)
• lib/softfloat/comparison.c (moved) (moved from uspace/lib/softfloat/generic/comparison.c ) (view diffs)
• lib/softfloat/comparison.h (moved) (moved from uspace/lib/softfloat/include/comparison.h ) (view diffs)
• lib/softfloat/conversion.c (moved) (moved from uspace/lib/softfloat/generic/conversion.c ) (view diffs)
• lib/softfloat/conversion.h (moved) (moved from uspace/lib/softfloat/include/conversion.h ) (view diffs)
• lib/softfloat/div.c (moved) (moved from uspace/lib/softfloat/generic/div.c ) (view diffs)
• lib/softfloat/div.h (moved) (moved from uspace/lib/softfloat/include/div.h ) (view diffs)
• lib/softfloat/mul.c (moved) (moved from uspace/lib/softfloat/generic/mul.c ) (view diffs)
• lib/softfloat/mul.h (moved) (moved from uspace/lib/softfloat/include/mul.h ) (view diffs)
• lib/softfloat/other.c (moved) (moved from uspace/lib/softfloat/generic/other.c ) (view diffs)
• lib/softfloat/other.h (moved) (moved from uspace/lib/softfloat/include/other.h ) (view diffs)
• lib/softfloat/sftypes.h (moved) (moved from uspace/lib/softfloat/include/sftypes.h ) (view diffs)
• lib/softfloat/softfloat.c (moved) (moved from uspace/lib/softfloat/generic/softfloat.c ) (view diffs)
• lib/softfloat/softfloat.h (moved) (moved from uspace/lib/softfloat/include/softfloat.h ) (view diffs)
• lib/softfloat/sub.c (moved) (moved from uspace/lib/softfloat/generic/sub.c ) (view diffs)
• lib/softfloat/sub.h (moved) (moved from uspace/lib/softfloat/include/sub.h ) (view diffs)
• lib/usb/include/usb/debug.h (modified) (view diffs)
• lib/usb/src/debug.c (modified) (view diffs)
• srv/devman/devman.c (modified) (view diffs)
• srv/devman/main.c (modified) (view diffs)
• srv/fs/udf/udf.c (modified) (view diffs)
• srv/fs/udf/udf_file.c (modified) (view diffs)
• srv/fs/udf/udf_ops.c (modified) (view diffs)
• srv/fs/udf/udf_volume.c (modified) (view diffs)
• srv/logger/Makefile (added)
• srv/logger/ctl.c (added)
• srv/logger/initlvl.c (added)
• srv/logger/level.c (added)
• srv/logger/logger.h (added)
• srv/logger/logs.c (added)
• srv/logger/main.c (added)
• srv/logger/writer.c (added)
• srv/net/ethip/arp.c (modified) (view diffs)
• srv/net/ethip/ethip.c (modified) (view diffs)
• srv/net/ethip/ethip_nic.c (modified) (view diffs)
• srv/net/ethip/pdu.c (modified) (view diffs)
• srv/net/inetsrv/addrobj.c (modified) (view diffs)
• srv/net/inetsrv/icmp.c (modified) (view diffs)
• srv/net/inetsrv/inet_link.c (modified) (view diffs)
• srv/net/inetsrv/inetcfg.c (modified) (view diffs)
• srv/net/inetsrv/inetping.c (modified) (view diffs)
• srv/net/inetsrv/inetsrv.c (modified) (view diffs)
• srv/net/inetsrv/pdu.c (modified) (view diffs)
• srv/net/inetsrv/reass.c (modified) (view diffs)
• srv/net/inetsrv/sroute.c (modified) (view diffs)
• srv/net/loopip/loopip.c (modified) (view diffs)
• srv/net/tcp/conn.c (modified) (view diffs)
• srv/net/tcp/iqueue.c (modified) (view diffs)
• srv/net/tcp/ncsim.c (modified) (view diffs)
• srv/net/tcp/rqueue.c (modified) (view diffs)
• srv/net/tcp/segment.c (modified) (view diffs)
• srv/net/tcp/sock.c (modified) (view diffs)
• srv/net/tcp/tcp.c (modified) (view diffs)
• srv/net/tcp/tqueue.c (modified) (view diffs)
• srv/net/tcp/ucall.c (modified) (view diffs)
• srv/net/udp/assoc.c (modified) (view diffs)
• srv/net/udp/sock.c (modified) (view diffs)
• srv/net/udp/ucall.c (modified) (view diffs)
• srv/net/udp/udp.c (modified) (view diffs)
• srv/net/udp/udp_inet.c (modified) (view diffs)