Mirrors/cartreader
2
0
Fork 0
mirror of https://github.com/sanni/cartreader.git synced 2024-11-15 01:15:06 +01:00
Code Issues Projects Releases Wiki Activity

Further optimize detection, combine loops

Browse Source
This commit is contained in:
Roger Braunstein 2024-07-07 16:12:02 -07:00
parent a751f4f9a6
commit bfe1390832
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Cart_Reader/LYNX.ino
View File

@ -117,7 +117,13 @@ static uint8_t readByte_LYNX(uint32_t addr, uint8_t audin = 0) {
#pragma region HIGHLEVEL #pragma region HIGHLEVEL
static bool detectBlockSize_LYNX() { static bool detectBlockSize_LYNX() {}
static bool detectCart_LYNX() {
// Could omit logging to save a few bytes
display_Clear();
println_Msg(F("Identifying..."));
lynxUseAudin = false; lynxUseAudin = false;
lynxBlockSize = 0; lynxBlockSize = 0;
@ -126,23 +132,17 @@ static bool detectBlockSize_LYNX() {
const size_t DETECT_BYTES = 128; const size_t DETECT_BYTES = 128;
for (int i = 0; i < DETECT_BYTES; i++) { for (int i = 0; i < DETECT_BYTES; i++) {
// If any differences are detected when AUDIN=1, uint8_t b = readByte_LYNX(i);
// AUDIN is used to bankswitch // If any differences are detected when AUDIN=1, AUDIN is used to bankswitch
// meaning we also use the maximum block size // meaning we also use the maximum block size
// (1024kb cart / 256 blocks = 4kb block bank switched between two // (1024kb cart / 256 blocks = 4kb block bank switched between lower/upper 2kb blocks)
// lower/upper 2kb blocks) if (b != readByte_LYNX(i, 1)) {
if (readByte_LYNX(i, 0) != readByte_LYNX(i, 1)) {
lynxUseAudin = true; lynxUseAudin = true;
lynxBlockSize = 2048; lynxBlockSize = 2048;
return true; break;
} }
} // Identify mirroring of largest stride
// Valid cart sizes of 128kb, 256kb, 512kb / 256 blocks = block sizes of 512b, 1024b, 2048b
// Use the already-dumped 2KB to detect mirroring in a small sample
// Valid cart sizes of 128kb, 256kb, 512kb / 256 blocks
// = block sizes of 512b, 1024b, 2048b
for (int i = 0; i < DETECT_BYTES; i++) {
uint8_t b = readByte_LYNX(i);
if (b != readByte_LYNX(i + 1024)) { if (b != readByte_LYNX(i + 1024)) {
lynxBlockSize = max(lynxBlockSize, 2048); lynxBlockSize = max(lynxBlockSize, 2048);
} else if (b != readByte_LYNX(i + 512)) { } else if (b != readByte_LYNX(i + 512)) {
@ -152,14 +152,7 @@ static bool detectBlockSize_LYNX() {
} }
} }
return (lynxBlockSize > 0); if (lynxBlockSize == 0) {
}
static bool detectCart_LYNX() {
// Could omit logging to save a few bytes
display_Clear();
println_Msg(F("Identifying..."));
if (!detectBlockSize_LYNX()) {
print_STR(error_STR, false); print_STR(error_STR, false);
display_Update(); display_Update();
wait(); wait();