Previous 15994 Revisions Next

r5032 Tuesday 16th June, 2009 at 17:22:37 UTC by Wilbert Pol
Added support for passing around 'deleted address mark' information to the floppy system. [Roberto Lavarone]
[docs]messnew.txt
[src/mess/devices]mflopimg.c
[src/mess/formats]ap2_dsk.c ap_dsk35.c basicdsk.c coco_dsk.c coupedsk.c flopimg.c flopimg.h fm7_dsk.c
[src/mess/tools/imgtool]iflopimg.c library.h
[src/mess/tools/imgtool/modules]mac.c os9.c pc_flop.c pc_hard.c prodos.c rsdos.c thomson.c vzdos.c

src/mess/tools/imgtool/iflopimg.c
r5031r5032
227227
228228
229229
230static imgtoolerr_t imgtool_floppy_write_sector(imgtool_image *image, UINT32 track, UINT32 head, UINT32 sector, const void *buffer, size_t len)
230static imgtoolerr_t imgtool_floppy_write_sector(imgtool_image *image, UINT32 track, UINT32 head, UINT32 sector, const void *buffer, size_t len, int ddam)
231231{
232232   floperr_t ferr;
233233
234   ferr = floppy_write_sector(get_floppy(image), head, track, sector, 0, buffer, len);
234   ferr = floppy_write_sector(get_floppy(image), head, track, sector, 0, buffer, len, ddam);
235235   if (ferr)
236236      return imgtool_floppy_error(ferr);
237237
r5031r5032
337337   else
338338   {
339339      stream_read(f, buffer, length);
340      err = floppy_write_sector(floppy, head, track, sector, offset, buffer, length);
340      err = floppy_write_sector(floppy, head, track, sector, offset, buffer, length, 0);   /* TODO: pass ddam argument from imgtool */
341341      if (err)
342342         goto done;
343343   }
src/mess/tools/imgtool/library.h
r5031r5032
277277   imgtoolerr_t   (*get_sector_size)   (imgtool_image *image, UINT32 track, UINT32 head, UINT32 sector, UINT32 *sector_size);
278278   imgtoolerr_t   (*get_geometry)      (imgtool_image *image, UINT32 *tracks, UINT32 *heads, UINT32 *sectors);
279279   imgtoolerr_t   (*read_sector)      (imgtool_image *image, UINT32 track, UINT32 head, UINT32 sector, void *buffer, size_t len);
280   imgtoolerr_t   (*write_sector)      (imgtool_image *image, UINT32 track, UINT32 head, UINT32 sector, const void *buffer, size_t len);
280   imgtoolerr_t   (*write_sector)      (imgtool_image *image, UINT32 track, UINT32 head, UINT32 sector, const void *buffer, size_t len, int ddam);
281281   imgtoolerr_t   (*read_block)      (imgtool_image *image, void *buffer, UINT64 block);
282282   imgtoolerr_t   (*write_block)      (imgtool_image *image, const void *buffer, UINT64 block);
283283   imgtoolerr_t   (*list_partitions)   (imgtool_image *image, imgtool_partition_info *partitions, size_t len);
src/mess/tools/imgtool/modules/pc_hard.c
r5031r5032
360360
361361
362362
363static imgtoolerr_t   pc_chd_image_writesector(imgtool_image *image, UINT32 track, UINT32 head, UINT32 sector, const void *buffer, size_t len)
363static imgtoolerr_t   pc_chd_image_writesector(imgtool_image *image, UINT32 track, UINT32 head, UINT32 sector, const void *buffer, size_t len, int ddam)
364364{
365365   pc_chd_image_info *info;
366366   info = pc_chd_get_image_info(image);
src/mess/tools/imgtool/modules/os9.c
r5031r5032
175175   if (err)
176176      return err;
177177
178   ferr = floppy_write_sector(imgtool_floppy(img), head, track, sector, offset, buffer, buffer_len);
178   ferr = floppy_write_sector(imgtool_floppy(img), head, track, sector, offset, buffer, buffer_len, 0);   /* TODO: pass ddam argument from imgtool */
179179   if (ferr)
180180      return imgtool_floppy_error(ferr);
181181
r5031r5032
774774   place_integer_be(header, 0x3f+0x0d, 1, 3); /* sector interleave factor */
775775   place_integer_be(header, 0x3f+0x0e, 1, 8); /* default sectors per allocation */
776776
777   err = floppy_write_sector(imgtool_floppy(img), 0, 0, first_sector_id, 0, header, sector_bytes);
777   err = floppy_write_sector(imgtool_floppy(img), 0, 0, first_sector_id, 0, header, sector_bytes, 0);   /* TODO: pass ddam argument from imgtool */
778778   if (err)
779779      goto done;
780780
r5031r5032
804804         }
805805      }
806806
807      err = floppy_write_sector(imgtool_floppy(img), 0, 0, first_sector_id + 1 + i, 0, header, sector_bytes);
807      err = floppy_write_sector(imgtool_floppy(img), 0, 0, first_sector_id + 1 + i, 0, header, sector_bytes, 0);   /* TODO: pass ddam argument from imgtool */
808808      if (err)
809809         goto done;
810810   }
r5031r5032
829829   place_integer_be(header, 0x10, 3, 1 + allocation_bitmap_lsns + 1);
830830   place_integer_be(header, 0x13, 2, 8);
831831
832   err = floppy_write_sector(imgtool_floppy(img), 0, 0, first_sector_id + 1 + allocation_bitmap_lsns, 0, header, sector_bytes);
832   err = floppy_write_sector(imgtool_floppy(img), 0, 0, first_sector_id + 1 + allocation_bitmap_lsns, 0, header, sector_bytes, 0);   /* TODO: pass ddam argument from imgtool */
833833   if (err)
834834      goto done;
835835
r5031r5032
839839   header[0x1F] = 1 + allocation_bitmap_lsns;
840840   header[0x20] = 0xAE;
841841   header[0x3F] = 1 + allocation_bitmap_lsns;
842   err = floppy_write_sector(imgtool_floppy(img), 0, 0, first_sector_id + 2 + allocation_bitmap_lsns, 0, header, sector_bytes);
842   err = floppy_write_sector(imgtool_floppy(img), 0, 0, first_sector_id + 2 + allocation_bitmap_lsns, 0, header, sector_bytes, 0);   /* TOOD: pass ddam argument from imgtool */
843843   if (err)
844844      goto done;
845845
src/mess/tools/imgtool/modules/thomson.c
r5031r5032
835835
836836static imgtoolerr_t thom_write_sector(imgtool_image *img, UINT32 track,
837837                  UINT32 head, UINT32 sector,
838                  const void *buf, size_t len)
838                  const void *buf, size_t len, int ddam)
839839{
840840  thom_floppy* f = (thom_floppy*) imgtool_image_extra_bytes( img );
841841  if ( stream_isreadonly( f->stream ) ) return IMGTOOLERR_WRITEERROR;
src/mess/tools/imgtool/modules/mac.c
r5031r5032
682682   if (err)
683683      return err;
684684
685   ferr = floppy_write_sector(imgtool_floppy(image->image), head, track, sector, 0, src, 512);
685   ferr = floppy_write_sector(imgtool_floppy(image->image), head, track, sector, 0, src, 512, 0);   /* TODO: pass ddam argument from imgtool */
686686   if (ferr)
687687      return imgtool_floppy_error(ferr);
688688
src/mess/tools/imgtool/modules/vzdos.c
r5031r5032
147147   memcpy(buffer, data, DATA_SIZE + 2);
148148   place_integer_le(buffer, DATA_SIZE + 2, 2, chksum16(data, DATA_SIZE + 2));
149149
150   ret = floppy_write_sector(imgtool_floppy(img), 0, track, sector_order[sector], data_start, buffer, sizeof(buffer));
150   ret = floppy_write_sector(imgtool_floppy(img), 0, track, sector_order[sector], data_start, buffer, sizeof(buffer), 0);   /* TODO: pass ddam argument from imgtool */
151151   if (ret) return ret;
152152
153153   return IMGTOOLERR_SUCCESS;
r5031r5032
376376   sector_data[11] = (UINT8) sector;         /* current sector */
377377   sector_data[12] = (UINT8) track + sector;   /* checksum-8 */
378378
379   ret = floppy_write_sector(imgtool_floppy(img), 0, track, sector_order[sector], 0, sector_data, sizeof(sector_data));
379   ret = floppy_write_sector(imgtool_floppy(img), 0, track, sector_order[sector], 0, sector_data, sizeof(sector_data), 0);   /* TODO: pass ddam argument from imgtool */
380380   if (ret) return ret;
381381
382382   return IMGTOOLERR_SUCCESS;
src/mess/tools/imgtool/modules/prodos.c
r5031r5032
330330
331331   /* read first sector */
332332   ferr = floppy_write_sector(imgtool_floppy(image), head, track,
333      sector1, 0, ((const UINT8 *) buffer) + 0, 256);
333      sector1, 0, ((const UINT8 *) buffer) + 0, 256, 0);   /* TODO: pass ddam argument from imgtool */
334334   if (ferr)
335335      return imgtool_floppy_error(ferr);
336336
337337   /* read second sector */
338338   ferr = floppy_write_sector(imgtool_floppy(image), head, track,
339      sector2, 0, ((const UINT8 *) buffer) + 256, 256);
339      sector2, 0, ((const UINT8 *) buffer) + 256, 256, 0);   /* TODO: pass ddam argument from imgtool */
340340   if (ferr)
341341      return imgtool_floppy_error(ferr);
342342
r5031r5032
408408   if (err)
409409      return err;
410410
411   ferr = floppy_write_sector(imgtool_floppy(image), head, track, sector, 0, buffer, 512);
411   ferr = floppy_write_sector(imgtool_floppy(image), head, track, sector, 0, buffer, 512, 0);   /* TODO: pass ddam argument from imgtool */
412412   if (ferr)
413413      return imgtool_floppy_error(ferr);
414414
src/mess/tools/imgtool/modules/pc_flop.c
r5031r5032
138138   if (err)
139139      return err;
140140
141   ferr = floppy_write_sector(imgtool_floppy(image), head, track, sector, 0, buffer, block_size);
141   ferr = floppy_write_sector(imgtool_floppy(image), head, track, sector, 0, buffer, block_size, 0);   /* TODO: pass ddam argument from imgtool */
142142   if (ferr)
143143      return imgtool_floppy_error(ferr);
144144   return IMGTOOLERR_SUCCESS;
src/mess/tools/imgtool/modules/rsdos.c
r5031r5032
5757{
5858   if (index_loc >= MAX_DIRENTS)
5959      return IMGTOOLERR_FILENOTFOUND;
60   return floppy_write_sector(imgtool_floppy(f), 0, 17, 3, index_loc * 32, (void *) ent, sizeof(*ent));
60   return floppy_write_sector(imgtool_floppy(f), 0, 17, 3, index_loc * 32, (void *) ent, sizeof(*ent), 0);   /* TODO: pass ddam argument from imgtool */
6161}
6262
6363
r5031r5032
145145
146146static floperr_t put_granule_map(imgtool_image *img, const UINT8 *granule_map, UINT8 granule_count)
147147{
148   return floppy_write_sector(imgtool_floppy(img), 0, 17, 2, 0, granule_map, granule_count);
148   return floppy_write_sector(imgtool_floppy(img), 0, 17, 2, 0, granule_map, granule_count, 0);   /* TODO: pass ddam argument from imgtool */
149149}
150150
151151
src/mess/devices/mflopimg.c
r5031r5032
117117{
118118   mess_flopimg *flopimg;
119119   int cylinder, sector, N;
120   unsigned long flags;
120121   UINT32 sector_length;
121122
122123   flopimg = get_flopimg(image);
123124   if (!flopimg || !flopimg->floppy)
124125      return;
125126
126   floppy_get_indexed_sector_info(flopimg->floppy, side, flopimg->track, id_index, &cylinder, &side, &sector, &sector_length);
127   floppy_get_indexed_sector_info(flopimg->floppy, side, flopimg->track, id_index, &cylinder, &side, &sector, &sector_length, &flags);
127128
128129   N = compute_log2(sector_length);
129130
r5031r5032
131132   id->H = side;
132133   id->R = sector;
133134   id->data_id = id_index;
134   id->flags = 0;
135   id->flags = flags;
135136   id->N = ((N >= 7) && (N <= 10)) ? N - 7 : 0;
136137}
137138
r5031r5032
164165
165166
166167
167static void flopimg_write_sector_data_from_buffer(const device_config *image, int side, int index1, const char *ptr, int length,int ddam)
168static void flopimg_write_sector_data_from_buffer(const device_config *image, int side, int index1, const char *ptr, int length, int ddam)
168169{
169170   mess_flopimg *flopimg;
170171
r5031r5032
175176   if (LOG_FLOPPY)
176177      log_readwrite("sector_write", side, flopimg->track, index1, ptr, length);
177178
178   floppy_write_indexed_sector(flopimg->floppy, side, flopimg->track, index1, 0, ptr, length);
179   floppy_write_indexed_sector(flopimg->floppy, side, flopimg->track, index1, 0, ptr, length, ddam);
179180}
180181
181182
src/mess/formats/coco_dsk.c
r5031r5032
398398   if (total_sectors % 8)
399399      header[0x0100 + (total_sectors / 8)] = 0xFF >> (total_sectors % 8);
400400
401   err = floppy_write_sector(floppy, 0, 0, 1, 0, &header[0x0000], 256);
401   err = floppy_write_sector(floppy, 0, 0, 1, 0, &header[0x0000], 256, 0);
402402   if (err)
403403      return err;
404404
405   err = floppy_write_sector(floppy, 0, 0, 2, 0, &header[0x0100], 256);
405   err = floppy_write_sector(floppy, 0, 0, 2, 0, &header[0x0100], 256, 0);
406406   if (err)
407407      return err;
408408
409   err = floppy_write_sector(floppy, 0, 0, 3, 0, &header[0x0200], 256);
409   err = floppy_write_sector(floppy, 0, 0, 3, 0, &header[0x0200], 256, 0);
410410   if (err)
411411      return err;
412412
413   err = floppy_write_sector(floppy, 0, 0, 4, 0, &header[0x0300], 256);
413   err = floppy_write_sector(floppy, 0, 0, 4, 0, &header[0x0300], 256, 0);
414414   if (err)
415415      return err;
416416
r5031r5032
971971
972972
973973
974static floperr_t coco_dmk_get_indexed_sector_info(floppy_image *floppy, int head, int track, int sector_index, int *cylinder, int *side, int *sector, UINT32 *sector_length)
974static floperr_t coco_dmk_get_indexed_sector_info(floppy_image *floppy, int head, int track, int sector_index, int *cylinder, int *side, int *sector, UINT32 *sector_length, unsigned long *flags)
975975{
976976   floperr_t err;
977977   UINT32 idam_offset;
r5031r5032
10021002      *sector = dmk_idam_sector(&track_data[idam_offset]);
10031003   if (sector_length)
10041004      *sector_length = 128 << dmk_idam_sectorlength(&track_data[idam_offset]);
1005   if (flags)
1006      /* TODO: read DAM or DDAM and determine flags */
1007      *flags = 0;
10051008   return FLOPPY_ERROR_SUCCESS;
10061009}
10071010
r5031r5032
10341037
10351038
10361039
1037static floperr_t internal_coco_dmk_write_sector(floppy_image *floppy, int head, int track, int sector, int sector_is_index, const void *buffer, size_t buflen)
1040static floperr_t internal_coco_dmk_write_sector(floppy_image *floppy, int head, int track, int sector, int sector_is_index, const void *buffer, size_t buflen, int ddam)
10381041{
10391042   floperr_t err;
10401043   UINT32 sector_length;
r5031r5032
10631066   return internal_coco_dmk_read_sector(floppy, head, track, sector, FALSE, buffer, buflen);
10641067}
10651068
1066static floperr_t coco_dmk_write_sector(floppy_image *floppy, int head, int track, int sector, const void *buffer, size_t buflen)
1069static floperr_t coco_dmk_write_sector(floppy_image *floppy, int head, int track, int sector, const void *buffer, size_t buflen, int ddam)
10671070{
1068   return internal_coco_dmk_write_sector(floppy, head, track, sector, FALSE, buffer, buflen);
1071   return internal_coco_dmk_write_sector(floppy, head, track, sector, FALSE, buffer, buflen, ddam);
10691072}
10701073
10711074static floperr_t coco_dmk_read_indexed_sector(floppy_image *floppy, int head, int track, int sector, void *buffer, size_t buflen)
r5031r5032
10731076   return internal_coco_dmk_read_sector(floppy, head, track, sector, TRUE, buffer, buflen);
10741077}
10751078
1076static floperr_t coco_dmk_write_indexed_sector(floppy_image *floppy, int head, int track, int sector, const void *buffer, size_t buflen)
1079static floperr_t coco_dmk_write_indexed_sector(floppy_image *floppy, int head, int track, int sector, const void *buffer, size_t buflen, int ddam)
10771080{
1078   return internal_coco_dmk_write_sector(floppy, head, track, sector, TRUE, buffer, buflen);
1081   return internal_coco_dmk_write_sector(floppy, head, track, sector, TRUE, buffer, buflen, ddam);
10791082}
10801083
10811084
src/mess/formats/flopimg.c
r5031r5032
414414*********************************************************************/
415415
416416static floperr_t floppy_readwrite_sector(floppy_image *floppy, int head, int track, int sector, int offset,
417   void *buffer, size_t buffer_len, int writing, int indexed)
417   void *buffer, size_t buffer_len, int writing, int indexed, int ddam)
418418{
419419   floperr_t err;
420420   const struct FloppyCallbacks *fmt;
r5031r5032
424424   UINT32 sector_length;
425425   UINT8 *buffer_ptr = buffer;
426426   floperr_t (*read_sector)(floppy_image *floppy, int head, int track, int sector, void *buffer, size_t buflen);
427   floperr_t (*write_sector)(floppy_image *floppy, int head, int track, int sector, const void *buffer, size_t buflen);
427   floperr_t (*write_sector)(floppy_image *floppy, int head, int track, int sector, const void *buffer, size_t buflen, int ddam);
428428
429429   fmt = floppy_callbacks(floppy);
430430
r5031r5032
462462   {
463463      /* find out the size of this sector */
464464      if (indexed)
465         err = fmt->get_indexed_sector_info(floppy, head, track, sector, NULL, NULL, NULL, &sector_length);
465         err = fmt->get_indexed_sector_info(floppy, head, track, sector, NULL, NULL, NULL, &sector_length, NULL);
466466      else
467467         err = fmt->get_sector_length(floppy, head, track, sector, &sector_length);
468468      if (err)
r5031r5032
495495            {
496496               memcpy(alloc_buf + offset, buffer_ptr, this_buffer_len);
497497
498               err = write_sector(floppy, head, track, sector, alloc_buf, sector_length);
498               err = write_sector(floppy, head, track, sector, alloc_buf, sector_length, ddam);
499499               if (err)
500500                  goto done;
501501            }
r5031r5032
511511            this_buffer_len = sector_length;
512512
513513            if (writing)
514               err = write_sector(floppy, head, track, sector, buffer_ptr, sector_length);
514               err = write_sector(floppy, head, track, sector, buffer_ptr, sector_length, ddam);
515515            else
516516               err = read_sector(floppy, head, track, sector, buffer_ptr, sector_length);
517517            if (err)
r5031r5032
542542
543543floperr_t floppy_read_sector(floppy_image *floppy, int head, int track, int sector, int offset,   void *buffer, size_t buffer_len)
544544{
545   return floppy_readwrite_sector(floppy, head, track, sector, offset, buffer, buffer_len, FALSE, FALSE);
545   return floppy_readwrite_sector(floppy, head, track, sector, offset, buffer, buffer_len, FALSE, FALSE, 0);
546546}
547547
548548
549549
550floperr_t floppy_write_sector(floppy_image *floppy, int head, int track, int sector, int offset, const void *buffer, size_t buffer_len)
550floperr_t floppy_write_sector(floppy_image *floppy, int head, int track, int sector, int offset, const void *buffer, size_t buffer_len, int ddam)
551551{
552   return floppy_readwrite_sector(floppy, head, track, sector, offset, (void *) buffer, buffer_len, TRUE, FALSE);
552   return floppy_readwrite_sector(floppy, head, track, sector, offset, (void *) buffer, buffer_len, TRUE, FALSE, ddam);
553553}
554554
555555
556556
557557floperr_t floppy_read_indexed_sector(floppy_image *floppy, int head, int track, int sector_index, int offset,   void *buffer, size_t buffer_len)
558558{
559   return floppy_readwrite_sector(floppy, head, track, sector_index, offset, buffer, buffer_len, FALSE, TRUE);
559   return floppy_readwrite_sector(floppy, head, track, sector_index, offset, buffer, buffer_len, FALSE, TRUE, 0);
560560}
561561
562562
563563
564floperr_t floppy_write_indexed_sector(floppy_image *floppy, int head, int track, int sector_index, int offset, const void *buffer, size_t buffer_len)
564floperr_t floppy_write_indexed_sector(floppy_image *floppy, int head, int track, int sector_index, int offset, const void *buffer, size_t buffer_len, int ddam)
565565{
566   return floppy_readwrite_sector(floppy, head, track, sector_index, offset, (void *) buffer, buffer_len, TRUE, TRUE);
566   return floppy_readwrite_sector(floppy, head, track, sector_index, offset, (void *) buffer, buffer_len, TRUE, TRUE, ddam);
567567}
568568
569569
r5031r5032
587587
588588   memset(buffer, data, length);
589589
590   err = floppy_write_sector(floppy, head, track, sector, 0, buffer, length);
590   err = floppy_write_sector(floppy, head, track, sector, 0, buffer, length, 0);
591591   if (err)
592592      goto done;
593593
r5031r5032
787787
788788
789789
790floperr_t floppy_get_indexed_sector_info(floppy_image *floppy, int head, int track, int sector_index, int *cylinder, int *side, int *sector, UINT32 *sector_length)
790floperr_t floppy_get_indexed_sector_info(floppy_image *floppy, int head, int track, int sector_index, int *cylinder, int *side, int *sector, UINT32 *sector_length, unsigned long *flags)
791791{
792792   const struct FloppyCallbacks *fmt;
793793
r5031r5032
795795   if (!fmt->get_indexed_sector_info)
796796      return FLOPPY_ERROR_UNSUPPORTED;
797797
798   return fmt->get_indexed_sector_info(floppy, head, track, sector_index, cylinder, side, sector, sector_length);
798   return fmt->get_indexed_sector_info(floppy, head, track, sector_index, cylinder, side, sector, sector_length, flags);
799799}
800800
801801
r5031r5032
807807
808808   do
809809   {
810      err = floppy_get_indexed_sector_info(floppy, head, track, sector_index, NULL, NULL, NULL, NULL);
810      err = floppy_get_indexed_sector_info(floppy, head, track, sector_index, NULL, NULL, NULL, NULL, NULL);
811811      if (!err)
812812         sector_index++;
813813   }
src/mess/formats/flopimg.h
r5031r5032
5050struct FloppyCallbacks
5151{
5252   floperr_t (*read_sector)(floppy_image *floppy, int head, int track, int sector, void *buffer, size_t buflen);
53   floperr_t (*write_sector)(floppy_image *floppy, int head, int track, int sector, const void *buffer, size_t buflen);
53   floperr_t (*write_sector)(floppy_image *floppy, int head, int track, int sector, const void *buffer, size_t buflen, int ddam);
5454   floperr_t (*read_indexed_sector)(floppy_image *floppy, int head, int track, int sector_index, void *buffer, size_t buflen);
55   floperr_t (*write_indexed_sector)(floppy_image *floppy, int head, int track, int sector_index, const void *buffer, size_t buflen);
55   floperr_t (*write_indexed_sector)(floppy_image *floppy, int head, int track, int sector_index, const void *buffer, size_t buflen, int ddam);
5656   floperr_t (*read_track)(floppy_image *floppy, int head, int track, UINT64 offset, void *buffer, size_t buflen);
5757   floperr_t (*write_track)(floppy_image *floppy, int head, int track, UINT64 offset, const void *buffer, size_t buflen);
5858   floperr_t (*format_track)(floppy_image *floppy, int head, int track, option_resolution *params);
r5031r5032
6262   int (*get_sectors_per_track)(floppy_image *floppy, int head, int track);
6363   UINT32 (*get_track_size)(floppy_image *floppy, int head, int track);
6464   floperr_t (*get_sector_length)(floppy_image *floppy, int head, int track, int sector, UINT32 *sector_length);
65   floperr_t (*get_indexed_sector_info)(floppy_image *floppy, int head, int track, int sector_index, int *cylinder, int *side, int *sector, UINT32 *sector_length);
65   floperr_t (*get_indexed_sector_info)(floppy_image *floppy, int head, int track, int sector_index, int *cylinder, int *side, int *sector, UINT32 *sector_length, unsigned long *flags);
6666   floperr_t (*get_track_data_offset)(floppy_image *floppy, int head, int track, UINT64 *offset);
6767};
6868
r5031r5032
140140
141141/* calls for accessing disk image data */
142142floperr_t floppy_read_sector(floppy_image *floppy, int head, int track, int sector, int offset, void *buffer, size_t buffer_len);
143floperr_t floppy_write_sector(floppy_image *floppy, int head, int track, int sector, int offset, const void *buffer, size_t buffer_len);
143floperr_t floppy_write_sector(floppy_image *floppy, int head, int track, int sector, int offset, const void *buffer, size_t buffer_len, int ddam);
144144floperr_t floppy_read_indexed_sector(floppy_image *floppy, int head, int track, int sector_index, int offset, void *buffer, size_t buffer_len);
145floperr_t floppy_write_indexed_sector(floppy_image *floppy, int head, int track, int sector_index, int offset, const void *buffer, size_t buffer_len);
145floperr_t floppy_write_indexed_sector(floppy_image *floppy, int head, int track, int sector_index, int offset, const void *buffer, size_t buffer_len, int ddam);
146146floperr_t floppy_clear_sector(floppy_image *floppy, int head, int track, int sector, UINT8 data);
147147floperr_t floppy_read_track(floppy_image *floppy, int head, int track, void *buffer, size_t buffer_len);
148148floperr_t floppy_write_track(floppy_image *floppy, int head, int track, const void *buffer, size_t buffer_len);
r5031r5032
153153int floppy_get_heads_per_disk(floppy_image *floppy);
154154UINT32 floppy_get_track_size(floppy_image *floppy, int head, int track);
155155floperr_t floppy_get_sector_length(floppy_image *floppy, int head, int track, int sector, UINT32 *sector_length);
156floperr_t floppy_get_indexed_sector_info(floppy_image *floppy, int head, int track, int sector_index, int *cylinder, int *side, int *sector, UINT32 *sector_length);
156floperr_t floppy_get_indexed_sector_info(floppy_image *floppy, int head, int track, int sector_index, int *cylinder, int *side, int *sector, UINT32 *sector_length, unsigned long *flags);
157157floperr_t floppy_get_sector_count(floppy_image *floppy, int head, int track, int *sector_count);
158158floperr_t floppy_load_track(floppy_image *floppy, int head, int track, int dirtify, void **track_data, size_t *track_length);
159159int floppy_is_read_only(floppy_image *floppy);
src/mess/formats/ap_dsk35.c
r5031r5032
463463
464464
465465
466static floperr_t apple35_write_sector(floppy_image *floppy, int head, int track, int sector, const void *buffer, size_t buflen)
466static floperr_t apple35_write_sector(floppy_image *floppy, int head, int track, int sector, const void *buffer, size_t buflen, int ddam)
467467{
468468   UINT32 data_offset;
469469
r5031r5032
499499
500500
501501
502static floperr_t apple35_write_sector_td(floppy_image *floppy, int head, int track, int sector, const void *buffer, size_t buflen)
502static floperr_t apple35_write_sector_td(floppy_image *floppy, int head, int track, int sector, const void *buffer, size_t buflen, int ddam)
503503{
504504   floperr_t err;
505505   UINT32 tag_offset = 0;
r5031r5032
507507   assert(buflen == 524);
508508
509509   /* first write the sector */
510   err = apple35_write_sector(floppy, head, track, sector, ((const UINT8 *) buffer) + 12, 512);
510   err = apple35_write_sector(floppy, head, track, sector, ((const UINT8 *) buffer) + 12, 512, 0);
511511   if (err)
512512      return err;
513513
r5031r5032
734734         sony_denibblize35(sector_data, nibble_data, checksum);
735735
736736         /* write the sector */
737         err = apple35_write_sector_td(floppy, head, track, sector, sector_data, sizeof(sector_data) / sizeof(sector_data[0]));
737         err = apple35_write_sector_td(floppy, head, track, sector, sector_data, sizeof(sector_data) / sizeof(sector_data[0]), 0);
738738         if (err)
739739            return err;
740740
src/mess/formats/ap2_dsk.c
r5031r5032
3434static floperr_t apple2_nib_read_track(floppy_image *floppy, int head, int track, UINT64 offset, void *buffer, size_t buflen);
3535static floperr_t apple2_nib_write_track(floppy_image *floppy, int head, int track, UINT64 offset, const void *buffer, size_t buflen);
3636static floperr_t apple2_nib_read_sector(floppy_image *floppy, int head, int track, int sector, void *buffer, size_t buflen);
37static floperr_t apple2_nib_write_sector(floppy_image *floppy, int head, int track, int sector, const void *buffer, size_t buflen);
37static floperr_t apple2_nib_write_sector(floppy_image *floppy, int head, int track, int sector, const void *buffer, size_t buflen, int ddam);
3838static floperr_t apple2_nib_get_sector_length(floppy_image *floppy, int head, int track, int sector, UINT32 *sector_length);
3939
4040
r5031r5032
229229      nibble += sector * APPLE2_SMALL_NIBBLE_SIZE;
230230
231231      disk_decode_nib(sector_buffer, nibble, NULL, NULL, NULL);
232      floppy_write_sector(floppy, head, track, sector, 0, sector_buffer, sizeof(sector_buffer));
232      floppy_write_sector(floppy, head, track, sector, 0, sector_buffer, sizeof(sector_buffer), 0);
233233   }
234234
235235   return FLOPPY_ERROR_SUCCESS;
r5031r5032
448448
449449
450450
451static floperr_t apple2_nib_write_sector(floppy_image *floppy, int head, int track, int sector, const void *buffer, size_t buflen)
451static floperr_t apple2_nib_write_sector(floppy_image *floppy, int head, int track, int sector, const void *buffer, size_t buflen, int ddam)
452452{
453453   floperr_t err;
454454   UINT8 *track_data;
src/mess/formats/fm7_dsk.c
r5031r5032
163163   return 0;
164164}
165165
166static floperr_t d77_get_indexed_sector_info(floppy_image *floppy, int head, int track, int sector_index, int *cylinder, int *side, int *sector, UINT32 *sector_length)
166static floperr_t d77_get_indexed_sector_info(floppy_image *floppy, int head, int track, int sector_index, int *cylinder, int *side, int *sector, UINT32 *sector_length, unsigned long *flags)
167167{
168168   struct d77_tag* tag = get_d77_tag(floppy);
169169   UINT32 offset;
src/mess/formats/coupedsk.c
r5031r5032
357357
358358static floperr_t coupe_sdf_get_indexed_sector_info(floppy_image *floppy,
359359   int head, int track, int sector_index,
360   int *cylinder, int *side, int *sector, UINT32 *sector_length)
360   int *cylinder, int *side, int *sector, UINT32 *sector_length,
361   unsigned long *flags)
361362{
362363   floperr_t err;
363364   UINT8 buffer[SDF_TRACKSIZE];
r5031r5032
376377   if (side)          *side          = buffer[offset + 3];
377378   if (sector)        *sector        = buffer[offset + 4];
378379   if (sector_length) *sector_length = 128 << buffer[offset + 5];
380   if (flags)         *flags        = 0;   /* TODO: read DAM or DDAM and determine flags */
379381
380382   return FLOPPY_ERROR_SUCCESS;
381383}
r5031r5032
398400
399401
400402static floperr_t coupe_sdf_write_indexed_sector(floppy_image *floppy,
401   int head, int track, int sector, const void *buffer, size_t buflen)
403   int head, int track, int sector, const void *buffer, size_t buflen, int ddam)
402404{
403405   floperr_t err;
404406   UINT64 offset;
src/mess/formats/basicdsk.c
r5031r5032
1313#include "basicdsk.h"
1414
1515static floperr_t basicdsk_read_sector(floppy_image *floppy, int head, int track, int sector, void *buffer, size_t buflen);
16static floperr_t basicdsk_write_sector(floppy_image *floppy, int head, int track, int sector, const void *buffer, size_t buflen);
16static floperr_t basicdsk_write_sector(floppy_image *floppy, int head, int track, int sector, const void *buffer, size_t buflen, int ddam);
1717static floperr_t basicdsk_read_indexed_sector(floppy_image *floppy, int head, int track, int sector, void *buffer, size_t buflen);
18static floperr_t basicdsk_write_indexed_sector(floppy_image *floppy, int head, int track, int sector, const void *buffer, size_t buflen);
18static floperr_t basicdsk_write_indexed_sector(floppy_image *floppy, int head, int track, int sector, const void *buffer, size_t buflen, int ddam);
1919static floperr_t basicdsk_get_sector_length(floppy_image *floppy, int head, int track, int sector, UINT32 *sector_length);
20static floperr_t basicdsk_get_indexed_sector_info(floppy_image *floppy, int head, int track, int sector_index, int *cylinder, int *side, int *sector, UINT32 *sector_length);
20static floperr_t basicdsk_get_indexed_sector_info(floppy_image *floppy, int head, int track, int sector_index, int *cylinder, int *side, int *sector, UINT32 *sector_length, unsigned long *flags);
2121static int basicdsk_get_heads_per_disk(floppy_image *floppy);
2222static int basicdsk_get_tracks_per_disk(floppy_image *floppy);
2323static floperr_t basicdsk_format_track(floppy_image *floppy, int head, int track, option_resolution *params);
r5031r5032
131131
132132
133133
134static floperr_t internal_basicdsk_write_sector(floppy_image *floppy, int head, int track, int sector, int sector_is_index, const void *buffer, size_t buflen)
134static floperr_t internal_basicdsk_write_sector(floppy_image *floppy, int head, int track, int sector, int sector_is_index, const void *buffer, size_t buflen, int ddam)
135135{
136136   UINT64 offset;
137137   floperr_t err;
r5031r5032
151151   return internal_basicdsk_read_sector(floppy, head, track, sector, FALSE, buffer, buflen);
152152}
153153
154static floperr_t basicdsk_write_sector(floppy_image *floppy, int head, int track, int sector, const void *buffer, size_t buflen)
154static floperr_t basicdsk_write_sector(floppy_image *floppy, int head, int track, int sector, const void *buffer, size_t buflen, int ddam)
155155{
156   return internal_basicdsk_write_sector(floppy, head, track, sector, FALSE, buffer, buflen);
156   return internal_basicdsk_write_sector(floppy, head, track, sector, FALSE, buffer, buflen, ddam);
157157}
158158
159159static floperr_t basicdsk_read_indexed_sector(floppy_image *floppy, int head, int track, int sector, void *buffer, size_t buflen)
r5031r5032
161161   return internal_basicdsk_read_sector(floppy, head, track, sector, TRUE, buffer, buflen);
162162}
163163
164static floperr_t basicdsk_write_indexed_sector(floppy_image *floppy, int head, int track, int sector, const void *buffer, size_t buflen)
164static floperr_t basicdsk_write_indexed_sector(floppy_image *floppy, int head, int track, int sector, const void *buffer, size_t buflen, int ddam)
165165{
166   return internal_basicdsk_write_sector(floppy, head, track, sector, TRUE, buffer, buflen);
166   return internal_basicdsk_write_sector(floppy, head, track, sector, TRUE, buffer, buflen, ddam);
167167}
168168
169169
r5031r5032
202202
203203   for (sector = 0; sector < geometry->sectors; sector++)
204204   {
205      err = basicdsk_write_sector(floppy, head, track, sector + geometry->first_sector_id, buffer, sector_length);
205      err = basicdsk_write_sector(floppy, head, track, sector + geometry->first_sector_id, buffer, sector_length, 0);
206206      if (err)
207207         goto done;
208208   }
r5031r5032
244244
245245
246246
247static floperr_t basicdsk_get_indexed_sector_info(floppy_image *floppy, int head, int track, int sector_index, int *cylinder, int *side, int *sector, UINT32 *sector_length)
247static floperr_t basicdsk_get_indexed_sector_info(floppy_image *floppy, int head, int track, int sector_index, int *cylinder, int *side, int *sector, UINT32 *sector_length, unsigned long *flags)
248248{
249249   sector_index += get_geometry(floppy)->first_sector_id;
250250   if (cylinder)
r5031r5032
253253      *side = head;
254254   if (sector)
255255      *sector = sector_index;
256   if (flags)
257      /* TODO: read DAM or DDAM and determine flags */
258      *flags = 0;
256259   return basicdsk_get_sector_length(floppy, head, track, sector_index, sector_length);
257260}
258261
docs/messnew.txt
r5031r5032
3737
3838Source Changes:
3939----------------
40(none)
40- Added support for passing around 'deleted address mark' information
41  to the floppy system. [Roberto Lavarone]
4142
4243
4344

Previous 15994 Revisions Next


© 1998-2018 The MESS Team