-
Notifications
You must be signed in to change notification settings - Fork 256
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
libs/dahdi-linux: bump to latest git head
Fixes compiling against linux >= 6.6 Signed-off-by: Adam Duskett <[email protected]>
- Loading branch information
Adam Duskett
committed
Apr 12, 2024
1 parent
22dd505
commit 338aae9
Showing
9 changed files
with
21 additions
and
253 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,60 +7,12 @@ Use fallthrough instead of comment to fix compilation warning. | |
|
|
||
| Signed-off-by: Christian Marangi <[email protected]> | ||
| --- | ||
| 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 *chan, int cursig) | ||
| break; | ||
| case DAHDI_SIG_FXSKS: /* FXS Kewlstart */ | ||
| case DAHDI_SIG_FXSGS: /* FXS Groundstart */ | ||
|
|
@@ -69,63 +21,3 @@ Signed-off-by: Christian Marangi <[email protected]> | |
| 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 */ | ||
60 changes: 0 additions & 60 deletions
60
libs/dahdi-linux/patches/201-dahdi-fix-always-true-compilation-warning.patch
This file was deleted.
Oops, something went wrong.
28 changes: 0 additions & 28 deletions
28
libs/dahdi-linux/patches/202-dahdi-sysfs-chan-fix-bug-if-clause-does-not-guard.patch
This file was deleted.
Oops, something went wrong.
38 changes: 0 additions & 38 deletions
38
libs/dahdi-linux/patches/204-dahdi-skip-checking-on-releasing.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,7 +13,7 @@ Signed-off-by: Christian Marangi <[email protected]> | |
|
|
||
| --- a/drivers/dahdi/xpp/xbus-core.c | ||
| +++ b/drivers/dahdi/xpp/xbus-core.c | ||
| @@ -1772,7 +1772,7 @@ static void xbus_fill_proc_queue(struct | ||
| @@ -1775,7 +1775,7 @@ static void xbus_fill_proc_queue(struct | ||
| s32 rem; | ||
| s64 lag_sec = div_s64_rem(q->worst_lag_usec, 1000, &rem); | ||
| seq_printf(sfile, | ||
|
|
||