mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-06-01 07:52:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Kernel: Make the PresentState register a bitfield in the SDHC driver

Browse source
This commit is contained in:
Daniel Bertalan 2023-06-24 09:16:07 +02:00 • committed by Jelle Raaijmakers
parent 6391480b80
commit b90a20aee6
Notes: sideshowbarker 2024-07-19 01:59:31 +09:00
3 changed files with 31 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Kernel/Devices/Storage/SD/SDHostController.cpp
View file

@ -270,14 +270,12 @@ bool SDHostController::retry_with_timeout(Function<bool()> f, i64 delay_between_
ErrorOr<void> SDHostController::issue_command(SD::Command const& cmd, u32 argument)
{
// SDHC 3.7.1: "Transaction Control without Data Transfer Using DAT Line"
constexpr u32 command_inhibit = 1 << 1;
// 1. Check Command Inhibit (CMD) in the Present State register.
// Repeat this step until Command Inhibit (CMD) is 0.
// That is, when Command Inhibit (CMD) is 1, the Host Driver
// shall not issue an SD Command.
if (!retry_with_timeout(
[&]() { return !(m_registers->present_state & command_inhibit); })) {
if (!retry_with_timeout([&]() { return !m_registers->present_state.command_inhibit_cmd; })) {
return EIO;
}
@ -290,8 +288,7 @@ ErrorOr<void> SDHostController::issue_command(SD::Command const& cmd, u32 argume
// 4. Check Command Inhibit (DAT) in the Present State register. Repeat
// this step until Command Inhibit (DAT) is set to 0.
constexpr u32 data_inhibit = 1 << 2;
if (!retry_with_timeout([&]() { return !(m_registers->present_state & data_inhibit); })) {
if (!retry_with_timeout([&]() { return !m_registers->present_state.command_inhibit_dat; })) {
return EIO;
}
}