Alias common::Error as CError

Author: thejpster

src/main.rs

@@ -92,7 +92,7 @@ use neotron_bmc_protocol::Receivable;
 use neotron_common_bios::{
 	self as common,
 	video::{Attr, TextBackgroundColour, TextForegroundColour},
-	MemoryRegion, Option as COption, Result as CResult,
+	Error as CError, MemoryRegion, Option as COption, Result as CResult,
 };
 
 // -----------------------------------------------------------------------------
@@ -1437,7 +1437,7 @@ pub extern "C" fn serial_get_info(_device: u8) -> COption<common::serial::Device
 /// Set the options for a given serial device. An error is returned if the
 /// options are invalid for that serial device.
 pub extern "C" fn serial_configure(_device: u8, _config: common::serial::Config) -> CResult<()> {
-	CResult::Err(common::Error::Unimplemented)
+	CResult::Err(CError::Unimplemented)
 }
 
 /// Write bytes to a serial port. There is no sense of 'opening' or
@@ -1450,7 +1450,7 @@ pub extern "C" fn serial_write(
 	_data: common::ApiByteSlice,
 	_timeout: COption<common::Timeout>,
 ) -> CResult<usize> {
-	CResult::Err(common::Error::Unimplemented)
+	CResult::Err(CError::Unimplemented)
 }
 
 /// Read bytes from a serial port. There is no sense of 'opening' or
@@ -1463,7 +1463,7 @@ pub extern "C" fn serial_read(
 	_data: common::ApiBuffer,
 	_timeout: COption<common::Timeout>,
 ) -> CResult<usize> {
-	CResult::Err(common::Error::Unimplemented)
+	CResult::Err(CError::Unimplemented)
 }
 
 /// Get the current wall time.
@@ -1555,14 +1555,14 @@ pub extern "C" fn time_clock_set(time: common::Time) {
 /// length. How it stores them is up to the BIOS - it could be EEPROM, or
 /// battery-backed SRAM.
 pub extern "C" fn configuration_get(_buffer: common::ApiBuffer) -> CResult<usize> {
-	CResult::Err(common::Error::Unimplemented)
+	CResult::Err(CError::Unimplemented)
 }
 
 /// Set the configuration data block.
 ///
 /// See `configuration_get`.
 pub extern "C" fn configuration_set(_buffer: common::ApiByteSlice) -> CResult<()> {
-	CResult::Err(common::Error::Unimplemented)
+	CResult::Err(CError::Unimplemented)
 }
 
 /// Does this Neotron BIOS support this video mode?
@@ -1583,7 +1583,7 @@ pub extern "C" fn video_set_mode(mode: common::video::Mode) -> CResult<()> {
 	if vga::set_video_mode(mode) {
 		CResult::Ok(())
 	} else {
-		CResult::Err(common::Error::UnsupportedConfiguration(0))
+		CResult::Err(CError::UnsupportedConfiguration(0))
 	}
 }
 
@@ -1625,7 +1625,7 @@ pub extern "C" fn video_get_framebuffer() -> *mut u8 {
 /// The pointer must point to enough video memory to handle the current video
 /// mode, and any future video mode you set.
 pub unsafe extern "C" fn video_set_framebuffer(_buffer: *const u8) -> CResult<()> {
-	CResult::Err(common::Error::Unimplemented)
+	CResult::Err(CError::Unimplemented)
 }
 
 /// Find out whether the given video mode needs more VRAM than we currently have.
@@ -1768,7 +1768,7 @@ fn convert_hid_event(
 
 /// Control the keyboard LEDs.
 pub extern "C" fn hid_set_leds(_leds: common::hid::KeyboardLeds) -> CResult<()> {
-	CResult::Err(common::Error::Unimplemented)
+	CResult::Err(CError::Unimplemented)
 }
 
 /// Wait for the next occurence of the specified video scan-line.
@@ -1846,7 +1846,7 @@ extern "C" fn i2c_write_read(
 	_tx2: common::ApiByteSlice,
 	_rx: common::ApiBuffer,
 ) -> CResult<()> {
-	CResult::Err(common::Error::Unimplemented)
+	CResult::Err(CError::Unimplemented)
 }
 
 extern "C" fn audio_mixer_channel_get_info(
@@ -1856,35 +1856,35 @@ extern "C" fn audio_mixer_channel_get_info(
 }
 
 extern "C" fn audio_mixer_channel_set_level(_audio_mixer_id: u8, _level: u8) -> CResult<()> {
-	CResult::Err(common::Error::Unimplemented)
+	CResult::Err(CError::Unimplemented)
 }
 
 extern "C" fn audio_output_set_config(_config: common::audio::Config) -> CResult<()> {
-	CResult::Err(common::Error::Unimplemented)
+	CResult::Err(CError::Unimplemented)
 }
 
 extern "C" fn audio_output_get_config() -> CResult<common::audio::Config> {
-	CResult::Err(common::Error::Unimplemented)
+	CResult::Err(CError::Unimplemented)
 }
 
 unsafe extern "C" fn audio_output_data(_samples: common::ApiByteSlice) -> CResult<usize> {
-	CResult::Err(common::Error::Unimplemented)
+	CResult::Err(CError::Unimplemented)
 }
 
 extern "C" fn audio_output_get_space() -> CResult<usize> {
 	CResult::Ok(0)
 }
 
 extern "C" fn audio_input_set_config(_config: common::audio::Config) -> CResult<()> {
-	CResult::Err(common::Error::Unimplemented)
+	CResult::Err(CError::Unimplemented)
 }
 
 extern "C" fn audio_input_get_config() -> CResult<common::audio::Config> {
-	CResult::Err(common::Error::Unimplemented)
+	CResult::Err(CError::Unimplemented)
 }
 
 extern "C" fn audio_input_data(_samples: common::ApiBuffer) -> CResult<usize> {
-	CResult::Err(common::Error::Unimplemented)
+	CResult::Err(CError::Unimplemented)
 }
 
 extern "C" fn audio_input_get_count() -> CResult<usize> {
@@ -1904,11 +1904,11 @@ extern "C" fn bus_write_read(
 	_tx2: common::ApiByteSlice,
 	_rx: common::ApiBuffer,
 ) -> CResult<()> {
-	CResult::Err(common::Error::Unimplemented)
+	CResult::Err(CError::Unimplemented)
 }
 
 extern "C" fn bus_exchange(_buffer: common::ApiBuffer) -> CResult<()> {
-	CResult::Err(common::Error::Unimplemented)
+	CResult::Err(CError::Unimplemented)
 }
 
 extern "C" fn bus_interrupt_status() -> u32 {
@@ -1983,7 +1983,7 @@ pub extern "C" fn block_write(
 	_num_blocks: u8,
 	_data: common::ApiByteSlice,
 ) -> CResult<()> {
-	CResult::Err(common::Error::Unimplemented)
+	CResult::Err(CError::Unimplemented)
 }
 
 /// Read one or more sectors to a block device.
@@ -2003,7 +2003,7 @@ pub extern "C" fn block_read(
 	use embedded_sdmmc::BlockDevice;
 	check_stacks();
 	if data.data_len != usize::from(num_blocks) * 512 {
-		return CResult::Err(common::Error::UnsupportedConfiguration(0));
+		return CResult::Err(CError::UnsupportedConfiguration(0));
 	}
 	let mut lock = HARDWARE.lock();
 	let hw = lock.as_mut().unwrap();
@@ -2014,7 +2014,7 @@ pub extern "C" fn block_read(
 				hw.sdcard_poll();
 				let info = match &hw.card_state {
 					CardState::Online(info) => info.clone(),
-					_ => return CResult::Err(common::Error::NoMediaFound),
+					_ => return CResult::Err(CError::NoMediaFound),
 				};
 				// Run card at full speed
 				let spi = sdcard::FakeSpi(hw, false);
@@ -2036,13 +2036,13 @@ pub extern "C" fn block_read(
 					Ok(_) => CResult::Ok(()),
 					Err(e) => {
 						defmt::warn!("SD error reading {}: {:?}", block.0, e);
-						CResult::Err(common::Error::DeviceError(0))
+						CResult::Err(CError::DeviceError(0))
 					}
 				}
 			}
 			_ => {
 				// Nothing else supported by this BIOS
-				CResult::Err(common::Error::InvalidDevice)
+				CResult::Err(CError::InvalidDevice)
 			}
 		}
 	};
@@ -2066,7 +2066,7 @@ pub extern "C" fn block_verify(
 	_num_blocks: u8,
 	_data: common::ApiByteSlice,
 ) -> CResult<()> {
-	CResult::Err(common::Error::Unimplemented)
+	CResult::Err(CError::Unimplemented)
 }
 
 extern "C" fn block_dev_eject(_dev_id: u8) -> CResult<()> {