The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-24 15:01:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement ReadOCR

Browse Source 
Libogc needs this now; I'm not sure what I changed from before that made it necessary.
This commit is contained in:
Pokechu22 2020-08-27 18:18:26 -07:00
parent d958605a1e
commit b2c15e0fdb
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Core/HW/EXI/EXI_DeviceSD.cpp
View File

@ -369,6 +369,16 @@ void CEXISD::HandleCommand(Command command, u32 argument)
block_state = BlockState::Response;
address = argument;
break;
case Command::ReadOCR:
{
response.push_back(0); // R1
u32 ocr = OCR_DEFAULT.m_hex;
response.push_back(ocr >> 24);
response.push_back(ocr >> 16);
response.push_back(ocr >> 8);
response.push_back(ocr);
break;
}
default:
// Don't know it
WARN_LOG_FMT(EXPANSIONINTERFACE, "Unimplemented SD command {:02x} {:08x}",

34
Source/Core/Core/HW/EXI/EXI_DeviceSD.h
View File

@ -8,6 +8,7 @@
#include <deque>
#include <string>
#include "Common/BitUtils.h"
#include "Common/CommonTypes.h"
#include "Common/IOFile.h"
#include "Core/HW/EXI/EXI_Device.h"
@ -86,7 +87,9 @@ private:
AppCmd = 55,
GenCmd = 56,
// 57-58 Reserved
// 57 Reserved for command system set by SwitchFunc
ReadOCR = 58,
CRCOnOff = 59,
// 60-63 Reserved for manufacturer
};
@ -121,6 +124,35 @@ private:
// 56-59 Reserved for security spec
};
enum class OCR : u32 // Operating Conditions Register
{
// 0-6 reserved
// 7 reserved for Low Voltage Range
// 8-14 reserved
// All of these (including the above reserved bits) are the VDD Voltage Window.
// e.g. Vdd27To28 indicates 2.7 to 2.8 volts
Vdd27To28 = 1 << 15,
Vdd28To29 = 1 << 16,
Vdd29To30 = 1 << 17,
Vdd30To31 = 1 << 18,
Vdd31To32 = 1 << 19,
Vdd32To33 = 1 << 20,
Vdd33To34 = 1 << 21,
Vdd34To35 = 1 << 22,
Vdd35To36 = 1 << 23,
// "S18A" (not part of VDD Voltage Window)
SwitchTo18VAccepted = 1 << 24,
// 25-29 reserved
// "CCS", only valid after startup done. This bit being set indicates SDHC.
CardCapacityStatus = 1 << 30,
// 0 if card is still starting up
CardPowerUpStatus = 1u << 31,
};
static constexpr Common::Flags<OCR> OCR_DEFAULT{
OCR::Vdd27To28, OCR::Vdd28To29, OCR::Vdd29To30, OCR::Vdd30To31, OCR::Vdd31To32,
OCR::Vdd32To33, OCR::Vdd33To34, OCR::Vdd34To35, OCR::Vdd35To36, OCR::CardPowerUpStatus};
static constexpr u8 START_BLOCK = 0xfe, START_MULTI_BLOCK = 0xfc, END_BLOCK = 0xfd;
// The spec has the first 3 bits of the data responses marked with an x, and doesn't explain why
static constexpr u8 DATA_RESPONSE_ACCEPTED = 0b0'010'0;