svn commit: r351322 - in head/sys: contrib/ncsw/Peripherals/FM/HC contrib/ncsw/Peripherals/FM/Pcd contrib/ncsw/Peripherals/QM contrib/ncsw/inc/Peripherals contrib/ncsw/user/env dev/dpaa

[Justin Hibbits]

Author: jhibbits
Date: Wed Aug 21 02:26:22 2019
New Revision: 351322
URL: https://svnweb.freebsd.org/changeset/base/351322

Log:
  dpaa: Fix warnings in dtsec(4) found by clang
  
  These are all trivial warnings that have no real functional change.

Modified:
  head/sys/contrib/ncsw/Peripherals/FM/HC/hc.c
  head/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_cc.c
  head/sys/contrib/ncsw/Peripherals/QM/qm_portal_fqr.c
  head/sys/contrib/ncsw/inc/Peripherals/dpaa_ext.h
  head/sys/contrib/ncsw/user/env/xx.c
  head/sys/dev/dpaa/if_dtsec_rm.c

Modified: head/sys/contrib/ncsw/Peripherals/FM/HC/hc.c
==============================================================================
--- head/sys/contrib/ncsw/Peripherals/FM/HC/hc.c	Wed Aug 21 02:21:40 2019	(r351321)
+++ head/sys/contrib/ncsw/Peripherals/FM/HC/hc.c	Wed Aug 21 02:26:22 2019	(r351322)
@@ -658,7 +658,7 @@ t_Error FmHcPcdKgSetClsPlan(t_Handle h_FmHc, t_FmPcdKg
         p_HcFrame->extraReg = HC_HCOR_KG_SCHEME_REGS_MASK;
 
         idx = (uint8_t)(i - p_Set->baseEntry);
-        memcpy(&p_HcFrame->hcSpecificData.clsPlanEntries, &p_Set->vectors[idx], CLS_PLAN_NUM_PER_GRP*sizeof(uint32_t));
+        memcpy(__DEVOLATILE(uint32_t *, &p_HcFrame->hcSpecificData.clsPlanEntries), &p_Set->vectors[idx], CLS_PLAN_NUM_PER_GRP*sizeof(uint32_t));
         p_HcFrame->commandSequence = seqNum;
 
         BUILD_FD(sizeof(t_HcFrame));

Modified: head/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_cc.c
==============================================================================
--- head/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_cc.c	Wed Aug 21 02:21:40 2019	(r351321)
+++ head/sys/contrib/ncsw/Peripherals/FM/Pcd/fm_cc.c	Wed Aug 21 02:26:22 2019	(r351322)
@@ -895,7 +895,7 @@ static t_Handle BuildNewAd(
 
     XX_Free(p_FmPcdCcNodeTmp);
 
-    return E_OK;
+    return NULL;
 }
 
 static t_Error DynamicChangeHc(

Modified: head/sys/contrib/ncsw/Peripherals/QM/qm_portal_fqr.c
==============================================================================
--- head/sys/contrib/ncsw/Peripherals/QM/qm_portal_fqr.c	Wed Aug 21 02:21:40 2019	(r351321)
+++ head/sys/contrib/ncsw/Peripherals/QM/qm_portal_fqr.c	Wed Aug 21 02:26:22 2019	(r351322)
@@ -1478,7 +1478,6 @@ static t_Error CalcWredCurve(t_QmCgWredCurve *p_WredCu
         }
     sa = sa/pres;
     ASSERT_COND(sa<128 && sa>=64);
-    sn = sn;
     ASSERT_COND(sn<64 && sn>=7);
 
     *p_CurveWord = ((ma << 24) |

Modified: head/sys/contrib/ncsw/inc/Peripherals/dpaa_ext.h
==============================================================================
--- head/sys/contrib/ncsw/inc/Peripherals/dpaa_ext.h	Wed Aug 21 02:21:40 2019	(r351321)
+++ head/sys/contrib/ncsw/inc/Peripherals/dpaa_ext.h	Wed Aug 21 02:26:22 2019	(r351322)
@@ -57,8 +57,12 @@
 
 #include <machine/endian.h>
 
+#ifndef __BYTE_ORDER__
 #define __BYTE_ORDER__ BYTE_ORDER
+#endif
+#ifndef __ORDER_BIG_ENDIAN__
 #define __ORDER_BIG_ENDIAN__	BIG_ENDIAN
+#endif
 
 /**************************************************************************//**
  @Description   Frame descriptor

Modified: head/sys/contrib/ncsw/user/env/xx.c
==============================================================================
--- head/sys/contrib/ncsw/user/env/xx.c	Wed Aug 21 02:21:40 2019	(r351321)
+++ head/sys/contrib/ncsw/user/env/xx.c	Wed Aug 21 02:26:22 2019	(r351322)
@@ -646,7 +646,7 @@ XX_IpcInitSession(char destAddr[XX_IPC_MAX_ADDR_NAME_L
 
 	/* Should not be called */
 	printf("NetCommSW: Unimplemented function %s() called!\n", __func__);
-	return (E_OK);
+	return (NULL);
 }
 
 t_Error

Modified: head/sys/dev/dpaa/if_dtsec_rm.c
==============================================================================
--- head/sys/dev/dpaa/if_dtsec_rm.c	Wed Aug 21 02:21:40 2019	(r351321)
+++ head/sys/dev/dpaa/if_dtsec_rm.c	Wed Aug 21 02:26:22 2019	(r351322)
@@ -86,10 +86,10 @@ enum dtsec_rm_pool_params {
 	DTSEC_RM_POOL_FI_MAX_SIZE	= 256,
 };
 
+#define	DTSEC_RM_FQR_RX_CHANNEL		e_QM_FQ_CHANNEL_POOL1
+#define	DTSEC_RM_FQR_TX_CONF_CHANNEL	e_QM_FQ_CHANNEL_SWPORTAL0
 enum dtsec_rm_fqr_params {
-	DTSEC_RM_FQR_RX_CHANNEL		= e_QM_FQ_CHANNEL_POOL1,
 	DTSEC_RM_FQR_RX_WQ		= 1,
-	DTSEC_RM_FQR_TX_CONF_CHANNEL	= e_QM_FQ_CHANNEL_SWPORTAL0,
 	DTSEC_RM_FQR_TX_WQ		= 1,
 	DTSEC_RM_FQR_TX_CONF_WQ		= 1
 };