::reset() now works

Author: mywave82

src/retrowave.cc

@@ -122,10 +122,21 @@ RetroWaveOpl::RetroWaveOpl(const char *filename)
 	io_prepare();
 	flush();
 
+	/* GPIOA.0 = /IC  Initial clear (Reset)
+	 * GPIOA.1 = A0   Low=Address, High=Data
+	 * GPIOA.2 = A1   Low=Bank0,   High=Bank1
+	 * GPIOA.3 = /WR  Write enable
+	 * GPIOA.4 = /CS  Chip Select
+	 * GPIOA.5 =
+	 * GPIOA.6 =
+	 * GPIOA.7 =
+	 * GPIOB[0:7] = D[0:7]
+	 */
+
 	for (uint8_t i=0x20; i<0x28; i++)
 	{
 		cmd_prepare((uint8_t)(i<<1), 0x0a, 1); // IOCON register
-		cmd_buffer[cmd_buffer_used++] = 0x28;  // Enable: HAEN, SEQOP
+		cmd_buffer[cmd_buffer_used++] = 0x28;  // HAEN=1 SEQOP=1 BANK=0
 		io_prepare();
 		flush();
 
@@ -172,24 +183,24 @@ void RetroWaveOpl::cmd_prepare(uint8_t io_addr, uint8_t io_reg, const int len)
 
 void RetroWaveOpl::queue_port0(uint8_t reg, uint8_t val)
 {
-	cmd_prepare(RetroWave_Board_OPL3, 0x12, 6);
+	cmd_prepare(RetroWave_Board_OPL3, 0x12, 6); // GPIOA register
 	cmd_buffer[cmd_buffer_used++] = 0xe1;
 	cmd_buffer[cmd_buffer_used++] = reg;
 	cmd_buffer[cmd_buffer_used++] = 0xe3;
 	cmd_buffer[cmd_buffer_used++] = val;
 	cmd_buffer[cmd_buffer_used++] = 0xfb;
-	cmd_buffer[cmd_buffer_used++] = val;
+	cmd_buffer[cmd_buffer_used++] = val; // Retrowave express OPL3 seems to only like even data writes
 }
 
 void RetroWaveOpl::queue_port1(uint8_t reg, uint8_t val)
 {
-	cmd_prepare(RetroWave_Board_OPL3, 0x12, 6);
+	cmd_prepare(RetroWave_Board_OPL3, 0x12, 6); // GPIOA register
 	cmd_buffer[cmd_buffer_used++] = 0xe5;
 	cmd_buffer[cmd_buffer_used++] = reg;
 	cmd_buffer[cmd_buffer_used++] = 0xe7;
 	cmd_buffer[cmd_buffer_used++] = val;
-	cmd_buffer[cmd_buffer_used++] = 0xfb;
-	cmd_buffer[cmd_buffer_used++] = val;
+	cmd_buffer[cmd_buffer_used++] = 0xff;
+	cmd_buffer[cmd_buffer_used++] = val; // Retrowave express OPL3 seems to only like even data writes
 }
 
 void RetroWaveOpl::reset(void)
@@ -200,62 +211,73 @@ void RetroWaveOpl::reset(void)
 		flush();
 	}
 
-	cmd_prepare(RetroWave_Board_OPL3, 0x12, 1);
+#if 1 /* reset using /IC pin */
+	cmd_prepare(RetroWave_Board_OPL3, 0x12, 1); // GPIOA register
 	cmd_buffer[cmd_buffer_used++] = 0xfe;
+	cmd_buffer[cmd_buffer_used++] = 0x00; // Retrowave express OPL3 seems to only like even data writes
 	io_prepare();
 	flush();
 
-	cmd_prepare(RetroWave_Board_OPL3, 0x12, 1);
+	usleep (1700); // chip needs about 1.6ms to safely reset
+
+	cmd_prepare(RetroWave_Board_OPL3, 0x12, 1); // GPIOA register
 	cmd_buffer[cmd_buffer_used++] = 0xff;
+	cmd_buffer[cmd_buffer_used++] = 0x00; // Retrowave express OPL3 seems to only like even data writes
 	io_prepare();
 	flush();
+#else /* reset by defaulting all registers */
+	queue_port1 (5, 1); // Enable OPL3 mode
+	queue_port1 (4, 0); // Disable all 4-OP connections
 
-	queue_port1 (5, 1);
-	queue_port1 (4, 0);
-
-	for (int i=0x20; i < 0x35; i++)
+	for (int i=0x20; i <= 0x35; i++)
+	{
+		queue_port0 (i, 0);
+		queue_port1 (i, 0);
+	}
+	for (int i=0x40; i <= 0x45; i++)
 	{
 		queue_port0 (i, 0);
 		queue_port1 (i, 0);
 	}
-	for (int i=0xa0; i < 0xa8; i++)
+	for (int i=0xa0; i <= 0xa8; i++)
 	{
 		queue_port0 (i, 0);
 		queue_port1 (i, 0);
 	}
-	for (int i=0xb0; i < 0xb8; i++)
+	for (int i=0xb0; i <= 0xb8; i++)
 	{
 		queue_port0 (i, 0);
 		queue_port1 (i, 0);
 	}
-	for (int i=0xbd; i < 0xbd; i++)
+	for (int i=0xbd; i <= 0xbd; i++)
 	{
 		queue_port0 (i, 0);
 		queue_port1 (i, 0);
 	}
-	for (int i=0xc0; i < 0xc8; i++)
+	for (int i=0xc0; i <= 0xc8; i++)
 	{
-		queue_port0 (i, 0x30);
-		queue_port1 (i, 0x30);
+		queue_port0 (i, 0x30); // Enable Left and Right
+		queue_port1 (i, 0x30); // Enable Left and Right
 	}
-	for (int i=0xe0; i < 0xf5; i++)
+	for (int i=0xe0; i <= 0xf5; i++)
 	{
 		queue_port0 (i, 0);
 		queue_port1 (i, 0);
 	}
-	for (int i=0x08; i < 0x08; i++)
+	for (int i=0x08; i <= 0x08; i++)
 	{
 		queue_port0 (i, 0);
 		queue_port1 (i, 0);
 	}
-	for (int i=0x01; i < 0x01; i++)
+	for (int i=0x01; i <= 0x01; i++)
 	{
 		queue_port0 (i, 0);
 		queue_port1 (i, 0);
 	}
-	queue_port1 (5, 0);
+	queue_port1 (5, 0); // OPL2 mode
 	io_prepare();
 	flush();
+#endif
 }
 
 void RetroWaveOpl::io_prepare(void)