Fixes for updating mmu mappings

dev/tsunami.hh:
    Added generic platform base class

--HG--
extra : convert_revision : ff74956937f9fca5bdfa5e3779add776e4a91f8b
This commit is contained in:
Andrew Schultz 2004-02-09 14:47:39 -05:00
parent b93cab4e85
commit 581a6ea0dd

View file

@ -35,17 +35,16 @@
#ifndef __TSUNAMI_HH__ #ifndef __TSUNAMI_HH__
#define __TSUNAMI_HH__ #define __TSUNAMI_HH__
#include "sim/sim_object.hh" #include "dev/platform.hh"
class IntrControl;
class ConsoleListener;
class SimConsole;
class AdaptecController; class AdaptecController;
class TlaserClock; class TlaserClock;
class EtherDev; class EtherDev;
class TsunamiCChip; class TsunamiCChip;
class TsunamiPChip; class TsunamiPChip;
class TsunamiIO;
class PCIConfigAll; class PCIConfigAll;
class System;
/** /**
* Top level class for Tsunami Chipset emulation. * Top level class for Tsunami Chipset emulation.
@ -54,18 +53,17 @@ class PCIConfigAll;
* read work * read work
*/ */
class Tsunami : public SimObject class Tsunami : public Platform
{ {
public: public:
/** Max number of CPUs in a Tsunami */ /** Max number of CPUs in a Tsunami */
static const int Max_CPUs = 4; static const int Max_CPUs = 4;
/** Pointer to the interrupt controller (used to post and ack interrupts on the CPU) */ /** Pointer to the system */
IntrControl *intrctrl; System *system;
/** Pointer to the UART emulation code */ /** Pointer to the TsunamiIO device which has the RTC */
SimConsole *cons; TsunamiIO *io;
/** Pointer to the SCSI controller device */ /** Pointer to the SCSI controller device */
AdaptecController *scsi; AdaptecController *scsi;
/** Pointer to the ethernet controller device */ /** Pointer to the ethernet controller device */
@ -92,8 +90,6 @@ class Tsunami : public SimObject
int intr_sum_type[Tsunami::Max_CPUs]; int intr_sum_type[Tsunami::Max_CPUs];
int ipi_pending[Tsunami::Max_CPUs]; int ipi_pending[Tsunami::Max_CPUs];
int interrupt_frequency;
public: public:
/** /**
* Constructor for the Tsunami Class. * Constructor for the Tsunami Class.
@ -102,7 +98,7 @@ class Tsunami : public SimObject
* @param intrcontrol pointer to the interrupt controller * @param intrcontrol pointer to the interrupt controller
* @param intrFreq frequency that interrupts happen * @param intrFreq frequency that interrupts happen
*/ */
Tsunami(const std::string &name, EtherDev *ethernet, SimConsole *con, Tsunami(const std::string &name, System *s, SimConsole *con,
IntrControl *intctrl, int intrFreq); IntrControl *intctrl, int intrFreq);
virtual void serialize(std::ostream &os); virtual void serialize(std::ostream &os);