external_master.cc (11817:594d96c093d0) external_master.cc (12680:91f4d6668b4f)
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

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

52 ExternalMaster::portHandlers;
53
54ExternalMaster::ExternalMaster(ExternalMasterParams *params) :
55 MemObject(params),
56 externalPort(NULL),
57 portName(params->name + ".port"),
58 portType(params->port_type),
59 portData(params->port_data),
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

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

52 ExternalMaster::portHandlers;
53
54ExternalMaster::ExternalMaster(ExternalMasterParams *params) :
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(params->name))
60 masterId(params->system->getMasterId(this))
61{}
62
63BaseMasterPort &
64ExternalMaster::getMasterPort(const std::string &if_name,
65 PortID idx)
66{
67 if (if_name == "port") {
68 DPRINTF(ExternalPort, "Trying to bind external port: %s %s\n",

--- 44 unchanged lines hidden --- 		61{}
62
63BaseMasterPort &
64ExternalMaster::getMasterPort(const std::string &if_name,
65 PortID idx)
66{
67 if (if_name == "port") {
68 DPRINTF(ExternalPort, "Trying to bind external port: %s %s\n",

--- 44 unchanged lines hidden ---