aboutsummaryrefslogtreecommitdiff
path: root/hw/nvram.h
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2009-10-01 16:12:16 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-01 16:12:16 -0500
commitc227f0995e1722a1abccc28cadf0664266bd8043 (patch)
tree39e92c2f818e3e8144978740b914731613af0e40 /hw/nvram.h
parent99a0949b720a0936da2052cb9a46db04ffc6db29 (diff)
downloadqemu-c227f0995e1722a1abccc28cadf0664266bd8043.zip
qemu-c227f0995e1722a1abccc28cadf0664266bd8043.tar.gz
qemu-c227f0995e1722a1abccc28cadf0664266bd8043.tar.bz2
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/nvram.h')
-rw-r--r--hw/nvram.h38
1 files changed, 19 insertions, 19 deletions
diff --git a/hw/nvram.h b/hw/nvram.h
index 180de88..c63fd5f 100644
--- a/hw/nvram.h
+++ b/hw/nvram.h
@@ -2,26 +2,26 @@
#define NVRAM_H
/* NVRAM helpers */
-typedef uint32_t (*a_nvram_read)(void *private, uint32_t addr);
-typedef void (*a_nvram_write)(void *private, uint32_t addr, uint32_t val);
-typedef struct nvram {
+typedef uint32_t (*nvram_read_t)(void *private, uint32_t addr);
+typedef void (*nvram_write_t)(void *private, uint32_t addr, uint32_t val);
+typedef struct nvram_t {
void *opaque;
- a_nvram_read read_fn;
- a_nvram_write write_fn;
-} a_nvram;
+ nvram_read_t read_fn;
+ nvram_write_t write_fn;
+} nvram_t;
-void NVRAM_set_byte (a_nvram *nvram, uint32_t addr, uint8_t value);
-uint8_t NVRAM_get_byte (a_nvram *nvram, uint32_t addr);
-void NVRAM_set_word (a_nvram *nvram, uint32_t addr, uint16_t value);
-uint16_t NVRAM_get_word (a_nvram *nvram, uint32_t addr);
-void NVRAM_set_lword (a_nvram *nvram, uint32_t addr, uint32_t value);
-uint32_t NVRAM_get_lword (a_nvram *nvram, uint32_t addr);
-void NVRAM_set_string (a_nvram *nvram, uint32_t addr,
+void NVRAM_set_byte (nvram_t *nvram, uint32_t addr, uint8_t value);
+uint8_t NVRAM_get_byte (nvram_t *nvram, uint32_t addr);
+void NVRAM_set_word (nvram_t *nvram, uint32_t addr, uint16_t value);
+uint16_t NVRAM_get_word (nvram_t *nvram, uint32_t addr);
+void NVRAM_set_lword (nvram_t *nvram, uint32_t addr, uint32_t value);
+uint32_t NVRAM_get_lword (nvram_t *nvram, uint32_t addr);
+void NVRAM_set_string (nvram_t *nvram, uint32_t addr,
const char *str, uint32_t max);
-int NVRAM_get_string (a_nvram *nvram, uint8_t *dst, uint16_t addr, int max);
-void NVRAM_set_crc (a_nvram *nvram, uint32_t addr,
+int NVRAM_get_string (nvram_t *nvram, uint8_t *dst, uint16_t addr, int max);
+void NVRAM_set_crc (nvram_t *nvram, uint32_t addr,
uint32_t start, uint32_t count);
-int PPC_NVRAM_set_params (a_nvram *nvram, uint16_t NVRAM_size,
+int PPC_NVRAM_set_params (nvram_t *nvram, uint16_t NVRAM_size,
const char *arch,
uint32_t RAM_size, int boot_device,
uint32_t kernel_image, uint32_t kernel_size,
@@ -29,13 +29,13 @@ int PPC_NVRAM_set_params (a_nvram *nvram, uint16_t NVRAM_size,
uint32_t initrd_image, uint32_t initrd_size,
uint32_t NVRAM_image,
int width, int height, int depth);
-typedef struct m48t59 a_m48t59;
+typedef struct m48t59_t m48t59_t;
void m48t59_write (void *private, uint32_t addr, uint32_t val);
uint32_t m48t59_read (void *private, uint32_t addr);
void m48t59_toggle_lock (void *private, int lock);
-a_m48t59 *m48t59_init_isa(uint32_t io_base, uint16_t size, int type);
-a_m48t59 *m48t59_init (qemu_irq IRQ, a_target_phys_addr mem_base,
+m48t59_t *m48t59_init_isa(uint32_t io_base, uint16_t size, int type);
+m48t59_t *m48t59_init (qemu_irq IRQ, target_phys_addr_t mem_base,
uint32_t io_base, uint16_t size,
int type);
void m48t59_set_addr (void *opaque, uint32_t addr);