Search
lxdream.org :: lxdream/src/asic.c :: diff
lxdream 0.9.1
released Jun 29
Download Now
filename src/asic.c
changeset 422:61a0598e07ff
prev342:850502f0e8de
next430:467519b050f4
author nkeynes
date Sat Oct 06 09:03:24 2007 +0000 (12 years ago)
permissions -rw-r--r--
last change Fix compilation warnings
file annotate diff log raw
1.1 --- a/src/asic.c Wed Jan 31 10:58:42 2007 +0000
1.2 +++ b/src/asic.c Sat Oct 06 09:03:24 2007 +0000
1.3 @@ -1,5 +1,5 @@
1.4 /**
1.5 - * $Id: asic.c,v 1.28 2007-01-31 10:58:42 nkeynes Exp $
1.6 + * $Id: asic.c,v 1.29 2007-10-06 08:59:42 nkeynes Exp $
1.7 *
1.8 * Support for the miscellaneous ASIC functions (Primarily event multiplexing,
1.9 * and DMA).
1.10 @@ -25,9 +25,11 @@
1.11 #include "mem.h"
1.12 #include "sh4/intc.h"
1.13 #include "sh4/dmac.h"
1.14 +#include "sh4/sh4core.h"
1.15 #include "dreamcast.h"
1.16 #include "maple/maple.h"
1.17 #include "gdrom/ide.h"
1.18 +#include "pvr2/pvr2.h"
1.19 #include "asic.h"
1.20 #define MMIO_IMPL
1.21 #include "asic.h"
1.22 @@ -269,7 +271,7 @@
1.23 uint32_t sh4addr = MMIO_READ( EXTDMA, G2DMA0SH4 + offset );
1.24 uint32_t length = MMIO_READ( EXTDMA, G2DMA0SIZ + offset ) & 0x1FFFFFFF;
1.25 uint32_t dir = MMIO_READ( EXTDMA, G2DMA0DIR + offset );
1.26 - uint32_t mode = MMIO_READ( EXTDMA, G2DMA0MOD + offset );
1.27 + // uint32_t mode = MMIO_READ( EXTDMA, G2DMA0MOD + offset );
1.28 char buf[length];
1.29 if( dir == 0 ) { /* SH4 to device */
1.30 mem_copy_from_sh4( buf, sh4addr, length );
1.31 @@ -294,7 +296,7 @@
1.32
1.33 uint32_t addr = MMIO_READ( EXTDMA, IDEDMASH4 );
1.34 uint32_t length = MMIO_READ( EXTDMA, IDEDMASIZ );
1.35 - int dir = MMIO_READ( EXTDMA, IDEDMADIR );
1.36 + // int dir = MMIO_READ( EXTDMA, IDEDMADIR );
1.37
1.38 uint32_t xfer = ide_read_data_dma( addr, length );
1.39 MMIO_WRITE( EXTDMA, IDEDMATXSIZ, xfer );
.