libc: Move crc8.h, crc16.h and crc32.h from include to include/nuttx

to avoid the conflict with the 3rd party library Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2022-08-12 14:13:41 +08:00 · 2022-08-12 14:13:41 +08:00 · 2b37909c9e
commit 2b37909c9e
parent b3795daa53
31 changed files with 52 additions and 51 deletions
--- a/arch/arm/src/stm32/stm32_bbsram.c
+++ b/arch/arm/src/stm32/stm32_bbsram.c
@ -40,8 +40,7 @@
 #include <unistd.h>
 #include <time.h>
 #include <nuttx/fs/fs.h>
-
-#include <crc32.h>
+#include <nuttx/crc32.h>

 #include "stm32_bbsram.h"
 #include "chip.h"
--- a/arch/arm/src/stm32f7/stm32_bbsram.c
+++ b/arch/arm/src/stm32f7/stm32_bbsram.c
@ -40,8 +40,7 @@
 #include <unistd.h>
 #include <time.h>
 #include <nuttx/fs/fs.h>
-
-#include <crc32.h>
+#include <nuttx/crc32.h>

 #include "stm32_bbsram.h"
 #include "chip.h"
--- a/arch/arm/src/stm32f7/stm32_ethernet.c
+++ b/arch/arm/src/stm32f7/stm32_ethernet.c
@ -44,7 +44,7 @@
 #include <nuttx/net/mii.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
-#include <crc64.h>
+#include <nuttx/crc64.h>

 #if defined(CONFIG_NET_PKT)
 #  include <nuttx/net/pkt.h>
--- a/arch/arm/src/stm32h7/stm32_bbsram.c
+++ b/arch/arm/src/stm32h7/stm32_bbsram.c
@ -39,8 +39,7 @@
 #include <unistd.h>
 #include <time.h>
 #include <nuttx/fs/fs.h>
-
-#include <crc32.h>
+#include <nuttx/crc32.h>

 #include "stm32_bbsram.h"
 #include "chip.h"
--- a/arch/arm/src/stm32h7/stm32_ethernet.c
+++ b/arch/arm/src/stm32h7/stm32_ethernet.c
@ -44,7 +44,7 @@
 #include <nuttx/net/mii.h>
 #include <nuttx/net/arp.h>
 #include <nuttx/net/netdev.h>
-#include <crc64.h>
+#include <nuttx/crc64.h>

 #if defined(CONFIG_NET_PKT)
 #  include <nuttx/net/pkt.h>
--- a/arch/renesas/src/rx65n/rx65n_sbram.c
+++ b/arch/renesas/src/rx65n/rx65n_sbram.c
@ -40,8 +40,7 @@
 #include <unistd.h>
 #include <time.h>
 #include <nuttx/fs/fs.h>
-
-#include <crc32.h>
+#include <nuttx/crc32.h>

 #include "rx65n_sbram.h"
 #include "chip.h"
--- a/arch/risc-v/src/esp32c3/esp32c3_wlan.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_wlan.c
@ -30,7 +30,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <debug.h>
-#include <crc64.h>
+#include <nuttx/crc64.h>
 #include <arpa/inet.h>

 #include <nuttx/nuttx.h>
--- a/arch/xtensa/src/esp32/esp32_emac.c
+++ b/arch/xtensa/src/esp32/esp32_emac.c
@ -37,7 +37,7 @@
 #include <arpa/inet.h>
 #include <net/if.h>

-#include <crc8.h>
+#include <nuttx/crc8.h>
 #include <nuttx/wdog.h>
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
--- a/arch/xtensa/src/esp32/esp32_wlan.c
+++ b/arch/xtensa/src/esp32/esp32_wlan.c
@ -30,9 +30,9 @@
 #include <assert.h>
 #include <errno.h>
 #include <debug.h>
-#include <crc64.h>
 #include <arpa/inet.h>

+#include <nuttx/crc64.h>
 #include <nuttx/nuttx.h>
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
--- a/drivers/mtd/smart.c
+++ b/drivers/mtd/smart.c
@ -37,12 +37,11 @@
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
-
-#include <crc8.h>
-#include <crc16.h>
-#include <crc32.h>
 #include <debug.h>

+#include <nuttx/crc8.h>
+#include <nuttx/crc16.h>
+#include <nuttx/crc32.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/ioctl.h>
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@ -33,10 +33,10 @@
 #include <errno.h>
 #include <assert.h>
 #include <debug.h>
-#include <crc32.h>

 #include <arpa/inet.h>

+#include <nuttx/crc32.h>
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
 #include <nuttx/kmalloc.h>
--- a/drivers/power/battery/bq769x0.c
+++ b/drivers/power/battery/bq769x0.c
@ -40,7 +40,7 @@
 #include <errno.h>
 #include <debug.h>

-#include <crc8.h>
+#include <nuttx/crc8.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/signal.h>
 #include <nuttx/i2c/i2c_master.h>
--- a/drivers/sensors/mlx90614.c
+++ b/drivers/sensors/mlx90614.c
@ -40,7 +40,7 @@
 #include <nuttx/random.h>

 #ifdef CONFIG_MLX90614_CRC
-#include <crc8.h>
+#include <nuttx/crc8.h>
 #endif

 #if defined(CONFIG_I2C) && defined(CONFIG_SENSORS_MLX90614)
--- a/fs/nxffs/nxffs_dump.c
+++ b/fs/nxffs/nxffs_dump.c
@ -27,8 +27,8 @@
 #include <string.h>
 #include <debug.h>
 #include <errno.h>
-#include <crc32.h>

+#include <nuttx/crc32.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/mtd/mtd.h>
--- a/fs/nxffs/nxffs_inode.c
+++ b/fs/nxffs/nxffs_inode.c
@ -26,11 +26,11 @@

 #include <stdint.h>
 #include <string.h>
-#include <crc32.h>
 #include <assert.h>
 #include <errno.h>
 #include <debug.h>

+#include <nuttx/crc32.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/mtd/mtd.h>

--- a/fs/nxffs/nxffs_open.c
+++ b/fs/nxffs/nxffs_open.c
@ -28,11 +28,11 @@
 #include <string.h>
 #include <fcntl.h>
 #include <time.h>
-#include <crc32.h>
 #include <assert.h>
 #include <errno.h>
 #include <debug.h>

+#include <nuttx/crc32.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/mtd/mtd.h>
--- a/fs/nxffs/nxffs_pack.c
+++ b/fs/nxffs/nxffs_pack.c
@ -28,9 +28,9 @@
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
-#include <crc32.h>
 #include <debug.h>

+#include <nuttx/crc32.h>
 #include <nuttx/kmalloc.h>

 #include "nxffs.h"
--- a/fs/nxffs/nxffs_read.c
+++ b/fs/nxffs/nxffs_read.c
@ -27,11 +27,11 @@
 #include <stdint.h>
 #include <string.h>
 #include <fcntl.h>
-#include <crc32.h>
 #include <assert.h>
 #include <errno.h>
 #include <debug.h>

+#include <nuttx/crc32.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/mtd/mtd.h>

--- a/fs/nxffs/nxffs_write.c
+++ b/fs/nxffs/nxffs_write.c
@ -27,11 +27,11 @@
 #include <stdint.h>
 #include <string.h>
 #include <fcntl.h>
-#include <crc32.h>
 #include <assert.h>
 #include <errno.h>
 #include <debug.h>

+#include <nuttx/crc32.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/mtd/mtd.h>

--- a/fs/partition/fs_gpt.c
+++ b/fs/partition/fs_gpt.c
@ -22,12 +22,12 @@
 * Included Files
 ****************************************************************************/

-#include <crc32.h>
 #include <ctype.h>
 #include <debug.h>
 #include <endian.h>
 #include <inttypes.h>

+#include <nuttx/crc32.h>
 #include <nuttx/kmalloc.h>

 #include "partition.h"
--- a/include/nuttx/crc16.h
+++ b/include/nuttx/crc16.h
@ -1,5 +1,5 @@
 /****************************************************************************
- * include/crc16.h
+ * include/nuttx/crc16.h
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@ -18,8 +18,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CRC16_H
-#define __INCLUDE_CRC16_H
+#ifndef __INCLUDE_NUTTX_CRC16_H
+#define __INCLUDE_NUTTX_CRC16_H

 /****************************************************************************
 * Included Files
@ -65,4 +65,4 @@ uint16_t crc16(FAR const uint8_t *src, size_t len);
 }
 #endif

-#endif /* __INCLUDE_CRC16_H */
+#endif /* __INCLUDE_NUTTX_CRC16_H */
--- a/include/nuttx/crc32.h
+++ b/include/nuttx/crc32.h
@ -1,5 +1,5 @@
 /****************************************************************************
- * include/crc32.h
+ * include/nuttx/crc32.h
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@ -18,8 +18,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CRC32_H
-#define __INCLUDE_CRC32_H
+#ifndef __INCLUDE_NUTTX_CRC32_H
+#define __INCLUDE_NUTTX_CRC32_H

 /****************************************************************************
 * Included Files
@ -65,4 +65,4 @@ uint32_t crc32(FAR const uint8_t *src, size_t len);
 }
 #endif

-#endif /* __INCLUDE_CRC32_H */
+#endif /* __INCLUDE_NUTTX_CRC32_H */
--- a/include/nuttx/crc64.h
+++ b/include/nuttx/crc64.h
@ -1,5 +1,5 @@
 /****************************************************************************
- * include/crc64.h
+ * include/nuttx/crc64.h
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@ -18,8 +18,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CRC64_H
-#define __INCLUDE_CRC64_H
+#ifndef __INCLUDE_NUTTX_CRC64_H
+#define __INCLUDE_NUTTX_CRC64_H

 /****************************************************************************
 * Included Files
@ -91,4 +91,4 @@ uint64_t crc64(FAR const uint8_t *src, size_t len);
 #endif

 #endif /* CONFIG_HAVE_LONG_LONG */
-#endif /* __INCLUDE_CRC64_H */
+#endif /* __INCLUDE_NUTTX_CRC64_H */
--- a/include/nuttx/crc8.h
+++ b/include/nuttx/crc8.h
@ -1,5 +1,5 @@
 /****************************************************************************
- * include/crc8.h
+ * include/nuttx/crc8.h
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@ -18,8 +18,8 @@
 *
 ****************************************************************************/

-#ifndef __INCLUDE_CRC8_H
-#define __INCLUDE_CRC8_H
+#ifndef __INCLUDE_NUTTX_CRC8_H
+#define __INCLUDE_NUTTX_CRC8_H

 /****************************************************************************
 * Included Files
@ -101,4 +101,4 @@ uint8_t crc8ccittpart(FAR const uint8_t *src, size_t len, uint8_t crc8val);
 }
 #endif

-#endif /* __INCLUDE_CRC8_H */
+#endif /* __INCLUDE_NUTTX_CRC8_H */
--- a/libs/libc/libc.csv
+++ b/libs/libc/libc.csv
@ -29,8 +29,8 @@
 "cfsetspeed","termios.h","defined(CONFIG_SERIAL_TERMIOS)","int","FAR struct termios *","speed_t"
 "chdir","unistd.h","!defined(CONFIG_DISABLE_ENVIRON)","int","FAR const char *"
 "clock","time.h","","clock_t"
-"crc32","crc32.h","","uint32_t","FAR const uint8_t *","size_t"
-"crc32part","crc32.h","","uint32_t","FAR const uint8_t *","size_t","uint32_t"
+"crc32","nuttx/crc32.h","","uint32_t","FAR const uint8_t *","size_t"
+"crc32part","nuttx/crc32.h","","uint32_t","FAR const uint8_t *","size_t","uint32_t"
 "ctime","time.h","","char *","const time_t *"
 "dirname","libgen.h","","FAR char *","FAR char *"
 "dlclose","dlfcn.h","defined(CONFIG_LIBC_DLFCN)","int","FAR void *"
--- a/libs/libc/misc/lib_crc16.c
+++ b/libs/libc/misc/lib_crc16.c
@ -38,7 +38,8 @@

 #include <sys/types.h>
 #include <stdint.h>
-#include <crc16.h>
+
+#include <nuttx/crc16.h>

 /************************************************************************************************
 * Private Data
--- a/libs/libc/misc/lib_crc32.c
+++ b/libs/libc/misc/lib_crc32.c
@ -45,7 +45,8 @@

 #include <sys/types.h>
 #include <stdint.h>
-#include <crc32.h>
+
+#include <nuttx/crc32.h>

 /************************************************************************************************
 * Private Data
--- a/libs/libc/misc/lib_crc64.c
+++ b/libs/libc/misc/lib_crc64.c
@ -26,7 +26,8 @@

 #include <sys/types.h>
 #include <stdint.h>
-#include <crc64.h>
+
+#include <nuttx/crc64.h>

 #ifdef CONFIG_HAVE_LONG_LONG

--- a/libs/libc/misc/lib_crc8.c
+++ b/libs/libc/misc/lib_crc8.c
@ -24,7 +24,8 @@

 #include <sys/types.h>
 #include <stdint.h>
-#include <crc8.h>
+
+#include <nuttx/crc8.h>

 /****************************************************************************
 * Private Data
--- a/libs/libc/misc/lib_crc8ccitt.c
+++ b/libs/libc/misc/lib_crc8ccitt.c
@ -26,7 +26,8 @@

 #include <sys/types.h>
 #include <stdint.h>
-#include <crc8.h>
+
+#include <nuttx/crc8.h>

 /***************************************************************************
 * Private Data
--- a/libs/libc/misc/lib_crc8table.c
+++ b/libs/libc/misc/lib_crc8table.c
@ -24,7 +24,8 @@

 #include <sys/types.h>
 #include <stdint.h>
-#include <crc8.h>
+
+#include <nuttx/crc8.h>

 /****************************************************************************
 * Public Functions