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

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

55 MemObject(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
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

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

55 MemObject(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
63BaseMasterPort &
64ExternalMaster::getMasterPort(const std::string &if_name,
65 PortID idx)
63Port &
64ExternalMaster::getPort(const std::string &if_name, PortID idx)
66{
67 if (if_name == "port") {
68 DPRINTF(ExternalPort, "Trying to bind external port: %s %s\n",
69 portType, portName);
70
71 if (!externalPort) {
72 auto handlerIter = portHandlers.find(portType);
73

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

79
80 if (!externalPort) {
81 fatal("%s: Can't find external port type: %s"
82 " port_data: '%s'\n", portName, portType, portData);
83 }
84 }
85 return *externalPort;
86 } else {
65{
66 if (if_name == "port") {
67 DPRINTF(ExternalPort, "Trying to bind external port: %s %s\n",
68 portType, portName);
69
70 if (!externalPort) {
71 auto handlerIter = portHandlers.find(portType);
72

--- 5 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 {
87 return MemObject::getMasterPort(if_name, idx);
86 return MemObject::getPort(if_name, idx);
88 }
89}
90
91void
92ExternalMaster::init()
93{
94 if (!externalPort) {
95 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 ---