From 422789eda765548e8e7a537321832bd7a2f9485e Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Mon, 5 Oct 2020 10:57:01 +0800 Subject: [PATCH] svd2utra: make svd parsing public This will be useful when replacing `csr.csv` with the svd file. Signed-off-by: Sean Cross --- svd2utra/src/generate.rs | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/svd2utra/src/generate.rs b/svd2utra/src/generate.rs index efdc68c46..b6127adb8 100644 --- a/svd2utra/src/generate.rs +++ b/svd2utra/src/generate.rs @@ -8,17 +8,18 @@ pub enum ParseError { MissingValue, ParseIntError, NonUTF8, + WriteError, } #[derive(Default, Debug)] -struct Field { +pub struct Field { name: String, lsb: usize, msb: usize, } #[derive(Default, Debug)] -struct Register { +pub struct Register { name: String, offset: usize, description: Option, @@ -26,7 +27,7 @@ struct Register { } #[derive(Default, Debug)] -struct Peripheral { +pub struct Peripheral { name: String, base: usize, size: usize, @@ -35,14 +36,14 @@ struct Peripheral { } #[derive(Default, Debug)] -struct MemoryRegion { +pub struct MemoryRegion { name: String, base: usize, size: usize, } #[derive(Default, Debug)] -struct Description { +pub struct Description { peripherals: Vec, memory_regions: Vec, } @@ -597,8 +598,7 @@ mod tests { Ok(()) } - -pub fn generate(src: T, dest: &mut U) -> Result<(), ParseError> { +pub fn parse_svd(src: T) -> Result { let mut buf = Vec::new(); let buf_reader = BufReader::new(src); let mut reader = Reader::from_reader(buf_reader); @@ -620,11 +620,16 @@ pub fn generate(src: T, dest: &mut U) -> Result<(), ParseErro } buf.clear(); } + Ok(description) +} - print_header(dest).unwrap(); - print_memory_regions(&description.memory_regions, dest).unwrap(); - print_peripherals(&description.peripherals, dest).unwrap(); - print_tests(&description.peripherals, dest).unwrap(); +pub fn generate(src: T, dest: &mut U) -> Result<(), ParseError> { + let description = parse_svd(src)?; + + print_header(dest).or(Err(ParseError::WriteError))?; + print_memory_regions(&description.memory_regions, dest).or(Err(ParseError::WriteError))?; + print_peripherals(&description.peripherals, dest).or(Err(ParseError::WriteError))?; + print_tests(&description.peripherals, dest).or(Err(ParseError::WriteError))?; Ok(()) }