Changeset ffa2c8ef in mainline for uspace/srv/hw/irc

Timestamp:

2011-01-29T11:36:08Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

46b881c

Parents:

64d2b10

Message:

do not intermix low-level IPC methods with async framework methods

Location:

uspace/srv/hw/irc

Files:

• apic/apic.c (modified) (3 diffs)
• fhc/fhc.c (modified) (4 diffs)
• i8259/i8259.c (modified) (3 diffs)
• obio/obio.c (modified) (4 diffs)

uspace/srv/hw/irc/apic/apic.c

@@ -36 +36 @@
  */
 
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/irc.h>
@@ -75 +74 @@
          * Answer the first IPC_M_CONNECT_ME_TO call.
          */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
         
         while (true) {
@@ -82 +81 @@
                 switch (IPC_GET_IMETHOD(call)) {
                 case IRC_ENABLE_INTERRUPT:
-                        ipc_answer_0(callid, apic_enable_irq(IPC_GET_ARG1(call)));
+                        async_answer_0(callid, apic_enable_irq(IPC_GET_ARG1(call)));
                         break;
                 case IRC_CLEAR_INTERRUPT:
                         /* Noop */
-                        ipc_answer_0(callid, EOK);
+                        async_answer_0(callid, EOK);
                         break;
                 default:
-                        ipc_answer_0(callid, EINVAL);
+                        async_answer_0(callid, EINVAL);
                         break;
                 }

uspace/srv/hw/irc/fhc/fhc.c

@@ -29 +29 @@
 /** @addtogroup fhc
  * @{
- */ 
+ */
 
 /**
- * @file        fhc.c
- * @brief       FHC bus controller driver.
+ * @file fhc.c
+ * @brief FHC bus controller driver.
  */
 
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/irc.h>
@@ -76 +75 @@
          * Answer the first IPC_M_CONNECT_ME_TO call.
          */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
 
         while (1) {
@@ -85 +84 @@
                 case IRC_ENABLE_INTERRUPT:
                         /* Noop */
-                        ipc_answer_0(callid, EOK);
+                        async_answer_0(callid, EOK);
                         break;
                 case IRC_CLEAR_INTERRUPT:
@@ -92 +91 @@
                         case FHC_UART_INR:
                                 fhc_uart_virt[FHC_UART_ICLR] = 0;
-                                ipc_answer_0(callid, EOK);
+                                async_answer_0(callid, EOK);
                                 break;
                         default:
-                                ipc_answer_0(callid, ENOTSUP);
+                                async_answer_0(callid, ENOTSUP);
                                 break;
                         }
                         break;
                 default:
-                        ipc_answer_0(callid, EINVAL);
+                        async_answer_0(callid, EINVAL);
                         break;
                 }

uspace/srv/hw/irc/i8259/i8259.c

@@ -36 +36 @@
  */
 
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/irc.h>
@@ -109 +108 @@
          * Answer the first IPC_M_CONNECT_ME_TO call.
          */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
         
         while (true) {
@@ -116 +115 @@
                 switch (IPC_GET_IMETHOD(call)) {
                 case IRC_ENABLE_INTERRUPT:
-                        ipc_answer_0(callid, pic_enable_irq(IPC_GET_ARG1(call)));
+                        async_answer_0(callid, pic_enable_irq(IPC_GET_ARG1(call)));
                         break;
                 case IRC_CLEAR_INTERRUPT:
                         /* Noop */
-                        ipc_answer_0(callid, EOK);
+                        async_answer_0(callid, EOK);
                         break;
                 default:
-                        ipc_answer_0(callid, EINVAL);
+                        async_answer_0(callid, EINVAL);
                         break;
                 }

uspace/srv/hw/irc/obio/obio.c

@@ -27 +27 @@
  */
 
-/** @addtogroup obio 
+/** @addtogroup obio
  * @{
- */ 
+ */
 
 /**
- * @file        obio.c
- * @brief       OBIO driver.
+ * @file obio.c
+ * @brief OBIO driver.
  *
  * OBIO is a short for on-board I/O. On UltraSPARC IIi and systems with U2P,
@@ -42 +42 @@
  */
 
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/irc.h>
@@ -86 +85 @@
          * Answer the first IPC_M_CONNECT_ME_TO call.
          */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
 
         while (1) {
@@ -95 +94 @@
                 case IRC_ENABLE_INTERRUPT:
                         /* Noop */
-                        ipc_answer_0(callid, EOK);
+                        async_answer_0(callid, EOK);
                         break;
                 case IRC_CLEAR_INTERRUPT:
                         inr = IPC_GET_ARG1(call);
                         base_virt[OBIO_CIR(inr & INO_MASK)] = 0;
-                        ipc_answer_0(callid, EOK);
+                        async_answer_0(callid, EOK);
                         break;
                 default:
-                        ipc_answer_0(callid, EINVAL);
+                        async_answer_0(callid, EINVAL);
                         break;
                 }