summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/formats/ap2_dsk.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/formats/ap2_dsk.h')
-rw-r--r--src/lib/formats/ap2_dsk.h32
1 files changed, 24 insertions, 8 deletions
diff --git a/src/lib/formats/ap2_dsk.h b/src/lib/formats/ap2_dsk.h
index cbeea73f2d3..33117ecbd84 100644
--- a/src/lib/formats/ap2_dsk.h
+++ b/src/lib/formats/ap2_dsk.h
@@ -21,14 +21,30 @@
***************************************************************************/
-#define APPLE2_NIBBLE_SIZE 416
-#define APPLE2_SMALL_NIBBLE_SIZE 374
-#define APPLE2_STD_TRACK_COUNT 35
-#define APPLE2_TRACK_COUNT 40
-#define APPLE2_SECTOR_COUNT 16
-#define APPLE2_SECTOR_SIZE 256
+constexpr int APPLE2_STD_TRACK_COUNT = 35;
+constexpr int APPLE2_TRACK_COUNT = 40;
+constexpr int APPLE2_SECTOR_SIZE = 256;
/**************************************************************************/
+class a2_13sect_format : public floppy_image_format_t
+{
+public:
+ a2_13sect_format();
+
+ virtual int identify(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants) const override;
+ virtual bool load(util::random_read &io, uint32_t form_factor, const std::vector<uint32_t> &variants, floppy_image &image) const override;
+
+ virtual const char *name() const noexcept override;
+ virtual const char *description() const noexcept override;
+ virtual const char *extensions() const noexcept override;
+ virtual bool supports_save() const noexcept override;
+
+private:
+ static uint8_t gb(const std::vector<bool> &buf, int &pos, int &wrap);
+};
+
+extern const a2_13sect_format FLOPPY_A213S_FORMAT;
+
class a2_16sect_format : public floppy_image_format_t
{
public:
@@ -126,8 +142,8 @@ public:
private:
static constexpr size_t nibbles_per_track = 0x1a00;
static constexpr size_t min_sync_bytes = 4;
- static constexpr auto expected_size_35t = 35 * nibbles_per_track;
- static constexpr auto expected_size_40t = 40 * nibbles_per_track;
+ static constexpr auto expected_size_35t = APPLE2_STD_TRACK_COUNT * nibbles_per_track;
+ static constexpr auto expected_size_40t = APPLE2_TRACK_COUNT * nibbles_per_track;
static std::vector<uint32_t> generate_levels_from_nibbles(const std::vector<uint8_t>& nibbles);
};