Merge pull request #74 from wwarthen/master

Resync

Source/Doc/UserGuide.md

@@ -3887,11 +3887,23 @@ local drives.
 
 ## Network Boot
 
-It is possible to boot your MT011 equipped RomWBW system directly from a
-network server.  This means that the operating system will be loaded 
+It is possible to boot your RomWBW system directly from a
+network server if it has the required hardware.  This means that the operating system will be loaded 
 directly from the network server and all of your drive letters will be 
-provided by the network server.  Duodyne is not yet supported in this 
-mode of operation.
+provided by the network server.  The supported hardware is:
+
+- RCBus System w/ MT011 including:
+  - Featherwing WizNet W5500
+  - SPI FRAM on secondary SPI interface (CS2)
+- Doudyne Disk I/O Board including:
+  - WIZ850io Module
+  - 25LCxxx Serial SPI EEPROM
+  
+Unlike the CP/NET Client, the presence of dedicated non-volatile
+storage is required to hold the network configuration.  This will be
+FRAM (for MT011) or Serial SPI EEPROM (Duodyne).    The NVRAM is used to store your WizNet 
+configuration values so they do not need to be re-entered every time you
+power-cycle your system.
 
 It is important to understand that the operating system that is loaded
 in this case is **not** a RomWBW enhanced operating system.  Some
@@ -3899,11 +3911,6 @@ commands (such as the `ASSIGN` command) will not be possible.  Also,
 you will only have access to drives provided by the network server --
 no local disk drives will be available.
 
-In order to do this, your MT011 Module **must** be enhanced with an 
-NVRAM SPI FRAM mini-board.  The NVRAM is used to store your WizNet 
-configuration values so they do not need to be re-entered every time you
-power-cycle your system.
-
 Using the same values from the previous example, you would
 issue the `WIZCFG` commands:
 
@@ -3924,25 +3931,25 @@ contains some files that will be sent to your RomWBW system when the
 Network boot is performed.  By default the directory will be
 `~/NetBoot`.  In this directory you need to place the following files:
 
-* `cpnos-wbw.sys`
+* `cpnos.sys`
 * `ndos.spr`
 * `snios.spr`
 
-All of these files are found in the Binary/CPNET/NetBoot directory of 
-the RomWBW distribution.
-
 You also need to make sure CpnetSocketServer is configured with an 'A' 
 drive and that drive must contain (at an absolute minimum) the following
 file:
 
 * `ccp.spr`
 
-which is also found in the Binary/CPNET/NetBoot directory of RomWBW
+All of these files are found in the Binary/CPNET/NetBoot directory of 
+the RomWBW distribution.  You will find 2 sub-directories named MT and
+DUO.  Get the files from the sub-directory corresponding to your
+specific hardware.
 
 Finally, you need to add the following line to your CpnetSocketServer 
 configuration file:
 
-`netboot_default = cpnos-wbw.sys`
+`netboot_default = cpnos.sys`
 
 To perform the network boot, you start your RomWBW system normally which
 should leave you at the Boot Loader prompt.  The 'N' command will

Source/HBIOS/Build.cmd

@@ -61,7 +61,17 @@ call hbios_env.cmd
 if %Platform%==UNA goto :UNA
 
 ::
-:: Bring the previously build font files into this directory
+:: Determine proper variant of the NetBoot module to embed
+::
+
+if %Platform%==DUO (
+    set NetBoot=netboot-duo.mod
+) else (
+    set NetBoot=netboot-mt.mod
+)
+
+::
+:: Bring the previously build font files into this directory 
 ::
 
 copy ..\Fonts\font*.asm . || exit /b
@@ -101,7 +111,7 @@ tasm -t%CPUType% -g3 -fFF -dCPM sysconf.asm sysconf.com sysconf_com.lst || exit
 ::
 
 copy /b romldr.bin + dbgmon.bin + ..\zsdos\zsys_wbw.bin + ..\cpm22\cpm_wbw.bin osimg.bin || exit /b
-copy /b ..\Forth\camel80.bin + nascom.bin + ..\tastybasic\src\tastybasic.bin + game.bin + eastaegg.bin + netboot.mod + updater.bin + sysconf.bin + usrrom.bin osimg1.bin || exit /b
+copy /b ..\Forth\camel80.bin + nascom.bin + ..\tastybasic\src\tastybasic.bin + game.bin + eastaegg.bin + %NETBOOT% + updater.bin + sysconf.bin + usrrom.bin osimg1.bin || exit /b
 
 if %Platform%==S100 (
     zxcc slr180 -s100mon/fh

Source/HBIOS/Makefile

@@ -5,7 +5,7 @@ MOREDIFF = game.bin hbios_rom.bin nascom.bin usrrom.bin \
 
 DEST = ../../Binary
 TOOLS =../../Tools
-OTHERS =  *.img *.rom *.com *.upd *.bin *.hex cpm.sys zsys.sys Build.inc font*.asm *.dat hbios_env.sh
+OTHERS =  *.img *.rom *.com *.upd *.bin *.hex cpm.sys zsys.sys Build.inc font*.asm *.dat hbios_env.sh netboot.mod
 
 # DIFFMAKE = 1
 
@@ -60,6 +60,11 @@ ROMNAME=${ROM_PLATFORM}_${ROM_CONFIG}
 $(OBJECTS) : $(ROMDEPS)
 	@cat romldr.bin dbgmon.bin ../ZSDOS/zsys_$(BIOS).bin ../CPM22/cpm_$(BIOS).bin >osimg.bin
 	cat romldr.bin dbgmon.bin ../ZSDOS/zsys_$(BIOS).bin >osimg_small.bin
+	if [ $(ROM_PLATFORM) = DUO ] ; then \
+		cat netboot-duo.mod >netboot.mod ; \
+	else \
+		cat netboot-mt.mod >netboot.mod  ; \
+	fi
 	if [ $(ROM_PLATFORM) != UNA ] ; then \
 		cat camel80.bin nascom.bin tastybasic.bin game.bin eastaegg.bin netboot.mod updater.bin sysconf.bin usrrom.bin >osimg1.bin ; \
 		if [ $(ROM_PLATFORM) = S100 ] ; then \