tag each mem_req as coming from the nic if it is DMA'd from the NIC. the NIC tells...

[gem5.git] / dev / tsunami.cc

diff --git a/dev/tsunami.cc b/dev/tsunami.cc
index ba33fa0967d51b97609c396f8c732d5b5fb7877b..c44da69b7f134a52ef7b14988bfbe0f5f3dbe0e7 100644 (file)
--- a/dev/tsunami.cc
+++ b/dev/tsunami.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
@@ -31,21 +31,23 @@
 #include <vector>
 
 #include "cpu/intr_control.hh"
-#include "dev/console.hh"
+#include "dev/simconsole.hh"
 #include "dev/etherdev.hh"
 #include "dev/ide_ctrl.hh"
 #include "dev/tlaser_clock.hh"
 #include "dev/tsunami_cchip.hh"
 #include "dev/tsunami_pchip.hh"
+#include "dev/tsunami_io.hh"
 #include "dev/tsunami.hh"
+#include "dev/pciconfigall.hh"
 #include "sim/builder.hh"
 #include "sim/system.hh"
 
 using namespace std;
 
-Tsunami::Tsunami(const string &name, System *s, SimConsole *con,
-                 IntrControl *ic, int intr_freq)
-    : Platform(name, con, ic, intr_freq), system(s)
+Tsunami::Tsunami(const string &name, System *s,
+                 IntrControl *ic, PciConfigAll *pci, int intr_freq)
+    : Platform(name, ic, pci, intr_freq), system(s)
 {
     // set the back pointer from the system to myself
     system->platform = this;
@@ -54,6 +56,24 @@ Tsunami::Tsunami(const string &name, System *s, SimConsole *con,
         intr_sum_type[i] = 0;
 }
 
+Tick
+Tsunami::intrFrequency()
+{
+    return io->frequency();
+}
+
+void
+Tsunami::postConsoleInt()
+{
+    io->postPIC(0x10);
+}
+
+void
+Tsunami::clearConsoleInt()
+{
+    io->clearPIC(0x10);
+}
+
 void
 Tsunami::serialize(std::ostream &os)
 {
@@ -71,6 +91,7 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(Tsunami)
     SimObjectParam<System *> system;
     SimObjectParam<SimConsole *> cons;
     SimObjectParam<IntrControl *> intrctrl;
+    SimObjectParam<PciConfigAll *> pciconfig;
     Param<int> interrupt_frequency;
 
 END_DECLARE_SIM_OBJECT_PARAMS(Tsunami)
@@ -80,13 +101,14 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(Tsunami)
     INIT_PARAM(system, "system"),
     INIT_PARAM(cons, "system console"),
     INIT_PARAM(intrctrl, "interrupt controller"),
+    INIT_PARAM(pciconfig, "PCI configuration"),
     INIT_PARAM_DFLT(interrupt_frequency, "frequency of interrupts", 1024)
 
 END_INIT_SIM_OBJECT_PARAMS(Tsunami)
 
 CREATE_SIM_OBJECT(Tsunami)
 {
-    return new Tsunami(getInstanceName(), system, cons, intrctrl,
+    return new Tsunami(getInstanceName(), system, intrctrl, pciconfig,
                        interrupt_frequency);
 }