Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Switch
RetroArch
snes9x
Commits
a9d37dd1
Unverified
Commit
a9d37dd1
authored
Jun 12, 2018
by
kps501
Committed by
GitHub
Jun 12, 2018
Browse files
backport bsx streaming, compiler warnings
parent
aac998ac
Changes
5
Hide whitespace changes
Inline
Side-by-side
bsx.cpp
View file @
a9d37dd1
...
...
@@ -918,9 +918,6 @@ void S9xSetBSX (uint8 byte, uint32 address)
void
S9xBSXSetStream1
(
uint8
count
)
{
// libretro: crash problems
return
;
if
(
BSX
.
sat_stream1
.
is_open
())
BSX
.
sat_stream1
.
close
();
//If Stream already opened for one file: Close it.
...
...
@@ -953,9 +950,6 @@ void S9xBSXSetStream1 (uint8 count)
void
S9xBSXSetStream2
(
uint8
count
)
{
// libretro: crash problems
return
;
if
(
BSX
.
sat_stream2
.
is_open
())
BSX
.
sat_stream2
.
close
();
//If Stream already opened for one file: Close it.
...
...
@@ -1569,14 +1563,11 @@ void S9xResetBSX (void)
BSX
.
sat_stream1_first
=
BSX
.
sat_stream2_first
=
FALSE
;
BSX
.
sat_stream1_count
=
BSX
.
sat_stream2_count
=
0
;
/*
libretro: load crash
if
(
BSX
.
sat_stream1
.
is_open
())
BSX
.
sat_stream1
.
close
();
if
(
BSX
.
sat_stream2
.
is_open
())
BSX
.
sat_stream2
.
close
();
*/
if
(
Settings
.
BS
)
BSX_Map
();
...
...
controls.cpp
View file @
a9d37dd1
...
...
@@ -572,7 +572,7 @@ void S9xControlsReset (void)
mouse
[
0
].
buttons
&=
~
0x30
;
mouse
[
1
].
buttons
&=
~
0x30
;
justifier
.
buttons
&=
~
JUSTIFIER_SELECT
;
macsrifle
.
buttons
=
0
;
macsrifle
.
buttons
=
0
;
}
void
S9xControlsSoftReset
(
void
)
...
...
cpu.cpp
View file @
a9d37dd1
...
...
@@ -299,14 +299,12 @@ void S9xReset (void)
memset
(
Memory
.
VRAM
,
0x00
,
0x10000
);
memset
(
Memory
.
FillRAM
,
0
,
0x8000
);
if
(
Settings
.
BS
)
S9xResetBSX
();
S9xResetBSX
();
S9xResetCPU
();
S9xResetPPU
();
S9xResetDMA
();
S9xResetAPU
();
S9xResetMSU
();
S9xResetMSU
();
if
(
Settings
.
DSP
)
S9xResetDSP
();
...
...
snes9x.cpp
View file @
a9d37dd1
...
...
@@ -214,9 +214,9 @@ extern FILE *trace;
#define S9X_CONF_FILE_NAME "snes9x.conf"
#ifndef __LIBRETRO__
static
char
*
rom_filename
=
NULL
;
#ifndef __LIBRETRO__
static
bool
parse_controller_spec
(
int
,
const
char
*
);
static
void
parse_crosshair_spec
(
enum
crosscontrols
,
const
char
*
);
static
bool
try_load_config_file
(
const
char
*
,
ConfigFile
&
);
...
...
snes9x.h
View file @
a9d37dd1
...
...
@@ -194,7 +194,7 @@
#define _SNES9X_H_
#ifndef VERSION
#define VERSION "1.56"
#define VERSION "1.56
.1
"
#endif
#include "port.h"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment