From 1e57ca2c1baeba785371373519507114cd62c550 Mon Sep 17 00:00:00 2001 From: Gatsby Van Date: Wed, 27 Dec 2023 17:14:58 +0800 Subject: [PATCH] miscellaneous fix. --- datalink814_ge/src/main.c | 2 +- datalink814_ge/src/util/util.h | 3 +- df_datalink/src/include/common.h | 51 +++++++++------- df_datalink/src/include/util.h | 101 ++++++++++++++++--------------- 4 files changed, 84 insertions(+), 73 deletions(-) diff --git a/datalink814_ge/src/main.c b/datalink814_ge/src/main.c index f6245b1..fdc30e0 100644 --- a/datalink814_ge/src/main.c +++ b/datalink814_ge/src/main.c @@ -69,7 +69,7 @@ int SetupInterruptSystem(XScuGic *instPtr, uint32_t devId); void PhysicalIntr_Handler(void *callBackRef); void PeriodicPull_Handler(void *callBackRef); #ifdef _MPC_CTRL -void MPC_IntrHandler(void *CallBackRef); +void MPC_IntrHandler(void *callBackRef); #endif /*********************** Driver Instance Definitions **************************/ diff --git a/datalink814_ge/src/util/util.h b/datalink814_ge/src/util/util.h index 467a6f6..a4a4608 100644 --- a/datalink814_ge/src/util/util.h +++ b/datalink814_ge/src/util/util.h @@ -1,5 +1,4 @@ -/*************************************************************************** -//** +/******************************************************************************* * @file util.h * @brief Implementation of utility functions. * @author DBogdan (dragos.bogdan@analog.com) diff --git a/df_datalink/src/include/common.h b/df_datalink/src/include/common.h index 8e1a8b5..b5edcc2 100644 --- a/df_datalink/src/include/common.h +++ b/df_datalink/src/include/common.h @@ -28,56 +28,65 @@ /************************** Constant Definitions *****************************/ /***************** Macros (Inline Functions) Definitions *********************/ -#define __PRINT_BLOCK(block) do {\ - block\ -} while(0) +#define __PRINT_BLOCK(block) \ + do \ + { \ + block \ + } while (0) #define ASSERT(exp) ((exp) ? (void)0 : AppAssert(__FILE__, __LINE__)) -#define _nop_() __asm__("nop") +#define _nop_() __asm__("nop") /* Stringify */ -#define STR(x) #x +#define STR(x) #x -#define _814_DEBUG_LEVEL 3 +// #define _814_DEBUG_LEVEL 3 #if _814_DEBUG_LEVEL > 0 -#define DBG_PRINT(...) printf(__VA_ARGS__) +#define DBG_PRINT(...) printf(__VA_ARGS__) #endif #if _814_DEBUG_LEVEL >= 1 #define DBG_ERROR(...) __PRINT_BLOCK( \ - printf("in"__FILE__" #%4d [error]\t",__LINE__); \ - printf(__VA_ARGS__); \ -) + printf("in"__FILE__ \ + " #%4d [error]\t", \ + __LINE__); \ + printf(__VA_ARGS__);) #endif #if _814_DEBUG_LEVEL >= 2 #define DBG_WARNING(...) __PRINT_BLOCK( \ - printf("[warning]\t"); \ - printf(__VA_ARGS__); \ -) + printf("[warning]\t"); \ + printf(__VA_ARGS__);) #endif #if _814_DEBUG_LEVEL >= 3 #define DBG_INFO(...) __PRINT_BLOCK( \ - printf("[Info]\t"); \ - printf(__VA_ARGS__); \ -) + printf("[Info]\t"); \ + printf(__VA_ARGS__);) #endif #ifndef DBG_ERROR -#define DBG_ERROR(...) {} +#define DBG_ERROR(...) \ + { \ + } #endif #ifndef DBG_WARNING -#define DBG_WARNING(...) {} +#define DBG_WARNING(...) \ + { \ + } #endif #ifndef DBG_INFO -#define DBG_INFO(...) {} +#define DBG_INFO(...) \ + { \ + } #endif #ifndef DBG_PRINT -#define DBG_PRINT(...) {} +#define DBG_PRINT(...) \ + { \ + } #endif /**************************** Type Definitions *******************************/ /************************** Variable Definitions *****************************/ /************************** Function Prototypes ******************************/ -void AppAssert(const char * file, int line); +void AppAssert(const char *file, int line); #endif /* __COMMON_H_ */ diff --git a/df_datalink/src/include/util.h b/df_datalink/src/include/util.h index d75e08d..befac68 100644 --- a/df_datalink/src/include/util.h +++ b/df_datalink/src/include/util.h @@ -1,8 +1,8 @@ -/***************************************************************************//** +/******************************************************************************* * @file util.h * @brief Implementation of utility functions. * @author DBogdan (dragos.bogdan@analog.com) -******************************************************************************** + ******************************************************************************** * Copyright 2018(c) Analog Devices, Inc. * * All rights reserved. @@ -35,7 +35,7 @@ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*******************************************************************************/ + *******************************************************************************/ #ifndef _UTIL_H_ #define _UTIL_H_ @@ -48,21 +48,21 @@ /******************************************************************************/ /********************** Macros and Constants Definitions **********************/ /******************************************************************************/ -//#define __CRC_LSB +// #define __CRC_LSB #define __BITSWAP_TABLE #define __CRC_LSB #define CRC16_INIT 0x0000 #define CRC8_INIT 0x00 -#define BIT(x) (1 << (x)) -#define ASSERT_BIT(x, ofst) (x | BIT(ofst)) +#define BIT(x) (1 << (x)) +#define ASSERT_BIT(x, ofst) (x | BIT(ofst)) #define DEASSERT_BIT(x, ofst) (x & (~BIT(ofst))) #define ARRAY_SIZE(x) \ (sizeof(x) / sizeof((x)[0])) -#define DIV_ROUND_UP(x,y) \ - (((x) + (y) - 1) / (y)) +#define DIV_ROUND_UP(x, y) \ + (((x) + (y)-1) / (y)) #define DIV_ROUND_CLOSEST(x, y) \ (((x) + (y) / 2) / (y)) #define DIV_ROUND_CLOSEST_ULL(x, y) \ @@ -71,52 +71,56 @@ #define min(x, y) \ (((x) < (y)) ? (x) : (y)) #define min_t(type, x, y) \ - (type)min((type)(x), (type)(y)) + (type) min((type)(x), (type)(y)) #define max(x, y) \ (((x) > (y)) ? (x) : (y)) #define max_t(type, x, y) \ - (type)max((type)(x), (type)(y)) + (type) max((type)(x), (type)(y)) #define clamp(val, min_val, max_val) \ (max(min((val), (max_val)), (min_val))) #define clamp_t(type, val, min_val, max_val) \ - (type)clamp((type)(val), (type)(min_val), (type)(max_val)) + (type) clamp((type)(val), (type)(min_val), (type)(max_val)) -#define swap(x, y) \ - {typeof(x) _tmp_ = (x); (x) = (y); (y) = _tmp_;} +#define swap(x, y) \ + { \ + typeof(x) _tmp_ = (x); \ + (x) = (y); \ + (y) = _tmp_; \ + } -#define round_up(x,y) \ - (((x)+(y)-1)/(y)) +#define round_up(x, y) \ + (((x) + (y)-1) / (y)) #define BITS_PER_LONG 32 -#define GENMASK(h, l) ({ \ - uint32_t t = (uint32_t)(~0UL); \ - t = t << (BITS_PER_LONG - (h - l + 1)); \ - t = t >> (BITS_PER_LONG - (h + 1)); \ - t; \ +#define GENMASK(h, l) ({ \ + uint32_t t = (uint32_t)(~0UL); \ + t = t << (BITS_PER_LONG - (h - l + 1)); \ + t = t >> (BITS_PER_LONG - (h + 1)); \ + t; \ }) -#define bswap_constant_32(x) \ - ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \ - (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24)) +#define bswap_constant_32(x) \ + ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \ + (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24)) #define bswap_constant_16(x) ((((x) & (uint16_t)0xff00) >> 8) | \ - (((x) & (uint16_t)0x00ff) << 8)) + (((x) & (uint16_t)0x00ff) << 8)) #define bit_swap_constant_8(x) \ - ((((x) & 0x80) >> 7) | \ - (((x) & 0x40) >> 5) | \ - (((x) & 0x20) >> 3) | \ - (((x) & 0x10) >> 1) | \ - (((x) & 0x08) << 1) | \ - (((x) & 0x04) << 3) | \ - (((x) & 0x02) << 5) | \ + ((((x) & 0x80) >> 7) | \ + (((x) & 0x40) >> 5) | \ + (((x) & 0x20) >> 3) | \ + (((x) & 0x10) >> 1) | \ + (((x) & 0x08) << 1) | \ + (((x) & 0x04) << 3) | \ + (((x) & 0x02) << 5) | \ (((x) & 0x01) << 7)) -#define U16_MAX ((uint16_t)~0U) -#define S16_MAX ((int16_t)(U16_MAX>>1)) +#define U16_MAX ((uint16_t)~0U) +#define S16_MAX ((int16_t)(U16_MAX >> 1)) #define DIV_U64(x, y) (x / y) @@ -149,8 +153,8 @@ uint32_t find_first_set_bit(uint32_t word); uint32_t find_last_set_bit(uint32_t word); /* Locate the closest element in an array. */ uint32_t find_closest(int32_t val, - const int32_t *array, - uint32_t size); + const int32_t *array, + uint32_t size); /* Shift the value and apply the specified mask. */ uint32_t field_prep(uint32_t mask, uint32_t val); /* Get a field specified by a mask from a word. */ @@ -159,22 +163,22 @@ uint32_t field_get(uint32_t mask, uint32_t word); int32_t log_base_2(uint32_t x); /* Find greatest common divisor of the given two numbers. */ uint32_t greatest_common_divisor(uint32_t a, - uint32_t b); + uint32_t b); /* Calculate best rational approximation for a given fraction. */ void rational_best_approximation(uint32_t given_numerator, - uint32_t given_denominator, - uint32_t max_numerator, - uint32_t max_denominator, - uint32_t *best_numerator, - uint32_t *best_denominator); + uint32_t given_denominator, + uint32_t max_numerator, + uint32_t max_denominator, + uint32_t *best_numerator, + uint32_t *best_denominator); /* Calculate the number of set bits. */ uint32_t hweight8(uint32_t word); /* Calculate the quotient and the remainder of an integer division. */ -uint64_t do_div(uint64_t* n, - uint64_t base); +uint64_t do_div(uint64_t *n, + uint64_t base); /* Unsigned 64bit divide with 64bit divisor and remainder */ uint64_t div64_u64_rem(uint64_t dividend, uint64_t divisor, - uint64_t *remainder); + uint64_t *remainder); /* Unsigned 64bit divide with 32bit divisor with remainder */ uint64_t div_u64_rem(uint64_t dividend, uint32_t divisor, uint32_t *remainder); int64_t div_s64_rem(int64_t dividend, int32_t divisor, int32_t *remainder); @@ -186,9 +190,8 @@ int32_t str_to_int32(const char *str); /* Converts from string to uint32_t */ uint32_t srt_to_uint32(const char *str); -int crc16_gen(uint8_t* buffPtr, uint32_t dataLen, uint16_t poly, uint16_t* crcVal); -bool crc16_check(uint8_t* buffPtr, uint32_t dataLen, uint32_t crcOffset, uint16_t poly); -int crc8_gen(uint8_t* buffPtr, uint32_t dataLen, uint16_t poly, uint8_t* crcVal); -bool crc8_check(uint8_t* buffPtr, uint32_t dataLen, uint32_t crcOffset, uint16_t poly); +int crc16_gen(uint8_t *buffPtr, uint32_t dataLen, uint16_t poly, uint16_t *crcVal); +bool crc16_check(uint8_t *buffPtr, uint32_t dataLen, uint32_t crcOffset, uint16_t poly); +int crc8_gen(uint8_t *buffPtr, uint32_t dataLen, uint16_t poly, uint8_t *crcVal); +bool crc8_check(uint8_t *buffPtr, uint32_t dataLen, uint32_t crcOffset, uint16_t poly); #endif // UTIL_H_ -