# HG changeset patch
# User boisy
# Date 1061248162 0
# Node ID 64a0273a846a77856723f315f463b263bb6a1c4d
# Parent  205b4fbc08cdb2dcc7b267584b38a76e4bebc8a0
Case fixes, etc.

diff -r 205b4fbc08cd -r 64a0273a846a 3rdparty/drivers/ide/ccide.asm
--- a/3rdparty/drivers/ide/ccide.asm	Mon Aug 18 23:00:46 2003 +0000
+++ b/3rdparty/drivers/ide/ccide.asm	Mon Aug 18 23:09:22 2003 +0000
@@ -714,13 +714,13 @@
          bne   ChkLSN1      No, check if LSN1
          ldx   TempHalf+1,u LSW of 'other half'
          cmpx  HalfSct+1,u  Same as LSW of buffered sector #?
-         bne   ChkLsn1      No, check if LSN1
+         bne   ChkLSN1      No, check if LSN1
          ldd   HalfOfs,u    Same partition as buffered sector's drive?
          cmpd  TempOfs,u
-         bne   ChkLsn1      No, check if LSN1
+         bne   ChkLSN1      No, check if LSN1
          lda   PhysDrv,u    Same physical drive as buffered sector's drive?
          cmpa  HalfDrv,u    Same as buffered sector's drive?
-         bne   ChkLsn1      No, check is LSN1
+         bne   ChkLSN1      No, check is LSN1
 * Buffered sector IS the other half of current write sector...no preread nec-
 *   essary.
          lbsr  InitWrit     Send Write command to IDE, setup mode, etc.
diff -r 205b4fbc08cd -r 64a0273a846a defs/systype
--- a/defs/systype	Mon Aug 18 23:00:46 2003 +0000
+++ b/defs/systype	Mon Aug 18 23:09:22 2003 +0000
@@ -547,18 +547,18 @@
 g005C    rmb   2          Temp for relative mouse X coord calculation
 g005E    rmb   2          Temp for relative mouse Y coord calculation
 G.MSmpRV rmb   1          Mouse sample reset value (# ticks till next read)
-G.KyDly  rmb   1          initial key repeat delay constant
+G.KyDly  rmb   1          initial key repeat delay constant ($61)
 G.KySpd  rmb   1          secondary key repeat delay constant
 *         IFEQ  TC9-true
 *KeyParm  rmb   1          keyboard command parameter byte
 *         ELSE  
-G.KyMse  rmb   1          keyboard mouse flag
+G.KyMse  rmb   1          keyboard mouse flag ($63)
 *         ENDC  
-G.Clear  rmb   1          "one-shot" CapsLock/SysRq key flag
-G.KyButt rmb   1          keyboard F1 and F2 "fire" button info
+G.Clear  rmb   1          "one-shot" CapsLock/SysRq key flag ($64)
+G.KyButt rmb   1          keyboard F1 and F2 "fire" button info ($65)
 G.AutoMs rmb   1          Auto-follow mouse flag for current device (0=NO)
-G.MseMv  rmb   1          mouse moved flag
-G.CoTble rmb   6          co-module table
+G.MseMv  rmb   1          mouse moved flag ($67)
+G.CoTble rmb   6          co-module table ($68)
 G.GrfEnt rmb   2          GRFDRV Entry address ($6E)
 g0070    rmb   1          # bytes to move in 1 block (1-72)
 G.WUseTb rmb   4          windows in use bit table (0=unused, 32 windows) ($71)
@@ -575,7 +575,13 @@
 G.MsInit rmb   2          set mouse routine vector
 G.MsSig  rmb   1          mouse signal flag
 G.DefPls rmb   16         Default palettes (2 repeats of 8 is default) ($C7)
-g00D7    rmb   41
+g00D7    rmb   9
+G.KeyEnt rmb   2	entry to keydrv subroutine module ($E0)
+G.KeyMem rmb   8	static memory for keydrv subroutine module
+G.JoyEnt rmb   2	entry to joydrv subroutine module ($EA)
+G.JoyMem rmb   8	static memory for joydrv subroutine module
+G.SndEnt rmb   2	entry to snddrv subroutine module ($F4)
+G.SndMem rmb   8	static memory for snddrv subroutine module
 
 *****************************************************************************
 * GrfDrv global memory data definitions
diff -r 205b4fbc08cd -r 64a0273a846a level1/cmds/disasm.asm
--- a/level1/cmds/disasm.asm	Mon Aug 18 23:00:46 2003 +0000
+++ b/level1/cmds/disasm.asm	Mon Aug 18 23:09:22 2003 +0000
@@ -23,6 +23,7 @@
 *
 * 04/22/03      - added 4-digit year output
 * 07/09/03      - changed output format of 6309 Bit commands
+* 08/14/03      - added code to output "end" line
 ********
 
          ifp1
@@ -1434,7 +1435,7 @@
          fcc   /CblCode /
          fcc   /FrtnCode/
          fcc   /???????? /
-ReEnt.   fcc   /ReEnt /
+reent.   fcc   /ReEnt /
 modprot. fcc   /Modprot /
 line010  fcc   /         ifp1/
 line011  fcb   $0d
@@ -1487,6 +1488,9 @@
 line180  fcc   /eom      equ   */
          fcb   $0d
 ln180sz  equ   *-line180
+line181  fcc   /         end/
+         fcb   $0d
+ln181sz  equ   *-line181
 line190  fcc   /equ   */
 ln190sz  equ   *-line190
 line200  fcb   $0a
@@ -2077,7 +2081,7 @@
          lbsr  merghex
          bra   chkrevs
 attr.r   equ   *
-         leay  ReEnt.,pcr
+         leay  reent.,pcr
          ldb   #5
          bra   moveattr
 attr.m   equ   *
@@ -2785,19 +2789,13 @@
 iscc     ldd   #'c*256+'c     cc register         
 gotregn  lbsr  movereg        Add register name
          lbsr  mvchr003       Add ','
-         ldb   <byte          Get original byte again
-         andb  #%00000111     Mask out all but register bit #
-         bsr   getbit         Get Bit #
-         lbsr  movechar       Add it to output
-         lbsr  mvchr003       Add ','
-         ldb   <byte          Get original byte again
-         andb  #%00111000     Mask out all but memory bit #
-         lsrb                 Shift for subroutine
-         lsrb
-         lsrb
-         bsr   getbit         Get ASCII value for memory bit #
-         lbsr  movechar       Add it to output
-         lbsr  mvchr003       Add ','
+         lda   <byte          Get original byte again
+         bsr   getbit         Output register Bit #
+         lda   <byte          Get original byte again
+         lsra                 Shift to memory bit #
+         lsra
+         lsra
+         bsr   getbit         Output memory bit #
          inc   <bitcom        Set bit command flag
 * Dupe of direct page stuff
          leay  line080,pc     Point to '<u'
@@ -2814,11 +2812,11 @@
          lbsr  indx046        put address in u table & write out line
 nou      lbra  chk.fd         Write it out & continue
 
-* Create ASCII of bit #
-getbit   lda   #'0            Bit # to 0
-         pshs  b              Put bit # onto stack
-         adda  ,s+            Add to ASCII base
-         rts
+* Output ASCII bit # plus comma
+getbit   anda  #%00000111     Mask to bit # 0-7
+         adda  #'0            Convert to ASCII digit
+         lbsr  movechar       Add it to output
+         lbra  mvchr003       Add ',' and return
 
 * 8 bit relative offset (bra)
 reladr.1 lda   #'L            Add 'L'
@@ -2915,6 +2913,10 @@
          ldb   #ln180sz
          lbsr  mergline
          lbsr  writline
+         leay  line181,pcr
+         ldb   #ln181sz
+         lbsr  mergline
+         lbsr  writline
          lbsr  moveadr
          leax  holdline,u
          lda   ,x
@@ -2962,7 +2964,7 @@
          sta   <byte
 
 unlink   ldu   <modadr
-         os9   F$Unlink
+         os9   F$UnLink
          lbcs  exit
          dec   <byte
          bne   unlink
@@ -3218,7 +3220,7 @@
          rts
 
 * 
-* get decimal value of bytes in d ,output in string pointed at by 'y'
+* get decimal value of bytes in d, output in string pointed at by 'y'
 *
 getdec   pshs  x
          ldx   #10000
@@ -3612,7 +3614,7 @@
 send     tst   <pass
          beq   send010
          lda   #1
-         os9   I$Writln
+         os9   I$WritLn
          lbcs  exit
 send010  lbsr  clrline
          rts
@@ -3701,7 +3703,7 @@
 * error encountered - print error to standard error path
 *
 prterror lda   #2
-         os9   I$Writln
+         os9   I$WritLn
 clrexit  clrb
 exit     os9   F$Exit
 
diff -r 205b4fbc08cd -r 64a0273a846a level1/cmds/xmode.asm
--- a/level1/cmds/xmode.asm	Mon Aug 18 23:00:46 2003 +0000
+++ b/level1/cmds/xmode.asm	Mon Aug 18 23:09:22 2003 +0000
@@ -261,7 +261,7 @@
          cmpb  #'?        help option?
          beq   MuchHelp  
 * Use Filename to Get Desc:
-         lda   #Updat.    open path to module file
+         lda   #UPDAT.    open path to module file
          os9   I$Open    
          bcs   Help      
          stx   <ParmPtr  
diff -r 205b4fbc08cd -r 64a0273a846a level2/cmds/shell_21.asm
--- a/level2/cmds/shell_21.asm	Mon Aug 18 23:00:46 2003 +0000
+++ b/level2/cmds/shell_21.asm	Mon Aug 18 23:09:22 2003 +0000
@@ -218,11 +218,11 @@
          fcb   $8D
 L0146    fdb   AllRedir-*
          fcs   "<>>>"
-         fdb   InErrRedir-*
+         fdb   IERedir-*
          fcs   "<>>"
-         fdb   InOutRedir-*
+         fdb   IORedir-*
          fcs   "<>"
-         fdb   OutErrRedir-*
+         fdb   OERedir-*
          fcs   ">>>"
          fdb   ErrRedir-*
          fcs   ">>"
@@ -311,7 +311,7 @@
          rts   
 L0209    comb  
          leax  -$01,x
-         ldb   #E$BPNAM
+         ldb   #E$BPNam
          rts   
 L020F    bsr   L0241
          pshs  y
@@ -538,22 +538,19 @@
 L03B3    bsr   L03BC
          bcc   L03DC
 L03B7    rts   
-InOutRedir
-         lda   #$0D
+IORedir  lda   #$0D
          sta   -$02,x
 L03BC    bsr   L03AA
          bcs   L03B7
          ldd   #$0180
          bra   L0362
-InErrRedir
-         lda   #$0D
+IERedir  lda   #$0D
          sta   -$03,x
          bsr   L03AA
          bcs   L03B7
          ldd   #$0280
          bra   L0362
-OutErrRedir
-         lda   #$0D
+OERedir  lda   #$0D
          sta   -$03,x
          lda   #$01
          bsr   L03AB