Previous 15994 Revisions Next

r2432 Tuesday 22nd April, 2008 at 15:18:17 UTC by Curt Coder
[MC68901] Improved device interface.
[src/mess/drivers]atarist.c x68k.c
[src/mess/includes]atarist.h x68k.h
[src/mess/machine]68901mfp.c 68901mfp.h
[src/mess/video]atarist.c atarist.h x68k.c

src/mess/includes/x68k.h
r2431r2432
99#ifndef X68K_H_
1010#define X68K_H_
1111
12#define MC68901_TAG   "mc68901"
1213
1314#define GFX16     0
1415#define GFX256    1
src/mess/includes/atarist.h
r2431r2432
11#ifndef __ATARI_ST__
22#define __ATARI_ST__
33
4#define MC68901_TAG   "mc68901"
5
6// Atari ST
7
8#define Y1      XTAL_2_4576MHz
9
10// STBook
11
12#define U517   XTAL_16MHz
13#define Y200   XTAL_2_4576MHz
14#define Y700   XTAL_10MHz
15
416typedef struct _atarist_state atarist_state;
5
617struct _atarist_state
718{
8   /* machine state */
9   mc68901_t *mfp;
1019};
1120
1221#endif
src/mess/video/x68k.c
r2431r2432
3131
3232extern struct x68k_system sys;
3333
34extern mc68901_t *x68k_mfp;
35
3634extern emu_timer* scanline_timer;
3735extern emu_timer* raster_irq;
3836extern emu_timer* vblank_irq;
r2431r2432
250248
251249TIMER_CALLBACK(x68k_crtc_vblank_irq)
252250{
251   const device_config *x68k_mfp = device_list_find_by_tag(machine->config->devicelist, MC68901, MC68901_TAG);
253252   int val = param;
254253   attotime irq_time;
255254   int vblank_line;
r2431r2432
273272      logerror("CRTC: VBlank off\n");
274273   }
275274
275   if (x68k_mfp != NULL)
276276   mc68901_tai_w(x68k_mfp, sys.crtc.vblank);
277277}
278278
src/mess/video/atarist.c
r2431r2432
3636
3737static emu_timer *atarist_glue_timer;
3838static emu_timer *atarist_shifter_timer;
39static const device_config *mfp;
3940
4041INLINE pen_t atarist_shift_mode_0(running_machine *machine)
4142{
r2431r2432
160161
161162   if (de != shifter.de)
162163   {
163      atarist_state *state = machine->driver_data;
164      mc68901_tbi_w(state->mfp, de);
164      mc68901_tbi_w(mfp, de);
165165      shifter.de = de;
166166   }
167167
r2431r2432
250250   return 0;
251251}
252252
253READ16_HANDLER( atarist_shifter_sync_r )
253READ8_HANDLER( atarist_shifter_sync_r )
254254{
255255   return shifter.sync;
256256}
257257
258WRITE16_HANDLER( atarist_shifter_sync_w )
258WRITE8_HANDLER( atarist_shifter_sync_w )
259259{
260   shifter.sync = data >> 8;
260   shifter.sync = data;
261261   logerror("SHIFTER Sync %x\n", shifter.sync);
262262   atarist_set_screen_parameters();
263263}
264264
265READ16_HANDLER( atarist_shifter_mode_r )
265READ8_HANDLER( atarist_shifter_mode_r )
266266{
267   return shifter.mode << 8;
267   return shifter.mode;
268268}
269269
270WRITE16_HANDLER( atarist_shifter_mode_w )
270WRITE8_HANDLER( atarist_shifter_mode_w )
271271{
272   shifter.mode = data >> 8;
272   shifter.mode = data;
273273   logerror("SHIFTER Mode %x\n", shifter.mode);
274274}
275275
r2431r2432
718718
719719VIDEO_START( atarist )
720720{
721   mfp = device_list_find_by_tag(machine->config->devicelist, MC68901, MC68901_TAG);
722
721723   atarist_shifter_timer = timer_alloc(atarist_shifter_tick, NULL);
722724   atarist_glue_timer = timer_alloc(atarist_glue_tick, NULL);
723725
src/mess/video/atarist.h
r2431r2432
3939
4040READ16_HANDLER( atarist_shifter_base_r );
4141READ16_HANDLER( atarist_shifter_counter_r );
42READ16_HANDLER( atarist_shifter_sync_r );
42READ8_HANDLER( atarist_shifter_sync_r );
4343READ16_HANDLER( atarist_shifter_palette_r );
44READ16_HANDLER( atarist_shifter_mode_r );
44READ8_HANDLER( atarist_shifter_mode_r );
4545
4646WRITE16_HANDLER( atarist_shifter_base_w );
47WRITE16_HANDLER( atarist_shifter_sync_w );
47WRITE8_HANDLER( atarist_shifter_sync_w );
4848WRITE16_HANDLER( atarist_shifter_palette_w );
49WRITE16_HANDLER( atarist_shifter_mode_w );
49WRITE8_HANDLER( atarist_shifter_mode_w );
5050
5151/* Atari STe Shifter */
5252
r2431r2432
8787WRITE16_HANDLER( atarist_blitter_count_x_w );
8888WRITE16_HANDLER( atarist_blitter_count_y_w );
8989WRITE16_HANDLER( atarist_blitter_op_w );
90WRITE16_HANDLER( atarist_blitter_op_w );
9091WRITE16_HANDLER( atarist_blitter_ctrl_w );
9192
9293/* Video */
src/mess/machine/68901mfp.c
r2431r2432
207207
208208#define LOG      (0)
209209
210struct _mc68901_t
211{
212   int device_type;
213   const mc68901_interface *intf;
214
215   UINT8 gpip;
216   UINT8 aer;
217   UINT8 ddr;
218
219   UINT16 ier, ipr, isr, imr;
220   UINT8 vr;
221   int irqlevel;
222
223   UINT8 tacr, tbcr, tcdcr;
224   UINT8 tdr[MC68901_MAX_TIMERS];
225   UINT8 tmc[MC68901_MAX_TIMERS];
226   int to[MC68901_MAX_TIMERS];
227   int ti[MC68901_MAX_TIMERS];
228   emu_timer *timer[MC68901_MAX_TIMERS];
229
230   UINT8 ucr;
231   UINT8 udr;
232   UINT8 scr;
233   UINT8 tsr, rsr, next_rsr, rsr_read;
234   UINT8 rx_buffer, tx_buffer;
235   int   rx_bits, tx_bits;
236   int   rx_parity, tx_parity;
237   int   rx_state, tx_state, xmit_state;
238   int rxtx_word, rxtx_start, rxtx_stop;
239} mfp_68901;
240
241210static const int MC68901_INT_MASK_GPIO[] =
242211{
243212   MC68901_IR_GPIP_0, MC68901_IR_GPIP_1, MC68901_IR_GPIP_2, MC68901_IR_GPIP_3,
r2431r2432
261230
262231static const int PRESCALER[] = { 0, 4, 10, 16, 50, 64, 100, 200 };
263232
264static void mc68901_check_interrupts(mc68901_t *chip)
233typedef struct _mc68901_t mc68901_t;
234struct _mc68901_t
265235{
266   if (chip->ipr & chip->imr)
236   int device_type;               /* device type */
237   const mc68901_interface *intf;      /* interface */
238
239   /* registers */
240   UINT8 gpip;                     /* general purpose I/O register */
241   UINT8 aer;                     /* active edge register */
242   UINT8 ddr;                     /* data direction register */
243
244   UINT16 ier;                     /* interrupt enable register */
245   UINT16 ipr;                     /* interrupt pending register */
246   UINT16 isr;                     /* interrupt in-service register */
247   UINT16 imr;                     /* interrupt mask register */
248   UINT8 vr;                     /* vector register */
249
250   UINT8 tacr;                     /* timer A control register */
251   UINT8 tbcr;                     /* timer B control register */
252   UINT8 tcdcr;                  /* timers C and D control register */
253   UINT8 tdr[MC68901_MAX_TIMERS];      /* timer data registers */
254   
255   UINT8 scr;                     /* synchronous character register */
256   UINT8 ucr;                     /* USART control register */
257   UINT8 tsr;                     /* transmitter status register */
258   UINT8 rsr;                     /* receiver status register */
259   UINT8 udr;                     /* USART data register */
260   
261   /* counter timer state */
262   UINT8 tmc[MC68901_MAX_TIMERS];      /* timer main counters */
263   int ti[MC68901_MAX_TIMERS];         /* timer in latch */
264   int to[MC68901_MAX_TIMERS];         /* timer out latch */
265
266   /* interrupt state */
267   int irqlevel;                  /* interrupt level latch */
268   
269   /* serial state */
270   UINT8 next_rsr;                  /* receiver status register latch */
271   int rsr_read;                  /* receiver status register read flag */
272   int rxtx_word;                  /* word length */
273   int rxtx_start;                  /* start bits */
274   int rxtx_stop;                  /* stop bits */
275
276   /* receive state */
277   UINT8 rx_buffer;               /* receive buffer */
278   int   rx_bits;                  /* receive bit count */
279   int   rx_parity;                  /* receive parity bit */
280   int   rx_state;                  /* receive state */
281
282   /* transmit state */
283   UINT8 tx_buffer;               /* transmit buffer */
284   int tx_bits;                  /* transmit bit count */
285   int tx_parity;                  /* transmit parity bit */
286   int tx_state;                  /* transmit state */
287   int xmit_state;                  /* transmitter state */
288
289   /* timers */
290   emu_timer *timer[MC68901_MAX_TIMERS]; /* counter timers */
291   
292   emu_timer *rx_timer;            /* receive timer */
293   emu_timer *tx_timer;            /* transmit timer */
294
295   emu_timer *poll_timer;            /* general purpose I/O poll timer */
296} mfp_68901;
297
298INLINE mc68901_t *get_safe_token(const device_config *device)
299{
300   assert(device != NULL);
301   assert(device->token != NULL);
302
303   return (mc68901_t *)device->token;
304}
305
306static void mc68901_check_interrupts(const device_config *device)
307{
308   mc68901_t *mc68901 = get_safe_token(device);
309
310   if (mc68901->ipr & mc68901->imr)
267311   {
268      chip->intf->irq_callback(chip, ASSERT_LINE);
312      mc68901->intf->on_irq_changed(device, ASSERT_LINE);
269313   }
270314   else
271315   {
272      chip->intf->irq_callback(chip, CLEAR_LINE);
316      mc68901->intf->on_irq_changed(device, CLEAR_LINE);
273317   }
274318}
275319
276static void mc68901_interrupt(mc68901_t *chip, UINT16 mask)
320static void mc68901_interrupt(const device_config *device, UINT16 mask)
277321{
278   chip->ipr |= mask;
322   mc68901_t *mc68901 = get_safe_token(device);
279323
280   mc68901_check_interrupts(chip);
324   mc68901->ipr |= mask;
325
326   mc68901_check_interrupts(device);
281327}
282328
283329static TIMER_CALLBACK( mc68901_gpio_poll_tick )
284330{
285   mc68901_t *chip = ptr;
331   const device_config *device = ptr;
332   mc68901_t *mc68901 = get_safe_token(device);
286333
287   UINT8 gpio = chip->intf->gpio_r(machine, 0);
334   UINT8 gpio = mc68901->intf->gpio_r(device);
288335
289   UINT8 gpold = (chip->gpip & ~chip->ddr) ^ chip->aer;
290   UINT8 gpnew = (gpio & ~chip->ddr) ^ chip->aer;
336   UINT8 gpold = (mc68901->gpip & ~mc68901->ddr) ^ mc68901->aer;
337   UINT8 gpnew = (gpio & ~mc68901->ddr) ^ mc68901->aer;
291338
292339   int bit;
293340
r2431r2432
297344      {
298345         if (LOG) logerror("MC68901 Edge Transition Detected on GPIO%u\n", bit);
299346
300         if (chip->ier & MC68901_INT_MASK_GPIO[bit]) // AND interrupt enabled bit is set...
347         if (mc68901->ier & MC68901_INT_MASK_GPIO[bit]) // AND interrupt enabled bit is set...
301348         {
302349            if (LOG) logerror("MC68901 Interrupt Pending for GPIO%u\n", bit);
303350
304            mc68901_interrupt(chip, MC68901_INT_MASK_GPIO[bit]); // set interrupt pending bit
351            mc68901_interrupt(device, MC68901_INT_MASK_GPIO[bit]); // set interrupt pending bit
305352         }
306353      }
307354   }
308355
309   chip->gpip = (gpio & ~chip->ddr) | (chip->gpip & chip->ddr);
356   mc68901->gpip = (gpio & ~mc68901->ddr) | (mc68901->gpip & mc68901->ddr);
310357}
311358
312359/* USART */
313360
314static void mc68901_rx_buffer_full(mc68901_t *chip)
361static void mc68901_rx_buffer_full(const device_config *device)
315362{
316   if (chip->ier & MC68901_IR_RCV_BUFFER_FULL)
363   mc68901_t *mc68901 = get_safe_token(device);
364
365   if (mc68901->ier & MC68901_IR_RCV_BUFFER_FULL)
317366   {
318      mc68901_interrupt(chip, MC68901_IR_RCV_BUFFER_FULL);
367      mc68901_interrupt(device, MC68901_IR_RCV_BUFFER_FULL);
319368   }
320369}
321370
322static void mc68901_rx_error(mc68901_t *chip)
371static void mc68901_rx_error(const device_config *device)
323372{
324   if (chip->ier & MC68901_IR_RCV_ERROR)
373   mc68901_t *mc68901 = get_safe_token(device);
374
375   if (mc68901->ier & MC68901_IR_RCV_ERROR)
325376   {
326      mc68901_interrupt(chip, MC68901_IR_RCV_ERROR);
377      mc68901_interrupt(device, MC68901_IR_RCV_ERROR);
327378   }
328379   else
329380   {
330      mc68901_rx_buffer_full(chip);
381      mc68901_rx_buffer_full(device);
331382   }
332383}
333384
334static void mc68901_tx_buffer_empty(mc68901_t *chip)
385static void mc68901_tx_buffer_empty(const device_config *device)
335386{
336   if (chip->ier & MC68901_IR_XMIT_BUFFER_EMPTY)
387   mc68901_t *mc68901 = get_safe_token(device);
388
389   if (mc68901->ier & MC68901_IR_XMIT_BUFFER_EMPTY)
337390   {
338      mc68901_interrupt(chip, MC68901_IR_XMIT_BUFFER_EMPTY);
391      mc68901_interrupt(device, MC68901_IR_XMIT_BUFFER_EMPTY);
339392   }
340393}
341394
342static void mc68901_tx_error(mc68901_t *chip)
395static void mc68901_tx_error(const device_config *device)
343396{
344   if (chip->ier & MC68901_IR_XMIT_ERROR)
397   mc68901_t *mc68901 = get_safe_token(device);
398
399   if (mc68901->ier & MC68901_IR_XMIT_ERROR)
345400   {
346      mc68901_interrupt(chip, MC68901_IR_XMIT_ERROR);
401      mc68901_interrupt(device, MC68901_IR_XMIT_ERROR);
347402   }
348403   else
349404   {
350      mc68901_tx_buffer_empty(chip);
405      mc68901_tx_buffer_empty(device);
351406   }
352407}
353408
r2431r2432
359414   return b & 1;
360415}
361416
362static void mc68901_serial_rx(mc68901_t *chip)
417static void mc68901_serial_rx(const device_config *device)
363418{
364   if (chip->rsr & MC68901_RSR_RCV_ENABLE)
419   mc68901_t *mc68901 = get_safe_token(device);
420
421   if (mc68901->rsr & MC68901_RSR_RCV_ENABLE)
365422   {
366      switch (chip->rx_state)
423      switch (mc68901->rx_state)
367424      {
368425      case MC68901_SERIAL_START:
369         if (chip->intf->rx_pin == 0)
426         if (mc68901->intf->rx_pin == 0)
370427         {
371            chip->rsr |= MC68901_RSR_CHAR_IN_PROGRESS;
372            chip->rx_bits = 0;
373            chip->rx_buffer = 0;
374            chip->rx_state = MC68901_SERIAL_DATA;
375            chip->next_rsr = MC68901_RSR_BREAK;
428            mc68901->rsr |= MC68901_RSR_CHAR_IN_PROGRESS;
429            mc68901->rx_bits = 0;
430            mc68901->rx_buffer = 0;
431            mc68901->rx_state = MC68901_SERIAL_DATA;
432            mc68901->next_rsr = MC68901_RSR_BREAK;
376433         }
377434         break;
378435
379436      case MC68901_SERIAL_DATA:
380         if ((chip->next_rsr & MC68901_RSR_BREAK) && (*chip->intf->rx_pin == 1) && chip->rsr_read)
437         if ((mc68901->next_rsr & MC68901_RSR_BREAK) && (*mc68901->intf->rx_pin == 1) && mc68901->rsr_read)
381438         {
382            chip->next_rsr &= ~MC68901_RSR_BREAK;
439            mc68901->next_rsr &= ~MC68901_RSR_BREAK;
383440         }
384441
385         chip->rx_buffer >>= 1;
386         chip->rx_buffer |= (*chip->intf->rx_pin << 7);
387         chip->rx_bits++;
442         mc68901->rx_buffer >>= 1;
443         mc68901->rx_buffer |= (*mc68901->intf->rx_pin << 7);
444         mc68901->rx_bits++;
388445
389         if (chip->rx_bits == chip->rxtx_word)
446         if (mc68901->rx_bits == mc68901->rxtx_word)
390447         {
391            if (chip->rxtx_word < 8)
448            if (mc68901->rxtx_word < 8)
392449            {
393               chip->rx_buffer >>= (8 - chip->rxtx_word);
450               mc68901->rx_buffer >>= (8 - mc68901->rxtx_word);
394451            }
395452
396            chip->rsr &= ~MC68901_RSR_CHAR_IN_PROGRESS;
453            mc68901->rsr &= ~MC68901_RSR_CHAR_IN_PROGRESS;
397454
398            if (chip->ucr & MC68901_UCR_PARITY_ENABLED)
455            if (mc68901->ucr & MC68901_UCR_PARITY_ENABLED)
399456            {
400               chip->rx_state = MC68901_SERIAL_PARITY;
457               mc68901->rx_state = MC68901_SERIAL_PARITY;
401458            }
402459            else
403460            {
404               chip->rx_state = MC68901_SERIAL_STOP;
461               mc68901->rx_state = MC68901_SERIAL_STOP;
405462            }
406463         }
407464         break;
408465
409466      case MC68901_SERIAL_PARITY:
410         chip->rx_parity = *chip->intf->rx_pin;
467         mc68901->rx_parity = *mc68901->intf->rx_pin;
411468
412         if (chip->rx_parity != (mc68901_parity(chip->rx_buffer) ^ ((chip->ucr & MC68901_UCR_PARITY_EVEN) >> 1)))
469         if (mc68901->rx_parity != (mc68901_parity(mc68901->rx_buffer) ^ ((mc68901->ucr & MC68901_UCR_PARITY_EVEN) >> 1)))
413470         {
414            chip->next_rsr |= MC68901_RSR_PARITY_ERROR;
471            mc68901->next_rsr |= MC68901_RSR_PARITY_ERROR;
415472         }
416473
417         chip->rx_state = MC68901_SERIAL_STOP;
474         mc68901->rx_state = MC68901_SERIAL_STOP;
418475         break;
419476
420477      case MC68901_SERIAL_STOP:
421         if (*chip->intf->rx_pin == 1)
478         if (*mc68901->intf->rx_pin == 1)
422479         {
423            if (!((chip->rsr & MC68901_RSR_SYNC_STRIP_ENABLE) && (chip->rx_buffer == chip->scr)))
480            if (!((mc68901->rsr & MC68901_RSR_SYNC_STRIP_ENABLE) && (mc68901->rx_buffer == mc68901->scr)))
424481            {
425               if (!(chip->rsr & MC68901_RSR_OVERRUN_ERROR))
482               if (!(mc68901->rsr & MC68901_RSR_OVERRUN_ERROR))
426483               {
427                  if (chip->rsr & MC68901_RSR_BUFFER_FULL)
484                  if (mc68901->rsr & MC68901_RSR_BUFFER_FULL)
428485                  {
429486                     // incoming word received but last word in receive buffer has not been read
430                     chip->next_rsr |= MC68901_RSR_OVERRUN_ERROR;
487                     mc68901->next_rsr |= MC68901_RSR_OVERRUN_ERROR;
431488                  }
432489                  else
433490                  {
434491                     // incoming word received and receive buffer is empty
435                     chip->rsr |= MC68901_RSR_BUFFER_FULL;
436                     chip->udr = chip->rx_buffer;
437                     mc68901_rx_buffer_full(chip);
492                     mc68901->rsr |= MC68901_RSR_BUFFER_FULL;
493                     mc68901->udr = mc68901->rx_buffer;
494                     mc68901_rx_buffer_full(device);
438495                  }
439496               }
440497            }
441498         }
442499         else
443500         {
444            if (chip->rx_buffer)
501            if (mc68901->rx_buffer)
445502            {
446503               // non-zero data word not followed by a stop bit
447               chip->next_rsr |= MC68901_RSR_FRAME_ERROR;
504               mc68901->next_rsr |= MC68901_RSR_FRAME_ERROR;
448505            }
449506         }
450507
451         chip->rx_state = MC68901_SERIAL_START;
508         mc68901->rx_state = MC68901_SERIAL_START;
452509         break;
453510      }
454511   }
r2431r2432
456513
457514static TIMER_CALLBACK( rx_tick )
458515{
459   mc68901_serial_rx(ptr);
516   const device_config *device = ptr;
517
518   mc68901_serial_rx(device);
460519}
461520
462static void mc68901_transmit_disabled(mc68901_t *chip)
521static void mc68901_transmit_disabled(const device_config *device)
463522{
464   switch (chip->tsr & MC68901_TSR_OUTPUT_MASK)
523   mc68901_t *mc68901 = get_safe_token(device);
524
525   switch (mc68901->tsr & MC68901_TSR_OUTPUT_MASK)
465526   {
466527   case MC68901_TSR_OUTPUT_HI_Z:
467528      // indeterminate
468529   case MC68901_TSR_OUTPUT_LOW:
469      *chip->intf->tx_pin = 0;
530      *mc68901->intf->tx_pin = 0;
470531      break;
471532
472533   case MC68901_TSR_OUTPUT_HIGH:
473534   case MC68901_TSR_OUTPUT_LOOP:
474      *chip->intf->tx_pin = 1;
535      *mc68901->intf->tx_pin = 1;
475536      break;
476537   }
477538}
478539
479static void mc68901_transmit(mc68901_t *chip)
540static void mc68901_transmit(const device_config *device)
480541{
481   switch (chip->tx_state)
542   mc68901_t *mc68901 = get_safe_token(device);
543
544   switch (mc68901->tx_state)
482545   {
483546   case MC68901_SERIAL_START:
484      if (chip->tsr & MC68901_TSR_UNDERRUN_ERROR)
547      if (mc68901->tsr & MC68901_TSR_UNDERRUN_ERROR)
485548      {
486         if (chip->tsr & MC68901_TSR_XMIT_ENABLE)
549         if (mc68901->tsr & MC68901_TSR_XMIT_ENABLE)
487550         {
488            *chip->intf->tx_pin = 1;
551            *mc68901->intf->tx_pin = 1;
489552         }
490553         else
491554         {
492            mc68901_transmit_disabled(chip);
555            mc68901_transmit_disabled(device);
493556         }
494557      }
495558      else
496559      {
497         if (chip->tsr & MC68901_TSR_BUFFER_EMPTY)
560         if (mc68901->tsr & MC68901_TSR_BUFFER_EMPTY)
498561         {
499            chip->tsr |= MC68901_TSR_UNDERRUN_ERROR;
562            mc68901->tsr |= MC68901_TSR_UNDERRUN_ERROR;
500563
501            if (chip->tsr & MC68901_TSR_XMIT_ENABLE)
564            if (mc68901->tsr & MC68901_TSR_XMIT_ENABLE)
502565            {
503               *chip->intf->tx_pin = 1;
566               *mc68901->intf->tx_pin = 1;
504567            }
505568            else
506569            {
507               mc68901_transmit_disabled(chip);
570               mc68901_transmit_disabled(device);
508571            }
509572         }
510573         else
511574         {
512            *chip->intf->tx_pin = 0;
513            chip->tx_buffer = chip->udr;
514            chip->tx_bits = 0;
515            chip->tx_state = MC68901_SERIAL_DATA;
516            chip->tsr |= MC68901_TSR_BUFFER_EMPTY;
517            mc68901_tx_buffer_empty(chip);
518            chip->tx_parity = mc68901_parity(chip->tx_buffer);
575            *mc68901->intf->tx_pin = 0;
576            mc68901->tx_buffer = mc68901->udr;
577            mc68901->tx_bits = 0;
578            mc68901->tx_state = MC68901_SERIAL_DATA;
579            mc68901->tsr |= MC68901_TSR_BUFFER_EMPTY;
580            mc68901_tx_buffer_empty(device);
581            mc68901->tx_parity = mc68901_parity(mc68901->tx_buffer);
519582         }
520583      }
521584      break;
522585
523586   case MC68901_SERIAL_DATA:
524      *chip->intf->tx_pin = chip->tx_buffer & 0x01;
525      chip->tx_buffer >>= 1;
526      chip->tx_bits++;
587      *mc68901->intf->tx_pin = mc68901->tx_buffer & 0x01;
588      mc68901->tx_buffer >>= 1;
589      mc68901->tx_bits++;
527590
528      if (chip->tx_bits == chip->rxtx_word)
591      if (mc68901->tx_bits == mc68901->rxtx_word)
529592      {
530         if (chip->ucr & MC68901_UCR_PARITY_ENABLED)
593         if (mc68901->ucr & MC68901_UCR_PARITY_ENABLED)
531594         {
532            chip->tx_state = MC68901_SERIAL_PARITY;
595            mc68901->tx_state = MC68901_SERIAL_PARITY;
533596         }
534597         else
535598         {
536            chip->tx_state = MC68901_SERIAL_STOP;
599            mc68901->tx_state = MC68901_SERIAL_STOP;
537600         }
538601      }
539602      break;
540603
541604   case MC68901_SERIAL_PARITY:
542      if (chip->rxtx_word < 8)
605      if (mc68901->rxtx_word < 8)
543606      {
544607         // highest bit in buffer is user-specified parity bit
545608
546         *chip->intf->tx_pin = chip->tx_buffer & 0x01;
609         *mc68901->intf->tx_pin = mc68901->tx_buffer & 0x01;
547610      }
548611      else
549612      {
550613         // use previously calculated parity
551614
552         *chip->intf->tx_pin = chip->tx_parity ^ ((chip->ucr & MC68901_UCR_PARITY_EVEN) >> 1);
615         *mc68901->intf->tx_pin = mc68901->tx_parity ^ ((mc68901->ucr & MC68901_UCR_PARITY_EVEN) >> 1);
553616      }
554617
555      chip->tx_state = MC68901_SERIAL_STOP;
618      mc68901->tx_state = MC68901_SERIAL_STOP;
556619      break;
557620
558621   case MC68901_SERIAL_STOP:
559      *chip->intf->tx_pin = 1;
622      *mc68901->intf->tx_pin = 1;
560623
561      if (chip->tsr & MC68901_TSR_XMIT_ENABLE)
624      if (mc68901->tsr & MC68901_TSR_XMIT_ENABLE)
562625      {
563         chip->tx_state = MC68901_SERIAL_START;
626         mc68901->tx_state = MC68901_SERIAL_START;
564627      }
565628      else
566629      {
567         if (chip->tsr & MC68901_TSR_AUTO_TURNAROUND)
630         if (mc68901->tsr & MC68901_TSR_AUTO_TURNAROUND)
568631         {
569            chip->tsr |= MC68901_TSR_XMIT_ENABLE;
570            chip->tx_state = MC68901_SERIAL_START;
632            mc68901->tsr |= MC68901_TSR_XMIT_ENABLE;
633            mc68901->tx_state = MC68901_SERIAL_START;
571634         }
572635         else
573636         {
574            chip->xmit_state = MC68901_XMIT_OFF;
575            chip->tsr |= MC68901_TSR_END_OF_XMIT;
576            mc68901_tx_error(chip);
637            mc68901->xmit_state = MC68901_XMIT_OFF;
638            mc68901->tsr |= MC68901_TSR_END_OF_XMIT;
639            mc68901_tx_error(device);
577640         }
578641      }
579642      break;
580643   }
581644}
582645
583static void mc68901_serial_tx(mc68901_t *chip)
646static void mc68901_serial_tx(const device_config *device)
584647{
585   switch (chip->xmit_state)
648   mc68901_t *mc68901 = get_safe_token(device);
649
650   switch (mc68901->xmit_state)
586651   {
587652   case MC68901_XMIT_OFF:
588      mc68901_transmit_disabled(chip);
653      mc68901_transmit_disabled(device);
589654      break;
590655
591656   case MC68901_XMIT_STARTING:
592      if (chip->tsr & MC68901_TSR_XMIT_ENABLE)
657      if (mc68901->tsr & MC68901_TSR_XMIT_ENABLE)
593658      {
594         *chip->intf->tx_pin = 1;
595         chip->xmit_state = MC68901_XMIT_ON;
659         *mc68901->intf->tx_pin = 1;
660         mc68901->xmit_state = MC68901_XMIT_ON;
596661      }
597662      else
598663      {
599         chip->xmit_state = MC68901_XMIT_OFF;
600         chip->tsr |= MC68901_TSR_END_OF_XMIT;
664         mc68901->xmit_state = MC68901_XMIT_OFF;
665         mc68901->tsr |= MC68901_TSR_END_OF_XMIT;
601666      }
602667      break;
603668
604669   case MC68901_XMIT_BREAK:
605      if (chip->tsr & MC68901_TSR_XMIT_ENABLE)
670      if (mc68901->tsr & MC68901_TSR_XMIT_ENABLE)
606671      {
607         if (chip->tsr & MC68901_TSR_BREAK)
672         if (mc68901->tsr & MC68901_TSR_BREAK)
608673         {
609            *chip->intf->tx_pin = 1;
674            *mc68901->intf->tx_pin = 1;
610675         }
611676         else
612677         {
613            chip->xmit_state = MC68901_XMIT_ON;
678            mc68901->xmit_state = MC68901_XMIT_ON;
614679         }
615680      }
616681      else
617682      {
618         chip->xmit_state = MC68901_XMIT_OFF;
619         chip->tsr |= MC68901_TSR_END_OF_XMIT;
683         mc68901->xmit_state = MC68901_XMIT_OFF;
684         mc68901->tsr |= MC68901_TSR_END_OF_XMIT;
620685      }
621686      break;
622687
623688   case MC68901_XMIT_ON:
624      mc68901_transmit(chip);
689      mc68901_transmit(device);
625690      break;
626691   }
627692}
628693
629694static TIMER_CALLBACK( tx_tick )
630695{
631   mc68901_serial_tx(ptr);
696   const device_config *device = ptr;
697
698   mc68901_serial_tx(device);
632699}
633700
634UINT8 mc68901_register_r(mc68901_t *chip, int reg)
701/* Register Access */
702
703READ8_DEVICE_HANDLER( mc68901_register_r )
635704{
636   assert(chip != NULL);
705   mc68901_t *mc68901 = get_safe_token(device);
637706
638   switch (reg)
707   assert(mc68901 != NULL);
708
709   switch (offset)
639710   {
640   case MC68901_REGISTER_GPIP:  return chip->gpip;
641   case MC68901_REGISTER_AER:   return chip->aer;
642   case MC68901_REGISTER_DDR:   return chip->ddr;
711   case MC68901_REGISTER_GPIP:  return mc68901->gpip;
712   case MC68901_REGISTER_AER:   return mc68901->aer;
713   case MC68901_REGISTER_DDR:   return mc68901->ddr;
643714
644   case MC68901_REGISTER_IERA:  return chip->ier >> 8;
645   case MC68901_REGISTER_IERB:  return chip->ier & 0xff;
646   case MC68901_REGISTER_IPRA:  return chip->ipr >> 8;
647   case MC68901_REGISTER_IPRB:  return chip->ipr & 0xff;
648   case MC68901_REGISTER_ISRA:  return chip->isr >> 8;
649   case MC68901_REGISTER_ISRB:  return chip->isr & 0xff;
650   case MC68901_REGISTER_IMRA:  return chip->imr >> 8;
651   case MC68901_REGISTER_IMRB:  return chip->imr & 0xff;
652   case MC68901_REGISTER_VR:    return chip->vr;
715   case MC68901_REGISTER_IERA:  return mc68901->ier >> 8;
716   case MC68901_REGISTER_IERB:  return mc68901->ier & 0xff;
717   case MC68901_REGISTER_IPRA:  return mc68901->ipr >> 8;
718   case MC68901_REGISTER_IPRB:  return mc68901->ipr & 0xff;
719   case MC68901_REGISTER_ISRA:  return mc68901->isr >> 8;
720   case MC68901_REGISTER_ISRB:  return mc68901->isr & 0xff;
721   case MC68901_REGISTER_IMRA:  return mc68901->imr >> 8;
722   case MC68901_REGISTER_IMRB:  return mc68901->imr & 0xff;
723   case MC68901_REGISTER_VR:    return mc68901->vr;
653724
654   case MC68901_REGISTER_TACR:  return chip->tacr;
655   case MC68901_REGISTER_TBCR:  return chip->tbcr;
656   case MC68901_REGISTER_TCDCR: return chip->tcdcr;
657   case MC68901_REGISTER_TADR:  return chip->tmc[MC68901_TIMER_A];
658   case MC68901_REGISTER_TBDR:  return chip->tmc[MC68901_TIMER_B];
659   case MC68901_REGISTER_TCDR:  return chip->tmc[MC68901_TIMER_C];
660   case MC68901_REGISTER_TDDR:  return chip->tmc[MC68901_TIMER_D];
725   case MC68901_REGISTER_TACR:  return mc68901->tacr;
726   case MC68901_REGISTER_TBCR:  return mc68901->tbcr;
727   case MC68901_REGISTER_TCDCR: return mc68901->tcdcr;
728   case MC68901_REGISTER_TADR:  return mc68901->tmc[MC68901_TIMER_A];
729   case MC68901_REGISTER_TBDR:  return mc68901->tmc[MC68901_TIMER_B];
730   case MC68901_REGISTER_TCDR:  return mc68901->tmc[MC68901_TIMER_C];
731   case MC68901_REGISTER_TDDR:  return mc68901->tmc[MC68901_TIMER_D];
661732
662   case MC68901_REGISTER_SCR:   return chip->scr;
663   case MC68901_REGISTER_UCR:   return chip->ucr;
733   case MC68901_REGISTER_SCR:   return mc68901->scr;
734   case MC68901_REGISTER_UCR:   return mc68901->ucr;
664735   case MC68901_REGISTER_RSR:
665      chip->rsr_read = 1;
666      return chip->rsr;
736      mc68901->rsr_read = 1;
737      return mc68901->rsr;
667738
668739   case MC68901_REGISTER_TSR:
669740      {
670741         // clear UE bit (in reality, this won't be cleared until one full clock cycle of the transmitter has passed since the bit was set)
671742
672         UINT8 tsr = chip->tsr;
673         chip->tsr &= 0xbf;
743         UINT8 tsr = mc68901->tsr;
744         mc68901->tsr &= 0xbf;
674745
675746         return tsr;
676747      }
r2431r2432
678749   case MC68901_REGISTER_UDR:
679750      // load RSR with latched value
680751
681      chip->rsr = (chip->next_rsr & 0x7c) | (chip->rsr & 0x03);
682      chip->next_rsr = 0;
752      mc68901->rsr = (mc68901->next_rsr & 0x7c) | (mc68901->rsr & 0x03);
753      mc68901->next_rsr = 0;
683754
684755      // signal receiver error interrupt
685756
686      if (chip->rsr & 0x78)
757      if (mc68901->rsr & 0x78)
687758      {
688         mc68901_rx_error(chip);
759         mc68901_rx_error(device);
689760      }
690761
691      return chip->udr;
762      return mc68901->udr;
692763
693764   default:                 return 0;
694765   }
r2431r2432
696767
697768#define DIVISOR PRESCALER[data & 0x07]
698769
699void mc68901_register_w(mc68901_t *chip, int reg, UINT8 data)
770WRITE8_DEVICE_HANDLER( mc68901_register_w )
700771{
701   assert(chip != NULL);
772   mc68901_t *mc68901 = get_safe_token(device);
702773
703   switch (reg)
774   switch (offset)
704775   {
705776   case MC68901_REGISTER_GPIP:
706777      if (LOG) logerror("MC68901 General Purpose I/O : %x\n", data);
707      chip->gpip = data & chip->ddr;
778      mc68901->gpip = data & mc68901->ddr;
708779
709      if (chip->intf->gpio_w)
780      if (mc68901->intf->gpio_w)
710781      {
711         chip->intf->gpio_w(Machine, 0, chip->gpip);
782         mc68901->intf->gpio_w(device, mc68901->gpip);
712783      }
713784      break;
714785
715786   case MC68901_REGISTER_AER:
716787      if (LOG) logerror("MC68901 Active Edge Register : %x\n", data);
717      chip->aer = data;
788      mc68901->aer = data;
718789      break;
719790
720791   case MC68901_REGISTER_DDR:
721792      if (LOG) logerror("MC68901 Data Direction Register : %x\n", data);
722      chip->ddr = data;
793      mc68901->ddr = data;
723794      break;
724795
725796   case MC68901_REGISTER_IERA:
726797      if (LOG) logerror("MC68901 Interrupt Enable Register A : %x\n", data);
727      chip->ier = (data << 8) | (chip->ier & 0xff);
728      chip->ipr &= chip->ier;
729      mc68901_check_interrupts(chip);
798      mc68901->ier = (data << 8) | (mc68901->ier & 0xff);
799      mc68901->ipr &= mc68901->ier;
800      mc68901_check_interrupts(device);
730801      break;
731802
732803   case MC68901_REGISTER_IERB:
733804      if (LOG) logerror("MC68901 Interrupt Enable Register B : %x\n", data);
734      chip->ier = (chip->ier & 0xff00) | data;
735      chip->ipr &= chip->ier;
736      mc68901_check_interrupts(chip);
805      mc68901->ier = (mc68901->ier & 0xff00) | data;
806      mc68901->ipr &= mc68901->ier;
807      mc68901_check_interrupts(device);
737808      break;
738809
739810   case MC68901_REGISTER_IPRA:
740811      if (LOG) logerror("MC68901 Interrupt Pending Register A : %x\n", data);
741      chip->ipr &= (data << 8) | (chip->ipr & 0xff);
742      mc68901_check_interrupts(chip);
812      mc68901->ipr &= (data << 8) | (mc68901->ipr & 0xff);
813      mc68901_check_interrupts(device);
743814      break;
744815
745816   case MC68901_REGISTER_IPRB:
746817      if (LOG) logerror("MC68901 Interrupt Pending Register B : %x\n", data);
747      chip->ipr &= (chip->ipr & 0xff00) | data;
748      mc68901_check_interrupts(chip);
818      mc68901->ipr &= (mc68901->ipr & 0xff00) | data;
819      mc68901_check_interrupts(device);
749820      break;
750821
751822   case MC68901_REGISTER_ISRA:
752823      if (LOG) logerror("MC68901 Interrupt In-Service Register A : %x\n", data);
753      chip->isr &= (data << 8) | (chip->isr & 0xff);
824      mc68901->isr &= (data << 8) | (mc68901->isr & 0xff);
754825      break;
755826
756827   case MC68901_REGISTER_ISRB:
757828      if (LOG) logerror("MC68901 Interrupt In-Service Register B : %x\n", data);
758      chip->isr &= (chip->isr & 0xff00) | data;
829      mc68901->isr &= (mc68901->isr & 0xff00) | data;
759830      break;
760831
761832   case MC68901_REGISTER_IMRA:
762833      if (LOG) logerror("MC68901 Interrupt Mask Register A : %x\n", data);
763      chip->imr = (data << 8) | (chip->imr & 0xff);
764      chip->isr &= chip->imr;
765      mc68901_check_interrupts(chip);
834      mc68901->imr = (data << 8) | (mc68901->imr & 0xff);
835      mc68901->isr &= mc68901->imr;
836      mc68901_check_interrupts(device);
766837      break;
767838
768839   case MC68901_REGISTER_IMRB:
769840      if (LOG) logerror("MC68901 Interrupt Mask Register B : %x\n", data);
770      chip->imr = (chip->imr & 0xff00) | data;
771      chip->isr &= chip->imr;
772      mc68901_check_interrupts(chip);
841      mc68901->imr = (mc68901->imr & 0xff00) | data;
842      mc68901->isr &= mc68901->imr;
843      mc68901_check_interrupts(device);
773844      break;
774845
775846   case MC68901_REGISTER_VR:
776847      if (LOG) logerror("MC68901 Interrupt Vector : %x\n", data & 0xf0);
777848
778      chip->vr = data & 0xf8;
849      mc68901->vr = data & 0xf8;
779850
780      if (chip->vr & MC68901_VR_S)
851      if (mc68901->vr & MC68901_VR_S)
781852      {
782853         if (LOG) logerror("MC68901 Software End-Of-Interrupt Mode\n");
783854      }
r2431r2432
785856      {
786857         if (LOG) logerror("MC68901 Automatic End-Of-Interrupt Mode\n");
787858
788         chip->isr = 0;
859         mc68901->isr = 0;
789860      }
790861      break;
791862
792863   case MC68901_REGISTER_TACR:
793      chip->tacr = data & 0x1f;
864      mc68901->tacr = data & 0x1f;
794865
795      switch (chip->tacr & 0x0f)
866      switch (mc68901->tacr & 0x0f)
796867      {
797868      case MC68901_TCR_TIMER_STOPPED:
798869         if (LOG) logerror("MC68901 Timer A Stopped\n");
799         timer_enable(chip->timer[MC68901_TIMER_A], 0);
870         timer_enable(mc68901->timer[MC68901_TIMER_A], 0);
800871         break;
801872
802873      case MC68901_TCR_TIMER_DELAY_4:
r2431r2432
807878      case MC68901_TCR_TIMER_DELAY_100:
808879      case MC68901_TCR_TIMER_DELAY_200:
809880         {
810         int divisor = PRESCALER[chip->tacr & 0x07];
881         int divisor = PRESCALER[mc68901->tacr & 0x07];
811882         if (LOG) logerror("MC68901 Timer A Delay Mode : %u Prescale\n", divisor);
812         timer_adjust_periodic(chip->timer[MC68901_TIMER_A], ATTOTIME_IN_HZ(chip->intf->timer_clock / divisor), 0, ATTOTIME_IN_HZ(chip->intf->timer_clock / divisor));
883         timer_adjust_periodic(mc68901->timer[MC68901_TIMER_A], ATTOTIME_IN_HZ(mc68901->intf->timer_clock / divisor), 0, ATTOTIME_IN_HZ(mc68901->intf->timer_clock / divisor));
813884         }
814885         break;
815886
816887      case MC68901_TCR_TIMER_EVENT:
817888         if (LOG) logerror("MC68901 Timer A Event Count Mode\n");
818         timer_enable(chip->timer[MC68901_TIMER_A], 0);
889         timer_enable(mc68901->timer[MC68901_TIMER_A], 0);
819890         break;
820891
821892      case MC68901_TCR_TIMER_PULSE_4:
r2431r2432
826897      case MC68901_TCR_TIMER_PULSE_100:
827898      case MC68901_TCR_TIMER_PULSE_200:
828899         {
829         int divisor = PRESCALER[chip->tacr & 0x07];
900         int divisor = PRESCALER[mc68901->tacr & 0x07];
830901         if (LOG) logerror("MC68901 Timer A Pulse Width Mode : %u Prescale\n", divisor);
831         timer_adjust_periodic(chip->timer[MC68901_TIMER_A], attotime_never, 0, ATTOTIME_IN_HZ(chip->intf->timer_clock / divisor));
832         timer_enable(chip->timer[MC68901_TIMER_A], 0);
902         timer_adjust_periodic(mc68901->timer[MC68901_TIMER_A], attotime_never, 0, ATTOTIME_IN_HZ(mc68901->intf->timer_clock / divisor));
903         timer_enable(mc68901->timer[MC68901_TIMER_A], 0);
833904         }
834905         break;
835906      }
836907
837      if (chip->tacr & MC68901_TCR_TIMER_RESET)
908      if (mc68901->tacr & MC68901_TCR_TIMER_RESET)
838909      {
839910         if (LOG) logerror("MC68901 Timer A Reset\n");
840911
841         chip->to[MC68901_TIMER_A] = 0;
912         mc68901->to[MC68901_TIMER_A] = 0;
842913
843         if (chip->intf->to_w)
914         if (mc68901->intf->on_to_changed)
844915         {
845            chip->intf->to_w(chip, MC68901_TIMER_A, chip->to[MC68901_TIMER_A]);
916            mc68901->intf->on_to_changed(device, MC68901_TIMER_A, mc68901->to[MC68901_TIMER_A]);
846917         }
847918      }
848919      break;
849920
850921   case MC68901_REGISTER_TBCR:
851      chip->tbcr = data & 0x1f;
922      mc68901->tbcr = data & 0x1f;
852923
853      switch (chip->tbcr & 0x0f)
924      switch (mc68901->tbcr & 0x0f)
854925      {
855926      case MC68901_TCR_TIMER_STOPPED:
856927         if (LOG) logerror("MC68901 Timer B Stopped\n");
857         timer_enable(chip->timer[MC68901_TIMER_B], 0);
928         timer_enable(mc68901->timer[MC68901_TIMER_B], 0);
858929         break;
859930
860931      case MC68901_TCR_TIMER_DELAY_4:
r2431r2432
865936      case MC68901_TCR_TIMER_DELAY_100:
866937      case MC68901_TCR_TIMER_DELAY_200:
867938         {
868         int divisor = PRESCALER[chip->tbcr & 0x07];
939         int divisor = PRESCALER[mc68901->tbcr & 0x07];
869940         if (LOG) logerror("MC68901 Timer B Delay Mode : %u Prescale\n", divisor);
870         timer_adjust_periodic(chip->timer[MC68901_TIMER_B], ATTOTIME_IN_HZ(chip->intf->timer_clock / divisor), 0, ATTOTIME_IN_HZ(chip->intf->timer_clock / divisor));
941         timer_adjust_periodic(mc68901->timer[MC68901_TIMER_B], ATTOTIME_IN_HZ(mc68901->intf->timer_clock / divisor), 0, ATTOTIME_IN_HZ(mc68901->intf->timer_clock / divisor));
871942         }
872943         break;
873944
874945      case MC68901_TCR_TIMER_EVENT:
875946         if (LOG) logerror("MC68901 Timer B Event Count Mode\n");
876         timer_enable(chip->timer[MC68901_TIMER_B], 0);
947         timer_enable(mc68901->timer[MC68901_TIMER_B], 0);
877948         break;
878949
879950      case MC68901_TCR_TIMER_PULSE_4:
r2431r2432
884955      case MC68901_TCR_TIMER_PULSE_100:
885956      case MC68901_TCR_TIMER_PULSE_200:
886957         {
887         int divisor = PRESCALER[chip->tbcr & 0x07];
958         int divisor = PRESCALER[mc68901->tbcr & 0x07];
888959         if (LOG) logerror("MC68901 Timer B Pulse Width Mode : %u Prescale\n", DIVISOR);
889         timer_adjust_periodic(chip->timer[MC68901_TIMER_B], attotime_never, 0, ATTOTIME_IN_HZ(chip->intf->timer_clock / divisor));
890         timer_enable(chip->timer[MC68901_TIMER_B], 0);
960         timer_adjust_periodic(mc68901->timer[MC68901_TIMER_B], attotime_never, 0, ATTOTIME_IN_HZ(mc68901->intf->timer_clock / divisor));
961         timer_enable(mc68901->timer[MC68901_TIMER_B], 0);
891962         }
892963         break;
893964      }
894965
895      if (chip->tacr & MC68901_TCR_TIMER_RESET)
966      if (mc68901->tacr & MC68901_TCR_TIMER_RESET)
896967      {
897968         if (LOG) logerror("MC68901 Timer B Reset\n");
898969
899         chip->to[MC68901_TIMER_B] = 0;
970         mc68901->to[MC68901_TIMER_B] = 0;
900971
901         if (chip->intf->to_w)
972         if (mc68901->intf->on_to_changed)
902973         {
903            chip->intf->to_w(chip, MC68901_TIMER_B, chip->to[MC68901_TIMER_B]);
974            mc68901->intf->on_to_changed(device, MC68901_TIMER_B, mc68901->to[MC68901_TIMER_B]);
904975         }
905976      }
906977      break;
907978
908979   case MC68901_REGISTER_TCDCR:
909      chip->tcdcr = data & 0x6f;
980      mc68901->tcdcr = data & 0x6f;
910981
911      switch (chip->tcdcr & 0x07)
982      switch (mc68901->tcdcr & 0x07)
912983      {
913984      case MC68901_TCR_TIMER_STOPPED:
914985         if (LOG) logerror("MC68901 Timer D Stopped\n");
915         timer_enable(chip->timer[MC68901_TIMER_D], 0);
986         timer_enable(mc68901->timer[MC68901_TIMER_D], 0);
916987         break;
917988
918989      case MC68901_TCR_TIMER_DELAY_4:
r2431r2432
923994      case MC68901_TCR_TIMER_DELAY_100:
924995      case MC68901_TCR_TIMER_DELAY_200:
925996         {
926         int divisor = PRESCALER[chip->tcdcr & 0x07];
997         int divisor = PRESCALER[mc68901->tcdcr & 0x07];
927998         if (LOG) logerror("MC68901 Timer D Delay Mode : %u Prescale\n", divisor);
928         timer_adjust_periodic(chip->timer[MC68901_TIMER_D], ATTOTIME_IN_HZ(chip->intf->timer_clock / divisor), 0, ATTOTIME_IN_HZ(chip->intf->timer_clock / divisor));
999         timer_adjust_periodic(mc68901->timer[MC68901_TIMER_D], ATTOTIME_IN_HZ(mc68901->intf->timer_clock / divisor), 0, ATTOTIME_IN_HZ(mc68901->intf->timer_clock / divisor));
9291000         }
9301001         break;
9311002      }
9321003
933      switch ((chip->tcdcr >> 4) & 0x07)
1004      switch ((mc68901->tcdcr >> 4) & 0x07)
9341005      {
9351006      case MC68901_TCR_TIMER_STOPPED:
9361007         if (LOG) logerror("MC68901 Timer C Stopped\n");
937         timer_enable(chip->timer[MC68901_TIMER_C], 0);
1008         timer_enable(mc68901->timer[MC68901_TIMER_C], 0);
9381009         break;
9391010
9401011      case MC68901_TCR_TIMER_DELAY_4:
r2431r2432
9451016      case MC68901_TCR_TIMER_DELAY_100:
9461017      case MC68901_TCR_TIMER_DELAY_200:
9471018         {
948         int divisor = PRESCALER[(chip->tcdcr >> 4) & 0x07];
1019         int divisor = PRESCALER[(mc68901->tcdcr >> 4) & 0x07];
9491020         if (LOG) logerror("MC68901 Timer C Delay Mode : %u Prescale\n", divisor);
950         timer_adjust_periodic(chip->timer[MC68901_TIMER_C], ATTOTIME_IN_HZ(chip->intf->timer_clock / divisor), 0, ATTOTIME_IN_HZ(chip->intf->timer_clock / divisor));
1021         timer_adjust_periodic(mc68901->timer[MC68901_TIMER_C], ATTOTIME_IN_HZ(mc68901->intf->timer_clock / divisor), 0, ATTOTIME_IN_HZ(mc68901->intf->timer_clock / divisor));
9511022         }
9521023         break;
9531024      }
r2431r2432
9561027   case MC68901_REGISTER_TADR:
9571028      if (LOG) logerror("MC68901 Timer A Data Register : %x\n", data);
9581029
959      chip->tdr[MC68901_TIMER_A] = data;
1030      mc68901->tdr[MC68901_TIMER_A] = data;
9601031
961      if (!timer_enabled(chip->timer[MC68901_TIMER_A]))
1032      if (!timer_enabled(mc68901->timer[MC68901_TIMER_A]))
9621033      {
963         chip->tmc[MC68901_TIMER_A] = data;
1034         mc68901->tmc[MC68901_TIMER_A] = data;
9641035      }
9651036      break;
9661037
9671038   case MC68901_REGISTER_TBDR:
9681039      if (LOG) logerror("MC68901 Timer B Data Register : %x\n", data);
9691040
970      chip->tdr[MC68901_TIMER_B] = data;
1041      mc68901->tdr[MC68901_TIMER_B] = data;
9711042
972      if (!timer_enabled(chip->timer[MC68901_TIMER_B]))
1043      if (!timer_enabled(mc68901->timer[MC68901_TIMER_B]))
9731044      {
974         chip->tmc[MC68901_TIMER_B] = data;
1045         mc68901->tmc[MC68901_TIMER_B] = data;
9751046      }
9761047      break;
9771048
9781049   case MC68901_REGISTER_TCDR:
9791050      if (LOG) logerror("MC68901 Timer C Data Register : %x\n", data);
9801051
981      chip->tdr[MC68901_TIMER_C] = data;
1052      mc68901->tdr[MC68901_TIMER_C] = data;
9821053
983      if (!timer_enabled(chip->timer[MC68901_TIMER_C]))
1054      if (!timer_enabled(mc68901->timer[MC68901_TIMER_C]))
9841055      {
985         chip->tmc[MC68901_TIMER_C] = data;
1056         mc68901->tmc[MC68901_TIMER_C] = data;
9861057      }
9871058      break;
9881059
9891060   case MC68901_REGISTER_TDDR:
9901061      if (LOG) logerror("MC68901 Timer D Data Register : %x\n", data);
9911062
992      chip->tdr[MC68901_TIMER_D] = data;
1063      mc68901->tdr[MC68901_TIMER_D] = data;
9931064
994      if (!timer_enabled(chip->timer[MC68901_TIMER_D]))
1065      if (!timer_enabled(mc68901->timer[MC68901_TIMER_D]))
9951066      {
996         chip->tmc[MC68901_TIMER_D] = data;
1067         mc68901->tmc[MC68901_TIMER_D] = data;
9971068      }
9981069      break;
9991070
10001071   case MC68901_REGISTER_SCR:
10011072      if (LOG) logerror("MC68901 Sync Character : %x\n", data);
10021073
1003      chip->scr = data;
1074      mc68901->scr = data;
10041075      break;
10051076
10061077   case MC68901_REGISTER_UCR:
r2431r2432
10231094      switch (data & 0x60)
10241095      {
10251096      case MC68901_UCR_WORD_LENGTH_8:
1026         chip->rxtx_word = 8;
1097         mc68901->rxtx_word = 8;
10271098         if (LOG) logerror("MC68901 Word Length : 8 bits\n");
10281099         break;
10291100      case MC68901_UCR_WORD_LENGTH_7:
1030         chip->rxtx_word = 7;
1101         mc68901->rxtx_word = 7;
10311102         if (LOG) logerror("MC68901 Word Length : 7 bits\n");
10321103         break;
10331104      case MC68901_UCR_WORD_LENGTH_6:
1034         chip->rxtx_word = 6;
1105         mc68901->rxtx_word = 6;
10351106         if (LOG) logerror("MC68901 Word Length : 6 bits\n");
10361107         break;
10371108      case MC68901_UCR_WORD_LENGTH_5:
1038         chip->rxtx_word = 5;
1109         mc68901->rxtx_word = 5;
10391110         if (LOG) logerror("MC68901 Word Length : 5 bits\n");
10401111         break;
10411112      }
r2431r2432
10431114      switch (data & 0x18)
10441115      {
10451116      case MC68901_UCR_START_STOP_0_0:
1046         chip->rxtx_start = 0;
1047         chip->rxtx_stop = 0;
1117         mc68901->rxtx_start = 0;
1118         mc68901->rxtx_stop = 0;
10481119         if (LOG) logerror("MC68901 Start Bits : 0, Stop Bits : 0, Format : synchronous\n");
10491120         break;
10501121      case MC68901_UCR_START_STOP_1_1:
1051         chip->rxtx_start = 1;
1052         chip->rxtx_stop = 1;
1122         mc68901->rxtx_start = 1;
1123         mc68901->rxtx_stop = 1;
10531124         if (LOG) logerror("MC68901 Start Bits : 1, Stop Bits : 1, Format : asynchronous\n");
10541125         break;
10551126      case MC68901_UCR_START_STOP_1_15:
1056         chip->rxtx_start = 1;
1057         chip->rxtx_stop = 1;
1127         mc68901->rxtx_start = 1;
1128         mc68901->rxtx_stop = 1;
10581129         if (LOG) logerror("MC68901 Start Bits : 1, Stop Bits : 1½, Format : asynchronous\n");
10591130         break;
10601131      case MC68901_UCR_START_STOP_1_2:
1061         chip->rxtx_start = 1;
1062         chip->rxtx_stop = 2;
1132         mc68901->rxtx_start = 1;
1133         mc68901->rxtx_stop = 2;
10631134         if (LOG) logerror("MC68901 Start Bits : 1, Stop Bits : 2, Format : asynchronous\n");
10641135         break;
10651136      }
r2431r2432
10731144         if (LOG) logerror("MC68901 Rx/Tx Clock Divisor : 1\n");
10741145      }
10751146
1076      chip->ucr = data;
1147      mc68901->ucr = data;
10771148      break;
10781149
10791150   case MC68901_REGISTER_RSR:
10801151      if ((data & MC68901_RSR_RCV_ENABLE) == 0)
10811152      {
10821153         if (LOG) logerror("MC68901 Receiver Disabled\n");
1083         chip->rsr = 0;
1154         mc68901->rsr = 0;
10841155      }
10851156      else
10861157      {
r2431r2432
10981169         if (data & MC68901_RSR_FOUND_SEARCH)
10991170            if (LOG) logerror("MC68901 Receiver Search Mode Enabled\n");
11001171
1101         chip->rsr = data & 0x0b;
1172         mc68901->rsr = data & 0x0b;
11021173      }
11031174      break;
11041175
r2431r2432
11071178      {
11081179         if (LOG) logerror("MC68901 Transmitter Disabled\n");
11091180
1110         chip->tsr = data & 0x27;
1181         mc68901->tsr = data & 0x27;
11111182      }
11121183      else
11131184      {
r2431r2432
11471218            if (LOG) logerror("MC68901 Transmitter Auto Turnaround Disabled\n");
11481219         }
11491220
1150         chip->tsr = data & 0x2f;
1151         chip->tsr |= MC68901_TSR_BUFFER_EMPTY;  // x68000 expects the buffer to be empty, so this will do for now
1221         mc68901->tsr = data & 0x2f;
1222         mc68901->tsr |= MC68901_TSR_BUFFER_EMPTY;  // x68000 expects the buffer to be empty, so this will do for now
11521223      }
11531224      break;
11541225
11551226   case MC68901_REGISTER_UDR:
11561227      if (LOG) logerror("MC68901 UDR %x\n", data);
1157      chip->udr = data;
1158      //chip->tsr &= ~MC68901_TSR_BUFFER_EMPTY;
1228      mc68901->udr = data;
1229      //mc68901->tsr &= ~MC68901_TSR_BUFFER_EMPTY;
11591230      break;
11601231   }
11611232}
11621233
1163static void mc68901_timer_count(mc68901_t *chip, int index)
1234static void mc68901_timer_count(const device_config *device, int index)
11641235{
1165   if (chip->tmc[index] == 0x01)
1236   mc68901_t *mc68901 = get_safe_token(device);
1237
1238   if (mc68901->tmc[index] == 0x01)
11661239   {
1167      chip->to[index] = chip->to[index] ? 0 : 1;
1240      mc68901->to[index] = mc68901->to[index] ? 0 : 1;
11681241
1169      if (chip->to[index])
1242      if (mc68901->to[index])
11701243      {
1171         if (chip->intf->rx_clock == MC68901_LOOPBACK_TIMER[index])
1244         if (mc68901->intf->rx_clock == MC68901_LOOPBACK_TIMER[index])
11721245         {
1173            mc68901_serial_rx(chip);
1246            mc68901_serial_rx(device);
11741247         }
11751248
1176         if (chip->intf->tx_clock == MC68901_LOOPBACK_TIMER[index])
1249         if (mc68901->intf->tx_clock == MC68901_LOOPBACK_TIMER[index])
11771250         {
1178            mc68901_serial_tx(chip);
1251            mc68901_serial_tx(device);
11791252         }
11801253      }
11811254
1182      if (chip->intf->to_w)
1255      if (mc68901->intf->on_to_changed)
11831256      {
1184         chip->intf->to_w(chip, index, chip->to[index]);
1257         mc68901->intf->on_to_changed(device, index, mc68901->to[index]);
11851258      }
11861259
1187      if (chip->ier & MC68901_INT_MASK_TIMER[index])
1260      if (mc68901->ier & MC68901_INT_MASK_TIMER[index])
11881261      {
1189         mc68901_interrupt(chip, MC68901_INT_MASK_TIMER[index]);
1262         mc68901_interrupt(device, MC68901_INT_MASK_TIMER[index]);
11901263      }
11911264
1192      chip->tmc[index] = chip->tdr[index];
1265      mc68901->tmc[index] = mc68901->tdr[index];
11931266   }
11941267   else
11951268   {
1196      chip->tmc[index]--;
1269      mc68901->tmc[index]--;
11971270   }
11981271}
11991272
1200static void mc68901_ti_w(mc68901_t *chip, int index, int value)
1273static void mc68901_ti_w(const device_config *device, int index, int value)
12011274{
1275   mc68901_t *mc68901 = get_safe_token(device);
1276
12021277   int bit = MC68901_GPIO_TIMER[index];
1203   int aer = BIT(chip->aer, bit);
1204   int cr = index ? chip->tbcr : chip->tacr;
1278   int aer = BIT(mc68901->aer, bit);
1279   int cr = index ? mc68901->tbcr : mc68901->tacr;
12051280
12061281   switch (cr & 0x0f)
12071282   {
12081283   case MC68901_TCR_TIMER_EVENT:
1209      if (((chip->ti[index] ^ aer) == 1) && ((value ^ aer) == 0))
1284      if (((mc68901->ti[index] ^ aer) == 1) && ((value ^ aer) == 0))
12101285      {
1211         mc68901_timer_count(chip, index);
1286         mc68901_timer_count(device, index);
12121287      }
12131288
1214      chip->ti[index] = value;
1289      mc68901->ti[index] = value;
12151290      break;
12161291
12171292   case MC68901_TCR_TIMER_PULSE_4:
r2431r2432
12211296   case MC68901_TCR_TIMER_PULSE_64:
12221297   case MC68901_TCR_TIMER_PULSE_100:
12231298   case MC68901_TCR_TIMER_PULSE_200:
1224      timer_enable(chip->timer[index], (value == aer));
1299      timer_enable(mc68901->timer[index], (value == aer));
12251300
1226      if (((chip->ti[index] ^ aer) == 0) && ((value ^ aer) == 1))
1301      if (((mc68901->ti[index] ^ aer) == 0) && ((value ^ aer) == 1))
12271302      {
1228         if (chip->ier & MC68901_INT_MASK_GPIO[bit])
1303         if (mc68901->ier & MC68901_INT_MASK_GPIO[bit])
12291304         {
1230            mc68901_interrupt(chip, MC68901_INT_MASK_GPIO[bit]);
1305            mc68901_interrupt(device, MC68901_INT_MASK_GPIO[bit]);
12311306         }
12321307      }
12331308
1234      chip->ti[index] = value;
1309      mc68901->ti[index] = value;
12351310      break;
12361311   }
12371312}
r2431r2432
12581333
12591334/* External Interface */
12601335
1261void mc68901_tai_w(mc68901_t *chip, int value)
1336void mc68901_tai_w(const device_config *device, int value)
12621337{
1263   assert(chip != NULL);
1338   mc68901_t *mc68901 = get_safe_token(device);
12641339
1265   mc68901_ti_w(chip, MC68901_TIMER_A, value);
1340   assert(mc68901 != NULL);
1341
1342   mc68901_ti_w(device, MC68901_TIMER_A, value);
12661343}
12671344
1268void mc68901_tbi_w(mc68901_t *chip, int value)
1345void mc68901_tbi_w(const device_config *device, int value)
12691346{
1270   assert(chip != NULL);
1347   mc68901_t *mc68901 = get_safe_token(device);
12711348
1272   mc68901_ti_w(chip, MC68901_TIMER_B, value);
1349   assert(mc68901 != NULL);
1350
1351   mc68901_ti_w(device, MC68901_TIMER_B, value);
12731352}
12741353
1275int mc68901_get_vector(mc68901_t *chip)
1354int mc68901_get_vector(const device_config *device)
12761355{
1356   mc68901_t *mc68901 = get_safe_token(device);
1357
12771358   int ch;
12781359
1279   assert(chip != NULL);
1360   assert(mc68901 != NULL);
12801361
12811362   for (ch = 15; ch >= 0; ch--)
12821363   {
1283      if (BIT(chip->imr, ch) && BIT(chip->ipr, ch))
1364      if (BIT(mc68901->imr, ch) && BIT(mc68901->ipr, ch))
12841365      {
1285         if (chip->vr & MC68901_VR_S)
1366         if (mc68901->vr & MC68901_VR_S)
12861367         {
1287            chip->isr |= (1 << ch);
1368            mc68901->isr |= (1 << ch);
12881369         }
12891370
1290         chip->ipr &= ~(1 << ch);
1371         mc68901->ipr &= ~(1 << ch);
12911372
1292         mc68901_check_interrupts(chip);
1373         mc68901_check_interrupts(device);
12931374
1294         return (chip->vr & 0xf0) | ch;
1375         return (mc68901->vr & 0xf0) | ch;
12951376      }
12961377   }
12971378
r2431r2432
13051386   mc68901_t *mc68901 = device->token;
13061387   char unique_tag[30];
13071388
1389   /* validate arguments */
13081390   assert(device->machine != NULL);
13091391   assert(device->tag != NULL);
13101392   assert(strlen(device->tag) < 20);
1311
1312   //mc68901->device_type = device_type;
13131393   mc68901->intf = device->static_config;
13141394
1315   // initial settings
1316
1395   /* set initial values */
13171396   mc68901->tsr = MC68901_TSR_BUFFER_EMPTY;
13181397
1319   // counter timers
1398   /* create the timers */
1399   mc68901->timer[MC68901_TIMER_A] = timer_alloc(timer_a, (void *)device);
1400   mc68901->timer[MC68901_TIMER_B] = timer_alloc(timer_b, (void *)device);
1401   mc68901->timer[MC68901_TIMER_C] = timer_alloc(timer_c, (void *)device);
1402   mc68901->timer[MC68901_TIMER_D] = timer_alloc(timer_d, (void *)device);
13201403
1321   mc68901->timer[MC68901_TIMER_A] = timer_alloc(timer_a, mc68901);
1322   mc68901->timer[MC68901_TIMER_B] = timer_alloc(timer_b, mc68901);
1323   mc68901->timer[MC68901_TIMER_C] = timer_alloc(timer_c, mc68901);
1324   mc68901->timer[MC68901_TIMER_D] = timer_alloc(timer_d, mc68901);
1325
1326   // serial receive timer
1327
13281404   if (mc68901->intf->rx_clock > 0)
13291405   {
1330      timer_pulse(ATTOTIME_IN_HZ(mc68901->intf->rx_clock), mc68901, 0, rx_tick);
1406      mc68901->rx_timer = timer_alloc(rx_tick, (void *)device);
1407      timer_adjust_periodic(mc68901->rx_timer, attotime_zero, 0, ATTOTIME_IN_HZ(mc68901->intf->rx_clock));
13311408   }
13321409
1333   // serial transmit timer
1334
13351410   if (mc68901->intf->tx_clock > 0)
13361411   {
1337      timer_pulse(ATTOTIME_IN_HZ(mc68901->intf->tx_clock), mc68901, 0, tx_tick);
1412      mc68901->tx_timer = timer_alloc(tx_tick, (void *)device);
1413      timer_adjust_periodic(mc68901->tx_timer, attotime_zero, 0, ATTOTIME_IN_HZ(mc68901->intf->tx_clock));
13381414   }
13391415
1340   // general purpose I/O poll timer
1341
13421416   if (mc68901->intf->gpio_r)
13431417   {
1344      timer_pulse(ATTOTIME_IN_HZ(mc68901->intf->chip_clock / 4), mc68901, 0, mc68901_gpio_poll_tick);
1418      mc68901->poll_timer = timer_alloc(mc68901_gpio_poll_tick, (void *)device);
1419      timer_adjust_periodic(mc68901->poll_timer, attotime_zero, 0, ATTOTIME_IN_HZ(mc68901->intf->chip_clock / 4));
13451420   }
13461421
1347   // register save state support
1348
1422   /* register for state saving */
13491423   state_save_combine_module_and_tag(unique_tag, "MC68901", device->tag);
13501424
13511425   state_save_register_item(unique_tag, 0, mc68901->gpip);
r2431r2432
13861460
13871461static DEVICE_RESET( mc68901 )
13881462{
1389   mc68901_t *mc68901 = device->token;
1390
1391   mc68901_register_w(mc68901, MC68901_REGISTER_GPIP, 0);
1392   mc68901_register_w(mc68901, MC68901_REGISTER_AER, 0);
1393   mc68901_register_w(mc68901, MC68901_REGISTER_DDR, 0);
1394   mc68901_register_w(mc68901, MC68901_REGISTER_IERA, 0);
1395   mc68901_register_w(mc68901, MC68901_REGISTER_IERB, 0);
1396   mc68901_register_w(mc68901, MC68901_REGISTER_IPRA, 0);
1397   mc68901_register_w(mc68901, MC68901_REGISTER_IPRB, 0);
1398   mc68901_register_w(mc68901, MC68901_REGISTER_ISRA, 0);
1399   mc68901_register_w(mc68901, MC68901_REGISTER_ISRB, 0);
1400   mc68901_register_w(mc68901, MC68901_REGISTER_IMRA, 0);
1401   mc68901_register_w(mc68901, MC68901_REGISTER_IMRB, 0);
1402   mc68901_register_w(mc68901, MC68901_REGISTER_VR, 0);
1403   mc68901_register_w(mc68901, MC68901_REGISTER_TACR, 0);
1404   mc68901_register_w(mc68901, MC68901_REGISTER_TBCR, 0);
1405   mc68901_register_w(mc68901, MC68901_REGISTER_TCDCR, 0);
1406   mc68901_register_w(mc68901, MC68901_REGISTER_SCR, 0);
1407   mc68901_register_w(mc68901, MC68901_REGISTER_UCR, 0);
1408   mc68901_register_w(mc68901, MC68901_REGISTER_RSR, 0);
1463   mc68901_register_w(device, MC68901_REGISTER_GPIP, 0);
1464   mc68901_register_w(device, MC68901_REGISTER_AER, 0);
1465   mc68901_register_w(device, MC68901_REGISTER_DDR, 0);
1466   mc68901_register_w(device, MC68901_REGISTER_IERA, 0);
1467   mc68901_register_w(device, MC68901_REGISTER_IERB, 0);
1468   mc68901_register_w(device, MC68901_REGISTER_IPRA, 0);
1469   mc68901_register_w(device, MC68901_REGISTER_IPRB, 0);
1470   mc68901_register_w(device, MC68901_REGISTER_ISRA, 0);
1471   mc68901_register_w(device, MC68901_REGISTER_ISRB, 0);
1472   mc68901_register_w(device, MC68901_REGISTER_IMRA, 0);
1473   mc68901_register_w(device, MC68901_REGISTER_IMRB, 0);
1474   mc68901_register_w(device, MC68901_REGISTER_VR, 0);
1475   mc68901_register_w(device, MC68901_REGISTER_TACR, 0);
1476   mc68901_register_w(device, MC68901_REGISTER_TBCR, 0);
1477   mc68901_register_w(device, MC68901_REGISTER_TCDCR, 0);
1478   mc68901_register_w(device, MC68901_REGISTER_SCR, 0);
1479   mc68901_register_w(device, MC68901_REGISTER_UCR, 0);
1480   mc68901_register_w(device, MC68901_REGISTER_RSR, 0);
14091481}
14101482
14111483static DEVICE_SET_INFO( mc68901 )
r2431r2432
14321504      case DEVINFO_FCT_RESET:                     info->reset = DEVICE_RESET_NAME(mc68901);   break;
14331505
14341506      /* --- the following bits of info are returned as NULL-terminated strings --- */
1435      case DEVINFO_STR_NAME:                     info->s = "Motorola 68901";               break;
1507      case DEVINFO_STR_NAME:                     info->s = "Motorola MC68901";            break;
14361508      case DEVINFO_STR_FAMILY:                  info->s = "MC68901 MFP";               break;
14371509      case DEVINFO_STR_VERSION:                  info->s = "1.0";                     break;
14381510      case DEVINFO_STR_SOURCE_FILE:               info->s = __FILE__;                     break;
14391511      case DEVINFO_STR_CREDITS:                  info->s = "Copyright the MESS Team";       break;
14401512   }
14411513}
1514
1515DEVICE_GET_INFO( mk68901 )
1516{
1517   switch (state)
1518   {
1519      /* --- the following bits of info are returned as 64-bit signed integers --- */
1520      case DEVINFO_INT_INLINE_CONFIG_BYTES:         info->i = 0;                        break;
1521      case DEVINFO_INT_CLASS:                     info->i = DEVICE_CLASS_PERIPHERAL;         break;
1522      case DEVINFO_INT_TOKEN_BYTES:               info->i = sizeof(mc68901_t);            break;
1523
1524      /* --- the following bits of info are returned as pointers to data or functions --- */
1525      case DEVINFO_FCT_SET_INFO:                  info->set_info = DEVICE_SET_INFO_NAME(mc68901); break;
1526      case DEVINFO_FCT_START:                     info->start = DEVICE_START_NAME(mc68901);   break;
1527      case DEVINFO_FCT_STOP:                     /* Nothing */                        break;
1528      case DEVINFO_FCT_RESET:                     info->reset = DEVICE_RESET_NAME(mc68901);   break;
1529
1530      /* --- the following bits of info are returned as NULL-terminated strings --- */
1531      case DEVINFO_STR_NAME:                     info->s = "Mostek MK68901";               break;
1532      case DEVINFO_STR_FAMILY:                  info->s = "MK68901 MFP";               break;
1533      case DEVINFO_STR_VERSION:                  info->s = "1.0";                     break;
1534      case DEVINFO_STR_SOURCE_FILE:               info->s = __FILE__;                     break;
1535      case DEVINFO_STR_CREDITS:                  info->s = "Copyright the MESS Team";       break;
1536   }
1537}
src/mess/machine/68901mfp.h
r2431r2432
1919               RC  10 |          | 39  D2
2020               Vcc  11 |          | 38  D1
2121               NC  12 |   MC68901    | 37  D0
22               TAO  13 |          | 36  GND
22               TAO  13 |   MK68901    | 36  GND
2323               TBO  14 |          | 35  CLK
2424               TCO  15 |          | 34  _IEI
2525               TDO  16 |          | 33  _IEO
2626             XTAL1  17 |          | 32  _IRQ
2727             XTAL2  18 |          | 31  _RR
2828               TAI  19 |          | 30  _TR
29               TBI  10 |          | 29  I7
29               TBI  20 |          | 29  I7
3030            _RESET   21 |           | 28  I6
3131               I0  22 |          | 27  I5
3232               I1  23 |          | 26  I4
r2431r2432
3939
4040#include "driver.h"
4141
42typedef struct _mc68901_t mc68901_t;
43typedef struct _mc68901_interface mc68901_interface;
42enum {
43   MC68901_TAO_LOOPBACK = -1,
44   MC68901_TBO_LOOPBACK = -2,
45   MC68901_TCO_LOOPBACK = -3,
46   MC68901_TDO_LOOPBACK = -4
47};
4448
45#define MC68901_TAO_LOOPBACK   -1
46#define MC68901_TBO_LOOPBACK   -2
47#define MC68901_TCO_LOOPBACK   -3
48#define MC68901_TDO_LOOPBACK   -4
49typedef void (*mc68901_on_irq_changed_func) (const device_config *device, int level);
50#define MC68901_ON_IRQ_CHANGED(name) void name(const device_config *device, int level)
4951
52typedef void (*mc68901_on_to_changed_func) (const device_config *device, int timer, int level);
53#define MC68901_ON_TO_CHANGED(name) void name(const device_config *device, int timer, int level)
54
55typedef UINT8 (*mc68901_gpio_read_func) (const device_config *device);
56#define MC68901_GPIO_READ(name) UINT8 name(const device_config *device)
57
58typedef void (*mc68901_gpio_write_func) (const device_config *device, UINT8 data);
59#define MC68901_GPIO_WRITE(name) void name(const device_config *device, UINT8 data)
60
5061#define MC68901 DEVICE_GET_INFO_NAME( mc68901 )
62#define MK68901 DEVICE_GET_INFO_NAME( mk68901 )
5163
5264/* interface */
65typedef struct _mc68901_interface mc68901_interface;
5366struct _mc68901_interface
5467{
55   int   chip_clock;
56   int   timer_clock;
57   int   rx_clock;
58   int   tx_clock;
68   int   chip_clock;         /* chip clock */
69   int   timer_clock;      /* timer clock */
70   int   rx_clock;         /* serial receive clock */
71   int   tx_clock;         /* serial transmit clock */
5972
60   UINT8 *rx_pin, *tx_pin;
73   UINT8 *rx_pin;         /* serial receive pin (pin 9) */
74   UINT8 *tx_pin;         /* serial transmit pin (pin 8) */
75   
76   /* this gets called for each change of the TxO pins (pins 13-16) */
77   mc68901_on_to_changed_func   on_to_changed;
6178
62   void (*to_w)(mc68901_t *chip, int timer, int value);
79   /* this gets called on each change of the interrupt line */
80   mc68901_on_irq_changed_func   on_irq_changed;
6381
64   void (*irq_callback)(mc68901_t *chip, int state);
82   /* this is called on each read of the GPIO pins */
83   mc68901_gpio_read_func      gpio_r;
6584
66   read8_machine_func gpio_r;
67   write8_machine_func gpio_w;
85   /* this is called on each write of the GPIO pins */
86   mc68901_gpio_write_func      gpio_w;
6887};
88#define MC68901_INTERFACE(name) const mc68901_interface (name) =
6989
7090/* device interface */
7191DEVICE_GET_INFO( mc68901 );
7292
73/* read from MFP register */
74UINT8 mc68901_register_r(mc68901_t *chip, int reg);
75/* write to MFP register */
76void mc68901_register_w(mc68901_t *chip, int reg, UINT8 data);
93/* register access */
94READ8_DEVICE_HANDLER( mc68901_register_r );
95WRITE8_DEVICE_HANDLER( mc68901_register_w );
7796
78/* write to MFP Timer A input */
79void mc68901_tai_w(mc68901_t *chip, int value);
80/* write to MFP Timer B input */
81void mc68901_tbi_w(mc68901_t *chip, int value);
97/* write to Timer A input (pin 19) */
98void mc68901_tai_w(const device_config *device, int value);
8299
83/* get MFP interrupt vector */
84int mc68901_get_vector(mc68901_t *chip);
100/* write to Timer B input (pin 20) */
101void mc68901_tbi_w(const device_config *device, int value);
85102
103/* get interrupt vector */
104int mc68901_get_vector(const device_config *device);
105
86106#endif
src/mess/drivers/x68k.c
r2431r2432
139139#include "devices/basicdsk.h"
140140#include "includes/x68k.h"
141141
142mc68901_t *x68k_mfp;
143
144142struct x68k_system sys;
145143
146144extern UINT16* gvram;  // Graphic VRAM
r2431r2432
941939
942940static READ16_HANDLER( x68k_mfp_r )
943941{
942   const device_config *x68k_mfp = device_list_find_by_tag(machine->config->devicelist, MC68901, MC68901_TAG);
943
944944   return mc68901_register_r(x68k_mfp, offset);
945945}
946946
r2431r2432
10101010
10111011static WRITE16_HANDLER( x68k_mfp_w )
10121012{
1013   const device_config *x68k_mfp = device_list_find_by_tag(machine->config->devicelist, MC68901, MC68901_TAG);
1014
10131015   /* For the Interrupt registers, the bits are set out as such:
10141016       Reg A - bit 7: GPIP7 (HSync)
10151017               bit 6: GPIP6 (CRTC CIRQ)
r2431r2432
14181420
14191421}
14201422
1421static READ8_HANDLER(mfp_gpio_r)
1423static MC68901_GPIO_READ( mfp_gpio_r )
14221424{
14231425   UINT8 data = sys.mfp.gpio;
14241426
r2431r2432
14311433   return data;
14321434}
14331435
1434static void mfp_irq_callback(mc68901_t *chip, int state)
1436static MC68901_ON_IRQ_CHANGED( mfp_irq_callback )
14351437{
14361438   static int prev;
1437   if(prev == CLEAR_LINE && state == CLEAR_LINE)  // eliminate unnecessary calls to set the IRQ line for speed reasons
1439   if(prev == CLEAR_LINE && level == CLEAR_LINE)  // eliminate unnecessary calls to set the IRQ line for speed reasons
14381440      return;
14391441   if((sys.ioc.irqstatus & 0xc0) != 0)  // if the FDC is busy, then we don't want to miss that IRQ
14401442      return;
1441   cpunum_set_input_line(Machine, 0, 6, state);
1442   prev = state;
1443   cpunum_set_input_line(device->machine, 0, 6, level);
1444   prev = level;
14431445}
14441446
14451447static INTERRUPT_GEN( x68k_vsync_irq )
r2431r2432
14601462
14611463static IRQ_CALLBACK(x68k_int_ack)
14621464{
1465   const device_config *x68k_mfp = device_list_find_by_tag(machine->config->devicelist, MC68901, MC68901_TAG);
1466
14631467   if(irqline == 6)  // MFP
14641468   {
14651469//      if(sys.mfp.isra & 0x10)
r2431r2432
19521956
19531957   nec765_init(&fdc_interface,NEC72065,NEC765_RDY_PIN_CONNECTED);
19541958   nec765_reset(0);
1955
1956   x68k_mfp = devtag_get_token(machine, MC68901, "mfp");
19571959}
19581960
19591961static DRIVER_INIT( x68000 )
r2431r2432
20112013   MDRV_MACHINE_RESET( x68000 )
20122014
20132015   /* device hardware */
2014   MDRV_DEVICE_ADD("mfp", MC68901)
2016   MDRV_DEVICE_ADD(MC68901_TAG, MC68901)
20152017   MDRV_DEVICE_CONFIG(mfp_interface)
20162018
20172019   MDRV_DEVICE_ADD( "ppi8255", PPI8255 )
src/mess/drivers/atarist.c
r2431r2432
3737
3838*/
3939
40// Atari ST
41
42#define Y1      XTAL_2_4576MHz
43
44// STBook
45
46#define U517   XTAL_16MHz
47#define Y200   XTAL_2_4576MHz
48#define Y700   XTAL_10MHz
49
50/* Multi Function Peripheral */
51
52static READ16_HANDLER( atarist_mfp_r )
53{
54   atarist_state *state = machine->driver_data;
55
56   return mc68901_register_r(state->mfp, offset);
57}
58
59static WRITE16_HANDLER( atarist_mfp_w )
60{
61   atarist_state *state = machine->driver_data;
62
63   if (ACCESSING_BITS_0_7) mc68901_register_w(state->mfp, offset, data & 0xff);
64}
65
6640/* Floppy Disk Controller */
6741
6842#define ATARIST_FLOPPY_STATUS_FDC_DATA_REQUEST   0x04
r2431r2432
489463
490464static void atariste_dmasound_set_state(running_machine *machine, int level)
491465{
492   atarist_state *state = machine->driver_data;
466   const device_config *mc68901 = device_list_find_by_tag(machine->config->devicelist, MC68901, MC68901_TAG);
493467
494468   dmasound.active = level;
495   mc68901_tai_w(state->mfp, level);
469   mc68901_tai_w(mc68901, level);
496470
497   if (state == 0)
471   if (level == 0)
498472   {
499473      dmasound.baselatch = dmasound.base;
500474      dmasound.endlatch = dmasound.end;
r2431r2432
748722   }
749723}
750724
751/* SCC8530 */
752
753static READ16_HANDLER( megaste_scc8530_r )
754{
755   if (ACCESSING_BITS_8_15)
756   {
757      return scc_r(machine, offset);
758   }
759   else
760   {
761      return 0;
762   }
763}
764
765static WRITE16_HANDLER( megaste_scc8530_w )
766{
767   if (ACCESSING_BITS_8_15)
768   {
769      scc_w(machine, offset, data);
770   }
771}
772
773725/* Mega STe Cache */
774726
775727static UINT16 megaste_cache;
r2431r2432
857809   AM_RANGE(0xff8000, 0xff8001) AM_READWRITE(atarist_mmu_r, atarist_mmu_w)
858810   AM_RANGE(0xff8200, 0xff8203) AM_READWRITE(atarist_shifter_base_r, atarist_shifter_base_w)
859811   AM_RANGE(0xff8204, 0xff8209) AM_READ(atarist_shifter_counter_r)
860   AM_RANGE(0xff820a, 0xff820b) AM_READWRITE(atarist_shifter_sync_r, atarist_shifter_sync_w)
812   AM_RANGE(0xff820a, 0xff820b) AM_READWRITE8(atarist_shifter_sync_r, atarist_shifter_sync_w, 0xff00)
861813   AM_RANGE(0xff8240, 0xff825f) AM_READWRITE(atarist_shifter_palette_r, atarist_shifter_palette_w)
862   AM_RANGE(0xff8260, 0xff8261) AM_READWRITE(atarist_shifter_mode_r, atarist_shifter_mode_w)
814   AM_RANGE(0xff8260, 0xff8261) AM_READWRITE8(atarist_shifter_mode_r, atarist_shifter_mode_w, 0xff00)
863815   AM_RANGE(0xff8604, 0xff8605) AM_READWRITE(atarist_fdc_data_r, atarist_fdc_data_w)
864816   AM_RANGE(0xff8606, 0xff8607) AM_READWRITE(atarist_fdc_dma_status_r, atarist_fdc_dma_mode_w)
865817   AM_RANGE(0xff8608, 0xff860d) AM_READWRITE(atarist_fdc_dma_base_r, atarist_fdc_dma_base_w)
866   AM_RANGE(0xff8800, 0xff8801) AM_READWRITE(AY8910_read_port_0_msb_r, AY8910_control_port_0_msb_w)
867   AM_RANGE(0xff8802, 0xff8803) AM_WRITE(AY8910_write_port_0_msb_w)
868   AM_RANGE(0xfffa00, 0xfffa2f) AM_READWRITE(atarist_mfp_r, atarist_mfp_w)
869   AM_RANGE(0xfffc00, 0xfffc01) AM_READWRITE(acia6850_0_stat_msb_r, acia6850_0_ctrl_msb_w)
870   AM_RANGE(0xfffc02, 0xfffc03) AM_READWRITE(acia6850_0_data_msb_r, acia6850_0_data_msb_w)
871   AM_RANGE(0xfffc04, 0xfffc05) AM_READWRITE(acia6850_1_stat_msb_r, acia6850_1_ctrl_msb_w)
872   AM_RANGE(0xfffc06, 0xfffc07) AM_READWRITE(acia6850_1_data_msb_r, acia6850_1_data_msb_w)
818   AM_RANGE(0xff8800, 0xff8801) AM_READWRITE8(AY8910_read_port_0_r, AY8910_control_port_0_w, 0xff00)
819   AM_RANGE(0xff8802, 0xff8803) AM_WRITE8(AY8910_write_port_0_w, 0xff00)
820   AM_RANGE(0xfffa00, 0xfffa2f) AM_DEVREADWRITE8(MC68901, MC68901_TAG, mc68901_register_r, mc68901_register_w, 0xff)
821   AM_RANGE(0xfffc00, 0xfffc01) AM_READWRITE8(acia6850_0_stat_r, acia6850_0_ctrl_w, 0xff00)
822   AM_RANGE(0xfffc02, 0xfffc03) AM_READWRITE8(acia6850_0_data_r, acia6850_0_data_w, 0xff00)
823   AM_RANGE(0xfffc04, 0xfffc05) AM_READWRITE8(acia6850_1_stat_r, acia6850_1_ctrl_w, 0xff00)
824   AM_RANGE(0xfffc06, 0xfffc07) AM_READWRITE8(acia6850_1_data_r, acia6850_1_data_w, 0xff00)
873825ADDRESS_MAP_END
874826
875827static ADDRESS_MAP_START( megast_map, ADDRESS_SPACE_PROGRAM, 16 )
r2431r2432
882834   AM_RANGE(0xff8000, 0xff8007) AM_READWRITE(atarist_mmu_r, atarist_mmu_w)
883835   AM_RANGE(0xff8200, 0xff8203) AM_READWRITE(atarist_shifter_base_r, atarist_shifter_base_w)
884836   AM_RANGE(0xff8204, 0xff8209) AM_READ(atarist_shifter_counter_r)
885   AM_RANGE(0xff820a, 0xff820b) AM_READWRITE(atarist_shifter_sync_r, atarist_shifter_sync_w)
837   AM_RANGE(0xff820a, 0xff820b) AM_READWRITE8(atarist_shifter_sync_r, atarist_shifter_sync_w, 0xff00)
886838   AM_RANGE(0xff8240, 0xff825f) AM_READWRITE(atarist_shifter_palette_r, atarist_shifter_palette_w)
887   AM_RANGE(0xff8260, 0xff8261) AM_READWRITE(atarist_shifter_mode_r, atarist_shifter_mode_w)
839   AM_RANGE(0xff8260, 0xff8261) AM_READWRITE8(atarist_shifter_mode_r, atarist_shifter_mode_w, 0xff00)
888840   AM_RANGE(0xff8604, 0xff8605) AM_READWRITE(atarist_fdc_data_r, atarist_fdc_data_w)
889841   AM_RANGE(0xff8606, 0xff8607) AM_READWRITE(atarist_fdc_dma_status_r, atarist_fdc_dma_mode_w)
890842   AM_RANGE(0xff8608, 0xff860d) AM_READWRITE(atarist_fdc_dma_base_r, atarist_fdc_dma_base_w)
891   AM_RANGE(0xff8800, 0xff8801) AM_READWRITE(AY8910_read_port_0_msb_r, AY8910_control_port_0_msb_w)
892   AM_RANGE(0xff8802, 0xff8803) AM_WRITE(AY8910_write_port_0_msb_w)
843   AM_RANGE(0xff8800, 0xff8801) AM_READWRITE8(AY8910_read_port_0_r, AY8910_control_port_0_w, 0xff00)
844   AM_RANGE(0xff8802, 0xff8803) AM_WRITE8(AY8910_write_port_0_w, 0xff00)
893845   AM_RANGE(0xff8a00, 0xff8a1f) AM_READWRITE(atarist_blitter_halftone_r, atarist_blitter_halftone_w)
894846   AM_RANGE(0xff8a20, 0xff8a21) AM_READWRITE(atarist_blitter_src_inc_x_r, atarist_blitter_src_inc_x_w)
895847   AM_RANGE(0xff8a22, 0xff8a23) AM_READWRITE(atarist_blitter_src_inc_y_r, atarist_blitter_src_inc_y_w)
r2431r2432
902854   AM_RANGE(0xff8a38, 0xff8a39) AM_READWRITE(atarist_blitter_count_y_r, atarist_blitter_count_y_w)
903855   AM_RANGE(0xff8a3a, 0xff8a3b) AM_READWRITE(atarist_blitter_op_r, atarist_blitter_op_w)
904856   AM_RANGE(0xff8a3c, 0xff8a3d) AM_READWRITE(atarist_blitter_ctrl_r, atarist_blitter_ctrl_w)
905   AM_RANGE(0xfffa00, 0xfffa3f) AM_READWRITE(atarist_mfp_r, atarist_mfp_w)
857   AM_RANGE(0xfffa00, 0xfffa3f) AM_DEVREADWRITE8(MC68901, MC68901_TAG, mc68901_register_r, mc68901_register_w, 0xff)
906858//  AM_RANGE(0xfffa40, 0xfffa57) AM_READWRITE(megast_fpu_r, megast_fpu_w)
907   AM_RANGE(0xfffc00, 0xfffc01) AM_READWRITE(acia6850_0_stat_msb_r, acia6850_0_ctrl_msb_w)
908   AM_RANGE(0xfffc02, 0xfffc03) AM_READWRITE(acia6850_0_data_msb_r, acia6850_0_data_msb_w)
909   AM_RANGE(0xfffc04, 0xfffc05) AM_READWRITE(acia6850_1_stat_msb_r, acia6850_1_ctrl_msb_w)
910   AM_RANGE(0xfffc06, 0xfffc07) AM_READWRITE(acia6850_1_data_msb_r, acia6850_1_data_msb_w)
859   AM_RANGE(0xfffc00, 0xfffc01) AM_READWRITE8(acia6850_0_stat_r, acia6850_0_ctrl_w, 0xff00)
860   AM_RANGE(0xfffc02, 0xfffc03) AM_READWRITE8(acia6850_0_data_r, acia6850_0_data_w, 0xff00)
861   AM_RANGE(0xfffc04, 0xfffc05) AM_READWRITE8(acia6850_1_stat_r, acia6850_1_ctrl_w, 0xff00)
862   AM_RANGE(0xfffc06, 0xfffc07) AM_READWRITE8(acia6850_1_data_r, acia6850_1_data_w, 0xff00)
911863   AM_RANGE(0xfffc20, 0xfffc3f) AM_READWRITE(rp5c15_r, rp5c15_w)
912864ADDRESS_MAP_END
913865
914
915866static ADDRESS_MAP_START( ste_map, ADDRESS_SPACE_PROGRAM, 16 )
916867   AM_RANGE(0x000000, 0x000007) AM_ROM
917868   AM_RANGE(0x000008, 0x1fffff) AM_RAMBANK(1)
r2431r2432
922873   AM_RANGE(0xff8000, 0xff8001) AM_READWRITE(atarist_mmu_r, atarist_mmu_w)
923874   AM_RANGE(0xff8200, 0xff8203) AM_READWRITE(atarist_shifter_base_r, atarist_shifter_base_w)
924875   AM_RANGE(0xff8204, 0xff8209) AM_READWRITE(atariste_shifter_counter_r, atariste_shifter_counter_w)
925   AM_RANGE(0xff820a, 0xff820b) AM_READWRITE(atarist_shifter_sync_r, atarist_shifter_sync_w)
876   AM_RANGE(0xff820a, 0xff820b) AM_READWRITE8(atarist_shifter_sync_r, atarist_shifter_sync_w, 0xff00)
926877   AM_RANGE(0xff820c, 0xff820d) AM_READWRITE(atariste_shifter_base_low_r, atariste_shifter_base_low_w)
927878   AM_RANGE(0xff820e, 0xff820f) AM_READWRITE(atariste_shifter_lineofs_r, atariste_shifter_lineofs_w)
928879   AM_RANGE(0xff8240, 0xff825f) AM_READWRITE(atarist_shifter_palette_r, atariste_shifter_palette_w)
929   AM_RANGE(0xff8260, 0xff8261) AM_READWRITE(atarist_shifter_mode_r, atarist_shifter_mode_w)
880   AM_RANGE(0xff8260, 0xff8261) AM_READWRITE8(atarist_shifter_mode_r, atarist_shifter_mode_w, 0xff00)
930881   AM_RANGE(0xff8264, 0xff8265) AM_READWRITE(atariste_shifter_pixelofs_r, atariste_shifter_pixelofs_w)
931882   AM_RANGE(0xff8604, 0xff8605) AM_READWRITE(atarist_fdc_data_r, atarist_fdc_data_w)
932883   AM_RANGE(0xff8606, 0xff8607) AM_READWRITE(atarist_fdc_dma_status_r, atarist_fdc_dma_mode_w)
933884   AM_RANGE(0xff8608, 0xff860d) AM_READWRITE(atarist_fdc_dma_base_r, atarist_fdc_dma_base_w)
934   AM_RANGE(0xff8800, 0xff8801) AM_READWRITE(AY8910_read_port_0_msb_r, AY8910_control_port_0_msb_w)
935   AM_RANGE(0xff8802, 0xff8803) AM_WRITE(AY8910_write_port_0_msb_w)
885   AM_RANGE(0xff8800, 0xff8801) AM_READWRITE8(AY8910_read_port_0_r, AY8910_control_port_0_w, 0xff00)
886   AM_RANGE(0xff8802, 0xff8803) AM_WRITE8(AY8910_write_port_0_w, 0xff00)
936887   AM_RANGE(0xff8900, 0xff8901) AM_READWRITE(atariste_sound_dma_control_r, atariste_sound_dma_control_w)
937888   AM_RANGE(0xff8902, 0xff8907) AM_READWRITE(atariste_sound_dma_base_r, atariste_sound_dma_base_w)
938889   AM_RANGE(0xff8908, 0xff890d) AM_READ(atariste_sound_dma_counter_r)
r2431r2432
960911   AM_RANGE(0xff9216, 0xff9217) AM_READ_PORT("PADDLE1Y")
961912   AM_RANGE(0xff9220, 0xff9221) AM_READ_PORT("GUNX")
962913   AM_RANGE(0xff9222, 0xff9223) AM_READ_PORT("GUNY")
963   AM_RANGE(0xfffa00, 0xfffa2f) AM_READWRITE(atarist_mfp_r, atarist_mfp_w)
964   AM_RANGE(0xfffc00, 0xfffc01) AM_READWRITE(acia6850_0_stat_msb_r, acia6850_0_ctrl_msb_w)
965   AM_RANGE(0xfffc02, 0xfffc03) AM_READWRITE(acia6850_0_data_msb_r, acia6850_0_data_msb_w)
966   AM_RANGE(0xfffc04, 0xfffc05) AM_READWRITE(acia6850_1_stat_msb_r, acia6850_1_ctrl_msb_w)
967   AM_RANGE(0xfffc06, 0xfffc07) AM_READWRITE(acia6850_1_data_msb_r, acia6850_1_data_msb_w)
914   AM_RANGE(0xfffa00, 0xfffa2f) AM_DEVREADWRITE8(MC68901, MC68901_TAG, mc68901_register_r, mc68901_register_w, 0xff)
915   AM_RANGE(0xfffc00, 0xfffc01) AM_READWRITE8(acia6850_0_stat_r, acia6850_0_ctrl_w, 0xff00)
916   AM_RANGE(0xfffc02, 0xfffc03) AM_READWRITE8(acia6850_0_data_r, acia6850_0_data_w, 0xff00)
917   AM_RANGE(0xfffc04, 0xfffc05) AM_READWRITE8(acia6850_1_stat_r, acia6850_1_ctrl_w, 0xff00)
918   AM_RANGE(0xfffc06, 0xfffc07) AM_READWRITE8(acia6850_1_data_r, acia6850_1_data_w, 0xff00)
968919ADDRESS_MAP_END
969920
970921static ADDRESS_MAP_START( megaste_map, ADDRESS_SPACE_PROGRAM, 16 )
r2431r2432
977928   AM_RANGE(0xff8000, 0xff8007) AM_READWRITE(atarist_mmu_r, atarist_mmu_w)
978929   AM_RANGE(0xff8200, 0xff8203) AM_READWRITE(atarist_shifter_base_r, atarist_shifter_base_w)
979930   AM_RANGE(0xff8204, 0xff8209) AM_READWRITE(atariste_shifter_counter_r, atariste_shifter_counter_w)
980   AM_RANGE(0xff820a, 0xff820b) AM_READWRITE(atarist_shifter_sync_r, atarist_shifter_sync_w)
931   AM_RANGE(0xff820a, 0xff820b) AM_READWRITE8(atarist_shifter_sync_r, atarist_shifter_sync_w, 0xff00)
981932   AM_RANGE(0xff820c, 0xff820d) AM_READWRITE(atariste_shifter_base_low_r, atariste_shifter_base_low_w)
982933   AM_RANGE(0xff820e, 0xff820f) AM_READWRITE(atariste_shifter_lineofs_r, atariste_shifter_lineofs_w)
983934   AM_RANGE(0xff8240, 0xff825f) AM_READWRITE(atarist_shifter_palette_r, atariste_shifter_palette_w)
984   AM_RANGE(0xff8260, 0xff8261) AM_READWRITE(atarist_shifter_mode_r, atarist_shifter_mode_w)
935   AM_RANGE(0xff8260, 0xff8261) AM_READWRITE8(atarist_shifter_mode_r, atarist_shifter_mode_w, 0xff00)
985936   AM_RANGE(0xff8264, 0xff8265) AM_READWRITE(atariste_shifter_pixelofs_r, atariste_shifter_pixelofs_w)
986937   AM_RANGE(0xff8604, 0xff8605) AM_READWRITE(atarist_fdc_data_r, atarist_fdc_data_w)
987938   AM_RANGE(0xff8606, 0xff8607) AM_READWRITE(atarist_fdc_dma_status_r, atarist_fdc_dma_mode_w)
988939   AM_RANGE(0xff8608, 0xff860d) AM_READWRITE(atarist_fdc_dma_base_r, atarist_fdc_dma_base_w)
989   AM_RANGE(0xff8800, 0xff8801) AM_READWRITE(AY8910_read_port_0_msb_r, AY8910_control_port_0_msb_w)
990   AM_RANGE(0xff8802, 0xff8803) AM_WRITE(AY8910_write_port_0_msb_w)
940   AM_RANGE(0xff8800, 0xff8801) AM_READWRITE8(AY8910_read_port_0_r, AY8910_control_port_0_w, 0xff00)
941   AM_RANGE(0xff8802, 0xff8803) AM_WRITE8(AY8910_write_port_0_w, 0xff00)
991942   AM_RANGE(0xff8900, 0xff8901) AM_READWRITE(atariste_sound_dma_control_r, atariste_sound_dma_control_w)
992943   AM_RANGE(0xff8902, 0xff8907) AM_READWRITE(atariste_sound_dma_base_r, atariste_sound_dma_base_w)
993944   AM_RANGE(0xff8908, 0xff890d) AM_READ(atariste_sound_dma_counter_r)
r2431r2432
1008959   AM_RANGE(0xff8a3a, 0xff8a3b) AM_READWRITE(atarist_blitter_op_r, atarist_blitter_op_w)
1009960   AM_RANGE(0xff8a3c, 0xff8a3d) AM_READWRITE(atarist_blitter_ctrl_r, atarist_blitter_ctrl_w)
1010961   AM_RANGE(0xff8e20, 0xff8e21) AM_READWRITE(megaste_cache_r, megaste_cache_w)
1011   AM_RANGE(0xfffa00, 0xfffa3f) AM_READWRITE(atarist_mfp_r, atarist_mfp_w)
962   AM_RANGE(0xfffa00, 0xfffa3f) AM_DEVREADWRITE8(MC68901, MC68901_TAG, mc68901_register_r, mc68901_register_w, 0xff)
1012963//  AM_RANGE(0xfffa40, 0xfffa5f) AM_READWRITE(megast_fpu_r, megast_fpu_w)
1013   AM_RANGE(0xff8c80, 0xff8c87) AM_READWRITE(megaste_scc8530_r, megaste_scc8530_w)
1014   AM_RANGE(0xfffc00, 0xfffc01) AM_READWRITE(acia6850_0_stat_msb_r, acia6850_0_ctrl_msb_w)
1015   AM_RANGE(0xfffc02, 0xfffc03) AM_READWRITE(acia6850_0_data_msb_r, acia6850_0_data_msb_w)
1016   AM_RANGE(0xfffc04, 0xfffc05) AM_READWRITE(acia6850_1_stat_msb_r, acia6850_1_ctrl_msb_w)
1017   AM_RANGE(0xfffc06, 0xfffc07) AM_READWRITE(acia6850_1_data_msb_r, acia6850_1_data_msb_w)
964   AM_RANGE(0xff8c80, 0xff8c87) AM_READWRITE8(scc_r, scc_w, 0xff00)
965   AM_RANGE(0xfffc00, 0xfffc01) AM_READWRITE8(acia6850_0_stat_r, acia6850_0_ctrl_w, 0xff00)
966   AM_RANGE(0xfffc02, 0xfffc03) AM_READWRITE8(acia6850_0_data_r, acia6850_0_data_w, 0xff00)
967   AM_RANGE(0xfffc04, 0xfffc05) AM_READWRITE8(acia6850_1_stat_r, acia6850_1_ctrl_w, 0xff00)
968   AM_RANGE(0xfffc06, 0xfffc07) AM_READWRITE8(acia6850_1_data_r, acia6850_1_data_w, 0xff00)
1018969   AM_RANGE(0xfffc20, 0xfffc3f) AM_READWRITE(rp5c15_r, rp5c15_w)
1019970ADDRESS_MAP_END
1020971
r2431r2432
1031982/*  AM_RANGE(0xff8000, 0xff8001) AM_READWRITE(stbook_mmu_r, stbook_mmu_w)
1032983    AM_RANGE(0xff8200, 0xff8203) AM_READWRITE(stbook_shifter_base_r, stbook_shifter_base_w)
1033984    AM_RANGE(0xff8204, 0xff8209) AM_READWRITE(stbook_shifter_counter_r, stbook_shifter_counter_w)
1034    AM_RANGE(0xff820a, 0xff820b) AM_READWRITE(stbook_shifter_sync_r, stbook_shifter_sync_w)
985    AM_RANGE(0xff820a, 0xff820b) AM_READWRITE8(stbook_shifter_sync_r, stbook_shifter_sync_w, 0xff00)
1035986    AM_RANGE(0xff820c, 0xff820d) AM_READWRITE(stbook_shifter_base_low_r, stbook_shifter_base_low_w)
1036987    AM_RANGE(0xff820e, 0xff820f) AM_READWRITE(stbook_shifter_lineofs_r, stbook_shifter_lineofs_w)
1037988    AM_RANGE(0xff8240, 0xff8241) AM_READWRITE(stbook_shifter_palette_r, stbook_shifter_palette_w)
1038    AM_RANGE(0xff8260, 0xff8261) AM_READWRITE(stbook_shifter_mode_r, stbook_shifter_mode_w)
989    AM_RANGE(0xff8260, 0xff8261) AM_READWRITE8(stbook_shifter_mode_r, stbook_shifter_mode_w, 0xff00)
1039990    AM_RANGE(0xff8264, 0xff8265) AM_READWRITE(stbook_shifter_pixelofs_r, stbook_shifter_pixelofs_w)*/
1040991   AM_RANGE(0xff827e, 0xff827f) AM_WRITE(stbook_lcd_control_w)
1041992   AM_RANGE(0xff8604, 0xff8605) AM_READWRITE(atarist_fdc_data_r, atarist_fdc_data_w)
1042993   AM_RANGE(0xff8606, 0xff8607) AM_READWRITE(atarist_fdc_dma_status_r, atarist_fdc_dma_mode_w)
1043994   AM_RANGE(0xff8608, 0xff860d) AM_READWRITE(atarist_fdc_dma_base_r, atarist_fdc_dma_base_w)
1044   AM_RANGE(0xff8800, 0xff8801) AM_READWRITE(AY8910_read_port_0_msb_r, AY8910_control_port_0_msb_w)
1045   AM_RANGE(0xff8802, 0xff8803) AM_WRITE(AY8910_write_port_0_msb_w)
995   AM_RANGE(0xff8800, 0xff8801) AM_READWRITE8(AY8910_read_port_0_r, AY8910_control_port_0_w, 0xff00)
996   AM_RANGE(0xff8802, 0xff8803) AM_WRITE8(AY8910_write_port_0_w, 0xff00)
1046997   AM_RANGE(0xff8900, 0xff8901) AM_READWRITE(atariste_sound_dma_control_r, atariste_sound_dma_control_w)
1047998   AM_RANGE(0xff8902, 0xff8907) AM_READWRITE(atariste_sound_dma_base_r, atariste_sound_dma_base_w)
1048999   AM_RANGE(0xff8908, 0xff890d) AM_READ(atariste_sound_dma_counter_r)
r2431r2432
10661017/*  AM_RANGE(0xff9202, 0xff9203) AM_READWRITE(stbook_lcd_contrast_r, stbook_lcd_contrast_w)
10671018    AM_RANGE(0xff9210, 0xff9211) AM_READWRITE(stbook_power_r, stbook_power_w)
10681019    AM_RANGE(0xff9214, 0xff9215) AM_READWRITE(stbook_reference_r, stbook_reference_w)*/
1069   AM_RANGE(0xfffa00, 0xfffa2f) AM_READWRITE(atarist_mfp_r, atarist_mfp_w)
1070   AM_RANGE(0xfffc00, 0xfffc01) AM_READWRITE(acia6850_0_stat_msb_r, acia6850_0_ctrl_msb_w)
1071   AM_RANGE(0xfffc02, 0xfffc03) AM_READWRITE(acia6850_0_data_msb_r, acia6850_0_data_msb_w)
1072   AM_RANGE(0xfffc04, 0xfffc05) AM_READWRITE(acia6850_1_stat_msb_r, acia6850_1_ctrl_msb_w)
1073   AM_RANGE(0xfffc06, 0xfffc07) AM_READWRITE(acia6850_1_data_msb_r, acia6850_1_data_msb_w)
1020   AM_RANGE(0xfffa00, 0xfffa2f) AM_DEVREADWRITE8(MC68901, MC68901_TAG, mc68901_register_r, mc68901_register_w, 0xff)
1021   AM_RANGE(0xfffc00, 0xfffc01) AM_READWRITE8(acia6850_0_stat_r, acia6850_0_ctrl_w, 0xff00)
1022   AM_RANGE(0xfffc02, 0xfffc03) AM_READWRITE8(acia6850_0_data_r, acia6850_0_data_w, 0xff00)
1023   AM_RANGE(0xfffc04, 0xfffc05) AM_READWRITE8(acia6850_1_stat_r, acia6850_1_ctrl_w, 0xff00)
1024   AM_RANGE(0xfffc06, 0xfffc07) AM_READWRITE8(acia6850_1_data_r, acia6850_1_data_w, 0xff00)
10741025ADDRESS_MAP_END
10751026
10761027/* Input Ports */
r2431r2432
13801331   acia_interrupt
13811332};
13821333
1383static READ8_HANDLER( mfp_gpio_r )
1334static MC68901_GPIO_READ( mfp_gpio_r )
13841335{
13851336   /*
13861337
r2431r2432
13971348
13981349    */
13991350
1400   atarist_state *state = machine->driver_data;
1401
14021351   UINT8 data = (centronics_read_handshake(0) & CENTRONICS_NOT_BUSY) >> 7;
14031352
1404   mc68901_tai_w(state->mfp, data & 0x01);
1353   mc68901_tai_w(device, data & 0x01);
14051354
14061355   data |= (acia_irq << 4);
14071356   data |= (fdc.irq << 5);
1408   data |= (input_port_read(machine, "config") & 0x80);
1357   data |= (input_port_read(device->machine, "config") & 0x80);
14091358
14101359   return data;
14111360}
14121361
1413static IRQ_CALLBACK(atarist_int_ack)
1362static IRQ_CALLBACK( atarist_int_ack )
14141363{
1415   atarist_state *state = machine->driver_data;
1364   const device_config *mc68901 = device_list_find_by_tag(machine->config->devicelist, MC68901, MC68901_TAG);
14161365
14171366   if (irqline == MC68000_IRQ_6)
14181367   {
1419      return mc68901_get_vector(state->mfp);
1368      return mc68901_get_vector(mc68901);
14201369   }
14211370
14221371   return MC68000_INT_ACK_AUTOVECTOR;
14231372}
14241373
1425static void mfp_interrupt(mc68901_t *chip, int state)
1374static MC68901_ON_IRQ_CHANGED( mfp_interrupt )
14261375{
1427   cpunum_set_input_line(Machine, 0, MC68000_IRQ_6, state);
1376   cpunum_set_input_line(device->machine, 0, MC68000_IRQ_6, level);
14281377}
14291378
14301379static UINT8 mfp_rx, mfp_tx;
14311380
1432static const mc68901_interface mfp_intf =
1381static MC68901_INTERFACE( mfp_intf )
14331382{
14341383   Y2/8,
14351384   Y1,
r2431r2432
15211470
15221471static MACHINE_START( atarist )
15231472{
1524   atarist_state *state = machine->driver_data;
1525
15261473   atarist_configure_memory(machine);
15271474   atarist_state_save();
15281475
r2431r2432
15301477   wd17xx_init(machine, WD_TYPE_1772, atarist_fdc_callback, NULL);
15311478   acia6850_config(0, &acia_ikbd_intf);
15321479   acia6850_config(1, &acia_midi_intf);
1533   state->mfp = devtag_get_token(machine, MC68901, "mfp");
15341480
15351481   cpunum_set_irq_callback(0, atarist_int_ack);
15361482}
r2431r2432
15461492   rp5c15_init(machine, &rtc_intf);
15471493}
15481494
1549static READ8_HANDLER( atariste_mfp_gpio_r )
1495static MC68901_GPIO_READ( atariste_mfp_gpio_r )
15501496{
15511497   /*
15521498
r2431r2432
15671513
15681514   data |= (acia_irq << 4);
15691515   data |= (fdc.irq << 5);
1570   data |= (input_port_read(machine, "config") & 0x80) ^ (dmasound.active << 7);
1516   data |= (input_port_read(device->machine, "config") & 0x80) ^ (dmasound.active << 7);
15711517
15721518   return data;
15731519}
15741520
1575static const mc68901_interface atariste_mfp_intf =
1521static MC68901_INTERFACE( atariste_mfp_intf )
15761522{
15771523   Y2/8,
15781524   Y1,
r2431r2432
16111557
16121558static MACHINE_START( atariste )
16131559{
1614   atarist_state *state = machine->driver_data;
1615
16161560   atarist_configure_memory(machine);
16171561   atariste_state_save();
16181562
r2431r2432
16201564   wd17xx_init(machine, WD_TYPE_1772, atarist_fdc_callback, NULL);
16211565   acia6850_config(0, &acia_ikbd_intf);
16221566   acia6850_config(1, &acia_midi_intf);
1623   state->mfp = devtag_get_token(machine, MC68901, "mfp");
16241567
16251568   cpunum_set_irq_callback(0, atarist_int_ack);
16261569
r2431r2432
17061649   acia_interrupt
17071650};
17081651
1709static READ8_HANDLER( stbook_mfp_gpio_r )
1652static MC68901_GPIO_READ( stbook_mfp_gpio_r )
17101653{
17111654   /*
17121655
r2431r2432
17311674   return data;
17321675}
17331676
1734static const mc68901_interface stbook_mfp_intf =
1677static MC68901_INTERFACE( stbook_mfp_intf )
17351678{
17361679   Y2/8,
17371680   Y1,
r2431r2432
17471690
17481691static MACHINE_START( stbook )
17491692{
1750   atarist_state *state = machine->driver_data;
1751
17521693   stbook_configure_memory(machine);
17531694   atariste_state_save();
17541695
r2431r2432
17591700   wd17xx_init(machine, WD_TYPE_1772, atarist_fdc_callback, NULL);
17601701   acia6850_config(0, &stbook_acia_ikbd_intf);
17611702   acia6850_config(1, &acia_midi_intf);
1762   state->mfp = devtag_get_token(machine, MC68901, "mfp");
17631703   rp5c15_init(machine, &rtc_intf);
17641704
17651705   cpunum_set_irq_callback(0, atarist_int_ack);
r2431r2432
17801720
17811721   // device hardware
17821722
1783   MDRV_DEVICE_ADD("mfp", MC68901)
1723   MDRV_DEVICE_ADD(MC68901_TAG, MC68901)
17841724   MDRV_DEVICE_CONFIG(mfp_intf)
17851725
17861726   // video hardware
r2431r2432
18261766
18271767   // device hardware
18281768
1829   MDRV_DEVICE_ADD("mfp", MC68901)
1769   MDRV_DEVICE_ADD(MC68901_TAG, MC68901)
18301770   MDRV_DEVICE_CONFIG(atariste_mfp_intf)
18311771
18321772   // video hardware
r2431r2432
18771817
18781818   // device hardware
18791819
1880   MDRV_DEVICE_ADD("mfp", MC68901)
1820   MDRV_DEVICE_ADD(MC68901_TAG, MC68901)
18811821   MDRV_DEVICE_CONFIG(stbook_mfp_intf)
18821822
18831823   // video hardware

Previous 15994 Revisions Next


© 1998-2018 The MESS Team