diff options
| author | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
| commit | 7acbfe40778bfbd03b0e2d357efef9ee9b0a34e9 (patch) | |
| tree | 90c0b95146f3d768b536658eac6a63ff9adcaaec /src/agb_flash.c | |
| parent | c0a27d5455014bfe54f7ea73e8a38ce0ed8da6da (diff) | |
| parent | e3c26e52ae6ab881ade913ca1fad2cd9629bbcb1 (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
Makefile
Diffstat (limited to 'src/agb_flash.c')
| -rw-r--r-- | src/agb_flash.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/agb_flash.c b/src/agb_flash.c index 34fb4e84a..340d469a7 100644 --- a/src/agb_flash.c +++ b/src/agb_flash.c @@ -217,7 +217,7 @@ u32 VerifyFlashSector(u16 sectorNum, u8 *src) tgt = FLASH_BASE + (sectorNum << gFlash->sector.shift); size = gFlash->sector.size; - return verifyFlashSector_Core(src, tgt, size); + return verifyFlashSector_Core(src, tgt, size); // return 0 if verified. } u32 VerifyFlashSectorNBytes(u16 sectorNum, u8 *src, u32 n) @@ -256,12 +256,12 @@ u32 VerifyFlashSectorNBytes(u16 sectorNum, u8 *src, u32 n) return verifyFlashSector_Core(src, tgt, n); } -u32 ProgramFlashSectorAndVerify(u16 sectorNum, u8 *src) +u32 ProgramFlashSectorAndVerify(u16 sectorNum, u8 *src) // 3rd is unused { u8 i; u32 result; - for (i = 0; i < 3; i++) + for (i = 0; i < 3; i++) // 3 attempts { result = ProgramFlashSector(sectorNum, src); if (result != 0) @@ -272,7 +272,7 @@ u32 ProgramFlashSectorAndVerify(u16 sectorNum, u8 *src) break; } - return result; + return result; // return 0 if verified and programmed. } u32 ProgramFlashSectorAndVerifyNBytes(u16 sectorNum, u8 *src, u32 n) |