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

Timestamp:

2011-01-14T12:34:42Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

45019865

Parents:

b2a6fcfe (diff), 6610565b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged development into lelian/hidd

File:

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

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

@@ -54 +54 @@
 #include <protocol_map.h>
 #include <net/device.h>
-#include <netif_interface.h>
+#include <netif_remote.h>
 #include <net_interface.h>
 #include <nil_interface.h>
@@ -201 +201 @@
 
         eth_globals.broadcast_addr =
-            measured_string_create_bulk("\xFF\xFF\xFF\xFF\xFF\xFF", ETH_ADDR);
+            measured_string_create_bulk((uint8_t *) "\xFF\xFF\xFF\xFF\xFF\xFF", ETH_ADDR);
         if (!eth_globals.broadcast_addr) {
                 rc = ENOMEM;
@@ -239 +239 @@
                 switch (IPC_GET_IMETHOD(*icall)) {
                 case NET_NIL_DEVICE_STATE:
-                        nil_device_state_msg_local(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:
                         rc = packet_translate_remote(eth_globals.net_phone,
-                            &packet, IPC_GET_PACKET(icall));
+                            &packet, IPC_GET_PACKET(*icall));
                         if (rc == EOK) {
                                 rc = nil_received_msg_local(0,
-                                    IPC_GET_DEVICE(icall), packet, 0);
+                                    IPC_GET_DEVICE(*icall), packet, 0);
                         }
                         ipc_answer_0(iid, (sysarg_t) rc);
@@ -284 +284 @@
         measured_string_t names[2] = {
                 {
-                        (char *) "ETH_MODE",
+                        (uint8_t *) "ETH_MODE",
                         8
                 },
                 {
-                        (char *) "ETH_DUMMY",
+                        (uint8_t *) "ETH_DUMMY",
                         9
                 }
@@ -294 +294 @@
         measured_string_t *configuration;
         size_t count = sizeof(names) / sizeof(measured_string_t);
-        char *data;
+        uint8_t *data;
         eth_proto_t *proto;
         int rc;
@@ -358 +358 @@
 
         if (configuration) {
-                if (!str_lcmp(configuration[0].value, "DIX",
+                if (!str_lcmp((char *) configuration[0].value, "DIX",
                     configuration[0].length)) {
                         device->flags |= ETH_DIX;
-                } else if(!str_lcmp(configuration[0].value, "8023_2_LSAP",
+                } else if(!str_lcmp((char *) configuration[0].value, "8023_2_LSAP",
                     configuration[0].length)) {
                         device->flags |= ETH_8023_2_LSAP;
@@ -407 +407 @@
         
         printf("%s: Device registered (id: %d, service: %d: mtu: %zu, "
-            "mac: %x:%x:%x:%x:%x:%x, flags: 0x%x)\n",
+            "mac: %02x:%02x:%02x:%02x:%02x:%02x, flags: 0x%x)\n",
             NAME, device->device_id, device->service, device->mtu,
             device->addr_data[0], device->addr_data[1],
@@ -837 +837 @@
 
 int nil_message_standalone(const char *name, ipc_callid_t callid,
-    ipc_call_t *call, ipc_call_t *answer, int *answer_count)
+    ipc_call_t *call, ipc_call_t *answer, size_t *answer_count)
 {
         measured_string_t *address;
@@ -853 +853 @@
         
         case NET_NIL_DEVICE:
-                return eth_device_message(IPC_GET_DEVICE(call),
-                    IPC_GET_SERVICE(call), IPC_GET_MTU(call));
+                return eth_device_message(IPC_GET_DEVICE(*call),
+                    IPC_GET_SERVICE(*call), IPC_GET_MTU(*call));
         case NET_NIL_SEND:
                 rc = packet_translate_remote(eth_globals.net_phone, &packet,
-                    IPC_GET_PACKET(call));
+                    IPC_GET_PACKET(*call));
                 if (rc != EOK)
                         return rc;
-                return eth_send_message(IPC_GET_DEVICE(call), packet,
-                    IPC_GET_SERVICE(call));
+                return eth_send_message(IPC_GET_DEVICE(*call), packet,
+                    IPC_GET_SERVICE(*call));
         case NET_NIL_PACKET_SPACE:
-                rc = eth_packet_space_message(IPC_GET_DEVICE(call), &addrlen,
+                rc = eth_packet_space_message(IPC_GET_DEVICE(*call), &addrlen,
                     &prefix, &content, &suffix);
                 if (rc != EOK)
                         return rc;
-                IPC_SET_ADDR(answer, addrlen);
-                IPC_SET_PREFIX(answer, prefix);
-                IPC_SET_CONTENT(answer, content);
-                IPC_SET_SUFFIX(answer, suffix);
+                IPC_SET_ADDR(*answer, addrlen);
+                IPC_SET_PREFIX(*answer, prefix);
+                IPC_SET_CONTENT(*answer, content);
+                IPC_SET_SUFFIX(*answer, suffix);
                 *answer_count = 4;
                 return EOK;
         case NET_NIL_ADDR:
-                rc = eth_addr_message(IPC_GET_DEVICE(call), ETH_LOCAL_ADDR,
+                rc = eth_addr_message(IPC_GET_DEVICE(*call), ETH_LOCAL_ADDR,
                     &address);
                 if (rc != EOK)
@@ -880 +880 @@
                 return measured_strings_reply(address, 1);
         case NET_NIL_BROADCAST_ADDR:
-                rc = eth_addr_message(IPC_GET_DEVICE(call), ETH_BROADCAST_ADDR,
+                rc = eth_addr_message(IPC_GET_DEVICE(*call), ETH_BROADCAST_ADDR,
                     &address);
                 if (rc != EOK)
@@ -886 +886 @@
                 return measured_strings_reply(address, 1);
         case IPC_M_CONNECT_TO_ME:
-                return eth_register_message(NIL_GET_PROTO(call),
-                    IPC_GET_PHONE(call));
+                return eth_register_message(NIL_GET_PROTO(*call),
+                    IPC_GET_PHONE(*call));
         }
         
@@ -908 +908 @@
         while (true) {
                 ipc_call_t answer;
-                int answer_count;
+                size_t count;
                 
                 /* Clear the answer structure */
-                refresh_answer(&answer, &answer_count);
+                refresh_answer(&answer, &count);
                 
                 /* Fetch the next message */
@@ -919 +919 @@
                 /* Process the message */
                 int res = nil_module_message_standalone(NAME, callid, &call,
-                    &answer, &answer_count);
+                    &answer, &count);
                 
                 /*
@@ -930 +930 @@
                 
                 /* Answer the message */
-                answer_call(callid, res, &answer, answer_count);
+                answer_call(callid, res, &answer, count);
         }
 }