diff --git a/pcsx2/Memory.cpp b/pcsx2/Memory.cpp index 8ddf972bf9..b93e91af6b 100644 --- a/pcsx2/Memory.cpp +++ b/pcsx2/Memory.cpp @@ -180,9 +180,9 @@ void memMapPhy() // "Secret" IOP HW mappings - Used by EE Bios Kernel during boot and generally // left untouched after that, as per EE/IOP thread safety rules. - vtlb_MapHandler(hw_by_page[0x1], 0x1f801000, 0x01000); - vtlb_MapHandler(hw_by_page[0x3], 0x1f803000, 0x01000); - vtlb_MapHandler(hw_by_page[0x8], 0x1f808000, 0x01000); + vtlb_MapHandler(iopHw_by_page_01, 0x1f801000, 0x01000); + vtlb_MapHandler(iopHw_by_page_03, 0x1f803000, 0x01000); + vtlb_MapHandler(iopHw_by_page_08, 0x1f808000, 0x01000); } diff --git a/pcsx2/ps2/Iop/IopHwRead.cpp b/pcsx2/ps2/Iop/IopHwRead.cpp index 085d089716..6cc71b7d7b 100644 --- a/pcsx2/ps2/Iop/IopHwRead.cpp +++ b/pcsx2/ps2/Iop/IopHwRead.cpp @@ -203,7 +203,7 @@ static __forceinline T _HwRead_16or32_Page1( u32 addr ) // ------------------------------------------------------------------------ // USB, with both 16 and 32 bit interfaces // - else if( masked_addr >= pgmsk(HW_USB_START) && masked_addr < pgmsk(HW_USB_END) ) + else if( (masked_addr >= pgmsk(HW_USB_START)) && (masked_addr < pgmsk(HW_USB_END)) ) { ret = (sizeof(T) == 2) ? USBread16( addr ) : USBread32( addr ); }