OSDN > 브라 우즈 소프트웨어 > Software Development > csp-qt > SCM > git > common_source_project-fm7 > Commit

csp-qt
Fork

common_source_project-fm7: Commit

Common Source Code Project for Qt (a.k.a for FM-7).

Revision	2e15ae8e0b1aa2090bc6b331bb88edf355b124be (tree)
Time	2020-01-28 06:14:59
Author	K.Ohta <whatisthis.sowhat@gmai...>
Commiter	K.Ohta

[VM][FMTOWNS][CDC][WIP] Adjusting around CDC.

--- a/source/src/vm/fmtowns/cdc.cpp

+++ b/source/src/vm/fmtowns/cdc.cpp

		@@ -102,7 +102,7 @@ void CDC::write_io8(uint32_t address, uint32_t data)
102	102	* 04C4h : Parameter register
103	103	* 04C6h : Transfer control register.
104	104	*/
105		-
	105	+ out_debug_log(_T("WRITE I/O: ADDR=%04X DATA=%02X"), address, data);
106	106	switch(address & 0x0f) {
107	107	case 0x00: // Master control register
108	108	{

		@@ -299,6 +299,7 @@ uint32_t CDC::read_io8(uint32_t address)
299	299	val = d_cdrom->read_subq();
300	300	break;
301	301	}
	302	+// out_debug_log(_T("READ I/O: ADDR=%04X VAL=%02X"), address, val);
302	303	return val;
303	304	}
304	305

		@@ -328,6 +329,7 @@ void CDC::read_cdrom(bool req_reply)
328	329	if(d_cdrom != NULL) {
329	330	track = d_cdrom->get_track(lba1);
330	331	}
	332	+ out_debug_log(_T("READ_CDROM TRACK=%d LBA1=%06X LBA2=%06X F1/S1/M1=%02X/%02X/%02X F2/S2/M2=%02X/%02X/%02X"), track, lba1, lba2, f1, s1, m1, f2, s2, m2);
331	333	if(track < 2) {
332	334	if(lba1 >= 150) {
333	335	lba1 = lba1 - 150;

		@@ -601,13 +603,17 @@ void CDC::write_signal(int ch, uint32_t data, uint32_t mask)
601	603	{
602	604	switch(ch) {
603	605	case SIG_TOWNS_CDC_DRQ:
604		- if((dma_transfer) && ((data & mask) != 0)) {
605		- software_transfer_phase = false;
606		- write_signals(&output_dma_line, 0xffffffff); // Indirect call do_dma().
607		- } else if((pio_transfer) && ((data & mask) != 0)) {
608		- software_transfer_phase = true;
609		- } else if(!((data & mask) != 0)) {
610		- software_transfer_phase = false;
	606	+ if((data & mask) != 0) {
	607	+ if((dma_transfer) ) {
	608	+ software_transfer_phase = false;
	609	+// uint8_t val = d_scsi_host->read_dma_io8(0);
	610	+ d_dmac->write_signal(SIG_UPD71071_CH3, data, mask);
	611	+// write_signals(&output_dma_line, val); // Indirect call do_dma().
	612	+ } else if((pio_transfer) ) {
	613	+ software_transfer_phase = true;
	614	+ } else {
	615	+ software_transfer_phase = false;
	616	+ }
611	617	}
612	618	break;
613	619	case SIG_TOWNS_CDC_CDROM_DONE:

--- a/source/src/vm/fmtowns/fmtowns.cpp

+++ b/source/src/vm/fmtowns/fmtowns.cpp

		@@ -304,6 +304,7 @@ VM::VM(EMU* parent_emu) : VM_TEMPLATE(parent_emu)
304	304	dma->set_context_ch1(scsi_host);
305	305	//dma->set_context_ch2(printer);
306	306	dma->set_context_ch3(cdc);
	307	+ //dma->set_context_ch3(cdc_scsi);
307	308	dma->set_context_child_dma(extra_dma);
308	309
309	310	floppy->set_context_fdc(fdc);

		@@ -339,6 +340,8 @@ VM::VM(EMU* parent_emu) : VM_TEMPLATE(parent_emu)
339	340	cdrom->scsi_id = 0;
340	341	cdrom->set_context_interface(cdc_scsi);
341	342	cdc_scsi->set_context_target(cdrom);
	343	+ cdrom->set_context_done(cdc, SIG_TOWNS_CDC_CDROM_DONE, 1);
	344	+
342	345	cdc->set_context_cdrom(cdrom);
343	346	cdc->set_context_scsi_host(cdc_scsi);
344	347	cdc->set_context_dmac(dma);

--- a/source/src/vm/fmtowns/fmtowns.h

+++ b/source/src/vm/fmtowns/fmtowns.h