X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fnand%2Fnonce.c;h=6fda2618e9a6af57e2b8cf319d6fd8145dcc4eae;hb=refs%2Fchanges%2F88%2F3488%2F3;hp=f4411640a190f51c0f679ac875b7b273455155a8;hpb=450ceda9aec12a0b67cca8dfbaf0384824cbd6c2;p=openocd.git

diff --git a/src/flash/nand/nonce.c b/src/flash/nand/nonce.c
index f4411640a1..6fda2618e9 100644
--- a/src/flash/nand/nonce.c
+++ b/src/flash/nand/nonce.c
@@ -12,16 +12,15 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #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 +49,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;
@@ -65,16 +59,15 @@ static int nonce_nand_init(struct nand_device *nand)
 	return ERROR_OK;
 }
 
-struct nand_flash_controller nonce_nand_controller =
-{
-	.name			= "nonce",
-	.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,
 };