This was just a resend of V2. I think this is a good idea to move sd.h and sdhci.h to include/hw/sd/
As these device models like sdhci can be easily instantiated, when we have the type and its object declaration available in header in includes. Regards, Sai > -----Original Message----- > From: Sai Pavan Boddu [mailto:sai.pavan.bo...@xilinx.com] > Sent: Tuesday, September 08, 2015 11:23 AM > To: qemu-devel@nongnu.org; crosthwaitepe...@gmail.com; > peter.mayd...@linaro.org > Cc: ebl...@redhat.com; Alistair Francis; Edgar Iglesias; Sai Pavan Boddu > Subject: [RFC V2 1/2] hw/sd : move sd.h to include/hw/sd/ > > Create new folder in includes for sd headers. > > Signed-off-by: Sai Pavan Boddu <saip...@xilinx.com> > --- > 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 d072dec..3bf1fcc 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 > -- > 1.9.1
