aboutsummaryrefslogtreecommitdiff
path: root/sdk-modifications/libsrc/dma
diff options
context:
space:
mode:
authorNebuleon Fumika2013-02-03 05:59:48 -0500
committerNebuleon Fumika2013-02-03 05:59:48 -0500
commit461f2406555faaee7191871390192d06625f5a81 (patch)
treeedbbc706e1b565855c2ae37289a622429b454988 /sdk-modifications/libsrc/dma
parentfd92545013ed91d2867e1e180a9b86611eb19f9c (diff)
downloadsnes9x2005-461f2406555faaee7191871390192d06625f5a81.tar.gz
snes9x2005-461f2406555faaee7191871390192d06625f5a81.tar.bz2
snes9x2005-461f2406555faaee7191871390192d06625f5a81.zip
Fix a name clash between Snes9x's dma.h and the DS2 dma.h by renaming the DS2 dma.h to ds2_dma.h.
Add preliminary support for drawing emulated screens with DS2 DMA.
Diffstat (limited to 'sdk-modifications/libsrc/dma')
-rw-r--r--sdk-modifications/libsrc/dma/dmacopy.c2
-rw-r--r--sdk-modifications/libsrc/dma/ds2_dma.h (renamed from sdk-modifications/libsrc/dma/dma.h)8
2 files changed, 9 insertions, 1 deletions
diff --git a/sdk-modifications/libsrc/dma/dmacopy.c b/sdk-modifications/libsrc/dma/dmacopy.c
index 2c5a2b1..83609d3 100644
--- a/sdk-modifications/libsrc/dma/dmacopy.c
+++ b/sdk-modifications/libsrc/dma/dmacopy.c
@@ -1,5 +1,5 @@
#include <stdlib.h>
-#include "dma.h"
+#include "ds2_dma.h"
#include "ds2_types.h"
#define MAX_DMA_NUM 6 /* max 6 channels */
diff --git a/sdk-modifications/libsrc/dma/dma.h b/sdk-modifications/libsrc/dma/ds2_dma.h
index f6ff230..491df0e 100644
--- a/sdk-modifications/libsrc/dma/dma.h
+++ b/sdk-modifications/libsrc/dma/ds2_dma.h
@@ -1,6 +1,10 @@
#ifndef __DMA_H__
#define __DMA_H__
+#ifdef __cplusplus
+extern "C" {
+#endif
+
//register a DMA transfer request
//ch: channel id request, there are 6 channles,
//irq_handler: the DMA interruption handle
@@ -42,5 +46,9 @@ extern int dma_isBusy(int ch);
extern int dma_isFree(int ch);
extern int dma_getFree(void);
+#ifdef __cplusplus
+}
+#endif
+
#endif //__DMA_H__