From: Mitsyanko Igor Date: Mon, 13 Aug 2012 10:04:06 +0000 (+0100) Subject: hw/sd.c: make sd_wp_addr() accept 64 bit address argument X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=347cab1a762ff8542016f574c5eb32f0c4588ea2;p=qmiga%2Fqemu.git hw/sd.c: make sd_wp_addr() accept 64 bit address argument Currently sd_wp_addr() accepts 32 bit address arguments therefore implicitly restricting SD card address range. Change address argument type to uint64_t. Signed-off-by: Igor Mitsyanko Signed-off-by: Peter Maydell --- diff --git a/hw/sd.c b/hw/sd.c index 575b509bde..e24d04ae33 100644 --- a/hw/sd.c +++ b/hw/sd.c @@ -539,7 +539,7 @@ static void sd_function_switch(SDState *sd, uint32_t arg) sd->data[66] = crc & 0xff; } -static inline int sd_wp_addr(SDState *sd, uint32_t addr) +static inline int sd_wp_addr(SDState *sd, uint64_t addr) { return test_bit(addr >> (HWBLOCK_SHIFT + SECTOR_SHIFT + WPGROUP_SHIFT), sd->wp_groups);