Rename cycles() function to ticks()

[gem5.git] / src / dev / pcireg.h

diff --git a/src/dev/pcireg.h b/src/dev/pcireg.h
index 9d2737c20bfb3d1bc0e69d36f5d17d460ec928b4..df57acdb0e3edf772cebb1fa367d62cb75543c57 100644 (file)
--- a/src/dev/pcireg.h
+++ b/src/dev/pcireg.h
@@ -24,6 +24,9 @@
  * 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.
+ *
+ * Authors: Nathan Binkert
+ *          Miguel Serrano
  */
 
 /* @file
@@ -51,18 +54,7 @@ union PCIConfig {
         uint8_t latencyTimer;
         uint8_t headerType;
         uint8_t bist;
-        union {
-            uint32_t baseAddr[6];
-
-            struct {
-                uint32_t baseAddr0;
-                uint32_t baseAddr1;
-                uint32_t baseAddr2;
-                uint32_t baseAddr3;
-                uint32_t baseAddr4;
-                uint32_t baseAddr5;
-            };
-        };
+        uint32_t baseAddr[6];
         uint32_t cardbusCIS;
         uint16_t subsystemVendorID;
         uint16_t subsystemID;
@@ -139,6 +131,7 @@ union PCIConfig {
 
 // Device specific offsets
 #define PCI_DEVICE_SPECIFIC            0x40    // 192 bytes
+#define PCI_CONFIG_SIZE         0xFF
 
 // Some Vendor IDs
 #define PCI_VENDOR_DEC                 0x1011