From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Sujith Sankar (ssujith)" Subject: Re: [PATCH] enicpmd: replace the type u_int* with uint* to remove compilation errors on a few platforms Date: Fri, 28 Nov 2014 09:24:26 +0000 Message-ID: References: <1417158120-29434-1-git-send-email-ssujith@cisco.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Cc: "dev-VfR2kkLFssw@public.gmane.org" To: David Marchand Return-path: In-Reply-To: Content-Language: en-US List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces-VfR2kkLFssw@public.gmane.org Sender: "dev" Hi David, The u8, u16, etc are there because enicpmd shares a lot of code with kernel= mode driver and these are used at a lot of places. I agree with you on bringing in consistency. Let me change ioread16 with u= int16 and upload a new patch. Hope this is ok with you. Thanks, -Sujith From: David Marchand > Date: Friday, 28 November 2014 2:18 pm To: "Sujith Sankar (ssujith)" > Cc: "dev-VfR2kkLFssw@public.gmane.org" > Subject: Re: [dpdk-dev] [PATCH] enicpmd: replace the type u_int* with uint*= to remove compilation errors on a few platforms Hello Sujith, Why keep those u8, u16, u32 etc... ? Especially, you can see in this patch that the ioread16 uses u16, while ior= ead8, ioread32 uses uint*. I like consistency and "standard" types (unless there is a reason why we us= e different types). Anyway, this patch builds fine on ppc. -- David Marchand On Fri, Nov 28, 2014 at 8:02 AM, Sujith Sankar > wrote: ENIC PMD was giving compilation errors on ppc_64-power8-linuxapp-gcc becaus= e of types such as u_int32_t. This patch replaces all those with uint32_t an= d similar ones. Reported-by: David Marchand > Signed-off-by: Sujith Sankar > --- lib/librte_pmd_enic/enic.h | 2 +- lib/librte_pmd_enic/enic_compat.h | 16 ++++++++-------- lib/librte_pmd_enic/enic_main.c | 18 +++++++++--------- lib/librte_pmd_enic/vnic/vnic_devcmd.h | 6 +++--- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/lib/librte_pmd_enic/enic.h b/lib/librte_pmd_enic/enic.h index 9f80fc0..6400d24 100644 --- a/lib/librte_pmd_enic/enic.h +++ b/lib/librte_pmd_enic/enic.h @@ -106,7 +106,7 @@ struct enic { int iommu_group_fd; int iommu_groupid; int eventfd; - u_int8_t mac_addr[ETH_ALEN]; + uint8_t mac_addr[ETH_ALEN]; pthread_t err_intr_thread; int promisc; int allmulti; diff --git a/lib/librte_pmd_enic/enic_compat.h b/lib/librte_pmd_enic/enic_c= ompat.h index d22578e..7c62bf2 100644 --- a/lib/librte_pmd_enic/enic_compat.h +++ b/lib/librte_pmd_enic/enic_compat.h @@ -89,9 +89,9 @@ typedef unsigned int u32; typedef unsigned long long u64; typedef unsigned long long dma_addr_t; -static inline u_int32_t ioread32(volatile void *addr) +static inline uint32_t ioread32(volatile void *addr) { - return *(volatile u_int32_t *)addr; + return *(volatile uint32_t *)addr; } static inline u16 ioread16(volatile void *addr) @@ -99,14 +99,14 @@ static inline u16 ioread16(volatile void *addr) return *(volatile u16 *)addr; } -static inline u_int8_t ioread8(volatile void *addr) +static inline uint8_t ioread8(volatile void *addr) { - return *(volatile u_int8_t *)addr; + return *(volatile uint8_t *)addr; } -static inline void iowrite32(u_int32_t val, volatile void *addr) +static inline void iowrite32(uint32_t val, volatile void *addr) { - *(volatile u_int32_t *)addr =3D val; + *(volatile uint32_t *)addr =3D val; } static inline void iowrite16(u16 val, volatile void *addr) @@ -114,9 +114,9 @@ static inline void iowrite16(u16 val, volatile void *ad= dr) *(volatile u16 *)addr =3D val; } -static inline void iowrite8(u_int8_t val, volatile void *addr) +static inline void iowrite8(uint8_t val, volatile void *addr) { - *(volatile u_int8_t *)addr =3D val; + *(volatile uint8_t *)addr =3D val; } static inline unsigned int readl(volatile void __iomem *addr) diff --git a/lib/librte_pmd_enic/enic_main.c b/lib/librte_pmd_enic/enic_mai= n.c index f6f00d3..853dd04 100644 --- a/lib/librte_pmd_enic/enic_main.c +++ b/lib/librte_pmd_enic/enic_main.c @@ -172,17 +172,17 @@ unsigned int enic_cleanup_wq(struct enic *enic, struc= t vnic_wq *wq) int enic_send_pkt(struct enic *enic, struct vnic_wq *wq, struct rte_mbuf *tx_pkt, unsigned short len, - u_int8_t sop, u_int8_t eop, - u_int16_t ol_flags, u_int16_t vlan_tag) + uint8_t sop, uint8_t eop, + uint16_t ol_flags, uint16_t vlan_tag) { struct wq_enet_desc *desc =3D vnic_wq_next_desc(wq); - u_int16_t mss =3D 0; - u_int16_t header_length =3D 0; - u_int8_t cq_entry =3D eop; - u_int8_t vlan_tag_insert =3D 0; + uint16_t mss =3D 0; + uint16_t header_length =3D 0; + uint8_t cq_entry =3D eop; + uint8_t vlan_tag_insert =3D 0; unsigned char *buf =3D (unsigned char *)(tx_pkt->buf_addr) + RTE_PKTMBUF_HEADROOM; - u_int64_t bus_addr =3D (dma_addr_t) + uint64_t bus_addr =3D (dma_addr_t) (tx_pkt->buf_physaddr + RTE_PKTMBUF_HEADROOM); if (sop) { @@ -342,8 +342,8 @@ static int enic_rq_alloc_buf(struct vnic_rq *rq) void *buf; dma_addr_t dma_addr; struct rq_enet_desc *desc =3D vnic_rq_next_desc(rq); - u_int8_t type =3D RQ_ENET_TYPE_ONLY_SOP; - u_int16_t len =3D ENIC_MAX_MTU + VLAN_ETH_HLEN; + uint8_t type =3D RQ_ENET_TYPE_ONLY_SOP; + uint16_t len =3D ENIC_MAX_MTU + VLAN_ETH_HLEN; u16 split_hdr_size =3D vnic_get_hdr_split_size(enic->vdev); struct rte_mbuf *mbuf =3D enic_rxmbuf_alloc(rq->mp); struct rte_mbuf *hdr_mbuf =3D NULL; diff --git a/lib/librte_pmd_enic/vnic/vnic_devcmd.h b/lib/librte_pmd_enic/v= nic/vnic_devcmd.h index b4c87c1..e7ecf31 100644 --- a/lib/librte_pmd_enic/vnic/vnic_devcmd.h +++ b/lib/librte_pmd_enic/vnic/vnic_devcmd.h @@ -691,9 +691,9 @@ enum { #define FILTER_MAX_BUF_SIZE 100 /* Maximum size of buffer to CMD_ADD_FILT= ER */ struct filter_tlv { - u_int32_t type; - u_int32_t length; - u_int32_t val[0]; + uint32_t type; + uint32_t length; + uint32_t val[0]; }; enum { -- 1.9.1