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

Merge pull request #38 from ramapcsx2/progress_bar

Browse Source 
speedup and progress bar for MD module
This commit is contained in:
sanni 2019-08-30 09:52:50 +02:00 committed by GitHub
commit 502000a546
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 60 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
Cart_Reader/MD.ino
View File

@ -310,15 +310,15 @@ word readWord_MD(unsigned long myAddress) {
PORTL = (myAddress >> 16) & 0xFF; PORTL = (myAddress >> 16) & 0xFF;
// Arduino running at 16Mhz -> one nop = 62.5ns // Arduino running at 16Mhz -> one nop = 62.5ns
__asm__("nop\n\t"); NOP;
// Setting CS(PH3) LOW // Setting CS(PH3) LOW
PORTH &= ~(1 << 3); PORTH &= ~(1 << 3);
// Setting OE(PH6) LOW // Setting OE(PH6) LOW
PORTH &= ~(1 << 6); PORTH &= ~(1 << 6);
// Long delay here or there will be read errors // most MD ROMs are 200ns, comparable to SNES > use similar access delay of 6 x 62.5 = 375ns
__asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t"); NOP; NOP; NOP; NOP; NOP; NOP;
// Read // Read
word tempWord = ( ( PINA & 0xFF ) << 8 ) | ( PINC & 0xFF ); word tempWord = ( ( PINA & 0xFF ) << 8 ) | ( PINC & 0xFF );
@ -327,7 +327,9 @@ word readWord_MD(unsigned long myAddress) {
PORTH |= (1 << 3); PORTH |= (1 << 3);
// Setting OE(PH6) HIGH // Setting OE(PH6) HIGH
PORTH |= (1 << 6); PORTH |= (1 << 6);
__asm__("nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t""nop\n\t");
// these 6x nop delays have been here before, unknown what they mean
NOP; NOP; NOP; NOP; NOP; NOP;
return tempWord; return tempWord;
} }
@ -585,6 +587,10 @@ void getCartInfo_MD() {
print_Msg(F("Size: ")); print_Msg(F("Size: "));
print_Msg(cartSize * 8 / 1024 / 1024 ); print_Msg(cartSize * 8 / 1024 / 1024 );
println_Msg(F(" MBit")); println_Msg(F(" MBit"));
print_Msg(F("ChkS: "));
print_Msg((chksum >> 8), HEX);
print_Msg((chksum & 0x00ff), HEX);
println_Msg(F(""));
if (saveType == 4) { if (saveType == 4) {
print_Msg(F("Serial EEPROM: ")); print_Msg(F("Serial EEPROM: "));
print_Msg(eepSize * 8 / 1024); print_Msg(eepSize * 8 / 1024);
@ -673,6 +679,11 @@ void readROM_MD() {
print_Error(F("SD Error"), true); print_Error(F("SD Error"), true);
} }
byte buffer[1024] = { 0 };
// get current time
unsigned long startTime = millis();
// Prepare SSF2 Banks // Prepare SSF2 Banks
if (cartSize > 0x400000) { if (cartSize > 0x400000) {
writeSSF2Map(0x50987E, 6); // 0xA130FD writeSSF2Map(0x50987E, 6); // 0xA130FD
@ -680,7 +691,13 @@ void readROM_MD() {
} }
byte offsetSSF2Bank = 0; byte offsetSSF2Bank = 0;
word d = 0; word d = 0;
for (unsigned long currBuffer = 0; currBuffer < cartSize / 2; currBuffer += 256) {
//Initialize progress bar
uint32_t processedProgressBar = 0;
uint32_t totalProgressBar = (uint32_t)(cartSize);
draw_progressbar(0, totalProgressBar);
for (unsigned long currBuffer = 0; currBuffer < cartSize / 2; currBuffer += 512) {
// Blink led // Blink led
if (currBuffer % 16384 == 0) if (currBuffer % 16384 == 0)
PORTB ^= (1 << 4); PORTB ^= (1 << 4);
@ -693,17 +710,40 @@ void readROM_MD() {
writeSSF2Map(0x50987F, 9); // 0xA130FF writeSSF2Map(0x50987F, 9); // 0xA130FF
offsetSSF2Bank = 1; offsetSSF2Bank = 1;
} }
for (int currWord = 0; currWord < 256; currWord++) {
word myWord = readWord_MD(currBuffer + currWord - (offsetSSF2Bank * 0x80000)); d = 0;
// Split word into two bytes
// Left for (int currWord = 0; currWord < 512; currWord++) {
sdBuffer[d] = (( myWord >> 8 ) & 0xFF); unsigned long myAddress = currBuffer + currWord - (offsetSSF2Bank * 0x80000);
// Right PORTF = myAddress & 0xFF;
sdBuffer[d + 1] = (myWord & 0xFF); PORTK = (myAddress >> 8) & 0xFF;
PORTL = (myAddress >> 16) & 0xFF;
// Arduino running at 16Mhz -> one nop = 62.5ns
NOP;
// Setting CS(PH3) LOW
PORTH &= ~(1 << 3);
// Setting OE(PH6) LOW
PORTH &= ~(1 << 6);
// most MD ROMs are 200ns, comparable to SNES > use similar access delay of 6 x 62.5 = 375ns
NOP; NOP; NOP; NOP; NOP; NOP;
// Read
buffer[d] = PINA;
buffer[d + 1] = PINC;
// Setting CS(PH3) HIGH
PORTH |= (1 << 3);
// Setting OE(PH6) HIGH
PORTH |= (1 << 6);
d += 2; d += 2;
} }
myFile.write(sdBuffer, 512); myFile.write(buffer, 1024);
d = 0;
// update progress bar
processedProgressBar += 1024;
draw_progressbar(processedProgressBar, totalProgressBar);
} }
// Close the file: // Close the file:
myFile.close(); myFile.close();
@ -713,6 +753,12 @@ void readROM_MD() {
writeSSF2Map(0x50987E, 6); // 0xA130FD writeSSF2Map(0x50987E, 6); // 0xA130FD
writeSSF2Map(0x50987F, 7); // 0xA130FF writeSSF2Map(0x50987F, 7); // 0xA130FF
} }
// print elapsed time
print_Msg(F("Time elapsed: "));
print_Msg((millis() - startTime));
println_Msg(F("s"));
display_Update();
} }
/****************************************** /******************************************