external_slave.cc (13784:1941dc118243) external_slave.cc (13892:0182a0601f66)
1/*
2 * Copyright (c) 2012-2014 ARM Limited
3 * All rights reserved
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

--- 167 unchanged lines hidden (view full) ---

176
177AddrRangeList
178ExternalSlave::ExternalPort::getAddrRanges() const
179{
180 return owner.addrRanges;
181}
182
183ExternalSlave::ExternalSlave(ExternalSlaveParams *params) :
1/*
2 * Copyright (c) 2012-2014 ARM Limited
3 * All rights reserved
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

--- 167 unchanged lines hidden (view full) ---

176
177AddrRangeList
178ExternalSlave::ExternalPort::getAddrRanges() const
179{
180 return owner.addrRanges;
181}
182
183ExternalSlave::ExternalSlave(ExternalSlaveParams *params) :
184 MemObject(params),
184 SimObject(params),
185 externalPort(NULL),
186 portName(params->name + ".port"),
187 portType(params->port_type),
188 portData(params->port_data),
189 addrRanges(params->addr_ranges.begin(), params->addr_ranges.end())
190{
191 /* Register the stub handler if it hasn't already been registered */
192 if (portHandlers.find("stub") == portHandlers.end())

--- 18 unchanged lines hidden (view full) ---

211
212 if (!externalPort) {
213 fatal("%s: Can't find external port type: %s"
214 " port_data: '%s'\n", portName, portType, portData);
215 }
216 }
217 return *externalPort;
218 } else {
185 externalPort(NULL),
186 portName(params->name + ".port"),
187 portType(params->port_type),
188 portData(params->port_data),
189 addrRanges(params->addr_ranges.begin(), params->addr_ranges.end())
190{
191 /* Register the stub handler if it hasn't already been registered */
192 if (portHandlers.find("stub") == portHandlers.end())

--- 18 unchanged lines hidden (view full) ---

211
212 if (!externalPort) {
213 fatal("%s: Can't find external port type: %s"
214 " port_data: '%s'\n", portName, portType, portData);
215 }
216 }
217 return *externalPort;
218 } else {
219 return MemObject::getPort(if_name, idx);
219 return SimObject::getPort(if_name, idx);
220 }
221}
222
223void
224ExternalSlave::init()
225{
226 if (!externalPort) {
227 fatal("ExternalSlave %s: externalPort not set!\n", name());

--- 19 unchanged lines hidden --- 		220 }
221}
222
223void
224ExternalSlave::init()
225{
226 if (!externalPort) {
227 fatal("ExternalSlave %s: externalPort not set!\n", name());

--- 19 unchanged lines hidden ---