提交 3f6c925f 编写于 作者: B balrog

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
上级 7ec47ead
...@@ -347,7 +347,7 @@ void bochs_bios_init(void) ...@@ -347,7 +347,7 @@ void bochs_bios_init(void)
/* Generate an initial boot sector which sets state and jump to /* Generate an initial boot sector which sets state and jump to
a specified vector */ 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; uint8_t bootsect[512], *p;
int i; int i;
......
...@@ -1294,7 +1294,7 @@ struct pxa2xx_i2c_s *pxa2xx_i2c_init(target_phys_addr_t base, ...@@ -1294,7 +1294,7 @@ struct pxa2xx_i2c_s *pxa2xx_i2c_init(target_phys_addr_t base,
{ {
int iomemtype; int iomemtype;
struct pxa2xx_i2c_s *s = (struct pxa2xx_i2c_s *) 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->base = base;
s->irq = irq; s->irq = irq;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册