Changeset 5278:b3e0dd3f3141 in roaraudio for roard/include/container_framework.h

Timestamp:

11/21/11 00:42:20 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

last parts of merging _nonblock into _ctl and fixed sizeof(cmd) of _ctls

File:

• roard/include/container_framework.h (modified) (2 diffs)

roard/include/container_framework.h

@@ -82 +82 @@
 ssize_t cont_fw_read    (struct roar_vio_calls * vio, void *buf, size_t count);
 ssize_t cont_fw_write   (struct roar_vio_calls * vio, void *buf, size_t count);
-off_t   cont_fw_lseek   (struct roar_vio_calls * vio, off_t offset, int whence);
-int     cont_fw_nonblock(struct roar_vio_calls * vio, int state);
+roar_off_t   cont_fw_lseek   (struct roar_vio_calls * vio, roar_off_t offset, int whence);
 int     cont_fw_sync    (struct roar_vio_calls * vio);
-int     cont_fw_ctl     (struct roar_vio_calls * vio, int cmd, void * data);
+int     cont_fw_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data);
 int     cont_fw_close   (struct roar_vio_calls * vio);
 
@@ -92 +91 @@
 ssize_t cont_pvio_read    (struct roar_vio_calls * vio, void *buf, size_t count);
 ssize_t cont_pvio_write   (struct roar_vio_calls * vio, void *buf, size_t count);
-off_t   cont_pvio_lseek   (struct roar_vio_calls * vio, off_t offset, int whence);
-int     cont_pvio_nonblock(struct roar_vio_calls * vio, int state);
+roar_off_t   cont_pvio_lseek   (struct roar_vio_calls * vio, roar_off_t offset, int whence);
 int     cont_pvio_sync    (struct roar_vio_calls * vio);
-int     cont_pvio_ctl     (struct roar_vio_calls * vio, int cmd, void * data);
+int     cont_pvio_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data);
 int     cont_pvio_close   (struct roar_vio_calls * vio);