esp8266/modules/flashbdev.py: Support extended block protocol.

This commit is contained in:
Damien George 2019-11-07 18:43:37 +11:00
parent d30b75e8f2
commit 6eee5413ff
1 changed files with 12 additions and 7 deletions

View File

@ -10,15 +10,17 @@ class FlashBdev:
def __init__(self, blocks=NUM_BLK): def __init__(self, blocks=NUM_BLK):
self.blocks = blocks self.blocks = blocks
def readblocks(self, n, buf): def readblocks(self, n, buf, off=0):
#print("readblocks(%s, %x(%d))" % (n, id(buf), len(buf))) #print("readblocks(%s, %x(%d), %d)" % (n, id(buf), len(buf), off))
esp.flash_read((n + self.START_SEC) * self.SEC_SIZE, buf) esp.flash_read((n + self.START_SEC) * self.SEC_SIZE + off, buf)
def writeblocks(self, n, buf): def writeblocks(self, n, buf, off=None):
#print("writeblocks(%s, %x(%d))" % (n, id(buf), len(buf))) #print("writeblocks(%s, %x(%d), %d)" % (n, id(buf), len(buf), off))
#assert len(buf) <= self.SEC_SIZE, len(buf) #assert len(buf) <= self.SEC_SIZE, len(buf)
if off is None:
esp.flash_erase(n + self.START_SEC) esp.flash_erase(n + self.START_SEC)
esp.flash_write((n + self.START_SEC) * self.SEC_SIZE, buf) off = 0
esp.flash_write((n + self.START_SEC) * self.SEC_SIZE + off, buf)
def ioctl(self, op, arg): def ioctl(self, op, arg):
#print("ioctl(%d, %r)" % (op, arg)) #print("ioctl(%d, %r)" % (op, arg))
@ -26,6 +28,9 @@ class FlashBdev:
return self.blocks return self.blocks
if op == 5: # MP_BLOCKDEV_IOCTL_BLOCK_SIZE if op == 5: # MP_BLOCKDEV_IOCTL_BLOCK_SIZE
return self.SEC_SIZE return self.SEC_SIZE
if op == 6: # MP_BLOCKDEV_IOCTL_BLOCK_ERASE
esp.flash_erase(arg + self.START_SEC)
return 0
size = esp.flash_size() size = esp.flash_size()
if size < 1024*1024: if size < 1024*1024: