motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 00:03:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

ETRAX machine updates.

Browse source 
* Move DMA_run into the dma controller to allow for multiple ETRAX/CRIS machines.
* Support both ELF and kimage kernel images.
* Correct emulation of the DMA RW_DATA register.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4678 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
edgar_igl 2008-06-06 10:58:48 +00:00
parent 96768ff79c
commit fa1bdde4a3
2 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
hw/etraxfs_dma.c
View file

@ -273,6 +273,7 @@ static void channel_load_d(struct fs_dma_ctrl *ctrl, int c)
sizeof ctrl->channels[c].current_d);
D(dump_d(c, &ctrl->channels[c].current_d));
ctrl->channels[c].regs[RW_DATA] = addr;
ctrl->channels[c].regs[RW_SAVED_DATA_BUF] =
(uint32_t)ctrl->channels[c].current_d.buf;
}
@ -561,7 +562,7 @@ dma_writel (void *opaque, target_phys_addr_t addr, uint32_t value)
switch (addr)
{
case RW_DATA:
printf("RW_DATA=%x\n", value);
ctrl->channels[c].regs[addr] = value;
break;
case RW_CFG:
@ -658,6 +659,13 @@ void etraxfs_dmac_connect_client(void *opaque, int c,
}
static void *etraxfs_dmac;
void DMA_run(void)
{
if (etraxfs_dmac)
etraxfs_dmac_run(etraxfs_dmac);
}
void *etraxfs_dmac_init(CPUState *env,
target_phys_addr_t base, int nr_channels)
{
@ -686,6 +694,8 @@ void *etraxfs_dmac_init(CPUState *env,
ctrl->channels[i].regmap);
}
/* Hax, we only support one DMA controller at a time. */
etraxfs_dmac = ctrl;
return ctrl;
err:
qemu_free(ctrl->channels);