diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-01 16:12:16 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-01 16:12:16 -0500 |
commit | c227f0995e1722a1abccc28cadf0664266bd8043 (patch) | |
tree | 39e92c2f818e3e8144978740b914731613af0e40 /hw/eeprom93xx.c | |
parent | 99a0949b720a0936da2052cb9a46db04ffc6db29 (diff) |
Revert "Get rid of _t suffix"
In the very least, a change like this requires discussion on the list.
The naming convention is goofy and it causes a massive merge problem. Something
like this _must_ be presented on the list first so people can provide input
and cope with it.
This reverts commit 99a0949b720a0936da2052cb9a46db04ffc6db29.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/eeprom93xx.c')
-rw-r--r-- | hw/eeprom93xx.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/hw/eeprom93xx.c b/hw/eeprom93xx.c index f3ac81611f..66dfc43d50 100644 --- a/hw/eeprom93xx.c +++ b/hw/eeprom93xx.c @@ -71,7 +71,7 @@ static const char *opstring[] = { }; #endif -struct eeprom { +struct _eeprom_t { uint8_t tick; uint8_t address; uint8_t command; @@ -93,7 +93,7 @@ static void eeprom_save(QEMUFile *f, void *opaque) { /* Save EEPROM data. */ unsigned address; - a_eeprom *eeprom = (a_eeprom *)opaque; + eeprom_t *eeprom = (eeprom_t *)opaque; qemu_put_byte(f, eeprom->tick); qemu_put_byte(f, eeprom->address); @@ -116,7 +116,7 @@ static int eeprom_load(QEMUFile *f, void *opaque, int version_id) { /* Load EEPROM data from saved data if version and EEPROM size of data and current EEPROM are identical. */ - a_eeprom *eeprom = (a_eeprom *)opaque; + eeprom_t *eeprom = (eeprom_t *)opaque; int result = -EINVAL; if (version_id >= OLD_EEPROM_VERSION) { unsigned address; @@ -150,7 +150,7 @@ static int eeprom_load(QEMUFile *f, void *opaque, int version_id) return result; } -void eeprom93xx_write(a_eeprom *eeprom, int eecs, int eesk, int eedi) +void eeprom93xx_write(eeprom_t *eeprom, int eecs, int eesk, int eedi) { uint8_t tick = eeprom->tick; uint8_t eedo = eeprom->eedo; @@ -275,7 +275,7 @@ void eeprom93xx_write(a_eeprom *eeprom, int eecs, int eesk, int eedi) eeprom->command = command; } -uint16_t eeprom93xx_read(a_eeprom *eeprom) +uint16_t eeprom93xx_read(eeprom_t *eeprom) { /* Return status of pin DO (0 or 1). */ logout("CS=%u DO=%u\n", eeprom->eecs, eeprom->eedo); @@ -292,10 +292,10 @@ void eeprom93xx_reset(eeprom_t *eeprom) } #endif -a_eeprom *eeprom93xx_new(uint16_t nwords) +eeprom_t *eeprom93xx_new(uint16_t nwords) { /* Add a new EEPROM (with 16, 64 or 256 words). */ - a_eeprom *eeprom; + eeprom_t *eeprom; uint8_t addrbits; switch (nwords) { @@ -313,7 +313,7 @@ a_eeprom *eeprom93xx_new(uint16_t nwords) addrbits = 6; } - eeprom = (a_eeprom *)qemu_mallocz(sizeof(*eeprom) + nwords * 2); + eeprom = (eeprom_t *)qemu_mallocz(sizeof(*eeprom) + nwords * 2); eeprom->size = nwords; eeprom->addrbits = addrbits; /* Output DO is tristate, read results in 1. */ @@ -324,7 +324,7 @@ a_eeprom *eeprom93xx_new(uint16_t nwords) return eeprom; } -void eeprom93xx_free(a_eeprom *eeprom) +void eeprom93xx_free(eeprom_t *eeprom) { /* Destroy EEPROM. */ logout("eeprom = 0x%p\n", eeprom); @@ -332,7 +332,7 @@ void eeprom93xx_free(a_eeprom *eeprom) qemu_free(eeprom); } -uint16_t *eeprom93xx_data(a_eeprom *eeprom) +uint16_t *eeprom93xx_data(eeprom_t *eeprom) { /* Get EEPROM data array. */ return &eeprom->contents[0]; |