Merge m5.eecs.umich.edu:/bk/newmem

into  ewok.(none):/home/gblack/m5/newmem

--HG--
extra : convert_revision : 7866241cf43416636cbd6a3a4f6eeda561ed2e27

1 files changed, 10 insertions, 7 deletions

diff --git a/dev/io_device.cc b/dev/io_device.cc
index 5f5f9a09d..ac993d78d 100644
--- a/dev/io_device.cc
+++ b/dev/io_device.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2005 The Regents of The University of Michigan
+ * Copyright (c) 2006 The Regents of The University of Michigan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -72,12 +72,6 @@ PioPort::SendEvent::process()
     port->transmitList.push_back(&packet);
 }
 
-PioDevice::PioDevice(const std::string &name, Platform *p)
-    : SimObject(name), platform(p)
-{
-    pioPort = new PioPort(this, p);
-}
-
 
 bool
 PioPort::recvTiming(Packet &pkt)
@@ -201,4 +195,13 @@ DmaDevice::~DmaDevice()
         delete dmaPort;
 }
 
+void
+BasePioDevice::addressRanges(AddrRangeList &range_list, bool &owner)
+{
+    assert(pioSize != 0);
+    owner = true;
+    range_list.clear();
+    range_list.push_back(RangeSize(pio_addr, sizeof(struct alphaAccess)));
+}
+