Changeset 2669:3b6eb870e562 in roaraudio

Timestamp:

09/12/09 22:46:02 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

deleted struct cont_fw_child

Location:

roard

Files:

• container_framework.c (modified) (4 diffs)
• include/container_framework.h (modified) (1 diff)

roard/container_framework.c

@@ -116 +116 @@
 
  if ( inst->parent->ccb.read != NULL )
-  return inst->parent->ccb.read(inst->parent, inst->inst, buf, count);
+  return inst->parent->ccb.read(inst->parent, inst, buf, count);
 
  return -1;
@@ -125 +125 @@
 
  if ( inst->parent->ccb.write != NULL )
-  return inst->parent->ccb.write(inst->parent, inst->inst, buf, count);
+  return inst->parent->ccb.write(inst->parent, inst, buf, count);
 
  return -1;
@@ -137 +137 @@
 
  if ( inst->parent->ccb.flush != NULL )
-  return inst->parent->ccb.flush(inst->parent, inst->inst);
+  return inst->parent->ccb.flush(inst->parent, inst);
 
  return 0;
@@ -152 +152 @@
 
  if ( inst->parent->ccb.close != NULL )
-  return inst->parent->ccb.close(inst->parent, inst->inst);
+  return inst->parent->ccb.close(inst->parent, inst);
 
  return  r;

roard/include/container_framework.h

@@ -32 +32 @@
 struct cont_fw_parent_inst;
 
-struct cont_fw_child {
+struct cont_fw_child_vio_inst {
  int child;
  void * u_inst;
-};
-
-struct cont_fw_child_vio_inst {
- int child;
- struct cont_fw_child       * inst;
  struct cont_fw_parent_inst * parent;
 };
 
 struct cont_fw_parent_inst {
- struct cont_fw_child * child[CONT_FW_MAX_CHILDS];
+ struct cont_fw_child_vio_inst * child[CONT_FW_MAX_CHILDS];
  void * u_inst;
  struct {
-  ssize_t (*read) (struct cont_fw_parent_inst * self, struct cont_fw_child * child, void *buf, size_t len);
-  ssize_t (*write)(struct cont_fw_parent_inst * self, struct cont_fw_child * child, void *buf, size_t len);
-  int     (*flush)(struct cont_fw_parent_inst * self, struct cont_fw_child * child);
-  int     (*close)(struct cont_fw_parent_inst * self, struct cont_fw_child * child);
+  ssize_t (*read) (struct cont_fw_parent_inst * self, struct cont_fw_child_vio_inst * child, void *buf, size_t len);
+  ssize_t (*write)(struct cont_fw_parent_inst * self, struct cont_fw_child_vio_inst * child, void *buf, size_t len);
+  int     (*flush)(struct cont_fw_parent_inst * self, struct cont_fw_child_vio_inst * child);
+  int     (*close)(struct cont_fw_parent_inst * self, struct cont_fw_child_vio_inst * child);
  } ccb;
  struct {