mlokis/ableos-framebuffer
1
0
Fork 0
forked from koniifer/ableos
Code Pull requests Activity

reduction of code base

Browse source
This commit is contained in:
Able 2022-01-22 01:26:25 -06:00
parent b47e8bd64c
commit 21b5add99d
9 changed files with 13 additions and 5291 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
ableos/shitty_code_to_rewrite/shutdown.rs
View file

@ -1,27 +0,0 @@
#[repr(C)]
pub struct ShutterDowner {
smi_cmd: u32,
acpi_enable: u8,
acpi_disable: u8,
pm1a_cnt: u32,
pm1b_cnt: u32,
slp_typa: u16,
slp_typb: u16,
slp_en: u16,
scii_en: u16,
pm1_cnt_len: u8,
}
pub structRSDPtr {
signature: [u8; 8],
checksum: u8,
oem_id: [u8; 6],
revision: u8,
rsdt_address: u32,
}
struct FACP {
signature: [u8; 4],
length: u32,
}

302
ableos/shitty_code_to_rewrite/shutdown_in_c.c
View file

@ -1,302 +0,0 @@
// //
// // here is the slighlty complicated ACPI poweroff code
// //
#include <stddef.h>
#include <print.h>
#include <string.h>
#include <io.h>
#include <time.h>
dword *SMI_CMD;
byte ACPI_ENABLE;
byte ACPI_DISABLE;
dword *PM1a_CNT;
dword *PM1b_CNT;
word SLP_TYPa;
word SLP_TYPb;
word SLP_EN;
word SCI_EN;
byte PM1_CNT_LEN;
struct RSDPtr
{
byte Signature[8];
byte CheckSum;
byte OemID[6];
byte Revision;
dword *RsdtAddress;
};
struct FACP
{
byte Signature[4];
dword Length;
byte unneded1[40 - 8];
dword *DSDT;
byte unneded2[48 - 44];
dword *SMI_CMD;
byte ACPI_ENABLE;
byte ACPI_DISABLE;
byte unneded3[64 - 54];
dword *PM1a_CNT_BLK;
dword *PM1b_CNT_BLK;
byte unneded4[89 - 72];
byte PM1_CNT_LEN;
};
// check if the given address has a valid header
unsigned int *acpiCheckRSDPtr(unsigned int *ptr)
{
char *sig = "RSD PTR ";
struct RSDPtr *rsdp = (struct RSDPtr *)ptr;
byte *bptr;
byte check = 0;
int i;
if (memcmp(sig, rsdp, 8) == 0)
{
// check checksum rsdpd
bptr = (byte *)ptr;
for (i = 0; i < sizeof(struct RSDPtr); i++)
{
check += *bptr;
bptr++;
}
// found valid rsdpd
if (check == 0)
{
/*
if (desc->Revision == 0)
wrstr("acpi 1");
else
wrstr("acpi 2");
*/
return (unsigned int *)rsdp->RsdtAddress;
}
}
return NULL;
}
// finds the acpi header and returns the address of the rsdt
unsigned int *acpiGetRSDPtr(void)
{
unsigned int *addr;
unsigned int *rsdp;
// search below the 1mb mark for RSDP signature
for (addr = (unsigned int *)0x000E0000; (int)addr < 0x00100000; addr += 0x10 / sizeof(addr))
{
rsdp = acpiCheckRSDPtr(addr);
if (rsdp != NULL)
return rsdp;
}
// at address 0x40:0x0E is the RM segment of the ebda
int ebda = *((short *)0x40E); // get pointer
ebda = ebda * 0x10 & 0x000FFFFF; // transform segment into linear address
// search Extended BIOS Data Area for the Root System Description Pointer signature
for (addr = (unsigned int *)ebda; (int)addr < ebda + 1024; addr += 0x10 / sizeof(addr))
{
rsdp = acpiCheckRSDPtr(addr);
if (rsdp != NULL)
return rsdp;
}
return NULL;
}
// checks for a given header and validates checksum
int acpiCheckHeader(unsigned int *ptr, char *sig)
{
if (memcmp(ptr, sig, 4) == 0)
{
char *checkPtr = (char *)ptr;
int len = *(ptr + 1);
char check = 0;
while (0 < len--)
{
check += *checkPtr;
checkPtr++;
}
if (check == 0)
return 0;
}
return -1;
}
int acpiEnable(void)
{
// check if acpi is enabled
if ((inw((unsigned int)PM1a_CNT) & SCI_EN) == 0)
{
// check if acpi can be enabled
if (SMI_CMD != 0 && ACPI_ENABLE != 0)
{
outb((unsigned int)SMI_CMD, ACPI_ENABLE); // send acpi enable command
// give 3 seconds time to enable acpi
int i;
for (i = 0; i < 300; i++)
{
if ((inw((unsigned int)PM1a_CNT) & SCI_EN) == 1)
break;
sleep(10);
}
if (PM1b_CNT != 0)
for (; i < 300; i++)
{
if ((inw((unsigned int)PM1b_CNT) & SCI_EN) == 1)
break;
sleep(10);
}
if (i < 300)
{
wrstr("enabled acpi.\n");
return 0;
}
else
{
wrstr("couldn't enable acpi.\n");
return -1;
}
}
else
{
wrstr("no known way to enable acpi.\n");
return -1;
}
}
else
{
//wrstr("acpi was already enabled.\n");
return 0;
}
}
//
// bytecode of the \_S5 object
// -----------------------------------------
// | (optional) | | | |
// NameOP | \ | _ | S | 5 | _
// 08 | 5A | 5F | 53 | 35 | 5F
//
// -----------------------------------------------------------------------------------------------------------
// | | | ( SLP_TYPa ) | ( SLP_TYPb ) | ( Reserved ) | (Reserved )
// PackageOP | PkgLength | NumElements | byteprefix Num | byteprefix Num | byteprefix Num | byteprefix Num
// 12 | 0A | 04 | 0A 05 | 0A 05 | 0A 05 | 0A 05
//
//----this-structure-was-also-seen----------------------
// PackageOP | PkgLength | NumElements |
// 12 | 06 | 04 | 00 00 00 00
//
// (Pkglength bit 6-7 encode additional PkgLength bytes [shouldn't be the case here])
//
int initAcpi(void)
{
unsigned int *ptr = acpiGetRSDPtr();
// check if address is correct ( if acpi is available on this pc )
if (ptr != NULL && acpiCheckHeader(ptr, "RSDT") == 0)
{
// the RSDT contains an unknown number of pointers to acpi tables
int entrys = *(ptr + 1);
entrys = (entrys - 36) / 4;
ptr += 36 / 4; // skip header information
while (0 < entrys--)
{
// check if the desired table is reached
if (acpiCheckHeader((unsigned int *)*ptr, "FACP") == 0)
{
entrys = -2;
struct FACP *facp = (struct FACP *)*ptr;
if (acpiCheckHeader((unsigned int *)facp->DSDT, "DSDT") == 0)
{
// search the \_S5 package in the DSDT
char *S5Addr = (char *)facp->DSDT + 36; // skip header
int dsdtLength = *(facp->DSDT + 1) - 36;
while (0 < dsdtLength--)
{
if (memcmp(S5Addr, "_S5_", 4) == 0)
break;
S5Addr++;
}
// check if \_S5 was found
if (dsdtLength > 0)
{
// check for valid AML structure
if ((*(S5Addr - 1) == 0x08 || (*(S5Addr - 2) == 0x08 && *(S5Addr - 1) == '\\')) && *(S5Addr + 4) == 0x12)
{
S5Addr += 5;
// calculate PkgLength size
S5Addr += ((*S5Addr &0xC0)>>6) +2;
if (*S5Addr == 0x0A)
S5Addr++; // skip byteprefix
SLP_TYPa = *(S5Addr) << 10;
S5Addr++;
if (*S5Addr == 0x0A)
S5Addr++; // skip byteprefix
SLP_TYPb = *(S5Addr) << 10;
SMI_CMD = facp->SMI_CMD;
ACPI_ENABLE = facp->ACPI_ENABLE;
ACPI_DISABLE = facp->ACPI_DISABLE;
PM1a_CNT = facp->PM1a_CNT_BLK;
PM1b_CNT = facp->PM1b_CNT_BLK;
PM1_CNT_LEN = facp->PM1_CNT_LEN;
SLP_EN = 1 << 13;
SCI_EN = 1;
return 0;
}
else
{
wrstr("\\_S5 parse error.\n");
}
}
else
{
wrstr("\\_S5 not present.\n");
}
}
else
{
wrstr("DSDT invalid.\n");
}
}
ptr++;
}
wrstr("no valid FACP present.\n");
}
else
{
wrstr("no acpi.\n");
}
return -1;
}
void acpiPowerOff(void)
{
// SCI_EN is set to 1 if acpi shutdown is possible
if (SCI_EN == 0)
return;
acpiEnable();
// send the shutdown command
outw((unsigned int)PM1a_CNT, SLP_TYPa | SLP_EN);
if (PM1b_CNT != 0)
outw((unsigned int)PM1b_CNT, SLP_TYPb | SLP_EN);
wrstr("acpi poweroff failed.\n");
}

4947
ableos/shitty_code_to_rewrite/signal.c
View file

File diff suppressed because it is too large Load diff

2
ableos/src/arch/x86_64/drivers/vga.rs
View file

@ -125,7 +125,7 @@ lazy_static! {
use core::fmt;
use lazy_static::lazy_static;
use spin::Mutex;
use vga::writers::Screen;
use volatile::Volatile;
#[macro_export]

6
ableos/src/arch/x86_64/interrupts.rs
View file

@ -1,11 +1,9 @@
use crate::{
arch::{drivers::vga::WRITER, gdt},
kernel_state::KERNEL_STATE,
kmain::KEY_BUFFER,
print, println,
relib::clparse,
};
use alloc::string::ToString;
use lazy_static::lazy_static;
use pic8259::ChainedPics;
use spin;
@ -101,7 +99,7 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(_stack_frame: InterruptStac
// Enter
0x0A => {
let xyz = crate::kmain::KEY_BUFFER.lock();
let _xyz = crate::kmain::KEY_BUFFER.lock();
// println!("{:?}", clparse::Command::parse(xyz.to_string()));
print!("{}", char::try_from(character).unwrap());

2
ableos/src/boot_conf.rs
View file

@ -1,5 +1,5 @@
use log::LevelFilter;
use serde::{de::value::BoolDeserializer, Deserialize, Serialize};
use serde::{Deserialize, Serialize};
#[derive(Serialize, Debug, Deserialize)]
pub enum LogLevel {

6
ableos/src/graphics/mod.rs
View file

@ -2,10 +2,10 @@ use crate::vga_e::VGAE;
use alloc::{boxed::Box, vec, vec::Vec};
use shadeable::{
evaluate_shader,
pixel_format::{new_rgba64, Rgba64},
pixel_format::{Rgba64},
};
use spin;
use vga::{colors::Color16, writers::GraphicsWriter};
use vga::{writers::GraphicsWriter};
#[derive(Debug)]
pub struct ScreenSize {
@ -137,7 +137,7 @@ impl VgaBuffer for ScreenBuffer {
let mode = VGAE.lock();
for y in 0..self.size.y {
for x in 0..self.size.x {
use shadeable::pixel_format::{get_color16, into_vga_16};
use shadeable::pixel_format::{into_vga_16};
// let vga_color = get_color16(self.buff[y * self.size.x + x]);
let vga_color = into_vga_16(self.buff[y * self.size.x + x]);

8
ableos/src/kmain.rs
View file

@ -79,8 +79,8 @@ pub fn kernel_main() -> ! {
graphics.force_redraw();
graphics.clear();
graphics.draw_filled_circle(100, 100, 5, 0x9900ff00);
screen_writer_test();
graphics.draw_filled_circle(100, 100, 50, 0x9900ff00);
graphics.copy_to_buffer();
@ -135,7 +135,7 @@ pub fn cpu_socket_startup() {
cpu_info_socket.register_protocol("CPU_INFO".to_string());
let x = master().unwrap();
let xyz = x.brand_string().unwrap();
let _xyz = x.brand_string().unwrap();
}
pub fn log_version_data() {
@ -199,8 +199,8 @@ pub fn screen_writer_test() {
sock_print_id.register_protocol("Screen Printer".to_string());
// sock_print_id.write(format!("a原 b画 cフ dァ eイ fル 集").into());
sock_print_id.write(format!("λ³ Half Life 3 booting up ㎣").into());
// sock_print_id.write(format!("Happy birthday 🎉").into());
// sock_print_id.write(format!("λ³ Half Life 3 booting up ㎣").into());
sock_print_id.write(format!("Happy birthday 🎉").into());
// sock_print_id.write(format!("1....2....3....4....5....6....7....8....9").into());
let mut prev = None;

4
ableos/src/relib/encoding/bin.rs
View file

@ -1,5 +1,5 @@
use alloc::{boxed::Box, vec::Vec};
use core::result;
use alloc::{boxed::Box};
pub struct BinCodeWriter {
pub stream: Box<u8>,