From cef9cf6f48c80a77bb643014b43794e994a92b92 Mon Sep 17 00:00:00 2001
From: topquark12 <aw@m-labs.hk>
Date: Wed, 13 Jan 2021 17:13:18 +0800
Subject: [PATCH] flash store: remove transmute

---
 src/flash_store.rs | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/flash_store.rs b/src/flash_store.rs
index 6374562..27b55ba 100644
--- a/src/flash_store.rs
+++ b/src/flash_store.rs
@@ -20,9 +20,7 @@ pub struct FlashBackend {
 }
 
 unsafe fn get_offset() -> usize {
-    let config = core::mem::transmute::<*const usize, usize>(&_config_start);
-    let flash = core::mem::transmute::<*const usize, usize>(&_flash_start);
-    config - flash
+    (&_config_start as *const usize as usize) - (&_flash_start as *const usize as usize)
 }
 
 impl StoreBackend for FlashBackend {
@@ -30,13 +28,6 @@ impl StoreBackend for FlashBackend {
 
     fn data(&self) -> &Self::Data {
         unsafe {
-            // This works
-            // let config = core::mem::transmute::<*const usize, usize>(&_config_start);
-            // let flash = core::mem::transmute::<*const usize, usize>(&_flash_start);
-            // let config_offset = config - flash;
-
-            // This doesn't
-            // let config_offset = (&_config_start - &_flash_start) as usize;
             &self.flash.read()[get_offset()..(get_offset() + FLASH_SECTOR_SIZE)]
         }
     }