async goes boom
continuous-integration/drone/push Build is passing

Signed-off-by: Julien CLEMENT <julien.clement@epita.fr>
This commit is contained in:
juju committed 2022-12-20 20:55:49 +01:00
1 parent af9a7aa712
commit 3968c4c376
3 files changed
+19 -13

No files matched your search

+9 -6
View File
@@ -9,6 +9,7 @@ use core::convert::TryInto;
use lazy_static::lazy_static;
use spin::Mutex;
use crate::utils::AsyncMutex;
use x86_64::instructions::port::Port;
const CD_SECTOR_SIZE: usize = 2048;
@@ -58,15 +59,16 @@ static ATAPI_SIG: [u8; 4] = [
];
lazy_static! {
pub static ref DRIVE: Mutex<Option<ATABus>> = {
Mutex::new(ATABus::discover_atapi_drive())
pub static ref DRIVE: AsyncMutex<Option<ATABus>> = {
AsyncMutex::new(ATABus::discover_atapi_drive())
};
}
pub fn init() {
pub async fn init() {
println!("Detecting drives");
match DRIVE.lock().as_ref() {
let guard = DRIVE.lock().await;
match guard.as_ref() {
None => println!("No drive detected :("),
Some(drive) => {
let drive_type = match drive.current_drive {
@@ -322,6 +324,7 @@ impl ATABus {
pub async fn print_block() {
DRIVE.lock().as_mut().unwrap().read_block(500).await;
serial_println!("{:x?}", DRIVE.lock().as_mut().unwrap().block);
let mut guard = DRIVE.lock().await;
guard.as_mut().unwrap().read_block(500).await;
serial_println!("{:x?}", guard.as_mut().unwrap().block);
}
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.