svd2utra: make svd parsing public

This will be useful when replacing `csr.csv` with the svd file.

Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
Sean Cross 2020-10-05 10:57:01 +08:00
parent 30abc1413a
commit 422789eda7

View file

@ -8,17 +8,18 @@ pub enum ParseError {
MissingValue, MissingValue,
ParseIntError, ParseIntError,
NonUTF8, NonUTF8,
WriteError,
} }
#[derive(Default, Debug)] #[derive(Default, Debug)]
struct Field { pub struct Field {
name: String, name: String,
lsb: usize, lsb: usize,
msb: usize, msb: usize,
} }
#[derive(Default, Debug)] #[derive(Default, Debug)]
struct Register { pub struct Register {
name: String, name: String,
offset: usize, offset: usize,
description: Option<String>, description: Option<String>,
@ -26,7 +27,7 @@ struct Register {
} }
#[derive(Default, Debug)] #[derive(Default, Debug)]
struct Peripheral { pub struct Peripheral {
name: String, name: String,
base: usize, base: usize,
size: usize, size: usize,
@ -35,14 +36,14 @@ struct Peripheral {
} }
#[derive(Default, Debug)] #[derive(Default, Debug)]
struct MemoryRegion { pub struct MemoryRegion {
name: String, name: String,
base: usize, base: usize,
size: usize, size: usize,
} }
#[derive(Default, Debug)] #[derive(Default, Debug)]
struct Description { pub struct Description {
peripherals: Vec<Peripheral>, peripherals: Vec<Peripheral>,
memory_regions: Vec<MemoryRegion>, memory_regions: Vec<MemoryRegion>,
} }
@ -597,8 +598,7 @@ mod tests {
Ok(()) Ok(())
} }
pub fn parse_svd<T: Read>(src: T) -> Result<Description, ParseError> {
pub fn generate<T: Read, U: Write>(src: T, dest: &mut U) -> Result<(), ParseError> {
let mut buf = Vec::new(); let mut buf = Vec::new();
let buf_reader = BufReader::new(src); let buf_reader = BufReader::new(src);
let mut reader = Reader::from_reader(buf_reader); let mut reader = Reader::from_reader(buf_reader);
@ -620,11 +620,16 @@ pub fn generate<T: Read, U: Write>(src: T, dest: &mut U) -> Result<(), ParseErro
} }
buf.clear(); buf.clear();
} }
Ok(description)
}
print_header(dest).unwrap(); pub fn generate<T: Read, U: Write>(src: T, dest: &mut U) -> Result<(), ParseError> {
print_memory_regions(&description.memory_regions, dest).unwrap(); let description = parse_svd(src)?;
print_peripherals(&description.peripherals, dest).unwrap();
print_tests(&description.peripherals, dest).unwrap(); 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(()) Ok(())
} }