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

lil fix to prev

This commit is contained in:
CaH4e3 2014-01-15 18:25:13 +00:00
parent 5d149f95d2
commit c5e92ed930
2 changed files with 24 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
trunk/src/input/pec586kb.cpp
View File

@ -48,13 +48,15 @@ static uint16 matrix[13][8] =
}; };
static void PEC586KB_Write(uint8 v) { static void PEC586KB_Write(uint8 v) {
if (((kstrobe & 7) == 1) && ((v & 7) == 2)) { if (!(kstrobe & 2) && (v & 2)) {
kspos = 0; kspos = 0;
}
if ((kstrobe & 1) && !(v & 1)) {
ksindex = 0; ksindex = 0;
} else if (((kstrobe & 7) == 7) && ((v & 3) == 2)) { }
if ((kstrobe & 4) && !(v & 4)) {
kspos++; kspos++;
kspos %= 13; kspos %= 13;
ksindex = 0;
} }
kstrobe = v; kstrobe = v;
} }
@ -65,13 +67,11 @@ static uint8 PEC586KB_Read(int w, uint8 ret) {
#endif #endif
if (w) { if (w) {
ret &= ~2; ret &= ~2;
if(matrix[kspos][7-ksindex] < (88 + 16)) {
if(bufit[matrix[kspos][7-ksindex]]) if(bufit[matrix[kspos][7-ksindex]])
ret |= 2; ret |= 2;
ksindex++; ksindex++;
ksindex&=7; ksindex&=7;
} }
}
#ifdef FCEUDEF_DEBUGGER #ifdef FCEUDEF_DEBUGGER
} }
#endif #endif
@ -79,8 +79,8 @@ static uint8 PEC586KB_Read(int w, uint8 ret) {
} }
static void PEC586KB_Strobe(void) { static void PEC586KB_Strobe(void) {
kstrobe = 0; // kstrobe = 0;
ksindex = 0; // ksindex = 0;
} }
static void PEC586KB_Update(void *data, int arg) { static void PEC586KB_Update(void *data, int arg) {

39
trunk/src/input/suborkb.cpp
View File

@ -29,32 +29,19 @@ static uint8 ksindex;
static uint16 matrix[13][2][4] = static uint16 matrix[13][2][4] =
{ {
{ { AK(4), AK(G), AK(F), AK(C) }, { { AK(4), AK(G), AK(F), AK(C) }, { AK(F2), AK(E), AK(5), AK(V) } },
{ AK(F2), AK(E), AK(5), AK(V) } }, { { AK(2), AK(D), AK(S), AK(END) }, { AK(F1), AK(W), AK(3), AK(X) } },
{ { AK(2), AK(D), AK(S), AK(END) }, { { AK(INSERT), AK(BACK), AK(NEXT), AK(RIGHT) }, { AK(F8), AK(PRIOR), AK(DELETE), AK(HOME) } },
{ AK(F1), AK(W), AK(3), AK(X) } }, { { AK(9), AK(I), AK(L), AK(COMMA) }, { AK(F5), AK(O), AK(0), AK(PERIOD) } },
{ { AK(INSERT), AK(BACK), AK(NEXT), AK(RIGHT) }, { { AK(RBRACKET), AK(RETURN), AK(UP), AK(LEFT) }, { AK(F7), AK(LBRACKET), AK(BACKSLASH), AK(DOWN) } },
{ AK(F8), AK(PRIOR), AK(DELETE), AK(HOME) } }, { { AK(Q), AK(CAPITAL), AK(Z), AK(TAB) }, { AK(ESCAPE), AK(A), AK(1), AK(LCONTROL) } },
{ { AK(9), AK(I), AK(L), AK(COMMA) }, { { AK(7), AK(Y), AK(K), AK(M) }, { AK(F4), AK(U), AK(8), AK(J) } },
{ AK(F5), AK(O), AK(0), AK(PERIOD) } }, { { AK(MINUS), AK(SEMICOLON), AK(APOSTROPHE), AK(SLASH) }, { AK(F6), AK(P), AK(EQUALS), AK(LSHIFT) } },
{ { AK(RBRACKET), AK(RETURN), AK(UP), AK(LEFT) }, { { AK(T), AK(H), AK(N), AK(SPACE) }, { AK(F3), AK(R), AK(6), AK(B) } },
{ AK(F7), AK(LBRACKET), AK(BACKSLASH), AK(DOWN) } }, { { AK(NUMPAD6), AK(GRETURN), AK(NUMPAD4), AK(NUMPAD8) }, { AK(NUMPAD2), 0, 0, 0 } }, // baibaidino actually uses diferent layot
{ { AK(Q), AK(CAPITAL), AK(Z), AK(TAB) }, { { AK(LMENU), AK(NUMPAD4), AK(NUMPAD7), AK(F11) }, { AK(F12), AK(NUMPAD1), AK(NUMPAD2), AK(NUMPAD8) } },
{ AK(ESCAPE), AK(A), AK(1), AK(LCONTROL) } }, { { AK(SUBTRACT), AK(ADD), AK(MULTIPLY), AK(NUMPAD9) }, { AK(F10), AK(NUMPAD5), AK(DIVIDE), AK(NUMLOCK) } },
{ { AK(7), AK(Y), AK(K), AK(M) }, { { AK(GRAVE), AK(NUMPAD6), AK(PAUSE), AK(SPACE) }, { AK(F9), AK(NUMPAD3), AK(DECIMAL), AK(NUMPAD0) } },
{ AK(F4), AK(U), AK(8), AK(J) } },
{ { AK(MINUS), AK(SEMICOLON), AK(APOSTROPHE), AK(SLASH) },
{ AK(F6), AK(P), AK(EQUALS), AK(LSHIFT) } },
{ { AK(T), AK(H), AK(N), AK(SPACE) },
{ AK(F3), AK(R), AK(6), AK(B) } },
{ { 0, 0, 0, 0 },
{ 0, 0, 0, 0 } },
{ { AK(LMENU), AK(NUMPAD4), AK(NUMPAD7), AK(F11) },
{ AK(F12), AK(NUMPAD1), AK(NUMPAD2), AK(NUMPAD8) } },
{ { AK(SUBTRACT), AK(ADD), AK(MULTIPLY), AK(NUMPAD9) },
{ AK(F10), AK(NUMPAD5), AK(DIVIDE), AK(NUMLOCK) } },
{ { AK(GRAVE), AK(NUMPAD6), AK(PAUSE), AK(SPACE) },
{ AK(F9), AK(NUMPAD3), AK(DECIMAL), AK(NUMPAD0) } },
}; };
static void SuborKB_Write(uint8 v) { static void SuborKB_Write(uint8 v) {