[patch] pose-3.5-protected-fix.patch

pose-3.5-protected-fix.patch (text/plain), 4.78 KB, created by Simon Ruggier on 2006-03-24 02:36:25 UTC

diff -ur Emulator_Src_3.5/SrcShared/Hardware/EmRegsEZTRGpro.cpp Emulator_Src_3.5-r1/SrcShared/Hardware/EmRegsEZTRGpro.cpp
--- Emulator_Src_3.5/SrcShared/Hardware/EmRegsEZTRGpro.cpp	2002-03-29 08:11:18.000000000 -0500
+++ Emulator_Src_3.5-r1/SrcShared/Hardware/EmRegsEZTRGpro.cpp	2006-03-24 02:24:19.000000000 -0500
@@ -229,7 +229,7 @@
 void EmRegsEZTRGpro::SetSubBankHandlers(void)
 {
 	EmRegsEZ::SetSubBankHandlers();
-	this->SetHandler((ReadFunction)&EmRegs::StdRead,
+	this->SetHandler(static_cast<ReadFunction>(&EmRegsEZTRGpro::StdRead),
                          (WriteFunction)&EmRegsEZTRGpro::spiWrite,
 	                 addressof(spiMasterData),
 	                 sizeof(f68EZ328Regs.spiMasterData));
diff -ur Emulator_Src_3.5/SrcShared/Hardware/EmRegsEZTRGpro.h Emulator_Src_3.5-r1/SrcShared/Hardware/EmRegsEZTRGpro.h
--- Emulator_Src_3.5/SrcShared/Hardware/EmRegsEZTRGpro.h	2002-03-29 08:11:18.000000000 -0500
+++ Emulator_Src_3.5-r1/SrcShared/Hardware/EmRegsEZTRGpro.h	2006-03-24 02:23:31.000000000 -0500
@@ -65,6 +65,10 @@
 
 	protected:
 		virtual EmSPISlave*		GetSPISlave				(void);
+        // hack to get around error on line 232 of EmRegsEZTRGPro.cpp
+        // when trying to get address of protected superclass member
+		uint32 StdRead(emuptr address, int size){return EmRegs::StdRead(address, size);};
+
 
 	private:
 		EmSPISlave*				fSPISlaveADC;
diff -ur Emulator_Src_3.5/SrcShared/Hardware/EmRegsVZHandEra330.cpp Emulator_Src_3.5-r1/SrcShared/Hardware/EmRegsVZHandEra330.cpp
--- Emulator_Src_3.5/SrcShared/Hardware/EmRegsVZHandEra330.cpp	2002-03-29 08:11:19.000000000 -0500
+++ Emulator_Src_3.5-r1/SrcShared/Hardware/EmRegsVZHandEra330.cpp	2006-03-24 03:18:39.000000000 -0500
@@ -588,14 +588,14 @@
 
     // SD support
 	this->SetHandler((ReadFunction)&EmRegsVZHandEra330::spiRxDRead,
-                         (WriteFunction)&EmRegsVZ::StdWrite,
+                         static_cast<WriteFunction>(&EmRegsVZHandEra330::StdWrite),
 	                 addressof(spiRxD),
 	                 sizeof(UInt16));
-	this->SetHandler((ReadFunction)&EmRegsVZ::StdRead,
+	this->SetHandler(static_cast<ReadFunction>(&EmRegsVZHandEra330::StdRead),
                          (WriteFunction)&EmRegsVZHandEra330::spiTxDWrite,
 	                 addressof(spiTxD),
 	                 sizeof(UInt16));
-	this->SetHandler((ReadFunction)&EmRegsVZ::StdRead,
+	this->SetHandler(static_cast<ReadFunction>(&EmRegsVZHandEra330::StdRead),
                          (WriteFunction)&EmRegsVZHandEra330::spiCont1Write,
 	                 addressof(spiCont1),
 	                 sizeof(UInt16));
diff -ur Emulator_Src_3.5/SrcShared/Hardware/EmRegsVZHandEra330.h Emulator_Src_3.5-r1/SrcShared/Hardware/EmRegsVZHandEra330.h
--- Emulator_Src_3.5/SrcShared/Hardware/EmRegsVZHandEra330.h	2002-03-29 08:11:19.000000000 -0500
+++ Emulator_Src_3.5-r1/SrcShared/Hardware/EmRegsVZHandEra330.h	2006-03-24 03:16:10.000000000 -0500
@@ -103,6 +103,10 @@
 	protected:
 		virtual EmSPISlave*		GetSPISlave				(void);
         virtual uint16          ButtonToBits            (SkinElementType button);
+        // hack to get around errors in EmRegsVZHandEra330.cpp
+        // when trying to get address of protected superclass member
+		uint32 StdRead(emuptr address, int size){return EmRegs::StdRead(address, size);};
+		void  StdWrite(emuptr address, int size, uint32 value){EmRegs::StdWrite(address, size, value);};
 
 	private:
         uint8                   GetPortD(uint8 result);
diff -ur Emulator_Src_3.5/SrcShared/Hardware/EmRegsVZPalmM505.cpp Emulator_Src_3.5-r1/SrcShared/Hardware/EmRegsVZPalmM505.cpp
--- Emulator_Src_3.5/SrcShared/Hardware/EmRegsVZPalmM505.cpp	2002-03-29 08:11:19.000000000 -0500
+++ Emulator_Src_3.5-r1/SrcShared/Hardware/EmRegsVZPalmM505.cpp	2006-03-24 03:27:34.000000000 -0500
@@ -50,7 +50,7 @@
 
 	// Now add standard/specialized handers for the defined registers.
 
-	this->SetHandler ((ReadFunction) &EmRegsVZ::StdRead,
+	this->SetHandler (static_cast<ReadFunction>(&EmRegsVZPalmM505::StdRead),
 		(WriteFunction) &EmRegsVZPalmM505::portFSelectWrite,
 		addressof (portFSelect), sizeof (f68VZ328Regs.portFSelect));
 }
diff -ur Emulator_Src_3.5/SrcShared/Hardware/EmRegsVZPalmM505.h Emulator_Src_3.5-r1/SrcShared/Hardware/EmRegsVZPalmM505.h
--- Emulator_Src_3.5/SrcShared/Hardware/EmRegsVZPalmM505.h	2002-03-29 08:11:19.000000000 -0500
+++ Emulator_Src_3.5-r1/SrcShared/Hardware/EmRegsVZPalmM505.h	2006-03-24 03:30:42.000000000 -0500
@@ -31,6 +31,10 @@
 		virtual void			GetLCDScanlines			(EmScreenUpdateInfo& info);
 
 		void					portFSelectWrite		(emuptr address, int size, uint32 value);
+    protected:
+        // hack to get around error on line 53 of EmRegsVZPalmM505.cpp
+        // when trying to get address of protected superclass member
+		uint32 StdRead(emuptr address, int size){return EmRegs::StdRead(address, size);};
 };
 
 #endif	/* EmRegsVZPalmM505_h */