Changeset a676574 in mainline
- Timestamp:
- 2011-01-09T12:18:00Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 54de5ebd
- Parents:
- a3eeef45 (diff), 9d12059 (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:
-
- 9 added
- 6 deleted
- 120 edited
- 11 moved
-
boot/Makefile.common (modified) (view diffs)
-
boot/arch/amd64/Makefile.inc (modified) (view diffs)
-
boot/arch/ia64/Makefile.inc (modified) (view diffs)
-
boot/arch/sparc64/Makefile.inc (modified) (view diffs)
-
contrib/conf/net-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/ppc32/Makefile.config (modified) (view diffs)
-
defaults/sparc64/Makefile.config (modified) (view diffs)
-
defaults/special/Makefile.config (modified) (view diffs)
-
kernel/arch/amd64/include/interrupt.h (modified) (view diffs)
-
kernel/arch/amd64/src/amd64.c (modified) (view diffs)
-
kernel/arch/amd64/src/interrupt.c (modified) (view diffs)
-
kernel/arch/ia32/include/interrupt.h (modified) (view diffs)
-
kernel/arch/ia32/src/drivers/i8259.c (modified) (view diffs)
-
kernel/arch/ia32/src/ia32.c (modified) (view diffs)
-
kernel/arch/ia32/src/interrupt.c (modified) (view diffs)
-
kernel/arch/ia32/src/smp/apic.c (modified) (view diffs)
-
kernel/generic/include/ddi/irq.h (modified) (view diffs)
-
kernel/generic/include/interrupt.h (modified) (view diffs)
-
kernel/generic/include/proc/task.h (modified) (view diffs)
-
kernel/generic/include/syscall/syscall.h (modified) (view diffs)
-
kernel/generic/src/interrupt/interrupt.c (modified) (view diffs)
-
kernel/generic/src/ipc/ipc.c (modified) (view diffs)
-
kernel/generic/src/ipc/irq.c (modified) (view diffs)
-
kernel/generic/src/main/main.c (modified) (view diffs)
-
kernel/generic/src/proc/task.c (modified) (view diffs)
-
kernel/generic/src/syscall/syscall.c (modified) (view diffs)
-
uspace/Makefile (modified) (view diffs)
-
uspace/app/init/init.c (modified) (view diffs)
-
uspace/app/kill/Makefile (added)
-
uspace/app/kill/kill.c (added)
-
uspace/app/killall/Makefile (moved) (moved from uspace/srv/net/cfg/Makefile ) (view diffs)
-
uspace/app/killall/killall.c (moved) (moved from uspace/app/tester/ipc/connect.c ) (view diffs)
-
uspace/app/netecho/netecho.c (modified) (view diffs)
-
uspace/app/taskdump/taskdump.c (modified) (view diffs)
-
uspace/app/tester/Makefile (modified) (view diffs)
-
uspace/app/tester/ipc/connect.def (deleted)
-
uspace/app/tester/ipc/register.def (deleted)
-
uspace/app/tester/tester.c (modified) (view diffs)
-
uspace/app/tester/tester.h (modified) (view diffs)
-
uspace/app/tester/vfs/vfs1.c (modified) (view diffs)
-
uspace/app/websrv/Makefile (added)
-
uspace/app/websrv/websrv.c (added)
-
uspace/drv/ns8250/ns8250.c (modified) (view diffs)
-
uspace/drv/pciintel/pci.c (modified) (view diffs)
-
uspace/lib/c/Makefile (modified) (view diffs)
-
uspace/lib/c/generic/adt/char_map.c (modified) (view diffs)
-
uspace/lib/c/generic/adt/measured_strings.c (modified) (view diffs)
-
uspace/lib/c/generic/async.c (modified) (view diffs)
-
uspace/lib/c/generic/async_rel.c (deleted)
-
uspace/lib/c/generic/async_sess.c (added)
-
uspace/lib/c/generic/device/hw_res.c (modified) (view diffs)
-
uspace/lib/c/generic/devman.c (modified) (view diffs)
-
uspace/lib/c/generic/devmap.c (modified) (view diffs)
-
uspace/lib/c/generic/fibril.c (modified) (view diffs)
-
uspace/lib/c/generic/fibril_synch.c (modified) (view diffs)
-
uspace/lib/c/generic/io/vprintf.c (modified) (view diffs)
-
uspace/lib/c/generic/libc.c (modified) (view diffs)
-
uspace/lib/c/generic/mem.c (modified) (view diffs)
-
uspace/lib/c/generic/net/icmp_api.c (modified) (view diffs)
-
uspace/lib/c/generic/net/inet.c (modified) (view diffs)
-
uspace/lib/c/generic/net/modules.c (modified) (view diffs)
-
uspace/lib/c/generic/net/packet.c (modified) (view diffs)
-
uspace/lib/c/generic/net/socket_client.c (modified) (view diffs)
-
uspace/lib/c/generic/task.c (modified) (view diffs)
-
uspace/lib/c/include/adt/char_map.h (modified) (view diffs)
-
uspace/lib/c/include/adt/generic_char_map.h (modified) (view diffs)
-
uspace/lib/c/include/adt/measured_strings.h (modified) (view diffs)
-
uspace/lib/c/include/async.h (modified) (view diffs)
-
uspace/lib/c/include/async_sess.h (moved) (moved from uspace/lib/c/include/async_rel.h ) (view diffs)
-
uspace/lib/c/include/device/hw_res.h (modified) (view diffs)
-
uspace/lib/c/include/fibril.h (modified) (view diffs)
-
uspace/lib/c/include/fibril_synch.h (modified) (view diffs)
-
uspace/lib/c/include/ipc/irc.h (moved) (moved from uspace/lib/c/include/ipc/bus.h ) (view diffs)
-
uspace/lib/c/include/ipc/services.h (modified) (view diffs)
-
uspace/lib/c/include/mem.h (modified) (view diffs)
-
uspace/lib/c/include/net/socket.h (modified) (view diffs)
-
uspace/lib/c/include/stdlib.h (modified) (view diffs)
-
uspace/lib/c/include/task.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/il/arp_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/net_interface.h (modified) (view diffs)
-
uspace/lib/net/include/netif_local.h (modified) (view diffs)
-
uspace/lib/net/include/netif_remote.h (modified) (view diffs)
-
uspace/lib/net/include/socket_core.h (modified) (view diffs)
-
uspace/lib/net/netif/netif_local.c (modified) (view diffs)
-
uspace/lib/net/netif/netif_remote.c (modified) (view diffs)
-
uspace/lib/net/tl/socket_core.c (modified) (view diffs)
-
uspace/lib/packet/generic/packet_server.c (modified) (view diffs)
-
uspace/srv/bd/ata_bd/ata_bd.c (modified) (view diffs)
-
uspace/srv/bd/ata_bd/ata_bd.h (modified) (view diffs)
-
uspace/srv/bd/ata_bd/ata_hw.h (added)
-
uspace/srv/devman/devman.c (modified) (view diffs)
-
uspace/srv/devmap/devmap.c (modified) (view diffs)
-
uspace/srv/fs/devfs/devfs_ops.c (modified) (view diffs)
-
uspace/srv/hid/kbd/port/ns16550.c (modified) (view diffs)
-
uspace/srv/hid/kbd/port/z8530.c (modified) (view diffs)
-
uspace/srv/hw/irc/apic/Makefile (added)
-
uspace/srv/hw/irc/apic/apic.c (moved) (moved from uspace/app/tester/ipc/register.c ) (view diffs)
-
uspace/srv/hw/irc/fhc/Makefile (moved) (moved from uspace/srv/hw/cir/fhc/Makefile ) (view diffs)
-
uspace/srv/hw/irc/fhc/fhc.c (moved) (moved from uspace/srv/hw/cir/fhc/fhc.c ) (view diffs)
-
uspace/srv/hw/irc/i8259/Makefile (added)
-
uspace/srv/hw/irc/i8259/i8259.c (added)
-
uspace/srv/hw/irc/obio/Makefile (moved) (moved from uspace/srv/hw/cir/obio/Makefile ) (view diffs)
-
uspace/srv/hw/irc/obio/obio.c (moved) (moved from uspace/srv/hw/cir/obio/obio.c ) (view diffs)
-
uspace/srv/hw/netif/dp8390/Makefile (modified) (view diffs)
-
uspace/srv/hw/netif/dp8390/dp8390.c (modified) (view diffs)
-
uspace/srv/hw/netif/dp8390/dp8390.h (modified) (view diffs)
-
uspace/srv/hw/netif/dp8390/dp8390_drv.h (modified) (view diffs)
-
uspace/srv/hw/netif/dp8390/dp8390_module.c (modified) (view diffs)
-
uspace/srv/hw/netif/dp8390/dp8390_port.h (modified) (view diffs)
-
uspace/srv/hw/netif/dp8390/local.h (deleted)
-
uspace/srv/hw/netif/dp8390/ne2000.c (modified) (view diffs)
-
uspace/srv/hw/netif/dp8390/ne2000.h (modified) (view diffs)
-
uspace/srv/net/cfg/lo (moved) (moved from uspace/srv/net/cfg/lo.netif_standalone ) (view diffs)
-
uspace/srv/net/cfg/lo.netif_nil_bundle (deleted)
-
uspace/srv/net/cfg/ne2k (moved) (moved from uspace/srv/net/cfg/ne2k.netif_standalone ) (view diffs)
-
uspace/srv/net/cfg/ne2k.netif_nil_bundle (deleted)
-
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/net/net.c (modified) (view diffs)
-
uspace/srv/net/net/net.h (modified) (view diffs)
-
uspace/srv/net/net/net_standalone.c (modified) (view diffs)
-
uspace/srv/net/netif/lo/Makefile (modified) (view diffs)
-
uspace/srv/net/netif/lo/lo.c (modified) (view diffs)
-
uspace/srv/net/nil/eth/Makefile (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/Makefile (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/udp/udp.c (modified) (view diffs)
-
uspace/srv/vfs/vfs.h (modified) (view diffs)
-
uspace/srv/vfs/vfs_lookup.c (modified) (view diffs)
-
uspace/srv/vfs/vfs_register.c (modified) (view diffs)
Note:
See TracChangeset
for help on using the changeset viewer.
