SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use i2c_slave_init() to allocate the PXA (dummy) I2C slave.

Browse Source 
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
This commit is contained in:
balrog 2007-05-23 22:21:27 +00:00
parent 7ec47eadc7
commit 3f6c925f37
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/pc.c
View File

@ -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;

2
hw/pxa2xx.c
View File

@ -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;