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

Fix warnings and unused variables

Browse Source
This commit is contained in:
Stephen Marz 2020-05-30 12:46:04 -04:00
parent 9fc8a7455f
commit 75ac13009d
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
risc_v/src/input.rs
View File

@ -9,9 +9,9 @@ use core::mem::size_of;
use alloc::collections::VecDeque; use alloc::collections::VecDeque;
pub static mut ABS_EVENTS: Option<VecDeque<Event>> = None; pub static mut ABS_EVENTS: Option<VecDeque<Event>> = None;
pub static mut ABS_OBSERVERS: Option<VecDeque<u16>> = None; // pub static mut ABS_OBSERVERS: Option<VecDeque<u16>> = None;
pub static mut KEY_EVENTS: Option<VecDeque<Event>> = None; pub static mut KEY_EVENTS: Option<VecDeque<Event>> = None;
pub static mut KEY_OBSERVERS: Option<VecDeque<u16>> = None; // pub static mut KEY_OBSERVERS: Option<VecDeque<u16>> = None;
const EVENT_BUFFER_ELEMENTS: usize = 64; const EVENT_BUFFER_ELEMENTS: usize = 64;
@ -99,13 +99,10 @@ const EVENT_SIZE: usize = size_of::<Event>();
pub struct Device { pub struct Device {
event_queue: *mut Queue, event_queue: *mut Queue,
status_queue: *mut Queue, status_queue: *mut Queue,
dev: *mut u32,
event_idx: u16, event_idx: u16,
event_ack_used_idx: u16, event_ack_used_idx: u16,
event_buffer: *mut Event, event_buffer: *mut Event,
status_idx: u16,
status_ack_used_idx: u16, status_ack_used_idx: u16,
status_buffer: *mut Event,
} }
pub static mut INPUT_DEVICES: [Option<Device>; 8] = [ pub static mut INPUT_DEVICES: [Option<Device>; 8] = [
@ -210,7 +207,7 @@ pub fn setup_input_device(ptr: *mut u32) -> bool {
status_bits |= StatusField::DriverOk.val32(); status_bits |= StatusField::DriverOk.val32();
ptr.add(MmioOffsets::Status.scale32()).write_volatile(status_bits); ptr.add(MmioOffsets::Status.scale32()).write_volatile(status_bits);
let config_ptr = ptr.add(MmioOffsets::Config.scale32()) as *mut Config; // let config_ptr = ptr.add(MmioOffsets::Config.scale32()) as *mut Config;
// let mut config = config_ptr.read_volatile(); // let mut config = config_ptr.read_volatile();
@ -224,10 +221,7 @@ pub fn setup_input_device(ptr: *mut u32) -> bool {
let mut dev = Device { let mut dev = Device {
event_queue: event_queue_ptr, event_queue: event_queue_ptr,
status_queue: status_queue_ptr, status_queue: status_queue_ptr,
dev: ptr,
status_idx: 0,
status_ack_used_idx: 0, status_ack_used_idx: 0,
status_buffer: kmalloc(EVENT_SIZE * EVENT_BUFFER_ELEMENTS) as *mut Event,
event_idx: 0, event_idx: 0,
event_ack_used_idx: 0, event_ack_used_idx: 0,
event_buffer: kmalloc(EVENT_SIZE * EVENT_BUFFER_ELEMENTS) as *mut Event, event_buffer: kmalloc(EVENT_SIZE * EVENT_BUFFER_ELEMENTS) as *mut Event,

2
risc_v/src/syscall.rs
View File

@ -9,7 +9,7 @@ use crate::{block::block_op,
elf, elf,
fs, fs,
gpu, gpu,
input::{Event, ABS_EVENTS, ABS_OBSERVERS, KEY_EVENTS, KEY_OBSERVERS}, input::{Event, ABS_EVENTS, KEY_EVENTS},
page::{map, virt_to_phys, EntryBits, Table, PAGE_SIZE}, page::{map, virt_to_phys, EntryBits, Table, PAGE_SIZE},
process::{add_kernel_process_args, delete_process, get_by_pid, set_sleeping, set_waiting, PROCESS_LIST, PROCESS_LIST_MUTEX}}; process::{add_kernel_process_args, delete_process, get_by_pid, set_sleeping, set_waiting, PROCESS_LIST, PROCESS_LIST_MUTEX}};
use alloc::{boxed::Box, string::String}; use alloc::{boxed::Box, string::String};