Changeset 250717cc in mainline for pci/pci.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:

• pci/pci.c (modified) (3 diffs)

pci/pci.c

@@ -15 +15 @@
 #include <stdlib.h>
 #include <ipc.h>
+#include <services.h>
 #include <errno.h>
 
@@ -24 +25 @@
 #define NAME            "PCI"
 
+static struct pci_access *pacc;
+
 int main(int argc, char *argv[])
 {
-        struct pci_access *pacc;
         struct pci_dev *dev;
         unsigned int c;
         char buf[80];
-
-        int ipc_res;
         ipcarg_t ns_in_phone_hash;
 
@@ -53 +53 @@
                         dev->vendor_id, dev->device_id));
         }
-        pci_cleanup(pacc);            /* Close everything */
 
         printf("%s: registering at naming service.\n", NAME);
-        if (ipc_connect_to_me(PHONE_NS, 40, 70, &ns_in_phone_hash) != 0) {
+        if (ipc_connect_to_me(PHONE_NS, SERVICE_PCI, 0, &ns_in_phone_hash) != 0) {
                 printf("Failed to register %s at naming service.\n", NAME);
                 return -1;
         }
-        
+
         printf("%s: accepting connections\n", NAME);
-        while (1) {
+        while (1) {             
                 ipc_call_t call;
                 ipc_callid_t callid;
-                
+                int retval;
+
                 callid = ipc_wait_for_call(&call, 0);
-                ipc_answer(callid, EHANGUP, 0, 0);
+                switch(IPC_GET_METHOD(call)) {
+                case IPC_M_CONNECT_ME_TO:
+                        IPC_SET_RETVAL(call, 0);
+                        break;
+                }
+                if (! (callid & IPC_CALLID_NOTIFICATION)) {
+                        ipc_answer(callid, &call);
+                }
+                printf("%s: received call from %lX\n", NAME, call.in_phone_hash);
         }
+
+        pci_cleanup(pacc);
         return 0;
 }