flash: Fix flash write algorithm on pflash only devices.

[fw/openocd] / src / flash / nand / nonce.c

diff --git a/src/flash/nand/nonce.c b/src/flash/nand/nonce.c
index 8d15040ffacb0cca08c432ccc646a797118b1ee0..76ed5264d97ca7771e2c2fc666e7c5bdc0a2b5ee 100644 (file)
--- a/src/flash/nand/nonce.c
+++ b/src/flash/nand/nonce.c
@@ -20,9 +20,9 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <flash/nand.h>
-#include "hello.h"
 
+#include "imp.h"
+#include "hello.h"
 
 static int nonce_nand_command(struct nand_device *nand, uint8_t command)
 {
@@ -51,11 +51,6 @@ static int nonce_nand_reset(struct nand_device *nand)
        return nonce_nand_command(nand, NAND_CMD_RESET);
 }
 
-static int nonce_nand_controller_ready(struct nand_device *nand, int timeout)
-{
-       return true;
-}
-
 NAND_DEVICE_COMMAND_HANDLER(nonce_nand_device_command)
 {
        return ERROR_OK;
@@ -66,17 +61,15 @@ static int nonce_nand_init(struct nand_device *nand)
        return ERROR_OK;
 }
 
-struct nand_flash_controller nonce_nand_controller =
-{
-       .name                   = "nonce",
-       .commands               = hello_command_handlers,
-       .nand_device_command    = &nonce_nand_device_command,
-       .init                   = &nonce_nand_init,
-       .reset                  = &nonce_nand_reset,
-       .command                = &nonce_nand_command,
-       .address                = &nonce_nand_address,
-       .read_data              = &nonce_nand_read,
-       .write_data             = &nonce_nand_write,
-       .write_block_data       = &nonce_nand_fast_block_write,
-       .controller_ready       = &nonce_nand_controller_ready,
+struct nand_flash_controller nonce_nand_controller = {
+       .name = "nonce",
+       .commands = hello_command_handlers,
+       .nand_device_command = &nonce_nand_device_command,
+       .init = &nonce_nand_init,
+       .reset = &nonce_nand_reset,
+       .command = &nonce_nand_command,
+       .address = &nonce_nand_address,
+       .read_data = &nonce_nand_read,
+       .write_data = &nonce_nand_write,
+       .write_block_data = &nonce_nand_fast_block_write,
 };