diff --git a/.Floppies/A2OSX.BOOT.po b/.Floppies/A2OSX.BOOT.po index ca367844..27723d79 100644 Binary files a/.Floppies/A2OSX.BOOT.po and b/.Floppies/A2OSX.BOOT.po differ diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index d91cf710..7272aed0 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/INC/A2osX.I.txt b/INC/A2osX.I.txt index a7e668bc..4530de46 100644 --- a/INC/A2osX.I.txt +++ b/INC/A2osX.I.txt @@ -74,6 +74,7 @@ A2osX.S.SP .EQ $C2 A2osX.S.COM .EQ $E0 A2osX.S.XY .EQ $E1 A2osX.S.NIC .EQ $E2 +A2osX.S.CLK .EQ $E3 A2osX.S.DISABLE .EQ $FF *-------------------------------------- * ProDOS ERROR CODES : $00->$5F diff --git a/SBIN/KCONFIG.S.txt b/SBIN/KCONFIG.S.txt index 83f6abea..d29dfc23 100644 --- a/SBIN/KCONFIG.S.txt +++ b/SBIN/KCONFIG.S.txt @@ -53,10 +53,11 @@ T.MSG.SLOT.DESC .DA MSG.SLOT.NODEV .DA MSG.SLOT.ATK .DA MSG.SLOT.DII .DA MSG.SLOT.BLK - .DA MSG.SLOT.PRT + .DA MSG.SLOT.SP .DA MSG.SLOT.COM .DA MSG.SLOT.XY - .DA MSG.SLOT.NET + .DA MSG.SLOT.NIC + .DA MSG.SLOT.CLK .DA MSG.SLOT.DIS L.MSG.PROMPT .DA MSG.PROMPT .DA 0 End Of Reloc Table @@ -350,6 +351,7 @@ SLOTS .DA #0 .DA #A2osX.S.COM .DA #A2osX.S.XY .DA #A2osX.S.NIC + .DA #A2osX.S.CLK .DA #A2osX.S.DISABLE SLOTS.MAX .EQ *-SLOTS *-------------------------------------- @@ -372,10 +374,11 @@ MSG.SLOT.VSD .AZ "SSC Shared Driver for VSDRIVE" MSG.SLOT.ATK .AZ "AppleTalk Board" MSG.SLOT.DII .AZ "Disk II Controller" MSG.SLOT.BLK .AZ "Generic Block/SCSI Controller" -MSG.SLOT.PRT .AZ "SmartPort Controller" +MSG.SLOT.SP .AZ "SmartPort Controller" MSG.SLOT.COM .AZ "Communication Card" MSG.SLOT.XY .AZ "XY Pointing Device" -MSG.SLOT.NET .AZ "Network Interface Card" +MSG.SLOT.NIC .AZ "Network Interface Card" +MSG.SLOT.CLK .AZ "Clock Card" MSG.SLOT.DIS .AZ "" MSG.PROMPT .AZ "\e[24;80H" MSG.QUIT .AZ "\ec" diff --git a/SYS/KERNEL.S.INIT.txt b/SYS/KERNEL.S.INIT.txt index 266f65be..8cbf0cd7 100644 --- a/SYS/KERNEL.S.INIT.txt +++ b/SYS/KERNEL.S.INIT.txt @@ -102,16 +102,23 @@ Kernel.Init3 sta SETALTZP sta IRQ.InKernel jsr SysScrInit + lda #"1" + sta $427 jsr MemMgrInit >LDYAI FD.NULL >SYSCALL MKDev - + inc $427 >LDYAI FD.SYS >SYSCALL MKDev - + inc $427 jsr PS0.Init + bcc .10 - >LDYAI MSG.Init3 + lda #"D" + sta $427 + bra * + +.10 >LDYAI MSG.Init3 >SYSCALL puts jsr CPU.Init.6502 @@ -123,8 +130,6 @@ Kernel.Init3 sta SETALTZP jsr EvtMgrInit - jsr FltMgrInit - jsr TskMgrInit bcs * @@ -288,12 +293,14 @@ PS0.Init >LDYAI CORE.S.PS0 Select Process 0 (Kernel) >LDYAI K.STACKTOP >STYA pStack - >PUSHWI 0 - >PUSHBI 0 + >PUSHWI 0 Aux type + >PUSHBI S.FI.T.TXT + >PUSHBI O.RDWR + >LDYAI DEV.SYS >SYSCALL fopen bcs .9 - + ldy #S.PS.hStdIn sta (pPs),y sta CORE.S.PS0+S.PS.hStdIn @@ -526,6 +533,10 @@ MemMgrInit >LDYAI Mem.MHiMem .4 stz OF.Table.hPath,x dex bpl .4 + + stz Evt.Table + stz Flt.Table + rts *-------------------------------------- * Setup AuxLC $FFFE->Kernel IRQ Handler @@ -631,13 +642,21 @@ IrqMgrInit.TClock tay get $n0 sty IRQ.VBL.n0 + lda #A2osX.S.CLK + sta A2osX.S,x + php sei - lda #$40 Enable interrupt + lda #$40+$20 Enable interrupt + 64Hz sta $c080,y + + lda #$40 + sta SET80STORE + sta CLRPAGE2 sta $478,x sta $7f8,x + sta CLR80STORE lda #64 sta CORE.TickPerSec @@ -924,13 +943,6 @@ EvtMgrInit >LDYAI MSG.EVT clc rts *-------------------------------------- -FltMgrInit >LDYAI MSG.FLT - >SYSCALL puts - - stz Flt.Table - clc - rts -*-------------------------------------- TskMgrInit >LDYAI MSG.TSK >SYSCALL puts @@ -1036,7 +1048,6 @@ MSG.IRQ.VBL .AZ " Mouse VBL IRQ Activated." MSG.IRQ.CLOCK .AZ " Clock Card IRQ Activated." MSG.IRQ.POLL .AZ " Polling Mode." MSG.EVT .AZ "Event Manager..." -MSG.FLT .AZ "Path Filter..." MSG.TSK .AZ "Task Manager..." MSG.Prefix .AZ "Root:%s\r\n" MSG.CTRLD .AZ "Ctrl-D Pressed, entering Maintenance mode..." diff --git a/SYS/KERNEL.S.IRQ.txt b/SYS/KERNEL.S.IRQ.txt index 118c52ab..dcf32cfb 100644 --- a/SYS/KERNEL.S.IRQ.txt +++ b/SYS/KERNEL.S.IRQ.txt @@ -132,8 +132,8 @@ K.IrqH.TCLOCK ldy IRQ.VBL.n0 and #$20 beq K.IrqH.DEV - lda $c080,y lda $c088,y + lda $c080,y bra K.IrqH.Switch *--------------------------------------