X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fmflash.c;h=1ad7290fa5850095b889823a5e51c03d8aec6c4c;hp=43d8ddd326b3c68fdc0264da570c59114fe2e093;hb=b61e454869c988e7fafc1c16982ccfec04415b51;hpb=c79cca04bed78839a18e73f3996805eb8001a812
diff --git a/src/flash/mflash.c b/src/flash/mflash.c
index 43d8ddd326..1ad7290fa5 100644
--- a/src/flash/mflash.c
+++ b/src/flash/mflash.c
@@ -12,9 +12,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 . *
***************************************************************************/
#ifdef HAVE_CONFIG_H
@@ -22,16 +20,15 @@
#endif
#include "mflash.h"
-#include "target.h"
-#include "time_support.h"
+#include
+#include
#include
#include
-
-static int s3c2440_set_gpio_to_output (struct mflash_gpio_num gpio);
-static int s3c2440_set_gpio_output_val (struct mflash_gpio_num gpio, uint8_t val);
-static int pxa270_set_gpio_to_output (struct mflash_gpio_num gpio);
-static int pxa270_set_gpio_output_val (struct mflash_gpio_num gpio, uint8_t val);
+static int s3c2440_set_gpio_to_output(struct mflash_gpio_num gpio);
+static int s3c2440_set_gpio_output_val(struct mflash_gpio_num gpio, uint8_t val);
+static int pxa270_set_gpio_to_output(struct mflash_gpio_num gpio);
+static int pxa270_set_gpio_output_val(struct mflash_gpio_num gpio, uint8_t val);
static struct mflash_bank *mflash_bank;
@@ -47,11 +44,10 @@ static struct mflash_gpio_drv s3c2440_gpio = {
.set_gpio_output_val = s3c2440_set_gpio_output_val
};
-static struct mflash_gpio_drv *mflash_gpio[] =
-{
- &pxa270_gpio,
- &s3c2440_gpio,
- NULL
+static struct mflash_gpio_drv *mflash_gpio[] = {
+ &pxa270_gpio,
+ &s3c2440_gpio,
+ NULL
};
#define PXA270_GAFR0_L 0x40E00054
@@ -63,7 +59,7 @@ static struct mflash_gpio_drv *mflash_gpio[] =
#define PXA270_GPSR0 0x40E00018
#define PXA270_GPCR0 0x40E00024
-static int pxa270_set_gpio_to_output (struct mflash_gpio_num gpio)
+static int pxa270_set_gpio_to_output(struct mflash_gpio_num gpio)
{
uint32_t addr, value, mask;
struct target *target = mflash_bank->target;
@@ -74,14 +70,16 @@ static int pxa270_set_gpio_to_output (struct mflash_gpio_num gpio)
addr = PXA270_GAFR0_L + (gpio.num >> 4) * 4;
- if ((ret = target_read_u32(target, addr, &value)) != ERROR_OK)
+ ret = target_read_u32(target, addr, &value);
+ if (ret != ERROR_OK)
return ret;
value &= ~mask;
if (addr == PXA270_GAFR3_U)
value &= ~PXA270_GAFR3_U_RESERVED_BITS;
- if ((ret = target_write_u32(target, addr, value)) != ERROR_OK)
+ ret = target_write_u32(target, addr, value);
+ if (ret != ERROR_OK)
return ret;
/* set direction to output */
@@ -89,7 +87,8 @@ static int pxa270_set_gpio_to_output (struct mflash_gpio_num gpio)
addr = PXA270_GPDR0 + (gpio.num >> 5) * 4;
- if ((ret = target_read_u32(target, addr, &value)) != ERROR_OK)
+ ret = target_read_u32(target, addr, &value);
+ if (ret != ERROR_OK)
return ret;
value |= mask;
@@ -100,7 +99,7 @@ static int pxa270_set_gpio_to_output (struct mflash_gpio_num gpio)
return ret;
}
-static int pxa270_set_gpio_output_val (struct mflash_gpio_num gpio, uint8_t val)
+static int pxa270_set_gpio_output_val(struct mflash_gpio_num gpio, uint8_t val)
{
uint32_t addr, value, mask;
struct target *target = mflash_bank->target;
@@ -108,13 +107,13 @@ static int pxa270_set_gpio_output_val (struct mflash_gpio_num gpio, uint8_t val)
mask = 0x1u << (gpio.num & 0x1F);
- if (val) {
+ if (val)
addr = PXA270_GPSR0 + (gpio.num >> 5) * 4;
- } else {
+ else
addr = PXA270_GPCR0 + (gpio.num >> 5) * 4;
- }
- if ((ret = target_read_u32(target, addr, &value)) != ERROR_OK)
+ ret = target_read_u32(target, addr, &value);
+ if (ret != ERROR_OK)
return ret;
value |= mask;
@@ -129,19 +128,19 @@ static int pxa270_set_gpio_output_val (struct mflash_gpio_num gpio, uint8_t val)
#define S3C2440_GPJCON 0x560000d0
#define S3C2440_GPJDAT 0x560000d4
-static int s3c2440_set_gpio_to_output (struct mflash_gpio_num gpio)
+static int s3c2440_set_gpio_to_output(struct mflash_gpio_num gpio)
{
uint32_t data, mask, gpio_con;
struct target *target = mflash_bank->target;
int ret;
- if (gpio.port[0] >= 'a' && gpio.port[0] <= 'h') {
+ if (gpio.port[0] >= 'a' && gpio.port[0] <= 'h')
gpio_con = S3C2440_GPACON + (gpio.port[0] - 'a') * 0x10;
- } else if (gpio.port[0] == 'j') {
+ else if (gpio.port[0] == 'j')
gpio_con = S3C2440_GPJCON;
- } else {
+ else {
LOG_ERROR("mflash: invalid port %d%s", gpio.num, gpio.port);
- return ERROR_INVALID_ARGUMENTS;
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
ret = target_read_u32(target, gpio_con, &data);
@@ -161,19 +160,19 @@ static int s3c2440_set_gpio_to_output (struct mflash_gpio_num gpio)
return ret;
}
-static int s3c2440_set_gpio_output_val (struct mflash_gpio_num gpio, uint8_t val)
+static int s3c2440_set_gpio_output_val(struct mflash_gpio_num gpio, uint8_t val)
{
uint32_t data, mask, gpio_dat;
struct target *target = mflash_bank->target;
int ret;
- if (gpio.port[0] >= 'a' && gpio.port[0] <= 'h') {
+ if (gpio.port[0] >= 'a' && gpio.port[0] <= 'h')
gpio_dat = S3C2440_GPADAT + (gpio.port[0] - 'a') * 0x10;
- } else if (gpio.port[0] == 'j') {
+ else if (gpio.port[0] == 'j')
gpio_dat = S3C2440_GPJDAT;
- } else {
+ else {
LOG_ERROR("mflash: invalid port %d%s", gpio.num, gpio.port);
- return ERROR_INVALID_ARGUMENTS;
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
ret = target_read_u32(target, gpio_dat, &data);
@@ -195,7 +194,7 @@ static int mg_hdrst(uint8_t level)
return mflash_bank->gpio_drv->set_gpio_output_val(mflash_bank->rst_pin, level);
}
-static int mg_init_gpio (void)
+static int mg_init_gpio(void)
{
int ret;
struct mflash_gpio_drv *gpio_drv = mflash_bank->gpio_drv;
@@ -209,7 +208,7 @@ static int mg_init_gpio (void)
return ret;
}
-static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time)
+static int mg_dsk_wait(mg_io_type_wait wait_local, uint32_t time_var)
{
uint8_t status, error;
struct target *target = mflash_bank->target;
@@ -220,19 +219,17 @@ static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time)
struct duration bench;
duration_start(&bench);
- while (time) {
+ while (time_var) {
ret = target_read_u8(target, mg_task_reg + MG_REG_STATUS, &status);
if (ret != ERROR_OK)
return ret;
- if (status & mg_io_rbit_status_busy)
- {
- if (wait == mg_io_wait_bsy)
+ if (status & mg_io_rbit_status_busy) {
+ if (wait_local == mg_io_wait_bsy)
return ERROR_OK;
} else {
- switch (wait)
- {
+ switch (wait_local) {
case mg_io_wait_not_bsy:
return ERROR_OK;
case mg_io_wait_rdy_noerr:
@@ -248,8 +245,7 @@ static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time)
}
/* Now we check the error condition! */
- if (status & mg_io_rbit_status_error)
- {
+ if (status & mg_io_rbit_status_error) {
ret = target_read_u8(target, mg_task_reg + MG_REG_ERROR, &error);
if (ret != ERROR_OK)
return ret;
@@ -259,16 +255,15 @@ static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time)
return ERROR_MG_IO;
}
- switch (wait)
- {
+ switch (wait_local) {
case mg_io_wait_rdy:
if (status & mg_io_rbit_status_ready)
return ERROR_OK;
-
+ /* fallthrough */
case mg_io_wait_drq:
if (status & mg_io_rbit_status_data_req)
return ERROR_OK;
-
+ /* fallthrough */
default:
break;
}
@@ -280,7 +275,7 @@ static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time)
else
LOG_ERROR("mflash: duration measurement failed: %d", ret);
- if (t > time)
+ if (t > time_var)
break;
}
@@ -295,14 +290,14 @@ static int mg_dsk_srst(uint8_t on)
uint8_t value;
int ret;
- if ((ret = target_read_u8(target, mg_task_reg + MG_REG_DRV_CTRL, &value)) != ERROR_OK)
+ ret = target_read_u8(target, mg_task_reg + MG_REG_DRV_CTRL, &value);
+ if (ret != ERROR_OK)
return ret;
- if (on) {
+ if (on)
value |= (mg_io_rbit_devc_srst);
- } else {
+ else
value &= ~mg_io_rbit_devc_srst;
- }
ret = target_write_u8(target, mg_task_reg + MG_REG_DRV_CTRL, value);
return ret;
@@ -319,7 +314,7 @@ static int mg_dsk_io_cmd(uint32_t sect_num, uint32_t cnt, uint8_t cmd)
if (ret != ERROR_OK)
return ret;
- value = mg_io_rval_dev_drv_master | mg_io_rval_dev_lba_mode |((sect_num >> 24) & 0xf);
+ value = mg_io_rval_dev_drv_master | mg_io_rval_dev_lba_mode | ((sect_num >> 24) & 0xf);
ret = target_write_u8(target, mg_task_reg + MG_REG_DRV_HEAD, value);
ret |= target_write_u8(target, mg_task_reg + MG_REG_SECT_CNT, (uint8_t)cnt);
@@ -339,57 +334,72 @@ static int mg_dsk_drv_info(void)
uint32_t mg_buff = mflash_bank->base + MG_BUFFER_OFFSET;
int ret;
- if ((ret = mg_dsk_io_cmd(0, 1, mg_io_cmd_identify)) != ERROR_OK)
+ ret = mg_dsk_io_cmd(0, 1, mg_io_cmd_identify);
+ if (ret != ERROR_OK)
return ret;
- if ((ret = mg_dsk_wait(mg_io_wait_drq, MG_OEM_DISK_WAIT_TIME_NORMAL)) != ERROR_OK)
+ ret = mg_dsk_wait(mg_io_wait_drq, MG_OEM_DISK_WAIT_TIME_NORMAL);
+ if (ret != ERROR_OK)
return ret;
LOG_INFO("mflash: read drive info");
- if (! mflash_bank->drv_info)
+ if (!mflash_bank->drv_info)
mflash_bank->drv_info = malloc(sizeof(struct mg_drv_info));
- target_read_memory(target, mg_buff, 2, sizeof(mg_io_type_drv_info) >> 1,
+ ret = target_read_memory(target, mg_buff, 2,
+ sizeof(mg_io_type_drv_info) >> 1,
(uint8_t *)&mflash_bank->drv_info->drv_id);
if (ret != ERROR_OK)
return ret;
- mflash_bank->drv_info->tot_sects = (uint32_t)(mflash_bank->drv_info->drv_id.total_user_addressable_sectors_hi << 16)
- + mflash_bank->drv_info->drv_id.total_user_addressable_sectors_lo;
+ mflash_bank->drv_info->tot_sects =
+ (uint32_t)(mflash_bank->drv_info->drv_id.total_user_addressable_sectors_hi << 16)
+ + mflash_bank->drv_info->drv_id.total_user_addressable_sectors_lo;
- return target_write_u8(target, mflash_bank->base + MG_REG_OFFSET + MG_REG_COMMAND, mg_io_cmd_confirm_read);
+ return target_write_u8(target,
+ mflash_bank->base + MG_REG_OFFSET + MG_REG_COMMAND,
+ mg_io_cmd_confirm_read);
}
static int mg_mflash_rst(void)
{
int ret;
- if ((ret = mg_init_gpio()) != ERROR_OK)
+ ret = mg_init_gpio();
+ if (ret != ERROR_OK)
return ret;
- if ((ret = mg_hdrst(0)) != ERROR_OK)
+ ret = mg_hdrst(0);
+ if (ret != ERROR_OK)
return ret;
- if ((ret = mg_dsk_wait(mg_io_wait_bsy, MG_OEM_DISK_WAIT_TIME_LONG)) != ERROR_OK)
+ ret = mg_dsk_wait(mg_io_wait_bsy, MG_OEM_DISK_WAIT_TIME_LONG);
+ if (ret != ERROR_OK)
return ret;
- if ((ret = mg_hdrst(1)) != ERROR_OK)
+ ret = mg_hdrst(1);
+ if (ret != ERROR_OK)
return ret;
- if ((ret = mg_dsk_wait(mg_io_wait_not_bsy, MG_OEM_DISK_WAIT_TIME_LONG)) != ERROR_OK)
+ ret = mg_dsk_wait(mg_io_wait_not_bsy, MG_OEM_DISK_WAIT_TIME_LONG);
+ if (ret != ERROR_OK)
return ret;
- if ((ret = mg_dsk_srst(1)) != ERROR_OK)
+ ret = mg_dsk_srst(1);
+ if (ret != ERROR_OK)
return ret;
- if ((ret = mg_dsk_wait(mg_io_wait_bsy, MG_OEM_DISK_WAIT_TIME_LONG)) != ERROR_OK)
+ ret = mg_dsk_wait(mg_io_wait_bsy, MG_OEM_DISK_WAIT_TIME_LONG);
+ if (ret != ERROR_OK)
return ret;
- if ((ret = mg_dsk_srst(0)) != ERROR_OK)
+ ret = mg_dsk_srst(0);
+ if (ret != ERROR_OK)
return ret;
- if ((ret = mg_dsk_wait(mg_io_wait_not_bsy, MG_OEM_DISK_WAIT_TIME_LONG)) != ERROR_OK)
+ ret = mg_dsk_wait(mg_io_wait_not_bsy, MG_OEM_DISK_WAIT_TIME_LONG);
+ if (ret != ERROR_OK)
return ret;
LOG_INFO("mflash: reset ok");
@@ -399,9 +409,8 @@ static int mg_mflash_rst(void)
static int mg_mflash_probe(void)
{
- int ret;
-
- if ((ret = mg_mflash_rst()) != ERROR_OK)
+ int ret = mg_mflash_rst();
+ if (ret != ERROR_OK)
return ret;
return mg_dsk_drv_info();
@@ -414,8 +423,10 @@ COMMAND_HANDLER(mg_probe_cmd)
ret = mg_mflash_probe();
if (ret == ERROR_OK) {
- command_print(CMD_CTX, "mflash (total %" PRIu32 " sectors) found at 0x%8.8" PRIx32 "",
- mflash_bank->drv_info->tot_sects, mflash_bank->base);
+ command_print(CMD_CTX,
+ "mflash (total %" PRIu32 " sectors) found at 0x%8.8" PRIx32 "",
+ mflash_bank->drv_info->tot_sects,
+ mflash_bank->base);
}
return ret;
@@ -428,7 +439,8 @@ static int mg_mflash_do_read_sects(void *buff, uint32_t sect_num, uint32_t sect_
struct target *target = mflash_bank->target;
uint8_t *buff_ptr = buff;
- if ((ret = mg_dsk_io_cmd(sect_num, sect_cnt, mg_io_cmd_read)) != ERROR_OK)
+ ret = mg_dsk_io_cmd(sect_num, sect_cnt, mg_io_cmd_read);
+ if (ret != ERROR_OK)
return ret;
address = mflash_bank->base + MG_BUFFER_OFFSET;
@@ -447,11 +459,14 @@ static int mg_mflash_do_read_sects(void *buff, uint32_t sect_num, uint32_t sect_
buff_ptr += MG_MFLASH_SECTOR_SIZE;
- ret = target_write_u8(target, mflash_bank->base + MG_REG_OFFSET + MG_REG_COMMAND, mg_io_cmd_confirm_read);
+ ret = target_write_u8(target,
+ mflash_bank->base + MG_REG_OFFSET + MG_REG_COMMAND,
+ mg_io_cmd_confirm_read);
if (ret != ERROR_OK)
return ret;
- LOG_DEBUG("mflash: %" PRIu32 " (0x%8.8" PRIx32 ") sector read", sect_num + i, (sect_num + i) * MG_MFLASH_SECTOR_SIZE);
+ LOG_DEBUG("mflash: %" PRIu32 " (0x%8.8" PRIx32 ") sector read", sect_num + i,
+ (sect_num + i) * MG_MFLASH_SECTOR_SIZE);
ret = duration_measure(&bench);
if ((ERROR_OK == ret) && (duration_elapsed(&bench) > 3)) {
@@ -474,7 +489,7 @@ static int mg_mflash_read_sects(void *buff, uint32_t sect_num, uint32_t sect_cnt
for (i = 0; i < quotient; i++) {
LOG_DEBUG("mflash: sect num : %" PRIu32 " buff : %p",
- sect_num, buff_ptr);
+ sect_num, buff_ptr);
ret = mg_mflash_do_read_sects(buff_ptr, sect_num, 256);
if (ret != ERROR_OK)
return ret;
@@ -485,7 +500,7 @@ static int mg_mflash_read_sects(void *buff, uint32_t sect_num, uint32_t sect_cnt
if (residue) {
LOG_DEBUG("mflash: sect num : %" PRIx32 " buff : %p",
- sect_num, buff_ptr);
+ sect_num, buff_ptr);
return mg_mflash_do_read_sects(buff_ptr, sect_num, residue);
}
@@ -493,14 +508,15 @@ static int mg_mflash_read_sects(void *buff, uint32_t sect_num, uint32_t sect_cnt
}
static int mg_mflash_do_write_sects(void *buff, uint32_t sect_num, uint32_t sect_cnt,
- mg_io_type_cmd cmd)
+ uint8_t cmd)
{
uint32_t i, address;
int ret;
struct target *target = mflash_bank->target;
uint8_t *buff_ptr = buff;
- if ((ret = mg_dsk_io_cmd(sect_num, sect_cnt, cmd)) != ERROR_OK)
+ ret = mg_dsk_io_cmd(sect_num, sect_cnt, cmd);
+ if (ret != ERROR_OK)
return ret;
address = mflash_bank->base + MG_BUFFER_OFFSET;
@@ -519,11 +535,14 @@ static int mg_mflash_do_write_sects(void *buff, uint32_t sect_num, uint32_t sect
buff_ptr += MG_MFLASH_SECTOR_SIZE;
- ret = target_write_u8(target, mflash_bank->base + MG_REG_OFFSET + MG_REG_COMMAND, mg_io_cmd_confirm_write);
+ ret = target_write_u8(target,
+ mflash_bank->base + MG_REG_OFFSET + MG_REG_COMMAND,
+ mg_io_cmd_confirm_write);
if (ret != ERROR_OK)
return ret;
- LOG_DEBUG("mflash: %" PRIu32 " (0x%8.8" PRIx32 ") sector write", sect_num + i, (sect_num + i) * MG_MFLASH_SECTOR_SIZE);
+ LOG_DEBUG("mflash: %" PRIu32 " (0x%8.8" PRIx32 ") sector write", sect_num + i,
+ (sect_num + i) * MG_MFLASH_SECTOR_SIZE);
ret = duration_measure(&bench);
if ((ERROR_OK == ret) && (duration_elapsed(&bench) > 3)) {
@@ -569,7 +588,7 @@ static int mg_mflash_write_sects(void *buff, uint32_t sect_num, uint32_t sect_cn
return ret;
}
-static int mg_mflash_read (uint32_t addr, uint8_t *buff, uint32_t len)
+static int mg_mflash_read(uint32_t addr, uint8_t *buff, uint32_t len)
{
uint8_t *buff_ptr = buff;
uint8_t sect_buff[MG_MFLASH_SECTOR_SIZE];
@@ -589,12 +608,22 @@ static int mg_mflash_read (uint32_t addr, uint8_t *buff, uint32_t len)
return ret;
if (end_addr < next_sec_addr) {
- memcpy(buff_ptr, sect_buff + (cur_addr & MG_MFLASH_SECTOR_SIZE_MASK), end_addr - cur_addr);
- LOG_DEBUG("mflash: copies %" PRIu32 " byte from sector offset 0x%8.8" PRIx32 "", end_addr - cur_addr, cur_addr);
+ memcpy(buff_ptr,
+ sect_buff + (cur_addr & MG_MFLASH_SECTOR_SIZE_MASK),
+ end_addr - cur_addr);
+ LOG_DEBUG(
+ "mflash: copies %" PRIu32 " byte from sector offset 0x%8.8" PRIx32 "",
+ end_addr - cur_addr,
+ cur_addr);
cur_addr = end_addr;
} else {
- memcpy(buff_ptr, sect_buff + (cur_addr & MG_MFLASH_SECTOR_SIZE_MASK), next_sec_addr - cur_addr);
- LOG_DEBUG("mflash: copies %" PRIu32 " byte from sector offset 0x%8.8" PRIx32 "", next_sec_addr - cur_addr, cur_addr);
+ memcpy(buff_ptr,
+ sect_buff + (cur_addr & MG_MFLASH_SECTOR_SIZE_MASK),
+ next_sec_addr - cur_addr);
+ LOG_DEBUG(
+ "mflash: copies %" PRIu32 " byte from sector offset 0x%8.8" PRIx32 "",
+ next_sec_addr - cur_addr,
+ cur_addr);
buff_ptr += (next_sec_addr - cur_addr);
cur_addr = next_sec_addr;
}
@@ -610,9 +639,11 @@ static int mg_mflash_read (uint32_t addr, uint8_t *buff, uint32_t len)
next_sec_addr += MG_MFLASH_SECTOR_SIZE;
}
- if (cnt)
- if ((ret = mg_mflash_read_sects(buff_ptr, sect_num, cnt)) != ERROR_OK)
+ if (cnt) {
+ ret = mg_mflash_read_sects(buff_ptr, sect_num, cnt);
+ if (ret != ERROR_OK)
return ret;
+ }
buff_ptr += cnt * MG_MFLASH_SECTOR_SIZE;
cur_addr += cnt * MG_MFLASH_SECTOR_SIZE;
@@ -626,7 +657,6 @@ static int mg_mflash_read (uint32_t addr, uint8_t *buff, uint32_t len)
memcpy(buff_ptr, sect_buff, end_addr - cur_addr);
LOG_DEBUG("mflash: copies %u byte", (unsigned)(end_addr - cur_addr));
-
}
}
@@ -653,12 +683,22 @@ static int mg_mflash_write(uint32_t addr, uint8_t *buff, uint32_t len)
return ret;
if (end_addr < next_sec_addr) {
- memcpy(sect_buff + (cur_addr & MG_MFLASH_SECTOR_SIZE_MASK), buff_ptr, end_addr - cur_addr);
- LOG_DEBUG("mflash: copies %" PRIu32 " byte to sector offset 0x%8.8" PRIx32 "", end_addr - cur_addr, cur_addr);
+ memcpy(sect_buff + (cur_addr & MG_MFLASH_SECTOR_SIZE_MASK),
+ buff_ptr,
+ end_addr - cur_addr);
+ LOG_DEBUG(
+ "mflash: copies %" PRIu32 " byte to sector offset 0x%8.8" PRIx32 "",
+ end_addr - cur_addr,
+ cur_addr);
cur_addr = end_addr;
} else {
- memcpy(sect_buff + (cur_addr & MG_MFLASH_SECTOR_SIZE_MASK), buff_ptr, next_sec_addr - cur_addr);
- LOG_DEBUG("mflash: copies %" PRIu32 " byte to sector offset 0x%8.8" PRIx32 "", next_sec_addr - cur_addr, cur_addr);
+ memcpy(sect_buff + (cur_addr & MG_MFLASH_SECTOR_SIZE_MASK),
+ buff_ptr,
+ next_sec_addr - cur_addr);
+ LOG_DEBUG(
+ "mflash: copies %" PRIu32 " byte to sector offset 0x%8.8" PRIx32 "",
+ next_sec_addr - cur_addr,
+ cur_addr);
buff_ptr += (next_sec_addr - cur_addr);
cur_addr = next_sec_addr;
}
@@ -678,9 +718,11 @@ static int mg_mflash_write(uint32_t addr, uint8_t *buff, uint32_t len)
next_sec_addr += MG_MFLASH_SECTOR_SIZE;
}
- if (cnt)
- if ((ret = mg_mflash_write_sects(buff_ptr, sect_num, cnt)) != ERROR_OK)
+ if (cnt) {
+ ret = mg_mflash_write_sects(buff_ptr, sect_num, cnt);
+ if (ret != ERROR_OK)
return ret;
+ }
buff_ptr += cnt * MG_MFLASH_SECTOR_SIZE;
cur_addr += cnt * MG_MFLASH_SECTOR_SIZE;
@@ -705,12 +747,11 @@ COMMAND_HANDLER(mg_write_cmd)
{
uint32_t address, cnt, res, i;
uint8_t *buffer;
- struct fileio fileio;
+ struct fileio *fileio;
int ret;
- if (CMD_ARGC != 3) {
+ if (CMD_ARGC != 3)
return ERROR_COMMAND_SYNTAX_ERROR;
- }
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], address);
@@ -718,50 +759,59 @@ COMMAND_HANDLER(mg_write_cmd)
if (ret != ERROR_OK)
return ret;
+ size_t filesize;
buffer = malloc(MG_FILEIO_CHUNK);
if (!buffer) {
- fileio_close(&fileio);
+ fileio_close(fileio);
return ERROR_FAIL;
}
+ int retval = fileio_size(fileio, &filesize);
+ if (retval != ERROR_OK) {
+ fileio_close(fileio);
+ free(buffer);
+ return retval;
+ }
- cnt = fileio.size / MG_FILEIO_CHUNK;
- res = fileio.size % MG_FILEIO_CHUNK;
+ cnt = filesize / MG_FILEIO_CHUNK;
+ res = filesize % MG_FILEIO_CHUNK;
struct duration bench;
duration_start(&bench);
size_t buf_cnt;
for (i = 0; i < cnt; i++) {
- if ((ret = fileio_read(&fileio, MG_FILEIO_CHUNK, buffer, &buf_cnt)) !=
- ERROR_OK)
+ ret = fileio_read(fileio, MG_FILEIO_CHUNK, buffer, &buf_cnt);
+ if (ret != ERROR_OK)
goto mg_write_cmd_err;
- if ((ret = mg_mflash_write(address, buffer, MG_FILEIO_CHUNK)) != ERROR_OK)
+ ret = mg_mflash_write(address, buffer, MG_FILEIO_CHUNK);
+ if (ret != ERROR_OK)
goto mg_write_cmd_err;
address += MG_FILEIO_CHUNK;
}
if (res) {
- if ((ret = fileio_read(&fileio, res, buffer, &buf_cnt)) != ERROR_OK)
+ ret = fileio_read(fileio, res, buffer, &buf_cnt);
+ if (ret != ERROR_OK)
goto mg_write_cmd_err;
- if ((ret = mg_mflash_write(address, buffer, res)) != ERROR_OK)
+ ret = mg_mflash_write(address, buffer, res);
+ if (ret != ERROR_OK)
goto mg_write_cmd_err;
}
- if (duration_measure(&bench) == ERROR_OK)
- {
- command_print(CMD_CTX, "wrote %zu byte from file %s "
- "in %fs (%0.3f kB/s)", fileio.size, CMD_ARGV[1],
- duration_elapsed(&bench), duration_kbps(&bench, fileio.size));
+ if (duration_measure(&bench) == ERROR_OK) {
+ command_print(CMD_CTX, "wrote %zu bytes from file %s "
+ "in %fs (%0.3f kB/s)", filesize, CMD_ARGV[1],
+ duration_elapsed(&bench), duration_kbps(&bench, filesize));
}
free(buffer);
- fileio_close(&fileio);
+ fileio_close(fileio);
return ERROR_OK;
mg_write_cmd_err:
- free(buffer);
- fileio_close(&fileio);
+ free(buffer);
+ fileio_close(fileio);
return ret;
}
@@ -770,12 +820,11 @@ COMMAND_HANDLER(mg_dump_cmd)
{
uint32_t address, size, cnt, res, i;
uint8_t *buffer;
- struct fileio fileio;
+ struct fileio *fileio;
int ret;
- if (CMD_ARGC != 4) {
+ if (CMD_ARGC != 4)
return ERROR_COMMAND_SYNTAX_ERROR;
- }
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], address);
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[3], size);
@@ -786,7 +835,7 @@ COMMAND_HANDLER(mg_dump_cmd)
buffer = malloc(MG_FILEIO_CHUNK);
if (!buffer) {
- fileio_close(&fileio);
+ fileio_close(fileio);
return ERROR_FAIL;
}
@@ -798,37 +847,39 @@ COMMAND_HANDLER(mg_dump_cmd)
size_t size_written;
for (i = 0; i < cnt; i++) {
- if ((ret = mg_mflash_read(address, buffer, MG_FILEIO_CHUNK)) != ERROR_OK)
+ ret = mg_mflash_read(address, buffer, MG_FILEIO_CHUNK);
+ if (ret != ERROR_OK)
goto mg_dump_cmd_err;
- if ((ret = fileio_write(&fileio, MG_FILEIO_CHUNK, buffer, &size_written))
- != ERROR_OK)
+ ret = fileio_write(fileio, MG_FILEIO_CHUNK, buffer, &size_written);
+ if (ret != ERROR_OK)
goto mg_dump_cmd_err;
address += MG_FILEIO_CHUNK;
}
if (res) {
- if ((ret = mg_mflash_read(address, buffer, res)) != ERROR_OK)
+ ret = mg_mflash_read(address, buffer, res);
+ if (ret != ERROR_OK)
goto mg_dump_cmd_err;
- if ((ret = fileio_write(&fileio, res, buffer, &size_written)) != ERROR_OK)
+ ret = fileio_write(fileio, res, buffer, &size_written);
+ if (ret != ERROR_OK)
goto mg_dump_cmd_err;
}
- if (duration_measure(&bench) == ERROR_OK)
- {
+ if (duration_measure(&bench) == ERROR_OK) {
command_print(CMD_CTX, "dump image (address 0x%8.8" PRIx32 " "
- "size %" PRIu32 ") to file %s in %fs (%0.3f kB/s)",
- address, size, CMD_ARGV[1],
- duration_elapsed(&bench), duration_kbps(&bench, size));
+ "size %" PRIu32 ") to file %s in %fs (%0.3f kB/s)",
+ address, size, CMD_ARGV[1],
+ duration_elapsed(&bench), duration_kbps(&bench, size));
}
free(buffer);
- fileio_close(&fileio);
+ fileio_close(fileio);
return ERROR_OK;
mg_dump_cmd_err:
- free(buffer);
- fileio_close(&fileio);
+ free(buffer);
+ fileio_close(fileio);
return ret;
}
@@ -839,8 +890,8 @@ static int mg_set_feature(mg_feature_id feature, mg_feature_val config)
uint32_t mg_task_reg = mflash_bank->base + MG_REG_OFFSET;
int ret;
- if ((ret = mg_dsk_wait(mg_io_wait_rdy_noerr, MG_OEM_DISK_WAIT_TIME_NORMAL))
- != ERROR_OK)
+ ret = mg_dsk_wait(mg_io_wait_rdy_noerr, MG_OEM_DISK_WAIT_TIME_NORMAL);
+ if (ret != ERROR_OK)
return ret;
ret = target_write_u8(target, mg_task_reg + MG_REG_FEATURE, feature);
@@ -856,7 +907,7 @@ static int mg_is_valid_pll(double XIN, int N, double CLK_OUT, int NO)
double v1 = XIN / N;
double v2 = CLK_OUT * NO;
- if (v1 <1000000 || v1 > 15000000 || v2 < 100000000 || v2 > 500000000)
+ if (v1 < 1000000 || v1 > 15000000 || v2 < 100000000 || v2 > 500000000)
return ERROR_MG_INVALID_PLL;
return ERROR_OK;
@@ -882,7 +933,7 @@ static int mg_pll_get_N(unsigned char input_div)
return N + 2;
}
-static int mg_pll_get_NO(unsigned char output_div)
+static int mg_pll_get_NO(unsigned char output_div)
{
int i, NO;
@@ -893,11 +944,11 @@ static int mg_pll_get_NO(unsigned char output_div)
return NO;
}
-static double mg_do_calc_pll(double XIN, mg_pll_t * p_pll_val, int is_approximate)
+static double mg_do_calc_pll(double XIN, mg_pll_t *p_pll_val, int is_approximate)
{
unsigned short i;
- unsigned char j, k;
- int M, N, NO;
+ unsigned char j, k;
+ int M, N, NO;
double CLK_OUT;
double DIV = 1;
double ROUND = 0;
@@ -907,22 +958,23 @@ static double mg_do_calc_pll(double XIN, mg_pll_t * p_pll_val, int is_approximat
ROUND = 500000;
}
- for (i = 0; i < MG_PLL_MAX_FEEDBACKDIV_VAL ; ++i) {
+ for (i = 0; i < MG_PLL_MAX_FEEDBACKDIV_VAL; ++i) {
M = mg_pll_get_M(i);
- for (j = 0; j < MG_PLL_MAX_INPUTDIV_VAL ; ++j) {
+ for (j = 0; j < MG_PLL_MAX_INPUTDIV_VAL; ++j) {
N = mg_pll_get_N(j);
- for (k = 0; k < MG_PLL_MAX_OUTPUTDIV_VAL ; ++k) {
+ for (k = 0; k < MG_PLL_MAX_OUTPUTDIV_VAL; ++k) {
NO = mg_pll_get_NO(k);
CLK_OUT = XIN * ((double)M / N) / NO;
if ((int)((CLK_OUT + ROUND) / DIV)
- == (int)(MG_PLL_CLK_OUT / DIV)) {
- if (mg_is_valid_pll(XIN, N, CLK_OUT, NO) == ERROR_OK)
- {
- p_pll_val->lock_cyc = (int)(XIN * MG_PLL_STD_LOCKCYCLE / MG_PLL_STD_INPUTCLK);
+ == (int)(MG_PLL_CLK_OUT / DIV)) {
+ if (mg_is_valid_pll(XIN, N, CLK_OUT, NO) == ERROR_OK) {
+ p_pll_val->lock_cyc =
+ (int)(XIN * MG_PLL_STD_LOCKCYCLE /
+ MG_PLL_STD_INPUTCLK);
p_pll_val->feedback_div = i;
p_pll_val->input_div = j;
p_pll_val->output_div = k;
@@ -986,128 +1038,128 @@ static int mg_verify_interface(void)
}
static const char g_strSEG_SerialNum[20] = {
- 'G','m','n','i','-','e','e','S','g','a','e','l',
- 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20
+ 'G', 'm', 'n', 'i', '-', 'e', 'e', 'S', 'g', 'a', 'e', 'l',
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
};
static const char g_strSEG_FWRev[8] = {
- 'F','X','L','T','2','v','0','.'
+ 'F', 'X', 'L', 'T', '2', 'v', '0', '.'
};
static const char g_strSEG_ModelNum[40] = {
- 'F','X','A','L','H','S','2',0x20,'0','0','s','7',
- 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
- 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
- 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20
+ 'F', 'X', 'A', 'L', 'H', 'S', '2', 0x20, '0', '0', 's', '7',
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
};
static void mg_gen_ataid(mg_io_type_drv_info *pSegIdDrvInfo)
{
/* b15 is ATA device(0) , b7 is Removable Media Device */
- pSegIdDrvInfo->general_configuration = 0x045A;
+ pSegIdDrvInfo->general_configuration = 0x045A;
/* 128MB : Cylinder=> 977 , Heads=> 8 , Sectors=> 32
* 256MB : Cylinder=> 980 , Heads=> 16 , Sectors=> 32
* 384MB : Cylinder=> 745 , Heads=> 16 , Sectors=> 63
*/
- pSegIdDrvInfo->number_of_cylinders = 0x02E9;
- pSegIdDrvInfo->reserved1 = 0x0;
- pSegIdDrvInfo->number_of_heads = 0x10;
- pSegIdDrvInfo->unformatted_bytes_per_track = 0x0;
- pSegIdDrvInfo->unformatted_bytes_per_sector = 0x0;
- pSegIdDrvInfo->sectors_per_track = 0x3F;
- pSegIdDrvInfo->vendor_unique1[0] = 0x000B;
- pSegIdDrvInfo->vendor_unique1[1] = 0x7570;
- pSegIdDrvInfo->vendor_unique1[2] = 0x8888;
-
- memcpy(pSegIdDrvInfo->serial_number, (void *)g_strSEG_SerialNum,20);
+ pSegIdDrvInfo->number_of_cylinders = 0x02E9;
+ pSegIdDrvInfo->reserved1 = 0x0;
+ pSegIdDrvInfo->number_of_heads = 0x10;
+ pSegIdDrvInfo->unformatted_bytes_per_track = 0x0;
+ pSegIdDrvInfo->unformatted_bytes_per_sector = 0x0;
+ pSegIdDrvInfo->sectors_per_track = 0x3F;
+ pSegIdDrvInfo->vendor_unique1[0] = 0x000B;
+ pSegIdDrvInfo->vendor_unique1[1] = 0x7570;
+ pSegIdDrvInfo->vendor_unique1[2] = 0x8888;
+
+ memcpy(pSegIdDrvInfo->serial_number, g_strSEG_SerialNum, 20);
/* 0x2 : dual buffer */
- pSegIdDrvInfo->buffer_type = 0x2;
+ pSegIdDrvInfo->buffer_type = 0x2;
/* buffer size : 2KB */
- pSegIdDrvInfo->buffer_sector_size = 0x800;
- pSegIdDrvInfo->number_of_ecc_bytes = 0;
+ pSegIdDrvInfo->buffer_sector_size = 0x800;
+ pSegIdDrvInfo->number_of_ecc_bytes = 0;
- memcpy(pSegIdDrvInfo->firmware_revision, (void *)g_strSEG_FWRev,8);
+ memcpy(pSegIdDrvInfo->firmware_revision, g_strSEG_FWRev, 8);
- memcpy(pSegIdDrvInfo->model_number, (void *)g_strSEG_ModelNum,40);
+ memcpy(pSegIdDrvInfo->model_number, g_strSEG_ModelNum, 40);
- pSegIdDrvInfo->maximum_block_transfer = 0x4;
- pSegIdDrvInfo->vendor_unique2 = 0x0;
- pSegIdDrvInfo->dword_io = 0x00;
+ pSegIdDrvInfo->maximum_block_transfer = 0x4;
+ pSegIdDrvInfo->vendor_unique2 = 0x0;
+ pSegIdDrvInfo->dword_io = 0x00;
/* b11 : IORDY support(PIO Mode 4), b10 : Disable/Enbale IORDY
* b9 : LBA support, b8 : DMA mode support
*/
- pSegIdDrvInfo->capabilities = 0x1 << 9;
+ pSegIdDrvInfo->capabilities = 0x1 << 9;
- pSegIdDrvInfo->reserved2 = 0x4000;
- pSegIdDrvInfo->vendor_unique3 = 0x00;
+ pSegIdDrvInfo->reserved2 = 0x4000;
+ pSegIdDrvInfo->vendor_unique3 = 0x00;
/* PIOMode-2 support */
- pSegIdDrvInfo->pio_cycle_timing_mode = 0x02;
- pSegIdDrvInfo->vendor_unique4 = 0x00;
+ pSegIdDrvInfo->pio_cycle_timing_mode = 0x02;
+ pSegIdDrvInfo->vendor_unique4 = 0x00;
/* MultiWord-2 support */
- pSegIdDrvInfo->dma_cycle_timing_mode = 0x00;
+ pSegIdDrvInfo->dma_cycle_timing_mode = 0x00;
/* b1 : word64~70 is valid
* b0 : word54~58 are valid and reflect the current numofcyls,heads,sectors
* b2 : If device supports Ultra DMA , set to one to vaildate word88
*/
- pSegIdDrvInfo->translation_fields_valid = (0x1 << 1) | (0x1 << 0);
- pSegIdDrvInfo->number_of_current_cylinders = 0x02E9;
- pSegIdDrvInfo->number_of_current_heads = 0x10;
- pSegIdDrvInfo->current_sectors_per_track = 0x3F;
- pSegIdDrvInfo->current_sector_capacity_lo = 0x7570;
- pSegIdDrvInfo->current_sector_capacity_hi = 0x000B;
-
- pSegIdDrvInfo->multi_sector_count = 0x04;
+ pSegIdDrvInfo->translation_fields_valid = (0x1 << 1) | (0x1 << 0);
+ pSegIdDrvInfo->number_of_current_cylinders = 0x02E9;
+ pSegIdDrvInfo->number_of_current_heads = 0x10;
+ pSegIdDrvInfo->current_sectors_per_track = 0x3F;
+ pSegIdDrvInfo->current_sector_capacity_lo = 0x7570;
+ pSegIdDrvInfo->current_sector_capacity_hi = 0x000B;
+
+ pSegIdDrvInfo->multi_sector_count = 0x04;
/* b8 : Multiple secotr setting valid , b[7:0] num of secotrs per block */
- pSegIdDrvInfo->multi_sector_setting_valid = 0x01;
- pSegIdDrvInfo->total_user_addressable_sectors_lo = 0x7570;
- pSegIdDrvInfo->total_user_addressable_sectors_hi = 0x000B;
- pSegIdDrvInfo->single_dma_modes_supported = 0x00;
- pSegIdDrvInfo->single_dma_transfer_active = 0x00;
+ pSegIdDrvInfo->multi_sector_setting_valid = 0x01;
+ pSegIdDrvInfo->total_user_addressable_sectors_lo = 0x7570;
+ pSegIdDrvInfo->total_user_addressable_sectors_hi = 0x000B;
+ pSegIdDrvInfo->single_dma_modes_supported = 0x00;
+ pSegIdDrvInfo->single_dma_transfer_active = 0x00;
/* b2 :Multi-word DMA mode 2, b1 : Multi-word DMA mode 1 */
- pSegIdDrvInfo->multi_dma_modes_supported = (0x1 << 0);
+ pSegIdDrvInfo->multi_dma_modes_supported = (0x1 << 0);
/* b2 :Multi-word DMA mode 2, b1 : Multi-word DMA mode 1 */
- pSegIdDrvInfo->multi_dma_transfer_active = (0x1 << 0);
+ pSegIdDrvInfo->multi_dma_transfer_active = (0x1 << 0);
/* b0 : PIO Mode-3 support, b1 : PIO Mode-4 support */
- pSegIdDrvInfo->adv_pio_mode = 0x00;
+ pSegIdDrvInfo->adv_pio_mode = 0x00;
/* 480(0x1E0)nsec for Multi-word DMA mode0
* 150(0x96) nsec for Multi-word DMA mode1
* 120(0x78) nsec for Multi-word DMA mode2
*/
- pSegIdDrvInfo->min_dma_cyc = 0x1E0;
- pSegIdDrvInfo->recommend_dma_cyc = 0x1E0;
- pSegIdDrvInfo->min_pio_cyc_no_iordy = 0x1E0;
- pSegIdDrvInfo->min_pio_cyc_with_iordy = 0x1E0;
- memset((void *)pSegIdDrvInfo->reserved3, 0x00, 22);
+ pSegIdDrvInfo->min_dma_cyc = 0x1E0;
+ pSegIdDrvInfo->recommend_dma_cyc = 0x1E0;
+ pSegIdDrvInfo->min_pio_cyc_no_iordy = 0x1E0;
+ pSegIdDrvInfo->min_pio_cyc_with_iordy = 0x1E0;
+ memset(pSegIdDrvInfo->reserved3, 0x00, 22);
/* b7 : ATA/ATAPI-7 ,b6 : ATA/ATAPI-6 ,b5 : ATA/ATAPI-5,b4 : ATA/ATAPI-4 */
- pSegIdDrvInfo->major_ver_num = 0x7E;
+ pSegIdDrvInfo->major_ver_num = 0x7E;
/* 0x1C : ATA/ATAPI-6 T13 1532D revision1 */
- pSegIdDrvInfo->minor_ver_num = 0x19;
+ pSegIdDrvInfo->minor_ver_num = 0x19;
/* NOP/READ BUFFER/WRITE BUFFER/Power management feature set support */
- pSegIdDrvInfo->feature_cmd_set_suprt0 = 0x7068;
+ pSegIdDrvInfo->feature_cmd_set_suprt0 = 0x7068;
/* Features/command set is valid/Advanced Pwr management/CFA feature set
* not support
*/
- pSegIdDrvInfo->feature_cmd_set_suprt1 = 0x400C;
- pSegIdDrvInfo->feature_cmd_set_suprt2 = 0x4000;
+ pSegIdDrvInfo->feature_cmd_set_suprt1 = 0x400C;
+ pSegIdDrvInfo->feature_cmd_set_suprt2 = 0x4000;
/* READ/WRITE BUFFER/PWR Management enable */
- pSegIdDrvInfo->feature_cmd_set_en0 = 0x7000;
+ pSegIdDrvInfo->feature_cmd_set_en0 = 0x7000;
/* CFA feature is disabled / Advancde power management disable */
- pSegIdDrvInfo->feature_cmd_set_en1 = 0x0;
- pSegIdDrvInfo->feature_cmd_set_en2 = 0x4000;
- pSegIdDrvInfo->reserved4 = 0x0;
+ pSegIdDrvInfo->feature_cmd_set_en1 = 0x0;
+ pSegIdDrvInfo->feature_cmd_set_en2 = 0x4000;
+ pSegIdDrvInfo->reserved4 = 0x0;
/* 0x1 * 2minutes */
- pSegIdDrvInfo->req_time_for_security_er_done = 0x19;
- pSegIdDrvInfo->req_time_for_enhan_security_er_done = 0x19;
+ pSegIdDrvInfo->req_time_for_security_er_done = 0x19;
+ pSegIdDrvInfo->req_time_for_enhan_security_er_done = 0x19;
/* Advanced power management level 1 */
- pSegIdDrvInfo->adv_pwr_mgm_lvl_val = 0x0;
- pSegIdDrvInfo->reserved5 = 0x0;
- memset((void *)pSegIdDrvInfo->reserved6, 0x00, 68);
+ pSegIdDrvInfo->adv_pwr_mgm_lvl_val = 0x0;
+ pSegIdDrvInfo->reserved5 = 0x0;
+ memset(pSegIdDrvInfo->reserved6, 0x00, 68);
/* Security mode feature is disabled */
- pSegIdDrvInfo->security_stas = 0x0;
- memset((void *)pSegIdDrvInfo->vendor_uniq_bytes, 0x00, 62);
+ pSegIdDrvInfo->security_stas = 0x0;
+ memset(pSegIdDrvInfo->vendor_uniq_bytes, 0x00, 62);
/* CFA power mode 1 support in maximum 200mA */
- pSegIdDrvInfo->cfa_pwr_mode = 0x0100;
- memset((void *)pSegIdDrvInfo->reserved7, 0x00, 190);
+ pSegIdDrvInfo->cfa_pwr_mode = 0x0100;
+ memset(pSegIdDrvInfo->reserved7, 0x00, 190);
}
static int mg_storage_config(void)
@@ -1115,18 +1167,18 @@ static int mg_storage_config(void)
uint8_t buff[512];
int ret;
- if ((ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_vcmd))
- != ERROR_OK)
+ ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_vcmd);
+ if (ret != ERROR_OK)
return ret;
- mg_gen_ataid((mg_io_type_drv_info *)buff);
+ mg_gen_ataid((mg_io_type_drv_info *)(void *)buff);
- if ((ret = mg_mflash_do_write_sects(buff, 0, 1, mg_vcmd_update_stgdrvinfo))
- != ERROR_OK)
+ ret = mg_mflash_do_write_sects(buff, 0, 1, mg_vcmd_update_stgdrvinfo);
+ if (ret != ERROR_OK)
return ret;
- if ((ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_default))
- != ERROR_OK)
+ ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_default);
+ if (ret != ERROR_OK)
return ret;
LOG_INFO("mflash: storage config ok");
@@ -1138,8 +1190,8 @@ static int mg_boot_config(void)
uint8_t buff[512];
int ret;
- if ((ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_vcmd))
- != ERROR_OK)
+ ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_vcmd);
+ if (ret != ERROR_OK)
return ret;
memset(buff, 0xff, 512);
@@ -1147,14 +1199,14 @@ static int mg_boot_config(void)
buff[0] = mg_op_mode_snd; /* operation mode */
buff[1] = MG_UNLOCK_OTP_AREA;
buff[2] = 4; /* boot size */
- *((uint32_t *)(buff + 4)) = 0; /* XIP size */
+ *((uint32_t *)(void *)(buff + 4)) = 0; /* XIP size */
- if ((ret = mg_mflash_do_write_sects(buff, 0, 1, mg_vcmd_update_xipinfo))
- != ERROR_OK)
+ ret = mg_mflash_do_write_sects(buff, 0, 1, mg_vcmd_update_xipinfo);
+ if (ret != ERROR_OK)
return ret;
- if ((ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_default))
- != ERROR_OK)
+ ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_default);
+ if (ret != ERROR_OK)
return ret;
LOG_INFO("mflash: boot config ok");
@@ -1173,16 +1225,16 @@ static int mg_set_pll(mg_pll_t *pll)
buff[6] = pll->input_div; /* PLL Input 5bit Divider */
buff[7] = pll->output_div; /* PLL Output Divider */
- if ((ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_vcmd))
- != ERROR_OK)
+ ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_vcmd);
+ if (ret != ERROR_OK)
return ret;
- if ((ret = mg_mflash_do_write_sects(buff, 0, 1, mg_vcmd_wr_pll))
- != ERROR_OK)
+ ret = mg_mflash_do_write_sects(buff, 0, 1, mg_vcmd_wr_pll);
+ if (ret != ERROR_OK)
return ret;
- if ((ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_default))
- != ERROR_OK)
+ ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_default);
+ if (ret != ERROR_OK)
return ret;
LOG_INFO("mflash: set pll ok");
@@ -1193,16 +1245,16 @@ static int mg_erase_nand(void)
{
int ret;
- if ((ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_vcmd))
- != ERROR_OK)
+ ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_vcmd);
+ if (ret != ERROR_OK)
return ret;
- if ((ret = mg_mflash_do_write_sects(NULL, 0, 0, mg_vcmd_purge_nand))
- != ERROR_OK)
+ ret = mg_mflash_do_write_sects(NULL, 0, 0, mg_vcmd_purge_nand);
+ if (ret != ERROR_OK)
return ret;
- if ((ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_default))
- != ERROR_OK)
+ ret = mg_set_feature(mg_feature_id_transmode, mg_feature_val_trans_default);
+ if (ret != ERROR_OK)
return ret;
LOG_INFO("mflash: erase nand ok");
@@ -1215,10 +1267,12 @@ COMMAND_HANDLER(mg_config_cmd)
mg_pll_t pll;
int ret;
- if ((ret = mg_verify_interface()) != ERROR_OK)
+ ret = mg_verify_interface();
+ if (ret != ERROR_OK)
return ret;
- if ((ret = mg_mflash_rst()) != ERROR_OK)
+ ret = mg_mflash_rst();
+ if (ret != ERROR_OK)
return ret;
switch (CMD_ARGC) {
@@ -1254,7 +1308,8 @@ COMMAND_HANDLER(mg_config_cmd)
pll.input_div, pll.output_div,
pll.lock_cyc);
- if ((ret = mg_erase_nand()) != ERROR_OK)
+ ret = mg_erase_nand();
+ if (ret != ERROR_OK)
return ret;
return mg_set_pll(&pll);
@@ -1269,35 +1324,39 @@ COMMAND_HANDLER(mg_config_cmd)
static const struct command_registration mflash_exec_command_handlers[] = {
{
.name = "probe",
- .handler = &mg_probe_cmd,
+ .handler = mg_probe_cmd,
.mode = COMMAND_EXEC,
.help = "Detect bank configuration information",
+ .usage = "",
},
{
.name = "write",
- .handler = &mg_write_cmd,
+ .handler = mg_write_cmd,
.mode = COMMAND_EXEC,
- .usage = " ",
- .help = "Write a file at the specified address",
+ /* FIXME bank_num is unused */
+ .usage = "bank_num filename address",
+ .help = "Write binary file at the specified address.",
},
{
.name = "dump",
- .handler = &mg_dump_cmd,
+ .handler = mg_dump_cmd,
.mode = COMMAND_EXEC,
- .usage = " ",
- .help = "Dump to a file from the specified address",
+ /* FIXME bank_num is unused */
+ .usage = "bank_num filename address size",
+ .help = "Write specified number of bytes from a binary file "
+ "to the specified, address.",
},
{
.name = "config",
- .handler = &mg_config_cmd,
+ .handler = mg_config_cmd,
.mode = COMMAND_EXEC,
- .usage = " ",
- .help = "Dump to a file from the specified address",
+ .help = "Configure MFLASH options.",
+ .usage = "('boot'|'storage'|'pll' frequency)",
},
COMMAND_REGISTRATION_DONE
};
-int mflash_init_drivers(struct command_context *cmd_ctx)
+static int mflash_init_drivers(struct command_context *cmd_ctx)
{
if (!mflash_bank)
return ERROR_OK;
@@ -1309,9 +1368,8 @@ COMMAND_HANDLER(handle_mflash_init_command)
if (CMD_ARGC != 0)
return ERROR_COMMAND_SYNTAX_ERROR;
- static bool mflash_initialized = false;
- if (mflash_initialized)
- {
+ static bool mflash_initialized;
+ if (mflash_initialized) {
LOG_INFO("'mflash init' has already been called");
return ERROR_OK;
}
@@ -1327,33 +1385,31 @@ COMMAND_HANDLER(mg_bank_cmd)
int i;
if (CMD_ARGC < 4)
- {
return ERROR_COMMAND_SYNTAX_ERROR;
- }
- if ((target = get_target(CMD_ARGV[3])) == NULL)
- {
+ target = get_target(CMD_ARGV[3]);
+ if (target == NULL) {
LOG_ERROR("target '%s' not defined", CMD_ARGV[3]);
return ERROR_FAIL;
}
mflash_bank = calloc(sizeof(struct mflash_bank), 1);
COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], mflash_bank->base);
- /// @todo Verify how this parsing should work, then document it.
+ /** @todo Verify how this parsing should work, then document it. */
char *str;
mflash_bank->rst_pin.num = strtoul(CMD_ARGV[2], &str, 0);
if (*str)
- mflash_bank->rst_pin.port[0] = (uint16_t)tolower(str[0]);
+ mflash_bank->rst_pin.port[0] = (uint16_t)
+ tolower((unsigned)str[0]);
mflash_bank->target = target;
- for (i = 0; mflash_gpio[i] ; i++) {
- if (! strcmp(mflash_gpio[i]->name, CMD_ARGV[0])) {
+ for (i = 0; mflash_gpio[i]; i++) {
+ if (!strcmp(mflash_gpio[i]->name, CMD_ARGV[0]))
mflash_bank->gpio_drv = mflash_gpio[i];
- }
}
- if (! mflash_bank->gpio_drv) {
+ if (!mflash_bank->gpio_drv) {
LOG_ERROR("%s is unsupported soc", CMD_ARGV[0]);
return ERROR_MG_UNSUPPORTED_SOC;
}
@@ -1364,16 +1420,17 @@ COMMAND_HANDLER(mg_bank_cmd)
static const struct command_registration mflash_config_command_handlers[] = {
{
.name = "bank",
- .handler = &mg_bank_cmd,
+ .handler = mg_bank_cmd,
.mode = COMMAND_CONFIG,
.help = "configure a mflash device bank",
- .usage = " ",
+ .usage = "soc_type base_addr pin_id target",
},
{
.name = "init",
.mode = COMMAND_CONFIG,
- .handler = &handle_mflash_init_command,
+ .handler = handle_mflash_init_command,
.help = "initialize mflash devices",
+ .usage = ""
},
COMMAND_REGISTRATION_DONE
};
@@ -1382,6 +1439,7 @@ static const struct command_registration mflash_command_handler[] = {
.name = "mflash",
.mode = COMMAND_ANY,
.help = "mflash command group",
+ .usage = "",
.chain = mflash_config_command_handlers,
},
COMMAND_REGISTRATION_DONE