summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib
diff options
context:
space:
mode:
author Curt Coder <curtcoder@mail.com>2023-03-26 11:30:31 +0300
committer Curt Coder <curtcoder@mail.com>2023-03-26 11:30:36 +0300
commitd280b65088a9ba594fa875a73bf495448255171b (patch)
tree491cb42eb3cdbf199ecf54f5c6fec119f62b9711 /src/lib
parentcfe5f09da96a74dfd694a6a376a38f6c81cb05e4 (diff)
abc80x: Split floppy software lists by disk drive type. [Curt Coder]
abc800_dsk: Split to interleaved and non-interleaved disk formats. [Curt Coder] New working software list items ------------------------------- abc838_flop: Systemskiva ABC800 v1.0 (Sweden), Systemskiva för UFD-DOS v6.3 (Sweden) [Curt Coder]
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/formats/abc800_dsk.cpp29
-rw-r--r--src/lib/formats/abc800_dsk.h1
-rw-r--r--src/lib/formats/abc800i_dsk.cpp108
-rw-r--r--src/lib/formats/abc800i_dsk.h35
-rw-r--r--src/lib/formats/all.cpp7
5 files changed, 153 insertions, 27 deletions
diff --git a/src/lib/formats/abc800_dsk.cpp b/src/lib/formats/abc800_dsk.cpp
index 6498aa7f357..88a9cacf0dc 100644
--- a/src/lib/formats/abc800_dsk.cpp
+++ b/src/lib/formats/abc800_dsk.cpp
@@ -26,7 +26,7 @@ const char *abc800_format::description() const
const char *abc800_format::extensions() const
{
- return "dsk,img";
+ return "img";
}
const abc800_format::format abc800_format::formats[] = {
@@ -51,7 +51,7 @@ const abc800_format::format abc800_format::formats[] = {
{ // 80K 5 1/4 inch single density single sided
floppy_image::FF_525, floppy_image::SSSD, floppy_image::FM,
- 4000, 16, 40, 1, 128, {}, -1, { 1,2,11,12,5,6,15,16,9,10,3,4,13,14,7,8 }, 28, 11, 27
+ 4000, 16, 40, 1, 128, {}, 1, {}, 28, 11, 27
},
// track description
@@ -75,7 +75,7 @@ const abc800_format::format abc800_format::formats[] = {
{ // 160K 5 1/4 inch double density single sided
floppy_image::FF_525, floppy_image::SSDD, floppy_image::MFM,
- 2000, 16, 40, 1, 256, {}, -1, { 1,8,15,6,13,4,11,2,9,16,7,14,5,12,3,10 }, 55, 22, 54
+ 2000, 16, 40, 1, 256, {}, 1, {}, 55, 22, 54
},
// track description
@@ -141,29 +141,6 @@ const abc800_format::format abc800_format::formats[] = {
const abc800_format FLOPPY_ABC800_FORMAT;
-void abc800_format::build_sector_description(const format &f, uint8_t *sectdata, desc_s *sectors, int track, int head) const
-{
- if(f.sector_base_id == -1) {
- for(int i=0; i<f.sector_count; i++) {
- int cur_offset = 0;
- for(int j=0; j<f.sector_count; j++)
- if(f.per_sector_id[j] < f.per_sector_id[i])
- cur_offset += f.sector_base_size ? f.sector_base_size : f.per_sector_size[j];
- sectors[i].data = sectdata + cur_offset;
- sectors[i].size = f.sector_base_size ? f.sector_base_size : f.per_sector_size[i];
- sectors[i].sector_id = i + f.per_sector_id[0];
- }
- } else {
- int cur_offset = 0;
- for(int i=0; i<f.sector_count; i++) {
- sectors[i].data = sectdata + cur_offset;
- sectors[i].size = f.sector_base_size ? f.sector_base_size : f.per_sector_size[i];
- cur_offset += sectors[i].size;
- sectors[i].sector_id = i + f.sector_base_id;
- }
- }
-}
-
int abc800_format::get_image_offset(const format &f, int head, int track) const
{
int offset = 0;
diff --git a/src/lib/formats/abc800_dsk.h b/src/lib/formats/abc800_dsk.h
index dc6f8911fa7..ce2ec83ac2b 100644
--- a/src/lib/formats/abc800_dsk.h
+++ b/src/lib/formats/abc800_dsk.h
@@ -24,7 +24,6 @@ public:
virtual const char *extensions() const override;
protected:
- virtual void build_sector_description(const format &d, uint8_t *sectdata, desc_s *sectors, int track, int head) const override;
virtual int get_image_offset(const format &f, int head, int track) const override;
private:
diff --git a/src/lib/formats/abc800i_dsk.cpp b/src/lib/formats/abc800i_dsk.cpp
new file mode 100644
index 00000000000..fe623c73fcd
--- /dev/null
+++ b/src/lib/formats/abc800i_dsk.cpp
@@ -0,0 +1,108 @@
+// license:BSD-3-Clause
+// copyright-holders:Curt Coder
+/*********************************************************************
+
+ formats/abc800i_dsk.c
+
+ Luxor ABC 830 interleaved disk image formats
+
+*********************************************************************/
+
+#include "formats/abc800i_dsk.h"
+
+abc800i_format::abc800i_format() : wd177x_format(formats)
+{
+}
+
+const char *abc800i_format::name() const
+{
+ return "abc800i";
+}
+
+const char *abc800i_format::description() const
+{
+ return "Luxor ABC 830 interleaved disk image";
+}
+
+const char *abc800i_format::extensions() const
+{
+ return "dsk";
+}
+
+const abc800i_format::format abc800i_format::formats[] = {
+ // track description
+ // 28xff 6x00 fe 2x00 01 00 f7 11xff 6x00 fb 128xe5 f7
+ // 27xff 6x00 fe 2x00 02 00 f7 11xff 6x00 fb 128xe5 f7
+ // 27xff 6x00 fe 2x00 03 00 f7 11xff 6x00 fb 128xe5 f7
+ // 27xff 6x00 fe 2x00 04 00 f7 11xff 6x00 fb 128xe5 f7
+ // 27xff 6x00 fe 2x00 05 00 f7 11xff 6x00 fb 128xe5 f7
+ // 27xff 6x00 fe 2x00 06 00 f7 11xff 6x00 fb 128xe5 f7
+ // 27xff 6x00 fe 2x00 07 00 f7 11xff 6x00 fb 128xe5 f7
+ // 27xff 6x00 fe 2x00 08 00 f7 11xff 6x00 fb 128xe5 f7
+ // 27xff 6x00 fe 2x00 09 00 f7 11xff 6x00 fb 128xe5 f7
+ // 27xff 6x00 fe 2x00 0a 00 f7 11xff 6x00 fb 128xe5 f7
+ // 27xff 6x00 fe 2x00 0b 00 f7 11xff 6x00 fb 128xe5 f7
+ // 27xff 6x00 fe 2x00 0c 00 f7 11xff 6x00 fb 128xe5 f7
+ // 27xff 6x00 fe 2x00 0d 00 f7 11xff 6x00 fb 128xe5 f7
+ // 27xff 6x00 fe 2x00 0e 00 f7 11xff 6x00 fb 128xe5 f7
+ // 27xff 6x00 fe 2x00 0f 00 f7 11xff 6x00 fb 128xe5 f7
+ // 27xff 6x00 fe 2x00 10 00 f7 11xff 6x00 fb 128xe5 f7
+ // 117xff
+
+ { // 80K 5 1/4 inch single density single sided
+ floppy_image::FF_525, floppy_image::SSSD, floppy_image::FM,
+ 4000, 16, 40, 1, 128, {}, -1, { 1,2,11,12,5,6,15,16,9,10,3,4,13,14,7,8 }, 28, 11, 27
+ },
+
+ // track description
+ // 55x4e 12x00 3xf5 fe 2x00 01 01 f7 22x4e 12x00 3xf5 fb 256xe5 f7
+ // 54x4e 12x00 3xf5 fe 2x00 02 01 f7 22x4e 12x00 3xf5 fb 256xe5 f7
+ // 54x4e 12x00 3xf5 fe 2x00 03 01 f7 22x4e 12x00 3xf5 fb 256xe5 f7
+ // 54x4e 12x00 3xf5 fe 2x00 04 01 f7 22x4e 12x00 3xf5 fb 256xe5 f7
+ // 54x4e 12x00 3xf5 fe 2x00 05 01 f7 22x4e 12x00 3xf5 fb 256xe5 f7
+ // 54x4e 12x00 3xf5 fe 2x00 06 01 f7 22x4e 12x00 3xf5 fb 256xe5 f7
+ // 54x4e 12x00 3xf5 fe 2x00 07 01 f7 22x4e 12x00 3xf5 fb 256xe5 f7
+ // 54x4e 12x00 3xf5 fe 2x00 08 01 f7 22x4e 12x00 3xf5 fb 256xe5 f7
+ // 54x4e 12x00 3xf5 fe 2x00 09 01 f7 22x4e 12x00 3xf5 fb 256xe5 f7
+ // 54x4e 12x00 3xf5 fe 2x00 0a 01 f7 22x4e 12x00 3xf5 fb 256xe5 f7
+ // 54x4e 12x00 3xf5 fe 2x00 0b 01 f7 22x4e 12x00 3xf5 fb 256xe5 f7
+ // 54x4e 12x00 3xf5 fe 2x00 0c 01 f7 22x4e 12x00 3xf5 fb 256xe5 f7
+ // 54x4e 12x00 3xf5 fe 2x00 0d 01 f7 22x4e 12x00 3xf5 fb 256xe5 f7
+ // 54x4e 12x00 3xf5 fe 2x00 0e 01 f7 22x4e 12x00 3xf5 fb 256xe5 f7
+ // 54x4e 12x00 3xf5 fe 2x00 0f 01 f7 22x4e 12x00 3xf5 fb 256xe5 f7
+ // 54x4e 12x00 3xf5 fe 2x00 10 01 f7 22x4e 12x00 3xf5 fb 256xe5 f7
+ // 298x4e
+
+ { // 160K 5 1/4 inch double density single sided
+ floppy_image::FF_525, floppy_image::SSDD, floppy_image::MFM,
+ 2000, 16, 40, 1, 256, {}, -1, { 1,8,15,6,13,4,11,2,9,16,7,14,5,12,3,10 }, 55, 22, 54
+ },
+
+ {}
+};
+
+const abc800i_format FLOPPY_ABC800I_FORMAT;
+
+void abc800i_format::build_sector_description(const format &f, uint8_t *sectdata, desc_s *sectors, int track, int head) const
+{
+ printf("fu");
+ if(f.sector_base_id == -1) {
+ for(int i=0; i<f.sector_count; i++) {
+ int cur_offset = 0;
+ for(int j=0; j<f.sector_count; j++)
+ if(f.per_sector_id[j] < f.per_sector_id[i])
+ cur_offset += f.sector_base_size ? f.sector_base_size : f.per_sector_size[j];
+ sectors[i].data = sectdata + cur_offset;
+ sectors[i].size = f.sector_base_size ? f.sector_base_size : f.per_sector_size[i];
+ sectors[i].sector_id = i + f.per_sector_id[0];
+ }
+ } else {
+ int cur_offset = 0;
+ for(int i=0; i<f.sector_count; i++) {
+ sectors[i].data = sectdata + cur_offset;
+ sectors[i].size = f.sector_base_size ? f.sector_base_size : f.per_sector_size[i];
+ cur_offset += sectors[i].size;
+ sectors[i].sector_id = i + f.sector_base_id;
+ }
+ }
+}
diff --git a/src/lib/formats/abc800i_dsk.h b/src/lib/formats/abc800i_dsk.h
new file mode 100644
index 00000000000..577573c11de
--- /dev/null
+++ b/src/lib/formats/abc800i_dsk.h
@@ -0,0 +1,35 @@
+// license:BSD-3-Clause
+// copyright-holders:Curt Coder
+/*********************************************************************
+
+ formats/abc800i_dsk.h
+
+ Luxor ABC 830 interleaved disk image formats
+
+*********************************************************************/
+#ifndef MAME_FORMATS_ABC800I_DSK_H
+#define MAME_FORMATS_ABC800I_DSK_H
+
+#pragma once
+
+#include "wd177x_dsk.h"
+
+class abc800i_format : public wd177x_format
+{
+public:
+ abc800i_format();
+
+ virtual const char *name() const override;
+ virtual const char *description() const override;
+ virtual const char *extensions() const override;
+
+protected:
+ virtual void build_sector_description(const format &d, uint8_t *sectdata, desc_s *sectors, int track, int head) const override;
+
+private:
+ static const format formats[];
+};
+
+extern const abc800i_format FLOPPY_ABC800I_FORMAT;
+
+#endif // MAME_FORMATS_ABC800I_DSK_H
diff --git a/src/lib/formats/all.cpp b/src/lib/formats/all.cpp
index 017c81b3ce9..d56a1ee9e6c 100644
--- a/src/lib/formats/all.cpp
+++ b/src/lib/formats/all.cpp
@@ -36,6 +36,10 @@
#include "abc800_dsk.h"
#endif
+#ifdef HAS_FORMATS_ABC800I_DSK
+#include "abc800i_dsk.h"
+#endif
+
#ifdef HAS_FORMATS_ABCFD2_DSK
#include "abcfd2_dsk.h"
#endif
@@ -820,6 +824,9 @@ void mame_formats_full_list(mame_formats_enumerator &en)
#ifdef HAS_FORMATS_ABC800_DSK
en.add(FLOPPY_ABC800_FORMAT); // abc800_dsk.h
#endif
+#ifdef HAS_FORMATS_ABC800I_DSK
+ en.add(FLOPPY_ABC800I_FORMAT); // abc800i_dsk.h
+#endif
#ifdef HAS_FORMATS_ABCFD2_DSK
en.add(FLOPPY_ABC_FD2_FORMAT); // abcfd2_dsk.h
#endif