derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

misc: Replaced master/slave terminology

Browse Source 
Change-Id: I4df2557c71e38cc4e3a485b0e590e85eb45de8b6
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/33553
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br>
Reviewed-by: Bobby R. Bruce <bbruce@ucdavis.edu>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Shivani Parekh
2020-08-24 11:47:44 -07:00
parent 468b343837
commit 392c1ced53
254 changed files with 2690 additions and 2521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/dev/storage/ide_ctrl.cc
View File

@@ -77,7 +77,7 @@ IdeController::Channel::Channel(
string newName, Addr _cmdSize, Addr _ctrlSize) :
_name(newName),
cmdAddr(0), cmdSize(_cmdSize), ctrlAddr(0), ctrlSize(_ctrlSize),
master(NULL), slave(NULL), selected(NULL)
device0(NULL), device1(NULL), selected(NULL)
{
bmiRegs.reset();
bmiRegs.status.dmaCap0 = 1;
@@ -105,16 +105,16 @@ IdeController::IdeController(Params *p)
continue;
switch (i) {
case 0:
primary.master = params()->disks[0];
primary.device0 = params()->disks[0];
break;
case 1:
primary.slave = params()->disks[1];
primary.device1 = params()->disks[1];
break;
case 2:
secondary.master = params()->disks[2];
secondary.device0 = params()->disks[2];
break;
case 3:
secondary.slave = params()->disks[3];
secondary.device1 = params()->disks[3];
break;
default:
panic("IDE controllers support a maximum "
@@ -156,9 +156,9 @@ void
IdeController::setDmaComplete(IdeDisk *disk)
{
Channel *channel;
if (disk == primary.master || disk == primary.slave) {
if (disk == primary.device0 || disk == primary.device1) {
channel = &primary;
} else if (disk == secondary.master || disk == secondary.slave) {
} else if (disk == secondary.device0 || disk == secondary.device1) {
channel = &secondary;
} else {
panic("Unable to find disk based on pointer %#x\n", disk);