git-svn-id: http://svn.code.sf.net/p/netboot65/code@316 93682198-c243-4bdb-bd91-e943c89aac3b

This commit is contained in:
jonnosan 2011-06-10 12:11:05 +00:00
parent cbd5b78b15
commit 763402b26f
11 changed files with 1801 additions and 36 deletions

Binary file not shown.

Binary file not shown.

View File

@ -5,7 +5,7 @@ AFLAGS=
INCFILES=\
../inc/common.i\
commonprint.i\
../inc/commonprint.i\
../inc/net.i\
../inc/menu.i\
../inc/kipper_constants.i\
@ -32,6 +32,7 @@ all: ip65 drivers\
kipperkart.prg \
kippergo.prg \
kippergo_rr.bin \
kkwiz_rr.bin \
kipperdisk.d64 \
kipperkart.o: kipperkart.s $(INCFILES) ../inc/ping.i ../inc/disk_transfer.i ../inc/sidplay.i ../inc/config_menu.i
@ -114,8 +115,11 @@ kkwiz.bin: kipperkart.o $(IP65WIZNETLIB) $(C64WIZNETLIB) $(INCFILES) ../cfg/c64_
ruby fix_cart.rb $@ 16384
# ruby set_ip_config.rb $@ mac auto
kkwiz_rr.bin: kkwiz.bin
cp crt8040.obj rrnet_header.bin
cat rrnet_header.bin kkwiz.bin > kkwiz_rr.bin
ruby fix_cart.rb $@ 32768
cp kkwiz_rr.bin ../wiznet/
d64_upload.d64: d64_upload.prg
cp d64_upload.prg ../../server/boot/

View File

@ -84,10 +84,10 @@ WIZNET_DATA_REG = WIZNET_BASE+3
;this implementation uses a default address for the w5100, and can be
;called as a 'generic' eth driver init function
eth_init:
lda $de01
eor #$01
sta $de01
lda $de01
ora #1 ;turn on clockport
sta $de01
lda #$80 ;reset
sta WIZNET_MODE_REG
@ -953,7 +953,7 @@ setup_tcp_socket:
.rodata
eth_driver_name:
.asciiz "WIZNET 5100"
.asciiz "RR-NET MK3 (WIZNET 5100)"
eth_driver_io_base:
.word WIZNET_BASE

View File

@ -18,7 +18,7 @@ IP65WIZNETLIB=../ip65/ip65_wiznet.lib
C64WIZNETLIB=../drivers/c64wiznet.lib
all: ip65 drivers kipperterm2.prg kt2wiz.prg kipperterm2.d64
all: ip65 drivers kipperterm2.prg kt2wiz.prg kipperterm2.d64 kt2wiz.d64
kipperterm2.o: kipperterm2.s $(INCFILES) ../inc/telnet.i ../inc/config_menu.i ../inc/gopher.i
@ -37,13 +37,18 @@ kt2wiz.prg: kipperterm2.o $(IP65WIZNETLIB) $(C64WIZNETLIB) $(INCFILES) ../cfg/c6
cp kt2wiz.prg ../../server/boot
kipperterm2.d64: kipperterm2.prg kt2wiz.prg addresses.txt abe.bas
kipperterm2.d64: kipperterm2.prg addresses.txt abe.bas
ripxplore.rb --init CbmDos $@ -a kipperterm2.prg
# ripxplore.rb $@ -a 80columns -t C64Prg
ripxplore.rb $@ -a addresses.txt -t C64Seq
ripxplore.rb $@ -a abe -t C64Prg
cp kipperterm2.d64 ../../server/boot
kt2wiz.d64: kt2wiz.prg addresses.txt abe.bas
ripxplore.rb --init CbmDos $@ -a kt2wiz.prg
ripxplore.rb $@ -a addresses.txt -t C64Seq
ripxplore.rb $@ -a abe -t C64Prg
cp kt2wiz.d64 ../wiznet/
clean:
rm -f *.o *.bin *.map *.prg *.pg2 *.dsk *.d64

View File

@ -1 +1 @@
.byte "2011-05-22"
.byte "2011-06-10"

View File

@ -26,6 +26,8 @@ all: ip65 drivers\
wizboot.prg \
telnetd.bin \
telnetd.prg \
wizbobcart.prg \
kt2wiz.d64 \
bootc64.prg \
%.o: %.s $(INCFILES) timestamp.rb
@ -50,6 +52,13 @@ telnetd.bin: telnetd.o $(IP65WIZNETLIB) $(C64WIZNETLIB) $(INCFILES) ../cfg/c64_8
telnetd.prg: telnetd.bin cartheader.prg
cat cartheader.prg telnetd.bin > $@
wizbobcart.bin: wizbobcart.o $(IP65WIZNETLIB) $(C64WIZNETLIB) $(INCFILES) ../cfg/c64_8kcart.cfg
$(LD) -m wizbobcart.map -vm -C ../cfg/c64_8kcart.cfg -o $@ $< $(IP65WIZNETLIB) $(C64WIZNETLIB)
ruby ../carts/fix_cart.rb $@ 8192
wizbobcart.prg: wizbobcart.bin cartheader.prg
cat cartheader.prg wizbobcart.bin > $@
clean:
rm -f *.o *.bin *.map *.prg *.pg2 *.dsk *.d64
@ -63,7 +72,12 @@ ip65:
drivers:
make -C ../drivers all
kt2wiz.d64:
make -C ../kipperterm2 kt2wiz.d64
bootc64.prg:
cp telnetd.prg ../../server/boot/bootc64.prg
cp wizbobcart.prg ../../server/boot/bootc64.prg
# cp telnetd.prg ../../server/boot/bootc64.prg
# cp wizboot2.prg ../../server/boot/bootc64.prg
# cp wiztest.prg ../../server/boot/bootc64.prg

View File

@ -51,6 +51,7 @@ TELNET_PORT=6400
XMAX=$289 ;max keypresses in buffer
STKEY=$91 ;last key pressed
INIT_MAGIC_VALUE=$C7
.segment "CARTRIDGE_HEADER"
.word cold_init ;cold start vector
.word warm_init ;warm start vector
@ -75,8 +76,18 @@ cold_init:
jsr $ff5B ;init. VIC
cli ;KERNAL init. finished
warm_init:
warm_init:
lda #INIT_MAGIC_VALUE
cmp init_flag
bne @real_init
jmp $fe5e ; contine on to real RESTORE routine
@real_init:
sta init_flag
;we need to set up BASIC as well
jsr $e453 ;set BASIC vectors
jsr $e3bf ;initialize zero page
;relocate our r/w data
ldax #__DATA_LOAD__
stax copy_src
@ -97,7 +108,6 @@ warm_init:
ldax #startup_msg
jsr print
jsr ip65_init
bcs init_failed
@ -107,6 +117,8 @@ init_failed:
jsr print_errorcode
jsr print_ip_config
jsr print_cr
flash_forever:
inc $d020
jmp flash_forever
@ -121,10 +133,6 @@ init_ok:
;install our new STOP handler
ldax ISTOP
stax old_stop_handler
ldax #stop_handler
; stax ISTOP
cli
@ -138,13 +146,12 @@ start_listening:
jsr print_dotted_quad
ldax #port
jsr print
;we need to copy BASIC as well since swapping KERNAL forces swap of BASIC
ldax #$A000
ldax #$8000
stax copy_src
stax copy_dest
ldax #$2000
ldax #$4000
jsr copymem
ldax #$E000
@ -156,6 +163,7 @@ start_listening:
;now intercept calls to $E716
;we do this instead of using the $326 vector because the BASIC
;'READY' loop calls $E716 directly rather than calling $FFD2
lda #$4C ;JMP
sta $e716
ldax #new_charout
@ -173,7 +181,6 @@ start_listening:
sta tcp_send_data_len
ldax #term_setup_string
jsr tcp_send
jmp $E397
@ -257,17 +264,9 @@ new_charout:
ldy temp_y
jmp $e719 ;after the code we patched
stop_handler:
lda break_flag
beq @no_stop
lda #$7f
sta STKEY
lda #0
sta break_flag
@no_stop:
jmp (old_stop_handler)
.bss
init_flag: .res 1
old_tick_handler: .res 2
old_stop_handler: .res 2
temp_x : .res 1
@ -310,6 +309,7 @@ connection_closed:
.byte 13,"CONNECTION CLOSED",13,0
term_setup_string:
.byte 142 ;upper case
.byte 147 ;cls
term_setup_string_length=*-term_setup_string

View File

@ -0,0 +1 @@
puts Time.now.strftime(".byte \" (%Y-%m-%d)\"")

1741
client/wiznet/wizbobcart.s Normal file

File diff suppressed because it is too large Load Diff

View File

@ -277,7 +277,7 @@ wizboot_msg:
.byte 147 ;cls
;.byte 14 ;lower case
.byte 142 ;upper case
.byte 13," WIZNET CART - V"
.byte 13," RR-NET MK3 - V"
.include "../inc/version.i"
.include "timestamp.i"
.byte 13