diff options
| author | Eugene Sandulenko | 2014-04-28 21:20:42 +0300 |
|---|---|---|
| committer | Eugene Sandulenko | 2014-04-28 21:20:42 +0300 |
| commit | c3ffbd884a2d917aede6020c4ae1ee4a13d7f861 (patch) | |
| tree | eef69449accc9a020cf1be49703a0dd698340c11 /backends/platform/ps2/ps2pad.cpp | |
| parent | 3d5dee897ef785e3f0c48ae3d857181f314700d1 (diff) | |
| parent | 4592e0b586829fade4a5c800672849e693a0d151 (diff) | |
| download | scummvm-rg350-c3ffbd884a2d917aede6020c4ae1ee4a13d7f861.tar.gz scummvm-rg350-c3ffbd884a2d917aede6020c4ae1ee4a13d7f861.tar.bz2 scummvm-rg350-c3ffbd884a2d917aede6020c4ae1ee4a13d7f861.zip | |
Merge pull request #426 from sunmax/master
PS2: Pull request to master for latest PS2 code
Diffstat (limited to 'backends/platform/ps2/ps2pad.cpp')
| -rw-r--r-- | backends/platform/ps2/ps2pad.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/backends/platform/ps2/ps2pad.cpp b/backends/platform/ps2/ps2pad.cpp index b59547baca..d990690331 100644 --- a/backends/platform/ps2/ps2pad.cpp +++ b/backends/platform/ps2/ps2pad.cpp @@ -34,7 +34,7 @@ Ps2Pad::Ps2Pad(OSystem_PS2 *system) { _padStatus = STAT_NONE; padInit(0); // initialize library - _port = _slot = 0; // first controller, no multitap + _port = _slot = 0; // first controller, no multitap initPad(); } @@ -51,9 +51,6 @@ void Ps2Pad::initPad(void) { } else { if (checkPadReady(_port, _slot)) { switch (_padStatus) { - case STAT_NONE: - printf("Pad Status is None. Shouldn't happen\n"); - break; case STAT_OPEN: _padStatus = STAT_DETECT; break; @@ -104,7 +101,8 @@ void Ps2Pad::initPad(void) { _padStatus = STAT_OKAY; break; case STAT_OKAY: - // pad is already initialized + case STAT_NONE: + // pad is already initialized (or not there) break; } } else { |