From 14c7e9fd1646ca07ee9c5abe1c23a85abba1df4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20M=C3=BChlstrasser?= Date: Tue, 3 Feb 2015 22:42:35 +0100 Subject: [PATCH] Rename c1p target to osic1p --- cfg/{c1p-asm.cfg => osic1p-asm.cfg} | 0 cfg/{c1p.cfg => osic1p.cfg} | 0 include/conio.h | 2 +- include/{c1p.h => osic1p.h} | 8 +- libsrc/Makefile | 2 +- libsrc/{c1p => osic1p}/_scrsize.s | 0 libsrc/{c1p => osic1p}/cclear.s | 0 libsrc/{c1p => osic1p}/cgetc.s | 2 +- libsrc/{c1p => osic1p}/chline.s | 0 libsrc/{c1p => osic1p}/clrscr.s | 2 +- libsrc/{c1p => osic1p}/cputc.s | 2 +- libsrc/{c1p => osic1p}/crt0.s | 0 libsrc/{c1p => osic1p}/ctype.s | 0 libsrc/{c1p => osic1p}/cvline.s | 0 libsrc/{c1p => osic1p}/extzp.inc | 0 libsrc/{c1p => osic1p}/extzp.s | 2 +- libsrc/{c1p => osic1p}/gotox.s | 0 libsrc/{c1p => osic1p}/gotoxy.s | 0 libsrc/{c1p => osic1p}/gotoy.s | 0 libsrc/{c1p => osic1p}/oserror.s | 0 libsrc/{c1p/c1p.inc => osic1p/osic1p.inc} | 0 libsrc/{c1p => osic1p}/wherex.s | 0 libsrc/{c1p => osic1p}/wherey.s | 0 src/c1p65.vcxproj | 94 ----------------------- src/ca65/main.c | 2 +- src/cc65/main.c | 2 +- src/common/target.c | 6 +- src/common/target.h | 6 +- 28 files changed, 18 insertions(+), 112 deletions(-) rename cfg/{c1p-asm.cfg => osic1p-asm.cfg} (100%) rename cfg/{c1p.cfg => osic1p.cfg} (100%) rename include/{c1p.h => osic1p.h} (92%) rename libsrc/{c1p => osic1p}/_scrsize.s (100%) rename libsrc/{c1p => osic1p}/cclear.s (100%) rename libsrc/{c1p => osic1p}/cgetc.s (93%) rename libsrc/{c1p => osic1p}/chline.s (100%) rename libsrc/{c1p => osic1p}/clrscr.s (91%) rename libsrc/{c1p => osic1p}/cputc.s (98%) rename libsrc/{c1p => osic1p}/crt0.s (100%) rename libsrc/{c1p => osic1p}/ctype.s (100%) rename libsrc/{c1p => osic1p}/cvline.s (100%) rename libsrc/{c1p => osic1p}/extzp.inc (100%) rename libsrc/{c1p => osic1p}/extzp.s (89%) rename libsrc/{c1p => osic1p}/gotox.s (100%) rename libsrc/{c1p => osic1p}/gotoxy.s (100%) rename libsrc/{c1p => osic1p}/gotoy.s (100%) rename libsrc/{c1p => osic1p}/oserror.s (100%) rename libsrc/{c1p/c1p.inc => osic1p/osic1p.inc} (100%) rename libsrc/{c1p => osic1p}/wherex.s (100%) rename libsrc/{c1p => osic1p}/wherey.s (100%) delete mode 100644 src/c1p65.vcxproj diff --git a/cfg/c1p-asm.cfg b/cfg/osic1p-asm.cfg similarity index 100% rename from cfg/c1p-asm.cfg rename to cfg/osic1p-asm.cfg diff --git a/cfg/c1p.cfg b/cfg/osic1p.cfg similarity index 100% rename from cfg/c1p.cfg rename to cfg/osic1p.cfg diff --git a/include/conio.h b/include/conio.h index f59375a63..10806785c 100644 --- a/include/conio.h +++ b/include/conio.h @@ -78,7 +78,7 @@ #elif defined(__NES__) # include #elif defined(__OSIC1P__) -# include +# include #endif diff --git a/include/c1p.h b/include/osic1p.h similarity index 92% rename from include/c1p.h rename to include/osic1p.h index 5789d7156..57fe0cd24 100644 --- a/include/c1p.h +++ b/include/osic1p.h @@ -1,12 +1,12 @@ /*****************************************************************************/ /* */ -/* c1p.h */ +/* osic1p.h */ /* */ /* Challenger 1P system specific definitions */ /* */ /* */ /* */ -/* (C) 2014 Stephan Muehlstrasser */ +/* (C) 2015 Stephan Muehlstrasser */ /* */ /* */ /* This software is provided 'as-is', without any expressed or implied */ @@ -28,8 +28,8 @@ /* */ /*****************************************************************************/ -#ifndef _C1P_H -#define _C1P_H +#ifndef _OSIC1P_H +#define _OSIC1P_H /* Check for errors */ #if !defined(__OSIC1P__) diff --git a/libsrc/Makefile b/libsrc/Makefile index b35ae1e38..42aaf078b 100644 --- a/libsrc/Makefile +++ b/libsrc/Makefile @@ -20,11 +20,11 @@ TARGETS = apple2 \ atarixl \ atari5200 \ atmos \ - c1p \ $(CBMS) \ $(GEOS) \ lynx \ nes \ + osic1p \ sim6502 \ sim65c02 \ supervision diff --git a/libsrc/c1p/_scrsize.s b/libsrc/osic1p/_scrsize.s similarity index 100% rename from libsrc/c1p/_scrsize.s rename to libsrc/osic1p/_scrsize.s diff --git a/libsrc/c1p/cclear.s b/libsrc/osic1p/cclear.s similarity index 100% rename from libsrc/c1p/cclear.s rename to libsrc/osic1p/cclear.s diff --git a/libsrc/c1p/cgetc.s b/libsrc/osic1p/cgetc.s similarity index 93% rename from libsrc/c1p/cgetc.s rename to libsrc/osic1p/cgetc.s index b17e76572..b5a519667 100644 --- a/libsrc/c1p/cgetc.s +++ b/libsrc/osic1p/cgetc.s @@ -4,7 +4,7 @@ .export _cgetc .import cursor - .include "c1p.inc" + .include "osic1p.inc" .include "extzp.inc" ; Input routine from 65V PROM MONITOR, show cursor if enabled diff --git a/libsrc/c1p/chline.s b/libsrc/osic1p/chline.s similarity index 100% rename from libsrc/c1p/chline.s rename to libsrc/osic1p/chline.s diff --git a/libsrc/c1p/clrscr.s b/libsrc/osic1p/clrscr.s similarity index 91% rename from libsrc/c1p/clrscr.s rename to libsrc/osic1p/clrscr.s index ce221f31e..32975526f 100644 --- a/libsrc/c1p/clrscr.s +++ b/libsrc/osic1p/clrscr.s @@ -4,7 +4,7 @@ .export _clrscr .import plot .importzp CURS_X, CURS_Y - .include "c1p.inc" + .include "osic1p.inc" ; Adapted from the Challenger Character Graphics ; Reference Manual, "2.3.3 MACHINE LANGUAGE SCREEN CLEAR" diff --git a/libsrc/c1p/cputc.s b/libsrc/osic1p/cputc.s similarity index 98% rename from libsrc/c1p/cputc.s rename to libsrc/osic1p/cputc.s index ca9152aa7..d343da951 100644 --- a/libsrc/c1p/cputc.s +++ b/libsrc/osic1p/cputc.s @@ -9,7 +9,7 @@ .export newline, plot .import popa, _gotoxy - .include "c1p.inc" + .include "osic1p.inc" .include "extzp.inc" _cputcxy: diff --git a/libsrc/c1p/crt0.s b/libsrc/osic1p/crt0.s similarity index 100% rename from libsrc/c1p/crt0.s rename to libsrc/osic1p/crt0.s diff --git a/libsrc/c1p/ctype.s b/libsrc/osic1p/ctype.s similarity index 100% rename from libsrc/c1p/ctype.s rename to libsrc/osic1p/ctype.s diff --git a/libsrc/c1p/cvline.s b/libsrc/osic1p/cvline.s similarity index 100% rename from libsrc/c1p/cvline.s rename to libsrc/osic1p/cvline.s diff --git a/libsrc/c1p/extzp.inc b/libsrc/osic1p/extzp.inc similarity index 100% rename from libsrc/c1p/extzp.inc rename to libsrc/osic1p/extzp.inc diff --git a/libsrc/c1p/extzp.s b/libsrc/osic1p/extzp.s similarity index 89% rename from libsrc/c1p/extzp.s rename to libsrc/osic1p/extzp.s index c55156f82..dfa84a61c 100644 --- a/libsrc/c1p/extzp.s +++ b/libsrc/osic1p/extzp.s @@ -18,4 +18,4 @@ SCR_LINELEN: .byte 24 SCREEN_PTR: .res 2 ; size 6 -; Adjust size of this segment in c1p.cfg if the size changes +; Adjust size of this segment in osic1p.cfg if the size changes diff --git a/libsrc/c1p/gotox.s b/libsrc/osic1p/gotox.s similarity index 100% rename from libsrc/c1p/gotox.s rename to libsrc/osic1p/gotox.s diff --git a/libsrc/c1p/gotoxy.s b/libsrc/osic1p/gotoxy.s similarity index 100% rename from libsrc/c1p/gotoxy.s rename to libsrc/osic1p/gotoxy.s diff --git a/libsrc/c1p/gotoy.s b/libsrc/osic1p/gotoy.s similarity index 100% rename from libsrc/c1p/gotoy.s rename to libsrc/osic1p/gotoy.s diff --git a/libsrc/c1p/oserror.s b/libsrc/osic1p/oserror.s similarity index 100% rename from libsrc/c1p/oserror.s rename to libsrc/osic1p/oserror.s diff --git a/libsrc/c1p/c1p.inc b/libsrc/osic1p/osic1p.inc similarity index 100% rename from libsrc/c1p/c1p.inc rename to libsrc/osic1p/osic1p.inc diff --git a/libsrc/c1p/wherex.s b/libsrc/osic1p/wherex.s similarity index 100% rename from libsrc/c1p/wherex.s rename to libsrc/osic1p/wherex.s diff --git a/libsrc/c1p/wherey.s b/libsrc/osic1p/wherey.s similarity index 100% rename from libsrc/c1p/wherey.s rename to libsrc/osic1p/wherey.s diff --git a/src/c1p65.vcxproj b/src/c1p65.vcxproj deleted file mode 100644 index dcc8f9926..000000000 --- a/src/c1p65.vcxproj +++ /dev/null @@ -1,94 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - - - - {4E031DE0-82B4-4204-8529-536626F7E0DF} - Win32Proj - c1p65 - - - - Application - true - v120 - - - - - Application - false - v120 - true - - - - - - - - - - - - - - - true - $(SolutionDir)..\bin\ - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - - - false - $(SolutionDir)..\bin\ - $(SolutionDir)..\wrk\$(ProjectName)\$(Configuration)\ - - - - - - Level3 - Disabled - _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - common - - - Console - true - $(IntDir)..\..\common\$(Configuration)\common.lib - - - - - Level3 - - - MaxSpeed - true - true - _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - common - - - Console - true - true - true - $(IntDir)..\..\common\$(Configuration)\common.lib - - - - - - \ No newline at end of file diff --git a/src/ca65/main.c b/src/ca65/main.c index 50878f47a..508f49603 100644 --- a/src/ca65/main.c +++ b/src/ca65/main.c @@ -303,7 +303,7 @@ static void SetSys (const char* Sys) NewSymbol ("__SIM65C02__", 1); break; - case TGT_C1P: + case TGT_OSIC1P: NewSymbol ("__OSIC1P__", 1); break; diff --git a/src/cc65/main.c b/src/cc65/main.c index b8963258d..ece22041a 100644 --- a/src/cc65/main.c +++ b/src/cc65/main.c @@ -258,7 +258,7 @@ static void SetSys (const char* Sys) DefineNumericMacro ("__SIM65C02__", 1); break; - case TGT_C1P: + case TGT_OSIC1P: DefineNumericMacro ("__OSIC1P__", 1); break; diff --git a/src/common/target.c b/src/common/target.c index b909e4d70..0b44ffa30 100644 --- a/src/common/target.c +++ b/src/common/target.c @@ -131,7 +131,6 @@ static const TargetEntry TargetMap[] = { { "bbc", TGT_BBC }, { "c128", TGT_C128 }, { "c16", TGT_C16 }, - { "c1p", TGT_C1P }, { "c64", TGT_C64 }, { "cbm510", TGT_CBM510 }, { "cbm610", TGT_CBM610 }, @@ -143,6 +142,7 @@ static const TargetEntry TargetMap[] = { { "module", TGT_MODULE }, { "nes", TGT_NES }, { "none", TGT_NONE }, + { "osic1p", TGT_OSIC1P }, { "pet", TGT_PET }, { "plus4", TGT_PLUS4 }, { "sim6502", TGT_SIM6502 }, @@ -163,12 +163,12 @@ static const TargetProperties PropertyTable[TGT_COUNT] = { { "atarixl", CPU_6502, BINFMT_BINARY, CTAtari }, { "vic20", CPU_6502, BINFMT_BINARY, CTPET }, { "c16", CPU_6502, BINFMT_BINARY, CTPET }, - { "c1p", CPU_6502, BINFMT_BINARY, CTNone }, { "c64", CPU_6502, BINFMT_BINARY, CTPET }, { "c128", CPU_6502, BINFMT_BINARY, CTPET }, { "plus4", CPU_6502, BINFMT_BINARY, CTPET }, { "cbm510", CPU_6502, BINFMT_BINARY, CTPET }, { "cbm610", CPU_6502, BINFMT_BINARY, CTPET }, + { "osic1p", CPU_6502, BINFMT_BINARY, CTNone }, { "pet", CPU_6502, BINFMT_BINARY, CTPET }, { "bbc", CPU_6502, BINFMT_BINARY, CTNone }, { "apple2", CPU_6502, BINFMT_BINARY, CTNone }, @@ -201,7 +201,7 @@ static int Compare (const void* Key, const void* Entry) return strcmp ((const char*) Key, ((const TargetEntry*)Entry)->Name); } - +#include target_t FindTarget (const char* Name) /* Find a target by name and return the target id. TGT_UNKNOWN is returned if diff --git a/src/common/target.h b/src/common/target.h index 067352deb..edce36fa5 100644 --- a/src/common/target.h +++ b/src/common/target.h @@ -59,13 +59,13 @@ typedef enum { TGT_ATARIXL, TGT_VIC20, TGT_C16, - TGT_C1P, TGT_C64, TGT_C128, TGT_PLUS4, TGT_CBM510, TGT_CBM610, - TGT_PET, + TGT_OSIC1P, + TGT_PET, TGT_BBC, TGT_APPLE2, TGT_APPLE2ENH, @@ -76,7 +76,7 @@ typedef enum { TGT_NES, TGT_SUPERVISION, TGT_LYNX, - TGT_SIM6502, + TGT_SIM6502, TGT_SIM65C02, TGT_COUNT /* Number of target systems */ } target_t;