Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5

[gem5.git] / dev / ide_ctrl.hh

diff --git a/dev/ide_ctrl.hh b/dev/ide_ctrl.hh
index 679c7422b83b0e06d89bb27df794d328923ae2d4..b29e5ae9a1d3bc797b18e3f374d287ff07321670 100644 (file)
--- a/dev/ide_ctrl.hh
+++ b/dev/ide_ctrl.hh
@@ -144,6 +144,10 @@ class IdeController : public PciDev
     /** Select the disk based on a pointer */
     int getDisk(IdeDisk *diskPtr);
 
+  public:
+    /** See if a disk is selected based on its pointer */
+    bool isDiskSelected(IdeDisk *diskPtr);
+
   public:
     /**
      * Constructs and initializes this controller.
@@ -163,7 +167,7 @@ class IdeController : public PciDev
                   MemoryController *mmu, PciConfigAll *cf,
                   PciConfigData *cd, Tsunami *t,
                   uint32_t bus_num, uint32_t dev_num, uint32_t func_num,
-                  Bus *host_bus, HierParams *hier);
+                  Bus *host_bus, Tick pio_latency, HierParams *hier);
 
     /**
      * Deletes the connected devices.