Changeset 5770:b3577113c65e in roaraudio

Timestamp:

11/22/12 01:49:23 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

support unregging FN Regs without unregging all FN Regs of current lhandle

Files:

• include/libroar/roardl.h (modified) (2 diffs)
• libroar/roardl.c (modified) (3 diffs)
• libroar/scheduler.c (modified) (1 diff)

include/libroar/roardl.h

@@ -50 +50 @@
 #define ROAR_DL_HANDLE_LIBROAR          ((struct roar_dl_lhandle*)(void*)2)
 #define ROAR_DL_HANDLE_APPLICATION      ((struct roar_dl_lhandle*)(void*)3)
+#define ROAR_DL_HANDLE_LIB              ((struct roar_dl_lhandle*)(void*)4)
 
 #define ROAR_DL_FN_DSTR                 0 /* VIO and DSTR drivers */
@@ -411 +412 @@
 int                      roar_dl_register_fn(struct roar_dl_lhandle * lhandle, int fn, int subtype, const void * object, size_t objectlen, int version, int options);
 
+// Unregister an FN.
+int                      roar_dl_unregister_fn2(struct roar_dl_lhandle * lhandle, int fn, int subtype, const void * object, size_t objectlen, int version, int options);
+
 // Unregister FN for the given plugin.
 // This should not be called directly and is called internally when needed.

libroar/roardl.c

@@ -981 +981 @@
 }
 
-int roar_dl_unregister_fn(struct roar_dl_lhandle * lhandle) {
+int                      roar_dl_unregister_fn2(struct roar_dl_lhandle * lhandle, int fn, int subtype, const void * object, size_t objectlen, int version, int options) {
+ struct __fnregs * c = NULL;
  size_t i, j;
-
-//} __fnrefs[ROAR_DL_FN_MAX][__MAX_FNREGS];
 
  if ( lhandle == NULL ) {
@@ -992 +991 @@
 
  for (i = 0; i < ROAR_DL_FN_MAX; i++) {
+  if ( fn != -1 && fn != i )
+   continue;
+
   for (j = 0; j < __MAX_FNREGS; j++) {
-   if ( __fnrefs[i][j].lhandle == lhandle ) {
-    if ( i == ROAR_DL_FN_REGFN ) {
-     __fnreg_trigger_by_handler(&(__fnrefs[i][j]), ROAR_DL_FNUNREG);
-    } else {
-     __fnreg_trigger_by_reg(&(__fnrefs[i][j]), ROAR_DL_FNUNREG, i);
-    }
-    memset(&(__fnrefs[i][j]), 0, sizeof(__fnrefs[i][j]));
-    __fnrefs[i][j].lhandle = NULL;
+   c = &(__fnrefs[i][j]);
+
+   if ( c->lhandle != lhandle )
+    continue;
+
+   if ( subtype != -1 && subtype != c->subtype )
+    continue;
+   if ( object != NULL && object != c->object )
+    continue;
+   if ( objectlen != (size_t)-1 && objectlen != c->objectlen )
+    continue;
+   if ( version != -1 && version != c->version )
+    continue;
+   if ( options != -1 && options != c->options )
+    continue;
+
+   if ( i == ROAR_DL_FN_REGFN ) {
+    __fnreg_trigger_by_handler(&(__fnrefs[i][j]), ROAR_DL_FNUNREG);
+   } else {
+    __fnreg_trigger_by_reg(&(__fnrefs[i][j]), ROAR_DL_FNUNREG, i);
    }
+   memset(&(__fnrefs[i][j]), 0, sizeof(__fnrefs[i][j]));
+   __fnrefs[i][j].lhandle = NULL;
   }
  }
@@ -1008 +1024 @@
 }
 
+int roar_dl_unregister_fn(struct roar_dl_lhandle * lhandle) {
+ return roar_dl_unregister_fn2(lhandle, -1, -1, NULL, (size_t)-1, -1, -1);
+}
+
 //ll

libroar/scheduler.c

@@ -565 +565 @@
 static int __update_cpi_service (struct roar_scheduler * sched, struct roar_scheduler_source * source, int del) {
  if ( del ) {
-  roar_err_set(ROAR_ERROR_NOTSUP);
-  return -1;
+  return roar_dl_unregister_fn2(ROAR_DL_HANDLE_LIBROAR, ROAR_DL_FN_REGFN, ROAR_DL_FNREG_SUBTYPE, &(sched->callback), sizeof(sched->callback), ROAR_DL_FNREG_VERSION, ROAR_DL_FNREG_OPT_NONE);
  }