From 0ef47be2da7203a1927e270281b9ea43b320be2a Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Wed, 11 May 2011 09:29:18 +0900
Subject: [PATCH] save memory (2)

---
 ChangeLog   |  2 ++
 src/flash.c | 15 ++++++---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 01b1228..0a06f83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2011-05-11  NIIBE Yutaka  <gniibe@fsij.org>
 
+	* src/flash.c (keystore_pool): Remove.  Use &_keystore_pool.
+
 	* src/ac.c (auth_status): Don't assign 0 as it's automatically
 	cleared.
 
diff --git a/src/flash.c b/src/flash.c
index 986db89..9c05702 100644
--- a/src/flash.c
+++ b/src/flash.c
@@ -162,7 +162,7 @@ flash_erase_page (uint32_t addr)
 #define FLASH_KEYSTORE_SIZE		(512*3)
 
 static const uint8_t *data_pool;
-static const uint8_t *keystore_pool;
+extern uint8_t _keystore_pool;
 
 static uint8_t *last_p;
 static const uint8_t *keystore;
@@ -179,7 +179,6 @@ const uint8_t *
 flash_init (void)
 {
   const uint8_t *p;
-  extern uint8_t _keystore_pool;
   uint16_t gen0, gen1;
   uint16_t *gen0_p = (uint16_t *)&_data_pool;
   uint16_t *gen1_p = (uint16_t *)(&_data_pool + FLASH_PAGE_SIZE);
@@ -196,10 +195,8 @@ flash_init (void)
   else
     data_pool = &_data_pool;
 
-  keystore_pool = &_keystore_pool;
-
   /* Seek empty keystore */
-  p = keystore_pool;
+  p = &_keystore_pool;
   while (*p != 0xff || *(p+1) != 0xff)
     p += 512;
 
@@ -384,7 +381,7 @@ flash_key_alloc (void)
 {
   uint8_t *k = (uint8_t *)keystore;
 
-  if ((k - keystore_pool) >= FLASH_KEYSTORE_SIZE)
+  if ((k - &_keystore_pool) >= FLASH_KEYSTORE_SIZE)
     return NULL;
 
   keystore += 512;
@@ -422,11 +419,11 @@ flash_key_write (uint8_t *key_addr, const uint8_t *key_data,
 void
 flash_keystore_release (void)
 {
-  flash_erase_page ((uint32_t)keystore_pool);
+  flash_erase_page ((uint32_t)&_keystore_pool);
 #if FLASH_KEYSTORE_SIZE > FLASH_PAGE_SIZE
-  flash_erase_page ((uint32_t)keystore_pool + FLASH_PAGE_SIZE);
+  flash_erase_page ((uint32_t)&_keystore_pool + FLASH_PAGE_SIZE);
 #endif
-  keystore = keystore_pool;
+  keystore = &_keystore_pool;
 }
 
 void