Changeset 8426912a in mainline for uspace/lib/c/generic

Timestamp:

2011-01-14T12:35:19Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

d450964

Parents:

6610565b (diff), 08abd81 (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 mainline changes

Location:

uspace/lib/c/generic

Files:

• ddi.c (modified) (1 diff)
• devman.c (modified) (1 diff)

uspace/lib/c/generic/ddi.c

@@ -96 +96 @@
 }
 
-/** Enable an interrupt.
- * 
- * @param irq the interrupt.
- * 
- * @return Zero on success, negative error code otherwise. 
- */
-int interrupt_enable(int irq) 
-{
-        return __SYSCALL2(SYS_INTERRUPT_ENABLE, (sysarg_t) irq, 1);
-}
-
-/** Disable an interrupt.
- * 
- * @param irq the interrupt.
- * 
- * @return Zero on success, negative error code otherwise. 
- */
-int interrupt_disable(int irq) 
-{
-        return __SYSCALL2(SYS_INTERRUPT_ENABLE, (sysarg_t) irq, 0);
-}
-
 /** Enable PIO for specified I/O range.
  *

uspace/lib/c/generic/devman.c

@@ -79 +79 @@
                 }
                 
-                if (flags & IPC_FLAG_BLOCKING)
+                if (flags & IPC_FLAG_BLOCKING) {
                         devman_phone_client = async_connect_me_to_blocking(
                             PHONE_NS, SERVICE_DEVMAN, DEVMAN_CLIENT, 0);
-                else
+                } else {
                         devman_phone_client = async_connect_me_to(PHONE_NS,
                             SERVICE_DEVMAN, DEVMAN_CLIENT, 0);
+                }
                 
                 fibril_mutex_unlock(&devman_phone_mutex);