X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_pmd_e1000%2Fe1000%2Fe1000_osdep.h;h=d04ec732f6e478c15e1025bf885151edf1760dbc;hb=66e1591687ac;hp=f1301f7f0a02934c58108b92a670cea5518d891e;hpb=38db3f7f50bde45477f564783a06ac8fbd3348fa;p=dpdk.git diff --git a/lib/librte_pmd_e1000/e1000/e1000_osdep.h b/lib/librte_pmd_e1000/e1000/e1000_osdep.h index f1301f7f0a..d04ec732f6 100644 --- a/lib/librte_pmd_e1000/e1000/e1000_osdep.h +++ b/lib/librte_pmd_e1000/e1000/e1000_osdep.h @@ -1,6 +1,6 @@ /****************************************************************************** - Copyright (c) 2001-2011, Intel Corporation + Copyright (c) 2001-2014, Intel Corporation All rights reserved. Redistribution and use in source and binary forms, with or without @@ -43,6 +43,7 @@ #include #include #include +#include #include "../e1000_logs.h" @@ -52,8 +53,8 @@ #define msec_delay(x) DELAY(1000*(x)) #define msec_delay_irq(x) DELAY(1000*(x)) -#define DEBUGFUNC(F) DEBUGOUT(F); -#define DEBUGOUT(S, args...) PMD_DRV_LOG(DEBUG, S, ##args) +#define DEBUGFUNC(F) DEBUGOUT(F "\n"); +#define DEBUGOUT(S, args...) PMD_DRV_LOG_RAW(DEBUG, S, ##args) #define DEBUGOUT1(S, args...) DEBUGOUT(S, ##args) #define DEBUGOUT2(S, args...) DEBUGOUT(S, ##args) #define DEBUGOUT3(S, args...) DEBUGOUT(S, ##args) @@ -96,7 +97,7 @@ typedef int bool; #define E1000_PCI_REG(reg) (*((volatile uint32_t *)(reg))) #define E1000_PCI_REG_WRITE(reg, value) do { \ - E1000_PCI_REG((reg)) = (value); \ + E1000_PCI_REG((reg)) = (rte_cpu_to_le_32(value)); \ } while (0) #define E1000_PCI_REG_ADDR(hw, reg) \ @@ -107,7 +108,7 @@ typedef int bool; static inline uint32_t e1000_read_addr(volatile void* addr) { - return E1000_PCI_REG(addr); + return rte_le_to_cpu_32(E1000_PCI_REG(addr)); } /* Necessary defines */