Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci/ixgbe Change tabs and spaces to make difference ...



details:   https://anonhg.NetBSD.org/src/rev/5ba4eb9f9484
branches:  trunk
changeset: 336287:5ba4eb9f9484
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Tue Feb 24 13:38:53 2015 +0000

description:
Change tabs and spaces to make difference among *BSDs small. No binary change.

diffstat:

 sys/dev/pci/ixgbe/ixgbe_type.h |  3807 ++++++++++++++++++++-------------------
 1 files changed, 1907 insertions(+), 1900 deletions(-)

diffs (truncated from 4368 to 300 lines):

diff -r 71f453d6b80e -r 5ba4eb9f9484 sys/dev/pci/ixgbe/ixgbe_type.h
--- a/sys/dev/pci/ixgbe/ixgbe_type.h    Tue Feb 24 13:17:27 2015 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_type.h    Tue Feb 24 13:38:53 2015 +0000
@@ -31,7 +31,7 @@
 
 ******************************************************************************/
 /*$FreeBSD: src/sys/dev/ixgbe/ixgbe_type.h,v 1.12 2011/01/19 19:36:27 jfv Exp $*/
-/*$NetBSD: ixgbe_type.h,v 1.2 2014/04/08 19:39:06 christos Exp $*/
+/*$NetBSD: ixgbe_type.h,v 1.3 2015/02/24 13:38:53 msaitoh Exp $*/
 
 #ifndef _IXGBE_TYPE_H_
 #define _IXGBE_TYPE_H_
@@ -46,1996 +46,2003 @@
 
 
 /* Vendor ID */
-#define IXGBE_INTEL_VENDOR_ID   0x8086
+#define IXGBE_INTEL_VENDOR_ID                  0x8086
 
 /* Device IDs */
-#define IXGBE_DEV_ID_82598               0x10B6
-#define IXGBE_DEV_ID_82598_BX            0x1508
-#define IXGBE_DEV_ID_82598AF_DUAL_PORT   0x10C6
-#define IXGBE_DEV_ID_82598AF_SINGLE_PORT 0x10C7
-#define IXGBE_DEV_ID_82598AT             0x10C8
-#define IXGBE_DEV_ID_82598AT2            0x150B
-#define IXGBE_DEV_ID_82598EB_SFP_LOM     0x10DB
-#define IXGBE_DEV_ID_82598EB_CX4         0x10DD
-#define IXGBE_DEV_ID_82598_CX4_DUAL_PORT 0x10EC
-#define IXGBE_DEV_ID_82598_DA_DUAL_PORT  0x10F1
-#define IXGBE_DEV_ID_82598_SR_DUAL_PORT_EM      0x10E1
-#define IXGBE_DEV_ID_82598EB_XF_LR       0x10F4
-#define IXGBE_DEV_ID_82599_KX4         PCI_PRODUCT_INTEL_82599_KX4
-#define IXGBE_DEV_ID_82599_KX4_MEZZ      0x1514
+#define IXGBE_DEV_ID_82598                     0x10B6
+#define IXGBE_DEV_ID_82598_BX                  0x1508
+#define IXGBE_DEV_ID_82598AF_DUAL_PORT         0x10C6
+#define IXGBE_DEV_ID_82598AF_SINGLE_PORT       0x10C7
+#define IXGBE_DEV_ID_82598AT                   0x10C8
+#define IXGBE_DEV_ID_82598AT2                  0x150B
+#define IXGBE_DEV_ID_82598EB_SFP_LOM           0x10DB
+#define IXGBE_DEV_ID_82598EB_CX4               0x10DD
+#define IXGBE_DEV_ID_82598_CX4_DUAL_PORT       0x10EC
+#define IXGBE_DEV_ID_82598_DA_DUAL_PORT                0x10F1
+#define IXGBE_DEV_ID_82598_SR_DUAL_PORT_EM     0x10E1
+#define IXGBE_DEV_ID_82598EB_XF_LR             0x10F4
+#define IXGBE_DEV_ID_82599_KX4                 PCI_PRODUCT_INTEL_82599_KX4
+#define IXGBE_DEV_ID_82599_KX4_MEZZ            0x1514
 #define IXGBE_DEV_ID_82599_COMBO_BACKPLANE     PCI_PRODUCT_INTEL_82599_COMBO_BACKPLANE
-#define IXGBE_SUBDEV_ID_82599_KX4_KR_MEZZ       0x000C
-#define IXGBE_DEV_ID_82599_CX4 PCI_PRODUCT_INTEL_82599_CX4
-#define IXGBE_DEV_ID_82599_SFP PCI_PRODUCT_INTEL_82599_SFP
-#define IXGBE_SUBDEV_ID_82599_SFP        0x11A9
-#define IXGBE_DEV_ID_82599_BACKPLANE_FCOE       0x152A
-#define IXGBE_DEV_ID_82599_SFP_FCOE      0x1529
-#define IXGBE_DEV_ID_82599_XAUI_LOM    PCI_PRODUCT_INTEL_82599_XAUI_LOM
-#define IXGBE_DEV_ID_82599_T3_LOM        0x151C
-#define IXGBE_DEV_ID_82599_VF   0x10ED
-#define IXGBE_DEV_ID_82599_SFP_DELL    0x154d
+#define IXGBE_SUBDEV_ID_82599_KX4_KR_MEZZ      0x000C
+#define IXGBE_DEV_ID_82599_CX4                 PCI_PRODUCT_INTEL_82599_CX4
+#define IXGBE_DEV_ID_82599_SFP                 PCI_PRODUCT_INTEL_82599_SFP
+#define IXGBE_SUBDEV_ID_82599_SFP              0x11A9
+#define IXGBE_DEV_ID_82599_BACKPLANE_FCOE      0x152A
+#define IXGBE_DEV_ID_82599_SFP_FCOE            0x1529
+#define IXGBE_DEV_ID_82599_XAUI_LOM            PCI_PRODUCT_INTEL_82599_XAUI_LOM
+#define IXGBE_DEV_ID_82599_T3_LOM              0x151C
+#define IXGBE_DEV_ID_82599_VF                  0x10ED
+#define IXGBE_DEV_ID_82599_SFP_DELL            0x154d
 
 /* General Registers */
-#define IXGBE_CTRL      0x00000
-#define IXGBE_STATUS    0x00008
-#define IXGBE_CTRL_EXT  0x00018
-#define IXGBE_ESDP      0x00020
-#define IXGBE_EODSDP    0x00028
-#define IXGBE_I2CCTL    0x00028
-#define IXGBE_LEDCTL    0x00200
-#define IXGBE_FRTIMER   0x00048
-#define IXGBE_TCPTIMER  0x0004C
-#define IXGBE_CORESPARE 0x00600
-#define IXGBE_EXVET     0x05078
+#define IXGBE_CTRL             0x00000
+#define IXGBE_STATUS           0x00008
+#define IXGBE_CTRL_EXT         0x00018
+#define IXGBE_ESDP             0x00020
+#define IXGBE_EODSDP           0x00028
+#define IXGBE_I2CCTL           0x00028
+#define IXGBE_LEDCTL           0x00200
+#define IXGBE_FRTIMER          0x00048
+#define IXGBE_TCPTIMER         0x0004C
+#define IXGBE_CORESPARE                0x00600
+#define IXGBE_EXVET            0x05078
 
 /* NVM Registers */
-#define IXGBE_EEC       0x10010
-#define IXGBE_EERD      0x10014
-#define IXGBE_EEWR      0x10018
-#define IXGBE_FLA       0x1001C
-#define IXGBE_EEMNGCTL  0x10110
-#define IXGBE_EEMNGDATA 0x10114
-#define IXGBE_FLMNGCTL  0x10118
-#define IXGBE_FLMNGDATA 0x1011C
-#define IXGBE_FLMNGCNT  0x10120
-#define IXGBE_FLOP      0x1013C
-#define IXGBE_GRC       0x10200
+#define IXGBE_EEC      0x10010
+#define IXGBE_EERD     0x10014
+#define IXGBE_EEWR     0x10018
+#define IXGBE_FLA      0x1001C
+#define IXGBE_EEMNGCTL 0x10110
+#define IXGBE_EEMNGDATA        0x10114
+#define IXGBE_FLMNGCTL 0x10118
+#define IXGBE_FLMNGDATA        0x1011C
+#define IXGBE_FLMNGCNT 0x10120
+#define IXGBE_FLOP     0x1013C
+#define IXGBE_GRC      0x10200
 
 /* General Receive Control */
-#define IXGBE_GRC_MNG   0x00000001 /* Manageability Enable */
-#define IXGBE_GRC_APME  0x00000002 /* APM enabled in EEPROM */
+#define IXGBE_GRC_MNG  0x00000001 /* Manageability Enable */
+#define IXGBE_GRC_APME 0x00000002 /* APM enabled in EEPROM */
 
-#define IXGBE_VPDDIAG0  0x10204
-#define IXGBE_VPDDIAG1  0x10208
+#define IXGBE_VPDDIAG0 0x10204
+#define IXGBE_VPDDIAG1 0x10208
 
 /* I2CCTL Bit Masks */
-#define IXGBE_I2C_CLK_IN        0x00000001
-#define IXGBE_I2C_CLK_OUT       0x00000002
-#define IXGBE_I2C_DATA_IN       0x00000004
-#define IXGBE_I2C_DATA_OUT      0x00000008
+#define IXGBE_I2C_CLK_IN       0x00000001
+#define IXGBE_I2C_CLK_OUT      0x00000002
+#define IXGBE_I2C_DATA_IN      0x00000004
+#define IXGBE_I2C_DATA_OUT     0x00000008
 
 /* Interrupt Registers */
-#define IXGBE_EICR      0x00800
-#define IXGBE_EICS      0x00808
-#define IXGBE_EIMS      0x00880
-#define IXGBE_EIMC      0x00888
-#define IXGBE_EIAC      0x00810
-#define IXGBE_EIAM      0x00890
-#define IXGBE_EICS_EX(_i)       (0x00A90 + (_i) * 4)
-#define IXGBE_EIMS_EX(_i)       (0x00AA0 + (_i) * 4)
-#define IXGBE_EIMC_EX(_i)       (0x00AB0 + (_i) * 4)
-#define IXGBE_EIAM_EX(_i)       (0x00AD0 + (_i) * 4)
+#define IXGBE_EICR             0x00800
+#define IXGBE_EICS             0x00808
+#define IXGBE_EIMS             0x00880
+#define IXGBE_EIMC             0x00888
+#define IXGBE_EIAC             0x00810
+#define IXGBE_EIAM             0x00890
+#define IXGBE_EICS_EX(_i)      (0x00A90 + (_i) * 4)
+#define IXGBE_EIMS_EX(_i)      (0x00AA0 + (_i) * 4)
+#define IXGBE_EIMC_EX(_i)      (0x00AB0 + (_i) * 4)
+#define IXGBE_EIAM_EX(_i)      (0x00AD0 + (_i) * 4)
 /* 82599 EITR is only 12 bits, with the lower 3 always zero */
 /*
  * 82598 EITR is 16 bits but set the limits based on the max
  * supported by all ixgbe hardware
  */
-#define IXGBE_MAX_INT_RATE      488281
-#define IXGBE_MIN_INT_RATE      956
-#define IXGBE_MAX_EITR          0x00000FF8
-#define IXGBE_MIN_EITR          8
-#define IXGBE_EITR(_i)  (((_i) <= 23) ? (0x00820 + ((_i) * 4)) : \
-                         (0x012300 + (((_i) - 24) * 4)))
-#define IXGBE_EITR_ITR_INT_MASK 0x00000FF8
-#define IXGBE_EITR_LLI_MOD      0x00008000
-#define IXGBE_EITR_CNT_WDIS     0x80000000
-#define IXGBE_IVAR(_i)  (0x00900 + ((_i) * 4)) /* 24 at 0x900-0x960 */
-#define IXGBE_IVAR_MISC 0x00A00 /* misc MSI-X interrupt causes */
-#define IXGBE_EITRSEL   0x00894
-#define IXGBE_MSIXT     0x00000 /* MSI-X Table. 0x0000 - 0x01C */
-#define IXGBE_MSIXPBA   0x02000 /* MSI-X Pending bit array */
-#define IXGBE_PBACL(_i) (((_i) == 0) ? (0x11068) : (0x110C0 + ((_i) * 4)))
-#define IXGBE_GPIE      0x00898
+#define IXGBE_MAX_INT_RATE     488281
+#define IXGBE_MIN_INT_RATE     956
+#define IXGBE_MAX_EITR         0x00000FF8
+#define IXGBE_MIN_EITR         8
+#define IXGBE_EITR(_i)         (((_i) <= 23) ? (0x00820 + ((_i) * 4)) : \
+                                (0x012300 + (((_i) - 24) * 4)))
+#define IXGBE_EITR_ITR_INT_MASK        0x00000FF8
+#define IXGBE_EITR_LLI_MOD     0x00008000
+#define IXGBE_EITR_CNT_WDIS    0x80000000
+#define IXGBE_IVAR(_i)         (0x00900 + ((_i) * 4)) /* 24 at 0x900-0x960 */
+#define IXGBE_IVAR_MISC                0x00A00 /* misc MSI-X interrupt causes */
+#define IXGBE_EITRSEL          0x00894
+#define IXGBE_MSIXT            0x00000 /* MSI-X Table. 0x0000 - 0x01C */
+#define IXGBE_MSIXPBA          0x02000 /* MSI-X Pending bit array */
+#define IXGBE_PBACL(_i)        (((_i) == 0) ? (0x11068) : (0x110C0 + ((_i) * 4)))
+#define IXGBE_GPIE             0x00898
 
 /* Flow Control Registers */
-#define IXGBE_FCADBUL   0x03210
-#define IXGBE_FCADBUH   0x03214
-#define IXGBE_FCAMACL   0x04328
-#define IXGBE_FCAMACH   0x0432C
-#define IXGBE_FCRTH_82599(_i) (0x03260 + ((_i) * 4)) /* 8 of these (0-7) */
-#define IXGBE_FCRTL_82599(_i) (0x03220 + ((_i) * 4)) /* 8 of these (0-7) */
-#define IXGBE_PFCTOP    0x03008
-#define IXGBE_FCTTV(_i) (0x03200 + ((_i) * 4)) /* 4 of these (0-3) */
-#define IXGBE_FCRTL(_i) (0x03220 + ((_i) * 8)) /* 8 of these (0-7) */
-#define IXGBE_FCRTH(_i) (0x03260 + ((_i) * 8)) /* 8 of these (0-7) */
-#define IXGBE_FCRTV     0x032A0
-#define IXGBE_FCCFG     0x03D00
-#define IXGBE_TFCS      0x0CE00
+#define IXGBE_FCADBUL          0x03210
+#define IXGBE_FCADBUH          0x03214
+#define IXGBE_FCAMACL          0x04328
+#define IXGBE_FCAMACH          0x0432C
+#define IXGBE_FCRTH_82599(_i)  (0x03260 + ((_i) * 4)) /* 8 of these (0-7) */
+#define IXGBE_FCRTL_82599(_i)  (0x03220 + ((_i) * 4)) /* 8 of these (0-7) */
+#define IXGBE_PFCTOP           0x03008
+#define IXGBE_FCTTV(_i)                (0x03200 + ((_i) * 4)) /* 4 of these (0-3) */
+#define IXGBE_FCRTL(_i)                (0x03220 + ((_i) * 8)) /* 8 of these (0-7) */
+#define IXGBE_FCRTH(_i)                (0x03260 + ((_i) * 8)) /* 8 of these (0-7) */
+#define IXGBE_FCRTV            0x032A0
+#define IXGBE_FCCFG            0x03D00
+#define IXGBE_TFCS             0x0CE00
 
 /* Receive DMA Registers */
-#define IXGBE_RDBAL(_i) (((_i) < 64) ? (0x01000 + ((_i) * 0x40)) : \
-                         (0x0D000 + ((_i - 64) * 0x40)))
-#define IXGBE_RDBAH(_i) (((_i) < 64) ? (0x01004 + ((_i) * 0x40)) : \
-                         (0x0D004 + ((_i - 64) * 0x40)))
-#define IXGBE_RDLEN(_i) (((_i) < 64) ? (0x01008 + ((_i) * 0x40)) : \
-                         (0x0D008 + ((_i - 64) * 0x40)))
-#define IXGBE_RDH(_i)   (((_i) < 64) ? (0x01010 + ((_i) * 0x40)) : \
-                         (0x0D010 + ((_i - 64) * 0x40)))
-#define IXGBE_RDT(_i)   (((_i) < 64) ? (0x01018 + ((_i) * 0x40)) : \
-                         (0x0D018 + ((_i - 64) * 0x40)))
-#define IXGBE_RXDCTL(_i) (((_i) < 64) ? (0x01028 + ((_i) * 0x40)) : \
-                          (0x0D028 + ((_i - 64) * 0x40)))
-#define IXGBE_RSCCTL(_i) (((_i) < 64) ? (0x0102C + ((_i) * 0x40)) : \
-                          (0x0D02C + ((_i - 64) * 0x40)))
-#define IXGBE_RSCDBU     0x03028
-#define IXGBE_RDDCC      0x02F20
-#define IXGBE_RXMEMWRAP  0x03190
-#define IXGBE_STARCTRL   0x03024
+#define IXGBE_RDBAL(_i)        (((_i) < 64) ? (0x01000 + ((_i) * 0x40)) : \
+                        (0x0D000 + ((_i - 64) * 0x40)))
+#define IXGBE_RDBAH(_i)        (((_i) < 64) ? (0x01004 + ((_i) * 0x40)) : \
+                        (0x0D004 + ((_i - 64) * 0x40)))
+#define IXGBE_RDLEN(_i)        (((_i) < 64) ? (0x01008 + ((_i) * 0x40)) : \
+                        (0x0D008 + ((_i - 64) * 0x40)))
+#define IXGBE_RDH(_i)  (((_i) < 64) ? (0x01010 + ((_i) * 0x40)) : \
+                        (0x0D010 + ((_i - 64) * 0x40)))
+#define IXGBE_RDT(_i)  (((_i) < 64) ? (0x01018 + ((_i) * 0x40)) : \
+                        (0x0D018 + ((_i - 64) * 0x40)))
+#define IXGBE_RXDCTL(_i)       (((_i) < 64) ? (0x01028 + ((_i) * 0x40)) : \
+                                (0x0D028 + ((_i - 64) * 0x40)))
+#define IXGBE_RSCCTL(_i)       (((_i) < 64) ? (0x0102C + ((_i) * 0x40)) : \
+                                (0x0D02C + ((_i - 64) * 0x40)))
+#define IXGBE_RSCDBU   0x03028
+#define IXGBE_RDDCC    0x02F20
+#define IXGBE_RXMEMWRAP        0x03190
+#define IXGBE_STARCTRL 0x03024
 /*
  * Split and Replication Receive Control Registers
  * 00-15 : 0x02100 + n*4
  * 16-64 : 0x01014 + n*0x40
  * 64-127: 0x0D014 + (n-64)*0x40
  */
-#define IXGBE_SRRCTL(_i) (((_i) <= 15) ? (0x02100 + ((_i) * 4)) : \
-                          (((_i) < 64) ? (0x01014 + ((_i) * 0x40)) : \
-                          (0x0D014 + ((_i - 64) * 0x40))))
+#define IXGBE_SRRCTL(_i)       (((_i) <= 15) ? (0x02100 + ((_i) * 4)) : \
+                                (((_i) < 64) ? (0x01014 + ((_i) * 0x40)) : \
+                                (0x0D014 + ((_i - 64) * 0x40))))
 /*
  * Rx DCA Control Register:
  * 00-15 : 0x02200 + n*4
  * 16-64 : 0x0100C + n*0x40
  * 64-127: 0x0D00C + (n-64)*0x40
  */
-#define IXGBE_DCA_RXCTRL(_i)    (((_i) <= 15) ? (0x02200 + ((_i) * 4)) : \
-                                 (((_i) < 64) ? (0x0100C + ((_i) * 0x40)) : \
-                                 (0x0D00C + ((_i - 64) * 0x40))))
-#define IXGBE_RDRXCTL           0x02F00
-#define IXGBE_RDRXCTL_RSC_PUSH  0x80
-#define IXGBE_RXPBSIZE(_i)      (0x03C00 + ((_i) * 4))
-                                             /* 8 of these 0x03C00 - 0x03C1C */
-#define IXGBE_RXCTRL    0x03000
-#define IXGBE_DROPEN    0x03D04
-#define IXGBE_RXPBSIZE_SHIFT 10
+#define IXGBE_DCA_RXCTRL(_i)   (((_i) <= 15) ? (0x02200 + ((_i) * 4)) : \
+                                (((_i) < 64) ? (0x0100C + ((_i) * 0x40)) : \
+                                (0x0D00C + ((_i - 64) * 0x40))))
+#define IXGBE_RDRXCTL          0x02F00
+#define IXGBE_RDRXCTL_RSC_PUSH 0x80
+/* 8 of these 0x03C00 - 0x03C1C */
+#define IXGBE_RXPBSIZE(_i)     (0x03C00 + ((_i) * 4))
+#define IXGBE_RXCTRL           0x03000
+#define IXGBE_DROPEN           0x03D04



Home | Main Index | Thread Index | Old Index