Changeset f51f193 in mainline
- Timestamp:
- 2011-07-12T03:00:14Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 6817eba
- Parents:
- eca52a8 (diff), 026793d (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:
-
- 90 added
- 16 deleted
- 166 edited
- 6 moved
-
HelenOS.config (modified) (view diffs)
-
boot/Makefile (modified) (view diffs)
-
boot/Makefile.silo (modified) (view diffs)
-
boot/Makefile.uboot (modified) (view diffs)
-
boot/arch/ia64/include/types.h (modified) (view diffs)
-
boot/arch/ia64/src/boot.S (modified) (view diffs)
-
boot/arch/ia64/src/main.c (modified) (view diffs)
-
boot/arch/mips32/Makefile.inc (modified) (view diffs)
-
boot/arch/mips64/Makefile.inc (added)
-
boot/arch/mips64/_link.ld.in (added)
-
boot/arch/mips64/include/arch.h (added)
-
boot/arch/mips64/include/asm.h (added)
-
boot/arch/mips64/include/main.h (added)
-
boot/arch/mips64/include/regname.h (added)
-
boot/arch/mips64/include/types.h (added)
-
boot/arch/mips64/src/asm.S (added)
-
boot/arch/mips64/src/main.c (added)
-
boot/arch/mips64/src/putchar.c (added)
-
boot/arch/sparc64/Makefile.inc (modified) (view diffs)
-
boot/arch/sparc64/src/main.c (modified) (view diffs)
-
boot/genarch/include/efi.h (added)
-
boot/silo/raw/isofs.b (deleted)
-
boot/silo/raw/second.b (deleted)
-
contrib/tools/serengeti_silo.sh (deleted)
-
defaults/mips64/Makefile.config (added)
-
defaults/mips64/msim/Makefile.config (added)
-
defaults/mips64/output (added)
-
defaults/sparc64/Makefile.config (modified) (view diffs)
-
defaults/sparc64/serengeti/Makefile.config (deleted)
-
kernel/arch/amd64/Makefile.inc (modified) (view diffs)
-
kernel/arch/arm32/src/mach/gta02/gta02.c (modified) (view diffs)
-
kernel/arch/arm32/src/mach/integratorcp/integratorcp.c (modified) (view diffs)
-
kernel/arch/ia32/src/boot/vesa_real.inc (modified) (view diffs)
-
kernel/arch/ia64/include/bootinfo.h (modified) (view diffs)
-
kernel/arch/ia64/src/drivers/ski.c (modified) (view diffs)
-
kernel/arch/ia64/src/ia64.c (modified) (view diffs)
-
kernel/arch/ia64/src/mm/frame.c (modified) (view diffs)
-
kernel/arch/mips32/Makefile.inc (modified) (view diffs)
-
kernel/arch/mips32/include/cycle.h (modified) (view diffs)
-
kernel/arch/mips32/include/debug.h (modified) (view diffs)
-
kernel/arch/mips32/include/mm/frame.h (modified) (view diffs)
-
kernel/arch/mips32/include/stack.h (modified) (view diffs)
-
kernel/arch/mips32/src/cache.c (modified) (view diffs)
-
kernel/arch/mips32/src/cpu/cpu.c (modified) (view diffs)
-
kernel/arch/mips32/src/fpu_context.c (modified) (view diffs)
-
kernel/arch/mips32/src/mm/as.c (modified) (view diffs)
-
kernel/arch/mips32/src/mm/tlb.c (modified) (view diffs)
-
kernel/arch/mips32/src/start.S (modified) (view diffs)
-
kernel/arch/mips64/Makefile.inc (added)
-
kernel/arch/mips64/_link.ld.in (added)
-
kernel/arch/mips64/include/arch.h (added)
-
kernel/arch/mips64/include/asm.h (added)
-
kernel/arch/mips64/include/asm/boot.h (added)
-
kernel/arch/mips64/include/asm/regname.h (added)
-
kernel/arch/mips64/include/atomic.h (added)
-
kernel/arch/mips64/include/barrier.h (added)
-
kernel/arch/mips64/include/cache.h (added)
-
kernel/arch/mips64/include/context.h (added)
-
kernel/arch/mips64/include/context_offset.h (added)
-
kernel/arch/mips64/include/cp0.h (added)
-
kernel/arch/mips64/include/cpu.h (moved) (moved from uspace/drv/bus/usb/usbmast/scsi.h ) (view diffs)
-
kernel/arch/mips64/include/cycle.h (added)
-
kernel/arch/mips64/include/debug.h (added)
-
kernel/arch/mips64/include/debugger.h (moved) (moved from kernel/genarch/include/ofw/fhc.h ) (view diffs)
-
kernel/arch/mips64/include/drivers/msim.h (added)
-
kernel/arch/mips64/include/elf.h (added)
-
kernel/arch/mips64/include/exception.h (added)
-
kernel/arch/mips64/include/faddr.h (moved) (moved from uspace/srv/hid/fb/sgcn.h ) (view diffs)
-
kernel/arch/mips64/include/fpu_context.h (added)
-
kernel/arch/mips64/include/interrupt.h (added)
-
kernel/arch/mips64/include/istate.h (added)
-
kernel/arch/mips64/include/mm/as.h (added)
-
kernel/arch/mips64/include/mm/asid.h (added)
-
kernel/arch/mips64/include/mm/frame.h (added)
-
kernel/arch/mips64/include/mm/page.h (added)
-
kernel/arch/mips64/include/mm/tlb.h (added)
-
kernel/arch/mips64/include/proc/task.h (moved) (moved from kernel/arch/sparc64/include/drivers/fhc.h ) (view diffs)
-
kernel/arch/mips64/include/proc/thread.h (added)
-
kernel/arch/mips64/include/smp/dorder.h (added)
-
kernel/arch/mips64/include/stack.h (added)
-
kernel/arch/mips64/include/types.h (added)
-
kernel/arch/mips64/src/asm.S (added)
-
kernel/arch/mips64/src/cache.c (added)
-
kernel/arch/mips64/src/context.S (added)
-
kernel/arch/mips64/src/cpu (added)
-
kernel/arch/mips64/src/ddi (added)
-
kernel/arch/mips64/src/debug (added)
-
kernel/arch/mips64/src/debugger.c (added)
-
kernel/arch/mips64/src/exception.c (added)
-
kernel/arch/mips64/src/fpu_context.c (added)
-
kernel/arch/mips64/src/interrupt.c (added)
-
kernel/arch/mips64/src/mips64.c (added)
-
kernel/arch/mips64/src/mm/as.c (added)
-
kernel/arch/mips64/src/mm/frame.c (added)
-
kernel/arch/mips64/src/mm/page.c (added)
-
kernel/arch/mips64/src/mm/tlb.c (added)
-
kernel/arch/mips64/src/smp/dorder.c (added)
-
kernel/arch/mips64/src/smp/smp.c (added)
-
kernel/arch/mips64/src/start.S (added)
-
kernel/arch/sparc64/Makefile.inc (modified) (view diffs)
-
kernel/arch/sparc64/include/drivers/sgcn.h (deleted)
-
kernel/arch/sparc64/src/console.c (modified) (view diffs)
-
kernel/arch/sparc64/src/drivers/fhc.c (deleted)
-
kernel/arch/sparc64/src/drivers/kbd.c (modified) (view diffs)
-
kernel/arch/sparc64/src/drivers/niagara.c (modified) (view diffs)
-
kernel/arch/sparc64/src/drivers/sgcn.c (deleted)
-
kernel/genarch/Makefile.inc (modified) (view diffs)
-
kernel/genarch/include/drivers/s3c24xx_uart/s3c24xx_uart.h (modified) (view diffs)
-
kernel/genarch/include/drivers/z8530/z8530.h (deleted)
-
kernel/genarch/src/drivers/dsrln/dsrlnout.c (modified) (view diffs)
-
kernel/genarch/src/drivers/ega/ega.c (modified) (view diffs)
-
kernel/genarch/src/drivers/s3c24xx_uart/s3c24xx_uart.c (modified) (view diffs)
-
kernel/genarch/src/drivers/z8530/z8530.c (deleted)
-
kernel/genarch/src/fb/fb.c (modified) (view diffs)
-
kernel/genarch/src/ofw/fhc.c (deleted)
-
kernel/generic/include/console/chardev.h (modified) (view diffs)
-
kernel/generic/include/console/console.h (modified) (view diffs)
-
kernel/generic/include/ddi/ddi.h (modified) (view diffs)
-
kernel/generic/include/mm/as.h (modified) (view diffs)
-
kernel/generic/include/panic.h (modified) (view diffs)
-
kernel/generic/include/syscall/syscall.h (modified) (view diffs)
-
kernel/generic/src/console/console.c (modified) (view diffs)
-
kernel/generic/src/ddi/ddi.c (modified) (view diffs)
-
kernel/generic/src/ddi/irq.c (modified) (view diffs)
-
kernel/generic/src/debug/panic.c (modified) (view diffs)
-
kernel/generic/src/lib/rd.c (modified) (view diffs)
-
kernel/generic/src/mm/as.c (modified) (view diffs)
-
kernel/generic/src/syscall/syscall.c (modified) (view diffs)
-
kernel/generic/src/time/clock.c (modified) (view diffs)
-
release/Makefile (modified) (view diffs)
-
tools/autotool.py (modified) (view diffs)
-
tools/toolchain.sh (modified) (view diffs)
-
uspace/Makefile (modified) (view diffs)
-
uspace/Makefile.common (modified) (view diffs)
-
uspace/app/ext2info/ext2info.c (modified) (view diffs)
-
uspace/app/init/init.c (modified) (view diffs)
-
uspace/app/ping/ping.c (modified) (view diffs)
-
uspace/app/trace/syscalls.c (modified) (view diffs)
-
uspace/drv/bus/usb/uhci/transfer_list.c (modified) (view diffs)
-
uspace/drv/bus/usb/usbmast/Makefile (modified) (view diffs)
-
uspace/drv/bus/usb/usbmast/cmds.c (added)
-
uspace/drv/bus/usb/usbmast/cmds.h (modified) (view diffs)
-
uspace/drv/bus/usb/usbmast/inquiry.c (deleted)
-
uspace/drv/bus/usb/usbmast/main.c (modified) (view diffs)
-
uspace/drv/bus/usb/usbmast/mast.c (modified) (view diffs)
-
uspace/drv/bus/usb/usbmast/mast.h (modified) (view diffs)
-
uspace/drv/bus/usb/usbmast/scsi_ms.c (added)
-
uspace/drv/bus/usb/usbmast/scsi_ms.h (added)
-
uspace/lib/c/Makefile (modified) (view diffs)
-
uspace/lib/c/arch/mips32/Makefile.common (modified) (view diffs)
-
uspace/lib/c/arch/mips32/include/atomic.h (modified) (view diffs)
-
uspace/lib/c/arch/mips32/include/fibril.h (modified) (view diffs)
-
uspace/lib/c/arch/mips32/include/thread.h (modified) (view diffs)
-
uspace/lib/c/arch/mips32/include/tls.h (modified) (view diffs)
-
uspace/lib/c/arch/mips32/include/types.h (modified) (view diffs)
-
uspace/lib/c/arch/mips32/src/syscall.c (modified) (view diffs)
-
uspace/lib/c/arch/mips32/src/tls.c (modified) (view diffs)
-
uspace/lib/c/arch/mips32eb/Makefile.common (modified) (view diffs)
-
uspace/lib/c/arch/mips64/Makefile.common (added)
-
uspace/lib/c/arch/mips64/Makefile.inc (added)
-
uspace/lib/c/arch/mips64/_link.ld.in (added)
-
uspace/lib/c/arch/mips64/include/atomic.h (added)
-
uspace/lib/c/arch/mips64/include/config.h (added)
-
uspace/lib/c/arch/mips64/include/ddi.h (added)
-
uspace/lib/c/arch/mips64/include/faddr.h (added)
-
uspace/lib/c/arch/mips64/include/fibril.h (added)
-
uspace/lib/c/arch/mips64/include/inttypes.h (added)
-
uspace/lib/c/arch/mips64/include/istate.h (added)
-
uspace/lib/c/arch/mips64/include/syscall.h (added)
-
uspace/lib/c/arch/mips64/include/thread.h (added)
-
uspace/lib/c/arch/mips64/include/tls.h (added)
-
uspace/lib/c/arch/mips64/include/types.h (added)
-
uspace/lib/c/arch/mips64/src/entry.s (added)
-
uspace/lib/c/arch/mips64/src/entryjmp.s (added)
-
uspace/lib/c/arch/mips64/src/fibril.S (added)
-
uspace/lib/c/arch/mips64/src/stacktrace.c (added)
-
uspace/lib/c/arch/mips64/src/stacktrace_asm.S (added)
-
uspace/lib/c/arch/mips64/src/syscall.c (added)
-
uspace/lib/c/arch/mips64/src/thread_entry.s (added)
-
uspace/lib/c/arch/mips64/src/tls.c (added)
-
uspace/lib/c/generic/adt/measured_strings.c (modified) (view diffs)
-
uspace/lib/c/generic/devman_obsolete.c (deleted)
-
uspace/lib/c/generic/io/console.c (modified) (view diffs)
-
uspace/lib/c/generic/net/icmp_api.c (modified) (view diffs)
-
uspace/lib/c/generic/net/icmp_common.c (modified) (view diffs)
-
uspace/lib/c/generic/net/modules.c (modified) (view diffs)
-
uspace/lib/c/generic/net/socket_client.c (modified) (view diffs)
-
uspace/lib/c/generic/str.c (modified) (view diffs)
-
uspace/lib/c/include/adt/measured_strings.h (modified) (view diffs)
-
uspace/lib/c/include/bitops.h (modified) (view diffs)
-
uspace/lib/c/include/fourcc.h (moved) (moved from uspace/lib/c/include/devman_obsolete.h ) (view diffs)
-
uspace/lib/c/include/ipc/console.h (modified) (view diffs)
-
uspace/lib/c/include/ipc/net.h (modified) (view diffs)
-
uspace/lib/c/include/ipc/services.h (modified) (view diffs)
-
uspace/lib/c/include/net/icmp_api.h (modified) (view diffs)
-
uspace/lib/c/include/net/icmp_common.h (modified) (view diffs)
-
uspace/lib/c/include/net/modules.h (modified) (view diffs)
-
uspace/lib/c/include/str.h (modified) (view diffs)
-
uspace/lib/drv/generic/driver.c (modified) (view diffs)
-
uspace/lib/drv/include/ddf/driver.h (modified) (view diffs)
-
uspace/lib/ext2/libext2_directory.c (modified) (view diffs)
-
uspace/lib/ext2/libext2_directory.h (modified) (view diffs)
-
uspace/lib/net/adt/module_map.c (modified) (view diffs)
-
uspace/lib/net/generic/generic.c (modified) (view diffs)
-
uspace/lib/net/generic/net_remote.c (modified) (view diffs)
-
uspace/lib/net/generic/packet_client.c (modified) (view diffs)
-
uspace/lib/net/generic/packet_remote.c (modified) (view diffs)
-
uspace/lib/net/il/arp_remote.c (modified) (view diffs)
-
uspace/lib/net/il/il_remote.c (modified) (view diffs)
-
uspace/lib/net/il/il_skel.c (modified) (view diffs)
-
uspace/lib/net/il/ip_remote.c (modified) (view diffs)
-
uspace/lib/net/include/adt/module_map.h (modified) (view diffs)
-
uspace/lib/net/include/arp_interface.h (modified) (view diffs)
-
uspace/lib/net/include/generic.h (modified) (view diffs)
-
uspace/lib/net/include/icmp_remote.h (modified) (view diffs)
-
uspace/lib/net/include/il_remote.h (modified) (view diffs)
-
uspace/lib/net/include/il_skel.h (modified) (view diffs)
-
uspace/lib/net/include/ip_interface.h (modified) (view diffs)
-
uspace/lib/net/include/ip_remote.h (modified) (view diffs)
-
uspace/lib/net/include/net_interface.h (modified) (view diffs)
-
uspace/lib/net/include/netif_remote.h (modified) (view diffs)
-
uspace/lib/net/include/netif_skel.h (modified) (view diffs)
-
uspace/lib/net/include/nil_remote.h (modified) (view diffs)
-
uspace/lib/net/include/nil_skel.h (modified) (view diffs)
-
uspace/lib/net/include/packet_client.h (modified) (view diffs)
-
uspace/lib/net/include/packet_remote.h (modified) (view diffs)
-
uspace/lib/net/include/socket_core.h (modified) (view diffs)
-
uspace/lib/net/include/tl_common.h (modified) (view diffs)
-
uspace/lib/net/include/tl_remote.h (modified) (view diffs)
-
uspace/lib/net/include/tl_skel.h (modified) (view diffs)
-
uspace/lib/net/netif/netif_remote.c (modified) (view diffs)
-
uspace/lib/net/netif/netif_skel.c (modified) (view diffs)
-
uspace/lib/net/nil/nil_remote.c (modified) (view diffs)
-
uspace/lib/net/nil/nil_skel.c (modified) (view diffs)
-
uspace/lib/net/tl/icmp_remote.c (modified) (view diffs)
-
uspace/lib/net/tl/socket_core.c (modified) (view diffs)
-
uspace/lib/net/tl/tl_common.c (modified) (view diffs)
-
uspace/lib/net/tl/tl_remote.c (modified) (view diffs)
-
uspace/lib/net/tl/tl_skel.c (modified) (view diffs)
-
uspace/lib/packet/generic/packet_server.c (modified) (view diffs)
-
uspace/lib/scsi/Makefile (moved) (moved from uspace/srv/hw/irc/fhc/Makefile ) (view diffs)
-
uspace/lib/scsi/include/scsi/sbc.h (added)
-
uspace/lib/scsi/include/scsi/spc.h (added)
-
uspace/lib/scsi/src/spc.c (added)
-
uspace/lib/softfloat/arch/mips32/include/functions.h (modified) (view diffs)
-
uspace/lib/softfloat/arch/mips64/include/functions.h (added)
-
uspace/lib/usbhost/src/batch.c (modified) (view diffs)
-
uspace/srv/bd/ata_bd/ata_bd.c (modified) (view diffs)
-
uspace/srv/fs/ext2fs/ext2fs_ops.c (modified) (view diffs)
-
uspace/srv/hid/console/console.c (modified) (view diffs)
-
uspace/srv/hid/fb/Makefile (modified) (view diffs)
-
uspace/srv/hid/fb/main.c (modified) (view diffs)
-
uspace/srv/hid/fb/niagara.c (modified) (view diffs)
-
uspace/srv/hid/fb/niagara.h (modified) (view diffs)
-
uspace/srv/hid/fb/sgcn.c (deleted)
-
uspace/srv/hid/input/Makefile (modified) (view diffs)
-
uspace/srv/hid/input/generic/input.c (modified) (view diffs)
-
uspace/srv/hid/input/include/kbd_port.h (modified) (view diffs)
-
uspace/srv/hid/input/port/niagara.c (modified) (view diffs)
-
uspace/srv/hid/input/port/sgcn.c (deleted)
-
uspace/srv/hid/input/port/z8530.c (deleted)
-
uspace/srv/hw/irc/fhc/fhc.c (deleted)
-
uspace/srv/hw/netif/ne2000/ne2000.c (modified) (view diffs)
-
uspace/srv/net/il/arp/arp.c (modified) (view diffs)
-
uspace/srv/net/il/arp/arp.h (modified) (view diffs)
-
uspace/srv/net/il/ip/ip.c (modified) (view diffs)
-
uspace/srv/net/il/ip/ip.h (modified) (view diffs)
-
uspace/srv/net/net/net.c (modified) (view diffs)
-
uspace/srv/net/netif/lo/lo.c (modified) (view diffs)
-
uspace/srv/net/nil/eth/eth.c (modified) (view diffs)
-
uspace/srv/net/nil/eth/eth.h (modified) (view diffs)
-
uspace/srv/net/nil/nildummy/nildummy.c (modified) (view diffs)
-
uspace/srv/net/nil/nildummy/nildummy.h (modified) (view diffs)
-
uspace/srv/net/tl/icmp/icmp.c (modified) (view diffs)
-
uspace/srv/net/tl/tcp/tcp.c (modified) (view diffs)
-
uspace/srv/net/tl/tcp/tcp.h (modified) (view diffs)
-
uspace/srv/net/tl/udp/udp.c (modified) (view diffs)
-
uspace/srv/net/tl/udp/udp.h (modified) (view diffs)
Note:
See TracChangeset
for help on using the changeset viewer.
