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

Timestamp:

2010-12-25T21:20:28Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

631ee0c

Parents:

1bfd3d3 (diff), 09178b7f (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:

Merge mainline changes.

File:

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

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

@@ -201 +201 @@
 
         eth_globals.broadcast_addr =
-            measured_string_create_bulk("\xFF\xFF\xFF\xFF\xFF\xFF",
-            CONVERT_SIZE(uint8_t, char, ETH_ADDR));
+            measured_string_create_bulk("\xFF\xFF\xFF\xFF\xFF\xFF", ETH_ADDR);
         if (!eth_globals.broadcast_addr) {
                 rc = ENOMEM;
@@ -234 +233 @@
 static void eth_receiver(ipc_callid_t iid, ipc_call_t *icall)
 {
-        packet_t packet;
+        packet_t *packet;
         int rc;
 
         while (true) {
-                switch (IPC_GET_METHOD(*icall)) {
+                switch (IPC_GET_IMETHOD(*icall)) {
                 case NET_NIL_DEVICE_STATE:
                         nil_device_state_msg_local(0, IPC_GET_DEVICE(icall),
@@ -251 +250 @@
                                     IPC_GET_DEVICE(icall), packet, 0);
                         }
-                        ipc_answer_0(iid, (ipcarg_t) rc);
+                        ipc_answer_0(iid, (sysarg_t) rc);
                         break;
                 default:
-                        ipc_answer_0(iid, (ipcarg_t) ENOTSUP);
+                        ipc_answer_0(iid, (sysarg_t) ENOTSUP);
                 }
                 
@@ -315 +314 @@
                         device->mtu = ETH_MAX_TAGGED_CONTENT(device->flags);
                 
-                printf("Device %d already exists:\tMTU\t= %d\n",
+                printf("Device %d already exists:\tMTU\t= %zu\n",
                     device->device_id, device->mtu);
                 fibril_rwlock_write_unlock(&eth_globals.devices_lock);
@@ -407 +406 @@
         }
         
-        printf("%s: Device registered (id: %d, service: %d: mtu: %d, "
+        printf("%s: Device registered (id: %d, service: %d: mtu: %zu, "
             "mac: %x:%x:%x:%x:%x:%x, flags: 0x%x)\n",
             NAME, device->device_id, device->service, device->mtu,
@@ -429 +428 @@
  * @return              NULL if the packet address length is not big enough.
  */
-static eth_proto_t *eth_process_packet(int flags, packet_t packet)
+static eth_proto_t *eth_process_packet(int flags, packet_t *packet)
 {
         eth_header_snap_t *header;
@@ -509 +508 @@
 
 int nil_received_msg_local(int nil_phone, device_id_t device_id,
-    packet_t packet, services_t target)
+    packet_t *packet, services_t target)
 {
         eth_proto_t *proto;
-        packet_t next;
+        packet_t *next;
         eth_device_t *device;
         int flags;
@@ -680 +679 @@
  */
 static int
-eth_prepare_packet(int flags, packet_t packet, uint8_t *src_addr, int ethertype,
+eth_prepare_packet(int flags, packet_t *packet, uint8_t *src_addr, int ethertype,
     size_t mtu)
 {
@@ -787 +786 @@
  * @return              EINVAL if the service parameter is not known.
  */
-static int eth_send_message(device_id_t device_id, packet_t packet,
+static int eth_send_message(device_id_t device_id, packet_t *packet,
     services_t sender)
 {
         eth_device_t *device;
-        packet_t next;
-        packet_t tmp;
+        packet_t *next;
+        packet_t *tmp;
         int ethertype;
         int rc;
@@ -841 +840 @@
 {
         measured_string_t *address;
-        packet_t packet;
+        packet_t *packet;
         size_t addrlen;
         size_t prefix;
@@ -849 +848 @@
         
         *answer_count = 0;
-        switch (IPC_GET_METHOD(*call)) {
+        switch (IPC_GET_IMETHOD(*call)) {
         case IPC_M_PHONE_HUNGUP:
                 return EOK;
@@ -926 +925 @@
                  * result.
                  */
-                if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) ||
+                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
                     (res == EHANGUP))
                         return;