From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aR46T-0006fB-GR for qemu-devel@nongnu.org; Wed, 03 Feb 2016 15:32:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aR46R-0005bz-GO for qemu-devel@nongnu.org; Wed, 03 Feb 2016 15:32:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57967) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aR46R-0005bt-8d for qemu-devel@nongnu.org; Wed, 03 Feb 2016 15:32:39 -0500 From: John Snow Date: Wed, 3 Feb 2016 15:32:19 -0500 Message-Id: <1454531555-32022-5-git-send-email-jsnow@redhat.com> In-Reply-To: <1454531555-32022-1-git-send-email-jsnow@redhat.com> References: <1454531555-32022-1-git-send-email-jsnow@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 04/20] i8257: rename struct dma_cont to I8257State List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, jsnow@redhat.com, =?UTF-8?q?Herv=C3=A9=20Poussineau?= From: Herv=C3=A9 Poussineau Signed-off-by: Herv=C3=A9 Poussineau Message-id: 1453843944-26833-4-git-send-email-hpoussin@reactos.org Signed-off-by: John Snow --- hw/dma/i8257.c | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c index bb6945a..e560a2f 100644 --- a/hw/dma/i8257.c +++ b/hw/dma/i8257.c @@ -53,7 +53,7 @@ struct dma_regs { #define ADDR 0 #define COUNT 1 =20 -static struct dma_cont { +typedef struct I8257State { uint8_t status; uint8_t command; uint8_t mask; @@ -62,7 +62,9 @@ static struct dma_cont { struct dma_regs regs[4]; MemoryRegion channel_io; MemoryRegion cont_io; -} dma_controllers[2]; +} I8257State; + +static I8257State dma_controllers[2]; =20 enum { CMD_MEMORY_TO_MEMORY =3D 0x01, @@ -85,7 +87,7 @@ static int channels[8] =3D {-1, 2, 3, 1, -1, -1, -1, 0}= ; =20 static void write_page (void *opaque, uint32_t nport, uint32_t data) { - struct dma_cont *d =3D opaque; + I8257State *d =3D opaque; int ichan; =20 ichan =3D channels[nport & 7]; @@ -98,7 +100,7 @@ static void write_page (void *opaque, uint32_t nport, = uint32_t data) =20 static void write_pageh (void *opaque, uint32_t nport, uint32_t data) { - struct dma_cont *d =3D opaque; + I8257State *d =3D opaque; int ichan; =20 ichan =3D channels[nport & 7]; @@ -111,7 +113,7 @@ static void write_pageh (void *opaque, uint32_t nport= , uint32_t data) =20 static uint32_t read_page (void *opaque, uint32_t nport) { - struct dma_cont *d =3D opaque; + I8257State *d =3D opaque; int ichan; =20 ichan =3D channels[nport & 7]; @@ -124,7 +126,7 @@ static uint32_t read_page (void *opaque, uint32_t npo= rt) =20 static uint32_t read_pageh (void *opaque, uint32_t nport) { - struct dma_cont *d =3D opaque; + I8257State *d =3D opaque; int ichan; =20 ichan =3D channels[nport & 7]; @@ -135,7 +137,7 @@ static uint32_t read_pageh (void *opaque, uint32_t np= ort) return d->regs[ichan].pageh; } =20 -static inline void init_chan (struct dma_cont *d, int ichan) +static inline void init_chan(I8257State *d, int ichan) { struct dma_regs *r; =20 @@ -144,7 +146,7 @@ static inline void init_chan (struct dma_cont *d, int= ichan) r->now[COUNT] =3D 0; } =20 -static inline int getff (struct dma_cont *d) +static inline int getff(I8257State *d) { int ff; =20 @@ -155,7 +157,7 @@ static inline int getff (struct dma_cont *d) =20 static uint64_t read_chan(void *opaque, hwaddr nport, unsigned size) { - struct dma_cont *d =3D opaque; + I8257State *d =3D opaque; int ichan, nreg, iport, ff, val, dir; struct dma_regs *r; =20 @@ -178,7 +180,7 @@ static uint64_t read_chan(void *opaque, hwaddr nport,= unsigned size) static void write_chan(void *opaque, hwaddr nport, uint64_t data, unsigned size) { - struct dma_cont *d =3D opaque; + I8257State *d =3D opaque; int iport, ichan, nreg; struct dma_regs *r; =20 @@ -197,7 +199,7 @@ static void write_chan(void *opaque, hwaddr nport, ui= nt64_t data, static void write_cont(void *opaque, hwaddr nport, uint64_t data, unsigned size) { - struct dma_cont *d =3D opaque; + I8257State *d =3D opaque; int iport, ichan =3D 0; =20 iport =3D (nport >> d->dshift) & 0x0f; @@ -285,7 +287,7 @@ static void write_cont(void *opaque, hwaddr nport, ui= nt64_t data, =20 static uint64_t read_cont(void *opaque, hwaddr nport, unsigned size) { - struct dma_cont *d =3D opaque; + I8257State *d =3D opaque; int iport, val; =20 iport =3D (nport >> d->dshift) & 0x0f; @@ -362,7 +364,7 @@ static bool dma_bh_scheduled; =20 static void DMA_run (void) { - struct dma_cont *d; + I8257State *d; int icont, ichan; int rearm =3D 0; static int running =3D 0; @@ -474,7 +476,7 @@ void DMA_schedule(void) =20 static void dma_reset(void *opaque) { - struct dma_cont *d =3D opaque; + I8257State *d =3D opaque; write_cont(d, (0x05 << d->dshift), 0, 1); } =20 @@ -520,7 +522,7 @@ static const MemoryRegionOps cont_io_ops =3D { }; =20 /* dshift =3D 0: 8 bit DMA, 1 =3D 16 bit DMA */ -static void dma_init2(struct dma_cont *d, int base, int dshift, +static void dma_init2(I8257State *d, int base, int dshift, int page_base, int pageh_base) { int i; @@ -580,11 +582,12 @@ static const VMStateDescription vmstate_dma =3D { .minimum_version_id =3D 1, .post_load =3D dma_post_load, .fields =3D (VMStateField[]) { - VMSTATE_UINT8(command, struct dma_cont), - VMSTATE_UINT8(mask, struct dma_cont), - VMSTATE_UINT8(flip_flop, struct dma_cont), - VMSTATE_INT32(dshift, struct dma_cont), - VMSTATE_STRUCT_ARRAY(regs, struct dma_cont, 4, 1, vmstate_dma_re= gs, struct dma_regs), + VMSTATE_UINT8(command, I8257State), + VMSTATE_UINT8(mask, I8257State), + VMSTATE_UINT8(flip_flop, I8257State), + VMSTATE_INT32(dshift, I8257State), + VMSTATE_STRUCT_ARRAY(regs, I8257State, 4, 1, vmstate_dma_regs, + struct dma_regs), VMSTATE_END_OF_LIST() } }; --=20 2.4.3