Changeset 849ed54 in mainline for uspace/srv/hw/netif

Timestamp:

2010-03-30T18:39:04Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7553689

Parents:

7d6fe4db

Message:

Networking work:
Split the networking stack into end-user library (libsocket) and two helper libraries (libnet and libnetif).
Don't use over-the-hand compiling and linking, but rather separation of conserns.
There might be still some issues and the non-modular networking architecture is currently broken, but this will be fixed soon.

Location:

uspace/srv/hw/netif/dp8390

Files:

• Makefile (moved) (moved from uspace/srv/net/netif/dp8390/Makefile ) (1 diff)
• dp8390.c (moved) (moved from uspace/srv/net/netif/dp8390/dp8390.c ) (1 diff)
• dp8390.h (moved) (moved from uspace/srv/net/netif/dp8390/dp8390.h ) (1 diff)
• dp8390_drv.h (moved) (moved from uspace/srv/net/netif/dp8390/dp8390_drv.h )
• dp8390_module.c (moved) (moved from uspace/srv/net/netif/dp8390/dp8390_module.c ) (4 diffs)
• dp8390_port.h (moved) (moved from uspace/srv/net/netif/dp8390/dp8390_port.h )
• local.h (moved) (moved from uspace/srv/net/netif/dp8390/local.h )
• ne2000.c (moved) (moved from uspace/srv/net/netif/dp8390/ne2000.c )
• ne2000.h (moved) (moved from uspace/srv/net/netif/dp8390/ne2000.h )

uspace/srv/hw/netif/dp8390/Makefile

@@ -28 +28 @@
 #
 
-NET_BASE = ../..
 USPACE_PREFIX = ../../../..
 ROOT_PATH = $(USPACE_PREFIX)/..
+LIBS = $(LIBNET_PREFIX)/libnet.a $(LIBSOCKET_PREFIX)/libsocket.a
+EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include -I$(LIBSOCKET_PREFIX)/include
 
 COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
 CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
 
-BINARY = dp8390
-
 -include $(COMMON_MAKEFILE)
 -include $(CONFIG_MAKEFILE)
+
+ifeq ($(CONFIG_NETWORKING),modular)
+        BINARY = dp8390
+endif
+
+ifeq ($(CONFIG_NETWORKING),module)
+        LIBRARY = libdp8390
+endif
 
 SOURCES = \
         dp8390.c \
         dp8390_module.c \
-        ne2000.c \
-        $(NET_BASE)/module.c \
-        $(NET_BASE)/modules.c \
-        $(NET_BASE)/netif/netif.c \
-        $(NET_BASE)/structures/measured_strings.c \
-        $(NET_BASE)/structures/packet/packet.c \
-        $(NET_BASE)/structures/packet/packet_client.c \
-        $(NET_BASE)/structures/packet/packet_remote.c
-
-ifeq ($(CONFIG_NETWORKING),module)
-        SOURCES += \
-                $(NET_BASE)/checksum.c \
-                $(NET_BASE)/nil/eth/eth.c \
-                $(NET_BASE)/net/net_remote.c \
-                $(NET_BASE)/netif/netif_nil_bundle.c
-endif
-
-ifeq ($(CONFIG_NETWORKING),modular)
-        SOURCES += \
-                $(NET_BASE)/nil/nil_remote.c \
-                $(NET_BASE)/netif/netif_standalone.c
-endif
+        ne2000.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/srv/hw/netif/dp8390/dp8390.c

@@ -36 +36 @@
 #include <errno.h>
 
-#include "../../include/byteorder.h"
-
-#include "../../structures/packet/packet.h"
-#include "../../structures/packet/packet_client.h"
-
-#include "../netif.h"
+#include <net_byteorder.h>
+
+#include <packet/packet.h>
+#include <packet/packet_client.h>
+
+#include <netif.h>
 
 #include "dp8390_drv.h"

uspace/srv/hw/netif/dp8390/dp8390.h

@@ -36 +36 @@
 #define __NET_NETIF_DP8390_H__
 
-#include "../../structures/packet/packet.h"
+#include <packet/packet.h>
 
 #include "dp8390_port.h"

uspace/srv/hw/netif/dp8390/dp8390_module.c

@@ -40 +40 @@
 #include <errno.h>
 #include <malloc.h>
-//#include <stdio.h>
 #include <ipc/ipc.h>
 #include <ipc/services.h>
 
-#include "../../err.h"
-#include "../../messages.h"
-#include "../../modules.h"
-
-#include "../../structures/packet/packet_client.h"
-#include "../../structures/measured_strings.h"
-
-#include "../../include/device.h"
-#include "../../include/nil_interface.h"
-
-#include "../netif.h"
-#include "../netif_module.h"
+#include <net_err.h>
+#include <net_messages.h>
+#include <net_modules.h>
+#include <packet/packet_client.h>
+#include <adt/measured_strings.h>
+#include <net_device.h>
+#include <nil_interface.h>
+#include <netif.h>
+#include <netif_module.h>
 
 #include "dp8390.h"
@@ -102 +98 @@
  */
 netif_globals_t netif_globals;
-
-/** Prints the module name.
- *  @see NAME
- */
-void module_print_name(void);
 
 /** Handles the interrupt messages.
@@ -151 +142 @@
         stats->send_window_errors = de_stat->ets_OWC;
         return EOK;
-}
-
-void module_print_name(void){
-        printf("%s", NAME);
 }
 
@@ -329 +316 @@
 }
 
+#ifdef CONFIG_NETWORKING_modular
+
+#include <netif_standalone.h>
+
+/** Default thread for new connections.
+ *
+ *  @param[in] iid The initial message identifier.
+ *  @param[in] icall The initial message call structure.
+ *
+ */
+static void netif_client_connection(ipc_callid_t iid, ipc_call_t * icall)
+{
+        /*
+         * Accept the connection
+         *  - Answer the first IPC_M_CONNECT_ME_TO call.
+         */
+        ipc_answer_0(iid, EOK);
+        
+        while(true) {
+                ipc_call_t answer;
+                int answer_count;
+                
+                /* Clear the answer structure */
+                refresh_answer(&answer, &answer_count);
+                
+                /* Fetch the next message */
+                ipc_call_t call;
+                ipc_callid_t callid = async_get_call(&call);
+                
+                /* Process the message */
+                int res = netif_module_message(callid, &call, &answer, &answer_count);
+                
+                /* End if said to either by the message or the processing result */
+                if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) || (res == EHANGUP))
+                        return;
+                
+                /* Answer the message */
+                answer_call(callid, res, &answer, answer_count);
+        }
+}
+
+/** Starts the module.
+ *
+ *  @param argc The count of the command line arguments. Ignored parameter.
+ *  @param argv The command line parameters. Ignored parameter.
+ *
+ *  @returns EOK on success.
+ *  @returns Other error codes as defined for each specific module start function.
+ *
+ */
+int main(int argc, char *argv[])
+{
+        ERROR_DECLARE;
+        
+        /* Print the module label */
+        printf("Task %d - %s\n", task_get_id(), NAME);
+        
+        /* Start the module */
+        if (ERROR_OCCURRED(netif_module_start(netif_client_connection))) {
+                printf(" - ERROR %i\n", ERROR_CODE);
+                return ERROR_CODE;
+        }
+        
+        return EOK;
+}
+
+#endif /* CONFIG_NETWORKING_modular */
+
+
 /** @}
  */