The-Homebrew-Cloud/Genesis-Plus-GX
2
0
Fork 0
mirror of https://github.com/ekeeke/Genesis-Plus-GX.git synced 2024-12-27 03:31:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "(Xbox 1) Fixed Xbox 1 crash - the problem was that there are (non-static)"

Browse Source 
This reverts commit 86254071be.
This commit is contained in:
twinaphex 2012-08-20 21:05:37 +02:00
parent 25786020d2
commit 4c33d7af7c
3 changed files with 9 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
libretro/msvc/msvc-2003-xbox1/msvc-2003-xbox1.vcproj
View File

@ -200,39 +200,6 @@
<File <File
RelativePath="..\..\libretro.c"> RelativePath="..\..\libretro.c">
</File> </File>
<File
RelativePath="..\..\scrc32.c">
<FileConfiguration
Name="Debug|Xbox">
<Tool
Name="VCCLCompilerTool"
CompileAs="1"/>
</FileConfiguration>
<FileConfiguration
Name="Profile|Xbox">
<Tool
Name="VCCLCompilerTool"
CompileAs="1"/>
</FileConfiguration>
<FileConfiguration
Name="Profile_FastCap|Xbox">
<Tool
Name="VCCLCompilerTool"
CompileAs="1"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Xbox">
<Tool
Name="VCCLCompilerTool"
CompileAs="1"/>
</FileConfiguration>
<FileConfiguration
Name="Release_LTCG|Xbox">
<Tool
Name="VCCLCompilerTool"
CompileAs="1"/>
</FileConfiguration>
</File>
</Filter> </Filter>
<Filter <Filter
Name="source" Name="source"
@ -344,69 +311,9 @@
</File> </File>
<File <File
RelativePath="..\..\..\source\sound\ym2413.c"> RelativePath="..\..\..\source\sound\ym2413.c">
<FileConfiguration
Name="Debug|Xbox">
<Tool
Name="VCCLCompilerTool"
Optimization="0"/>
</FileConfiguration>
<FileConfiguration
Name="Profile|Xbox">
<Tool
Name="VCCLCompilerTool"
Optimization="0"/>
</FileConfiguration>
<FileConfiguration
Name="Profile_FastCap|Xbox">
<Tool
Name="VCCLCompilerTool"
Optimization="0"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Xbox">
<Tool
Name="VCCLCompilerTool"
Optimization="0"/>
</FileConfiguration>
<FileConfiguration
Name="Release_LTCG|Xbox">
<Tool
Name="VCCLCompilerTool"
Optimization="0"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\..\source\sound\ym2612.c"> RelativePath="..\..\..\source\sound\ym2612.c">
<FileConfiguration
Name="Debug|Xbox">
<Tool
Name="VCCLCompilerTool"
Optimization="0"/>
</FileConfiguration>
<FileConfiguration
Name="Profile|Xbox">
<Tool
Name="VCCLCompilerTool"
Optimization="0"/>
</FileConfiguration>
<FileConfiguration
Name="Profile_FastCap|Xbox">
<Tool
Name="VCCLCompilerTool"
Optimization="0"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Xbox">
<Tool
Name="VCCLCompilerTool"
Optimization="0"/>
</FileConfiguration>
<FileConfiguration
Name="Release_LTCG|Xbox">
<Tool
Name="VCCLCompilerTool"
Optimization="0"/>
</FileConfiguration>
</File> </File>
</Filter> </Filter>
<Filter <Filter

12
source/sound/ym2413.c
View File

@ -1245,11 +1245,13 @@ INLINE void set_ar_dr(int slot,int v)
} }
/* set sustain level & release rate */ /* set sustain level & release rate */
INLINE void set_sl_rr_ym2413(int slot,int v) INLINE void set_sl_rr(int slot,int v)
{ {
YM2413_OPLL_CH *CH = &ym2413.P_CH[slot/2]; YM2413_OPLL_CH *CH = &ym2413.P_CH[slot/2];
YM2413_OPLL_SLOT *SLOT = &CH->SLOT[slot&1]; YM2413_OPLL_SLOT *SLOT = &CH->SLOT[slot&1];
SLOT->sl = sl_tab[ v>>4 ]; SLOT->sl = sl_tab[ v>>4 ];
SLOT->rr = (v&0x0f)? 16 + ((v&0x0f)<<2) : 0; SLOT->rr = (v&0x0f)? 16 + ((v&0x0f)<<2) : 0;
SLOT->eg_sh_rr = eg_rate_shift [SLOT->rr + SLOT->ksr ]; SLOT->eg_sh_rr = eg_rate_shift [SLOT->rr + SLOT->ksr ];
SLOT->eg_sel_rr = eg_rate_select[SLOT->rr + SLOT->ksr ]; SLOT->eg_sel_rr = eg_rate_select[SLOT->rr + SLOT->ksr ];
@ -1263,8 +1265,8 @@ static void load_instrument(UINT32 chan, UINT32 slot, UINT8* inst )
set_ksl_wave_fb(chan, inst[3]); set_ksl_wave_fb(chan, inst[3]);
set_ar_dr(slot, inst[4]); set_ar_dr(slot, inst[4]);
set_ar_dr(slot+1, inst[5]); set_ar_dr(slot+1, inst[5]);
set_sl_rr_ym2413(slot, inst[6]); set_sl_rr(slot, inst[6]);
set_sl_rr_ym2413(slot+1, inst[7]); set_sl_rr(slot+1, inst[7]);
} }
static void update_instrument_zero(UINT8 r) static void update_instrument_zero(UINT8 r)
@ -1343,7 +1345,7 @@ static void update_instrument_zero(UINT8 r)
{ {
if ((ym2413.instvol_r[chan]&0xf0)==0) if ((ym2413.instvol_r[chan]&0xf0)==0)
{ {
set_sl_rr_ym2413(chan*2, inst[6]); set_sl_rr(chan*2, inst[6]);
} }
} }
break; break;
@ -1353,7 +1355,7 @@ static void update_instrument_zero(UINT8 r)
{ {
if ((ym2413.instvol_r[chan]&0xf0)==0) if ((ym2413.instvol_r[chan]&0xf0)==0)
{ {
set_sl_rr_ym2413(chan*2+1, inst[7]); set_sl_rr(chan*2+1, inst[7]);
} }
} }
break; break;

4
source/sound/ym2612.c
View File

@ -1011,7 +1011,7 @@ INLINE void set_sr(FM_SLOT *SLOT,int v)
} }
/* set release rate */ /* set release rate */
INLINE void set_sl_rr_ym2612(FM_SLOT *SLOT,int v) INLINE void set_sl_rr(FM_SLOT *SLOT,int v)
{ {
SLOT->sl = sl_table[ v>>4 ]; SLOT->sl = sl_table[ v>>4 ];
@ -1586,7 +1586,7 @@ INLINE void OPNWriteReg(int r, int v)
break; break;
case 0x80: /* SL, RR */ case 0x80: /* SL, RR */
set_sl_rr_ym2612(SLOT,v); set_sl_rr(SLOT,v);
break; break;
case 0x90: /* SSG-EG */ case 0x90: /* SSG-EG */