From edb088526f9eeca2dd0470130aa9a7eaa41fb0ca Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Fri, 11 Aug 2017 14:33:34 -0400
Subject: [PATCH] Simplified slightly, and updated TODO as to still-missing
 functionality.

---
 Storage/Disk/Formats/CPCDSK.cpp | 38 ++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/Storage/Disk/Formats/CPCDSK.cpp b/Storage/Disk/Formats/CPCDSK.cpp
index 973344ff4..bf3082384 100644
--- a/Storage/Disk/Formats/CPCDSK.cpp
+++ b/Storage/Disk/Formats/CPCDSK.cpp
@@ -123,33 +123,33 @@ std::shared_ptr<Track> CPCDSK::get_uncached_track_at_position(unsigned int head,
 		new_sector.data.resize(data_size);
 		fread(new_sector.data.data(), sizeof(uint8_t), data_size, file_);
 
-		// TODO: obey the status bytes, somehow (?)
-		if(sector_info.status1 || sector_info.status2) {
-			if(sector_info.status1 & 0x08) {
-				// The CRC failed in the ID field.
-				new_sector.has_header_crc_error = true;
-			}
+		if(sector_info.status1 & 0x08) {
+			// The CRC failed in the ID field.
+			new_sector.has_header_crc_error = true;
+		}
 
-			if(sector_info.status2 & 0x20) {
-				// The CRC failed in the data field.
-				new_sector.has_data_crc_error = true;
-			}
+		if(sector_info.status2 & 0x20) {
+			// The CRC failed in the data field.
+			new_sector.has_data_crc_error = true;
+		}
 
-			if(sector_info.status2 & 0x40) {
-				// This sector is marked as deleted.
-				new_sector.is_deleted = true;
-			}
+		if(sector_info.status2 & 0x40) {
+			// This sector is marked as deleted.
+			new_sector.is_deleted = true;
+		}
 
-			if(sector_info.status2 & 0x01) {
-				// Data field wasn't found.
-				new_sector.data.clear();
-			}
+		if(sector_info.status2 & 0x01) {
+			// Data field wasn't found.
+			new_sector.data.clear();
 		}
 
 		sectors.push_back(std::move(new_sector));
 	}
 
-	// TODO: supply gay 3 length and filler byte
+	// TODO: extensions to the extended format; John Elliot's addition of single-density support,
+	// and Simon Owen's weak/random sectors, subject to adding some logic to pick a potential
+	// FM/MFM encoding that can produce specified weak values.
+
 	if(sectors.size()) return Storage::Encodings::MFM::GetMFMTrackWithSectors(sectors, gap3_length, filler_byte);
 
 	return nullptr;