| Message ID | 20180319213101.6100-3-wsa+renesas@sang-engineering.com |
|---|---|
| State | New |
| Headers | show |
| Series | nvram: at24c: fix problems related to "rom-size" | expand |
On 03/19/2018 10:31 PM, Wolfram Sang wrote: > 0 as "rom-size" will lead to an error message. Let's use the size of a > small 24c01 which has 128 byte. > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/nvram/eeprom_at24c.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/hw/nvram/eeprom_at24c.c b/hw/nvram/eeprom_at24c.c > index ccf78b25e4..ab1ef686e2 100644 > --- a/hw/nvram/eeprom_at24c.c > +++ b/hw/nvram/eeprom_at24c.c > @@ -28,6 +28,9 @@ > #define TYPE_AT24C_EE "at24c-eeprom" > #define AT24C_EE(obj) OBJECT_CHECK(EEPROMState, (obj), TYPE_AT24C_EE) > > +/* default is the size of a 24c01 EEPROM */ > +#define AT24C_ROMSIZE_DEFAULT 128 > + > typedef struct EEPROMState { > I2CSlave parent_obj; > > @@ -171,7 +174,7 @@ void at24c_eeprom_reset(DeviceState *state) > } > > static Property at24c_eeprom_props[] = { > - DEFINE_PROP_UINT32("rom-size", EEPROMState, rsize, 0), > + DEFINE_PROP_UINT32("rom-size", EEPROMState, rsize, AT24C_ROMSIZE_DEFAULT), > DEFINE_PROP_BOOL("writable", EEPROMState, writable, true), > DEFINE_PROP_DRIVE("drive", EEPROMState, blk), > DEFINE_PROP_END_OF_LIST() >
diff --git a/hw/nvram/eeprom_at24c.c b/hw/nvram/eeprom_at24c.c index ccf78b25e4..ab1ef686e2 100644 --- a/hw/nvram/eeprom_at24c.c +++ b/hw/nvram/eeprom_at24c.c @@ -28,6 +28,9 @@ #define TYPE_AT24C_EE "at24c-eeprom" #define AT24C_EE(obj) OBJECT_CHECK(EEPROMState, (obj), TYPE_AT24C_EE) +/* default is the size of a 24c01 EEPROM */ +#define AT24C_ROMSIZE_DEFAULT 128 + typedef struct EEPROMState { I2CSlave parent_obj; @@ -171,7 +174,7 @@ void at24c_eeprom_reset(DeviceState *state) } static Property at24c_eeprom_props[] = { - DEFINE_PROP_UINT32("rom-size", EEPROMState, rsize, 0), + DEFINE_PROP_UINT32("rom-size", EEPROMState, rsize, AT24C_ROMSIZE_DEFAULT), DEFINE_PROP_BOOL("writable", EEPROMState, writable, true), DEFINE_PROP_DRIVE("drive", EEPROMState, blk), DEFINE_PROP_END_OF_LIST()
0 as "rom-size" will lead to an error message. Let's use the size of a small 24c01 which has 128 byte. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- hw/nvram/eeprom_at24c.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)