flash/nor/nrf5: check protection before flash erase/write on nRF51

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

diff --git a/src/flash/nand/orion.c b/src/flash/nand/orion.c
index e6a33eb680c7b35d9a699e73f51f07755abe4701..69814eca35f434dc96694e7aad4ec782bc87f500 100644 (file)
--- a/src/flash/nand/orion.c
+++ b/src/flash/nand/orion.c
@@ -1,6 +1,6 @@
 /***************************************************************************
  *   Copyright (C) 2009 by Marvell Semiconductors, Inc.                    *
- *   Written by Nicolas Pitre <nico at marvell.com>                           *
+ *   Written by Nicolas Pitre <nico at marvell.com>                        *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -13,9 +13,7 @@
  *   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/>. *
  ***************************************************************************/
 
 /*
@@ -30,9 +28,7 @@
 #include "arm_io.h"
 #include <target/arm.h>
 
-
-struct orion_nand_controller
-{
+struct orion_nand_controller {
        struct arm_nand_data    io;
 
        uint32_t                cmd;
@@ -120,9 +116,8 @@ NAND_DEVICE_COMMAND_HANDLER(orion_nand_device_command)
        uint32_t base;
        uint8_t ale, cle;
 
-       if (CMD_ARGC != 3) {
+       if (CMD_ARGC != 3)
                return ERROR_COMMAND_SYNTAX_ERROR;
-       }
 
        hw = calloc(1, sizeof(*hw));
        if (!hw) {
@@ -152,17 +147,15 @@ static int orion_nand_init(struct nand_device *nand)
        return ERROR_OK;
 }
 
-struct nand_flash_controller orion_nand_controller =
-{
-       .name                   = "orion",
-       .usage                  = "<target_id> <NAND_address>",
-       .command                = orion_nand_command,
-       .address                = orion_nand_address,
-       .read_data              = orion_nand_read,
-       .write_data             = orion_nand_write,
-       .write_block_data       = orion_nand_fast_block_write,
-       .reset                  = orion_nand_reset,
-       .nand_device_command    = orion_nand_device_command,
-       .init                   = orion_nand_init,
+struct nand_flash_controller orion_nand_controller = {
+       .name = "orion",
+       .usage = "<target_id> <NAND_address>",
+       .command = orion_nand_command,
+       .address = orion_nand_address,
+       .read_data = orion_nand_read,
+       .write_data = orion_nand_write,
+       .write_block_data = orion_nand_fast_block_write,
+       .reset = orion_nand_reset,
+       .nand_device_command = orion_nand_device_command,
+       .init = orion_nand_init,
 };
-