ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

The usual Linux stuff. Plus one or two minor things that I hadn't had a chance to commit yet. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2513 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-01-24 14:49:07 +00:00
parent 0d92ee6d0d
commit 6fdeb8d64a
6 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -53,6 +53,7 @@ set(resourceList AppIcon16.png
ButtonIcon_Camera.png ButtonIcon_Camera.png
ConfigIcon_Cpu.png ConfigIcon_Cpu.png
ConfigIcon_Gamefixes.png ConfigIcon_Gamefixes.png
ConfigIcon_MemoryCard.png
ConfigIcon_Paths.png ConfigIcon_Paths.png
ConfigIcon_Plugins.png ConfigIcon_Plugins.png
ConfigIcon_Speedhacks.png ConfigIcon_Speedhacks.png

1
pcsx2/CMakeLists.txt
View File

@ -321,6 +321,7 @@ set(pcsx2GuiSources
gui/Panels/GameFixesPanel.cpp gui/Panels/GameFixesPanel.cpp
gui/Panels/GSWindowPanel.cpp gui/Panels/GSWindowPanel.cpp
gui/Panels/LogOptionsPanels.cpp gui/Panels/LogOptionsPanels.cpp
gui/Panels/MemoryCardsPanel.cpp
gui/Panels/MiscPanelStuff.cpp gui/Panels/MiscPanelStuff.cpp
gui/Panels/PathsPanel.cpp gui/Panels/PathsPanel.cpp
gui/Panels/PluginSelectorPanel.cpp gui/Panels/PluginSelectorPanel.cpp

16
pcsx2/Dmac.h
View File

@ -99,9 +99,23 @@ union tDMA_TAG {
tDMA_TAG(u32 val) { _u32 = val; } tDMA_TAG(u32 val) { _u32 = val; }
u16 upper() { return (_u32 >> 16); } u16 upper() { return (_u32 >> 16); }
u16 lower() { return (u16)_u32; } u16 lower() { return (u16)_u32; }
wxString tag_to_str()
{
switch(ID)
{
case TAG_REFE: return wxsFormat(L"REFE %08X", _u32); break;
case TAG_CNT: return L"CNT"; break;
case TAG_NEXT: return wxsFormat(L"NEXT %08X", _u32); break;
case TAG_REF: return wxsFormat(L"REF %08X", _u32); break;
case TAG_REFS: return wxsFormat(L"REFS %08X", _u32); break;
case TAG_CALL: return L"CALL"; break;
case TAG_RET: return L"RET"; break;
case TAG_END: return L"END"; break;
default: return L"????"; break;
}
}
void reset() { _u32 = 0; } void reset() { _u32 = 0; }
}; };
#define DMA_TAG(value) ((tDMA_TAG)(value)) #define DMA_TAG(value) ((tDMA_TAG)(value))
union tDMA_CHCR { union tDMA_CHCR {

7
pcsx2/Linux/pcsx2.cbp
View File

@ -390,6 +390,7 @@
<Unit filename="../gui/Panels/GameFixesPanel.cpp" /> <Unit filename="../gui/Panels/GameFixesPanel.cpp" />
<Unit filename="../gui/Panels/LogOptionsPanels.cpp" /> <Unit filename="../gui/Panels/LogOptionsPanels.cpp" />
<Unit filename="../gui/Panels/LogOptionsPanels.h" /> <Unit filename="../gui/Panels/LogOptionsPanels.h" />
<Unit filename="../gui/Panels/MemoryCardsPanel.cpp" />
<Unit filename="../gui/Panels/MiscPanelStuff.cpp" /> <Unit filename="../gui/Panels/MiscPanelStuff.cpp" />
<Unit filename="../gui/Panels/PathsPanel.cpp" /> <Unit filename="../gui/Panels/PathsPanel.cpp" />
<Unit filename="../gui/Panels/PluginSelectorPanel.cpp" /> <Unit filename="../gui/Panels/PluginSelectorPanel.cpp" />
@ -440,6 +441,12 @@
<Option weight="0" /> <Option weight="0" />
<Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" /> <Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" />
</Unit> </Unit>
<Unit filename="../gui/Resources/ConfigIcon_MemoryCard.h" />
<Unit filename="../gui/Resources/ConfigIcon_MemoryCard.png">
<Option compile="1" />
<Option weight="0" />
<Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" />
</Unit>
<Unit filename="../gui/Resources/ConfigIcon_Paths.h" /> <Unit filename="../gui/Resources/ConfigIcon_Paths.h" />
<Unit filename="../gui/Resources/ConfigIcon_Paths.png"> <Unit filename="../gui/Resources/ConfigIcon_Paths.png">
<Option compile="1" /> <Option compile="1" />

2
pcsx2/Sif.cpp
View File

@ -20,10 +20,8 @@
#include "IopCommon.h" #include "IopCommon.h"
#include "Sif.h" #include "Sif.h"
DMACh *sif0ch, *sif1ch, *sif2ch;
static _sif sif0, sif1; static _sif sif0, sif1;
bool eesifbusy[2] = { false, false }; bool eesifbusy[2] = { false, false };
extern bool iopsifbusy[2]; extern bool iopsifbusy[2];

3
pcsx2/Sif.h
View File

@ -69,7 +69,6 @@ struct _sif
s32 counter; s32 counter;
struct sifData data; struct sifData data;
}; };
extern DMACh *sif0ch, *sif1ch, *sif2ch;
extern void sifInit(); extern void sifInit();
@ -86,5 +85,7 @@ extern void EEsif1Interrupt();
extern void sif0Interrupt(); extern void sif0Interrupt();
extern void sif1Interrupt(); extern void sif1Interrupt();
#define sif0_tag DMA_TAG(sif0.data.data)
#define sif1_tag DMA_TAG(sif1.data.data)
#endif /* __SIF_H__ */ #endif /* __SIF_H__ */