diff mbox

[V6,1/2] sd.h: Move sd.h to include/hw/sd/

Message ID 1442993557-32277-2-git-send-email-saipava@xilinx.com
State New
Headers show

Commit Message

Sai Pavan Boddu Sept. 23, 2015, 7:32 a.m. UTC 
Create a sd directory under include/hw/ and move sd.h to same.

Signed-off-by: Sai Pavan Boddu <saipava@xilinx.com>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
---
Changes for V6:
    Fix commit message.
Changes for V5:
    None
Changes for V4:
    Fix commit message.
Changes for V3:
    None.
---
 hw/sd/milkymist-memcard.c | 2 +-
 hw/sd/omap_mmc.c          | 2 +-
 hw/sd/pl181.c             | 2 +-
 hw/sd/pxa2xx_mmci.c       | 2 +-
 hw/sd/sd.c                | 2 +-
 hw/sd/sdhci.h             | 2 +-
 hw/sd/ssi-sd.c            | 2 +-
 include/hw/{ => sd}/sd.h  | 0
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename include/hw/{ => sd}/sd.h (100%)

Comments

Peter Crosthwaite Sept. 25, 2015, 3:32 a.m. UTC | #1 
On Wed, Sep 23, 2015 at 12:32 AM, Sai Pavan Boddu
<sai.pavan.boddu@xilinx.com> wrote:
> Create a sd directory under include/hw/ and move sd.h to same.
>
> Signed-off-by: Sai Pavan Boddu <saipava@xilinx.com>
> Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>

This probably needs more work for what the public API should be, but a
step in the right direction for SoCification (and QoMification).

Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>

> ---
> Changes for V6:
>     Fix commit message.
> Changes for V5:
>     None
> Changes for V4:
>     Fix commit message.
> Changes for V3:
>     None.
> ---
>  hw/sd/milkymist-memcard.c | 2 +-
>  hw/sd/omap_mmc.c          | 2 +-
>  hw/sd/pl181.c             | 2 +-
>  hw/sd/pxa2xx_mmci.c       | 2 +-
>  hw/sd/sd.c                | 2 +-
>  hw/sd/sdhci.h             | 2 +-
>  hw/sd/ssi-sd.c            | 2 +-
>  include/hw/{ => sd}/sd.h  | 0
>  8 files changed, 7 insertions(+), 7 deletions(-)
>  rename include/hw/{ => sd}/sd.h (100%)
>
> diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c
> index 2209ef1..b430d56 100644
> --- a/hw/sd/milkymist-memcard.c
> +++ b/hw/sd/milkymist-memcard.c
> @@ -28,7 +28,7 @@
>  #include "qemu/error-report.h"
>  #include "sysemu/block-backend.h"
>  #include "sysemu/blockdev.h"
> -#include "hw/sd.h"
> +#include "hw/sd/sd.h"
>
>  enum {
>      ENABLE_CMD_TX   = (1<<0),
> diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c
> index 35d8033..5bc4719 100644
> --- a/hw/sd/omap_mmc.c
> +++ b/hw/sd/omap_mmc.c
> @@ -18,7 +18,7 @@
>   */
>  #include "hw/hw.h"
>  #include "hw/arm/omap.h"
> -#include "hw/sd.h"
> +#include "hw/sd/sd.h"
>
>  struct omap_mmc_s {
>      qemu_irq irq;
> diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c
> index 11fcd47..ddd9b6f 100644
> --- a/hw/sd/pl181.c
> +++ b/hw/sd/pl181.c
> @@ -10,7 +10,7 @@
>  #include "sysemu/block-backend.h"
>  #include "sysemu/blockdev.h"
>  #include "hw/sysbus.h"
> -#include "hw/sd.h"
> +#include "hw/sd/sd.h"
>
>  //#define DEBUG_PL181 1
>
> diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c
> index d1fe6d5..b217080 100644
> --- a/hw/sd/pxa2xx_mmci.c
> +++ b/hw/sd/pxa2xx_mmci.c
> @@ -12,7 +12,7 @@
>
>  #include "hw/hw.h"
>  #include "hw/arm/pxa.h"
> -#include "hw/sd.h"
> +#include "hw/sd/sd.h"
>  #include "hw/qdev.h"
>
>  struct PXA2xxMMCIState {
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index a1ff465..0787e33 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -31,7 +31,7 @@
>
>  #include "hw/hw.h"
>  #include "sysemu/block-backend.h"
> -#include "hw/sd.h"
> +#include "hw/sd/sd.h"
>  #include "qemu/bitmap.h"
>
>  //#define DEBUG_SD 1
> diff --git a/hw/sd/sdhci.h b/hw/sd/sdhci.h
> index 3352d23..a45593f 100644
> --- a/hw/sd/sdhci.h
> +++ b/hw/sd/sdhci.h
> @@ -28,7 +28,7 @@
>  #include "qemu-common.h"
>  #include "hw/pci/pci.h"
>  #include "hw/sysbus.h"
> -#include "hw/sd.h"
> +#include "hw/sd/sd.h"
>
>  /* R/W SDMA System Address register 0x0 */
>  #define SDHC_SYSAD                     0x00
> diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c
> index e4b2d4f..c49ff62 100644
> --- a/hw/sd/ssi-sd.c
> +++ b/hw/sd/ssi-sd.c
> @@ -13,7 +13,7 @@
>  #include "sysemu/block-backend.h"
>  #include "sysemu/blockdev.h"
>  #include "hw/ssi.h"
> -#include "hw/sd.h"
> +#include "hw/sd/sd.h"
>
>  //#define DEBUG_SSI_SD 1
>
> diff --git a/include/hw/sd.h b/include/hw/sd/sd.h
> similarity index 100%
> rename from include/hw/sd.h
> rename to include/hw/sd/sd.h
> --
> 2.1.4
>
Sai Pavan Boddu Sept. 25, 2015, 3:52 a.m. UTC | #2 
> -----Original Message-----

> From: Peter Crosthwaite [mailto:crosthwaitepeter@gmail.com]

> Sent: Friday, September 25, 2015 9:02 AM

> To: Sai Pavan Boddu

> Cc: qemu-devel@nongnu.org Developers; Peter Maydell; Alistair Francis;

> Edgar Iglesias; Sai Pavan Boddu

> Subject: Re: [PATCH V6 1/2] sd.h: Move sd.h to include/hw/sd/

> 

> On Wed, Sep 23, 2015 at 12:32 AM, Sai Pavan Boddu

> <sai.pavan.boddu@xilinx.com> wrote:

> > Create a sd directory under include/hw/ and move sd.h to same.

> >

> > Signed-off-by: Sai Pavan Boddu <saipava@xilinx.com>

> > Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>

> 

> This probably needs more work for what the public API should be, but a

> step in the right direction for SoCification (and QoMification).

> 

> Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>

Thanks,
Sai Pavan
> 

> > ---

> > Changes for V6:

> >     Fix commit message.

> > Changes for V5:

> >     None

> > Changes for V4:

> >     Fix commit message.

> > Changes for V3:

> >     None.

> > ---

> >  hw/sd/milkymist-memcard.c | 2 +-

> >  hw/sd/omap_mmc.c          | 2 +-

> >  hw/sd/pl181.c             | 2 +-

> >  hw/sd/pxa2xx_mmci.c       | 2 +-

> >  hw/sd/sd.c                | 2 +-

> >  hw/sd/sdhci.h             | 2 +-

> >  hw/sd/ssi-sd.c            | 2 +-

> >  include/hw/{ => sd}/sd.h  | 0

> >  8 files changed, 7 insertions(+), 7 deletions(-)

> >  rename include/hw/{ => sd}/sd.h (100%)

> >

> > diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c

> > index 2209ef1..b430d56 100644

> > --- a/hw/sd/milkymist-memcard.c

> > +++ b/hw/sd/milkymist-memcard.c

> > @@ -28,7 +28,7 @@

> >  #include "qemu/error-report.h"

> >  #include "sysemu/block-backend.h"

> >  #include "sysemu/blockdev.h"

> > -#include "hw/sd.h"

> > +#include "hw/sd/sd.h"

> >

> >  enum {

> >      ENABLE_CMD_TX   = (1<<0),

> > diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c

> > index 35d8033..5bc4719 100644

> > --- a/hw/sd/omap_mmc.c

> > +++ b/hw/sd/omap_mmc.c

> > @@ -18,7 +18,7 @@

> >   */

> >  #include "hw/hw.h"

> >  #include "hw/arm/omap.h"

> > -#include "hw/sd.h"

> > +#include "hw/sd/sd.h"

> >

> >  struct omap_mmc_s {

> >      qemu_irq irq;

> > diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c

> > index 11fcd47..ddd9b6f 100644

> > --- a/hw/sd/pl181.c

> > +++ b/hw/sd/pl181.c

> > @@ -10,7 +10,7 @@

> >  #include "sysemu/block-backend.h"

> >  #include "sysemu/blockdev.h"

> >  #include "hw/sysbus.h"

> > -#include "hw/sd.h"

> > +#include "hw/sd/sd.h"

> >

> >  //#define DEBUG_PL181 1

> >

> > diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c

> > index d1fe6d5..b217080 100644

> > --- a/hw/sd/pxa2xx_mmci.c

> > +++ b/hw/sd/pxa2xx_mmci.c

> > @@ -12,7 +12,7 @@

> >

> >  #include "hw/hw.h"

> >  #include "hw/arm/pxa.h"

> > -#include "hw/sd.h"

> > +#include "hw/sd/sd.h"

> >  #include "hw/qdev.h"

> >

> >  struct PXA2xxMMCIState {

> > diff --git a/hw/sd/sd.c b/hw/sd/sd.c

> > index a1ff465..0787e33 100644

> > --- a/hw/sd/sd.c

> > +++ b/hw/sd/sd.c

> > @@ -31,7 +31,7 @@

> >

> >  #include "hw/hw.h"

> >  #include "sysemu/block-backend.h"

> > -#include "hw/sd.h"

> > +#include "hw/sd/sd.h"

> >  #include "qemu/bitmap.h"

> >

> >  //#define DEBUG_SD 1

> > diff --git a/hw/sd/sdhci.h b/hw/sd/sdhci.h

> > index 3352d23..a45593f 100644

> > --- a/hw/sd/sdhci.h

> > +++ b/hw/sd/sdhci.h

> > @@ -28,7 +28,7 @@

> >  #include "qemu-common.h"

> >  #include "hw/pci/pci.h"

> >  #include "hw/sysbus.h"

> > -#include "hw/sd.h"

> > +#include "hw/sd/sd.h"

> >

> >  /* R/W SDMA System Address register 0x0 */

> >  #define SDHC_SYSAD                     0x00

> > diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c

> > index e4b2d4f..c49ff62 100644

> > --- a/hw/sd/ssi-sd.c

> > +++ b/hw/sd/ssi-sd.c

> > @@ -13,7 +13,7 @@

> >  #include "sysemu/block-backend.h"

> >  #include "sysemu/blockdev.h"

> >  #include "hw/ssi.h"

> > -#include "hw/sd.h"

> > +#include "hw/sd/sd.h"

> >

> >  //#define DEBUG_SSI_SD 1

> >

> > diff --git a/include/hw/sd.h b/include/hw/sd/sd.h

> > similarity index 100%

> > rename from include/hw/sd.h

> > rename to include/hw/sd/sd.h

> > --

> > 2.1.4

> >
diff mbox

Patch

diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c
index 2209ef1..b430d56 100644
--- a/hw/sd/milkymist-memcard.c
+++ b/hw/sd/milkymist-memcard.c
@@ -28,7 +28,7 @@ 
 #include "qemu/error-report.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
-#include "hw/sd.h"
+#include "hw/sd/sd.h"
 
 enum {
     ENABLE_CMD_TX   = (1<<0),
diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c
index 35d8033..5bc4719 100644
--- a/hw/sd/omap_mmc.c
+++ b/hw/sd/omap_mmc.c
@@ -18,7 +18,7 @@ 
  */
 #include "hw/hw.h"
 #include "hw/arm/omap.h"
-#include "hw/sd.h"
+#include "hw/sd/sd.h"
 
 struct omap_mmc_s {
     qemu_irq irq;
diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c
index 11fcd47..ddd9b6f 100644
--- a/hw/sd/pl181.c
+++ b/hw/sd/pl181.c
@@ -10,7 +10,7 @@ 
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
 #include "hw/sysbus.h"
-#include "hw/sd.h"
+#include "hw/sd/sd.h"
 
 //#define DEBUG_PL181 1
 
diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c
index d1fe6d5..b217080 100644
--- a/hw/sd/pxa2xx_mmci.c
+++ b/hw/sd/pxa2xx_mmci.c
@@ -12,7 +12,7 @@ 
 
 #include "hw/hw.h"
 #include "hw/arm/pxa.h"
-#include "hw/sd.h"
+#include "hw/sd/sd.h"
 #include "hw/qdev.h"
 
 struct PXA2xxMMCIState {
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index a1ff465..0787e33 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -31,7 +31,7 @@ 
 
 #include "hw/hw.h"
 #include "sysemu/block-backend.h"
-#include "hw/sd.h"
+#include "hw/sd/sd.h"
 #include "qemu/bitmap.h"
 
 //#define DEBUG_SD 1
diff --git a/hw/sd/sdhci.h b/hw/sd/sdhci.h
index 3352d23..a45593f 100644
--- a/hw/sd/sdhci.h
+++ b/hw/sd/sdhci.h
@@ -28,7 +28,7 @@ 
 #include "qemu-common.h"
 #include "hw/pci/pci.h"
 #include "hw/sysbus.h"
-#include "hw/sd.h"
+#include "hw/sd/sd.h"
 
 /* R/W SDMA System Address register 0x0 */
 #define SDHC_SYSAD                     0x00
diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c
index e4b2d4f..c49ff62 100644
--- a/hw/sd/ssi-sd.c
+++ b/hw/sd/ssi-sd.c
@@ -13,7 +13,7 @@ 
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
 #include "hw/ssi.h"
-#include "hw/sd.h"
+#include "hw/sd/sd.h"
 
 //#define DEBUG_SSI_SD 1
 
diff --git a/include/hw/sd.h b/include/hw/sd/sd.h
similarity index 100%
rename from include/hw/sd.h
rename to include/hw/sd/sd.h