Changeset cd50486 in mainline for uspace/lib/drv/generic/driver.c

Timestamp:

2011-02-06T22:03:55Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

25971d2

Parents:

1110ebd (diff), 960ff451 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge development/ changes

File:

• uspace/lib/drv/generic/driver.c (modified) (12 diffs)

uspace/lib/drv/generic/driver.c

@@ -186 +186 @@
                 pseudocode = &default_pseudocode;
         
-        int res = ipc_register_irq(irq, dev->handle, ctx->id, pseudocode);
+        int res = register_irq(irq, dev->handle, ctx->id, pseudocode);
         if (res != EOK) {
                 remove_interrupt_context(&interrupt_contexts, ctx);
@@ -199 +199 @@
         interrupt_context_t *ctx = find_interrupt_context(&interrupt_contexts,
             dev, irq);
-        int res = ipc_unregister_irq(irq, dev->handle);
+        int res = unregister_irq(irq, dev->handle);
         
         if (ctx != NULL) {
@@ -272 +272 @@
         }
         
-        ipc_answer_0(iid, res);
+        async_answer_0(iid, res);
 }
 
@@ -278 +278 @@
 {
         /* Accept connection */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
         
         bool cont = true;
@@ -293 +293 @@
                         break;
                 default:
-                        ipc_answer_0(callid, ENOENT);
+                        async_answer_0(callid, ENOENT);
                 }
         }
@@ -316 +316 @@
                 printf("%s: driver_connection_gen error - no device with handle"
                     " %" PRIun " was found.\n", driver->name, handle);
-                ipc_answer_0(iid, ENOENT);
+                async_answer_0(iid, ENOENT);
                 return;
         }
@@ -331 +331 @@
                 ret = (*dev->ops->open)(dev);
         
-        ipc_answer_0(iid, ret);
+        async_answer_0(iid, ret);
         if (ret != EOK)
                 return;
@@ -347 +347 @@
                         if (dev->ops != NULL && dev->ops->close != NULL)
                                 (*dev->ops->close)(dev);
-                        ipc_answer_0(callid, EOK);
+                        async_answer_0(callid, EOK);
                         return;
                 default:
@@ -368 +368 @@
                                     "invalid interface id %d.",
                                     driver->name, iface_idx);
-                                ipc_answer_0(callid, ENOTSUP);
+                                async_answer_0(callid, ENOTSUP);
                                 break;
                         }
@@ -381 +381 @@
                                 printf("device with handle %" PRIun " has no interface "
                                     "with id %d.\n", handle, iface_idx);
-                                ipc_answer_0(callid, ENOTSUP);
+                                async_answer_0(callid, ENOTSUP);
                                 break;
                         }
@@ -400 +400 @@
                                 printf("%s: driver_connection_gen error - "
                                     "invalid interface method.", driver->name);
-                                ipc_answer_0(callid, ENOTSUP);
+                                async_answer_0(callid, ENOTSUP);
                                 break;
                         }
@@ -446 +446 @@
         default:
                 /* No such interface */
-                ipc_answer_0(iid, ENOENT);
+                async_answer_0(iid, ENOENT);
         }
 }