andrey/osblog
1
0
Fork 0
mirror of https://github.com/sgmarz/osblog.git synced 2024-11-23 18:06:20 +04:00
Code Issues Projects Releases Wiki Activity

Shortened some code using Rust

Browse Source
This commit is contained in:
Stephen Marz 2020-03-13 21:45:13 -04:00
parent 50df049fbb
commit ea4c8ae9c2
2 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
risc_v/ch9/src/block.rs
View File

@ -225,6 +225,7 @@ pub fn fill_next_descriptor(bd: &mut BlockDevice, desc: Descriptor) -> u16 {
pub fn block_op(dev: usize, buffer: *mut u8, size: u32, offset: u64, write: bool) {
unsafe {
if let Some(bdev) = BLOCK_DEVICES[dev - 1].as_mut() {
// Check to see if we are trying to write to a read only device.
if true == bdev.read_only && true == write {
println!("Trying to write to read/only!");
return;
@ -238,22 +239,29 @@ pub fn block_op(dev: usize, buffer: *mut u8, size: u32, offset: u64, write: bool
next: 0, };
let head_idx = fill_next_descriptor(bdev, desc);
(*blk_request).header.sector = sector;
if false == write {
(*blk_request).header.blktype = VIRTIO_BLK_T_IN;
// A write is an "out" direction, whereas a read is an "in" direction.
(*blk_request).header.blktype = if true == write {
VIRTIO_BLK_T_OUT
}
else {
(*blk_request).header.blktype = VIRTIO_BLK_T_OUT;
}
VIRTIO_BLK_T_IN
};
// We put 111 in the status. Whenever the device finishes, it will write into
// status. If we read status and it is 111, we know that it wasn't written to by
// the device.
(*blk_request).data.data = buffer;
(*blk_request).header.reserved = 0;
(*blk_request).status.status = 111;
let mut desc = Descriptor { addr: buffer as u64,
len: size,
flags: virtio::VIRTIO_DESC_F_NEXT,
next: 0, };
if false == write {
desc.flags |= virtio::VIRTIO_DESC_F_WRITE
}
let desc = Descriptor { addr: buffer as u64,
len: size,
flags: virtio::VIRTIO_DESC_F_NEXT
| if false == write {
virtio::VIRTIO_DESC_F_WRITE
}
else {
0
},
next: 0, };
let _data_idx = fill_next_descriptor(bdev, desc);
let desc = Descriptor { addr: &(*blk_request).status as *const Status as u64,
len: size_of::<Status>() as u32,
@ -289,16 +297,6 @@ pub fn pending(bd: &mut BlockDevice) {
let ref elem = queue.used.ring[bd.ack_used_idx as usize];
bd.ack_used_idx = (bd.ack_used_idx + 1) % VIRTIO_RING_SIZE as u16;
let rq = queue.desc[elem.id as usize].addr as *const Request;
let stat = (*rq).status.status;
if 0 == stat {
println!("Success!");
}
else if 1 == stat {
println!("IO Error");
}
else if 2 == stat {
println!("Unsupported");
}
kfree(rq as *mut u8);
// TODO: Awaken the process that will need this I/O. This is
// the purpose of the waiting state.

3
risc_v/ch9/src/lib.rs
View File

@ -180,9 +180,10 @@ extern "C" fn kinit() {
print!("{:02x} ", buffer.add(48+i).read());
}
println!();
(*buffer.add(2)) = 0x7a;
buffer.add(0).write(0xaa);
buffer.add(1).write(0xbb);
buffer.add(2).write(0x7a);
}
block::write(8, buffer, 512, 0);
// Free the testing buffer.