Context Navigation

← Previous Changeset
Next Changeset →

Changeset 977fcea in mainline

Timestamp:

2011-01-14T10:11:11Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial

Children:

f9dd44d

Parents:

0bd2879 (diff), 6610565b (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:

development branch merge

Files:

: 5 added
: 6 deleted
: 133 edited
: 15 moved

.bzrignore (modified) (view diffs)
boot/arch/amd64/Makefile.inc (modified) (view diffs)
boot/arch/sparc64/Makefile.inc (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/src/ipc/ipc.c (modified) (view diffs)
uspace/Makefile (modified) (view diffs)
uspace/app/init/init.c (modified) (view diffs)
uspace/app/tester/hw/misc/virtchar1.c (modified) (view diffs)
uspace/app/tester/hw/serial/serial1.c (modified) (view diffs)
uspace/app/usbinfo/Makefile (modified) (view diffs)
uspace/app/usbinfo/info.c (added)
uspace/app/usbinfo/main.c (modified) (view diffs)
uspace/app/usbinfo/usbinfo.h (modified) (view diffs)
uspace/drv/isa/isa.c (modified) (view diffs)
uspace/drv/ns8250/ns8250.c (modified) (view diffs)
uspace/drv/pciintel/pci.c (modified) (view diffs)
uspace/drv/rootpc/rootpc.c (modified) (view diffs)
uspace/drv/test1/char.c (modified) (view diffs)
uspace/drv/usbkbd/main.c (modified) (view diffs)
uspace/drv/vhc/hcd.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_sess.c (modified) (view diffs)
uspace/lib/c/generic/device/char_dev.c (moved) (moved from uspace/lib/c/generic/device/char.c) (view diffs)
uspace/lib/c/generic/device/hw_res.c (modified) (view diffs)
uspace/lib/c/generic/devman.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/mem.c (modified) (view diffs)
uspace/lib/c/generic/net/modules.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/assert.h (modified) (view diffs)
uspace/lib/c/include/async_sess.h (modified) (view diffs)
uspace/lib/c/include/device/char_dev.h (moved) (moved from uspace/lib/c/include/device/char.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/ipc/arp.h (modified) (view diffs)
uspace/lib/c/include/ipc/dev_iface.h (modified) (view diffs)
uspace/lib/c/include/ipc/icmp.h (modified) (view diffs)
uspace/lib/c/include/ipc/il.h (modified) (view diffs)
uspace/lib/c/include/ipc/ip.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/net.h (modified) (view diffs)
uspace/lib/c/include/ipc/netif.h (modified) (view diffs)
uspace/lib/c/include/ipc/nil.h (modified) (view diffs)
uspace/lib/c/include/ipc/packet.h (modified) (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/in.h (modified) (view diffs)
uspace/lib/c/include/net/modules.h (modified) (view diffs)
uspace/lib/c/include/stdlib.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/driver.c (modified) (view diffs)
uspace/lib/drv/generic/remote_char_dev.c (moved) (moved from uspace/lib/drv/generic/remote_char.c) (view diffs)
uspace/lib/drv/generic/remote_hw_res.c (moved) (moved from uspace/lib/drv/generic/remote_res.c) (view diffs)
uspace/lib/drv/include/dev_iface.h (modified) (view diffs)
uspace/lib/drv/include/driver.h (modified) (view diffs)
uspace/lib/drv/include/ops/char_dev.h (moved) (moved from uspace/lib/drv/include/char.h) (view diffs)
uspace/lib/drv/include/ops/hw_res.h (moved) (moved from uspace/lib/drv/include/resource.h) (view diffs)
uspace/lib/drv/include/remote_char_dev.h (moved) (moved from uspace/lib/drv/include/remote_res.h) (view diffs)
uspace/lib/drv/include/remote_hw_res.h (moved) (moved from uspace/lib/drv/include/remote_char.h) (view diffs)
uspace/lib/net/Makefile (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/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/il_local.h (modified) (view diffs)
uspace/lib/net/include/net_interface.h (modified) (view diffs)
uspace/lib/net/include/netif_interface.h (deleted)
uspace/lib/net/include/netif_remote.h (modified) (view diffs)
uspace/lib/net/include/netif_skel.h (moved) (moved from uspace/lib/net/include/netif_local.h) (view diffs)
uspace/lib/net/include/nil_local.h (modified) (view diffs)
uspace/lib/net/include/socket_core.h (modified) (view diffs)
uspace/lib/net/include/tl_local.h (modified) (view diffs)
uspace/lib/net/netif/netif_remote.c (modified) (view diffs)
uspace/lib/net/netif/netif_skel.c (moved) (moved from uspace/lib/net/netif/netif_local.c) (view diffs)
uspace/lib/net/tl/socket_core.c (modified) (view diffs)
uspace/lib/packet/generic/packet_server.c (modified) (view diffs)
uspace/lib/packet/include/packet_server.h (modified) (view diffs)
uspace/lib/usb/include/usb/devreq.h (modified) (view diffs)
uspace/lib/usb/include/usb/usb.h (modified) (view diffs)
uspace/lib/usb/src/usbdrvreq.c (modified) (view diffs)
uspace/srv/bd/ata_bd/ata_bd.c (modified) (view diffs)
uspace/srv/bd/file_bd/file_bd.c (modified) (view diffs)
uspace/srv/bd/gxe_bd/gxe_bd.c (modified) (view diffs)
uspace/srv/bd/part/guid_part/guid_part.c (modified) (view diffs)
uspace/srv/bd/part/mbr_part/mbr_part.c (modified) (view diffs)
uspace/srv/bd/rd/rd.c (modified) (view diffs)
uspace/srv/devman/devman.c (modified) (view diffs)
uspace/srv/fs/devfs/devfs_ops.c (modified) (view diffs)
uspace/srv/hid/console/console.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/hid/s3c24xx_ts/s3c24xx_ts.c (modified) (view diffs)
uspace/srv/hw/bus/cuda_adb/cuda_adb.c (modified) (view diffs)
uspace/srv/hw/char/i8042/i8042.c (modified) (view diffs)
uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (view diffs)
uspace/srv/hw/irc/apic/Makefile (added)
uspace/srv/hw/irc/apic/apic.c (added)
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/DRIVER_REMOVAL (deleted)
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 (deleted)
uspace/srv/hw/netif/dp8390/dp8390_module.c (deleted)
uspace/srv/hw/netif/dp8390/dp8390_port.h (deleted)
uspace/srv/hw/netif/dp8390/ne2000.c (modified) (view diffs)
uspace/srv/hw/netif/dp8390/ne2000.h (deleted)
uspace/srv/net/cfg/ne2k (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/arp/arp_module.c (modified) (view diffs)
uspace/srv/net/il/arp/arp_module.h (modified) (view diffs)
uspace/srv/net/il/ip/ip.c (modified) (view diffs)
uspace/srv/net/il/ip/ip_module.c (modified) (view diffs)
uspace/srv/net/il/ip/ip_module.h (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/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/eth/eth_header.h (modified) (view diffs)
uspace/srv/net/nil/eth/eth_module.c (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/nil/nildummy/nildummy_module.c (modified) (view diffs)
uspace/srv/net/tl/icmp/icmp.c (modified) (view diffs)
uspace/srv/net/tl/icmp/icmp_module.c (modified) (view diffs)
uspace/srv/net/tl/icmp/icmp_module.h (modified) (view diffs)
uspace/srv/net/tl/tcp/tcp.c (modified) (view diffs)
uspace/srv/net/tl/tcp/tcp_module.c (modified) (view diffs)
uspace/srv/net/tl/tcp/tcp_module.h (modified) (view diffs)
uspace/srv/net/tl/udp/udp.c (modified) (view diffs)
uspace/srv/net/tl/udp/udp_module.c (modified) (view diffs)
uspace/srv/net/tl/udp/udp_module.h (modified) (view diffs)
uspace/srv/vfs/vfs_register.c (modified) (view diffs)

Changeset view not shown, since the total size (2.0 MB) exceeds 976.6 KB

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 977fcea in mainline

Download in other formats: