Previous 15994 Revisions Next

r7323 Thursday 11th February, 2010 at 14:05:04 UTC by Curt Coder
[C1571] Connected write protect line to VIA, improved side selection.
[src/mess/devices]flopdrv.c flopdrv.h
[src/mess/formats]d64_dsk.c
[src/mess/machine]c1571.c c2040.c

src/mess/devices/flopdrv.c
r7322r7323
3737   devcb_resolved_write_line out_tk00_func;
3838   devcb_resolved_write_line out_wpt_func;
3939   devcb_resolved_write_line out_rdy_func;
40   devcb_resolved_write_line out_dskchg_func;
4041
4142   /* state of input lines */
4243   int drtn; /* direction */
r7322r7323
627628   floppy->drive_id = floppy_get_drive(device);
628629   floppy->active = FALSE;
629630
630   /* by default we are write-protected */
631   floppy->wpt = CLEAR_LINE;
631   /* resolve callbacks */
632   devcb_resolve_write_line(&floppy->out_idx_func, &floppy->config->out_idx_func, device);
633   devcb_resolve_read_line(&floppy->in_mon_func, &floppy->config->in_mon_func, device);
634   devcb_resolve_write_line(&floppy->out_tk00_func, &floppy->config->out_tk00_func, device);
635   devcb_resolve_write_line(&floppy->out_wpt_func, &floppy->config->out_wpt_func, device);
636   devcb_resolve_write_line(&floppy->out_rdy_func, &floppy->config->out_rdy_func, device);
637//   devcb_resolve_write_line(&floppy->out_dskchg_func, &floppy->config->out_dskchg_func, device);
632638
639   /* by default we are not write-protected */
640   floppy->wpt = ASSERT_LINE;
641   devcb_call_write_line(&floppy->out_wpt_func, floppy->wpt);
642
633643   /* not at track 0 */
634644   floppy->tk00 = ASSERT_LINE;
645   devcb_call_write_line(&floppy->out_tk00_func, floppy->tk00);
635646
636647   /* motor off */
637648   floppy->mon = ASSERT_LINE;
638649
639650   /* disk changed */
640651   floppy->dskchg = CLEAR_LINE;
641
642   /* resolve callbacks */
643   devcb_resolve_write_line(&floppy->out_idx_func, &floppy->config->out_idx_func, device);
644   devcb_resolve_read_line(&floppy->in_mon_func, &floppy->config->in_mon_func, device);
645   devcb_resolve_write_line(&floppy->out_tk00_func, &floppy->config->out_tk00_func, device);
646   devcb_resolve_write_line(&floppy->out_wpt_func, &floppy->config->out_wpt_func, device);
647   devcb_resolve_write_line(&floppy->out_rdy_func, &floppy->config->out_rdy_func, device);
652//   devcb_call_write_line(&floppy->out_dskchg_func, floppy->dskchg);
648653}
649654
650655static int internal_floppy_device_load(running_device *image, int create_format, option_resolution *create_args)
src/mess/devices/flopdrv.h
r7322r7323
3838   devcb_write_line out_tk00_func; /* track 00 */
3939   devcb_write_line out_wpt_func;  /* write protect */
4040   devcb_write_line out_rdy_func;  /* ready */
41//   devcb_write_line out_dskchg_func;  /* disk changed */
4142
4243   floppy_type_t floppy_type;
4344   const struct FloppyFormat *formats;
src/mess/machine/c2040.c
r7322r7323
267267}
268268
269269/*-------------------------------------------------
270    read_current_track - read track from disk
271-------------------------------------------------*/
272
273static void read_current_track(c2040_t *c2040, int unit)
274{
275   c2040->unit[unit].track_len = G64_BUFFER_SIZE;
276   c2040->unit[unit].buffer_pos = G64_DATA_START;
277   c2040->unit[unit].bit_pos = 7;
278   c2040->bit_count = 0;
279
280   /* read track data */
281   floppy_drive_read_track_data_info_buffer(c2040->unit[unit].image, c2040->side, c2040->unit[unit].track_buffer, &c2040->unit[unit].track_len);
282
283   /* extract track length */
284   c2040->unit[unit].track_len = G64_DATA_START + ((c2040->unit[unit].track_buffer[1] << 8) | c2040->unit[unit].track_buffer[0]);
285}
286
287/*-------------------------------------------------
288    spindle_motor - spindle motor control
289-------------------------------------------------*/
290
291static void spindle_motor(c2040_t *c2040, int unit, int mtr)
292{
293   if (c2040->unit[unit].mtr != mtr)
294   {
295      if (!mtr)
296      {
297         /* read track data */
298         read_current_track(c2040, unit);
299      }
300
301      floppy_mon_w(c2040->unit[unit].image, mtr);
302
303      c2040->unit[unit].mtr = mtr;
304   }
305}
306
307/*-------------------------------------------------
308    micropolis_step_motor - Micropolis stepper
309   motor control
310-------------------------------------------------*/
311
312static void micropolis_step_motor(c2040_t *c2040, int unit, int mtr, int stp)
313{
314   if (!mtr && (c2040->unit[unit].stp != stp))
315   {
316      int tracks = 0;
317
318      switch (c2040->unit[unit].stp)
319      {
320      case 0:   if (stp == 1) tracks++; else if (stp == 3) tracks--; break;
321      case 1:   if (stp == 2) tracks++; else if (stp == 0) tracks--; break;
322      case 2: if (stp == 3) tracks++; else if (stp == 1) tracks--; break;
323      case 3: if (stp == 0) tracks++; else if (stp == 2) tracks--; break;
324      }
325
326      if (tracks != 0)
327      {
328         /* step read/write head */
329         floppy_drive_seek(c2040->unit[unit].image, tracks);
330
331         /* read new track data */
332         read_current_track(c2040, unit);
333      }
334
335      c2040->unit[unit].stp = stp;
336   }
337}
338
339/*-------------------------------------------------
340    mpi_step_motor - MPI stepper motor control
341-------------------------------------------------*/
342
343static void mpi_step_motor(c2040_t *c2040, int unit, int mtr, int stp)
344{
345   if (!mtr && (c2040->unit[unit].stp != stp))
346   {
347      int tracks = 0;
348
349      switch (c2040->unit[unit].stp)
350      {
351      case 0:   if (stp == 1) tracks++; else if (stp == 2) tracks--; break;
352      case 1:   if (stp == 3) tracks++; else if (stp == 0) tracks--; break;
353      case 2: if (stp == 0) tracks++; else if (stp == 3) tracks--; break;
354      case 3: if (stp == 2) tracks++; else if (stp == 1) tracks--; break;
355      }
356
357      if (tracks != 0)
358      {
359         /* step read/write head */
360         floppy_drive_seek(c2040->unit[unit].image, tracks);
361
362         /* read new track data */
363         read_current_track(c2040, unit);
364      }
365
366      c2040->unit[unit].stp = stp;
367   }
368}
369
370/*-------------------------------------------------
270371    c2040_ieee488_atn_w - IEEE-488 bus attention
271372-------------------------------------------------*/
272373
r7322r7323
630731    via6522_interface via_intf um3
631732-------------------------------------------------*/
632733
633static void read_current_track(c2040_t *c2040, int unit)
634{
635   c2040->unit[unit].track_len = G64_BUFFER_SIZE;
636   c2040->unit[unit].buffer_pos = G64_DATA_START;
637   c2040->unit[unit].bit_pos = 7;
638   c2040->bit_count = 0;
639
640   /* read track data */
641   floppy_drive_read_track_data_info_buffer(c2040->unit[unit].image, c2040->side, c2040->unit[unit].track_buffer, &c2040->unit[unit].track_len);
642
643   /* extract track length */
644   c2040->unit[unit].track_len = G64_DATA_START + ((c2040->unit[unit].track_buffer[1] << 8) | c2040->unit[unit].track_buffer[0]);
645}
646
647static void spindle_motor(c2040_t *c2040, int unit, int mtr)
648{
649   if (c2040->unit[unit].mtr != mtr)
650   {
651      if (!mtr)
652      {
653         /* read track data */
654         read_current_track(c2040, unit);
655      }
656
657      floppy_mon_w(c2040->unit[unit].image, mtr);
658
659      c2040->unit[unit].mtr = mtr;
660   }
661}
662
663static void micropolis_step_motor(c2040_t *c2040, int unit, int mtr, int stp)
664{
665   if (!mtr && (c2040->unit[unit].stp != stp))
666   {
667      int tracks = 0;
668
669      switch (c2040->unit[unit].stp)
670      {
671      case 0:   if (stp == 1) tracks++; else if (stp == 3) tracks--; break;
672      case 1:   if (stp == 2) tracks++; else if (stp == 0) tracks--; break;
673      case 2: if (stp == 3) tracks++; else if (stp == 1) tracks--; break;
674      case 3: if (stp == 0) tracks++; else if (stp == 2) tracks--; break;
675      }
676
677      if (tracks != 0)
678      {
679         /* step read/write head */
680         floppy_drive_seek(c2040->unit[unit].image, tracks);
681
682         /* read new track data */
683         read_current_track(c2040, unit);
684      }
685
686      c2040->unit[unit].stp = stp;
687   }
688}
689
690734static READ8_DEVICE_HANDLER( via_pa_r )
691735{
692736   /*
r7322r7323
810854    via6522_interface c8050_via_intf um3
811855-------------------------------------------------*/
812856
813static void mpi_step_motor(c2040_t *c2040, int unit, int mtr, int stp)
814{
815   if (!mtr && (c2040->unit[unit].stp != stp))
816   {
817      int tracks = 0;
818
819      switch (c2040->unit[unit].stp)
820      {
821      case 0:   if (stp == 1) tracks++; else if (stp == 2) tracks--; break;
822      case 1:   if (stp == 3) tracks++; else if (stp == 0) tracks--; break;
823      case 2: if (stp == 0) tracks++; else if (stp == 3) tracks--; break;
824      case 3: if (stp == 2) tracks++; else if (stp == 1) tracks--; break;
825      }
826
827      if (tracks != 0)
828      {
829         /* step read/write head */
830         floppy_drive_seek(c2040->unit[unit].image, tracks);
831
832         /* read new track data */
833         read_current_track(c2040, unit);
834      }
835
836      c2040->unit[unit].stp = stp;
837   }
838}
839
840857static READ8_DEVICE_HANDLER( c8050_via_pb_r )
841858{
842859   /*
src/mess/machine/c1571.c
r7322r7323
1111
1212   TODO:
1313
14   - autoboot does not work when fast serial is used
15   - disk insert routine is not run
1416   - 1541/1571 Alignment shows drive speed as 266 rpm, should be 310
15   - toggle WPRT line on disk change
1617   - CP/M disks
1718    - power/activity LEDs
1819
r7322r7323
3839#define M6522_1_TAG      "u4"
3940#define M6526_TAG      "u20"
4041#define WD1770_TAG      "u11"
42#define C64H156_TAG      "u6"
4143
4244/***************************************************************************
4345    TYPE DEFINITIONS
r7322r7323
199201}
200202
201203/*-------------------------------------------------
204    read_current_track - read track from disk
205-------------------------------------------------*/
206
207static void read_current_track(c1571_t *c1571)
208{
209   c1571->track_len = G64_BUFFER_SIZE;
210   c1571->buffer_pos = G64_DATA_START;
211   c1571->bit_pos = 7;
212   c1571->bit_count = 0;
213
214   /* read track data */
215   floppy_drive_read_track_data_info_buffer(c1571->image, c1571->side, c1571->track_buffer, &c1571->track_len);
216
217   /* extract track length */
218   c1571->track_len = G64_DATA_START + ((c1571->track_buffer[1] << 8) | c1571->track_buffer[0]);
219}
220
221/*-------------------------------------------------
222    set_side - set disk side
223-------------------------------------------------*/
224
225static void set_side(c1571_t *c1571, int side)
226{
227   if (c1571->side != side)
228   {
229      c1571->side = side;
230      wd17xx_set_side(c1571->wd1770, side);
231
232      if (c1571->mtr)
233      {
234         /* read track data */
235         read_current_track(c1571);
236      }
237   }
238}
239
240/*-------------------------------------------------
241    spindle_motor - spindle motor control
242-------------------------------------------------*/
243
244static void spindle_motor(c1571_t *c1571, int mtr)
245{
246   if (c1571->mtr != mtr)
247   {
248      if (mtr)
249      {
250         /* read track data */
251         read_current_track(c1571);
252      }
253
254      floppy_mon_w(c1571->image, !mtr);
255      timer_enable(c1571->bit_timer, mtr);
256
257      c1571->mtr = mtr;
258   }
259}
260
261/*-------------------------------------------------
262    step_motor - stepper motor control
263-------------------------------------------------*/
264
265static void step_motor(c1571_t *c1571, int stp)
266{
267   if (c1571->mtr & (c1571->stp != stp))
268   {
269      int tracks = 0;
270
271      switch (c1571->stp)
272      {
273      case 0:   if (stp == 1) tracks++; else if (stp == 3) tracks--; break;
274      case 1:   if (stp == 2) tracks++; else if (stp == 0) tracks--; break;
275      case 2: if (stp == 3) tracks++; else if (stp == 1) tracks--; break;
276      case 3: if (stp == 0) tracks++; else if (stp == 2) tracks--; break;
277      }
278
279      if (tracks != 0)
280      {
281         /* step read/write head */
282         floppy_drive_seek(c1571->image, tracks);
283
284         /* read new track data */
285         read_current_track(c1571);
286      }
287
288      c1571->stp = stp;
289   }
290}
291
292/*-------------------------------------------------
202293    c1571_iec_atn_w - serial bus attention
203294-------------------------------------------------*/
204295
r7322r7323
292383ADDRESS_MAP_END
293384
294385/*-------------------------------------------------
295    via6522_interface c1571_via0_intf
386    via6522_interface via0_intf
296387-------------------------------------------------*/
297388
298389static WRITE_LINE_DEVICE_HANDLER( via0_irq_w )
r7322r7323
366457   iec_srq_w(device->owner);
367458
368459   /* side select */
369   c1571->side = BIT(data, 2);
370   wd17xx_set_side(c1571->wd1770, BIT(data, 2));
371
460   int side = BIT(data, 2);
461   set_side(c1571, side);
462   
372463   /* attention out */
373464   cbm_iec_atn_w(c1571->serial_bus, device->owner, !BIT(data, 6));
374465}
r7322r7323
438529   cbm_iec_clk_w(c1571->serial_bus, device->owner, !BIT(data, 3));
439530}
440531
441static const via6522_interface c1571_via0_intf =
532static READ_LINE_DEVICE_HANDLER( atn_in_r )
442533{
534   c1571_t *c1571 = get_safe_token(device->owner);
535
536   return !cbm_iec_atn_r(c1571->serial_bus);
537}
538
539static READ_LINE_DEVICE_HANDLER( wprt_r )
540{
541   c1571_t *c1571 = get_safe_token(device->owner);
542
543   return !floppy_wpt_r(c1571->image);
544}
545
546static const via6522_interface via0_intf =
547{
443548   DEVCB_HANDLER(via0_pa_r),
444549   DEVCB_HANDLER(via0_pb_r),
445   DEVCB_NULL, /* ATN IN */
550   DEVCB_LINE(atn_in_r),
446551   DEVCB_NULL,
447   DEVCB_NULL, /* _WPRT */
552   DEVCB_LINE(wprt_r),
448553   DEVCB_NULL,
449554
450555   DEVCB_HANDLER(via0_pa_w),
r7322r7323
458563};
459564
460565/*-------------------------------------------------
461    via6522_interface c1571_via1_intf
566    via6522_interface via1_intf
462567-------------------------------------------------*/
463568
464static void read_current_track(c1571_t *c1571)
465{
466   c1571->track_len = G64_BUFFER_SIZE;
467   c1571->buffer_pos = G64_DATA_START;
468   c1571->bit_pos = 7;
469   c1571->bit_count = 0;
470
471   /* read track data */
472   floppy_drive_read_track_data_info_buffer(c1571->image, c1571->side, c1571->track_buffer, &c1571->track_len);
473
474   /* extract track length */
475   c1571->track_len = G64_DATA_START + ((c1571->track_buffer[1] << 8) | c1571->track_buffer[0]);
476}
477
478static void spindle_motor(c1571_t *c1571, int mtr)
479{
480   if (c1571->mtr != mtr)
481   {
482      if (mtr)
483      {
484         /* read track data */
485         read_current_track(c1571);
486      }
487
488      floppy_mon_w(c1571->image, !mtr);
489      timer_enable(c1571->bit_timer, mtr);
490
491      c1571->mtr = mtr;
492   }
493}
494
495static void step_motor(c1571_t *c1571, int mtr, int stp)
496{
497   if (mtr & (c1571->stp != stp))
498   {
499      int tracks = 0;
500
501      switch (c1571->stp)
502      {
503      case 0:   if (stp == 1) tracks++; else if (stp == 3) tracks--; break;
504      case 1:   if (stp == 2) tracks++; else if (stp == 0) tracks--; break;
505      case 2: if (stp == 3) tracks++; else if (stp == 1) tracks--; break;
506      case 3: if (stp == 0) tracks++; else if (stp == 2) tracks--; break;
507      }
508
509      if (tracks != 0)
510      {
511         /* step read/write head */
512         floppy_drive_seek(c1571->image, tracks);
513
514         /* read new track data */
515         read_current_track(c1571);
516      }
517
518      c1571->stp = stp;
519   }
520}
521
522569static WRITE_LINE_DEVICE_HANDLER( via1_irq_w )
523570{
524571   c1571_t *c1571 = get_safe_token(device->owner);
r7322r7323
622669
623670   /* stepper motor */
624671   int stp = data & 0x03;
625   step_motor(c1571, mtr, stp);
672   step_motor(c1571, stp);
626673
627674   /* TODO activity LED */
628675
r7322r7323
661708   c1571->mode = state;
662709}
663710
664static const via6522_interface c1571_via1_intf =
711static const via6522_interface via1_intf =
665712{
666713   DEVCB_HANDLER(yb_r),
667714   DEVCB_HANDLER(via1_pb_r),
r7322r7323
681728};
682729
683730/*-------------------------------------------------
684    mos6526_interface c1571_cia_intf
731    mos6526_interface cia_intf
685732-------------------------------------------------*/
686733
687734static WRITE_LINE_DEVICE_HANDLER( cia_irq_w )
r7322r7323
711758   iec_data_w(device->owner);
712759}
713760
714static MOS6526_INTERFACE( c1571_cia_intf )
761static MOS6526_INTERFACE( cia_intf )
715762{
716763   0,
717764   DEVCB_LINE(cia_irq_w),
r7322r7323
725772};
726773
727774/*-------------------------------------------------
728    wd17xx_interface c1571_wd1770_intf
775    wd17xx_interface wd1770_intf
729776-------------------------------------------------*/
730777
731static const wd17xx_interface c1571_wd1770_intf =
778static const wd17xx_interface wd1770_intf =
732779{
733780   DEVCB_LINE_GND,
734781   DEVCB_NULL,
r7322r7323
750797    floppy_config c1570_floppy_config
751798-------------------------------------------------*/
752799
800static WRITE_LINE_DEVICE_HANDLER( wpt_w )
801{
802   c1571_t *c1571 = get_safe_token(device->owner);
803
804   via_ca2_w(c1571->via0, !state);
805}
806
753807static const floppy_config c1570_floppy_config =
754808{
755809   DEVCB_NULL,
756810   DEVCB_NULL,
757811   DEVCB_NULL,
812   DEVCB_LINE(wpt_w),
758813   DEVCB_NULL,
759   DEVCB_NULL,
760814   FLOPPY_DRIVE_SS_80,
761815   FLOPPY_OPTIONS_NAME(c1571),
762816   DO_NOT_KEEP_GEOMETRY
r7322r7323
771825   DEVCB_NULL,
772826   DEVCB_NULL,
773827   DEVCB_NULL,
828   DEVCB_LINE(wpt_w),
774829   DEVCB_NULL,
775   DEVCB_NULL,
776830   FLOPPY_DRIVE_DS_80,
777831   FLOPPY_OPTIONS_NAME(c1571),
778832   DO_NOT_KEEP_GEOMETRY
r7322r7323
786840   MDRV_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/8)
787841   MDRV_CPU_PROGRAM_MAP(c1570_map)
788842
789   MDRV_VIA6522_ADD(M6522_0_TAG, XTAL_16MHz/8, c1571_via0_intf)
790   MDRV_VIA6522_ADD(M6522_1_TAG, XTAL_16MHz/8, c1571_via1_intf)
791   MDRV_MOS6526R1_ADD(M6526_TAG, XTAL_16MHz/8, c1571_cia_intf)
792   MDRV_WD1770_ADD(WD1770_TAG, c1571_wd1770_intf)
843   MDRV_VIA6522_ADD(M6522_0_TAG, XTAL_16MHz/8, via0_intf)
844   MDRV_VIA6522_ADD(M6522_1_TAG, XTAL_16MHz/8, via1_intf)
845   MDRV_MOS6526R1_ADD(M6526_TAG, XTAL_16MHz/8, cia_intf)
846   MDRV_WD1770_ADD(WD1770_TAG, wd1770_intf)
793847
794848   MDRV_FLOPPY_DRIVE_ADD(FLOPPY_0, c1570_floppy_config)
795849MACHINE_DRIVER_END
r7322r7323
802856   MDRV_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/8)
803857   MDRV_CPU_PROGRAM_MAP(c1571_map)
804858
805   MDRV_VIA6522_ADD(M6522_0_TAG, XTAL_16MHz/8, c1571_via0_intf)
806   MDRV_VIA6522_ADD(M6522_1_TAG, XTAL_16MHz/8, c1571_via1_intf)
807   MDRV_MOS6526R1_ADD(M6526_TAG, XTAL_16MHz/8, c1571_cia_intf)
808   MDRV_WD1770_ADD(WD1770_TAG, c1571_wd1770_intf)
859   MDRV_VIA6522_ADD(M6522_0_TAG, XTAL_16MHz/8, via0_intf)
860   MDRV_VIA6522_ADD(M6522_1_TAG, XTAL_16MHz/8, via1_intf)
861   MDRV_MOS6526R1_ADD(M6526_TAG, XTAL_16MHz/8, cia_intf)
862   MDRV_WD1770_ADD(WD1770_TAG, wd1770_intf)
809863
810864   MDRV_FLOPPY_DRIVE_ADD(FLOPPY_0, c1571_floppy_config)
811865MACHINE_DRIVER_END
r7322r7323
818872   MDRV_CPU_ADD(M6502_TAG, M6502, XTAL_16MHz/8)
819873   MDRV_CPU_PROGRAM_MAP(c1571cr_map)
820874
821   MDRV_VIA6522_ADD(M6522_0_TAG, XTAL_16MHz/8, c1571_via0_intf)
822   MDRV_VIA6522_ADD(M6522_1_TAG, XTAL_16MHz/8, c1571_via1_intf)
823   MDRV_MOS6526R1_ADD(M6526_TAG, XTAL_16MHz/8, c1571_cia_intf)
824   MDRV_WD1770_ADD(WD1770_TAG, c1571_wd1770_intf)
875   MDRV_VIA6522_ADD(M6522_0_TAG, XTAL_16MHz/8, via0_intf)
876   MDRV_VIA6522_ADD(M6522_1_TAG, XTAL_16MHz/8, via1_intf)
877   MDRV_MOS6526R1_ADD(M6526_TAG, XTAL_16MHz/8, cia_intf)
878   MDRV_WD1770_ADD(WD1770_TAG, wd1770_intf)
825879
826880   MDRV_FLOPPY_DRIVE_ADD(FLOPPY_0, c1571_floppy_config)
827881MACHINE_DRIVER_END
src/mess/formats/d64_dsk.c
r7322r7323
1010
1111    TODO:
1212
13   - D81 geometry translation
1413    - disk errors
1514   - variable gaps
1615
r7322r7323
651650      logerror("D64 DOS version: %s\n", DOS_VERSION[dos]);
652651   }
653652
653   /* clear track data offsets */
654   for (head = 0; head < MAX_HEADS; head++)
655   {
656      for (track = 0; track < MAX_TRACKS; track++)
657      {
658         tag->track_offset[head][track] = INVALID_OFFSET;
659      }
660   }
661
654662   /* determine track data offsets */
655663   for (head = 0; head < heads; head++)
656664   {

Previous 15994 Revisions Next


© 1998-2018 The MESS Team