1
0
Fork 0
forked from AbleOS/ableos

unused import: git::commit_message

`#[warn(unused_imports)]` on by default
This commit is contained in:
TheOddGarlic 2022-08-01 14:09:05 +03:00
parent 983550ae54
commit 34a701bd5c
14 changed files with 32 additions and 108 deletions

View file

@ -1,5 +1,5 @@
// #![allow(clippy::print_literal)] // #![allow(clippy::print_literal)]
use super::{drivers::serial, gdt, interrupts}; use super::{gdt, interrupts};
use crate::{logger, serial_println, TERM}; use crate::{logger, serial_println, TERM};
/// x86_64 initialization /// x86_64 initialization

View file

@ -1,17 +1,10 @@
use core::panic::PanicInfo; use core::panic::PanicInfo;
use crate::{ use crate::{arch::gdt, rhai_shell::KEYBUFF, VgaBuffer, SCREEN_BUFFER};
arch::gdt, image::mono_bitmap::bruh, kernel_state::KERNEL_STATE, print, println,
rhai_shell::KEYBUFF, VgaBuffer, SCREEN_BUFFER,
};
use cpuio::outb; use cpuio::outb;
use pic8259::ChainedPics; use pic8259::ChainedPics;
use qrcode::{ use qrcode::QrCode;
render::{string, unicode},
QrCode,
};
use spin::Lazy; use spin::Lazy;
use vga::colors::Color16;
use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame}; use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame};
use super::sloop; use super::sloop;
@ -156,8 +149,7 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(_stack_frame: InterruptStac
// warn!("ArrowKeys are unsupported currently"); // warn!("ArrowKeys are unsupported currently");
} }
kc => { _kc => {
// trace!("Unprintable key: {kc:?}"), // trace!("Unprintable key: {kc:?}"),
} }
}; };

View file

@ -1,12 +1,6 @@
use core::fmt::Display;
use alloc::collections::VecDeque; use alloc::collections::VecDeque;
use kernel::proccess::PID;
use crate::{arch::generate_process_pass, handle::Handle};
#[derive(Debug)] #[derive(Debug)]
pub struct ChannelPermission { pub struct ChannelPermission {
pub owner: bool, pub owner: bool,
pub producer: bool, pub producer: bool,

View file

@ -1,8 +1,7 @@
//! A handle is a u128 with a set of permissions //! A handle is a u128 with a set of permissions
//! and a resource connected to it //! and a resource connected to it
use crate::Path; use crate::arch::generate_process_pass;
use crate::{arch::generate_process_pass, channels::Channel};
use core::fmt::Display; use core::fmt::Display;
#[derive(Debug)] #[derive(Debug)]

View file

@ -1,12 +1,8 @@
use crate::arch::interrupts::InterruptIndex; use crate::arch::interrupts::InterruptIndex;
use crate::arch::interrupts::PICS; use crate::arch::interrupts::PICS;
use crate::ps2_mouse::{Mouse, MouseState}; use crate::ps2_mouse::{Mouse, MouseState};
use crate::vga_e::VGAE;
use lazy_static::lazy_static; use lazy_static::lazy_static;
use log::info;
use spin::Mutex; use spin::Mutex;
use vga::colors::Color16;
use vga::writers::GraphicsWriter;
use x86_64::instructions::port::PortReadOnly; use x86_64::instructions::port::PortReadOnly;
use x86_64::structures::idt::InterruptStackFrame; use x86_64::structures::idt::InterruptStackFrame;

View file

@ -1,26 +1,14 @@
#![allow(clippy::empty_loop)] #![allow(clippy::empty_loop)]
use core::sync::atomic::{AtomicU64, Ordering}; use core::sync::atomic::AtomicU64;
use crate::arch::drivers::sysinfo::master; use crate::arch::{drivers::sysinfo::master, init, sloop};
use crate::ipc::channel::ChannelMessage; use crate::relib::network::socket::{SimpleSock, Socket};
use crate::ipc::{self, IPC};
use crate::scheduler::SCHEDULER;
use crate::time::fetch_time;
use crate::{ use crate::{
arch::{init, sloop}, boot_conf::KernelConfig, scheduler::SCHEDULER, scratchpad, systeminfo::RELEASE_TYPE, TERM,
relib::network::socket::{SimpleSock, Socket},
scratchpad,
}; };
use crate::{boot_conf::KernelConfig, systeminfo::RELEASE_TYPE};
use crate::{hardware, wasm_jumploader, SectionType, TERM};
use genfs::{Fs, OpenOptions};
use kernel::KERNEL_VERSION; use kernel::KERNEL_VERSION;
use libwasm::syscalls::time_calls::get_time;
use qrcode::render::unicode;
use qrcode::QrCode;
use spin::Lazy; use spin::Lazy;
use x86_64::instructions::interrupts::{disable, enable};
// TODO: Change this structure to allow for multiple cores loaded // TODO: Change this structure to allow for multiple cores loaded
pub static KERNEL_CONF: Lazy<KernelConfig> = Lazy::new(KernelConfig::new); pub static KERNEL_CONF: Lazy<KernelConfig> = Lazy::new(KernelConfig::new);

View file

@ -1,10 +1,6 @@
use crate::kmain::KERNEL_CONF; use crate::{kmain::KERNEL_CONF, time::fetch_time};
use crate::network::socket::{SimpleSock, Socket}; use lliw::Fg;
use crate::time::fetch_time; use log::{Level, LevelFilter, Metadata, Record, SetLoggerError};
use alloc::borrow::ToOwned;
use lliw::{Fg, Reset};
use log::{Level, Metadata, Record};
use log::{LevelFilter, SetLoggerError};
static LOGGER: SimpleLogger = SimpleLogger; static LOGGER: SimpleLogger = SimpleLogger;
// TODO: Rebuild this to take advantage of sockets // TODO: Rebuild this to take advantage of sockets
@ -19,7 +15,6 @@ impl log::Log for SimpleLogger {
x86_64::instructions::interrupts::without_interrupts(|| { x86_64::instructions::interrupts::without_interrupts(|| {
if self.enabled(record.metadata()) { if self.enabled(record.metadata()) {
let time_float = fetch_time(); let time_float = fetch_time();
use log::Level::*;
use Fg::*; use Fg::*;
let color = match record.level() { let color = match record.level() {

View file

@ -1,10 +1,6 @@
use crate::{ use crate::relib::encoding::rle::{decode, encode};
graphics::SCREEN_BUFFER, use crate::vga_e::VGAE;
relib::encoding::rle::{decode, encode},
vga_e::VGAE,
VgaBuffer,
};
use shadeable::pixel_format::new_rgba64;
use vga::writers::GraphicsWriter; use vga::writers::GraphicsWriter;
pub fn bruh() { pub fn bruh() {

View file

@ -1,12 +1,6 @@
use crate::arch::drivers::sysinfo::master; use crate::arch::{drivers::sysinfo::master, shutdown, sloop};
use crate::filesystem::FILE_SYSTEM; use crate::systeminfo::{KERNEL_VERSION, RELEASE_TYPE};
use crate::time::fetch_time; use crate::{filesystem::FILE_SYSTEM, time::fetch_time, KERNEL_STATE};
use crate::wasm_jumploader::interp;
use crate::{
arch::{shutdown, sloop},
systeminfo::{KERNEL_VERSION, RELEASE_TYPE},
KERNEL_STATE,
};
use genfs::{Fs, OpenOptions}; use genfs::{Fs, OpenOptions};
use kernel::allocator::ALLOCATOR; use kernel::allocator::ALLOCATOR;
use rhai::Engine; use rhai::Engine;

View file

@ -1,34 +1,15 @@
use core::fmt::Error;
// use crate::aalloc::aalloc;
use crate::arch::interrupts::{reset_pit_for_cpu, set_pit_2}; use crate::arch::interrupts::{reset_pit_for_cpu, set_pit_2};
use crate::arch::{generate_process_pass, shutdown}; use crate::{
use crate::channels::{Channel, ChannelPermission}; arch::shutdown, filesystem::FILE_SYSTEM, rhai_shell::KEYBUFF, vterm::Term,
use crate::devices::pci; wasm_jumploader::run_program,
use crate::filesystem::FILE_SYSTEM; };
use crate::handle::Handle;
use crate::image::mono_bitmap::bruh;
use crate::ipc::IPC;
use crate::rhai_shell::shell;
use crate::rhai_shell::KEYBUFF;
use crate::unicode_utils::LAMBDA;
use crate::vterm::Term;
use crate::wasm_jumploader::run_program;
use crate::{vgai, SCREEN_BUFFER};
use acpi::{AcpiTables, PlatformInfo}; use acpi::{AcpiTables, PlatformInfo};
use alloc::collections::{vec_deque, VecDeque}; use cpuio::{inb, outb};
use cpuio::inb;
use cpuio::outb;
use ext2::fs::sync::{DirectoryEntry, Synced}; use ext2::fs::sync::{DirectoryEntry, Synced};
use ext2::fs::Ext2; use ext2::{fs::Ext2, sector::Size1024};
use ext2::sector::Size1024; use genfs::{Fs, OpenOptions};
use ext2::sys::inode;
use genfs::OpenOptions;
use genfs::{DirEntry, Fs};
use kernel::proccess::PID;
use kernel::software_int;
use spin::Lazy; use spin::Lazy;
use vga::writers::GraphicsWriter;
// TODO: move to a better place // TODO: move to a better place
#[derive(Clone, Copy, Debug, PartialEq, Eq)] #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@ -49,8 +30,8 @@ impl acpi::AcpiHandler for AcpiStruct {
} }
pub static TERM: Lazy<spin::Mutex<Term>> = Lazy::new(|| spin::Mutex::new(Term::new())); pub static TERM: Lazy<spin::Mutex<Term>> = Lazy::new(|| spin::Mutex::new(Term::new()));
#[derive(Debug)]
#[derive(Debug)]
pub struct Path { pub struct Path {
pub path: Vec<String>, pub path: Vec<String>,
} }
@ -215,7 +196,7 @@ pub fn sound(n_frequency: u32) {
set_pit_2(div); set_pit_2(div);
//And play the sound using the PC speaker // And play the sound using the PC speaker
tmp = inb(0x61); tmp = inb(0x61);
if tmp != (tmp | 3) { if tmp != (tmp | 3) {
outb(tmp | 3, 0x61); outb(tmp | 3, 0x61);
@ -231,7 +212,7 @@ pub fn sound_off() {
reset_pit_for_cpu(); reset_pit_for_cpu();
} }
pub fn list_files_in_dir(fs: &Synced<Ext2<Size1024, Vec<u8>>>, path: &[u8]) -> Vec<DirectoryEntry> { pub fn list_files_in_dir(fs: &Synced<Ext2<Size1024, Vec<u8>>>, _path: &[u8]) -> Vec<DirectoryEntry> {
let mut entry_list = vec![]; let mut entry_list = vec![];
let dirr = fs.read_dir(b"/").unwrap(); let dirr = fs.read_dir(b"/").unwrap();

View file

@ -1,7 +1,4 @@
use vga::{ use vga::{colors::Color16, writers::Graphics640x480x16};
colors::Color16,
writers::{Graphics640x480x16, GraphicsWriter},
};
pub static VGAE_BUFF_OFFSET_X: spin::Mutex<u8> = spin::Mutex::new(0); pub static VGAE_BUFF_OFFSET_X: spin::Mutex<u8> = spin::Mutex::new(0);
pub static VGAE_BUFF_OFFSET_Y: spin::Mutex<u8> = spin::Mutex::new(0); pub static VGAE_BUFF_OFFSET_Y: spin::Mutex<u8> = spin::Mutex::new(0);

View file

@ -1,5 +1,3 @@
use vga::writers::{Graphics640x480x16, GraphicsWriter};
pub enum Color { pub enum Color {
/// Represents the color `Black (0x0)`. /// Represents the color `Black (0x0)`.
Black = 0x0, Black = 0x0,

View file

@ -1,9 +1,6 @@
use crate::vga_e::VGAE;
use vga::{colors::Color16, writers::GraphicsWriter}; use vga::{colors::Color16, writers::GraphicsWriter};
use crate::{
hardware::{MOUSE, _MOUSE},
vga_e::VGAE,
};
const TERM_MINUS_ONE_LINE: usize = 4720; const TERM_MINUS_ONE_LINE: usize = 4720;
const CURSOR_COLOR: Color16 = Color16::Cyan; const CURSOR_COLOR: Color16 = Color16::Cyan;

View file

@ -2,9 +2,7 @@ pub mod host_functions;
use crate::{filesystem::FILE_SYSTEM, wasm_jumploader::host_functions::HostExternals}; use crate::{filesystem::FILE_SYSTEM, wasm_jumploader::host_functions::HostExternals};
use genfs::{Fs, OpenOptions}; use genfs::{Fs, OpenOptions};
use wasmi::{ use wasmi::{ImportsBuilder, ModuleInstance};
ImportsBuilder, MemoryDescriptor, ModuleImportResolver, ModuleInstance, StackRecycler,
};
pub fn interp() { pub fn interp() {
trace!("Interpreting..."); trace!("Interpreting...");
@ -114,7 +112,6 @@ pub fn run_program(program: &[u8]) {
// .expect("failed to instantiate wasm module") // .expect("failed to instantiate wasm module")
use wasmi::GlobalRef;
match instance { match instance {
Ok(inst) => { Ok(inst) => {
let mut instance = inst.assert_no_start(); let mut instance = inst.assert_no_start();