Changeset 5276:0eb24ca6810e in roaraudio for include

Timestamp:

11/20/11 18:36:49 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

merged VIO's _nonblock() into _ctl() (Closes: #135)

Location:

include/libroar

Files:

• vio.h (modified) (3 diffs)
• vio_ctl.h (modified) (1 diff)
• vio_winsock.h (modified) (1 diff)

include/libroar/vio.h

@@ -53 +53 @@
  ssize_t (*write   )(struct roar_vio_calls * vio, void *buf, size_t count);
  off_t   (*lseek   )(struct roar_vio_calls * vio, off_t offset, int whence);
- int     (*nonblock)(struct roar_vio_calls * vio, int state);
+// int     (*nonblock)(struct roar_vio_calls * vio, int state);
  int     (*sync    )(struct roar_vio_calls * vio);
  int     (*ctl     )(struct roar_vio_calls * vio, int cmd, void * data);
@@ -104 +104 @@
 ssize_t roar_vio_basic_write   (struct roar_vio_calls * vio, void *buf, size_t count);
 off_t   roar_vio_basic_lseek   (struct roar_vio_calls * vio, off_t offset, int whence);
-int     roar_vio_basic_nonblock(struct roar_vio_calls * vio, int state);
 int     roar_vio_basic_sync    (struct roar_vio_calls * vio);
 int     roar_vio_basic_ctl     (struct roar_vio_calls * vio, int cmd, void * data);
@@ -120 +119 @@
 ssize_t roar_vio_pass_write   (struct roar_vio_calls * vio, void *buf, size_t count);
 off_t   roar_vio_pass_lseek   (struct roar_vio_calls * vio, off_t offset, int whence);
-int     roar_vio_pass_nonblock(struct roar_vio_calls * vio, int state);
 int     roar_vio_pass_sync    (struct roar_vio_calls * vio);
 int     roar_vio_pass_ctl     (struct roar_vio_calls * vio, int cmd, void * data);

include/libroar/vio_ctl.h

@@ -99 +99 @@
 #define ROAR_VIO_CTL_GET_USERPASS        (ROAR_VIO_CTL_GENERIC|ROAR_VIO_CTL_SET|0x0194)
 #define ROAR_VIO_CTL_SET_USERPASS        (ROAR_VIO_CTL_GENERIC|ROAR_VIO_CTL_SET|0x0194)
-// NOTE: continue with 0x01A0 from here.
+
+// Implement roar_vio_nonblock()...
+#define ROAR_VIO_CTL_NONBLOCK            (ROAR_VIO_CTL_GENERIC|0x01A0) /* roar_vio_nonblock(), int */
 
 // get or set data format used for read and write calls, see below

include/libroar/vio_winsock.h

@@ -42 +42 @@
 ssize_t roar_vio_winsock_read    (struct roar_vio_calls * vio, void *buf, size_t count);
 ssize_t roar_vio_winsock_write   (struct roar_vio_calls * vio, void *buf, size_t count);
-int     roar_vio_winsock_nonblock(struct roar_vio_calls * vio, int state);
 int     roar_vio_winsock_sync    (struct roar_vio_calls * vio);
 int     roar_vio_winsock_ctl     (struct roar_vio_calls * vio, int cmd, void * data);