From 8d9750652edea9cdd35bace306497f866d32f4e8 Mon Sep 17 00:00:00 2001 From: Derek Hensley Date: Fri, 21 Feb 2025 17:00:11 -0800 Subject: Small sys_flashrom clean up (#1795) * sys_flashrom cleanup * Remove uncessary data word from function names * format --- include/sys_flashrom.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'include') diff --git a/include/sys_flashrom.h b/include/sys_flashrom.h index dd160cc16..f858ee456 100644 --- a/include/sys_flashrom.h +++ b/include/sys_flashrom.h @@ -4,13 +4,14 @@ #include "ultra64.h" typedef struct FlashromRequest { - /* 0x00 */ s32 requestType; + /* 0x00 */ s32 type; /* 0x04 */ s32 response; /* 0x08 */ void* addr; - /* 0x0C */ s32 pageNum; - /* 0x10 */ s32 pageCount; - /* 0x14 */ OSMesgQueue messageQueue; -} FlashromRequest; // size = 0x2C + /* 0x0C */ u32 pageNum; + /* 0x10 */ u32 pageCount; + /* 0x14 */ OSMesgQueue queue; + /* 0x2C */ OSMesg msgBuf[1]; +} FlashromRequest; // size = 0x30 #define FLASHROM_REQUEST_WRITE 1 #define FLASHROM_REQUEST_READ 2 @@ -18,10 +19,10 @@ typedef struct FlashromRequest { #define FLASH_TYPE_MAGIC 0x11118001 s32 SysFlashrom_InitFlash(void); -s32 SysFlashrom_ReadData(void* addr, u32 pageNum, u32 pageCount); -void SysFlashrom_WriteDataAsync(u8* addr, u32 pageNum, u32 pageCount); +s32 SysFlashrom_Read(void* addr, u32 pageNum, u32 pageCount); +void SysFlashrom_WriteAsync(void* addr, u32 pageNum, u32 pageCount); s32 SysFlashrom_IsBusy(void); s32 SysFlashrom_AwaitResult(void); -void SysFlashrom_WriteDataSync(void* addr, u32 pageNum, u32 pageCount); +void SysFlashrom_WriteSync(void* addr, u32 pageNum, u32 pageCount); #endif -- cgit v1.2.3