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

client/test/Makefile

@@ -19,6 +19,8 @@ INCFILES=\
   ../inc/net.i\
 
 all: \
+	ip65 \
+	drivers \
 	test_getc.prg \
 	testdns.prg \
 	test_disk_io.prg \
@@ -44,6 +46,12 @@ all: \
 #	test_disk_io.d64 \
 
 
+ip65:
+	make -C ../ip65 all
+
+drivers:
+	make -C ../drivers all
+
 %.o: %.c
 	$(CC) -c $(CFLAGS) $<
 

client/test/test_wiznet.s

@@ -1,6 +1,7 @@
   .include "../inc/common.i"
   .include "../inc/commonprint.i"
   .include "../inc/net.i"
+  .include "../drivers/w5100.i"
 
   .import exit_to_basic  
   
@@ -11,7 +12,13 @@
   .import icmp_echo_ip
   .import icmp_ping
   .import get_key
-  .import w5100_read_reg
+  .import w5100_read_register
+  .import w5100_write_register
+  .import w5100_select_register
+  .import w5100_get_current_register
+  .import w5100_read_next_byte
+  .import w5100_write_next_byte
+  
   .import  __CODE_LOAD__
   .import  __CODE_SIZE__
   .import  __RODATA_SIZE__
@@ -36,19 +43,66 @@ basicstub:
 .code
 
 init:
+; jsr wait_for_keypress
   init_ip_via_dhcp
+; jsr wait_for_keypress
+
+  jsr print_ip_config
+;
+;  jsr wait_for_keypress
+;  jsr dhcp_init
+  rts
 ;  jsr print_ip_config
+ print_driver_init
+  jsr ip65_init
   jsr print_cr
 
+;  jsr	wiznet_dump
 
-  lda #0
+;  ldax #W5100_S0_RX_RSR0
-  sta register_page
+;  jsr dump_current_register
-  jsr dump_wiznet_register_page
+;  jsr	wait_for_keypress
-  lda #$4
+;  jsr dump_current_register
-  sta register_page
+  
-  jsr dump_wiznet_register_page
+   ldax #sending
+   jsr	print
+   jsr	wait_for_keypress
+   jsr send_frame
+   jsr	wiznet_dump
+   jsr dump_current_register
+   
+   
+@wait_for_frame: 	
+  	ldax #W5100_S0_RX_RSR0
+	jsr  w5100_read_register
+  	bne	:+
+	jsr  w5100_read_next_byte
+  	bne	:+
+  	inc	$d020
+;  	jsr dump_current_register
+;	jsr	wiznet_dump
+
+  	jmp @wait_for_frame
+:
+
+ 	jsr dump_frame
+ 	
+
+  
+  ldx #$0
+:
+  lda ping_dest,x
+  lda	#5
+  jsr	w5100_write_next_byte
+  inx
+  inc	$d021
+  cpx	#$4
+  bne :-
+
+  jsr	dump_current_register
+
+  jsr	wiznet_dump
   
-  ;our default gateway is probably a safe thing to ping
   ldx #$3
 :
   lda cfg_gateway,x
@@ -70,6 +124,135 @@ init:
 @error:
   jmp print_errorcode
 
+dump_current_register:
+  jsr w5100_get_current_register
+print_ax_hex:  
+  pha
+  txa
+  jsr	print_hex
+  pla	
+  jmp	print_hex
+
+send_frame:
+ 
+  ldax #test_frame_length
+  stax tx_length
+
+  lda #0
+  sta byte_count
+  sta byte_count+1
+  
+  ldax #$4000
+  stax tx_ptr
+ 
+@write_one_byte:	
+  ldy	tx_ptr
+  lda	test_frame,y
+  tay
+  ldax	tx_ptr  
+  
+  jsr  w5100_write_register
+    
+  inc	byte_count
+  bne	:+
+  inc	byte_count+1
+ :
+ 
+  inc	tx_ptr
+  bne	:+
+  inc	tx_ptr+1
+ :
+ 
+ lda	byte_count
+ cmp	tx_length
+ bne	@write_one_byte
+ 
+ tay
+ ldax 	#W5100_S0_TX_WR1  
+ jsr  	w5100_write_register
+
+ ldax 	#W5100_S0_CR
+ ldy	#W5100_CMD_SEND_MAC
+ jsr	w5100_write_register
+
+  lda #$40
+  sta register_page
+  jsr dump_wiznet_register_page
+
+ jmp	wait_for_keypress
+
+
+
+
+dump_frame:
+  jsr	print_cr
+  jsr	wiznet_dump
+ 
+  ldax #W5100_S0_RX_RSR0
+  jsr  w5100_read_register
+  sta rx_length+1  
+  jsr  w5100_read_next_byte
+  sta rx_length
+  ldx	rx_length+1  
+  jsr	print_ax_hex
+  
+ ; jsr	wait_for_keypress
+
+  jsr print_cr
+
+  lda #0
+  sta byte_count
+  sta byte_count+1
+  
+  ldax #$6000
+  stax rx_ptr
+ 
+@read_one_byte:
+  ldax	rx_ptr  
+  jsr  w5100_read_register
+  jsr print_hex
+    
+  inc	byte_count
+  bne	:+
+  inc	byte_count+1
+ :
+ 
+  inc	rx_ptr
+  bne	:+
+  inc	rx_ptr+1
+ :
+ 
+ lda	byte_count
+ cmp	rx_length
+ bne	@read_one_byte
+ lda	byte_count+1
+ cmp	#4
+ beq	@done
+ cmp	rx_length+1
+ bne	@read_one_byte
+ 
+ @done:
+
+ 
+ jsr	print_cr
+ jsr	dump_current_register
+ jsr	print_cr
+ ldax	rx_length
+ jsr print_hex
+ 
+ jmp	wait_for_keypress
+
+wiznet_dump:
+ lda #0
+  sta register_page
+  jsr dump_wiznet_register_page
+  lda #$4
+  sta register_page
+  jsr dump_wiznet_register_page
+    
+  jsr	wait_for_keypress
+  
+  jmp	print_cr
  
 dump_wiznet_register_page:
   sta register_page
@@ -79,7 +262,7 @@ dump_wiznet_register_page:
 
 @one_row:
   lda current_register
-  cmp #$20
+  cmp #$40
   beq @done
   lda register_page
   jsr print_hex
@@ -96,7 +279,7 @@ dump_wiznet_register_page:
 @dump_byte:
   lda current_register
   ldx register_page
-  jsr w5100_read_reg
+  jsr w5100_read_register
   jsr print_hex
   lda #' '
   jsr print_a
@@ -122,16 +305,45 @@ wait_for_keypress:
   
 .rodata
 ms: .byte " MS",13,0
-pinging: .byte "PINGING ",0
+pinging: .byte "PINGING ",13,10,0
-
+sending: .byte "SENDING ",13,10,0
 hello: .byte "HELLO WORLD!",13,10,0
+sock_0:	.byte "SOCKET 0 ",0
+read:	.byte "READ",0
+write_addr: .byte "WRITE"
+addr: .byte " ADDRESS : ",0
+
+ping_dest: .byte 10,5,1,1
+
+
+test_frame:
+.byte $ff,$ff,$ff,$ff,$ff,$ff
+.byte $01,$02,$03,$04,$05,$06,$07,$08
+.byte $11,$12,$13,$14,$15,$16,$17,$18
+.byte $21,$22,$23,$24,$25,$26,$27,$28
+.byte $31,$32,$33,$34,$35,$36,$37,$38
+.byte $ff,$ff,$ff,$ff,$ff,$ff
+.byte $ff,$ff,$ff,$ff,$ff,$ff
+.byte $01,$02,$03,$04,$05,$06,$07,$08
+.byte $11,$12,$13,$14,$15,$16,$17,$18
+.byte $21,$22,$23,$24,$25,$26,$27,$28
+.byte $31,$32,$33,$34,$35,$36,$37,$38
+
+test_frame_length=*-test_frame
 .bss
-block_number: .res 1
+rx_length: .res 2
-block_length: .res 2
+rx_ptr:	.res 2
+byte_count:	.res 2
+
+tx_length: .res 2
+tx_ptr:	.res 2
+
 current_register:.res 1
 current_byte_in_row: .res 1
 register_page: .res 1
 
+
+
 ;-- LICENSE FOR test_ping.s --
 ; The contents of this file are subject to the Mozilla Public License
 ; Version 1.1 (the "License"); you may not use this file except in