Changeset 5856b627 in mainline
- Timestamp:
- 2013-08-20T12:36:48Z (11 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 26e2de3
- Parents:
- 0ee999d (diff), 4da8fdb (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. - Files:
-
- 59 added
- 72 edited
-
HelenOS.config (modified) (view diffs)
-
boot/Makefile.common (modified) (view diffs)
-
boot/arch/amd64/Makefile.inc (modified) (view diffs)
-
boot/arch/arm32/include/cp15.h (added)
-
boot/arch/arm32/src/asm.S (modified) (view diffs)
-
boot/arch/arm32/src/main.c (modified) (view diffs)
-
boot/arch/arm32/src/mm.c (modified) (view diffs)
-
contrib/conf/ia32-qe.sh (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/special/Makefile.config (modified) (view diffs)
-
kernel/arch/arm32/include/arch/asm.h (modified) (view diffs)
-
kernel/arch/arm32/include/arch/cp15.h (modified) (view diffs)
-
kernel/arch/arm32/include/arch/mm/page.h (modified) (view diffs)
-
kernel/arch/arm32/include/arch/mm/page_armv4.h (modified) (view diffs)
-
kernel/arch/arm32/include/arch/mm/page_armv6.h (modified) (view diffs)
-
kernel/arch/arm32/src/cpu/cpu.c (modified) (view diffs)
-
kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c (modified) (view diffs)
-
kernel/arch/arm32/src/mm/tlb.c (modified) (view diffs)
-
kernel/arch/ia32/src/mm/frame.c (modified) (view diffs)
-
kernel/genarch/include/genarch/drivers/amdm37x/gpt.h (modified) (view diffs)
-
kernel/genarch/src/mm/page_pt.c (modified) (view diffs)
-
kernel/generic/include/mm/as.h (modified) (view diffs)
-
kernel/generic/include/mm/frame.h (modified) (view diffs)
-
kernel/generic/src/ddi/ddi.c (modified) (view diffs)
-
kernel/generic/src/mm/as.c (modified) (view diffs)
-
kernel/generic/src/mm/frame.c (modified) (view diffs)
-
uspace/Makefile (modified) (view diffs)
-
uspace/Makefile.common (modified) (view diffs)
-
uspace/app/init/init.c (modified) (view diffs)
-
uspace/app/mixerctl/Makefile (added)
-
uspace/app/mixerctl/mixerctl.c (added)
-
uspace/app/ping/ping.c (modified) (view diffs)
-
uspace/app/ping6/ping6.c (modified) (view diffs)
-
uspace/app/wavplay/Makefile (added)
-
uspace/app/wavplay/dplay.c (added)
-
uspace/app/wavplay/dplay.h (added)
-
uspace/app/wavplay/drec.c (added)
-
uspace/app/wavplay/drec.h (added)
-
uspace/app/wavplay/main.c (added)
-
uspace/app/wavplay/wave.c (added)
-
uspace/app/wavplay/wave.h (added)
-
uspace/drv/audio/sb16/Makefile (added)
-
uspace/drv/audio/sb16/ddf_log.h (added)
-
uspace/drv/audio/sb16/dsp.c (added)
-
uspace/drv/audio/sb16/dsp.h (added)
-
uspace/drv/audio/sb16/dsp_commands.h (added)
-
uspace/drv/audio/sb16/main.c (added)
-
uspace/drv/audio/sb16/mixer.c (added)
-
uspace/drv/audio/sb16/mixer.h (added)
-
uspace/drv/audio/sb16/mixer_iface.c (added)
-
uspace/drv/audio/sb16/pcm_iface.c (added)
-
uspace/drv/audio/sb16/registers.h (added)
-
uspace/drv/audio/sb16/sb16.c (added)
-
uspace/drv/audio/sb16/sb16.h (added)
-
uspace/drv/audio/sb16/sb16.ma (added)
-
uspace/drv/bus/isa/i8237.c (modified) (view diffs)
-
uspace/drv/bus/isa/i8237.h (modified) (view diffs)
-
uspace/drv/bus/isa/isa.c (modified) (view diffs)
-
uspace/drv/infrastructure/root/root.c (modified) (view diffs)
-
uspace/drv/infrastructure/rootamdm37x/rootamdm37x.c (modified) (view diffs)
-
uspace/drv/infrastructure/rootamdm37x/uhh.h (modified) (view diffs)
-
uspace/drv/nic/e1k/e1k.c (modified) (view diffs)
-
uspace/lib/c/generic/async.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/inet/addr.c (modified) (view diffs)
-
uspace/lib/c/include/async.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/ipc/dev_iface.h (modified) (view diffs)
-
uspace/lib/drv/Makefile (modified) (view diffs)
-
uspace/lib/drv/generic/dev_iface.c (modified) (view diffs)
-
uspace/lib/drv/generic/remote_audio_mixer.c (added)
-
uspace/lib/drv/generic/remote_audio_pcm.c (added)
-
uspace/lib/drv/generic/remote_hw_res.c (modified) (view diffs)
-
uspace/lib/drv/include/audio_mixer_iface.h (added)
-
uspace/lib/drv/include/audio_pcm_iface.h (added)
-
uspace/lib/drv/include/ops/hw_res.h (modified) (view diffs)
-
uspace/lib/drv/include/remote_audio_mixer.h (added)
-
uspace/lib/drv/include/remote_audio_pcm.h (added)
-
uspace/lib/hound/Makefile (added)
-
uspace/lib/hound/include/hound/client.h (added)
-
uspace/lib/hound/include/hound/protocol.h (added)
-
uspace/lib/hound/include/hound/server.h (added)
-
uspace/lib/hound/src/client.c (added)
-
uspace/lib/hound/src/protocol.c (added)
-
uspace/lib/pcm/Makefile (added)
-
uspace/lib/pcm/include/pcm/format.h (added)
-
uspace/lib/pcm/include/pcm/sample_format.h (added)
-
uspace/lib/pcm/src/format.c (added)
-
uspace/lib/posix/include/posix/stdio.h (modified) (view diffs)
-
uspace/lib/posix/include/posix/stdlib.h (modified) (view diffs)
-
uspace/lib/posix/include/posix/time.h (modified) (view diffs)
-
uspace/lib/posix/include/posix/unistd.h (modified) (view diffs)
-
uspace/lib/posix/source/stdlib.c (modified) (view diffs)
-
uspace/lib/posix/source/time.c (modified) (view diffs)
-
uspace/lib/posix/source/unistd.c (modified) (view diffs)
-
uspace/lib/softfloat/softfloat.c (modified) (view diffs)
-
uspace/lib/softfloat/softfloat.h (modified) (view diffs)
-
uspace/srv/audio/hound/Makefile (added)
-
uspace/srv/audio/hound/audio_data.c (added)
-
uspace/srv/audio/hound/audio_data.h (added)
-
uspace/srv/audio/hound/audio_device.c (added)
-
uspace/srv/audio/hound/audio_device.h (added)
-
uspace/srv/audio/hound/audio_sink.c (added)
-
uspace/srv/audio/hound/audio_sink.h (added)
-
uspace/srv/audio/hound/audio_source.c (added)
-
uspace/srv/audio/hound/audio_source.h (added)
-
uspace/srv/audio/hound/connection.c (added)
-
uspace/srv/audio/hound/connection.h (added)
-
uspace/srv/audio/hound/hound.c (added)
-
uspace/srv/audio/hound/hound.h (added)
-
uspace/srv/audio/hound/hound_ctx.c (added)
-
uspace/srv/audio/hound/hound_ctx.h (added)
-
uspace/srv/audio/hound/iface.c (added)
-
uspace/srv/audio/hound/log.h (added)
-
uspace/srv/audio/hound/main.c (added)
-
uspace/srv/hid/compositor/compositor.c (modified) (view diffs)
-
uspace/srv/locsrv/locsrv.c (modified) (view diffs)
-
uspace/srv/net/ethip/ethip.h (modified) (view diffs)
-
uspace/srv/net/ethip/ethip_nic.c (modified) (view diffs)
-
uspace/srv/net/inetsrv/inetsrv.c (modified) (view diffs)
-
uspace/srv/net/inetsrv/ndp.c (modified) (view diffs)
Note:
See TracChangeset
for help on using the changeset viewer.
