This is an automated email from the ASF dual-hosted git repository.
GUIDINGLI pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new b3aa54f8af0 libs/libc/misc: remove duplicate crc16ibm implementation.
b3aa54f8af0 is described below
commit b3aa54f8af092afaf6efdfb403a97754341c3593
Author: yukangzhi <[email protected]>
AuthorDate: Tue Dec 2 10:11:58 2025 +0800
libs/libc/misc: remove duplicate crc16ibm implementation.
crc16ibm() and crc16h8005() implement the same CRC-16/ARC algorithm
(polynomial 0x8005, reflected 0xA001, initial seed 0x0000, no final
XOR), so lib_crc16ibm.c duplicates lib_crc16h8005.c.
Remove lib_crc16ibm.c and keep crc16ibm()/crc16ibmpart() as macros
that map to crc16h8005()/crc16h8005_part(), so existing callers keep
building and get identical results.
Assisted-by: Kiro
Signed-off-by: yukangzhi <[email protected]>
---
include/nuttx/crc16.h | 5 +-
libs/libc/misc/CMakeLists.txt | 1 -
libs/libc/misc/Make.defs | 2 +-
libs/libc/misc/lib_crc16ibm.c | 131 ------------------------------------------
4 files changed, 3 insertions(+), 136 deletions(-)
diff --git a/include/nuttx/crc16.h b/include/nuttx/crc16.h
index bed7c5af5bd..f41abd4d476 100644
--- a/include/nuttx/crc16.h
+++ b/include/nuttx/crc16.h
@@ -136,8 +136,7 @@ uint16_t crc16ccitt(FAR const uint8_t *src, size_t len);
*
****************************************************************************/
-uint16_t crc16ibmpart(FAR const uint8_t *src, size_t len,
- uint16_t crc16val);
+#define crc16ibmpart crc16h8005_part
/****************************************************************************
* Name: crc16ibm
@@ -159,7 +158,7 @@ uint16_t crc16ibmpart(FAR const uint8_t *src, size_t len,
*
****************************************************************************/
-uint16_t crc16ibm(FAR const uint8_t *src, size_t len);
+#define crc16ibm crc16h8005
/****************************************************************************
* Name: crc16xmodempart
diff --git a/libs/libc/misc/CMakeLists.txt b/libs/libc/misc/CMakeLists.txt
index 3334e8e4702..07041cfd935 100644
--- a/libs/libc/misc/CMakeLists.txt
+++ b/libs/libc/misc/CMakeLists.txt
@@ -93,7 +93,6 @@ list(
lib_crc32hf4acfb13.c
lib_crc16.c
lib_crc16ccitt.c
- lib_crc16ibm.c
lib_crc16xmodem.c
lib_crc16h1021.c
lib_crc16h8005.c
diff --git a/libs/libc/misc/Make.defs b/libs/libc/misc/Make.defs
index 01aa6a6aa8d..4f59fcb5d49 100644
--- a/libs/libc/misc/Make.defs
+++ b/libs/libc/misc/Make.defs
@@ -55,7 +55,7 @@ CSRCS += lib_crc8.c lib_crc8ccitt.c lib_crc8table.c
lib_crc8rohc.c
CSRCS += lib_crc8h1d.c lib_crc8h2f.c lib_crc16h1021.c lib_crc16h8005.c
CSRCS += lib_crc32h04c11db7.c lib_crc32hf4acfb13.c lib_crc64emac.c
CSRCS += lib_backtrace.c lib_ftok.c lib_err.c lib_instrument.c lib_glob.c
-CSRCS += lib_crc16ibm.c lib_crc16xmodem.c lib_xorsum16.c
+CSRCS += lib_crc16xmodem.c lib_xorsum16.c
CSRCS += lib_fdcheck.c lib_tag.c
# Keyboard driver encoder/decoder
diff --git a/libs/libc/misc/lib_crc16ibm.c b/libs/libc/misc/lib_crc16ibm.c
deleted file mode 100644
index 86901a77e21..00000000000
--- a/libs/libc/misc/lib_crc16ibm.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/****************************************************************************
- * libs/libc/misc/lib_crc16ibm.c
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership. The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <sys/types.h>
-#include <stdint.h>
-
-#include <nuttx/crc16.h>
-
-/* CRC table for the CRC-16. The poly is 0x8005 (x^16 + x^15 + x^2 + 1) */
-
-static const uint16_t crc16ibm_tab[256] =
-{
- 0x0000, 0xc0c1, 0xc181, 0x0140, 0xc301, 0x03c0, 0x0280, 0xc241,
- 0xc601, 0x06c0, 0x0780, 0xc741, 0x0500, 0xc5c1, 0xc481, 0x0440,
- 0xcc01, 0x0cc0, 0x0d80, 0xcd41, 0x0f00, 0xcfc1, 0xce81, 0x0e40,
- 0x0a00, 0xcac1, 0xcb81, 0x0b40, 0xc901, 0x09c0, 0x0880, 0xc841,
- 0xd801, 0x18c0, 0x1980, 0xd941, 0x1b00, 0xdbc1, 0xda81, 0x1a40,
- 0x1e00, 0xdec1, 0xdf81, 0x1f40, 0xdd01, 0x1dc0, 0x1c80, 0xdc41,
- 0x1400, 0xd4c1, 0xd581, 0x1540, 0xd701, 0x17c0, 0x1680, 0xd641,
- 0xd201, 0x12c0, 0x1380, 0xd341, 0x1100, 0xd1c1, 0xd081, 0x1040,
- 0xf001, 0x30c0, 0x3180, 0xf141, 0x3300, 0xf3c1, 0xf281, 0x3240,
- 0x3600, 0xf6c1, 0xf781, 0x3740, 0xf501, 0x35c0, 0x3480, 0xf441,
- 0x3c00, 0xfcc1, 0xfd81, 0x3d40, 0xff01, 0x3fc0, 0x3e80, 0xfe41,
- 0xfa01, 0x3ac0, 0x3b80, 0xfb41, 0x3900, 0xf9c1, 0xf881, 0x3840,
- 0x2800, 0xe8c1, 0xe981, 0x2940, 0xeb01, 0x2bc0, 0x2a80, 0xea41,
- 0xee01, 0x2ec0, 0x2f80, 0xef41, 0x2d00, 0xedc1, 0xec81, 0x2c40,
- 0xe401, 0x24c0, 0x2580, 0xe541, 0x2700, 0xe7c1, 0xe681, 0x2640,
- 0x2200, 0xe2c1, 0xe381, 0x2340, 0xe101, 0x21c0, 0x2080, 0xe041,
- 0xa001, 0x60c0, 0x6180, 0xa141, 0x6300, 0xa3c1, 0xa281, 0x6240,
- 0x6600, 0xa6c1, 0xa781, 0x6740, 0xa501, 0x65c0, 0x6480, 0xa441,
- 0x6c00, 0xacc1, 0xad81, 0x6d40, 0xaf01, 0x6fc0, 0x6e80, 0xae41,
- 0xaa01, 0x6ac0, 0x6b80, 0xab41, 0x6900, 0xa9c1, 0xa881, 0x6840,
- 0x7800, 0xb8c1, 0xb981, 0x7940, 0xbb01, 0x7bc0, 0x7a80, 0xba41,
- 0xbe01, 0x7ec0, 0x7f80, 0xbf41, 0x7d00, 0xbdc1, 0xbc81, 0x7c40,
- 0xb401, 0x74c0, 0x7580, 0xb541, 0x7700, 0xb7c1, 0xb681, 0x7640,
- 0x7200, 0xb2c1, 0xb381, 0x7340, 0xb101, 0x71c0, 0x7080, 0xb041,
- 0x5000, 0x90c1, 0x9181, 0x5140, 0x9301, 0x53c0, 0x5280, 0x9241,
- 0x9601, 0x56c0, 0x5780, 0x9741, 0x5500, 0x95c1, 0x9481, 0x5440,
- 0x9c01, 0x5cc0, 0x5d80, 0x9d41, 0x5f00, 0x9fc1, 0x9e81, 0x5e40,
- 0x5a00, 0x9ac1, 0x9b81, 0x5b40, 0x9901, 0x59c0, 0x5880, 0x9841,
- 0x8801, 0x48c0, 0x4980, 0x8941, 0x4b00, 0x8bc1, 0x8a81, 0x4a40,
- 0x4e00, 0x8ec1, 0x8f81, 0x4f40, 0x8d01, 0x4dc0, 0x4c80, 0x8c41,
- 0x4400, 0x84c1, 0x8581, 0x4540, 0x8701, 0x47c0, 0x4680, 0x8641,
- 0x8201, 0x42c0, 0x4380, 0x8341, 0x4100, 0x81c1, 0x8081, 0x4040
-};
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: crc16ibm
- *
- * Description:
- * Return a 16-bit CRC-ANSI of the contents of the 'src' buffer, length
- * 'len' using the polynomial 0x8005 (x^16 + x^15 + x^2 + 1).
- *
- * The ANSI variant of CRC-16 uses 0x8005 (0xA001 reflected) as its
- * polynomial with the initial * value set to 0x0000.
- *
- * The following checksums can, among others, be calculated by this
- * function, depending on the value provided for the initial seed and
- * the value the final calculated CRC is XORed with:
- *
- * - ARC, CRC-16, CRC-16/LHA, CRC-IBM
- * https://reveng.sourceforge.io/crc-catalogue/16.htm#crc.cat.crc-16-arc
- * poly: 0x8005 (0xA001) initial seed: 0x0000, xor output: 0x0000
- *
- ****************************************************************************/
-
-uint16_t crc16ibmpart(FAR const uint8_t *src, size_t len,
- uint16_t crc16val)
-{
- size_t i;
- uint16_t v = crc16val;
-
- for (i = 0; i < len; i++)
- {
- v = (v >> 8) ^ crc16ibm_tab[(v ^ src[i]) & 0xff];
- }
-
- return v;
-}
-
-/****************************************************************************
- * Name: crc16ibm
- *
- * Description:
- * Return a 16-bit CRC-ANSI of the contents of the 'src' buffer, length
- * 'len' using the polynomial 0x8005 (x^16 + x^15 + x^2 + 1).
- *
- * The ANSI variant of CRC-16 uses 0x8005 (0xA001 reflected) as its
- * polynomial with the initial * value set to 0x0000.
- *
- * The following checksums can, among others, be calculated by this
- * function, depending on the value provided for the initial seed and
- * the value the final calculated CRC is XORed with:
- *
- * - ARC, CRC-16, CRC-16/LHA, CRC-IBM
- * https://reveng.sourceforge.io/crc-catalogue/16.htm#crc.cat.crc-16-arc
- * poly: 0x8005 (0xA001) initial seed: 0x0000, xor output: 0x0000
- *
- ****************************************************************************/
-
-uint16_t crc16ibm(FAR const uint8_t *src, size_t len)
-{
- return crc16ibmpart(src, len, 0);
-}