david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename pflash_t member width to bank_width

Browse Source 
Rename the 'width' member of the pflash_t structure
in preparation for adding a bank_width member.

Signed-off-by: Roy Franz <roy.franz@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1386279359-32286-2-git-send-email-roy.franz@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Roy Franz 2013-12-17 19:42:26 +00:00 committed by Peter Maydell
parent 9d935509fd
commit 4b6fedcac0
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/block/pflash_cfi01.c
View File

@ -71,7 +71,7 @@ struct pflash_t {
BlockDriverState *bs; BlockDriverState *bs;
uint32_t nb_blocs; uint32_t nb_blocs;
uint64_t sector_len; uint64_t sector_len;
uint8_t width; uint8_t bank_width;
uint8_t be; uint8_t be;
uint8_t wcycle; /* if 0, the flash is read normally */ uint8_t wcycle; /* if 0, the flash is read normally */
int ro; int ro;
@ -126,10 +126,11 @@ static uint32_t pflash_read (pflash_t *pfl, hwaddr offset,
ret = -1; ret = -1;
boff = offset & 0xFF; /* why this here ?? */ boff = offset & 0xFF; /* why this here ?? */
if (pfl->width == 2) if (pfl->bank_width == 2) {
boff = boff >> 1; boff = boff >> 1;
else if (pfl->width == 4) } else if (pfl->bank_width == 4) {
boff = boff >> 2; boff = boff >> 2;
}
#if 0 #if 0
DPRINTF("%s: reading offset " TARGET_FMT_plx " under cmd %02x width %d\n", DPRINTF("%s: reading offset " TARGET_FMT_plx " under cmd %02x width %d\n",
@ -665,7 +666,7 @@ static void pflash_cfi01_realize(DeviceState *dev, Error **errp)
pfl->cfi_table[0x28] = 0x02; pfl->cfi_table[0x28] = 0x02;
pfl->cfi_table[0x29] = 0x00; pfl->cfi_table[0x29] = 0x00;
/* Max number of bytes in multi-bytes write */ /* Max number of bytes in multi-bytes write */
if (pfl->width == 1) { if (pfl->bank_width == 1) {
pfl->cfi_table[0x2A] = 0x08; pfl->cfi_table[0x2A] = 0x08;
} else { } else {
pfl->cfi_table[0x2A] = 0x0B; pfl->cfi_table[0x2A] = 0x0B;
@ -706,7 +707,7 @@ static Property pflash_cfi01_properties[] = {
DEFINE_PROP_DRIVE("drive", struct pflash_t, bs), DEFINE_PROP_DRIVE("drive", struct pflash_t, bs),
DEFINE_PROP_UINT32("num-blocks", struct pflash_t, nb_blocs, 0), DEFINE_PROP_UINT32("num-blocks", struct pflash_t, nb_blocs, 0),
DEFINE_PROP_UINT64("sector-length", struct pflash_t, sector_len, 0), DEFINE_PROP_UINT64("sector-length", struct pflash_t, sector_len, 0),
DEFINE_PROP_UINT8("width", struct pflash_t, width, 0), DEFINE_PROP_UINT8("width", struct pflash_t, bank_width, 0),
DEFINE_PROP_UINT8("big-endian", struct pflash_t, be, 0), DEFINE_PROP_UINT8("big-endian", struct pflash_t, be, 0),
DEFINE_PROP_UINT16("id0", struct pflash_t, ident0, 0), DEFINE_PROP_UINT16("id0", struct pflash_t, ident0, 0),
DEFINE_PROP_UINT16("id1", struct pflash_t, ident1, 0), DEFINE_PROP_UINT16("id1", struct pflash_t, ident1, 0),
@ -745,8 +746,8 @@ pflash_t *pflash_cfi01_register(hwaddr base,
DeviceState *qdev, const char *name, DeviceState *qdev, const char *name,
hwaddr size, hwaddr size,
BlockDriverState *bs, BlockDriverState *bs,
uint32_t sector_len, int nb_blocs, int width, uint32_t sector_len, int nb_blocs,
uint16_t id0, uint16_t id1, int bank_width, uint16_t id0, uint16_t id1,
uint16_t id2, uint16_t id3, int be) uint16_t id2, uint16_t id3, int be)
{ {
DeviceState *dev = qdev_create(NULL, TYPE_CFI_PFLASH01); DeviceState *dev = qdev_create(NULL, TYPE_CFI_PFLASH01);
@ -756,7 +757,7 @@ pflash_t *pflash_cfi01_register(hwaddr base,
} }
qdev_prop_set_uint32(dev, "num-blocks", nb_blocs); qdev_prop_set_uint32(dev, "num-blocks", nb_blocs);
qdev_prop_set_uint64(dev, "sector-length", sector_len); qdev_prop_set_uint64(dev, "sector-length", sector_len);
qdev_prop_set_uint8(dev, "width", width); qdev_prop_set_uint8(dev, "width", bank_width);
qdev_prop_set_uint8(dev, "big-endian", !!be); qdev_prop_set_uint8(dev, "big-endian", !!be);
qdev_prop_set_uint16(dev, "id0", id0); qdev_prop_set_uint16(dev, "id0", id0);
qdev_prop_set_uint16(dev, "id1", id1); qdev_prop_set_uint16(dev, "id1", id1);