Merge branch 'master' into driverupdate2

# Conflicts: (taken: newer version)
#	Driver/baxnet/README.enc
#	Driver/baxnet/bin/enc624j6net.device
#	Driver/baxnet/bin/enc624j6net.device_68000
#	Driver/baxnet/source/Makefile.enc
#	Driver/baxnet/source/device.c
#	Driver/baxnet/source/enc624j6net/enc624j6l.asm
#	Driver/baxnet/source/server.c
#	Driver/baxnet/source/version.h

Driver/baxnet/source/debug.i

@@ -18,10 +18,9 @@ _LVORawMayGetChar		equ 	-$1fe
 ;
 ;
 ;
-	ifne	DEBUG
+	ifd DEBUG
 
-;	XREF	_KPrintFa0a1
-;	XREF	_KPrintF
+	XREF	_KPrintF
 
 WRITEDEBUG	macro
 		movem.l			d0/d1/a0/a1,-(sp)	
@@ -51,7 +50,7 @@ WRITEDEBUG	macro
 		endif
 		lea.l		(\1),a0
 		move.l		sp,a1
-		jsr			_KPrintFa0a1
+		jsr			_KPrintF
 		ifnb \2
 			add.l		#4,sp
 		endif
@@ -80,7 +79,7 @@ WRITEDEBUG	macro
 	endm
 	else
 WRITEDEBUG macro
-	;
+	nop
 	endm
 	endc
 
@@ -117,7 +116,7 @@ WRITEOUT macro
 	ifd DEBUG
 		move.l		\1,a0
 		move.l		sp,a1
-		jsr			_KPrintFa0a1
+		jsr			_KPrintF
 	endif
 	move.l		\1,d1
 	move.l		sp,d2