summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2011-11-01 11:36:43 +0000
committer Olivier Galibert <galibert@pobox.com>2011-11-01 11:36:43 +0000
commit55e17a2bb907cbf19218eda40d0239633f99f7b9 (patch)
tree107eccd9ac5e989742a8a67a67325fcd8f3c22f7 /src/lib
parentc965e4ad2794d433f709e90346c81904d3106b29 (diff)
ipf: Describe the remaining fields [O. Galibert, SPS]
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/formats/ipf_dsk.c18
-rw-r--r--src/lib/formats/ipf_dsk.h174
2 files changed, 96 insertions, 96 deletions
diff --git a/src/lib/formats/ipf_dsk.c b/src/lib/formats/ipf_dsk.c
index 150c34f205d..db17bcc550e 100644
--- a/src/lib/formats/ipf_dsk.c
+++ b/src/lib/formats/ipf_dsk.c
@@ -94,11 +94,11 @@ bool ipf_format::parse_info(const UINT8 *info)
type = r32(info+12);
if(type != 1)
return false;
- f4 = r32(info+16); // Usually 2
- f8 = r32(info+20); // Usually 1
+ encoder_type = r32(info+16); // 1 for CAPS, 2 for SPS
+ encoder_revision = r32(info+20); // 1 always
release = r32(info+24);
revision = r32(info+28);
- f14 = r32(info+32); // Perhaps some kind of (unchecked) checksum
+ origin = r32(info+32); // Original source reference
min_cylinder = r32(info+36);
max_cylinder = r32(info+40);
min_head = r32(info+44);
@@ -144,7 +144,7 @@ bool ipf_format::parse_imge(const UINT8 *imge)
return false;
t->type = r32(imge+20);
- t->t12 = r32(imge+24); // Usually 1
+ t->sigtype = r32(imge+24); // 1 for 2us cells, no other value valid
t->size_bytes = r32(imge+28);
t->index_bytes = r32(imge+32);
t->index_cells = r32(imge+36);
@@ -152,11 +152,11 @@ bool ipf_format::parse_imge(const UINT8 *imge)
t->gapsize_cells = r32(imge+44);
t->size_cells = r32(imge+48);
t->block_count = r32(imge+52);
- t->t44 = r32(imge+56); // Usually 0
+ t->process = r32(imge+56); // encoder process, always 0
t->weak_bits = r32(imge+60);
- t->t56 = r32(imge+68);
- t->t60 = r32(imge+72);
- t->t64 = r32(imge+76);
+ t->reserved[0] = r32(imge+68);
+ t->reserved[1] = r32(imge+72);
+ t->reserved[2] = r32(imge+76);
return true;
}
@@ -167,7 +167,7 @@ bool ipf_format::parse_data(const UINT8 *data, UINT32 &pos, UINT32 max_extra_siz
if(!t)
return false;
- t->d4 = r32(data+16); // Somehow related to the number of data cells
+ t->data_size_bits = r32(data+16);
t->data = data+28;
t->data_size = r32(data+12);
if(t->data_size > max_extra_size)
diff --git a/src/lib/formats/ipf_dsk.h b/src/lib/formats/ipf_dsk.h
index b453c7c3115..83159bbf2f3 100644
--- a/src/lib/formats/ipf_dsk.h
+++ b/src/lib/formats/ipf_dsk.h
@@ -1,87 +1,87 @@
-#ifndef IPF_DSK_H_
-#define IPF_DSK_H_
-
-#include "flopimg.h"
-
-class ipf_format : public floppy_image_format_t
-{
-public:
- ipf_format();
-
- virtual int identify(io_generic *io);
- virtual bool load(io_generic *io, floppy_image *image);
-
- virtual const char *name() const;
- virtual const char *description() const;
- virtual const char *extensions() const;
- virtual bool supports_save() const;
-
-private:
- struct track_info {
- UINT32 cylinder, head, type;
- UINT32 t12, t44, t56, t60, t64;
- UINT32 size_bytes, size_cells;
- UINT32 index_bytes, index_cells;
- UINT32 datasize_cells, gapsize_cells;
- UINT32 block_count, weak_bits;
-
- UINT32 d4;
-
- bool info_set;
-
- const UINT8 *data;
- UINT32 data_size;
- };
-
- track_info *tinfos;
- UINT32 tcount;
-
- UINT32 type, release, revision;
- UINT32 f4, f8, f14;
- UINT32 min_cylinder, max_cylinder, min_head, max_head;
- UINT32 credit_day, credit_time;
- UINT32 platform[4], extra[5];
-
- UINT32 crc32r(const UINT8 *data, UINT32 size);
-
- bool parse_info(const UINT8 *info);
- bool parse_imge(const UINT8 *imge);
- bool parse_data(const UINT8 *data, UINT32 &pos, UINT32 max_extra_size);
-
- bool scan_one_tag(UINT8 *data, UINT32 size, UINT32 &pos, UINT8 *&tag, UINT32 &tsize);
- bool scan_all_tags(UINT8 *data, UINT32 size);
- static UINT32 r32(const UINT8 *p);
- static UINT32 rb(const UINT8 *&p, int count);
-
- track_info *get_index(UINT32 idx);
-
- void track_write_raw(UINT32 *&track, const UINT8 *data, UINT32 cells, bool &context);
- void track_write_mfm(UINT32 *&track, const UINT8 *data, UINT32 start_offset, UINT32 patlen, UINT32 cells, bool &context);
- void track_write_weak(UINT32 *&track, UINT32 cells);
- bool generate_block_data(const UINT8 *data, const UINT8 *dlimit, UINT32 *track, UINT32 *tlimit, bool &context);
-
- bool gap_description_to_reserved_size(const UINT8 *&data, const UINT8 *dlimit, UINT32 &res_size);
- bool generate_gap_from_description(const UINT8 *&data, const UINT8 *dlimit, UINT32 *track, UINT32 size, bool pre, bool &context);
- bool generate_block_gap_0(UINT32 gap_cells, UINT8 pattern, UINT32 &spos, UINT32 ipos, UINT32 *track, bool &context);
- bool generate_block_gap_1(UINT32 gap_cells, UINT32 &spos, const UINT8 *data, const UINT8 *dlimit, UINT32 *track, bool &context);
- bool generate_block_gap_2(UINT32 gap_cells, UINT32 &spos, const UINT8 *data, const UINT8 *dlimit, UINT32 *track, bool &context);
- bool generate_block_gap_3(UINT32 gap_cells, UINT32 &spos, UINT32 ipos, const UINT8 *data, const UINT8 *dlimit, UINT32 *track, bool &context);
- bool generate_block_gap(UINT32 gap_type, UINT32 gap_cells, UINT8 pattern, UINT32 &spos, UINT32 ipos, const UINT8 *data, const UINT8 *dlimit, UINT32 *track, bool &context);
-
- bool generate_block(track_info *t, UINT32 idx, UINT32 ipos, UINT32 *track, UINT32 &pos, UINT32 &dpos, UINT32 &gpos, UINT32 &spos, bool &context);
- UINT32 block_compute_real_size(track_info *t);
-
- void timing_set(UINT32 *track, UINT32 start, UINT32 end, UINT32 time);
- bool generate_timings(track_info *t, UINT32 *track, const UINT32 *data_pos, const UINT32 *gap_pos);
-
- void rotate(UINT32 *track, UINT32 offset, UINT32 size);
- void mark_track_splice(UINT32 *t);
- bool generate_track(track_info *t, floppy_image *image);
- bool generate_tracks(floppy_image *image);
-
- bool parse(UINT8 *data, UINT32 size, floppy_image *image);
-};
-
-extern const floppy_format_type FLOPPY_IPF_FORMAT;
-
-#endif /*IPF_DSK_H_*/
+#ifndef IPF_DSK_H_
+#define IPF_DSK_H_
+
+#include "flopimg.h"
+
+class ipf_format : public floppy_image_format_t
+{
+public:
+ ipf_format();
+
+ virtual int identify(io_generic *io);
+ virtual bool load(io_generic *io, floppy_image *image);
+
+ virtual const char *name() const;
+ virtual const char *description() const;
+ virtual const char *extensions() const;
+ virtual bool supports_save() const;
+
+private:
+ struct track_info {
+ UINT32 cylinder, head, type;
+ UINT32 sigtype, process, reserved[3];
+ UINT32 size_bytes, size_cells;
+ UINT32 index_bytes, index_cells;
+ UINT32 datasize_cells, gapsize_cells;
+ UINT32 block_count, weak_bits;
+
+ UINT32 data_size_bits;
+
+ bool info_set;
+
+ const UINT8 *data;
+ UINT32 data_size;
+ };
+
+ track_info *tinfos;
+ UINT32 tcount;
+
+ UINT32 type, release, revision;
+ UINT32 encoder_type, encoder_revision, origin;
+ UINT32 min_cylinder, max_cylinder, min_head, max_head;
+ UINT32 credit_day, credit_time;
+ UINT32 platform[4], extra[5];
+
+ UINT32 crc32r(const UINT8 *data, UINT32 size);
+
+ bool parse_info(const UINT8 *info);
+ bool parse_imge(const UINT8 *imge);
+ bool parse_data(const UINT8 *data, UINT32 &pos, UINT32 max_extra_size);
+
+ bool scan_one_tag(UINT8 *data, UINT32 size, UINT32 &pos, UINT8 *&tag, UINT32 &tsize);
+ bool scan_all_tags(UINT8 *data, UINT32 size);
+ static UINT32 r32(const UINT8 *p);
+ static UINT32 rb(const UINT8 *&p, int count);
+
+ track_info *get_index(UINT32 idx);
+
+ void track_write_raw(UINT32 *&track, const UINT8 *data, UINT32 cells, bool &context);
+ void track_write_mfm(UINT32 *&track, const UINT8 *data, UINT32 start_offset, UINT32 patlen, UINT32 cells, bool &context);
+ void track_write_weak(UINT32 *&track, UINT32 cells);
+ bool generate_block_data(const UINT8 *data, const UINT8 *dlimit, UINT32 *track, UINT32 *tlimit, bool &context);
+
+ bool gap_description_to_reserved_size(const UINT8 *&data, const UINT8 *dlimit, UINT32 &res_size);
+ bool generate_gap_from_description(const UINT8 *&data, const UINT8 *dlimit, UINT32 *track, UINT32 size, bool pre, bool &context);
+ bool generate_block_gap_0(UINT32 gap_cells, UINT8 pattern, UINT32 &spos, UINT32 ipos, UINT32 *track, bool &context);
+ bool generate_block_gap_1(UINT32 gap_cells, UINT32 &spos, const UINT8 *data, const UINT8 *dlimit, UINT32 *track, bool &context);
+ bool generate_block_gap_2(UINT32 gap_cells, UINT32 &spos, const UINT8 *data, const UINT8 *dlimit, UINT32 *track, bool &context);
+ bool generate_block_gap_3(UINT32 gap_cells, UINT32 &spos, UINT32 ipos, const UINT8 *data, const UINT8 *dlimit, UINT32 *track, bool &context);
+ bool generate_block_gap(UINT32 gap_type, UINT32 gap_cells, UINT8 pattern, UINT32 &spos, UINT32 ipos, const UINT8 *data, const UINT8 *dlimit, UINT32 *track, bool &context);
+
+ bool generate_block(track_info *t, UINT32 idx, UINT32 ipos, UINT32 *track, UINT32 &pos, UINT32 &dpos, UINT32 &gpos, UINT32 &spos, bool &context);
+ UINT32 block_compute_real_size(track_info *t);
+
+ void timing_set(UINT32 *track, UINT32 start, UINT32 end, UINT32 time);
+ bool generate_timings(track_info *t, UINT32 *track, const UINT32 *data_pos, const UINT32 *gap_pos);
+
+ void rotate(UINT32 *track, UINT32 offset, UINT32 size);
+ void mark_track_splice(UINT32 *t);
+ bool generate_track(track_info *t, floppy_image *image);
+ bool generate_tracks(floppy_image *image);
+
+ bool parse(UINT8 *data, UINT32 size, floppy_image *image);
+};
+
+extern const floppy_format_type FLOPPY_IPF_FORMAT;
+
+#endif /*IPF_DSK_H_*/