ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/sd.c: introduce wrapper for conversion address to wp group 

Add wrapper function sd_addr_to_wpnum() to replace long address-->wg_group
conversion line.

Signed-off-by: Igor Mitsyanko <i.mitsyanko@samsung.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Mitsyanko Igor 2012-08-13 11:04:06 +01:00 committed by Peter Maydell
parent 347cab1a76
commit b7202b8870
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hw/sd.c
View File

@ -388,6 +388,11 @@ static void sd_response_r7_make(SDState *sd, uint8_t *response)
response[3] = (sd->vhs >> 0) & 0xff; response[3] = (sd->vhs >> 0) & 0xff;
} }
static inline uint64_t sd_addr_to_wpnum(uint64_t addr)
{
return addr >> (HWBLOCK_SHIFT + SECTOR_SHIFT + WPGROUP_SHIFT);
}
static void sd_reset(SDState *sd, BlockDriverState *bdrv) static void sd_reset(SDState *sd, BlockDriverState *bdrv)
{ {
uint64_t size; uint64_t size;
@ -400,7 +405,7 @@ static void sd_reset(SDState *sd, BlockDriverState *bdrv)
} }
size = sect << 9; size = sect << 9;
sect = (size >> (HWBLOCK_SHIFT + SECTOR_SHIFT + WPGROUP_SHIFT)) + 1; sect = sd_addr_to_wpnum(size) + 1;
sd->state = sd_idle_state; sd->state = sd_idle_state;
sd->rca = 0x0000; sd->rca = 0x0000;
@ -477,10 +482,8 @@ static void sd_erase(SDState *sd)
return; return;
} }
start = sd->erase_start >> start = sd_addr_to_wpnum(sd->erase_start);
(HWBLOCK_SHIFT + SECTOR_SHIFT + WPGROUP_SHIFT); end = sd_addr_to_wpnum(sd->erase_end);
end = sd->erase_end >>
(HWBLOCK_SHIFT + SECTOR_SHIFT + WPGROUP_SHIFT);
sd->erase_start = 0; sd->erase_start = 0;
sd->erase_end = 0; sd->erase_end = 0;
sd->csd[14] |= 0x40; sd->csd[14] |= 0x40;
@ -497,7 +500,7 @@ static uint32_t sd_wpbits(SDState *sd, uint64_t addr)
uint32_t i, wpnum; uint32_t i, wpnum;
uint32_t ret = 0; uint32_t ret = 0;
wpnum = addr >> (HWBLOCK_SHIFT + SECTOR_SHIFT + WPGROUP_SHIFT); wpnum = sd_addr_to_wpnum(addr);
for (i = 0; i < 32; i++, wpnum++, addr += WPGROUP_SIZE) { for (i = 0; i < 32; i++, wpnum++, addr += WPGROUP_SIZE) {
if (addr < sd->size && test_bit(wpnum, sd->wp_groups)) { if (addr < sd->size && test_bit(wpnum, sd->wp_groups)) {
@ -541,8 +544,7 @@ static void sd_function_switch(SDState *sd, uint32_t arg)
static inline int sd_wp_addr(SDState *sd, uint64_t addr) static inline int sd_wp_addr(SDState *sd, uint64_t addr)
{ {
return test_bit(addr >> (HWBLOCK_SHIFT + SECTOR_SHIFT + WPGROUP_SHIFT), return test_bit(sd_addr_to_wpnum(addr), sd->wp_groups);
sd->wp_groups);
} }
static void sd_lock_command(SDState *sd) static void sd_lock_command(SDState *sd)
@ -565,8 +567,7 @@ static void sd_lock_command(SDState *sd)
sd->card_status |= LOCK_UNLOCK_FAILED; sd->card_status |= LOCK_UNLOCK_FAILED;
return; return;
} }
bitmap_zero(sd->wp_groups, bitmap_zero(sd->wp_groups, sd_addr_to_wpnum(sd->size) + 1);
(sd->size >> (HWBLOCK_SHIFT + SECTOR_SHIFT + WPGROUP_SHIFT)) + 1);
sd->csd[14] &= ~0x10; sd->csd[14] &= ~0x10;
sd->card_status &= ~CARD_IS_LOCKED; sd->card_status &= ~CARD_IS_LOCKED;
sd->pwd_len = 0; sd->pwd_len = 0;
@ -1012,8 +1013,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,
} }
sd->state = sd_programming_state; sd->state = sd_programming_state;
set_bit(addr >> (HWBLOCK_SHIFT + SECTOR_SHIFT + WPGROUP_SHIFT), set_bit(sd_addr_to_wpnum(addr), sd->wp_groups);
sd->wp_groups);
/* Bzzzzzzztt .... Operation complete. */ /* Bzzzzzzztt .... Operation complete. */
sd->state = sd_transfer_state; sd->state = sd_transfer_state;
return sd_r1b; return sd_r1b;
@ -1032,8 +1032,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,
} }
sd->state = sd_programming_state; sd->state = sd_programming_state;
clear_bit(addr >> (HWBLOCK_SHIFT + SECTOR_SHIFT + WPGROUP_SHIFT), clear_bit(sd_addr_to_wpnum(addr), sd->wp_groups);
sd->wp_groups);
/* Bzzzzzzztt .... Operation complete. */ /* Bzzzzzzztt .... Operation complete. */
sd->state = sd_transfer_state; sd->state = sd_transfer_state;
return sd_r1b; return sd_r1b;