Changeset 4c61e60 in mainline for init/init.c

Timestamp:

2006-03-19T19:42:38Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

06b0d112

Parents:

7048773

Message:

Adapt userspace API to conform to kernel api.

File:

• init/init.c (modified) (6 diffs)

init/init.c

@@ -113 +113 @@
         int retval;
 
+        printf("Pinging\n");
         retval = ipc_call_sync(PHONE_NS, NS_PING, 0xbeef,&result);
         printf("Retval: %d - received: %P\n", retval, result);
 }
 
-static void got_answer(void *private, int retval, ipc_data_t *data)
+static void got_answer(void *private, int retval, ipc_call_t *data)
 {
         printf("Retval: %d...%s...%zX, %zX\n", retval, private,
@@ -149 +150 @@
 
 
-static void got_answer_2(void *private, int retval, ipc_data_t *data)
+static void got_answer_2(void *private, int retval, ipc_call_t *data)
 {
         printf("Pong\n");
@@ -156 +157 @@
 {
         int res;
-        unsigned long long taskid;
+        ipcarg_t phonead;
         ipc_callid_t callid;
         ipc_call_t data;
@@ -162 +163 @@
 
         printf("Asking 0 to connect to me...\n");
-        res = ipc_connect_to_me(0, 1, 2, &taskid);
-        printf("Result: %d - taskid: %llu\n", res, taskid);
+        res = ipc_connect_to_me(0, 1, 2, &phonead);
+        printf("Result: %d - phonead: %llu\n", res, phonead);
         for (i=0; i < 100; i++) {
                 printf("----------------\n");
@@ -179 +180 @@
         int res;
         ipcarg_t result;
+        int phoneid;
 
         printf("Starting connect...\n");
@@ -253 +255 @@
 //      test_connection_ipc();
 //      test_hangup();
-        test_slam();
-
-//      if ((tid = thread_create(utest, NULL, "utest") != -1)) {
-//              printf("Created thread tid=%d\n", tid);
-//      }
+//      test_slam();
+
+        if ((tid = thread_create(utest, NULL, "utest") != -1)) {
+                printf("Created thread tid=%d\n", tid);
+        }
         return 0;
 }