From 568100bd8bba1f31c90844a756173a2ccb5e646e Mon Sep 17 00:00:00 2001
From: Angelo Salese <angelosa@users.noreply.github.com>
Date: Mon, 28 Oct 2013 01:54:14 +0000
Subject: [PATCH] Added a bunch of commands

---
 src/mame/drivers/jaguar.c  | 86 +++++++++++++++++++++++++++++++++++---
 src/mame/includes/jaguar.h | 14 +++++--
 2 files changed, 92 insertions(+), 8 deletions(-)

diff --git a/src/mame/drivers/jaguar.c b/src/mame/drivers/jaguar.c
index 8aacded1038..bdcfd35f285 100644
--- a/src/mame/drivers/jaguar.c
+++ b/src/mame/drivers/jaguar.c
@@ -344,6 +344,10 @@ Notes:
 #include "imagedev/snapquik.h"
 #include "sound/dac.h"
 #include "machine/eepromser.h"
+#include "sound/cdda.h"
+#include "cdrom.h"
+#include "imagedev/chd_cd.h"
+
 
 #define COJAG_CLOCK         XTAL_52MHz
 #define R3000_CLOCK         XTAL_40MHz
@@ -382,10 +386,13 @@ void jaguar_state::machine_reset()
 		memcpy(m_shared_ram, m_rom_base, 0x400);    // do not increase, or Doom breaks
 		m_maincpu->set_input_line(INPUT_LINE_RESET, PULSE_LINE);
 
-		/* hack until I understand */
 		if(m_is_jagcd)
 		{
-			m_shared_ram[0x4/4] = 0x00802000;
+			m_shared_ram[0x4/4] = 0x00802000; /* hack until I understand */
+
+			m_cd_file = m_cdrom->get_cdrom_file();
+			m_butch_cmd_index = 0;
+			m_butch_cmd_size = 1;
 		}
 	}
 
@@ -1161,7 +1168,8 @@ READ32_MEMBER(jaguar_state::butch_regs_r)
 	switch(offset*4)
 	{
 		case 8: //DS DATA
-			return m_butch_cmd_response;
+			//m_butch_regs[0] &= ~0x2000;
+			return m_butch_cmd_response[(m_butch_cmd_index++) % m_butch_cmd_size];
 	}
 
 	return m_butch_regs[offset];
@@ -1176,13 +1184,73 @@ WRITE32_MEMBER(jaguar_state::butch_regs_w)
 		case 8: //DS DATA
 			switch((m_butch_regs[offset] & 0xff00) >> 8)
 			{
+				case 0x03: // Read TOC
+					UINT32 msf;
+
+					if(m_butch_regs[offset] & 0xff) // Multi Session CD, TODO
+					{
+						m_butch_cmd_response[0] = 0x0029; // illegal value
+						m_butch_regs[0] |= 0x2000;
+						m_butch_cmd_index = 0;
+						m_butch_cmd_size = 1;
+						return;
+					}
+
+					msf = cdrom_get_track_start(m_cd_file, 0) + 150;
+
+					/* first track number */
+					m_butch_cmd_response[0] = 0x2000 | 1;
+					/* last track number */
+					m_butch_cmd_response[1] = 0x2100 | cdrom_get_last_track(m_cd_file);
+
+					/* start of first track minutes */
+					m_butch_cmd_response[2] = 0x2200 | ((msf / 60) / 60);
+					/* start of first track seconds */
+					m_butch_cmd_response[3] = 0x2300 | (msf / 60) % 60;
+					/* start of first track frame */
+					m_butch_cmd_response[4] = 0x2400 | (msf % 75);
+					m_butch_regs[0] |= 0x2000;
+					m_butch_cmd_index = 0;
+					m_butch_cmd_size = 5;
+					break;
+				case 0x14: // Read Long TOC
+					{
+						UINT32 msf;
+						int ntrks = cdrom_get_last_track(m_cd_file);
+
+						for(int i=0;i<ntrks;i++)
+						{
+							msf = cdrom_get_track_start(m_cd_file, i) + 150;
+
+							/* track number */
+							m_butch_cmd_response[i*5+0] = 0x6000 | (i+1);
+							/* attributes (?) */
+							m_butch_cmd_response[i*5+1] = 0x6100 | 0x00;
+
+							/* start of track minutes */
+							m_butch_cmd_response[i*5+2] = 0x6200 | ((msf / 60) / 60);
+							/* start of track seconds */
+							m_butch_cmd_response[i*5+3] = 0x6300 | (msf / 60) % 60;
+							/* start of track frame */
+							m_butch_cmd_response[i*5+4] = 0x6400 | (msf % 75);
+						}
+						m_butch_regs[0] |= 0x2000;
+						m_butch_cmd_index = 0;
+						m_butch_cmd_size = 5*ntrks;
+					}
+
+					break;
 				case 0x15: // Set Mode
 					m_butch_regs[0] |= 0x2000;
-					m_butch_cmd_response = 0x1700 | (m_butch_regs[offset] & 0xff);
+					m_butch_cmd_response[0] = 0x1700 | (m_butch_regs[offset] & 0xff);
+					m_butch_cmd_index = 0;
+					m_butch_cmd_size = 1;
 					break;
 				case 0x70: // Set DAC Mode
 					m_butch_regs[0] |= 0x2000;
-					m_butch_cmd_response = 0x7000 | (m_butch_regs[offset] & 0xff);
+					m_butch_cmd_response[0] = 0x7000 | (m_butch_regs[offset] & 0xff);
+					m_butch_cmd_index = 0;
+					m_butch_cmd_size = 1;
 					break;
 				default:
 					printf("%04x CMD\n",m_butch_regs[offset]);
@@ -1794,6 +1862,12 @@ static MACHINE_CONFIG_START( jaguar, jaguar_state )
 	MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
 MACHINE_CONFIG_END
 
+struct cdrom_interface jagcd_cdrom =
+{
+	"jag_cdrom",
+	NULL
+};
+
 static MACHINE_CONFIG_DERIVED( jaguarcd, jaguar )
 	MCFG_CPU_MODIFY("maincpu")
 	MCFG_CPU_PROGRAM_MAP(jaguarcd_map)
@@ -1805,6 +1879,8 @@ static MACHINE_CONFIG_DERIVED( jaguarcd, jaguar )
 	MCFG_CPU_MODIFY("dsp")
 	MCFG_JAGUAR_IRQ_HANDLER(WRITELINE(jaguar_state, dsp_cpu_int))
 	MCFG_CPU_PROGRAM_MAP(jagcd_dsp_map)
+
+	MCFG_CDROM_ADD( "cdrom",jagcd_cdrom )
 MACHINE_CONFIG_END
 
 /*************************************
diff --git a/src/mame/includes/jaguar.h b/src/mame/includes/jaguar.h
index b39f55f0cbe..c289076dce6 100644
--- a/src/mame/includes/jaguar.h
+++ b/src/mame/includes/jaguar.h
@@ -1,5 +1,5 @@
-// license:BSD-3-Clause
-// copyright-holders:Aaron Giles
+// license:MAME
+// copyright-holders:Aaron Giles,Nathan Woods,Angelo Salese, Robbbert
 /*************************************************************************
 
     Atari Jaguar hardware
@@ -12,6 +12,8 @@
 #include "machine/eepromser.h"
 #include "machine/vt83c461.h"
 #include "imagedev/snapquik.h"
+#include "cdrom.h"
+#include "imagedev/chd_cd.h"
 
 #ifndef ENABLE_SPEEDUP_HACKS
 #define ENABLE_SPEEDUP_HACKS 1
@@ -32,6 +34,7 @@ public:
 			m_dsp(*this, "dsp"),
 			m_dac1(*this, "dac1"),
 			m_dac2(*this, "dac2"),
+			m_cdrom(*this, "cdrom"),
 			m_nvram(*this, "nvram"),
 			m_rom_base(*this, "rom"),
 			m_cart_base(*this, "cart"),
@@ -68,6 +71,7 @@ public:
 	required_device<jaguardsp_cpu_device> m_dsp;
 	required_device<dac_device> m_dac1;
 	required_device<dac_device> m_dac2;
+	optional_device<cdrom_image_device> m_cdrom;
 
 	// memory
 	optional_shared_ptr<UINT32> m_nvram;        // not used on console
@@ -120,7 +124,11 @@ public:
 	UINT8 m_blend_y[65536];
 	UINT8 m_blend_cc[65536];
 	UINT32 m_butch_regs[0x40/4];
-	UINT32 m_butch_cmd_response;
+	UINT32 m_butch_cmd_response[0x102];
+	UINT8 m_butch_cmd_index;
+	UINT8 m_butch_cmd_size;
+	cdrom_file  *m_cd_file;
+	const cdrom_toc*    m_toc;
 
 	static void (jaguar_state::*const bitmap4[8])(UINT16 *, INT32, INT32, UINT32 *, INT32, UINT16 *);
 	static void (jaguar_state::*const bitmap8[8])(UINT16 *, INT32, INT32, UINT32 *, INT32, UINT16 *);