[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/17] i8257: rename struct dma_cont to I8257State
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH 03/17] i8257: rename struct dma_cont to I8257State |
Date: |
Tue, 29 Dec 2015 09:04:40 +0100 |
Signed-off-by: Hervé Poussineau <address@hidden>
---
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 4d0b49d..f4fcf39 100644
--- a/hw/dma/i8257.c
+++ b/hw/dma/i8257.c
@@ -52,7 +52,7 @@ struct dma_regs {
#define ADDR 0
#define COUNT 1
-static struct dma_cont {
+typedef struct I8257State {
uint8_t status;
uint8_t command;
uint8_t mask;
@@ -61,7 +61,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];
enum {
CMD_MEMORY_TO_MEMORY = 0x01,
@@ -84,7 +86,7 @@ static int channels[8] = {-1, 2, 3, 1, -1, -1, -1, 0};
static void write_page (void *opaque, uint32_t nport, uint32_t data)
{
- struct dma_cont *d = opaque;
+ I8257State *d = opaque;
int ichan;
ichan = channels[nport & 7];
@@ -97,7 +99,7 @@ static void write_page (void *opaque, uint32_t nport,
uint32_t data)
static void write_pageh (void *opaque, uint32_t nport, uint32_t data)
{
- struct dma_cont *d = opaque;
+ I8257State *d = opaque;
int ichan;
ichan = channels[nport & 7];
@@ -110,7 +112,7 @@ static void write_pageh (void *opaque, uint32_t nport,
uint32_t data)
static uint32_t read_page (void *opaque, uint32_t nport)
{
- struct dma_cont *d = opaque;
+ I8257State *d = opaque;
int ichan;
ichan = channels[nport & 7];
@@ -123,7 +125,7 @@ static uint32_t read_page (void *opaque, uint32_t nport)
static uint32_t read_pageh (void *opaque, uint32_t nport)
{
- struct dma_cont *d = opaque;
+ I8257State *d = opaque;
int ichan;
ichan = channels[nport & 7];
@@ -134,7 +136,7 @@ static uint32_t read_pageh (void *opaque, uint32_t nport)
return d->regs[ichan].pageh;
}
-static inline void init_chan (struct dma_cont *d, int ichan)
+static inline void init_chan(I8257State *d, int ichan)
{
struct dma_regs *r;
@@ -143,7 +145,7 @@ static inline void init_chan (struct dma_cont *d, int ichan)
r->now[COUNT] = 0;
}
-static inline int getff (struct dma_cont *d)
+static inline int getff(I8257State *d)
{
int ff;
@@ -154,7 +156,7 @@ static inline int getff (struct dma_cont *d)
static uint64_t read_chan(void *opaque, hwaddr nport, unsigned size)
{
- struct dma_cont *d = opaque;
+ I8257State *d = opaque;
int ichan, nreg, iport, ff, val, dir;
struct dma_regs *r;
@@ -177,7 +179,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 = opaque;
+ I8257State *d = opaque;
int iport, ichan, nreg;
struct dma_regs *r;
@@ -196,7 +198,7 @@ static void write_chan(void *opaque, hwaddr nport, uint64_t
data,
static void write_cont(void *opaque, hwaddr nport, uint64_t data,
unsigned size)
{
- struct dma_cont *d = opaque;
+ I8257State *d = opaque;
int iport, ichan = 0;
iport = (nport >> d->dshift) & 0x0f;
@@ -284,7 +286,7 @@ static void write_cont(void *opaque, hwaddr nport, uint64_t
data,
static uint64_t read_cont(void *opaque, hwaddr nport, unsigned size)
{
- struct dma_cont *d = opaque;
+ I8257State *d = opaque;
int iport, val;
iport = (nport >> d->dshift) & 0x0f;
@@ -361,7 +363,7 @@ static bool dma_bh_scheduled;
static void DMA_run (void)
{
- struct dma_cont *d;
+ I8257State *d;
int icont, ichan;
int rearm = 0;
static int running = 0;
@@ -473,7 +475,7 @@ void DMA_schedule(void)
static void dma_reset(void *opaque)
{
- struct dma_cont *d = opaque;
+ I8257State *d = opaque;
write_cont(d, (0x05 << d->dshift), 0, 1);
}
@@ -519,7 +521,7 @@ static const MemoryRegionOps cont_io_ops = {
};
/* dshift = 0: 8 bit DMA, 1 = 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;
@@ -579,11 +581,12 @@ static const VMStateDescription vmstate_dma = {
.minimum_version_id = 1,
.post_load = dma_post_load,
.fields = (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_regs,
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()
}
};
--
2.1.4
- [Qemu-devel] [PATCH 00/17] ISA DMA controllers cleanup (i8257, i82374), Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 08/17] isa: add an ISA DMA interface, and store it within the ISA bus, Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 06/17] i8257: add missing const, Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 14/17] cs4231a: use IsaDma interface instead of global DMA_* functions, Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 15/17] gus: use IsaDma interface instead of global DMA_* functions, Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 04/17] i8257: rename functions to start with i8257_ prefix, Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 16/17] sb16: use IsaDma interface instead of global DMA_* functions, Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 05/17] i8257: make the DMA running method per controller, Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 03/17] i8257: rename struct dma_cont to I8257State,
Hervé Poussineau <=
- [Qemu-devel] [PATCH 02/17] i8257: pass ISA bus to DMA_init() function, Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 09/17] i8257: implement the IsaDma interface, Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 10/17] magnum: disable floppy DMA for now, Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 07/17] i8257: QOM'ify, Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 01/17] i82374: device only existed as ISA device, so simplify device, Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 12/17] sparc64: disable floppy DMA, Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 17/17] dma: remove now useless DMA_* functions, Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 11/17] sparc: disable floppy DMA, Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 13/17] fdc: use IsaDma interface instead of global DMA_* functions, Hervé Poussineau, 2015/12/29
- [Qemu-devel] [PATCH 09/17] i8257: register the IsaDma interface, Hervé Poussineau, 2015/12/29