diff options
author | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-05-23 22:21:27 +0000 |
---|---|---|
committer | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-05-23 22:21:27 +0000 |
commit | 3f6c925f37cd8a1dddb8a8fbbcef4630ea347775 (patch) | |
tree | 912ad812f2e0e4f6740ac47cce9f243011470e83 /hw | |
parent | 7ec47eadc7048435b54bc53ccb41307851098409 (diff) | |
download | hqemu-3f6c925f37cd8a1dddb8a8fbbcef4630ea347775.zip hqemu-3f6c925f37cd8a1dddb8a8fbbcef4630ea347775.tar.gz |
Use i2c_slave_init() to allocate the PXA (dummy) I2C slave.
Hush the warning:
hw/pc.c:402: warning: control reaches end of non-void function
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2856 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
-rw-r--r-- | hw/pc.c | 2 | ||||
-rw-r--r-- | hw/pxa2xx.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -347,7 +347,7 @@ void bochs_bios_init(void) /* Generate an initial boot sector which sets state and jump to a specified vector */ -static int generate_bootsect(uint32_t gpr[8], uint16_t segs[6], uint16_t ip) +static void generate_bootsect(uint32_t gpr[8], uint16_t segs[6], uint16_t ip) { uint8_t bootsect[512], *p; int i; diff --git a/hw/pxa2xx.c b/hw/pxa2xx.c index 913c0bd..03f4b47 100644 --- a/hw/pxa2xx.c +++ b/hw/pxa2xx.c @@ -1294,7 +1294,7 @@ struct pxa2xx_i2c_s *pxa2xx_i2c_init(target_phys_addr_t base, { int iomemtype; struct pxa2xx_i2c_s *s = (struct pxa2xx_i2c_s *) - qemu_mallocz(sizeof(struct pxa2xx_i2c_s)); + i2c_slave_init(i2c_init_bus(), 0, sizeof(struct pxa2xx_i2c_s)); s->base = base; s->irq = irq; |