Previous 15994 Revisions Next

r1909 Tuesday 11th March, 2008 at 18:56:24 UTC by Wilbert Pol
Changed tpi6525 implementation to be more running_machine aware.
[src/mess/machine]amigacd.c cbmb.c tpi6525.c tpi6525.h

src/mess/machine/cbmb.c
r1908r1909
157157   return data^0xff;
158158}
159159
160static void cbmb_irq (int level)
160static void cbmb_irq (running_machine *machine, int level)
161161{
162162   static int old_level = 0;
163163
164164   if (level != old_level)
165165   {
166166      DBG_LOG (3, "mos6509", ("irq %s\n", level ? "start" : "end"));
167      cpunum_set_input_line(Machine, 0, M6502_IRQ_LINE, level);
167      cpunum_set_input_line(machine, 0, M6502_IRQ_LINE, level);
168168      old_level = level;
169169   }
170170}
r1908r1909
188188   cbm_ieee_data_w(0, data);
189189}
190190
191static void cbmb_tpi6525_0_irq2_level( int level ) {
192   tpi6525_0_irq2_level( Machine, level );
193}
194
191195static const cia6526_interface cbmb_cia =
192196{
193197   CIA6526,
194   tpi6525_0_irq2_level,
198   cbmb_tpi6525_0_irq2_level,
195199   0.0, 60,
196200
197201   {
r1908r1909
218222   return cbmb_colorram[offset&0x3ff];
219223}
220224
221static void cbmb_change_font(int level)
225static void cbmb_change_font(running_machine *machine, int level)
222226{
223227   cbmb_vh_set_font(level);
224228}
r1908r1909
309313{
310314   static int level = 0;
311315
312   tpi6525_0_irq0_level(level);
316   tpi6525_0_irq0_level(machine, level);
313317   level=!level;
314318   if (level) return ;
315319
src/mess/machine/amigacd.c
r1908r1909
7171
7272static _dmac_data dmac_data;
7373
74static void check_interrupts( void )
74static void check_interrupts( running_machine *machine )
7575{
7676   /* if interrupts are disabled, bail */
7777   if ( (dmac_data.cntr & CNTR_INTEN) == 0 )
r1908r1909
8282      return;
8383
8484   /* otherwise, generate the IRQ */
85   amiga_custom_w(Machine, REG_INTREQ, 0x8000 | INTENA_PORTS, 0);
85   amiga_custom_w(machine, REG_INTREQ, 0x8000 | INTENA_PORTS, 0);
8686}
8787
8888static TIMER_CALLBACK(dmac_dma_proc)
r1908r1909
117117   else
118118   {
119119      dmac_data.istr |= ISTR_INT_P | ISTR_E_INT;
120      check_interrupts();
120      check_interrupts( machine );
121121   }
122122}
123123
r1908r1909
264264      {
265265         LOG(( "DMAC: PC=%08x - CNTR Write(%04x)\n", activecpu_get_pc(), data ));
266266         dmac_data.cntr = data;
267         check_interrupts();
267         check_interrupts( machine );
268268      }
269269      break;
270270
r1908r1909
460460   }
461461}
462462
463static void tp6525_irq( int level )
463static void tp6525_irq( running_machine *machine, int level )
464464{
465465   LOG(( "TPI6525 Interrupt: level = %d\n", level ));
466466
r1908r1909
468468   {
469469      if ( (CUSTOM_REG(REG_INTREQ) & INTENA_PORTS) == 0 )
470470      {
471         amiga_custom_w(Machine, REG_INTREQ, 0x8000 | INTENA_PORTS, 0);
471         amiga_custom_w(machine, REG_INTREQ, 0x8000 | INTENA_PORTS, 0);
472472      }
473473      else
474474      {
r1908r1909
481481static void cdrom_status_enabled( int level )
482482{
483483   /* PC3 on the 6525 */
484   tpi6525_0_irq3_level( level );
484   tpi6525_0_irq3_level( Machine, level );
485485}
486486
487487static void cdrom_status_change( int level )
r1908r1909
490490   level = level ? 0 : 1;
491491
492492   /* PC2 on the 6525 */
493   tpi6525_0_irq2_level( level );
493   tpi6525_0_irq2_level( Machine, level );
494494}
495495
496496static void cdrom_subcode_ready( int level )
497497{
498498   /* PC1 on the 6525 */
499   tpi6525_0_irq1_level( level );
499   tpi6525_0_irq1_level( Machine, level );
500500}
501501
502502void amigacd_init( void )
src/mess/machine/tpi6525.c
r1908r1909
112112      This->irq_level[4]=0;
113113}
114114
115static void tpi6525_set_interrupt(TPI6525 *This)
115static void tpi6525_set_interrupt(running_machine *machine, TPI6525 *This)
116116{
117117   if (!This->interrupt.level && (This->air!=0)) {
118118      This->interrupt.level=1;
119119      DBG_LOG (3, "tpi6525",("%d set interrupt\n",This->number));
120120      if (This->interrupt.output!=NULL)
121         This->interrupt.output(This->interrupt.level);
121         This->interrupt.output(machine, This->interrupt.level);
122122   }
123123}
124124
125static void tpi6525_clear_interrupt(TPI6525 *This)
125static void tpi6525_clear_interrupt(running_machine *machine, TPI6525 *This)
126126{
127127   if (This->interrupt.level && (This->air==0)) {
128128      This->interrupt.level=0;
129129      DBG_LOG (3, "tpi6525",("%d clear interrupt\n",This->number));
130130      if (This->interrupt.output!=NULL)
131         This->interrupt.output(This->interrupt.level);
131         This->interrupt.output(machine, This->interrupt.level);
132132   }
133133}
134134
135static void tpi6525_irq0_level(TPI6525 *This, int level)
135static void tpi6525_irq0_level(running_machine *machine, TPI6525 *This, int level)
136136{
137137   if (INTERRUPT_MODE && (level!=This->irq_level[0]) ) {
138138      This->irq_level[0]=level;
139139      if ((level==0)&&!(This->air&1)&&(This->c.ddr&1)) {
140140         This->air|=1;
141         tpi6525_set_interrupt(This);
141         tpi6525_set_interrupt(machine, This);
142142      }
143143   }
144144}
145145
146static void tpi6525_irq1_level(TPI6525 *This, int level)
146static void tpi6525_irq1_level(running_machine *machine, TPI6525 *This, int level)
147147{
148148   if (INTERRUPT_MODE && (level!=This->irq_level[1]) ) {
149149      This->irq_level[1]=level;
150150      if ((level==0)&&!(This->air&2)&&(This->c.ddr&2)) {
151151         This->air|=2;
152         tpi6525_set_interrupt(This);
152         tpi6525_set_interrupt(machine, This);
153153      }
154154   }
155155}
156156
157static void tpi6525_irq2_level(TPI6525 *This, int level)
157static void tpi6525_irq2_level(running_machine *machine, TPI6525 *This, int level)
158158{
159159   if (INTERRUPT_MODE && (level!=This->irq_level[2]) ) {
160160      This->irq_level[2]=level;
161161      if ((level==0)&&!(This->air&4)&&(This->c.ddr&4)) {
162162         This->air|=4;
163         tpi6525_set_interrupt(This);
163         tpi6525_set_interrupt(machine, This);
164164      }
165165   }
166166}
167167
168static void tpi6525_irq3_level(TPI6525 *This, int level)
168static void tpi6525_irq3_level(running_machine *machine, TPI6525 *This, int level)
169169{
170170   if (INTERRUPT_MODE && (level!=This->irq_level[3]) ) {
171171      This->irq_level[3]=level;
r1908r1909
173173           ||(!INTERRUPT3_RISING_EDGE&&(level==0)))
174174          &&!(This->air&8)&&(This->c.ddr&8)) {
175175         This->air|=8;
176         tpi6525_set_interrupt(This);
176         tpi6525_set_interrupt(machine, This);
177177      }
178178   }
179179}
180180
181static void tpi6525_irq4_level(TPI6525 *This, int level)
181static void tpi6525_irq4_level(running_machine *machine, TPI6525 *This, int level)
182182{
183183   if (INTERRUPT_MODE &&(level!=This->irq_level[4]) ) {
184184      This->irq_level[4]=level;
r1908r1909
186186           ||(!INTERRUPT4_RISING_EDGE&&(level==0)))
187187           &&!(This->air&0x10)&&(This->c.ddr&0x10)) {
188188         This->air|=0x10;
189         tpi6525_set_interrupt(This);
189         tpi6525_set_interrupt(machine, This);
190190      }
191191   }
192192}
r1908r1909
236236   This->c.in=data;
237237}
238238
239static int tpi6525_port_r(TPI6525 *This, int offset)
239static int tpi6525_port_r(running_machine *machine, TPI6525 *This, int offset)
240240{
241241   int data=0xff;
242242   switch (offset&7) {
r1908r1909
303303         data=This->air;
304304         This->air=0;
305305      }
306      tpi6525_clear_interrupt(This);
306      tpi6525_clear_interrupt(machine, This);
307307      break;
308308   }
309309   DBG_LOG (3, "tpi6525",
r1908r1909
311311   return data;
312312}
313313
314static void tpi6525_port_w(TPI6525 *This, int offset, int data)
314static void tpi6525_port_w(running_machine *machine, TPI6525 *This, int offset, int data)
315315{
316316   DBG_LOG (2, "tpi6525",
317317          ("%d write %.2x %.2x\n",This->number, offset,data));
r1908r1909
359359         if (CA_MANUAL_OUT) {
360360            if (This->ca.level!=CA_MANUAL_LEVEL) {
361361               This->ca.level=CA_MANUAL_LEVEL;
362               if (This->ca.output) This->ca.output(This->ca.level);
362               if (This->ca.output) This->ca.output(machine, This->ca.level);
363363            }
364364         }
365365         if (CB_MANUAL_OUT) {
366366            if (This->cb.level!=CB_MANUAL_LEVEL) {
367367               This->cb.level=CB_MANUAL_LEVEL;
368               if (This->cb.output) This->cb.output(This->cb.level);
368               if (This->cb.output) This->cb.output(machine, This->cb.level);
369369            }
370370         }
371371      }
r1908r1909
397397   tpi6525_reset(tpi6525+3);
398398}
399399
400void tpi6525_0_irq0_level(int level)
400void tpi6525_0_irq0_level(running_machine *machine, int level)
401401{
402   tpi6525_irq0_level(tpi6525, level);
402   tpi6525_irq0_level(machine, tpi6525, level);
403403}
404404
405void tpi6525_0_irq1_level(int level)
405void tpi6525_0_irq1_level(running_machine *machine, int level)
406406{
407   tpi6525_irq1_level(tpi6525, level);
407   tpi6525_irq1_level(machine, tpi6525, level);
408408}
409409
410void tpi6525_0_irq2_level(int level)
410void tpi6525_0_irq2_level(running_machine *machine, int level)
411411{
412   tpi6525_irq2_level(tpi6525, level);
412   tpi6525_irq2_level(machine, tpi6525, level);
413413}
414414
415void tpi6525_0_irq3_level(int level)
415void tpi6525_0_irq3_level(running_machine *machine, int level)
416416{
417   tpi6525_irq3_level(tpi6525, level);
417   tpi6525_irq3_level(machine, tpi6525, level);
418418}
419419
420void tpi6525_0_irq4_level(int level)
420void tpi6525_0_irq4_level(running_machine *machine, int level)
421421{
422   tpi6525_irq4_level(tpi6525, level);
422   tpi6525_irq4_level(machine, tpi6525, level);
423423}
424424
425void tpi6525_1_irq0_level(int level)
425void tpi6525_1_irq0_level(running_machine *machine, int level)
426426{
427   tpi6525_irq0_level(tpi6525+1, level);
427   tpi6525_irq0_level(machine, tpi6525+1, level);
428428}
429429
430void tpi6525_1_irq1_level(int level)
430void tpi6525_1_irq1_level(running_machine *machine, int level)
431431{
432   tpi6525_irq1_level(tpi6525+1, level);
432   tpi6525_irq1_level(machine, tpi6525+1, level);
433433}
434434
435void tpi6525_1_irq2_level(int level)
435void tpi6525_1_irq2_level(running_machine *machine, int level)
436436{
437   tpi6525_irq2_level(tpi6525+1, level);
437   tpi6525_irq2_level(machine, tpi6525+1, level);
438438}
439439
440void tpi6525_1_irq3_level(int level)
440void tpi6525_1_irq3_level(running_machine *machine, int level)
441441{
442   tpi6525_irq3_level(tpi6525+1, level);
442   tpi6525_irq3_level(machine, tpi6525+1, level);
443443}
444444
445void tpi6525_1_irq4_level(int level)
445void tpi6525_1_irq4_level(running_machine *machine, int level)
446446{
447   tpi6525_irq4_level(tpi6525+1, level);
447   tpi6525_irq4_level(machine, tpi6525+1, level);
448448}
449449
450450 READ8_HANDLER ( tpi6525_0_port_r )
451451{
452   return tpi6525_port_r(tpi6525, offset);
452   return tpi6525_port_r(machine, tpi6525, offset);
453453}
454454
455455 READ8_HANDLER ( tpi6525_1_port_r )
456456{
457   return tpi6525_port_r(tpi6525+1, offset);
457   return tpi6525_port_r(machine, tpi6525+1, offset);
458458}
459459
460460 READ8_HANDLER ( tpi6525_2_port_r )
461461{
462   return tpi6525_port_r(tpi6525+2, offset);
462   return tpi6525_port_r(machine, tpi6525+2, offset);
463463}
464464
465465 READ8_HANDLER ( tpi6525_3_port_r )
466466{
467   return tpi6525_port_r(tpi6525+3, offset);
467   return tpi6525_port_r(machine, tpi6525+3, offset);
468468}
469469
470470WRITE8_HANDLER ( tpi6525_0_port_w )
471471{
472   tpi6525_port_w(tpi6525, offset, data);
472   tpi6525_port_w(machine, tpi6525, offset, data);
473473}
474474
475475WRITE8_HANDLER ( tpi6525_1_port_w )
476476{
477   tpi6525_port_w(tpi6525+1, offset, data);
477   tpi6525_port_w(machine, tpi6525+1, offset, data);
478478}
479479
480480WRITE8_HANDLER ( tpi6525_2_port_w )
481481{
482   tpi6525_port_w(tpi6525+2, offset, data);
482   tpi6525_port_w(machine, tpi6525+2, offset, data);
483483}
484484
485485WRITE8_HANDLER ( tpi6525_3_port_w )
486486{
487   tpi6525_port_w(tpi6525+3, offset, data);
487   tpi6525_port_w(machine, tpi6525+3, offset, data);
488488}
489489
490490 READ8_HANDLER ( tpi6525_0_port_a_r )
src/mess/machine/tpi6525.h
r1908r1909
4040   } a,b,c;
4141
4242   struct {
43      void (*output)(int level);
43      void (*output)(running_machine *machine, int level);
4444      int level;
4545   } ca, cb, interrupt;
4646
r1908r1909
6060void tpi6525_2_reset(void);
6161void tpi6525_3_reset(void);
6262
63void tpi6525_0_irq0_level(int level);
64void tpi6525_0_irq1_level(int level);
65void tpi6525_0_irq2_level(int level);
66void tpi6525_0_irq3_level(int level);
67void tpi6525_0_irq4_level(int level);
63void tpi6525_0_irq0_level(running_machine *machine, int level);
64void tpi6525_0_irq1_level(running_machine *machine, int level);
65void tpi6525_0_irq2_level(running_machine *machine, int level);
66void tpi6525_0_irq3_level(running_machine *machine, int level);
67void tpi6525_0_irq4_level(running_machine *machine, int level);
6868
69void tpi6525_1_irq0_level(int level);
70void tpi6525_1_irq1_level(int level);
71void tpi6525_1_irq2_level(int level);
72void tpi6525_1_irq3_level(int level);
73void tpi6525_1_irq4_level(int level);
69void tpi6525_1_irq0_level(running_machine *machine, int level);
70void tpi6525_1_irq1_level(running_machine *machine, int level);
71void tpi6525_1_irq2_level(running_machine *machine, int level);
72void tpi6525_1_irq3_level(running_machine *machine, int level);
73void tpi6525_1_irq4_level(running_machine *machine, int level);
7474
7575 READ8_HANDLER  ( tpi6525_0_port_r );
7676 READ8_HANDLER  ( tpi6525_1_port_r );

Previous 15994 Revisions Next


© 1998-2018 The MESS Team