Merge branch 'test'

[kiibohd-controller.git] / Scan / DPH / scan_loop.h

diff --git a/Scan/DPH/scan_loop.h b/Scan/DPH/scan_loop.h
index bfad6ebd1ad18ad06a03c96fc10d1a2d3ccf9f38..fc2bbbbd067046beb0ecc4a94377385b6543b1b5 100644 (file)
--- a/Scan/DPH/scan_loop.h
+++ b/Scan/DPH/scan_loop.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2013 by Jacob Alexander
- * 
+/* Copyright (C) 2013-2014 by Jacob Alexander
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -46,18 +46,15 @@ extern volatile     uint8_t KeyIndex_BufferUsed;
 // ----- Functions -----
 
 // Functions used by main.c
-void scan_setup( void );
-uint8_t scan_loop( void );
+void Scan_setup();
+uint8_t Scan_loop();
 
 
 // Functions available to macro.c
-uint8_t scan_sendData( uint8_t dataPayload );
+uint8_t Scan_sendData( uint8_t dataPayload );
 
-void scan_finishedWithBuffer( uint8_t sentKeys );
-void scan_finishedWithUSBBuffer( uint8_t sentKeys );
-void scan_lockKeyboard( void );
-void scan_unlockKeyboard( void );
-void scan_resetKeyboard( void );
+void Scan_finishedWithMacro( uint8_t sentKeys );
+void Scan_finishedWithOutput( uint8_t sentKeys );
 
 
 #endif // __SCAN_LOOP_H