-
Notifications
You must be signed in to change notification settings - Fork 268
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
dahdi-linux: fix compilation for mips_24k arch
Fix compilation for mips_24k arch due to a define conflicts with ABS. Patch has been proposed upstream and should be accepted. Signed-off-by: Christian Marangi <[email protected]>
- Loading branch information
Showing
2 changed files
with
43 additions
and
1 deletion.
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
42 changes: 42 additions & 0 deletions
42
libs/dahdi-linux/patches/206-dahdi_echocan_mg2-rename-ABS-define-to-PARA_ABS.patch
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 |
---|---|---|
@@ -0,0 +1,42 @@ | ||
From d2563faf053da31e1329e7313339669f31c989da Mon Sep 17 00:00:00 2001 | ||
From: Christian Marangi <[email protected]> | ||
Date: Wed, 20 Mar 2024 19:48:33 +0100 | ||
Subject: [PATCH] dahdi_echocan_mg2: rename ABS define to PARA_ABS | ||
|
||
Rename ABS define to PARA_ABS to fix compilation error with mips 24kc | ||
arch. | ||
|
||
This target define in his ASM header a similar define ABS that cause | ||
conflicts and redefinition error for this driver. | ||
|
||
Rename ABS to PARA_ABS to better suite the usage as it's abs usage with | ||
value decremented by one if it's the max negative int. | ||
|
||
Signed-off-by: Christian Marangi <[email protected]> | ||
--- | ||
drivers/dahdi/dahdi_echocan_mg2.c | 6 +++--- | ||
1 file changed, 3 insertions(+), 3 deletions(-) | ||
|
||
--- a/drivers/dahdi/dahdi_echocan_mg2.c | ||
+++ b/drivers/dahdi/dahdi_echocan_mg2.c | ||
@@ -44,7 +44,7 @@ | ||
static int debug; | ||
static int aggressive; | ||
|
||
-#define ABS(a) abs(a!=-32768?a:-32767) | ||
+#define PARA_ABS(a) abs(a!=-32768?a:-32767) | ||
|
||
#define RESTORE_COEFFS {\ | ||
int x;\ | ||
@@ -464,9 +464,9 @@ static inline short sample_update(struct | ||
RESTORE_COEFFS; | ||
} | ||
|
||
- sign_error = ABS(rs) - ABS(isig); | ||
+ sign_error = PARA_ABS(rs) - PARA_ABS(isig); | ||
|
||
- if (ABS(sign_error) > MAX_SIGN_ERROR) | ||
+ if (PARA_ABS(sign_error) > MAX_SIGN_ERROR) | ||
{ | ||
rs = 0; | ||
RESTORE_COEFFS; |