external_master.cc (13784:1941dc118243) external_master.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

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

47#include "base/trace.hh"
48#include "debug/ExternalPort.hh"
49#include "sim/system.hh"
50
51std::map<std::string, ExternalMaster::Handler *>
52 ExternalMaster::portHandlers;
53
54ExternalMaster::ExternalMaster(ExternalMasterParams *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

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

47#include "base/trace.hh"
48#include "debug/ExternalPort.hh"
49#include "sim/system.hh"
50
51std::map<std::string, ExternalMaster::Handler *>
52 ExternalMaster::portHandlers;
53
54ExternalMaster::ExternalMaster(ExternalMasterParams *params) :
55 MemObject(params),
55 SimObject(params),
56 externalPort(NULL),
57 portName(params->name + ".port"),
58 portType(params->port_type),
59 portData(params->port_data),
60 masterId(params->system->getMasterId(this))
61{}
62
63Port &

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

78
79 if (!externalPort) {
80 fatal("%s: Can't find external port type: %s"
81 " port_data: '%s'\n", portName, portType, portData);
82 }
83 }
84 return *externalPort;
85 } else {
56 externalPort(NULL),
57 portName(params->name + ".port"),
58 portType(params->port_type),
59 portData(params->port_data),
60 masterId(params->system->getMasterId(this))
61{}
62
63Port &

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

78
79 if (!externalPort) {
80 fatal("%s: Can't find external port type: %s"
81 " port_data: '%s'\n", portName, portType, portData);
82 }
83 }
84 return *externalPort;
85 } else {
86 return MemObject::getPort(if_name, idx);
86 return SimObject::getPort(if_name, idx);
87 }
88}
89
90void
91ExternalMaster::init()
92{
93 if (!externalPort) {
94 fatal("ExternalMaster %s: externalPort not set!\n", name());

--- 17 unchanged lines hidden --- 		87 }
88}
89
90void
91ExternalMaster::init()
92{
93 if (!externalPort) {
94 fatal("ExternalMaster %s: externalPort not set!\n", name());

--- 17 unchanged lines hidden ---