Previous 199869 Revisions Next

r26857 Wednesday 1st January, 2014 at 14:27:08 UTC by smf
removed runtime via device lookups, removed ca1, cb1, ca2, cb2 callbacks from configuration & push the values they returned (always 1). [smf]
[src/mess/drivers]microtan.c
[src/mess/includes]microtan.h
[src/mess/machine]microtan.c

trunk/src/mess/includes/microtan.h
r26856r26857
3232      : driver_device(mconfig, type, tag),
3333      m_videoram(*this, "videoram"),
3434      m_maincpu(*this, "maincpu"),
35      m_cassette(*this, "cassette") { }
35      m_cassette(*this, "cassette"),
36      m_via6522_0(*this, "via6522_0"),
37      m_via6522_1(*this, "via6522_1")
38   { }
3639
3740   required_shared_ptr<UINT8> m_videoram;
3841   UINT8 m_chunky_graphics;
r26856r26857
6568   TIMER_CALLBACK_MEMBER(microtan_pulse_nmi);
6669   DECLARE_READ8_MEMBER(via_0_in_a);
6770   DECLARE_READ8_MEMBER(via_0_in_b);
68   DECLARE_READ_LINE_MEMBER(via_0_in_ca1);
69   DECLARE_READ_LINE_MEMBER(via_0_in_cb1);
70   DECLARE_READ_LINE_MEMBER(via_0_in_ca2);
71   DECLARE_READ_LINE_MEMBER(via_0_in_cb2);
7271   DECLARE_WRITE8_MEMBER(via_0_out_a);
7372   DECLARE_WRITE8_MEMBER(via_0_out_b);
7473   DECLARE_WRITE_LINE_MEMBER(via_0_out_ca2);
7574   DECLARE_WRITE_LINE_MEMBER(via_0_out_cb2);
7675   DECLARE_READ8_MEMBER(via_1_in_a);
7776   DECLARE_READ8_MEMBER(via_1_in_b);
78   DECLARE_READ_LINE_MEMBER(via_1_in_ca1);
79   DECLARE_READ_LINE_MEMBER(via_1_in_cb1);
80   DECLARE_READ_LINE_MEMBER(via_1_in_ca2);
81   DECLARE_READ_LINE_MEMBER(via_1_in_cb2);
8277   DECLARE_WRITE8_MEMBER(via_1_out_a);
8378   DECLARE_WRITE8_MEMBER(via_1_out_b);
8479   DECLARE_WRITE_LINE_MEMBER(via_1_out_ca2);
r26856r26857
8782   DECLARE_WRITE_LINE_MEMBER(via_1_irq);
8883   required_device<cpu_device> m_maincpu;
8984   required_device<cassette_image_device> m_cassette;
85   required_device<via6522_device> m_via6522_0;
86   required_device<via6522_device> m_via6522_1;
9087   UINT8 read_dsw();
9188   void microtan_set_irq_line();
9289   void store_key(int key);
trunk/src/mess/drivers/microtan.c
r26856r26857
261261   MCFG_DEVICE_ADD("via6522_0", VIA6522, 0)
262262   MCFG_VIA6522_READPA_HANDLER(READ8(microtan_state, via_0_in_a))
263263   MCFG_VIA6522_READPB_HANDLER(READ8(microtan_state, via_0_in_b))
264   MCFG_VIA6522_READCA1_HANDLER(READLINE(microtan_state, via_0_in_ca1))
265   MCFG_VIA6522_READCB1_HANDLER(READLINE(microtan_state, via_0_in_cb1))
266   MCFG_VIA6522_READCA2_HANDLER(READLINE(microtan_state, via_0_in_ca2))
267   MCFG_VIA6522_READCB2_HANDLER(READLINE(microtan_state, via_0_in_cb2))
268264   MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(microtan_state, via_0_out_a))
269265   MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(microtan_state, via_0_out_b))
270266   MCFG_VIA6522_CA2_HANDLER(WRITELINE(microtan_state, via_0_out_ca2))
r26856r26857
274270   MCFG_DEVICE_ADD("via6522_1", VIA6522, 0)
275271   MCFG_VIA6522_READPA_HANDLER(READ8(microtan_state, via_1_in_a))
276272   MCFG_VIA6522_READPB_HANDLER(READ8(microtan_state, via_1_in_b))
277   MCFG_VIA6522_READCA1_HANDLER(READLINE(microtan_state, via_1_in_ca1))
278   MCFG_VIA6522_READCB1_HANDLER(READLINE(microtan_state, via_1_in_cb1))
279   MCFG_VIA6522_READCA2_HANDLER(READLINE(microtan_state, via_1_in_ca2))
280   MCFG_VIA6522_READCB2_HANDLER(READLINE(microtan_state, via_1_in_cb2))
281273   MCFG_VIA6522_WRITEPA_HANDLER(WRITE8(microtan_state, via_1_out_a))
282274   MCFG_VIA6522_WRITEPB_HANDLER(WRITE8(microtan_state, via_1_out_b))
283275   MCFG_VIA6522_CA2_HANDLER(WRITELINE(microtan_state, via_1_out_ca2))
trunk/src/mess/machine/microtan.c
r26856r26857
169169   return data;
170170}
171171
172READ_LINE_MEMBER(microtan_state::via_0_in_ca1)
173{
174   int data = 1;
175   LOG(("microtan_via_0_in_ca1 %d\n", data));
176   return data;
177}
178
179READ_LINE_MEMBER(microtan_state::via_0_in_cb1)
180{
181   int data = 1;
182   LOG(("microtan_via_0_in_cb1 %d\n", data));
183   return data;
184}
185
186READ_LINE_MEMBER(microtan_state::via_0_in_ca2)
187{
188   int data = 1;
189   LOG(("microtan_via_0_in_ca2 %d\n", data));
190   return data;
191}
192
193READ_LINE_MEMBER(microtan_state::via_0_in_cb2)
194{
195   int data = 1;
196   LOG(("microtan_via_0_in_cb2 %d\n", data));
197   return data;
198}
199
200172WRITE8_MEMBER(microtan_state::via_0_out_a)
201173{
202174   LOG(("microtan_via_0_out_a %02X\n", data));
r26856r26857
243215   return data;
244216}
245217
246READ_LINE_MEMBER(microtan_state::via_1_in_ca1)
247{
248   int data = 1;
249   LOG(("microtan_via_1_in_ca1 %d\n", data));
250   return data;
251}
252
253READ_LINE_MEMBER(microtan_state::via_1_in_cb1)
254{
255   int data = 1;
256   LOG(("microtan_via_1_in_cb1 %d\n", data));
257   return data;
258}
259
260READ_LINE_MEMBER(microtan_state::via_1_in_ca2)
261{
262   int data = 1;
263   LOG(("microtan_via_1_in_ca2 %d\n", data));
264   return data;
265}
266
267READ_LINE_MEMBER(microtan_state::via_1_in_cb2)
268{
269   int data = 1;
270   LOG(("microtan_via_1_in_cb2 %d\n", data));
271   return data;
272}
273
274218WRITE8_MEMBER(microtan_state::via_1_out_a)
275219{
276220   LOG(("microtan_via_1_out_a %02X\n", data));
r26856r26857
317261TIMER_CALLBACK_MEMBER(microtan_state::microtan_read_cassette)
318262{
319263   double level = m_cassette->input();
320   via6522_device *via_0 = machine().device<via6522_device>("via6522_0");
321264
322265   LOG(("microtan_read_cassette: %g\n", level));
323266   if (level < -0.07)
324      via_0->write_cb2(0);
267      m_via6522_0->write_cb2(0);
325268   else if (level > +0.07)
326      via_0->write_cb2(1);
269      m_via6522_0->write_cb2(1);
327270}
328271
329272READ8_MEMBER(microtan_state::microtan_sound_r)
r26856r26857
547490   }
548491
549492   m_timer = timer_alloc(TIMER_READ_CASSETTE);
493
494   m_via6522_0->write_ca1(1);
495   m_via6522_0->write_cb1(1);
496   m_via6522_0->write_ca2(1);
497   m_via6522_0->write_cb2(1);
498
499   m_via6522_1->write_ca1(1);
500   m_via6522_1->write_cb1(1);
501   m_via6522_1->write_ca2(1);
502   m_via6522_1->write_cb2(1);
550503}
551504
552505void microtan_state::machine_reset()
r26856r26857
761714{
762715   UINT8 *RAM = memregion("maincpu")->base();
763716   address_space &space = m_maincpu->space(AS_PROGRAM);
764   via6522_device *via_0 = machine().device<via6522_device>("via6522_0");
765   via6522_device *via_1 = machine().device<via6522_device>("via6522_1");
766717   ay8910_device *ay8910 = machine().device<ay8910_device>("ay8910.1");
767718
768719   /* check for .DMP file format */
r26856r26857
819770
820771      /* first set of VIA6522 registers */
821772      for (i = 0; i < 16; i++ )
822         via_0->write(space, i, snapshot_buff[base++]);
773         m_via6522_0->write(space, i, snapshot_buff[base++]);
823774
824775      /* second set of VIA6522 registers */
825776      for (i = 0; i < 16; i++ )
826         via_1->write(space, i, snapshot_buff[base++]);
777         m_via6522_1->write(space, i, snapshot_buff[base++]);
827778
828779      /* microtan IO bff0-bfff */
829780      for (i = 0; i < 16; i++ )

Previous 199869 Revisions Next

© 1997-2024 The MAME Team