Attachment #82993 for bug #127400

Lines 229-235 Link Here

(-)Emulator_Src_3.5/SrcShared/Hardware/EmRegsEZTRGpro.cpp (-1 / +1 lines)
229	void EmRegsEZTRGpro::SetSubBankHandlers(void)	229	void EmRegsEZTRGpro::SetSubBankHandlers(void)
230	{	230	{
231	EmRegsEZ::SetSubBankHandlers();	231	EmRegsEZ::SetSubBankHandlers();
232	this->SetHandler((ReadFunction)&EmRegs::StdRead,	232	this->SetHandler(static_cast<ReadFunction>(&EmRegsEZTRGpro::StdRead),
233	(WriteFunction)&EmRegsEZTRGpro::spiWrite,	233	(WriteFunction)&EmRegsEZTRGpro::spiWrite,
234	addressof(spiMasterData),	234	addressof(spiMasterData),
235	sizeof(f68EZ328Regs.spiMasterData));	235	sizeof(f68EZ328Regs.spiMasterData));

Lines 65-70 Link Here

(-)Emulator_Src_3.5/SrcShared/Hardware/EmRegsEZTRGpro.h (+4 lines)
65		65
66	protected:	66	protected:
67	virtual EmSPISlave* GetSPISlave (void);	67	virtual EmSPISlave* GetSPISlave (void);
		68	// hack to get around error on line 232 of EmRegsEZTRGPro.cpp
		69	// when trying to get address of protected superclass member
		70	uint32 StdRead(emuptr address, int size){return EmRegs::StdRead(address, size);};
		71
68		72
69	private:	73	private:
70	EmSPISlave* fSPISlaveADC;	74	EmSPISlave* fSPISlaveADC;





    // SD support
	this->SetHandler((ReadFunction)&EmRegsVZHandEra330::spiRxDRead,
                         static_cast<WriteFunction>(&EmRegsVZHandEra330::StdWrite),
	                 addressof(spiRxD),
	                 sizeof(UInt16));
	this->SetHandler(static_cast<ReadFunction>(&EmRegsVZHandEra330::StdRead),
                         (WriteFunction)&EmRegsVZHandEra330::spiTxDWrite,
	                 addressof(spiTxD),
	                 sizeof(UInt16));
	this->SetHandler(static_cast<ReadFunction>(&EmRegsVZHandEra330::StdRead),
                         (WriteFunction)&EmRegsVZHandEra330::spiCont1Write,
	                 addressof(spiCont1),
	                 sizeof(UInt16));

Lines 103-108 Link Here

(-)Emulator_Src_3.5/SrcShared/Hardware/EmRegsVZHandEra330.h (+4 lines)
103	protected:	103	protected:
104	virtual EmSPISlave* GetSPISlave (void);	104	virtual EmSPISlave* GetSPISlave (void);
105	virtual uint16 ButtonToBits (SkinElementType button);	105	virtual uint16 ButtonToBits (SkinElementType button);
		106	// hack to get around errors in EmRegsVZHandEra330.cpp
		107	// when trying to get address of protected superclass member
		108	uint32 StdRead(emuptr address, int size){return EmRegs::StdRead(address, size);};
		109	void StdWrite(emuptr address, int size, uint32 value){EmRegs::StdWrite(address, size, value);};
106		110
107	private:	111	private:
108	uint8 GetPortD(uint8 result);	112	uint8 GetPortD(uint8 result);

Lines 50-56 Link Here

(-)Emulator_Src_3.5/SrcShared/Hardware/EmRegsVZPalmM505.cpp (-1 / +1 lines)
50		50
51	// Now add standard/specialized handers for the defined registers.	51	// Now add standard/specialized handers for the defined registers.
52		52
53	this->SetHandler ((ReadFunction) &EmRegsVZ::StdRead,	53	this->SetHandler (static_cast<ReadFunction>(&EmRegsVZPalmM505::StdRead),
54	(WriteFunction) &EmRegsVZPalmM505::portFSelectWrite,	54	(WriteFunction) &EmRegsVZPalmM505::portFSelectWrite,
55	addressof (portFSelect), sizeof (f68VZ328Regs.portFSelect));	55	addressof (portFSelect), sizeof (f68VZ328Regs.portFSelect));
56	}	56	}

Lines 31-36 Link Here

(-)Emulator_Src_3.5/SrcShared/Hardware/EmRegsVZPalmM505.h (+4 lines)
31	virtual void GetLCDScanlines (EmScreenUpdateInfo& info);	31	virtual void GetLCDScanlines (EmScreenUpdateInfo& info);
32		32
33	void portFSelectWrite (emuptr address, int size, uint32 value);	33	void portFSelectWrite (emuptr address, int size, uint32 value);
		34	protected:
		35	// hack to get around error on line 53 of EmRegsVZPalmM505.cpp
		36	// when trying to get address of protected superclass member
		37	uint32 StdRead(emuptr address, int size){return EmRegs::StdRead(address, size);};
34	};	38	};
35		39
36	#endif /* EmRegsVZPalmM505_h */	40	#endif /* EmRegsVZPalmM505_h */

Return to bug 127400

Lines 588-601 Link Here

(-)Emulator_Src_3.5/SrcShared/Hardware/EmRegsVZHandEra330.cpp (-3 / +3 lines)
588		588
589	// SD support	589	// SD support
590	this->SetHandler((ReadFunction)&EmRegsVZHandEra330::spiRxDRead,	590	this->SetHandler((ReadFunction)&EmRegsVZHandEra330::spiRxDRead,
591	(WriteFunction)&EmRegsVZ::StdWrite,	591	static_cast<WriteFunction>(&EmRegsVZHandEra330::StdWrite),
592	addressof(spiRxD),	592	addressof(spiRxD),
593	sizeof(UInt16));	593	sizeof(UInt16));
594	this->SetHandler((ReadFunction)&EmRegsVZ::StdRead,	594	this->SetHandler(static_cast<ReadFunction>(&EmRegsVZHandEra330::StdRead),
595	(WriteFunction)&EmRegsVZHandEra330::spiTxDWrite,	595	(WriteFunction)&EmRegsVZHandEra330::spiTxDWrite,
596	addressof(spiTxD),	596	addressof(spiTxD),
597	sizeof(UInt16));	597	sizeof(UInt16));
598	this->SetHandler((ReadFunction)&EmRegsVZ::StdRead,	598	this->SetHandler(static_cast<ReadFunction>(&EmRegsVZHandEra330::StdRead),
599	(WriteFunction)&EmRegsVZHandEra330::spiCont1Write,	599	(WriteFunction)&EmRegsVZHandEra330::spiCont1Write,
600	addressof(spiCont1),	600	addressof(spiCont1),
601	sizeof(UInt16));	601	sizeof(UInt16));