proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-06-14 21:59:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DMA API change

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@646 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2004-02-25 23:25:55 +00:00
parent 8b1f24b090
commit 16f62432c4
2 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
hw/dma.c
View File

@ -39,7 +39,6 @@
#define ldebug(...) #define ldebug(...)
#endif #endif
#define MEM_REAL(addr) ((addr)+(uint32_t)(phys_ram_base))
#define LENOFA(a) ((int) (sizeof(a)/sizeof(a[0]))) #define LENOFA(a) ((int) (sizeof(a)/sizeof(a[0])))
struct dma_regs { struct dma_regs {
@ -49,8 +48,8 @@ struct dma_regs {
uint8_t page; uint8_t page;
uint8_t dack; uint8_t dack;
uint8_t eop; uint8_t eop;
DMA_read_handler read_handler; DMA_transfer_handler transfer_handler;
DMA_misc_handler misc_handler; void *opaque;
}; };
#define ADDR 0 #define ADDR 0
@ -284,40 +283,27 @@ static void channel_run (int ncont, int ichan)
{ {
struct dma_regs *r; struct dma_regs *r;
int n; int n;
int irq; target_ulong addr;
uint32_t addr;
/* int ai, dir; */ /* int ai, dir; */
r = dma_controllers[ncont].regs + ichan; r = dma_controllers[ncont].regs + ichan;
/* ai = r->mode & 16; */ /* ai = r->mode & 16; */
/* dir = r->mode & 32 ? -1 : 1; */ /* dir = r->mode & 32 ? -1 : 1; */
addr = MEM_REAL ((r->page << 16) | r->now[ADDR]); addr = (r->page << 16) | r->now[ADDR];
n = r->transfer_handler (r->opaque, addr,
irq = -1; (r->base[COUNT] << ncont) + (1 << ncont));
n = r->read_handler (addr, (r->base[COUNT] << ncont) + (1 << ncont), &irq);
r->now[COUNT] = n; r->now[COUNT] = n;
ldebug ("dma_pos %d irq %d size %d\n", ldebug ("dma_pos %d size %d\n",
n, irq, (r->base[1] << ncont) + (1 << ncont)); n, (r->base[1] << ncont) + (1 << ncont));
if (-1 != irq) {
pic_set_irq (irq, 1);
}
} }
void DMA_run (void) void DMA_run (void)
{ {
static int in_dma;
struct dma_cont *d; struct dma_cont *d;
int icont, ichan; int icont, ichan;
if (in_dma) {
log ("attempt to re-enter dma\n");
return;
}
in_dma = 1;
d = dma_controllers; d = dma_controllers;
for (icont = 0; icont < 2; icont++, d++) { for (icont = 0; icont < 2; icont++, d++) {
@ -330,12 +316,11 @@ void DMA_run (void)
channel_run (icont, ichan); channel_run (icont, ichan);
} }
} }
in_dma = 0;
} }
void DMA_register_channel (int nchan, void DMA_register_channel (int nchan,
DMA_read_handler read_handler, DMA_transfer_handler transfer_handler,
DMA_misc_handler misc_handler) void *opaque)
{ {
struct dma_regs *r; struct dma_regs *r;
int ichan, ncont; int ichan, ncont;
@ -344,8 +329,14 @@ void DMA_register_channel (int nchan,
ichan = nchan & 3; ichan = nchan & 3;
r = dma_controllers[ncont].regs + ichan; r = dma_controllers[ncont].regs + ichan;
r->read_handler = read_handler; r->transfer_handler = transfer_handler;
r->misc_handler = misc_handler; r->opaque = opaque;
}
/* request the emulator to transfer a new DMA memory block ASAP */
void DMA_schedule(int nchan)
{
cpu_interrupt(cpu_single_env, CPU_INTERRUPT_EXIT);
} }
void DMA_init (void) void DMA_init (void)

11
vl.h
View File

@ -24,8 +24,9 @@
#ifndef VL_H #ifndef VL_H
#define VL_H #define VL_H
#include "cpu.h"
/* vl.c */ /* vl.c */
struct CPUState;
extern int reset_requested; extern int reset_requested;
extern int64_t ticks_per_sec; extern int64_t ticks_per_sec;
@ -128,17 +129,15 @@ int AUD_get_buffer_size (void);
void AUD_init (void); void AUD_init (void);
/* dma.c */ /* dma.c */
typedef int (*DMA_read_handler) (uint32_t addr, int size, int *irq); typedef int (*DMA_transfer_handler) (void *opaque, target_ulong addr, int size);
typedef int (*DMA_misc_handler) (int);
int DMA_get_channel_mode (int nchan); int DMA_get_channel_mode (int nchan);
void DMA_hold_DREQ (int nchan); void DMA_hold_DREQ (int nchan);
void DMA_release_DREQ (int nchan); void DMA_release_DREQ (int nchan);
void DMA_schedule(int nchan);
void DMA_run (void); void DMA_run (void);
void DMA_init (void); void DMA_init (void);
void DMA_register_channel (int nchan, void DMA_register_channel (int nchan,
DMA_read_handler read_handler, DMA_transfer_handler transfer_handler, void *opaque);
DMA_misc_handler misc_handler);
/* sb16.c */ /* sb16.c */
void SB16_run (void); void SB16_run (void);