Changeset 931:f0583968c304 in roaraudio

Timestamp:

12/07/08 17:33:08 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added driver_openvio()

Location:

roard

Files:

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

roard/driver.c

@@ -77 +77 @@
    }
 
-   ROAR_WARN("driver_open(*): driver uses old non-vio interface!");
+   ROAR_WARN("driver_open(*): driver(%s) uses old non-vio interface!", driver);
 
    if ( g_driver[i].open )
@@ -85 +85 @@
  }
 
+ return -1;
+}
+
+int driver_openvio(struct roar_vio_calls * calls,
+                 int * driver_id, char * driver /* NOTE: this is not part of struct roar_driver's def! */,
+                 char * device, struct roar_audio_info * info, int fh) {
+ int i;
+
+ if ( driver == NULL )
+  driver = ROAR_DRIVER_DEFAULT;
+
+ for (i = 0; g_driver[i].name != NULL; i++) {
+  if ( strcmp(g_driver[i].name, driver) == 0 ) {
+   ROAR_DBG("driver_open(*): found driver: id = %i", i);
+
+   *driver_id = i;
+
+   if ( g_driver[i].vio_init == NULL ) {
+    ROAR_WARN("driver_open(*): driver(%s) uses old non-vio interface!", driver);
+    ROAR_ERR("driver_openvio(calls=%p, driver_id={%i}, driver='%s', device='%s', info=%p, fh=%i): not a VIO driver!",
+        calls, i, driver, device, info, fh);
+    return -1;
+   }
+
+   return g_driver[i].vio_init(calls, device, info, fh);
+  }
+ }
  return -1;
 }

roard/include/driver.h

@@ -89 +89 @@
                  int * driver_id, char * driver /* NOTE: this is not part of struct roar_driver's def! */,
                  char * device, struct roar_audio_info * info);
+int driver_openvio(struct roar_vio_calls * calls,
+                 int * driver_id, char * driver /* NOTE: this is not part of struct roar_driver's def! */,
+                 char * device, struct roar_audio_info * info, int fh);
+
 int driver_close(DRIVER_USERDATA_T   inst, int driver);
 int driver_pause(DRIVER_USERDATA_T   inst, int driver, int newstate);