MAME SVN History

199869 Revisions

r20136 Wednesday 9th January, 2013 at 01:10:44 UTC by R. Belmont
(MESS) Apollo fixes: [Hans Ostermeyer] * fixed MLOG: machine -> machine() * use the correct address space for dma (supplied space parameter is wrong; why?) * minor fix for 64 Bit Ubuntu * block_set_filemark() failed to set the filemark buffer; memcpy will now use 64 bit words (i.e. 8 byte chunks) for copying

[src/mess/includes]	apollo.h
[src/mess/machine]	apollo.c apollo_eth.c sc499.c

trunk/src/mess/machine/sc499.c
r20135	r20136
1098	1098	void sc499_device::block_set_filemark()
1099	1099	{
1100	1100	static const UINT8 fm_pattern[] = {0xDE, 0xAF, 0xFA, 0xED};
	1101	int i;
1101	1102
1102		memcpy(m_ctape_block_buffer, fm_pattern, 4);
1103		memcpy(m_ctape_block_buffer+4, m_ctape_block_buffer, SC499_CTAPE_BLOCK_SIZE-4);
	1103	for (i = 0; i < SC499_CTAPE_BLOCK_SIZE; i += 4)
	1104	{
	1105	memcpy(m_ctape_block_buffer + i, fm_pattern, 4);
	1106	}
1104	1107	}
1105	1108
1106	1109	//**************************************************************************

trunk/src/mess/machine/apollo.c
r20135	r20136
435	435	offset &= 0x3ff;
436	436	}
437	437
438		data = space.read_byte(page_offset + offset);
	438	data = machine().firstcpu->space(AS_PROGRAM).read_byte(page_offset + offset);
439	439
440	440	if (VERBOSE > 1 \|\| offset < 4 \|\| (offset & 0xff) == 0 \|\| (offset & 0xff) == 0xff)
441	441	{
r20135	r20136
455	455	offset &= 0x3ff;
456	456	}
457	457	// FIXME: MSB not available, writing only LSB
458		space.write_byte(page_offset + offset, data);
	458	machine().firstcpu->space(AS_PROGRAM).write_byte(page_offset + offset, data);
459	459
460	460	if (VERBOSE > 1 \|\| offset < 4 \|\| (offset & 0xff) == 0 \|\| (offset & 0xff) == 0xff)
461	461	{
r20135	r20136
477	477	offset = (offset << 1) & 0x3ff;
478	478	}
479	479
480		data = space.read_byte(page_offset + offset);
	480	data = machine().firstcpu->space(AS_PROGRAM).read_byte(page_offset + offset);
481	481
482	482	SLOG1(("dma read word at offset %x+%03x = %04x", page_offset, offset , data));
483	483	// FIXME: MSB will get lost
r20135	r20136
501	501	offset = (offset << 1) & 0x3ff;
502	502	}
503	503
504		space.write_byte(page_offset + offset, data);
	504	machine().firstcpu->space(AS_PROGRAM).write_byte(page_offset + offset, data);
505	505	SLOG1(("dma write word at offset %x+%03x = %02x", page_offset, offset, data));
506	506	}
507	507
r20135	r20136
1104	1104
1105	1105	#if defined(APOLLO_FOR_LINUX)
1106	1106	device_t device = (device_t ) ptr;
	1107	address_space &space = device->machine().device(MAINCPU)->memory().space(AS_PROGRAM);
1107	1108	UINT8 data;
1108	1109
1109	1110	#define SRA 0x01
r20135	r20136
1275	1276	// machine/apollo_fdc.c - APOLLO DS3500 Floppy disk controller
1276	1277	//##########################################################################
1277	1278
1278		#undef VERBOSE
1279		#define VERBOSE 0
1280
1281	1279	FLOPPY_FORMATS_MEMBER( apollo_state::floppy_formats )
1282	1280	FLOPPY_APOLLO_FORMAT
1283	1281	FLOPPY_FORMATS_END

trunk/src/mess/machine/apollo_eth.c
r20135	r20136
115	115	}
116	116	else if (packet_len > sizeof(rx_buffer))
117	117	{
118		DLOG(("apollo_eth_receive_packet: data size (%d) exceeds rx buffer size (%d)!!!", packet_len, sizeof(rx_buffer)));
	118	DLOG(("apollo_eth_receive_packet: data size (%d) exceeds rx buffer size (%d)!!!", packet_len, (int)sizeof(rx_buffer)));
119	119	return -1;
120	120	}
121	121

trunk/src/mess/includes/apollo.h
r20135	r20136
35	35	#define DLOG(x) { logerror ("%s - %s: ", apollo_cpu_context(device->machine().device(MAINCPU)), device->tag()); LOG(x) }
36	36	#define DLOG1(x) { if (VERBOSE > 0) DLOG(x) }
37	37	#define DLOG2(x) { if (VERBOSE > 1) DLOG(x) }
38		#define MLOG(x) { logerror ("%s: ", apollo_cpu_context(machine.device(MAINCPU))); LOG(x) }
	38	#define MLOG(x) { logerror ("%s: ", apollo_cpu_context(machine().device(MAINCPU))); LOG(x) }
39	39	#define MLOG1(x) { if (VERBOSE > 0) MLOG(x) }
40	40	#define MLOG2(x) { if (VERBOSE > 1) MLOG(x) }
41	41	#define SLOG(x) { logerror ("%s: ", apollo_cpu_context(&space.device())); LOG(x) }

199869 Revisions