X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fvirtual.c;h=217f7a4df08b785ba2cca2aa14c3acabe05716bc;hp=f1e84c29e0204b03a349063f74ba58f763702eae;hb=refs%2Fchanges%2F19%2F4919%2F8;hpb=16b6b5e7a86353dbc0c4823fe3d772c0faca7c1c

diff --git a/src/flash/nor/virtual.c b/src/flash/nor/virtual.c
index f1e84c29e0..217f7a4df0 100644
--- a/src/flash/nor/virtual.c
+++ b/src/flash/nor/virtual.c
@@ -13,24 +13,22 @@
  *   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 "imp.h"
 
-static struct flash_bank* virtual_get_master_bank(struct flash_bank *bank)
+static struct flash_bank *virtual_get_master_bank(struct flash_bank *bank)
 {
-	struct flash_bank* master_bank;
+	struct flash_bank *master_bank;
 
 	master_bank = get_flash_bank_by_name_noprobe(bank->driver_priv);
-	if (master_bank == NULL) {
-		LOG_ERROR("master flash bank '%s' does not exist", (char*)bank->driver_priv);
-	}
+	if (master_bank == NULL)
+		LOG_ERROR("master flash bank '%s' does not exist", (char *)bank->driver_priv);
 
 	return master_bank;
 }
@@ -39,31 +37,34 @@ static void virtual_update_bank_info(struct flash_bank *bank)
 {
 	struct flash_bank *master_bank = virtual_get_master_bank(bank);
 
-	if (master_bank == NULL) {
+	if (master_bank == NULL)
 		return;
-	}
 
 	/* update the info we do not have */
 	bank->size = master_bank->size;
 	bank->chip_width = master_bank->chip_width;
 	bank->bus_width = master_bank->bus_width;
+	bank->erased_value = master_bank->erased_value;
+	bank->default_padded_value = master_bank->default_padded_value;
+	bank->write_start_alignment = master_bank->write_start_alignment;
+	bank->write_end_alignment = master_bank->write_end_alignment;
+	bank->minimal_write_gap = master_bank->minimal_write_gap;
 	bank->num_sectors = master_bank->num_sectors;
 	bank->sectors = master_bank->sectors;
+	bank->num_prot_blocks = master_bank->num_prot_blocks;
+	bank->prot_blocks = master_bank->prot_blocks;
 }
 
 FLASH_BANK_COMMAND_HANDLER(virtual_flash_bank_command)
 {
 	if (CMD_ARGC < 7)
-	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
-	}
 
 	/* get the master flash bank */
 	const char *bank_name = CMD_ARGV[6];
 	struct flash_bank *master_bank = get_flash_bank_by_name_noprobe(bank_name);
 
-	if (master_bank == NULL)
-	{
+	if (master_bank == NULL) {
 		LOG_ERROR("master flash bank '%s' does not exist", bank_name);
 		return ERROR_FLASH_OPERATION_FAILED;
 	}
@@ -79,13 +80,12 @@ static int virtual_protect(struct flash_bank *bank, int set, int first, int last
 	struct flash_bank *master_bank = virtual_get_master_bank(bank);
 	int retval;
 
-	if (master_bank == NULL) {
+	if (master_bank == NULL)
 		return ERROR_FLASH_OPERATION_FAILED;
-	}
 
 	/* call master handler */
-	if ((retval = master_bank->driver->protect(master_bank, set,
-			first, last)) != ERROR_OK)
+	retval = master_bank->driver->protect(master_bank, set, first, last);
+	if (retval != ERROR_OK)
 		return retval;
 
 	return ERROR_OK;
@@ -96,12 +96,12 @@ static int virtual_protect_check(struct flash_bank *bank)
 	struct flash_bank *master_bank = virtual_get_master_bank(bank);
 	int retval;
 
-	if (master_bank == NULL) {
+	if (master_bank == NULL)
 		return ERROR_FLASH_OPERATION_FAILED;
-	}
 
 	/* call master handler */
-	if ((retval = master_bank->driver->protect_check(master_bank)) != ERROR_OK)
+	retval = master_bank->driver->protect_check(master_bank);
+	if (retval != ERROR_OK)
 		return retval;
 
 	return ERROR_OK;
@@ -112,31 +112,29 @@ static int virtual_erase(struct flash_bank *bank, int first, int last)
 	struct flash_bank *master_bank = virtual_get_master_bank(bank);
 	int retval;
 
-	if (master_bank == NULL) {
+	if (master_bank == NULL)
 		return ERROR_FLASH_OPERATION_FAILED;
-	}
 
 	/* call master handler */
-	if ((retval = master_bank->driver->erase(master_bank,
-			first, last)) != ERROR_OK)
+	retval = master_bank->driver->erase(master_bank, first, last);
+	if (retval != ERROR_OK)
 		return retval;
 
 	return ERROR_OK;
 }
 
-static int virtual_write(struct flash_bank *bank, uint8_t *buffer,
+static int virtual_write(struct flash_bank *bank, const uint8_t *buffer,
 		uint32_t offset, uint32_t count)
 {
 	struct flash_bank *master_bank = virtual_get_master_bank(bank);
 	int retval;
 
-	if (master_bank == NULL) {
+	if (master_bank == NULL)
 		return ERROR_FLASH_OPERATION_FAILED;
-	}
 
 	/* call master handler */
-	if ((retval = master_bank->driver->write(master_bank, buffer,
-			offset, count)) != ERROR_OK)
+	retval = master_bank->driver->write(master_bank, buffer, offset, count);
+	if (retval != ERROR_OK)
 		return retval;
 
 	return ERROR_OK;
@@ -147,12 +145,12 @@ static int virtual_probe(struct flash_bank *bank)
 	struct flash_bank *master_bank = virtual_get_master_bank(bank);
 	int retval;
 
-	if (master_bank == NULL) {
+	if (master_bank == NULL)
 		return ERROR_FLASH_OPERATION_FAILED;
-	}
 
 	/* call master handler */
-	if ((retval = master_bank->driver->probe(master_bank)) != ERROR_OK)
+	retval = master_bank->driver->probe(master_bank);
+	if (retval != ERROR_OK)
 		return retval;
 
 	/* update the info we do not have */
@@ -166,12 +164,12 @@ static int virtual_auto_probe(struct flash_bank *bank)
 	struct flash_bank *master_bank = virtual_get_master_bank(bank);
 	int retval;
 
-	if (master_bank == NULL) {
+	if (master_bank == NULL)
 		return ERROR_FLASH_OPERATION_FAILED;
-	}
 
 	/* call master handler */
-	if ((retval = master_bank->driver->auto_probe(master_bank)) != ERROR_OK)
+	retval = master_bank->driver->auto_probe(master_bank);
+	if (retval != ERROR_OK)
 		return retval;
 
 	/* update the info we do not have */
@@ -184,11 +182,10 @@ static int virtual_info(struct flash_bank *bank, char *buf, int buf_size)
 {
 	struct flash_bank *master_bank = virtual_get_master_bank(bank);
 
-	if (master_bank == NULL) {
+	if (master_bank == NULL)
 		return ERROR_FLASH_OPERATION_FAILED;
-	}
 
-	snprintf(buf, buf_size, "%s driver for flash bank %s at 0x%8.8" PRIx32 "",
+	snprintf(buf, buf_size, "%s driver for flash bank %s at " TARGET_ADDR_FMT,
 			bank->driver->name, master_bank->name, master_bank->base);
 
 	return ERROR_OK;
@@ -199,12 +196,12 @@ static int virtual_blank_check(struct flash_bank *bank)
 	struct flash_bank *master_bank = virtual_get_master_bank(bank);
 	int retval;
 
-	if (master_bank == NULL) {
+	if (master_bank == NULL)
 		return ERROR_FLASH_OPERATION_FAILED;
-	}
 
 	/* call master handler */
-	if ((retval = master_bank->driver->erase_check(master_bank)) != ERROR_OK)
+	retval = master_bank->driver->erase_check(master_bank);
+	if (retval != ERROR_OK)
 		return retval;
 
 	return ERROR_OK;
@@ -216,13 +213,12 @@ static int virtual_flash_read(struct flash_bank *bank,
 	struct flash_bank *master_bank = virtual_get_master_bank(bank);
 	int retval;
 
-	if (master_bank == NULL) {
+	if (master_bank == NULL)
 		return ERROR_FLASH_OPERATION_FAILED;
-	}
 
 	/* call master handler */
-	if ((retval = master_bank->driver->read(master_bank, buffer,
-			offset, count)) != ERROR_OK)
+	retval = master_bank->driver->read(master_bank, buffer, offset, count);
+	if (retval != ERROR_OK)
 		return retval;
 
 	return ERROR_OK;
@@ -240,4 +236,5 @@ struct flash_driver virtual_flash = {
 	.erase_check = virtual_blank_check,
 	.protect_check = virtual_protect_check,
 	.info = virtual_info,
+	.free_driver_priv = default_flash_free_driver_priv,
 };