You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2022/10/25 23:24:26 UTC
[incubator-nuttx] branch master updated: arch: Replace __builtin_bswapxx with bswapxx
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 739210708a arch: Replace __builtin_bswapxx with bswapxx
739210708a is described below
commit 739210708aa864d08e57544a9bf2e18fe106879d
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Oct 26 04:04:38 2022 +0800
arch: Replace __builtin_bswapxx with bswapxx
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/imx6/imx_enet.c | 5 +++--
arch/arm/src/imxrt/imxrt_enet.c | 5 +++--
arch/arm/src/s32k1xx/s32k1xx_enet.c | 5 +++--
arch/arm/src/s32k1xx/s32k1xx_lpspi.c | 5 +++--
arch/arm/src/s32k3xx/s32k3xx_lpspi.c | 5 +++--
5 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/arch/arm/src/imx6/imx_enet.c b/arch/arm/src/imx6/imx_enet.c
index f420663ea2..d1c0414653 100644
--- a/arch/arm/src/imx6/imx_enet.c
+++ b/arch/arm/src/imx6/imx_enet.c
@@ -33,6 +33,7 @@
#include <assert.h>
#include <debug.h>
#include <errno.h>
+#include <endian.h>
#include <arpa/inet.h>
@@ -321,8 +322,8 @@ static inline void imx_enet_modifyreg32(struct imx_driver_s *priv,
static inline uint32_t imx_swap32(uint32_t value);
static inline uint16_t imx_swap16(uint16_t value);
#else
-# define imx_swap32 __builtin_bswap32
-# define imx_swap16 __builtin_bswap16
+# define imx_swap32 swap32
+# define imx_swap16 swap16
#endif
#endif
diff --git a/arch/arm/src/imxrt/imxrt_enet.c b/arch/arm/src/imxrt/imxrt_enet.c
index 07f52752a2..360643b9c0 100644
--- a/arch/arm/src/imxrt/imxrt_enet.c
+++ b/arch/arm/src/imxrt/imxrt_enet.c
@@ -33,6 +33,7 @@
#include <assert.h>
#include <debug.h>
#include <errno.h>
+#include <endian.h>
#include <arpa/inet.h>
@@ -364,8 +365,8 @@ static inline void imxrt_enet_modifyreg32(struct imxrt_driver_s *priv,
static inline uint32_t imxrt_swap32(uint32_t value);
static inline uint16_t imxrt_swap16(uint16_t value);
#else
-# define imxrt_swap32 __builtin_bswap32
-# define imxrt_swap16 __builtin_bswap16
+# define imxrt_swap32 swap32
+# define imxrt_swap16 swap16
#endif
#endif
diff --git a/arch/arm/src/s32k1xx/s32k1xx_enet.c b/arch/arm/src/s32k1xx/s32k1xx_enet.c
index 01ccde7e00..92f818f81e 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_enet.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_enet.c
@@ -32,6 +32,7 @@
#include <assert.h>
#include <debug.h>
#include <errno.h>
+#include <endian.h>
#include <arpa/inet.h>
@@ -299,8 +300,8 @@ static uint8_t g_buffer_pool[NENET_NBUFFERS * S32K1XX_BUF_SIZE]
static inline uint32_t s32k1xx_swap32(uint32_t value);
static inline uint16_t s32k1xx_swap16(uint16_t value);
#else
-# define s32k1xx_swap32 __builtin_bswap32
-# define s32k1xx_swap16 __builtin_bswap16
+# define s32k1xx_swap32 swap32
+# define s32k1xx_swap16 swap16
#endif
#endif
diff --git a/arch/arm/src/s32k1xx/s32k1xx_lpspi.c b/arch/arm/src/s32k1xx/s32k1xx_lpspi.c
index 0cec7e82ae..438facb568 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_lpspi.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_lpspi.c
@@ -61,6 +61,7 @@
#include <assert.h>
#include <errno.h>
#include <debug.h>
+#include <endian.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
@@ -1655,7 +1656,7 @@ static void s32k1xx_lpspi_exchange_nodma(struct spi_dev_s *dev,
if (src)
{
- word = __builtin_bswap16(*src++);
+ word = swap16(*src++);
/* read the required number of bytes */
}
@@ -1672,7 +1673,7 @@ static void s32k1xx_lpspi_exchange_nodma(struct spi_dev_s *dev,
if (dest)
{
- *dest++ = __builtin_bswap16(word);
+ *dest++ = swap16(word);
}
}
}
diff --git a/arch/arm/src/s32k3xx/s32k3xx_lpspi.c b/arch/arm/src/s32k3xx/s32k3xx_lpspi.c
index 71ef92ae8f..001dd8beda 100644
--- a/arch/arm/src/s32k3xx/s32k3xx_lpspi.c
+++ b/arch/arm/src/s32k3xx/s32k3xx_lpspi.c
@@ -57,6 +57,7 @@
#include <assert.h>
#include <errno.h>
#include <debug.h>
+#include <endian.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
@@ -1705,7 +1706,7 @@ static void s32k3xx_lpspi_exchange_nodma(struct spi_dev_s *dev,
if (src)
{
- word = __builtin_bswap16(*src++);
+ word = swap16(*src++);
/* read the required number of bytes */
}
@@ -1722,7 +1723,7 @@ static void s32k3xx_lpspi_exchange_nodma(struct spi_dev_s *dev,
if (dest)
{
- *dest++ = __builtin_bswap16(word);
+ *dest++ = swap16(word);
}
}
}