Previous

199869 Revisions

Next

r26886 Thursday 2nd January, 2014 at 05:40:15 UTC by R. Belmont
(MESS) mac: cleanup (nw)

[src/mess/drivers]	mac.c macpci.c
[src/mess/includes]	mac.h
[src/mess/machine]	mac.c mackbd.h

trunk/src/mess/machine/mackbd.h

r26885	r26886
11	11	//  INTERFACE CONFIGURATION MACROS
12	12	//**************************************************************************
13	13
	14	#define MACKBD_DEFAULT_TAG "mackbd"
	15
	16	#define MCFG_MACKBD_ADD() \
	17	MCFG_DEVICE_ADD(MACKBD_DEFAULT_TAG, MACKBD, 0)
	18
	19	#define MCFG_MACKBD_REPLACE() \
	20	MCFG_DEVICE_REPLACE(MACKBD_DEFAULT_TAG, MACKBD, 0)
	21
	22	#define MCFG_MACKBD_REMOVE() \
	23	MCFG_DEVICE_REMOVE(MACKBD_DEFAULT_TAG)
	24
14	25	#define MCFG_MACKBD_CLKOUT_HANDLER(_devcb) \
15	26	devcb = &mackbd_device::set_clkout_handler(*device, DEVCB2_##_devcb);
16	27

trunk/src/mess/machine/mac.c

r26885	r26886
1185	1185
1186	1186	switch (m_model)
1187	1187	{
1188		case MODEL_MAC_PORTABLE:
1189		case MODEL_MAC_PB100:
1190		#if LOG_ADB
1191		//          printf("Read PM data %x\n", m_pm_data_recv);
1192		#endif
1193		return m_pm_data_recv;
1194
1195	1188	case MODEL_MAC_CLASSIC:
1196	1189	case MODEL_MAC_II:
1197	1190	case MODEL_MAC_II_FDHD:
r26885	r26886
1244	1237	return 0x80;
1245	1238	}
1246	1239
	1240	READ8_MEMBER(mac_state::mac_via_in_a_pmu)
	1241	{
	1242	//  printf("VIA1 IN_A (PC %x)\n", m_maincpu->safe_pc());
	1243
	1244	#if LOG_ADB
	1245	//   printf("Read PM data %x\n", m_pm_data_recv);
	1246	#endif
	1247	return m_pm_data_recv;
	1248	}
	1249
1247	1250	READ8_MEMBER(mac_state::mac_via_in_b)
1248	1251	{
1249	1252	int val = 0;
1250		// portable/PB100 is pretty different
1251		if (m_model >= MODEL_MAC_PORTABLE && m_model <= MODEL_MAC_PB100)
	1253	/* video beam in display (! VBLANK && ! HBLANK basically) */
	1254	if (machine().primary_screen)
1252	1255	{
1253		//      printf("Read VIA B: PM_ACK %x\n", m_pm_ack);
1254		val = 0x80 | 0x04 | m_pm_ack;   // SCC wait/request (bit 2 must be set at 900c1a or startup tests always fail)
	1256	if (machine().primary_screen->vpos() >= MAC_V_VIS)
	1257	val |= 0x40;
1255	1258	}
1256		else
	1259
	1260	if (ADB_IS_BITBANG_CLASS)
1257	1261	{
1258		/* video beam in display (! VBLANK && ! HBLANK basically) */
1259		if (machine().primary_screen)
	1262	val |= m_adb_state<<4;
	1263
	1264	if (!m_adb_irq_pending)
1260	1265	{
1261		if (machine().primary_screen->vpos() >= MAC_V_VIS)
1262		val |= 0x40;
	1266	val |= 0x08;
1263	1267	}
1264	1268
1265		if (ADB_IS_BITBANG_CLASS)
1266		{
1267		val |= m_adb_state<<4;
	1269	val |= m_rtc->data_r();
	1270	}
	1271	else if (ADB_IS_EGRET)
	1272	{
	1273	val |= m_egret->get_xcvr_session()<<3;
	1274	}
	1275	else if (ADB_IS_CUDA)
	1276	{
	1277	val |= m_cuda->get_treq()<<3;
	1278	}
	1279	else
	1280	{
	1281	if (m_mouse_bit_y)  /* Mouse Y2 */
	1282	val |= 0x20;
	1283	if (m_mouse_bit_x)  /* Mouse X2 */
	1284	val |= 0x10;
	1285	if ((m_mouse0->read() & 0x01) == 0)
	1286	val |= 0x08;
1268	1287
1269		if (!m_adb_irq_pending)
1270		{
1271		val |= 0x08;
1272		}
	1288	val |= m_rtc->data_r();
	1289	}
1273	1290
1274		val |= m_rtc->data_r();
1275		}
1276		else if (ADB_IS_EGRET)
1277		{
1278		val |= m_egret->get_xcvr_session()<<3;
1279		}
1280		else if (ADB_IS_CUDA)
1281		{
1282		val |= m_cuda->get_treq()<<3;
1283		}
1284		else
1285		{
1286		if (m_mouse_bit_y)  /* Mouse Y2 */
1287		val |= 0x20;
1288		if (m_mouse_bit_x)  /* Mouse X2 */
1289		val |= 0x10;
1290		if ((m_mouse0->read() & 0x01) == 0)
1291		val |= 0x08;
	1291	//  printf("VIA1 IN_B = %02x (PC %x)\n", val, m_maincpu->safe_pc());
1292	1292
1293		if (!ADB_IS_PM_CLASS)
1294		{
1295		val |= m_rtc->data_r();
1296		}
1297		}
	1293	return val;
	1294	}
	1295
	1296	READ8_MEMBER(mac_state::mac_via_in_b_via2pmu)
	1297	{
	1298	int val = 0;
	1299	// TODO: is this valid for VIA2 PMU machines?
	1300	/* video beam in display (! VBLANK && ! HBLANK basically) */
	1301	if (machine().primary_screen)
	1302	{
	1303	if (machine().primary_screen->vpos() >= MAC_V_VIS)
	1304	val |= 0x40;
1298	1305	}
1299	1306
1300	1307	//  printf("VIA1 IN_B = %02x (PC %x)\n", val, m_maincpu->safe_pc());
r26885	r26886
1302	1309	return val;
1303	1310	}
1304	1311
	1312	READ8_MEMBER(mac_state::mac_via_in_b_pmu)
	1313	{
	1314	int val = 0;
	1315	//   printf("Read VIA B: PM_ACK %x\n", m_pm_ack);
	1316	val = 0x80 | 0x04 | m_pm_ack;   // SCC wait/request (bit 2 must be set at 900c1a or startup tests always fail)
	1317
	1318	//  printf("VIA1 IN_B = %02x (PC %x)\n", val, m_maincpu->safe_pc());
	1319
	1320	return val;
	1321	}
	1322
1305	1323	WRITE8_MEMBER(mac_state::mac_via_out_a)
1306	1324	{
1307	1325	mac_sound_device *sound = machine().device<mac_sound_device>("custom");
1308	1326	device_t *fdc = machine().device("fdc");
1309	1327	//  printf("VIA1 OUT A: %02x (PC %x)\n", data, m_maincpu->safe_pc());
1310	1328
1311		if (ADB_IS_PM_VIA1)
1312		{
1313		#if LOG_ADB
1314		//      printf("%02x to PM\n", data);
1315		#endif
1316		m_pm_data_send = data;
1317		return;
1318		}
1319
1320	1329	set_scc_waitrequest((data & 0x80) >> 7);
1321	1330	m_screen_buffer = (data & 0x40) >> 6;
1322	1331	sony_set_sel_line(fdc,(data & 0x20) >> 5);
r26885	r26886
1344	1353	}
1345	1354	}
1346	1355
	1356	WRITE8_MEMBER(mac_state::mac_via_out_a_pmu)
	1357	{
	1358	//  printf("VIA1 OUT A: %02x (PC %x)\n", data, m_maincpu->safe_pc());
	1359
	1360	#if LOG_ADB
	1361	//   printf("%02x to PM\n", data);
	1362	#endif
	1363	m_pm_data_send = data;
	1364	return;
	1365	}
	1366
1347	1367	WRITE8_MEMBER(mac_state::mac_via_out_b)
1348	1368	{
1349	1369	mac_sound_device *sound = machine().device<mac_sound_device>("custom");
1350	1370	//  printf("VIA1 OUT B: %02x (PC %x)\n", data, m_maincpu->safe_pc());
1351	1371
1352		if (ADB_IS_PM_VIA1)
1353		{
1354		device_t *fdc = machine().device("fdc");
1355
1356		sony_set_sel_line(fdc,(data & 0x20) >> 5);
1357		m_drive_select = ((data & 0x10) >> 4);
1358
1359		if ((data & 1) && !(m_pm_req & 1))
1360		{
1361		#if LOG_ADB
1362		printf("PM: 68k dropping /REQ\n");
1363		#endif
1364
1365		if (m_pm_state == 0)     // do this in receive state only
1366		{
1367		m_pm_data_recv = 0xff;
1368		m_pm_ack |= 2;
1369
1370		// check if length byte matches
1371		if ((m_pm_dptr >= 2) && (m_pm_cmd[1] == (m_pm_dptr-2)))
1372		{
1373		pmu_exec();
1374		#if LOG_ADB
1375		printf("PMU exec: command %02x length %d\n", m_pm_cmd[0], m_pm_cmd[1]);
1376		#endif
1377		}
1378		}
1379		}
1380		else if (!(data & 1) && (m_pm_req & 1))
1381		{
1382		if (m_pm_state == 0)
1383		{
1384		#if LOG_ADB
1385		printf("PM: 68k asserting /REQ, clocking in byte [%d] = %02x\n", m_pm_dptr, m_pm_data_send);
1386		#endif
1387		m_pm_ack &= ~2; // clear, we're waiting for more bytes
1388		m_pm_cmd[m_pm_dptr++] = m_pm_data_send;
1389		}
1390		else    // receiving, so this is different
1391		{
1392		m_pm_data_recv = m_pm_out[m_pm_sptr++];
1393		m_pm_slen--;
1394		m_pm_ack |= 2;  // raise ACK to indicate available byte
1395		#if LOG_ADB
1396		printf("PM: 68k asserted /REQ, sending byte %02x\n", m_pm_data_recv);
1397		#endif
1398
1399		// another byte to send?
1400		if (m_pm_slen)
1401		{
1402		m_pmu_send_timer->adjust(attotime(0, ATTOSECONDS_IN_USEC(100)));
1403		}
1404		else
1405		{
1406		m_pm_state = 0; // back to receive state
1407		m_pmu_send_timer->adjust(attotime::never);
1408		}
1409		}
1410		}
1411
1412		m_pm_req = data & 1;
1413		return;
1414		}
1415
1416	1372	if (AUDIO_IS_CLASSIC)
1417	1373	{
1418	1374	sound->enable_sound((data & 0x80) == 0);
1419	1375	}
1420	1376
	1377	m_rtc->ce_w((data & 0x04)>>2);
	1378	m_rtc->data_w(data & 0x01);
	1379	m_rtc->clk_w((data >> 1) & 0x01);
	1380	}
	1381
	1382	WRITE8_MEMBER(mac_state::mac_via_out_b_bbadb)
	1383	{
	1384	//  printf("VIA1 OUT B: %02x (PC %x)\n", data, m_maincpu->safe_pc());
	1385
1421	1386	// SE and Classic have SCSI enable/disable here
1422	1387	if ((m_model == MODEL_MAC_SE) || (m_model == MODEL_MAC_CLASSIC))
1423	1388	{
r26885	r26886
1437	1402	}
1438	1403	}
1439	1404
1440		if (ADB_IS_BITBANG_CLASS)
1441		{
1442		mac_adb_newaction((data & 0x30) >> 4);
	1405	mac_adb_newaction((data & 0x30) >> 4);
1443	1406
1444		m_rtc->ce_w((data & 0x04)>>2);
1445		m_rtc->data_w(data & 0x01);
1446		m_rtc->clk_w((data >> 1) & 0x01);
1447		}
1448		else if (ADB_IS_EGRET)
	1407	m_rtc->ce_w((data & 0x04)>>2);
	1408	m_rtc->data_w(data & 0x01);
	1409	m_rtc->clk_w((data >> 1) & 0x01);
	1410	}
	1411
	1412	WRITE8_MEMBER(mac_state::mac_via_out_b_egadb)
	1413	{
	1414	//  printf("VIA1 OUT B: %02x (PC %x)\n", data, m_maincpu->safe_pc());
	1415
	1416	#if LOG_ADB
	1417	printf("68K: New Egret state: SS %d VF %d (PC %x)\n", (data>>5)&1, (data>>4)&1, space.device().safe_pc());
	1418	#endif
	1419	m_egret->set_via_full((data&0x10) ? 1 : 0);
	1420	m_egret->set_sys_session((data&0x20) ? 1 : 0);
	1421	}
	1422
	1423	WRITE8_MEMBER(mac_state::mac_via_out_b_cdadb)
	1424	{
	1425	//  printf("VIA1 OUT B: %02x (PC %x)\n", data, m_maincpu->safe_pc());
	1426
	1427	#if LOG_ADB
	1428	printf("68K: New Cuda state: TIP %d BYTEACK %d (PC %x)\n", (data>>5)&1, (data>>4)&1, space.device().safe_pc());
	1429	#endif
	1430	m_cuda->set_byteack((data&0x10) ? 1 : 0);
	1431	m_cuda->set_tip((data&0x20) ? 1 : 0);
	1432	}
	1433
	1434	WRITE8_MEMBER(mac_state::mac_via_out_b_via2pmu)
	1435	{
	1436	//  printf("VIA1 OUT B: %02x (PC %x)\n", data, m_maincpu->safe_pc());
	1437	}
	1438
	1439	WRITE8_MEMBER(mac_state::mac_via_out_b_pmu)
	1440	{
	1441	//  printf("VIA1 OUT B: %02x (PC %x)\n", data, m_maincpu->safe_pc());
	1442
	1443	device_t *fdc = machine().device("fdc");
	1444
	1445	sony_set_sel_line(fdc,(data & 0x20) >> 5);
	1446	m_drive_select = ((data & 0x10) >> 4);
	1447
	1448	if ((data & 1) && !(m_pm_req & 1))
1449	1449	{
1450	1450	#if LOG_ADB
1451		printf("68K: New Egret state: SS %d VF %d (PC %x)\n", (data>>5)&1, (data>>4)&1, space.device().safe_pc());
	1451	printf("PM: 68k dropping /REQ\n");
1452	1452	#endif
1453		m_egret->set_via_full((data&0x10) ? 1 : 0);
1454		m_egret->set_sys_session((data&0x20) ? 1 : 0);
	1453
	1454	if (m_pm_state == 0)     // do this in receive state only
	1455	{
	1456	m_pm_data_recv = 0xff;
	1457	m_pm_ack |= 2;
	1458
	1459	// check if length byte matches
	1460	if ((m_pm_dptr >= 2) && (m_pm_cmd[1] == (m_pm_dptr-2)))
	1461	{
	1462	pmu_exec();
	1463	#if LOG_ADB
	1464	printf("PMU exec: command %02x length %d\n", m_pm_cmd[0], m_pm_cmd[1]);
	1465	#endif
	1466	}
	1467	}
1455	1468	}
1456		else if (ADB_IS_CUDA)
	1469	else if (!(data & 1) && (m_pm_req & 1))
1457	1470	{
1458		#if LOG_ADB
1459		printf("68K: New Cuda state: TIP %d BYTEACK %d (PC %x)\n", (data>>5)&1, (data>>4)&1, space.device().safe_pc());
1460		#endif
1461		m_cuda->set_byteack((data&0x10) ? 1 : 0);
1462		m_cuda->set_tip((data&0x20) ? 1 : 0);
	1471	if (m_pm_state == 0)
	1472	{
	1473	#if LOG_ADB
	1474	printf("PM: 68k asserting /REQ, clocking in byte [%d] = %02x\n", m_pm_dptr, m_pm_data_send);
	1475	#endif
	1476	m_pm_ack &= ~2; // clear, we're waiting for more bytes
	1477	m_pm_cmd[m_pm_dptr++] = m_pm_data_send;
	1478	}
	1479	else    // receiving, so this is different
	1480	{
	1481	m_pm_data_recv = m_pm_out[m_pm_sptr++];
	1482	m_pm_slen--;
	1483	m_pm_ack |= 2;  // raise ACK to indicate available byte
	1484	#if LOG_ADB
	1485	printf("PM: 68k asserted /REQ, sending byte %02x\n", m_pm_data_recv);
	1486	#endif
	1487
	1488	// another byte to send?
	1489	if (m_pm_slen)
	1490	{
	1491	m_pmu_send_timer->adjust(attotime(0, ATTOSECONDS_IN_USEC(100)));
	1492	}
	1493	else
	1494	{
	1495	m_pm_state = 0; // back to receive state
	1496	m_pmu_send_timer->adjust(attotime::never);
	1497	}
	1498	}
1463	1499	}
1464		else if (!ADB_IS_PM_CLASS)
1465		{
1466		m_rtc->ce_w((data & 0x04)>>2);
1467		m_rtc->data_w(data & 0x01);
1468		m_rtc->clk_w((data >> 1) & 0x01);
1469		}
	1500
	1501	m_pm_req = data & 1;
1470	1502	}
1471	1503
1472	1504	WRITE_LINE_MEMBER(mac_state::mac_via_irq)
r26885	r26886
1508	1540	}
1509	1541
1510	1542	/* *************************************************************************
1511		* VIA 2 (on Mac IIs and PowerMacs)
	1543	* VIA 2 (on Mac IIs, PowerBooks > 100, and PowerMacs)
1512	1544	* *************************************************************************/
1513	1545
1514	1546	WRITE_LINE_MEMBER(mac_state::mac_via2_irq)
r26885	r26886
1549	1581	READ8_MEMBER(mac_state::mac_via2_in_a)
1550	1582	{
1551	1583	UINT8 result;
1552		if (ADB_IS_PM_VIA2)
	1584
	1585	if ((m_model == MODEL_MAC_QUADRA_700) || (m_model == MODEL_MAC_QUADRA_900) || (m_model == MODEL_MAC_QUADRA_950))
1553	1586	{
1554		result = m_pm_data_recv;
1555		}
1556		else if ((m_model == MODEL_MAC_QUADRA_700) || (m_model == MODEL_MAC_QUADRA_900) || (m_model == MODEL_MAC_QUADRA_950))
1557		{
1558	1587	result = 0x80 | m_nubus_irq_state;
1559	1588	}
1560	1589	else
r26885	r26886
1565	1594	return result;
1566	1595	}
1567	1596
	1597	READ8_MEMBER(mac_state::mac_via2_in_a_pmu)
	1598	{
	1599	return m_pm_data_recv;
	1600	}
	1601
1568	1602	READ8_MEMBER(mac_state::mac_via2_in_b)
1569	1603	{
1570	1604	//  logerror("VIA2 IN B (PC %x)\n", m_maincpu->safe_pc());
1571	1605
1572		if (ADB_IS_PM_VIA2)
1573		{
1574		if (m_pm_ack == 2)
1575		{
1576		return 0xcf;
1577		}
1578		else
1579		{
1580		return 0xcd;
1581		}
1582		}
1583
1584	1606	if ((m_model == MODEL_MAC_LC) || (m_model == MODEL_MAC_LC_II) || (m_model == MODEL_MAC_CLASSIC_II))
1585	1607	{
1586	1608	return 0x4f;
r26885	r26886
1594	1616	return 0xcf;        // indicate no NuBus transaction error
1595	1617	}
1596	1618
1597		WRITE8_MEMBER(mac_state::mac_via2_out_a)
	1619	READ8_MEMBER(mac_state::mac_via2_in_b_pmu)
1598	1620	{
1599		//  logerror("VIA2 OUT A: %02x (PC %x)\n", data, m_maincpu->safe_pc());
1600		if (ADB_IS_PM_VIA2)
	1621	//  logerror("VIA2 IN B (PC %x)\n", m_maincpu->safe_pc());
	1622
	1623	if (m_pm_ack == 2)
1601	1624	{
1602		m_pm_data_send = data;
1603		return;
	1625	return 0xcf;
1604	1626	}
	1627	else
	1628	{
	1629	return 0xcd;
	1630	}
1605	1631	}
1606	1632
	1633	WRITE8_MEMBER(mac_state::mac_via2_out_a)
	1634	{
	1635	//  logerror("VIA2 OUT A: %02x (PC %x)\n", data, m_maincpu->safe_pc());
	1636	}
	1637
	1638	WRITE8_MEMBER(mac_state::mac_via2_out_a_pmu)
	1639	{
	1640	//  logerror("VIA2 OUT A: %02x (PC %x)\n", data, m_maincpu->safe_pc());
	1641	m_pm_data_send = data;
	1642	}
	1643
1607	1644	WRITE8_MEMBER(mac_state::mac_via2_out_b)
1608	1645	{
1609	1646	//  logerror("VIA2 OUT B: %02x (PC %x)\n", data, m_maincpu->safe_pc());
1610	1647
1611		if (ADB_IS_PM_VIA2)
	1648	// chain 60.15 Hz to VIA1
	1649	m_via1->write_ca1(data>>7);
	1650
	1651	if (m_model == MODEL_MAC_II)
1612	1652	{
1613		if ((data & 4) && !(m_pm_req & 4))
	1653	m68000_base_device *m68k = downcast<m68000_base_device *>(m_maincpu.target());
	1654	m68k_set_hmmu_enable(m68k, (data & 0x8) ? M68K_HMMU_DISABLE : M68K_HMMU_ENABLE_II);
	1655	}
	1656	}
	1657
	1658	WRITE8_MEMBER(mac_state::mac_via2_out_b_pmu)
	1659	{
	1660	//   logerror("VIA2 OUT B PMU: %02x (PC %x)\n", data, m_maincpu->pc());
	1661
	1662	if ((data & 4) && !(m_pm_req & 4))
	1663	{
	1664	#if LOG_ADB
	1665	printf("PM: 68k dropping /REQ\n");
	1666	#endif
	1667
	1668	if (m_pm_state == 0)     // do this in receive state only
1614	1669	{
1615		#if LOG_ADB
1616		printf("PM: 68k dropping /REQ\n");
1617		#endif
	1670	m_pm_data_recv = 0xff;
	1671	m_pm_ack |= 2;
1618	1672
1619		if (m_pm_state == 0)     // do this in receive state only
	1673	// check if length byte matches
	1674	if ((m_pm_dptr >= 2) && (m_pm_cmd[1] == (m_pm_dptr-2)))
1620	1675	{
1621		m_pm_data_recv = 0xff;
1622		m_pm_ack |= 2;
1623
1624		// check if length byte matches
1625		if ((m_pm_dptr >= 2) && (m_pm_cmd[1] == (m_pm_dptr-2)))
1626		{
1627		pmu_exec();
1628		#if LOG_ADB
1629		printf("PMU exec: command %02x length %d\n", m_pm_cmd[0], m_pm_cmd[1]);
1630		#endif
1631		}
	1676	pmu_exec();
	1677	#if LOG_ADB
	1678	printf("PMU exec: command %02x length %d\n", m_pm_cmd[0], m_pm_cmd[1]);
	1679	#endif
1632	1680	}
1633	1681	}
1634		else if (!(data & 4) && (m_pm_req & 4))
	1682	}
	1683	else if (!(data & 4) && (m_pm_req & 4))
	1684	{
	1685	if (m_pm_state == 0)
1635	1686	{
1636		if (m_pm_state == 0)
	1687	#if LOG_ADB
	1688	printf("PM: 68k asserting /REQ, clocking in byte [%d] = %02x\n", m_pm_dptr, m_pm_data_send);
	1689	#endif
	1690	m_pm_ack &= ~2; // clear, we're waiting for more bytes
	1691	m_pm_cmd[m_pm_dptr++] = m_pm_data_send;
	1692	}
	1693	else    // receiving, so this is different
	1694	{
	1695	m_pm_data_recv = m_pm_out[m_pm_sptr++];
	1696	m_pm_slen--;
	1697	m_pm_ack |= 2;  // raise ACK to indicate available byte
	1698	#if LOG_ADB
	1699	printf("PM: 68k asserted /REQ, sending byte %02x\n", m_pm_data_recv);
	1700	#endif
	1701
	1702	// another byte to send?
	1703	if (m_pm_slen)
1637	1704	{
1638		#if LOG_ADB
1639		printf("PM: 68k asserting /REQ, clocking in byte [%d] = %02x\n", m_pm_dptr, m_pm_data_send);
1640		#endif
1641		m_pm_ack &= ~2; // clear, we're waiting for more bytes
1642		m_pm_cmd[m_pm_dptr++] = m_pm_data_send;
	1705	m_pmu_send_timer->adjust(attotime(0, ATTOSECONDS_IN_USEC(100)));
1643	1706	}
1644		else    // receiving, so this is different
	1707	else
1645	1708	{
1646		m_pm_data_recv = m_pm_out[m_pm_sptr++];
1647		m_pm_slen--;
1648		m_pm_ack |= 2;  // raise ACK to indicate available byte
1649		#if LOG_ADB
1650		printf("PM: 68k asserted /REQ, sending byte %02x\n", m_pm_data_recv);
1651		#endif
1652
1653		// another byte to send?
1654		if (m_pm_slen)
1655		{
1656		m_pmu_send_timer->adjust(attotime(0, ATTOSECONDS_IN_USEC(100)));
1657		}
1658		else
1659		{
1660		m_pm_state = 0; // back to receive state
1661		m_pmu_send_timer->adjust(attotime::never);
1662		}
	1709	m_pm_state = 0; // back to receive state
	1710	m_pmu_send_timer->adjust(attotime::never);
1663	1711	}
1664	1712	}
1665
1666		m_pm_req = data & 4;
1667		return;
1668	1713	}
1669		else
1670		{
1671		// chain 60.15 Hz to VIA1
1672		m_via1->write_ca1(data>>7);
1673		}
1674	1714
1675		if (m_model == MODEL_MAC_II)
1676		{
1677		m68000_base_device *m68k = downcast<m68000_base_device *>(m_maincpu.target());
1678		m68k_set_hmmu_enable(m68k, (data & 0x8) ? M68K_HMMU_DISABLE : M68K_HMMU_ENABLE_II);
1679		}
	1715	m_pm_req = data & 4;
1680	1716	}
1681	1717
1682	1718	// This signal is generated internally on RBV, V8, Sonora, VASP, Eagle, etc.
r26885	r26886
1704	1740	this->m_adb_timer->adjust(attotime::never);
1705	1741	m_pmu_int_status = 0;
1706	1742	}
1707
1708	1743	}
1709	1744
1710	1745	if (machine().primary_screen)

trunk/src/mess/includes/mac.h

r26885	r26886
27	27	#define MAC_SCREEN_NAME "screen"
28	28	#define MAC_539X_1_TAG "scsi:539x_1"
29	29	#define MAC_539X_2_TAG "scsi:539x_2"
30		#define MACKBD_TAG  "mackbd"
31	30
32	31	// uncomment to run i8021 keyboard in orignal Mac/512(e)/Plus
33	32	//#define MAC_USE_EMULATED_KBD (1)
r26885	r26886
39	38	#define ADB_IS_EGRET_NONCLASS   (mac->m_model >= MODEL_MAC_LC && mac->m_model <= MODEL_MAC_CLASSIC_II) || ((mac->m_model >= MODEL_MAC_IISI) && (mac->m_model <= MODEL_MAC_IIVI))
40	39	#define ADB_IS_CUDA     ((m_model >= MODEL_MAC_COLOR_CLASSIC && m_model <= MODEL_MAC_LC_580) || ((m_model >= MODEL_MAC_QUADRA_660AV) && (m_model <= MODEL_MAC_QUADRA_630)) || (m_model >= MODEL_MAC_POWERMAC_6100))
41	40	#define ADB_IS_CUDA_NONCLASS        ((mac->m_model >= MODEL_MAC_COLOR_CLASSIC && mac->m_model <= MODEL_MAC_LC_580) || ((mac->m_model >= MODEL_MAC_QUADRA_660AV) && (mac->m_model <= MODEL_MAC_QUADRA_630)) || (mac->m_model >= MODEL_MAC_POWERMAC_6100))
42		#define ADB_IS_PM_VIA1  (m_model >= MODEL_MAC_PORTABLE && m_model <= MODEL_MAC_PB100)
43		#define ADB_IS_PM_VIA2  (m_model >= MODEL_MAC_PB140 && m_model <= MODEL_MAC_PBDUO_270c)
44	41	#define ADB_IS_PM_VIA1_CLASS    (m_model >= MODEL_MAC_PORTABLE && m_model <= MODEL_MAC_PB100)
45	42	#define ADB_IS_PM_VIA2_CLASS    (m_model >= MODEL_MAC_PB140 && m_model <= MODEL_MAC_PBDUO_270c)
46	43	#define ADB_IS_PM_CLASS ((m_model >= MODEL_MAC_PORTABLE && m_model <= MODEL_MAC_PB100) || (m_model >= MODEL_MAC_PB140 && m_model <= MODEL_MAC_PBDUO_270c))
r26885	r26886
203	200	m_539x_1(*this, MAC_539X_1_TAG),
204	201	m_539x_2(*this, MAC_539X_2_TAG),
205	202	m_ncr5380(*this, "scsi:ncr5380"),
206		m_mackbd(*this, MACKBD_TAG),
	203	m_mackbd(*this, MACKBD_DEFAULT_TAG),
207	204	m_rtc(*this,"rtc"),
208	205	m_mouse0(*this, "MOUSE0"),
209	206	m_mouse1(*this, "MOUSE1"),
r26885	r26886
519	516	DECLARE_READ8_MEMBER(mac_via_in_b);
520	517	DECLARE_WRITE8_MEMBER(mac_via_out_a);
521	518	DECLARE_WRITE8_MEMBER(mac_via_out_b);
	519	DECLARE_READ8_MEMBER(mac_via_in_a_pmu);
	520	DECLARE_READ8_MEMBER(mac_via_in_b_pmu);
	521	DECLARE_WRITE8_MEMBER(mac_via_out_a_pmu);
	522	DECLARE_WRITE8_MEMBER(mac_via_out_b_pmu);
	523	DECLARE_WRITE8_MEMBER(mac_via_out_b_bbadb);
	524	DECLARE_WRITE8_MEMBER(mac_via_out_b_egadb);
	525	DECLARE_WRITE8_MEMBER(mac_via_out_b_cdadb);
	526	DECLARE_READ8_MEMBER(mac_via_in_b_via2pmu);
	527	DECLARE_WRITE8_MEMBER(mac_via_out_b_via2pmu);
522	528	DECLARE_READ8_MEMBER(mac_via2_in_a);
523	529	DECLARE_READ8_MEMBER(mac_via2_in_b);
524	530	DECLARE_WRITE8_MEMBER(mac_via2_out_a);
525	531	DECLARE_WRITE8_MEMBER(mac_via2_out_b);
	532	DECLARE_READ8_MEMBER(mac_via2_in_a_pmu);
	533	DECLARE_READ8_MEMBER(mac_via2_in_b_pmu);
	534	DECLARE_WRITE8_MEMBER(mac_via2_out_a_pmu);
	535	DECLARE_WRITE8_MEMBER(mac_via2_out_b_pmu);
526	536	DECLARE_WRITE_LINE_MEMBER(mac_kbd_clk_in);
527	537	void mac_state_load();
528	538	DECLARE_WRITE_LINE_MEMBER(mac_via_irq);

trunk/src/mess/drivers/macpci.c

r26885	r26886
92	92	NULL
93	93	};
94	94
95		static const cuda_interface mac_cuda_interface =
96		{
97		DEVCB_DRIVER_LINE_MEMBER(macpci_state, cuda_reset_w),
98		DEVCB_DRIVER_LINE_MEMBER(macpci_state, cuda_adb_linechange_w)
99		};
100
101	95	static MACHINE_CONFIG_START( pippin, macpci_state )
102	96	/* basic machine hardware */
103	97	MCFG_CPU_ADD("maincpu", PPC603, 66000000)
r26885	r26886
135	129	MCFG_VIA6522_IRQ_HANDLER(WRITELINE(macpci_state,mac_via_irq))
136	130
137	131	//  MCFG_SCC8530_ADD("scc", C7M, line_cb_t(FUNC(macpci_state::set_scc_interrupt), static_cast<macpci_state *>(owner)))
138		MCFG_CUDA_ADD(CUDA_341S0060, mac_cuda_interface)
	132	MCFG_CUDA_ADD(CUDA_341S0060)
	133	MCFG_CUDA_RESET_CALLBACK(WRITELINE(macpci_state, cuda_reset_w))
	134	MCFG_CUDA_LINECHANGE_CALLBACK(WRITELINE(macpci_state, cuda_adb_linechange_w))
	135	MCFG_CUDA_VIA_CLOCK_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb1))
	136	MCFG_CUDA_VIA_DATA_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb2))
139	137	MCFG_QUANTUM_PERFECT_CPU("maincpu")
140	138	MACHINE_CONFIG_END
141	139

trunk/src/mess/drivers/mac.c

r26885	r26886
918	918	NULL
919	919	};
920	920
921		static const cuda_interface mac_cuda_interface =
922		{
923		DEVCB_DRIVER_LINE_MEMBER(mac_state, cuda_reset_w),
924		DEVCB_DRIVER_LINE_MEMBER(mac_state, adb_linechange_w)
925		};
926
927		static const cuda_interface mac_egret_interface =
928		{
929		DEVCB_DRIVER_LINE_MEMBER(mac_state, cuda_reset_w),
930		DEVCB_DRIVER_LINE_MEMBER(mac_state, adb_linechange_w)
931		};
932
933	921	static MACHINE_CONFIG_START( mac512ke, mac_state )
934	922
935	923	/* basic machine hardware */
r26885	r26886
971	959	MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_via_out_cb2))
972	960	MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via_irq))
973	961
974		MCFG_DEVICE_ADD(MACKBD_TAG, MACKBD, 0)
	962	MCFG_MACKBD_ADD()
975	963	#ifdef MAC_USE_EMULATED_KBD
976	964	MCFG_MACKBD_DATAOUT_HANDLER(DEVWRITELINE("via6522_0", via6522_device, write_cb2))
977	965	MCFG_MACKBD_CLKOUT_HANDLER(WRITELINE(mac_state, mac_kbd_clk_in))
r26885	r26886
1020	1008	MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
1021	1009	MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b))
1022	1010	MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
1023		MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b))
	1011	MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b_bbadb))
1024	1012	MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_adb_via_out_cb2))
1025	1013	MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via_irq))
1026	1014
r26885	r26886
1029	1017	MCFG_RAM_DEFAULT_SIZE("4M")
1030	1018	MCFG_RAM_EXTRA_OPTIONS("2M,2560K,4M")
1031	1019
1032		MCFG_DEVICE_REMOVE(MACKBD_TAG)
	1020	MCFG_MACKBD_REMOVE()
1033	1021
1034	1022	MCFG_MACPDS_BUS_ADD("sepds", "maincpu", macpds_intf)
1035	1023	MCFG_MACPDS_SLOT_ADD("sepds", "pds", mac_sepds_cards, NULL)
r26885	r26886
1044	1032	MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
1045	1033	MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b))
1046	1034	MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
1047		MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b))
	1035	MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b_bbadb))
1048	1036	MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_adb_via_out_cb2))
1049	1037	MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via_irq))
1050	1038
r26885	r26886
1053	1041	MCFG_RAM_DEFAULT_SIZE("4M")
1054	1042	MCFG_RAM_EXTRA_OPTIONS("2M,2560K,4M")
1055	1043
1056		MCFG_DEVICE_REMOVE(MACKBD_TAG)
	1044	MCFG_MACKBD_REMOVE()
1057	1045	MACHINE_CONFIG_END
1058	1046
1059	1047	static MACHINE_CONFIG_START( macprtb, mac_state )
1060
1061	1048	/* basic machine hardware */
1062	1049	MCFG_CPU_ADD("maincpu", M68000, C15M)
1063	1050	MCFG_CPU_PROGRAM_MAP(macprtb_map)
r26885	r26886
1095	1082
1096	1083	MCFG_SCC8530_ADD("scc", C7M, line_cb_t(FUNC(mac_state::set_scc_interrupt), static_cast<mac_state *>(owner)))
1097	1084	MCFG_DEVICE_ADD("via6522_0", VIA6522, 783360)
1098		MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
1099		MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b))
1100		MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
1101		MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b))
	1085	MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a_pmu))
	1086	MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b_pmu))
	1087	MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a_pmu))
	1088	MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b_pmu))
1102	1089	MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_via_out_cb2))
1103	1090	MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via_irq))
1104	1091
r26885	r26886
1150	1137	MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
1151	1138	MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b))
1152	1139	MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
1153		MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b))
	1140	MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b_bbadb))
1154	1141	MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_adb_via_out_cb2))
1155	1142	MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via_irq))
1156	1143
r26885	r26886
1248	1235	MCFG_RAM_DEFAULT_SIZE("2M")
1249	1236	MCFG_RAM_EXTRA_OPTIONS("4M,6M,8M,10M")
1250	1237
	1238	MCFG_DEVICE_MODIFY("via6522_0")
	1239	MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b_egadb))
	1240
1251	1241	MCFG_NUBUS_SLOT_REMOVE("nb9")
1252	1242	MCFG_NUBUS_SLOT_REMOVE("nba")
1253	1243	MCFG_NUBUS_SLOT_REMOVE("nbb")
r26885	r26886
1263	1253	MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
1264	1254	MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
1265	1255
1266		MCFG_EGRET_ADD(EGRET_341S0850, mac_egret_interface)
	1256	MCFG_EGRET_ADD(EGRET_341S0850)
	1257	MCFG_EGRET_RESET_CALLBACK(WRITELINE(mac_state, cuda_reset_w))
	1258	MCFG_EGRET_LINECHANGE_CALLBACK(WRITELINE(mac_state, adb_linechange_w))
	1259	MCFG_EGRET_VIA_CLOCK_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb1))
	1260	MCFG_EGRET_VIA_DATA_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb2))
1267	1261	MCFG_QUANTUM_PERFECT_CPU("maincpu")
1268	1262	MACHINE_CONFIG_END
1269	1263
r26885	r26886
1281	1275	static MACHINE_CONFIG_DERIVED( maccclas, maclc2 )
1282	1276
1283	1277	MCFG_EGRET_REMOVE()
1284		MCFG_CUDA_ADD(CUDA_341S0788, mac_cuda_interface)    // should be 0417, but that version won't sync up properly with the '030 right now
	1278	MCFG_CUDA_ADD(CUDA_341S0788)    // should be 0417, but that version won't sync up properly with the '030 right now
	1279	MCFG_CUDA_RESET_CALLBACK(WRITELINE(mac_state, cuda_reset_w))
	1280	MCFG_CUDA_LINECHANGE_CALLBACK(WRITELINE(mac_state, adb_linechange_w))
	1281	MCFG_CUDA_VIA_CLOCK_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb1))
	1282	MCFG_CUDA_VIA_DATA_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb2))
	1283
	1284	MCFG_DEVICE_MODIFY("via6522_0")
	1285	MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b_cdadb))
1285	1286	MACHINE_CONFIG_END
1286	1287
1287	1288	static MACHINE_CONFIG_DERIVED( maclc3, maclc )
r26885	r26886
1304	1305	MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
1305	1306	MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
1306	1307
1307		MCFG_EGRET_REPLACE(EGRET_341S0851, mac_egret_interface)
	1308	MCFG_EGRET_REPLACE(EGRET_341S0851)
	1309	MCFG_EGRET_RESET_CALLBACK(WRITELINE(mac_state, cuda_reset_w))
	1310	MCFG_EGRET_LINECHANGE_CALLBACK(WRITELINE(mac_state, adb_linechange_w))
	1311	MCFG_EGRET_VIA_CLOCK_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb1))
	1312	MCFG_EGRET_VIA_DATA_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb2))
1308	1313	MACHINE_CONFIG_END
1309	1314
1310	1315	static MACHINE_CONFIG_DERIVED( maclc520, maclc3 )
1311	1316
1312	1317	MCFG_EGRET_REMOVE()
1313		MCFG_CUDA_ADD(CUDA_341S0060, mac_cuda_interface)
	1318	MCFG_CUDA_ADD(CUDA_341S0060)
	1319	MCFG_CUDA_RESET_CALLBACK(WRITELINE(mac_state, cuda_reset_w))
	1320	MCFG_CUDA_LINECHANGE_CALLBACK(WRITELINE(mac_state, adb_linechange_w))
	1321	MCFG_CUDA_VIA_CLOCK_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb1))
	1322	MCFG_CUDA_VIA_DATA_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb2))
	1323
	1324	MCFG_DEVICE_MODIFY("via6522_0")
	1325	MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b_cdadb))
1314	1326	MACHINE_CONFIG_END
1315	1327
1316	1328	static MACHINE_CONFIG_DERIVED( maciivx, maclc )
r26885	r26886
1334	1346	MCFG_RAM_DEFAULT_SIZE("4M")
1335	1347	MCFG_RAM_EXTRA_OPTIONS("8M,12M,16M,20M,24M,28M,32M,36M,40M,44M,48M,52M,56M,60M,64M")
1336	1348
1337		MCFG_EGRET_REPLACE(EGRET_341S0851, mac_egret_interface)
	1349	MCFG_EGRET_REPLACE(EGRET_341S0851)
	1350	MCFG_EGRET_RESET_CALLBACK(WRITELINE(mac_state, cuda_reset_w))
	1351	MCFG_EGRET_LINECHANGE_CALLBACK(WRITELINE(mac_state, adb_linechange_w))
	1352	MCFG_EGRET_VIA_CLOCK_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb1))
	1353	MCFG_EGRET_VIA_DATA_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb2))
1338	1354	MACHINE_CONFIG_END
1339	1355
1340	1356	static MACHINE_CONFIG_DERIVED( maciivi, maclc )
r26885	r26886
1358	1374	MCFG_RAM_DEFAULT_SIZE("4M")
1359	1375	MCFG_RAM_EXTRA_OPTIONS("8M,12M,16M,20M,24M,28M,32M,36M,40M,44M,48M,52M,56M,60M,64M")
1360	1376
1361		MCFG_EGRET_REPLACE(EGRET_341S0851, mac_egret_interface)
	1377	MCFG_EGRET_REPLACE(EGRET_341S0851)
	1378	MCFG_EGRET_RESET_CALLBACK(WRITELINE(mac_state, cuda_reset_w))
	1379	MCFG_EGRET_LINECHANGE_CALLBACK(WRITELINE(mac_state, adb_linechange_w))
	1380	MCFG_EGRET_VIA_CLOCK_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb1))
	1381	MCFG_EGRET_VIA_DATA_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb2))
1362	1382	MACHINE_CONFIG_END
1363	1383
1364	1384	static MACHINE_CONFIG_DERIVED( maciix, macii )
r26885	r26886
1421	1441	MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
1422	1442	MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b))
1423	1443	MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
1424		MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b))
	1444	MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b_bbadb))
1425	1445	MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_adb_via_out_cb2))
1426	1446	MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via_irq))
1427	1447
r26885	r26886
1479	1499
1480	1500	MCFG_DEVICE_ADD("via6522_0", VIA6522, 783360)
1481	1501	MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
1482		MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b))
	1502	MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b_via2pmu))
1483	1503	MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
1484		MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b))
	1504	MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b_via2pmu))
1485	1505	MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_adb_via_out_cb2))
1486	1506	MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via_irq))
1487	1507
1488	1508	MCFG_DEVICE_ADD("via6522_1", VIA6522, 783360)
1489		MCFG_VIA6522_READPA_HANDLER(READ8(mac_state, mac_via2_in_a))
1490		MCFG_VIA6522_READPB_HANDLER(READ8(mac_state, mac_via2_in_b))
1491		MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via2_out_a))
1492		MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via2_out_b))
	1509	MCFG_VIA6522_READPA_HANDLER(READ8(mac_state, mac_via2_in_a_pmu))
	1510	MCFG_VIA6522_READPB_HANDLER(READ8(mac_state, mac_via2_in_b_pmu))
	1511	MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via2_out_a_pmu))
	1512	MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via2_out_b_pmu))
1493	1513	MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via2_irq))
1494	1514
1495	1515	/* internal ram */
r26885	r26886
1559	1579
1560	1580	MCFG_DEVICE_ADD("via6522_0", VIA6522, 783360)
1561	1581	MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
1562		MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b))
	1582	MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b_via2pmu))
1563	1583	MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
1564		MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b))
	1584	MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b_via2pmu))
1565	1585	MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_adb_via_out_cb2))
1566	1586	MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via_irq))
1567	1587
1568	1588	MCFG_DEVICE_ADD("via6522_1", VIA6522, 783360)
1569		MCFG_VIA6522_READPA_HANDLER(READ8(mac_state, mac_via2_in_a))
1570		MCFG_VIA6522_READPB_HANDLER(READ8(mac_state, mac_via2_in_b))
1571		MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via2_out_a))
1572		MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via2_out_b))
	1589	MCFG_VIA6522_READPA_HANDLER(READ8(mac_state, mac_via2_in_a_pmu))
	1590	MCFG_VIA6522_READPB_HANDLER(READ8(mac_state, mac_via2_in_b_pmu))
	1591	MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via2_out_a_pmu))
	1592	MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via2_out_b_pmu))
1573	1593	MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via2_irq))
1574	1594
1575	1595	/* internal ram */
r26885	r26886
1634	1654	MCFG_RAM_DEFAULT_SIZE("10M")
1635	1655	MCFG_RAM_EXTRA_OPTIONS("2M,4M,6M,8M,10M")
1636	1656
1637		MCFG_EGRET_REPLACE(EGRET_341S0851, mac_egret_interface)
	1657	MCFG_EGRET_REPLACE(EGRET_341S0851)
	1658	MCFG_EGRET_RESET_CALLBACK(WRITELINE(mac_state, cuda_reset_w))
	1659	MCFG_EGRET_LINECHANGE_CALLBACK(WRITELINE(mac_state, adb_linechange_w))
	1660	MCFG_EGRET_VIA_CLOCK_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb1))
	1661	MCFG_EGRET_VIA_DATA_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb2))
1638	1662	MACHINE_CONFIG_END
1639	1663
1640	1664	static MACHINE_CONFIG_DERIVED( maciici, macii )
r26885	r26886
1697	1721	MCFG_RAM_DEFAULT_SIZE("2M")
1698	1722	MCFG_RAM_EXTRA_OPTIONS("4M,8M,16M,32M,48M,64M,128M")
1699	1723
1700		MCFG_EGRET_ADD(EGRET_344S0100, mac_egret_interface)
	1724	MCFG_DEVICE_MODIFY("via6522_0")
	1725	MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b_egadb))
	1726
	1727	MCFG_EGRET_ADD(EGRET_344S0100)
	1728	MCFG_EGRET_RESET_CALLBACK(WRITELINE(mac_state, cuda_reset_w))
	1729	MCFG_EGRET_LINECHANGE_CALLBACK(WRITELINE(mac_state, adb_linechange_w))
	1730	MCFG_EGRET_VIA_CLOCK_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb1))
	1731	MCFG_EGRET_VIA_DATA_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb2))
1701	1732	MCFG_QUANTUM_PERFECT_CPU("maincpu")
1702	1733	MACHINE_CONFIG_END
1703	1734
r26885	r26886
1742	1773	MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
1743	1774	MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b))
1744	1775	MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
1745		MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b))
	1776	MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b_cdadb))
1746	1777	MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_adb_via_out_cb2))
1747	1778	MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via_irq))
1748	1779
r26885	r26886
1758	1789	MCFG_RAM_DEFAULT_SIZE("8M")
1759	1790	MCFG_RAM_EXTRA_OPTIONS("16M,32M,64M,128M")
1760	1791
1761		MCFG_CUDA_ADD(CUDA_341S0060, mac_cuda_interface)
	1792	MCFG_CUDA_ADD(CUDA_341S0060)
	1793	MCFG_CUDA_RESET_CALLBACK(WRITELINE(mac_state, cuda_reset_w))
	1794	MCFG_CUDA_LINECHANGE_CALLBACK(WRITELINE(mac_state, adb_linechange_w))
	1795	MCFG_CUDA_VIA_CLOCK_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb1))
	1796	MCFG_CUDA_VIA_DATA_CALLBACK(DEVWRITELINE("via6522_0", via6522_device, write_cb2))
1762	1797	MACHINE_CONFIG_END
1763	1798
1764	1799	static MACHINE_CONFIG_START( macqd700, mac_state )
r26885	r26886
1799	1834	MCFG_VIA6522_READPA_HANDLER(READ8(mac_state,mac_via_in_a))
1800	1835	MCFG_VIA6522_READPB_HANDLER(READ8(mac_state,mac_via_in_b))
1801	1836	MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(mac_state,mac_via_out_a))
1802		MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b))
	1837	MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(mac_state,mac_via_out_b_bbadb))
1803	1838	MCFG_VIA6522_CB2_HANDLER(WRITELINE(mac_state,mac_adb_via_out_cb2))
1804	1839	MCFG_VIA6522_IRQ_HANDLER(WRITELINE(mac_state,mac_via_irq))
1805	1840

Previous

199869 Revisions

Next

---

© 1997-2024 The MAME Team