From a908c12fe19312b29844a4da4ec45c5522eb207f Mon Sep 17 00:00:00 2001
From: david-schmidt <1110325+david-schmidt@users.noreply.github.com>
Date: Tue, 15 Jun 2021 07:27:26 -0400
Subject: [PATCH 1/4] Start SOS virtual serial printer

---
 build/build.xml                             |  45 ++-
 doc/removeMaven.re                          |   2 +-
 src/client/sos/serial/printer/vsprinter.asm | 369 ++++++++++++++++++++
 3 files changed, 400 insertions(+), 16 deletions(-)
 create mode 100644 src/client/sos/serial/printer/vsprinter.asm

diff --git a/build/build.xml b/build/build.xml
index 986883ca..e8731199 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -27,9 +27,9 @@ all
 					common
 				prodos-bootstrap
 				prodos-vsdrive
-					vdrive-image-prep
+					drivers-image-prep
 				prodos-vedrive
-					vdrive-image-prep
+					drivers-image-prep
 			sos
 				sos-serial
 					sos-image-prep
@@ -37,8 +37,8 @@ all
 				sos-ethernet
 					sos-image-prep
 					common
-				sos-vsdrive
-					vdrive-image-prep
+				sos-drivers
+					drivers-image-prep
 				sos-bootstrap
 		server
 			zip
@@ -299,7 +299,7 @@ all
 		<delete file="${projdir}/src/client/STARTUP.SYSTEM" />
 		<delete file="${projdir}/src/client/ADTPRO" />
 	</target>
-	<target name="vdrive-image-prep" description="Start Empty VDrive Disk Image">
+	<target name="drivers-image-prep" description="Start Empty Drivers Disk Image">
 		<!--
 		Start Empty VDrive Disk Image
 		-->
@@ -307,7 +307,7 @@ all
 		<copy file="${builddir}/VDriveBase.dsk" tofile="${builddir}/${distName}/disks/${vdriveDiskName}.DSK" />
 		<appleCommander command="n" imagename="${builddir}/${distName}/disks/${vdriveDiskName}.DSK" volname="${vdriveVolName}"/>
 	</target>
-	<target name="prodos-vsdrive" depends="vdrive-image-prep" description="Builds the Virtual Serial Drive Driver (ProDOS)">
+	<target name="prodos-vsdrive" depends="drivers-image-prep" description="Builds the Virtual Serial Drive Driver (ProDOS)">
 		<appleCommander command="pro800" imagename="${builddir}/${distName}/disks/Virtual.po" volname="${vdriveVolName1}"/>
 		<appleCommander command="pro800" imagename="${builddir}/${distName}/disks/Virtual2.po" volname="${vdriveVolName2}"/>
 		<echo message="Assembling ProDOS virtual serial drive source..."/>
@@ -343,7 +343,7 @@ all
 		<delete file="${projdir}/src/client/VSDRIVE_HIGH" />
 	</target>
 
-	<target name="prodos-vedrive" depends="vdrive-image-prep" description="Builds the Virtual Ethernet Drive Driver (ProDOS)">
+	<target name="prodos-vedrive" depends="drivers-image-prep" description="Builds the Virtual Ethernet Drive Driver (ProDOS)">
 		<appleCommander command="pro800" imagename="${builddir}/${distName}/disks/Virtual.po" volname="${vdriveVolName1}"/>
 		<appleCommander command="pro800" imagename="${builddir}/${distName}/disks/Virtual2.po" volname="${vdriveVolName2}"/>
 		<echo message="Assembling ProDOS virtual ethernet drive source..."/>
@@ -371,7 +371,7 @@ all
 		<appleCommander command="p" input="${builddir}/lib/cc65/loader.system" imagename="${builddir}/${distName}/disks/${vdriveDiskName}.DSK" filename="VEDRIVE.SYSTEM" type="SYS" address="8192"/>
 	</target>
 
-	<target name="prodos-vedrive2" depends="vdrive-image-prep" description="Builds the Uthernet II Virtual Ethernet Drive Driver (ProDOS)">
+	<target name="prodos-vedrive2" depends="drivers-image-prep" description="Builds the Uthernet II Virtual Ethernet Drive Driver (ProDOS)">
 		<appleCommander command="pro800" imagename="${builddir}/${distName}/disks/Virtual.po" volname="${vdriveVolName1}"/>
 		<appleCommander command="pro800" imagename="${builddir}/${distName}/disks/Virtual2.po" volname="${vdriveVolName2}"/>
 		<echo message="Assembling ProDOS virtual Uthernet II drive source..."/>
@@ -441,7 +441,7 @@ all
 	SOS section
 	============================================================================================
 	-->
-	<target name="sos" depends="prepare, sos-serial, sos-ethernet, sos-vsdrive, sos-bootstrap" description="Orchestrate Overall Client Build for SOS" />
+	<target name="sos" depends="prepare, sos-serial, sos-ethernet, sos-drivers, sos-bootstrap" description="Orchestrate Overall Client Build for SOS" />
 	<target name="sos-serial" depends="sos-image-prep, common" description="Build the ADTPro Serial Client (SOS)">
 		<echo message="Assembling sos-serial client..."/>
 		<!--
@@ -520,28 +520,43 @@ all
 		<!-- Note: keep this binary GRUB if you want to write it out to sector zero of a disk image for SOS bootstrap testing. --> 
 		<delete file="${projdir}/src/client/GRUB" />
 	</target>
-	<target name="sos-vsdrive" depends="vdrive-image-prep" description="Copy Virtual Serial Drive Driver (SOS)">
+	<target name="sos-drivers" depends="drivers-image-prep" description="Copy Virtual Serial Drivers (SOS)">
 		<!--
 		Assemble the driver source
 		-->
-		<echo message="Assembling sos-driver..."/>
+		<echo message="Assembling SOS Virtual Serial Drive driver..."/>
 		<exec dir="${projdir}/src/client/sos/serial/drive" executable="${assemblerPath}/ca65" failonerror="true">
 			<arg line=" -l vsdrivesos.lst vsdrive.asm -o vsdrivesos.o" />
 		</exec>
+		<echo message="Assembling SOS Virtual Serial Printer driver..."/>
+		<exec dir="${projdir}/src/client/sos/serial/printer" executable="${assemblerPath}/ca65" failonerror="true">
+			<arg line=" -l vsprintersos.lst vsprinter.asm -o vsprintersos.o" />
+		</exec>
 		<!--
 		Link the driver object code
 		-->
-		<echo message="Linking sos-driver..."/>
+		<echo message="Linking SOS Virtual Serial Drive driver..."/>
 		<exec dir="${projdir}/src/client/sos/serial/drive" executable="${assemblerPath}/ld65" failonerror="true">
-			<arg line=" vsdrivesos.o -o vsdrivesos.o65 -C ${builddir}/Apple3_o65.cfg" />
+			<arg line="vsdrivesos.o -o vsdrivesos.o65 -C ${builddir}/Apple3_o65.cfg" />
+		</exec>
+		<echo message="Linking SOS Virtual Serial Printer driver..."/>
+		<exec dir="${projdir}/src/client/sos/serial/printer" executable="${assemblerPath}/ld65" failonerror="true">
+			<arg line="vsprintersos.o -o vsprintersos.o65 -C ${builddir}/Apple3_o65.cfg" />
 		</exec>
 		<!--
-		Copy out the Apple /// virtual serial drive driver
+		Copy out the Apple /// Virtual Serial Drive river
 		-->
-		<echo message="Copying sos-driver components..." />
+		<echo message="Copying Virtual Serial Drive components..." />
 		<appleCommander command="g" imagename="${a3sysutils-vs}" filename="VSDRIVE.A3DRVR" output="${builddir}/VSDRIVE.A3DRVR" />
 		<appleCommander command="p" input="${builddir}/VSDRIVE.A3DRVR" imagename="${builddir}/${distName}/disks/${vdriveDiskName}.DSK" filename="VSDRIVE.A3DRVR" type="pcd" />
 		<delete file="${builddir}/VSDRIVE.A3DRVR" />
+		<!--
+		Copy out the Apple /// Virtual Serial Printer driver
+		-->
+		<echo message="Copying Virtual Serial Printer components..." />
+		<appleCommander command="g" imagename="${a3sysutils-vs}" filename="VSPRINTER.A3DRVR" output="${builddir}/VSPRINTER.A3DRVR" />
+		<appleCommander command="p" input="${builddir}/VSPRINTER.A3DRVR" imagename="${builddir}/${distName}/disks/${vdriveDiskName}.DSK" filename="VSPRINTER.A3DRVR" type="pcd" />
+		<delete file="${builddir}/VSPRINTER.A3DRVR" />
 	</target>
 	<target name="sos-image-prep" description="Start Empty SOS Disk Image" >
 		<echo message="Prepping SOS disk images..." />
diff --git a/doc/removeMaven.re b/doc/removeMaven.re
index 0b198849..85106f2f 100644
--- a/doc/removeMaven.re
+++ b/doc/removeMaven.re
@@ -1,7 +1,7 @@
 s@v\.r\.m@2.1.0@ig;
 s@\<a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"\>@<a href="https://github.com/ADTPro/adtpro"><img src="https://assets-cdn.github.com/images/modules/logos_page/GitHub-Logo.png" /></a>@ig;
 s@\<img class="builtBy" alt="Built by Maven" src="\./images/logos/maven-feather.png" \/\>@@ig;
-s@\</body\>@\<script src\=\"http\:\/\/www.google-analytics.com\/urchin.js\" type\=\"text\/javascript\"\>\<\/script\>\<script type\=\"text\/javascript\"\>_uacct \= \"UA-697468-1\";urchinTracker\(\);\<\/script\>\<\/body\>@ig;
+s@<head>@\<head\>\<script async src\=\"https\:\/\/www.googletagmanager.com\/gtag\/js\?id\=UA-697468-1\"\>\<\/script\>\<script\>window\.dataLayer \= window\.dataLayer \|\| \[\]\; function gtag\(\)\{dataLayer\.push\(arguments\)\;\}gtag\(\'js\', new Date\(\)\)\; gtag\(\'config\'\, \'UA-697468-1\'\)\;\<\/script\>@ig;
 s@(href="http://www.youtube.com/watch\?v=CMF3PL17kqg)(.*)"@\1\2" target\="_new"@ig;
 s@href="http://dataswamp.net/apple2eserialterm/index.php"@href="http://dataswamp.net/apple2eserialterm/index.php" target\="_new"@ig;
 s@href="http://ressources-apple2.voila.net/adtpro/adtpro.html"@href="http://ressources-apple2.voila.net/adtpro/adtpro.html" target\="_new"@ig;
diff --git a/src/client/sos/serial/printer/vsprinter.asm b/src/client/sos/serial/printer/vsprinter.asm
new file mode 100644
index 00000000..eaff6b99
--- /dev/null
+++ b/src/client/sos/serial/printer/vsprinter.asm
@@ -0,0 +1,369 @@
+; VSPrinter
+
+; 0.01A - Initial release
+
+;         .TITLE "Apple /// Virtual Serial Printer Driver"
+          .PROC  VSPRINTER
+
+                .setcpu "6502"
+                .reloc
+
+DriverVersion   :=   $0010           ; Version number
+DriverMfgr      :=   $4453           ; Driver Manufacturer - DS
+
+;
+; SOS Equates
+;
+ExtPG     :=   $1401                 ; Driver extended bank address offset
+AllocSIR  :=   $1913                 ; Allocate system internal resource
+SysErr    :=   $1928                 ; Report error to system
+EReg      :=   $FFDF                 ; Environment register
+ReqCode   :=   $C0                   ; Request code
+SOS_Unit  :=   $C1                   ; Unit number
+SosBuf    :=   $C2                   ; SOS buffer pointer (2 bytes)
+ReqCnt    :=   $C4                   ; Requested byte count
+CtlStat   :=   $C2                   ; Control/status code
+CSList    :=   $C3                   ; Control/status list pointer
+SosBlk    :=   $C6                   ; Starting block number
+QtyRead   :=   $C8                   ; Pointer to bytes read returned by D_READ
+
+;
+; Our temps in zero page
+;
+Count     :=   $CE                   ; 2 bytes
+Timer     :=   $D0                   ; 2 bytes
+NumBlks   :=   $D2                   ; 2 bytes lb,hb
+DataBuf   :=   $D4                   ; 2 bytes
+EnvCmd    :=   $D6                   ; 1 byte envelope command
+Checksum  :=   $D7                   ; 1 byte checksum calc
+
+;
+; Communications hardware constants
+;
+ACIADR    :=   $c0f0                 ; ACIA Data register
+ACIASR    :=   $c0f1                 ; ACIA Status register
+ACIACMD   :=   $c0f2                 ; ACIA Command mode register
+ACIACTL   :=   $c0f3                 ; ACIA Control register
+
+;
+; SOS Error Codes
+;
+XDNFERR   :=   $10                   ; Device not found
+XBADDNUM  :=   $11                   ; Invalid device number
+XREQCODE  :=   $20                   ; Invalid request code
+XCTLCODE  :=   $21                   ; Invalid control/status code
+XCTLPARAM :=   $22                   ; Invalid control/status parameter
+XNOTOPEN  :=   $23                   ; Device not open
+XNORESRC  :=   $25                   ; Resources not available
+XBADOP    :=   $26                   ; Invalid operation
+XIOERROR  :=   $27                   ; I/O error
+XNODRIVE  :=   $28                   ; Drive not connected
+XBYTECNT  :=   $2C                   ; Byte count not a multiple of 512
+XBLKNUM   :=   $2D                   ; Block number to large
+XDISKSW   :=   $2E                   ; Disk switched
+XNORESET  :=   $33                   ; Device reset failed
+
+;
+; Switch Macro
+;
+                 .MACRO  SWITCH index,bounds,adrs_table,noexec      ;See SOS Reference
+                 .IFNBLANK index        ;If PARM1 is present,
+                 LDA     index          ; load A with switch index
+                 .ENDIF
+                 .IFNBLANK bounds       ;If PARM2 is present,
+                 CMP     #bounds+1      ; perform bounds checking
+                 BCS     @110           ; on switch index
+                 .ENDIF
+                 ASL     A              ;Multiply by 2 for table index
+                 TAY
+                 LDA     adrs_table+1,Y ;Get switch address from table
+                 PHA                    ; and push onto Stack
+                 LDA     adrs_table,Y
+                 PHA
+                 .IFBLANK noexec
+                 RTS                    ; exit to code
+                 .ENDIF
+@110:
+                 .ENDMACRO
+
+;
+; GoSlow macro - slow down via E-Register
+;
+          .MACRO GoSlow
+          PHA
+          LDA EReg
+          ORA #$80                   ; Set 1MHz switch
+          STA EReg
+          PLA
+          .ENDMACRO
+
+;
+; GoFast macro - speed up via E-Register
+;
+          .MACRO GoFast
+          PHA
+          LDA EReg
+          AND #$7f
+          STA EReg                   ; Whatever it was - set it back
+          PLA
+          .ENDMACRO
+
+          .SEGMENT "TEXT"
+
+;
+; Comment Field of driver
+;
+          .WORD  $FFFF ; Signal that we have a comment
+          .WORD  COMMENT_END - COMMENT ; Length of comment field
+COMMENT:  .BYTE "Apple /// Virtual Serial Printer Driver by David Schmidt 2021"
+COMMENT_END:
+
+;------------------------------------
+;
+; Device identification Block (DIB) - VSPRINTER
+;
+;------------------------------------
+
+DIB_0:
+          .WORD     $0000            ; Link pointer
+          .WORD     Entry            ; Entry pointer
+          .BYTE     $08              ; Name length byte
+          .BYTE     ".VSPRINTER     "; Device name
+          .BYTE     $80              ; Active, no page alignment
+          .BYTE     $00              ; Slot number
+          .BYTE     $00              ; Unit number
+          .BYTE     $41              ; Type
+          .BYTE     $04              ; Subtype
+          .BYTE     $00              ; Filler
+DIB0_Blks:
+          .WORD     $0000            ; # Blocks (none, character device)
+          .WORD     DriverMfgr       ; Manufacturer
+          .WORD     DriverVersion    ; Driver version
+          .WORD     $0000            ; DCB length followed by DCB
+
+;------------------------------------
+;
+; Local storage locations
+;
+;------------------------------------
+
+SIRAddr:  .WORD     SIRTbl
+SIRTbl:   .BYTE     $01              ; ACIA resource
+          .BYTE     $00
+          .WORD     $FEC4            ; Do-nothing interrupt vector
+          .BYTE     $00              ; Bank register
+SIRLen    :=        *-SIRTbl
+StackPtr: .BYTE     $00
+DCB_Idx:  .BYTE     $00                  ; DCB 0's blocks
+OPENFLG:  .BYTE     $00
+
+;------------------------------------
+;
+; Driver request handlers
+;
+;------------------------------------
+
+Entry:
+          JSR Dispatch               ; Call the dispatcher
+          LDX SOS_Unit               ; Get drive number for this unit
+          LDA ReqCode                ; Keep request around for D_REPEAT
+          LDA #$00
+          RTS
+;
+; The Dispatcher.  Note that if we came in on a D_INIT call,
+; we do a branch to Dispatch normally.  
+; Dispatch is called as a subroutine!
+;
+DoTable:
+          .WORD     DRead-1          ; 0 Read request
+          .WORD     DWrite-1         ; 1 Write request
+          .WORD     DStatus-1        ; 2 Status request
+          .WORD     DControl-1       ; 3 Control request
+          .WORD     BadReq-1         ; 4 Unused
+          .WORD     BadReq-1         ; 5 Unused
+          .WORD     DOpen-1          ; 6 Open
+          .WORD     DClose-1         ; 7 Close
+          .WORD     DInit-1          ; 8 Init request
+Dispatch: SWITCH    ReqCode,9,DoTable ; Serve the request
+
+;
+; Dispatch errors
+;
+BadReq:   LDA #XREQCODE              ; Bad request code!
+          JSR SysErr                 ; Return to SOS with error in A
+BadOp:    LDA #XBADOP                ; Invalid operation!
+          JSR SysErr                 ; Return to SOS with error in A
+NotOpen:  LDA #XNOTOPEN              ; Device not open
+          JSR SysErr                 ; Return to SOS with error in A
+NoDevice: LDA #XDNFERR               ; Device not found
+          JSR SysErr                 ; Return to SOS with error in A
+
+;
+; D_READ call processing
+;
+DRead:
+          BIT OPENFLG
+          BMI :+
+          JMP NotOpen
+:         LDA #XBADOP
+          JSR SysErr
+
+ReadExit: RTS                        ; Exit read routines
+
+;
+; D_WRITE call processing
+;
+DWrite:
+          RTS
+
+;
+; D_STATUS call processing
+;
+DStatus:
+          LDA CtlStat                ; Which status code to run?
+          BNE DSWhat
+          LDY #$00                   ; $00 - Driver status, return zero
+          STA (CSList),Y
+          CLC
+          RTS
+DSWhat:   LDA #XCTLCODE              ; Control/status code no good
+          JSR SysErr                 ; Return to SOS with error in A
+
+;
+; D_CONTROL call processing
+;  $00 = Reset device
+;  $FE = Perform media formatting
+;
+DControl:
+          LDA CtlStat                ; Control command
+          BEQ CReset
+          JMP DCWhat                 ; Control code no good!
+CReset:   GoSlow
+          BIT ACIADR                 ; Clear ACIA Data register
+          GoFast
+DCDone:   RTS          
+DCNoReset:
+          LDA #XNORESET              ; Things went bad after reset
+          JSR SysErr                 ; Return to SOS with error in A
+DCWhat:   LDA #XCTLCODE              ; Control/status code no good
+          JSR SysErr                 ; Return to SOS with error in A
+
+DClose:
+DOpen:
+          CLC
+          RTS
+;
+; D_INIT call processing - called at initialization
+;
+DInit:
+          LDA #SIRLen
+          LDX SIRAddr
+          LDY SIRAddr+1
+          JSR AllocSIR               ; Allocate the ACIA
+          BCS NoACIA
+
+          PHP
+          SEI                        ; Disable system interrupts
+          GoSlow                     ; Set up the communications environment
+          LDA #$0b                   ; No parity, no interrupts
+          STA ACIACMD                ; Store via ACIA command register
+          LDA #$10                   ; $16=300, $1e=9600, $1f=19200, $10=115k
+          STA ACIACTL                ; Store via ACIA control register
+          LDA ACIASR                 ; Clear any prior ACIA interrupts
+          GoFast
+          PLP                        ; Re-enable system interrupt state
+
+DInitDone:
+          CLC
+          RTS
+NoACIA:
+          LDA #XNORESRC
+          JSR SysErr                 ; Return to SOS with error in A
+
+;------------------------------------
+;
+; Utility routines
+;
+;------------------------------------
+
+
+;
+; SendEnvelope - send the command envelope
+;
+SendEnvelope:                        ; Send a command envelope
+          LDA #$00
+          STA Checksum 
+          LDA #$c5                   ; "E"
+          JSR PUTCC                  ; Envelope
+          LDA EnvCmd
+          JSR PUTCC                  ; Send command
+          LDA SosBlk
+          JSR PUTCC                  ; Send LSB of requested block
+          LDA SosBlk+1
+          JSR PUTCC                  ; Send MSB of requested block
+          LDA Checksum
+          JSR PUTC                   ; Send envelope Checksum
+          RTS                        ; Carry is clear, return
+
+
+;
+; PUTCC - Put a byte to the ACIA, adding to the checksum
+;
+PUTCC:    PHA
+          EOR Checksum
+          STA Checksum
+          JMP PUTC0
+;
+; PUTC - Put a byte to the ACIA
+;
+PUTC:
+          PHA                        ; Push 'character to send' onto the stack
+PUTC0:    LDA #$00
+          STA Timer
+          STA Timer+1
+          GoSlow
+PUTC1:
+          LDA ACIASR                 ; Check status bits
+          AND #$70
+          CMP #$10
+          BNE PUTC1                  ; Output register is full, no timeout; so loop
+          PLA                        ; Pull 'character to send' back off the stack
+          STA ACIADR                 ; Put character
+          GoFast
+          RTS
+
+; Fix up the buffer pointer to correct for addressing
+; anomalies.  We just need to do the initial checking
+; for two cases:
+; 00xx bank N -> 80xx bank N-1
+; 20xx bank 8F if N was 0
+; FDxx bank N -> 7Dxx bank N+1
+; If pointer is adjusted, return with carry set
+;
+FixUp:    LDA DataBuf+1              ; Look at msb
+          BEQ @1                     ; That's one!
+          CMP #$FD                   ; Is it the other one?
+          BCS @2                     ; Yep. fix it!
+          RTS                        ; Pointer unchanged, return carry clear.
+@1:       LDA #$80                   ; 00xx -> 80xx
+          STA DataBuf+1
+          DEC DataBuf+ExtPG          ; Bank N -> band N-1
+          LDA DataBuf+ExtPG          ; See if it was bank 0
+          CMP #$7F                   ; (80) before the DEC.
+          BNE @3                     ; Nope! all fixed.
+          LDA #$20                   ; If it was, change both
+          STA DataBuf+1              ; Msb of address and
+          LDA #$8F
+          STA DataBuf+ExtPG          ; Bank number for bank 8F
+          RTS                        ; Return carry set
+@2:       AND #$7F                   ; Strip off high bit
+          STA DataBuf+1              ; FDxx ->7Dxx
+          INC DataBuf+ExtPG          ; Bank N -> bank N+1
+@3:       RTS                        ; Return carry set
+
+CkUnit:
+          CLC
+          RTS
+
+         .ENDPROC
+         .END

From 864a993cafa7f340d890e831609648ebbe801253 Mon Sep 17 00:00:00 2001
From: david-schmidt <1110325+david-schmidt@users.noreply.github.com>
Date: Tue, 15 Jun 2021 09:46:45 -0400
Subject: [PATCH 2/4] Add a3driverutil

---
 build/ADTProBuild-default.properties   |   4 +-
 build/build.xml                        |  25 +
 build/lib/A3DriverUtil/a3driverutil.py | 633 +++++++++++++++++++++++++
 3 files changed, 661 insertions(+), 1 deletion(-)
 create mode 100644 build/lib/A3DriverUtil/a3driverutil.py

diff --git a/build/ADTProBuild-default.properties b/build/ADTProBuild-default.properties
index 16f4f8ba..61fdcb82 100644
--- a/build/ADTProBuild-default.properties
+++ b/build/ADTProBuild-default.properties
@@ -6,4 +6,6 @@
 # support files for local builds.
 #
 # assemblerPath defines the place where the ca65 executable lives.
-assemblerPath=c:/dev/cc65/cc65-master/bin
\ No newline at end of file
+assemblerPath=c:/dev/cc65/cc65-master/bin
+# pythonPath defines the place where the python 2.7 interpreter executables live.
+python27Path=c:/Python27/
\ No newline at end of file
diff --git a/build/build.xml b/build/build.xml
index e8731199..3db9b3f7 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -543,6 +543,31 @@ all
 		<exec dir="${projdir}/src/client/sos/serial/printer" executable="${assemblerPath}/ld65" failonerror="true">
 			<arg line="vsprintersos.o -o vsprintersos.o65 -C ${builddir}/Apple3_o65.cfg" />
 		</exec>
+<!--
+		<echo message="Extracting SOS.DRIVER..."/>
+		<appleCommander command="g" imagename="${projdir}/out/${sysUtilDiskImage}" filename="SOS.DRIVER" output="${projdir}/out/SOS.DRIVER#0c0000" />
+		<echo message="Deleting CFFA driver from SOS.DRIVER..."/>		
+		<exec executable="${python27Path}python">
+			<arg value="${builddir}/lib/A3Driverutil/A3Driverutil.py"/>
+			<arg value="delete"/>
+			<arg value=".CFFA3000D1"/>
+			<arg value="${projdir}/out/SOS.DRIVER#0c0000"/>
+		</exec>
+		<echo message="Adding built driver to SOS.DRIVER..."/>		
+		<exec executable="${python27Path}python">
+			<arg value="${builddir}/lib/A3Driverutil/A3Driverutil.py"/>
+			<arg value="add"/>
+			<arg value="${projdir}/out/focus3.o65"/>
+			<arg value="${projdir}/out/SOS.DRIVER#0c0000"/>
+		</exec>
+		<echo message="Deleting SOS.DRIVER from disk images..."/>
+		<appleCommander command="d" imagename="${projdir}/out/${sysUtilDiskImage}" filename="SOS.DRIVER" failonerror="false"/>
+		<appleCommander command="d" imagename="${projdir}/out/${basicDiskImage}" filename="SOS.DRIVER" failonerror="false"/>
+		<echo message="Putting updated SOS.DRIVER back on disk images..."/>
+		<appleCommander command="p" input="${projdir}/out/SOS.DRIVER#0c0000" imagename="${projdir}/out/${sysUtilDiskImage}" filename="SOS.DRIVER" type="SOS" />
+		<appleCommander command="p" input="${projdir}/out/SOS.DRIVER#0c0000" imagename="${projdir}/out/${basicDiskImage}" filename="SOS.DRIVER" type="SOS" />
+-->
+		
 		<!--
 		Copy out the Apple /// Virtual Serial Drive river
 		-->
diff --git a/build/lib/A3DriverUtil/a3driverutil.py b/build/lib/A3DriverUtil/a3driverutil.py
new file mode 100644
index 00000000..b2e92333
--- /dev/null
+++ b/build/lib/A3DriverUtil/a3driverutil.py
@@ -0,0 +1,633 @@
+#!/usr/bin/python
+#
+
+# use unpack from struct and argv from sys
+from struct import unpack,pack; import argparse;
+
+parser = argparse.ArgumentParser(
+    prog='A3Driverutil.py',
+    formatter_class=argparse.RawDescriptionHelpFormatter,
+    description='''\
+Driverutil.py - A Python script to work with A3 drivers
+ By Robert Justice
+
+The primary function is to convert an o65 relocatable 6502 binary
+file to A3 driver format. This is to allow driver development using
+the ca65 assembler
+
+Support to add, update the converted driver into a SOS.DRIVER file
+and delete & list is also included.
+
+Finally, has some extract functions to extract driver code to allow
+disassembly. One of these will relocate the extracted Driver to 
+0x2000 base address to minimise any confusion with zero page when
+disassembling.
+
+        https://github.com/rob_justice/A3Driverutil
+
+ reuses some functions and ideas from Driv3rs.py, thank you
+        https://github.com/thecompu/Driv3rs
+
+''')
+
+subparsers = parser.add_subparsers(help='Command Description',dest="command")
+
+# Bin command
+bin_parser = subparsers.add_parser(
+    'bin', help='Convert o65 binary to A3 driver binary format, Comment + Code + RelocationTable')
+bin_parser.add_argument(
+    'o65file', action='store',
+    help='Input o65 code file to be converted')
+bin_parser.add_argument(
+    'binfile', action='store',
+    help='Binary output file')
+
+# Sos command
+sos_parser = subparsers.add_parser(
+    'sos', help='Convert o65 binary and output as SOS.DRIVER format(for use with scp)')
+sos_parser.add_argument(
+    'o65file', action='store',
+    help='Input o65 code file to be converted')
+sos_parser.add_argument(
+    'sosfile', action='store',
+    help='SOS.DRIVER Binary output file')
+
+# List command
+add_parser = subparsers.add_parser(
+    'list', help='List current drivers in a SOS.DRIVER file')
+add_parser.add_argument(
+    'sosfile', action='store',
+    help='SOS.DRIVER file to list drivers in')
+    
+# Add command
+add_parser = subparsers.add_parser(
+    'add', help='Convert o65 binary and add as new driver to a existing SOS.DRIVER file')
+add_parser.add_argument(
+    'o65file', action='store',
+    help='Input o65 code file to be converted')
+add_parser.add_argument(
+    'sosfile', action='store',
+    help='SOS.DRIVER file to list the contained drivers')
+
+# Update command
+update_parser = subparsers.add_parser(
+    'update', help='Convert o65 binary and update existing driver in a SOS.DRIVER file')
+update_parser.add_argument(
+    'o65file', action='store',
+    help='Input o65 code file to be converted')
+update_parser.add_argument(
+    'sosfile', action='store',
+    help='SOS.DRIVER file to be updated')
+
+# Delete command
+delete_parser = subparsers.add_parser(
+    'delete', help='Delete a driver from an existing SOS.DRIVER file')
+delete_parser.add_argument(
+    'drivername', action='store',
+    help='Name of driver to be deleted (include . eg: ".console"')
+delete_parser.add_argument(
+    'sosfile', action='store',
+    help='SOS.DRIVER file to delete the driver from')
+    
+# Extract command
+extract_parser = subparsers.add_parser(
+    'extract', help='Extract a driver from an existing SOS.DRIVER file')
+extract_parser.add_argument(
+    'drivername', action='store',
+    help='Name of driver to be extracted (include . eg: ".console"')
+extract_parser.add_argument(
+    'sosfile', action='store',
+    help='SOS.DRIVER file to extract the driver from')
+
+# Extract code and relocate to 0x2000 command
+extract_parser = subparsers.add_parser(
+    'extractcode', help='Extract a drivers code from an existing SOS.DRIVER file and relocate to 0x2000 to aid disassembly')
+extract_parser.add_argument(
+    'drivername', action='store',
+    help='Name of driver to be extracted (include . eg: ".console"')
+extract_parser.add_argument(
+    'sosfile', action='store',
+    help='SOS.DRIVER file to extract the driver from')
+
+args = parser.parse_args()
+
+
+# this function unpacks several read operations --
+# text, binary, and single-byte. Each uses unpack from
+# struct and attempts converts the resulting tuple into
+# into either a string or integer, depending upon need.
+def readUnpack(file,bytes, **options):
+    if options.get("type") == 't':
+        SOS = file.read(bytes)
+        text_unpacked = unpack('%ss' % bytes, SOS)
+        return ''.join(text_unpacked)
+
+    if options.get("type") == 'b':
+        SOS = file.read(bytes)
+        offset_unpacked = unpack ('< H', SOS)
+        return int('.'.join(str(x) for x in offset_unpacked))
+
+    if options.get("type") == '1':
+        SOS = file.read(bytes)
+        offset_unpacked = unpack ('< B', SOS)
+        return int(ord(SOS))
+
+# this function reads a word from a string at the specified
+# offset and returns an integer 
+def readWord(data,startpos):
+    return ord(data[startpos+1])*256+ord(data[startpos])
+
+# this function reads a byte from a string at the specified
+# offset and returns an integer
+def readByte(data,startpos):
+    return ord(data[startpos])
+
+#
+# this function reads in a o65 binary file of a driver and 
+# converts to the same format as contained in the SOS.DRIVER
+# file for drivers, Comment, Code, RelocateTable
+#  input - filename of o65 file
+#  returns - converted driver as a string
+#
+def convert_o65(file):        
+    o65file = open(file, 'rb')
+    
+    #parse the o65 file
+    byte = readUnpack(o65file,1,type = '1')        #non-C64 marker, 2 bytes
+    byte = readUnpack(o65file,1,type = '1')
+    o65 = readUnpack(o65file,3,type = 't')         # "o65" MAGIC number!
+    if o65 == 'o65':    #valid file, lets keep going
+        version = readUnpack(o65file,1,type = '1')  # version
+        mode = readUnpack(o65file,2,type = 'b')     # mode word
+        tbase = readUnpack(o65file,2,type = 'b')    # address to which text is assembled to originally
+        tlen = readUnpack(o65file,2,type = 'b')     # length of text segment
+        dbase = readUnpack(o65file,2,type = 'b')    # originating address for data segment
+        dlen = readUnpack(o65file,2,type = 'b')     # length of data segment
+        bbase = readUnpack(o65file,2,type = 'b')    # originating address for bss segment
+        blen = readUnpack(o65file,2,type = 'b')     # length of bss segment
+        zbase = readUnpack(o65file,2,type = 'b')    # originating address for zero segment
+        zlen = readUnpack(o65file,2,type = 'b')     # length of zero segment
+        stack = readUnpack(o65file,2,type = 'b')    # minimum needed stack size, 0= not known.
+        
+        #print ("mode: ",mode)
+        #print ("tbase: ",tbase)
+        #print ("tlen: ",tlen)
+        #print ("dbase: ",dbase)
+        #print ("dlen: ",dlen)
+
+        if tlen == 0:
+            print("No text segment found; ensure your driver defines .segment \"TEXT\"")
+            exit(1)
+        if dlen == 0:
+            print("No data segment found; ensure your driver defines .segment \"DATA\"")
+            exit(1)
+
+        #skip over header options
+        olen = readUnpack(o65file,1,type = '1') 
+        while olen != 0 :  #0 marks end of options header
+           otype = readUnpack(o65file,1,type = '1')
+           option_bytes = readUnpack(o65file,olen-2,type = 't')
+           olen = readUnpack(o65file,1,type = '1') 
+        
+        driver=''      #this will be the converted driver
+        
+        #add text segment
+        driver += o65file.read(tlen)  #this is the comment part
+        
+        #trim off the comment 0xFFFF if there is a comment
+        if readWord(driver,0) == 0xFFFF:
+           driver = driver[2:]
+        
+        #add data segment length
+        driver += pack('<H',dlen)     #this is the length of the code part
+        
+        #add data segment
+        driver += o65file.read(dlen)  #this is the code part
+        
+        #skip Undefined references list number (should be 0) assuming size 16 bits for now
+        byte = readUnpack(o65file,1,type = '1')
+        byte = readUnpack(o65file,1,type = '1')
+        
+        #skip TEXT segment reloc table, this should be 0 indicating no entries
+        byte = readUnpack(o65file,1,type = '1')
+        
+        #convert the relocation table from relative offset bytes to absolute addresses
+        reloctable =[]
+        
+        offset_address = dbase-1     #offset starts at data seg orig minus 1
+        offset = readUnpack(o65file,1,type = '1')
+        #print ("start offset:",offset)
+        
+        while offset != 0:
+            if offset == 255:    #next offset > 254, so add this and get next byte
+                offset_address = offset_address + offset -1 #add 254
+                offset = readUnpack(o65file,1,type = '1')
+            else:
+                typebyte = readUnpack(o65file,1,type = '1')
+                if typebyte == 0x83:    #8=word offset and 3=data segment
+                    offset_address = offset_address + offset
+                    reloctable.append(offset_address)
+                    offset = readUnpack(o65file,1,type = '1')
+        
+        #add the length of the relocation table
+        driver += pack('<H',len(reloctable)*2)    #this is the length of the relocate part in bytes
+        
+        #add the relocation table
+        for i in range(0,len(reloctable)):
+            driver += pack('<H',reloctable[i])     #this is the relocation part
+        o65file.close()
+        
+        return driver    #return the converted driver binary
+    
+    else:
+        print 'not o65 input file'
+        o65file.close()
+        exit()
+    
+# 
+# this function searchs through the driverfile data and returns
+# a list of offsets for the drivers contained in the data
+# each entry in the returned list is a dictionary containing:
+#  'comment_start'
+#  'code_start'
+#  'reloc_start'
+#
+def parsedriverfile(filecontents): 
+    filetype = filecontents[0:8]           #check for 'SOS DRVR' header
+    if filetype != 'SOS DRVR':
+        print "INVALID SOS.DRIVER file"
+        exit()
+    
+    drivers_list = []
+    offset = readWord(filecontents,8) + 8 + 2  #actual drivers start after this offset
+    loop = True
+    while loop :
+        driver = {}
+        rel_offset = readWord(filecontents,offset)  #comment length
+        if rel_offset == 0xFFFF:   #we are at the end of the file
+            end_mark = offset
+            loop = False
+        else :                     #else lets walk through and build the offsets 
+            driver['comment_start'] = offset
+            offset += rel_offset + 2
+            drivers_list.append(driver)
+            driver['code_start'] = offset
+            rel_offset = readWord(filecontents,offset)     #code length
+            offset += rel_offset + 2
+            driver['reloc_start'] = offset
+            rel_offset = readWord(filecontents,offset)     #reloc start
+            offset += rel_offset + 2
+    
+    return [drivers_list,end_mark]
+
+#       
+# this function extracts the driver details from the dib
+# and returns them in a dictionary
+#
+def parseDIB(filedata,offset,dib):
+    driver_details={}
+    driver_details['dib_num'] = dib
+    driver_details['name_len'] = readByte(filedata,offset+6)
+    driver_details['name'] = filedata[offset+7:offset+7+driver_details['name_len']]
+    driver_details['status'] = readByte(filedata,offset+22)
+    driver_details['slot'] = readByte(filedata,offset+23)
+    driver_details['unit'] = readByte(filedata,offset+24)
+    driver_details['devtype'] = readByte(filedata,offset+25)
+    driver_details['subtype'] = readByte(filedata,offset+26)
+    driver_details['manid'] = readWord(filedata,offset+30)
+    driver_details['release'] = readWord(filedata,offset+32)
+    return driver_details      
+
+#
+# this function extracts the name from the driver
+# returns the name
+#
+def getDriverName(driver):
+    offset = readWord(driver, 0)          #comment length
+    name_length = readByte(driver,offset + 8)  #extract the name length from the driver code
+                                               #code starts after the comment
+    return driver[offset+9:offset+9+name_length]  #then grab the name
+
+
+#
+# this function finds the index in a list of the member that
+# contains a dictionary key/value pair
+#
+def find(lst, key, value):
+    for i, dic in enumerate(lst):
+        if dic[key] == value:
+            return i
+    return -1
+
+
+
+#   
+# Main program
+# lets select from the options
+#
+
+# raw driver format output as binary file
+if args.command == 'bin':
+    driver = convert_o65(args.o65file)
+    bin_file = args.binfile
+    outfile = open(bin_file,'wb')
+    outfile.write(driver)   
+    print 'File converted and written as raw binary file to:',bin_file
+    outfile.close()
+
+# Convert file and output as SOS.DRIVER format
+# adds a dummy charset and keyboard header to keep scp happy
+elif args.command == 'sos':  
+    driver = convert_o65(args.o65file)
+
+    #create SOS driver header
+    header = 'SOS DRVR'
+    header += pack('<H',0x0522)  #header length
+    header += pack('>H',0x0400)  #Number of Disk /// drives installed (4)
+    header += '??              ' #char set name, ?? indicates no char set included (16 chars long)
+    
+    for i in range(0,0x400):     #pad out the char set with spaces   
+        header += ' '
+    
+    header += '??              ' #keyboard layout name (16 chars long)
+    
+    for i in range(0,0x100):     #pad out with spaces   
+        header += ' '
+    
+    sos_file = args.sosfile
+    outfile = open(sos_file,'wb')
+    outfile.write(header + driver + pack('>H',0xFFFF))  #add the end marker   
+    
+    print 'File converted and written as SOS.DRIVER binary file to:',sos_file
+    outfile.close()
+   
+#Convert and add to an existing SOS.DRIVER file
+elif args.command == 'add':  
+    driver = convert_o65(args.o65file)   #convert the driver code
+
+    driver_name = getDriverName(driver)  #extract the driver name from the driver
+    
+    sos_file = args.sosfile              #read in the existing SOS.DRIVER file
+    sosdriver = open(sos_file,'rb')
+    sosdriverfile = sosdriver.read()     
+    sosdriver.close()
+    
+    drivers_list = parsedriverfile(sosdriverfile)[0] #we just want the first item in the returned list
+    driver_end = parsedriverfile(sosdriverfile)[1]   #this is the offset of the 0xFFFF end marker
+    
+    #lets check if it already exists in the SOS.DRIVER file
+    driver_details = []
+    
+    for i in range(0,len(drivers_list)):
+        offset = drivers_list[i]['code_start']
+        driver_details.append(parseDIB(sosdriverfile,offset,0))  #we always use dib0
+    
+    i = find(driver_details,'name',driver_name.upper()) #find index of the driver to add, convert name to uppercase
+    
+    if i == -1:
+        #not found, lets add
+        trimmed_sosdriver = sosdriverfile[0:driver_end]  #trim of the 0xFFFF end marker
+        newsosdriverfile = trimmed_sosdriver + driver + chr(0xFF) + chr(0xFF)
+        
+        sosdriver = open(sos_file,'wb')      #write it back out, overwriting the old one
+        sosdriver.write(newsosdriverfile)      
+        sosdriver.close()   
+        
+        print 'Driver: ' + driver_name + ' added to ' + sos_file
+    
+    else:
+        #found, report error
+        print 'Driver: ' + driver_name + ' elready exists in ' + sos_file + ', not added'
+
+
+#List drivers in a SOS.DRIVER file
+elif args.command == 'list':  
+    sos_file = args.sosfile
+    sosdriver = open(sos_file,'rb')
+    filedata = sosdriver.read()   
+    drivers_list = parsedriverfile(filedata)[0]  #we just want the first item in the returned list
+
+    driver_details = []
+    
+    for i in range(0,len(drivers_list)):
+        dib = 0
+        offset = drivers_list[i]['code_start']
+        driver_details.append(parseDIB(filedata,offset,dib))
+        nextdib = readWord(filedata,offset+2) #next dib of this driver
+        while nextdib != 0:
+            dib += 1
+            driver_details.append(parseDIB(filedata,offset+nextdib,dib))
+            nextdib = readWord(filedata,offset+nextdib+2) #next dib of this driver
+    
+    print    'DriverName        Status     Slot   Unit   Manid  Release'     
+    for i in range(0,len(driver_details)):
+        #decode status byte
+        if driver_details[i]['status'] & 0x80 == 0x80:
+            status = 'active'
+        else:
+            status = 'inactive'
+        #decode slot
+        if driver_details[i]['slot'] == 0:
+            slot = 'N/A'
+        else:
+            slot = driver_details[i]['slot']
+        
+        if driver_details[i]['dib_num'] == 0:  #don't indent the first DIB
+            print '{:16}  {:10} {:3}     {:02X}     {:04X}   {:04X}'.format(driver_details[i]['name'], status, slot, driver_details[i]['unit'],driver_details[i]['manid'],driver_details[i]['release'])
+        else:         #otherwise indent the rest, ie sub devices
+            print '  {:16}{:10} {:3}     {:02X}     {:04X}   {:04X}'.format(driver_details[i]['name'], status, slot, driver_details[i]['unit'],driver_details[i]['manid'],driver_details[i]['release'])
+
+    print '\n Total size: ',len(filedata)
+
+
+#Convert and update an existing driver in a SOS.DRIVER file
+elif args.command == 'update':  
+    driver = convert_o65(args.o65file)   #convert the driver code
+    
+    driver_name = getDriverName(driver)  #extract the driver name from the driver    
+    
+    print 'Driver in o65 file: ',driver_name
+    
+    sos_file = args.sosfile              #read in the existing SOS.DRIVER file
+    sosdriver = open(sos_file,'rb')
+    sosdriverfile = sosdriver.read()
+    sosdriver.close()
+    
+    drivers_list = parsedriverfile(sosdriverfile)[0]
+    drivers_end = parsedriverfile(sosdriverfile)[1]
+    
+    driver_details = []
+    
+    for i in range(0,len(drivers_list)):
+        offset = drivers_list[i]['code_start']
+        driver_details.append(parseDIB(sosdriverfile,offset,0))  #we always use dib0
+    
+    i = find(driver_details,'name',driver_name.upper()) #find index of the driver to update, convert name to uppercase
+    
+    if i != -1:
+        #found it
+        print 'Driver found in SOS.DRIVER, updating..'
+        #print drivers_list
+        
+        newsosdriverfile = sosdriverfile[0:drivers_list[i]['comment_start']]    #part up to target driver
+        newsosdriverfile += driver  #add the updated driver
+        
+        if i < len(drivers_list)-1:  #check if its not the last one
+           newsosdriverfile += sosdriverfile[drivers_list[i+1]['comment_start']:]  #add the rest after the target driver
+        else:                        #otherwise we use the end marker
+           newsosdriverfile += sosdriverfile[drivers_end:]  #add the rest after the target driver
+        
+        sosdriver = open(sos_file,'wb')        #write it back out
+        sosdriver.write(newsosdriverfile)
+        sosdriver.close()
+        
+        print 'Driver: ' + driver_name + ' updated!'
+    
+    else:
+        #not found
+        print 'Driver: ' + driver_name + ' not found in SOS.DRIVER file'
+
+
+#Delete an existing driver in a SOS.DRIVER file
+elif args.command == 'delete':  
+    driver_name = args.drivername
+    
+    sos_file = args.sosfile              #read in the SOS.DRIVER file
+    sosdriver = open(sos_file,'rb')
+    sosdriverfile = sosdriver.read()
+    sosdriver.close()
+    
+    drivers_list = parsedriverfile(sosdriverfile)[0]
+    drivers_end = parsedriverfile(sosdriverfile)[1]
+    
+    driver_details = []
+    
+    for i in range(0,len(drivers_list)):
+        offset = drivers_list[i]['code_start']
+        driver_details.append(parseDIB(sosdriverfile,offset,0))  #we always use dib0
+    
+    i = find(driver_details,'name',driver_name.upper()) #find index of the driver to delete, convert name to uppercase
+    
+    if i != -1:
+        #found it
+        print 'Driver found in SOS.DRIVER, deleting..'
+        
+        newsosdriverfile = sosdriverfile[0:drivers_list[i]['comment_start']]    #part up to target driver
+        
+        if i < len(drivers_list)-1:  #check if its not the last one
+           newsosdriverfile += sosdriverfile[drivers_list[i+1]['comment_start']:]  #add the rest after the target driver
+        else:                        #otherwise we use the end marker
+           newsosdriverfile += sosdriverfile[drivers_end:]  #add the rest after the target driver
+        
+        sosdriver = open(sos_file,'wb')        #write it back out
+        sosdriver.write(newsosdriverfile)
+        sosdriver.close()
+        
+        print 'Driver: ' + driver_name + ' deleted!'
+    
+    else:
+        #not found
+        print 'Driver: ' + driver_name + ' not found in SOS.DRIVER file'
+
+
+
+#Extract a driver from a SOS.DRIVER file
+elif args.command == 'extract':  
+   driver_name = args.drivername
+   
+   sos_file = args.sosfile              #read in the SOS.DRIVER file
+   sosdriver = open(sos_file,'rb')
+   sosdriverfile = sosdriver.read()
+   sosdriver.close()
+   
+   drivers_list = parsedriverfile(sosdriverfile)[0]  #parse the driver file to find the positions of the drivers
+   drivers_end = parsedriverfile(sosdriverfile)[1]  #parse the driver file to find the end of the drivers
+
+   driver_details = []                    #now grab the details from dib0 of each them ie to find the names
+   for i in range(0,len(drivers_list)):
+      offset = drivers_list[i]['code_start']
+      driver_details.append(parseDIB(sosdriverfile,offset,0))  #we always use dib0
+
+   i = find(driver_details,'name',driver_name.upper()) #find index of the driver to extract, convert name to uppercase
+   
+   if i != -1:
+      #found it
+      print 'Driver found in SOS.DRIVER, extracting..'
+      
+      if i < len(drivers_list)-1:   #check if its not the last one in sos.driver
+         extracted_driver = sosdriverfile[drivers_list[i]['comment_start']:drivers_list[i+1]['comment_start']]
+         
+      else:      #must be the last one, so we use the offset of the 0xFFFF marker
+         extracted_driver = sosdriverfile[drivers_list[i]['comment_start']:drivers_end]
+      
+      filename = driver_name[1:] + '.driver'  #chop off the ., and add .driver to the end
+      driverfile = open(filename,'wb')        #write the new driver out
+      driverfile.write(extracted_driver)
+      driverfile.close()
+
+      print 'Driver: ' + driver_name + ' extracted and written to file: ' + filename
+
+   else:
+      #not found
+      print 'Driver: ' + driver_name + ' not found in SOS.DRIVER file'
+
+#Extract a drivers code from a SOS.DRIVER file and relocate to 0x2000 to aid disassembly
+# relocating to something other than 0x0000 helps to remove zero page ambiguities when
+# disassembling the driver code
+elif args.command == 'extractcode':  
+   driver_name = args.drivername
+   
+   sos_file = args.sosfile              #read in the SOS.DRIVER file
+   sosdriver = open(sos_file,'rb')
+   sosdriverfile = sosdriver.read()
+   sosdriver.close()
+   
+   drivers_list = parsedriverfile(sosdriverfile)[0]  #parse the driver file to find the positions of the drivers
+   drivers_end = parsedriverfile(sosdriverfile)[1]  #parse the driver file to find the end of the drivers
+
+   driver_details = []                    #now grab the details from dib0 of each them ie to find the names
+   for i in range(0,len(drivers_list)):
+      offset = drivers_list[i]['code_start']
+      driver_details.append(parseDIB(sosdriverfile,offset,0))  #we always use dib0
+
+   i = find(driver_details,'name',driver_name.upper()) #find index of the driver to extract, convert name to uppercase
+   
+   if i != -1:
+      #found it
+      print 'Driver found in SOS.DRIVER, extracting code..'
+      
+      #grab the code
+      extracted_driver_code = sosdriverfile[drivers_list[i]['code_start']+2:drivers_list[i]['reloc_start']] #skip the code length(+2)
+
+      #grab the relocate table
+      if i < len(drivers_list)-1:   #check if its not the last one in sos.driver
+         extracted_driver_reloc = sosdriverfile[drivers_list[i]['reloc_start']+2:drivers_list[i+1]['comment_start']] #skip the reloc length(+2)
+      else:      #must be the last one, so we use the offset of the 0xFFFF marker
+         extracted_driver_reloc = sosdriverfile[drivers_list[i]['reloc_start']+2:drivers_end]  #skip the reloc length(+2)
+      #print  extracted_driver_reloc.encode('hex')
+      
+      #convert the reloc table from little endian addresses to list of integers 
+      offset_table = []
+      for i in range (0,len(extracted_driver_reloc),2):
+         offset_table.append(readWord(extracted_driver_reloc,i))
+            
+      #now lets relocate the code to 0x2000
+      #just updates the high byte of the addresses to 0x20
+      j = 0
+      for i in range(0,len(extracted_driver_code)):
+          byte = readByte(extracted_driver_code,i)
+          if i == offset_table[j]+1:   #looking at high byte
+              extracted_driver_code = extracted_driver_code[:i] + chr(byte + 0x20) + extracted_driver_code[i+1:]   #add to the existing address high byte
+              if j < (len(offset_table)-1):    
+                 j += 1        
+
+      filename = driver_name[1:] + '.driver_code_0x2000'  #chop off the ., and add .driver_code_0x2000 to the end
+      driverfile = open(filename,'wb')        #write the new driver out
+      driverfile.write(extracted_driver_code)
+      driverfile.close()
+
+      print 'Driver: ' + driver_name + ' extracted, relocated and written to file: ' + filename
+
+   else:
+      #not found
+      print 'Driver: ' + driver_name + ' not found in SOS.DRIVER file'

From 5f1915363c02c35202d9ff8092f175a53bb69c68 Mon Sep 17 00:00:00 2001
From: David Schmidt <1110325+david-schmidt@users.noreply.github.com>
Date: Tue, 15 Jun 2021 17:45:26 -0400
Subject: [PATCH 3/4] Properly assemble drivers

---
 build/ADTProBuild-default.properties        |  2 +-
 build/build.xml                             | 60 +++++++++++++--------
 src/client/sos/serial/drive/vsdrive.asm     |  7 ++-
 src/client/sos/serial/printer/vsprinter.asm |  4 +-
 4 files changed, 48 insertions(+), 25 deletions(-)

diff --git a/build/ADTProBuild-default.properties b/build/ADTProBuild-default.properties
index 61fdcb82..c54f84c2 100644
--- a/build/ADTProBuild-default.properties
+++ b/build/ADTProBuild-default.properties
@@ -8,4 +8,4 @@
 # assemblerPath defines the place where the ca65 executable lives.
 assemblerPath=c:/dev/cc65/cc65-master/bin
 # pythonPath defines the place where the python 2.7 interpreter executables live.
-python27Path=c:/Python27/
\ No newline at end of file
+python27Path=c:/Python27/
diff --git a/build/build.xml b/build/build.xml
index 3db9b3f7..77ce1a95 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -539,48 +539,66 @@ all
 		<exec dir="${projdir}/src/client/sos/serial/drive" executable="${assemblerPath}/ld65" failonerror="true">
 			<arg line="vsdrivesos.o -o vsdrivesos.o65 -C ${builddir}/Apple3_o65.cfg" />
 		</exec>
+		<exec executable="${python27Path}/python">
+			<arg value="${builddir}/lib/A3Driverutil/A3Driverutil.py"/>
+			<arg value="bin"/>
+			<arg value="${projdir}/src/client/sos/serial/drive/vsdrivesos.o65"/>
+			<arg value="${builddir}/VSDRIVE.A3DRVR"/>
+		</exec>
 		<echo message="Linking SOS Virtual Serial Printer driver..."/>
 		<exec dir="${projdir}/src/client/sos/serial/printer" executable="${assemblerPath}/ld65" failonerror="true">
 			<arg line="vsprintersos.o -o vsprintersos.o65 -C ${builddir}/Apple3_o65.cfg" />
 		</exec>
-<!--
+		<exec executable="${python27Path}/python">
+			<arg value="${builddir}/lib/A3Driverutil/A3Driverutil.py"/>
+			<arg value="bin"/>
+			<arg value="${projdir}/src/client/sos/serial/printer/vsprintersos.o65"/>
+			<arg value="${builddir}/VSPRINTER.A3DRVR"/>
+		</exec>
 		<echo message="Extracting SOS.DRIVER..."/>
-		<appleCommander command="g" imagename="${projdir}/out/${sysUtilDiskImage}" filename="SOS.DRIVER" output="${projdir}/out/SOS.DRIVER#0c0000" />
-		<echo message="Deleting CFFA driver from SOS.DRIVER..."/>		
-		<exec executable="${python27Path}python">
+		<appleCommander command="g" imagename="${builddir}/${distName}/disks/${vdriveDiskName}.DSK" filename="SOS.DRIVER" output="${builddir}/SOS.DRIVER#0c0000" />
+		<echo message="Deleting drivers from SOS.DRIVER..."/>		
+		<exec executable="${python27Path}/python">
+			<arg value="${builddir}/lib/A3Driverutil/A3Driverutil.py"/>
+			<arg value="delete"/>
+			<arg value=".VSDRIVE"/>
+			<arg value="${builddir}/SOS.DRIVER#0c0000" />
+		</exec>
+		<exec executable="${python27Path}/python">
 			<arg value="${builddir}/lib/A3Driverutil/A3Driverutil.py"/>
 			<arg value="delete"/>
-			<arg value=".CFFA3000D1"/>
-			<arg value="${projdir}/out/SOS.DRIVER#0c0000"/>
+			<arg value=".VSPRINTER"/>
+			<arg value="${builddir}/SOS.DRIVER#0c0000" />
 		</exec>
 		<echo message="Adding built driver to SOS.DRIVER..."/>		
-		<exec executable="${python27Path}python">
+		<exec executable="${python27Path}/python">
 			<arg value="${builddir}/lib/A3Driverutil/A3Driverutil.py"/>
 			<arg value="add"/>
-			<arg value="${projdir}/out/focus3.o65"/>
-			<arg value="${projdir}/out/SOS.DRIVER#0c0000"/>
-		</exec>
-		<echo message="Deleting SOS.DRIVER from disk images..."/>
-		<appleCommander command="d" imagename="${projdir}/out/${sysUtilDiskImage}" filename="SOS.DRIVER" failonerror="false"/>
-		<appleCommander command="d" imagename="${projdir}/out/${basicDiskImage}" filename="SOS.DRIVER" failonerror="false"/>
-		<echo message="Putting updated SOS.DRIVER back on disk images..."/>
-		<appleCommander command="p" input="${projdir}/out/SOS.DRIVER#0c0000" imagename="${projdir}/out/${sysUtilDiskImage}" filename="SOS.DRIVER" type="SOS" />
-		<appleCommander command="p" input="${projdir}/out/SOS.DRIVER#0c0000" imagename="${projdir}/out/${basicDiskImage}" filename="SOS.DRIVER" type="SOS" />
--->
-		
+			<arg value="${projdir}/src/client/sos/serial/drive/vsdrivesos.o65"/>
+			<arg value="${builddir}/SOS.DRIVER#0c0000" />
+		</exec>
+		<exec executable="${python27Path}/python">
+			<arg value="${builddir}/lib/A3Driverutil/A3Driverutil.py"/>
+			<arg value="add"/>
+			<arg value="${projdir}/src/client/sos/serial/printer/vsprintersos.o65"/>
+			<arg value="${builddir}/SOS.DRIVER#0c0000" />
+		</exec>
+		<echo message="Deleting SOS.DRIVER from driver disk image..."/>
+		<appleCommander command="d" imagename="${builddir}/${distName}/disks/${vdriveDiskName}.DSK" filename="SOS.DRIVER" failonerror="false"/>
+		<echo message="Putting updated SOS.DRIVER back on driver disk image..."/>
+		<appleCommander command="p" input="${builddir}/SOS.DRIVER#0c0000" imagename="${builddir}/${distName}/disks/${vdriveDiskName}.DSK" filename="SOS.DRIVER" type="SOS" />
+		<delete file="${builddir}/SOS.DRIVER#0c0000" />
 		<!--
 		Copy out the Apple /// Virtual Serial Drive river
 		-->
 		<echo message="Copying Virtual Serial Drive components..." />
-		<appleCommander command="g" imagename="${a3sysutils-vs}" filename="VSDRIVE.A3DRVR" output="${builddir}/VSDRIVE.A3DRVR" />
 		<appleCommander command="p" input="${builddir}/VSDRIVE.A3DRVR" imagename="${builddir}/${distName}/disks/${vdriveDiskName}.DSK" filename="VSDRIVE.A3DRVR" type="pcd" />
 		<delete file="${builddir}/VSDRIVE.A3DRVR" />
 		<!--
 		Copy out the Apple /// Virtual Serial Printer driver
 		-->
 		<echo message="Copying Virtual Serial Printer components..." />
-		<appleCommander command="g" imagename="${a3sysutils-vs}" filename="VSPRINTER.A3DRVR" output="${builddir}/VSPRINTER.A3DRVR" />
-		<appleCommander command="p" input="${builddir}/VSPRINTER.A3DRVR" imagename="${builddir}/${distName}/disks/${vdriveDiskName}.DSK" filename="VSPRINTER.A3DRVR" type="pcd" />
+		<appleCommander command="p" input="${builddir}/VSPRINTER.A3DRVR" imagename="${builddir}/${distName}/disks/${vdriveDiskName}.DSK" filename="VSPRINTER.A3DRV" type="pcd" />
 		<delete file="${builddir}/VSPRINTER.A3DRVR" />
 	</target>
 	<target name="sos-image-prep" description="Start Empty SOS Disk Image" >
diff --git a/src/client/sos/serial/drive/vsdrive.asm b/src/client/sos/serial/drive/vsdrive.asm
index 38db0997..56c47d54 100644
--- a/src/client/sos/serial/drive/vsdrive.asm
+++ b/src/client/sos/serial/drive/vsdrive.asm
@@ -6,7 +6,8 @@
 ;         names, clean up module name, synchronize version number with ADTPro release 
 ; 1.28  - Use newer time-transporting protocol, add second drive as .VSDRIVE2
 ; 1.31  - Add null interrupt handler for ACIA
-
+; 2.11  - Build with a3driverutil
+
 ;         .TITLE "Apple /// Virtual Serial Drive Driver"
           .PROC  VSDRIVE
 
@@ -14,7 +15,7 @@
                 .setcpu "6502"
                 .reloc
 
-DriverVersion   :=   $1310            ; Version number
+DriverVersion   :=   $2110            ; Version number
 DriverMfgr      :=   $4453            ; Driver Manufacturer - DS
 
 ;
@@ -123,6 +124,8 @@ XNORESET  :=   $33                   ; Device reset failed
 COMMENT:  .BYTE "Apple /// Virtual Serial Drive Driver by David Schmidt 2012 - 2014"
 COMMENT_END:
 
+          .SEGMENT "DATA"
+
 ;------------------------------------
 ;
 ; Device identification Block (DIB) - VSDRIVE
diff --git a/src/client/sos/serial/printer/vsprinter.asm b/src/client/sos/serial/printer/vsprinter.asm
index eaff6b99..f94652cc 100644
--- a/src/client/sos/serial/printer/vsprinter.asm
+++ b/src/client/sos/serial/printer/vsprinter.asm
@@ -118,6 +118,8 @@ XNORESET  :=   $33                   ; Device reset failed
 COMMENT:  .BYTE "Apple /// Virtual Serial Printer Driver by David Schmidt 2021"
 COMMENT_END:
 
+          .SEGMENT "DATA"
+
 ;------------------------------------
 ;
 ; Device identification Block (DIB) - VSPRINTER
@@ -127,7 +129,7 @@ COMMENT_END:
 DIB_0:
           .WORD     $0000            ; Link pointer
           .WORD     Entry            ; Entry pointer
-          .BYTE     $08              ; Name length byte
+          .BYTE     $0a              ; Name length byte
           .BYTE     ".VSPRINTER     "; Device name
           .BYTE     $80              ; Active, no page alignment
           .BYTE     $00              ; Slot number

From f42ac5bd6b7226f2d037ae177a14c8dbddd10518 Mon Sep 17 00:00:00 2001
From: David Schmidt <1110325+david-schmidt@users.noreply.github.com>
Date: Sat, 26 Jun 2021 19:58:29 -0400
Subject: [PATCH 4/4] Rebase driver on serial printer interrupt handler

---
 src/client/sos/serial/printer/vsprinter.asm | 900 ++++++++++++--------
 1 file changed, 560 insertions(+), 340 deletions(-)

diff --git a/src/client/sos/serial/printer/vsprinter.asm b/src/client/sos/serial/printer/vsprinter.asm
index f94652cc..41bf9c4f 100644
--- a/src/client/sos/serial/printer/vsprinter.asm
+++ b/src/client/sos/serial/printer/vsprinter.asm
@@ -1,371 +1,591 @@
-; VSPrinter
+;.TITLE "Apple /// Virtual Serial Printer Driver by David Schmidt 2021"
 
-; 0.01A - Initial release
+;-----------------------------------------------------------------------
+;
+; SOS Virtual Serial Printer Driver
+;
+; Copyright (C) 2021 by David Schmidt
+; Released to the public domain
+;
+;
+; Revisions:
+;
+; 0.01 - Initial release
+;
+;-----------------------------------------------------------------------
 
-;         .TITLE "Apple /// Virtual Serial Printer Driver"
-          .PROC  VSPRINTER
+DEVTYPE		= $41
+SUBTYPE		= $04
+DriverMfgr	= $4453	; Driver Manufacturer - David Schmidt (DS)
+RELEASE		= $0010	; Version number
 
-                .setcpu "6502"
-                .reloc
+;-----------------------------------------------------------------------
+;
+; The macro SWITCH performs an N way branch based on a switch index. The
+; maximum value of the switch index is 127 with bounds checking provided
+; as an option. The macro uses the A and Y registers and alters the C,
+; Z, and N flags of the status register, but the X register is unchanged.
+;
+; SWITCH [index], [bounds], adrs_table, [*]
+;
+; index This is the variable that is to be used as the switch index.
+; If omitted, the value in the accumulator is used.
+;
+; bounds This is the maximum allowable value for index. If index
+; exceeds this value, the carry bit will be set and execution
+; will continue following the macro. If bounds is omitted,
+; no bounds checking will be performed.
+;
+; adrs_table This is a table of addresses (low byte first) used by the
+; switch. The first entry corresponds to index zero.
+;
+; * If an asterisk is supplied as the fourth parameter, the
+; macro will push the switch address but will not exit to
+; it; execution will continue following the macro. The
+; program may then load registers or set the status before
+; exiting to the switch address.
+;
+;-----------------------------------------------------------------------
+;
+.MACRO		SWITCH	index,bounds,adrs_table,noexec      ;See SOS Reference
+.IFNBLANK	index										;If PARM1 is present,
+	LDA		index										; load A with switch index
+.ENDIF
+.IFNBLANK	bounds										;If PARM2 is present,
+	CMP		#bounds+1									; perform bounds checking
+	BCS		@110										; on switch index
+.ENDIF
+	ASL		A											;Multiply by 2 for table index
+	TAY
+	LDA		adrs_table+1,Y								;Get switch address from table
+	PHA													; and push onto Stack
+	LDA		adrs_table,Y
+	PHA
+.IFBLANK	noexec
+	RTS													; exit to code
+.ENDIF
+@110:
+.ENDMACRO
+
+.SEGMENT "TEXT"
+;.PROC SERPRNT
+.WORD $FFFF
+.WORD COMMENT_END - COMMENT ; Length of comment field
+COMMENT:
+.BYTE "Apple /// Virtual Serial Printer Driver by David Schmidt 2021"
+COMMENT_END:
 
-DriverVersion   :=   $0010           ; Version number
-DriverMfgr      :=   $4453           ; Driver Manufacturer - DS
+.SEGMENT "DATA"
 
+;----------------------------------------------------------------------
 ;
-; SOS Equates
+; Device Handler Identification Block
 ;
-ExtPG     :=   $1401                 ; Driver extended bank address offset
-AllocSIR  :=   $1913                 ; Allocate system internal resource
-SysErr    :=   $1928                 ; Report error to system
-EReg      :=   $FFDF                 ; Environment register
-ReqCode   :=   $C0                   ; Request code
-SOS_Unit  :=   $C1                   ; Unit number
-SosBuf    :=   $C2                   ; SOS buffer pointer (2 bytes)
-ReqCnt    :=   $C4                   ; Requested byte count
-CtlStat   :=   $C2                   ; Control/status code
-CSList    :=   $C3                   ; Control/status list pointer
-SosBlk    :=   $C6                   ; Starting block number
-QtyRead   :=   $C8                   ; Pointer to bytes read returned by D_READ
+;----------------------------------------------------------------------
 
+IDBLK:
+.WORD $0000 ;Link to next device handler
+.WORD SP_MAIN ;Entry point address
+.BYTE $0a ;Length of device name
+.BYTE ".VSPRINTER     "
+.BYTE $80,$00,$00 ;Device, Slot & Unit numbers
+.BYTE DEVTYPE
+.BYTE SUBTYPE
+.BYTE $00
+.WORD $0000
+.WORD DriverMfgr
+.WORD RELEASE
+
+;----------------------------------------------------------------------
 ;
-; Our temps in zero page
+; Device Handler Configuration Block
 ;
-Count     :=   $CE                   ; 2 bytes
-Timer     :=   $D0                   ; 2 bytes
-NumBlks   :=   $D2                   ; 2 bytes lb,hb
-DataBuf   :=   $D4                   ; 2 bytes
-EnvCmd    :=   $D6                   ; 1 byte envelope command
-Checksum  :=   $D7                   ; 1 byte checksum calc
+;----------------------------------------------------------------------
+
+.WORD $05				;Configuration block length
+DRATE:		.BYTE $0e	;Data Rate
+DFORMAT:	.BYTE $00	;Data Format
+CRDELAY:	.BYTE $00	;Carriage return delay
+LFDELAY:	.BYTE $00	;Line feed delay
+FFDELAY:	.BYTE $00	;Form feed delay
 
+;----------------------------------------------------------------------
 ;
-; Communications hardware constants
+; SOS Global Data & Subroutines
 ;
-ACIADR    :=   $c0f0                 ; ACIA Data register
-ACIASR    :=   $c0f1                 ; ACIA Status register
-ACIACMD   :=   $c0f2                 ; ACIA Command mode register
-ACIACTL   :=   $c0f3                 ; ACIA Control register
+;----------------------------------------------------------------------
 
+ALLOCSIR	= $1913
+DEALCSIR	= $1916
+SYSERR		= $1928
+
+;----------------------------------------------------------------------
 ;
 ; SOS Error Codes
 ;
-XDNFERR   :=   $10                   ; Device not found
-XBADDNUM  :=   $11                   ; Invalid device number
-XREQCODE  :=   $20                   ; Invalid request code
-XCTLCODE  :=   $21                   ; Invalid control/status code
-XCTLPARAM :=   $22                   ; Invalid control/status parameter
-XNOTOPEN  :=   $23                   ; Device not open
-XNORESRC  :=   $25                   ; Resources not available
-XBADOP    :=   $26                   ; Invalid operation
-XIOERROR  :=   $27                   ; I/O error
-XNODRIVE  :=   $28                   ; Drive not connected
-XBYTECNT  :=   $2C                   ; Byte count not a multiple of 512
-XBLKNUM   :=   $2D                   ; Block number to large
-XDISKSW   :=   $2E                   ; Disk switched
-XNORESET  :=   $33                   ; Device reset failed
-
-;
-; Switch Macro
-;
-                 .MACRO  SWITCH index,bounds,adrs_table,noexec      ;See SOS Reference
-                 .IFNBLANK index        ;If PARM1 is present,
-                 LDA     index          ; load A with switch index
-                 .ENDIF
-                 .IFNBLANK bounds       ;If PARM2 is present,
-                 CMP     #bounds+1      ; perform bounds checking
-                 BCS     @110           ; on switch index
-                 .ENDIF
-                 ASL     A              ;Multiply by 2 for table index
-                 TAY
-                 LDA     adrs_table+1,Y ;Get switch address from table
-                 PHA                    ; and push onto Stack
-                 LDA     adrs_table,Y
-                 PHA
-                 .IFBLANK noexec
-                 RTS                    ; exit to code
-                 .ENDIF
-@110:
-                 .ENDMACRO
+;----------------------------------------------------------------------
+
+XREQCODE	= $20 ;Invalid request code
+XCTLCODE	= $21 ;Invalid control/status code
+XNOTOPEN	= $23 ;Device not open
+XNOTAVIL	= $24 ;Device not available
+XNORESRC	= $25 ;Resource not available
+XBADOP		= $26 ;Invalid operation for device
+
+
+;----------------------------------------------------------------------
+;
+; Hardware I/O Addresses
+;
+;----------------------------------------------------------------------
+
+ACIADATA	= $C0F0 ;ACIA data register
+ACIASTAT	= $C0F1 ;ACIA status register
+ACIACMD		= $C0F2 ;ACIA command register
+ACIACTL		= $C0F3 ;ACIA control register
+E_REG		= $FFDF ;Environment register
+B_REG		= $FFEF ;Bank register
 
+
+;----------------------------------------------------------------------
 ;
-; GoSlow macro - slow down via E-Register
+; Miscellaneous Equates
 ;
-          .MACRO GoSlow
-          PHA
-          LDA EReg
-          ORA #$80                   ; Set 1MHz switch
-          STA EReg
-          PLA
-          .ENDMACRO
+;----------------------------------------------------------------------
+
+TRUE	= $80
+FALSE	= $00
+ASC_LF	= $0A
+ASC_FF	= $0C
+ASC_CR	= $0D
+BITON4	= $10
+BITON7	= $80
 
+;-----------------------------------------------------------------------
 ;
-; GoFast macro - speed up via E-Register
+; SOS Device Handler Interface
 ;
-          .MACRO GoFast
-          PHA
-          LDA EReg
-          AND #$7f
-          STA EReg                   ; Whatever it was - set it back
-          PLA
-          .ENDMACRO
+;-----------------------------------------------------------------------
 
-          .SEGMENT "TEXT"
+SOSINT	= $C0
+REQCODE	= SOSINT+0 ;SOS request code
+BUFFER	= SOSINT+2 ;Buffer pointer
+REQCNT	= SOSINT+4 ;Requested count
+CTLSTAT	= SOSINT+2 ;Control/status code
+CSLIST	= SOSINT+3 ;Control/status list pointer
 
+;-----------------------------------------------------------------------
 ;
-; Comment Field of driver
+; Zero Page Storage
 ;
-          .WORD  $FFFF ; Signal that we have a comment
-          .WORD  COMMENT_END - COMMENT ; Length of comment field
-COMMENT:  .BYTE "Apple /// Virtual Serial Printer Driver by David Schmidt 2021"
-COMMENT_END:
+;-----------------------------------------------------------------------
+
+ZPGSAVE	= SOSINT+$0A ;Saved zero page storage
+ZPGTEMP	= ZPGSAVE+$00 ;Temporary zero page storage
+MOVCNT	= ZPGTEMP+$00
 
-          .SEGMENT "DATA"
-
-;------------------------------------
+;-----------------------------------------------------------------------
 ;
-; Device identification Block (DIB) - VSPRINTER
+; Private Variable Storage
 ;
-;------------------------------------
+;-----------------------------------------------------------------------
 
-DIB_0:
-          .WORD     $0000            ; Link pointer
-          .WORD     Entry            ; Entry pointer
-          .BYTE     $0a              ; Name length byte
-          .BYTE     ".VSPRINTER     "; Device name
-          .BYTE     $80              ; Active, no page alignment
-          .BYTE     $00              ; Slot number
-          .BYTE     $00              ; Unit number
-          .BYTE     $41              ; Type
-          .BYTE     $04              ; Subtype
-          .BYTE     $00              ; Filler
-DIB0_Blks:
-          .WORD     $0000            ; # Blocks (none, character device)
-          .WORD     DriverMfgr       ; Manufacturer
-          .WORD     DriverVersion    ; Driver version
-          .WORD     $0000            ; DCB length followed by DCB
-
-;------------------------------------
-;
-; Local storage locations
-;
-;------------------------------------
-
-SIRAddr:  .WORD     SIRTbl
-SIRTbl:   .BYTE     $01              ; ACIA resource
-          .BYTE     $00
-          .WORD     $FEC4            ; Do-nothing interrupt vector
-          .BYTE     $00              ; Bank register
-SIRLen    :=        *-SIRTbl
-StackPtr: .BYTE     $00
-DCB_Idx:  .BYTE     $00                  ; DCB 0's blocks
-OPENFLG:  .BYTE     $00
-
-;------------------------------------
-;
-; Driver request handlers
-;
-;------------------------------------
-
-Entry:
-          JSR Dispatch               ; Call the dispatcher
-          LDX SOS_Unit               ; Get drive number for this unit
-          LDA ReqCode                ; Keep request around for D_REPEAT
-          LDA #$00
-          RTS
-;
-; The Dispatcher.  Note that if we came in on a D_INIT call,
-; we do a branch to Dispatch normally.  
-; Dispatch is called as a subroutine!
-;
-DoTable:
-          .WORD     DRead-1          ; 0 Read request
-          .WORD     DWrite-1         ; 1 Write request
-          .WORD     DStatus-1        ; 2 Status request
-          .WORD     DControl-1       ; 3 Control request
-          .WORD     BadReq-1         ; 4 Unused
-          .WORD     BadReq-1         ; 5 Unused
-          .WORD     DOpen-1          ; 6 Open
-          .WORD     DClose-1         ; 7 Close
-          .WORD     DInit-1          ; 8 Init request
-Dispatch: SWITCH    ReqCode,9,DoTable ; Serve the request
-
-;
-; Dispatch errors
-;
-BadReq:   LDA #XREQCODE              ; Bad request code!
-          JSR SysErr                 ; Return to SOS with error in A
-BadOp:    LDA #XBADOP                ; Invalid operation!
-          JSR SysErr                 ; Return to SOS with error in A
-NotOpen:  LDA #XNOTOPEN              ; Device not open
-          JSR SysErr                 ; Return to SOS with error in A
-NoDevice: LDA #XDNFERR               ; Device not found
-          JSR SysErr                 ; Return to SOS with error in A
-
-;
-; D_READ call processing
-;
-DRead:
-          BIT OPENFLG
-          BMI :+
-          JMP NotOpen
-:         LDA #XBADOP
-          JSR SysErr
-
-ReadExit: RTS                        ; Exit read routines
-
-;
-; D_WRITE call processing
-;
-DWrite:
-          RTS
-
-;
-; D_STATUS call processing
-;
-DStatus:
-          LDA CtlStat                ; Which status code to run?
-          BNE DSWhat
-          LDY #$00                   ; $00 - Driver status, return zero
-          STA (CSList),Y
-          CLC
-          RTS
-DSWhat:   LDA #XCTLCODE              ; Control/status code no good
-          JSR SysErr                 ; Return to SOS with error in A
-
-;
-; D_CONTROL call processing
-;  $00 = Reset device
-;  $FE = Perform media formatting
-;
-DControl:
-          LDA CtlStat                ; Control command
-          BEQ CReset
-          JMP DCWhat                 ; Control code no good!
-CReset:   GoSlow
-          BIT ACIADR                 ; Clear ACIA Data register
-          GoFast
-DCDone:   RTS          
-DCNoReset:
-          LDA #XNORESET              ; Things went bad after reset
-          JSR SysErr                 ; Return to SOS with error in A
-DCWhat:   LDA #XCTLCODE              ; Control/status code no good
-          JSR SysErr                 ; Return to SOS with error in A
-
-DClose:
-DOpen:
-          CLC
-          RTS
-;
-; D_INIT call processing - called at initialization
-;
-DInit:
-          LDA #SIRLen
-          LDX SIRAddr
-          LDY SIRAddr+1
-          JSR AllocSIR               ; Allocate the ACIA
-          BCS NoACIA
-
-          PHP
-          SEI                        ; Disable system interrupts
-          GoSlow                     ; Set up the communications environment
-          LDA #$0b                   ; No parity, no interrupts
-          STA ACIACMD                ; Store via ACIA command register
-          LDA #$10                   ; $16=300, $1e=9600, $1f=19200, $10=115k
-          STA ACIACTL                ; Store via ACIA control register
-          LDA ACIASR                 ; Clear any prior ACIA interrupts
-          GoFast
-          PLP                        ; Re-enable system interrupt state
-
-DInitDone:
-          CLC
-          RTS
-NoACIA:
-          LDA #XNORESRC
-          JSR SysErr                 ; Return to SOS with error in A
-
-;------------------------------------
-;
-; Utility routines
-;
-;------------------------------------
-
-
-;
-; SendEnvelope - send the command envelope
-;
-SendEnvelope:                        ; Send a command envelope
-          LDA #$00
-          STA Checksum 
-          LDA #$c5                   ; "E"
-          JSR PUTCC                  ; Envelope
-          LDA EnvCmd
-          JSR PUTCC                  ; Send command
-          LDA SosBlk
-          JSR PUTCC                  ; Send LSB of requested block
-          LDA SosBlk+1
-          JSR PUTCC                  ; Send MSB of requested block
-          LDA Checksum
-          JSR PUTC                   ; Send envelope Checksum
-          RTS                        ; Carry is clear, return
-
-
-;
-; PUTCC - Put a byte to the ACIA, adding to the checksum
-;
-PUTCC:    PHA
-          EOR Checksum
-          STA Checksum
-          JMP PUTC0
-;
-; PUTC - Put a byte to the ACIA
-;
-PUTC:
-          PHA                        ; Push 'character to send' onto the stack
-PUTC0:    LDA #$00
-          STA Timer
-          STA Timer+1
-          GoSlow
-PUTC1:
-          LDA ACIASR                 ; Check status bits
-          AND #$70
-          CMP #$10
-          BNE PUTC1                  ; Output register is full, no timeout; so loop
-          PLA                        ; Pull 'character to send' back off the stack
-          STA ACIADR                 ; Put character
-          GoFast
-          RTS
-
-; Fix up the buffer pointer to correct for addressing
-; anomalies.  We just need to do the initial checking
-; for two cases:
-; 00xx bank N -> 80xx bank N-1
-; 20xx bank 8F if N was 0
-; FDxx bank N -> 7Dxx bank N+1
-; If pointer is adjusted, return with carry set
-;
-FixUp:    LDA DataBuf+1              ; Look at msb
-          BEQ @1                     ; That's one!
-          CMP #$FD                   ; Is it the other one?
-          BCS @2                     ; Yep. fix it!
-          RTS                        ; Pointer unchanged, return carry clear.
-@1:       LDA #$80                   ; 00xx -> 80xx
-          STA DataBuf+1
-          DEC DataBuf+ExtPG          ; Bank N -> band N-1
-          LDA DataBuf+ExtPG          ; See if it was bank 0
-          CMP #$7F                   ; (80) before the DEC.
-          BNE @3                     ; Nope! all fixed.
-          LDA #$20                   ; If it was, change both
-          STA DataBuf+1              ; Msb of address and
-          LDA #$8F
-          STA DataBuf+ExtPG          ; Bank number for bank 8F
-          RTS                        ; Return carry set
-@2:       AND #$7F                   ; Strip off high bit
-          STA DataBuf+1              ; FDxx ->7Dxx
-          INC DataBuf+ExtPG          ; Bank N -> bank N+1
-@3:       RTS                        ; Return carry set
-
-CkUnit:
-          CLC
-          RTS
-
-         .ENDPROC
-         .END
+SIRADDR:
+.WORD SIRTABLE
+SIRTABLE:
+.BYTE $01,$00 ;ACIA resource
+.WORD ACIAMIH
+MIHBANK:
+.BYTE $00
+SIRCOUNT = *-SIRTABLE
+OPENFLG: .BYTE FALSE ;Device open flag
+XMIT: .BYTE FALSE ;XMIT in progress flag
+DLYCNT: .BYTE $00 ;Delay count for MIH
+BUFCNT: .BYTE $00 ;Local buffer byte count
+BUFHEAD: .BYTE $00 ;Local buffer head index
+BUFTAIL: .BYTE $00 ;Local buffer tail index
+BUFSIZE = $6e ;110. ;Local buffer size
+LOCBUF: ;Local buffer
+.BYTE "Copyright (C) 2021 by David Schmidt."
+CPYRGHTSIZ = *-LOCBUF
+.RES BUFSIZE-CPYRGHTSIZ,0
+
+;-----------------------------------------------------------------------
+;
+; Serial Printer Driver -- Main entry point
+;
+;-----------------------------------------------------------------------
+
+SP_MAIN:
+SWITCH REQCODE,8,SP_REQSW
+
+BADREQ: LDA #XREQCODE	;Invalid request code
+JSR SYSERR
+
+
+NOTOPEN: LDA #XNOTOPEN	;Device not open
+JSR SYSERR
+
+SP_REQSW:				;Serial Printer request switch
+.WORD SP_READ-1
+.WORD SP_WRITE-1
+.WORD SP_STAT-1
+.WORD SP_CNTL-1
+.WORD BADREQ-1
+.WORD BADREQ-1
+.WORD SP_OPEN-1
+.WORD SP_CLOSE-1
+.WORD SP_INIT-1
+
+;----------------------------------------------------------------------
+;
+; Serial Printer Driver -- Initialization Request
+;
+;----------------------------------------------------------------------
+
+SP_INIT:
+LDA #FALSE
+STA OPENFLG
+LDA DRATE	;Validate data rate
+AND #$0F
+STA DRATE
+TAX
+LDA DFORMAT	;Validate data format
+AND #$EE
+ORA #$10
+CPX #$03	;If data rate is 110 baud
+BNE @010
+ORA #$80	; force two stop bits
+@010: STA DFORMAT
+CLC
+RTS
+
+;----------------------------------------------------------------------
+;
+; Serial Printer Driver -- Open Request
+;
+;----------------------------------------------------------------------
+
+SP_OPEN:
+BIT OPENFLG		;Serial Printer open?
+BPL @010		; No
+LDA #XNOTAVIL
+JSR SYSERR
+
+@010:
+LDA B_REG
+AND #$0F
+STA MIHBANK		;Set interrupt handler bank
+LDA #SIRCOUNT
+LDX SIRADDR
+LDY SIRADDR+1
+JSR ALLOCSIR	;Allocate the ACIA
+BCS @020
+
+LDA #FALSE
+STA XMIT
+JSR CNTL00		;Set up ACIA
+LDA #TRUE
+STA OPENFLG		;Set serial printer open
+RTS
+
+@020:
+LDA #XNORESRC
+JSR SYSERR
+
+;----------------------------------------------------------------------
+;
+; Serial Printer Driver -- Close Request
+;
+;----------------------------------------------------------------------
+
+SP_CLOSE:
+ASL OPENFLG		;Serial Printer open?
+BCS @010		; Yes
+JMP NOTOPEN
+@010:
+BIT XMIT		;Wait for write completion
+BMI @010
+PHP
+SEI
+LDA E_REG
+TAX
+ORA #BITON7
+STA E_REG		;Switch to 1 MHz
+STA ACIASTAT	;Reset the ACIA
+STX E_REG
+PLP
+LDA #SIRCOUNT
+LDX SIRADDR
+LDY SIRADDR+1
+JSR DEALCSIR	;Deallocate the ACIA
+RTS
+
+;-----------------------------------------------------------------------
+;
+; Serial Printer Driver -- Read Request
+;
+;-----------------------------------------------------------------------
+
+SP_READ:
+BIT OPENFLG	;Serial Printer open?
+BMI @010
+JMP NOTOPEN
+@010:
+LDA #XBADOP
+JSR SYSERR
+
+;-----------------------------------------------------------------------
+;
+; Serial Printer Driver -- Write Request
+;
+;-----------------------------------------------------------------------
+
+SP_WRITE:
+BIT OPENFLG
+BMI @010
+JMP NOTOPEN
+@010:
+LDA #BUFSIZE/2		;Set MOVCNT to the lesser
+LDY REQCNT+1		; of BUFSIZE/2 and REQCNT.
+BNE @020
+CMP REQCNT
+BCC @020
+LDA REQCNT
+BNE @020
+RTS					;Count = zero -- all done!
+@020:
+STA MOVCNT
+
+LDA BUFFER+1		;Check for buffer
+CMP #$FF			; address overflow
+BCC @030
+SBC #$80
+STA BUFFER+1
+INC $1401+BUFFER
+
+@030: SEC
+LDA #BUFSIZE
+SBC MOVCNT
+@040: CMP BUFCNT	;Wait for room in buffer
+BCC @040
+
+LDY #$00
+LDX BUFTAIL
+@050:
+LDA (BUFFER),Y		;Move data to local buffer
+STA LOCBUF,X
+INX
+CPX #BUFSIZE
+BCC @060
+LDX #$00
+@060:
+INY
+CPY MOVCNT
+BCC @050
+STX BUFTAIL
+
+PHP
+SEI					;Shut down interrupts
+CLC
+LDA BUFCNT
+ADC MOVCNT			;Bump buffer count
+STA BUFCNT
+
+BIT XMIT			;Already transmitting?
+BVS @070			; Yes
+LDA #$C0
+STA XMIT			;Set transmitting flag
+LDA E_REG
+PHA
+ORA #BITON7			;Switch to 1 MHz
+STA E_REG
+LDY ACIASTAT		;Fake an interrupt to start
+JSR ACIAMIH			; the interrupt handler.
+PLA
+STA E_REG			;Switch back to 2 MHz
+@070: PLP
+
+CLC
+LDA BUFFER
+ADC MOVCNT			;Fix up buffer pointer
+STA BUFFER
+BCC @080
+INC BUFFER+1
+
+@080:
+SEC
+LDA REQCNT
+SBC MOVCNT			;Fix up requested count
+STA REQCNT
+BCS @010
+DEC REQCNT+1
+JMP @010			;Loop back for more
+
+;-----------------------------------------------------------------------
+;
+; ACIA Master Interrupt Handler
+;
+;-----------------------------------------------------------------------
+
+ACIAMIH:
+LDA E_REG
+ORA #BITON7		;Set 1 MHz mode
+STA E_REG
+
+TYA				;Check DSR and DCD status
+AND #$60		; bits for printer hand shake
+BNE @080
+
+TYA				;Check transmit register
+AND #BITON4		; empty status bit
+BEQ @060
+
+LDA DLYCNT		;Any transmit delay in progress?
+BEQ @010		; no
+DEC DLYCNT
+JMP @060
+
+@010:
+LDA BUFCNT		;Any data to transmit?
+BEQ @070		; no -- wait for completion
+LDX BUFHEAD
+LDA LOCBUF,X
+STA ACIADATA	;Transmit one character
+INX
+CPX #BUFSIZE
+BCC @020
+LDX #$00
+@020:
+STX BUFHEAD		;Update buffer index
+DEC BUFCNT		; and count
+
+CMP #ASC_CR		;Check for any delay
+BEQ @040
+BCS @060
+CMP #ASC_LF
+BNE @030
+LDA LFDELAY
+BCS @050
+@030:
+CMP #ASC_FF
+BNE @060
+LDA FFDELAY
+BCS @050
+@040:
+LDA CRDELAY
+@050:
+STA DLYCNT
+@060:
+LDA ACIACMD
+AND #$E0		;Enable transmit interrupt
+ORA #$07
+STA ACIACMD
+RTS
+
+@070:
+ASL XMIT
+BMI @060		;Still not done
+
+@080:
+LDA ACIACMD
+AND #$E0		;Disable transmit interrupt
+ORA #$0B
+STA ACIACMD
+RTS
+
+;----------------------------------------------------------------------
+;
+; Serial Printer Driver -- Status Request
+;
+;----------------------------------------------------------------------
+
+SP_STAT:
+BIT OPENFLG		;Serial Printer open?
+BMI @010
+JMP NOTOPEN
+@010:
+SWITCH CTLSTAT,2,STATSW
+
+
+BADCTL:
+LDA #XCTLCODE	;Invalid control code
+JSR SYSERR
+
+
+STATSW:
+.WORD STAT00-1
+.WORD STAT01-1
+.WORD STAT02-1
+
+
+STAT00:
+RTS				;0 -- NOP
+
+
+STAT01:
+LDY #0			;1 -- Status Table
+LDA #0
+STA (CSLIST),Y
+RTS
+
+
+STAT02:
+LDY #0			;2 -- New Line
+LDA #FALSE
+STA (CSLIST),Y
+RTS
+
+;----------------------------------------------------------------------
+;
+; Serial Printer Driver -- Control Request
+;
+;----------------------------------------------------------------------
+
+SP_CNTL:
+BIT OPENFLG		;Serial Printer open?
+BMI @010		; Ok
+JMP NOTOPEN
+@010:
+SWITCH CTLSTAT,2,CNTLSW
+JMP BADCTL
+
+CNTLSW:
+.WORD CNTL00-1
+.WORD CNTL01-1
+.WORD CNTL02-1
+
+CNTL00:			;0 -- Reset
+@010:
+BIT XMIT		;Wait for write completion
+BMI @010
+LDA #$00
+STA BUFHEAD
+STA BUFTAIL
+PHP
+SEI
+LDA E_REG
+TAX
+ORA #BITON7
+STA E_REG		;Switch to 1 MHz
+STA ACIASTAT	;Reset ACIA
+LDA DFORMAT
+AND #$F0
+ORA DRATE
+STA ACIACTL		;Set up ACIA control register
+LDA DFORMAT
+ASL A
+ASL A
+ASL A
+ASL A
+ORA #$0B
+STA ACIACMD		;Set up ACIA command register
+STX E_REG		;Switch back to 2 MHz
+PLP
+RTS
+
+CNTL01:			;1 -- Serial Printer Status Table
+RTS
+
+CNTL02:			;2 -- New Line
+RTS
\ No newline at end of file