From b30fbd1e20443f7ecbb7c1fa3610b2dacf9002c1 Mon Sep 17 00:00:00 2001 From: jonnosan Date: Sun, 3 May 2009 05:28:12 +0000 Subject: [PATCH] git-svn-id: http://svn.code.sf.net/p/netboot65/code@132 93682198-c243-4bdb-bd91-e943c89aac3b --- client/nb65/Makefile | 1 + client/nb65/nb65_c64.s | 10 ++++----- client/nb65/nb65_version.i | 1 + client/nb65/utherboot.s | 19 +++++++++++++++++- dist/make_dist.rb | 29 ++++++++++++++++++++------- doc/nb65_api_technical_reference.doc | Bin 112128 -> 114176 bytes 6 files changed, 46 insertions(+), 14 deletions(-) create mode 100644 client/nb65/nb65_version.i diff --git a/client/nb65/Makefile b/client/nb65/Makefile index f48abe5..3dbc34a 100644 --- a/client/nb65/Makefile +++ b/client/nb65/Makefile @@ -9,6 +9,7 @@ INCFILES=\ ../inc/net.i\ ../inc/menu.i\ ../inc/nb65_constants.i\ + nb65_version.i\ IP65LIB=../ip65/ip65.lib diff --git a/client/nb65/nb65_c64.s b/client/nb65/nb65_c64.s index acf0f09..7223d47 100644 --- a/client/nb65/nb65_c64.s +++ b/client/nb65/nb65_c64.s @@ -387,9 +387,6 @@ cmp #KEYCODE_F7 ldax #tftp_dir_filemask stax nb65_param_buffer+NB65_TFTP_FILENAME - jsr print - jsr print_cr - ldax #nb65_param_buffer nb65call #NB65_TFTP_DOWNLOAD @@ -530,8 +527,9 @@ cfg_get_configuration_ptr: .rodata netboot65_msg: -.byte "NETBOOT65 - C64 NETWORK BOOT CLIENT V0.9",13 -.byte 0 +.byte 13," NETBOOT65 - C64 CLIENT VERSION " +.include "nb65_version.i" +.byte 13,0 main_menu_msg: .byte 13," MAIN MENU",13,13 .byte "F1: TFTP BOOT F3: BASIC",13 @@ -548,7 +546,7 @@ config_menu_msg: downloading_msg: .asciiz "DOWNLOADING " -getting_dir_listing_msg: .asciiz "FETCHING DIR FOR " +getting_dir_listing_msg: .byte "FETCHING DIRECTORY",13,0 tftp_dir_listing_fail_msg: .byte "DIR LISTING FAILED",13,0 diff --git a/client/nb65/nb65_version.i b/client/nb65/nb65_version.i new file mode 100644 index 0000000..dc5a63f --- /dev/null +++ b/client/nb65/nb65_version.i @@ -0,0 +1 @@ +.byte "0.9.7" diff --git a/client/nb65/utherboot.s b/client/nb65/utherboot.s index 8e50313..dbe39c4 100644 --- a/client/nb65/utherboot.s +++ b/client/nb65/utherboot.s @@ -38,6 +38,10 @@ .import __CODE_LOAD__ .import __CODE_RUN__ .import __CODE_SIZE__ + .import __IP65_DEFAULTS_LOAD__ + .import __IP65_DEFAULTS_RUN__ + .import __IP65_DEFAULTS_SIZE__ + ;.segment "PAGE3" ;disable_language_card: .res 3 @@ -92,6 +96,9 @@ tftp_dir_buffer = $4000 ldax #__RODATA_SIZE__ jsr startup_copymem + +;@fixme: jmp @fixme + ;relocate the DATA segment ldax #__DATA_LOAD__ stax copy_src @@ -100,6 +107,14 @@ tftp_dir_buffer = $4000 ldax #__DATA_SIZE__ jsr startup_copymem + ;relocate the IP65_DEFAULTS segment + ldax #__IP65_DEFAULTS_LOAD__ + stax copy_src + ldax #__IP65_DEFAULTS_RUN__ + stax copy_dest + ldax #__IP65_DEFAULTS_SIZE__ + jsr startup_copymem + jmp init ; copy memory @@ -293,4 +308,6 @@ tftp_download_fail_msg: tftp_download_ok_msg: .asciiz "DOWNLOAD OK" -startup_msg: .byte "UTHERNET NETWORK BOOT CLIENT V0.1",0 +startup_msg: .byte "UTHERNET NETWORK BOOT CLIENT V" +.include "nb65_version.i" +.byte 0 diff --git a/dist/make_dist.rb b/dist/make_dist.rb index edc04d9..e5026ba 100644 --- a/dist/make_dist.rb +++ b/dist/make_dist.rb @@ -8,13 +8,17 @@ require 'ftools' WORKING_DIR=File.expand_path(File.dirname(__FILE__)+"/netboot65") SRC_DIR=File.expand_path(File.dirname(__FILE__)+"/../") -["","a2","c64","lib","bin","boot","doc","inc","examples"].each do |dir_suffix| +VERSION_FILE=File.expand_path(File.dirname(__FILE__)+"/version_number.txt") +VERSION_INC_FILE=File.expand_path(File.dirname(__FILE__)+"/../client/nb65/nb65_version.i") +version_string=File.open(VERSION_FILE).read + +["","c64","lib","bin","boot","doc","inc","examples"].each do |dir_suffix| dir_path="#{WORKING_DIR}/#{dir_suffix}" Dir.mkdir(dir_path) unless File.exist?(dir_path) end [ -["client/nb65/utherboot.dsk","a2/"], +#["client/nb65/utherboot.dsk","a2/"], ["client/nb65/set_ip_config.rb","bin/"], #["client/nb65/nb65_rrnet.bin","c64/"], ["client/nb65/nb65_c64_ram.prg","c64/"], @@ -22,12 +26,12 @@ end ["client/nb65/d64_upload.prg","boot/"], ["server/lib/tftp_server.rb","lib"], ["server/bin/tftp_only_server.rb","bin/tftp_server.rb"], -["server/bin/import_ags_games.rb","bin"], -["server/boot/BOOTA2.PG2","boot"], -["doc/README.Apple2.html","a2"], +#["server/bin/import_ags_games.rb","bin"], +#["server/boot/BOOTA2.PG2","boot"], +#["doc/README.Apple2.html","a2"], ["doc/README.C64.html","c64"], ["doc/netboot65.html","doc/index.html"], -["doc/README.Apple2.html","doc"], +#["doc/README.Apple2.html","doc"], ["doc/README.C64.html","doc"], ["doc/nb65_api_technical_reference.doc","doc"], ["client/inc/common.i","inc"], @@ -45,5 +49,16 @@ end end -zipfile_name=File.dirname(__FILE__)+"/netboot65-#{Time.now.strftime("%Y-%m-%d")}.zip" +zipfile_name=File.dirname(__FILE__)+"/netboot65-#{version_string}.zip" Archive::Zip.archive(zipfile_name, WORKING_DIR) + +(maj,min,rel)=version_string.split(".") +version_string="#{maj}.#{min}.#{(rel.to_i)+1}" + +file=File.new(VERSION_INC_FILE,"w") +file<<".byte \"#{version_string}\"\n" +file.close + +file=File.new(VERSION_FILE,"w") +file<O=XQ2QyuMcPJC1}nlXDkT55e9OTRi5njgVHXJe-LcmL$osu zmyUnX;a%F8{3@eo!u8)-bK?3C%sVif2l~&R&dS}CtPDmT+)Z6Ock>iy>*3l-&m~W1 z7WZ{M`Yu`0`5P3<1~RrIsd~pI`VDsU-Ca>yS=**%n*&=!ti9*(zvhXsnt z9rNKGW$g-RKTxVJja!hT=>CW#(>MkXNRRju#xhvH!SJJE9QpBXdY{I73)S5j`vOX%^BHT)lW%4|{4j~qxSLX)X*3RlSYhTF@(548hTbjc z@@_0{cJHCd?rmQj;6~_beLuyf!@JxgcK9*x@JWg4is}i1k|W>T#MSuxbkWxWE!Wbeq)SzFD z1{KqY+nQ-9wT5LYG0lkSnxdMTqDSUvP(&PIb)J?s5HXdoQL8CY&89u9QlD=k0tH{E zs4?V14TK?YIZ@c^9K_O+37Le1%(|Ndr7mKJ;XpdV*2#3@vnWj(W!W|YhOQuEQ3HOe zW=ny_jTk&gRw-gznjR`qOcixAm55E!ky->)i|n9UmZ57Ny*@d!b6!H$%F@hvnu#E2 z55(j*3>(H;t-(QES8P*5#nouN5{e)_L8C6JBY!B<+_;9c)nPv*7e;73sv<)cI>NSO ze8^9MB6H$Yk@Apmx-Xpv*N_t|imyhZL4=TQ!4{)M=u1q~M!Kd3$y`A(MJXMmezdR| ziPx&uoKmI2FcodSN+~FT*Xixa`$TK^LlAS+6!JZ&Bn$eK#>`pIJJFk(71xnWYD*iv zKF_g3zLSS&^OmsT37riMeMOa(o@(=LEo#xZA)D!BCmf?>Nv2e$IbcA}F&d5QdSAp^ z8;Pn^y7Gx5$Ba>msP+?nQcX-TQfxxsDoH0ficoD6y$DssUvHz0ZN~w4lg^~B!aV6E zurUIXnRE`M)5>U89Bes%yB}_!UbkK$^h4Z4Qpo_$lP*&di|IIA@`|X9TegqlvCVjZ zTE{saxGE41LhhYzlcEA8WY9f<82wIrQR#|HeIsEtId^n+!tEjSJc>j0_v=Pr4i0zJ zMxQvvh@rT$H4MikcW0P&yQc(R1m&t43?luOn-qUM6iRp1y^+>+r32u{5!BTHtVN&*3El)=gvV?dkYs2gurHAQKkJ>K0%ta1AK-Gu8y)?I`BYPu9-& zwT4)n!v}W1;`|ml|FPTcaY<~<;e}#n4u3%YOVAH@%V=tO!owZRJFQpf*~?g`7+T+wYI0^1C@fi~g! zGoT28QoyA^8Bh+q4>$>6?CYCfT&KU!u6}&|5=t|Ni~MZf?s0O6axZDSyf8U5$h)*t zZg_ImP1eFgLb?jNwdUv@)ydAyXTBqOd}xLD%oN5t;Pp_HPvvFhV>{Q3jjf}ZZGd8Ufauu2|j}ti2QxL zBX39*&fq0HaSpN2;D84h)Q+)gm>)WkFuAH8k#df${193ak zT*GSOcBQ#W$-V4KO74|3cj_6E+|>w|Jz4?un8a9b zU{(!d2EZoc9UAC?hA0GJ_?pHm#WxzqAqa6j^I{oZ%0**{kL@}Eij#nAP`Cj=xH-fh z5uIl7BKqg;3xli)W(d?{8MqqS(&V?ydPT`>zT5lL(c8i+l}DdQy*ZnIa$oAW!E-&L zeJvlCx?ax%9_|&@i@4<@F=>eYt*h$Iz4WD((cJ76w-)h#iLp=Nt`kr30^Uw|7xS%c z`VXr%gjmcAbEn`0;D(}$h#r(J@J2&-gf)Dp}qMQ3UWh2`(dn3b5BF-=6 z#hw#0#8*rC3mLdD#D-t+UuT4CE{T$5ymtm&=o6Ol3!~`5XnoL{%QBYS4wgOA$HQ>| zDIGLi>Y?vW8l+y6iY!OWKOEovLKe+kWuM|ZWvvfa15WFGtQ2!?SVrd^pm)yhNF90_ z=RR{gtZbLx%T1X-NL8=o_w#o6Hp1CP&?3Hy_vCHGx>Y>q$TNH}=R?Gh)x5CH3ms0M z73yl9qjWtvi9XdbAbuY}lr|ztE@Y&ZZs7@EGUok!{U(0CD>*`I2k02hG|09yYhjSt1-SGicfpVxZ(ZeusQKW>c z_9(4ss@^*4YOc0pNHtVF8gD98DWa}=>x`D$|2p?hb&Q{PQ{i zk%wj*z_y9?*F0>cl{=`?o$7XKXmfu4R{muM})WsfUKZ|vSBYi$(0YH2YYJiR(M7Ncu(G;ReuG~y z{Bx0HDZ?A%-qbCL0?3w#arEjh<0wPD_A{Ju(OKAn`kX+b*RU3A5FZtReqi;?`b84m zgnw!jkxiACa3fc?rFN{iOL^GJT1y$4j6K>saCZ};?E6tk4|{8^C#BO|!@44E%R1^Q z=%`0qj3FhYhMT*)J>>;+HnoQ1HXDpkGu+%vt#fm-^13n8S)O*Ua6DTIveb*CIl@_h(fWMY zf)qqYcMeIn{(YhP-H2 z#;=t|f6;-4x}*aQr{WC&E@87>16cFu z@!XHCYRY(?7&r}8K6QIM_YJ@hO1k-wWHOF`9D@L| zk_`lqQ!bAS8%dFD-_Nr1@uc}*v+Vr8)BK3+4*HMNZ^H+ydIGQZtk2`UPpFCl9^g4S zm0z~7O{GoeiStLqg!z}jSPS#w^V!th>3mUbo568xR~?G@19iHH!^1MMSXOx1!8y}= zkaEoAt)9x6oNTd`G+9jVk6ElDXLBpndp0js)w6k_DxAY{YSkP*^sIa&WY0-KW8_PH zvXJlZRO&j-vYoaYT0CU;R@qNAvB=+<6baAvY%At4%hRzDhlAu<6`cqqD#xeii{3;I z!cmkx9J~bf?@yO_?DKdy2W6m@4Ed!@@vJT3aIS^l2Yd$PbH8UkH+GG*=awztMCJt5 z#l_97XU2@)uSU2yv`O;B2J$Nt0AB|XD_w|{&I3GCm$TF1%CmbHmGYr_G6boUA&Je% z@|-W_o*|*~(_4%O?}E8t9#F}fxSvt89O@IW0<4sprJFdfzr<8P?EpK$w_q3e4(tX} zzZZ5N_#RY({onvN2&De5$x-#{=d9-E1urV&arVnsjUTk*YEl_Hd5*dT6ZkPg7OKe} ZF62;k$HV#jjheI>^?N+GHglc8KLOk6OpX8m