avrf.c: Use extended addressing for flash > 0x20000

[openocd.git] / src / flash / nor / avrf.c

diff --git a/src/flash/nor/avrf.c b/src/flash/nor/avrf.c
index 1dc5f07e1c1124e7b6860b4e87e57144839f3d7e..aa864590907eb04a23f24416270cf10b2d36756e 100644 (file)
--- a/src/flash/nor/avrf.c
+++ b/src/flash/nor/avrf.c
@@ -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/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -63,12 +61,19 @@ struct avrf_flash_bank {
        int probed;
 };
 
-static struct avrf_type avft_chips_info[] = {
+static const struct avrf_type avft_chips_info[] = {
 /*     name, chip_id,  flash_page_size, flash_page_num,
  *                     eeprom_page_size, eeprom_page_num
  */
        {"atmega128", 0x9702, 256, 512, 8, 512},
+       {"atmega128rfa1", 0xa701, 128, 512, 8, 512},
        {"at90can128", 0x9781, 256, 512, 8, 512},
+       {"at90usb128", 0x9782, 256, 512, 8, 512},
+       {"atmega164p", 0x940a, 128, 128, 4, 128},
+       {"atmega324p", 0x9508, 128, 256, 4, 256},
+       {"atmega324pa", 0x9511, 128, 256, 4, 256},
+       {"atmega644p", 0x960a, 256, 256, 8, 256},
+       {"atmega1284p", 0x9705, 256, 512, 8, 512},
 };
 
 /* avr program functions */
@@ -137,7 +142,8 @@ static int avr_jtagprg_chiperase(struct avr_common *avr)
 }
 
 static int avr_jtagprg_writeflashpage(struct avr_common *avr,
-       uint8_t *page_buf,
+       const bool ext_addressing,
+       const uint8_t *page_buf,
        uint32_t buf_size,
        uint32_t addr,
        uint32_t page_size)
@@ -147,6 +153,13 @@ static int avr_jtagprg_writeflashpage(struct avr_common *avr,
        avr_jtag_sendinstr(avr->jtag_info.tap, NULL, AVR_JTAG_INS_PROG_COMMANDS);
        avr_jtag_senddat(avr->jtag_info.tap, NULL, 0x2310, AVR_JTAG_REG_ProgrammingCommand_Len);
 
+       /* load extended high byte */
+       if (ext_addressing)
+               avr_jtag_senddat(avr->jtag_info.tap,
+                       NULL,
+                       0x0b00 | ((addr >> 17) & 0xFF),
+                       AVR_JTAG_REG_ProgrammingCommand_Len);
+
        /* load addr high byte */
        avr_jtag_senddat(avr->jtag_info.tap,
                NULL,
@@ -228,17 +241,12 @@ static int avrf_erase(struct flash_bank *bank, int first, int last)
        return avr_jtagprg_leaveprogmode(avr);
 }
 
-static int avrf_protect(struct flash_bank *bank, int set, int first, int last)
-{
-       LOG_INFO("%s", __func__);
-       return ERROR_OK;
-}
-
-static int avrf_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count)
+static int avrf_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t offset, uint32_t count)
 {
        struct target *target = bank->target;
        struct avr_common *avr = target->arch_info;
        uint32_t cur_size, cur_buffer_size, page_size;
+       bool ext_addressing;
 
        if (bank->target->state != TARGET_HALTED) {
                LOG_ERROR("Target not halted");
@@ -259,6 +267,11 @@ static int avrf_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset,
        if (ERROR_OK != avr_jtagprg_enterprogmode(avr))
                return ERROR_FAIL;
 
+       if (bank->size > 0x20000)
+               ext_addressing = true;
+       else
+               ext_addressing = false;
+
        cur_size = 0;
        while (count > 0) {
                if (count > page_size)
@@ -266,6 +279,7 @@ static int avrf_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset,
                else
                        cur_buffer_size = count;
                avr_jtagprg_writeflashpage(avr,
+                       ext_addressing,
                        buffer + cur_size,
                        cur_buffer_size,
                        offset + cur_size,
@@ -288,7 +302,7 @@ static int avrf_probe(struct flash_bank *bank)
        struct target *target = bank->target;
        struct avrf_flash_bank *avrf_info = bank->driver_priv;
        struct avr_common *avr = target->arch_info;
-       struct avrf_type *avr_info = NULL;
+       const struct avrf_type *avr_info = NULL;
        int i;
        uint32_t device_id;
 
@@ -333,7 +347,7 @@ static int avrf_probe(struct flash_bank *bank)
                        bank->sectors[i].offset = i * avr_info->flash_page_size;
                        bank->sectors[i].size = avr_info->flash_page_size;
                        bank->sectors[i].is_erased = -1;
-                       bank->sectors[i].is_protected = 1;
+                       bank->sectors[i].is_protected = -1;
                }
 
                avrf_info->probed = 1;
@@ -355,17 +369,11 @@ static int avrf_auto_probe(struct flash_bank *bank)
        return avrf_probe(bank);
 }
 
-static int avrf_protect_check(struct flash_bank *bank)
-{
-       LOG_INFO("%s", __func__);
-       return ERROR_OK;
-}
-
 static int avrf_info(struct flash_bank *bank, char *buf, int buf_size)
 {
        struct target *target = bank->target;
        struct avr_common *avr = target->arch_info;
-       struct avrf_type *avr_info = NULL;
+       const struct avrf_type *avr_info = NULL;
        int i;
        uint32_t device_id;
 
@@ -440,9 +448,9 @@ COMMAND_HANDLER(avrf_handle_mass_erase_command)
                for (i = 0; i < bank->num_sectors; i++)
                        bank->sectors[i].is_erased = 1;
 
-               command_print(CMD_CTX, "avr mass erase complete");
+               command_print(CMD, "avr mass erase complete");
        } else
-               command_print(CMD_CTX, "avr mass erase failed");
+               command_print(CMD, "avr mass erase failed");
 
        LOG_DEBUG("%s", __func__);
        return ERROR_OK;
@@ -469,17 +477,16 @@ static const struct command_registration avrf_command_handlers[] = {
        COMMAND_REGISTRATION_DONE
 };
 
-struct flash_driver avr_flash = {
+const struct flash_driver avr_flash = {
        .name = "avr",
        .commands = avrf_command_handlers,
        .flash_bank_command = avrf_flash_bank_command,
        .erase = avrf_erase,
-       .protect = avrf_protect,
        .write = avrf_write,
        .read = default_flash_read,
        .probe = avrf_probe,
        .auto_probe = avrf_auto_probe,
-       .erase_check = default_flash_mem_blank_check,
-       .protect_check = avrf_protect_check,
+       .erase_check = default_flash_blank_check,
        .info = avrf_info,
+       .free_driver_priv = default_flash_free_driver_priv,
 };