Changeset 4811:8d0d713ca0c1 in roaraudio for roard/driver.c

Timestamp:

03/27/11 13:38:18 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Removed old -d and friends from roard (Closes: #122)

File:

• roard/driver.c (modified) (5 diffs)

roard/driver.c

@@ -145 +145 @@
 }
 
-int driver_open (DRIVER_USERDATA_T * inst, int * driver_id, char * driver, 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,
+                 struct roar_stream_server * sstream) {
  int i;
 
@@ -156 +159 @@
 #endif
 
+ ROAR_DBG("driver_openvio(*): searching for driver '%s'...", driver);
+
  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 ) {
-    if ( (*inst = malloc(sizeof(struct roar_vio_calls))) == NULL )
-     return -1;
-
-    memset(*inst, 0, sizeof(struct roar_vio_calls));
-
-    if ( (i = g_driver[i].vio_init(*inst, device, info, -1, NULL)) == -1 ) {
-     free(*inst);
-     return -1;
-    }
-    return i;
-   }
-
-   if ( g_driver[i].open ) {
-    ROAR_WARN("driver_open(*): driver(%s) uses old non-vio interface!", driver);
-    return g_driver[i].open(inst, device, info);
-   }
-
-   return 0;
-  }
- }
-
- 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,
-                 struct roar_stream_server * sstream) {
- int i;
-
-#ifdef ROAR_DRIVER_DEFAULT
- if ( driver == NULL )
-  driver = ROAR_DRIVER_DEFAULT;
-#else
- if ( driver == NULL )
-  return -1;
-#endif
-
- ROAR_DBG("driver_openvio(*): searching for driver '%s'...", driver);
-
- 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);
+   ROAR_DBG("driver_openvio(*): found driver: id = %i", i);
 
    *driver_id = i;
@@ -219 +177 @@
     }
 
-    ROAR_WARN("driver_open(*): driver(%s) uses old non-vio interface!", driver);
+    ROAR_WARN("driver_openvio(*): 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);
@@ -232 +190 @@
 }
 
-int driver_close(DRIVER_USERDATA_T   inst, int driver) {
- int ret = 0;
- ROAR_DBG("driver_close(inst=%p, driver=%i) = ?", inst, driver);
-
- if ( driver == -1 )
-  return -1;
-
- if ( g_driver[driver].close )
-  ret = g_driver[driver].close(inst);
-
- if ( g_driver[driver].vio_init != NULL )
-  free(inst);
-
- return ret;
-}
-
 int driver_closevio(struct roar_vio_calls * calls, int driver) {
  ROAR_DBG("driver_closevio(calls=%p, driver=%i) = ?", calls, driver);
@@ -259 +201 @@
  if ( calls->close != NULL )
   roar_vio_close(calls);
-
- return 0;
-}
-
-int driver_write(DRIVER_USERDATA_T   inst, int driver, char * buf, int len) {
- if ( driver == -1 )
-  return -1;
-
- if ( g_driver[driver].vio_init != NULL )
-  return roar_vio_write((struct roar_vio_calls *) inst, buf, len);
-
- return 0;
-}
-
-int driver_read (DRIVER_USERDATA_T   inst, int driver, char * buf, int len) {
- if ( driver == -1 )
-  return -1;
-
- if ( g_driver[driver].vio_init != NULL )
-  return roar_vio_read((struct roar_vio_calls *) inst, buf, len);
 
  return 0;