summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/formats
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2022-09-25 00:56:34 +1000
committer Vas Crabb <vas@vastheman.com>2022-09-25 00:56:34 +1000
commitb2679ec43c7b358b29f2c5a3b6d3ccb93abbc8f3 (patch)
treed304ecf98d985c9f53d4a0cf356e6b260e50ff17 /src/lib/formats
parentbec3213167334e5dac5e03de66b83dc73ad96c04 (diff)
srcclean pass in preparation for release branch
Diffstat (limited to 'src/lib/formats')
-rw-r--r--src/lib/formats/ap2_dsk.cpp6
-rw-r--r--src/lib/formats/fsmgr.h4
-rw-r--r--src/lib/formats/victor9k_dsk.cpp34
3 files changed, 22 insertions, 22 deletions
diff --git a/src/lib/formats/ap2_dsk.cpp b/src/lib/formats/ap2_dsk.cpp
index 31f2554aea9..bb29cd1702b 100644
--- a/src/lib/formats/ap2_dsk.cpp
+++ b/src/lib/formats/ap2_dsk.cpp
@@ -2054,11 +2054,11 @@ bool moof_format::load(util::random_read &io, uint32_t form_factor, const std::v
uint32_t trks_off = off_trks + (fidx * 8);
uint32_t boff = (uint32_t)r16(img, trks_off + 0) * 512;
uint32_t track_size = r32(img, trks_off + 4);
-
+
uint32_t total_ticks = 0;
for(uint32_t i=0; i != track_size; i++)
total_ticks += img[boff+i];
-
+
// Assume there is always a pulse at index, and it's
// the last one in the stream
std::vector<uint32_t> &buf = image->get_buffer(track, head);
@@ -2075,7 +2075,7 @@ bool moof_format::load(util::random_read &io, uint32_t form_factor, const std::v
uint32_t trks_off = off_trks + (idx * 8);
uint32_t boff = (uint32_t)r16(img, trks_off + 0) * 512;
-
+
uint32_t track_size = r32(img, trks_off + 4);
if (track_size == 0)
diff --git a/src/lib/formats/fsmgr.h b/src/lib/formats/fsmgr.h
index 6e3220ad753..fa4acfaafe8 100644
--- a/src/lib/formats/fsmgr.h
+++ b/src/lib/formats/fsmgr.h
@@ -301,8 +301,8 @@ public:
virtual void add_format(const floppy_image_format_t &type, u32 image_size, const char *name, const char *description) = 0;
private:
- u32 m_form_factor;
- const std::vector<u32> & m_variants;
+ u32 m_form_factor;
+ const std::vector<u32> & m_variants;
};
struct hd_enumerator {
diff --git a/src/lib/formats/victor9k_dsk.cpp b/src/lib/formats/victor9k_dsk.cpp
index df2b503aa02..eb2a0135d20 100644
--- a/src/lib/formats/victor9k_dsk.cpp
+++ b/src/lib/formats/victor9k_dsk.cpp
@@ -36,10 +36,10 @@
7 71-79 63-74 12 149.6 401
8 unused 75-79 11 144.0 417
- * The documentation for the Victor lists Zone 4 as ending with Track 48
- on side 1 and track 40 on side two. This is incorrect. The above table
- reflects disks analyzed from various machines and matches the assembly
- code in the floppy driver. Various written documents contain this
+ * The documentation for the Victor lists Zone 4 as ending with Track 48
+ on side 1 and track 40 on side two. This is incorrect. The above table
+ reflects disks analyzed from various machines and matches the assembly
+ code in the floppy driver. Various written documents contain this
documentation bug.
Interleave factor 3
@@ -152,16 +152,16 @@ int victor9k_format::find_size(util::random_read &io, uint32_t form_factor)
{
return find_size(io);
}
-
-int victor9k_format::identify(floppy_image *image)
+
+int victor9k_format::identify(floppy_image *image)
{
for(int i=0; formats[i].form_factor; i++) {
const format &f = formats[i];
if(f.variant == image->get_variant())
return i;
}
-
- return -1;
+
+ return -1;
}
@@ -210,7 +210,7 @@ void victor9k_format::log_boot_sector(uint8_t *data)
//Disk type - flags
osd_printf_verbose("%s sided\n", (data[32]) ? "Double" : "Single");
- //Sector Interleave
+ //Sector Interleave
osd_printf_verbose("Sector Interleave: %02x\n", data[33]);
// Disc type
@@ -296,7 +296,7 @@ bool victor9k_format::load(util::random_read &io, uint32_t form_factor, const st
const format &f = formats[type];
- osd_printf_verbose("Type: %d Head Count: %d Sector Count: %d\n", type,
+ osd_printf_verbose("Type: %d Head Count: %d Sector Count: %d\n", type,
f.head_count, f.sector_count);
uint64_t size;
@@ -314,7 +314,7 @@ bool victor9k_format::load(util::random_read &io, uint32_t form_factor, const st
int track_offset = 0;
- osd_printf_verbose("load Heads: %01d Tracks: %02d Sectors/track head[1]track[1]: %02d\n ",
+ osd_printf_verbose("load Heads: %01d Tracks: %02d Sectors/track head[1]track[1]: %02d\n ",
f.head_count, f.track_count, sectors_per_track[1][1]);
for (int head = 0; head < f.head_count; head++) {
@@ -432,7 +432,7 @@ const int victor9k_format::speed_zone[2][80] =
1, 1, 1, 1, 1, 1, 1, 1,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
@@ -457,7 +457,7 @@ bool victor9k_format::save(util::random_read_write &io, const std::vector<uint32
const format &f = formats[type];
- osd_printf_verbose("save Heads: %01d Tracks: %02d Sectors/track head[1]track[1]: %02d\n ",
+ osd_printf_verbose("save Heads: %01d Tracks: %02d Sectors/track head[1]track[1]: %02d\n ",
f.head_count, f.track_count, sectors_per_track[1][1]);
for(int head=0; head < f.head_count; head++) {
for(int track=0; track < f.track_count; track++) {
@@ -466,7 +466,7 @@ bool victor9k_format::save(util::random_read_write &io, const std::vector<uint32
uint8_t sectdata[40*512];
desc_s sectors[40];
int offset = get_image_offset(f, head, track);
- osd_printf_verbose(">>type: %s, head: %d, track: %d, sector_count: %d, offset: %d, track_size: %d\n",
+ osd_printf_verbose(">>type: %s, head: %d, track: %d, sector_count: %d, offset: %d, track_size: %d\n",
f.sector_base_size, head, track, sector_count, offset, track_size);
build_sector_description(f, sectdata, 0, sectors, sector_count);
@@ -481,7 +481,7 @@ bool victor9k_format::save(util::random_read_write &io, const std::vector<uint32
void victor9k_format::extract_sectors(floppy_image *image, const format &f, desc_s *sdesc, int track, int head, int sector_count)
{
-
+
// Extract the sectors
auto bitstream = generate_bitstream_from_track(track, head, cell_size[speed_zone[head][track]], image);
auto sectors = extract_sectors_from_bitstream_victor_gcr5(bitstream);
@@ -492,11 +492,11 @@ void victor9k_format::extract_sectors(floppy_image *image, const format &f, desc
sectors.push_back(sector);
}
}
-
+
for(int i=0; i<sector_count; i++) {
desc_s &ds = sdesc[i];
const auto &data = sectors[ds.sector_id];
- osd_printf_verbose("Head: %01d TracK: %02d Total Sectors: %02d Current Sector: %02d ",
+ osd_printf_verbose("Head: %01d TracK: %02d Total Sectors: %02d Current Sector: %02d ",
head, track, sector_count, i);
if(data.empty()) {
memset((uint8_t *)ds.data, 0, ds.size);