From 91f86df368565f4af1f1fb5dc590a78b2a43041c Mon Sep 17 00:00:00 2001
From: Kai Ryu <kai1103@gmail.com>
Date: Thu, 21 Nov 2013 13:44:32 +0900
Subject: [PATCH] Fix confusion of size and count

---
 common/keymap_ex.c | 16 +++++++++-------
 common/keymap_ex.h |  7 +++----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/common/keymap_ex.c b/common/keymap_ex.c
index 082e3207..cb67e8f4 100644
--- a/common/keymap_ex.c
+++ b/common/keymap_ex.c
@@ -30,7 +30,9 @@ void keymap_init(void) {
 }
 
 bool check_keymap_in_eeprom(void) {
-    return false;
+    uint16_t checksum_in_eeprom = eeprom_read_word(&((keymap_ex_t*)EECONFIG_KEYMAP_EX)->checksum);
+    uint16_t checksum = EECONFIG_MAGIC_NUMBER;
+    return (checksum_in_eeprom == checksum);
 }
 
 void write_keymap_to_eeprom(void) {
@@ -39,10 +41,10 @@ void write_keymap_to_eeprom(void) {
     const uint8_t *keymaps = keymaps_pointer();
     // write fn_actions
     if (fn_actions != NULL) {
-        uint16_t size_of_fn_actions = fn_actions_size();
-        for (uint16_t i = 0; i < FN_ACTIONS_SIZE_EX; i++) {
+        uint16_t fn_actions_count_in_flash = fn_actions_count();
+        for (uint16_t i = 0; i < FN_ACTIONS_COUNT; i++) {
             uint16_t fn_action = 0;
-            if (i < size_of_fn_actions) {
+            if (i < fn_actions_count_in_flash) {
                 fn_action = pgm_read_word(fn_actions + i);
             }
             eeconfig_write_keymap_fn_action(i, fn_action);
@@ -51,10 +53,10 @@ void write_keymap_to_eeprom(void) {
     }
     // write keymaps
     if (keymaps != NULL) {
-        uint16_t size_of_keymaps = keymaps_size();
-        for (uint16_t i = 0; i < KEYMAPS_SIZE_EX; i++) {
+        uint16_t keys_count_in_flash = keys_count();
+        for (uint16_t i = 0; i < KEYS_COUNT; i++) {
             uint8_t keymap = 0;
-            if (i < size_of_keymaps) {
+            if (i < keys_count_in_flash) {
                 keymap = pgm_read_byte(keymaps + i);
             }
             eeconfig_write_keymap_key_by_index(i, keymap);
diff --git a/common/keymap_ex.h b/common/keymap_ex.h
index b15c3fe1..be229b10 100644
--- a/common/keymap_ex.h
+++ b/common/keymap_ex.h
@@ -37,8 +37,7 @@ typedef struct {
 #define EECONFIG_KEYMAP_FN_ACTIONS (EECONFIG_KEYMAP_EX + sizeof(uint16_t))
 #define EECONFIG_KEYMAP_KEYMAPS (EECONFIG_KEYMAP_FN_ACTIONS + sizeof(uint16_t) * FN_ACTIONS_COUNT)
 
-#define FN_ACTIONS_SIZE_EX (sizeof(uint16_t) * FN_ACTIONS_COUNT)
-#define KEYMAPS_SIZE_EX (sizeof(uint8_t) * KEYMAPS_COUNT * MATRIX_ROWS * MATRIX_COLS)
+#define KEYS_COUNT (KEYMAPS_COUNT * MATRIX_ROWS * MATRIX_COLS)
 #define FN_ACTION_OFFSET(index) (sizeof(uint16_t) * index)
 #define KEY_OFFSET(layer, row, col) (sizeof(uint8_t) * (layer * MATRIX_ROWS * MATRIX_COLS + row * MATRIX_COLS + col))
 
@@ -54,8 +53,8 @@ void eeconfig_write_keymap_fn_action(uint8_t index, uint16_t fn_action);
 
 const uint8_t* keymaps_pointer(void);
 const uint16_t* fn_actions_pointer(void);
-uint16_t keymaps_size(void);
-uint16_t fn_actions_size(void);
+uint16_t keys_count(void);
+uint16_t fn_actions_count(void);
 
 #endif