From 6e6b14958a16f3357047869bdbf8c1ec0ff9aa07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emil=20Gardstr=C3=B6m?= Date: Wed, 16 May 2018 00:52:20 +0200 Subject: [PATCH] Switched to UPPER_CASE for unions PascalCase doesn't work when we have registers named `FOO_11` and `FOO1_1`. This happened in * Freescale MKL81Z7 * Freescale MKL82Z7 * Freescale MK81F25615 * Freescale MK82F25615 on `LTC0_PK*` registers. --- src/generate/peripheral.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/generate/peripheral.rs b/src/generate/peripheral.rs index 903a69a3..33c58d18 100644 --- a/src/generate/peripheral.rs +++ b/src/generate/peripheral.rs @@ -7,7 +7,7 @@ use svd::{Cluster, ClusterInfo, Defaults, Peripheral, Register}; use syn::{self, Ident}; use errors::*; -use util::{self, ToSanitizedPascalCase, ToSanitizedSnakeCase, ToSanitizedUpperCase, BITS_PER_BYTE}; +use util::{self, ToSanitizedSnakeCase, ToSanitizedUpperCase, BITS_PER_BYTE}; use generate::register; @@ -490,7 +490,7 @@ fn register_or_cluster_block_nightly( if region.fields.len() > 1 && !block_is_union { let (type_name, name) = match region.ident.clone() { Some(prefix) => { - (Ident::new(format!("{}Union", prefix.to_sanitized_pascal_case())), + (Ident::new(format!("{}_UNION", prefix.to_sanitized_upper_case())), Ident::new(prefix)) } // If we can't find a name, fall back to the region index as a