Previous 15994 Revisions Next

r7529 Sunday 7th March, 2010 at 15:30:50 UTC by Curt Coder
[TRS80M2] Boots from diskette now.
[Z80DMA] Fixed ready signal handling.
[src/emu/machine]z80dma.c
[src/mess/drivers]trs80m2.c

src/emu/machine/z80dma.c
r7528r7529
154154   UINT16 addressB;
155155   UINT16 count;
156156
157   UINT8 rdy;
157   int rdy;
158   int force_ready;
158159   UINT8 reset_pointer;
159160
160161   UINT8 is_read;
r7528r7529
227228   }
228229}
229230
231static int is_ready(z80dma_t *z80dma)
232{
233   return (z80dma->force_ready) || (z80dma->rdy == READY_ACTIVE_HIGH(z80dma));
234}
235
230236/*-------------------------------------------------
231237    z80dma_do_read - perform DMA read
232238-------------------------------------------------*/
r7528r7529
379385      z80dma->dma_enabled = 0; //FIXME: Correct?
380386        z80dma->status = 0x19;
381387
382      if(!(z80dma->rdy ^ READY_ACTIVE_HIGH(z80dma))) z80dma->status |= 0x02;  // ready line status
388      z80dma->status |= !is_ready(z80dma) << 1; // ready line status
383389
384390      if(TRANSFER_MODE(z80dma) == TM_TRANSFER)     z80dma->status |= 0x10;   // no match found
385391
r7528r7529
404410   attotime next;
405411
406412   /* no transfer is active right now; is there a transfer pending right now? */
407   pending_transfer = z80dma->rdy & z80dma->dma_enabled;
413   pending_transfer = is_ready(z80dma) & z80dma->dma_enabled;
408414
409415   if (pending_transfer)
410416   {
r7528r7529
419425   }
420426   else
421427   {
422      /* no transfers active right now */
423      timer_reset(z80dma->timer, attotime_never);
428      if (z80dma->is_read)
429      {
430         /* no transfers active right now */
431         timer_reset(z80dma->timer, attotime_never);
432      }
424433   }
425434
426435   /* set the busreq line */
r7528r7529
503512      }
504513      else if ((data & 0x83) == 0x83) // WR6
505514      {
515         z80dma->dma_enabled = 0;
516
506517         WR6(z80dma) = data;
518
507519         switch (data)
508520         {
509521            case COMMAND_ENABLE_AFTER_RETI:
r7528r7529
517529               WR3(z80dma) &= ~0x20;
518530               z80dma->ip = 0;
519531               z80dma->ius = 0;
520               z80dma->rdy = 0;
532               z80dma->force_ready = 0;
521533               z80dma->status |= 0x08;
522534               break;
523535            case COMMAND_INITIATE_READ_SEQUENCE:
r7528r7529
534546            case COMMAND_RESET:
535547               if (LOG) logerror("Reset\n");
536548               z80dma->dma_enabled = 0;
537               z80dma->rdy = 1;
549               z80dma->force_ready = 0;
538550               /* Needs six reset commands to reset the DMA */
539551               {
540552                  UINT8 WRi;
r7528r7529
557569            case COMMAND_DISABLE_DMA:
558570               if (LOG) logerror("Disable DMA\n");
559571               z80dma->dma_enabled = 0;
560               z80dma->rdy = 1 ^ ((WR5(z80dma) & 0x8)>>3);
561               z80dma_rdy_w(device, z80dma->rdy);
562572               break;
563573            case COMMAND_ENABLE_DMA:
564574               if (LOG) logerror("Enable DMA\n");
565575               z80dma->dma_enabled = 1;
566               z80dma->rdy = (WR5(z80dma) & 0x8)>>3;
567               z80dma_rdy_w(device, z80dma->rdy);
576               z80dma_update_status(device);
568577               break;
569578            case COMMAND_READ_MASK_FOLLOWS:
570579               if (LOG) logerror("Set Read Mask\n");
r7528r7529
587596               break;
588597            case COMMAND_FORCE_READY:
589598               if (LOG) logerror("Force ready\n");
590               z80dma->rdy = (WR5(z80dma) & 0x8)>>3;
591               z80dma_rdy_w(device, z80dma->rdy);
599               z80dma->force_ready = 1;
600               z80dma_update_status(device);
592601               break;
593602            case COMMAND_ENABLE_INTERRUPTS:
594603               if (LOG) logerror("Enable IRQ\n");
r7528r7529
640649static TIMER_CALLBACK( z80dma_rdy_write_callback )
641650{
642651   running_device *device = (running_device *)ptr;
643   int state = param & 0x01;
644652   z80dma_t *z80dma = get_safe_token(device);
645653
646   /* normalize state */
647   z80dma->rdy = 1 ^ state ^ READY_ACTIVE_HIGH(z80dma);
648   z80dma->status = (z80dma->status & 0xFD) | (z80dma->rdy<<1);
654   z80dma->rdy = param;
655   z80dma->status = (z80dma->status & 0xFD) | (!is_ready(z80dma) << 1);
649656
650657   z80dma_update_status(device);
651658
652   if (z80dma->rdy && INT_ON_READY(z80dma))
659   if (is_ready(z80dma) && INT_ON_READY(z80dma))
653660    {
654661      trigger_interrupt(device, INT_RDY);
655662    }
r7528r7529
662669WRITE_LINE_DEVICE_HANDLER( z80dma_rdy_w )
663670{
664671   z80dma_t *z80dma = get_safe_token(device);
665   int param;
666672
667   param = (state ? 1 : 0);
668673   if (LOG) logerror("RDY: %d Active High: %d\n", state, READY_ACTIVE_HIGH(z80dma));
669   timer_call_after_resynch(device->machine, (void *) device, param, z80dma_rdy_write_callback);
674
675   timer_call_after_resynch(device->machine, (void *) device, state, z80dma_rdy_write_callback);
670676}
671677
672678/*-------------------------------------------------
r7528r7529
797803   state_save_register_device_item(device, 0, z80dma->addressB);
798804   state_save_register_device_item(device, 0, z80dma->count);
799805   state_save_register_device_item(device, 0, z80dma->rdy);
806   state_save_register_device_item(device, 0, z80dma->force_ready);
800807   state_save_register_device_item(device, 0, z80dma->is_read);
801808   state_save_register_device_item(device, 0, z80dma->cur_cycle);
802809   state_save_register_device_item(device, 0, z80dma->latch);
r7528r7529
812819
813820   z80dma->status = 0;
814821   z80dma->rdy = 0;
822   z80dma->force_ready = 0;
815823   z80dma->num_follow = 0;
816824   z80dma->dma_enabled = 0;
817825   z80dma->read_num_follow = z80dma->read_cur_follow = 0;
src/mess/drivers/trs80m2.c
r7528r7529
1010 
1111    TODO:
1212 
13   - z80dma RDY handling is broken, DMA from FDC fails
1413   - wd17xx.c thinks the drive is always ready
15   - NOT A SYSTEM DISK, RE-BOOT
1614    - keyboard CPU ROM
1715    - keyboard layout
1816    - graphics board
r7528r7529
539537 
540538      if (driver_state->enable_rtc_int && driver_state->rtc_int)
541539      {
542         logerror("RTC INT\n");
543540         /* trigger RTC interrupt */
544541         cputag_set_input_line(device->machine, Z80_TAG, INPUT_LINE_NMI, ASSERT_LINE);
545542      }

Previous 15994 Revisions Next


© 1998-2018 The MESS Team