diff options
| author | Nadia Holmquist Pedersen <nadia@nhp.sh> | 2020-07-27 16:06:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-27 16:06:53 +0200 |
| commit | 40a9f41be8ec484728862eb065b9b6985909db33 (patch) | |
| tree | a037a722e60dc06a8de6990ce9da0c50f2d7015f /src/SPI.cpp | |
| parent | 5c08207f359479fdd16fa8517f9d2a5e8fe52c63 (diff) | |
| parent | dff14ca80ada883870131c7ff17d85866254ccc0 (diff) | |
Merge branch 'master' into fix/aarch64-ci
Diffstat (limited to 'src/SPI.cpp')
| -rw-r--r-- | src/SPI.cpp | 34 |
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; |