Previous 15994 Revisions Next

r7882 Wednesday 21st April, 2010 at 13:43:43 UTC by Curt Coder
Implemented get_track_size function for D64/G64.
[docs]messnew.txt
[src/mess/devices]flopdrv.c flopdrv.h
[src/mess/formats]d64_dsk.c g64_dsk.c g64_dsk.h
[src/mess/machine]c1541.c c1551.c c1571.c c2040.c

src/mess/devices/flopdrv.c
r7881r7882
607607   return drv->current_track;
608608}
609609
610UINT64 floppy_drive_get_current_track_size(running_device *img, int head)
611{
612   floppy_drive *drv = get_safe_token( img );
613   int size = 0;
614
615   if (image_exists(img))
616   {
617      size = floppy_get_track_size(drv->floppy, head, drv->current_track);
618   }
619
620   return size;
621}
622
610623void floppy_drive_set_rpm(running_device *img, float rpm)
611624{
612625   floppy_drive *drv = get_safe_token( img );
src/mess/devices/flopdrv.h
r7881r7882
7878void floppy_drive_set_flag_state(running_device *img, int flag, int state);
7979/* get current physical track drive is on */
8080int floppy_drive_get_current_track(running_device *img);
81/* get current physical track size */
82UINT64 floppy_drive_get_current_track_size(running_device *img, int head);
8183
8284/* get next id from track, 1 if got a id, 0 if no id was got */
8385int floppy_drive_get_next_id(running_device *img, int side, chrn_id *);
src/mess/machine/c2040.c
r7881r7882
238238      if (c2040->unit[c2040->drive].buffer_pos >= c2040->unit[c2040->drive].track_len)
239239      {
240240         /* loop to the start of the track */
241         c2040->unit[c2040->drive].buffer_pos = G64_DATA_START;
241         c2040->unit[c2040->drive].buffer_pos = 0;
242242      }
243243   }
244244
r7881r7882
277277static void read_current_track(c2040_t *c2040, int unit)
278278{
279279   c2040->unit[unit].track_len = G64_BUFFER_SIZE;
280   c2040->unit[unit].buffer_pos = G64_DATA_START;
280   c2040->unit[unit].buffer_pos = 0;
281281   c2040->unit[unit].bit_pos = 7;
282282   c2040->bit_count = 0;
283283
r7881r7882
285285   floppy_drive_read_track_data_info_buffer(c2040->unit[unit].image, c2040->side, c2040->unit[unit].track_buffer, &c2040->unit[unit].track_len);
286286
287287   /* extract track length */
288   c2040->unit[unit].track_len = G64_DATA_START + ((c2040->unit[unit].track_buffer[1] << 8) | c2040->unit[unit].track_buffer[0]);
288   c2040->unit[unit].track_len = floppy_drive_get_current_track_size(c2040->unit[unit].image, c2040->side);
289289}
290290
291291/*-------------------------------------------------
src/mess/machine/c1541.c
r7881r7882
248248      c1541->bit_pos = 7;
249249      c1541->buffer_pos++;
250250
251      if (c1541->buffer_pos > c1541->track_len + 1)
251      if (c1541->buffer_pos >= c1541->track_len)
252252      {
253253         /* loop to the start of the track */
254         c1541->buffer_pos = G64_DATA_START;
254         c1541->buffer_pos = 0;
255255      }
256256   }
257257
r7881r7882
292292static void read_current_track(c1541_t *c1541)
293293{
294294   c1541->track_len = G64_BUFFER_SIZE;
295   c1541->buffer_pos = G64_DATA_START;
295   c1541->buffer_pos = 0;
296296   c1541->bit_pos = 7;
297297   c1541->bit_count = 0;
298298
299299   /* read track data */
300300   floppy_drive_read_track_data_info_buffer(c1541->image, 0, c1541->track_buffer, &c1541->track_len);
301301
302   /* extract track length */
303   c1541->track_len = G64_DATA_START + ((c1541->track_buffer[1] << 8) | c1541->track_buffer[0]);
302   /* get track length */
303   c1541->track_len = floppy_drive_get_current_track_size(c1541->image, 0);
304304}
305305
306306/*-------------------------------------------------
src/mess/machine/c1551.c
r7881r7882
135135      c1551->bit_pos = 7;
136136      c1551->buffer_pos++;
137137
138      if (c1551->buffer_pos > c1551->track_len + 1)
138      if (c1551->buffer_pos >= c1551->track_len)
139139      {
140140         /* loop to the start of the track */
141         c1551->buffer_pos = G64_DATA_START;
141         c1551->buffer_pos = 0;
142142      }
143143   }
144144
r7881r7882
173173static void read_current_track(c1551_t *c1551)
174174{
175175   c1551->track_len = G64_BUFFER_SIZE;
176   c1551->buffer_pos = G64_DATA_START;
176   c1551->buffer_pos = 0;
177177   c1551->bit_pos = 7;
178178   c1551->bit_count = 0;
179179
r7881r7882
181181   floppy_drive_read_track_data_info_buffer(c1551->image, 0, c1551->track_buffer, &c1551->track_len);
182182
183183   /* extract track length */
184   c1551->track_len = G64_DATA_START + ((c1551->track_buffer[1] << 8) | c1551->track_buffer[0]);
184   c1551->track_len = floppy_drive_get_current_track_size(c1551->image, 0);
185185}
186186
187187/*-------------------------------------------------
src/mess/machine/c1571.c
r7881r7882
163163      c1571->bit_pos = 7;
164164      c1571->buffer_pos++;
165165
166      if (c1571->buffer_pos > c1571->track_len + 1)
166      if (c1571->buffer_pos >= c1571->track_len)
167167      {
168168         /* loop to the start of the track */
169         c1571->buffer_pos = G64_DATA_START;
169         c1571->buffer_pos = 0;
170170      }
171171   }
172172
r7881r7882
209209static void read_current_track(c1571_t *c1571)
210210{
211211   c1571->track_len = G64_BUFFER_SIZE;
212   c1571->buffer_pos = G64_DATA_START;
212   c1571->buffer_pos = 0;
213213   c1571->bit_pos = 7;
214214   c1571->bit_count = 0;
215215
r7881r7882
217217   floppy_drive_read_track_data_info_buffer(c1571->image, c1571->side, c1571->track_buffer, &c1571->track_len);
218218
219219   /* extract track length */
220   c1571->track_len = G64_DATA_START + ((c1571->track_buffer[1] << 8) | c1571->track_buffer[0]);
220   c1571->track_len = floppy_drive_get_current_track_size(c1571->image, c1571->side);
221221}
222222
223223/*-------------------------------------------------
src/mess/formats/d64_dsk.c
r7881r7882
1010
1111    TODO:
1212
13   - fix MAX_ERROR_SECTORS, it is too small for d80/d82
1314   - write to disk
1415    - disk errors 24, 25, 26, 28, 74
1516    - variable gaps
r7881r7882
2627    PARAMETERS
2728***************************************************************************/
2829
29#define LOG
30#define LOG 1
3031
3132#define MAX_HEADS         2
3233#define MAX_TRACKS         84
33#define MAX_ERROR_SECTORS   802
34#define MAX_ERROR_SECTORS   802 // TODO this is too small for .d80 files
3435#define SECTOR_SIZE         256
3536#define SECTOR_SIZE_GCR      368
3637
r7881r7882
244245}
245246
246247/*-------------------------------------------------
248    d64_get_track_size - returns the track size
249-------------------------------------------------*/
250
251static UINT32 d64_get_track_size(floppy_image *floppy, int head, int track)
252{
253   struct d64dsk_tag *tag = get_tag(floppy);
254
255   if (tag->track_offset[head][track] == INVALID_OFFSET)
256      return 0;
257
258   /* determine number of sectors per track */
259   int sectors_per_track = d64_get_sectors_per_track(floppy, head, track);
260
261   /* allocate temporary GCR track data buffer */
262   UINT32 track_length = sectors_per_track * SECTOR_SIZE_GCR;
263
264   return track_length;
265}
266
267/*-------------------------------------------------
247268    get_sector_error_code - returns the error
248269   code for the given sector
249270-------------------------------------------------*/
r7881r7882
251272static int get_sector_error_code(floppy_image *floppy, int head, int dos_track, int sector)
252273{
253274   struct d64dsk_tag *tag = get_tag(floppy);
254   int sector_error = tag->error[tag->error_offset[head][dos_track] + sector];
255275
256   if (sector_error)
276   if (!tag->has_errors)
277      return ERROR_00;
278
279   int sector_error = tag->error[tag->error_offset[head][dos_track] + sector]; // TODO index out of bounds!!!
280
281   if (sector_error != ERROR_00)
257282   {
258283      logerror("D64 error %s head %u track %u sector %u\n", ERROR_CODE[sector_error], head, dos_track, sector);
259284   }
r7881r7882
371396      UINT8 *d64_track_data;
372397      UINT16 gcr_track_size;
373398      UINT8 *gcr_track_data;
374      UINT64 gcr_pos = G64_DATA_START;
375      //int error_offset = 0;
399      UINT64 gcr_pos = 0;
376400
377401      /* determine logical track number */
378402      int dos_track = get_dos_track(track);
r7881r7882
398422
399423      if (buflen < gcr_track_size) fatalerror("D64 track buffer too small: %u!\n", (UINT32)buflen);
400424
401      /* prepend GCR track data buffer with GCR track size */
402      gcr_track_data[0] = gcr_track_size & 0xff;
403      gcr_track_data[1] = gcr_track_size >> 8;
404
405425      /* read D64 track data */
406426      floppy_image_read(floppy, d64_track_data, track_offset, d64_track_size);
407427
r7881r7882
475495         UINT8 sector_checksum = d64_track_data[d64_pos];
476496         for (i = 1; i < 256; i++)
477497            sector_checksum ^= d64_track_data[d64_pos + i];
478         
498
479499         if (sector_error == ERROR_23)
480500            sector_checksum ^= 0xff;
481501         
r7881r7882
504524         for (i = 0; i < 14; i++)
505525            gcr_track_data[gcr_pos + i] = 0x55;
506526         gcr_pos += 14;
507
508         //error_offset++;
509527      }
510528
511529      /* copy GCR track data to buffer */
512      memcpy(buffer, gcr_track_data, gcr_track_size + G64_DATA_START);
530      memcpy(buffer, gcr_track_data, gcr_track_size);
513531   }
514532   else   /* half tracks */
515533   {
r7881r7882
729747               if (LOG)
730748               {
731749                  logerror("D64 head %u track %u data offset: %04x\n", head, track + 1, tag->track_offset[head][track]);
732                  logerror("D64 head %u track %u error offset: %04x\n", head, track + 1, tag->error_offset[head][track]);
750                  if (has_errors) logerror("D64 head %u track %u error offset: %04x\n", head, track + 1, tag->error_offset[head][track]);
733751               }
734752            }
735753         }
r7881r7882
762780               if (LOG)
763781               {
764782                  logerror("D64 head %u track %.1f data offset: %04x\n", head, get_dos_track(track), tag->track_offset[head][track]);
765                  logerror("D64 head %u track %.1f error offset: %04x\n", head, get_dos_track(track), tag->error_offset[head][track]);
783                  if (has_errors) logerror("D64 head %u track %.1f error offset: %04x\n", head, get_dos_track(track), tag->error_offset[head][track]);
766784               }
767785            }
768786         }
r7881r7882
821839   callbacks->write_track = d64_write_track;
822840   callbacks->get_heads_per_disk = d64_get_heads_per_disk;
823841   callbacks->get_tracks_per_disk = d64_get_tracks_per_disk;
842   callbacks->get_track_size = d64_get_track_size;
824843
825844   return FLOPPY_ERROR_SUCCESS;
826845}
src/mess/formats/g64_dsk.c
r7881r7882
8686    the disk image for a given track
8787-------------------------------------------------*/
8888
89static floperr_t get_track_offset(floppy_image *floppy, int track, UINT64 *offset)
89static floperr_t get_track_offset(floppy_image *floppy, int head, int track, UINT64 *offset)
9090{
9191   struct g64dsk_tag *tag = get_tag(floppy);
9292   UINT64 offs = 0;
r7881r7882
103103}
104104
105105/*-------------------------------------------------
106    g64_get_track_size - returns the track size
107-------------------------------------------------*/
108
109static UINT32 g64_get_track_size(floppy_image *floppy, int head, int track)
110{
111   /* get track offset */
112   UINT64 track_offset;
113   floperr_t err = get_track_offset(floppy, head, track, &track_offset);
114
115   if (err)
116      return 0;
117
118   /* read track length */
119   UINT8 size[2];
120   floppy_image_read(floppy, &size, track_offset, 2);
121   UINT32 track_length = (size[1] << 8) | size[0];
122
123   return track_length;
124}
125
126/*-------------------------------------------------
106127    g64_read_track - reads a full track from the
107128    disk image
108129-------------------------------------------------*/
r7881r7882
115136   UINT16 track_length = 0;
116137
117138   /* get track offset */
118   err = get_track_offset(floppy, track, &track_offset);
139   err = get_track_offset(floppy, head, track, &track_offset);
119140
120141   if (err)
121142      return err;
122143
123144   if (!head && track_offset)
124145   {
125      if (buflen < (tag->track_size + G64_DATA_START)) fatalerror("G64 track buffer too small: %u!\n", (UINT32)buflen);
146      if (buflen < tag->track_size) fatalerror("G64 track buffer too small: %u!\n", (UINT32)buflen);
126147
127148      /* read track */
128      floppy_image_read(floppy, buffer, track_offset, tag->track_size + G64_DATA_START);
149      floppy_image_read(floppy, buffer, track_offset + 2, tag->track_size);
129150   }
130151   else
131152   {
r7881r7882
268289   callbacks->write_track = g64_write_track;
269290   callbacks->get_heads_per_disk = g64_get_heads_per_disk;
270291   callbacks->get_tracks_per_disk = g64_get_tracks_per_disk;
292   callbacks->get_track_size = g64_get_track_size;
271293
272294   return FLOPPY_ERROR_SUCCESS;
273295}
src/mess/formats/g64_dsk.h
r7881r7882
1818#define G64_SYNC_MARK      0x3ff      /* 10 consecutive 1-bits */
1919
2020#define G64_BUFFER_SIZE      16384
21#define G64_DATA_START      2
2221
2322const int C2040_BITRATE[] =
2423{
docs/messnew.txt
r7881r7882
113113- Inserts a check whether the get_track_size function is defined in the disk
114114  format before calling it. (bug #1934) [Michael Zapf]
115115
116- Implemented get_track_size function for D64 and G64 formats. [Curt Coder]
116117
117118
119
1181200.137
119121
120122New System Drivers Supported:

Previous 15994 Revisions Next


© 1998-2018 The MESS Team