Merge pull request #190 from yoyoerx/function_pointers

Addressing void* return warning & coding style

82 files changed, 33034 insertions, 41462 deletions

diff --git a/keyboard/atomic/atomic.c b/keyboard/atomic/atomic.c
index fa66266a4c..30e8122893 100644
--- a/keyboard/atomic/atomic.c
+++ b/keyboard/atomic/atomic.c
@@ -1,16 +1,16 @@
 #include "atomic.h"
 
 __attribute__ ((weak))
-void * matrix_init_user(void) {
+void matrix_init_user(void) {
 	// leave these blank
-};
+}
 
 __attribute__ ((weak))
-void * matrix_scan_user(void) {
+void matrix_scan_user(void) {
 	// leave these blank
-};
+}
 
-void * matrix_init_kb(void) {
+void matrix_init_kb(void) {
 	// put your keyboard start-up code here
 	// runs once when the firmware starts up
 
@@ -25,16 +25,12 @@ void * matrix_init_kb(void) {
     DDRE |= (1<<6);
     PORTE |= (1<<6);
 
-	if (matrix_init_user) {
-		(*matrix_init_user)();
-	}
-};
+	matrix_init_user();
+}
 
-void * matrix_scan_kb(void) {
+void matrix_scan_kb(void) {
 	// put your looping keyboard code here
 	// runs every cycle (a lot)
 
-	if (matrix_scan_user) {
-		(*matrix_scan_user)();
-	}
-};
\ No newline at end of file
+	matrix_scan_user();
+}
\ No newline at end of file
diff --git a/keyboard/atomic/atomic.h b/keyboard/atomic/atomic.h
index 95982ecad1..d8574efa93 100644
--- a/keyboard/atomic/atomic.h
+++ b/keyboard/atomic/atomic.h
@@ -24,7 +24,7 @@
     { K40, K41, KC_NO, K43, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B,   K4C,   K4D,   K4E }  \
 }
 
-void * matrix_init_user(void);
-void * matrix_scan_user(void);
+void matrix_init_user(void);
+void matrix_scan_user(void);
 
 #endif
\ No newline at end of file
diff --git a/keyboard/atreus/atreus.c b/keyboard/atreus/atreus.c
index bfc893084f..9d1de631bb 100644
--- a/keyboard/atreus/atreus.c
+++ b/keyboard/atreus/atreus.c
@@ -1,16 +1,16 @@
 #include "atreus.h"
 
 __attribute__ ((weak))
-void * matrix_init_user(void) {
+void matrix_init_user(void) {
 	// leave these blank
 };
 
 __attribute__ ((weak))
-void * matrix_scan_user(void) {
+void matrix_scan_user(void) {
 	// leave these blank
 };
 
-void * matrix_init_kb(void) {
+void matrix_init_kb(void) {
 	// put your keyboard start-up code here
 	// runs once when the firmware starts up
 
@@ -19,7 +19,7 @@ void * matrix_init_kb(void) {
 	}
 };
 
-void * matrix_scan_kb(void) {
+void matrix_scan_kb(void) {
 	// put your looping keyboard code here
 	// runs every cycle (a lot)
 
diff --git a/keyboard/atreus/atreus.h b/keyboard/atreus/atreus.h
index 9dd77859f9..8d5989e442 100644
--- a/keyboard/atreus/atreus.h
+++ b/keyboard/atreus/atreus.h
@@ -22,7 +22,7 @@
 	{ k2a, k30, k31, k32, k33, k34,   k36, k37, k38, k39, k3a } \
 }
 
-void * matrix_init_user(void);
-void * matrix_scan_user(void);
+void matrix_init_user(void);
+void matrix_scan_user(void);
 
 #endif
diff --git a/keyboard/ergodox_ez/190hotfix.sh b/keyboard/ergodox_ez/190hotfix.sh
new file mode 100755
index 0000000000..bdc3adce22
--- /dev/null
+++ b/keyboard/ergodox_ez/190hotfix.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+#a tool to fix broken keymaps as a result of pull request #190 
+#changing the declaration of matrix_scan_user() and matrix_init_user()
+#
+#This script will save a copy of the specified keymap as keymap.c.bak
+#and then create a new keymap.c with the definion corrected.
+#this script must be run from the ergodox_ez directory
+if [ $# -ne 1 ]; then
+    echo $0: usage: ./190hotfix keymap_name
+    exit 1
+fi
+
+echo Saving backup as ./keymaps/$1/keymap.c.bak ...
+mv ./keymaps/$1/keymap.c ./keymaps/$1/keymap.c.bak
+
+echo Modifying ./keymaps/$1/keymap.c ...
+cat ./keymaps/$1/keymap.c.bak | sed -r 's/^void \* matrix_/void matrix_/'>./keymaps/$1/keymap.c
+
+echo Complete!
diff --git a/keyboard/ergodox_ez/ergodox_ez.c b/keyboard/ergodox_ez/ergodox_ez.c
index d0eaf33923..97e6de1ee3 100644
--- a/keyboard/ergodox_ez/ergodox_ez.c
+++ b/keyboard/ergodox_ez/ergodox_ez.c
@@ -5,16 +5,16 @@ bool i2c_initialized = 0;
 uint8_t mcp23018_status = 0x20;
 
 __attribute__ ((weak))
-void * matrix_init_user(void) {
-    return NULL;
-};
+void matrix_init_user(void) {
+
+}
 
 __attribute__ ((weak))
-void * matrix_scan_user(void) {
-    return NULL;
-};
+void matrix_scan_user(void) {
+
+}
 
-void * matrix_init_kb(void) {
+void matrix_init_kb(void) {
    // keyboard LEDs (see "PWM on ports OC1(A|B|C)" in "teensy-2-0.md")
     TCCR1A = 0b10101001;  // set and configure fast PWM
     TCCR1B = 0b00001001;  // set and configure fast PWM
@@ -34,21 +34,12 @@ void * matrix_init_kb(void) {
 
     ergodox_blink_all_leds();
 
-    if (matrix_init_user) {
-        (*matrix_init_user)();
-    }
-
-    return NULL;
-};
-
-void * matrix_scan_kb(void) {
-
-    if (matrix_scan_user) {
-        (*matrix_scan_user)();
-    }
+    matrix_init_user();
+}
 
-    return NULL;
-};
+void matrix_scan_kb(void) {
+    matrix_scan_user();
+}
 
 
 void ergodox_blink_all_leds(void)
diff --git a/keyboard/ergodox_ez/ergodox_ez.h b/keyboard/ergodox_ez/ergodox_ez.h
index aceb7ed9c3..1e446baf6f 100644
--- a/keyboard/ergodox_ez/ergodox_ez.h
+++ b/keyboard/ergodox_ez/ergodox_ez.h
@@ -123,8 +123,8 @@ inline void ergodox_led_all_set(uint8_t n)
     { k0D, k1D, k2D, k3D, k4D, KC_NO }    \
    }
 
-void * matrix_init_user(void);
-void * matrix_scan_user(void);
+void matrix_init_user(void);
+void matrix_scan_user(void);
 
 
 
diff --git a/keyboard/ergodox_ez/keymaps/andrew_osx/andrew_osx.hex b/keyboard/ergodox_ez/keymaps/andrew_osx/andrew_osx.hex
index e3ee9afd3e..fc0876d844 100644
--- a/keyboard/ergodox_ez/keymaps/andrew_osx/andrew_osx.hex
+++ b/keyboard/ergodox_ez/keymaps/andrew_osx/andrew_osx.hex
@@ -1,17 +1,17 @@
-:100000000C9400070C9444070C9444070C94440788

-:100010000C9444070C9444070C9444070C94440734

-:100020000C9444070C9444070C9458120C942A1313

-:100030000C9444070C9444070C9444070C94440714

-:100040000C9444070C94022C0C9444070C94440721

-:100050000C9444070C94FA210C9444070C94440724

-:100060000C9444070C9444070C9444070C944407E4

-:100070000C9444070C9444070C9444070C944407D4

-:100080000C9444070C9444070C9444070C944407C4

-:100090000C9444070C9444070C9444070C944407B4

-:1000A0000C9444070C9444070C9444079713B91319

-:1000B000A714B913A714FE132114A71476148914D6

-:1000C000D017D017FF17FF17431881189B1A9B1AD8

-:1000D0009A189B1A9B199B196F1A9B1A9B1A861ABE

+:100000000C9465020C94AC020C94AC020C94AC02FF

+:100010000C94AC020C94AC020C94AC020C94AC02A8

+:100020000C94AC020C94AC020C94C30B0C94950C85

+:100030000C94AC020C94AC020C94AC020C94AC0288

+:100040000C94AC020C9409210C94AC020C94AC02FC

+:100050000C94AC020C949B1A0C94AC020C94AC0261

+:100060000C94AC020C94AC020C94AC020C94AC0258

+:100070000C94AC020C94AC020C94AC020C94AC0248

+:100080000C94AC020C94AC020C94AC020C94AC0238

+:100090000C94AC020C94AC020C94AC020C94AC0228

+:1000A0000C94AC020C94AC020C94AC02020D240D26

+:1000B000170E240D170E690D8C0D170EE10DF40DA2

+:1000C000DE10DE100D110D1150118A1197139713C8

+:1000D000A3119713981298126B1397139713821307

 :1000E0000000F0A12E002B002971E10035810000F5

 :1000F0001E00140004001D71E20027021F001A00F8

 :1001000016001B00E104E3002000080007000600C1

@@ -43,1429 +43,1079 @@
 :1002A0000100010001000100A9000100010001009E

 :1002B0000100AC00AA00B600010001000100AB0083

 :1002C000A80001000100010001000100010001007F

-:1002D00001000100AE000100010000000A0025300D

-:1002E000313662003A200025303258000A722F63FE

-:1002F0002030313233343536373839414243444582

-:10030000460A000A002530325800626F756E636538

-:10031000213A20006C6566742073696465206174FD

-:100320007461636865640A006C656674207369644F

-:1003300065206E6F7420726573706F6E64696E678E

-:100340000A00747279696E6720746F207265736534

-:1003500074206D637032333031380A000A444542EC

-:1003600055473A20656E61626C65642E0A005B73C6

-:100370005D004B6579626F617264207374617274A1

-:100380002E0A005B575D005B535D005B525D005BB6

-:10039000445D005B435D0016034500720067006F1B

-:1003A0000044006F007800200045005A000000164D

-:1003B000034500720067006F0044006F0078002062

-:1003C0000045005A0000000403090409028D0005DD

-:1003D0000100A0FA09040000010301010009211134

-:1003E000010001223F000705810308000A090401FA

-:1003F000000103010200092111010001224D000743

-:1004000005820308000A0904020001030000000934

-:1004100021110100012236000705830308000A09A3

-:100420000403000203000000092111010001222041

-:1004300000070584032000010705040320000109CB

-:100440000404000103000000092111010001223908

-:1004500000070585031000011201100100000008CB

-:10046000EDFE071301000102000105010906A101CB

-:10047000050719E029E71500250195087501810296

-:100480000508190129059505750191029501750366

-:100490009101050719002977150025019578750147

-:1004A0008102C00631FF0974A1010975150025FFFD

-:1004B0009520750881020976150025FF952075089D

-:1004C0009102C005010980A101850216010026B72D

-:1004D000001A01002AB700751095018100C0050CB3

-:1004E0000901A1018503160100269C021A01002AB8

-:1004F0009C02751095018100C005010902A1010946

-:1005000001A10005091901290515002501950575A9

-:100510000181029501750381010501093009311539

-:1005200081257F95027508810609381581257F95FB

-:100530000175088106050C0A38021581257F950191

-:1005400075088106C0C005010906A101050719E06B

-:1005500029E71500250195087501810295017508A7

-:10056000810105081901290595057501910295017B

-:10057000750391010507190029FF150025FF950650

-:1005800075088100C00A002530325820006B65795B

-:10059000626F6172645F7265706F72743A20000AF4

-:1005A0000025303258006B6579626F6172645F7349

-:1005B00065745F6C65643A200064656C5F6B657997

-:1005C0005F6269743A2063616E27742064656C3AD7

-:1005D00020253032580A006164645F6B65795F6280

-:1005E00069743A2063616E2774206164643A20253F

-:1005F0003032580A00646F6E652E0A00626F6F67B2

-:100600006D61676963207363616E3A202E2E2E2020

-:1006100000290A002575002F002575005D2800259A

-:10062000640020002564002000256400200025646B

-:10063000007C0025303258006D6F7573656B6579ED

-:10064000205B62746E7C782079207620685D287249

-:1006500065702F61636C293A205B006D6B5F776872

-:1006600065656C5F74696D655F746F5F6D6178203F

-:100670003D2025640A006D6B5F776865656C5F6D72

-:1006800061785F7370656564203D2025640A006DA4

-:100690006B5F74696D655F746F5F6D6178203D207D

-:1006A00025640A006D6B5F6D61785F7370656564CA

-:1006B000203D2025640A006D6B5F696E746572765B

-:1006C000616C203D2025640A006D6B5F64656C6180

-:1006D00079203D2025640A006D6B5F776865656C45

-:1006E0005F74696D655F746F5F6D6178203D202573

-:1006F000640A006D6B5F776865656C5F6D61785F3C

-:100700007370656564203D2025640A006D6B5F741D

-:10071000696D655F746F5F6D6178203D2025640AA7

-:10072000006D6B5F6D61785F7370656564203D205F

-:1007300025640A006D6B5F696E74657276616C206A

-:100740003D2025640A006D6B5F64656C6179203D16

-:100750002025640A000A00257500363A207768656E

-:10076000656C5F74696D655F746F5F6D61783A2069

-:10077000000A00257500353A20776865656C5F6D65

-:1007800061785F73706565643A20000A0025750022

-:10079000343A2074696D655F746F5F6D61783A20DB

-:1007A000000A00257500333A206D61785F7370652B

-:1007B00065643A20000A00257500323A20696E749B

-:1007C000657276616C286D73293A20000A002575E0

-:1007D00000313A2064656C6179282A31306D7329C3

-:1007E0003A20000A092D2056616C756573202D0A88

-:1007F000004D3E004D25643E20003F00736574208F

-:1008000064656661756C740A00433E200077686514

-:1008100072652064656C74613A20637572736F72DF

-:100820003D25642C20776865656C3D25640A536519

-:100830006520687474703A2F2F656E2E77696B6926

-:1008400070656469612E6F72672F77696B692F4DD0

-:100850006F7573655F6B6579730A000A092D204D0A

-:100860006F7573656B6579202D0A4553432F713A77

-:1008700009717569740A313A0964656C6179282ACD

-:1008800031306D73290A323A09696E746572766186

-:100890006C286D73290A333A096D61785F7370654E

-:1008A00065640A343A0974696D655F746F5F6D61E0

-:1008B000780A353A09776865656C5F6D61785F73B2

-:1008C000706565640A363A09776865656C5F7469B6

-:1008D0006D655F746F5F6D61780A0A703A097072B6

-:1008E000696E742076616C7565730A643A09736584

-:1008F000742064656661756C74730A75703A092BAF

-:10090000310A646F776E3A092D310A706775703A53

-:10091000092B31300A7067646F776E3A092D3130D8

-:100920000A0A7370656564203D2064656C746120FB

-:100930002A206D61785F7370656564202A202872B3

-:100940006570656174202F2074696D655F746F5FD9

-:100950006D6178290A003F004D3E2000433E200093

-:100960004C25640A000A092D20436F6E736F6C6575

-:10097000202D0A4553432F713A09717569740A6D28

-:100980003A096D6F7573656B65790A000A092D2048

-:100990004D61676963202D0A643A09646562756771

-:1009A0000A783A096465627567206D6174726978C6

-:1009B0000A6B3A096465627567206B6579626F61DD

-:1009C00072640A6D3A096465627567206D6F7573AC

-:1009D000650A763A0976657273696F6E0A733A0929

-:1009E0007374617475730A633A09636F6E736F6C25

-:1009F00065206D6F64650A302D343A096C61796544

-:100A000072302D34284631302D4634290A50617514

-:100A1000733A09626F6F746C6F616465720