ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GBA e-Reader: Bitmap scanning

This commit is contained in:
Vicki Pfau 2020-02-23 17:59:03 -08:00
parent 7091494583
commit b3f5e6b9ee
3 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/gba/ereader.c
View File

@ -323,13 +323,16 @@ void GBAHardwareEReaderScan(struct GBACartridgeHardware* hw, const void* data, s
if (!hw->eReaderDots) { if (!hw->eReaderDots) {
hw->eReaderDots = anonymousMemoryMap(EREADER_DOTCODE_SIZE); hw->eReaderDots = anonymousMemoryMap(EREADER_DOTCODE_SIZE);
} }
hw->eReaderX = -24;
memset(hw->eReaderDots, 0, EREADER_DOTCODE_SIZE); memset(hw->eReaderDots, 0, EREADER_DOTCODE_SIZE);
uint8_t blockRS[44][0x10]; uint8_t blockRS[44][0x10];
bool parsed = false; bool parsed = false;
bool bitmap = false;
size_t blocks; size_t blocks;
int base; int base;
switch (size) { switch (size) {
// Raw sizes
case 2112: case 2112:
parsed = true; parsed = true;
// Fallthrough // Fallthrough
@ -344,11 +347,38 @@ void GBAHardwareEReaderScan(struct GBACartridgeHardware* hw, const void* data, s
base = 1; base = 1;
blocks = 18; blocks = 18;
break; break;
// Bitmap sizes
case 5456:
bitmap = true;
break;
default: default:
return; return;
} }
size_t i; size_t i;
if (bitmap) {
size_t x;
for (i = 0; i < 40; ++i) {
const uint8_t* line = &((const uint8_t*) data)[(i + 2) * 124];
uint8_t* origin = &hw->eReaderDots[EREADER_DOTCODE_STRIDE * i + 200];
for (x = 0; x < 124; ++x) {
uint8_t byte = line[x];
if (x == 123) {
byte &= 0xE0;
}
origin[x * 8 + 0] = (byte >> 7) & 1;
origin[x * 8 + 1] = (byte >> 6) & 1;
origin[x * 8 + 2] = (byte >> 5) & 1;
origin[x * 8 + 3] = (byte >> 4) & 1;
origin[x * 8 + 4] = (byte >> 3) & 1;
origin[x * 8 + 5] = (byte >> 2) & 1;
origin[x * 8 + 6] = (byte >> 1) & 1;
origin[x * 8 + 7] = byte & 1;
}
}
return;
}
for (i = 0; i < blocks + 1; ++i) { for (i = 0; i < blocks + 1; ++i) {
uint8_t* origin = &hw->eReaderDots[35 * i + 200]; uint8_t* origin = &hw->eReaderDots[35 * i + 200];
_eReaderAnchor(&origin[EREADER_DOTCODE_STRIDE * 0]); _eReaderAnchor(&origin[EREADER_DOTCODE_STRIDE * 0]);
@ -427,7 +457,6 @@ void GBAHardwareEReaderScan(struct GBACartridgeHardware* hw, const void* data, s
b += 26; b += 26;
} }
} }
hw->eReaderX = -24;
} }
void _eReaderReset(struct GBACartridgeHardware* hw) { void _eReaderReset(struct GBACartridgeHardware* hw) {

12
src/platform/qt/CoreController.cpp
View File

@ -682,9 +682,15 @@ void CoreController::setFakeEpoch(const QDateTime& time) {
void CoreController::scanCard(const QString& path) { void CoreController::scanCard(const QString& path) {
#ifdef M_CORE_GBA #ifdef M_CORE_GBA
QFile file(path); QImage image(path);
file.open(QIODevice::ReadOnly); if (image.isNull()) {
m_eReaderData = file.read(2912); QFile file(path);
file.open(QIODevice::ReadOnly);
m_eReaderData = file.read(2912);
} else if (image.size() == QSize(989, 44)) {
const uchar* bits = image.constBits();
m_eReaderData.setRawData(reinterpret_cast<const char*>(bits), image.sizeInBytes());
}
mCoreThreadRunFunction(&m_threadContext, [](mCoreThread* thread) { mCoreThreadRunFunction(&m_threadContext, [](mCoreThread* thread) {
CoreController* controller = static_cast<CoreController*>(thread->userData); CoreController* controller = static_cast<CoreController*>(thread->userData);

2
src/platform/qt/Window.cpp
View File

@ -424,7 +424,7 @@ void Window::selectPatch() {
} }
void Window::scanCard() { void Window::scanCard() {
QStringList filenames = GBAApp::app()->getOpenFileNames(this, tr("Select e-Reader dotcode"), tr("e-Reader card (*.raw *.bin)")); QStringList filenames = GBAApp::app()->getOpenFileNames(this, tr("Select e-Reader dotcode"), tr("e-Reader card (*.raw *.bin *.bmp)"));
for (QString& filename : filenames) { for (QString& filename : filenames) {
m_controller->scanCard(filename); m_controller->scanCard(filename);
} }