diff options
| author | Alexander Graf <agraf@suse.de> | 2013-06-30 02:22:41 +0200 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-07-11 18:51:24 +0200 |
| commit | d2f0ce2189feef94516d81fa5834fa4d65435053 (patch) | |
| tree | 573ab2186b7293c607bf9e9010604e59acbd1c7c | |
| parent | d1e562deb2de5c2ced639b18dee59a9ab08236b6 (diff) | |
PPC: dbdma: Move static bh variable to device struct
The DBDMA controller has a bottom half to asynchronously process DMA
request queues.
This bh was stored as a gross static variable. Move it into the device
struct instead.
While at it, move all users of it to the new generic kick function.
Signed-off-by: Alexander Graf <agraf@suse.de>
| -rw-r--r-- | hw/misc/macio/mac_dbdma.c | 24 | ||||
| -rw-r--r-- | include/hw/ppc/mac_dbdma.h | 1 |
2 files changed, 16 insertions, 9 deletions
diff --git a/hw/misc/macio/mac_dbdma.c b/hw/misc/macio/mac_dbdma.c index d1506ce228..4ca0491fab 100644 --- a/hw/misc/macio/mac_dbdma.c +++ b/hw/misc/macio/mac_dbdma.c @@ -54,6 +54,11 @@ /* */ +static DBDMAState *dbdma_from_ch(DBDMA_channel *ch) +{ + return container_of(ch, DBDMAState, channels[ch->channel]); +} + #ifdef DEBUG_DBDMA static void dump_dbdma_cmd(dbdma_cmd *cmd) { @@ -248,7 +253,6 @@ static void conditional_branch(DBDMA_channel *ch) } } -static QEMUBH *dbdma_bh; static void channel_run(DBDMA_channel *ch); static void dbdma_end(DBDMA_io *io) @@ -365,7 +369,7 @@ static void load_word(DBDMA_channel *ch, int key, uint32_t addr, next(ch); wait: - qemu_bh_schedule(dbdma_bh); + DBDMA_kick(dbdma_from_ch(ch)); } static void store_word(DBDMA_channel *ch, int key, uint32_t addr, @@ -403,7 +407,7 @@ static void store_word(DBDMA_channel *ch, int key, uint32_t addr, next(ch); wait: - qemu_bh_schedule(dbdma_bh); + DBDMA_kick(dbdma_from_ch(ch)); } static void nop(DBDMA_channel *ch) @@ -420,7 +424,7 @@ static void nop(DBDMA_channel *ch) conditional_branch(ch); wait: - qemu_bh_schedule(dbdma_bh); + DBDMA_kick(dbdma_from_ch(ch)); } static void stop(DBDMA_channel *ch) @@ -538,7 +542,7 @@ static void DBDMA_run_bh(void *opaque) void DBDMA_kick(DBDMAState *dbdma) { - qemu_bh_schedule(dbdma_bh); + qemu_bh_schedule(dbdma->bh); } void DBDMA_register_channel(void *dbdma, int nchan, qemu_irq irq, @@ -594,10 +598,12 @@ dbdma_control_write(DBDMA_channel *ch) ch->regs[DBDMA_STATUS] = status; - if (status & ACTIVE) - qemu_bh_schedule(dbdma_bh); - if ((status & FLUSH) && ch->flush) + if (status & ACTIVE) { + DBDMA_kick(dbdma_from_ch(ch)); + } + if ((status & FLUSH) && ch->flush) { ch->flush(&ch->io); + } } static void dbdma_write(void *opaque, hwaddr addr, @@ -750,7 +756,7 @@ void* DBDMA_init (MemoryRegion **dbdma_mem) vmstate_register(NULL, -1, &vmstate_dbdma, s); qemu_register_reset(dbdma_reset, s); - dbdma_bh = qemu_bh_new(DBDMA_run_bh, s); + s->bh = qemu_bh_new(DBDMA_run_bh, s); return s; } diff --git a/include/hw/ppc/mac_dbdma.h b/include/hw/ppc/mac_dbdma.h index aaeab10b6c..eb8e0f0075 100644 --- a/include/hw/ppc/mac_dbdma.h +++ b/include/hw/ppc/mac_dbdma.h @@ -154,6 +154,7 @@ typedef struct DBDMA_channel { typedef struct { MemoryRegion mem; DBDMA_channel channels[DBDMA_CHANNELS]; + QEMUBH *bh; } DBDMAState; /* Externally callable functions */ |