diff options
author | Russell Bryant <russell@digium.com> | 2008-08-03 16:25:15 +0000 |
---|---|---|
committer | Russell Bryant <russell@digium.com> | 2008-08-03 16:25:15 +0000 |
commit | 3e769ba4640df1f3fe480498c31351efe58b5ec3 (patch) | |
tree | 4c277b1f6b631046cb67f0bf3a743212e5a78006 | |
parent | 65d9b7fc7a2889232c5ce72babd536916bd90ed4 (diff) |
Get rid of dahdi_rxsig_t typedef
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4682 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r-- | drivers/dahdi/dahdi-base.c | 4 | ||||
-rw-r--r-- | drivers/dahdi/xpp/card_fxo.c | 2 | ||||
-rw-r--r-- | drivers/dahdi/xpp/dahdi_debug.h | 2 | ||||
-rw-r--r-- | drivers/dahdi/xpp/xpp_dahdi.c | 2 | ||||
-rw-r--r-- | include/dahdi/kernel.h | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 0daa838..37a128e 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -6131,7 +6131,7 @@ static inline void __rbs_otimer_expire(struct dahdi_chan *chan) } } -static void __dahdi_hooksig_pvt(struct dahdi_chan *chan, dahdi_rxsig_t rxsig) +static void __dahdi_hooksig_pvt(struct dahdi_chan *chan, enum dahdi_rxsig rxsig) { /* State machines for receive hookstate transitions @@ -6304,7 +6304,7 @@ static void __dahdi_hooksig_pvt(struct dahdi_chan *chan, dahdi_rxsig_t rxsig) } } -void dahdi_hooksig(struct dahdi_chan *chan, dahdi_rxsig_t rxsig) +void dahdi_hooksig(struct dahdi_chan *chan, enum dahdi_rxsig rxsig) { /* skip if no change */ unsigned long flags; diff --git a/drivers/dahdi/xpp/card_fxo.c b/drivers/dahdi/xpp/card_fxo.c index b7c8154..a6b5266 100644 --- a/drivers/dahdi/xpp/card_fxo.c +++ b/drivers/dahdi/xpp/card_fxo.c @@ -257,7 +257,7 @@ static void handle_fxo_leds(xpd_t *xpd) static void update_dahdi_ring(xpd_t *xpd, int pos, bool on) { - dahdi_rxsig_t rxsig; + enum dahdi_rxsig rxsig; BUG_ON(!xpd); if(on) { diff --git a/drivers/dahdi/xpp/dahdi_debug.h b/drivers/dahdi/xpp/dahdi_debug.h index a2cd242..7bf68f3 100644 --- a/drivers/dahdi/xpp/dahdi_debug.h +++ b/drivers/dahdi/xpp/dahdi_debug.h @@ -92,7 +92,7 @@ void dump_poll(int debug, const char *msg, int poll); -static inline char *rxsig2str(dahdi_rxsig_t sig) +static inline char *rxsig2str(enum dahdi_rxsig sig) { switch(sig) { case DAHDI_RXSIG_ONHOOK: return "ONHOOK"; diff --git a/drivers/dahdi/xpp/xpp_dahdi.c b/drivers/dahdi/xpp/xpp_dahdi.c index 9c5ebd2..2d36ea4 100644 --- a/drivers/dahdi/xpp/xpp_dahdi.c +++ b/drivers/dahdi/xpp/xpp_dahdi.c @@ -540,7 +540,7 @@ void update_xpd_status(xpd_t *xpd, int alarm_flag) void update_line_status(xpd_t *xpd, int pos, bool to_offhook) { - dahdi_rxsig_t rxsig; + enum dahdi_rxsig rxsig; BUG_ON(!xpd); if(to_offhook) { diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index 7d39e47..4ff5d2e 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -427,13 +427,13 @@ enum dahdi_txsig { DAHDI_TXSIG_TOTAL, }; -typedef enum { +enum dahdi_rxsig { DAHDI_RXSIG_ONHOOK, DAHDI_RXSIG_OFFHOOK, DAHDI_RXSIG_START, DAHDI_RXSIG_RING, DAHDI_RXSIG_INITIAL -} dahdi_rxsig_t; +}; /* Span flags */ #define DAHDI_FLAG_REGISTERED (1 << 0) @@ -720,7 +720,7 @@ char *dahdi_lboname(int lbo); void dahdi_rbsbits(struct dahdi_chan *chan, int bits); /*! \brief Tell DAHDI abou changes in received signalling */ -void dahdi_hooksig(struct dahdi_chan *chan, dahdi_rxsig_t rxsig); +void dahdi_hooksig(struct dahdi_chan *chan, enum dahdi_rxsig rxsig); /*! \brief Queue an event on a channel */ void dahdi_qevent_nolock(struct dahdi_chan *chan, int event); |