# HG changeset patch
# User boisy
# Date 1062775437 0
# Node ID 5dd56f2f45b483e2e20bb9c0a3e42b8f8243c238
# Parent  57f23da9790ad21232f7a9b435a5c2685d9bc6af
Cleaned up source

diff -r 57f23da9790a -r 5dd56f2f45b4 level2/modules/cc3io.asm
--- a/level2/modules/cc3io.asm	Fri Sep 05 13:28:04 2003 +0000
+++ b/level2/modules/cc3io.asm	Fri Sep 05 15:23:57 2003 +0000
@@ -588,16 +588,16 @@
          bita  #KeyMse
          puls  a
          ENDC
-         beq   L0381		no, try joystick
-         ldx   >WGlobal+G.KeyEnt $10E0 else get ptr to keydrv
-         leau  >G.KeyMem,u	and ptr to its statics
-         jsr   $06,x		call into it
-         ldu   <D.CCMem		get ptr to CC mem
-         sta   <G.KyButt,u	save key button
-L0381    ldx   >WGlobal+G.JoyEnt $10EA get ptr to joydrv
-         leau  >G.JoyMem,u	and ptr to its statics
-         jsr   $06,x		get X/Y info
-         ldu   <D.CCMem		get ptr to CC mem
+         beq   L0381			no, try joystick
+         ldx   >WGlobal+G.KeyEnt	else get ptr to keydrv
+         leau  >G.KeyMem,u		and ptr to its statics
+         jsr   $06,x			call into it
+         ldu   <D.CCMem			get ptr to CC mem
+         sta   <G.KyButt,u		save key button
+L0381    ldx   >WGlobal+G.JoyEnt	get ptr to joydrv
+         leau  >G.JoyMem,u		and ptr to its statics
+         jsr   $06,x			get X/Y info
+         ldu   <D.CCMem			get ptr to CC mem
          lda   #$82
          cmpb  #$80
          beq   L0397
@@ -617,9 +617,9 @@
          tstb  
          lbne  L044E
          pshs  u,y,x
-         ldx   >WGlobal+G.KeyEnt $10E0
+         ldx   >WGlobal+G.KeyEnt
          leau  >G.KeyMem,u
-         jsr   $09,x
+         jsr   $09,x			call Read Key routine
          puls  u,y,x
          bpl   L03C8
          clr   <G.LastCh,u
diff -r 57f23da9790a -r 5dd56f2f45b4 level2/modules/keydrv_cc3.asm
--- a/level2/modules/keydrv_cc3.asm	Fri Sep 05 13:28:04 2003 +0000
+++ b/level2/modules/keydrv_cc3.asm	Fri Sep 05 15:23:57 2003 +0000
@@ -9,39 +9,42 @@
 *   4      1998/10/10  Robert Gault
 * L2 Upgrade distribution version with annotations by Robert Gault.
 
-         nam   KeyDrv
+         nam   KeyDrv    
          ttl   Keyboard Driver for CoCo 3
 
 * Disassembled 98/09/09 09:02:10 by Disasm v1.6 (C) 1988 by RML
 
-         ifp1  
-         use   defsfile
-         endc  
+         ifp1            
+         use   defsfile  
+         endc            
 
 tylg     set   Systm+Objct
-atrv     set   ReEnt+rev
-rev      set   $00
-edition  equ   4
+atrv     set   ReEnt+rev 
+rev      set   $00       
+edition  equ   4         
 
-         mod   eom,name,tylg,atrv,start,size
-size     equ   .
+         mod   eom,name,tylg,atrv,entry,size
+size     equ   .         
 
-name     fcs   /KeyDrv/
-         fcb   edition
+name     fcs   /KeyDrv/  
+         fcb   edition   
+
+entry    equ   *         
 
-* The KeyDrv subroutine module has four entry points:
-* - Init
-* - Term
-* - FuncKeys
-* - ReadKys
-start    lbra  Init       init/term; CLRB RTS
-         lbra  Term
-         lbra  FuncKeys   test for keys F1, F2
+* Init - Initialize keyboard
+         lbra  Init      
+
+* Term - Terminate keyboard
+         lbra  Term      
 
-ReadKys  ldu   <D.CCMem   CC3IO global memory $1000
-         ldx   #PIA0Base  base address of PIA#1
-         clrb  
-         comb  
+* Function - Test for function keys
+         lbra  FuncKeys  
+
+* Read - read keys if pressed
+ReadKys  ldu   <D.CCMem   Get CC3IO global memory into U
+         ldx   #PIA0Base  base address of PIA0
+         clrb            
+         comb            
          stb   $02,x      clear all strobe lines
          ldb   ,x         read PIA#1
          comb             bit values 0=off 1=on
@@ -49,47 +52,55 @@
          bne   L0059      branch if button pushed; error routine
          clr   $02,x      enable all strobe lines
          lda   ,x         read PIA#1
-         coma  
-         anda  #%01111111 mask only the joystick conparator
+         coma            
+         anda  #%01111111 mask only the joystick comparator
          beq   L0042      branch if no keys pressed
-         pshs  dp
-         tfr   u,d
+         pshs  dp        
+         tfr   u,d       
          tfr   a,dp       set DP to the address in regU
          bsr   L005C      evaluate the found key matrix
          puls  dp         return to system DP
          bpl   L005B      valid key
 L0042    clra             regA    would have been the found key
          ldb   <G.CapLok,u CapsLock/SysRq key down flag
-         bne   L0056
+         bne   L0056     
          clr   <G.KTblLC,u Key table entry# last checked (1-3)
-         coma  
-         comb  
+         coma            
+         comb            
          sta   <G.LKeyCd,u last keyboard code
          sta   <G.2Key1,u 2nd key table storage; $FF=none
          std   <G.2Key2,u format (Row/Column)
 L0056    clr   <G.CapLok,u see above
-L0059    ldb   #$FF
-L005B    rts   
+L0059    ldb   #$FF      
+L005B    rts             
 
 L005C    ldx   #PIA0Base  base value of PIA#1
-         clra  
-         clrb  
+         ifne  H6309     
+         clrd            
+         else            
+         clra            
+         clrb            
+         endc            
          std   <G.ShftDn  shift/CTRL flag; 0=NO $FF=YES
          std   <G.KeyFlg  PIA bits/ALT flag
 *	%00000111-Column # (Output, 0-7)
 *	%00111000-Row # (Input, 0-6)
-         coma  
+         ifne  H6309     
+         comd            
+         else            
+         coma            
          comb             set primary key table
+         endc            
          std   <G.Key1    key 1&2 flags $FF=none
          sta   <G.Key3    key 3      ˛
          deca             ie. lda #%11111110
          sta   $02,x      strobe one column
 L006E    lda   ,x         read PIA#1
-         coma  
+         coma            
          anda  #$7F       keep only keys, bit 0=off 1=on
-         beq   L0082
+         beq   L0082     
          ldb   #$FF       preset counter to -1
-L0077    incb  
+L0077    incb            
          lsra             bit test regA
          bcc   L007E      no key so branch
          lbsr  L010E      convert column/row to matrix value and store it
@@ -102,10 +113,10 @@
          lbsr  L0166      simultaneous check; recover key matrix value
          bmi   L00F5      invalid so go
          cmpa  <G.LKeyCd  last keyboard code	
-         bne   L0095
+         bne   L0095     
          inc   <G.KySame  same key flag ?counter?
 L0095    sta   <G.LKeyCd  setup for last key pressed
-         beq   L00B5
+         beq   L00B5     
          suba  #$1A       the key value (matrix) of Z
          bhi   L00B5      not a letter so go
          adda  #$1A       restore regA
@@ -118,18 +129,18 @@
          andb  #CapsLck   test caps flag
          bne   L00E0      not shifted so go
          adda  #$20       convert to ASCII lower case
-         bra   L00E0
+         bra   L00E0     
 * key is not a letter; this routine is not based on some underlining principle of
 * the keyboard hardware. It is also a function of the decode table at $1DC,pcr.
-L00B5    ldb   #$03
+L00B5    ldb   #$03      
          mul              regB = (key#-26) times 3
          lda   <G.ShftDn  shift key flag
          beq   L00BF      not shifted so go
-         incb  
-         bra   L00C5
+         incb            
+         bra   L00C5     
 L00BF    lda   <G.CntlDn  CTRL flag
-         beq   L00C5
-         addb  #$02
+         beq   L00C5     
+         addb  #$02      
 L00C5    ldx   <G.CurDev  point regX to device’s static memory
          lda   <$22,x     key sense flag
          beq   L00D0      not set so go
@@ -138,9 +149,9 @@
 L00D0    cmpb  #$4C       SHIFTed ALT key
          blt   L00D8      not ALT, CTRL, F1, F2, or SHIFT so go
          inc   <G.AltDwn  flag special keys (ALT,CTRL)
-         subb  #$06
+         subb  #$06      
 L00D8    leax  >L01DC,pcr decode table
-         lda   b,x
+         lda   b,x       
          bmi   L00F6      if regA = $81 - $84
 * several entries to this routine from any key press; regA is already ASCII
 L00E0    ldb   <G.AltDwn  was ALT flagged?
@@ -152,128 +163,128 @@
          ora   #$20       convert to lower case
 L00EE    ora   #$80       set for ALT characters
 L00F0    andcc  #^Negative not negative
-         rts   
+         rts             
 L00F3    orcc  #Negative  set negative
-L00F5    rts   
+L00F5    rts             
 L00F6    inc   <G.CapLok  caps lock/SysRq
          inc   <G.Clear   one shot caps lock/SysRq
-         bra   L00F0
+         bra   L00F0     
 L00FC    pshs  b,a        convert column into power of 2
-         clrb  
-         orcc  #Carry
-         inca  
-L0102    rolb  
-         deca  
-         bne   L0102
+         clrb            
+         orcc  #Carry    
+         inca            
+L0102    rolb            
+         deca            
+         bne   L0102     
          bra   L0108      WHY IS THIS HERE??
 L0108    orb   <G.KySns   previous value of column
-         stb   <G.KySns
-         puls  pc,b,a
-L010E    pshs  b,a
+         stb   <G.KySns  
+         puls  pc,b,a    
+L010E    pshs  b,a       
          cmpb  #$03       is it row 3?
-         bne   L011C
+         bne   L011C     
          lda   <G.KeyFlg  get column #
          cmpa  #$03       is it column 3?; ie up arrow
          blt   L011C      if lt must be a letter
          bsr   L00FC      its a non letter so bsr
 L011C    lslb             B*8  8 keys per row
-         lslb  
-         lslb  
+         lslb            
+         lslb            
          addb  <G.KeyFlg  add in the column #
          cmpb  #$33       ALT
-         bne   L012B
+         bne   L012B     
          inc   <G.AltDwn  ALT down flag
-         ldb   #$04
-         bra   L0108
+         ldb   #$04      
+         bra   L0108     
 L012B    cmpb  #$34       CTRL
-         bne   L0135
+         bne   L0135     
          inc   <G.CntlDn  CTRL down flag
-         ldb   #$02
-         bra   L0108
-L0135    cmpb  #$37       shift key
-         bne   L013F
-         com   <G.ShftDn  shift down flag
-         ldb   #$01
-         bra   L0108
+         ldb   #$02      
+         bra   L0108     
+L0135    cmpb  #$37       SHIFT key
+         bne   L013F     
+         com   <G.ShftDn  SHIFT down flag
+         ldb   #$01      
+         bra   L0108     
 * check how many key (1-3) are currently being pressed
-L013F    pshs  x
+L013F    pshs  x         
          leax  <$2D,u     1st key table
-         bsr   L014A
-         puls  x
-         puls  pc,b,a
-L014A    pshs  a
-         lda   ,x
-         bpl   L0156
-         stb   ,x
-         ldb   #$01
-         puls  pc,a
-L0156    lda   $01,x
-         bpl   L0160
-         stb   $01,x
-         ldb   #$02
-         puls  pc,a
-L0160    stb   $02,x
-         ldb   #$03
-         puls  pc,a
+         bsr   L014A     
+         puls  x         
+         puls  pc,b,a    
+L014A    pshs  a         
+         lda   ,x        
+         bpl   L0156     
+         stb   ,x        
+         ldb   #$01      
+         puls  pc,a      
+L0156    lda   $01,x     
+         bpl   L0160     
+         stb   $01,x     
+         ldb   #$02      
+         puls  pc,a      
+L0160    stb   $02,x     
+         ldb   #$03      
+         puls  pc,a      
 * simlutaneous key test
-L0166    pshs  y,x,b
-         ldb   <G.KTblLC  key table entry#
-         beq   L019D
+L0166    pshs  y,x,b     
+         ldb   <G.KTblLC  key table entry #
+         beq   L019D     
          leax  <$2A,u     point to 2nd key table
-         pshs  b
+         pshs  b         
 L0171    leay  <$2D,u     1st key table
-         ldb   #$03
-         lda   ,x         get key#1
+         ldb   #$03      
+         lda   ,x         get key #1
          bmi   L018F      go if invalid? (no key)
 L017A    cmpa  ,y         is it a match?
          bne   L0184      go if not a matched key
-         clr   ,y
+         clr   ,y        
          com   ,y         set value to $FF
-         bra   L018F
-L0184    leay  $01,y
-         decb  
-         bne   L017A
-         lda   #$FF
-         sta   ,x
+         bra   L018F     
+L0184    leay  $01,y     
+         decb            
+         bne   L017A     
+         lda   #$FF      
+         sta   ,x        
          dec   <G.KTblLC  key table entry#
-L018F    leax  $01,x
+L018F    leax  $01,x     
          dec   ,s         column counter
-         bne   L0171
-         leas  $01,s
+         bne   L0171     
+         leas  $01,s     
          ldb   <G.KTblLC  key table entry (can test for 3 simul keys)
-         beq   L019D
-         bsr   L01C4
+         beq   L019D     
+         bsr   L01C4     
 L019D    leax  <$2D,u     1st key table
-         lda   #$03
-L01A2    ldb   ,x+
-         bpl   L01B5
-         deca  
-         bne   L01A2
+         lda   #$03      
+L01A2    ldb   ,x+       
+         bpl   L01B5     
+         deca            
+         bne   L01A2     
          ldb   <G.KTblLc  key table entry (can test for 3 simul keys)
-         beq   L01C0
-         decb  
+         beq   L01C0     
+         decb            
          leax  <$2A,u     2nd key table
-         lda   b,x
-         bra   L01BE
-L01B5    tfr   b,a
+         lda   b,x       
+         bra   L01BE     
+L01B5    tfr   b,a       
          leax  <$2A,u     2nd key table
-         bsr   L014A
-         stb   <G.KTblLC
-L01BE    puls  pc,y,x,b
+         bsr   L014A     
+         stb   <G.KTblLC 
+L01BE    puls  pc,y,x,b  
 L01C0    orcc  #Negative  flag negative
-         puls  pc,y,x,b
-L01C4    leax  <$2A,u
-         bsr   L01CF
-         leax  $01,x
-         bsr   L01CF
-         leax  -$01,x
-L01CF    lda   ,x
-         bpl   L01DB
-         ldb   $01,x
-         bmi   L01DB
-         sta   $01,x
-         stb   ,x
-L01DB    rts   
+         puls  pc,y,x,b  
+L01C4    leax  <$2A,u    
+         bsr   L01CF     
+         leax  $01,x     
+         bsr   L01CF     
+         leax  -$01,x    
+L01CF    lda   ,x        
+         bpl   L01DB     
+         ldb   $01,x     
+         bmi   L01DB     
+         sta   $01,x     
+         stb   ,x        
+L01DB    rts             
 * These seem to be special key combination values; 3 per key in ASCII
 *L01DC  fcb     @,shift@,nul
 *	fcb	up,shifted,CTRL
@@ -309,31 +320,35 @@
          fdb   $0035,$2500,$3626,$0037,$275e,$3828,$5b39,$295d
          fdb   $3a2a,$003b,$2b7f,$2c3c,$7b2d,$3d5f,$2e3e,$7d2f
          fdb   $3f5c,$0d0d,$0d82,$8384,$0503,$1b31,$3335,$3234
-         fcb   $36
-
-Init           
-Term     clrb  
-         rts   
+         fcb   $36       
 
-FuncKeys ldu   <D.CCMem
-         ldx   #PIA0Base
-         clra  
-         ldb   #%11011111 strob column #6 PIA#1
-         stb   $02,x
-         ldb   ,x         read PIA#1
-         bitb  #%01000000 test for F1 function key
-         bne   L0240
-         inca             flag F1
-L0240    ldb   #%10111111 strobe column #7 PIA#1
-         stb   $02,x
-         ldb   ,x         read PIA#1
-         bitb  #%01000000 test for F2 function key
-         bne   L024C
-         ora   #$04       flag F2
-L024C    rts   
-
-         emod  
-eom      equ   *
-         end   
+* Init and Term do nothing for this CoCo keyboard subroutine module
+Init                     
+Term     clrb            
+         rts             
 
 
+* This entry point tests for the F1/F2 function keys on a CoCo 3
+* keyboard.
+* Exit: A = Function keys pressed (Bit 0 = F1, Bit 2 = F2)
+FuncKeys ldu   <D.CCMem   get CC3IO global mem pointer into U
+         ldx   #PIA0Base  get address of PIA #0
+         clra             clear A
+         ldb   #%11011111 strobe column #6 of PIA #0
+         stb   $02,x     
+         ldb   ,x         read PIA #0
+         bitb  #%01000000 test for F1 function key
+         bne   CheckF2    branch if set (key not down)
+         inca             flag F1 as down
+CheckF2  ldb   #%10111111 strobe column #7 PIA #0
+         stb   $02,x     
+         ldb   ,x         read PIA #0
+         bitb  #%01000000 test for F2 function key
+         bne   L024C     
+         ora   #$04       flag F2 as down
+L024C    rts             
+
+         emod            
+eom      equ   *         
+         end             
+