@@ -653,7 +653,7 @@ fn expand_cluster(cluster: &Cluster, config: &Config) -> Result<Vec<RegisterBloc
653
653
654
654
match cluster {
655
655
Cluster :: Single ( info) => cluster_expanded. push ( RegisterBlockField {
656
- syn_field : convert_svd_cluster ( cluster) ?,
656
+ syn_field : cluster_to_syn_field ( cluster) ?,
657
657
description : info. description . as_ref ( ) . unwrap_or ( & info. name ) . into ( ) ,
658
658
offset : info. address_offset ,
659
659
size : cluster_size,
@@ -682,7 +682,7 @@ fn expand_cluster(cluster: &Cluster, config: &Config) -> Result<Vec<RegisterBloc
682
682
if array_convertible {
683
683
if sequential_indexes_from0 {
684
684
cluster_expanded. push ( RegisterBlockField {
685
- syn_field : convert_svd_cluster ( cluster) ?,
685
+ syn_field : cluster_to_syn_field ( cluster) ?,
686
686
description : info. description . as_ref ( ) . unwrap_or ( & info. name ) . into ( ) ,
687
687
offset : info. address_offset ,
688
688
size : cluster_size * array_info. dim ,
@@ -713,7 +713,7 @@ fn expand_cluster(cluster: &Cluster, config: &Config) -> Result<Vec<RegisterBloc
713
713
} ) ;
714
714
}
715
715
cluster_expanded. push ( RegisterBlockField {
716
- syn_field : convert_svd_cluster ( cluster) ?,
716
+ syn_field : cluster_to_syn_field ( cluster) ?,
717
717
description : description. into ( ) ,
718
718
offset : info. address_offset ,
719
719
size : cluster_size * array_info. dim ,
@@ -753,7 +753,7 @@ fn expand_register(register: &Register, config: &Config) -> Result<Vec<RegisterB
753
753
754
754
match register {
755
755
Register :: Single ( info) => register_expanded. push ( RegisterBlockField {
756
- syn_field : convert_svd_register ( register, config. ignore_groups )
756
+ syn_field : register_to_syn_field ( register, config. ignore_groups )
757
757
. with_context ( || "syn error occured" ) ?,
758
758
description : info. description . clone ( ) . unwrap_or_default ( ) ,
759
759
offset : info. address_offset ,
@@ -783,7 +783,7 @@ fn expand_register(register: &Register, config: &Config) -> Result<Vec<RegisterB
783
783
784
784
if sequential_indexes_from0 {
785
785
register_expanded. push ( RegisterBlockField {
786
- syn_field : convert_svd_register ( register, config. ignore_groups ) ?,
786
+ syn_field : register_to_syn_field ( register, config. ignore_groups ) ?,
787
787
description : info. description . clone ( ) . unwrap_or_default ( ) ,
788
788
offset : info. address_offset ,
789
789
size : register_size * array_info. dim ,
@@ -815,7 +815,7 @@ fn expand_register(register: &Register, config: &Config) -> Result<Vec<RegisterB
815
815
} ) ;
816
816
}
817
817
register_expanded. push ( RegisterBlockField {
818
- syn_field : convert_svd_register ( register, config. ignore_groups ) ?,
818
+ syn_field : register_to_syn_field ( register, config. ignore_groups ) ?,
819
819
description,
820
820
offset : info. address_offset ,
821
821
size : register_size * array_info. dim ,
@@ -941,12 +941,12 @@ fn expand_svd_register(register: &Register, ignore_group: bool) -> Result<Vec<sy
941
941
}
942
942
Ok ( out)
943
943
} else {
944
- Ok ( vec ! [ convert_svd_register ( register, ignore_group) ?] )
944
+ Ok ( vec ! [ register_to_syn_field ( register, ignore_group) ?] )
945
945
}
946
946
}
947
947
948
948
/// Convert a parsed `Register` into its `Field` equivalent
949
- fn convert_svd_register ( register : & Register , ignore_group : bool ) -> Result < syn:: Field > {
949
+ fn register_to_syn_field ( register : & Register , ignore_group : bool ) -> Result < syn:: Field > {
950
950
Ok ( match register {
951
951
Register :: Single ( info) => {
952
952
let info_name = info. fullname ( ignore_group) ;
@@ -1011,12 +1011,12 @@ fn expand_svd_cluster(cluster: &Cluster) -> Result<Vec<syn::Field>, syn::Error>
1011
1011
}
1012
1012
Ok ( out)
1013
1013
} else {
1014
- Ok ( vec ! [ convert_svd_cluster ( cluster) ?] )
1014
+ Ok ( vec ! [ cluster_to_syn_field ( cluster) ?] )
1015
1015
}
1016
1016
}
1017
1017
1018
1018
/// Convert a parsed `Cluster` into its `Field` equivalent
1019
- fn convert_svd_cluster ( cluster : & Cluster ) -> Result < syn:: Field , syn:: Error > {
1019
+ fn cluster_to_syn_field ( cluster : & Cluster ) -> Result < syn:: Field , syn:: Error > {
1020
1020
Ok ( match cluster {
1021
1021
Cluster :: Single ( info) => {
1022
1022
let ty_name = util:: replace_suffix ( & info. name , "" ) ;
0 commit comments