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

client/ip65/tcp.s

@@ -29,7 +29,7 @@ MAX_TCP_PACKETS_SENT=8     ;timeout after sending 8 messages will be about 7 sec
 .export tcp_send_keep_alive
 .export tcp_connect_remote_port
 .export tcp_remote_ip
-
+.export tcp_state
 .export tcp_inbound_data_ptr
 .export tcp_inbound_data_length
 

client/v1541/Makefile

@@ -15,7 +15,7 @@ IP65LIB=../ip65/ip65_tcp.lib
 
 C64PROGLIB=../drivers/c64prog.lib
 
-all: v1541.prg v1541.d64
+all: v1541.prg 
 
 
 %.o: %.s $(INCFILES) 

client/v1541/v1541.cfg

@@ -17,9 +17,8 @@ MEMORY {
     DATA:   load = STARTRAM, run=UNDERBASIC, type = rw, define = yes;
     IP65_DEFAULTS: load = STARTRAM, run= HIRAM, type = ro, define = yes;
     CODESTUB: load STARTRAM, run= HIRAM, type = rw, define = yes;
-    SELF_MODIFIED_CODE: load = STARTRAM, run=HIRAM, type = rw,define = yes;
 
     BSS: load = HIRAM, type = bss;
-    TCP_VARS: load = HIRAM, type = bss;   
+    TCP_VARS: load = UNDERBASIC, type = bss;
 
     }

client/v1541/v1541.s

@@ -5,18 +5,41 @@
   .include "../inc/kipper_constants.i"
 .endif
 
+
+SERVER_PORT=1541
+.define SERVERNAME  "COMMODORESERVER.COM"
+
 .import ip65_init
 .import dhcp_init
 .import tcp_connect
 .import dns_resolve
+.import dns_set_hostname
+.import dns_ip
 .import	print_a
-
+.import tcp_connect_ip
+.import tcp_send_string
+.import tcp_connect
+.import tcp_close
+.import tcp_callback
+.import ip65_process
+.import ip65_error
+.import tcp_state
+.import copymem
+.import check_for_abort_key
+.import tcp_inbound_data_ptr
+.import tcp_inbound_data_length
+.import tcp_send_keep_alive  
+.import get_key
 .importzp copy_src
 .importzp copy_dest
+.export keep_alive_counter
 pptr=copy_src
 
+CINV=$314
 ILOAD=$330
 ISAVE=$332
+FNLEN		=	$B7
+FNADDR		=	$BB
 
 .import __CODE_LOAD__
 .import __CODE_RUN__
@@ -62,6 +85,19 @@ relocate:
 	ldax #__CODE_SIZE__
 	jsr __copymem
 	
+  
+	ldx ILOAD+1
+  cpx #>load_handler
+	bne	@not_installed
+	ldax #@already_installed_msg    
+	jsr	__print
+	rts
+  
+  @installed_msg: .byte "V1541 INSTALLED",0
+  @already_installed_msg: .byte "V1541 ALREADY INSTALLED",0
+@not_installed:
+  
+  
 	ldax #__DATA_LOAD__
 	stax copy_src
 	ldax #__DATA_RUN__
@@ -91,28 +127,95 @@ relocate:
 	jsr __copymem
 	
 
-	jsr	swap_basic_out
+  
 	
-;	jsr	ip65_init
+  jsr	swap_basic_out
-	bcs	:+
+  
+	jsr	ip65_init
+  bcc @init_ok
+  ldax #@no_nic
+  jsr	print
+@fail_and_exit:
+  ldax #@not_installed_msg
+  jsr print
+  jmp	@done
+@no_nic: .byte "NO RR-NET FOUND - ",0
+@not_installed_msg: .byte "V1541 NOT INSTALLED.",0  
+@init_ok:
+  ldax #@dhcp_init_msg
+  jsr print
 	jsr	dhcp_init
-:	
+  bcc @dhcp_worked
+@failed:  
+  ldax #@fail_msg
+  jsr print
+  jmp @fail_and_exit
+@dhcp_init_msg: .byte "DHCP INITIALISATION"
+@elipses: .byte "...",0
+@ok_msg: .byte "OK",13,0
+@fail_msg: .byte "FAILED",13,0
+@dhcp_worked:  
+  ldax #@ok_msg  
+  jsr print
+  
+  ldax #@resolve_servername_msg
+  jsr print
+  ldax  #@elipses
+  jsr print
+  ldax #@servername
+  jsr dns_set_hostname
+  jsr dns_resolve  
+  bcc @dns_worked
+  jmp @failed
+@resolve_servername_msg: .byte "RESOLVING "
+@servername: .byte SERVERNAME,0
+@dns_worked:
+  ldax #@ok_msg  
+  jsr print
+  ldx #3
+@copy_server_ip_loop:
+  lda dns_ip,x
+  sta tcp_connect_ip,x
+  dex
+  bpl @copy_server_ip_loop
+
+  ldax #@connecting_msg
+  jsr print
+  ldax #@servername
+  jsr print
+  ldax  #@elipses
+  jsr print
+  ldax  #csip_callback
+  stax  tcp_callback
+  ldax #SERVER_PORT  
+  jsr tcp_connect
+  bcc @connect_worked
+  jmp @failed
+@connecting_msg:  .byte "CONNECTING TO ",0
+
+@connect_worked:  
+  ldax #@ok_msg  
+  jsr print
+  ;IP stack OK, now set vectors  
+  
+  ldax CINV
+  stax  old_irq_vector
+  
 	ldax ILOAD
-	cpx #>load_handler
-	bne	@not_installed
-	ldax #already_installed
-	jsr	print
-	jmp	@done
-@not_installed:
 	stax old_load_vector	
 	ldax #load_handler
 	stax ILOAD
-	ldax #installed
+	ldax #@installed_msg
 	jsr	print
 
+ldax #irq_handler
+  sei
+  stax CINV  
 @done:	
 	jsr	swap_basic_in
-
+  lda #0
+  sta $dc08 ;make sure TOD clock is started
+  cli
 	rts
 	
 __copymem:
@@ -145,16 +248,96 @@ __copymem:
 	rts
 
 end: .byte 0	
-installed: .byte "V1541 INSTALLED",0
 
-already_installed: .byte "V1541 ALREADY INSTALLED",0
+__print:
+	sta pptr
+	stx pptr + 1
+	
+@print_loop:
+  ldy #0
+  lda (pptr),y
+	beq @done_print  
+	jsr print_a
+	inc pptr
+	bne @print_loop
+  inc pptr+1
+  bne @print_loop ;if we ever get to $ffff, we've probably gone far enough ;-)
+@done_print:
+  rts
+
+
 .code
 
 load_dev_2:
-	inc $d020
+  ldy #$00
-	clc
+  lda (FNADDR),y
+  cmp #'!'
+  beq @do_disks
+@done:
+  clc  
 	jmp	swap_basic_in
 
+@do_disks:
+	ldax	  #@cmd_dsks
+  jsr tcp_send_string	
+  bcs @error
+	jsr show_list
+	jmp @done
+
+@cmd_dsks:    .byte "DISKS 22",$0d,$0
+@error:
+  ldax #transmission_error
+  jsr print
+  lda ip65_error
+  jsr print_hex
+  lda tcp_state
+  jsr print_hex
+
+  jmp @done
+
+
+show_list:
+
+@loop:
+  lda $91     ; look for STOP key
+  cmp #$7F
+  beq @done
+  lda #5 ;wait for max 5 seconds
+  jsr getc
+  bcc @got_data
+  ldax  #timeout_error
+  jmp print
+@got_data:
+  cmp #$03		;ETX byte (indicating end of page)?
+  beq @get_user_input
+  cmp #$04		;EOT byte (indicating end of list)?
+  beq @done
+	jsr print_a	;got a byte - output it
+  jmp @loop ;continue getting characters
+
+;End of page, so ask for user input
+ @get_user_input:
+  jsr get_key
+  
+  cmp #'S'
+  beq @user_exit
+
+  cmp #$0D
+  bne @get_user_input
+  ldax #continue_cmd
+
+  jsr tcp_send_string
+  jmp @loop
+
+;User wishes to stop - send S to server and quit
+@user_exit:
+  ldax  #stop_cmd  
+  jsr tcp_send_string
+
+@done:
+
+rts
+
 
 print:
 	sta pptr
@@ -172,11 +355,125 @@ print:
 @done_print:
   rts
 
-	
+
+csip_callback:
+  lda tcp_inbound_data_length+1
+  cmp #$ff
+  bne @not_eof
+  rts
+@not_eof:
+  
+  ldax tcp_inbound_data_ptr
+  stax copy_src
+  ldax #csip_stream_buffer
+  stax copy_dest
+  stax next_char_ptr
+
+  ldax tcp_inbound_data_length
+  stax buffer_length
+  jsr copymem
+  rts
+
+getc:
+  sta getc_timeout_seconds
+
+  clc
+  lda $dc09  ;time of day clock: seconds (in BCD)
+  sed
+  adc getc_timeout_seconds
+  cmp #$60
+  bcc @timeout_set
+  sec
+  sbc #$60
+@timeout_set:  
+  cld
+  sta getc_timeout_end  
+
+@poll_loop: 
+  jsr next_char
+  bcs @no_char
+  rts ;done!
+@no_char:  
+  jsr check_for_abort_key
+  bcc @no_abort
+  lda #KPR_ERROR_ABORTED_BY_USER
+  sta ip65_error
+  inc user_abort
+  rts
+@no_abort:  
+  jsr ip65_process
+  lda $dc09  ;time of day clock: seconds
+  cmp getc_timeout_end  
+  bne @poll_loop
+  lda #00
+  sec
+  rts
+
+next_char:
+  lda buffer_length
+  bne @not_eof
+  lda buffer_length+1
+  bne @not_eof
+  sec
+  rts
+@not_eof:  
+  next_char_ptr=*+1
+  lda $ffff
+  pha
+  inc next_char_ptr
+  bne :+
+  inc next_char_ptr+1
+:  
+  sec
+  lda   buffer_length
+  sbc #1
+  sta   buffer_length
+  lda   buffer_length+1
+  sbc #0
+  sta   buffer_length+1
+  pla
+  clc  
+  rts
+
+print_hex:
+  pha  
+  pha  
+  lsr
+  lsr
+  lsr
+  lsr
+  tax
+  lda hexdigits,x
+  jsr print_a
+  pla
+  and #$0F
+  tax
+  lda hexdigits,x
+  jsr print_a
+  pla
+  rts
+hexdigits:
+.byte "0123456789ABCDEF"
+
+tcp_irq_handler:
+
+  inc keep_alive_counter
+  lda keep_alive_counter
+  bne @skip
+  jsr tcp_send_keep_alive  
+@skip:  
+  jsr ip65_process
+@done:  
+
+  rts
+  
+
+
 .segment "CODESTUB"
 
 swap_basic_out:
 	lda $01
+  sta underneath_basic
 	and #$FE
 	sta $01
 	rts
@@ -185,6 +482,8 @@ swap_basic_in:
 	lda $01
 	ora #$01
 	sta $01
+  lda #$0  
+  sta underneath_basic
 	rts
 
 load_handler:
@@ -197,4 +496,49 @@ old_load_vector:
 	:
 	jsr	swap_basic_out
 	jmp	load_dev_2
-	
+
+irq_handler:
+  lda underneath_basic
+  bne @done 
+  jsr swap_basic_out
+  jsr tcp_irq_handler
+  jsr	swap_basic_in
+@done:  
+	.byte $4c	;jmp
+old_irq_vector:	
+	.word	$ffff	
+
+underneath_basic: .res 1
+
+.segment "TCP_VARS"
+csip_stream_buffer: .res 1600
+user_abort: .res 1
+getc_timeout_end: .res 1
+getc_timeout_seconds: .res 1
+buffer_length: .res 2  
+keep_alive_counter: .res 1
+
+.data
+continue_cmd: .byte $0D,0
+stop_cmd: .byte "S",0
+timeout_error: .byte "TIMEOUT ERROR",13,0
+transmission_error: .byte "TRANSMISSION ERROR",13,0
+
+;-- LICENSE FOR v1541.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
+; compliance with the License. You may obtain a copy of the License at
+; http://www.mozilla.org/MPL/
+; 
+; Software distributed under the License is distributed on an "AS IS"
+; basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+; License for the specific language governing rights and limitations
+; under the License.
+; 
+; The Original Code is ip65.
+; 
+; The Initial Developer of the Original Code is Jonno Downes,
+; jonno@jamtronix.com.
+; Portions created by the Initial Developer are Copyright (C) 2010
+; Jonno Downes. All Rights Reserved.  
+; -- LICENSE END --