Previous 15994 Revisions Next

r11070 Sunday 3rd April, 2011 at 19:24:09 UTC by Curt Coder
[COMX35] Modernized driver some more.
[src/mess/drivers]comx35.c
[src/mess/includes]comx35.h
[src/mess/machine]comx35.c

src/mess/machine/comx35.c
r11069r11070
114114
115115*/
116116
117#include "emu.h"
118#include "cpu/cosmac/cosmac.h"
119#include "machine/wd17xx.h"
120#include "imagedev/printer.h"
121#include "imagedev/snapquik.h"
122#include "sound/cdp1869.h"
123#include "video/mc6845.h"
124117#include "includes/comx35.h"
125#include "machine/rescap.h"
126#include "imagedev/flopdrv.h"
127#include "machine/ram.h"
128118
129119enum
130120{
r11069r11070
137127UINT8 comx35_state::read_expansion()
138128{
139129   UINT8 result;
140   switch(m_machine.phase())
130   
131   switch (m_machine.phase())
141132   {
142133      case MACHINE_PHASE_RESET:
143134      case MACHINE_PHASE_RUNNING:
r11069r11070
148139         result = 0x00;
149140         break;
150141   }
142
151143   return result;
152144}
153145
r11069r11070
169161}
170162
171163/* Floppy Disc Controller */
172static WRITE_LINE_DEVICE_HANDLER( comx35_fdc_intrq_w )
164
165WRITE_LINE_MEMBER( comx35_state::fdc_intrq_w )
173166{
174   comx35_state *driver_state = device->machine().driver_data<comx35_state>();
175   driver_state->m_fdc_irq = state;
167   m_fdc_irq = state;
176168}
177169
178static WRITE_LINE_DEVICE_HANDLER( comx35_fdc_drq_w )
170WRITE_LINE_MEMBER( comx35_state::fdc_drq_w )
179171{
180   comx35_state *driver_state = device->machine().driver_data<comx35_state>();
181
182   if (driver_state->m_fdc_drq_enable)
183      driver_state->m_cdp1802_ef4 = state;
172   if (m_fdc_drq_enable)
173      m_cdp1802_ef4 = state;
184174}
185175
186176const wd17xx_interface comx35_wd17xx_interface =
187177{
188178   DEVCB_NULL,
189   DEVCB_LINE(comx35_fdc_intrq_w),
190   DEVCB_LINE(comx35_fdc_drq_w),
179   DEVCB_DRIVER_LINE_MEMBER(comx35_state, fdc_intrq_w),
180   DEVCB_DRIVER_LINE_MEMBER(comx35_state, fdc_drq_w),
191181   { FLOPPY_0, FLOPPY_1, NULL, NULL }
192182};
193183
src/mess/includes/comx35.h
r11069r11070
1#pragma once
2
13#ifndef __COMX35__
24#define __COMX35__
35
6#define ADDRESS_MAP_MODERN
7
8#include "emu.h"
49#include "cpu/cosmac/cosmac.h"
510#include "sound/cdp1869.h"
11#include "sound/wave.h"
12#include "imagedev/flopdrv.h"
13#include "formats/comx35_dsk.h"
14#include "formats/comx35_comx.h"
15#include "imagedev/cassette.h"
16#include "imagedev/printer.h"
17#include "imagedev/snapquik.h"
618#include "machine/cdp1871.h"
7#include "imagedev/snapquik.h"
19#include "machine/comxpl80.h"
820#include "machine/wd17xx.h"
921#include "machine/ram.h"
22#include "machine/rescap.h"
23#include "video/mc6845.h"
1024
1125#define SCREEN_TAG         "screen"
1226#define MC6845_SCREEN_TAG   "screen80"
r11069r11070
6781   virtual void video_start();
6882   virtual bool screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect);
6983
70   DECLARE_WRITE8_MEMBER(cdp1869_w);
71   DECLARE_READ8_MEMBER(io_r);
72   DECLARE_READ8_MEMBER(io2_r);
73   DECLARE_WRITE8_MEMBER(bank_select_w);
74   DECLARE_WRITE8_MEMBER(io_w);
75   DECLARE_READ_LINE_MEMBER(clear_r);
76   DECLARE_READ_LINE_MEMBER(ef2_r);
77   DECLARE_READ_LINE_MEMBER(ef4_r);
78   DECLARE_WRITE_LINE_MEMBER(comx35_q_w);
79   DECLARE_READ_LINE_MEMBER(comx35_shift_r);
80   DECLARE_READ_LINE_MEMBER(comx35_control_r);
84   DECLARE_WRITE8_MEMBER( cdp1869_w );
85   DECLARE_READ8_MEMBER( io_r );
86   DECLARE_READ8_MEMBER( io2_r );
87   DECLARE_WRITE8_MEMBER( bank_select_w );
88   DECLARE_WRITE8_MEMBER( io_w );
89   DECLARE_READ_LINE_MEMBER( clear_r );
90   DECLARE_READ_LINE_MEMBER( ef2_r );
91   DECLARE_READ_LINE_MEMBER( ef4_r );
92   DECLARE_WRITE_LINE_MEMBER( q_w );
93   DECLARE_READ_LINE_MEMBER( shift_r );
94   DECLARE_READ_LINE_MEMBER( control_r );
95   DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w );
96   DECLARE_WRITE_LINE_MEMBER( fdc_drq_w );
8197
8298   UINT8 read_expansion();
8399   bool is_expansion_box_installed();
src/mess/drivers/comx35.c
r11069r11070
1010
1111*/
1212
13#define ADDRESS_MAP_MODERN
14
15#include "emu.h"
1613#include "includes/comx35.h"
17#include "cpu/cosmac/cosmac.h"
18#include "sound/cdp1869.h"
19#include "sound/wave.h"
20#include "imagedev/flopdrv.h"
21#include "formats/comx35_dsk.h"
22#include "formats/comx35_comx.h"
23#include "imagedev/cassette.h"
24#include "imagedev/printer.h"
25#include "imagedev/snapquik.h"
26#include "machine/cdp1871.h"
27#include "machine/comxpl80.h"
28#include "machine/wd17xx.h"
29#include "machine/ram.h"
30#include "video/mc6845.h"
3114
3215/* Memory Maps */
3316
r11069r11070
201184
202185/* CDP1802 Interface */
203186
204static READ_LINE_DEVICE_HANDLER( clear_r )
187READ_LINE_MEMBER( comx35_state::clear_r )
205188{
206   comx35_state *state = device->machine().driver_data<comx35_state>();
207
208   return state->m_reset;
189   return m_reset;
209190}
210191
211static READ_LINE_DEVICE_HANDLER( ef2_r )
192READ_LINE_MEMBER( comx35_state::ef2_r )
212193{
213   comx35_state *state = device->machine().driver_data<comx35_state>();
214
215   if (state->m_iden)
194   if (m_iden)
216195   {
217196      // interrupts disabled: PAL/NTSC
218      return state->m_vis->pal_ntsc_r();
197      return m_vis->pal_ntsc_r();
219198   }
220199   else
221200   {
222201      // interrupts enabled: keyboard repeat
223      return state->m_kbe->rpt_r();
202      return m_kbe->rpt_r();
224203   }
225204}
226205
227static READ_LINE_DEVICE_HANDLER( ef4_r )
206READ_LINE_MEMBER( comx35_state::ef4_r )
228207{
229   comx35_state *state = device->machine().driver_data<comx35_state>();
230
231   return (cassette_input(device) < 0) | state->m_cdp1802_ef4;
208   return (cassette_input(m_cassette) < 0) | m_cdp1802_ef4;
232209}
233210
234211static COSMAC_SC_WRITE( comx35_sc_w )
r11069r11070
270247   }
271248}
272249
273static WRITE_LINE_DEVICE_HANDLER( comx35_q_w )
250WRITE_LINE_MEMBER( comx35_state::q_w )
274251{
275   comx35_state *driver_state = device->machine().driver_data<comx35_state>();
252   m_cdp1802_q = state;
276253
277   driver_state->m_cdp1802_q = state;
278
279   if (driver_state->m_iden && state)
254   if (m_iden && state)
280255   {
281256      // enable interrupts
282      driver_state->m_iden = 0;
257      m_iden = 0;
283258   }
284259
285260   // cassette output
286   cassette_output(driver_state->m_cassette, state ? +1.0 : -1.0);
261   cassette_output(m_cassette, state ? +1.0 : -1.0);
287262}
288263
289264static COSMAC_INTERFACE( cosmac_intf )
290265{
291266   DEVCB_LINE_VCC,                        // wait
292   DEVCB_LINE(clear_r),                  // clear
267   DEVCB_DRIVER_LINE_MEMBER(comx35_state, clear_r),// clear
293268   DEVCB_NULL,                           // EF1
294   DEVCB_LINE(ef2_r),                     // EF2
269   DEVCB_DRIVER_LINE_MEMBER(comx35_state, ef2_r),   // EF2
295270   DEVCB_NULL,                           // EF3
296   DEVCB_DEVICE_LINE(CASSETTE_TAG, ef4_r),      // EF4
297   DEVCB_LINE(comx35_q_w),                  // Q
271   DEVCB_DRIVER_LINE_MEMBER(comx35_state, ef4_r),   // EF4
272   DEVCB_DRIVER_LINE_MEMBER(comx35_state, q_w),   // Q
298273   DEVCB_NULL,                           // DMA in
299274   DEVCB_NULL,                           // DMA out
300275   comx35_sc_w,                        // SC
r11069r11070
304279
305280/* CDP1871 Interface */
306281
307static READ_LINE_DEVICE_HANDLER( comx35_shift_r )
282READ_LINE_MEMBER( comx35_state::shift_r )
308283{
309   return BIT(input_port_read(device->machine(), "MODIFIERS"), 0);
284   return BIT(input_port_read(m_machine, "MODIFIERS"), 0);
310285}
311286
312static READ_LINE_DEVICE_HANDLER( comx35_control_r )
287READ_LINE_MEMBER( comx35_state::control_r )
313288{
314   return BIT(input_port_read(device->machine(), "MODIFIERS"), 1);
289   return BIT(input_port_read(m_machine, "MODIFIERS"), 1);
315290}
316291
317292static CDP1871_INTERFACE( comx35_cdp1871_intf )
r11069r11070
327302   DEVCB_INPUT_PORT("D9"),
328303   DEVCB_INPUT_PORT("D10"),
329304   DEVCB_INPUT_PORT("D11"),
330   DEVCB_LINE(comx35_shift_r),
331   DEVCB_LINE(comx35_control_r),
305   DEVCB_DRIVER_LINE_MEMBER(comx35_state, shift_r),
306   DEVCB_DRIVER_LINE_MEMBER(comx35_state, control_r),
332307   DEVCB_NULL,
333308   DEVCB_CPU_INPUT_LINE(CDP1802_TAG, COSMAC_INPUT_LINE_EF3),
334309   DEVCB_NULL // polled
r11069r11070
445420   ROM_LOAD( "f&m.eprom.board.1.1.bin",0x0000, 0x0800, CRC(a042a31a) SHA1(13831a1350aa62a87988bfcc99c4b7db8ef1cf62) )
446421
447422   ROM_REGION( 0x2000, "80column", 0 ) /* 80 Column Card */
448   ROM_LOAD( "p.cl1",               0x0000, 0x0800, CRC(b417d30a) SHA1(d428b0467945ecb9aec884211d0f4b1d8d56d738) ) // V1.0
423   ROM_LOAD( "p 1.0.cl1",            0x0000, 0x0800, CRC(b417d30a) SHA1(d428b0467945ecb9aec884211d0f4b1d8d56d738) ) // V1.0
449424   ROM_LOAD( "p 1.1.cl1",            0x0000, 0x0800, CRC(0a2eaf19) SHA1(3f1f640caef964fb47aaa147cab6d215c2b30e9d) ) // V1.1
450425
451426   ROM_REGION( 0x800, "chargen", 0 ) /* 80 Column Card */
452   ROM_LOAD( "c.cl4",               0x0000, 0x0800, CRC(69dd7b07) SHA1(71d368adbb299103d165eab8359a97769e463e26) ) // V1.0
427   ROM_LOAD( "c 1.0.cl4",            0x0000, 0x0800, CRC(69dd7b07) SHA1(71d368adbb299103d165eab8359a97769e463e26) ) // V1.0
453428   ROM_LOAD( "c 1.1.cl4",            0x0000, 0x0800, CRC(dc9b5046) SHA1(4e041cec03dda6dba5e2598d060c49908a4fab2a) ) // V1.1
454429ROM_END
455430

Previous 15994 Revisions Next


© 1998-2018 The MESS Team