Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/pci u_int*_t -> unit*_t. No funcitonal change.



details:   https://anonhg.NetBSD.org/src/rev/f0df49b50a23
branches:  trunk
changeset: 1007962:f0df49b50a23
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Mar 05 16:05:45 2020 +0000

description:
u_int*_t -> unit*_t. No funcitonal change.

diffstat:

 sys/dev/pci/if_tireg.h |  402 ++++++++++++++++++++++++------------------------
 1 files changed, 201 insertions(+), 201 deletions(-)

diffs (truncated from 606 to 300 lines):

diff -r fbda0b55a3b9 -r f0df49b50a23 sys/dev/pci/if_tireg.h
--- a/sys/dev/pci/if_tireg.h    Thu Mar 05 16:05:05 2020 +0000
+++ b/sys/dev/pci/if_tireg.h    Thu Mar 05 16:05:45 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tireg.h,v 1.27 2020/03/05 15:56:20 msaitoh Exp $ */
+/* $NetBSD: if_tireg.h,v 1.28 2020/03/05 16:05:45 msaitoh Exp $ */
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -374,8 +374,8 @@
 #define TI_MEM_MAX             0x7FFFFF
 
 typedef struct {
-       u_int32_t               ti_addr_hi;
-       u_int32_t               ti_addr_lo;
+       uint32_t        ti_addr_hi;
+       uint32_t        ti_addr_lo;
 } ti_hostaddr;
 
 /*
@@ -401,13 +401,13 @@
 struct ti_rcb {
        ti_hostaddr             ti_hostaddr;
 #if BYTE_ORDER == BIG_ENDIAN
-       u_int16_t               ti_max_len;
-       u_int16_t               ti_flags;
+       uint16_t                ti_max_len;
+       uint16_t                ti_flags;
 #else
-       u_int16_t               ti_flags;
-       u_int16_t               ti_max_len;
+       uint16_t                ti_flags;
+       uint16_t                ti_max_len;
 #endif
-       u_int32_t               ti_unused;
+       uint32_t                ti_unused;
 };
 
 #define TI_RCB_FLAG_TCP_UDP_CKSUM      0x00000001
@@ -421,8 +421,8 @@
 #define TI_RCB_FLAG_RING_DISABLED      0x00000200
 
 struct ti_producer {
-       u_int32_t               ti_idx;
-       u_int32_t               ti_unused;
+       uint32_t                ti_idx;
+       uint32_t                ti_unused;
 };
 
 /*
@@ -432,45 +432,45 @@
        /*
         * MAC stats, taken from RFC 1643, ethernet-like MIB
         */
-       volatile u_int32_t dot3StatsAlignmentErrors;            /* 0 */
-       volatile u_int32_t dot3StatsFCSErrors;                  /* 1 */
-       volatile u_int32_t dot3StatsSingleCollisionFrames;      /* 2 */
-       volatile u_int32_t dot3StatsMultipleCollisionFrames;    /* 3 */
-       volatile u_int32_t dot3StatsSQETestErrors;              /* 4 */
-       volatile u_int32_t dot3StatsDeferredTransmissions;      /* 5 */
-       volatile u_int32_t dot3StatsLateCollisions;             /* 6 */
-       volatile u_int32_t dot3StatsExcessiveCollisions;        /* 7 */
-       volatile u_int32_t dot3StatsInternalMacTransmitErrors;  /* 8 */
-       volatile u_int32_t dot3StatsCarrierSenseErrors;         /* 9 */
-       volatile u_int32_t dot3StatsFrameTooLongs;              /* 10 */
-       volatile u_int32_t dot3StatsInternalMacReceiveErrors;   /* 11 */
+       volatile uint32_t dot3StatsAlignmentErrors;             /* 0 */
+       volatile uint32_t dot3StatsFCSErrors;                   /* 1 */
+       volatile uint32_t dot3StatsSingleCollisionFrames;       /* 2 */
+       volatile uint32_t dot3StatsMultipleCollisionFrames;     /* 3 */
+       volatile uint32_t dot3StatsSQETestErrors;               /* 4 */
+       volatile uint32_t dot3StatsDeferredTransmissions;       /* 5 */
+       volatile uint32_t dot3StatsLateCollisions;              /* 6 */
+       volatile uint32_t dot3StatsExcessiveCollisions; /* 7 */
+       volatile uint32_t dot3StatsInternalMacTransmitErrors;   /* 8 */
+       volatile uint32_t dot3StatsCarrierSenseErrors;          /* 9 */
+       volatile uint32_t dot3StatsFrameTooLongs;               /* 10 */
+       volatile uint32_t dot3StatsInternalMacReceiveErrors;    /* 11 */
        /*
         * interface stats, taken from RFC 1213, MIB-II, interfaces group
         */
-       volatile u_int32_t ifIndex;                             /* 12 */
-       volatile u_int32_t ifType;                              /* 13 */
-       volatile u_int32_t ifMtu;                               /* 14 */
-       volatile u_int32_t ifSpeed;                             /* 15 */
-       volatile u_int32_t ifAdminStatus;                       /* 16 */
+       volatile uint32_t ifIndex;                              /* 12 */
+       volatile uint32_t ifType;                               /* 13 */
+       volatile uint32_t ifMtu;                                /* 14 */
+       volatile uint32_t ifSpeed;                              /* 15 */
+       volatile uint32_t ifAdminStatus;                        /* 16 */
 #define IF_ADMIN_STATUS_UP      1
 #define IF_ADMIN_STATUS_DOWN    2
 #define IF_ADMIN_STATUS_TESTING 3
-       volatile u_int32_t ifOperStatus;                        /* 17 */
+       volatile uint32_t ifOperStatus;                 /* 17 */
 #define IF_OPER_STATUS_UP       1
 #define IF_OPER_STATUS_DOWN     2
 #define IF_OPER_STATUS_TESTING  3
 #define IF_OPER_STATUS_UNKNOWN  4
 #define IF_OPER_STATUS_DORMANT  5
-       volatile u_int32_t ifLastChange;                        /* 18 */
-       volatile u_int32_t ifInDiscards;                        /* 19 */
-       volatile u_int32_t ifInErrors;                          /* 20 */
-       volatile u_int32_t ifInUnknownProtos;                   /* 21 */
-       volatile u_int32_t ifOutDiscards;                       /* 22 */
-       volatile u_int32_t ifOutErrors;                         /* 23 */
-       volatile u_int32_t ifOutQLen;     /* deprecated */      /* 24 */
-       volatile u_int8_t  ifPhysAddress[8]; /* 8 bytes */      /* 25 - 26 */
-       volatile u_int8_t  ifDescr[32];                         /* 27 - 34 */
-       u_int32_t alignIt;      /* align to 64 bit for u_int64_ts following */
+       volatile uint32_t ifLastChange;                 /* 18 */
+       volatile uint32_t ifInDiscards;                 /* 19 */
+       volatile uint32_t ifInErrors;                           /* 20 */
+       volatile uint32_t ifInUnknownProtos;                    /* 21 */
+       volatile uint32_t ifOutDiscards;                        /* 22 */
+       volatile uint32_t ifOutErrors;                          /* 23 */
+       volatile uint32_t ifOutQLen;     /* deprecated */       /* 24 */
+       volatile uint8_t  ifPhysAddress[8]; /* 8 bytes */       /* 25 - 26 */
+       volatile uint8_t  ifDescr[32];                          /* 27 - 34 */
+       uint32_t alignIt;      /* align to 64 bit for u_int64_ts following */
        /*
         * more interface stats, taken from RFC 1573, MIB-IIupdate,
         * interfaces group
@@ -483,133 +483,133 @@
        volatile u_int64_t ifHCOutUcastPkts;                    /* 46 - 47 */
        volatile u_int64_t ifHCOutMulticastPkts;                /* 48 - 49 */
        volatile u_int64_t ifHCOutBroadcastPkts;                /* 50 - 51 */
-       volatile u_int32_t ifLinkUpDownTrapEnable;              /* 52 */
-       volatile u_int32_t ifHighSpeed;                         /* 53 */
-       volatile u_int32_t ifPromiscuousMode;                   /* 54 */
-       volatile u_int32_t ifConnectorPresent; /* follow link state 55 */
+       volatile uint32_t ifLinkUpDownTrapEnable;               /* 52 */
+       volatile uint32_t ifHighSpeed;                          /* 53 */
+       volatile uint32_t ifPromiscuousMode;                    /* 54 */
+       volatile uint32_t ifConnectorPresent; /* follow link state 55 */
        /*
         * Host Commands
         */
-       volatile u_int32_t nicCmdsHostState;                    /* 56 */
-       volatile u_int32_t nicCmdsFDRFiltering;                 /* 57 */
-       volatile u_int32_t nicCmdsSetRecvProdIndex;             /* 58 */
-       volatile u_int32_t nicCmdsUpdateGencommStats;           /* 59 */
-       volatile u_int32_t nicCmdsResetJumboRing;               /* 60 */
-       volatile u_int32_t nicCmdsAddMCastAddr;                 /* 61 */
-       volatile u_int32_t nicCmdsDelMCastAddr;                 /* 62 */
-       volatile u_int32_t nicCmdsSetPromiscMode;               /* 63 */
-       volatile u_int32_t nicCmdsLinkNegotiate;                /* 64 */
-       volatile u_int32_t nicCmdsSetMACAddr;                   /* 65 */
-       volatile u_int32_t nicCmdsClearProfile;                 /* 66 */
-       volatile u_int32_t nicCmdsSetMulticastMode;             /* 67 */
-       volatile u_int32_t nicCmdsClearStats;                   /* 68 */
-       volatile u_int32_t nicCmdsSetRecvJumboProdIndex;        /* 69 */
-       volatile u_int32_t nicCmdsSetRecvMiniProdIndex;         /* 70 */
-       volatile u_int32_t nicCmdsRefreshStats;                 /* 71 */
-       volatile u_int32_t nicCmdsUnknown;                      /* 72 */
+       volatile uint32_t nicCmdsHostState;                     /* 56 */
+       volatile uint32_t nicCmdsFDRFiltering;                  /* 57 */
+       volatile uint32_t nicCmdsSetRecvProdIndex;              /* 58 */
+       volatile uint32_t nicCmdsUpdateGencommStats;            /* 59 */
+       volatile uint32_t nicCmdsResetJumboRing;                /* 60 */
+       volatile uint32_t nicCmdsAddMCastAddr;                  /* 61 */
+       volatile uint32_t nicCmdsDelMCastAddr;                  /* 62 */
+       volatile uint32_t nicCmdsSetPromiscMode;                /* 63 */
+       volatile uint32_t nicCmdsLinkNegotiate;         /* 64 */
+       volatile uint32_t nicCmdsSetMACAddr;                    /* 65 */
+       volatile uint32_t nicCmdsClearProfile;                  /* 66 */
+       volatile uint32_t nicCmdsSetMulticastMode;              /* 67 */
+       volatile uint32_t nicCmdsClearStats;                    /* 68 */
+       volatile uint32_t nicCmdsSetRecvJumboProdIndex; /* 69 */
+       volatile uint32_t nicCmdsSetRecvMiniProdIndex;          /* 70 */
+       volatile uint32_t nicCmdsRefreshStats;                  /* 71 */
+       volatile uint32_t nicCmdsUnknown;                       /* 72 */
        /*
         * NIC Events
         */
-       volatile u_int32_t nicEventsNICFirmwareOperational;     /* 73 */
-       volatile u_int32_t nicEventsStatsUpdated;               /* 74 */
-       volatile u_int32_t nicEventsLinkStateChanged;           /* 75 */
-       volatile u_int32_t nicEventsError;                      /* 76 */
-       volatile u_int32_t nicEventsMCastListUpdated;           /* 77 */
-       volatile u_int32_t nicEventsResetJumboRing;             /* 78 */
+       volatile uint32_t nicEventsNICFirmwareOperational;      /* 73 */
+       volatile uint32_t nicEventsStatsUpdated;                /* 74 */
+       volatile uint32_t nicEventsLinkStateChanged;            /* 75 */
+       volatile uint32_t nicEventsError;                       /* 76 */
+       volatile uint32_t nicEventsMCastListUpdated;            /* 77 */
+       volatile uint32_t nicEventsResetJumboRing;              /* 78 */
        /*
         * Ring manipulation
         */
-       volatile u_int32_t nicRingSetSendProdIndex;             /* 79 */
-       volatile u_int32_t nicRingSetSendConsIndex;             /* 80 */
-       volatile u_int32_t nicRingSetRecvReturnProdIndex;       /* 81 */
+       volatile uint32_t nicRingSetSendProdIndex;              /* 79 */
+       volatile uint32_t nicRingSetSendConsIndex;              /* 80 */
+       volatile uint32_t nicRingSetRecvReturnProdIndex;        /* 81 */
        /*
         * Interrupts
         */
-       volatile u_int32_t nicInterrupts;                       /* 82 */
-       volatile u_int32_t nicAvoidedInterrupts;                /* 83 */
+       volatile uint32_t nicInterrupts;                        /* 82 */
+       volatile uint32_t nicAvoidedInterrupts;         /* 83 */
        /*
         * BD Coalescing Thresholds
         */
-       volatile u_int32_t nicEventThresholdHit;                /* 84 */
-       volatile u_int32_t nicSendThresholdHit;                 /* 85 */
-       volatile u_int32_t nicRecvThresholdHit;                 /* 86 */
+       volatile uint32_t nicEventThresholdHit;         /* 84 */
+       volatile uint32_t nicSendThresholdHit;                  /* 85 */
+       volatile uint32_t nicRecvThresholdHit;                  /* 86 */
        /*
         * DMA Attentions
         */
-       volatile u_int32_t nicDmaRdOverrun;                     /* 87 */
-       volatile u_int32_t nicDmaRdUnderrun;                    /* 88 */
-       volatile u_int32_t nicDmaWrOverrun;                     /* 89 */
-       volatile u_int32_t nicDmaWrUnderrun;                    /* 90 */
-       volatile u_int32_t nicDmaWrMasterAborts;                /* 91 */
-       volatile u_int32_t nicDmaRdMasterAborts;                /* 92 */
+       volatile uint32_t nicDmaRdOverrun;                      /* 87 */
+       volatile uint32_t nicDmaRdUnderrun;                     /* 88 */
+       volatile uint32_t nicDmaWrOverrun;                      /* 89 */
+       volatile uint32_t nicDmaWrUnderrun;                     /* 90 */
+       volatile uint32_t nicDmaWrMasterAborts;         /* 91 */
+       volatile uint32_t nicDmaRdMasterAborts;         /* 92 */
        /*
         * NIC Resources
         */
-       volatile u_int32_t nicDmaWriteRingFull;                 /* 93 */
-       volatile u_int32_t nicDmaReadRingFull;                  /* 94 */
-       volatile u_int32_t nicEventRingFull;                    /* 95 */
-       volatile u_int32_t nicEventProducerRingFull;            /* 96 */
-       volatile u_int32_t nicTxMacDescrRingFull;               /* 97 */
-       volatile u_int32_t nicOutOfTxBufSpaceFrameRetry;        /* 98 */
-       volatile u_int32_t nicNoMoreWrDMADescriptors;           /* 99 */
-       volatile u_int32_t nicNoMoreRxBDs;                      /* 100 */
-       volatile u_int32_t nicNoSpaceInReturnRing;              /* 101 */
-       volatile u_int32_t nicSendBDs;            /* current count 102 */
-       volatile u_int32_t nicRecvBDs;            /* current count 103 */
-       volatile u_int32_t nicJumboRecvBDs;       /* current count 104 */
-       volatile u_int32_t nicMiniRecvBDs;        /* current count 105 */
-       volatile u_int32_t nicTotalRecvBDs;       /* current count 106 */
-       volatile u_int32_t nicTotalSendBDs;       /* current count 107 */
-       volatile u_int32_t nicJumboSpillOver;                   /* 108 */
-       volatile u_int32_t nicSbusHangCleared;                  /* 109 */
-       volatile u_int32_t nicEnqEventDelayed;                  /* 110 */
+       volatile uint32_t nicDmaWriteRingFull;                  /* 93 */
+       volatile uint32_t nicDmaReadRingFull;                   /* 94 */
+       volatile uint32_t nicEventRingFull;                     /* 95 */
+       volatile uint32_t nicEventProducerRingFull;             /* 96 */
+       volatile uint32_t nicTxMacDescrRingFull;                /* 97 */
+       volatile uint32_t nicOutOfTxBufSpaceFrameRetry; /* 98 */
+       volatile uint32_t nicNoMoreWrDMADescriptors;            /* 99 */
+       volatile uint32_t nicNoMoreRxBDs;                       /* 100 */
+       volatile uint32_t nicNoSpaceInReturnRing;               /* 101 */
+       volatile uint32_t nicSendBDs;            /* current count 102 */
+       volatile uint32_t nicRecvBDs;            /* current count 103 */
+       volatile uint32_t nicJumboRecvBDs;       /* current count 104 */
+       volatile uint32_t nicMiniRecvBDs;        /* current count 105 */
+       volatile uint32_t nicTotalRecvBDs;       /* current count 106 */
+       volatile uint32_t nicTotalSendBDs;       /* current count 107 */
+       volatile uint32_t nicJumboSpillOver;                    /* 108 */
+       volatile uint32_t nicSbusHangCleared;                   /* 109 */
+       volatile uint32_t nicEnqEventDelayed;                   /* 110 */
        /*
         * Stats from MAC rx completion
         */
-       volatile u_int32_t nicMacRxLateColls;                   /* 111 */
-       volatile u_int32_t nicMacRxLinkLostDuringPkt;           /* 112 */
-       volatile u_int32_t nicMacRxPhyDecodeErr;                /* 113 */
-       volatile u_int32_t nicMacRxMacAbort;                    /* 114 */
-       volatile u_int32_t nicMacRxTruncNoResources;            /* 115 */
+       volatile uint32_t nicMacRxLateColls;                    /* 111 */
+       volatile uint32_t nicMacRxLinkLostDuringPkt;            /* 112 */
+       volatile uint32_t nicMacRxPhyDecodeErr;         /* 113 */
+       volatile uint32_t nicMacRxMacAbort;                     /* 114 */
+       volatile uint32_t nicMacRxTruncNoResources;             /* 115 */
        /*
         * Stats from the mac_stats area
         */
-       volatile u_int32_t nicMacRxDropUla;                     /* 116 */
-       volatile u_int32_t nicMacRxDropMcast;                   /* 117 */
-       volatile u_int32_t nicMacRxFlowControl;                 /* 118 */
-       volatile u_int32_t nicMacRxDropSpace;                   /* 119 */
-       volatile u_int32_t nicMacRxColls;                       /* 120 */
+       volatile uint32_t nicMacRxDropUla;                      /* 116 */
+       volatile uint32_t nicMacRxDropMcast;                    /* 117 */
+       volatile uint32_t nicMacRxFlowControl;                  /* 118 */
+       volatile uint32_t nicMacRxDropSpace;                    /* 119 */
+       volatile uint32_t nicMacRxColls;                        /* 120 */
        /*
         * MAC RX Attentions
         */
-       volatile u_int32_t nicMacRxTotalAttns;                  /* 121 */
-       volatile u_int32_t nicMacRxLinkAttns;                   /* 122 */
-       volatile u_int32_t nicMacRxSyncAttns;                   /* 123 */
-       volatile u_int32_t nicMacRxConfigAttns;                 /* 124 */



Home | Main Index | Thread Index | Old Index