Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-30 13:53:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor all io APIs of vfs based on VmReader/VmWriter

Browse Source
This commit is contained in:
Shaowei Song
2024-08-22 07:52:20 +00:00
committed by Tate, Hongliang Tian
parent 837c7bebb6
commit dce796cdde
50 changed files with 566 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ostd/src/mm/dma/dma_stream.rs
View File

@ -202,19 +202,19 @@ impl Drop for DmaStreamInner {
impl VmIo for DmaStream {
/// Reads data into the buffer.
fn read_bytes(&self, offset: usize, buf: &mut [u8]) -> Result<(), Error> {
fn read(&self, offset: usize, writer: &mut VmWriter) -> Result<(), Error> {
if self.inner.direction == DmaDirection::ToDevice {
return Err(Error::AccessDenied);
}
self.inner.vm_segment.read_bytes(offset, buf)
self.inner.vm_segment.read(offset, writer)
}
/// Writes data from the buffer.
fn write_bytes(&self, offset: usize, buf: &[u8]) -> Result<(), Error> {
fn write(&self, offset: usize, reader: &mut VmReader) -> Result<(), Error> {
if self.inner.direction == DmaDirection::FromDevice {
return Err(Error::AccessDenied);
}
self.inner.vm_segment.write_bytes(offset, buf)
self.inner.vm_segment.write(offset, reader)
}
}
@ -282,18 +282,18 @@ impl<'a> DmaStreamSlice<'a> {
}
impl VmIo for DmaStreamSlice<'_> {
fn read_bytes(&self, offset: usize, buf: &mut [u8]) -> Result<(), Error> {
if buf.len() + offset > self.len {
fn read(&self, offset: usize, writer: &mut VmWriter) -> Result<(), Error> {
if writer.avail() + offset > self.len {
return Err(Error::InvalidArgs);
}
self.stream.read_bytes(self.offset + offset, buf)
self.stream.read(self.offset + offset, writer)
}
fn write_bytes(&self, offset: usize, buf: &[u8]) -> Result<(), Error> {
if buf.len() + offset > self.len {
fn write(&self, offset: usize, reader: &mut VmReader) -> Result<(), Error> {
if reader.remain() + offset > self.len {
return Err(Error::InvalidArgs);
}
self.stream.write_bytes(self.offset + offset, buf)
self.stream.write(self.offset + offset, reader)
}
}