Previous 15994 Revisions Next

r5686 Friday 11th September, 2009 at 11:01:00 UTC by Dirk Best
[SAMCOUPE] Added support for Extended DiSK/MV - CPC style disk images.
[docs]messnew.txt
[src/mess/drivers]samcoupe.c
[src/mess/formats]coupedsk.c coupedsk.h dsk_dsk.c dsk_dsk.h

src/mess/formats/dsk_dsk.c
r5685r5686
2020{
2121   int disk_image_type;  /* image type: standard or extended */
2222   int heads;
23   int tracks;   
23   int tracks;
2424   int sector_size;
2525   UINT64 track_offsets[84*2]; /* offset within data for each track */
26   
26
2727};
2828
2929
r5685r5686
3636
3737
3838
39static FLOPPY_IDENTIFY(dsk_dsk_identify)
39FLOPPY_IDENTIFY( dsk_dsk_identify )
4040{
4141   UINT8 header[8];
42   
42
4343   floppy_image_read(floppy, header, 0, 8);
44   if ( memcmp( header, MV_CPC, 8 ) ==0) {     
44   if ( memcmp( header, MV_CPC, 8 ) ==0) {
4545      *vote = 100;
46   } else
47   if ( memcmp( header, EXTENDED, 8 ) ==0) {   
46   } else
47   if ( memcmp( header, EXTENDED, 8 ) ==0) {
4848      *vote = 100;
4949   } else {
5050      *vote = 0;
r5685r5686
7575   UINT8 sectors_per_track;
7676   int i;
7777   /* translate the sector to a raw sector */
78   
78
7979   if (!sector_is_index)
8080   {
8181      sector -= 1;
8282   }
83   
83
8484   /* check to see if we are out of range */
8585   if ((head < 0) || (head >= get_tag(floppy)->heads) || (track < 0) || (track >= get_tag(floppy)->tracks)
8686         || (sector < 0) )
8787      return FLOPPY_ERROR_SEEKERROR;
88   
89   track_offset = dsk_get_track_offset(floppy, head, track);   
90   
88
89   track_offset = dsk_get_track_offset(floppy, head, track);
90
9191   floppy_image_read(floppy, track_info, track_offset, 0x100);
92     
92
9393   sectors_per_track = track_info[0x015];
9494   if (sector >= sectors_per_track) {
9595      return FLOPPY_ERROR_SEEKERROR;
9696   }
9797
9898   if (get_tag(floppy)->disk_image_type==0) {
99      get_tag(floppy)->sector_size = (1<<(track_info[0x014]+7));     
99      get_tag(floppy)->sector_size = (1<<(track_info[0x014]+7));
100100      offs = track_offset + 0x100 +sector * get_tag(floppy)->sector_size;
101   } else {   
102      get_tag(floppy)->sector_size = track_info[0x18 + (sector<<3) + 6] + (track_info[0x18+(sector<<3) + 7]<<8);           
103      offs = track_offset + 0x100;     
101   } else {
102      get_tag(floppy)->sector_size = track_info[0x18 + (sector<<3) + 6] + (track_info[0x18+(sector<<3) + 7]<<8);
103      offs = track_offset + 0x100;
104104      for (i=0;i<sector;i++) {
105         offs += track_info[0x18 + (i<<3) + 6] + (track_info[0x18+(i<<3) + 7]<<8);         
106      }         
105         offs += track_info[0x18 + (i<<3) + 6] + (track_info[0x18+(i<<3) + 7]<<8);
106      }
107107   }
108   
108
109109   if (offset)
110110      *offset = offs;
111111   return FLOPPY_ERROR_SUCCESS;
r5685r5686
116116static floperr_t internal_dsk_read_sector(floppy_image *floppy, int head, int track, int sector, int sector_is_index, void *buffer, size_t buflen)
117117{
118118   UINT64 offset;
119   floperr_t err;   
119   floperr_t err;
120120   err = get_offset(floppy, head, track, sector, sector_is_index, &offset);
121121   if (err)
122122      return err;
r5685r5686
163163
164164static floperr_t dsk_get_sector_length(floppy_image *floppy, int head, int track, int sector, UINT32 *sector_length)
165165{
166   floperr_t err;   
166   floperr_t err;
167167   err = get_offset(floppy, head, track, sector, FALSE, NULL);
168168   if (err)
169169      return err;
r5685r5686
180180   UINT64 offset;
181181   UINT8 sector_info[0x100];
182182   int pos;
183   
183
184184   retVal = get_offset(floppy, head, track, sector_index+1, FALSE, NULL);
185185   offset = dsk_get_track_offset(floppy,head,track);
186186   pos = 0x18 + (sector_index << 3);
r5685r5686
190190   if (side)
191191      *side = sector_info[pos + 1];
192192   if (sector)
193      *sector = sector_info[pos + 2];         
193      *sector = sector_info[pos + 2];
194194   if (sector_length) {
195195      *sector_length = 1 << (sector_info[pos + 3] + 7);
196   }     
196   }
197197   if (flags)
198198      *flags = (sector_info[pos + 5] & 0x40) ? ID_FLAG_DELETED_DATA : 0;
199199   return retVal;
200200}
201201
202202
203static FLOPPY_CONSTRUCT(dsk_dsk_construct)
203FLOPPY_CONSTRUCT( dsk_dsk_construct )
204204{
205205   struct FloppyCallbacks *callbacks;
206206   struct dskdsk_tag *tag;
r5685r5686
208208   UINT64 tmp = 0;
209209   int i;
210210   int skip,cnt;
211   
211
212212   floppy_image_read(floppy, header, 0, 0x100);
213     
213
214214   tag = (struct dskdsk_tag *) floppy_create_tag(floppy, dskDSK_TAG, sizeof(struct dskdsk_tag));
215215   if (!tag)
216216      return FLOPPY_ERROR_OUTOFMEMORY;
r5685r5686
221221   } else {
222222      skip = 1;
223223   }
224   tag->tracks  = header[0x30];   
224   tag->tracks  = header[0x30];
225225   cnt =0;
226   if ( memcmp( header, MV_CPC, 8 ) ==0) {     
226   if ( memcmp( header, MV_CPC, 8 ) ==0) {
227227      tag->disk_image_type = 0;
228228      tmp = 0x100;
229229      for (i=0; i<tag->tracks * tag->heads; i++)
230230      {
231         tag->track_offsets[cnt] = tmp;         
231         tag->track_offsets[cnt] = tmp;
232232         tmp += pick_integer_le(header, 0x32, 2);
233233         cnt += skip;
234      }     
234      }
235235   } else  {
236236      tag->disk_image_type = 1;
237237      tmp = 0x100;
238238      for (i=0; i<tag->tracks * tag->heads; i++)
239      {         
240         tag->track_offsets[cnt] = tmp;         
239      {
240         tag->track_offsets[cnt] = tmp;
241241         tmp += header[0x34 + i] << 8;
242242         cnt += skip;
243      }     
244   }
243      }
244   }
245245
246246   callbacks = floppy_callbacks(floppy);
247247   callbacks->read_sector = dsk_read_sector;
r5685r5686
251251   callbacks->get_sector_length = dsk_get_sector_length;
252252   callbacks->get_heads_per_disk = dsk_get_heads_per_disk;
253253   callbacks->get_tracks_per_disk = dsk_get_tracks_per_disk;
254   callbacks->get_indexed_sector_info = dsk_get_indexed_sector_info;   
255   return FLOPPY_ERROR_SUCCESS;   
254   callbacks->get_indexed_sector_info = dsk_get_indexed_sector_info;
255   return FLOPPY_ERROR_SUCCESS;
256256}
257257/* ----------------------------------------------------------------------- */
258258
src/mess/formats/dsk_dsk.h
r5685r5686
66
77*********************************************************************/
88
9#ifndef DSK_DSK_H
10#define DSK_DSK_H
9#ifndef __DSK_DSK_H__
10#define __DSK_DSK_H__
1111
1212#include "formats/flopimg.h"
1313
14/**************************************************************************/
1514
1615FLOPPY_OPTIONS_EXTERN(dsk);
1716
18#endif /* DSK_DSK_H */
17FLOPPY_IDENTIFY(dsk_dsk_identify);
18FLOPPY_CONSTRUCT(dsk_dsk_construct);
19
20
21#endif /* __DSK_DSK_H__ */
src/mess/formats/coupedsk.c
r5685r5686
3333
3434/*
3535    Straight rip without any header
36   
36
3737    Data:
38   
38
3939    Side 0 Track 0
4040    Side 1 Track 0
4141    Side 0 Track 1
r5685r5686
4444*/
4545
4646
47static FLOPPY_CONSTRUCT( coupe_mgt_construct )
47FLOPPY_CONSTRUCT( coupe_mgt_construct )
4848{
4949   struct basicdsk_geometry geometry;
5050
r5685r5686
6969         return FLOPPY_ERROR_INVALIDIMAGE;
7070
7171      geometry.sectors = size / 81920;
72     
72
7373   }
7474
7575   return basicdsk_construct(floppy, &geometry);
7676}
7777
7878
79static FLOPPY_IDENTIFY( coupe_mgt_identify )
79FLOPPY_IDENTIFY( coupe_mgt_identify )
8080{
8181   UINT64 size;
8282
8383   size = floppy_image_size(floppy);
8484
8585   *vote = (size == 737280 || size == 819200) ? 100 : 0;
86   return FLOPPY_ERROR_SUCCESS;   
86   return FLOPPY_ERROR_SUCCESS;
8787}
8888
8989
r5685r5686
9696
9797/*
9898    Header (22 bytes):
99   
99
100100    0-17 "Aley's disk backup"
101101    18   number of sides
102102    19   number of tracks
103103    20   number of sectors per track
104104    21   sector size divided by 64
105   
105
106106    Data:
107   
107
108108    Side 0 Track 0
109109    Side 0 Track 1
110110    Side 0 Track 2
111111    ...
112112    Side 1 Track 0
113113    Side 1 Track 1
114    ... 
114    ...
115115*/
116116
117117
r5685r5686
128128   UINT8 header[SAD_HEADER_LEN];
129129
130130   floppy_image_read(floppy, header, 0, SAD_HEADER_LEN);
131   
131
132132   *heads = header[18];
133133   *tracks = header[19];
134134   *sectors = header[20];
r5685r5686
136136}
137137
138138
139static FLOPPY_CONSTRUCT( coupe_sad_construct )
139FLOPPY_CONSTRUCT( coupe_sad_construct )
140140{
141141   struct basicdsk_geometry geometry;
142142   int heads, tracks, sectors, sector_length;
r5685r5686
184184}
185185
186186
187static FLOPPY_IDENTIFY( coupe_sad_identify )
187FLOPPY_IDENTIFY( coupe_sad_identify )
188188{
189189   int heads, tracks, sectors, sector_size;
190190   UINT64 size, calculated_size;
191191
192192   size = floppy_image_size(floppy);
193   
193
194194   /* read values from SAD header */
195195   coupe_sad_interpret_header(floppy, &heads, &tracks, &sectors, &sector_size);
196196
r5685r5686
206206/*************************************
207207 *
208208 *  SDF disk image format
209 *
209 *
210210 *  TODO: wd17xx status codes are
211211 *        currently ignored
212212 *
r5685r5686
222222static int coupe_sdf_get_tracks_per_disk(floppy_image *floppy)
223223{
224224   struct sdf_tag *tag = floppy_tag(floppy, SDF_TAG);
225   return tag->tracks;   
225   return tag->tracks;
226226}
227227
228228
r5685r5686
328328   if (err) return err;
329329
330330   *offset = track_offset + sector_offset;
331   
331
332332   return FLOPPY_ERROR_SUCCESS;
333333}
334334
r5685r5686
391391
392392   err = coupe_sdf_get_total_sector_offset(floppy, head, track, sector, &offset);
393393   if (err) return err;
394   
394
395395   /* read sector data into buffer */
396396   floppy_image_read(floppy, buffer, offset + 8, buflen);
397397
r5685r5686
432432}
433433
434434
435static FLOPPY_CONSTRUCT( coupe_sdf_construct )
435FLOPPY_CONSTRUCT( coupe_sdf_construct )
436436{
437437   struct FloppyCallbacks *callbacks;
438438   struct sdf_tag *tag;
r5685r5686
472472}
473473
474474
475static FLOPPY_IDENTIFY( coupe_sdf_identify )
475FLOPPY_IDENTIFY( coupe_sdf_identify )
476476{
477477   int heads, tracks;
478478
r5685r5686
487487
488488   return FLOPPY_ERROR_SUCCESS;
489489}
490
491
492
493/*************************************
494 *
495 *  Floppy options
496 *
497 *************************************/
498
499FLOPPY_OPTIONS_START(coupe)
500   FLOPPY_OPTION
501   (
502      coupe_mgt, "mgt,dsk,sad", "SAM Coupe MGT disk image", coupe_mgt_identify, coupe_mgt_construct,
503      HEADS([2])
504      TRACKS([80])
505      SECTORS(9-[10])
506      SECTOR_LENGTH([512])
507      FIRST_SECTOR_ID([1])
508   )
509   FLOPPY_OPTION
510   (
511      coupe_sad, "sad,dsk", "SAM Coupe SAD disk image", coupe_sad_identify, coupe_sad_construct,
512      HEADS(1-[2]-255)
513      TRACKS(1-[80]-255)
514      SECTORS(1-[10]-255)
515      SECTOR_LENGTH(64/128/256/[512]/1024/2048/4096)
516      FIRST_SECTOR_ID([1])
517   )
518   FLOPPY_OPTION
519   (
520      coupe_sdf, "sdf,dsk,sad", "SAM Coupe SDF disk image", coupe_sdf_identify, coupe_sdf_construct,
521      HEADS(1-[2])
522      TRACKS(1-[80]-83)
523      SECTORS(1-[10]-12)
524      SECTOR_LENGTH(128/256/[512]/1024)
525      FIRST_SECTOR_ID([1])
526   )
527FLOPPY_OPTIONS_END
src/mess/formats/coupedsk.h
r5685r5686
66
77**************************************************************************/
88
9#ifndef COUPEDSK_H_
10#define COUPEDSK_H_
9#ifndef __COUPEDSK_H__
10#define __COUPEDSK_H__
1111
12
1312#include "formats/flopimg.h"
1413
1514
16FLOPPY_OPTIONS_EXTERN(coupe);
15FLOPPY_CONSTRUCT( coupe_mgt_construct );
16FLOPPY_IDENTIFY( coupe_mgt_identify );
17FLOPPY_CONSTRUCT( coupe_sad_construct );
18FLOPPY_IDENTIFY( coupe_sad_identify );
19FLOPPY_CONSTRUCT( coupe_sdf_construct );
20FLOPPY_IDENTIFY( coupe_sdf_identify );
1721
1822
19#endif /* COUPEDSK_H_ */
23#endif /* __COUPEDSK_H__ */
src/mess/drivers/samcoupe.c
r5685r5686
4444/* devices */
4545#include "devices/mflopimg.h"
4646#include "formats/coupedsk.h"
47#include "formats/dsk_dsk.h"
4748
4849
4950/***************************************************************************
r5685r5686
563564    SYSTEM CONFIG
564565***************************************************************************/
565566
567FLOPPY_OPTIONS_START( coupe )
568   FLOPPY_OPTION
569   (
570      coupe_mgt, "mgt,dsk,sad", "SAM Coupe MGT disk image", coupe_mgt_identify, coupe_mgt_construct,
571      HEADS([2])
572      TRACKS([80])
573      SECTORS(9-[10])
574      SECTOR_LENGTH([512])
575      FIRST_SECTOR_ID([1])
576   )
577   FLOPPY_OPTION
578   (
579      coupe_sad, "sad,dsk", "SAM Coupe SAD disk image", coupe_sad_identify, coupe_sad_construct,
580      HEADS(1-[2]-255)
581      TRACKS(1-[80]-255)
582      SECTORS(1-[10]-255)
583      SECTOR_LENGTH(64/128/256/[512]/1024/2048/4096)
584      FIRST_SECTOR_ID([1])
585   )
586   FLOPPY_OPTION
587   (
588      coupe_sdf, "sdf,dsk,sad", "SAM Coupe SDF disk image", coupe_sdf_identify, coupe_sdf_construct,
589      HEADS(1-[2])
590      TRACKS(1-[80]-83)
591      SECTORS(1-[10]-12)
592      SECTOR_LENGTH(128/256/[512]/1024)
593      FIRST_SECTOR_ID([1])
594   )
595   FLOPPY_OPTION(dsk, "dsk", "DSK floppy disk image", dsk_dsk_identify, dsk_dsk_construct, NULL)
596FLOPPY_OPTIONS_END
597
566598static void samcoupe_floppy_getinfo(const mess_device_class *devclass, UINT32 state, union devinfo *info)
567599{
568600   /* floppy */
docs/messnew.txt
r5685r5686
7272
7373- [PX4] Added RAM disk support.  [Dirk Best]
7474
75- [SAMCOUPE] Added support for Extended DiSK/MV - CPC style disk
76  images.  [Dirk Best]
77
7578- [SNES] Plenty of improvements to SNES emulation (see MAME whatsnew for
7679  more details) [Fabio Priuli, Angelo Salese]:
7780  * fixes to hi-res in Mode 5/6, interlaced graphics, rowscroll, window effect

Previous 15994 Revisions Next


© 1998-2018 The MESS Team