X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fflash%2Fnand%2Fnonce.c;h=565ad727f35c54924e9019b8f3a80ca3110df776;hb=b0759dfc538b973cce67df93f8a7fe239bfb4c74;hp=f4411640a190f51c0f679ac875b7b273455155a8;hpb=450ceda9aec12a0b67cca8dfbaf0384824cbd6c2;p=openocd.git

diff --git a/src/flash/nand/nonce.c b/src/flash/nand/nonce.c
index f4411640a1..565ad727f3 100644
--- a/src/flash/nand/nonce.c
+++ b/src/flash/nand/nonce.c
@@ -20,7 +20,9 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <flash/nand.h>
+
+#include "imp.h"
+#include "hello.h"
 
 
 static int nonce_nand_command(struct nand_device *nand, uint8_t command)
@@ -50,11 +52,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;
@@ -68,6 +65,7 @@ static int nonce_nand_init(struct nand_device *nand)
 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,
@@ -76,5 +74,4 @@ struct nand_flash_controller nonce_nand_controller =
 	.read_data		= &nonce_nand_read,
 	.write_data		= &nonce_nand_write,
 	.write_block_data	= &nonce_nand_fast_block_write,
-	.controller_ready	= &nonce_nand_controller_ready,
 };