Viewing all changes in revision 545.
- Committer: Jakub Jermar
- Date: 2011-04-13 14:45:41 UTC
- mfrom: (527.1.397 main-clone)
- Revision ID: jakub@jermar.eu-20110413144541-x0j3r1zxqhsljx1o
Merge mainline changes.
- files added:
- boot/Makefile.uboot
- defaults/arm32/gta02
- kernel/arch/arm32/include/mach/gta02
- kernel/arch/arm32/src/mach/gta02
- kernel/genarch/include/drivers/s3c24xx_irqc
- kernel/genarch/include/drivers/s3c24xx_timer
- kernel/genarch/include/drivers/s3c24xx_uart
- kernel/genarch/src/drivers/s3c24xx_irqc
- kernel/genarch/src/drivers/s3c24xx_uart
- release
- uspace/app/kill
- uspace/app/killall
- uspace/app/sysinfo
- uspace/app/tester/devs
- uspace/app/tester/hw
- uspace/app/tester/hw/misc
- uspace/app/tester/hw/serial
- uspace/app/websrv
- uspace/dist/drv
- uspace/dist/log
- uspace/drv
- uspace/drv/isa
- uspace/drv/ns8250
- uspace/drv/pciintel
- uspace/drv/root
- uspace/drv/rootpc
- uspace/drv/rootvirt
- uspace/drv/test1
- uspace/drv/test2
- uspace/lib/c/generic/device
- uspace/lib/c/generic/ipc
- uspace/lib/c/generic/net
- uspace/lib/c/generic/private
- uspace/lib/c/include/device
- uspace/lib/c/include/net
- uspace/lib/drv
- uspace/lib/drv/generic
- uspace/lib/drv/include
- uspace/lib/drv/include/ddf
- uspace/lib/drv/include/ops
- uspace/srv/devman
- uspace/srv/hid/s3c24xx_ts
- uspace/srv/hw/char/s3c24xx_uart
- uspace/srv/hw/irc/apic
- uspace/srv/hw/irc/i8259
- files removed:
- contrib/arch/uspace/srv/pci
- kernel/arch/arm32/src/drivers
- uspace/app/stats
- uspace/lib/pci
- uspace/lib/socket/adt
- uspace/lib/socket/include/adt
- uspace/lib/socket/include/packet
- uspace/lib/socket/packet
- uspace/srv/hw/bus/pci
- uspace/srv/net/netstart
- files renamed:
- uspace/app/tasks/ => uspace/app/stats/
- uspace/app/tasks/tasks.c => uspace/app/stats/stats.c
- uspace/dist/scratch/ => uspace/dist/tmp/
- uspace/lib/socket/adt/char_map.c => uspace/lib/c/generic/adt/char_map.c
- uspace/lib/socket/adt/dynamic_fifo.c => uspace/lib/c/generic/adt/dynamic_fifo.c
- uspace/lib/socket/adt/measured_strings.c => uspace/lib/c/generic/adt/measured_strings.c
- uspace/lib/socket/generic/icmp_api.c => uspace/lib/c/generic/net/icmp_api.c
- uspace/lib/socket/generic/icmp_common.c => uspace/lib/c/generic/net/icmp_common.c
- uspace/lib/socket/generic/inet.c => uspace/lib/c/generic/net/inet.c
- uspace/lib/socket/generic/net_modules.c => uspace/lib/c/generic/net/modules.c
- uspace/lib/socket/packet/packet.c => uspace/lib/c/generic/net/packet.c
- uspace/lib/socket/generic/socket_client.c => uspace/lib/c/generic/net/socket_client.c
- uspace/lib/socket/generic/socket_parse.c => uspace/lib/c/generic/net/socket_parse.c
- uspace/lib/c/include/async_priv.h => uspace/lib/c/generic/private/async.h
- uspace/lib/socket/include/adt/char_map.h => uspace/lib/c/include/adt/char_map.h
- uspace/lib/socket/include/adt/dynamic_fifo.h => uspace/lib/c/include/adt/dynamic_fifo.h
- uspace/lib/socket/include/adt/generic_char_map.h => uspace/lib/c/include/adt/generic_char_map.h
- uspace/lib/socket/include/adt/generic_field.h => uspace/lib/c/include/adt/generic_field.h
- uspace/lib/socket/include/adt/int_map.h => uspace/lib/c/include/adt/int_map.h
- uspace/lib/socket/include/adt/measured_strings.h => uspace/lib/c/include/adt/measured_strings.h
- uspace/lib/net/include/arp_messages.h => uspace/lib/c/include/ipc/arp.h
- uspace/lib/socket/include/icmp_messages.h => uspace/lib/c/include/ipc/icmp.h
- uspace/lib/net/include/il_messages.h => uspace/lib/c/include/ipc/il.h
- uspace/lib/net/include/ip_messages.h => uspace/lib/c/include/ipc/ip.h
- uspace/lib/c/include/ipc/bus.h => uspace/lib/c/include/ipc/irc.h
- uspace/lib/net/include/net_net_messages.h => uspace/lib/c/include/ipc/net_net.h
- uspace/lib/net/include/netif_messages.h => uspace/lib/c/include/ipc/netif.h
- uspace/lib/net/include/nil_messages.h => uspace/lib/c/include/ipc/nil.h
- uspace/lib/socket/include/packet/packet_messages.h => uspace/lib/c/include/ipc/packet.h
- uspace/lib/socket/include/socket_messages.h => uspace/lib/c/include/ipc/socket.h
- uspace/lib/net/include/tl_messages.h => uspace/lib/c/include/ipc/tl.h
- uspace/lib/socket/include/net_device.h => uspace/lib/c/include/net/device.h
- uspace/lib/socket/include/icmp_api.h => uspace/lib/c/include/net/icmp_api.h
- uspace/lib/socket/include/icmp_codes.h => uspace/lib/c/include/net/icmp_codes.h
- uspace/lib/socket/include/icmp_common.h => uspace/lib/c/include/net/icmp_common.h
- uspace/lib/socket/include/in.h => uspace/lib/c/include/net/in.h
- uspace/lib/socket/include/in6.h => uspace/lib/c/include/net/in6.h
- uspace/lib/socket/include/inet.h => uspace/lib/c/include/net/inet.h
- uspace/lib/socket/include/ip_codes.h => uspace/lib/c/include/net/ip_codes.h
- uspace/lib/socket/include/ip_protocols.h => uspace/lib/c/include/net/ip_protocols.h
- uspace/lib/socket/include/net_modules.h => uspace/lib/c/include/net/modules.h
- uspace/lib/socket/include/packet/packet.h => uspace/lib/c/include/net/packet.h
- uspace/lib/socket/include/packet/packet_header.h => uspace/lib/c/include/net/packet_header.h
- uspace/lib/socket/include/socket.h => uspace/lib/c/include/net/socket.h
- uspace/lib/socket/include/socket_codes.h => uspace/lib/c/include/net/socket_codes.h
- uspace/lib/socket/include/socket_parse.h => uspace/lib/c/include/net/socket_parse.h
- uspace/lib/socket/packet/packet_client.c => uspace/lib/net/generic/packet_client.c
- uspace/lib/socket/include/net_messages.h => uspace/lib/net/include/generic.h
- uspace/lib/net/include/icmp_interface.h => uspace/lib/net/include/icmp_remote.h
- uspace/lib/net/include/il_interface.h => uspace/lib/net/include/il_remote.h
- uspace/lib/net/include/il_local.h => uspace/lib/net/include/il_skel.h
- uspace/lib/net/include/netif_local.h => uspace/lib/net/include/netif_skel.h
- uspace/lib/net/include/nil_local.h => uspace/lib/net/include/nil_skel.h
- uspace/lib/socket/include/packet/packet_client.h => uspace/lib/net/include/packet_client.h
- uspace/lib/socket/include/socket_core.h => uspace/lib/net/include/socket_core.h
- uspace/lib/net/include/tl_interface.h => uspace/lib/net/include/tl_remote.h
- uspace/lib/net/include/tl_local.h => uspace/lib/net/include/tl_skel.h
- uspace/lib/net/netif/netif_local.c => uspace/lib/net/netif/netif_skel.c
- uspace/lib/socket/generic/socket_core.c => uspace/lib/net/tl/socket_core.c
- uspace/lib/socket/ => uspace/lib/packet/
- uspace/lib/socket/packet/packet_server.c => uspace/lib/packet/generic/packet_server.c
- uspace/lib/socket/include/packet/packet_server.h => uspace/lib/packet/include/packet_server.h
- uspace/srv/hw/cir/ => uspace/srv/hw/irc/
- uspace/srv/hw/netif/dp8390/ => uspace/srv/hw/netif/ne2000/
- uspace/srv/hw/netif/dp8390/dp8390_module.c => uspace/srv/hw/netif/ne2000/ne2000.c
- uspace/srv/net/cfg/lo.netif_standalone => uspace/srv/net/cfg/lo
- uspace/srv/net/cfg/ne2k.netif_standalone => uspace/srv/net/cfg/ne2k
- files modified:
- HelenOS.config
expand all
collapse all
added
removed
