libs/dahdi-linux: bump to latest git head

[feed/telephony.git] / libs / dahdi-linux / patches / 200-dahdi-use-fallthrough-where-needed.patch

diff --git a/libs/dahdi-linux/patches/200-dahdi-use-fallthrough-where-needed.patch b/libs/dahdi-linux/patches/200-dahdi-use-fallthrough-where-needed.patch
index 5e613b79b9ad2cb7490cb9ab64f4d6e6b3f0b54e..e9a4d4d7276f4e78125214e69f93a4299f149af1 100644 (file)
--- a/libs/dahdi-linux/patches/200-dahdi-use-fallthrough-where-needed.patch
+++ b/libs/dahdi-linux/patches/200-dahdi-use-fallthrough-where-needed.patch
@@ -7,60 +7,12 @@ Use fallthrough instead of comment to fix compilation warning.
 
 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
 ---
- drivers/dahdi/dahdi-base.c      | 14 +++++++-------
- drivers/dahdi/wcaxx-base.c      |  2 ++
- drivers/dahdi/wctdm24xxp/base.c |  2 ++
- drivers/dahdi/xpp/card_global.c |  2 +-
- 4 files changed, 12 insertions(+), 8 deletions(-)
+ drivers/dahdi/dahdi-base.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 --- a/drivers/dahdi/dahdi-base.c
 +++ b/drivers/dahdi/dahdi-base.c
-@@ -7930,7 +7930,7 @@ static inline void __dahdi_process_getau
-                       memset(getlin, 0, DAHDI_CHUNKSIZE * sizeof(short));
-                       txb[0] = DAHDI_LIN2X(0, ms);
-                       memset(txb + 1, txb[0], DAHDI_CHUNKSIZE - 1);
--                      /* fallthrough */
-+                      fallthrough;
-               case DAHDI_CONF_CONF:   /* Normal conference mode */
-                       if (is_pseudo_chan(ms)) /* if pseudo-channel */
-                          {
-@@ -7954,7 +7954,7 @@ static inline void __dahdi_process_getau
-                               memset(txb + 1, txb[0], DAHDI_CHUNKSIZE - 1);
-                               break;
-                          }
--                      /* fall through */
-+                      fallthrough;
-               case DAHDI_CONF_CONFMON:        /* Conference monitor mode */
-                       if (ms->confmode & DAHDI_CONF_LISTENER) {
-                               /* Subtract out last sample written to conf */
-@@ -8493,7 +8493,7 @@ static void __dahdi_hooksig_pvt(struct d
-                       break;
-               }
- #endif
--              /* fallthrough */
-+              fallthrough;
-          case DAHDI_SIG_FXSGS:  /* FXS Groundstart */
-               if (rxsig == DAHDI_RXSIG_ONHOOK) {
-                       chan->ringdebtimer = RING_DEBOUNCE_TIME;
-@@ -8512,7 +8512,7 @@ static void __dahdi_hooksig_pvt(struct d
-                               chan->gotgs = 1;
-                       }
-               }
--              /* fallthrough */
-+              fallthrough;
-          case DAHDI_SIG_FXOLS: /* FXO Loopstart */
-          case DAHDI_SIG_FXOKS: /* FXO Kewlstart */
-               switch(rxsig) {
-@@ -8612,7 +8612,7 @@ void dahdi_rbsbits(struct dahdi_chan *ch
-                       __dahdi_hooksig_pvt(chan, DAHDI_RXSIG_START);
-                       break;
-               }
--              /* Fall through */
-+              fallthrough;
-           case DAHDI_SIG_EM_E1:
-           case DAHDI_SIG_FXOLS: /* FXO Loopstart */
-           case DAHDI_SIG_FXOKS: /* FXO Kewlstart */
-@@ -8630,7 +8630,7 @@ void dahdi_rbsbits(struct dahdi_chan *ch
+@@ -8645,7 +8645,7 @@ void dahdi_rbsbits(struct dahdi_chan *ch
                break;
           case DAHDI_SIG_FXSKS:  /* FXS Kewlstart */
           case DAHDI_SIG_FXSGS:  /* FXS Groundstart */
@@ -69,63 +21,3 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
           case DAHDI_SIG_FXSLS:
                if (!(cursig & DAHDI_BBIT)) {
                        /* Check for ringing first */
-@@ -9059,7 +9059,7 @@ static inline void __dahdi_process_putau
-                               memcpy(ss->putlin, putlin, DAHDI_CHUNKSIZE * sizeof(short));
-                               break;
-                          }
--                      /* fall through */
-+                      fallthrough;
-               case DAHDI_CONF_CONFANN:  /* Conference with announce */
-                       if (ms->confmode & DAHDI_CONF_TALKER) {
-                               /* Store temp value */
---- a/drivers/dahdi/wcaxx-base.c
-+++ b/drivers/dahdi/wcaxx-base.c
-@@ -1456,7 +1456,7 @@ wcaxx_check_battery_lost(struct wcaxx *w
-               break;
-       case BATTERY_UNKNOWN:
-               mod_hooksig(wc, mod, DAHDI_RXSIG_ONHOOK);
--              /* fallthrough */
-+              fallthrough;
-       case BATTERY_PRESENT:
-               fxo->battery_state = BATTERY_DEBOUNCING_LOST;
-               fxo->battdebounce_timer = wc->framecount + battdebounce;
-@@ -1567,7 +1567,7 @@ wcaxx_check_battery_present(struct wcaxx
-               break;
-       case BATTERY_UNKNOWN:
-               mod_hooksig(wc, mod, DAHDI_RXSIG_OFFHOOK);
--              /* fallthrough */
-+              fallthrough;
-       case BATTERY_LOST:
-               fxo->battery_state = BATTERY_DEBOUNCING_PRESENT;
-               fxo->battdebounce_timer = wc->framecount + battdebounce;
---- a/drivers/dahdi/wctdm24xxp/base.c
-+++ b/drivers/dahdi/wctdm24xxp/base.c
-@@ -1964,7 +1964,7 @@ wctdm_check_battery_lost(struct wctdm *w
-               break;
-       case BATTERY_UNKNOWN:
-               mod_hooksig(wc, mod, DAHDI_RXSIG_ONHOOK);
--              /* fallthrough */
-+              fallthrough;
-       case BATTERY_PRESENT:
-               fxo->battery_state = BATTERY_DEBOUNCING_LOST;
-               fxo->battdebounce_timer = wc->framecount + battdebounce;
-@@ -2074,7 +2074,7 @@ wctdm_check_battery_present(struct wctdm
-               break;
-       case BATTERY_UNKNOWN:
-               mod_hooksig(wc, mod, DAHDI_RXSIG_OFFHOOK);
--              /* fallthrough */
-+              fallthrough;
-       case BATTERY_LOST:
-               fxo->battery_state = BATTERY_DEBOUNCING_PRESENT;
-               fxo->battdebounce_timer = wc->framecount + battdebounce;
---- a/drivers/dahdi/xpp/card_global.c
-+++ b/drivers/dahdi/xpp/card_global.c
-@@ -148,7 +148,7 @@ static int execute_chip_command(xpd_t *x
-               XPD_NOTICE(xpd,
-                       "'I' is deprecated in register commands. "
-                       "Use 'S' instead.\n");
--              /* fall through */
-+              fallthrough;
-       case 'S':
-               do_subreg = 1;
-               num_args += 2;  /* register + subreg */