aboutsummaryrefslogtreecommitdiff
path: root/src/SPI.cpp
diff options
context:
space:
mode:
authorArisotura <thetotalworm@gmail.com>2020-07-27 16:01:55 +0200
committerGitHub <noreply@github.com>2020-07-27 16:01:55 +0200
commitdff14ca80ada883870131c7ff17d85866254ccc0 (patch)
treec15926879ed78d68d313c75e4cb7d764cb4c1fea /src/SPI.cpp
parent17ce4d2a73770ecd8c5f0ff036636b5453cb86c9 (diff)
parent6a682a8ef0d1cc3aa35eaa70c4f7a7d106b25b06 (diff)
Merge pull request #682 from nadiaholmquist/slirp-merge
Merge slirp branch into master
Diffstat (limited to 'src/SPI.cpp')
-rw-r--r--src/SPI.cpp34
1 files changed, 19 insertions, 15 deletions
diff --git a/src/SPI.cpp b/src/SPI.cpp
index ac40707..eff0a05 100644
--- a/src/SPI.cpp
+++ b/src/SPI.cpp
@@ -162,22 +162,26 @@ void Reset()
UserSettings = userdata;
- // fix touchscreen coords
- #if 0
- *(u16*)&Firmware[userdata+0x58] = 0;
- *(u16*)&Firmware[userdata+0x5A] = 0;
- Firmware[userdata+0x5C] = 0;
- Firmware[userdata+0x5D] = 0;
- *(u16*)&Firmware[userdata+0x5E] = 255<<4;
- *(u16*)&Firmware[userdata+0x60] = 191<<4;
- Firmware[userdata+0x62] = 255;
- Firmware[userdata+0x63] = 191;
-
- // disable autoboot
- //Firmware[userdata+0x64] &= 0xBF;
-
- *(u16*)&Firmware[userdata+0x72] = CRC16(&Firmware[userdata], 0x70, 0xFFFF);
+ // TODO evetually: do this in DSi mode
+ if (NDS::ConsoleType == 0)
+ {
+ // fix touchscreen coords
+ *(u16*)&Firmware[userdata+0x58] = 0;
+ *(u16*)&Firmware[userdata+0x5A] = 0;
+ Firmware[userdata+0x5C] = 0;
+ Firmware[userdata+0x5D] = 0;
+ *(u16*)&Firmware[userdata+0x5E] = 255<<4;
+ *(u16*)&Firmware[userdata+0x60] = 191<<4;
+ Firmware[userdata+0x62] = 255;
+ Firmware[userdata+0x63] = 191;
+
+ // disable autoboot
+ //Firmware[userdata+0x64] &= 0xBF;
+
+ *(u16*)&Firmware[userdata+0x72] = CRC16(&Firmware[userdata], 0x70, 0xFFFF);
+ }
+#if 0
// replace MAC address with random address
// TODO: make optional?
Firmware[0x36] = 0x00;