Kernel version 0.9 : Change in NIC detection/reset

This commit is contained in:
Rémy GIBERT 2017-02-19 21:14:09 +01:00
parent e6441b6b26
commit a190169a07
7 changed files with 24 additions and 14 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -3,12 +3,10 @@ PREFIX /A2OSX.BOOT
NEW NEW
INC 1 INC 1
AUTO 6 AUTO 6
ECHO *** A2osX Startup file *** ECHO *** A2osX Startup Script ***
echo Working Directory: echo Working Directory:$CD
CD
SET PATH=${PATH};/A2OSX.DEV/BIN/ SET PATH=${PATH};/A2OSX.DEV/BIN/
SET PS1='$PWD' SET PS1='$PWD'
SET
# Main Screen # Main Screen
INSDRV CONSOLE.DRV INSDRV CONSOLE.DRV
STARTPROC GETTY CON ${A2OSX}SBIN/LOGIN STARTPROC GETTY CON ${A2OSX}SBIN/LOGIN
@ -19,7 +17,7 @@ STARTPROC GETTY COM2 ${A2OSX}SBIN/LOGIN
#INSDRV PIC.DRV #INSDRV PIC.DRV
# Network Section # Network Section
INSDRV UTHERNET.DRV 000E3A123456 INSDRV UTHERNET.DRV 000E3A123456
#INSDRV UTHERNET2.DRV 0008DC123456 INSDRV UTHERNET2.DRV 0008DC123456
#INSDRV UTHER2.AI.DRV 0008DC123456 #INSDRV UTHER2.AI.DRV 0008DC123456
#INSDRV LANCEGS.DRV #INSDRV LANCEGS.DRV
STARTPROC TCPIP STARTPROC TCPIP

View File

@ -133,7 +133,7 @@ ARGS .BS 2
DEV.HEADER .DA DRV.CS.START DEV.HEADER .DA DRV.CS.START
.DA #S.DEV.S.BLOCK+S.DEV.S.WRITE+S.DEV.S.READ .DA #S.DEV.S.BLOCK+S.DEV.S.WRITE+S.DEV.S.READ
DEV.HEADER.NAME .DA #4 DEV.HEADER.NAME .DA #4
.AS "ETH1" NAME .AS "ETH7" NAME
*-------------------------------------- *--------------------------------------
* Driver Code * Driver Code
*-------------------------------------- *--------------------------------------
@ -361,7 +361,7 @@ OPEN jsr CLOSE
>LDYAI PP.LineCTL >LDYAI PP.LineCTL
>STYA PacketPagePTR,x >STYA PacketPagePTR,x
>LDYAI PP.LineCTL.LID+PP.LineCTL.SerRxOn+PP.LineCTL.SerTxOn+PP.LineCTL.Auto >LDYAI PP.LineCTL.LID+PP.LineCTL.SerRxOn+PP.LineCTL.SerTxOn+PP.LineCTL.10BaseT
>STYA PacketPageDATA,x >STYA PacketPageDATA,x
clc clc
rts rts
@ -371,6 +371,12 @@ CLOSE ldx DEVSLOTx0
>STYA PacketPagePTR,x >STYA PacketPagePTR,x
>LDYAI PP.SelfCTL.LID+PP.SelfCTL.RESET >LDYAI PP.SelfCTL.LID+PP.SelfCTL.RESET
>STYA PacketPageDATA,x >STYA PacketPageDATA,x
>LDYAI PP.SelfCTL
>STYA PacketPagePTR,x
>LDYAI PP.SelfCTL.LID
>STYA PacketPageDATA,x
clc clc
rts rts
*-------------------------------------- *--------------------------------------

View File

@ -54,9 +54,17 @@ Dev.Detect >STYA Args
lda #W5100.MR.RST lda #W5100.MR.RST
sta W5100.MR,x sta W5100.MR,x
lda #0
.10 dec give some time....
bne .10
lda #W5100.MR.AI+W5100.MR.IND lda #W5100.MR.AI+W5100.MR.IND
sta W5100.MR,x sta W5100.MR,x
pha
pla
lda W5100.MR,x lda W5100.MR,x
cmp #W5100.MR.AI+W5100.MR.IND cmp #W5100.MR.AI+W5100.MR.IND
bne .2 bne .2
@ -114,9 +122,7 @@ Dev.Detect >STYA Args
sta MAC+5 sta MAC+5
bra .8 bra .8
.4 >SYSCALL GetMemPtrA .4 jsr DecodeMac
>STYA ZPTmpPTR
jsr DecodeMac
bcc .8 bcc .8
lda #DEVMGR.ERRICL lda #DEVMGR.ERRICL
sec sec
@ -140,7 +146,7 @@ Args .BS 2
*-------------------------------------- *--------------------------------------
DEV.HEADER .DA DRV.CS.START DEV.HEADER .DA DRV.CS.START
.DA #S.DEV.S.BLOCK+S.DEV.S.WRITE+S.DEV.S.READ .DA #S.DEV.S.BLOCK+S.DEV.S.WRITE+S.DEV.S.READ
DEV.HEADER.NAME >PSTR "ETH1" NAME DEV.HEADER.NAME >PSTR "ETH7" NAME
*-------------------------------------- *--------------------------------------
* Driver Code * Driver Code
*-------------------------------------- *--------------------------------------

View File

@ -47,13 +47,13 @@ PP.LineCTL .EQ $0112 Line Control (RW)
PP.LineCTL.LID .EQ %00000000.00010011 PP.LineCTL.LID .EQ %00000000.00010011
PP.LineCTL.SerRxOn .EQ %00000000.01000000 PP.LineCTL.SerRxOn .EQ %00000000.01000000
PP.LineCTL.SerTxOn .EQ %00000000.10000000 PP.LineCTL.SerTxOn .EQ %00000000.10000000
*PP.LineCTL.10BaseT .EQ %00000000.00000000 PP.LineCTL.10BaseT .EQ %00000000.00000000
*PP.LineCTL.AUIonly .EQ %00000001.00000000 *PP.LineCTL.AUIonly .EQ %00000001.00000000
PP.LineCTL.Auto .EQ %00000010.00000000 *PP.LineCTL.Auto .EQ %00000010.00000000
PP.SelfCTL .EQ $0114 Self Control (RW) PP.SelfCTL .EQ $0114 Self Control (RW)
PP.SelfCTL.LID .EQ %00000000.00010101 PP.SelfCTL.LID .EQ %00000000.00010101
PP.SelfCTL.RESET .EQ %00000000.01000000 PP.SelfCTL.RESET .EQ %00000000.01000000
PP.SelfCTL.SWSuspnd .EQ %00000000.10000000 *PP.SelfCTL.SWSuspnd .EQ %00000000.10000000
*PP.SelfCTL.HWSleepE .EQ %00000001.00000000 *PP.SelfCTL.HWSleepE .EQ %00000001.00000000
*PP.SelfCTL.HWStndby .EQ %00000010.00000000 *PP.SelfCTL.HWStndby .EQ %00000010.00000000
PP.BufCTL .EQ $0116 PP.BufCTL .EQ $0116