deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Allow fixup to be repeated.

Browse source 
There are scenarios in which it is beneficial to search for an Etherne chip at several i/o locations. To do so the chip initialization is performed at several i/o locations until it succeeds. In order to allow for that operation model the i/o location fixup needs to be repeatable.

Note: This won't work with the RR-Net because the fixup bits overlap with the chip i/o bits.
This commit is contained in:
Oliver Schmidt 2015-07-09 22:43:16 +02:00
parent a30e2e0045
commit f348f4feb2
3 changed files with 47 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cpu/6502/net/cs8900a.S
View file

@ -92,12 +92,13 @@ fixups = * - fixup
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
rxtxreg := $FF00 ; High byte patched at runtime ; 3 most significant nibbles are fixed up at runtime
txcmd := $FF04 ; High byte patched at runtime rxtxreg := $FFF0
txlen := $FF06 ; High byte patched at runtime txcmd := $FFF4
isq := $FF08 ; High byte patched at runtime txlen := $FFF6
packetpp := $FF0A ; High byte patched at runtime isq := $FFF8
ppdata := $FF0C ; High byte patched at runtime packetpp := $FFFA
ppdata := $FFFC
.data .data
@ -117,8 +118,9 @@ init:
ldy #$00 ldy #$00
; Fixup address at location ; Fixup address at location
: lda reg : lda (ptr),y
eor (ptr),y ; Use XOR to support C64 RR-Net and #$0F
eor reg ; Use XOR to support C64 RR-Net
sta (ptr),y sta (ptr),y
iny iny
lda reg+1 lda reg+1

58
cpu/6502/net/lan91c96.S
View file

@ -95,40 +95,41 @@ fixups = * - fixup
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
ethbsr := $FF0E ; Bank select register R/W (2B) ; 3 most significant nibbles are fixed up at runtime
ethbsr := $FFFE ; Bank select register R/W (2B)
; Register bank 0 ; Register bank 0
ethtcr := $FF00 ; Transmition control register R/W (2B) ethtcr := $FFF0 ; Transmition control register R/W (2B)
ethephsr := $FF02 ; EPH status register R/O (2B) ethephsr := $FFF2 ; EPH status register R/O (2B)
ethrcr := $FF04 ; Receive control register R/W (2B) ethrcr := $FFF4 ; Receive control register R/W (2B)
ethecr := $FF06 ; Counter register R/O (2B) ethecr := $FFF6 ; Counter register R/O (2B)
ethmir := $FF08 ; Memory information register R/O (2B) ethmir := $FFF8 ; Memory information register R/O (2B)
ethmcr := $FF0A ; Memory Config. reg. +0 R/W +1 R/O (2B) ethmcr := $FFFA ; Memory Config. reg. +0 R/W +1 R/O (2B)
; Register bank 1 ; Register bank 1
ethcr := $FF00 ; Configuration register R/W (2B) ethcr := $FFF0 ; Configuration register R/W (2B)
ethbar := $FF02 ; Base address register R/W (2B) ethbar := $FFF2 ; Base address register R/W (2B)
ethiar := $FF04 ; Individual address register R/W (6B) ethiar := $FFF4 ; Individual address register R/W (6B)
ethgpr := $FF0A ; General address register R/W (2B) ethgpr := $FFFA ; General address register R/W (2B)
ethctr := $FF0C ; Control register R/W (2B) ethctr := $FFFC ; Control register R/W (2B)
; Register bank 2 ; Register bank 2
ethmmucr := $FF00 ; MMU command register W/O (1B) ethmmucr := $FFF0 ; MMU command register W/O (1B)
ethautotx := $FF01 ; AUTO TX start register R/W (1B) ethautotx := $FFF1 ; AUTO TX start register R/W (1B)
ethpnr := $FF02 ; Packet number register R/W (1B) ethpnr := $FFF2 ; Packet number register R/W (1B)
etharr := $FF03 ; Allocation result register R/O (1B) etharr := $FFF3 ; Allocation result register R/O (1B)
ethfifo := $FF04 ; FIFO ports register R/O (2B) ethfifo := $FFF4 ; FIFO ports register R/O (2B)
ethptr := $FF06 ; Pointer register R/W (2B) ethptr := $FFF6 ; Pointer register R/W (2B)
ethdata := $FF08 ; Data register R/W (4B) ethdata := $FFF8 ; Data register R/W (4B)
ethist := $FF0C ; Interrupt status register R/O (1B) ethist := $FFFC ; Interrupt status register R/O (1B)
ethack := $FF0C ; Interrupt acknowledge register W/O (1B) ethack := $FFFC ; Interrupt acknowledge register W/O (1B)
ethmsk := $FF0D ; Interrupt mask register R/W (1B) ethmsk := $FFFD ; Interrupt mask register R/W (1B)
; Register bank 3 ; Register bank 3
ethmt := $FF00 ; Multicast table R/W (8B) ethmt := $FFF0 ; Multicast table R/W (8B)
ethmgmt := $FF08 ; Management interface R/W (2B) ethmgmt := $FFF8 ; Management interface R/W (2B)
ethrev := $FF0A ; Revision register R/W (2B) ethrev := $FFFA ; Revision register R/W (2B)
ethercv := $FF0C ; Early RCV register R/W (2B) ethercv := $FFFC ; Early RCV register R/W (2B)
.data .data
@ -148,8 +149,9 @@ init:
ldy #$00 ldy #$00
; Fixup address at location ; Fixup address at location
: lda reg : lda (ptr),y
ora (ptr),y and #$0F
ora reg
sta (ptr),y sta (ptr),y
iny iny
lda reg+1 lda reg+1

12
cpu/6502/net/w5100.S
View file

@ -103,9 +103,10 @@ fixups = * - fixup
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
mode := $FF00 ; High byte patched at runtime ; 14 most significant bits are fixed up at runtime
addr := $FF01 ; High byte patched at runtime mode := $FFFC|0
data := $FF03 ; High byte patched at runtime addr := $FFFC|1
data := $FFFC|3
.data .data
@ -125,8 +126,9 @@ init:
ldy #$00 ldy #$00
; Fixup address at location ; Fixup address at location
: lda reg : lda (ptr),y
ora (ptr),y and #$03
ora reg
sta (ptr),y sta (ptr),y
iny iny
lda reg+1 lda reg+1