From f674db7de30b6ea8525e18ecd33d5e5d3924c6ae Mon Sep 17 00:00:00 2001 From: Jacob Alexander Date: Sun, 20 Jan 2013 22:36:05 -0500 Subject: [PATCH] Adding API changes introduced by the FACOM converter - Shouldn't affect anything, and will allow for greater buffer clearing control --- Scan/BETKB/scan_loop.c | 4 ++-- Scan/BETKB/scan_loop.h | 4 ++-- Scan/EpsonQX-10/scan_loop.c | 4 ++-- Scan/EpsonQX-10/scan_loop.h | 4 ++-- Scan/HP150/scan_loop.c | 4 ++-- Scan/HP150/scan_loop.h | 4 ++-- Scan/Kaypro1/scan_loop.c | 4 ++-- Scan/Kaypro1/scan_loop.h | 4 ++-- Scan/MicroSwitch8304/scan_loop.c | 4 ++-- Scan/MicroSwitch8304/scan_loop.h | 4 ++-- Scan/SonyNEWS/scan_loop.c | 4 ++-- Scan/SonyNEWS/scan_loop.h | 4 ++-- Scan/SonyOA-S3400/scan_loop.c | 4 ++-- Scan/SonyOA-S3400/scan_loop.h | 4 ++-- Scan/Tandy1000/scan_loop.c | 4 ++-- Scan/Tandy1000/scan_loop.h | 4 ++-- Scan/UnivacF3W9/scan_loop.c | 4 ++-- Scan/UnivacF3W9/scan_loop.h | 4 ++-- Scan/matrix/scan_loop.c | 4 ++-- Scan/matrix/scan_loop.h | 4 ++-- 20 files changed, 40 insertions(+), 40 deletions(-) diff --git a/Scan/BETKB/scan_loop.c b/Scan/BETKB/scan_loop.c index 1355f9a..f473f6d 100644 --- a/Scan/BETKB/scan_loop.c +++ b/Scan/BETKB/scan_loop.c @@ -247,12 +247,12 @@ uint8_t scan_sendData( uint8_t dataPayload ) } // Signal KeyIndex_Buffer that it has been properly read -void scan_finishedWithBuffer( void ) +void scan_finishedWithBuffer( uint8_t sentKeys ) { } // Signal that the keys have been properly sent over USB -void scan_finishedWithUSBBuffer( void ) +void scan_finishedWithUSBBuffer( uint8_t sentKeys ) { } diff --git a/Scan/BETKB/scan_loop.h b/Scan/BETKB/scan_loop.h index 58438c6..e491606 100644 --- a/Scan/BETKB/scan_loop.h +++ b/Scan/BETKB/scan_loop.h @@ -56,8 +56,8 @@ uint8_t scan_loop( void ); // Functions available to macro.c uint8_t scan_sendData( uint8_t dataPayload ); -void scan_finishedWithBuffer( void ); -void scan_finishedWithUSBBuffer( void ); +void scan_finishedWithBuffer( uint8_t sentKeys ); +void scan_finishedWithUSBBuffer( uint8_t sentKeys ); void scan_lockKeyboard( void ); void scan_unlockKeyboard( void ); void scan_resetKeyboard( void ); diff --git a/Scan/EpsonQX-10/scan_loop.c b/Scan/EpsonQX-10/scan_loop.c index 8bbabf8..9cd813b 100644 --- a/Scan/EpsonQX-10/scan_loop.c +++ b/Scan/EpsonQX-10/scan_loop.c @@ -382,7 +382,7 @@ uint8_t scan_sendData( uint8_t dataPayload ) } // Signal KeyIndex_Buffer that it has been properly read -inline void scan_finishedWithBuffer( void ) +inline void scan_finishedWithBuffer( uint8_t sentKeys ) { return; } @@ -394,7 +394,7 @@ inline void scan_finishedWithBuffer( void ) // // However, this differentiation causes complications on how the key signals are discarded and used // The single keypresses must be discarded immediately, while the modifiers must be kept -inline void scan_finishedWithUSBBuffer( void ) +inline void scan_finishedWithUSBBuffer( uint8_t sentKeys ) { uint8_t foundModifiers = 0; diff --git a/Scan/EpsonQX-10/scan_loop.h b/Scan/EpsonQX-10/scan_loop.h index 4ce8c7e..1e05626 100644 --- a/Scan/EpsonQX-10/scan_loop.h +++ b/Scan/EpsonQX-10/scan_loop.h @@ -55,8 +55,8 @@ uint8_t scan_loop( void ); // Functions available to macro.c uint8_t scan_sendData( uint8_t dataPayload ); -void scan_finishedWithBuffer( void ); -void scan_finishedWithUSBBuffer( void ); +void scan_finishedWithBuffer( uint8_t sentKeys ); +void scan_finishedWithUSBBuffer( uint8_t sentKeys ); void scan_lockKeyboard( void ); void scan_unlockKeyboard( void ); void scan_resetKeyboard( void ); diff --git a/Scan/HP150/scan_loop.c b/Scan/HP150/scan_loop.c index bfa0424..40ba111 100644 --- a/Scan/HP150/scan_loop.c +++ b/Scan/HP150/scan_loop.c @@ -253,12 +253,12 @@ uint8_t scan_sendData( uint8_t dataPayload ) } // Signal KeyIndex_Buffer that it has been properly read -void scan_finishedWithBuffer( void ) +void scan_finishedWithBuffer( uint8_t sentKeys ) { } // Signal that the keys have been properly sent over USB -void scan_finishedWithUSBBuffer( void ) +void scan_finishedWithUSBBuffer( uint8_t sentKeys ) { } diff --git a/Scan/HP150/scan_loop.h b/Scan/HP150/scan_loop.h index 58438c6..e491606 100644 --- a/Scan/HP150/scan_loop.h +++ b/Scan/HP150/scan_loop.h @@ -56,8 +56,8 @@ uint8_t scan_loop( void ); // Functions available to macro.c uint8_t scan_sendData( uint8_t dataPayload ); -void scan_finishedWithBuffer( void ); -void scan_finishedWithUSBBuffer( void ); +void scan_finishedWithBuffer( uint8_t sentKeys ); +void scan_finishedWithUSBBuffer( uint8_t sentKeys ); void scan_lockKeyboard( void ); void scan_unlockKeyboard( void ); void scan_resetKeyboard( void ); diff --git a/Scan/Kaypro1/scan_loop.c b/Scan/Kaypro1/scan_loop.c index 19fb0f3..97d0318 100644 --- a/Scan/Kaypro1/scan_loop.c +++ b/Scan/Kaypro1/scan_loop.c @@ -282,12 +282,12 @@ uint8_t scan_sendData( uint8_t dataPayload ) } // Signal KeyIndex_Buffer that it has been properly read -void scan_finishedWithBuffer( void ) +void scan_finishedWithBuffer( uint8_t sentKeys ) { } // Signal that the keys have been properly sent over USB -void scan_finishedWithUSBBuffer( void ) +void scan_finishedWithUSBBuffer( uint8_t sentKeys ) { } diff --git a/Scan/Kaypro1/scan_loop.h b/Scan/Kaypro1/scan_loop.h index 41637d7..661c204 100644 --- a/Scan/Kaypro1/scan_loop.h +++ b/Scan/Kaypro1/scan_loop.h @@ -56,8 +56,8 @@ uint8_t scan_loop( void ); // Functions available to macro.c uint8_t scan_sendData( uint8_t dataPayload ); -void scan_finishedWithBuffer( void ); -void scan_finishedWithUSBBuffer( void ); +void scan_finishedWithBuffer( uint8_t sentKeys ); +void scan_finishedWithUSBBuffer( uint8_t sentKeys ); void scan_lockKeyboard( void ); void scan_unlockKeyboard( void ); void scan_resetKeyboard( void ); diff --git a/Scan/MicroSwitch8304/scan_loop.c b/Scan/MicroSwitch8304/scan_loop.c index 0f145cc..fdacb6c 100644 --- a/Scan/MicroSwitch8304/scan_loop.c +++ b/Scan/MicroSwitch8304/scan_loop.c @@ -204,7 +204,7 @@ uint8_t scan_sendData( uint8_t dataPayload ) // Signal KeyIndex_Buffer that it has been properly read // In the case of the Micro Switch 8304, we leave the buffer alone until more scancode data comes in -void scan_finishedWithBuffer( void ) +void scan_finishedWithBuffer( uint8_t sentKeys ) { // We received a Clear code from the 8304, clear the buffer now that we've used it if ( BufferReadyToClear ) @@ -215,7 +215,7 @@ void scan_finishedWithBuffer( void ) } // Signal that the keys have been properly sent over USB -void scan_finishedWithUSBBuffer( void ) +void scan_finishedWithUSBBuffer( uint8_t sentKeys ) { } diff --git a/Scan/MicroSwitch8304/scan_loop.h b/Scan/MicroSwitch8304/scan_loop.h index ef782b2..0a46ffa 100644 --- a/Scan/MicroSwitch8304/scan_loop.h +++ b/Scan/MicroSwitch8304/scan_loop.h @@ -56,8 +56,8 @@ uint8_t scan_loop( void ); // Functions available to macro.c uint8_t scan_sendData( uint8_t dataPayload ); -void scan_finishedWithBuffer( void ); -void scan_finishedWithUSBBuffer( void ); +void scan_finishedWithBuffer( uint8_t sentKeys ); +void scan_finishedWithUSBBuffer( uint8_t sentKeys ); void scan_lockKeyboard( void ); void scan_unlockKeyboard( void ); void scan_resetKeyboard( void ); diff --git a/Scan/SonyNEWS/scan_loop.c b/Scan/SonyNEWS/scan_loop.c index ca4d0bb..6cab58a 100644 --- a/Scan/SonyNEWS/scan_loop.c +++ b/Scan/SonyNEWS/scan_loop.c @@ -208,7 +208,7 @@ uint8_t scan_sendData( uint8_t dataPayload ) // Signal KeyIndex_Buffer that it has been properly read // Not needed as a signal is sent to remove key-presses -void scan_finishedWithBuffer( void ) +void scan_finishedWithBuffer( uint8_t sentKeys ) { return; } @@ -230,7 +230,7 @@ void scan_resetKeyboard( void ) KeyIndex_BufferUsed = 0; } -void scan_finishedWithUSBBuffer( void ) +void scan_finishedWithUSBBuffer( uint8_t sentKeys ) { return; } diff --git a/Scan/SonyNEWS/scan_loop.h b/Scan/SonyNEWS/scan_loop.h index f3b1466..1e05626 100644 --- a/Scan/SonyNEWS/scan_loop.h +++ b/Scan/SonyNEWS/scan_loop.h @@ -55,8 +55,8 @@ uint8_t scan_loop( void ); // Functions available to macro.c uint8_t scan_sendData( uint8_t dataPayload ); -void scan_finishedWithUSBBuffer( void ); -void scan_finishedWithBuffer( void ); +void scan_finishedWithBuffer( uint8_t sentKeys ); +void scan_finishedWithUSBBuffer( uint8_t sentKeys ); void scan_lockKeyboard( void ); void scan_unlockKeyboard( void ); void scan_resetKeyboard( void ); diff --git a/Scan/SonyOA-S3400/scan_loop.c b/Scan/SonyOA-S3400/scan_loop.c index dda9b28..c7dd71b 100644 --- a/Scan/SonyOA-S3400/scan_loop.c +++ b/Scan/SonyOA-S3400/scan_loop.c @@ -519,7 +519,7 @@ uint8_t scan_sendData( uint8_t dataPayload ) // Signal KeyIndex_Buffer that it has been properly read // Not needed as a signal is sent to remove key-presses -void scan_finishedWithBuffer( void ) +void scan_finishedWithBuffer( uint8_t sentKeys ) { return; } @@ -551,7 +551,7 @@ void scan_resetKeyboard( void ) // USB module is finished with buffer // Not needed as a signal is sent to remove key-presses -void scan_finishedWithUSBBuffer( void ) +void scan_finishedWithUSBBuffer( uint8_t sentKeys ) { return; } diff --git a/Scan/SonyOA-S3400/scan_loop.h b/Scan/SonyOA-S3400/scan_loop.h index 41412b2..7d7f309 100644 --- a/Scan/SonyOA-S3400/scan_loop.h +++ b/Scan/SonyOA-S3400/scan_loop.h @@ -56,8 +56,8 @@ uint8_t scan_loop( void ); // Functions available to macro.c uint8_t scan_sendData( uint8_t dataPayload ); -void scan_finishedWithUSBBuffer( void ); -void scan_finishedWithBuffer( void ); +void scan_finishedWithBuffer( uint8_t sentKeys ); +void scan_finishedWithUSBBuffer( uint8_t sentKeys ); void scan_lockKeyboard( void ); void scan_unlockKeyboard( void ); void scan_resetKeyboard( void ); diff --git a/Scan/Tandy1000/scan_loop.c b/Scan/Tandy1000/scan_loop.c index c6eed86..a906b13 100644 --- a/Scan/Tandy1000/scan_loop.c +++ b/Scan/Tandy1000/scan_loop.c @@ -232,12 +232,12 @@ uint8_t scan_sendData( uint8_t dataPayload ) // Signal KeyIndex_Buffer that it has been properly read // TODO -void scan_finishedWithBuffer( void ) +void scan_finishedWithBuffer( uint8_t sentKeys ) { } // Signal that the keys have been properly sent over USB -void scan_finishedWithUSBBuffer( void ) +void scan_finishedWithUSBBuffer( uint8_t sentKeys ) { } diff --git a/Scan/Tandy1000/scan_loop.h b/Scan/Tandy1000/scan_loop.h index f185b4c..911960a 100644 --- a/Scan/Tandy1000/scan_loop.h +++ b/Scan/Tandy1000/scan_loop.h @@ -56,8 +56,8 @@ uint8_t scan_loop( void ); // Functions available to macro.c uint8_t scan_sendData( uint8_t dataPayload ); -void scan_finishedWithBuffer( void ); -void scan_finishedWithUSBBuffer( void ); +void scan_finishedWithBuffer( uint8_t sentKeys ); +void scan_finishedWithUSBBuffer( uint8_t sentKeys ); void scan_lockKeyboard( void ); void scan_unlockKeyboard( void ); void scan_resetKeyboard( void ); diff --git a/Scan/UnivacF3W9/scan_loop.c b/Scan/UnivacF3W9/scan_loop.c index 1ee4443..cb417a6 100644 --- a/Scan/UnivacF3W9/scan_loop.c +++ b/Scan/UnivacF3W9/scan_loop.c @@ -323,14 +323,14 @@ uint8_t scan_sendData( uint8_t dataPayload ) } // Signal KeyIndex_Buffer that it has been properly read -inline void scan_finishedWithBuffer( void ) +inline void scan_finishedWithBuffer( uint8_t sentKeys ) { return; } // Signal that the keys have been properly sent over USB // TODO -inline void scan_finishedWithUSBBuffer( void ) +inline void scan_finishedWithUSBBuffer( uint8_t sentKeys ) { /* uint8_t foundModifiers = 0; diff --git a/Scan/UnivacF3W9/scan_loop.h b/Scan/UnivacF3W9/scan_loop.h index 00f318f..8f2e69e 100644 --- a/Scan/UnivacF3W9/scan_loop.h +++ b/Scan/UnivacF3W9/scan_loop.h @@ -55,8 +55,8 @@ uint8_t scan_loop( void ); // Functions available to macro.c uint8_t scan_sendData( uint8_t dataPayload ); -void scan_finishedWithBuffer( void ); -void scan_finishedWithUSBBuffer( void ); +void scan_finishedWithBuffer( uint8_t sentKeys ); +void scan_finishedWithUSBBuffer( uint8_t sentKeys ); void scan_lockKeyboard( void ); void scan_unlockKeyboard( void ); void scan_resetKeyboard( void ); diff --git a/Scan/matrix/scan_loop.c b/Scan/matrix/scan_loop.c index f385295..1b3912d 100644 --- a/Scan/matrix/scan_loop.c +++ b/Scan/matrix/scan_loop.c @@ -161,14 +161,14 @@ inline uint8_t scan_loop() // Signal that the keys have been properly sent over USB -inline void scan_finishedWithUSBBuffer( void ) +inline void scan_finishedWithUSBBuffer( uint8_t sentKeys ) { return; } // Signal KeyIndex_Buffer that it has been fully scanned using the macro module -inline void scan_finishedWithBuffer( void ) +inline void scan_finishedWithBuffer( uint8_t sentKeys ) { return; } diff --git a/Scan/matrix/scan_loop.h b/Scan/matrix/scan_loop.h index eaff7a0..c0f7aa3 100644 --- a/Scan/matrix/scan_loop.h +++ b/Scan/matrix/scan_loop.h @@ -63,8 +63,8 @@ uint8_t scan_loop( void ); // Functions available to macro.c uint8_t scan_sendData( uint8_t dataPayload ); -void scan_finishedWithBuffer( void ); -void scan_finishedWithUSBBuffer( void ); +void scan_finishedWithBuffer( uint8_t sentKeys ); +void scan_finishedWithUSBBuffer( uint8_t sentKeys ); void scan_lockKeyboard( void ); void scan_unlockKeyboard( void ); void scan_resetKeyboard( void );