From: Gabe Black <gabeblack@google.com>
Date: Tue, 26 Sep 2017 00:53:57 +0000 (-0700)
Subject: dev: Make the IDE controller handle NULL simobject pointers.
X-Git-Tag: v19.0.0.0~2618
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5a27a68c736eb1d295e52e0d5cdd106942ffd6f2;p=gem5.git

dev: Make the IDE controller handle NULL simobject pointers.

Only panic if there are disks which would actually be connected to it beyond
its limit. Also skip past disks which are set to NULL. This is useful since
it lets you set up disks on different ports of the controller instead of
filling them contiguously.

Change-Id: I92f1316d3ad6931e25bfffeb34fb2603c0b95ce7
Reviewed-on: https://gem5-review.googlesource.com/4848
Maintainer: Gabe Black <gabeblack@google.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
---

diff --git a/src/dev/storage/ide_ctrl.cc b/src/dev/storage/ide_ctrl.cc
index 6d507269f..d1c9f7d73 100644
--- a/src/dev/storage/ide_ctrl.cc
+++ b/src/dev/storage/ide_ctrl.cc
@@ -102,23 +102,31 @@ IdeController::IdeController(Params *p)
     ioEnabled(false), bmEnabled(false),
     ioShift(p->io_shift), ctrlOffset(p->ctrl_offset)
 {
-    if (params()->disks.size() > 4)
-        panic("IDE controllers support a maximum of 4 devices attached!\n");
 
     // Assign the disks to channels
-    int numDisks = params()->disks.size();
-    if (numDisks > 0)
-        primary.master = params()->disks[0];
-    if (numDisks > 1)
-        primary.slave = params()->disks[1];
-    if (numDisks > 2)
-        secondary.master = params()->disks[2];
-    if (numDisks > 3)
-        secondary.slave = params()->disks[3];
-
     for (int i = 0; i < params()->disks.size(); i++) {
+        if (!params()->disks[i])
+            continue;
+        switch (i) {
+          case 0:
+            primary.master = params()->disks[0];
+            break;
+          case 1:
+            primary.slave = params()->disks[1];
+            break;
+          case 2:
+            secondary.master = params()->disks[2];
+            break;
+          case 3:
+            secondary.slave = params()->disks[3];
+            break;
+          default:
+            panic("IDE controllers support a maximum "
+                  "of 4 devices attached!\n");
+        }
         params()->disks[i]->setController(this);
     }
+
     primary.select(false);
     secondary.select(false);