U8, U16, U32 data type changes

[o-du/l2.git] / src / cm / cm_lib.c

diff --git a/src/cm/cm_lib.c b/src/cm/cm_lib.c
index f393fd9..52f83d5 100644 (file)
--- a/src/cm/cm_lib.c
+++ b/src/cm/cm_lib.c
@@ -197,27 +197,26 @@ EXTERN Size regMemSize;
 *
 */
 #ifdef ANSI
-U8 *cmMemcpy
+uint8_t *cmMemcpy
 (
-U8           *tgt,
-CONSTANT U8  *src,
+uint8_t           *tgt,
+CONSTANT uint8_t  *src,
 PTR          len
 )
 #else
-U8 *cmMemcpy(tgt, src, len)
-U8           *tgt;
-CONSTANT U8  *src;
+uint8_t *cmMemcpy(tgt, src, len)
+uint8_t           *tgt;
+CONSTANT uint8_t  *src;
 PTR          len;
 #endif
 {
    /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/
-   TRC2(cmMemcpy)
 
 #ifdef MS_MBUF_CORRUPTION /* checking for valid memory address */
 if ((tgt > startPtr128) && (tgt < (startPtr128+regMemSize)))
 {
-   if ((*((U32 *)(tgt + 4)) == 0xDEADDEAD) || (*((U32 *)(tgt + 24)) == 0xDEADDEAD) ||
-      (*((U32 *)(tgt + 44)) == 0xDEADDEAD) || (*((U32 *)(tgt + 80)) == 0xDEADDEAD))
+   if ((*((uint32_t *)(tgt + 4)) == 0xDEADDEAD) || (*((uint32_t *)(tgt + 24)) == 0xDEADDEAD) ||
+      (*((uint32_t *)(tgt + 44)) == 0xDEADDEAD) || (*((uint32_t *)(tgt + 80)) == 0xDEADDEAD))
    {
       Data *crashPtr=NULLP;
       *crashPtr = 9;
@@ -225,8 +224,8 @@ if ((tgt > startPtr128) && (tgt < (startPtr128+regMemSize)))
 }
 if ((src > startPtr128) && (src < (startPtr128+regMemSize)))
 {
-   if ((*((U32 *)(src + 4)) == 0xDEADDEAD) || (*((U32 *)(src + 24)) == 0xDEADDEAD) ||
-      (*((U32 *)(src + 44)) == 0xDEADDEAD) || (*((U32 *)(src + 80)) == 0xDEADDEAD))
+   if ((*((uint32_t *)(src + 4)) == 0xDEADDEAD) || (*((uint32_t *)(src + 24)) == 0xDEADDEAD) ||
+      (*((uint32_t *)(src + 44)) == 0xDEADDEAD) || (*((uint32_t *)(src + 80)) == 0xDEADDEAD))
    {
       Data *crashPtr=NULLP;
       *crashPtr = 9;
@@ -234,7 +233,7 @@ if ((src > startPtr128) && (src < (startPtr128+regMemSize)))
 }
 #endif 
 #if (MEMCPY_AVAIL) /* memcpy is available */
-   return ((U8 *) memcpy((Void *)tgt, (CONSTANT Void *)src, (size_t)len));
+   return ( memcpy(tgt, src, len));
 #else
    while (len--)
       *tgt++ = *src++;
@@ -265,19 +264,18 @@ if ((src > startPtr128) && (src < (startPtr128+regMemSize)))
 #ifdef ANSI
 S16 cmMemcmp
 (
-CONSTANT U8     *s1,
-CONSTANT U8     *s2,
+CONSTANT uint8_t     *s1,
+CONSTANT uint8_t     *s2,
 PTR             len
 )
 #else
 S16 cmMemcmp (s1, s2, len)
-CONSTANT U8     *s1;
-CONSTANT U8     *s2;
+CONSTANT uint8_t     *s1;
+CONSTANT uint8_t     *s2;
 PTR             len;
 #endif
 {
    /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/
-   TRC2(cmMemcmp)
 #if MEMCMP_AVAIL /* memcmp is available */
    return ((S16) memcmp((CONSTANT Void *)s1, (CONSTANT Void *)s2, (size_t)len));
 #else  /* MEMCMP_AVAIL: memcmp is not available */
@@ -312,26 +310,25 @@ PTR             len;
 *
 */
 #ifdef ANSI
-U8 *cmMemset
+uint8_t *cmMemset
 (
-U8           *str,
-U8           val,
+uint8_t           *str,
+uint8_t           val,
 PTR          len
 )
 #else
-U8 *cmMemset(str, val, len)
-U8           *str;
-U8           val;
+uint8_t *cmMemset(str, val, len)
+uint8_t           *str;
+uint8_t           val;
 PTR          len;
 #endif
 {
    /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/
-   TRC2(cmMemset)
 #if MS_MBUF_CORRUPTION /* checking for valid memory address */
 if ((str > startPtr128) && (str < (startPtr128+regMemSize)))
 {
-   if ((*((U32 *)(str + 4)) == 0xDEADDEAD) || (*((U32 *)(str + 24)) == 0xDEADDEAD) ||
-      (*((U32 *)(str + 44)) == 0xDEADDEAD) || (*((U32 *)(str + 80)) == 0xDEADDEAD))
+   if ((*((uint32_t *)(str + 4)) == 0xDEADDEAD) || (*((uint32_t *)(str + 24)) == 0xDEADDEAD) ||
+      (*((uint32_t *)(str + 44)) == 0xDEADDEAD) || (*((uint32_t *)(str + 80)) == 0xDEADDEAD))
    {
       Data *crashPtr=NULLP;
       *crashPtr = 9;
@@ -345,7 +342,7 @@ if ((str > startPtr128) && (str < (startPtr128+regMemSize)))
    }
    else
    {
-      memset((void *)str,val,(size_t) len);
+      memset(str,val, len);
    }
 #else  /* MEMSET_AVAIL: memset is not available */
    while (len --)
@@ -393,17 +390,16 @@ if ((str > startPtr128) && (str < (startPtr128+regMemSize)))
 #ifdef ANSI
 S16 cmStrcmp
 (
-CONSTANT U8 *s1,
-CONSTANT U8 *s2
+CONSTANT uint8_t *s1,
+CONSTANT uint8_t *s2
 )
 #else
 S16 cmStrcmp (s1, s2)
-CONSTANT U8 *s1;
-CONSTANT U8 *s2;
+CONSTANT uint8_t *s1;
+CONSTANT uint8_t *s2;
 #endif
 {
    /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/
-   TRC2(cmStrcmp)
 #if (STRCMP_AVAIL)
    return (strcmp((CONSTANT S8 *)s1, (CONSTANT S8 *)s2));
 #else   /* STRCMP_AVAIL */
@@ -458,19 +454,18 @@ CONSTANT U8 *s2;
 #ifdef ANSI
 S16 cmStrncmp
 (
-CONSTANT U8  *s1,
-CONSTANT U8  *s2,
+CONSTANT uint8_t  *s1,
+CONSTANT uint8_t  *s2,
 MsgLen       len /* cm_lib_c_001.main_12: Changing from S16 to MsgLen.*/
 )
 #else
 S16 cmStrncmp (s1, s2, len)
-CONSTANT U8  *s1;
-CONSTANT U8  *s2;
+CONSTANT uint8_t  *s1;
+CONSTANT uint8_t  *s2;
 MsgLen       len;
 #endif
 {
    /*cm_lib_c_001.main_14 : Fix for TRACE5 feature crash due to missing TRC MACRO*/
-   TRC2(cmStrncmp)
 #if (STRNCMP_AVAIL)
    return (strncmp((CONSTANT S8 *)s1, (CONSTANT S8 *)s2, (size_t) len));
 #else   /* STRNCMP_AVAIL */
@@ -513,23 +508,21 @@ MsgLen       len;
 #ifdef ANSI
 MsgLen cmStrlen
 (
-CONSTANT U8 *s
+CONSTANT uint8_t *s
 )
 #else
 /* cm_lib_c_001.main_12: Changing from S16 to MsgLen.*/
 MsgLen cmStrlen (s)
-CONSTANT U8 *s;
+CONSTANT uint8_t *s;
 #endif
 {
 #if (STRLEN_AVAIL)
    /*cm_lib_c_001.main_15 : Fix for warning due to mixed declation*/
-   TRC2(cmStrlen)
    return ((MsgLen)strlen((CONSTANT S8 *)s));
 #else   /* STRLEN_AVAIL */
    MsgLen i;
   
    /*cm_lib_c_001.main_15 : Fix for warning due to mixed declation*/
-   TRC2(cmStrlen)
 
    for (i = 0; *s; i++, s++);
    return (i);