aboutsummaryrefslogtreecommitdiff
path: root/src/flash
diff options
context:
space:
mode:
authorAndreas Fritiofson <andreas.fritiofson@gmail.com>2013-09-28 17:28:25 +0200
committerSpencer Oliver <spen@spen-soft.co.uk>2013-10-31 20:42:47 +0000
commit13f6c889ab9b6e5b1c4f48fca9807fdc1fb83f42 (patch)
treefd5412ade9345f19316dcbee5ea39f961f34509a /src/flash
parent517ba0690dcc9e859a05df2113ce32401a5ab254 (diff)
Remove unnecessary (void *)
When pointer casts are needed, cast directly to the correct type, instead of going via void*. Don't explicitly cast to void* if it would have been done implicitly. Change-Id: I4093209200051c5eb62847d00a4b9c8567480068 Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com> Reviewed-on: http://openocd.zylin.com/1669 Tested-by: jenkins Reviewed-by: Mathias Küster <kesmtp@freenet.de> Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Diffstat (limited to 'src/flash')
-rw-r--r--src/flash/mflash.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/flash/mflash.c b/src/flash/mflash.c
index b329c7f0..ea1673f0 100644
--- a/src/flash/mflash.c
+++ b/src/flash/mflash.c
@@ -1073,16 +1073,16 @@ static void mg_gen_ataid(mg_io_type_drv_info *pSegIdDrvInfo)
pSegIdDrvInfo->vendor_unique1[1] = 0x7570;
pSegIdDrvInfo->vendor_unique1[2] = 0x8888;
- memcpy(pSegIdDrvInfo->serial_number, (void *)g_strSEG_SerialNum, 20);
+ memcpy(pSegIdDrvInfo->serial_number, g_strSEG_SerialNum, 20);
/* 0x2 : dual buffer */
pSegIdDrvInfo->buffer_type = 0x2;
/* buffer size : 2KB */
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;
@@ -1131,7 +1131,7 @@ static void mg_gen_ataid(mg_io_type_drv_info *pSegIdDrvInfo)
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);
+ 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;
/* 0x1C : ATA/ATAPI-6 T13 1532D revision1 */
@@ -1155,13 +1155,13 @@ static void mg_gen_ataid(mg_io_type_drv_info *pSegIdDrvInfo)
/* Advanced power management level 1 */
pSegIdDrvInfo->adv_pwr_mgm_lvl_val = 0x0;
pSegIdDrvInfo->reserved5 = 0x0;
- memset((void *)pSegIdDrvInfo->reserved6, 0x00, 68);
+ memset(pSegIdDrvInfo->reserved6, 0x00, 68);
/* Security mode feature is disabled */
pSegIdDrvInfo->security_stas = 0x0;
- memset((void *)pSegIdDrvInfo->vendor_uniq_bytes, 0x00, 62);
+ 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);
+ memset(pSegIdDrvInfo->reserved7, 0x00, 190);
}
static int mg_storage_config(void)