Changeset b39eb79 in mainline
- Timestamp:
- 2011-12-26T17:21:21Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 9b56a8dd
- Parents:
- cf5c05c0 (diff), 7e1b130 (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:
-
- 47 added
- 3 deleted
- 164 edited
- 2 moved
-
abi/include/ddi/arg.h (modified) (view diffs)
-
abi/include/ipc/methods.h (modified) (view diffs)
-
abi/include/syscall.h (modified) (view diffs)
-
boot/Makefile.common (modified) (view diffs)
-
contrib/conf/net-qe.sh (modified) (view diffs)
-
kernel/arch/abs32le/src/abs32le.c (modified) (view diffs)
-
kernel/arch/amd64/src/amd64.c (modified) (view diffs)
-
kernel/arch/ia32/src/boot/vesa_real.inc (modified) (view diffs)
-
kernel/arch/ia32/src/ia32.c (modified) (view diffs)
-
kernel/arch/ia64/include/asm.h (modified) (view diffs)
-
kernel/arch/ia64/src/ia64.c (modified) (view diffs)
-
kernel/arch/ia64/src/start.S (modified) (view diffs)
-
kernel/arch/mips32/src/mips32.c (modified) (view diffs)
-
kernel/arch/mips64/src/mips64.c (modified) (view diffs)
-
kernel/generic/include/ddi/ddi.h (modified) (view diffs)
-
kernel/generic/include/ipc/sysipc.h (modified) (view diffs)
-
kernel/generic/include/mm/as.h (modified) (view diffs)
-
kernel/generic/include/mm/page.h (modified) (view diffs)
-
kernel/generic/include/synch/smc.h (modified) (view diffs)
-
kernel/generic/include/syscall/syscall.h (modified) (view diffs)
-
kernel/generic/src/ddi/ddi.c (modified) (view diffs)
-
kernel/generic/src/ipc/irq.c (modified) (view diffs)
-
kernel/generic/src/ipc/sysipc.c (modified) (view diffs)
-
kernel/generic/src/lib/elf.c (modified) (view diffs)
-
kernel/generic/src/mm/as.c (modified) (view diffs)
-
kernel/generic/src/mm/page.c (modified) (view diffs)
-
kernel/generic/src/proc/program.c (modified) (view diffs)
-
kernel/generic/src/syscall/syscall.c (modified) (view diffs)
-
uspace/Makefile (modified) (view diffs)
-
uspace/app/klog/klog.c (modified) (view diffs)
-
uspace/app/mkbd/main.c (modified) (view diffs)
-
uspace/app/netecho/netecho.c (modified) (view diffs)
-
uspace/app/nettest3/Makefile (added)
-
uspace/app/nettest3/nettest3.c (added)
-
uspace/app/tester/mm/common.c (modified) (view diffs)
-
uspace/app/tester/mm/mapping1.c (modified) (view diffs)
-
uspace/app/trace/syscalls.c (modified) (view diffs)
-
uspace/app/usbinfo/dev.c (modified) (view diffs)
-
uspace/app/usbinfo/info.c (modified) (view diffs)
-
uspace/app/usbinfo/main.c (modified) (view diffs)
-
uspace/app/usbinfo/usbinfo.h (modified) (view diffs)
-
uspace/app/websrv/websrv.c (modified) (view diffs)
-
uspace/dist/data/web/bar.htm (added)
-
uspace/dist/data/web/foo.htm (added)
-
uspace/dist/data/web/index.htm (added)
-
uspace/drv/bus/isa/Makefile (modified) (view diffs)
-
uspace/drv/bus/isa/i8237.c (added)
-
uspace/drv/bus/isa/i8237.h (moved) (moved from uspace/lib/usbdev/src/pipepriv.h ) (view diffs)
-
uspace/drv/bus/isa/isa.c (modified) (view diffs)
-
uspace/drv/bus/isa/isa.dev (modified) (view diffs)
-
uspace/drv/bus/pci/pciintel/pci.c (modified) (view diffs)
-
uspace/drv/bus/pci/pciintel/pci.h (modified) (view diffs)
-
uspace/drv/bus/usb/ohci/hc.c (modified) (view diffs)
-
uspace/drv/bus/usb/ohci/ohci.c (modified) (view diffs)
-
uspace/drv/bus/usb/ohci/ohci_batch.c (modified) (view diffs)
-
uspace/drv/bus/usb/ohci/ohci_batch.h (modified) (view diffs)
-
uspace/drv/bus/usb/ohci/pci.c (modified) (view diffs)
-
uspace/drv/bus/usb/ohci/root_hub.c (modified) (view diffs)
-
uspace/drv/bus/usb/ohci/utils/malloc32.h (modified) (view diffs)
-
uspace/drv/bus/usb/uhci/hc.c (modified) (view diffs)
-
uspace/drv/bus/usb/uhci/pci.c (modified) (view diffs)
-
uspace/drv/bus/usb/uhci/transfer_list.c (modified) (view diffs)
-
uspace/drv/bus/usb/uhci/uhci.c (modified) (view diffs)
-
uspace/drv/bus/usb/uhci/uhci_batch.c (modified) (view diffs)
-
uspace/drv/bus/usb/uhci/uhci_batch.h (modified) (view diffs)
-
uspace/drv/bus/usb/uhci/utils/malloc32.h (modified) (view diffs)
-
uspace/drv/bus/usb/uhcirh/main.c (modified) (view diffs)
-
uspace/drv/bus/usb/uhcirh/port.c (modified) (view diffs)
-
uspace/drv/bus/usb/usbhub/port.c (modified) (view diffs)
-
uspace/drv/bus/usb/usbhub/usbhub.c (modified) (view diffs)
-
uspace/drv/bus/usb/usbhub/usbhub.h (modified) (view diffs)
-
uspace/drv/bus/usb/usbmast/main.c (modified) (view diffs)
-
uspace/drv/bus/usb/usbmid/main.c (modified) (view diffs)
-
uspace/drv/bus/usb/vhc/hub.c (modified) (view diffs)
-
uspace/drv/infrastructure/rootpc/rootpc.c (modified) (view diffs)
-
uspace/drv/nic/e1k/Makefile (added)
-
uspace/drv/nic/e1k/e1k.c (added)
-
uspace/drv/nic/e1k/e1k.h (added)
-
uspace/drv/nic/e1k/e1k.ma (added)
-
uspace/drv/nic/ne2k/dp8390.c (modified) (view diffs)
-
uspace/drv/nic/rtl8139/Makefile (added)
-
uspace/drv/nic/rtl8139/defs.c (added)
-
uspace/drv/nic/rtl8139/defs.h (added)
-
uspace/drv/nic/rtl8139/driver.c (added)
-
uspace/drv/nic/rtl8139/driver.h (added)
-
uspace/drv/nic/rtl8139/general.c (added)
-
uspace/drv/nic/rtl8139/general.h (added)
-
uspace/drv/nic/rtl8139/rtl8139.ma (added)
-
uspace/lib/c/Makefile (modified) (view diffs)
-
uspace/lib/c/generic/as.c (modified) (view diffs)
-
uspace/lib/c/generic/async.c (modified) (view diffs)
-
uspace/lib/c/generic/ddi.c (modified) (view diffs)
-
uspace/lib/c/generic/device/nic.c (modified) (view diffs)
-
uspace/lib/c/generic/device/pci.c (added)
-
uspace/lib/c/generic/elf/elf_load.c (modified) (view diffs)
-
uspace/lib/c/generic/fibril_synch.c (modified) (view diffs)
-
uspace/lib/c/generic/ipc.c (modified) (view diffs)
-
uspace/lib/c/generic/malloc.c (modified) (view diffs)
-
uspace/lib/c/generic/mman.c (modified) (view diffs)
-
uspace/lib/c/generic/time.c (modified) (view diffs)
-
uspace/lib/c/include/as.h (modified) (view diffs)
-
uspace/lib/c/include/async.h (modified) (view diffs)
-
uspace/lib/c/include/bitops.h (modified) (view diffs)
-
uspace/lib/c/include/ddi.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/device/nic.h (modified) (view diffs)
-
uspace/lib/c/include/device/pci.h (added)
-
uspace/lib/c/include/errno.h (modified) (view diffs)
-
uspace/lib/c/include/fibril_synch.h (modified) (view diffs)
-
uspace/lib/c/include/ipc/ipc.h (modified) (view diffs)
-
uspace/lib/c/include/ipc/net.h (modified) (view diffs)
-
uspace/lib/c/include/net/device.h (modified) (view diffs)
-
uspace/lib/drv/generic/driver.c (modified) (view diffs)
-
uspace/lib/drv/generic/remote_nic.c (modified) (view diffs)
-
uspace/lib/drv/include/ops/hw_res.h (modified) (view diffs)
-
uspace/lib/drv/include/ops/nic.h (modified) (view diffs)
-
uspace/lib/drv/include/usbhc_iface.h (modified) (view diffs)
-
uspace/lib/fb/imgmap.c (modified) (view diffs)
-
uspace/lib/fb/screenbuffer.c (modified) (view diffs)
-
uspace/lib/fs/libfs.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/nic/include/nic.h (modified) (view diffs)
-
uspace/lib/nic/src/nic_driver.c (modified) (view diffs)
-
uspace/lib/nic/src/nic_rx_control.c (modified) (view diffs)
-
uspace/lib/usb/Makefile (modified) (view diffs)
-
uspace/lib/usb/include/usb/classes/hub.h (modified) (view diffs)
-
uspace/lib/usb/include/usb/dev.h (added)
-
uspace/lib/usb/include/usb/hc.h (modified) (view diffs)
-
uspace/lib/usb/include/usb/usb.h (modified) (view diffs)
-
uspace/lib/usb/src/ddfiface.c (modified) (view diffs)
-
uspace/lib/usb/src/dev.c (moved) (moved from uspace/lib/usb/src/resolve.c ) (view diffs)
-
uspace/lib/usb/src/hc.c (modified) (view diffs)
-
uspace/lib/usb/src/usb.c (modified) (view diffs)
-
uspace/lib/usbdev/Makefile (modified) (view diffs)
-
uspace/lib/usbdev/include/usb/dev/driver.h (modified) (view diffs)
-
uspace/lib/usbdev/include/usb/dev/hub.h (modified) (view diffs)
-
uspace/lib/usbdev/include/usb/dev/pipes.h (modified) (view diffs)
-
uspace/lib/usbdev/include/usb/dev/poll.h (modified) (view diffs)
-
uspace/lib/usbdev/include/usb/dev/request.h (modified) (view diffs)
-
uspace/lib/usbdev/include/usb/dev/usb_device_connection.h (added)
-
uspace/lib/usbdev/src/altiface.c (modified) (view diffs)
-
uspace/lib/usbdev/src/devdrv.c (modified) (view diffs)
-
uspace/lib/usbdev/src/devpoll.c (modified) (view diffs)
-
uspace/lib/usbdev/src/hub.c (modified) (view diffs)
-
uspace/lib/usbdev/src/pipepriv.c (deleted)
-
uspace/lib/usbdev/src/pipes.c (modified) (view diffs)
-
uspace/lib/usbdev/src/pipesinit.c (modified) (view diffs)
-
uspace/lib/usbdev/src/pipesio.c (deleted)
-
uspace/lib/usbdev/src/recognise.c (modified) (view diffs)
-
uspace/lib/usbhost/Makefile (modified) (view diffs)
-
uspace/lib/usbhost/include/usb/host/endpoint.h (modified) (view diffs)
-
uspace/lib/usbhost/include/usb/host/usb_device_manager.h (modified) (view diffs)
-
uspace/lib/usbhost/include/usb/host/usb_transfer_batch.h (modified) (view diffs)
-
uspace/lib/usbhost/src/iface.c (modified) (view diffs)
-
uspace/lib/usbhost/src/usb_device_manager.c (modified) (view diffs)
-
uspace/lib/usbhost/src/usb_endpoint_manager.c (modified) (view diffs)
-
uspace/lib/usbhost/src/usb_transfer_batch.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/fs/exfat/exfat_bitmap.c (modified) (view diffs)
-
uspace/srv/fs/exfat/exfat_dentry.c (modified) (view diffs)
-
uspace/srv/fs/exfat/exfat_directory.c (modified) (view diffs)
-
uspace/srv/fs/exfat/exfat_fat.c (modified) (view diffs)
-
uspace/srv/fs/exfat/exfat_ops.c (modified) (view diffs)
-
uspace/srv/hid/fb/fb.c (modified) (view diffs)
-
uspace/srv/hid/fb/port/ega.c (modified) (view diffs)
-
uspace/srv/hid/fb/port/kchar.c (modified) (view diffs)
-
uspace/srv/hid/fb/port/kfb.c (modified) (view diffs)
-
uspace/srv/hid/fb/port/niagara.c (modified) (view diffs)
-
uspace/srv/hid/input/port/gxemul.c (modified) (view diffs)
-
uspace/srv/hid/input/port/msim.c (modified) (view diffs)
-
uspace/srv/hid/input/port/niagara.c (modified) (view diffs)
-
uspace/srv/hid/input/port/ns16550.c (modified) (view diffs)
-
uspace/srv/hid/input/port/pl050.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/obio/obio.c (modified) (view diffs)
-
uspace/srv/net/cfg/e1k.nic (added)
-
uspace/srv/net/net/packet_server.c (modified) (view diffs)
-
uspace/srv/net/tl/tcp/Makefile (modified) (view diffs)
-
uspace/srv/net/tl/tcp/conn.c (added)
-
uspace/srv/net/tl/tcp/conn.h (added)
-
uspace/srv/net/tl/tcp/iqueue.c (added)
-
uspace/srv/net/tl/tcp/iqueue.h (added)
-
uspace/srv/net/tl/tcp/ncsim.c (added)
-
uspace/srv/net/tl/tcp/ncsim.h (added)
-
uspace/srv/net/tl/tcp/pdu.c (added)
-
uspace/srv/net/tl/tcp/pdu.h (added)
-
uspace/srv/net/tl/tcp/rqueue.c (added)
-
uspace/srv/net/tl/tcp/rqueue.h (added)
-
uspace/srv/net/tl/tcp/segment.c (added)
-
uspace/srv/net/tl/tcp/segment.h (added)
-
uspace/srv/net/tl/tcp/seq_no.c (added)
-
uspace/srv/net/tl/tcp/seq_no.h (added)
-
uspace/srv/net/tl/tcp/sock.c (added)
-
uspace/srv/net/tl/tcp/sock.h (added)
-
uspace/srv/net/tl/tcp/std.h (added)
-
uspace/srv/net/tl/tcp/tcp.c (modified) (view diffs)
-
uspace/srv/net/tl/tcp/tcp.h (modified) (view diffs)
-
uspace/srv/net/tl/tcp/tcp_header.h (deleted)
-
uspace/srv/net/tl/tcp/tcp_type.h (added)
-
uspace/srv/net/tl/tcp/test.c (added)
-
uspace/srv/net/tl/tcp/test.h (added)
-
uspace/srv/net/tl/tcp/tqueue.c (added)
-
uspace/srv/net/tl/tcp/tqueue.h (added)
-
uspace/srv/net/tl/tcp/ucall.c (added)
-
uspace/srv/net/tl/tcp/ucall.h (added)
-
uspace/srv/vfs/vfs.c (modified) (view diffs)
Note:
See TracChangeset
for help on using the changeset viewer.
