Support for changing CD volume via 0x0E audio control page.

lib/SCSI2SD/src/firmware/mode.c

@@ -658,6 +658,11 @@ static void doModeSelect(void)
 				}
 			}
 			break;
+			case 0x0E: // CD audio control page
+			{
+				if (!modeSelectCDAudioControlPage(pageLen, idx)) goto bad;
+			}
+			break;
 			//default:
 
 				// Easiest to just ignore for now. We'll get here when changing

src/BlueSCSI_mode.cpp

@@ -29,6 +29,7 @@
 #include "BlueSCSI_audio.h"
 #endif
 #include "BlueSCSI_cdrom.h"
+#include "BlueSCSI_log.h"
 
 extern "C" {
 #include "BlueSCSI_mode.h"
@@ -54,8 +55,8 @@ static const uint8_t CDROMAudioControlParametersPage[] =
 0x00, // reserved
 0x80, // 1 LBAs/sec multip
 0x00, 0x4B, // 75 LBAs/sec
-0x03, 0xFF, // output port 0 active, max volume
-0x03, 0xFF, // output port 1 active, max volume
+0x01, 0xFF, // output port 0 active, max volume
+0x02, 0xFF, // output port 1 active, max volume
 0x00, 0x00, // output port 2 inactive
 0x00, 0x00 // output port 3 inactive
 };
@@ -134,3 +135,27 @@ int modeSenseCDAudioControlPage(int pc, int idx, int pageCode, int* pageFound)
     return 0;
 #endif
 }
+
+extern "C"
+int modeSelectCDAudioControlPage(int pageLen, int idx)
+{
+#ifdef ENABLE_AUDIO_OUTPUT
+    if (scsiDev.target->cfg->deviceType == S2S_CFG_OPTICAL)
+    {
+        if (pageLen != 0x0E) return 0;
+        uint8_t volL = scsiDev.data[idx+9];
+        uint8_t volR = scsiDev.data[idx+11];
+        // only support setting channels to same volume, just pick higher
+        uint8_t vol = (volL > volR) ? volL : volR;
+        debuglog("------ CD audio control page volume (", volL, ",", volR, ")");
+        audio_set_volume(scsiDev.target->targetId, vol);
+        return 1;
+    }
+    else
+    {
+        return 0;
+    }
+#else
+    return 0;
+#endif
+}

src/BlueSCSI_mode.h

@@ -23,3 +23,5 @@
 
 int modeSenseCDDevicePage(int pc, int idx, int pageCode, int* pageFound);
 int modeSenseCDAudioControlPage(int pc, int idx, int pageCode, int* pageFound);
+
+int modeSelectCDAudioControlPage(int pageLen, int idx);