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

improve trackball controller detection

This commit is contained in:
thrust26 2019-02-12 22:18:19 +01:00
parent 8855804635
commit 9857fa888b
2 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/emucore/ControllerDetector.cxx
View File

@ -364,15 +364,17 @@ bool ControllerDetector::usesPaddle(const uInt8* image, uInt32 size,
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool ControllerDetector::isProbablyTrakBall(const uInt8* image, uInt32 size) bool ControllerDetector::isProbablyTrakBall(const uInt8* image, uInt32 size)
{ {
// check for TrakBall table // check for TrakBall tables
const int NUM_SIGS = 1; const int NUM_SIGS = 3;
const int SIG_SIZE = 8; const int SIG_SIZE = 6;
uInt8 signature[SIG_SIZE] = { uInt8 signature[NUM_SIGS][SIG_SIZE] = {
0b1010, 0b1000, 0b1000, 0b1010, 0b0010, 0b0000, 0b0000, 0b0010 // NextTrackTbl { 0b1010, 0b1000, 0b1000, 0b1010, 0b0010, 0b0000/*, 0b0000, 0b0010*/ }, // NextTrackTbl (T. Jentzsch)
// TODO: Omegamatrix's signature (.MovementTab_1) { 0x00, 0x07, 0x87, 0x07, 0x88, 0x01/*, 0xff, 0x01*/ }, // .MovementTab_1 (Omegamatrix, SMX7)
}; { 0x00, 0x01, 0x81, 0x01, 0x82, 0x03 }, // .MovementTab_1 (Omegamatrix)
}; // all pattern checked, only TrakBall matches
if(searchForBytes(image, size, signature, SIG_SIZE)) for(uInt32 i = 0; i < NUM_SIGS; ++i)
if(searchForBytes(image, size, signature[i], SIG_SIZE))
return true; return true;
return false; return false;
@ -381,14 +383,17 @@ bool ControllerDetector::isProbablyTrakBall(const uInt8* image, uInt32 size)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool ControllerDetector::isProbablyAtariMouse(const uInt8* image, uInt32 size) bool ControllerDetector::isProbablyAtariMouse(const uInt8* image, uInt32 size)
{ {
// check for Atari Mouse table // check for Atari Mouse tables
const int SIG_SIZE = 8; const int NUM_SIGS = 3;
uInt8 signature[SIG_SIZE] = { const int SIG_SIZE = 6;
0b0101, 0b0111, 0b0100, 0b0110, 0b1101, 0b1111, 0b1100, 0b1110 // NextTrackTbl uInt8 signature[NUM_SIGS][SIG_SIZE] = {
// TODO: Omegamatrix's signature (.MovementTab_1) { 0b0101, 0b0111, 0b0100, 0b0110, 0b1101, 0b1111/*, 0b1100, 0b1110*/ }, // NextTrackTbl (T. Jentzsch)
}; { 0x00, 0x87, 0x07, 0x00, 0x08, 0x81/*, 0x7f, 0x08*/ }, // .MovementTab_1 (Omegamatrix, SMX7)
{ 0x00, 0x81, 0x01, 0x00, 0x02, 0x83 }, // .MovementTab_1 (Omegamatrix)
}; // all pattern checked, only Atari Mouse matches
if(searchForBytes(image, size, signature, SIG_SIZE)) for(uInt32 i = 0; i < NUM_SIGS; ++i)
if(searchForBytes(image, size, signature[i], SIG_SIZE))
return true; return true;
return false; return false;
@ -397,14 +402,17 @@ bool ControllerDetector::isProbablyAtariMouse(const uInt8* image, uInt32 size)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool ControllerDetector::isProbablyAmigaMouse(const uInt8* image, uInt32 size) bool ControllerDetector::isProbablyAmigaMouse(const uInt8* image, uInt32 size)
{ {
// check for Amiga Mouse table // check for Amiga Mouse tables
const int SIG_SIZE = 8; const int NUM_SIGS = 3;
uInt8 signature[SIG_SIZE] = { const int SIG_SIZE = 6;
0b1100, 0b1000, 0b0100, 0b0000, 0b1101, 0b1001, 0b0101, 0b0001 // NextTrackTbl uInt8 signature[NUM_SIGS][SIG_SIZE] = {
// TODO: Omegamatrix's signature (.MovementTab_1) { 0b1100, 0b1000, 0b0100, 0b0000, 0b1101, 0b1001/*, 0b0101, 0b0001*/ }, // NextTrackTbl (T. Jentzsch)
}; { 0x00, 0x88, 0x07, 0x01, 0x08, 0x00/*, 0x7f, 0x07*/ }, // .MovementTab_1 (Omegamatrix, SMX7)
{ 0x00, 0x82, 0x01, 0x03, 0x02, 0x00 }, // .MovementTab_1 (Omegamatrix)
}; // all pattern checked, only Amiga Mouse matches
if(searchForBytes(image, size, signature, SIG_SIZE)) for(uInt32 i = 0; i < NUM_SIGS; ++i)
if(searchForBytes(image, size, signature[i], SIG_SIZE))
return true; return true;
return false; return false;
@ -443,8 +451,7 @@ bool ControllerDetector::isProbablySaveKey(const uInt8* image, uInt32 size, Cont
0xea, // nop 0xea, // nop
0xa9, 0x0c, // lda #I2C_SCL_MASK|I2C_SDA_MASK 0xa9, 0x0c, // lda #I2C_SCL_MASK|I2C_SDA_MASK
0x8d // sta SWACNT 0x8d // sta SWACNT
}, }
}; };
for(uInt32 i = 0; i < NUM_SIGS; ++i) for(uInt32 i = 0; i < NUM_SIGS; ++i)

8
src/emucore/ControllerDetector.hxx
View File

@ -80,16 +80,16 @@ class ControllerDetector
static bool usesPaddle(const uInt8* image, uInt32 size, Controller::Jack port, static bool usesPaddle(const uInt8* image, uInt32 size, Controller::Jack port,
const Settings& settings); const Settings& settings);
// Returns true if Trak-Ball table is found. // Returns true if a Trak-Ball table is found.
static bool isProbablyTrakBall(const uInt8* image, uInt32 size); static bool isProbablyTrakBall(const uInt8* image, uInt32 size);
// Returns true if Atari Mouse table is found. // Returns true if an Atari Mouse table is found.
static bool isProbablyAtariMouse(const uInt8* image, uInt32 size); static bool isProbablyAtariMouse(const uInt8* image, uInt32 size);
// Returns true if Amiga Mouse table is found. // Returns true if an Amiga Mouse table is found.
static bool isProbablyAmigaMouse(const uInt8* image, uInt32 size); static bool isProbablyAmigaMouse(const uInt8* image, uInt32 size);
// Returns true if the SaveKey code pattern is found. // Returns true if a SaveKey code pattern is found.
static bool isProbablySaveKey(const uInt8* image, uInt32 size, Controller::Jack port); static bool isProbablySaveKey(const uInt8* image, uInt32 size, Controller::Jack port);
private: private: