paoda
/
zba
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(backup): resolve banking issue in flash impl

This commit is contained in:
Rekai Nyangadzayi Musuka 2022-05-27 21:17:50 -03:00
parent 517ed7a835
commit 413ff02ad9
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/bus/backup.zig
View File

@ -268,26 +268,30 @@ const Flash = struct {
self.state = .Ready; self.state = .Ready;
} }
fn shouldEraseSector(self: *const Self, idx: usize, byte: u8) bool { fn shouldEraseSector(self: *const Self, addr: usize, byte: u8) bool {
return self.prep_erase and idx & 0xFFF == 0x000 and byte == 0x30; return self.state == .Command and self.prep_erase and byte == 0x30 and addr & 0xFFF == 0x000;
} }
fn write(self: *Self, buf: []u8, idx: usize, byte: u8) void { fn write(self: *Self, buf: []u8, idx: usize, byte: u8) void {
buf[idx + if (self.bank == 1) 0x1000 else @as(usize, 0)] = byte; buf[self.baseAddress() + idx] = byte;
self.prep_write = false; self.prep_write = false;
} }
fn read(self: *const Self, buf: []u8, idx: usize) u8 { fn read(self: *const Self, buf: []u8, idx: usize) u8 {
return buf[idx + if (self.bank == 1) 0x1000 else @as(usize, 0)]; return buf[self.baseAddress() + idx];
} }
fn eraseSector(self: *Self, buf: []u8, idx: usize) void { fn eraseSector(self: *Self, buf: []u8, idx: usize) void {
const start = (idx & 0xF000) + if (self.bank == 1) 0x1000 else @as(usize, 0); const start = self.baseAddress() + (idx & 0xF000);
std.mem.set(u8, buf[start..][0..0x1000], 0xFF); std.mem.set(u8, buf[start..][0..0x1000], 0xFF);
self.prep_erase = false; self.prep_erase = false;
self.state = .Ready; self.state = .Ready;
} }
inline fn baseAddress(self: *const Self) usize {
return if (self.bank == 1) 0x10000 else @as(usize, 0);
}
}; };
const FlashState = enum { const FlashState = enum {