net/enic: replace some PMD macros with standard API

[dpdk.git] / drivers / net / enic / base / cq_desc.h

diff --git a/drivers/net/enic/base/cq_desc.h b/drivers/net/enic/base/cq_desc.h
index f3ef6bb..52e0402 100644 (file)
--- a/drivers/net/enic/base/cq_desc.h
+++ b/drivers/net/enic/base/cq_desc.h
@@ -1,39 +1,11 @@
-/*
- * Copyright 2008-2010 Cisco Systems, Inc.  All rights reserved.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2008-2017 Cisco Systems, Inc.  All rights reserved.
  * Copyright 2007 Nuova Systems, Inc.  All rights reserved.
- *
- * Copyright (c) 2014, Cisco Systems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * 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 _CQ_DESC_H_
 #define _CQ_DESC_H_
+#include <rte_byteorder.h>
 
 /*
  * Completion queue descriptor types
@@ -67,6 +39,7 @@ struct cq_desc {
 #define CQ_DESC_TYPE_MASK        ((1 << CQ_DESC_TYPE_BITS) - 1)
 #define CQ_DESC_COLOR_MASK       1
 #define CQ_DESC_COLOR_SHIFT      7
+#define CQ_DESC_COLOR_MASK_NOSHIFT 0x80
 #define CQ_DESC_Q_NUM_BITS       10
 #define CQ_DESC_Q_NUM_MASK       ((1 << CQ_DESC_Q_NUM_BITS) - 1)
 #define CQ_DESC_COMP_NDX_BITS    12
@@ -86,8 +59,8 @@ static inline void cq_desc_enc(struct cq_desc *desc,
 {
        desc->type_color = (type & CQ_DESC_TYPE_MASK) |
                ((color & CQ_DESC_COLOR_MASK) << CQ_DESC_COLOR_SHIFT);
-       desc->q_number = cpu_to_le16(q_number & CQ_DESC_Q_NUM_MASK);
-       desc->completed_index = cpu_to_le16(completed_index &
+       desc->q_number = rte_cpu_to_le_16(q_number & CQ_DESC_Q_NUM_MASK);
+       desc->completed_index = rte_cpu_to_le_16(completed_index &
                CQ_DESC_COMP_NDX_MASK);
 }
 
@@ -110,8 +83,8 @@ static inline void cq_desc_dec(const struct cq_desc *desc_arg,
        rmb();
 
        *type = type_color & CQ_DESC_TYPE_MASK;
-       *q_number = le16_to_cpu(desc->q_number) & CQ_DESC_Q_NUM_MASK;
-       *completed_index = le16_to_cpu(desc->completed_index) &
+       *q_number = rte_le_to_cpu_16(desc->q_number) & CQ_DESC_Q_NUM_MASK;
+       *completed_index = rte_le_to_cpu_16(desc->completed_index) &
                CQ_DESC_COMP_NDX_MASK;
 }