Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update cmsis-svd library, and fix incompatiblitiy with gen-device-svd #4625

Merged
merged 2 commits into from
Nov 22, 2024
+11 −4
Merged

Update cmsis-svd library, and fix incompatiblitiy with gen-device-svd #4625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3315ad
Update cmsis-svd library
cibomahto Nov 21, 2024
8b8b083
Fix invalid assembler syntax from gen-device-svd
cibomahto Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/cmsis-svd
Open in desktop
Submodule cmsis-svd updated 19 files
+105,849 −0 data/RaspberryPi/rp2350.svd
+1 −0 data/STMicro/Contents.txt
+89,540 −0 data/STMicro/STM32U031.svd
+97,238 −0 data/STMicro/STM32U073.svd
+98,312 −0 data/STMicro/STM32U083.svd
+145,736 −0 data/STMicro/STM32U535.svd
+148,115 −0 data/STMicro/STM32U545.svd
+185,797 −0 data/STMicro/STM32U575.svd
+186,417 −0 data/STMicro/STM32U585.svd
+215,697 −0 data/STMicro/STM32U595.svd
+293,551 −0 data/STMicro/STM32U599.svd
+218,084 −0 data/STMicro/STM32U5A5.svd
+295,938 −0 data/STMicro/STM32U5A9.svd
+339,410 −0 data/STMicro/STM32U5Fx.svd
+341,797 −0 data/STMicro/STM32U5Gx.svd
+6 −0 data/SiFive-Community/LICENSE
+8 −0 data/SiFive-Community/README.md
+491 −0 data/SiFive-Community/fu540.svd
+2,800 −0 data/SiFive-Community/fu740.svd
13 changes: 10 additions & 3 deletions tools/gen-device-svd/gen-device-svd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,13 @@ func readSVD(path, sourceURL string) (*Device, error) {
return interruptList[i].PeripheralIndex < interruptList[j].PeripheralIndex
})

// Properly format the description, with comments.
description := ""
if text := device.Description; text != "" {
description = "// " + strings.ReplaceAll(text, "\n", "\n// ")
description = regexp.MustCompile(`\s+\n`).ReplaceAllString(description, "\n")
}

// Properly format the license block, with comments.
licenseBlock := ""
if text := formatText(device.LicenseText); text != "" {
Expand All @@ -460,7 +467,7 @@ func readSVD(path, sourceURL string) (*Device, error) {
DescriptorSource: sourceURL,
Name: device.Name,
NameLower: nameLower,
Description: strings.TrimSpace(device.Description),
Description: description,
LicenseBlock: licenseBlock,
}
if device.CPU != nil {
Expand Down Expand Up @@ -902,7 +909,7 @@ func writeGo(outdir string, device *Device, interruptSystem string) error {

//go:build {{.pkgName}} && {{.device.Metadata.NameLower}}

// {{.device.Metadata.Description}}
{{.device.Metadata.Description}}
//
{{.device.Metadata.LicenseBlock}}
package {{.pkgName}}
Expand Down Expand Up @@ -1350,7 +1357,7 @@ func writeAsm(outdir string, device *Device) error {
t := template.Must(template.New("go").Parse(`// Automatically generated file. DO NOT EDIT.
// Generated by gen-device-svd.go from {{.File}}, see {{.DescriptorSource}}

// {{.Description}}
{{.Description}}
//
{{.LicenseBlock}}

Expand Down