diff --git a/DRV/UTHER2.AI.DRV.S.txt b/DRV/UTHER2.AI.DRV.S.txt index 7cbf5800..f6dacbeb 100644 --- a/DRV/UTHER2.AI.DRV.S.txt +++ b/DRV/UTHER2.AI.DRV.S.txt @@ -45,16 +45,10 @@ Dev.Detect >STYA Args >LDYA L.MSG.DETECT >SYSCALL CPrintFYA - ldx #$70 + ldx #$70+$88 + ldy #7 -.1 txa IO based detection, avoid scanning in Disk Controller IO!!!! - lsr - lsr - lsr - lsr - tay - - lda A2osX.SLOTS,y +.1 lda A2osX.SLOTS,y IO based detection, avoid scanning in Disk Controller IO!!!! bne .2 lda #W5100.MR.RST @@ -89,6 +83,7 @@ Dev.Detect >STYA Args sec sbc #$10 tax + dey bne .1 >LDYA L.MSG.DETECT.KO @@ -99,12 +94,6 @@ Dev.Detect >STYA Args rts .3 stx DEVSLOTx0 - txa - lsr - lsr - lsr - lsr - tay lda #A2osX.SLOTS.NET sta A2osX.SLOTS,y diff --git a/DRV/UTHERNET2.DRV.S.txt b/DRV/UTHERNET2.DRV.S.txt index 22dc093b..83e247b3 100644 --- a/DRV/UTHERNET2.DRV.S.txt +++ b/DRV/UTHERNET2.DRV.S.txt @@ -44,16 +44,10 @@ Dev.Detect >STYA Args >LDYA L.MSG.DETECT >SYSCALL CPrintFYA - ldx #$70 + ldx #$70+$88 + ldy #7 -.1 txa IO based detection, avoid scanning in Disk Controller IO!!!! - lsr - lsr - lsr - lsr - tay - - lda A2osX.SLOTS,y +.1 lda A2osX.SLOTS,y IO based detection, avoid scanning in Disk Controller IO!!!! bne .2 lda #W5100.MR.RST @@ -88,6 +82,7 @@ Dev.Detect >STYA Args sec sbc #$10 tax + dey bne .1 >LDYA L.MSG.DETECT.KO @@ -98,12 +93,6 @@ Dev.Detect >STYA Args rts .3 stx DEVSLOTx0 - txa - lsr - lsr - lsr - lsr - tay lda #A2osX.SLOTS.NET sta A2osX.SLOTS,y diff --git a/Floppies/A2OSX.BOOT.po b/Floppies/A2OSX.BOOT.po index a3325941..93062987 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 427d196d..76f84287 100644 Binary files a/Floppies/A2OSX.BUILD.po and b/Floppies/A2OSX.BUILD.po differ diff --git a/Floppies/A2OSX.SRC.po b/Floppies/A2OSX.SRC.po index 775b977b..089aeafb 100644 Binary files a/Floppies/A2OSX.SRC.po and b/Floppies/A2OSX.SRC.po differ diff --git a/INC/NET.W5100.I.txt b/INC/NET.W5100.I.txt index 98a25dfd..bafd61f1 100644 --- a/INC/NET.W5100.I.txt +++ b/INC/NET.W5100.I.txt @@ -14,13 +14,13 @@ AUTO 6 sta W5100.AR+1,x .EM *-------------------------------------- -W5100.MR .EQ $C084 Mode Register +W5100.MR .EQ $C084-$88 Mode Register W5100.MR.RST .EQ %10000000 W5100.MR.PB .EQ %00010000 W5100.MR.PPPOE .EQ %00001000 W5100.MR.AI .EQ %00000010 W5100.MR.IND .EQ %00000001 -W5100.AR .EQ $C085 Memory Pointer +W5100.AR .EQ $C085-$88 Memory Pointer W5100.AR.GAR .EQ $0001 W5100.AR.SUBR .EQ $0005 W5100.AR.SHAR .EQ $0009 @@ -70,7 +70,7 @@ W5100.AR.S0.TX.RD .EQ $0422 W5100.AR.S0.TX.WR .EQ $0424 W5100.AR.S0.RX.RSR .EQ $0426 W5100.AR.S0.RX.RD .EQ $0428 -W5100.DR .EQ $C087 +W5100.DR .EQ $C087-$88 *-------------------------------------- TX.BASE .EQ $4000 RX.BASE .EQ $6000