sdio: add sdh peripherals and modify sdh_demo
#15
Conversation
This file contains 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
luojia65
requested changes
Dec 27, 2024
bouffalo-hal/src/sdio.rs
Outdated
Comment on lines
243
to
244
| /// Set this bit to zero. | ||
| ZERO = 0, |
There was a problem hiding this comment.
Suggested change
| /// Set this bit to zero. | |
| ZERO = 0, | |
| /// Set this bit to zero. | |
| None = 0, |
Should we consider using None to indicate that no automatic command is enabled?
bouffalo-hal/src/sdio.rs
Outdated
| @@ -321,22 +330,23 @@ pub struct Command(u16); | |||
|
|
|||
| /// CMD Type. | |||
| #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] | |||
| pub enum CmdType { | |||
| Other, | |||
| pub enum SDHCmdType { | |||
There was a problem hiding this comment.
Suggested change
| pub enum SDHCmdType { | |
| pub enum CommandType { |
I suggest using CommandType as the enum name, as the module name sdio already implies it pertains to an SDH command.
bouffalo-hal/src/sdio.rs
Outdated
Comment on lines
3613
to
3618
| while !self.sdh.software_reset.read().is_reset_all_finished() { | ||
| // Wait for software reset finished. | ||
| unsafe { | ||
| asm!("nop"); | ||
| } | ||
| } |
There was a problem hiding this comment.
Suggested change
| while !self.sdh.software_reset.read().is_reset_all_finished() { | |
| // Wait for software reset finished. | |
| unsafe { | |
| asm!("nop"); | |
| } | |
| } | |
| // Wait for software reset finished. | |
| while !self.sdh.software_reset.read().is_reset_all_finished() { | |
| core::hint::spin_loop() | |
| } |
Use core::hint::spin_loop() for busy-wait loops. This function provides appropriate hint instructions for each architecture to temporarily reduce the instruction retirement rate, improving energy efficiency.
bouffalo-hal/src/sdio.rs
Outdated
Comment on lines
3620
to
3615
| // GLB_Set_SDH_CLK. | ||
| let mut tmp_val = glb.sdh_config.read(); // GLB_REG_SDH_CLK_EN. | ||
| tmp_val = tmp_val.disable_sdh_clk(); | ||
| unsafe { | ||
| glb.sdh_config.write(tmp_val); | ||
| } | ||
| tmp_val = glb.sdh_config.read(); | ||
| tmp_val = tmp_val.set_sdh_clk_sel(0); // GLB_REG_SDH_CLK_SEL. | ||
| tmp_val = tmp_val.set_sdh_clk_div_len(7); // GLB_REG_SDH_CLK_DIV. | ||
| unsafe { | ||
| glb.sdh_config.write(tmp_val); | ||
| } | ||
| tmp_val = glb.sdh_config.read(); | ||
| tmp_val = tmp_val.enable_sdh_clk(); // GLB_REG_SDH_CLK_EN. | ||
| unsafe { | ||
| glb.sdh_config.write(tmp_val); | ||
| } |
There was a problem hiding this comment.
There are multiple writes to the sdh_config register. Will the code function correctly if we retain only the last write?
bouffalo-hal/src/sdio.rs
Outdated
Comment on lines
3638
to
3633
| // SDH_Ctrl_Init. | ||
| let mut tmp_val = self.sdh.clock_control.read(); | ||
| tmp_val = tmp_val.set_sd_clk_freq(0); // SDH_SD_FREQ_SEL_LO. | ||
| tmp_val = tmp_val.set_sd_clk_freq_upper(0); // SDH_SD_FREQ_SEL_HI. | ||
| tmp_val = tmp_val.set_clk_gen_mode(ClkGenMode::DividedClk); // SDH_CLK_GEN_SEL. | ||
| tmp_val = tmp_val.enable_internal_clk(); // SDH_INT_CLK_EN. | ||
| tmp_val = tmp_val.enable_sd_clk(); // SDH_SD_CLK_EN. | ||
| unsafe { | ||
| self.sdh.clock_control.write(tmp_val); | ||
| } |
There was a problem hiding this comment.
Prefer modify function on RW registers to shorten the code size.
Also fix some code issues. Signed-off-by: Yu Chongbing <[email protected]>
NanaHigh
force-pushed
the
nanahigh/sdio
branch
from
982f1a4 to
ed84a8e
Compare
|
I have completed the adjustment in latest commit. @luojia65 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Also fix some code issues.
Tested on M1s Dock, is works fine.