Merge pull request #2817 from thedax/master

Various code cleanups.
This commit is contained in:
Henrik Rydgård 2013-07-17 15:30:46 -07:00
commit c543665513
3 changed files with 10 additions and 9 deletions

View File

@ -36,10 +36,10 @@ struct HDRemaster {
// TODO: Use UMD_DATA.bin to differentiate the Eiyuu games from the regular PSP editions.
// TODO: Do all of the remasters aside from Monster Hunter/Shin Sangoku use double texture coordinates?
const struct HDRemaster g_HDRemasters[] = {
{ "NPJB40001", 0x4000000, false }, // MONSTER HUNTER PORTABLE 3rd HD Ver.
{ "NPJB40002", 0x4000000, true }, // K-ON Houkago Live HD Ver
{ "NPJB40003", 0x4000000, false }, // Shin Sangoku Musou Multi Raid 2 HD Ver
// { "ULJM05170", 0x4000000, true }, // Eiyuu Densetsu Sora no Kiseki FC Kai HD Edition
// { "ULJM05277", 0x4C00000, true }, // Eiyuu Densetsu: Sora no Kiseki SC Kai HD Edition, game needs 76 MB
// { "ULJM05353", 0x4C00000, true }, // Eiyuu Densetsu: Sora no Kiseki 3rd Kai HD Edition, game needs 76 MB
{ "NPJB40001", 0x4000000, false }, // MONSTER HUNTER PORTABLE 3rd HD Ver.
{ "NPJB40002", 0x4000000, true }, // K-ON Houkago Live HD Ver
{ "NPJB40003", 0x4000000, false }, // Shin Sangoku Musou Multi Raid 2 HD Ver
// { "ULJM05170", 0x4000000, true }, // Eiyuu Densetsu Sora no Kiseki FC Kai HD Edition
// { "ULJM05277", 0x4C00000, true }, // Eiyuu Densetsu: Sora no Kiseki SC Kai HD Edition, game needs 76 MB
// { "ULJM05353", 0x4C00000, true }, // Eiyuu Densetsu: Sora no Kiseki 3rd Kai HD Edition, game needs 76 MB
};

View File

@ -57,6 +57,7 @@ u8 *m_pUncachedVRAM;
// Holds the ending address of the PSP's user space.
// Required for HD Remasters to work properly.
// These replace RAM_SIZE and RAM_MASK, respectively.
u32 g_MemoryMask;
u32 g_MemorySize;

View File

@ -83,8 +83,9 @@ extern u8 *m_pUncachedRAM;
extern u8 *m_pPhysicalVRAM;
extern u8 *m_pUncachedVRAM;
extern u32 g_MemorySize; // Replaces RAM_SIZE
extern u32 g_MemoryMask; // Replaces RAM_MASK
// These replace RAM_SIZE and RAM_MASK, respectively.
extern u32 g_MemorySize;
extern u32 g_MemoryMask;
enum
{
@ -394,4 +395,3 @@ inline bool operator>=(const PSPPointer<T> &lhs, const PSPPointer<T> &rhs)
}
#endif