Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5

[gem5.git] / dev / io_device.cc

diff --git a/dev/io_device.cc b/dev/io_device.cc
index 4f53ba48d35530df7b734e0d6b24522efb7bae7e..7703ad5e303647e2ff5045a50602ebd2c5179fe0 100644 (file)
--- a/dev/io_device.cc
+++ b/dev/io_device.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2004 The Regents of The University of Michigan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,9 +29,10 @@
 #include "dev/io_device.hh"
 #include "mem/bus/base_interface.hh"
 #include "mem/bus/dma_interface.hh"
+#include "sim/builder.hh"
 
 PioDevice::PioDevice(const std::string &name)
-    : FunctionalMemory(name), pioInterface(NULL)
+    : FunctionalMemory(name), pioInterface(NULL), pioLatency(0)
 {}
 
 PioDevice::~PioDevice()
@@ -40,6 +41,8 @@ PioDevice::~PioDevice()
         delete pioInterface;
 }
 
+DEFINE_SIM_OBJECT_CLASS_NAME("PioDevice", PioDevice)
+
 DmaDevice::DmaDevice(const std::string &name)
     : PioDevice(name), dmaInterface(NULL)
 {}
@@ -50,3 +53,5 @@ DmaDevice::~DmaDevice()
         delete dmaInterface;
 }
 
+DEFINE_SIM_OBJECT_CLASS_NAME("DmaDevice", DmaDevice)
+