From ac81f8ac0b67bbadb0d660d4d4552c7adb931cf4 Mon Sep 17 00:00:00 2001 From: Wei-ju Wu Date: Wed, 15 Jun 2016 10:23:11 -0700 Subject: [PATCH] added the libraries sub project --- libraries/example_lib | 1 + scrolling_tricks/Makefile | 6 +- scrolling_tricks/cop.asm | 226 ---------------------------------- scrolling_tricks/cop.h | 29 ----- scrolling_tricks/xlimited.c | 2 +- scrolling_tricks/xunlimited.c | 2 +- 6 files changed, 6 insertions(+), 260 deletions(-) create mode 160000 libraries/example_lib delete mode 100644 scrolling_tricks/cop.asm delete mode 100644 scrolling_tricks/cop.h diff --git a/libraries/example_lib b/libraries/example_lib new file mode 160000 index 0000000..1748169 --- /dev/null +++ b/libraries/example_lib @@ -0,0 +1 @@ +Subproject commit 17481696faee8126a032f4263b00757a9468200a diff --git a/scrolling_tricks/Makefile b/scrolling_tricks/Makefile index 8f35efc..c742e94 100644 --- a/scrolling_tricks/Makefile +++ b/scrolling_tricks/Makefile @@ -10,15 +10,15 @@ all: xunlimited xlimited clean: rm -f xunlimited xlimited *.o -cop.o: cop.asm +cop_x.o: cop_x.asm $(ASM) $(ASM_FLAGS) -o $@ $< .c.o: $(CC) $(CFLAGS) -c -o $@ $^ -xunlimited: hardware.o cop.o common.o xunlimited.o +xunlimited: hardware.o cop_x.o common.o xunlimited.o $(CC) -o $@ $^ -lamiga -lauto -xlimited: hardware.o cop.o common.o xlimited.o +xlimited: hardware.o cop_x.o common.o xlimited.o $(CC) -o $@ $^ -lamiga -lauto diff --git a/scrolling_tricks/cop.asm b/scrolling_tricks/cop.asm deleted file mode 100644 index a1085e7..0000000 --- a/scrolling_tricks/cop.asm +++ /dev/null @@ -1,226 +0,0 @@ - - SECTION copperlist,DATA,CHIP - - XDEF _CopperList - XDEF _CopFETCHMODE - XDEF _CopBPLCON0 - XDEF _CopBPLCON1 - XDEF _CopBPLCON3 - XDEF _CopBPLMODA - XDEF _CopBPLMODB - XDEF _CopDIWSTART - XDEF _CopDIWSTOP - XDEF _CopDDFSTART - XDEF _CopDDFSTOP - XDEF _CopPLANE1H - XDEF _CopPLANE1L - XDEF _CopPLANE2H - XDEF _CopPLANE2L - XDEF _CopPLANE3H - XDEF _CopPLANE3L - XDEF _CopPLANE4H - XDEF _CopPLANE4L - XDEF _CopPLANE5H - XDEF _CopPLANE5L - XDEF _CopPLANE6H - XDEF _CopPLANE6L - XDEF _CopPLANE7H - XDEF _CopPLANE7L - XDEF _CopPLANE8H - XDEF _CopPLANE8L - XDEF _CopSKY - -_CopperList: - dc.w $180,0 - -_CopFETCHMODE: - dc.w $1FC,0 - -_CopBPLCON0: - dc.w $100,0 - -_CopBPLCON1: - dc.w $102,0 - -_CopBPLCON3: - dc.w $106,0 - -_CopBPLMODA: - dc.w $108,0 - -_CopBPLMODB: - dc.w $10A,0 - -_CopDIWSTART: - dc.w $8e,0 - -_CopDIWSTOP: - dc.w $90,0 - -_CopDDFSTART: - dc.w $92,0 - -_CopDDFSTOP: - dc.w $94,0 - -_CopPLANE1H: - dc.w $e0,0 - -_CopPLANE1L: - dc.w $e2,0 - -_CopPLANE2H: - dc.w $e4,0 - -_CopPLANE2L: - dc.w $e6,0 - -_CopPLANE3H: - dc.w $e8,0 - -_CopPLANE3L: - dc.w $ea,0 - -_CopPLANE4H: - dc.w $ec,0 - -_CopPLANE4L: - dc.w $ee,0 - -_CopPLANE5H: - dc.w $f0,0 - -_CopPLANE5L: - dc.w $f2,0 - -_CopPLANE6H: - dc.w $f4,0 - -_CopPLANE6L: - dc.w $f6,0 - -_CopPLANE7H: - dc.w $f8,0 - -_CopPLANE7L: - dc.w $fa,0 - -_CopPLANE8H: - dc.w $fc,0 - -_CopPLANE8L: - dc.w $fe,0 - -_CopSKY: - dc.w -1,-2 - dc.w $180,$FFF - - dc.w $390f,-2 - dc.w $180,$EEF - dc.w $3A0f,-2 - dc.w $180,$FFF - dc.w $3B0f,-2 - dc.w $180,$EEF - - dc.w $490f,-2 - dc.w $180,$DDF - dc.w $4a0f,-2 - dc.w $180,$EEF - dc.w $4b0f,-2 - dc.w $180,$DDF - - dc.w $590f,-2 - dc.w $180,$CCF - dc.w $5A0f,-2 - dc.w $180,$DDF - dc.w $5B0f,-2 - dc.w $180,$CCF - - dc.w $690f,-2 - dc.w $180,$BBF - dc.w $6A0f,-2 - dc.w $180,$CCF - dc.w $6B0f,-2 - dc.w $180,$BBF - - dc.w $790f,-2 - dc.w $180,$AAF - dc.w $7A0f,-2 - dc.w $180,$BBF - dc.w $7B0f,-2 - dc.w $180,$AAF - - dc.w $890f,-2 - dc.w $180,$99E - dc.w $8A0f,-2 - dc.w $180,$AAF - dc.w $8B0f,-2 - dc.w $180,$99E - - dc.w $990f,-2 - dc.w $180,$88E - dc.w $9A0f,-2 - dc.w $180,$99E - dc.w $9B0f,-2 - dc.w $180,$88E - - dc.w $A90f,-2 - dc.w $180,$77E - dc.w $AA0f,-2 - dc.w $180,$88E - dc.w $AB0f,-2 - dc.w $180,$77E - - dc.w $B90f,-2 - dc.w $180,$66E - dc.w $BA0f,-2 - dc.w $180,$77E - dc.w $BB0f,-2 - dc.w $180,$66E - - dc.w $C90f,-2 - dc.w $180,$55D - dc.w $CA0f,-2 - dc.w $180,$66E - dc.w $CB0f,-2 - dc.w $180,$55D - - dc.w $D90f,-2 - dc.w $180,$44D - dc.w $DA0f,-2 - dc.w $180,$55D - dc.w $DB0f,-2 - dc.w $180,$44D - - dc.w $E90f,-2 - dc.w $180,$33D - dc.w $EA0f,-2 - dc.w $180,$44D - dc.w $EB0f,-2 - dc.w $180,$33D - - dc.w $F90f,-2 - dc.w $180,$22C - dc.w $FA0f,-2 - dc.w $180,$33D - dc.w $FB0f,-2 - dc.w $180,$22C - - dc.w $FFDF,-2 - dc.w $090F,-2 - dc.w $180,$11C - dc.w $0A0F,-2 - dc.w $180,$22C - dc.w $0B0F,-2 - dc.w $180,$11C - - dc.w $190f,-2 - dc.w $180,$00B - dc.w $1A0f,-2 - dc.w $180,$11C - dc.w $1B0f,-2 - dc.w $180,$00B - - dc.w -1,-2 - END - diff --git a/scrolling_tricks/cop.h b/scrolling_tricks/cop.h deleted file mode 100644 index 4b392b7..0000000 --- a/scrolling_tricks/cop.h +++ /dev/null @@ -1,29 +0,0 @@ -extern WORD CopperList[]; -extern WORD CopFETCHMODE[]; -extern WORD CopBPLCON0[]; -extern WORD CopBPLCON1[]; -extern WORD CopBPLCON3[]; -extern WORD CopBPLMODA[]; -extern WORD CopBPLMODB[]; -extern WORD CopDIWSTART[]; -extern WORD CopDIWSTOP[]; -extern WORD CopDDFSTART[]; -extern WORD CopDDFSTOP[]; -extern WORD CopPLANE1H[]; -extern WORD CopPLANE1L[]; -extern WORD CopPLANE2H[]; -extern WORD CopPLANE2L[]; -extern WORD CopPLANE3H[]; -extern WORD CopPLANE3L[]; -extern WORD CopPLANE4H[]; -extern WORD CopPLANE4L[]; -extern WORD CopPLANE5H[]; -extern WORD CopPLANE5L[]; -extern WORD CopPLANE6H[]; -extern WORD CopPLANE6L[]; -extern WORD CopPLANE7H[]; -extern WORD CopPLANE7L[]; -extern WORD CopPLANE8H[]; -extern WORD CopPLANE8L[]; -extern WORD CopSKY[]; - diff --git a/scrolling_tricks/xlimited.c b/scrolling_tricks/xlimited.c index 404e379..e7562aa 100644 --- a/scrolling_tricks/xlimited.c +++ b/scrolling_tricks/xlimited.c @@ -15,7 +15,7 @@ #include #include "hardware.h" -#include "cop.h" +#include "cop_x.h" #include "global_defs.h" #include "common.h" diff --git a/scrolling_tricks/xunlimited.c b/scrolling_tricks/xunlimited.c index d56b078..e7dac48 100644 --- a/scrolling_tricks/xunlimited.c +++ b/scrolling_tricks/xunlimited.c @@ -15,7 +15,7 @@ #include #include "hardware.h" -#include "cop.h" +#include "cop_x.h" #include "global_defs.h" #include "common.h"