From be00c7d0c4e85fd44d8c2d71521a5181688feeb8 Mon Sep 17 00:00:00 2001 From: ntfreak Date: Wed, 23 Jul 2008 14:49:41 +0000 Subject: [PATCH] - more fixes to high density stm32x flash driver - updated copyright for original author git-svn-id: svn://svn.berlios.de/openocd/trunk@859 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/flash/stm32x.c | 124 +++++++++++++++++++++++++++++++++++++++---- src/flash/stm32x.h | 3 ++ src/flash/str7x.c | 3 ++ src/flash/str7x.h | 3 ++ src/flash/str9x.c | 3 ++ src/flash/str9x.h | 3 ++ src/flash/str9xpec.c | 3 ++ src/flash/str9xpec.h | 3 ++ 8 files changed, 135 insertions(+), 10 deletions(-) diff --git a/src/flash/stm32x.c b/src/flash/stm32x.c index 899dad99..4b25e74c 100644 --- a/src/flash/stm32x.c +++ b/src/flash/stm32x.c @@ -2,6 +2,9 @@ * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * * * + * Copyright (C) 2008 by Spencer Oliver * + * spen@spen-soft.co.uk * + * * * 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 * * the Free Software Foundation; either version 2 of the License, or * @@ -286,6 +289,7 @@ int stm32x_protect_check(struct flash_bank_s *bank) u32 protection; int i, s; int num_bits; + int set; if (target->state != TARGET_HALTED) { @@ -300,17 +304,50 @@ int stm32x_protect_check(struct flash_bank_s *bank) * high density - each protection bit is for 2 * 2K pages */ num_bits = (bank->num_sectors / stm32x_info->ppage_size); - for (i = 0; i < num_bits; i++) + if (stm32x_info->ppage_size == 2) { - int set = 1; + /* high density flash */ + + set = 1; - if( protection & (1 << i)) + if (protection & (1 << 31)) set = 0; - for (s = 0; s < stm32x_info->ppage_size; s++) - bank->sectors[(i * stm32x_info->ppage_size) + s].is_protected = set; + /* bit 31 controls sector 62 - 255 protection */ + for (s = 62; s < bank->num_sectors; s++) + { + bank->sectors[s].is_protected = set; + } + + if (bank->num_sectors > 61) + num_bits = 31; + + for (i = 0; i < num_bits; i++) + { + set = 1; + + if (protection & (1 << i)) + set = 0; + + for (s = 0; s < stm32x_info->ppage_size; s++) + bank->sectors[(i * stm32x_info->ppage_size) + s].is_protected = set; + } } - + else + { + /* medium density flash */ + for (i = 0; i < num_bits; i++) + { + set = 1; + + if( protection & (1 << i)) + set = 0; + + for (s = 0; s < stm32x_info->ppage_size; s++) + bank->sectors[(i * stm32x_info->ppage_size) + s].is_protected = set; + } + } + return ERROR_OK; } @@ -390,11 +427,16 @@ int stm32x_protect(struct flash_bank_s *bank, int set, int first, int last) /* high density flash */ /* bit 7 controls sector 62 - 255 protection */ - if (first > 61 || last <= 255) - prot_reg[3] |= (1 << 7); + if (last > 61) + { + if (set) + prot_reg[3] &= ~(1 << 7); + else + prot_reg[3] |= (1 << 7); + } if (first > 61) - first = 61; + first = 62; if (last > 61) last = 61; @@ -739,7 +781,69 @@ int stm32x_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, int stm32x_info(struct flash_bank_s *bank, char *buf, int buf_size) { - snprintf(buf, buf_size, "stm32x flash driver info" ); + target_t *target = bank->target; + u32 device_id; + int printed; + + /* read stm32 device id register */ + target_read_u32(target, 0xE0042000, &device_id); + + if ((device_id & 0x7ff) == 0x410) + { + printed = snprintf(buf, buf_size, "stm32x (Medium Density) - Rev: "); + buf += printed; + buf_size -= printed; + + switch(device_id >> 16) + { + case 0x0000: + snprintf(buf, buf_size, "A"); + break; + + case 0x2000: + snprintf(buf, buf_size, "B"); + break; + + case 0x2001: + snprintf(buf, buf_size, "Z"); + break; + + case 0x2003: + snprintf(buf, buf_size, "Y"); + break; + + default: + snprintf(buf, buf_size, "unknown"); + break; + } + } + else if ((device_id & 0x7ff) == 0x414) + { + printed = snprintf(buf, buf_size, "stm32x (High Density) - Rev: "); + buf += printed; + buf_size -= printed; + + switch(device_id >> 16) + { + case 0x1000: + snprintf(buf, buf_size, "A"); + break; + + case 0x1001: + snprintf(buf, buf_size, "Z"); + break; + + default: + snprintf(buf, buf_size, "unknown"); + break; + } + } + else + { + snprintf(buf, buf_size, "Cannot identify target as a stm32x\n"); + return ERROR_FLASH_OPERATION_FAILED; + } + return ERROR_OK; } diff --git a/src/flash/stm32x.h b/src/flash/stm32x.h index e4aca609..04f813aa 100644 --- a/src/flash/stm32x.h +++ b/src/flash/stm32x.h @@ -2,6 +2,9 @@ * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * * * + * Copyright (C) 2008 by Spencer Oliver * + * spen@spen-soft.co.uk * + * * * 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 * * the Free Software Foundation; either version 2 of the License, or * diff --git a/src/flash/str7x.c b/src/flash/str7x.c index 5c17a6c5..facd873d 100644 --- a/src/flash/str7x.c +++ b/src/flash/str7x.c @@ -2,6 +2,9 @@ * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * * * + * Copyright (C) 2008 by Spencer Oliver * + * spen@spen-soft.co.uk * + * * * 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 * * the Free Software Foundation; either version 2 of the License, or * diff --git a/src/flash/str7x.h b/src/flash/str7x.h index a3372f59..7e48f4a4 100644 --- a/src/flash/str7x.h +++ b/src/flash/str7x.h @@ -2,6 +2,9 @@ * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * * * + * Copyright (C) 2008 by Spencer Oliver * + * spen@spen-soft.co.uk * + * * * 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 * * the Free Software Foundation; either version 2 of the License, or * diff --git a/src/flash/str9x.c b/src/flash/str9x.c index fbae6c68..7468c3fb 100644 --- a/src/flash/str9x.c +++ b/src/flash/str9x.c @@ -2,6 +2,9 @@ * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * * * + * Copyright (C) 2008 by Spencer Oliver * + * spen@spen-soft.co.uk * + * * * 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 * * the Free Software Foundation; either version 2 of the License, or * diff --git a/src/flash/str9x.h b/src/flash/str9x.h index f3100ce3..a2a67ef2 100644 --- a/src/flash/str9x.h +++ b/src/flash/str9x.h @@ -2,6 +2,9 @@ * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * * * + * Copyright (C) 2008 by Spencer Oliver * + * spen@spen-soft.co.uk * + * * * 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 * * the Free Software Foundation; either version 2 of the License, or * diff --git a/src/flash/str9xpec.c b/src/flash/str9xpec.c index b6f966f6..f508e0bf 100644 --- a/src/flash/str9xpec.c +++ b/src/flash/str9xpec.c @@ -2,6 +2,9 @@ * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * * * + * Copyright (C) 2008 by Spencer Oliver * + * spen@spen-soft.co.uk * + * * * 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 * * the Free Software Foundation; either version 2 of the License, or * diff --git a/src/flash/str9xpec.h b/src/flash/str9xpec.h index dcc90118..4e34f6c7 100644 --- a/src/flash/str9xpec.h +++ b/src/flash/str9xpec.h @@ -2,6 +2,9 @@ * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * * * + * Copyright (C) 2008 by Spencer Oliver * + * spen@spen-soft.co.uk * + * * * 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 * * the Free Software Foundation; either version 2 of the License, or * -- 2.39.5