Revert "sources reorg"

This reverts commit 70e6f21.
superg · Dec 7, 2023 · b635776 · b635776
1 parent 22f6011
commit b635776
Show file tree

Hide file tree

Showing 14 changed files with 618 additions and 631 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -128,10 +128,7 @@ target_sources(redumper
 	"cd/cdrom.ixx"
 	"cd/ecc.ixx"
 	"cd/edc.ixx"
-	"cd/offset_manager.ixx"
-	"cd/protection.ixx"
 	"cd/scrambler.ixx"
-	"cd/split.ixx"
 	"cd/subcode.ixx"
 	"cd/toc.ixx"
 	"crc/crc.ixx"
@@ -179,11 +176,13 @@ target_sources(redumper
 	"drive.ixx"
 	"hash.ixx"
 	"info.ixx"
+	"offset_manager.ixx"
 	"options.ixx"
 	"redumper.ixx"
 	"rings.ixx"
 	"rom_entry.ixx"
 	"skeleton.ixx"
+	"split.ixx"
 	"version.ixx"
 )
 

diff --git a/cd/cd_dump.ixx b/cd/cd_dump.ixx
@@ -1,6 +1,5 @@
 module;
 #include <algorithm>
-#include <bit>
 #include <cstdint>
 #include <filesystem>
 #include <format>
@@ -32,7 +31,6 @@ import utils.file_io;
 import utils.logger;
 import utils.misc;
 import utils.signal;
-import utils.strings;
 
 
 
@@ -365,7 +363,7 @@ uint32_t state_from_c2(std::vector<State> &state, const uint8_t *c2_data)
 		if(c2_quad)
 		{
 			state[i] = State::ERROR_C2;
-			c2_count += std::popcount(c2_quad);
+			c2_count += bits_count(c2_quad);
 		}
 	}
 

diff --git a/cd/protection.ixx b/cd/protection.ixx
diff --git a/cd/toc.ixx b/cd/toc.ixx
@@ -16,7 +16,6 @@ import crc.crc16_gsm;
 import scsi.mmc;
 import utils.endian;
 import utils.misc;
-import utils.strings;
 
 
 

diff --git a/drive.ixx b/drive.ixx
@@ -22,7 +22,6 @@ import utils.endian;
 import utils.file_io;
 import utils.logger;
 import utils.misc;
-import utils.strings;