Skip to content

Commit fa814a3

Browse files
committed
Make Trinket M0 build fit; make RAMFS in vfs_fat_* tests be compliant with expected API
1 parent e724bc1 commit fa814a3

File tree

6 files changed

+11
-1
lines changed

6 files changed

+11
-1
lines changed

ports/atmel-samd/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ else
114114
# -finline-limit=80 or so is similar to not having it on.
115115
# There is no simple default value, though.
116116
ifdef INTERNAL_FLASH_FILESYSTEM
117-
CFLAGS += -finline-limit=60
117+
CFLAGS += -finline-limit=55
118118
endif
119119
CFLAGS += -flto
120120
endif

tests/extmod/vfs_fat_fileio1.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,13 @@ def readblocks(self, n, buf):
2727
#print("readblocks(%s, %x(%d))" % (n, id(buf), len(buf)))
2828
for i in range(len(buf)):
2929
buf[i] = self.data[n * self.SEC_SIZE + i]
30+
return 0
3031

3132
def writeblocks(self, n, buf):
3233
#print("writeblocks(%s, %x)" % (n, id(buf)))
3334
for i in range(len(buf)):
3435
self.data[n * self.SEC_SIZE + i] = buf[i]
36+
return 0
3537

3638
def ioctl(self, op, arg):
3739
#print("ioctl(%d, %r)" % (op, arg))

tests/extmod/vfs_fat_fileio2.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,13 @@ def readblocks(self, n, buf):
2727
#print("readblocks(%s, %x(%d))" % (n, id(buf), len(buf)))
2828
for i in range(len(buf)):
2929
buf[i] = self.data[n * self.SEC_SIZE + i]
30+
return 0
3031

3132
def writeblocks(self, n, buf):
3233
#print("writeblocks(%s, %x)" % (n, id(buf)))
3334
for i in range(len(buf)):
3435
self.data[n * self.SEC_SIZE + i] = buf[i]
36+
return 0
3537

3638
def ioctl(self, op, arg):
3739
#print("ioctl(%d, %r)" % (op, arg))

tests/extmod/vfs_fat_more.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,13 @@ def readblocks(self, n, buf):
2727
#print("readblocks(%s, %x(%d))" % (n, id(buf), len(buf)))
2828
for i in range(len(buf)):
2929
buf[i] = self.data[n * self.SEC_SIZE + i]
30+
return 0
3031

3132
def writeblocks(self, n, buf):
3233
#print("writeblocks(%s, %x)" % (n, id(buf)))
3334
for i in range(len(buf)):
3435
self.data[n * self.SEC_SIZE + i] = buf[i]
36+
return 0
3537

3638
def ioctl(self, op, arg):
3739
#print("ioctl(%d, %r)" % (op, arg))

tests/extmod/vfs_fat_oldproto.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,13 @@ def readblocks(self, n, buf):
2525
#print("readblocks(%s, %x(%d))" % (n, id(buf), len(buf)))
2626
for i in range(len(buf)):
2727
buf[i] = self.data[n * self.SEC_SIZE + i]
28+
return 0
2829

2930
def writeblocks(self, n, buf):
3031
#print("writeblocks(%s, %x)" % (n, id(buf)))
3132
for i in range(len(buf)):
3233
self.data[n * self.SEC_SIZE + i] = buf[i]
34+
return 0
3335

3436
def sync(self):
3537
pass

tests/extmod/vfs_fat_ramdisk.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,13 @@ def readblocks(self, n, buf):
2626
#print("readblocks(%s, %x(%d))" % (n, id(buf), len(buf)))
2727
for i in range(len(buf)):
2828
buf[i] = self.data[n * self.SEC_SIZE + i]
29+
return 0
2930

3031
def writeblocks(self, n, buf):
3132
#print("writeblocks(%s, %x)" % (n, id(buf)))
3233
for i in range(len(buf)):
3334
self.data[n * self.SEC_SIZE + i] = buf[i]
35+
return 0
3436

3537
def ioctl(self, op, arg):
3638
#print("ioctl(%d, %r)" % (op, arg))

0 commit comments

Comments
 (0)