Mirrors/m1n1
2
0
Fork 0
mirror of https://github.com/AsahiLinux/m1n1 synced 2024-11-21 22:23:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

afk.rbep: s/BLOCK_SIZE/BLOCK_STEP/

Browse source 
Otherwise the previous commit is way too confusing.

Signed-off-by: Eileen Yoon <eyn@gmx.com>
This commit is contained in:
Eileen Yoon 2024-01-23 21:58:29 +09:00 committed by Hector Martin
parent 476c31e973
commit eebff23b5a
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
proxyclient/m1n1/fw/afk/rbep.py
View file

@ -79,7 +79,7 @@ size by dividing by 3.
""" """
class AFKRingBuf(Reloadable): class AFKRingBuf(Reloadable):
BLOCK_SIZE = 0x40 BLOCK_STEP = 0x40
BLOCK_COUNT = 3 BLOCK_COUNT = 3
def __init__(self, ep, base, size): def __init__(self, ep, base, size):
@ -87,12 +87,12 @@ class AFKRingBuf(Reloadable):
self.base = base self.base = base
bs, unk = struct.unpack("<II", self.read_buf(0, 8)) bs, unk = struct.unpack("<II", self.read_buf(0, 8))
# calculate stride # calculate block_size
# bs + self.BLOCK_COUNT * stride) == size # bs + self.BLOCK_COUNT * block_size) == size
assert((size - bs) % self.BLOCK_COUNT == 0) assert((size - bs) % self.BLOCK_COUNT == 0)
stride = (size - bs) // self.BLOCK_COUNT block_size = (size - bs) // self.BLOCK_COUNT
assert(stride % self.BLOCK_SIZE == 0) assert(block_size % self.BLOCK_STEP == 0)
self.stride = stride self.block_size = block_size
self.bufsize = bs self.bufsize = bs
self.rptr = 0 self.rptr = 0
self.wptr = 0 self.wptr = 0
@ -104,25 +104,25 @@ class AFKRingBuf(Reloadable):
return self.ep.iface.writemem(self.base + off, data) return self.ep.iface.writemem(self.base + off, data)
def get_rptr(self): def get_rptr(self):
return struct.unpack("<I", self.read_buf(self.stride * 1, 4))[0] return struct.unpack("<I", self.read_buf(self.block_size * 1, 4))[0]
#return self.ep.asc.p.read32(self.base + self.BLOCK_SIZE) #return self.ep.asc.p.read32(self.base + self.BLOCK_STEP)
def get_wptr(self): def get_wptr(self):
return struct.unpack("<I", self.read_buf(self.stride * 2, 4))[0] return struct.unpack("<I", self.read_buf(self.block_size * 2, 4))[0]
#return self.ep.asc.p.read32(self.base + 2 * self.BLOCK_SIZE) #return self.ep.asc.p.read32(self.base + 2 * self.BLOCK_STEP)
def update_rptr(self, rptr): def update_rptr(self, rptr):
self.write_buf(self.stride * 1, struct.pack("<I", rptr)) self.write_buf(self.block_size * 1, struct.pack("<I", rptr))
self.ep.asc.p.write32(self.base + self.BLOCK_SIZE, rptr) self.ep.asc.p.write32(self.base + self.BLOCK_STEP, rptr)
def update_wptr(self, wptr): def update_wptr(self, wptr):
self.write_buf(self.stride * 2, struct.pack("<I", wptr)) self.write_buf(self.block_size * 2, struct.pack("<I", wptr))
self.ep.asc.p.write32(self.base + 2 * self.BLOCK_SIZE, wptr) self.ep.asc.p.write32(self.base + 2 * self.BLOCK_STEP, wptr)
def read(self): def read(self):
self.wptr = self.get_wptr() self.wptr = self.get_wptr()
base = self.stride * 3 # after header (size, rptr, wptr) base = self.block_size * 3 # after header (size, rptr, wptr)
while self.wptr != self.rptr: while self.wptr != self.rptr:
hdr = self.read_buf(base + self.rptr, 16) hdr = self.read_buf(base + self.rptr, 16)
self.rptr += 16 self.rptr += 16
@ -135,7 +135,7 @@ class AFKRingBuf(Reloadable):
assert magic in [b"IOP ", b"AOP "] assert magic in [b"IOP ", b"AOP "]
payload = self.read_buf(base + self.rptr, size) payload = self.read_buf(base + self.rptr, size)
self.rptr = (align_up(self.rptr + size, self.stride)) % self.bufsize self.rptr = (align_up(self.rptr + size, self.block_size)) % self.bufsize
self.update_rptr(self.rptr) self.update_rptr(self.rptr)
yield hdr[8:] + payload yield hdr[8:] + payload
self.wptr = self.get_wptr() self.wptr = self.get_wptr()
@ -143,7 +143,7 @@ class AFKRingBuf(Reloadable):
self.update_rptr(self.rptr) self.update_rptr(self.rptr)
def write(self, data): def write(self, data):
base = self.stride * 3 # after header (size, rptr, wptr) base = self.block_size * 3 # after header (size, rptr, wptr)
hdr2, data = data[:8], data[8:] hdr2, data = data[:8], data[8:]
self.rptr = self.get_rptr() self.rptr = self.get_rptr()
@ -163,7 +163,7 @@ class AFKRingBuf(Reloadable):
raise AFKError("Ring buffer is full") raise AFKError("Ring buffer is full")
self.write_buf(base + self.wptr + 0x10, data) self.write_buf(base + self.wptr + 0x10, data)
self.wptr = align_up(self.wptr + 0x10 + len(data), self.stride) % self.bufsize self.wptr = align_up(self.wptr + 0x10 + len(data), self.block_size) % self.bufsize
self.update_wptr(self.wptr) self.update_wptr(self.wptr)
return self.wptr return self.wptr
@ -212,7 +212,7 @@ class AFKRingBufEndpoint(ASCBaseEndpoint):
@msg_handler(0x89, AFKEP_GetBuf) @msg_handler(0x89, AFKEP_GetBuf)
def GetBuf(self, msg): def GetBuf(self, msg):
size = msg.SIZE * AFKRingBuf.BLOCK_SIZE size = msg.SIZE * AFKRingBuf.BLOCK_STEP
if self.iobuffer: if self.iobuffer:
print("WARNING: trying to reset iobuffer!") print("WARNING: trying to reset iobuffer!")
@ -242,8 +242,8 @@ class AFKRingBufEndpoint(ASCBaseEndpoint):
return True # no op return True # no op
def init_rb(self, msg): def init_rb(self, msg):
off = msg.OFFSET * AFKRingBuf.BLOCK_SIZE off = msg.OFFSET * AFKRingBuf.BLOCK_STEP
size = msg.SIZE * AFKRingBuf.BLOCK_SIZE size = msg.SIZE * AFKRingBuf.BLOCK_STEP
return AFKRingBuf(self, self.iobuffer + off, size) return AFKRingBuf(self, self.iobuffer + off, size)
def start_queues(self): def start_queues(self):