[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 09/12] i2c: Add normal type name and cast to smbu
From: |
minyard |
Subject: |
[Qemu-devel] [PATCH v2 09/12] i2c: Add normal type name and cast to smbus_eeprom.c |
Date: |
Thu, 15 Nov 2018 13:24:43 -0600 |
From: Corey Minyard <address@hidden>
Create a type name and a cast macro and use those through the
code.
Signed-off-by: Corey Minyard <address@hidden>
---
hw/i2c/smbus_eeprom.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/hw/i2c/smbus_eeprom.c b/hw/i2c/smbus_eeprom.c
index 4d25222e23..8d4eed129f 100644
--- a/hw/i2c/smbus_eeprom.c
+++ b/hw/i2c/smbus_eeprom.c
@@ -30,6 +30,11 @@
//#define DEBUG
+#define TYPE_SMBUS_EEPROM "smbus-eeprom"
+
+#define SMBUS_EEPROM(obj) \
+ OBJECT_CHECK(SMBusEEPROMDevice, (obj), TYPE_SMBUS_EEPROM)
+
typedef struct SMBusEEPROMDevice {
SMBusDevice smbusdev;
void *data;
@@ -38,7 +43,7 @@ typedef struct SMBusEEPROMDevice {
static uint8_t eeprom_receive_byte(SMBusDevice *dev)
{
- SMBusEEPROMDevice *eeprom = (SMBusEEPROMDevice *) dev;
+ SMBusEEPROMDevice *eeprom = SMBUS_EEPROM(dev);
uint8_t *data = eeprom->data;
uint8_t val = data[eeprom->offset++];
@@ -51,7 +56,7 @@ static uint8_t eeprom_receive_byte(SMBusDevice *dev)
static int eeprom_write_data(SMBusDevice *dev, uint8_t *buf, uint8_t len)
{
- SMBusEEPROMDevice *eeprom = (SMBusEEPROMDevice *) dev;
+ SMBusEEPROMDevice *eeprom = SMBUS_EEPROM(dev);
uint8_t *data = eeprom->data;
#ifdef DEBUG
@@ -73,7 +78,7 @@ static int eeprom_write_data(SMBusDevice *dev, uint8_t *buf,
uint8_t len)
static void smbus_eeprom_realize(DeviceState *dev, Error **errp)
{
- SMBusEEPROMDevice *eeprom = (SMBusEEPROMDevice *)dev;
+ SMBusEEPROMDevice *eeprom = SMBUS_EEPROM(dev);
eeprom->offset = 0;
}
@@ -97,7 +102,7 @@ static void smbus_eeprom_class_initfn(ObjectClass *klass,
void *data)
}
static const TypeInfo smbus_eeprom_info = {
- .name = "smbus-eeprom",
+ .name = TYPE_SMBUS_EEPROM,
.parent = TYPE_SMBUS_DEVICE,
.instance_size = sizeof(SMBusEEPROMDevice),
.class_init = smbus_eeprom_class_initfn,
@@ -114,7 +119,7 @@ void smbus_eeprom_init_one(I2CBus *smbus, uint8_t address,
uint8_t *eeprom_buf)
{
DeviceState *dev;
- dev = qdev_create((BusState *) smbus, "smbus-eeprom");
+ dev = qdev_create((BusState *) smbus, TYPE_SMBUS_EEPROM);
qdev_prop_set_uint8(dev, "address", address);
qdev_prop_set_ptr(dev, "data", eeprom_buf);
qdev_init_nofail(dev);
--
2.17.1
- [Qemu-devel] [PATCH v2 02/12] i2c: have I2C receive operation return uint8_t, (continued)
- [Qemu-devel] [PATCH v2 02/12] i2c: have I2C receive operation return uint8_t, minyard, 2018/11/15
- [Qemu-devel] [PATCH v2 05/12] i2c: Fix pm_smbus handling of I2C block read, minyard, 2018/11/15
- [Qemu-devel] [PATCH v2 08/12] i2c: Add an SMBus vmstate structure, minyard, 2018/11/15
- [Qemu-devel] [PATCH v2 07/12] i2c:pm_smbus: Fix state transfer, minyard, 2018/11/15
- [Qemu-devel] [PATCH v2 06/12] boards.h: Ignore migration for SMBus devices on older machines, minyard, 2018/11/15
- [Qemu-devel] [PATCH v2 10/12] i2c: Add a size constant for the smbus_eeprom size, minyard, 2018/11/15
- [Qemu-devel] [PATCH v2 09/12] i2c: Add normal type name and cast to smbus_eeprom.c,
minyard <=
- [Qemu-devel] [PATCH v2 11/12] i2c: Add vmstate handling to the smbus eeprom, minyard, 2018/11/15
- [Qemu-devel] [PATCH v2 12/12] i2c: Add a reset function to smbus_eeprom, minyard, 2018/11/15
- Re: [Qemu-devel] [PATCH v2 00/12] RFC: Fix/add vmstate handling in some I2C code, Philippe Mathieu-Daudé, 2018/11/15