diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-04-11 13:43:15 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-04-11 13:43:15 -0400 |
| commit | 194fb50fbd3f00577ce129762c9a8f13c721e4ad (patch) | |
| tree | fa464892deda45dae86ff3c847cc7ae9aea0db22 /dev/uart8250.cc | |
| parent | da7990ab337699ae788809ddaea5ba5c363e0015 (diff) | |
| parent | f6fc18f03d639098b1421fa3412329773b0a6ab1 (diff) | |
| download | gem5-194fb50fbd3f00577ce129762c9a8f13c721e4ad.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.eecs.umich.edu:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : ef75b46b9c1c267c84e6bb2b2234d46c4edcda16
Diffstat (limited to 'dev/uart8250.cc')
| -rw-r--r-- | dev/uart8250.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dev/uart8250.cc b/dev/uart8250.cc index bbb42c065..7c8899180 100644 --- a/dev/uart8250.cc +++ b/dev/uart8250.cc @@ -336,7 +336,7 @@ Uart8250::unserialize(Checkpoint *cp, const std::string §ion) BEGIN_DECLARE_SIM_OBJECT_PARAMS(Uart8250) - Param<Addr> addr; + Param<Addr> pio_addr; Param<Tick> pio_latency; SimObjectParam<Platform *> platform; SimObjectParam<SimConsole *> sim_console; @@ -346,7 +346,7 @@ END_DECLARE_SIM_OBJECT_PARAMS(Uart8250) BEGIN_INIT_SIM_OBJECT_PARAMS(Uart8250) - INIT_PARAM(addr, "Device Address"), + INIT_PARAM(pio_addr, "Device Address"), INIT_PARAM_DFLT(pio_latency, "Programmed IO latency", 1000), INIT_PARAM(platform, "platform"), INIT_PARAM(sim_console, "The Simulator Console"), @@ -358,7 +358,7 @@ CREATE_SIM_OBJECT(Uart8250) { Uart8250::Params *p = new Uart8250::Params; p->name = getInstanceName(); - p->pio_addr = addr; + p->pio_addr = pio_addr; p->pio_delay = pio_latency; p->platform = platform; p->cons = sim_console; |