Changeset f044e96 in mainline for uspace/lib

Timestamp:

2011-12-19T15:42:29Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

17b3cc6

Parents:

1761268

Message:

use systematic names

• register_irq → irq_register
• unregister_irq → irq_unregister

Location:

uspace/lib

Files:

• c/generic/ddi.c (modified) (2 diffs)
• c/include/ddi.h (modified) (1 diff)
• drv/generic/driver.c (modified) (2 diffs)

uspace/lib/c/generic/ddi.c

@@ -176 +176 @@
  *
  */
-int register_irq(int inr, int devno, int method, irq_code_t *ucode)
+int irq_register(int inr, int devno, int method, irq_code_t *ucode)
 {
-        return __SYSCALL4(SYS_REGISTER_IRQ, inr, devno, method,
+        return __SYSCALL4(SYS_IRQ_REGISTER, inr, devno, method,
             (sysarg_t) ucode);
 }
@@ -190 +190 @@
  *
  */
-int unregister_irq(int inr, int devno)
+int irq_unregister(int inr, int devno)
 {
-        return __SYSCALL2(SYS_UNREGISTER_IRQ, inr, devno);
+        return __SYSCALL2(SYS_IRQ_UNREGISTER, inr, devno);
 }
 

uspace/lib/c/include/ddi.h

@@ -53 +53 @@
 extern int pio_enable(void *, size_t, void **);
 
-extern int register_irq(int, int, int, irq_code_t *);
-extern int unregister_irq(int, int);
+extern int irq_register(int, int, int, irq_code_t *);
+extern int irq_unregister(int, int);
 
 #endif

uspace/lib/drv/generic/driver.c

@@ -198 +198 @@
                 pseudocode = &default_pseudocode;
         
-        int res = register_irq(irq, dev->handle, ctx->id, pseudocode);
+        int res = irq_register(irq, dev->handle, ctx->id, pseudocode);
         if (res != EOK) {
                 remove_interrupt_context(&interrupt_contexts, ctx);
@@ -211 +211 @@
         interrupt_context_t *ctx = find_interrupt_context(&interrupt_contexts,
             dev, irq);
-        int res = unregister_irq(irq, dev->handle);
+        int res = irq_unregister(irq, dev->handle);
         
         if (ctx != NULL) {