base.cc (10190:fb83d025d1c3) base.cc (10194:e6d2e8083d9c)
1/*
2 * Copyright (c) 2011-2012 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

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

427 if (new_dtb_port) {
428 assert(!new_dtb_port->isConnected());
429 assert(old_dtb_port);
430 assert(old_dtb_port->isConnected());
431 BaseSlavePort &slavePort = old_dtb_port->getSlavePort();
432 old_dtb_port->unbind();
433 new_dtb_port->bind(slavePort);
434 }
1/*
2 * Copyright (c) 2011-2012 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

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

427 if (new_dtb_port) {
428 assert(!new_dtb_port->isConnected());
429 assert(old_dtb_port);
430 assert(old_dtb_port->isConnected());
431 BaseSlavePort &slavePort = old_dtb_port->getSlavePort();
432 old_dtb_port->unbind();
433 new_dtb_port->bind(slavePort);
434 }
435 newTC->getITBPtr()->takeOverFrom(oldTC->getITBPtr());
436 newTC->getDTBPtr()->takeOverFrom(oldTC->getDTBPtr());
435
436 // Checker whether or not we have to transfer CheckerCPU
437 // objects over in the switch
438 CheckerCPU *oldChecker = oldTC->getCheckerCpuPtr();
439 CheckerCPU *newChecker = newTC->getCheckerCpuPtr();
440 if (oldChecker && newChecker) {
441 BaseMasterPort *old_checker_itb_port =
442 oldChecker->getITBPtr()->getMasterPort();
443 BaseMasterPort *old_checker_dtb_port =
444 oldChecker->getDTBPtr()->getMasterPort();
445 BaseMasterPort *new_checker_itb_port =
446 newChecker->getITBPtr()->getMasterPort();
447 BaseMasterPort *new_checker_dtb_port =
448 newChecker->getDTBPtr()->getMasterPort();
449
437
438 // Checker whether or not we have to transfer CheckerCPU
439 // objects over in the switch
440 CheckerCPU *oldChecker = oldTC->getCheckerCpuPtr();
441 CheckerCPU *newChecker = newTC->getCheckerCpuPtr();
442 if (oldChecker && newChecker) {
443 BaseMasterPort *old_checker_itb_port =
444 oldChecker->getITBPtr()->getMasterPort();
445 BaseMasterPort *old_checker_dtb_port =
446 oldChecker->getDTBPtr()->getMasterPort();
447 BaseMasterPort *new_checker_itb_port =
448 newChecker->getITBPtr()->getMasterPort();
449 BaseMasterPort *new_checker_dtb_port =
450 newChecker->getDTBPtr()->getMasterPort();
451
452 newChecker->getITBPtr()->takeOverFrom(oldChecker->getITBPtr());
453 newChecker->getDTBPtr()->takeOverFrom(oldChecker->getDTBPtr());
454
450 // Move over any table walker ports if they exist for checker
451 if (new_checker_itb_port) {
452 assert(!new_checker_itb_port->isConnected());
453 assert(old_checker_itb_port);
454 assert(old_checker_itb_port->isConnected());
455 BaseSlavePort &slavePort =
456 old_checker_itb_port->getSlavePort();
457 old_checker_itb_port->unbind();

--- 158 unchanged lines hidden --- 		455 // Move over any table walker ports if they exist for checker
456 if (new_checker_itb_port) {
457 assert(!new_checker_itb_port->isConnected());
458 assert(old_checker_itb_port);
459 assert(old_checker_itb_port->isConnected());
460 BaseSlavePort &slavePort =
461 old_checker_itb_port->getSlavePort();
462 old_checker_itb_port->unbind();

--- 158 unchanged lines hidden ---