Changeset 912:e0480ffcba74 in roaraudio for roard/driver_esd.c

Timestamp:

12/06/08 22:36:19 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

got esd driver working via vio, changed driver interface a bit to get a memory leak away

File:

• roard/driver_esd.c (modified) (4 diffs)

roard/driver_esd.c

@@ -32 +32 @@
 */
 
-int driver_esd_open(DRIVER_USERDATA_T * inst, char * device, struct roar_audio_info * info) {
+int driver_esd_open_sysio(DRIVER_USERDATA_T * inst, char * device, struct roar_audio_info * info) {
  esd_format_t format = ESD_STREAM | ESD_PLAY;
  char name[80] = "roard";
@@ -60 +60 @@
 }
 
+int driver_esd_open_vio(struct roar_vio_calls * inst, char * device, struct roar_audio_info * info) {
+ inst->read  = driver_esd_read;
+ inst->write = driver_esd_write;
+ return driver_esd_open_sysio(&(inst->inst), device, info);
+}
+
 int driver_esd_close(DRIVER_USERDATA_T   inst) {
- int fh = *(int*)inst;
+ int fh;
+
+ inst = ((struct roar_vio_calls *)inst)->inst;
+
+ fh = *(int*)inst;
 
  free((void*)inst);
@@ -72 +82 @@
 }
 
-int driver_esd_write(DRIVER_USERDATA_T   inst, char * buf, int len) {
- int * di = (int*)inst;
+int driver_esd_write(struct roar_vio_calls * inst, void * buf, size_t len) {
+ int * di = (int*)((struct roar_vio_calls *)inst)->inst;
 
  if ( di[1] )
@@ -81 +91 @@
 }
 
-int driver_esd_read(DRIVER_USERDATA_T   inst, char * buf, int len) {
- return read(*(int*)inst, buf, len);
+int driver_esd_read(struct roar_vio_calls * inst, void * buf, size_t len) {
+ return read(*(int*)((struct roar_vio_calls *)inst)->inst, buf, len);
 }