machine/atsam*, nrf, rp2040, stm32: correct error flashBlockDevice pad() function
Signed-off-by: deadprogram <ron@hybridgroup.com>
Этот коммит содержится в:
родитель
373ab34492
коммит
e7363966a5
5 изменённых файлов: 16 добавлений и 16 удалений
|
@ -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...)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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...)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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...)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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...)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
Загрузка…
Создание таблицы
Сослаться в новой задаче