Changeset 7fc092a in mainline
- Timestamp:
- 2011-01-27T22:09:29Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- db7ed07
- Parents:
- 9ee87f6 (diff), 6265a2b (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:
-
- 12 added
- 15 deleted
- 152 edited
- 14 moved
-
.bzrignore (modified) (view diffs)
-
boot/Makefile.common (modified) (view diffs)
-
kernel/arch/amd64/include/interrupt.h (modified) (view diffs)
-
kernel/arch/amd64/src/amd64.c (modified) (view diffs)
-
kernel/arch/ia32/include/interrupt.h (modified) (view diffs)
-
kernel/arch/ia32/src/ia32.c (modified) (view diffs)
-
kernel/arch/ia64/include/interrupt.h (modified) (view diffs)
-
kernel/arch/ia64/src/ia64.c (modified) (view diffs)
-
kernel/generic/include/ddi/ddi.h (modified) (view diffs)
-
kernel/generic/include/mm/page.h (modified) (view diffs)
-
kernel/generic/include/syscall/syscall.h (modified) (view diffs)
-
kernel/generic/include/sysinfo/abi.h (modified) (view diffs)
-
kernel/generic/include/sysinfo/sysinfo.h (modified) (view diffs)
-
kernel/generic/src/adt/avl.c (modified) (view diffs)
-
kernel/generic/src/ddi/ddi.c (modified) (view diffs)
-
kernel/generic/src/mm/backend_phys.c (modified) (view diffs)
-
kernel/generic/src/mm/page.c (modified) (view diffs)
-
kernel/generic/src/mm/slab.c (modified) (view diffs)
-
kernel/generic/src/syscall/syscall.c (modified) (view diffs)
-
kernel/generic/src/sysinfo/stats.c (modified) (view diffs)
-
kernel/generic/src/sysinfo/sysinfo.c (modified) (view diffs)
-
uspace/Makefile (modified) (view diffs)
-
uspace/app/ping/ping.c (modified) (view diffs)
-
uspace/app/tasks/tasks.c (modified) (view diffs)
-
uspace/app/tester/Makefile (modified) (view diffs)
-
uspace/app/tester/mm/mapping1.c (added)
-
uspace/app/tester/mm/mapping1.def (added)
-
uspace/app/tester/tester.c (modified) (view diffs)
-
uspace/app/tester/tester.h (modified) (view diffs)
-
uspace/app/top/screen.c (modified) (view diffs)
-
uspace/app/top/top.c (modified) (view diffs)
-
uspace/app/top/top.h (modified) (view diffs)
-
uspace/app/trace/syscalls.c (modified) (view diffs)
-
uspace/app/usbinfo/dump.c (modified) (view diffs)
-
uspace/app/usbinfo/info.c (modified) (view diffs)
-
uspace/app/usbinfo/usbinfo.h (modified) (view diffs)
-
uspace/app/virtusbkbd/keys.h (modified) (view diffs)
-
uspace/app/virtusbkbd/virtusbkbd.c (modified) (view diffs)
-
uspace/doc/doxygroups.h (modified) (view diffs)
-
uspace/drv/ns8250/ns8250.c (modified) (view diffs)
-
uspace/drv/usbhub/main.c (modified) (view diffs)
-
uspace/drv/usbhub/port_status.h (modified) (view diffs)
-
uspace/drv/usbhub/usbhub.c (modified) (view diffs)
-
uspace/drv/usbhub/usbhub.h (modified) (view diffs)
-
uspace/drv/usbhub/usbhub_private.h (modified) (view diffs)
-
uspace/drv/usbhub/usblist.c (modified) (view diffs)
-
uspace/drv/usbhub/usblist.h (modified) (view diffs)
-
uspace/drv/usbhub/utils.c (modified) (view diffs)
-
uspace/drv/usbkbd/Makefile (modified) (view diffs)
-
uspace/drv/usbkbd/descdump.c (added)
-
uspace/drv/usbkbd/descdump.h (added)
-
uspace/drv/usbkbd/descparser.c (added)
-
uspace/drv/usbkbd/descparser.h (moved) (moved from uspace/srv/net/il/ip/ip_module.h ) (view diffs)
-
uspace/drv/usbkbd/main.c (modified) (view diffs)
-
uspace/drv/vhc/conn.h (modified) (view diffs)
-
uspace/drv/vhc/conndev.c (modified) (view diffs)
-
uspace/drv/vhc/connhost.c (modified) (view diffs)
-
uspace/drv/vhc/debug.c (modified) (view diffs)
-
uspace/drv/vhc/devices.c (modified) (view diffs)
-
uspace/drv/vhc/devices.h (modified) (view diffs)
-
uspace/drv/vhc/hc.c (modified) (view diffs)
-
uspace/drv/vhc/hc.h (modified) (view diffs)
-
uspace/drv/vhc/hcd.c (modified) (view diffs)
-
uspace/drv/vhc/hub.c (modified) (view diffs)
-
uspace/drv/vhc/hub.h (modified) (view diffs)
-
uspace/drv/vhc/hub/hub.c (modified) (view diffs)
-
uspace/drv/vhc/hub/hub.h (modified) (view diffs)
-
uspace/drv/vhc/hub/virthub.c (modified) (view diffs)
-
uspace/drv/vhc/hub/virthub.h (modified) (view diffs)
-
uspace/drv/vhc/hub/virthubops.c (modified) (view diffs)
-
uspace/drv/vhc/vhcd.h (modified) (view diffs)
-
uspace/lib/c/generic/as.c (modified) (view diffs)
-
uspace/lib/c/generic/ddi.c (modified) (view diffs)
-
uspace/lib/c/generic/devman.c (modified) (view diffs)
-
uspace/lib/c/generic/net/icmp_common.c (modified) (view diffs)
-
uspace/lib/c/generic/stats.c (modified) (view diffs)
-
uspace/lib/c/generic/sysinfo.c (modified) (view diffs)
-
uspace/lib/c/include/adt/hash_table.h (modified) (view diffs)
-
uspace/lib/c/include/as.h (modified) (view diffs)
-
uspace/lib/c/include/ddi.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/services.h (modified) (view diffs)
-
uspace/lib/c/include/net/icmp_common.h (modified) (view diffs)
-
uspace/lib/drv/generic/remote_usbhc.c (modified) (view diffs)
-
uspace/lib/drv/include/usb_iface.h (modified) (view diffs)
-
uspace/lib/drv/include/usbhc_iface.h (modified) (view diffs)
-
uspace/lib/net/Makefile (modified) (view diffs)
-
uspace/lib/net/generic/protocol_map.c (modified) (view diffs)
-
uspace/lib/net/il/il_remote.c (moved) (moved from uspace/lib/net/il/il_interface.c ) (view diffs)
-
uspace/lib/net/il/il_skel.c (added)
-
uspace/lib/net/il/ip_remote.c (modified) (view diffs)
-
uspace/lib/net/include/icmp_header.h (modified) (view diffs)
-
uspace/lib/net/include/icmp_remote.h (moved) (moved from uspace/lib/net/include/icmp_interface.h ) (view diffs)
-
uspace/lib/net/include/il_local.h (deleted)
-
uspace/lib/net/include/il_remote.h (moved) (moved from uspace/lib/net/include/il_interface.h ) (view diffs)
-
uspace/lib/net/include/il_skel.h (moved) (moved from uspace/srv/net/tl/tcp/tcp_module.c ) (view diffs)
-
uspace/lib/net/include/nil_interface.h (deleted)
-
uspace/lib/net/include/nil_local.h (deleted)
-
uspace/lib/net/include/nil_remote.h (modified) (view diffs)
-
uspace/lib/net/include/nil_skel.h (added)
-
uspace/lib/net/include/tl_remote.h (moved) (moved from uspace/lib/net/include/tl_interface.h ) (view diffs)
-
uspace/lib/net/include/tl_skel.h (moved) (moved from uspace/lib/net/include/tl_local.h ) (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 (added)
-
uspace/lib/net/tl/icmp_remote.c (modified) (view diffs)
-
uspace/lib/net/tl/tl_common.c (modified) (view diffs)
-
uspace/lib/net/tl/tl_remote.c (moved) (moved from uspace/lib/net/tl/tl_interface.c ) (view diffs)
-
uspace/lib/net/tl/tl_skel.c (added)
-
uspace/lib/usb/Makefile (modified) (view diffs)
-
uspace/lib/usb/include/usb/addrkeep.h (modified) (view diffs)
-
uspace/lib/usb/include/usb/classes/classes.h (modified) (view diffs)
-
uspace/lib/usb/include/usb/classes/hid.h (modified) (view diffs)
-
uspace/lib/usb/include/usb/classes/hidparser.h (modified) (view diffs)
-
uspace/lib/usb/include/usb/classes/hidut.h (modified) (view diffs)
-
uspace/lib/usb/include/usb/classes/hidutkbd.h (modified) (view diffs)
-
uspace/lib/usb/include/usb/classes/hub.h (modified) (view diffs)
-
uspace/lib/usb/include/usb/debug.h (modified) (view diffs)
-
uspace/lib/usb/include/usb/descriptor.h (modified) (view diffs)
-
uspace/lib/usb/include/usb/devreq.h (modified) (view diffs)
-
uspace/lib/usb/include/usb/dp.h (moved) (moved from uspace/srv/net/il/arp/arp_module.h ) (view diffs)
-
uspace/lib/usb/include/usb/hcd.h (modified) (view diffs)
-
uspace/lib/usb/include/usb/hcdhubd.h (modified) (view diffs)
-
uspace/lib/usb/include/usb/usb.h (modified) (view diffs)
-
uspace/lib/usb/include/usb/usbdrv.h (modified) (view diffs)
-
uspace/lib/usb/include/usb/usbmem.h (moved) (moved from uspace/srv/net/il/arp/arp_header.h ) (view diffs)
-
uspace/lib/usb/src/addrkeep.c (modified) (view diffs)
-
uspace/lib/usb/src/class.c (modified) (view diffs)
-
uspace/lib/usb/src/debug.c (modified) (view diffs)
-
uspace/lib/usb/src/dp.c (added)
-
uspace/lib/usb/src/drvpsync.c (modified) (view diffs)
-
uspace/lib/usb/src/dump.c (added)
-
uspace/lib/usb/src/hcdhubd.c (modified) (view diffs)
-
uspace/lib/usb/src/hcdhubd_private.h (modified) (view diffs)
-
uspace/lib/usb/src/hcdrv.c (modified) (view diffs)
-
uspace/lib/usb/src/hidparser.c (modified) (view diffs)
-
uspace/lib/usb/src/localdrv.c (modified) (view diffs)
-
uspace/lib/usb/src/recognise.c (modified) (view diffs)
-
uspace/lib/usb/src/remotedrv.c (modified) (view diffs)
-
uspace/lib/usb/src/usb.c (modified) (view diffs)
-
uspace/lib/usb/src/usbdrv.c (modified) (view diffs)
-
uspace/lib/usb/src/usbdrvreq.c (modified) (view diffs)
-
uspace/lib/usb/src/usbmem.c (added)
-
uspace/lib/usbvirt/include/usbvirt/device.h (modified) (view diffs)
-
uspace/lib/usbvirt/include/usbvirt/hub.h (modified) (view diffs)
-
uspace/lib/usbvirt/src/callback.c (modified) (view diffs)
-
uspace/lib/usbvirt/src/ctrlpipe.c (modified) (view diffs)
-
uspace/lib/usbvirt/src/debug.c (modified) (view diffs)
-
uspace/lib/usbvirt/src/main.c (modified) (view diffs)
-
uspace/lib/usbvirt/src/private.h (modified) (view diffs)
-
uspace/lib/usbvirt/src/stdreq.c (modified) (view diffs)
-
uspace/lib/usbvirt/src/transaction.c (modified) (view diffs)
-
uspace/srv/devman/main.c (modified) (view diffs)
-
uspace/srv/hw/netif/ne2000/Makefile (moved) (moved from uspace/srv/hw/netif/dp8390/Makefile ) (view diffs)
-
uspace/srv/hw/netif/ne2000/dp8390.c (moved) (moved from uspace/srv/hw/netif/dp8390/dp8390.c ) (view diffs)
-
uspace/srv/hw/netif/ne2000/dp8390.h (moved) (moved from uspace/srv/hw/netif/dp8390/dp8390.h ) (view diffs)
-
uspace/srv/hw/netif/ne2000/ne2000.c (moved) (moved from uspace/srv/hw/netif/dp8390/ne2000.c ) (view diffs)
-
uspace/srv/net/cfg/ne2k (modified) (view diffs)
-
uspace/srv/net/il/arp/Makefile (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 (deleted)
-
uspace/srv/net/il/arp/arp_oc.h (deleted)
-
uspace/srv/net/il/ip/Makefile (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/il/ip/ip_module.c (deleted)
-
uspace/srv/net/net/net.c (modified) (view diffs)
-
uspace/srv/net/net/net.h (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/eth/eth_header.h (deleted)
-
uspace/srv/net/nil/eth/eth_module.c (deleted)
-
uspace/srv/net/nil/nildummy/Makefile (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 (deleted)
-
uspace/srv/net/tl/icmp/Makefile (modified) (view diffs)
-
uspace/srv/net/tl/icmp/icmp.c (modified) (view diffs)
-
uspace/srv/net/tl/icmp/icmp.h (deleted)
-
uspace/srv/net/tl/icmp/icmp_module.c (deleted)
-
uspace/srv/net/tl/icmp/icmp_module.h (deleted)
-
uspace/srv/net/tl/tcp/Makefile (modified) (view diffs)
-
uspace/srv/net/tl/tcp/tcp.c (modified) (view diffs)
-
uspace/srv/net/tl/tcp/tcp_module.h (deleted)
-
uspace/srv/net/tl/udp/Makefile (modified) (view diffs)
-
uspace/srv/net/tl/udp/udp.c (modified) (view diffs)
-
uspace/srv/net/tl/udp/udp_module.c (deleted)
-
uspace/srv/net/tl/udp/udp_module.h (deleted)
-
uspace/lib/usb/include/usb/addrkeep.h
-
Property mode
changed from
100644to120000
-
Property mode
changed from
-
uspace/lib/usb/include/usb/hcd.h
-
Property mode
changed from
120000to100644
-
Property mode
changed from
Note:
See TracChangeset
for help on using the changeset viewer.
