Use Attr from common_bios.

Now we have nice constants for the palette colours.

Author: jonathanpallant

src/main.rs

@@ -83,7 +83,10 @@ use rp_pico::{
 };
 
 // Other Neotron Crates
-use common::MemoryRegion;
+use common::{
+	video::{Attr, TextBackgroundColour, TextForegroundColour},
+	MemoryRegion,
+};
 use neotron_bmc_commands::Command;
 use neotron_bmc_protocol::Receivable;
 use neotron_common_bios as common;
@@ -1054,16 +1057,32 @@ fn sign_on() {
 
 	tc.move_to(0, 0);
 
-	tc.change_attr(vga::Attr::new(11, 4));
+	tc.change_attr(Attr::new(
+		TextForegroundColour::BRIGHT_YELLOW,
+		TextBackgroundColour::BLUE,
+		false,
+	));
 	write!(&tc, "{LOGO_TEXT}").unwrap();
 
-	tc.change_attr(vga::Attr::new(15, 0));
+	tc.change_attr(Attr::new(
+		TextForegroundColour::WHITE,
+		TextBackgroundColour::BLACK,
+		false,
+	));
 	write!(&tc, "{LICENCE_TEXT}").unwrap();
 
-	tc.change_attr(vga::Attr::new(15, 4));
+	tc.change_attr(Attr::new(
+		TextForegroundColour::WHITE,
+		TextBackgroundColour::BLUE,
+		false,
+	));
 	writeln!(&tc, "BIOS Version: {}", VERSION.trim_matches('\0')).unwrap();
 
-	tc.change_attr(vga::Attr::new(15, 1));
+	tc.change_attr(Attr::new(
+		TextForegroundColour::WHITE,
+		TextBackgroundColour::DARK_RED,
+		false,
+	));
 	let bmc_ver = critical_section::with(|cs| {
 		let mut lock = HARDWARE.borrow_ref_mut(cs);
 		let hw = lock.as_mut().unwrap();
@@ -1088,15 +1107,28 @@ fn sign_on() {
 		}
 	}
 
-	tc.change_attr(vga::Attr::new(15, 0));
+	tc.change_attr(Attr::new(
+		TextForegroundColour::WHITE,
+		TextBackgroundColour::BLACK,
+		false,
+	));
 	writeln!(&tc).unwrap();
 	writeln!(&tc).unwrap();
 
 	// Do a colour test
 	for bg in 0..=7 {
 		for fg in 0..=15 {
 			if fg != bg {
-				tc.change_attr(vga::Attr::new(fg, bg));
+				tc.change_attr(
+					// Safety: The loop above ensures bg and fg stay within bounds (0..=7 and 0..=15)
+					unsafe {
+						Attr::new(
+							TextForegroundColour::new_unchecked(fg),
+							TextBackgroundColour::new_unchecked(bg),
+							false,
+						)
+					},
+				);
 				write!(&tc, "ABCabc123#!").unwrap();
 			}
 		}

src/vga/mod.rs

@@ -41,6 +41,7 @@ mod font8;
 
 use core::sync::atomic::{AtomicBool, AtomicPtr, AtomicU16, AtomicU8, Ordering};
 use defmt::{debug, trace};
+use neotron_common_bios::video::{Attr, TextBackgroundColour, TextForegroundColour};
 use rp_pico::{hal::pio::PIOExt, pac::interrupt};
 
 // -----------------------------------------------------------------------------
@@ -146,11 +147,6 @@ pub struct RGBPair(u32);
 #[derive(Copy, Clone, PartialEq, Eq)]
 pub struct Glyph(u8);
 
-/// Represents VGA format foreground/background attributes.
-#[repr(transparent)]
-#[derive(Copy, Clone, PartialEq, Eq)]
-pub struct Attr(u8);
-
 /// Represents a glyph/attribute pair. This is what out text console is made
 /// out of. They work in exactly the same way as IBM PC VGA.
 #[repr(transparent)]
@@ -306,6 +302,10 @@ pub mod colours {
 }
 
 /// Holds the 256-entry palette for indexed colour modes.
+///
+/// Note, the first eight entries should match
+/// [`neotron_common_bios::video::TextBackgroundColour`] and the first 16 entries
+/// should meatch [`neotron_common_bios::video::TextForegroundColour`].
 pub static VIDEO_PALETTE: [AtomicU16; 256] = [
 	// Index 000: 0x000 (Black)
 	AtomicU16::new(RGBColour::from_12bit(0x0, 0x0, 0x0).0),
@@ -1509,7 +1509,14 @@ impl TextConsole {
 			current_col: AtomicU16::new(0),
 			text_buffer: AtomicPtr::new(core::ptr::null_mut()),
 			// White on Black, with the default palette
-			current_attr: AtomicU8::new(Attr::new(15, 0).0),
+			current_attr: AtomicU8::new(
+				Attr::new(
+					TextForegroundColour::WHITE,
+					TextBackgroundColour::BLACK,
+					false,
+				)
+				.0,
+			),
 		}
 	}
 
@@ -2087,18 +2094,6 @@ impl RGBPair {
 	}
 }
 
-impl Attr {
-	/// Construct a new `Attr` from a foreground and a background index.
-	///
-	/// * The `fg` value must be in the range `0..=15`.
-	/// * The `bg` value must be in the range `0..=7`.
-	pub const fn new(fg: u8, bg: u8) -> Attr {
-		let mut result = (bg & 0x07) << 4;
-		result |= fg & 0x0F;
-		Attr(result)
-	}
-}
-
 impl GlyphAttr {
 	/// Make a new glyph/attribute pair.
 	pub const fn new(glyph: Glyph, attr: Attr) -> GlyphAttr {
@@ -2148,7 +2143,13 @@ impl TextColourLookup {
 	fn init(&mut self, palette: &[AtomicU16]) {
 		for (fg, fg_colour) in palette.iter().take(16).enumerate() {
 			for (bg, bg_colour) in palette.iter().take(8).enumerate() {
-				let attr = Attr::new(fg as u8, bg as u8);
+				let attr = unsafe {
+					Attr::new(
+						TextForegroundColour::new_unchecked(fg as u8),
+						TextBackgroundColour::new_unchecked(bg as u8),
+						false,
+					)
+				};
 				for pixels in 0..=3 {
 					let index: usize = (((attr.0 & 0x7F) as usize) << 2) | (pixels & 0x03) as usize;
 					let pair = RGBPair::from_pixels(