vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a bunch of warnings.

Browse Source
This commit is contained in:
4lDO2
2024-07-08 13:01:25 +02:00
parent c86f107344
commit 5e7db80285
52 changed files with 105 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/scheme/acpi.rs
+3 -3
View File
@@ -17,9 +17,9 @@ use crate::syscall::{
error::{Error, Result, EACCES, EBADF, EBADFD, EINTR, EINVAL, EISDIR, ENOENT, ENOTDIR, EROFS},
flag::{
EventFlags, EVENT_READ, MODE_CHR, MODE_DIR, MODE_FILE, O_ACCMODE, O_CREAT, O_DIRECTORY,
O_EXCL, O_RDONLY, O_STAT, O_SYMLINK, SEEK_CUR, SEEK_END, SEEK_SET,
O_EXCL, O_RDONLY, O_STAT, O_SYMLINK,
},
usercopy::{UserSliceRo, UserSliceWo},
usercopy::UserSliceWo,
};
use super::{CallerCtx, GlobalSchemes, KernelScheme, OpenResult};
@@ -186,7 +186,7 @@ impl KernelScheme for AcpiScheme {
}
Ok(())
}
fn kreadoff(&self, id: usize, dst_buf: UserSliceWo, offset: u64, flags: u32, stored_flags: u32) -> Result<usize> {
fn kreadoff(&self, id: usize, dst_buf: UserSliceWo, offset: u64, _flags: u32, _stored_flags: u32) -> Result<usize> {
let Ok(offset) = usize::try_from(offset) else {
return Ok(0);
};
src/scheme/debug.rs
+2 -2
View File
@@ -7,7 +7,7 @@ use crate::{
scheme::*,
sync::WaitQueue,
syscall::{
flag::{EventFlags, EVENT_READ, F_GETFL, F_SETFL, O_ACCMODE, O_NONBLOCK},
flag::{EventFlags, EVENT_READ, O_NONBLOCK},
usercopy::{UserSliceRo, UserSliceWo},
},
};
@@ -95,7 +95,7 @@ impl KernelScheme for DebugScheme {
Ok(())
}
fn kread(&self, id: usize, buf: UserSliceWo, flags: u32, _stored_flags: u32) -> Result<usize> {
let handle = {
let _handle = {
let handles = HANDLES.read();
*handles.get(&id).ok_or(Error::new(EBADF))?
};
src/scheme/event.rs
+1 -1
View File
@@ -41,7 +41,7 @@ impl KernelScheme for EventScheme {
queue.read(buf, flags & O_NONBLOCK as u32 == 0)
}
fn kwrite(&self, id: usize, buf: UserSliceRo, flags: u32, _stored_flags: u32) -> Result<usize> {
fn kwrite(&self, id: usize, buf: UserSliceRo, _flags: u32, _stored_flags: u32) -> Result<usize> {
let id = EventQueueId::from(id);
let queue = {
src/scheme/irq.rs
+1 -1
View File
@@ -353,7 +353,7 @@ impl crate::scheme::KernelScheme for IrqScheme {
buf.copy_common_bytes_from_slice(&scheme_path)
}
fn kreadoff(&self, file: usize, buffer: UserSliceWo, offset: u64, flags: u32, _stored_flags: u32) -> Result<usize> {
fn kreadoff(&self, file: usize, buffer: UserSliceWo, offset: u64, _flags: u32, _stored_flags: u32) -> Result<usize> {
let handles_guard = HANDLES.read();
let handle = handles_guard.get(&file).ok_or(Error::new(EBADF))?;
src/scheme/mod.rs
+1 -1
View File
@@ -10,7 +10,7 @@ use alloc::{boxed::Box, collections::BTreeMap, string::ToString, sync::Arc, vec:
use core::sync::atomic::AtomicUsize;
use hashbrown::HashMap;
use spin::{Once, RwLock, RwLockReadGuard, RwLockWriteGuard};
use syscall::{EventFlags, MunmapFlags, SendFdFlags, SEEK_CUR, SEEK_END, SEEK_SET};
use syscall::{EventFlags, MunmapFlags, SendFdFlags};
use crate::{
context::{file::{FileDescription, InternalFlags}, memory::AddrSpaceWrapper},
src/scheme/pipe.rs
+2 -2
View File
@@ -10,9 +10,9 @@ use spin::{Mutex, RwLock};
use crate::{
context::file::InternalFlags, event, sync::WaitCondition, syscall::{
data::Stat,
error::{Error, Result, EAGAIN, EBADF, EINTR, EINVAL, ENOENT, EPIPE, ESPIPE},
error::{Error, Result, EAGAIN, EBADF, EINTR, EINVAL, ENOENT, EPIPE},
flag::{
EventFlags, EVENT_READ, EVENT_WRITE, F_GETFL, F_SETFL, MODE_FIFO, O_ACCMODE, O_NONBLOCK,
EventFlags, EVENT_READ, EVENT_WRITE, MODE_FIFO, O_NONBLOCK,
},
usercopy::{UserSliceRo, UserSliceWo},
}
src/scheme/proc.rs
+3 -5
View File
@@ -1,7 +1,7 @@
use crate::{
arch::paging::{Page, RmmA, RmmArch, VirtualAddress},
context::{
self, context::{HardBlockedReason, SignalState}, file::{FileDescriptor, InternalFlags}, memory::{handle_notify_files, AddrSpace, AddrSpaceWrapper, Grant, PageSpan}, Context, ContextId, Status
self, context::{HardBlockedReason, SignalState}, file::{FileDescriptor, InternalFlags}, memory::{handle_notify_files, AddrSpaceWrapper, Grant, PageSpan}, Context, ContextId, Status
},
memory::PAGE_SIZE,
ptrace,
@@ -729,7 +729,7 @@ impl<const FULL: bool> KernelScheme for ProcScheme<FULL> {
_ => Err(Error::new(EBADF)),
}
}
fn kreadoff(&self, id: usize, buf: UserSliceWo, offset: u64, read_flags: u32, _stored_flags: u32) -> Result<usize> {
fn kreadoff(&self, id: usize, buf: UserSliceWo, offset: u64, _read_flags: u32, _stored_flags: u32) -> Result<usize> {
// Don't hold a global lock during the context switch later on
let info = {
let handles = HANDLES.read();
@@ -943,7 +943,7 @@ impl<const FULL: bool> KernelScheme for ProcScheme<FULL> {
_ => Err(Error::new(EBADF)),
}
}
fn kwriteoff(&self, id: usize, buf: UserSliceRo, _offset: u64, fcntl_flags: u32, _stored_flags: u32) -> Result<usize> {
fn kwriteoff(&self, id: usize, buf: UserSliceRo, _offset: u64, _fcntl_flags: u32, _stored_flags: u32) -> Result<usize> {
// TODO: offset
// Don't hold a global lock during the context switch later on
@@ -1138,8 +1138,6 @@ impl<const FULL: bool> KernelScheme for ProcScheme<FULL> {
}
let state = if data.thread_control_addr != 0 && data.proc_control_addr != 0 {
let offset = u16::try_from(data.thread_control_addr % PAGE_SIZE).unwrap();
let validate_off = |addr, sz| {
let off = addr % PAGE_SIZE;
if off % mem::align_of::<usize>() == 0 && off + sz <= PAGE_SIZE {
src/scheme/root.rs
+1 -1
View File
@@ -5,7 +5,7 @@ use core::{
sync::atomic::{AtomicUsize, Ordering},
};
use hashbrown::HashMap;
use spin::{Mutex, RwLock};
use spin::RwLock;
use crate::{
context::{self, file::InternalFlags},
src/scheme/serio.rs
+1 -1
View File
@@ -12,7 +12,7 @@ use crate::{
scheme::*,
sync::WaitQueue,
syscall::{
flag::{EventFlags, EVENT_READ, F_GETFL, F_SETFL, O_ACCMODE, O_NONBLOCK},
flag::{EventFlags, EVENT_READ, O_NONBLOCK},
usercopy::UserSliceWo,
},
};
src/scheme/user.rs
+6 -7
View File
@@ -11,18 +11,17 @@ use core::{
sync::atomic::{AtomicBool, Ordering},
usize,
};
use hashbrown::hash_map::{Entry, HashMap};
use spin::{Mutex, RwLock};
use spinning_top::RwSpinlock;
use syscall::{
schemev2::{Cqe, CqeOpcode, Opcode, Sqe, SqeFlags}, FobtainFdFlags, MunmapFlags, SendFdFlags, F_SETFL, KSMSG_CANCEL, MAP_FIXED_NOREPLACE, SIGKILL, SKMSG_FOBTAINFD, SKMSG_FRETURNFD, SKMSG_PROVIDE_MMAP
schemev2::{Cqe, CqeOpcode, Opcode, Sqe, SqeFlags}, FobtainFdFlags, MunmapFlags, SendFdFlags, F_SETFL, KSMSG_CANCEL, MAP_FIXED_NOREPLACE, SKMSG_FOBTAINFD, SKMSG_FRETURNFD, SKMSG_PROVIDE_MMAP
};
use crate::{
context::{
self, context::HardBlockedReason, file::{FileDescription, FileDescriptor, InternalFlags}, memory::{
AddrSpace, AddrSpaceWrapper, BorrowedFmapSource, Grant, GrantFileRef, MmapMode, PageSpan, DANGLING
}, BorrowedHtBuf, Context, ContextId, Status
}, BorrowedHtBuf, Context, Status
},
event,
memory::Frame,
@@ -620,7 +619,7 @@ impl UserInner {
dst.copy_exactly(&self.translate_sqe_to_packet(&sqe)?)?;
bytes_read += size_of::<Packet>();
}
Err(error) if bytes_read > 0 => return Ok(bytes_read),
Err(_error) if bytes_read > 0 => return Ok(bytes_read),
Err(Error { errno: EAGAIN }) if self.unmounting.load(Ordering::SeqCst) => return Ok(bytes_read),
Err(error) => return Err(error),
}
@@ -740,7 +739,7 @@ impl UserInner {
pub fn request_fmap(
&self,
id: usize,
offset: u64,
_offset: u64,
required_page_count: usize,
flags: MapFlags,
) -> Result<()> {
@@ -1200,7 +1199,7 @@ impl KernelScheme for UserScheme {
let address = inner.copy_and_capture_tail(path.as_bytes())?;
match inner.call_extended(ctx, None, Opcode::Open, [address.base(), address.len(), flags])? {
Response::Regular(code, fl) => Ok({
let fd = Error::demux(code)?;
let _ = Error::demux(code)?;
OpenResult::SchemeLocal(code, InternalFlags::from_extra0(fl).ok_or(Error::new(EINVAL))?)
}),
Response::Fd(desc) => Ok(OpenResult::External(desc)),
@@ -1401,7 +1400,7 @@ impl KernelScheme for UserScheme {
number: usize,
desc: Arc<RwLock<FileDescription>>,
flags: SendFdFlags,
arg: u64,
_arg: u64,
) -> Result<usize> {
let inner = self.inner.upgrade().ok_or(Error::new(ENODEV))?;