-
Notifications
You must be signed in to change notification settings - Fork 25
feat(block): implement sdmmc #9
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
eternalcomet
wants to merge
6
commits into
main
Choose a base branch
from
pr-sdmmc
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
17f4c61
feat(block): sdmmc
AsakuraMizu 25272ec
build(block): update dependency simple-sdmmc
eternalcomet 921f208
fix(block): add overflow check for sdmmc block id
eternalcomet b68db57
remove useless cast
eternalcomet 46cd465
fix(sdmmc): check if max block id exceeds device capacity
eternalcomet d836f23
style(sdmmc): fix format
eternalcomet File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| //! SD/MMC driver based on SDIO. | ||
|
|
||
| use axdriver_base::{BaseDriverOps, DevError, DevResult, DeviceType}; | ||
| use simple_sdmmc::SdMmc; | ||
|
|
||
| use crate::BlockDriverOps; | ||
|
|
||
| /// A SD/MMC driver. | ||
| pub struct SdMmcDriver(SdMmc); | ||
|
|
||
| impl SdMmcDriver { | ||
| /// Creates a new [`SdMmcDriver`] from the given base address. | ||
| /// | ||
| /// # Safety | ||
| /// | ||
| /// The caller must ensure that `base` is a valid pointer to the SD/MMC | ||
| /// controller's register block and that no other code is concurrently | ||
| /// accessing the same hardware. | ||
| pub unsafe fn new(base: usize) -> Self { | ||
| Self(unsafe { SdMmc::new(base) }) | ||
| } | ||
| } | ||
|
|
||
| impl BaseDriverOps for SdMmcDriver { | ||
| fn device_type(&self) -> DeviceType { | ||
| DeviceType::Block | ||
| } | ||
|
|
||
| fn device_name(&self) -> &str { | ||
| "sdmmc" | ||
| } | ||
| } | ||
|
|
||
| impl BlockDriverOps for SdMmcDriver { | ||
| fn num_blocks(&self) -> u64 { | ||
| self.0.num_blocks() | ||
| } | ||
|
|
||
| fn block_size(&self) -> usize { | ||
| SdMmc::BLOCK_SIZE | ||
| } | ||
|
|
||
| fn read_block(&mut self, block_id: u64, buf: &mut [u8]) -> DevResult { | ||
| let (blocks, remainder) = buf.as_chunks_mut::<{ SdMmc::BLOCK_SIZE }>(); | ||
|
|
||
| // the buf length must be a multiple of block size | ||
| if !remainder.is_empty() { | ||
| return Err(DevError::InvalidParam); | ||
| } | ||
|
|
||
| // check if block id exceeds device capacity | ||
| if block_id.saturating_add(blocks.len() as u64) > self.0.num_blocks() { | ||
| return Err(DevError::InvalidParam); | ||
| } | ||
|
|
||
| let block_id: u32 = block_id.try_into().map_err(|_| DevError::InvalidParam)?; | ||
| for (i, block) in blocks.iter_mut().enumerate() { | ||
| self.0.read_block(block_id + i as u32, block); | ||
| } | ||
|
AsakuraMizu marked this conversation as resolved.
|
||
|
|
||
| Ok(()) | ||
| } | ||
|
|
||
| fn write_block(&mut self, block_id: u64, buf: &[u8]) -> DevResult { | ||
| let (blocks, remainder) = buf.as_chunks::<{ SdMmc::BLOCK_SIZE }>(); | ||
|
|
||
| // the buf length must be a multiple of block size | ||
| if !remainder.is_empty() { | ||
| return Err(DevError::InvalidParam); | ||
| } | ||
|
|
||
| // check if block id exceeds device capacity | ||
| if block_id.saturating_add(blocks.len() as u64) > self.0.num_blocks() { | ||
| return Err(DevError::InvalidParam); | ||
| } | ||
|
|
||
| let block_id: u32 = block_id.try_into().map_err(|_| DevError::InvalidParam)?; | ||
| for (i, block) in blocks.iter().enumerate() { | ||
| self.0.write_block(block_id + i as u32, block); | ||
| } | ||
|
AsakuraMizu marked this conversation as resolved.
|
||
|
|
||
| Ok(()) | ||
| } | ||
|
|
||
| fn flush(&mut self) -> DevResult { | ||
| Ok(()) | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.