From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nvy12-0008Sy-N6 for qemu-devel@nongnu.org; Sun, 28 Mar 2010 15:19:20 -0400 Received: from [140.186.70.92] (port=41881 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nvy11-0008Rz-7a for qemu-devel@nongnu.org; Sun, 28 Mar 2010 15:19:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nvy0z-0001W0-9U for qemu-devel@nongnu.org; Sun, 28 Mar 2010 15:19:19 -0400 Received: from mail-bw0-f218.google.com ([209.85.218.218]:38962) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nvy0y-0001Vu-Ve for qemu-devel@nongnu.org; Sun, 28 Mar 2010 15:19:17 -0400 Received: by bwz10 with SMTP id 10so13032609bwz.2 for ; Sun, 28 Mar 2010 12:19:15 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <5b3d6ea78f9cb0e95ef84d3b830d6f144bb795a1.1269617186.git.riku.voipio@nokia.com> References: <5b3d6ea78f9cb0e95ef84d3b830d6f144bb795a1.1269617186.git.riku.voipio@nokia.com> Date: Sun, 28 Mar 2010 21:19:14 +0200 Message-ID: <5b31733c1003281219x29e942a7l8bb9f252c160c8b3@mail.gmail.com> Subject: Re: [Qemu-devel] [PATCH 23/48] multi-mmc support in init call From: Filip Navara Content-Type: multipart/alternative; boundary=0016e6d778fdac41450482e145a5 List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Riku Voipio Cc: Riku Voipio , =?ISO-8859-1?Q?Juha_Riihim=E4ki?= , qemu-devel@nongnu.org --0016e6d778fdac41450482e145a5 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable I see neither the change to sd_init implementation nor the implementation of sd_is_mmc. Best regards, Filip Navara On Fri, Mar 26, 2010 at 5:06 PM, Riku Voipio wrote: > From: Juha Riihim=E4ki > > change sd_init convention to allow multiple entries > > Signed-Off-By: Riku Voipio > Signed-Off-By: Juha Riihim=E4ki > > --- > hw/omap_mmc.c | 4 ++-- > hw/pl181.c | 2 +- > hw/pxa2xx_mmci.c | 2 +- > hw/sd.h | 4 +++- > hw/ssi-sd.c | 2 +- > 5 files changed, 8 insertions(+), 6 deletions(-) > > diff --git a/hw/omap_mmc.c b/hw/omap_mmc.c > index 15cbf06..7c94d91 100644 > --- a/hw/omap_mmc.c > +++ b/hw/omap_mmc.c > @@ -590,7 +590,7 @@ struct omap_mmc_s *omap_mmc_init(target_phys_addr_t > base, > cpu_register_physical_memory(base, 0x800, iomemtype); > > /* Instantiate the storage */ > - s->card =3D sd_init(bd, 0); > + s->card =3D sd_init(bd, 0, 0); > > return s; > } > @@ -616,7 +616,7 @@ struct omap_mmc_s *omap2_mmc_init(struct > omap_target_agent_s *ta, > omap_l4_attach(ta, 0, iomemtype); > > /* Instantiate the storage */ > - s->card =3D sd_init(bd, 0); > + s->card =3D sd_init(bd, 0, 0); > > s->cdet =3D qemu_allocate_irqs(omap_mmc_cover_cb, s, 1)[0]; > sd_set_cb(s->card, NULL, s->cdet); > diff --git a/hw/pl181.c b/hw/pl181.c > index 1924053..fd5ee81 100644 > --- a/hw/pl181.c > +++ b/hw/pl181.c > @@ -458,7 +458,7 @@ static int pl181_init(SysBusDevice *dev) > sysbus_init_irq(dev, &s->irq[0]); > sysbus_init_irq(dev, &s->irq[1]); > bd =3D qdev_init_bdrv(&dev->qdev, IF_SD); > - s->card =3D sd_init(bd, 0); > + s->card =3D sd_init(bd, 0, 0); > qemu_register_reset(pl181_reset, s); > pl181_reset(s); > /* ??? Save/restore. */ > diff --git a/hw/pxa2xx_mmci.c b/hw/pxa2xx_mmci.c > index a415349..01e7f1e 100644 > --- a/hw/pxa2xx_mmci.c > +++ b/hw/pxa2xx_mmci.c > @@ -532,7 +532,7 @@ PXA2xxMMCIState *pxa2xx_mmci_init(target_phys_addr_t > base, > cpu_register_physical_memory(base, 0x00100000, iomemtype); > > /* Instantiate the actual storage */ > - s->card =3D sd_init(bd, 0); > + s->card =3D sd_init(bd, 0, 0); > > register_savevm("pxa2xx_mmci", 0, 0, > pxa2xx_mmci_save, pxa2xx_mmci_load, s); > diff --git a/hw/sd.h b/hw/sd.h > index ac4b7c4..96450f2 100644 > --- a/hw/sd.h > +++ b/hw/sd.h > @@ -67,7 +67,8 @@ typedef struct { > > typedef struct SDState SDState; > > -SDState *sd_init(BlockDriverState *bs, int is_spi); > +SDState *sd_init(BlockDriverState *bs, int is_spi, int is_mmc); > +void sd_reset(SDState *sd); > int sd_do_command(SDState *sd, SDRequest *req, > uint8_t *response); > void sd_write_data(SDState *sd, uint8_t value); > @@ -75,5 +76,6 @@ uint8_t sd_read_data(SDState *sd); > void sd_set_cb(SDState *sd, qemu_irq readonly, qemu_irq insert); > int sd_data_ready(SDState *sd); > void sd_enable(SDState *sd, int enable); > +int sd_is_mmc(SDState *sd); > > #endif /* __hw_sd_h */ > diff --git a/hw/ssi-sd.c b/hw/ssi-sd.c > index 5e74e5d..a5d350d 100644 > --- a/hw/ssi-sd.c > +++ b/hw/ssi-sd.c > @@ -236,7 +236,7 @@ static int ssi_sd_init(SSISlave *dev) > > s->mode =3D SSI_SD_CMD; > bs =3D qdev_init_bdrv(&dev->qdev, IF_SD); > - s->sd =3D sd_init(bs, 1); > + s->sd =3D sd_init(bs, 1, 0); > register_savevm("ssi_sd", -1, 1, ssi_sd_save, ssi_sd_load, s); > return 0; > } > -- > 1.6.5 > > > > --0016e6d778fdac41450482e145a5 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable I see neither the change to=A0= sd_init implementation nor the implementation of=A0sd_is_mmc.
Best regards,
Filip Navara

On Fri, Mar 26, 2010 at 5:06 PM, Riku Voipio <riku.voipio@iki.fi> wrote:
=
From: Juha Riihim=E4ki <juha= .riihimaki@nokia.com>

change sd_init convention to allow multiple entries

Signed-Off-By: Riku Voipio <rik= u.voipio@nokia.com>
Signed-Off-By: Juha Riihim=E4ki <juha.riihimaki@nokia.com>

---
=A0hw/omap_mmc.c =A0 =A0| =A0 =A04 ++--
=A0hw/pl181.c =A0 =A0 =A0 | =A0 =A02 +-
=A0hw/pxa2xx_mmci.c | =A0 =A02 +-
=A0hw/sd.h =A0 =A0 =A0 =A0 =A0| =A0 =A04 +++-
=A0hw/ssi-sd.c =A0 =A0 =A0| =A0 =A02 +-
=A05 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/hw/omap_mmc.c b/hw/omap_mmc.c
index 15cbf06..7c94d91 100644
--- a/hw/omap_mmc.c
+++ b/hw/omap_mmc.c
@@ -590,7 +590,7 @@ struct omap_mmc_s *omap_mmc_init(target_phys_addr_t bas= e,
=A0 =A0 cpu_register_physical_memory(base, 0x800, iomemtype);

=A0 =A0 /* Instantiate the storage */
- =A0 =A0s->card =3D sd_init(bd, 0);
+ =A0 =A0s->card =3D sd_init(bd, 0, 0);

=A0 =A0 return s;
=A0}
@@ -616,7 +616,7 @@ struct omap_mmc_s *omap2_mmc_init(struct omap_target_ag= ent_s *ta,
=A0 =A0 omap_l4_attach(ta, 0, iomemtype);

=A0 =A0 /* Instantiate the storage */
- =A0 =A0s->card =3D sd_init(bd, 0);
+ =A0 =A0s->card =3D sd_init(bd, 0, 0);

=A0 =A0 s->cdet =3D qemu_allocate_irqs(omap_mmc_cover_cb, s, 1)[0];
=A0 =A0 sd_set_cb(s->card, NULL, s->cdet);
diff --git a/hw/pl181.c b/hw/pl181.c
index 1924053..fd5ee81 100644
--- a/hw/pl181.c
+++ b/hw/pl181.c
@@ -458,7 +458,7 @@ static int pl181_init(SysBusDevice *dev)
=A0 =A0 sysbus_init_irq(dev, &s->irq[0]);
=A0 =A0 sysbus_init_irq(dev, &s->irq[1]);
=A0 =A0 bd =3D qdev_init_bdrv(&dev->qdev, IF_SD);
- =A0 =A0s->card =3D sd_init(bd, 0);
+ =A0 =A0s->card =3D sd_init(bd, 0, 0);
=A0 =A0 qemu_register_reset(pl181_reset, s);
=A0 =A0 pl181_reset(s);
=A0 =A0 /* ??? Save/restore. =A0*/
diff --git a/hw/pxa2xx_mmci.c b/hw/pxa2xx_mmci.c
index a415349..01e7f1e 100644
--- a/hw/pxa2xx_mmci.c
+++ b/hw/pxa2xx_mmci.c
@@ -532,7 +532,7 @@ PXA2xxMMCIState *pxa2xx_mmci_init(target_phys_addr_t ba= se,
=A0 =A0 cpu_register_physical_memory(base, 0x00100000, iomemtype);

=A0 =A0 /* Instantiate the actual storage */
- =A0 =A0s->card =3D sd_init(bd, 0);
+ =A0 =A0s->card =3D sd_init(bd, 0, 0);

=A0 =A0 register_savevm("pxa2xx_mmci", 0, 0,
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pxa2xx_mmci_save, pxa2xx_mmci_load= , s);
diff --git a/hw/sd.h b/hw/sd.h
index ac4b7c4..96450f2 100644
--- a/hw/sd.h
+++ b/hw/sd.h
@@ -67,7 +67,8 @@ typedef struct {

=A0typedef struct SDState SDState;

-SDState *sd_init(BlockDriverState *bs, int is_spi);
+SDState *sd_init(BlockDriverState *bs, int is_spi, int is_mmc);
+void sd_reset(SDState *sd);
=A0int sd_do_command(SDState *sd, SDRequest *req,
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 uint8_t *response);
=A0void sd_write_data(SDState *sd, uint8_t value);
@@ -75,5 +76,6 @@ uint8_t sd_read_data(SDState *sd);
=A0void sd_set_cb(SDState *sd, qemu_irq readonly, qemu_irq insert);
=A0int sd_data_ready(SDState *sd);
=A0void sd_enable(SDState *sd, int enable);
+int sd_is_mmc(SDState *sd);

=A0#endif /* __hw_sd_h */
diff --git a/hw/ssi-sd.c b/hw/ssi-sd.c
index 5e74e5d..a5d350d 100644
--- a/hw/ssi-sd.c
+++ b/hw/ssi-sd.c
@@ -236,7 +236,7 @@ static int ssi_sd_init(SSISlave *dev)

=A0 =A0 s->mode =3D SSI_SD_CMD;
=A0 =A0 bs =3D qdev_init_bdrv(&dev->qdev, IF_SD);
- =A0 =A0s->sd =3D sd_init(bs, 1);
+ =A0 =A0s->sd =3D sd_init(bs, 1, 0);
=A0 =A0 register_savevm("ssi_sd", -1, 1, ssi_sd_save, ssi_sd_loa= d, s);
=A0 =A0 return 0;
=A0}
--
1.6.5




--0016e6d778fdac41450482e145a5--