Changes in / [61ee6df:76ecb300] in mainline
- Files:
-
- 173 deleted
- 31 edited
Legend:
- Unmodified
- Added
- Removed
-
HelenOS.config
r61ee6df r76ecb300 509 509 % Write core files 510 510 ! CONFIG_WRITE_CORE_FILES (n/y) 511 512 % Networking architecture513 @ "none" No networking514 @ "modular" Modular515 @ "module" One module516 ! NETWORKING (choice)517 518 % DP8390 (NE2k) network interface519 ! [NETWORKING=modular|NETWORKING=module] CONFIG_NETIF_DP8390 (y/n)520 -
boot/Makefile.common
r61ee6df r76ecb300 85 85 COMPONENTS += $(USPACEDIR)/srv/fs/fat/fat 86 86 endif 87 88 CFG =89 90 NET_SRVS = \91 $(USPACEDIR)/srv/net/net/net \92 $(USPACEDIR)/srv/net/netif/lo/lo \93 $(USPACEDIR)/srv/net/netif/dp8390/dp8390 \94 $(USPACEDIR)/srv/net/nil/eth/eth \95 $(USPACEDIR)/srv/net/nil/nildummy/nildummy \96 $(USPACEDIR)/srv/net/app/echo/echo97 98 NET_APPS = \99 $(USPACEDIR)/srv/net/net/start/netstart \100 $(USPACEDIR)/srv/net/app/ping/ping \101 $(USPACEDIR)/srv/net/app/nettest1/nettest1 \102 $(USPACEDIR)/srv/net/app/nettest2/nettest2103 104 ifneq ($(NETWORKING), none)105 NET_CFG = \106 $(USPACEDIR)/srv/net/cfg/$(NETWORKING)/general \107 $(USPACEDIR)/srv/net/cfg/$(NETWORKING)/lo \108 $(USPACEDIR)/srv/net/cfg/$(NETWORKING)/ne2k109 endif110 111 ifeq ($(NETWORKING), module)112 RD_APPS += $(NET_APPS)113 114 RD_SRVS += $(NET_SRVS)115 116 CFG += $(NET_CFG)117 else118 ifeq ($(NETWORKING), modular)119 RD_APPS += $(NET_APPS)120 121 RD_SRVS += $(NET_SRVS)122 123 RD_SRVS += $(USPACEDIR)/srv/net/il/ip/ip \124 $(USPACEDIR)/srv/net/il/arp/arp \125 $(USPACEDIR)/srv/net/tl/udp/udp \126 $(USPACEDIR)/srv/net/tl/tcp/tcp \127 $(USPACEDIR)/srv/net/tl/icmp/icmp128 129 CFG += $(NET_CFG)130 endif131 endif132 -
boot/arch/amd64/Makefile.inc
-
Property mode
changed from
100755
to100644
r61ee6df r76ecb300 39 39 build: $(BASE)/image.iso 40 40 41 $(BASE)/image.iso: arch/$(BARCH)/grub/stage2_eltorito $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_APPS) $(CFG)41 $(BASE)/image.iso: arch/$(BARCH)/grub/stage2_eltorito $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_APPS) 42 42 mkdir -p $(TMP)/boot/grub 43 43 cp arch/$(BARCH)/grub/stage2_eltorito $(TMP)/boot/grub/ … … 56 56 done 57 57 58 rm -f $(USPACEDIR)/dist/srv/*59 rm -f $(USPACEDIR)/dist/app/*60 rm -f $(USPACEDIR)/dist/cfg/net/*61 62 58 cp $(KERNELDIR)/kernel.bin $(TMP)/boot/ 63 59 for task in $(INIT_TASKS) ; do \ … … 69 65 for file in $(RD_APPS) ; do \ 70 66 cp $$file $(USPACEDIR)/dist/app/ ; \ 71 done72 for file in $(NET_CFG) ; do \73 cp $$file $(USPACEDIR)/dist/cfg/net/ ; \74 67 done 75 68 … … 85 78 86 79 clean: 87 rm -f $(USPACEDIR)/dist/srv/*88 rm -f $(USPACEDIR)/dist/app/*89 rm -f $(USPACEDIR)/dist/cfg/net/*90 91 80 for file in $(RD_SRVS) ; do \ 92 81 rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \ … … 95 84 rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \ 96 85 done 97 for file in $(NET_CFG) ; do \98 rm -f $(USPACEDIR)/dist/cfg/net/`basename $$file` ; \99 done100 86 rm -fr $(TMP) 101 87 rm -f $(BASE)/image.iso -
Property mode
changed from
-
boot/arch/arm32/loader/Makefile
r61ee6df r76ecb300 37 37 38 38 clean: 39 rm -f $(USPACEDIR)/dist/srv/*40 rm -f $(USPACEDIR)/dist/app/*41 rm -f $(USPACEDIR)/dist/cfg/net/*42 43 39 for file in $(RD_SRVS) ; do \ 44 40 rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \ … … 47 43 rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \ 48 44 done 49 for file in $(NET_CFG) ; do \50 rm -f $(USPACEDIR)/dist/cfg/net/`basename $$file` ; \51 done52 45 rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(COMPS).h $(COMPS).c $(LINK) $(INITRD).img $(INITRD).fs 53 46 find . -name '*.o' -follow -exec rm \{\} \; -
boot/arch/arm32/loader/Makefile.build
r61ee6df r76ecb300 76 76 77 77 $(DEPEND): 78 rm -f $(USPACEDIR)/dist/srv/*79 rm -f $(USPACEDIR)/dist/app/*80 rm -f $(USPACEDIR)/dist/cfg/net/*81 82 78 for file in $(RD_SRVS) ; do \ 83 79 cp $$file $(USPACEDIR)/dist/srv/ ; \ … … 85 81 for file in $(RD_APPS) ; do \ 86 82 cp $$file $(USPACEDIR)/dist/app/ ; \ 87 done88 for file in $(NET_CFG) ; do \89 cp $$file $(USPACEDIR)/dist/cfg/net/ ; \90 83 done 91 84 ifeq ($(RDFMT),tmpfs) -
boot/arch/ia64/loader/Makefile
r61ee6df r76ecb300 40 40 $(MAKE) -C gefi clean 41 41 $(MAKE) -C gefi/HelenOS clean 42 43 rm -f $(USPACEDIR)/dist/srv/*44 rm -f $(USPACEDIR)/dist/app/*45 rm -f $(USPACEDIR)/dist/cfg/net/*46 47 42 for file in $(RD_SRVS) ; do \ 48 43 rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \ … … 51 46 rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \ 52 47 done 53 for file in $(NET_CFG) ; do \54 rm -f $(USPACEDIR)/dist/cfg/net/`basename $$file` ; \55 done56 48 rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(HELLO) $(COMPS).h $(COMPS).c $(LINK) $(INITRD).img $(INITRD).fs 57 49 find . -name '*.o' -follow -exec rm \{\} \; -
boot/arch/ia64/loader/Makefile.build
r61ee6df r76ecb300 77 77 78 78 $(DEPEND): 79 rm -f $(USPACEDIR)/dist/srv/*80 rm -f $(USPACEDIR)/dist/app/*81 rm -f $(USPACEDIR)/dist/cfg/net/*82 83 79 for file in $(RD_SRVS) ; do \ 84 80 cp $$file $(USPACEDIR)/dist/srv/ ; \ … … 86 82 for file in $(RD_APPS) ; do \ 87 83 cp $$file $(USPACEDIR)/dist/app/ ; \ 88 done89 for file in $(NET_CFG) ; do \90 cp $$file $(USPACEDIR)/dist/cfg/net/ ; \91 84 done 92 85 ifeq ($(RDFMT),tmpfs) -
boot/arch/mips32/loader/Makefile
r61ee6df r76ecb300 37 37 38 38 clean: 39 rm -f $(USPACEDIR)/dist/srv/*40 rm -f $(USPACEDIR)/dist/app/*41 rm -f $(USPACEDIR)/dist/cfg/net/*42 43 39 for file in $(RD_SRVS) ; do \ 44 40 rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \ … … 47 43 rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \ 48 44 done 49 for file in $(NET_CFG) ; do \50 rm -f $(USPACEDIR)/dist/cfg/net/`basename $$file` ; \51 done52 45 rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(RAW) $(COMPS).h $(COMPS).c $(LINK) $(INITRD).img $(INITRD).fs 53 46 find . -name '*.o' -follow -exec rm \{\} \; -
boot/arch/mips32/loader/Makefile.build
r61ee6df r76ecb300 77 77 78 78 $(DEPEND): 79 rm -f $(USPACEDIR)/dist/srv/*80 rm -f $(USPACEDIR)/dist/app/*81 rm -f $(USPACEDIR)/dist/cfg/net/*82 83 79 for file in $(RD_SRVS) ; do \ 84 80 cp $$file $(USPACEDIR)/dist/srv/ ; \ … … 86 82 for file in $(RD_APPS) ; do \ 87 83 cp $$file $(USPACEDIR)/dist/app/ ; \ 88 done89 for file in $(NET_CFG) ; do \90 cp $$file $(USPACEDIR)/dist/cfg/net/ ; \91 84 done 92 85 ifeq ($(RDFMT),tmpfs) -
boot/arch/ppc32/loader/Makefile
r61ee6df r76ecb300 37 37 38 38 clean: 39 rm -f $(USPACEDIR)/dist/srv/*40 rm -f $(USPACEDIR)/dist/app/*41 rm -f $(USPACEDIR)/dist/cfg/net/*42 43 39 for file in $(RD_SRVS) ; do \ 44 40 rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \ … … 47 43 rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \ 48 44 done 49 for file in $(NET_CFG) ; do \50 rm -f $(USPACEDIR)/dist/cfg/net/`basename $$file` ; \51 done52 45 rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(COMPS).h $(COMPS).c $(LINK) $(INITRD).img $(INITRD).fs 53 46 find . -name '*.o' -follow -exec rm \{\} \; -
boot/arch/ppc32/loader/Makefile.build
r61ee6df r76ecb300 77 77 78 78 $(DEPEND): 79 rm -f $(USPACEDIR)/dist/srv/*80 rm -f $(USPACEDIR)/dist/app/*81 rm -f $(USPACEDIR)/dist/cfg/net/*82 83 79 for file in $(RD_SRVS) ; do \ 84 80 cp $$file $(USPACEDIR)/dist/srv/ ; \ … … 86 82 for file in $(RD_APPS) ; do \ 87 83 cp $$file $(USPACEDIR)/dist/app/ ; \ 88 done89 for file in $(NET_CFG) ; do \90 cp $$file $(USPACEDIR)/dist/cfg/net/ ; \91 84 done 92 85 ifeq ($(RDFMT),tmpfs) -
boot/arch/sparc64/loader/Makefile
r61ee6df r76ecb300 37 37 38 38 clean: 39 rm -f $(USPACEDIR)/dist/srv/*40 rm -f $(USPACEDIR)/dist/app/*41 rm -f $(USPACEDIR)/dist/cfg/net/*42 43 39 for file in $(RD_SRVS) $(RD_SRVS_GENERIC) ; do \ 44 40 rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \ … … 47 43 rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \ 48 44 done 49 for file in $(NET_CFG) ; do \50 rm -f $(USPACEDIR)/dist/cfg/net/`basename $$file` ; \51 done52 45 rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(COMPS).h $(COMPS).c $(LINK) $(INITRD).img $(INITRD).fs 53 46 find . -name '*.o' -follow -exec rm \{\} \; -
boot/arch/sparc64/loader/Makefile.build
r61ee6df r76ecb300 88 88 89 89 $(DEPEND): 90 rm -f $(USPACEDIR)/dist/srv/*91 rm -f $(USPACEDIR)/dist/app/*92 rm -f $(USPACEDIR)/dist/cfg/net/*93 94 90 for file in $(RD_SRVS) ; do \ 95 91 cp $$file $(USPACEDIR)/dist/srv/ ; \ … … 97 93 for file in $(RD_APPS) ; do \ 98 94 cp $$file $(USPACEDIR)/dist/app/ ; \ 99 done100 for file in $(NET_CFG) ; do \101 cp $$file $(USPACEDIR)/dist/cfg/net/ ; \102 95 done 103 96 ifeq ($(RDFMT),tmpfs) -
defaults/amd64/Makefile.config
r61ee6df r76ecb300 61 61 # Mount /data on startup 62 62 CONFIG_MOUNT_DATA = n 63 64 # Default networking architecture65 NETWORKING = modular -
defaults/arm32/Makefile.config
r61ee6df r76ecb300 37 37 # Mount /data on startup 38 38 CONFIG_MOUNT_DATA = n 39 40 # Default networking architecture41 NETWORKING = none -
defaults/ia32/Makefile.config
r61ee6df r76ecb300 67 67 # Mount /data on startup 68 68 CONFIG_MOUNT_DATA = n 69 70 # Default networking architecture71 NETWORKING = modular -
defaults/ia64/Makefile.config
r61ee6df r76ecb300 49 49 # Mount /data on startup 50 50 CONFIG_MOUNT_DATA = n 51 52 # Default networking architecture53 NETWORKING = modular -
defaults/mips32/Makefile.config
r61ee6df r76ecb300 43 43 # Mount /data on startup 44 44 CONFIG_MOUNT_DATA = n 45 46 # Default networking architecture47 NETWORKING = none -
defaults/ppc32/Makefile.config
r61ee6df r76ecb300 43 43 # Mount /data on startup 44 44 CONFIG_MOUNT_DATA = n 45 46 # Default networking architecture47 NETWORKING = none -
defaults/sparc64/Makefile.config
r61ee6df r76ecb300 61 61 # Mount /data on startup 62 62 CONFIG_MOUNT_DATA = n 63 64 # Default networking architecture65 NETWORKING = modular -
defaults/sparc64/sun4v/Makefile.config
r61ee6df r76ecb300 14 14 15 15 CONFIG_FB = n 16 17 NETWORKING = none18 -
kernel/arch/amd64/include/interrupt.h
r61ee6df r76ecb300 54 54 #define IRQ_PIC_SPUR 7 55 55 #define IRQ_MOUSE 12 56 #define IRQ_DP8390 957 56 58 57 /* this one must have four least significant bits set to ones */ -
kernel/arch/amd64/src/amd64.c
r61ee6df r76ecb300 228 228 (uintptr_t) I8042_BASE); 229 229 #endif 230 231 #ifdef CONFIG_NETIF_DP8390232 trap_virtual_enable_irqs(1 << IRQ_DP8390);233 sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390);234 #endif235 230 } 236 231 -
kernel/arch/ia32/include/interrupt.h
r61ee6df r76ecb300 54 54 #define IRQ_PIC_SPUR 7 55 55 #define IRQ_MOUSE 12 56 #define IRQ_DP8390 957 56 58 57 /* this one must have four least significant bits set to ones */ -
kernel/arch/ia32/src/ia32.c
r61ee6df r76ecb300 186 186 (uintptr_t) I8042_BASE); 187 187 #endif 188 189 #ifdef CONFIG_NETIF_DP8390190 trap_virtual_enable_irqs(1 << IRQ_DP8390);191 sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390);192 #endif193 188 } 194 189 -
kernel/arch/ia64/include/interrupt.h
r61ee6df r76ecb300 61 61 #define IRQ_KBD (0x01 + LEGACY_INTERRUPT_BASE) 62 62 #define IRQ_MOUSE (0x0c + LEGACY_INTERRUPT_BASE) 63 #define IRQ_DP8390 (0x09 + LEGACY_INTERRUPT_BASE)64 63 65 64 /** General Exception codes. */ -
kernel/arch/ia64/src/ia64.c
r61ee6df r76ecb300 212 212 (uintptr_t) I8042_BASE); 213 213 #endif 214 215 #ifdef CONFIG_NETIF_DP8390 216 sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390); 217 #endif 218 214 219 215 sysinfo_set_item_val("ia64_iospace", NULL, true); 220 216 sysinfo_set_item_val("ia64_iospace.address", NULL, true); -
kernel/generic/include/ipc/ipc.h
r61ee6df r76ecb300 227 227 #ifdef KERNEL 228 228 229 #define IPC_MAX_PHONES 32229 #define IPC_MAX_PHONES 16 230 230 231 231 #include <synch/spinlock.h> -
uspace/Makefile
r61ee6df r76ecb300 63 63 srv/hid/fb \ 64 64 srv/hid/kbd \ 65 srv/hw/char/i8042 \ 66 srv/net 65 srv/hw/char/i8042 67 66 68 67 ifneq ($(UARCH),abs32le) -
uspace/doc/doxygroups.h
r61ee6df r76ecb300 26 26 * @ingroup srvcs 27 27 */ 28 29 /** 30 * @defgroup net Networking Stack 31 * @ingroup srvcs 32 */ 33 34 /** 35 * @defgroup netif Network interface drivers 36 * @ingroup net 37 */ 38 39 /** 40 * @defgroup lo Loopback Service 41 * @ingroup netif 42 */ 43 44 /** 45 * @defgroup dp8390 Generic DP8390 network interface family service 46 * @ingroup netif 47 */ 48 49 /** 50 * @defgroup ne2k NE2000 network interface family 51 * @ingroup dp8390 52 */ 53 54 /** 55 * @defgroup net_nil Network interface layer 56 * @ingroup net 57 */ 58 59 /** 60 * @defgroup eth Ethernet (IEEE 802.3) network interface layer Service 61 * @ingroup net_nil 62 */ 63 64 /** 65 * @defgroup nildummy Dummy network interface layer Service 66 * @ingroup net_nil 67 */ 68 69 /** 70 * @defgroup net_il Inter-networking layer 71 * @ingroup net 72 */ 73 74 /** 75 * @defgroup arp Address Resolution Protocol (ARP) Service 76 * @ingroup net_il 77 */ 78 79 /** 80 * @defgroup ip Internet Protocol (IP) Service 81 * @ingroup net_il 82 */ 83 84 /** 85 * @defgroup net_tl Transport layer 86 * @ingroup net 87 */ 88 89 /** 90 * @defgroup icmp Internet Control Message Protocol (ICMP) Service 91 * @ingroup net_tl 92 */ 93 94 /** 95 * @defgroup udp User Datagram Protocol (UDP) Service 96 * @ingroup net_tl 97 */ 98 99 /** 100 * @defgroup tcp Transmission Control Protocol (TCP) Service 101 * @ingroup net_tl 102 */ 103 104 /** 105 * @defgroup packet Packet management system 106 * @ingroup net 107 */ 108 109 /** 110 * @defgroup net_app Applications 111 * @ingroup net 112 */ 113 114 /** 115 * @defgroup echo Echo Service 116 * @ingroup net_app 117 */ 118 119 /** 120 * @defgroup ping Ping 121 * @ingroup net_app 122 */ 123 124 /** 125 * @defgroup nettest Networking tests 126 * @ingroup net_app 127 */ 128 129 /** 130 * @defgroup net_lib Application library 131 * @ingroup net 132 */ 133 134 /** 135 * @defgroup socket Sockets 136 * @ingroup net_lib 137 */ 138 139 /** 140 * @defgroup netdb Netdb 141 * @ingroup net_lib 142 */ 143 28 144 29 /** 145 30 * @cond amd64 -
uspace/lib/libc/include/ipc/services.h
r61ee6df r76ecb300 47 47 SERVICE_FHC, 48 48 SERVICE_OBIO, 49 SERVICE_CLIPBOARD, 50 SERVICE_NETWORKING, 51 SERVICE_LO, 52 SERVICE_DP8390, 53 SERVICE_ETHERNET, 54 SERVICE_NILDUMMY, 55 SERVICE_IP, 56 SERVICE_ARP, 57 SERVICE_RARP, 58 SERVICE_ICMP, 59 SERVICE_UDP, 60 SERVICE_TCP, 61 SERVICE_SOCKET 49 SERVICE_CLIPBOARD 62 50 } services_t; 63 51
Note:
See TracChangeset
for help on using the changeset viewer.