Previous 15994 Revisions Next

r7218 Monday 1st February, 2010 at 09:14:31 UTC by Curt Coder
[PET] Changed floppy drive to Commodore 4040.
[docs]messnew.txt
[src/mess/drivers]pet.c
[src/mess/formats]d64_dsk.c g64_dsk.c
[src/mess/machine]c2040.c

src/mess/machine/c2040.c
r7217r7218
1111
1212   TODO:
1313
14   - e21t18s00
15   - read from disk
1614   - 8050 clock generator
1715   - write to disk
1816   - save state
r7217r7218
111109   int ready;                     /* byte ready */
112110   int mode;                     /* mode select */
113111   int rw;                        /* read/write select */
112   int miot_irq;                  /* MIOT interrupt */
114113
115114   /* devices */
116115   running_device *cpu_dos;
r7217r7218
219218      int ready = !(c2040->bit_count==9);
220219      int error = !(ready | BIT(c2040->e, 3));
221220
222      logerror("offs %04x G64 %02x READY %u PA %02x DATA %03x GCR %02x SYNC %u ERROR %u I %04x\n", c2040->unit[c2040->drive].buffer_pos,
221      logerror("offs %04x/%04x G64 %02x READY %u PA %02x DATA %03x GCR %02x SYNC %u ERROR %u I %04x\n", c2040->unit[c2040->drive].buffer_pos-1, c2040->unit[c2040->drive].track_len,
223222         c2040->unit[c2040->drive].track_buffer[c2040->unit[c2040->drive].buffer_pos],
224223         ready, pa, c2040->sr & 0x3ff, c2040->e, SYNC, error, c2040->i);
225224   }
r7217r7218
255254      c2040->unit[c2040->drive].bit_pos = 7;
256255      c2040->unit[c2040->drive].buffer_pos++;
257256
258      if (c2040->unit[c2040->drive].buffer_pos > c2040->unit[c2040->drive].track_len + 1)
257      if (c2040->unit[c2040->drive].buffer_pos == c2040->unit[c2040->drive].track_len + 2)
259258      {
260259         /* loop to the start of the track */
261260         c2040->unit[c2040->drive].buffer_pos = TRACK_DATA_START;
r7217r7218
279278   {
280279      /* set byte ready flag */
281280      c2040->ready = ready;
282      via_ca1_w(c2040->via, ready);
283281   }
284282
283   via_ca1_w(c2040->via, ready);
285284   via_cb1_w(c2040->via, ERROR);
286285}
287286
r7217r7218
670669
671670   UINT16 i = c2040->i;
672671   UINT8 e = c2040->e;
672   UINT8 data = (BIT(e, 6) << 7) | (BIT(i, 7) << 6) | (e & 0x33) | (BIT(e, 2) << 3) | (i & 0x04);
673673
674   return (BIT(e, 6) << 7) | (BIT(i, 7) << 6) | (e & 0x33) | (BIT(e, 2) << 3) | (i & 0x04);
674   return data;
675675}
676676
677677static READ8_DEVICE_HANDLER( via_pb_r )
r7217r7218
722722         floppy_drive_read_track_data_info_buffer(c2040->unit[unit].image, c2040->side, c2040->unit[unit].track_buffer, &c2040->unit[unit].track_len);
723723
724724         /* extract track length */
725         c2040->unit[unit].track_len = (c2040->unit[unit].track_buffer[1] << 8) | c2040->unit[unit].track_buffer[0];
725         c2040->unit[unit].track_len = 2 + ((c2040->unit[unit].track_buffer[1] << 8) | c2040->unit[unit].track_buffer[0]);
726726      }
727727
728728      c2040->unit[unit].stp = stp;
r7217r7218
10041004   }
10051005
10061006   /* interrupt */
1007   cpu_set_input_line(c2040->cpu_fdc, M6502_IRQ_LINE, BIT(newdata, 7) ? CLEAR_LINE : ASSERT_LINE);
1007   if (c2040->miot_irq != BIT(newdata, 7))
1008   {
1009      cpu_set_input_line(c2040->cpu_fdc, M6502_IRQ_LINE, BIT(newdata, 7) ? CLEAR_LINE : ASSERT_LINE);
1010      c2040->miot_irq = BIT(newdata, 7);
1011   }
10081012}
10091013
10101014static const miot6530_interface miot_intf =
r7217r7218
14171421   c2040->unit[1].image = device->subdevice(FLOPPY_1);
14181422
14191423   /* find GCR ROM */
1420   running_device *region_dev = NULL;
1421
14221424   if ((device->type == C2040) || (device->type == C3040))
14231425   {
1424      region_dev = device->subdevice(C2040_REGION);
1426      astring region_name(device->tag, ":", C2040_REGION);
1427      c2040->gcr = memory_region(device->machine, region_name.cstr()) +
1428         memory_region_length(device->machine, region_name.cstr()) - 0x800;
14251429   }
14261430   else if (device->type == C4040)
14271431   {
1428      region_dev = device->subdevice(C4040_REGION);
1432      astring region_name(device->tag, ":", C4040_REGION);
1433      c2040->gcr = memory_region(device->machine, region_name.cstr()) +
1434         memory_region_length(device->machine, region_name.cstr()) - 0x800;
14291435   }
14301436   else if ((device->type == C8050) || (device->type == C8250))
14311437   {
1432      region_dev = device->subdevice(C8050_REGION);
1438      astring region_name(device->tag, ":", C8050_REGION);
1439      c2040->gcr = memory_region(device->machine, region_name.cstr()) +
1440         memory_region_length(device->machine, region_name.cstr()) - 0x800;
14331441   }
14341442   else if (device->type == SFD1001)
14351443   {
1436      region_dev = device->subdevice(SFD1001_REGION);
1444      astring region_name(device->tag, ":", SFD1001_REGION);
1445      c2040->gcr = memory_region(device->machine, region_name.cstr()) +
1446         memory_region_length(device->machine, region_name.cstr()) - 0x800;
14371447   }
14381448
1439   c2040->gcr = memory_region(device->machine, region_dev->tag.cstr()) +
1440      memory_region_length(device->machine, region_dev->tag.cstr()) - 0x800;
1441
14421449   /* allocate data timer */
14431450   c2040->bit_timer = timer_alloc(device->machine, bit_tick, (void *)device);
14441451
src/mess/formats/d64_dsk.c
r7217r7218
44
55   SYNC                  FF * 5
66   08
7   CHECKSUM               sector ^ track ^ id2 ^ id1
8   SECTOR                  0..20 (2040), 0..28 (8050)
9   TRACK                  1..35 (2040), 1..77 (8050), 1..70 (1571)
10   ID2
711   ID1
8   ID2
9   TRACK                  1..35 (2040), 1..77 (8050)
10   SECTOR                  0..20 (2040), 0..28 (8050)
11   CHECKSUM
12   GAP 1                  55 * 9 (2040), 8 (1541)
12   GAP 1                  55 * 9 (2040), 55 * 8 (1541)
1313
1414   SYNC                  FF * 5
1515   07
16   BYTE 0
17   BYTE 1
16   NEXT TRACK
17   NEXT SECTOR
1818   254 BYTES OF DATA
1919   CHECKSUM
2020   GAP 2                  55 * 8..19
r7217r7218
6464#include "formats/d64_dsk.h"
6565#include "devices/flopdrv.h"
6666
67#define LOG 1
67#define LOG
6868
6969#define MAX_HEADS         2
7070#define MAX_TRACKS         84
r7217r7218
403403         gcr_pos += 5;
404404
405405         /* Inter-sector gap */
406         // "In tests that the author conducted on a real 1541 disk, gap sizes of 8 to 19 bytes were seen."
406         // "In tests that the author conducted on a real 1541 disk, gap sizes of 8 to 19 bytes were seen."
407407         // Here we put 14 as an average...
408408         for (i = 0; i < 14; i++)
409409            gcr_track_data[gcr_pos + i] = 0x55;
src/mess/formats/g64_dsk.c
r7217r7218
4242
4343#define LOG 0
4444
45#define HEADER_LENGTH   0x2ac       /* standard length for 84 half tracks */
46#define HALF_TRACKS      84
45#define HEADER_LENGTH   0x2ac            /* standard length for 84 half tracks */
46#define MAX_TRACKS      84
4747
4848struct g64dsk_tag
4949{
5050   int version;
51   int tracks;
52   UINT16 track_size;
53   UINT32 track_offset[HALF_TRACKS];      /* offset within data for each half track */
54   UINT32 speed_zone_offset[HALF_TRACKS]; /* offset within data for each half track */
51   int tracks;                        /* number of physical tracks */
52   UINT16 track_size;                  /* size of each track */
53   UINT32 track_offset[MAX_TRACKS];      /* offset within data for each track */
54   UINT32 speed_zone_offset[MAX_TRACKS];   /* offset within data for each track */
5555};
5656
57INLINE float get_track_index(int track)
57INLINE float get_dos_track(int track)
5858{
5959   return ((float)track / 2) + 1;
6060}
6161
6262static struct g64dsk_tag *get_tag(floppy_image *floppy)
6363{
64   struct g64dsk_tag *tag;
65   tag = (g64dsk_tag *)floppy_tag(floppy);
64   struct g64dsk_tag *tag = (g64dsk_tag *)floppy_tag(floppy);
6665   return tag;
6766}
6867
r7217r7218
9493
9594static floperr_t g64_read_track(floppy_image *floppy, int head, int track, UINT64 offset, void *buffer, size_t buflen)
9695{
96   struct g64dsk_tag *tag = get_tag(floppy);
9797   floperr_t err;
9898   UINT64 track_offset;
99   UINT8 header[2];
10099   UINT16 track_length = 0;
101100
102101   /* get track offset */
r7217r7218
107106
108107   if (track_offset)
109108   {
110      /* get track length */
111      floppy_image_read(floppy, header, track_offset, 2);
112      track_length = (header[1] << 8) | header[0];
109      if (buflen < (tag->track_size + 2)) fatalerror("G64 track buffer too small: %u!\n", (UINT32)buflen);
113110
114      if (buflen < track_length) fatalerror("G64 track buffer too small: %u!\n", (UINT32)buflen);
115
116      if (track_length)
117      {
118         /* read track */
119         floppy_image_read(floppy, buffer, track_offset, track_length);
120      }
111      /* read track */
112      floppy_image_read(floppy, buffer, track_offset, tag->track_size + 2);
121113   }
122114   else
123115   {
r7217r7218
125117      memset(buffer, 0, buflen);
126118   }
127119
128   if (LOG) logerror("G64 track %.1f length %u\n", get_track_index(track), track_length);
120   if (LOG) logerror("G64 track %.1f length %u\n", get_dos_track(track), track_length);
129121
130122   return FLOPPY_ERROR_SUCCESS;
131123}
r7217r7218
190182      floppy_image_read(floppy, header, pos, 4); pos += 4;
191183      tag->track_offset[i] = (header[3] << 24) | (header[2] << 16) | (header[1] << 8) | header[0];
192184
193      if (LOG) logerror("G64 track %.1f data offset: %04x\n", get_track_index(i), tag->track_offset[i]);
185      if (LOG) logerror("G64 track %.1f data offset: %04x\n", get_dos_track(i), tag->track_offset[i]);
194186   }
195187
196188   /* speed zone offsets */
r7217r7218
202194      if (LOG)
203195      {
204196         if (tag->speed_zone_offset[i] < 4)
205            logerror("G64 track %.1f speed zone: %u\n", get_track_index(i), tag->speed_zone_offset[i]);
197            logerror("G64 track %.1f speed zone: %u\n", get_dos_track(i), tag->speed_zone_offset[i]);
206198         else
207            logerror("G64 track %.1f speed zone offset: %04x\n", get_track_index(i), tag->speed_zone_offset[i]);
199            logerror("G64 track %.1f speed zone offset: %04x\n", get_dos_track(i), tag->speed_zone_offset[i]);
208200      }
209201   }
210202
src/mess/drivers/pet.c
r7217r7218
388388#include "machine/cbmipt.h"
389389#include "video/mc6845.h"
390390#include "devices/messram.h"
391#include "machine/c1541.h"
391#include "machine/c2040.h"
392392
393393/* devices config */
394394#include "includes/cbm.h"
r7217r7218
648648   { "pia_0" },
649649   { "pia_1", DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_DEVICE_HANDLER("pia_1", pia6821_cb1_w), DEVCB_DEVICE_HANDLER("pia_1", pia6821_ca1_w), DEVCB_NULL },
650650   { "via6522_0" },
651   { C2031_IEEE488("c2031") },
651   { C2040_IEEE488("c4040") },
652652   { NULL}
653653};
654654
r7217r7218
693693
694694   /* IEEE bus */
695695   MDRV_IEEE488_ADD("ieee_bus", ieee488_daisy)
696   MDRV_C2031_ADD("c2031", "ieee_bus", 8)
696   MDRV_C4040_ADD("c4040", "ieee_bus", 8)
697697MACHINE_DRIVER_END
698698
699699
docs/messnew.txt
r7217r7218
4242
4343- [PDP1] Fixed crash when debugger invoked (bug #1371]. [Robbbert]
4444
45- [PET] Changed floppy drive to Commodore 4040. [Curt Coder]
46
4547- [SCV] Implemented upd177c audio. [plgDavid]
4648
4749- [TX0] Fixed disassembly in the debugger. [Robbbert]
r7217r7218
6365
6466- Cleanups for driver_data and Standard C library usage.  [Atari Ace]
6567
68- Placed floppy drive head initially on track 0 to fix alignment issues
69  with Commodore drives, where physical track 1 is a half track. [Curt Coder]
6670
6771
68720.136

Previous 15994 Revisions Next


© 1998-2018 The MESS Team