Skip to content

Commit

Permalink
dahdi-linux: fix compilation for mips_24k arch
Browse files Browse the repository at this point in the history
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
Ansuel committed Mar 20, 2024
1 parent dc889d8 commit c60658b
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 1 deletion.
2 changes: 1 addition & 1 deletion libs/dahdi-linux/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk

PKG_NAME:=dahdi-linux
PKG_RELEASE:=1
PKG_RELEASE:=2

PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/asterisk/dahdi-linux.git
Expand Down
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;

0 comments on commit c60658b

Please sign in to comment.