Fix memtype some wrong

Fix redefined warning Remove SCE_KERNEL_MEMBLOCK_TYPE_USER_TOOL_RW macro from psp2common/kernel/sysmem.h. This is already defined by psp2kern/kernel/sysmem/memtype.h. So Use SCE_KERNEL_MEMBLOCK_TYPE_USER_MAIN_TOOL_RW instead. Remove SCE_KERNEL_MEMBLOCK_TYPE_USER_CDRAM_RW/SCE_KERNEL_MEMBLOCK_TYPE_USER_MAIN_PHYCONT_* macro from psp2kern/kernel/sysmem/memtype.h. This is already defined by psp2common/kernel/sysmem.h. Fix typo SCE_KERNEL_MEMBLOCK_TYPE_USER_MAIN_CDIALIG_* to SCE_KERNEL_MEMBLOCK_TYPE_USER_MAIN_CDIALOG_*
SonicMastr · Apr 20, 2022 · 2235b4c · 2235b4c
1 parent c2b869c
commit 2235b4c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/include/psp2common/kernel/sysmem.h b/include/psp2common/kernel/sysmem.h
@@ -27,8 +27,8 @@ extern "C" {
 #define SCE_KERNEL_MEMBLOCK_TYPE_USER_MAIN_GAME_RW       (0x0C50D060)
 #define SCE_KERNEL_MEMBLOCK_TYPE_USER_MAIN_PHYCONT_RW    (0x0C80D060)
 #define SCE_KERNEL_MEMBLOCK_TYPE_USER_MAIN_PHYCONT_NC_RW (0x0D808060)
-#define SCE_KERNEL_MEMBLOCK_TYPE_USER_MAIN_CDIALIG_RW    (0x0CA0D060)
-#define SCE_KERNEL_MEMBLOCK_TYPE_USER_MAIN_CDIALIG_NC_RW (0x0CA08060)
+#define SCE_KERNEL_MEMBLOCK_TYPE_USER_MAIN_CDIALOG_RW    (0x0CA0D060)
+#define SCE_KERNEL_MEMBLOCK_TYPE_USER_MAIN_CDIALOG_NC_RW (0x0CA08060)
 #define SCE_KERNEL_MEMBLOCK_TYPE_USER_MAIN_TOOL_RW       (0x0CF0D060)
 #define SCE_KERNEL_MEMBLOCK_TYPE_USER_MAIN_TOOL_NC_RW    (0x0CF08060)
 #define SCE_KERNEL_MEMBLOCK_TYPE_USER_CDIALOG_R          (0x0E20D040)
@@ -43,10 +43,7 @@ extern "C" {
 
 #define SCE_KERNEL_MEMBLOCK_TYPE_USER_RW_UNCACHE         (0x0C208060)
 #define SCE_KERNEL_MEMBLOCK_TYPE_USER_RW                 (0x0C20D060)
-#define SCE_KERNEL_MEMBLOCK_TYPE_USER_MAIN_CDIALOG_NC_RW (0x0CA08060)
-#define SCE_KERNEL_MEMBLOCK_TYPE_USER_MAIN_CDIALOG_RW    (0x0CA0D060)
 #define SCE_KERNEL_MEMBLOCK_TYPE_USER_TOOL_NC_RW         (0x0CF08060)
-#define SCE_KERNEL_MEMBLOCK_TYPE_USER_TOOL_RW            (0x0CF0D060)
 
 
 

diff --git a/include/psp2kern/kernel/sysmem/memtype.h b/include/psp2kern/kernel/sysmem/memtype.h
@@ -104,10 +104,7 @@ extern "C" {
  */
 
 #define SCE_KERNEL_MEMBLOCK_TYPE_SHARED_RX               (0x0390D050)
-#define SCE_KERNEL_MEMBLOCK_TYPE_USER_CDRAM_RW           (0x09408060)
 #define SCE_KERNEL_MEMBLOCK_TYPE_USER_RX                 (0x0C20D050)
-#define SCE_KERNEL_MEMBLOCK_TYPE_USER_MAIN_PHYCONT_RW    (0x0C80D060)
-#define SCE_KERNEL_MEMBLOCK_TYPE_USER_MAIN_PHYCONT_NC_RW (0x0D808060)
 #define SCE_KERNEL_MEMBLOCK_TYPE_KERNEL_RX               (0x1020D005)
 #define SCE_KERNEL_MEMBLOCK_TYPE_KERNEL_RW               (0x1020D006)
 #define SCE_KERNEL_MEMBLOCK_TYPE_RW_UNK0                 (0x6020D006)