di0ib/tmk_keyboard_custom
Archived
1
0
Fork 0
Code Releases Activity

Fix PS/2 protocol build options

Browse Source
This commit is contained in:
tmk 2012-10-14 20:03:26 +09:00
parent ab65887b1e
commit 9999353bfd
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
protocol/ps2.c
View File

@ -89,8 +89,9 @@ uint8_t ps2_error = PS2_ERR_NONE;
void ps2_host_init(void) void ps2_host_init(void)
{ {
#ifdef PS2_INT_ENABLE #ifdef PS2_USE_INT
PS2_INT_ENABLE(); PS2_INT_INIT();
PS2_INT_ON();
idle(); idle();
#else #else
inhibit(); inhibit();
@ -103,8 +104,8 @@ uint8_t ps2_host_send(uint8_t data)
uint8_t res = 0; uint8_t res = 0;
bool parity = true; bool parity = true;
ps2_error = PS2_ERR_NONE; ps2_error = PS2_ERR_NONE;
#ifdef PS2_INT_DISABLE #ifdef PS2_USE_INT
PS2_INT_DISABLE(); PS2_INT_OFF();
#endif #endif
/* terminate a transmission if we have */ /* terminate a transmission if we have */
inhibit(); inhibit();
@ -144,8 +145,8 @@ uint8_t ps2_host_send(uint8_t data)
res = ps2_host_recv_response(); res = ps2_host_recv_response();
ERROR: ERROR:
#ifdef PS2_INT_ENABLE #ifdef PS2_USE_INT
PS2_INT_ENABLE(); PS2_INT_ON();
idle(); idle();
#else #else
inhibit(); inhibit();
@ -173,7 +174,7 @@ uint8_t ps2_host_recv_response(void)
return data; return data;
} }
#ifndef PS2_INT_VECT #ifndef PS2_USE_INT
uint8_t ps2_host_recv(void) uint8_t ps2_host_recv(void)
{ {
return ps2_host_recv_response(); return ps2_host_recv_response();