move stuff around so PageShift is defined before it is needed
don't ever include a file while in a namespace
start of making alpha console new memsystem happy
Make a BasePioDevice which is what all the simple Pio devices will inherit from
add a description of when the data pointer will have memory
arch/alpha/isa_traits.hh:
don't ever include a file while in a namespace
dev/alpha_console.cc:
dev/alpha_console.hh:
start of making alpha console new memsystem happy
dev/io_device.cc:
dev/io_device.hh:
Make a BasePioDevice which is what all the simple Pio devices will inherit from
mem/packet.hh:
add a description of when the data pointer will have memory
--HG--
extra : convert_revision : 495c0915541f9cad3eb42891e60b4ecbee7952bf
This commit is contained in:
@@ -70,7 +70,7 @@ class MemoryController;
|
||||
* primarily used doing boot before the kernel has loaded its device
|
||||
* drivers.
|
||||
*/
|
||||
class AlphaConsole : public PioDevice
|
||||
class AlphaConsole : public BasePioDevice
|
||||
{
|
||||
protected:
|
||||
struct Access : public AlphaAccess
|
||||
@@ -96,23 +96,29 @@ class AlphaConsole : public PioDevice
|
||||
/** a pointer to the CPU boot cpu */
|
||||
BaseCPU *cpu;
|
||||
|
||||
Addr addr;
|
||||
static const Addr size = sizeof(struct AlphaAccess);
|
||||
public:
|
||||
struct Params : public BasePioDevice::Params
|
||||
{
|
||||
SimConsole *cons;
|
||||
SimpleDisk *disk;
|
||||
AlphaSystem *sys;
|
||||
BaseCpu *cpu;
|
||||
};
|
||||
protected:
|
||||
const Params *params() const {return (const Params *)_params; }
|
||||
|
||||
public:
|
||||
|
||||
/** Standard Constructor */
|
||||
AlphaConsole(const std::string &name, SimConsole *cons, SimpleDisk *d,
|
||||
AlphaSystem *s, BaseCPU *c, Platform *platform,
|
||||
MemoryController *mmu, Addr addr,
|
||||
HierParams *hier, Bus *pio_bus);
|
||||
AlphaConsole(Params *p);
|
||||
|
||||
virtual void startup();
|
||||
|
||||
/**
|
||||
* memory mapped reads and writes
|
||||
*/
|
||||
virtual Fault read(MemReqPtr &req, uint8_t *data);
|
||||
virtual Fault write(MemReqPtr &req, const uint8_t *data);
|
||||
virtual Tick read(Packet &pkt);
|
||||
virtual Tick write(Packet &pkt);
|
||||
|
||||
/**
|
||||
* standard serialization routines for checkpointing
|
||||
|
||||
Reference in New Issue
Block a user