diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index bab4f4ff..3534e8a5 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/BIN/LSDEV.S.txt b/BIN/LSDEV.S.txt index c4ee1336..f30fc576 100644 --- a/BIN/LSDEV.S.txt +++ b/BIN/LSDEV.S.txt @@ -90,6 +90,15 @@ DumpDev >LDYA L.MSG0 jsr DumpDevFD bcs .9 + ldy #DEV.DIB+S.DIB-1 + ldx #S.DIB-1 + +.2 lda BLANK.DIB,x + sta (pData),y + dey + dex + bpl .2 + >PUSHEA.G DEV.DIB >LDA.G Table.Index >SYSCALL GetDevStatus @@ -253,6 +262,13 @@ FD.T.LNK .AZ "LNK" FD.T.DSOCK .AZ "DSOCK" FD.T.SSOCK .AZ "SSOCK" FD.T.PIPE .AZ "PIPE" +*-------------------------------------- +BLANK.DIB .DA #0 #S.DIB.S.BLOCK+S.DIB.S.WRITE+S.DIB.S.READ + .BS 3 + >PSTR "(No IDS String!)" + .DA #0 #S.DIB.T.PRODOS + .DA #0 + .DA 0 K.VER *-------------------------------------- .DUMMY .OR 0 diff --git a/SYS/KERNEL.S.DRV.txt b/SYS/KERNEL.S.DRV.txt index 4835b2c8..6ed2439d 100644 --- a/SYS/KERNEL.S.DRV.txt +++ b/SYS/KERNEL.S.DRV.txt @@ -95,7 +95,7 @@ DRV.BlkDevice.DIB .DA K.VER *-------------------------------------- * IOCTL to BLK protocol converter -* in : pIOCTL (AUX) +* in : pIOCTL *-------------------------------------- DRV.BLK txa lsr @@ -156,28 +156,27 @@ DRV.BLK.PARAMS .BS 6 * Smartport Driver *-------------------------------------- DRV.SmartPort cld - >STYA DRV.SmartPort.Go.IOCTL + >STYA pIOCTL + >STYA .3 smartport Params txa lsr - sta DRV.SmartPort.Go.Cmd + sta .2 tax lda DRV.SmartPort.Cnt,x - sta DRV.SmartPort.Go.Cmd + sta (pIOCTL) CmdList ldy #S.FD.DEV.BUSPTR lda (pFD),y - sta .8+1 + sta .1+1 iny lda (pFD),y - sta .8+2 + sta .1+2 -.8 jsr $ffff -DRV.SmartPort.Go.Cmd - .BS 1 -DRV.SmartPort.Go.IOCTL - .BS 2 +.1 jsr $ffff +.2 .BS 1 +.3 .BS 2 rts DRV.SmartPort.Cnt diff --git a/SYS/KERNEL.S.INIT.txt b/SYS/KERNEL.S.INIT.txt index ef5acec2..f80af2d0 100644 --- a/SYS/KERNEL.S.INIT.txt +++ b/SYS/KERNEL.S.INIT.txt @@ -847,6 +847,7 @@ DevMgrInit >LDYAI MSG.DEV .2 cmp #$FF /RAM is always $FF00 bne .3 + jsr DevMgrInit.RAM bra .8 @@ -869,11 +870,10 @@ DevMgrInit >LDYAI MSG.DEV ldy #7 lda (ZPPtr1),y beq .51 $Cn07=00 : SmartPort - bne .6 ldx #AWSmartPort.SIG-AWSmartPort.OFS-1 -.50 ldy AWSmartPort.OFS,x Check if there is a AWsmartport firmware +.50 ldy AWSmartPort.OFS,x Check if there is AWsmartport firmware lda (ZPPtr1),y cmp AWSmartPort.SIG,x bne .6 not on AW @@ -907,21 +907,25 @@ DevMgrInit >LDYAI MSG.DEV DevMgrInit.DEVCNT .BS 1 *-------------------------------------- -DevMgrInit.DII >LDYAI DRV.DiskII - jmp DevMgrInit.AddBDev +DevMgrInit.DII ldx #0 + >LDYAI DRV.DiskII + bra DevMgrInit.AddBDev *-------------------------------------- -DevMgrInit.RAM >LDYAI DRV.RamDrive - jmp DevMgrInit.AddBDev +DevMgrInit.RAM ldx #2 + >LDYAI DRV.RamDrive + bra DevMgrInit.AddBDev *-------------------------------------- -DevMgrInit.USR >LDYAI DRV.BlkDevice - jmp DevMgrInit.AddBDev +DevMgrInit.USR ldx #4 + >LDYAI DRV.BlkDevice + bra DevMgrInit.AddBDev *-------------------------------------- DevMgrInit.BLK ldy #$ff lda (ZPPtr1),y sta FD.BDEV+S.FD.DEV.BUSPTR + ldx #6 >LDYAI DRV.BlkDevice - jmp DevMgrInit.AddBDev + bra DevMgrInit.AddBDev *-------------------------------------- DevMgrInit.SP ldy #$ff lda (ZPPtr1),y @@ -931,17 +935,17 @@ DevMgrInit.SP ldy #$ff sta FD.BDEV+S.FD.DEV.BUSPTR lda ZPPtr1+1 sta .1+2 - + sta FD.BDEV+S.FD.DEV.BUSPTR+1 + lda FD.BDEV+S.FD.DEV.DEVID sta SP.IOCTL.STATUS+S.IOCTL.UNITNUM - + .1 jsr $ffff Self Modified .DA #0 Status .DA SP.IOCTL.STATUS bcs DevMgrInit.AddBDev.RTS - ldx SP.IOCTL.STATUS.DIB+S.DIB.S - + ldx #8 >LDYAI DRV.SmartPort *-------------------------------------- DevMgrInit.AddBDev @@ -955,14 +959,16 @@ DevMgrInit.AddBDev ora #$30 sta FD.BDEV.NAME+3 SxDn + >PUSHW MSG.BLKDEV.TBL,x >PUSHWI FD.BDEV.NAME - >PUSHBI 2 + >PUSHBI 4 >LDYAI MSG.BLKDEV >SYSCALL printf >PUSHWI FD.BDEV.NAME >LDYAI FD.BDEV >SYSCALL MKDev + DevMgrInit.AddBDev.RTS rts *-------------------------------------- @@ -1136,7 +1142,17 @@ MSG.Init2.OK .AZ "A2osX[Stage2]:Complete.\n" SYSSCREEN.TOP .AZ "A2osX 0.93 Console" MSG.Init3 .AZ "A2osX[Stage3]:Init *** Press Ctrl-R for ROOT Mode ***" MSG.DEV .AZ "Device Manager..." -MSG.BLKDEV .AZ " Adding : /DEV/%s\r\n" +MSG.BLKDEV .AZ " Adding Device: /DEV/%s, Type: %s\r\n" +MSG.BLKDEV.TBL .DA MSG.BLKDEV.DII + .DA MSG.BLKDEV.RAM + .DA MSG.BLKDEV.USR + .DA MSG.BLKDEV.BLK + .DA MSG.BLKDEV.SP +MSG.BLKDEV.DII .AZ "Disk ][" +MSG.BLKDEV.RAM .AZ "/RAM Disk" +MSG.BLKDEV.USR .AZ "User" +MSG.BLKDEV.BLK .AZ "Generic Block" +MSG.BLKDEV.SP .AZ "Smartport" MSG.IRQ .AZ "Interrupt Manager..." MSG.IRQ.VBL .AZ " Mouse VBL IRQ Activated." MSG.IRQ.CLOCK .AZ " Clock Card IRQ Activated."