Changeset 250717cc in mainline for init/init.c

Timestamp:

2006-05-16T09:30:42Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ec153a0

Parents:

51d6f80

Message:

Add services.h to codify service numbers.
Assign codes for PCI, keyboard and frame buffer services.

Rename ipc_answer() to ipc_answer_fast() and add the basic
slower variant and call it ipc_answer(). Add some doxygen comments.

Remove unused bits from the libpci library.

File:

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

init/init.c

@@ -29 +29 @@
 #include "version.h"
 #include <ipc.h>
+#include <services.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -40 +41 @@
 #include <ddi.h>
 #include <string.h>
+#include <errno.h>
 #include <kbd.h>
 
@@ -203 +205 @@
                 callid = ipc_wait_for_call(&data, NULL);
                 printf("Received ping\n");
-                ipc_answer(callid, 0, 0, 0);
+                ipc_answer_fast(callid, 0, 0, 0);
         }
 //      callid = ipc_wait_for_call(&data, NULL);
@@ -301 +303 @@
 
         printf("Test: Starting connect...\n");
-        while ((phoneid = ipc_connect_me_to(PHONE_NS, 30, 60)) < 0) {
+        while ((phoneid = ipc_connect_me_to(PHONE_NS, SERVICE_KEYBOARD, 0)) < 0) {
         };
         
@@ -314 +316 @@
         printf("Test: Hangin up\n");
         ipc_hangup(phoneid);
+}
+
+static void test_pci()
+{
+        int phone;
+        while ((phone = ipc_connect_me_to(PHONE_NS, SERVICE_PCI, 0)) < 0)
+                ;
+        printf("Connected to PCI service through phone %d.\n", phone);
 }
 
@@ -355 +365 @@
 //      test_slam();
 //      test_as_send();
+        test_pci();
         test_kbd();
 
@@ -378 +389 @@
 
         int i;
-        
+
         for (i = 0; i < 50000000; i++)
                 ;
@@ -401 +412 @@
         printf("Main thread exiting.\n");
 */
+
         return 0;
 }