Changeset 87b4baac in mainline for uspace/srv/net/nil

Timestamp:

2010-12-17T20:16:46Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

424558a

Parents:

463e734 (diff), bbc74af7 (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

Location:

uspace/srv/net/nil

Files:

• eth/eth.c (modified) (5 diffs)
• eth/eth_module.c (modified) (2 diffs)
• nildummy/nildummy.c (modified) (4 diffs)
• nildummy/nildummy_module.c (modified) (2 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;
@@ -238 +237 @@
 
         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);
                 }
                 
@@ -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;

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

@@ -52 +52 @@
 int nil_module_start_standalone(async_client_conn_t client_connection)
 {
-        ipcarg_t phonehash;
+        sysarg_t phonehash;
         int rc;
         
@@ -66 +66 @@
                 goto out;
 
-        rc = REGISTER_ME(SERVICE_ETHERNET, &phonehash);
+        rc = ipc_connect_to_me(PHONE_NS, SERVICE_ETHERNET, 0, 0, &phonehash);
         if (rc != EOK)
                 goto out;

uspace/srv/net/nil/nildummy/nildummy.c

@@ -110 +110 @@
 
         while (true) {
-                switch (IPC_GET_METHOD(*icall)) {
+                switch (IPC_GET_IMETHOD(*icall)) {
                 case NET_NIL_DEVICE_STATE:
                         rc = nil_device_state_msg_local(0,
                             IPC_GET_DEVICE(icall), IPC_GET_STATE(icall));
-                        ipc_answer_0(iid, (ipcarg_t) rc);
+                        ipc_answer_0(iid, (sysarg_t) rc);
                         break;
                 
@@ -124 +124 @@
                                     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);
                 }
                 
@@ -386 +386 @@
         
         *answer_count = 0;
-        switch (IPC_GET_METHOD(*call)) {
+        switch (IPC_GET_IMETHOD(*call)) {
         case IPC_M_PHONE_HUNGUP:
                 return EOK;
@@ -466 +466 @@
                  * result.
                  */
-                if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) ||
+                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
                     (res == EHANGUP))
                         return;

uspace/srv/net/nil/nildummy/nildummy_module.c

@@ -52 +52 @@
 int nil_module_start_standalone(async_client_conn_t client_connection)
 {
-        ipcarg_t phonehash;
+        sysarg_t phonehash;
         int rc;
         
@@ -67 +67 @@
                 goto out;
         
-        rc = REGISTER_ME(SERVICE_NILDUMMY, &phonehash);
+        rc = ipc_connect_to_me(PHONE_NS, SERVICE_NILDUMMY, 0, 0, &phonehash);
         if (rc != EOK)
                 goto out;