- Timestamp:
- 2012-10-23T13:16:49Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 6ecf5b8
- Parents:
- 32b3a12 (diff), b2ac3998 (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. - Location:
- uspace
- Files:
-
- 105 added
- 1 deleted
- 148 edited
- 22 moved
-
Makefile (modified) (view diffs)
-
Makefile.common (modified) (view diffs)
-
app/bdsh/Makefile (modified) (view diffs)
-
app/bdsh/cmds/modules/cmp/cmp.c (added)
-
app/bdsh/cmds/modules/cmp/cmp.h (added)
-
app/bdsh/cmds/modules/cmp/cmp_def.h (added)
-
app/bdsh/cmds/modules/cmp/entry.h (added)
-
app/bdsh/cmds/modules/modules.h (modified) (view diffs)
-
app/bdsh/config.h (modified) (view diffs)
-
app/bithenge/Makefile (added)
-
app/bithenge/Makefile.linux (added)
-
app/bithenge/test.c (added)
-
app/date/Makefile (added)
-
app/date/date.c (added)
-
app/devctl/devctl.c (modified) (view diffs)
-
app/logset/Makefile (added)
-
app/logset/main.c (added)
-
app/mkexfat/mkexfat.c (modified) (view diffs)
-
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/trace/ipcp.c (modified) (view diffs)
-
app/trace/proto.c (modified) (view diffs)
-
app/trace/proto.h (modified) (view diffs)
-
app/vuhid/main.c (modified) (view diffs)
-
dist/src/bithenge/basic.bh (added)
-
dist/src/bithenge/basic.dat (added)
-
dist/src/bithenge/basic.out (added)
-
dist/src/bithenge/bits.bh (added)
-
dist/src/bithenge/bits.dat (added)
-
dist/src/bithenge/bits.out (added)
-
dist/src/bithenge/cond.bh (added)
-
dist/src/bithenge/cond.dat (added)
-
dist/src/bithenge/cond.out (added)
-
dist/src/bithenge/expression.bh (added)
-
dist/src/bithenge/expression.dat (added)
-
dist/src/bithenge/expression.out (added)
-
dist/src/bithenge/fat.bh (added)
-
dist/src/bithenge/fat.dat (added)
-
dist/src/bithenge/fat.out (added)
-
dist/src/bithenge/gif/blue_1x1.gif (added)
-
dist/src/bithenge/gif/gif.bh (added)
-
dist/src/bithenge/gif/helenos.gif (added)
-
dist/src/bithenge/gif/loader.gif (added)
-
dist/src/bithenge/gif/readme (added)
-
dist/src/bithenge/repeat.bh (added)
-
dist/src/bithenge/repeat.dat (added)
-
dist/src/bithenge/repeat.out (added)
-
dist/src/bithenge/test.bdsh (added)
-
dist/src/bithenge/test.sh (added)
-
dist/src/bithenge/trip.bh (added)
-
dist/src/bithenge/trip.dat (added)
-
dist/src/bithenge/trip.out (added)
-
dist/src/bithenge/usbdesc.bh (added)
-
dist/src/bithenge/usbdesc.kbd.dat (added)
-
dist/src/bithenge/usbdesc.kbd.out (added)
-
drv/block/ahci/ahci.c (modified) (view diffs)
-
drv/bus/isa/isa.c (modified) (view diffs)
-
drv/bus/isa/isa.dev (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)
-
drv/time/cmos-rtc/Makefile (added)
-
drv/time/cmos-rtc/cmos-regs.h (added)
-
drv/time/cmos-rtc/cmos-rtc.c (added)
-
drv/time/cmos-rtc/cmos-rtc.ma (added)
-
lib/bithenge/Makefile (added)
-
lib/bithenge/Makefile.linux (added)
-
lib/bithenge/include/bithenge/blob.h (added)
-
lib/bithenge/include/bithenge/compound.h (added)
-
lib/bithenge/include/bithenge/expression.h (added)
-
lib/bithenge/include/bithenge/file.h (added)
-
lib/bithenge/include/bithenge/os.h (added)
-
lib/bithenge/include/bithenge/print.h (added)
-
lib/bithenge/include/bithenge/script.h (added)
-
lib/bithenge/include/bithenge/sequence.h (added)
-
lib/bithenge/include/bithenge/source.h (added)
-
lib/bithenge/include/bithenge/transform.h (added)
-
lib/bithenge/include/bithenge/tree.h (added)
-
lib/bithenge/src/blob.c (added)
-
lib/bithenge/src/common.h (added)
-
lib/bithenge/src/compound.c (added)
-
lib/bithenge/src/expression.c (added)
-
lib/bithenge/src/failure.c (added)
-
lib/bithenge/src/failure.h (added)
-
lib/bithenge/src/file.c (added)
-
lib/bithenge/src/helenos/block.c (added)
-
lib/bithenge/src/helenos/block.h (added)
-
lib/bithenge/src/helenos/common.h (added)
-
lib/bithenge/src/linux/common.h (added)
-
lib/bithenge/src/print.c (added)
-
lib/bithenge/src/script.c (added)
-
lib/bithenge/src/sequence.c (added)
-
lib/bithenge/src/source.c (added)
-
lib/bithenge/src/transform.c (added)
-
lib/bithenge/src/tree.c (added)
-
lib/block/block.c (modified) (view diffs)
-
lib/block/block.h (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/Makefile.common (modified) (view diffs)
-
lib/c/arch/mips32/_link.ld.in (modified) (view diffs)
-
lib/c/arch/mips32eb/Makefile.common (modified) (view diffs)
-
lib/c/arch/mips64/Makefile.common (modified) (view diffs)
-
lib/c/arch/mips64/_link.ld.in (modified) (view diffs)
-
lib/c/arch/ppc32/Makefile.common (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/adt/hash_set.c (deleted)
-
lib/c/generic/adt/hash_table.c (modified) (view diffs)
-
lib/c/generic/async.c (modified) (view diffs)
-
lib/c/generic/device/battery_dev.c (added)
-
lib/c/generic/device/clock_dev.c (added)
-
lib/c/generic/dlfcn.c (modified) (view diffs)
-
lib/c/generic/fibril_synch.c (modified) (view diffs)
-
lib/c/generic/io/log.c (modified) (view diffs)
-
lib/c/generic/io/logctl.c (added)
-
lib/c/generic/time.c (modified) (view diffs)
-
lib/c/include/adt/hash.h (added)
-
lib/c/include/adt/hash_table.h (modified) (view diffs)
-
lib/c/include/adt/list.h (modified) (view diffs)
-
lib/c/include/device/battery_dev.h (added)
-
lib/c/include/device/clock_dev.h (added)
-
lib/c/include/io/log.h (modified) (view diffs)
-
lib/c/include/io/logctl.h (added)
-
lib/c/include/ipc/dev_iface.h (modified) (view diffs)
-
lib/c/include/ipc/logger.h (moved) (moved from uspace/lib/c/include/adt/hash_set.h ) (view diffs)
-
lib/c/include/ipc/services.h (modified) (view diffs)
-
lib/c/include/macros.h (modified) (view diffs)
-
lib/c/include/sys/time.h (modified) (view diffs)
-
lib/drv/Makefile (modified) (view diffs)
-
lib/drv/generic/dev_iface.c (modified) (view diffs)
-
lib/drv/generic/log.c (modified) (view diffs)
-
lib/drv/generic/remote_battery_dev.c (added)
-
lib/drv/generic/remote_clock_dev.c (added)
-
lib/drv/include/ddf/log.h (modified) (view diffs)
-
lib/drv/include/ops/battery_dev.h (added)
-
lib/drv/include/ops/clock_dev.h (added)
-
lib/drv/include/remote_battery_dev.h (added)
-
lib/drv/include/remote_clock_dev.h (added)
-
lib/ext4/libext4_crc.c (modified) (view diffs)
-
lib/ext4/libext4_filesystem.c (modified) (view diffs)
-
lib/ext4/libext4_hash.c (modified) (view diffs)
-
lib/fs/libfs.c (modified) (view diffs)
-
lib/nic/include/nic.h (modified) (view diffs)
-
lib/nic/include/nic_addr_db.h (modified) (view diffs)
-
lib/nic/include/nic_wol_virtues.h (modified) (view diffs)
-
lib/nic/src/nic_addr_db.c (modified) (view diffs)
-
lib/nic/src/nic_wol_virtues.c (modified) (view diffs)
-
lib/posix/include/posix/time.h (modified) (view diffs)
-
lib/posix/source/time.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/devman.h (modified) (view diffs)
-
srv/devman/main.c (modified) (view diffs)
-
srv/fs/cdfs/cdfs_ops.c (modified) (view diffs)
-
srv/fs/exfat/exfat.h (modified) (view diffs)
-
srv/fs/exfat/exfat_idx.c (modified) (view diffs)
-
srv/fs/exfat/exfat_ops.c (modified) (view diffs)
-
srv/fs/ext2fs/ext2fs_ops.c (modified) (view diffs)
-
srv/fs/ext4fs/ext4fs_ops.c (modified) (view diffs)
-
srv/fs/fat/fat.h (modified) (view diffs)
-
srv/fs/fat/fat_idx.c (modified) (view diffs)
-
srv/fs/locfs/locfs_ops.c (modified) (view diffs)
-
srv/fs/mfs/mfs.h (modified) (view diffs)
-
srv/fs/mfs/mfs_ops.c (modified) (view diffs)
-
srv/fs/tmpfs/tmpfs.h (modified) (view diffs)
-
srv/fs/tmpfs/tmpfs_ops.c (modified) (view diffs)
-
srv/fs/udf/udf.c (modified) (view diffs)
-
srv/fs/udf/udf.h (modified) (view diffs)
-
srv/fs/udf/udf_file.c (modified) (view diffs)
-
srv/fs/udf/udf_idx.c (modified) (view diffs)
-
srv/fs/udf/udf_ops.c (modified) (view diffs)
-
srv/fs/udf/udf_volume.c (modified) (view diffs)
-
srv/hid/input/gsp.c (modified) (view diffs)
-
srv/hid/input/gsp.h (modified) (view diffs)
-
srv/locsrv/locsrv.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)
-
srv/ns/service.c (modified) (view diffs)
-
srv/ns/task.c (modified) (view diffs)
-
srv/vfs/vfs.h (modified) (view diffs)
-
srv/vfs/vfs_node.c (modified) (view diffs)
Note:
See TracChangeset
for help on using the changeset viewer.
