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

This commit is contained in:
jonnosan 2009-08-20 14:03:02 +00:00
parent f04be850f9
commit db19fb6d62
14 changed files with 134 additions and 68 deletions

View File

@ -9,7 +9,7 @@ SEGMENTS {
STARTUP: load = RAM, type = ro ,define = yes, optional=yes;
CODE: load = RAM, type = ro,define = yes;
DATA: load = RAM, type = rw,define = yes;
SELF_MODIFIED_CODE: load = RAM, type = rw,define = yes;
SELF_MODIFIED_CODE: load = RAM, type = rw,define = yes, optional=yes;
VIC_DATA: load = RAM, type = rw,align = $800, optional=yes;
RODATA: load = RAM, type = ro,define = yes, optional=yes;
IP65_DEFAULTS: load = RAM, type = rw,define = yes, optional=yes;

View File

@ -14,20 +14,20 @@ INCFILES=\
../inc/net.i\
all: \
comatomx.prg \
upnatom.prg \
%.o: %.s
$(AS) $(AFLAGS) $<
comatomx.o: comatomx.s sine_data.i
upnatom.o: upnatom.s sine_data.i
$(AS) $(AFLAGS) $<
sine_data.i: make_sine_data.rb
ruby make_sine_data.rb
comatomx.prg: comatomx.o nt2play.o $(IP65TCPLIB) $(C64PROGLIB) $(INCFILES) ../cfg/c64prg.cfg
$(LD) -m comatomx.map -vm -C ../cfg/c64prg.cfg -o comatomx.prg $(AFLAGS) $< $(IP65TCPLIB) $(C64PROGLIB) $(NT2PLAY)
cp comatomx.prg ../../server/boot/
upnatom.prg: upnatom.o nt2play.o $(IP65TCPLIB) $(C64PROGLIB) $(INCFILES) ../cfg/c64prg.cfg
$(LD) -m upnatom.map -vm -C ../cfg/c64prg.cfg -o upnatom.prg $(AFLAGS) $< $(IP65TCPLIB) $(C64PROGLIB) $(NT2PLAY)
cp upnatom.prg ../../server/boot/
clean:
rm -f *.o *.pg2 *.prg *.map

View File

@ -8,8 +8,6 @@
print_a = $ffd2
.import parser_init
.import parser_skip_next
SCREEN_RAM = $0400
COLOUR_RAM = $d800
@ -260,23 +258,34 @@ init:
nb65call #NB65_DOWNLOAD_RESOURCE
bcs @download_feed ;if at first we don't succeed, try try again
inc BORDER_COLOR ;little marker of success
lda #1
sta scroll_state
ldax #scroll_buffer_1
stax current_output_ptr
; jsr emit_titles
jsr emit_titles
ldax #scroll_buffer_1
stax current_input_ptr_ptr ;will get picked up once we have finished going through the message once
lda #1
sta scroll_state
@endless_loop:
jsr NB65_PERIODIC_PROCESSING_VECTOR
lda scroll_state
beq @download_feed
jmp @endless_loop
reset_input_buffer:
ldax current_input_ptr_ptr
stax current_input_ptr
ldax scroll_buffer_0
stax current_input_ptr_ptr
lda #0
sta scroll_state
rts
;look for NB65 signature at location pointed at by AX
@ -661,22 +670,6 @@ print_errorcode:
top_sprite_color_irq:
start_irq
wait_next_raster
dec $d025 ;sprite multicolor register 0
dec $d026 ;sprite multicolor register 1
jmp exit_from_irq
bottom_sprite_color_irq:
start_irq
wait_next_raster
inc $d025 ;sprite multicolor register 0
inc $d026 ;sprite multicolor register 1
jmp exit_from_irq
update_nb65_counters_irq:
start_irq
jsr NB65_VBL_VECTOR
@ -684,18 +677,18 @@ update_nb65_counters_irq:
play_music_irq:
inc BORDER_COLOR
; inc BORDER_COLOR
start_irq
jsr MUSIC_BASE+PLAYER_PLAY
dec BORDER_COLOR
; dec BORDER_COLOR
jmp exit_from_irq
emit_titles:
ldax #download_buffer
jsr parser_init
nb65call #NB65_PARSER_INIT
@next_title:
ldax #title
jsr parser_skip_next
nb65call #NB65_PARSER_SKIP_NEXT
bcs @done
jsr emit_tag_contents
@ -821,7 +814,6 @@ raster_jump_table:
.byte $0,$80
.word play_music_irq
.byte $80,$05
.word move_sprites_irq
@ -831,7 +823,7 @@ jump_counter: .byte 0
sprite_x_pos:
.byte $38,$58,$78,$98,$B8,$D8,$F8,$18
.byte $34,$54,$78,$90,$Bb,$Db,$Fb,$1b
sprite_x_msb:
.byte $80
@ -840,18 +832,20 @@ sprite_y_pos:
.include "sine_data.i"
.include "sine_data.i"
scroll_template:
sprite_text:
.byte "COMATOMX"
.byte " / ip: %i / gateway: %g / dns server %d / polling %f /"
.byte "UP\NATOM" ;options are A-Z, "[\]^_"
scroll_template:
.byte " ip: %i / gateway: %g / dns server %d / polling %f /"
.byte " ",0
feed_url:
.byte "http://search.twitter.com/search.atom?q=kipper",0
.byte "http://static.cricinfo.com/rss/livescores.xml",0
;.byte "http://static.cricinfo.com/rss/livescores.xml",0
title:
.byte "<title>",0
@ -902,7 +896,7 @@ scroll_state: .res 1
nb65_param_buffer: .res $20
download_buffer:
download_buffer_length=4000
download_buffer_length=8000
.res download_buffer_length
scroll_buffer_0:

View File

@ -60,7 +60,9 @@ NB65_INPUT_HOSTNAME EQU $91 ;no inputs, outputs: AX = pointer to host
NB65_INPUT_PORT_NUMBER EQU $92 ;no inputs, outputs: AX = port number entered ($0000..$FFFF)
NB65_BLOCK_COPY EQU $A0 ;inputs: AX points to a block copy structure, outputs: none
NB65_PARSER_INIT EQU $A1 ;inputs: AX points to a null terminated string, outputs: none
NB65_PARSER_SKIP_NEXT EQU $A2 ;inputs: AX points to a null terminated substring, outputs: AX points to
;previously loaded string that is just past the next occurance of substring
NB65_GET_LAST_ERROR EQU $FF ;no inputs, outputs A EQU error code (from last function that set the global error value, not necessarily the
;last function that was called)

View File

@ -1 +1 @@
.byte "0.9.21"
.byte "0.9.24"

View File

@ -603,6 +603,19 @@ cpy #NB65_BLOCK_COPY
ldax tmp_copy_length
jmp copymem
:
cpy #NB65_PARSER_INIT
bne :+
.import parser_init
jmp parser_init
:
cpy #NB65_PARSER_SKIP_NEXT
bne :+
.import parser_skip_next
jmp parser_skip_next
:
.endif
.endif

View File

@ -7,7 +7,6 @@
.importzp copy_src
.importzp copy_dest
target_string=copy_src
search_string=copy_dest

View File

@ -22,7 +22,7 @@ APPLE2PROGLIB=../drivers/apple2prog.lib
BOOTA2.PG2=../../server/boot/BOOTA2.PG2
#all: utherboot.dsk $(BOOTA2.PG2) nb65_rrnet.bin nb65_std_cart.bin nb65_c64_ram.prg d64_upload.prg c64boot.d64 d64_upload.d64
all: nb65_std_cart.bin nb65_tcp_cart.bin nb65_tcp_cart_rr.bin
all: nb65_std_cart.bin nb65_tcp_cart.bin nb65_tcp_cart_rr.bin nb65_c64_ram.prg
nb65_c64_ram.o: nb65_c64.s $(INCFILES)
$(AS) -DBANKSWITCH_SUPPORT=0 $(AFLAGS) -o $@ $<

View File

@ -41,11 +41,13 @@ end
filebytes=File.open(filename,"rb").read
if !(filebytes[0x09,4]=="NB65") then
start_of_nb65_cart_image=filebytes.index("80NB65")
if start_of_nb65_cart_image.nil? then
puts "file '#{filename}' does not appear to be a netboot65 cartridge image"
exit
end
(number_of_options/2).times do |i|
option=ARGV[i*2+1]
value=ARGV[i*2+2]
@ -56,7 +58,7 @@ end
show_options
exit
end
option_offset=offsets[0]
option_offset=start_of_nb65_cart_image+offsets[0]-7
option_length=offsets[1]
if option_length==6 then

8
dist/make_dist.rb vendored
View File

@ -18,19 +18,21 @@ version_string=File.open(VERSION_FILE).read
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/"],
["client/nb65/nb65_std_cart.bin","c64/"],
["client/nb65/nb65_tcp_cart.bin","c64/"],
["client/nb65/nb65_tcp_cart_rr.bin","c64/"],
["client/nb65/d64_upload.prg","boot/"],
["client/examples/upnatom.prg","boot/"],
["server/lib/tftp_server.rb","lib"],
["server/lib/file_list.rb","lib"],
["server/bin/tftp_only_server.rb","bin/tftp_server.rb"],
["server/bin/import_ags_games.rb","bin"],
#["server/bin/import_ags_games.rb","bin"],
#["server/boot/BOOTA2.PG2","boot"],
["doc/README.Apple2.html","a2"],
#["doc/README.Apple2.html","a2"],
["doc/README.C64.html","c64"],
["doc/netboot65.html","doc/index.html"],
#["doc/README.Apple2.html","doc"],

View File

@ -1 +1 @@
0.9.21
0.9.24

View File

@ -1,20 +1,26 @@
<h1>NETBOOT65 FOR THE C64</h1>
<h2>STARTING THE SERVER</h2>
<ol>
<li> unzip the archive somewhere on your local hard drive</li>
<li>start the bin/tftp_server.rb script (e.g. by double-clicking on it)</li>
</ol>
There are 2 major 'flavours' of the NB65 client, the major difference being whether the cart supports UDP only (but allows access to BASIC), or UDP + TCP (but loses access to BASIC). The
reason for this is the UDP only version of the client fits into an 8KB cartridge, whereas the TCP code pushes the cartridge size up to 16KB, and the upper half of a 16KB cartridge sits in the same
memory location as BASIC.
<p>
Within the major flavours, there are also variations in media - the majority of code is identical between the different media but there are different headers etc. The supported media are:
<p>
<ul>
<li> A prg that can be loaded from disk </li>
<li>'ordinary' cartridge images (that can be burned into an eeprom on e.g. a 64NIC+ card)</li>
<li>'Retro Replay' cartridge images - these are actually 'ordinary' cartridge images that have been converted into a form suitable for use in a Retro Replay using Doc Bacardi's
<a href=http://freenet-homepage.de/LittleDreamLand/CRT8040.html>CRT8040</a> tool</li>
</ul>
<h2>TO USE WITH VICE</h2>
Run <a href=http://www.viceteam.org/>VICE</a> with the nb65_std_cart.bin cartridge image attached (e.g. "x64.exe -cart8 nb65_std_cart.bin")
<table>
<tr><th>filename</th><th>flavour</th><th>media</th><th>command to use in VICE</th></tr>
<tr><td>nb65_c64_ram.prg</td><td>UDP only (+ BASIC)</td><td>RAM</td><td> x64.exe nb65_c64_ram.prg</td></tr>
<tr><td>nb65_std_cart.bin</td><td>UDP only (+ BASIC)</td><td>standard 8KB cart</td><td>x64.exe -cart8 nb65_std_cart.bin</td></tr>
<tr><td>nb65_tcp_cart.bin</td><td>UDP/TCP (no BASIC)</td><td>standard 16KB cart</td><td>x64.exe -cart16 nb65_tcp_cart.bin</td></tr>
<tr><td>nb65_tcp_cart_rr.bin</td><td>UDP/TCP (no BASIC)</td><td>Retro Replay cart image</td><td>x64.exe -cartrr nb65_tcp_cart_rr.bin</td></tr>
</table>
<h2>TO USE WITH A REAL C64</h2>
<h3>Option 1 - Hardcore</h3>
burn the nb65_std_cart.bin cartridge to an EPROM and insert in an 8KB cartridge (which should be set up to have EXROM=0, GAME=1)
<h3>Option 2 - Just dabbling</h3>
You can just run the nb65_c64_ram.prg program (which is essentially the cartridge image plus a loader prg to insert the image into the right place in RAM).
<h2>USING THE CARTRIDGE</h2>
@ -22,23 +28,71 @@ When the cartridge starts, it will attempt to configure the IP stack via DHCP. I
then the IP stack will fall back to using the IP configuration built into the cartridge. See the section "IP CONFIGURATION" for info on how to modify the
cartridge defaults prior to burning an image.
<p>
Once the IP stack is initialised, the "main menu" screen will be displayed. From the main menu, the following options are available:
Once the IP stack is initialised, the "main menu" screen will be displayed. There are slight variations between the menus shown on the 2 "flavours".
<h3>Main Menu - UDP only carts</h3>
<ul>
<li>F1 : TFTP BOOT. THis will query a TFTP server for a list of PRG files, and allow the selection of a file to be downloaded and executed.</li>
<li>F1 : TFTP BOOT. This will query a TFTP server for a list of PRG files, and allow the selection of a file to be downloaded and executed. Most 'single load' applications should work</li>
<li>F3 : BASIC. This will exit to BASIC (with IP stack still configured, so NB65 aware apps can be loaded from disk and run)</li>
<li>F5 : ARP TABLE. This will show a table of the current mapping of IP and MAC addresses </li>
<li>F7 : CONFIG. This brings up a menu where the IP configuration can be modified. Changes made here will be persistent until the next reboot.</li>
</ul>
<h3>Main Menu - UDP/TCP carts</h3>
<ul>
<li>F1 : TFTP BOOT. This will query a TFTP server for a list of PRG files, and allow the selection of a file to be downloaded and executed. This version of TFTP BOOT is restricted to running only
pure machine language programs, since BASIC is not available when this cart is active. (NB - programs that are pure M/L except for a BASIC stub consisting of a single SYS call will be executed).
be loaded </li>
<li>F3 : NET APPS. This will bring up another menu of network-orientated applications (see below for more details).
<li>F5 : ARP TABLE. This will show a table of the current mapping of IP and MAC addresses </li>
<li>F7 : CONFIG. This brings up a menu where the IP configuration can be modified. Changes made here will be persistent until the next reboot.</li>
</ul>
<h3>Net Apps - UDP/TCP carts</h3>
<ul>
<li>F1 : TELNET. You will be prompted to enter a hostname, a port number, and a connection mode. Connection mode is either
<ul>
<li>ASCII - . keypresses are converted to ASCII before being sent out, and incoming data is converted to PETSCII before being displayed.
There is no terminal emulation, and keystrokes are sent a character at a time.</li>
<li>PETSCII - no translation is done on data coming in or out. This mode is suitable for connecting to PETSCII BBSs</li>
<li>Line - Data is converted to/from ASCII, but each line of input can be edited and is not sent until the RETURN key is pressed.</li>
</ul>
Once a connection is made, it can be terminated by hitting RUN/STOP
<li>F3 : GOPHER.FLOODGAP.COM. This will launch the Gopher client, and connect to the gopher portal at gopher://gopher.floodgap.com/</li>
<li>F5 : GOPHER. You will be prompted to enter the hostname (only - no port number can be specified) of a gopher server, and the gopher client will be launched connecting to the specified server.
<li>F7 : MAIN MENU. This will return to the main menu.</li>
</ul>
<h3>Gopher Client - UDP/TCP carts</h3>
Once a gopher resource is loaded, the following keys are active:
<ul>
<li>SPACE, F7 or down arrow : scroll down to next page
<li>F1 or up arror : scroll up to previous page
<li>F2 : show recently visited resource
<li>F3 or left arrow : go back to last visited resource
<li>F5 : prompt to enter a new server (nb server name only - not resource or port)
<li>RUN/STOP : quit
</ul>
If the page currently being displayed has links to further resources in it, each link will be displayed
starting with a highlighted letter (e.g. the first link on a page will have an inverse "A" next to it,
the 2nd link on a page will have an inverse "B" next to it etc). Press the letter assigned to the link
to load up that resource.
<h2>IP CONFIGURATION</h2>
There is a script in the "bin" folder called "set_ip_config.rb" that can be used to modify the MAC address and IP config details in the cart image before
it is burned. For example, to set the MAC address and DNS servers, use this command:
<pre>set_ip_config.rb nb65_std_cart.bin mac ab:cd:ef:12:34:56 dns 10.5.1.1</pre>
run "set_ip_config.rb" with no parameters to see all the options for what can be configured.
<h2>STARTING THE SERVER</h2>
<ol>
<li> unzip the archive somewhere on your local hard drive</li>
<li>start the bin/tftp_server.rb script (e.g. by double-clicking on it)</li>
</ol>
<h2>ADDING MORE FILES</h2>
Only single-load files can be used (this may change in a future release). The files need to be in "PRG" format, i.e.the first 2 bytes of the file must be
Only single-load files can be used. The files need to be in "PRG" format, i.e.the first 2 bytes of the file must be
the load address (little-endian, i.e. low/high). The files also need to have a file extension of ".PRG" (in upper case, if your operating system of choice
is case sensitive).
<p>

Binary file not shown.

View File

@ -79,10 +79,10 @@ td {
<h1>netboot65</h1>
<p>
netboot65 is a project to support network booting C64 and Apple ][computers. It is based on the <a href=http://ip65.sourceforge.net/>IP65 TCP/IP stack</a>. Current components are:
netboot65 is a project to support network booting Commodore 64 computers. It is based on the <a href=http://ip65.sourceforge.net/>IP65 TCP/IP stack</a>. Current components are:
<ul>
<li>a server (written in <a href=http://www.ruby-lang.org/>ruby</a> for maximum portability) that provides a TFTP server with some proprietary extensions to allow clients to request a directory listing.
<li>clients (currently available as a disk image for Apple ][, and either a cartridge or a standalone prg file for C64) that initialises an IP stack, acquires an IP address via DHCP, queries the local LAN for a TFTP server,
<li>clients (currently <!--available as a disk image for Apple ][, and either--> a cartridge or a standalone prg file for C64) that initialises an IP stack, acquires an IP address via DHCP, queries the local LAN for a TFTP server,
and then allows a program file to be downloaded via TFTP and executed. Currently only 'single load' programs are supported, but many old games and utility programs can be run in this way.
<li>the NB65 API (currently for C64 only) that allows for IP aware applications to be developed without being tied to a specific MAC address, IP address or network device, as is the case with most existing
IP libraries for 6502 computers.
@ -95,7 +95,7 @@ IP libraries for 6502 computers.
<h2>Documentation</h2>
<ul>
<li><a href=README.C64.html>C64 documentation</a>
<li><a href=README.Apple2.html>Apple ][ documentation</a>
<!--<li><a href=README.Apple2.html>Apple ][ documentation</a>-->
<li><a href="nb65_api_technical_reference.doc">NB65 API Technical Reference (word doc)</a>
</ul>