MAME SVN History

199869 Revisions

r34884 Friday 6th February, 2015 at 06:45:53 UTC by Robbbert
(MESS) kaypro: reinstated support for the old DSK format, but you need to rename your disks to KAY.

[src/lib/formats]	kaypro_dsk.c
[src/mess/drivers]	kaypro.c
[src/mess/includes]	kaypro.h
[src/mess/machine]	kaypro.c

trunk/src/lib/formats/kaypro_dsk.c
r243395	r243396
1	1	// license:BSD-3-Clause
2		// copyright-holders:Olivier Galibert
	2	// copyright-holders:Olivier Galibert, Robbbert
3	3	/*********************************************************************
4	4
5	5	formats/kaypro_dsk.c
r243395	r243396
9	9	There is no inter-sector info on these disks. It is simply a
10	10	dump of the 512 bytes from each sector and track in order.
11	11	It is just like a headerless quickload.
	12	No idea about how to calculate the gaps. Used the ones recommended
	13	in the wd177x_dsk notes, works for most disks. Please note that
	14	these disks usually have DSK extension, but that conflicts with
	15	the CPCEMU DSK format. You need to rename your Kaypro DSK disks
	16	to KAY extension.
12	17
13	18	*********************************************************************/
14	19
r243395	r243396
31	36
32	37	const char *kayproii_format::extensions() const
33	38	{
34		return "dsk";
	39	return "kay";
35	40	}
36	41
37	42	// gap info is a total guess
38	43	const kayproii_format::format kayproii_format::formats[] = {
39	44	{ /* 191K 13cm double density single sided */
40	45	floppy_image::FF_525, floppy_image::SSDD, floppy_image::MFM,
41		2000, 10, 40, 1, 512, {}, 1, {}, 32, 22, 31
	46	2000, 10, 40, 1, 512, {}, 0, {}, 80, 22, 24
42	47	},
43	48	{}
44	49	};
r243395	r243396
59	64
60	65	const char *kaypro2x_format::extensions() const
61	66	{
62		return "dsk";
	67	return "kay";
63	68	}
64	69
65	70	// gap info is a total guess
66	71	const kaypro2x_format::format kaypro2x_format::formats[] = {
67	72	{ /* 382K 13cm double density double sided */
68	73	floppy_image::FF_525, floppy_image::DSDD, floppy_image::MFM,
69		2000, 10, 80, 2, 512, {}, 1, {}, 32, 22, 31
	74	2000, 10, 40, 2, 512, {}, 0, {}, 80, 22, 24
70	75	},
71	76	{}
72	77	};

trunk/src/mess/drivers/kaypro.c
r243395	r243396
163	163
164	164	************************************************************/
165	165
	166	FLOPPY_FORMATS_MEMBER( kaypro_state::kayproii_floppy_formats )
	167	FLOPPY_KAYPROII_FORMAT
	168	FLOPPY_FORMATS_END
	169
	170	FLOPPY_FORMATS_MEMBER( kaypro_state::kaypro2x_floppy_formats )
	171	FLOPPY_KAYPRO2X_FORMAT
	172	FLOPPY_FORMATS_END
	173
166	174	static SLOT_INTERFACE_START( kaypro_floppies )
167	175	SLOT_INTERFACE( "drive0", FLOPPY_525_DD )
168	176	SLOT_INTERFACE( "drive1", FLOPPY_525_DD )
r243395	r243396
224	232	MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(kaypro_state, fdc_intrq_w))
225	233	MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(kaypro_state, fdc_drq_w))
226	234	MCFG_WD_FDC_FORCE_READY
227		MCFG_FLOPPY_DRIVE_ADD("fdc:0", kaypro_floppies, "drive0", floppy_image_device::default_floppy_formats)
228		MCFG_FLOPPY_DRIVE_ADD("fdc:1", kaypro_floppies, "drive1", floppy_image_device::default_floppy_formats)
	235	MCFG_FLOPPY_DRIVE_ADD("fdc:0", kaypro_floppies, "drive0", kaypro_state::kayproii_floppy_formats)
	236	MCFG_FLOPPY_DRIVE_ADD("fdc:1", kaypro_floppies, "drive1", kaypro_state::kayproii_floppy_formats)
229	237	MCFG_SOFTWARE_LIST_ADD("flop_list","kayproii")
230	238	MACHINE_CONFIG_END
231	239
r243395	r243396
287	295	MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(kaypro_state, fdc_intrq_w))
288	296	MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(kaypro_state, fdc_drq_w))
289	297	MCFG_WD_FDC_FORCE_READY
290		MCFG_FLOPPY_DRIVE_ADD("fdc:0", kaypro_floppies, "drive0", floppy_image_device::default_floppy_formats)
291		MCFG_FLOPPY_DRIVE_ADD("fdc:1", kaypro_floppies, "drive1", floppy_image_device::default_floppy_formats)
	298	MCFG_FLOPPY_DRIVE_ADD("fdc:0", kaypro_floppies, "drive0", kaypro_state::kaypro2x_floppy_formats)
	299	MCFG_FLOPPY_DRIVE_ADD("fdc:1", kaypro_floppies, "drive1", kaypro_state::kaypro2x_floppy_formats)
292	300	MACHINE_CONFIG_END
293	301
294	302	static MACHINE_CONFIG_DERIVED( omni2, kaypro4 )

trunk/src/mess/includes/kaypro.h
r243395	r243396
59	59	DECLARE_PALETTE_INIT(kaypro);
60	60	DECLARE_MACHINE_RESET(kay_kbd);
61	61	DECLARE_DRIVER_INIT(kaypro);
	62	DECLARE_FLOPPY_FORMATS(kayproii_floppy_formats);
	63	DECLARE_FLOPPY_FORMATS(kaypro2x_floppy_formats);
62	64	UINT32 screen_update_kayproii(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
63	65	UINT32 screen_update_kaypro2x(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
64	66	UINT32 screen_update_omni2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);

trunk/src/mess/machine/kaypro.c
r243395	r243396
114	114	m_floppy = m_floppy1->get_device();
115	115
116	116	m_fdc->set_floppy(m_floppy);
117		m_fdc->dden_w(BIT(data, 5)); ~~// not connected~~
	117	m_fdc->dden_w(BIT(data, 5));
118	118
119	119	if (m_floppy)
120	120	{
r243395	r243396
252	252	m_system_port = 0x80;
253	253	m_fdc_rq = 0;
254	254	m_maincpu->reset();
255		timer_set(attotime::from_hz(1), TIMER_FLOPPY); /* timer ~~for~~ rtc */
	255	timer_set(attotime::from_hz(1), TIMER_FLOPPY); /* kick-start the nmi timer */
256	256	}
257	257
258	258

https://github.com/mamedev/mame/commit/d826b5b1ae634f95c7270b2835a91a30023004ff

199869 Revisions