diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2010-12-21 16:09:22 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2010-12-21 16:09:22 +0000 |
| commit | 468f760d48ff7650b3bb3901063fa2f402edda62 (patch) | |
| tree | 6c500bf750146eb2bfa64dca068a85314f13d768 /include | |
| parent | dd6239ada7f3273da036b4718a23ff57641c9423 (diff) | |
dahdi: Use a single wait_queue_t for dahdi channels.
Since we've now switched to wait_event_interruptible calls, we have a
condition that we can check when we're awoken. This allows us to
combine the separate wait queues into a single queue.
Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Acked-by: Russ Meyerreicks <rmeyerreicks@digium.com>
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9548 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'include')
| -rw-r--r-- | include/dahdi/kernel.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index e7dff97..a0ecc32 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -451,26 +451,23 @@ struct dahdi_chan { int sigcap; /*!< Capability for signalling */ __u32 chan_alarms; /*!< alarms status */ + wait_queue_head_t waitq; + /* Used only by DAHDI -- NO DRIVER SERVICEABLE PARTS BELOW */ /* Buffer declarations */ u_char *readbuf[DAHDI_MAX_NUM_BUFS]; /*!< read buffer */ int inreadbuf; int outreadbuf; - wait_queue_head_t readbufq; /*!< read wait queue */ u_char *writebuf[DAHDI_MAX_NUM_BUFS]; /*!< write buffers */ int inwritebuf; int outwritebuf; - wait_queue_head_t writebufq; /*!< write wait queue */ int blocksize; /*!< Block size */ int eventinidx; /*!< out index in event buf (circular) */ int eventoutidx; /*!< in index in event buf (circular) */ unsigned int eventbuf[DAHDI_MAX_EVENTSIZE]; /*!< event circ. buffer */ - wait_queue_head_t eventbufq; /*!< event wait queue */ - - wait_queue_head_t txstateq; /*!< waiting on the tx state to change */ int readn[DAHDI_MAX_NUM_BUFS]; /*!< # of bytes ready in read buf */ int readidx[DAHDI_MAX_NUM_BUFS]; /*!< current read pointer */ @@ -507,7 +504,6 @@ struct dahdi_chan { /* I/O Mask */ unsigned int iomask; /*! I/O Mux signal mask */ - wait_queue_head_t sel; /*! thingy for select stuff */ /* HDLC state machines */ struct fasthdlc_state txhdlc; |