summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2019-04-26 17:03:57 -0400
committer GitHub <noreply@github.com>2019-04-26 17:03:57 -0400
commit20574881adc978e36a4964ea4b4f62788a1a4aee (patch)
treecb3f3e6bb739adc4179e75e6cbe9911077cebf88
parent0680e6f4549f5c630b1f589514d7fce4419c644f (diff)
parenta4773ca2240909dec3df3e220cbd8a1712af49f6 (diff)
Merge pull request #4931 from JoakimLarsson/flop_ns
flopimg.h: uncluttered global name space as per Vas suggestion
-rw-r--r--src/lib/formats/flopimg.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/formats/flopimg.h b/src/lib/formats/flopimg.h
index aba5189da69..8430ae8150b 100644
--- a/src/lib/formats/flopimg.h
+++ b/src/lib/formats/flopimg.h
@@ -157,9 +157,6 @@ LEGACY_FLOPPY_OPTIONS_EXTERN(default);
#define INTERLEAVE(range) "I" #range
#define FIRST_SECTOR_ID(range) "F" #range
-/* Max number of excess tracks to be discarded from disk image to fit floppy drive */
-#define DUMP_THRESHOLD 2
-
/***************************************************************************
Prototypes
@@ -591,6 +588,9 @@ protected:
uint8_t sbyte_mfm_r(const uint8_t *bitstream, int &pos, int track_size);
uint8_t sbyte_gcr5_r(const uint8_t *bitstream, int &pos, int track_size);
+ //! Max number of excess tracks to be discarded from disk image to fit floppy drive
+ enum { DUMP_THRESHOLD = 2 };
+
private:
enum { CRC_NONE, CRC_AMIGA, CRC_CBM, CRC_CCITT, CRC_CCITT_FM, CRC_MACHEAD, CRC_FCS, CRC_VICTOR_HDR, CRC_VICTOR_DATA };
enum { MAX_CRC_COUNT = 64 };