Merge branch 'master' of github.com:cbbrowne/qmk_firmware

1 files changed, 14 insertions, 4 deletions

diff --git a/tmk_core/common/matrix.h b/tmk_core/common/matrix.h
index 85415df719..cee3593eee 100644
--- a/tmk_core/common/matrix.h
+++ b/tmk_core/common/matrix.h
@@ -14,7 +14,6 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 #ifndef MATRIX_H
 #define MATRIX_H
 
@@ -63,9 +62,20 @@ void matrix_print(void);
 void matrix_power_up(void);
 void matrix_power_down(void);
 
-/* keyboard-specific setup/loop functionality */
-void * matrix_init_kb(void);
-void * matrix_scan_kb(void);
+/* executes code for Quantum */
+void matrix_init_quantum(void);
+void matrix_scan_quantum(void);
+
+void matrix_init_kb(void);
+void matrix_scan_kb(void);
+
+void matrix_init_user(void);
+void matrix_scan_user(void);
+
+#ifdef I2C_SPLIT
+	void slave_matrix_init(void);
+	uint8_t slave_matrix_scan(void);
+#endif
 
 #ifdef __cplusplus
 }