Cargo.toml

@@ -1,12 +1,17 @@
 [package]
 name = "vga"
-version = "0.2.7"
+version = "0.2.6"
 authors = ["Ryan Kennedy <rkennedy9064@gmail.com>"]
 edition = "2018"
 description = "Support for vga specific functions, data structures, and registers."
 documentation = "https://docs.rs/vga"
-keywords = ["vga", "no_std"]
-categories = ["no-std"]
+keywords = [
+    "vga",
+    "no_std",
+]
+categories = [
+    "no-std",
+]
 license = "MIT/Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/rust-osdev/vga"
@@ -15,20 +20,11 @@ repository = "https://github.com/rust-osdev/vga"
 
 [dependencies]
 bitflags = "1.2.1"
-spin = "0.9"
-log = "*"
+conquer-once = { version = "0.2.1", default-features = false }
+font8x8 = { version = "0.2.5", default-features = false, features = ["unicode"] }
+spinning_top = { version = "0.2.2", features = ["nightly"] }
+x86_64 = "0.13.2"
 
-conquer-once = { version = "0.3.2", default-features = false }
-font8x8 = { version = "0.3.1", default-features = false, features = [
-    "unicode",
-] }
-spinning_top = { version = "0.2.4", features = ["nightly"] }
-x86_64 = "0.14.2"
 [dependencies.num-traits]
 version = "0.2.14"
 default-features = false
-
-[dependencies.ab_glyph]
-version = "0.2.15"
-default-features = false
-features = ["libm"]

src/colors.rs

@@ -69,6 +69,7 @@ impl TextModeColor {
         self.0 = foreground as u8;
     }
 }
+
 /// Represents the default vga 256 color palette.
 pub const DEFAULT_PALETTE: [u8; PALETTE_SIZE] = [
     0x0, 0x0, 0x0, 0x0, 0x0, 0x2A, 0x0, 0x2A, 0x0, 0x0, 0x2A, 0x2A, 0x2A, 0x0, 0x0, 0x2A, 0x0,

src/lib.rs

@@ -7,8 +7,6 @@
 #![no_std]
 #![warn(missing_docs)]
 
-extern crate alloc;
-
 pub mod colors;
 pub mod configurations;
 pub mod drawing;

src/writers/graphics_640x480x16.rs

@@ -5,7 +5,6 @@ use crate::{
     registers::{PlaneMask, WriteMode},
     vga::{VideoMode, VGA},
 };
-use core::convert::From;
 use font8x8::UnicodeFonts;
 
 const WIDTH: usize = 640;
@@ -123,89 +122,15 @@ impl Graphics640x480x16 {
 
     #[inline]
     fn _set_pixel(self, x: usize, y: usize, color: Color16) {
-        if x < 640 && y < 480 {
-            let frame_buffer = self.get_frame_buffer();
-            let offset = x / 8 + y * WIDTH_IN_BYTES;
-            let pixel_mask = 0x80 >> (x & 0x07);
-            VGA.lock()
-                .graphics_controller_registers
-                .set_bit_mask(pixel_mask);
-            unsafe {
-                frame_buffer.add(offset).read_volatile();
-                frame_buffer.add(offset).write_volatile(u8::from(color));
-            }
-        }
-    }
-}
-
-use ab_glyph::{Font, FontRef, Glyph};
-use log::trace;
-use spin::Lazy;
-
-const FONT_BASIC: Lazy<FontRef> = Lazy::new({
-    || FontRef::try_from_slice(include_bytes!("../../assets/fonts/unifont-14.0.01.ttf")).unwrap()
-});
-
-const FONT_SUPPLEMENTARY: Lazy<FontRef> = Lazy::new(|| {
-    FontRef::try_from_slice(include_bytes!(
-        "../../assets/fonts/unifont_upper-14.0.01.ttf"
-    ))
-    .unwrap()
-});
-
-const FONT_SCALE: f32 = 14.0;
-const GLYPH_HEIGHT: f32 = 10.0;
-const GLYPH_WIDTH: f32 = 8.0;
-
-impl Graphics640x480x16 {
-    /// Draw a glyph on the screen at the given position
-    ///
-    /// # Arguments
-    /// * `x` - the x position of the glyph
-    /// * `y` - the y position of the glyph
-    /// * `glyph` - the glyph to draw
-    /// * `color` - the color of the glyph
-    pub fn draw_unicode_char(&self, mut x: usize, mut y: usize, character: char, color: Color16) {
-        self.set_write_mode_2();
-
-        // trace!("Char {}", character);
-
-        // if character == '\n' {
-        //     return;
-        // }
-        if x == 80 {
-            x = 0;
-            y += 1;
-        }
-
-        if character != '\0' {
-            let real_x = x as f32 * GLYPH_WIDTH;
-            let real_y = (y as f32 + 1.0) * GLYPH_HEIGHT;
-            // trace!("REALX{}\nREALY{}", real_x, real_y);
-
-            let in_supp_plane = character as u32 > 0xffff;
-
-            let plane = match in_supp_plane {
-                false => FONT_BASIC,
-                true => FONT_SUPPLEMENTARY,
-            };
-
-            let q_glyph: Glyph = plane
-                .glyph_id(character)
-                .with_scale_and_position(FONT_SCALE, ab_glyph::point(real_x, real_y));
-
-            if let Some(q) = plane.outline_glyph(q_glyph) {
-                q.draw(|gx, gy, c| {
-                    if c > 0.1 {
-                        let corner = q.px_bounds().min;
-                        self._set_pixel(
-                            gx as usize + corner.x as usize,
-                            gy as usize + corner.y as usize,
-                            color,
-                        );
-                    }
-                });
-            }
+        let frame_buffer = self.get_frame_buffer();
+        let offset = x / 8 + y * WIDTH_IN_BYTES;
+        let pixel_mask = 0x80 >> (x & 0x07);
+        VGA.lock()
+            .graphics_controller_registers
+            .set_bit_mask(pixel_mask);
+        unsafe {
+            frame_buffer.add(offset).read_volatile();
+            frame_buffer.add(offset).write_volatile(u8::from(color));
         }
     }
 }

testing/Cargo.toml

@@ -6,12 +6,12 @@ edition = "2018"
 
 [dependencies]
 bootloader = { version = "0.9.11", features = ["map_physical_memory"] }
-conquer-once = { version = "0.3.2", default-features = false }
-spinning_top = { version = "0.2.4", features = ["nightly"] }
-pic8259 = "0.10.1"
+conquer-once = { version = "0.2.1", default-features = false }
+spinning_top = { version = "0.2.2", features = ["nightly"] }
+pic8259_simple = "0.2.0"
 vga = { path = "../" }
-uart_16550 = "0.2.14"
-x86_64 = "0.14.2"
+uart_16550 = "0.2.10"
+x86_64 = "0.13.2"
 
 [package.metadata.bootimage]
 test-args = [

testing/src/interrupts.rs

@@ -2,7 +2,7 @@ use crate::gdt;
 use crate::{hlt_loop, serial_print, serial_println};
 use conquer_once::spin::Lazy;
 use core::convert::Into;
-use pic8259::ChainedPics;
+use pic8259_simple::ChainedPics;
 use spinning_top::Spinlock;
 use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame, PageFaultErrorCode};
 
@@ -49,14 +49,14 @@ pub fn init_idt() {
 }
 
 extern "x86-interrupt" fn double_fault_handler(
-    stack_frame: InterruptStackFrame,
+    stack_frame: &mut InterruptStackFrame,
     _error_code: u64,
 ) -> ! {
     panic!("EXCEPTION: DOUBLE FAULT\n{:#?}", stack_frame);
 }
 
 extern "x86-interrupt" fn page_fault_handler(
-    stack_frame: InterruptStackFrame,
+    stack_frame: &mut InterruptStackFrame,
     error_code: PageFaultErrorCode,
 ) {
     use x86_64::registers::control::Cr2;
@@ -69,7 +69,7 @@ extern "x86-interrupt" fn page_fault_handler(
 }
 
 extern "x86-interrupt" fn segment_not_present(
-    _stack_frame: InterruptStackFrame,
+    _stack_frame: &mut InterruptStackFrame,
     _error_code: u64,
 ) {
     // For some reason this sometimes gets thrown when running tests in qemu,