Mercurial > hg > Members > kono > nitros9-code
changeset 1242:bdd2f61d5dbc
Fixed case issues in several files (thanks Rodney H.)
| author | boisy |
|---|---|
| date | Wed, 06 Aug 2003 23:52:47 +0000 |
| parents | 716c84dca8e4 |
| children | 0819245a7e87 |
| files | 3rdparty/utils/boisy/grep.asm 3rdparty/utils/boisy/mode.asm 3rdparty/utils/boisy/more.asm defs/systype level1/cmds/cputype.asm level1/cmds/disasm.asm level1/modules/boot_idelba.asm level1/modules/rbf.asm level2/coco3/ChangeLog level2/coco3_6309/ChangeLog level2/modules/boot_1773.asm level2/modules/ioman.asm level2/modules/rbf.asm level2/modules/rel.asm level2/modules/xacia.asm |
| diffstat | 15 files changed, 84 insertions(+), 68 deletions(-) [+] |
line wrap: on
line diff
--- a/3rdparty/utils/boisy/grep.asm Wed Aug 06 18:56:08 2003 +0000 +++ b/3rdparty/utils/boisy/grep.asm Wed Aug 06 23:52:47 2003 +0000 @@ -31,7 +31,7 @@ use defsfile endc - mod Size,Name,Prgrm+Objct,Reent+1,Start,Fin + mod Size,Name,Prgrm+Objct,ReEnt+1,Start,Fin Name fcs /Grep/ Ed fcb $01 @@ -118,7 +118,7 @@ leax 1,x else increment X bra ChckFile and get the next char -GetFile lda #read. Open for read +GetFile lda #READ. Open for read os9 I$Open bcs Error sta Path and save the path
--- a/3rdparty/utils/boisy/mode.asm Wed Aug 06 18:56:08 2003 +0000 +++ b/3rdparty/utils/boisy/mode.asm Wed Aug 06 23:52:47 2003 +0000 @@ -23,7 +23,7 @@ use defsfile endc - mod Size,Name,Prgrm+Objct,Reent+1,Start,Fin + mod Size,Name,Prgrm+Objct,ReEnt+1,Start,Fin Name fcs /Mode/ Vrsn fcb $06 @@ -139,7 +139,7 @@ puls x bra Parse2 -HELP leax Helpmess,pcr +Help leax Helpmess,pcr ldy #Helplen lda #1 os9 I$Write
--- a/3rdparty/utils/boisy/more.asm Wed Aug 06 18:56:08 2003 +0000 +++ b/3rdparty/utils/boisy/more.asm Wed Aug 06 23:52:47 2003 +0000 @@ -40,7 +40,7 @@ REVON equ $1f20 REVOFF equ $1f21 - mod Size,Name,Prgrm+Objct,Reent+1,Start,Fin + mod Size,Name,Prgrm+Objct,ReEnt+1,Start,Fin Name fcs /M/ Ed fcb 2 @@ -50,7 +50,7 @@ XL rmb 1 YH rmb 1 YL rmb 1 -Lflag rmb 1 +LFlag rmb 1 FilePtr rmb 2 Buffer rmb 250 FileBuf rmb 60 @@ -154,7 +154,7 @@ beq Parse anda #$df cmpa #'L - bne IsitW + bne IsItW com LFlag bra Parse IsItW cmpa #'W
--- a/defs/systype Wed Aug 06 18:56:08 2003 +0000 +++ b/defs/systype Wed Aug 06 23:52:47 2003 +0000 @@ -180,7 +180,7 @@ *************************** * Color Computer 3 Specific * -MappedIO equ True (Actually False but it works better this way) +MappedIO equ true (Actually False but it works better this way) ******************** * Hardware addresses
--- a/level1/cmds/cputype.asm Wed Aug 06 18:56:08 2003 +0000 +++ b/level1/cmds/cputype.asm Wed Aug 06 23:52:47 2003 +0000 @@ -18,7 +18,7 @@ endc tylg set Prgrm+Objct -atrv set Reent+Rev +atrv set ReEnt+Rev rev set 1 edition set 3
--- a/level1/cmds/disasm.asm Wed Aug 06 18:56:08 2003 +0000 +++ b/level1/cmds/disasm.asm Wed Aug 06 23:52:47 2003 +0000 @@ -29,8 +29,8 @@ use defsfile endc -typ set prgrm+objct -attrev set reent+revision +typ set Prgrm+Objct +attrev set ReEnt+revision revision set 1 edtn set 5 edition edition equ $30+edtn ascii edition @@ -1434,7 +1434,7 @@ fcc /CblCode / fcc /FrtnCode/ fcc /???????? / -reent. fcc /ReEnt / +ReEnt. fcc /ReEnt / modprot. fcc /Modprot / line010 fcc / ifp1/ line011 fcb $0d @@ -1924,11 +1924,11 @@ lbra prterror diskmod equ * inc <diskio - lda #read. + lda #READ. tst <x.opt beq open - ora #exec. -open os9 i$open + ora #EXEC. +open os9 I$Open lbcs exit sta <path lbsr getbyte @@ -1944,11 +1944,11 @@ mem020 equ * clra - os9 f$link + os9 F$Link bcc gotmod clra ldx <xreghold - os9 f$load + os9 F$Load lbcs nolink gotmod equ * stu <modadr @@ -1993,7 +1993,7 @@ lbsr mergline lbsr getbyte stb <tylghold - andb #typemask + andb #TypeMask tstb beq badtype cmpb #$40 @@ -2026,7 +2026,7 @@ chklang equ * lbsr mvchr008 ldb <byte - andb #langmask + andb #LangMask tstb beq badlang cmpb #6 @@ -2068,16 +2068,16 @@ lbsr mergline lbsr getbyte stb <atrvhold - andb #attrmask - cmpb #reent + andb #AttrMask + cmpb #ReEnt beq attr.r - cmpb #modprot + cmpb #ModProt beq attr.m lbsr mvchr005 lbsr merghex bra chkrevs attr.r equ * - leay reent.,pcr + leay ReEnt.,pcr ldb #5 bra moveattr attr.m equ * @@ -2095,7 +2095,7 @@ ldb #ln310sz lbsr mergline ldb <byte - andb #revsmask + andb #RevsMask stb revshold lbsr merghex lda #$0d @@ -2858,7 +2858,7 @@ rladr2.3 leax line240,pcr Error:symbol table full ldy #ln240sz lda #2 - os9 i$writln + os9 I$WritLn lbra unlink rladr2.4 lbsr merghex2 Add 4 hex digits & return rts @@ -2871,7 +2871,7 @@ * subd <highadr * tfr d,y * lda #2 -* os9 i$write +* os9 I$Write * lbcs exit * lbra clrexit endit015 inc <pass @@ -2962,7 +2962,7 @@ sta <byte unlink ldu <modadr - os9 f$unlink + os9 F$Unlink lbcs exit dec <byte bne unlink @@ -2971,7 +2971,7 @@ close tst <diskio beq close010 lda <path - os9 i$close + os9 I$Close lbcs exit close010 rts @@ -3321,7 +3321,7 @@ getdisk leax byte,u ldy #1 lda <path - os9 i$read + os9 I$Read lbcs endit ldb <byte gotbyte lda <byte @@ -3612,7 +3612,7 @@ send tst <pass beq send010 lda #1 - os9 i$writln + os9 I$Writln lbcs exit send010 lbsr clrline rts @@ -3701,9 +3701,9 @@ * error encountered - print error to standard error path * prterror lda #2 - os9 i$writln + os9 I$Writln clrexit clrb -exit os9 f$exit +exit os9 F$Exit emod eom equ *
--- a/level1/modules/boot_idelba.asm Wed Aug 06 18:56:08 2003 +0000 +++ b/level1/modules/boot_idelba.asm Wed Aug 06 23:52:47 2003 +0000 @@ -84,7 +84,7 @@ bsr GetSect load in LSN0, U = buffer start bcs L00B0 - IFNE NitrOS9 + IFGT Level-1 lda #'0 --- loaded in LSN0 jsr <D.BtBug --- ENDC @@ -117,7 +117,7 @@ bsr GetSect read one sector bcs L00AE if there's an error, exit - IFNE NitrOS9 + IFGT Level-1 lda #'. dump out a period for boot debugging jsr <D.BtBug do the debug stuff ENDC
--- a/level1/modules/rbf.asm Wed Aug 06 18:56:08 2003 +0000 +++ b/level1/modules/rbf.asm Wed Aug 06 23:52:47 2003 +0000 @@ -662,7 +662,7 @@ lbra L0CED SetStat ldb R$B,u - cmpb #SS.OPT + cmpb #SS.Opt bne L0584 ldx R$X,u leax $02,x
--- a/level2/coco3/ChangeLog Wed Aug 06 18:56:08 2003 +0000 +++ b/level2/coco3/ChangeLog Wed Aug 06 23:52:47 2003 +0000 @@ -1,4 +1,6 @@ OS-9 Level Two V03.01.04: +- rel has been back-ported from NitrOS-9 Level Two, adding 40 and 80 + column boot screen options. - asm is now at edition 8 and includes the following fixes/additions: o Symbols now allow underscores. o The "parens error" bug has been fixed.
--- a/level2/coco3_6309/ChangeLog Wed Aug 06 18:56:08 2003 +0000 +++ b/level2/coco3_6309/ChangeLog Wed Aug 06 23:52:47 2003 +0000 @@ -1,4 +1,6 @@ OS-9 Level Two V03.01.04: +- rel has been back-ported from NitrOS-9 Level Two, adding 40 and 80 + column boot screen options. - asm is now at edition 8 and includes the following fixes/additions: o Symbols now allow underscores. o The "parens error" bug has been fixed.
--- a/level2/modules/boot_1773.asm Wed Aug 06 18:56:08 2003 +0000 +++ b/level2/modules/boot_1773.asm Wed Aug 06 23:52:47 2003 +0000 @@ -10,6 +10,8 @@ * rate and disk timeout changes * 6r2 Added '.' output for each sector under NitrOS9 BGP 03/05/18 * for Mark Marlette (a special request :) +* 6r3 Added BLOB-Stop code as per Robert Gault's BGP 03/08/04 +* suggestion. nam Boot ttl WD1773 Boot module @@ -27,7 +29,7 @@ tylg set Systm+Objct atrv set ReEnt+rev -rev set $02 +rev set $03 edition set 6 mod eom,name,tylg,atrv,start,size @@ -116,10 +118,8 @@ bsr ReadSect bcs L00A8 - IFNE NitrOS9 lda #'. dump out a period for boot debugging jsr <D.BtBug do the debug stuff - ENDC puls x,b,a inc u0002,u @@ -182,17 +182,18 @@ lbsr L01AA orb #$80 lda #$02 -L0111 bita >$FF48 - bne L0123 - leay -$01,y - bne L0111 - lda ,u - sta >$FF40 - puls y - bra L0138 +*L0111 bita >$FF48 +* bne L0123 +* leay -$01,y +* bne L0111 +* lda ,u +* sta >$FF40 +* puls y +* bra L0138 L0123 lda >$FF4B sta ,x+ - stb >$FF40 +* stb >$FF40 + nop bra L0123 NMIRtn leas R$Size,s
--- a/level2/modules/ioman.asm Wed Aug 06 18:56:08 2003 +0000 +++ b/level2/modules/ioman.asm Wed Aug 06 23:52:47 2003 +0000 @@ -215,6 +215,12 @@ lsrb jmp w,x ELSE +* pshs d +* ldd b,x +* leax d,x +* puls d +* lsrb +* jmp ,x pshs b lslb ldd b,x @@ -859,7 +865,7 @@ stx <D.Proc rts -L0489 ldb #E$BPNam +L0489 ldb #E$BPNam L048B pshs b lda ,y ldx <D.PthDBT
--- a/level2/modules/rbf.asm Wed Aug 06 18:56:08 2003 +0000 +++ b/level2/modules/rbf.asm Wed Aug 06 23:52:47 2003 +0000 @@ -1132,7 +1132,7 @@ GetStat ldb R$B,u get function code beq Gst5FF it's SS.Opt, go process -* SS.OPT +* SS.Opt * Entry A=path number * B=$00 * X=address to put 32 byte packet @@ -1172,12 +1172,12 @@ ENDC Gst5FF rts return -* SS.POS +* SS.Pos * Entry A=path num * B=$05 * Exit X=msw of pos * U=lsw of pos -Gst600 cmpb #SS.POS is it SS.Pos? +Gst600 cmpb #SS.Pos is it SS.Pos? bne Gst60D no, keep checking IFNE H6309 * use 2 LDD, STD, same size as ldq/std/stw, PD.CP+2 <$0F, we can use short n,R @@ -1245,9 +1245,9 @@ * B = errcode * SetStat ldb R$B,u get function code -* TODO: remove next line since SS.OPT is 0 - cmpb #SS.OPT - bne Sst659 not SS.OPT, skip ahead +* TODO: remove next line since SS.Opt is 0 + cmpb #SS.Opt + bne Sst659 not SS.Opt, skip ahead ldx R$X,u get pointer to option packet leax $02,x skip device type and drive # leau PD.STP,y get pointer to start of data @@ -1486,7 +1486,7 @@ std PD.DSK,y init disk ID lbsr L097F get a byte from caller's X sta ,s save it - cmpa #PDELIm is it a device? + cmpa #PDELIM is it a device? bne Sst7FB no, skip ahead lbsr GtDvcNam go parse it sta ,s save last character @@ -1497,7 +1497,7 @@ Sst7FB anda #$7F strip high bit cmpa #PENTIR entire device flag? beq Sst81E yes, go process - lda #PDELIm place delimiter as last char + lda #PDELIM place delimiter as last char sta ,s leax -$01,x bump path pointer back 1 lda PD.MOD,y get file mode
--- a/level2/modules/rel.asm Wed Aug 06 18:56:08 2003 +0000 +++ b/level2/modules/rel.asm Wed Aug 06 23:52:47 2003 +0000 @@ -151,11 +151,16 @@ leau <L00E0,pcr point to $20, a space tfm u,x+ clear out the screen ELSE - ldd #$2000-8 - ldu #$2020 -ClrLoop stu ,x++ - subd #$0002 + ldy #$2000-8 + ldb #$20 +ClrLoop stb ,x+ + leay -1,y bne ClrLoop +* ldd #$2000-8 +* ldu #$2020 +*ClrLoop stu ,x++ +* subd #$0002 +* bne ClrLoop ENDC MoveTxt leau <L0011,pcr point to OS-9 Welcome Message @@ -187,11 +192,11 @@ L0011 fdb ScStart+(11*Width)+((Width-L1)/2) fcb L1 length of the text below +T1 equ * IFNE NitrOS9 -T1 fcc /Welcome to NitrOS-9!/ - ELSE -T1 fcc /Welcome to OS-9!/ + fcc /NITR/ ENDC + fcc /OS9 BOOT/ L1 equ *-T1 fdb ScStart+(13*Width)+((Width-LFail)/2) @@ -232,7 +237,7 @@ leau <R.Crash,pcr point to D.Crash, D.CBStart ldy #D.Crash move it over bsr Move E=$00 from call to L00FD above. - IFNE NitrOS9 + IFNE H6309 ldmd #$03 go to native mode, FIRQ saves all registers inc <D.MDREG 0+1=1; set MD shadow register (clr'd from above) ENDC @@ -255,7 +260,7 @@ * reset vector: map ROMs out and go to REL in the default DECB block map, * which is still block $3F at the top fo memory nop required for the ROMs to believe it's a reset vector -* clr >$FFDF go to all RAM mode + clr >$FFDF go to all RAM mode jmp >Offset+reset and re-start the boot Pad fill $39,$127-*
--- a/level2/modules/xacia.asm Wed Aug 06 18:56:08 2003 +0000 +++ b/level2/modules/xacia.asm Wed Aug 06 23:52:47 2003 +0000 @@ -762,7 +762,7 @@ bra TimedSlp Sleep1 ldx #1 give up balance of tick TimedSlp pshs cc save IRQ enable status - andcc #Intmasks enable IRQs + andcc #IntMasks enable IRQs os9 F$Sleep puls cc,pc restore IRQ enable status, return @@ -830,7 +830,7 @@ ifeq A6552-true ldy <V.PORT ldd #FCTxBrk*256+TB.Brk [A]=flow control flag, [B]=Tx break enable - orcc #Intmasks disable IRQs while messing with flow control flags + orcc #IntMasks disable IRQs while messing with flow control flags ora <FloCtlTx set Tx break flag bit sta <FloCtlTx save Tx flow control flags stb TBReg,y start Tx line break @@ -844,7 +844,7 @@ ifeq A6551-true ldy <V.PORT ldd #FCTxBrk*256+TIRB.Brk [A]=flow control flag, [B]=Tx break enable - orcc #Intmasks disable IRQs while messing with flow control flags + orcc #IntMasks disable IRQs while messing with flow control flags ora <FloCtlTx set Tx break flag bit sta <FloCtlTx save Tx flow control flags orb CmdReg,y set Tx line break bits