Merge pull request #230 from eduardocasino/vt100

Proposal: Move Ivo van Poorten's scrvt100 driver to apps

Author: davidgiven

apps/build.py

@@ -79,3 +79,11 @@ def asm(self, name, src: Target = None, deps: Targets = []):
         "include",
     ],
 )
+
+llvmprogram(
+    name="scrvt100",
+    srcs=["./scrvt100.S"],
+    deps=[
+        "include",
+    ],
+)

src/arch/osi/utils/scrvt100.S apps/scrvt100.Ssrc/arch/osi/utils/scrvt100.S renamed to apps/scrvt100.S

@@ -9,6 +9,9 @@
 ; -------------------------------------------------------------------------
 
 #include "zif.inc"
+
+; force clang version and not the asm.com version
+
 #include "cpm65.inc"
 #include "driver.inc"
 #include "jumptables.inc"

src/arch/kim-1/build.py

@@ -7,15 +7,19 @@
     MINIMAL_APPS_SRCS,
     BIG_APPS,
     BIG_APPS_SRCS,
+    SCREEN_APPS,
+    BIG_SCREEN_APPS,
     PASCAL_APPS,
 )
 
 COMMODORE_ITEMS = (
-    {"0:ccp.sys@sr": "src+ccp", "0:bdos.sys@sr": "src/bdos"}
+    {"0:ccp.sys@sr": "src+ccp", "0:bdos.sys@sr": "src/bdos",
+     "0:scrvt100.com": "apps+scrvt100"}
     | MINIMAL_APPS
     | MINIMAL_APPS_SRCS
     | BIG_APPS
     | BIG_APPS_SRCS
+    | SCREEN_APPS
 )
 
 
@@ -96,12 +100,22 @@ def mkcbmfs(self, name, items: TargetsMap = {}, title="CBMFS", id=None):
     format="k-1013",
     bootimage=".+bios-k1013",
     size=256 * 77 * 26,
-    items={"0:ccp.sys@sr": "src+ccp", "0:bdos.sys@sr": "src/bdos"}
-    | {"0:pasc.pas": "third_party/pascal-m+pasc_pas_cpm"}
+    items={
+        "0:ccp.sys@sr": "src+ccp", "0:bdos.sys@sr": "src/bdos",
+        "0:scrvt100.com": "apps+scrvt100",
+        "0:format.com": "src/arch/kim-1/utils+format",
+        "0:format.txt": "src/arch/kim-1/cpmfs/format.txt",
+        "0:imu.com": "src/arch/kim-1/utils+imu",
+        "0:imu.txt": "src/arch/kim-1/cpmfs/imu.txt",
+        "0:sys.com": "apps+sys",
+        "0:pasc.pas": "third_party/pascal-m+pasc_pas_cpm",
+    }
     | MINIMAL_APPS
     | MINIMAL_APPS_SRCS
     | BIG_APPS
     | BIG_APPS_SRCS
+    | SCREEN_APPS
+    | BIG_SCREEN_APPS
     | PASCAL_APPS,
 )
 
@@ -110,12 +124,17 @@ def mkcbmfs(self, name, items: TargetsMap = {}, title="CBMFS", id=None):
     format="sdcard",
     bootimage=".+bios-sdcard",
     size=512 * 4096 * 16,
-    items={"0:ccp.sys@sr": "src+ccp", "0:bdos.sys@sr": "src/bdos"}
-    | {"0:pasc.pas": "third_party/pascal-m+pasc_pas_cpm"}
+    items={
+        "0:ccp.sys@sr": "src+ccp", "0:bdos.sys@sr": "src/bdos",
+        "0:scrvt100.com": "apps+scrvt100",
+        "0:pasc.pas": "third_party/pascal-m+pasc_pas_cpm",
+    }
     | MINIMAL_APPS
     | MINIMAL_APPS_SRCS
     | BIG_APPS
     | BIG_APPS_SRCS
+    | SCREEN_APPS
+    | BIG_SCREEN_APPS
     | PASCAL_APPS,
 )
 

src/arch/osi/build.py

@@ -290,7 +290,7 @@
     items={
         "0:ccp.sys@sr": "src+ccp",
         "0:bdos.sys@sr": "src/bdos",
-        "0:scrvt100.com": "src/arch/osi/utils+scrvt100",
+        "0:scrvt100.com": "apps+scrvt100",
     }
     | MINIMAL_APPS
     | BIG_APPS

src/arch/osi/utils/build.py

@@ -1,24 +1,4 @@
 from build.llvm import llvmprogram
 
-llvmprogram(
-    name="tty540b",
-    srcs=["./tty540b.S"],
-    deps=[
-        "include",
-    ],
-)
-llvmprogram(
-    name="scrvt100",
-    srcs=["./scrvt100.S"],
-    deps=[
-        "include",
-    ],
-)
-llvmprogram(
-    name="tty630",
-    srcs=["./tty540b.S"],
-    deps=[
-        "include",
-    ],
-    cflags=["-DOSI630"],
-)
+llvmprogram( name="tty540b", srcs=["./tty540b.S"], deps=[ "include", ],)
+llvmprogram( name="tty630", srcs=["./tty540b.S"], deps=[ "include", ], cflags=["-DOSI630"],)