Revert hal_flash compatibility with disk/disk

Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/45e04163
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/45e04163
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/45e04163

Branch: refs/heads/develop
Commit: 45e04163e92c63ff22c59aa140420f8fba41edf1
Parents: 2e972af
Author: Fabio Utzig <[email protected]>
Authored: Thu Jan 5 20:35:15 2017 -0200
Committer: Fabio Utzig <[email protected]>
Committed: Thu Jan 12 10:51:46 2017 -0200

----------------------------------------------------------------------
 hw/hal/include/hal/hal_flash.h | 3 ---
 hw/hal/src/hal_flash.c         | 6 ------
 2 files changed, 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/45e04163/hw/hal/include/hal/hal_flash.h
----------------------------------------------------------------------
diff --git a/hw/hal/include/hal/hal_flash.h b/hw/hal/include/hal/hal_flash.h
index bd4f6f3..11f5f1d 100644
--- a/hw/hal/include/hal/hal_flash.h
+++ b/hw/hal/include/hal/hal_flash.h
@@ -25,9 +25,6 @@ extern "C" {
 #endif
 
 #include <inttypes.h>
-#include <disk/disk.h>
-
-extern struct disk_ops hal_flash_ops;
 
 int hal_flash_ioctl(uint8_t flash_id, uint32_t cmd, void *args);
 int hal_flash_read(uint8_t flash_id, uint32_t address, void *dst,

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/45e04163/hw/hal/src/hal_flash.c
----------------------------------------------------------------------
diff --git a/hw/hal/src/hal_flash.c b/hw/hal/src/hal_flash.c
index ada6e23..27d260a 100644
--- a/hw/hal/src/hal_flash.c
+++ b/hw/hal/src/hal_flash.c
@@ -175,9 +175,3 @@ hal_flash_ioctl(uint8_t id, uint32_t cmd, void *args)
 {
     return 0;
 }
-
-struct disk_ops hal_flash_ops = {
-    .read  = &hal_flash_read,
-    .write = &hal_flash_write,
-    .ioctl = &hal_flash_ioctl,
-};

Reply via email to