Skip to content

Commit 3cc0a3a

Browse files
author
nofeletru
committed
Исправлена запись SPI флешек размером 128Mbit
1 parent c4cb2ec commit 3cc0a3a

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

software/main.pas

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ procedure WriteFlash25(var RomStream: TMemoryStream; StartAddress, WriteSize: ca
489489
try
490490

491491
//Проверяем тип адресации 256+Mbit
492-
if WriteSize > 16777215 then
492+
if WriteSize > 16777216 then
493493
begin
494494
UsbAsp25_ReadSR(hUSBDev, sreg, $15);
495495
if isBitSet(sreg, 0) then addr32bit4byte := true;
@@ -527,7 +527,7 @@ procedure WriteFlash25(var RomStream: TMemoryStream; StartAddress, WriteSize: ca
527527
if WriteType = WT_PAGE then
528528
begin
529529

530-
if WriteSize > 16777215 then //Память больше 128Мбит
530+
if WriteSize > 16777216 then //Память больше 128Мбит
531531
begin
532532
if addr32bit4byte then //4 байтная адресация включена
533533
BytesWrite := BytesWrite + UsbAsp25_Write32bitAddr(hUSBDev, $02, Address, datachunk, PageSize)
@@ -536,7 +536,7 @@ procedure WriteFlash25(var RomStream: TMemoryStream; StartAddress, WriteSize: ca
536536
//3 байтовая адресация включена
537537

538538
//старший байт адреса
539-
if Address > 16777215 then
539+
if Address > 16777216 then
540540
begin
541541
UsbAsp25_WriteSR(hUSBDev, hi(hi(Address)), $c5);
542542
UsbAsp25_WREN(hUSBDev);
@@ -561,7 +561,7 @@ procedure WriteFlash25(var RomStream: TMemoryStream; StartAddress, WriteSize: ca
561561
if (MainForm.MenuAutoCheck.Checked) and (WriteType = WT_PAGE) then
562562
begin
563563

564-
if WriteSize > 16777215 then
564+
if WriteSize > 16777216 then
565565
UsbAsp25_Read32bitAddr(hUSBDev, $13, Address, datachunk2, PageSize)
566566
else
567567
UsbAsp25_Read(hUSBDev, $03, Address, datachunk2, PageSize);
@@ -822,7 +822,7 @@ procedure ReadFlash25(var RomStream: TMemoryStream; StartAddress, ChipSize: card
822822
begin
823823
if ChunkSize > (ChipSize - Address) then ChunkSize := ChipSize - Address;
824824

825-
if ChipSize > 16777215 then
825+
if ChipSize > 16777216 then
826826
BytesRead := BytesRead + UsbAsp25_Read32bitAddr(hUSBDev, $13, Address, datachunk, ChunkSize)
827827
else
828828
BytesRead := BytesRead + UsbAsp25_Read(hUSBDev, $03, Address, datachunk, ChunkSize);
@@ -1034,7 +1034,7 @@ procedure VerifyFlash25(var RomStream: TMemoryStream; StartAddress, DataSize: ca
10341034
begin
10351035
if ChunkSize > (DataSize - Address) then ChunkSize := DataSize - Address;
10361036

1037-
if DataSize > 16777215 then
1037+
if DataSize > 16777216 then
10381038
BytesRead := BytesRead + UsbAsp25_Read32bitAddr(hUSBDev, $13, Address, datachunk, ChunkSize)
10391039
else
10401040
BytesRead := BytesRead + UsbAsp25_Read(hUSBDev, $03, Address, datachunk, ChunkSize);

0 commit comments

Comments
 (0)