# HG changeset patch
# User boisy
# Date 1027176271 0
# Node ID c93ecc2622535548a3d62c8b3edbf1fc7f80c375
# Parent  9e9648e1729888e2c134c78f3ff619e58026eb84
More source enhancements

diff -r 9e9648e17298 -r c93ecc262253 level1/modules/ccdisk.asm
--- a/level1/modules/ccdisk.asm	Sat Jul 20 14:20:13 2002 +0000
+++ b/level1/modules/ccdisk.asm	Sat Jul 20 14:44:31 2002 +0000
@@ -28,10 +28,7 @@
 
 L0000    mod   eom,name,tylg,atrv,start,size
 
-u0000    rmb   1
-u0001    rmb   3
-u0004    rmb   4
-u0008    rmb   7
+         rmb   DRVBEG
 u000F    rmb   38
 u0035    rmb   8
 u003D    rmb   18
@@ -275,7 +272,7 @@
 L0188    ldx   ,u
          cmpx  ,y
          bne   L0198
-         leau  u0008,u
+         leau  $08,u
          leay  $08,y
          dec   ,s
          bne   L0188
diff -r 9e9648e17298 -r c93ecc262253 level1/modules/cchdisk.asm
--- a/level1/modules/cchdisk.asm	Sat Jul 20 14:20:13 2002 +0000
+++ b/level1/modules/cchdisk.asm	Sat Jul 20 14:44:31 2002 +0000
@@ -24,8 +24,7 @@
 
          mod   eom,name,tylg,atrv,start,size
 
-u0000    rmb   8
-u0008    rmb   7
+         rmb   DRVBEG
 u000F    rmb   91
 u006A    rmb   61
 u00A7    rmb   2
@@ -237,7 +236,7 @@
 L0134    ldx   ,u
          cmpx  ,y
          bne   L0144
-         leau  u0008,u
+         leau  $08,u
          leay  $08,y
          dec   ,s
          bne   L0134
diff -r 9e9648e17298 -r c93ecc262253 level1/modules/ccio.asm
--- a/level1/modules/ccio.asm	Sat Jul 20 14:20:13 2002 +0000
+++ b/level1/modules/ccio.asm	Sat Jul 20 14:44:31 2002 +0000
@@ -22,18 +22,7 @@
 
          mod   eom,name,tylg,atrv,start,size
 
-u0000    rmb   3
-u0003    rmb   1
-u0004    rmb   1
-u0005    rmb   4
-u0009    rmb   2
-u000B    rmb   1
-u000C    rmb   1
-u000D    rmb   11
-u0018    rmb   1
-u0019    rmb   1
-u001A    rmb   1
-u001B    rmb   2
+         rmb   V.SCF
 u001D    rmb   7
 u0024    rmb   1
 u0025    rmb   1
@@ -111,7 +100,7 @@
 *
 Init     stu   >D.KbdSta               store devmem ptr
          clra
-         leax  <u001D,u
+         leax  <$1D,u
          ldb   #$5D
 L002E    sta   ,x+
          decb
@@ -253,19 +242,19 @@
          stb   <u0078,u
 L012F    sta   ,x
          beq   L014F
-         cmpa  u000D,u
+         cmpa  V.PCHR,u
          bne   L013F
-         ldx   u0009,u
+         ldx   V.DEV2,u
          beq   L014F
          sta   $08,x
          bra   L014F
 L013F    ldb   #$03
-         cmpa  u000B,u
+         cmpa  V.INTR,u
          beq   L014B
          ldb   #$02
-         cmpa  u000C,u
+         cmpa  V.QUIT,u
          bne   L014F
-L014B    lda   u0003,u
+L014B    lda   V.LPRC,u
          bra   L0153
 L014F    ldb   #S$Wake
          lda   V.WAKE,u
diff -r 9e9648e17298 -r c93ecc262253 level1/modules/kbvdio.asm
--- a/level1/modules/kbvdio.asm	Sat Jul 20 14:20:13 2002 +0000
+++ b/level1/modules/kbvdio.asm	Sat Jul 20 14:44:31 2002 +0000
@@ -1,12 +1,11 @@
 ********************************************************************
-* progname - program module
+* KBVDIO - keyboard/video driver
 *
 * $Id$
 *
 * Ed.    Comments                                       Who YY/MM/DD
 * ------------------------------------------------------------------
 *  -     Original Dragon Data distribution version
-*
 
          nam   KBVDIO
          ttl   os9 device driver    
@@ -16,10 +15,14 @@
          ifp1
          use   defsfile
          endc
+
 tylg     set   Drivr+Objct   
 atrv     set   ReEnt+rev
 rev      set   $01
+edition  set   4
+
          mod   eom,name,tylg,atrv,start,size
+
 u0000    rmb   2
 u0002    rmb   1
 u0003    rmb   1
@@ -78,26 +81,26 @@
 u006F    rmb   91
 size     equ   .
          fcb   $07 
-name     equ   *
-         fcs   /KBVDIO/
-         fcb   $04 
-start    equ   *
-         lbra  L0027
-         lbra  L0286
-         lbra  L0345
-         lbra  L0072
-         lbra  L0098
-         lbra  L009D
+
+name     fcs   /KBVDIO/
+         fcb   edition
 
-L0027    lbsr  L02BA
+start    lbra  Init
+         lbra  Read
+         lbra  Write
+         lbra  GetStat
+         lbra  SetStat
+         lbra  Term
+
+Init     lbsr  L02BA
          lbra  L002D
 L002D    pshs  cc
          orcc  #$10
-         stu   >$006D
-         ldd   >$0032
-         std   >$006B
+         stu   >D.KbdSta
+         ldd   >D.IRQ
+         std   >D.AltIRQ
          leax  >L00B0,pcr
-         stx   >$0032
+         stx   >D.IRQ
          ldx   #$FF00
          stx   <u003B,u
          clra  
@@ -121,7 +124,7 @@
          ldb   #$F5
          orcc  #$01
          rts   
-L0072    cmpa  #$01
+GetStat    cmpa  #$01
          bne   L0082
          lda   <u0049,u
          suba  <u0048,u
@@ -136,24 +139,27 @@
          lbeq  L085F
          cmpa  #$1C
          lbeq  L04CD
-L0098    ldb   #$D0
-L009A    orcc  #$01
+
+SetStat  ldb   #E$UnkSvc
+L009A    orcc  #Carry
          rts   
-L009D    pshs  cc
+
+Term     pshs  cc
          orcc  #$10
-         ldx   >$006B
-         stx   >$0032
+         ldx   >D.AltIRQ
+         stx   >D.IRQ
          puls  pc,cc
+
 L00A9    incb  
          cmpb  #$7F
          bls   L00AF
 L00AE    clrb  
 L00AF    rts   
-L00B0    ldu   >$006D
+L00B0    ldu   >D.KbdSta
          ldx   <u003B,u
          lda   $03,x
          bmi   L00BE
-         jmp   [>$0038]
+         jmp   [>D.SvcIRQ]
 L00BE    lda   $02,x
          lda   #$FF
          sta   $02,x
@@ -171,13 +177,13 @@
          sta   <u003F,u
          sta   <u0040,u
          sta   <u0041,u
-L00DF    lda   >$006F
+L00DF    lda   >D.DskTmr
          beq   L00ED
          deca  
-         sta   >$006F
+         sta   >D.DskTmr
          bne   L00ED
          sta   >$FF48
-L00ED    jmp   [>$006B]
+L00ED    jmp   [>D.AltIRQ]
 L00F1    bsr   L013F
          bmi   L00DF
          sta   <u0047,u
@@ -376,7 +382,8 @@
          tst   <u0000
          neg   <u0000
          eim   #$03,<u001B
-L0286    leax  <u004A,u
+
+Read     leax  <u004A,u
          ldb   <u0049,u
          orcc  #$10
          cmpb  <u0048,u
@@ -395,9 +402,9 @@
          clr   u0005,u
          ldx   <u004B
 L02AF    ldb   <$36,x
-         beq   L0286
+         beq   Read
          cmpb  #$04
-L02B6    bcc   L0286
+L02B6    bcc   Read
          coma  
          rts   
 L02BA    pshs  y,x
@@ -459,7 +466,7 @@
          bne   L0332
          clrb  
          puls  pc,x
-L0345    ldb   <u0025,u
+Write    ldb   <u0025,u
          bne   L0387
          tsta  
          bmi   L0371
@@ -1143,5 +1150,8 @@
          bra   L08C0
 L08E0    suba  ,s+
          bra   L08C0
+
          emod
 eom      equ   *
+         end
+
diff -r 9e9648e17298 -r c93ecc262253 level1/modules/printer.asm
--- a/level1/modules/printer.asm	Sat Jul 20 14:20:13 2002 +0000
+++ b/level1/modules/printer.asm	Sat Jul 20 14:44:31 2002 +0000
@@ -24,7 +24,7 @@
 
          mod   eom,name,tylg,atrv,start,size
 
-u0000    rmb   29
+         rmb   V.SCF
 u001D    rmb   1
 u001E    rmb   1
 u001F    rmb   1
diff -r 9e9648e17298 -r c93ecc262253 level1/modules/rs232.asm
--- a/level1/modules/rs232.asm	Sat Jul 20 14:20:13 2002 +0000
+++ b/level1/modules/rs232.asm	Sat Jul 20 14:44:31 2002 +0000
@@ -24,7 +24,7 @@
 
          mod   eom,name,tylg,atrv,start,size
 
-u0000    rmb   29
+         rmb   V.SCF
 u001D    rmb   1
 u001E    rmb   1
 u001F    rmb   1