Win32 Parallel port code upgraded to work better on machines without …

…built-in parallel ports. (thanks Brad Oldham) git-svn-id: https://www.daphne-emu.com:9443/daphnesvn/branches/v_1_0@3012 c98d566b-fa28-4d4c-8a7b-932307ef5c1a
DavidGriffith · Feb 20, 2009 · 777120a · 777120a
1 parent 935b66f
commit 777120a
Show file tree

Hide file tree

Showing 17 changed files with 112 additions and 264 deletions.
diff --git a/daphne-changelog.txt b/daphne-changelog.txt
@@ -1,6 +1,9 @@
 Daphne Changelog
 -------------------------
 
+v1.0.4
+- Changed parallel port code so that any address can be used for the parallel port (Brad Oldham).
+
 v1.0.3
 - Fixed linux hardware queries (especially video card query).
 - Changed linux .so loader so that libvldp2.so can be in /usr/lib or some other place (Arnaud Gibert)

diff --git a/inpout32.dll b/inpout32.dll
diff --git a/par-io.dll b/par-io.dll
diff --git a/src/DaphneManifest.xml b/src/DaphneManifest.xml
@@ -2,6 +2,6 @@
 	<version>
 		<major>1</major>
 		<minor>0</minor>
-		<build>3</build>
+		<build>4</build>
 	</version>
 </manifest>
diff --git a/src/clear_hw_scoreboard/clear_hw_scoreboard.vcproj b/src/clear_hw_scoreboard/clear_hw_scoreboard.vcproj
@@ -124,9 +124,6 @@
 			<File
 				RelativePath="..\io\logger.cpp">
 			</File>
-			<File
-				RelativePath="..\io\par-io.cpp">
-			</File>
 			<File
 				RelativePath="..\io\parallel.cpp">
 			</File>
@@ -144,6 +141,13 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
 		</Filter>
+		<Filter
+			Name="lib"
+			Filter="">
+			<File
+				RelativePath="..\lib\inpout32.lib">
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>

diff --git a/src/daphne.cpp b/src/daphne.cpp
@@ -89,7 +89,7 @@ using namespace std;
 
 const char *get_daphne_version()
 {
-	return "1.0.3";
+	return "1.0.4";
 }
 
 unsigned char get_filename(char *s, unsigned char n)
@@ -351,12 +351,12 @@ unsigned char get_scoreboard()
 	return (realscoreboard);
 }
 
-void set_scoreboard_port(unsigned char value)
+void set_scoreboard_port(unsigned int value)
 {
 	rsb_port = value;
 }
 
-unsigned char get_scoreboard_port()
+unsigned int get_scoreboard_port()
 {
 	return(rsb_port);
 }

diff --git a/src/daphne.h b/src/daphne.h
@@ -54,8 +54,8 @@ unsigned char get_frame_modifier();
 void set_frame_modifier(unsigned char value);
 void set_scoreboard(unsigned char value);
 unsigned char get_scoreboard();
-void set_scoreboard_port(unsigned char value);
-unsigned char get_scoreboard_port();
+void set_scoreboard_port(unsigned int value);
+unsigned int get_scoreboard_port();
 void reset_logfile(int argc, char **argv);
 void set_scoreboard_text(char sb_text[]);
 

diff --git a/src/daphne_vs2003.vcproj b/src/daphne_vs2003.vcproj
@@ -536,12 +536,6 @@
 				<File
 					RelativePath="io\numstr.h">
 				</File>
-				<File
-					RelativePath="io\par-io.cpp">
-				</File>
-				<File
-					RelativePath="io\par-io.h">
-				</File>
 				<File
 					RelativePath=".\io\parallel.cpp">
 				</File>
@@ -941,6 +935,13 @@
 			Name="Resource Files"
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
 		</Filter>
+		<Filter
+			Name="lib"
+			Filter="">
+			<File
+				RelativePath=".\lib\inpout32.lib">
+			</File>
+		</Filter>
 		<File
 			RelativePath="..\daphne-changelog.txt">
 		</File>

diff --git a/src/globals.h b/src/globals.h
@@ -44,7 +44,7 @@ Uint8 frame_modifier = 0;	// what type of frame modifications to be used
 Uint8 joystick_detected = 0;	// 0 = no joystick, 1 = joystick present
 
 Uint8 realscoreboard = 0;	// 1 = external scoreboard is attached
-Uint8 rsb_port = 0;		// 0 = LPT1, 1 = LPT2 for real scoreboard
+unsigned int rsb_port = 0;		// 0 = LPT1, 1 = LPT2 or address of real scoreboard 
 
 unsigned int idleexit; // added by JFA for -idleexit
 unsigned char startsilent = 0;

diff --git a/src/io/cmdline.cpp b/src/io/cmdline.cpp
@@ -32,6 +32,7 @@
 #include "numstr.h"
 #include "homedir.h"
 #include "input.h"	// to disable joystick use
+#include "../io/numstr.h"
 #include "../video/video.h"
 #include "../video/led.h"
 #include "../daphne.h"
@@ -75,7 +76,7 @@
 #include "../ldp-out/ldp-combo.h"
 #include "../ldp-out/ldp-vldp.h"
 #include "../ldp-out/framemod.h"
- 
+
 #ifdef UNIX
 #include <unistd.h>     // for unlink
 #endif
@@ -810,8 +811,7 @@ bool parse_cmd_line(int argc, char **argv)
 		else if (strcasecmp(s, "-scoreport")==0)
 		{
 			get_next_word(s, sizeof(s));
-			i = atoi(s);
-			set_scoreboard_port((unsigned char) i);
+			set_scoreboard_port((unsigned int)numstr::ToUint32(s, 16));
 			sprintf(s, "Setting scoreboard port to %d", i);
 			printline(s);
 		}

diff --git a/src/io/par-io.cpp b/src/io/par-io.cpp
diff --git a/src/io/par-io.h b/src/io/par-io.h