tinygo-org/tinygo
1
0
Fork 0
mirror of https://github.com/tinygo-org/tinygo.git synced 2026-08-17 11:13:27 +00:00
Code Issues Packages Projects Releases 6 Wiki Activity

machine/atsam*, nrf, rp2040, stm32: correct error flashBlockDevice pad() function

Browse Source 
Signed-off-by: deadprogram <ron@hybridgroup.com>
This commit is contained in:
deadprogram
2023-05-05 21:34:35 +02:00
committed by Ron Evans
parent 373ab34492
commit e7363966a5
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/machine/machine_atsamd21.go
+3 -3
View File
@@ -1910,12 +1910,12 @@ func (f flashBlockDevice) EraseBlocks(start, len int64) error {
// pad data if needed so it is long enough for correct byte alignment on writes. // pad data if needed so it is long enough for correct byte alignment on writes.
func (f flashBlockDevice) pad(p []byte) []byte { func (f flashBlockDevice) pad(p []byte) []byte {
paddingNeeded := f.WriteBlockSize() - (int64(len(p)) % f.WriteBlockSize()) overflow := int64(len(p)) % f.WriteBlockSize()
if paddingNeeded == 0 { if overflow == 0 {
return p return p
} }
padding := bytes.Repeat([]byte{0xff}, int(paddingNeeded)) padding := bytes.Repeat([]byte{0xff}, int(f.WriteBlockSize()-overflow))
return append(p, padding...) return append(p, padding...)
} }
src/machine/machine_atsamd51.go
+3 -3
View File
@@ -2239,12 +2239,12 @@ func (f flashBlockDevice) EraseBlocks(start, len int64) error {
// pad data if needed so it is long enough for correct byte alignment on writes. // pad data if needed so it is long enough for correct byte alignment on writes.
func (f flashBlockDevice) pad(p []byte) []byte { func (f flashBlockDevice) pad(p []byte) []byte {
paddingNeeded := f.WriteBlockSize() - (int64(len(p)) % f.WriteBlockSize()) overflow := int64(len(p)) % f.WriteBlockSize()
if paddingNeeded == 0 { if overflow == 0 {
return p return p
} }
padding := bytes.Repeat([]byte{0xff}, int(paddingNeeded)) padding := bytes.Repeat([]byte{0xff}, int(f.WriteBlockSize()-overflow))
return append(p, padding...) return append(p, padding...)
} }
src/machine/machine_nrf.go
+3 -3
View File
@@ -396,12 +396,12 @@ func (f flashBlockDevice) EraseBlocks(start, len int64) error {
// pad data if needed so it is long enough for correct byte alignment on writes. // pad data if needed so it is long enough for correct byte alignment on writes.
func (f flashBlockDevice) pad(p []byte) []byte { func (f flashBlockDevice) pad(p []byte) []byte {
paddingNeeded := f.WriteBlockSize() - (int64(len(p)) % f.WriteBlockSize()) overflow := int64(len(p)) % f.WriteBlockSize()
if paddingNeeded == 0 { if overflow == 0 {
return p return p
} }
padding := bytes.Repeat([]byte{0xff}, int(paddingNeeded)) padding := bytes.Repeat([]byte{0xff}, int(f.WriteBlockSize()-overflow))
return append(p, padding...) return append(p, padding...)
} }
src/machine/machine_rp2040_rom.go
+3 -3
View File
@@ -236,12 +236,12 @@ func (f flashBlockDevice) EraseBlocks(start, length int64) error {
// pad data if needed so it is long enough for correct byte alignment on writes. // pad data if needed so it is long enough for correct byte alignment on writes.
func (f flashBlockDevice) pad(p []byte) []byte { func (f flashBlockDevice) pad(p []byte) []byte {
paddingNeeded := f.WriteBlockSize() - (int64(len(p)) % f.WriteBlockSize()) overflow := int64(len(p)) % f.WriteBlockSize()
if paddingNeeded == 0 { if overflow == 0 {
return p return p
} }
padding := bytes.Repeat([]byte{0xff}, int(paddingNeeded)) padding := bytes.Repeat([]byte{0xff}, int(f.WriteBlockSize()-overflow))
return append(p, padding...) return append(p, padding...)
} }
src/machine/machine_stm32_flash.go
+4 -4
View File
@@ -92,13 +92,13 @@ func (f flashBlockDevice) EraseBlocks(start, len int64) error {
// pad data if needed so it is long enough for correct byte alignment on writes. // pad data if needed so it is long enough for correct byte alignment on writes.
func (f flashBlockDevice) pad(p []byte) []byte { func (f flashBlockDevice) pad(p []byte) []byte {
paddingNeeded := f.WriteBlockSize() - (int64(len(p)) % f.WriteBlockSize()) overflow := int64(len(p)) % f.WriteBlockSize()
if paddingNeeded == 0 { if overflow == 0 {
return p return p
} }
padded := bytes.Repeat([]byte{0xff}, int(paddingNeeded)) padding := bytes.Repeat([]byte{0xff}, int(f.WriteBlockSize()-overflow))
return append(p, padded...) return append(p, padding...)
} }
const memoryStart = 0x08000000 const memoryStart = 0x08000000