X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=dev%2Ftsunami.cc;h=c44da69b7f134a52ef7b14988bfbe0f5f3dbe0e7;hb=c9e6a15196a87fd1aa923b9ee0f6ff736ad6d33b;hp=a8cf551d324970bea1a6d7ef0e583f5c6617e563;hpb=3ccc0b1f968e3efaeccda65e06f862c899678312;p=gem5.git

diff --git a/dev/tsunami.cc b/dev/tsunami.cc
index a8cf551d3..c44da69b7 100644
--- 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,27 +31,49 @@
 #include <vector>
 
 #include "cpu/intr_control.hh"
-#include "dev/console.hh"
+#include "dev/simconsole.hh"
 #include "dev/etherdev.hh"
-#include "dev/scsi_ctrl.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, ScsiController *s, EtherDev *e,
-                       SimConsole *con, IntrControl *ic, int intr_freq)
-    : SimObject(name), intrctrl(ic), cons(con), scsi(s), ethernet(e),
-      interrupt_frequency(intr_freq)
+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;
+
     for (int i = 0; i < Tsunami::Max_CPUs; i++)
         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)
 {
@@ -66,30 +88,28 @@ Tsunami::unserialize(Checkpoint *cp, const std::string &section)
 
 BEGIN_DECLARE_SIM_OBJECT_PARAMS(Tsunami)
 
-    SimObjectParam<ScsiController *> scsi;
-    SimObjectParam<EtherDev *> ethernet;
+    SimObjectParam<System *> system;
     SimObjectParam<SimConsole *> cons;
     SimObjectParam<IntrControl *> intrctrl;
+    SimObjectParam<PciConfigAll *> pciconfig;
     Param<int> interrupt_frequency;
 
 END_DECLARE_SIM_OBJECT_PARAMS(Tsunami)
 
 BEGIN_INIT_SIM_OBJECT_PARAMS(Tsunami)
 
-    INIT_PARAM(scsi, "scsi controller"),
-    INIT_PARAM(ethernet, "ethernet controller"),
+    INIT_PARAM(system, "system"),
     INIT_PARAM(cons, "system console"),
     INIT_PARAM(intrctrl, "interrupt controller"),
-    INIT_PARAM_DFLT(interrupt_frequency, "frequency of interrupts", 1200)
+    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(), scsi, ethernet,
-                           cons, intrctrl, interrupt_frequency);
+    return new Tsunami(getInstanceName(), system, intrctrl, pciconfig,
+                       interrupt_frequency);
 }
 
 REGISTER_SIM_OBJECT("Tsunami", Tsunami)
-