added support for 9400-16i HBA cards in all three modules

45Drives · Oct 31, 2022 · 0f172af · 0f172af
1 parent 71c5013
commit 0f172af
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 9 deletions.
diff --git a/45drives-motherboard/public/helper_scripts/pci b/45drives-motherboard/public/helper_scripts/pci
@@ -116,7 +116,7 @@ def lspci_hba():
 		return False
 	hba_cards = []
 	hba_dict = {}
-	rx_pci=re.compile(r"^(\w\w:\w\w\.\w).*\n.*(?:(?:(?:^\t).*\n)+^.*)?(9600-16i|9600-24i|SAS9305-16i|SAS9305-24i|HBA 9405W-16i|9361-16i).*\n",re.MULTILINE)
+	rx_pci=re.compile(r"^(\w\w:\w\w\.\w).*\n.*(?:(?:(?:^\t).*\n)+^.*)?(9600-16i|9600-24i|SAS9305-16i|SAS9305-24i|HBA 9405W-16i|9361-16i|HBA 9400-16i).*\n",re.MULTILINE)
 	for match in rx_pci.finditer(lspci_hba_result):
 		hba_dict["Model"] = match.group(2)
 		hba_dict["Bus Address"] = "0000:" + match.group(1)

diff --git a/45drives-motherboard/public/img/motherboard/9400-16i.png b/45drives-motherboard/public/img/motherboard/9400-16i.png
diff --git a/45drives-motherboard/src/components/P5Motherboard.vue b/45drives-motherboard/src/components/P5Motherboard.vue
@@ -667,6 +667,47 @@ export default {
                       );
                       MASK_ARR[c] = newMask;
                     } 
+                    else if (
+                      pci_info["PCI Info"][i]["Card Type"] == "HBA" &&
+                      pci_info["PCI Info"][i]["Card Model"] == "HBA 9400-16i"
+                    ) {
+                      peripherals.push(
+                        new peripheral(
+                          "PCI",
+                          components[c]["x0"] -
+                            components[c]["width"] * WIDTHOFFSET,
+                          0,
+                          components[c]["width"],
+                          components[c]["height"],
+                          "#FF800080",
+                          peripheralImages.length,
+                          components[c]["width"] * pciScale
+                        )
+                      );
+                      peripheralImages.push(
+                        m.loadImage("img/motherboard/9400-16i.png")
+                      );
+                      components[c]["x0"] =
+                        components[c]["x0"] -
+                        components[c]["width"] * WIDTHOFFSET;
+                      components[c]["y0"] = 0;
+                      components[c]["width"] =
+                        101.0 * components[c]["width"] * pciScale;
+                      components[c]["height"] =
+                        components[c]["width"] / (101.0 / 891.0);
+                      components[c].popup.content = components[
+                        c
+                      ].popup.content;
+                      let newMask = m.generateMask(
+                        background_img.width,
+                        background_img.height,
+                        components[c]["x0"],
+                        components[c]["y0"],
+                        components[c]["width"],
+                        components[c]["height"]
+                      );
+                      MASK_ARR[c] = newMask;
+                    } 
                     else if (
                       pci_info["PCI Info"][i]["Card Type"] == "HBA" &&
                       pci_info["PCI Info"][i]["Card Model"] == "9600-16i"

diff --git a/45drives-system/public/scripts/pci b/45drives-system/public/scripts/pci
@@ -74,7 +74,7 @@ def lspci_hba():
 		return False
 	hba_cards = []
 	hba_dict = {}
-	rx_pci=re.compile(r"^(\w\w:\w\w\.\w).*\n.*(?:(?:(?:^\t).*\n)+^.*)?(9600-16i|9600-24i|SAS9305-16i|SAS9305-24i|HBA 9405W-16i|9361-16i).*\n",re.MULTILINE)
+	rx_pci=re.compile(r"^(\w\w:\w\w\.\w).*\n.*(?:(?:(?:^\t).*\n)+^.*)?(9600-16i|9600-24i|SAS9305-16i|SAS9305-24i|HBA 9405W-16i|9361-16i|HBA 9400-16i).*\n",re.MULTILINE)
 	for match in rx_pci.finditer(lspci_hba_result):
 		hba_dict["Model"] = match.group(2)
 		hba_dict["Bus Address"] = "0000:" + match.group(1)

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,3 @@
-## cockpit-45drives-hardware 2.2.1-4
+## cockpit-45drives-hardware 2.2.1-5
 
-* Incremented build for release on repo
-* added support for BCM57412 network cards
-* added support for 9361-16i HBA cards
+* added support for 9400-16i HBA cards in System, Disks and Motherbaord Modules
diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@
 PLUGIN_SRCS=
 
 # For installing to a remote machine for testing with `make install-remote`
-REMOTE_TEST_HOST=192.168.35.55
+REMOTE_TEST_HOST=192.168.209.239
 REMOTE_TEST_USER=root
 
 # Restarts cockpit after install

diff --git a/manifest.json b/manifest.json
@@ -4,7 +4,7 @@
     "title": "cockpit-45drives-hardware",
     "prerelease": false,
     "version": "2.2.1",
-    "buildVersion": "4",
+    "buildVersion": "5",
     "author": "Mark Hooper <[email protected]>",
     "url": "https://github.com/45Drives/cockpit-hardware",
     "category": "utils",
@@ -59,7 +59,7 @@
     "changelog": {
         "urgency": "medium",
         "version": "2.2.1",
-        "buildVersion": "4",
+        "buildVersion": "5",
         "ignore": [],
         "date": null,
         "packager": "Mark Hooper <[email protected]>",

diff --git a/packaging/el8/main.spec b/packaging/el8/main.spec
@@ -42,6 +42,8 @@ make DESTDIR=%{buildroot} install
 /usr/lib/udev/rules.d/68-cockpit-45drives-disks.rules
 
 %changelog
+* Mon Oct 31 2022 Mark Hooper <[email protected]> 2.2.1-5
+- added support for 9400-16i HBA cards in System, Disks and Motherbaord Modules
 * Wed Sep 28 2022 Mark Hooper <[email protected]> 2.2.1-4
 - Incremented build for release on repo
 - added support for BCM57412 network cards

diff --git a/packaging/focal/changelog b/packaging/focal/changelog
@@ -1,3 +1,9 @@
+cockpit-45drives-hardware (2.2.1-5focal) focal; urgency=medium
+
+  * added support for 9400-16i HBA cards in System, Disks and Motherbaord Modules
+
+ -- Mark Hooper <[email protected]>  Mon, 31 Oct 2022 11:29:06 -0300
+
 cockpit-45drives-hardware (2.2.1-4focal) focal; urgency=medium
 
   * Incremented build for release on repo