Update autotools scripts to require automake 1.6. The configure.in script

[fw/openocd] / src / flash / mflash.c

diff --git a/src/flash/mflash.c b/src/flash/mflash.c
index 340a9f5686cd955ee4ea3c7a83e3e7afa4c4980a..08aad9f1d2f9c5ddc7d89c5a9a8239369774488c 100644 (file)
--- a/src/flash/mflash.c
+++ b/src/flash/mflash.c
@@ -206,31 +206,6 @@ static int mflash_rst(u8 level)
        return mflash_bank->gpio_drv->set_gpio_output_val(mflash_bank->rst_pin, level);
 }
 
-static int mg_dump_task_reg (void)
-{
-       target_t *target = mflash_bank->target;
-       u32 address = mflash_bank->base + MG_REG_OFFSET + MG_REG_ERROR;
-       u8 value, i;
-       char *reg_name[9] = {
-               "error                  ",
-               "sector count           ",
-               "sector num (LBA  7- 0) ",
-               "cyl. low   (LBA 15- 8) ",
-               "cyl. high  (LBA 23-16) ",
-               "drv/head               ",
-               "status                 ",
-               "dev control            ",
-               "burst control          "
-       };
-
-       for (i = 0; i < 9; i++) {
-               target_read_u8(target, address + i * 2, &value);
-               LOG_INFO("%s : 0x%2.2x", reg_name[i], value);
-       }
-
-       return ERROR_OK;
-
-}
 static int mflash_init_gpio (void)
 {
        mflash_gpio_drv_t *gpio_drv = mflash_bank->gpio_drv;
@@ -498,14 +473,16 @@ static int mg_mflash_read_sects(void *buff, u32 sect_num, u32 sect_cnt)
        residue = sect_cnt % 256;
 
        for (i = 0; i < quotient; i++) {
-               LOG_DEBUG("sect num : %u buff : 0x%8.8x", sect_num, (u32)buff_ptr);
+               LOG_DEBUG("sect num : %u buff : 0x%0lx", sect_num, 
+                       (unsigned long)buff_ptr);
                mg_mflash_do_read_sects(buff_ptr, sect_num, 256);
                sect_num += 256;
                buff_ptr += 256 * MG_MFLASH_SECTOR_SIZE;
        }
 
        if (residue) {
-               LOG_DEBUG("sect num : %u buff : %8.8x", sect_num, (u32)buff_ptr);
+               LOG_DEBUG("sect num : %u buff : %0lx", sect_num, 
+                       (unsigned long)buff_ptr);
                mg_mflash_do_read_sects(buff_ptr, sect_num, residue);
        }
 
@@ -567,14 +544,16 @@ static int mg_mflash_write_sects(void *buff, u32 sect_num, u32 sect_cnt)
        residue = sect_cnt % 256;
 
        for (i = 0; i < quotient; i++) {
-               LOG_DEBUG("sect num : %u buff : %8.8x", sect_num, (u32)buff_ptr);
+               LOG_DEBUG("sect num : %u buff : %0lx", sect_num, 
+                       (unsigned long)buff_ptr);
                mg_mflash_do_write_sects(buff_ptr, sect_num, 256);
                sect_num += 256;
                buff_ptr += 256 * MG_MFLASH_SECTOR_SIZE;
        }
 
        if (residue) {
-               LOG_DEBUG("sect num : %u buff : %8.8x", sect_num, (u32)buff_ptr);
+               LOG_DEBUG("sect num : %u buff : %0lx", sect_num, 
+                       (unsigned long)buff_ptr);
                mg_mflash_do_write_sects(buff_ptr, sect_num, residue);
        }