diff --git a/os/src/drivers/block/sdcard.rs b/os/src/drivers/block/sdcard.rs index d736632a..756e9a00 100644 --- a/os/src/drivers/block/sdcard.rs +++ b/os/src/drivers/block/sdcard.rs @@ -423,7 +423,7 @@ impl SDCard { /* Byte 15 */ CSD_CRC: (csd_tab[15] & 0xFE) >> 1, Reserved4: 1, - /* Return the reponse */ + /* Return the response */ }) } diff --git a/os/src/drivers/chardev/ns16550a.rs b/os/src/drivers/chardev/ns16550a.rs index 667a6604..81e3878b 100644 --- a/os/src/drivers/chardev/ns16550a.rs +++ b/os/src/drivers/chardev/ns16550a.rs @@ -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); } diff --git a/user/src/bin/cat.rs b/user/src/bin/cat.rs index 9cbed233..91cc453b 100644 --- a/user/src/bin/cat.rs +++ b/user/src/bin/cat.rs @@ -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];