WebSVN – HelenOS – Path Comparison – / – /branches/network/ Rev 3466 and /branches/network/ Rev 3465

Ignore whitespace Rev 3466 → Rev 3465

/branches/network/uspace/app/init/init.c
107,7 → 107,6
// FIXME: spawn("/sbin/pci");
spawn("/sbin/fb");
spawn("/sbin/kbd");
spawn("/sbin/networking");
spawn("/sbin/console");

console_wait();

 /branches/network/uspace/lib/libc/include/ipc/services.h
 ,16 → 43,7
     SERVICE_VIDEO,
     SERVICE_CONSOLE,
     SERVICE_VFS,
-    SERVICE_DEVMAP,
-    SERVICE_NETWORKING,
-    SERVICE_IP,
-    SERVICE_ARP,
-    SERVICE_RARP,
-    SERVICE_ICMP,
-    SERVICE_UDP,
-    SERVICE_TCP,
-    SERVICE_SOCKET,
-    SERVICE_ETHERNET
+    SERVICE_DEVMAP
 } services_t;
 /* Memory area to be received from NS */

/branches/network/uspace/srv/net/tcp/tcp.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/branches/network/uspace/srv/net/tcp/tcp.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/branches/network/uspace/srv/net/tcp/tcp_module.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/branches/network/uspace/srv/net/tcp/Makefile
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/branches/network/uspace/srv/net/networking/networking.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/branches/network/uspace/srv/net/networking/Makefile
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/branches/network/uspace/srv/net/ip/Makefile
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/branches/network/uspace/srv/net/ip/ip.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/branches/network/uspace/srv/net/ip/ip_module.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/branches/network/uspace/srv/net/ip/ip.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/branches/network/uspace/srv/net/modules.c
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/branches/network/uspace/srv/net/messages.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/branches/network/uspace/srv/net/modules.h
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

 /branches/network/uspace/Makefile
 ,7 → 46,6
     srv/fs/tmpfs \
     srv/vfs \
     srv/devmap \
-    srv/net/networking \
     app/tetris \
     app/tester \
     app/klog \
 ,17 → 68,6
     CFLAGS += -DCONFIG_MIPS_FPU
 endif
-ifeq ($(NETWORKING), modular)
-    DIRS += srv/net/ip \
-        srv/net/tcp
-#       srv/net/arp \
-#       srv/net/rarp \
-#       srv/net/icmp \
-#       srv/net/udp \
-#       srv/net/socket \
-#       srv/net/drivers/ne2k_isa
-endif
 BUILDS := $(addsuffix .build,$(DIRS))
 CLEANS := $(addsuffix .clean,$(DIRS))
 ,4 → 93,4
     -$(MAKE) -C $(basename $@) clean ARCH=$(ARCH)
 $(BUILDS):
-    $(MAKE) -C $(basename $@) all ARCH=$(ARCH) COMPILER=$(COMPILER) NETWORKING=$(NETWORKING)
+    $(MAKE) -C $(basename $@) all ARCH=$(ARCH) COMPILER=$(COMPILER)

 /branches/network/uspace/doc/doxygroups.h
 ,24 → 20,19
      * @defgroup fbs Framebuffer Service
      * @ingroup srvcs
      */
     /**
      * @defgroup console Console Service
      * @ingroup srvcs
      */
     /**
-     * @defgroup net Networking Service
-     * @ingroup srvcs
-     */
-    /**
      * @cond amd64
      * @defgroup pci PCI Service
      * @ingroup srvcs
      * @endcond
      */
     /**
      * @cond ia32
      * @defgroup pci PCI Service
 ,19 → 39,18
      * @ingroup srvcs
      * @endcond
      */
 /**
  * @defgroup emul Emulation Libraries
  * @ingroup uspace
  */
     /**
      * @defgroup sfl Softloat
      * @ingroup emul
      */
     /**
      * @defgroup softint Softint
      * @ingroup emul
      */

 /branches/network/boot/arch/ia32/Makefile.inc
 ,21 → 49,8
     $(USPACEDIR)/app/tetris/tetris \
     $(USPACEDIR)/app/tester/tester \
     $(USPACEDIR)/app/klog/klog \
-    $(USPACEDIR)/app/bdsh/bdsh \
-    $(USPACEDIR)/srv/net/networking/networking
-#   $(USPACEDIR)/srv/net/drivers/ne2k_isa
+    $(USPACEDIR)/app/bdsh/bdsh
-ifeq ($(NETWORKING), modular)
-    RD_TASKS += $(USPACEDIR)/srv/net/ip/ip \
-            $(USPACEDIR)/srv/net/tcp/tcp
-#           $(USPACEDIR)/srv/net/arp \
-#           $(USPACEDIR)/srv/net/rarp \
-#           $(USPACEDIR)/srv/net/icmp \
-#           $(USPACEDIR)/srv/net/udp \
-#           $(USPACEDIR)/srv/net/socket \
-#           $(USPACEDIR)/srv/net/ethernet
-endif
 build: $(BASE)/image.iso
 $(BASE)/image.iso: arch/$(ARCH)/grub/stage2_eltorito arch/$(ARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_TASKS)

 /branches/network/Makefile
 ,11 → 120,11
 else
     $(MAKE) -C kernel ARCH=$(KARCH) COMPILER=$(COMPILER) CONFIG_DEBUG=$(CONFIG_DEBUG)
 endif
-    $(MAKE) -C uspace ARCH=$(UARCH) COMPILER=$(COMPILER) CONFIG_DEBUG=$(CONFIG_DEBUG) NETWORKING=$(NETWORKING)
+    $(MAKE) -C uspace ARCH=$(UARCH) COMPILER=$(COMPILER) CONFIG_DEBUG=$(CONFIG_DEBUG)
 ifneq ($(IMAGE),)
-    $(MAKE) -C boot ARCH=$(BARCH) COMPILER=$(COMPILER) CONFIG_DEBUG=$(CONFIG_DEBUG) NETWORKING=$(NETWORKING) IMAGE=$(IMAGE)
+    $(MAKE) -C boot ARCH=$(BARCH) COMPILER=$(COMPILER) CONFIG_DEBUG=$(CONFIG_DEBUG) IMAGE=$(IMAGE)
 else
-    $(MAKE) -C boot ARCH=$(BARCH) COMPILER=$(COMPILER) CONFIG_DEBUG=$(CONFIG_DEBUG) NETWORKING=$(NETWORKING)
+    $(MAKE) -C boot ARCH=$(BARCH) COMPILER=$(COMPILER) CONFIG_DEBUG=$(CONFIG_DEBUG)
 endif
 config:

 /branches/network/HelenOS.config
 ,8 → 78,3
 # Debug build
 ! CONFIG_DEBUG (y/n)
-# Networking architecture
-@ "modular" Modular
-@ "module" One module
-! [PLATFORM=ia32] NETWORKING (choice)