X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Famiga%2Fmain.c;h=46c777abbf21a7c060d22e3140652c98f4283413;hb=3f381738bd1f53bace45c8bf9ffc6d772ff90aab;hp=354f1d644dea0f2801d6a46a107cb173113e4e8d;hpb=bba694e9bc50fb24ffe4b3c8f7b5d33f01b3ea4d;p=retrocrawl

diff --git a/src/amiga/main.c b/src/amiga/main.c
index 354f1d6..46c777a 100644
--- a/src/amiga/main.c
+++ b/src/amiga/main.c
@@ -3,8 +3,9 @@
 #include "copper.h"
 #include "gfx.h"
 #include "game.h"
+#include "serial.h"
 
-static uint32_t coplist[32];
+static uint32_t coplist[128];
 
 int main(void)
 {
@@ -13,6 +14,9 @@ int main(void)
 	REG_INTENA = SETBITS(INTEN_VERTB | INTEN_MASTER);
 	REG_DMACON = CLRBITS(DMA_ALL);
 
+	ser_init(38400);
+	ser_print("retrocrawl amiga starting up...\n");
+
 	init_gfx();
 
 	REG_COLOR0 = 0x111;
@@ -23,21 +27,20 @@ int main(void)
 
 	wait_vblank();
 
-	uint32_t *copptr = coplist;
+	init_copper(coplist, 32, COPPER_SINGLE);
 	for(i=0; i<NBPL; i++) {
 		uint32_t addr = (intptr_t)bplptr[i];
 		int reg = REGN_BPL1PTH + i * 4;
-		*copptr++ = COPPER_MOVE(reg, addr >> 16);
-		*copptr++ = COPPER_MOVE(reg + 2, addr);
+		add_copper(COPPER_MOVE(reg, addr >> 16));
+		add_copper(COPPER_MOVE(reg + 2, addr));
 	}
-	*copptr = COPPER_END;
-	REG32_COP1LC = (uint32_t)coplist;
-	REG_COPJMP1 = 0;
-
-	REG_DMACON = SETBITS(DMA_BPL | DMA_COPPER | DMA_BLITTER | DMA_MASTER);
+	*copperlist_end = COPPER_END;
 
 	game_init();
 
+	wait_vblank();
+	REG_DMACON = SETBITS(DMA_BPL | DMA_COPPER | DMA_BLITTER | DMA_SPRITE | DMA_MASTER);
+
 	for(;;) {
 		wait_vblank();
 		game_draw();