From 512b9036a6bc06751498e404ee445afa5da7d2be Mon Sep 17 00:00:00 2001
From: jski <blackdanieljames@gmail.com>
Date: Thu, 14 Mar 2024 14:30:24 -0400
Subject: [PATCH 1/4] Added options for USB passthrough devices on
 DiskSettings.page, using info from https://www.smartmontools.org/wiki/USB for
 smartmontools 7.3

---
 emhttp/plugins/dynamix/DiskSettings.page | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/emhttp/plugins/dynamix/DiskSettings.page b/emhttp/plugins/dynamix/DiskSettings.page
index 9094969b5..b9d0a8004 100644
--- a/emhttp/plugins/dynamix/DiskSettings.page
+++ b/emhttp/plugins/dynamix/DiskSettings.page
@@ -364,6 +364,13 @@ _(Default SMART controller type)_:
   <?=mk_option(_var($var,'smType'), "-d cciss", "HP cciss")?>
   <?=mk_option(_var($var,'smType'), "-d marvell", "Marvell")?>
   <?=mk_option(_var($var,'smType'), "-d megaraid", "MegaRAID")?>
+  <?=mk_option(_var($var,'smType'), "-d usbcypress", "Cypress ATACB")?>
+  <?=mk_option(_var($var,'smType'), "-d usbjmicron", "JMicron ATA pass-through")?>
+  <?=mk_option(_var($var,'smType'), "-d usbprolific", "Prolific ATA pass-through")?>
+  <?=mk_option(_var($var,'smType'), "-d usbsunplus", "Sunplus ATA pass-through")?>
+  <?=mk_option(_var($var,'smType'), "-d sntasmedia", "ASMedia NVMe pass-through")?>
+  <?=mk_option(_var($var,'smType'), "-d sntjmicron", "JMicron NVMe pass-through")?>
+  <?=mk_option(_var($var,'smType'), "-d sntrealtek", "Realtek NVMe pass-through")?>
   </select>
 
 :disk_default_smart_controller_help:

From 9524159cf23128d629d6fdf167d3e3270fceb37f Mon Sep 17 00:00:00 2001
From: jski <blackdanieljames@gmail.com>
Date: Thu, 14 Mar 2024 14:42:42 -0400
Subject: [PATCH 2/4] Added options for USB passthrough devices on
 DeviceInfo.page, using info from https://www.smartmontools.org/wiki/USB for
 smartmontools 7.3

---
 emhttp/plugins/dynamix/DeviceInfo.page | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page
index cb6e3e6d6..0fd9efa10 100755
--- a/emhttp/plugins/dynamix/DeviceInfo.page
+++ b/emhttp/plugins/dynamix/DeviceInfo.page
@@ -314,6 +314,13 @@ function setGlue(form,reset) {
    {glue:'' ,more:1,dev:1,type:'',min1:0,max1:15},                                         // hp cciss
    {glue:'' ,more:0,dev:0,type:''},                                                        // marvell
    {glue:',',more:1,dev:1,type:'',min1:0,max1:127}                                         // megaraid
+   {glue:',',more:1,dev:0,type:'input'},min1:'',max1:'0xffffffff'},                        // cypress
+   {glue:',',more:3,dev:0,type:'select',min1:'',max1:'p',min2:'',max2:'x',min3:1,max3:128},// jmicron ata
+   {glue:'' ,more:0,dev:0,type:''},                                                        // prolific
+   {glue:'' ,more:0,dev:0,type:''},                                                        // sunplus
+   {glue:'' ,more:0,dev:0,type:''},                                                        // asmedia
+   {glue:'' ,more:0,dev:0,type:''},                                                        // jmicron nvme
+   {glue:'' ,more:0,dev:0,type:''},                                                        // realtek
   ];
   var n = form.smType.selectedIndex>0 ? form.smType.selectedIndex-1 : <?=_var($var,'smIndex',0)?>;
   var x = data[n]['more'];

From 415cb252e7865b4dfd9bf034a5482a7cae62155c Mon Sep 17 00:00:00 2001
From: jski <blackdanieljames@gmail.com>
Date: Thu, 14 Mar 2024 19:21:59 -0400
Subject: [PATCH 3/4] Missed one section to add the new settings in
 DeviceInfo.page

---
 emhttp/plugins/dynamix/DeviceInfo.page | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page
index 0fd9efa10..cccefe282 100755
--- a/emhttp/plugins/dynamix/DeviceInfo.page
+++ b/emhttp/plugins/dynamix/DeviceInfo.page
@@ -1253,6 +1253,13 @@ _(SMART controller type)_:
   <?=mk_option(_var($disk,'smType'), "-d cciss", "HP cciss")?>
   <?=mk_option(_var($disk,'smType'), "-d marvell", "Marvell")?>
   <?=mk_option(_var($disk,'smType'), "-d megaraid", "MegaRAID")?>
+  <?=mk_option(_var($disk,'smType'), "-d usbcypress", "Cypress ATACB")?>
+  <?=mk_option(_var($disk,'smType'), "-d usbjmicron", "JMicron ATA pass-through")?>
+  <?=mk_option(_var($disk,'smType'), "-d usbprolific", "Prolific ATA pass-through")?>
+  <?=mk_option(_var($disk,'smType'), "-d usbsunplus", "Sunplus ATA pass-through")?>
+  <?=mk_option(_var($disk,'smType'), "-d sntasmedia", "ASMedia NVMe pass-through")?>
+  <?=mk_option(_var($disk,'smType'), "-d sntjmicron", "JMicron NVMe pass-through")?>
+  <?=mk_option(_var($disk,'smType'), "-d sntrealtek", "Realtek NVMe pass-through")?>
   </select>
   <input type="text" name="smPort1" value="<?=_var($disk,'smPort1')?>" class="option"><select name="smPort1" class="narrow option" disabled></select>
   <input type="text" name="smPort2" value="<?=_var($disk,'smPort2')?>" class="option"><select name="smPort2" class="narrow option" disabled></select>

From 10d590fc66fda7426b30cf1603dac0b302f4c858 Mon Sep 17 00:00:00 2001
From: jski <blackdanieljames@gmail.com>
Date: Sat, 16 Mar 2024 15:28:20 -0400
Subject: [PATCH 4/4] Fixed two typos, thanks @ljm42

---
 emhttp/plugins/dynamix/DeviceInfo.page | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emhttp/plugins/dynamix/DeviceInfo.page b/emhttp/plugins/dynamix/DeviceInfo.page
index cccefe282..f76c93db4 100755
--- a/emhttp/plugins/dynamix/DeviceInfo.page
+++ b/emhttp/plugins/dynamix/DeviceInfo.page
@@ -313,8 +313,8 @@ function setGlue(form,reset) {
    {glue:'/',more:3,dev:1,type:'',min1:1,max1:4,min2:1,max2:128,min3:1,max3:4},            // highpoint
    {glue:'' ,more:1,dev:1,type:'',min1:0,max1:15},                                         // hp cciss
    {glue:'' ,more:0,dev:0,type:''},                                                        // marvell
-   {glue:',',more:1,dev:1,type:'',min1:0,max1:127}                                         // megaraid
-   {glue:',',more:1,dev:0,type:'input'},min1:'',max1:'0xffffffff'},                        // cypress
+   {glue:',',more:1,dev:1,type:'',min1:0,max1:127},                                        // megaraid
+   {glue:',',more:1,dev:0,type:'input',min1:'',max1:'0xffffffff'},                         // cypress
    {glue:',',more:3,dev:0,type:'select',min1:'',max1:'p',min2:'',max2:'x',min3:1,max3:128},// jmicron ata
    {glue:'' ,more:0,dev:0,type:''},                                                        // prolific
    {glue:'' ,more:0,dev:0,type:''},                                                        // sunplus