Changeset 947:edb7ba2fe666 in roaraudio

Timestamp:

12/07/08 23:28:12 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

changed raw driver to use vio interface and display sysio vs. vio in driver list

Location:

roard

Files:

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

roard/driver.c

@@ -31 +31 @@
 #endif
  { "roar", "RoarAudio driver", "localhost, remote.host.dom", driver_roar_open, driver_roar_close, driver_roar_pause, driver_roar_write, driver_roar_read, driver_roar_flush, NULL},
- { "raw",  "RAW PCM driver", "/some/file", driver_raw_open, driver_raw_close, driver_roar_pause, driver_raw_write, driver_raw_read, driver_raw_flush, NULL},
+ { "raw",  "RAW PCM driver", "/some/file", NULL, driver_raw_close, driver_roar_pause, NULL, NULL, driver_raw_flush, driver_raw_open_vio},
 #if defined(ROAR_HAVE_OSS_BSD) || defined(ROAR_HAVE_OSS)
 #ifndef ROAR_DEFAULT_OSS_DEV
@@ -48 +48 @@
 
  for (i = 0; g_driver[i].name != NULL; i++) {
-  printf("  %-8s - %s (devices: %s)\n", g_driver[i].name, g_driver[i].desc, g_driver[i].devices);
+  printf("  %-8s %c%c - %s (devices: %s)\n", g_driver[i].name,
+                g_driver[i].open     != NULL || (g_driver[i].open == NULL && g_driver[i].vio_init == NULL) ? 'S' : ' ',
+                g_driver[i].vio_init != NULL || (g_driver[i].open == NULL && g_driver[i].vio_init == NULL) ? 'V' : ' ',
+                g_driver[i].desc, g_driver[i].devices);
  }
 }

roard/driver_raw.c

@@ -25 +25 @@
 #include "roard.h"
 
-int driver_raw_open(DRIVER_USERDATA_T * inst, char * device, struct roar_audio_info * info) {
- int * di = malloc(sizeof(int));
-
- if ( di == NULL )
-  return -1;
-
- *inst = (DRIVER_USERDATA_T)di;
+int driver_raw_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh) {
 
  if ( device == NULL ) {
-  free(di);
-  *inst = NULL;
   return -1;
  }
 
- *di = open(device, O_CREAT|O_TRUNC|O_WRONLY, 0644);
+ if ( fh == -1 ) {
+  if ( (fh = open(device, O_CREAT|O_TRUNC|O_WRONLY, 0644)) == -1 ) {
+   return -1;
+  }
+ }
 
- if ( *di == -1 ) {
-  free(di);
-  *inst = NULL;
-  return -1;
- }
+ roar_vio_set_fh(inst, fh);
 
  return 0;
@@ -51 +43 @@
 
 int driver_raw_close(DRIVER_USERDATA_T   inst) {
- int fh = *(int*)inst;
-
- free((void*)inst);
-
- return close(fh);
+ return close(roar_vio_get_fh((struct roar_vio_calls *)inst));
 }
 
 int driver_raw_pause(DRIVER_USERDATA_T   inst, int newstate) {
  return -1;
-}
-
-int driver_raw_write(DRIVER_USERDATA_T   inst, char * buf, int len) {
- return write(*(int*)inst, buf, len);
-}
-
-int driver_raw_read(DRIVER_USERDATA_T   inst, char * buf, int len) {
- return read(*(int*)inst, buf, len);
 }
 

roard/include/driver_raw.h

@@ -26 +26 @@
 #define _DRIVER_RAW_H_
 
-int driver_raw_open(DRIVER_USERDATA_T * inst, char * device, struct roar_audio_info * info);
+int driver_raw_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info, int fh);
 int driver_raw_close(DRIVER_USERDATA_T   inst);
 int driver_raw_pause(DRIVER_USERDATA_T   inst, int newstate);
-int driver_raw_write(DRIVER_USERDATA_T   inst, char * buf, int len);
-int driver_raw_read(DRIVER_USERDATA_T   inst, char * buf, int len);
 int driver_raw_flush(DRIVER_USERDATA_T   inst);