sd: pass bool parameter for sd_init
Signed-off-by: liguang <lig.fnst@cn.fujitsu.com> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
This commit is contained in:
parent
e990a39328
commit
6790f59da3
@ -250,7 +250,7 @@ static int milkymist_memcard_init(SysBusDevice *dev)
|
||||
DriveInfo *dinfo;
|
||||
|
||||
dinfo = drive_get_next(IF_SD);
|
||||
s->card = sd_init(dinfo ? dinfo->bdrv : NULL, 0);
|
||||
s->card = sd_init(dinfo ? dinfo->bdrv : NULL, false);
|
||||
s->enabled = dinfo ? bdrv_is_inserted(dinfo->bdrv) : 0;
|
||||
|
||||
memory_region_init_io(&s->regs_region, &memcard_mmio_ops, s,
|
||||
|
@ -592,7 +592,7 @@ struct omap_mmc_s *omap_mmc_init(hwaddr base,
|
||||
memory_region_add_subregion(sysmem, base, &s->iomem);
|
||||
|
||||
/* Instantiate the storage */
|
||||
s->card = sd_init(bd, 0);
|
||||
s->card = sd_init(bd, false);
|
||||
|
||||
return s;
|
||||
}
|
||||
@ -617,7 +617,7 @@ struct omap_mmc_s *omap2_mmc_init(struct omap_target_agent_s *ta,
|
||||
omap_l4_attach(ta, 0, &s->iomem);
|
||||
|
||||
/* Instantiate the storage */
|
||||
s->card = sd_init(bd, 0);
|
||||
s->card = sd_init(bd, false);
|
||||
|
||||
s->cdet = qemu_allocate_irqs(omap_mmc_cover_cb, s, 1)[0];
|
||||
sd_set_cb(s->card, NULL, s->cdet);
|
||||
|
@ -485,7 +485,7 @@ static int pl181_init(SysBusDevice *dev)
|
||||
sysbus_init_irq(dev, &s->irq[1]);
|
||||
qdev_init_gpio_out(&s->busdev.qdev, s->cardstatus, 2);
|
||||
dinfo = drive_get_next(IF_SD);
|
||||
s->card = sd_init(dinfo ? dinfo->bdrv : NULL, 0);
|
||||
s->card = sd_init(dinfo ? dinfo->bdrv : NULL, false);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -538,7 +538,7 @@ PXA2xxMMCIState *pxa2xx_mmci_init(MemoryRegion *sysmem,
|
||||
memory_region_add_subregion(sysmem, base, &s->iomem);
|
||||
|
||||
/* Instantiate the actual storage */
|
||||
s->card = sd_init(bd, 0);
|
||||
s->card = sd_init(bd, false);
|
||||
|
||||
register_savevm(NULL, "pxa2xx_mmci", 0, 0,
|
||||
pxa2xx_mmci_save, pxa2xx_mmci_load, s);
|
||||
|
@ -1165,7 +1165,7 @@ static void sdhci_initfn(Object *obj)
|
||||
DriveInfo *di;
|
||||
|
||||
di = drive_get_next(IF_SD);
|
||||
s->card = sd_init(di ? di->bdrv : NULL, 0);
|
||||
s->card = sd_init(di ? di->bdrv : NULL, false);
|
||||
s->eject_cb = qemu_allocate_irqs(sdhci_insert_eject_cb, s, 1)[0];
|
||||
s->ro_cb = qemu_allocate_irqs(sdhci_card_readonly_cb, s, 1)[0];
|
||||
sd_set_cb(s->card, s->ro_cb, s->eject_cb);
|
||||
|
@ -245,7 +245,7 @@ static int ssi_sd_init(SSISlave *dev)
|
||||
|
||||
s->mode = SSI_SD_CMD;
|
||||
dinfo = drive_get_next(IF_SD);
|
||||
s->sd = sd_init(dinfo ? dinfo->bdrv : NULL, 1);
|
||||
s->sd = sd_init(dinfo ? dinfo->bdrv : NULL, true);
|
||||
register_savevm(&dev->qdev, "ssi_sd", -1, 1, ssi_sd_save, ssi_sd_load, s);
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user