Shivani Parekh has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/33518 )
Change subject: dev-arm,dev: Replaced master/slave variables + comments
--x86
......................................................................
dev-arm,dev: Replaced master/slave variables + comments --x86
Change-Id: I975498ab67879e22afb59b6159d019021254f571
---
M src/dev/arm/RealView.py
M src/dev/serial/terminal.cc
M src/dev/storage/ide_ctrl.cc
M src/dev/storage/ide_ctrl.hh
M src/dev/x86/I82094AA.py
M src/dev/x86/SouthBridge.py
M src/dev/x86/i82094aa.cc
7 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/src/dev/arm/RealView.py b/src/dev/arm/RealView.py
index 684567f..440292b 100644
--- a/src/dev/arm/RealView.py
+++ b/src/dev/arm/RealView.py
@@ -93,8 +93,9 @@
type = 'AmbaDmaDevice'
abstract = True
cxx_header = "dev/arm/amba_device.hh"
- pio_addr = Param.Addr("Address for AMBA slave interface")
- pio_latency = Param.Latency("10ns", "Time between action and
write/read result by AMBA DMA Device")
+ pio_addr = Param.Addr("Address for AMBA responder interface")
+ pio_latency = Param.Latency("10ns",
+ "Time between action and write/read result by AMBA DMA Device")
interrupt = Param.ArmInterruptPin("Interrupt that connects to GIC")
amba_id = Param.UInt32("ID of AMBA device for kernel detection")
diff --git a/src/dev/serial/terminal.cc b/src/dev/serial/terminal.cc
index 7cfc6d7..8b420da 100644
--- a/src/dev/serial/terminal.cc
+++ b/src/dev/serial/terminal.cc
@@ -204,7 +204,7 @@
pollQueue.schedule(dataEvent);
stringstream stream;
- ccprintf(stream, "==== m5 slave terminal: Terminal %d ====", number);
+ ccprintf(stream, "==== m5 terminal: Terminal %d ====", number);
// we need an actual carriage return followed by a newline for the
// terminal
diff --git a/src/dev/storage/ide_ctrl.cc b/src/dev/storage/ide_ctrl.cc
index 632144c..47cdd10 100644
--- a/src/dev/storage/ide_ctrl.cc
+++ b/src/dev/storage/ide_ctrl.cc
@@ -77,7 +77,7 @@
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 @@
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 @@
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);
diff --git a/src/dev/storage/ide_ctrl.hh b/src/dev/storage/ide_ctrl.hh
index 44e8c5b..5410985 100644
--- a/src/dev/storage/ide_ctrl.hh
+++ b/src/dev/storage/ide_ctrl.hh
@@ -89,8 +89,13 @@
uint32_t bmidtp;
} bmiRegs;
- /** IDE disks connected to this controller */
- IdeDisk *master, *slave;
+ /** IDE disks connected to this controller
+ * For more details about device0 and device1 see:
+ * https://en.wikipedia.org/wiki/Parallel_ATA
+ * #Multiple_devices_on_a_cable
+ *
+ */
+ IdeDisk *device0, *device1;
/** Currently selected disk */
IdeDisk *selected;
@@ -98,10 +103,10 @@
bool selectBit;
void
- select(bool selSlave)
+ select(bool selDisk)
{
- selectBit = selSlave;
- selected = selectBit ? slave : master;
+ selectBit = selDisk;
+ selected = selectBit ? device1 : device0;
}
void accessCommand(Addr offset, int size, uint8_t *data, bool
read);
diff --git a/src/dev/x86/I82094AA.py b/src/dev/x86/I82094AA.py
index 2cb210a..ce1f394 100644
--- a/src/dev/x86/I82094AA.py
+++ b/src/dev/x86/I82094AA.py
@@ -34,7 +34,7 @@
cxx_class = 'X86ISA::I82094AA'
cxx_header = "dev/x86/i82094aa.hh"
apic_id = Param.Int(1, 'APIC id for this IO APIC')
- int_master = RequestPort("Port for sending interrupt messages")
+ int_requestor = RequestPort("Port for sending interrupt messages")
int_latency = Param.Latency('1ns', \
"Latency for an interrupt to propagate through this device.")
external_int_pic = Param.I8259(NULL, "External PIC, if any")
diff --git a/src/dev/x86/SouthBridge.py b/src/dev/x86/SouthBridge.py
index 22e2d1f..7fd16cc 100644
--- a/src/dev/x86/SouthBridge.py
+++ b/src/dev/x86/SouthBridge.py
@@ -108,4 +108,4 @@
self.pit.pio = bus.master
self.speaker.pio = bus.master
self.io_apic.pio = bus.master
- self.io_apic.int_master = bus.slave
+ self.io_apic.int_requestor = bus.slave
diff --git a/src/dev/x86/i82094aa.cc b/src/dev/x86/i82094aa.cc
index 8d91cc6..50b6e47 100644
--- a/src/dev/x86/i82094aa.cc
+++ b/src/dev/x86/i82094aa.cc
@@ -42,7 +42,7 @@
X86ISA::I82094AA::I82094AA(Params *p)
: BasicPioDevice(p, 20), extIntPic(p->external_int_pic),
lowestPriorityOffset(0),
- intMasterPort(name() + ".int_master", this, this, p->int_latency)
+ intMasterPort(name() + ".int_requestor", this, this, p->int_latency)
{
// This assumes there's only one I/O APIC in the system and since the
apic
// id is stored in a 8-bit field with 0xff meaning broadcast, the id
must
@@ -79,7 +79,7 @@
Port &
X86ISA::I82094AA::getPort(const std::string &if_name, PortID idx)
{
- if (if_name == "int_master")
+ if (if_name == "int_requestor")
return intMasterPort;
if (if_name == "inputs")
return *inputs.at(idx);
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/33518
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I975498ab67879e22afb59b6159d019021254f571
Gerrit-Change-Number: 33518
Gerrit-PatchSet: 1
Gerrit-Owner: Shivani Parekh <shpar...@ucdavis.edu>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
