andrey/rCore-Tutorial-v3
1
0
Fork 0
mirror of https://github.com/rcore-os/rCore-Tutorial-v3.git synced 2025-01-19 05:27:13 +04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #65 from cuishuang/main

Browse Source 
fix some typos
This commit is contained in:
chyyuu 2022-04-22 22:17:07 +08:00 committed by GitHub
commit a8e4c13e99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os/src/drivers/block/sdcard.rs
View File

@ -423,7 +423,7 @@ impl</*'a,*/ X: SPI> SDCard</*'a,*/ X> {
/* Byte 15 */
CSD_CRC: (csd_tab[15] & 0xFE) >> 1,
Reserved4: 1,
/* Return the reponse */
/* Return the response */
})
}

4
os/src/drivers/chardev/ns16550a.rs
View File

@ -12,7 +12,7 @@ use volatile::{ReadOnly, Volatile, WriteOnly};
bitflags! {
/// InterruptEnableRegister
pub struct IER: u8 {
const RX_AVALIABLE = 1 << 0;
const RX_AVAILABLE = 1 << 0;
const TX_EMPTY = 1 << 1;
}
@ -95,7 +95,7 @@ impl NS16550aRaw {
mcr |= MCR::REQUEST_TO_SEND;
mcr |= MCR::AUX_OUTPUT2;
read_end.mcr.write(mcr);
let ier = IER::RX_AVALIABLE;
let ier = IER::RX_AVAILABLE;
read_end.ier.write(ier);
}

2
user/src/bin/cat.rs
View File

@ -12,7 +12,7 @@ pub fn main(argc: usize, argv: &[&str]) -> i32 {
assert!(argc == 2);
let fd = open(argv[1], OpenFlags::RDONLY);
if fd == -1 {
panic!("Error occured when opening file");
panic!("Error occurred when opening file");
}
let fd = fd as usize;
let mut buf = [0u8; 256];