Consistent naming for screen dimension constants.

diff --git a/libsrc/osic1p/_scrsize.s b/libsrc/osic1p/_scrsize.s
index b0241c547ff72f5336a141e99cda0d808b585c6f..be07234b4982e96f98e45adecd4eb372afeea4b7 100644 (file)
--- a/libsrc/osic1p/_scrsize.s
+++ b/libsrc/osic1p/_scrsize.s
@@ -13,7 +13,7 @@
         .include        "osic1p.inc"
 
 .proc   screensize
-        ldx     #SCR_LINELEN
+        ldx     #SCR_WIDTH
         ldy     #SCR_HEIGHT
         rts
 .endproc

diff --git a/libsrc/osic1p/cputc.s b/libsrc/osic1p/cputc.s
index 9e6ae3253f5e04135b3fdf3b00f094e0c894ad78..e986daad1a5506901de6a971678cc231f99c85cd 100644 (file)
--- a/libsrc/osic1p/cputc.s
+++ b/libsrc/osic1p/cputc.s
@@ -35,7 +35,7 @@ cputdirect:
 ; Advance cursor position
 
 advance:
-        cpy     #(SCR_LINELEN - 1)
+        cpy     #(SCR_WIDTH - 1)
         bne     L3
         jsr     newline         ; new line
         ldy     #$FF            ; + cr

diff --git a/libsrc/osic1p/osic1p.inc b/libsrc/osic1p/osic1p.inc
index f49bc122b5a1a818b9202c4d81262db92d59dace..b5d48f32eeb5b9d95f7ca4347b130c9e74bf0544 100644 (file)
--- a/libsrc/osic1p/osic1p.inc
+++ b/libsrc/osic1p/osic1p.inc
@@ -6,5 +6,5 @@ KBD             := $DF00        ; Polled keyboard register
 \r
 ; Other definitions\r
 VIDEORAMSIZE    = $0400         ; Size of C1P video RAM (1 kB)\r
-SCR_LINELEN     = $19           ; screen width\r
-SCR_HEIGHT      = $19           ; screen height\r
+SCR_WIDTH       = $19           ; Screen width\r
+SCR_HEIGHT      = $19           ; Screen height\r