| Message ID | d1fc46c0c2b1c3d9dea379839e47982baf867400.1445995187.git.alistair.francis@xilinx.com |
|---|---|
| State | New |
| Headers | show |
On Wed, Oct 28, 2015 at 10:32 AM, Alistair Francis < alistair.francis@xilinx.com> wrote: > Move the ssi.h include file into the ssi directory. > > Needs a note about the typedef changes. You can drop those changes if you want, as checkpatch is not an issue when moving code. > Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> > Either way: Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com> Regards, Peter --- > V2: > - Change git patch to indicate rename > > hw/arm/pxa2xx.c | 2 +- > hw/arm/spitz.c | 2 +- > hw/arm/stellaris.c | 2 +- > hw/arm/strongarm.c | 2 +- > hw/arm/tosa.c | 2 +- > hw/arm/xilinx_zynq.c | 2 +- > hw/arm/z2.c | 2 +- > hw/block/m25p80.c | 2 +- > hw/display/ads7846.c | 2 +- > hw/display/ssd0323.c | 2 +- > hw/microblaze/petalogix_ml605_mmu.c | 2 +- > hw/misc/max111x.c | 2 +- > hw/sd/ssi-sd.c | 2 +- > hw/ssi/pl022.c | 2 +- > hw/ssi/ssi.c | 2 +- > hw/ssi/xilinx_spi.c | 2 +- > hw/ssi/xilinx_spips.c | 2 +- > include/hw/{ => ssi}/ssi.h | 10 ++++++---- > 18 files changed, 23 insertions(+), 21 deletions(-) > rename include/hw/{ => ssi}/ssi.h (96%) > > diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c > index 79d22d9..54bf152 100644 > --- a/hw/arm/pxa2xx.c > +++ b/hw/arm/pxa2xx.c > @@ -12,7 +12,7 @@ > #include "sysemu/sysemu.h" > #include "hw/char/serial.h" > #include "hw/i2c/i2c.h" > -#include "hw/ssi.h" > +#include "hw/ssi/ssi.h" > #include "sysemu/char.h" > #include "sysemu/block-backend.h" > #include "sysemu/blockdev.h" > diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c > index 8d3cc0b..ee8f889 100644 > --- a/hw/arm/spitz.c > +++ b/hw/arm/spitz.c > @@ -16,7 +16,7 @@ > #include "sysemu/sysemu.h" > #include "hw/pcmcia.h" > #include "hw/i2c/i2c.h" > -#include "hw/ssi.h" > +#include "hw/ssi/ssi.h" > #include "hw/block/flash.h" > #include "qemu/timer.h" > #include "hw/devices.h" > diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c > index 3d6486f..c785e90 100644 > --- a/hw/arm/stellaris.c > +++ b/hw/arm/stellaris.c > @@ -8,7 +8,7 @@ > */ > > #include "hw/sysbus.h" > -#include "hw/ssi.h" > +#include "hw/ssi/ssi.h" > #include "hw/arm/arm.h" > #include "hw/devices.h" > #include "qemu/timer.h" > diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c > index 9624ecb..4d2ba02 100644 > --- a/hw/arm/strongarm.c > +++ b/hw/arm/strongarm.c > @@ -34,7 +34,7 @@ > #include "hw/arm/arm.h" > #include "sysemu/char.h" > #include "sysemu/sysemu.h" > -#include "hw/ssi.h" > +#include "hw/ssi/ssi.h" > > //#define DEBUG > > diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c > index 02814d7..68ad01e 100644 > --- a/hw/arm/tosa.c > +++ b/hw/arm/tosa.c > @@ -19,7 +19,7 @@ > #include "hw/pcmcia.h" > #include "hw/boards.h" > #include "hw/i2c/i2c.h" > -#include "hw/ssi.h" > +#include "hw/ssi/ssi.h" > #include "sysemu/block-backend.h" > #include "hw/sysbus.h" > #include "exec/address-spaces.h" > diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c > index 9f89483..9db9602 100644 > --- a/hw/arm/xilinx_zynq.c > +++ b/hw/arm/xilinx_zynq.c > @@ -24,7 +24,7 @@ > #include "hw/block/flash.h" > #include "sysemu/block-backend.h" > #include "hw/loader.h" > -#include "hw/ssi.h" > +#include "hw/ssi/ssi.h" > #include "qemu/error-report.h" > > #define NUM_SPI_FLASHES 4 > diff --git a/hw/arm/z2.c b/hw/arm/z2.c > index b44eb76..c82fe2c 100644 > --- a/hw/arm/z2.c > +++ b/hw/arm/z2.c > @@ -16,7 +16,7 @@ > #include "hw/arm/arm.h" > #include "hw/devices.h" > #include "hw/i2c/i2c.h" > -#include "hw/ssi.h" > +#include "hw/ssi/ssi.h" > #include "hw/boards.h" > #include "sysemu/sysemu.h" > #include "hw/block/flash.h" > diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c > index 7b9f97c..addd907 100644 > --- a/hw/block/m25p80.c > +++ b/hw/block/m25p80.c > @@ -24,7 +24,7 @@ > #include "hw/hw.h" > #include "sysemu/block-backend.h" > #include "sysemu/blockdev.h" > -#include "hw/ssi.h" > +#include "hw/ssi/ssi.h" > > #ifndef M25P80_ERR_DEBUG > #define M25P80_ERR_DEBUG 0 > diff --git a/hw/display/ads7846.c b/hw/display/ads7846.c > index 3f35369..cb82317 100644 > --- a/hw/display/ads7846.c > +++ b/hw/display/ads7846.c > @@ -10,7 +10,7 @@ > * GNU GPL, version 2 or (at your option) any later version. > */ > > -#include "hw/ssi.h" > +#include "hw/ssi/ssi.h" > #include "ui/console.h" > > typedef struct { > diff --git a/hw/display/ssd0323.c b/hw/display/ssd0323.c > index 9727007..7545da8 100644 > --- a/hw/display/ssd0323.c > +++ b/hw/display/ssd0323.c > @@ -10,7 +10,7 @@ > /* The controller can support a variety of different displays, but we only > implement one. Most of the commends relating to brightness and > geometry > setup are ignored. */ > -#include "hw/ssi.h" > +#include "hw/ssi/ssi.h" > #include "ui/console.h" > > //#define DEBUG_SSD0323 1 > diff --git a/hw/microblaze/petalogix_ml605_mmu.c > b/hw/microblaze/petalogix_ml605_mmu.c > index 462060f..5366cec 100644 > --- a/hw/microblaze/petalogix_ml605_mmu.c > +++ b/hw/microblaze/petalogix_ml605_mmu.c > @@ -35,7 +35,7 @@ > #include "sysemu/block-backend.h" > #include "hw/char/serial.h" > #include "exec/address-spaces.h" > -#include "hw/ssi.h" > +#include "hw/ssi/ssi.h" > > #include "boot.h" > > diff --git a/hw/misc/max111x.c b/hw/misc/max111x.c > index bef3651..d619d61 100644 > --- a/hw/misc/max111x.c > +++ b/hw/misc/max111x.c > @@ -10,7 +10,7 @@ > * GNU GPL, version 2 or (at your option) any later version. > */ > > -#include "hw/ssi.h" > +#include "hw/ssi/ssi.h" > > typedef struct { > SSISlave parent_obj; > diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c > index e4b2d4f..4fe00fd 100644 > --- a/hw/sd/ssi-sd.c > +++ b/hw/sd/ssi-sd.c > @@ -12,7 +12,7 @@ > > #include "sysemu/block-backend.h" > #include "sysemu/blockdev.h" > -#include "hw/ssi.h" > +#include "hw/ssi/ssi.h" > #include "hw/sd.h" > > //#define DEBUG_SSI_SD 1 > diff --git a/hw/ssi/pl022.c b/hw/ssi/pl022.c > index 61d568f..0bbf633 100644 > --- a/hw/ssi/pl022.c > +++ b/hw/ssi/pl022.c > @@ -8,7 +8,7 @@ > */ > > #include "hw/sysbus.h" > -#include "hw/ssi.h" > +#include "hw/ssi/ssi.h" > > //#define DEBUG_PL022 1 > > diff --git a/hw/ssi/ssi.c b/hw/ssi/ssi.c > index 2aab79b..a0f57c0 100644 > --- a/hw/ssi/ssi.c > +++ b/hw/ssi/ssi.c > @@ -12,7 +12,7 @@ > * GNU GPL, version 2 or (at your option) any later version. > */ > > -#include "hw/ssi.h" > +#include "hw/ssi/ssi.h" > > struct SSIBus { > BusState parent_obj; > diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c > index 620573c..94bb2a7 100644 > --- a/hw/ssi/xilinx_spi.c > +++ b/hw/ssi/xilinx_spi.c > @@ -29,7 +29,7 @@ > #include "qemu/log.h" > #include "qemu/fifo8.h" > > -#include "hw/ssi.h" > +#include "hw/ssi/ssi.h" > > #ifdef XILINX_SPI_ERR_DEBUG > #define DB_PRINT(...) do { \ > diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c > index 0910f54..e9471ff 100644 > --- a/hw/ssi/xilinx_spips.c > +++ b/hw/ssi/xilinx_spips.c > @@ -27,7 +27,7 @@ > #include "hw/ptimer.h" > #include "qemu/log.h" > #include "qemu/fifo8.h" > -#include "hw/ssi.h" > +#include "hw/ssi/ssi.h" > #include "qemu/bitops.h" > > #ifndef XILINX_SPIPS_ERR_DEBUG > diff --git a/include/hw/ssi.h b/include/hw/ssi/ssi.h > similarity index 96% > rename from include/hw/ssi.h > rename to include/hw/ssi/ssi.h > index df0f838..4a0a539 100644 > --- a/include/hw/ssi.h > +++ b/include/hw/ssi/ssi.h > @@ -14,6 +14,8 @@ > #include "hw/qdev.h" > > typedef struct SSISlave SSISlave; > +typedef struct SSISlaveClass SSISlaveClass; > +typedef enum SSICSMode SSICSMode; > > #define TYPE_SSI_SLAVE "ssi-slave" > #define SSI_SLAVE(obj) \ > @@ -25,14 +27,14 @@ typedef struct SSISlave SSISlave; > > #define SSI_GPIO_CS "ssi-gpio-cs" > > -typedef enum { > +enum SSICSMode { > SSI_CS_NONE = 0, > SSI_CS_LOW, > SSI_CS_HIGH, > -} SSICSMode; > +}; > > /* Slave devices. */ > -typedef struct SSISlaveClass { > +struct SSISlaveClass { > DeviceClass parent_class; > > int (*init)(SSISlave *dev); > @@ -55,7 +57,7 @@ typedef struct SSISlaveClass { > * always be called for the device for every txrx access to the > parent bus > */ > uint32_t (*transfer_raw)(SSISlave *dev, uint32_t val); > -} SSISlaveClass; > +}; > > struct SSISlave { > DeviceState parent_obj; > -- > 2.5.0 > >
On Wed, Oct 28, 2015 at 6:44 PM, Peter Crosthwaite <crosthwaitepeter@gmail.com> wrote: > > > On Wed, Oct 28, 2015 at 10:32 AM, Alistair Francis > <alistair.francis@xilinx.com> wrote: >> >> Move the ssi.h include file into the ssi directory. >> > > Needs a note about the typedef changes. You can drop those changes if you > want, as checkpatch is not an issue when moving code. Good point, I added a comment saying that I made some changes to pass checkpatch. > >> >> Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> > > > Either way: > > Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com> Thanks Alistair > > Regards, > Peter > >> --- >> V2: >> - Change git patch to indicate rename >> >> hw/arm/pxa2xx.c | 2 +- >> hw/arm/spitz.c | 2 +- >> hw/arm/stellaris.c | 2 +- >> hw/arm/strongarm.c | 2 +- >> hw/arm/tosa.c | 2 +- >> hw/arm/xilinx_zynq.c | 2 +- >> hw/arm/z2.c | 2 +- >> hw/block/m25p80.c | 2 +- >> hw/display/ads7846.c | 2 +- >> hw/display/ssd0323.c | 2 +- >> hw/microblaze/petalogix_ml605_mmu.c | 2 +- >> hw/misc/max111x.c | 2 +- >> hw/sd/ssi-sd.c | 2 +- >> hw/ssi/pl022.c | 2 +- >> hw/ssi/ssi.c | 2 +- >> hw/ssi/xilinx_spi.c | 2 +- >> hw/ssi/xilinx_spips.c | 2 +- >> include/hw/{ => ssi}/ssi.h | 10 ++++++---- >> 18 files changed, 23 insertions(+), 21 deletions(-) >> rename include/hw/{ => ssi}/ssi.h (96%) >> >> diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c >> index 79d22d9..54bf152 100644 >> --- a/hw/arm/pxa2xx.c >> +++ b/hw/arm/pxa2xx.c >> @@ -12,7 +12,7 @@ >> #include "sysemu/sysemu.h" >> #include "hw/char/serial.h" >> #include "hw/i2c/i2c.h" >> -#include "hw/ssi.h" >> +#include "hw/ssi/ssi.h" >> #include "sysemu/char.h" >> #include "sysemu/block-backend.h" >> #include "sysemu/blockdev.h" >> diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c >> index 8d3cc0b..ee8f889 100644 >> --- a/hw/arm/spitz.c >> +++ b/hw/arm/spitz.c >> @@ -16,7 +16,7 @@ >> #include "sysemu/sysemu.h" >> #include "hw/pcmcia.h" >> #include "hw/i2c/i2c.h" >> -#include "hw/ssi.h" >> +#include "hw/ssi/ssi.h" >> #include "hw/block/flash.h" >> #include "qemu/timer.h" >> #include "hw/devices.h" >> diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c >> index 3d6486f..c785e90 100644 >> --- a/hw/arm/stellaris.c >> +++ b/hw/arm/stellaris.c >> @@ -8,7 +8,7 @@ >> */ >> >> #include "hw/sysbus.h" >> -#include "hw/ssi.h" >> +#include "hw/ssi/ssi.h" >> #include "hw/arm/arm.h" >> #include "hw/devices.h" >> #include "qemu/timer.h" >> diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c >> index 9624ecb..4d2ba02 100644 >> --- a/hw/arm/strongarm.c >> +++ b/hw/arm/strongarm.c >> @@ -34,7 +34,7 @@ >> #include "hw/arm/arm.h" >> #include "sysemu/char.h" >> #include "sysemu/sysemu.h" >> -#include "hw/ssi.h" >> +#include "hw/ssi/ssi.h" >> >> //#define DEBUG >> >> diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c >> index 02814d7..68ad01e 100644 >> --- a/hw/arm/tosa.c >> +++ b/hw/arm/tosa.c >> @@ -19,7 +19,7 @@ >> #include "hw/pcmcia.h" >> #include "hw/boards.h" >> #include "hw/i2c/i2c.h" >> -#include "hw/ssi.h" >> +#include "hw/ssi/ssi.h" >> #include "sysemu/block-backend.h" >> #include "hw/sysbus.h" >> #include "exec/address-spaces.h" >> diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c >> index 9f89483..9db9602 100644 >> --- a/hw/arm/xilinx_zynq.c >> +++ b/hw/arm/xilinx_zynq.c >> @@ -24,7 +24,7 @@ >> #include "hw/block/flash.h" >> #include "sysemu/block-backend.h" >> #include "hw/loader.h" >> -#include "hw/ssi.h" >> +#include "hw/ssi/ssi.h" >> #include "qemu/error-report.h" >> >> #define NUM_SPI_FLASHES 4 >> diff --git a/hw/arm/z2.c b/hw/arm/z2.c >> index b44eb76..c82fe2c 100644 >> --- a/hw/arm/z2.c >> +++ b/hw/arm/z2.c >> @@ -16,7 +16,7 @@ >> #include "hw/arm/arm.h" >> #include "hw/devices.h" >> #include "hw/i2c/i2c.h" >> -#include "hw/ssi.h" >> +#include "hw/ssi/ssi.h" >> #include "hw/boards.h" >> #include "sysemu/sysemu.h" >> #include "hw/block/flash.h" >> diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c >> index 7b9f97c..addd907 100644 >> --- a/hw/block/m25p80.c >> +++ b/hw/block/m25p80.c >> @@ -24,7 +24,7 @@ >> #include "hw/hw.h" >> #include "sysemu/block-backend.h" >> #include "sysemu/blockdev.h" >> -#include "hw/ssi.h" >> +#include "hw/ssi/ssi.h" >> >> #ifndef M25P80_ERR_DEBUG >> #define M25P80_ERR_DEBUG 0 >> diff --git a/hw/display/ads7846.c b/hw/display/ads7846.c >> index 3f35369..cb82317 100644 >> --- a/hw/display/ads7846.c >> +++ b/hw/display/ads7846.c >> @@ -10,7 +10,7 @@ >> * GNU GPL, version 2 or (at your option) any later version. >> */ >> >> -#include "hw/ssi.h" >> +#include "hw/ssi/ssi.h" >> #include "ui/console.h" >> >> typedef struct { >> diff --git a/hw/display/ssd0323.c b/hw/display/ssd0323.c >> index 9727007..7545da8 100644 >> --- a/hw/display/ssd0323.c >> +++ b/hw/display/ssd0323.c >> @@ -10,7 +10,7 @@ >> /* The controller can support a variety of different displays, but we >> only >> implement one. Most of the commends relating to brightness and >> geometry >> setup are ignored. */ >> -#include "hw/ssi.h" >> +#include "hw/ssi/ssi.h" >> #include "ui/console.h" >> >> //#define DEBUG_SSD0323 1 >> diff --git a/hw/microblaze/petalogix_ml605_mmu.c >> b/hw/microblaze/petalogix_ml605_mmu.c >> index 462060f..5366cec 100644 >> --- a/hw/microblaze/petalogix_ml605_mmu.c >> +++ b/hw/microblaze/petalogix_ml605_mmu.c >> @@ -35,7 +35,7 @@ >> #include "sysemu/block-backend.h" >> #include "hw/char/serial.h" >> #include "exec/address-spaces.h" >> -#include "hw/ssi.h" >> +#include "hw/ssi/ssi.h" >> >> #include "boot.h" >> >> diff --git a/hw/misc/max111x.c b/hw/misc/max111x.c >> index bef3651..d619d61 100644 >> --- a/hw/misc/max111x.c >> +++ b/hw/misc/max111x.c >> @@ -10,7 +10,7 @@ >> * GNU GPL, version 2 or (at your option) any later version. >> */ >> >> -#include "hw/ssi.h" >> +#include "hw/ssi/ssi.h" >> >> typedef struct { >> SSISlave parent_obj; >> diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c >> index e4b2d4f..4fe00fd 100644 >> --- a/hw/sd/ssi-sd.c >> +++ b/hw/sd/ssi-sd.c >> @@ -12,7 +12,7 @@ >> >> #include "sysemu/block-backend.h" >> #include "sysemu/blockdev.h" >> -#include "hw/ssi.h" >> +#include "hw/ssi/ssi.h" >> #include "hw/sd.h" >> >> //#define DEBUG_SSI_SD 1 >> diff --git a/hw/ssi/pl022.c b/hw/ssi/pl022.c >> index 61d568f..0bbf633 100644 >> --- a/hw/ssi/pl022.c >> +++ b/hw/ssi/pl022.c >> @@ -8,7 +8,7 @@ >> */ >> >> #include "hw/sysbus.h" >> -#include "hw/ssi.h" >> +#include "hw/ssi/ssi.h" >> >> //#define DEBUG_PL022 1 >> >> diff --git a/hw/ssi/ssi.c b/hw/ssi/ssi.c >> index 2aab79b..a0f57c0 100644 >> --- a/hw/ssi/ssi.c >> +++ b/hw/ssi/ssi.c >> @@ -12,7 +12,7 @@ >> * GNU GPL, version 2 or (at your option) any later version. >> */ >> >> -#include "hw/ssi.h" >> +#include "hw/ssi/ssi.h" >> >> struct SSIBus { >> BusState parent_obj; >> diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c >> index 620573c..94bb2a7 100644 >> --- a/hw/ssi/xilinx_spi.c >> +++ b/hw/ssi/xilinx_spi.c >> @@ -29,7 +29,7 @@ >> #include "qemu/log.h" >> #include "qemu/fifo8.h" >> >> -#include "hw/ssi.h" >> +#include "hw/ssi/ssi.h" >> >> #ifdef XILINX_SPI_ERR_DEBUG >> #define DB_PRINT(...) do { \ >> diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c >> index 0910f54..e9471ff 100644 >> --- a/hw/ssi/xilinx_spips.c >> +++ b/hw/ssi/xilinx_spips.c >> @@ -27,7 +27,7 @@ >> #include "hw/ptimer.h" >> #include "qemu/log.h" >> #include "qemu/fifo8.h" >> -#include "hw/ssi.h" >> +#include "hw/ssi/ssi.h" >> #include "qemu/bitops.h" >> >> #ifndef XILINX_SPIPS_ERR_DEBUG >> diff --git a/include/hw/ssi.h b/include/hw/ssi/ssi.h >> similarity index 96% >> rename from include/hw/ssi.h >> rename to include/hw/ssi/ssi.h >> index df0f838..4a0a539 100644 >> --- a/include/hw/ssi.h >> +++ b/include/hw/ssi/ssi.h >> @@ -14,6 +14,8 @@ >> #include "hw/qdev.h" >> >> typedef struct SSISlave SSISlave; >> +typedef struct SSISlaveClass SSISlaveClass; >> +typedef enum SSICSMode SSICSMode; >> >> #define TYPE_SSI_SLAVE "ssi-slave" >> #define SSI_SLAVE(obj) \ >> @@ -25,14 +27,14 @@ typedef struct SSISlave SSISlave; >> >> #define SSI_GPIO_CS "ssi-gpio-cs" >> >> -typedef enum { >> +enum SSICSMode { >> SSI_CS_NONE = 0, >> SSI_CS_LOW, >> SSI_CS_HIGH, >> -} SSICSMode; >> +}; >> >> /* Slave devices. */ >> -typedef struct SSISlaveClass { >> +struct SSISlaveClass { >> DeviceClass parent_class; >> >> int (*init)(SSISlave *dev); >> @@ -55,7 +57,7 @@ typedef struct SSISlaveClass { >> * always be called for the device for every txrx access to the >> parent bus >> */ >> uint32_t (*transfer_raw)(SSISlave *dev, uint32_t val); >> -} SSISlaveClass; >> +}; >> >> struct SSISlave { >> DeviceState parent_obj; >> -- >> 2.5.0 >> >
diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c index 79d22d9..54bf152 100644 --- a/hw/arm/pxa2xx.c +++ b/hw/arm/pxa2xx.c @@ -12,7 +12,7 @@ #include "sysemu/sysemu.h" #include "hw/char/serial.h" #include "hw/i2c/i2c.h" -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" #include "sysemu/char.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c index 8d3cc0b..ee8f889 100644 --- a/hw/arm/spitz.c +++ b/hw/arm/spitz.c @@ -16,7 +16,7 @@ #include "sysemu/sysemu.h" #include "hw/pcmcia.h" #include "hw/i2c/i2c.h" -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" #include "hw/block/flash.h" #include "qemu/timer.h" #include "hw/devices.h" diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index 3d6486f..c785e90 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -8,7 +8,7 @@ */ #include "hw/sysbus.h" -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" #include "hw/arm/arm.h" #include "hw/devices.h" #include "qemu/timer.h" diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index 9624ecb..4d2ba02 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -34,7 +34,7 @@ #include "hw/arm/arm.h" #include "sysemu/char.h" #include "sysemu/sysemu.h" -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" //#define DEBUG diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c index 02814d7..68ad01e 100644 --- a/hw/arm/tosa.c +++ b/hw/arm/tosa.c @@ -19,7 +19,7 @@ #include "hw/pcmcia.h" #include "hw/boards.h" #include "hw/i2c/i2c.h" -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" #include "sysemu/block-backend.h" #include "hw/sysbus.h" #include "exec/address-spaces.h" diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 9f89483..9db9602 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -24,7 +24,7 @@ #include "hw/block/flash.h" #include "sysemu/block-backend.h" #include "hw/loader.h" -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" #include "qemu/error-report.h" #define NUM_SPI_FLASHES 4 diff --git a/hw/arm/z2.c b/hw/arm/z2.c index b44eb76..c82fe2c 100644 --- a/hw/arm/z2.c +++ b/hw/arm/z2.c @@ -16,7 +16,7 @@ #include "hw/arm/arm.h" #include "hw/devices.h" #include "hw/i2c/i2c.h" -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" #include "hw/boards.h" #include "sysemu/sysemu.h" #include "hw/block/flash.h" diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 7b9f97c..addd907 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -24,7 +24,7 @@ #include "hw/hw.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" #ifndef M25P80_ERR_DEBUG #define M25P80_ERR_DEBUG 0 diff --git a/hw/display/ads7846.c b/hw/display/ads7846.c index 3f35369..cb82317 100644 --- a/hw/display/ads7846.c +++ b/hw/display/ads7846.c @@ -10,7 +10,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" #include "ui/console.h" typedef struct { diff --git a/hw/display/ssd0323.c b/hw/display/ssd0323.c index 9727007..7545da8 100644 --- a/hw/display/ssd0323.c +++ b/hw/display/ssd0323.c @@ -10,7 +10,7 @@ /* The controller can support a variety of different displays, but we only implement one. Most of the commends relating to brightness and geometry setup are ignored. */ -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" #include "ui/console.h" //#define DEBUG_SSD0323 1 diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c index 462060f..5366cec 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -35,7 +35,7 @@ #include "sysemu/block-backend.h" #include "hw/char/serial.h" #include "exec/address-spaces.h" -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" #include "boot.h" diff --git a/hw/misc/max111x.c b/hw/misc/max111x.c index bef3651..d619d61 100644 --- a/hw/misc/max111x.c +++ b/hw/misc/max111x.c @@ -10,7 +10,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" typedef struct { SSISlave parent_obj; diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c index e4b2d4f..4fe00fd 100644 --- a/hw/sd/ssi-sd.c +++ b/hw/sd/ssi-sd.c @@ -12,7 +12,7 @@ #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" #include "hw/sd.h" //#define DEBUG_SSI_SD 1 diff --git a/hw/ssi/pl022.c b/hw/ssi/pl022.c index 61d568f..0bbf633 100644 --- a/hw/ssi/pl022.c +++ b/hw/ssi/pl022.c @@ -8,7 +8,7 @@ */ #include "hw/sysbus.h" -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" //#define DEBUG_PL022 1 diff --git a/hw/ssi/ssi.c b/hw/ssi/ssi.c index 2aab79b..a0f57c0 100644 --- a/hw/ssi/ssi.c +++ b/hw/ssi/ssi.c @@ -12,7 +12,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" struct SSIBus { BusState parent_obj; diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c index 620573c..94bb2a7 100644 --- a/hw/ssi/xilinx_spi.c +++ b/hw/ssi/xilinx_spi.c @@ -29,7 +29,7 @@ #include "qemu/log.h" #include "qemu/fifo8.h" -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" #ifdef XILINX_SPI_ERR_DEBUG #define DB_PRINT(...) do { \ diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c index 0910f54..e9471ff 100644 --- a/hw/ssi/xilinx_spips.c +++ b/hw/ssi/xilinx_spips.c @@ -27,7 +27,7 @@ #include "hw/ptimer.h" #include "qemu/log.h" #include "qemu/fifo8.h" -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" #include "qemu/bitops.h" #ifndef XILINX_SPIPS_ERR_DEBUG diff --git a/include/hw/ssi.h b/include/hw/ssi/ssi.h similarity index 96% rename from include/hw/ssi.h rename to include/hw/ssi/ssi.h index df0f838..4a0a539 100644 --- a/include/hw/ssi.h +++ b/include/hw/ssi/ssi.h @@ -14,6 +14,8 @@ #include "hw/qdev.h" typedef struct SSISlave SSISlave; +typedef struct SSISlaveClass SSISlaveClass; +typedef enum SSICSMode SSICSMode; #define TYPE_SSI_SLAVE "ssi-slave" #define SSI_SLAVE(obj) \ @@ -25,14 +27,14 @@ typedef struct SSISlave SSISlave; #define SSI_GPIO_CS "ssi-gpio-cs" -typedef enum { +enum SSICSMode { SSI_CS_NONE = 0, SSI_CS_LOW, SSI_CS_HIGH, -} SSICSMode; +}; /* Slave devices. */ -typedef struct SSISlaveClass { +struct SSISlaveClass { DeviceClass parent_class; int (*init)(SSISlave *dev); @@ -55,7 +57,7 @@ typedef struct SSISlaveClass { * always be called for the device for every txrx access to the parent bus */ uint32_t (*transfer_raw)(SSISlave *dev, uint32_t val); -} SSISlaveClass; +}; struct SSISlave { DeviceState parent_obj;
Move the ssi.h include file into the ssi directory. Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> --- V2: - Change git patch to indicate rename hw/arm/pxa2xx.c | 2 +- hw/arm/spitz.c | 2 +- hw/arm/stellaris.c | 2 +- hw/arm/strongarm.c | 2 +- hw/arm/tosa.c | 2 +- hw/arm/xilinx_zynq.c | 2 +- hw/arm/z2.c | 2 +- hw/block/m25p80.c | 2 +- hw/display/ads7846.c | 2 +- hw/display/ssd0323.c | 2 +- hw/microblaze/petalogix_ml605_mmu.c | 2 +- hw/misc/max111x.c | 2 +- hw/sd/ssi-sd.c | 2 +- hw/ssi/pl022.c | 2 +- hw/ssi/ssi.c | 2 +- hw/ssi/xilinx_spi.c | 2 +- hw/ssi/xilinx_spips.c | 2 +- include/hw/{ => ssi}/ssi.h | 10 ++++++---- 18 files changed, 23 insertions(+), 21 deletions(-) rename include/hw/{ => ssi}/ssi.h (96%)