Changed most of the library sources to use .CAP instead of .CPU.

libsrc/conio/cputs.s

@@ -8,13 +8,12 @@
         .export         _cputsxy, _cputs
         .import         gotoxy, _cputc
         .importzp       ptr1, tmp1
-        .macpack        cpu
 
 _cputsxy:
         sta     ptr1            ; Save s for later
         stx     ptr1+1
         jsr     gotoxy          ; Set cursor, pop x and y
-.if (.cpu .bitand CPU_ISET_65SC02)
+.if .cap(CPU_HAS_BRA8)
         bra     L0              ; Same as cputs...
 .else
         jmp     L0              ; Same as cputs...
@@ -24,7 +23,7 @@ _cputs: sta     ptr1            ; Save s
         stx     ptr1+1
 
 L0:
-.if (.cpu .bitand CPU_ISET_65SC02)
+.if .cap(CPU_HAS_ZPIND)
         lda     (ptr1)          ; (5)
 .else
         ldy     #0              ; (2)

libsrc/conio/scrsize.s

@@ -10,8 +10,6 @@
         .import         screensize
         .importzp       ptr1, ptr2
 
-        .macpack        cpu
-
 .proc   _screensize
 
         sta     ptr2            ; Store the y pointer
@@ -20,7 +18,7 @@
         jsr     screensize      ; Get screensize into X/Y
         tya                     ; Get Y size into A
 
-.if (.cpu .bitand ::CPU_ISET_65SC02)
+.if .cap(CPU_HAS_ZPIND)
         sta     (ptr2)
         txa
         sta     (ptr1)

libsrc/conio/vcprintf.s

@@ -10,7 +10,6 @@
         .importzp       c_sp, ptr1, ptr2, ptr3, tmp1
 
         .macpack        generic
-        .macpack        cpu
 
 .data
 
@@ -74,7 +73,7 @@ out:    jsr     popax           ; count
 
 ; Loop outputting characters
 
-.if (.cpu .bitand CPU_ISET_65SC02)
+.if .cap(CPU_HAS_ZPIND, CPU_HAS_BRA8)
 
 @L1:    dec     outdesc+6
         beq     @L4