# HG changeset patch # User Jacob Alexander # Date 1358739365 18000 # Node ID 9765cca5970061b03b2fe5b26a5bf097ee6fa7b5 # Parent 5e5c3bfbcc1c3218561cf72df704eeb665a545b4 Adding API changes introduced by the FACOM converter - Shouldn't affect anything, and will allow for greater buffer clearing control diff -r 5e5c3bfbcc1c -r 9765cca59700 Scan/BETKB/scan_loop.c --- a/Scan/BETKB/scan_loop.c Sun Jan 20 22:23:28 2013 -0500 +++ b/Scan/BETKB/scan_loop.c Sun Jan 20 22:36:05 2013 -0500 @@ -247,12 +247,12 @@ } // 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 -r 5e5c3bfbcc1c -r 9765cca59700 Scan/BETKB/scan_loop.h --- a/Scan/BETKB/scan_loop.h Sun Jan 20 22:23:28 2013 -0500 +++ b/Scan/BETKB/scan_loop.h Sun Jan 20 22:36:05 2013 -0500 @@ -56,8 +56,8 @@ // 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 -r 5e5c3bfbcc1c -r 9765cca59700 Scan/EpsonQX-10/scan_loop.c --- a/Scan/EpsonQX-10/scan_loop.c Sun Jan 20 22:23:28 2013 -0500 +++ b/Scan/EpsonQX-10/scan_loop.c Sun Jan 20 22:36:05 2013 -0500 @@ -382,7 +382,7 @@ } // 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 @@ // // 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 -r 5e5c3bfbcc1c -r 9765cca59700 Scan/EpsonQX-10/scan_loop.h --- a/Scan/EpsonQX-10/scan_loop.h Sun Jan 20 22:23:28 2013 -0500 +++ b/Scan/EpsonQX-10/scan_loop.h Sun Jan 20 22:36:05 2013 -0500 @@ -55,8 +55,8 @@ // 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 -r 5e5c3bfbcc1c -r 9765cca59700 Scan/HP150/scan_loop.c --- a/Scan/HP150/scan_loop.c Sun Jan 20 22:23:28 2013 -0500 +++ b/Scan/HP150/scan_loop.c Sun Jan 20 22:36:05 2013 -0500 @@ -253,12 +253,12 @@ } // 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 -r 5e5c3bfbcc1c -r 9765cca59700 Scan/HP150/scan_loop.h --- a/Scan/HP150/scan_loop.h Sun Jan 20 22:23:28 2013 -0500 +++ b/Scan/HP150/scan_loop.h Sun Jan 20 22:36:05 2013 -0500 @@ -56,8 +56,8 @@ // 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 -r 5e5c3bfbcc1c -r 9765cca59700 Scan/Kaypro1/scan_loop.c --- a/Scan/Kaypro1/scan_loop.c Sun Jan 20 22:23:28 2013 -0500 +++ b/Scan/Kaypro1/scan_loop.c Sun Jan 20 22:36:05 2013 -0500 @@ -282,12 +282,12 @@ } // 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 -r 5e5c3bfbcc1c -r 9765cca59700 Scan/Kaypro1/scan_loop.h --- a/Scan/Kaypro1/scan_loop.h Sun Jan 20 22:23:28 2013 -0500 +++ b/Scan/Kaypro1/scan_loop.h Sun Jan 20 22:36:05 2013 -0500 @@ -56,8 +56,8 @@ // 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 -r 5e5c3bfbcc1c -r 9765cca59700 Scan/MicroSwitch8304/scan_loop.c --- a/Scan/MicroSwitch8304/scan_loop.c Sun Jan 20 22:23:28 2013 -0500 +++ b/Scan/MicroSwitch8304/scan_loop.c Sun Jan 20 22:36:05 2013 -0500 @@ -204,7 +204,7 @@ // 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 @@ } // Signal that the keys have been properly sent over USB -void scan_finishedWithUSBBuffer( void ) +void scan_finishedWithUSBBuffer( uint8_t sentKeys ) { } diff -r 5e5c3bfbcc1c -r 9765cca59700 Scan/MicroSwitch8304/scan_loop.h --- a/Scan/MicroSwitch8304/scan_loop.h Sun Jan 20 22:23:28 2013 -0500 +++ b/Scan/MicroSwitch8304/scan_loop.h Sun Jan 20 22:36:05 2013 -0500 @@ -56,8 +56,8 @@ // 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 -r 5e5c3bfbcc1c -r 9765cca59700 Scan/SonyNEWS/scan_loop.c --- a/Scan/SonyNEWS/scan_loop.c Sun Jan 20 22:23:28 2013 -0500 +++ b/Scan/SonyNEWS/scan_loop.c Sun Jan 20 22:36:05 2013 -0500 @@ -208,7 +208,7 @@ // 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 @@ KeyIndex_BufferUsed = 0; } -void scan_finishedWithUSBBuffer( void ) +void scan_finishedWithUSBBuffer( uint8_t sentKeys ) { return; } diff -r 5e5c3bfbcc1c -r 9765cca59700 Scan/SonyNEWS/scan_loop.h --- a/Scan/SonyNEWS/scan_loop.h Sun Jan 20 22:23:28 2013 -0500 +++ b/Scan/SonyNEWS/scan_loop.h Sun Jan 20 22:36:05 2013 -0500 @@ -55,8 +55,8 @@ // 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 -r 5e5c3bfbcc1c -r 9765cca59700 Scan/SonyOA-S3400/scan_loop.c --- a/Scan/SonyOA-S3400/scan_loop.c Sun Jan 20 22:23:28 2013 -0500 +++ b/Scan/SonyOA-S3400/scan_loop.c Sun Jan 20 22:36:05 2013 -0500 @@ -519,7 +519,7 @@ // 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 @@ // 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 -r 5e5c3bfbcc1c -r 9765cca59700 Scan/SonyOA-S3400/scan_loop.h --- a/Scan/SonyOA-S3400/scan_loop.h Sun Jan 20 22:23:28 2013 -0500 +++ b/Scan/SonyOA-S3400/scan_loop.h Sun Jan 20 22:36:05 2013 -0500 @@ -56,8 +56,8 @@ // 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 -r 5e5c3bfbcc1c -r 9765cca59700 Scan/Tandy1000/scan_loop.c --- a/Scan/Tandy1000/scan_loop.c Sun Jan 20 22:23:28 2013 -0500 +++ b/Scan/Tandy1000/scan_loop.c Sun Jan 20 22:36:05 2013 -0500 @@ -232,12 +232,12 @@ // 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 -r 5e5c3bfbcc1c -r 9765cca59700 Scan/Tandy1000/scan_loop.h --- a/Scan/Tandy1000/scan_loop.h Sun Jan 20 22:23:28 2013 -0500 +++ b/Scan/Tandy1000/scan_loop.h Sun Jan 20 22:36:05 2013 -0500 @@ -56,8 +56,8 @@ // 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 -r 5e5c3bfbcc1c -r 9765cca59700 Scan/UnivacF3W9/scan_loop.c --- a/Scan/UnivacF3W9/scan_loop.c Sun Jan 20 22:23:28 2013 -0500 +++ b/Scan/UnivacF3W9/scan_loop.c Sun Jan 20 22:36:05 2013 -0500 @@ -323,14 +323,14 @@ } // 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 -r 5e5c3bfbcc1c -r 9765cca59700 Scan/UnivacF3W9/scan_loop.h --- a/Scan/UnivacF3W9/scan_loop.h Sun Jan 20 22:23:28 2013 -0500 +++ b/Scan/UnivacF3W9/scan_loop.h Sun Jan 20 22:36:05 2013 -0500 @@ -55,8 +55,8 @@ // 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 -r 5e5c3bfbcc1c -r 9765cca59700 Scan/matrix/scan_loop.c --- a/Scan/matrix/scan_loop.c Sun Jan 20 22:23:28 2013 -0500 +++ b/Scan/matrix/scan_loop.c Sun Jan 20 22:36:05 2013 -0500 @@ -161,14 +161,14 @@ // 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 -r 5e5c3bfbcc1c -r 9765cca59700 Scan/matrix/scan_loop.h --- a/Scan/matrix/scan_loop.h Sun Jan 20 22:23:28 2013 -0500 +++ b/Scan/matrix/scan_loop.h Sun Jan 20 22:36:05 2013 -0500 @@ -63,8 +63,8 @@ // 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 );