Changeset 14f1db0 in mainline for uspace/srv/net/nil/eth/eth.c

Timestamp:

2010-04-09T12:54:57Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

a1caa3c2

Parents:

24ab58b3

Message:

networking overhaul:

• separation of conserns
• removal of (almost all) overlaping symbols, libnetif is not needed anymore
• again, it is possible to build the networking in multiple architecture configurations (however, currently only the bundling netif and nil layers is supported, more to come)
• code style updates and fixes (still a huge amount of work to do)

File:

• uspace/srv/net/nil/eth/eth.c (modified) (14 diffs)

uspace/srv/net/nil/eth/eth.c

@@ -60 +60 @@
 #include <adt/measured_strings.h>
 #include <packet/packet_client.h>
-#include <nil_module.h>
+#include <packet_remote.h>
+#include <nil_local.h>
 
 #include "eth.h"
@@ -271 +272 @@
 INT_MAP_IMPLEMENT(eth_protos, eth_proto_t)
 
-int nil_device_state_msg(int nil_phone, device_id_t device_id, int state){
+int nil_device_state_msg_local(int nil_phone, device_id_t device_id, int state){
         int index;
         eth_proto_ref proto;
@@ -475 +476 @@
 }
 
-int nil_received_msg(int nil_phone, device_id_t device_id, packet_t packet, services_t target){
+int nil_received_msg_local(int nil_phone, device_id_t device_id, packet_t packet, services_t target){
         eth_proto_ref proto;
         packet_t next;
@@ -497 +498 @@
                 }else{
                         // drop invalid/unknown
-                        pq_release(eth_globals.net_phone, packet_get_id(packet));
+                        pq_release_remote(eth_globals.net_phone, packet_get_id(packet));
                 }
                 packet = next;
@@ -681 +682 @@
         ethertype = htons(protocol_map(SERVICE_ETHERNET, sender));
         if(! ethertype){
-                pq_release(eth_globals.net_phone, packet_get_id(packet));
+                pq_release_remote(eth_globals.net_phone, packet_get_id(packet));
                 return EINVAL;
         }
@@ -699 +700 @@
                                 packet = tmp;
                         }
-                        pq_release(eth_globals.net_phone, packet_get_id(next));
+                        pq_release_remote(eth_globals.net_phone, packet_get_id(next));
                         next = tmp;
                 }else{
@@ -713 +714 @@
 }
 
-int nil_message(const char *name, ipc_callid_t callid, ipc_call_t *call,
+int nil_message_standalone(const char *name, ipc_callid_t callid, ipc_call_t *call,
     ipc_call_t *answer, int *answer_count)
 {
@@ -733 +734 @@
                             IPC_GET_SERVICE(call), IPC_GET_MTU(call));
                 case NET_NIL_SEND:
-                        ERROR_PROPAGATE(packet_translate(eth_globals.net_phone, &packet,
+                        ERROR_PROPAGATE(packet_translate_remote(eth_globals.net_phone, &packet,
                             IPC_GET_PACKET(call)));
                         return eth_send_message(IPC_GET_DEVICE(call), packet,
@@ -771 +772 @@
                 switch(IPC_GET_METHOD(*icall)){
                         case NET_NIL_DEVICE_STATE:
-                                nil_device_state_msg(0, IPC_GET_DEVICE(icall), IPC_GET_STATE(icall));
+                                nil_device_state_msg_local(0, IPC_GET_DEVICE(icall), IPC_GET_STATE(icall));
                                 ipc_answer_0(iid, EOK);
                                 break;
                         case NET_NIL_RECEIVED:
-                                if(! ERROR_OCCURRED(packet_translate(eth_globals.net_phone, &packet, IPC_GET_PACKET(icall)))){
-                                        ERROR_CODE = nil_received_msg(0, IPC_GET_DEVICE(icall), packet, 0);
+                                if(! ERROR_OCCURRED(packet_translate_remote(eth_globals.net_phone, &packet, IPC_GET_PACKET(icall)))){
+                                        ERROR_CODE = nil_received_msg_local(0, IPC_GET_DEVICE(icall), packet, 0);
                                 }
                                 ipc_answer_0(iid, (ipcarg_t) ERROR_CODE);
@@ -787 +788 @@
 }
 
-#ifdef CONFIG_NETWORKING_modular
-
-#include <nil_standalone.h>
+#ifndef CONFIG_NETIF_NIL_BUNDLE
 
 /** Default thread for new connections.
  *
- *  @param[in] iid The initial message identifier.
- *  @param[in] icall The initial message call structure.
+ * @param[in] iid The initial message identifier.
+ * @param[in] icall The initial message call structure.
  *
  */
-static void nil_client_connection(ipc_callid_t iid, ipc_call_t * icall)
+static void nil_client_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
         /*
@@ -817 +816 @@
                 
                 /* Process the message */
-                int res = nil_module_message(NAME, callid, &call, &answer,
+                int res = nil_module_message_standalone(NAME, callid, &call, &answer,
                     &answer_count);
                 
@@ -829 +828 @@
 }
 
-/** 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[])
 {
@@ -843 +833 @@
         
         /* Start the module */
-        if (ERROR_OCCURRED(nil_module_start(nil_client_connection)))
+        if (ERROR_OCCURRED(nil_module_start_standalone(nil_client_connection)))
                 return ERROR_CODE;
         
@@ -849 +839 @@
 }
 
-#endif /* CONFIG_NETWORKING_modular */
+#endif /* CONFIG_NETIF_NIL_BUNDLE */
 
 /** @}