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

client/ip65/Makefile

@@ -29,6 +29,7 @@ ETHOBJS= \
   parser.o \
   string_utils.o \
   telnet.o \
+  url.o \
   arithmetic.o\
   
 all: ip65.lib ip65_tcp.lib

client/ip65/function_dispatcher.s

@@ -160,10 +160,10 @@ ip_configured:
   jsr dns_resolve
   bcs @dns_error
 
-  ldy #NB65_DNS_HOSTNAME_IP
-  ldx #4
+  ldy #NB65_DNS_HOSTNAME_IP  
   plax
   stax nb65_params
+  ldx #4
 @copy_dns_ip:
   lda dns_ip,y
   sta (nb65_params),y

client/ip65/url.s

@@ -11,7 +11,7 @@
 .import output_buffer
 .importzp copy_src
 .importzp copy_dest
-
+.import ip65_error
 .import parser_init
 .import parser_skip_next
 .import dns_set_hostname
@@ -22,6 +22,7 @@
 .export  url_port
 .export  url_selector
 .export url_resource_type
+.export url_parse
 
 target_string=copy_src
 search_string=copy_dest

client/nb65/nb65_c64.s

@@ -71,7 +71,7 @@
   .import arp_calculate_gateway_mask
   .import parse_dotted_quad
   .import dotted_quad_value
-   
+  .import parse_integer
   .import get_key_ip65   
   .import cfg_ip
 	.import cfg_netmask
@@ -251,6 +251,7 @@ main_menu:
   jmp @get_key
 
 @exit_to_basic:
+  nb65call #NB65_DEACTIVATE   
   ldax #$fe66 ;do a wam start
   jmp exit_cart_via_ax
 
@@ -521,6 +522,13 @@ cmp #KEYCODE_F7
   bne @not_a_basic_file
 
   .if (BANKSWITCH_SUPPORT=$03)
+  lda $805
+  cmp #$9e  ;opcode for 'SYS'
+  bne @not_a_basic_stub
+  ldax  #$806  ;should point to ascii string containing address that was to be SYSed
+  jsr parse_integer 
+  jmp exit_cart_via_ax ;good luck! 
+@not_a_basic_stub:  
   ldax #cant_boot_basic
   jsr print
   jsr wait_for_keypress
@@ -665,7 +673,7 @@ exit_gopher:
 	.rodata
 
 netboot65_msg: 
-.byte 13,"NB65 - VERSION "
+.byte 13,"NB65 - V"
 .include "nb65_version.i"
 .byte 13,0
 main_menu_msg:

client/test/test_parser.s

@@ -1,6 +1,5 @@
 .include "../inc/common.i"
 .include "../inc/commonprint.i"
-.include "../ip65/url.s"
 .include "../inc/net.i"
 
 .import print_a
@@ -11,8 +10,11 @@
 .import parser_skip_next
 .importzp copy_src
 .importzp copy_dest
-
-
+.import  url_ip
+.import  url_port
+.import  url_selector
+.import url_resource_type
+.import url_parse
 temp_buff=copy_dest
 
 .bss
@@ -54,6 +56,7 @@ init:
   ldax #url_4
   jsr test_url_parse 
   jsr wait_key
+ 
   ldax #url_5
   jsr test_url_parse 
   ldax #url_6
@@ -63,6 +66,7 @@ init:
   ldax #url_8  
   jsr test_url_parse 
   jsr wait_key
+  
   ldax #url_9
   jsr test_url_parse 
   ldax #url_a
@@ -72,15 +76,15 @@ init:
   ldax #url_c
   jsr test_url_parse 
   
-  rts
+  jsr wait_key
   
 
   ldax #atom_file
   jsr parser_init
   
-  ldax #entry
-  jsr parser_skip_next
-  bcs @done
+;  ldax #entry
+;  jsr parser_skip_next
+;  bcs @done
   
 @next_title:  
   ldax #title
@@ -90,7 +94,7 @@ init:
   jsr print_tag_contents
   jsr print_cr
   
-;  jmp @next_title
+  jmp @next_title
 @done:
   rts
 test_url_parse:
@@ -202,10 +206,10 @@ ip: .asciiz "IP: "
 port: .asciiz " PORT: $"
 type: .asciiz " TYPE:"
 selector: .asciiz "SELECTOR: "
-press_a_key: .asciiz "PRESS ANY KEY TO CONTINUE"
+press_a_key: .byte "PRESS ANY KEY TO CONTINUE",13,0
 
 atom_file:
-;.incbin "atom_test.xml"
+.incbin "atom_test.xml"
 
 
 .byte 0