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

• ns/ns.c (modified) (4 diffs)

ns/ns.c

@@ -72 +72 @@
 } hashed_service_t;
 
-/*
-irq_cmd_t msim_cmds[1] = {
-        { CMD_MEM_READ_1, (void *)0xB0000000, 0 }
-};
-
-irq_code_t msim_kbd = {
-        1,
-        msim_cmds
-};
-*/
-/*
-irq_cmd_t i8042_cmds[1] = {
-        { CMD_PORT_READ_1, (void *)0x60, 0 }
-};
-
-irq_code_t i8042_kbd = {
-        1,
-        i8042_cmds
-};
-*/
-
-
 int static ping_phone;
 
@@ -110 +88 @@
                 return ENOMEM;
         }
-        
-        
-//      ipc_register_irq(2, &msim_kbd);
-//      ipc_register_irq(1, &i8042_kbd);
+                
         while (1) {
                 callid = ipc_wait_for_call(&call, 0);
-                printf("NS: Call in_phone_hash=%lX...", call.in_phone_hash);
+//              printf("NS: Call in_phone_hash=%lX...", call.in_phone_hash);
                 switch (IPC_GET_METHOD(call)) {
                 case IPC_M_AS_SEND:
                         as = (char *)IPC_GET_ARG2(call);
                         printf("Received as: %P, size:%d\n", as, IPC_GET_ARG3(call));
-                        retval = ipc_answer(callid, 0,(sysarg_t)(1024*1024), 0);
+                        retval = ipc_answer_fast(callid, 0,(sysarg_t)(1024*1024), 0);
                         if (!retval) {
                                 printf("Reading shared memory...");
@@ -171 +146 @@
                 }
                 if (! (callid & IPC_CALLID_NOTIFICATION)) {
-                        printf("Answering.\n");
-                        ipc_answer(callid, retval, arg1, arg2);
+//                      printf("Answering.\n");
+                        ipc_answer_fast(callid, retval, arg1, arg2);
                 }
         }
@@ -228 +203 @@
         hlp = hash_table_find(&ns_hash_table, keys);
         if (!hlp) {
-                printf("Service %d not registered.\n", service);
+//              printf("Service %d not registered.\n", service);
                 return ENOENT;
         }