Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 91501 | Differences between
and this patch

Collapse All | Expand All

(-)Emulator_Src_3.5.orig/SrcShared/EmStream.h (-6 / +6 lines)
Lines 90-96 Link Here
90
90
91
									container.resize (numElements);
91
									container.resize (numElements);
92
92
93
									deque<T>::iterator	iter = container.begin ();
93
									typename deque<T>::iterator	iter = container.begin ();
94
									while (iter != container.end ())
94
									while (iter != container.end ())
95
									{
95
									{
96
										*this >> *iter;
96
										*this >> *iter;
Lines 108-114 Link Here
108
108
109
									container.resize (numElements);
109
									container.resize (numElements);
110
110
111
									list<T>::iterator	iter = container.begin ();
111
									typename list<T>::iterator	iter = container.begin ();
112
									while (iter != container.end ())
112
									while (iter != container.end ())
113
									{
113
									{
114
										*this >> *iter;
114
										*this >> *iter;
Lines 126-132 Link Here
126
126
127
									container.resize (numElements);
127
									container.resize (numElements);
128
128
129
									vector<T>::iterator	iter = container.begin ();
129
									typename vector<T>::iterator	iter = container.begin ();
130
									while (iter != container.end ())
130
									while (iter != container.end ())
131
									{
131
									{
132
										*this >> *iter;
132
										*this >> *iter;
Lines 143-149 Link Here
143
143
144
									*this << numElements;
144
									*this << numElements;
145
145
146
									deque<T>::const_iterator	iter = container.begin ();
146
									typename deque<T>::const_iterator	iter = container.begin ();
147
									while (iter != container.end ())
147
									while (iter != container.end ())
148
									{
148
									{
149
										*this << *iter;
149
										*this << *iter;
Lines 160-166 Link Here
160
160
161
									*this << numElements;
161
									*this << numElements;
162
162
163
									list<T>::const_iterator	iter = container.begin ();
163
									typename list<T>::const_iterator	iter = container.begin ();
164
									while (iter != container.end ())
164
									while (iter != container.end ())
165
									{
165
									{
166
										*this << *iter;
166
										*this << *iter;
Lines 177-183 Link Here
177
177
178
									*this << numElements;
178
									*this << numElements;
179
179
180
									vector<T>::const_iterator	iter = container.begin ();
180
									typename vector<T>::const_iterator	iter = container.begin ();
181
									while (iter != container.end ())
181
									while (iter != container.end ())
182
									{
182
									{
183
										*this << *iter;
183
										*this << *iter;
(-)Emulator_Src_3.5.orig/SrcShared/Hardware/EmRegsEZTRGpro.cpp (-1 / +1 lines)
Lines 229-235 Link Here
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((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));
(-)Emulator_Src_3.5.orig/SrcShared/Hardware/EmRegsVZHandEra330.cpp (-3 / +3 lines)
Lines 588-601 Link Here
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
                         (WriteFunction)&EmRegsVZHandEra330::StdWrite,
592
	                 addressof(spiRxD),
592
	                 addressof(spiRxD),
593
	                 sizeof(UInt16));
593
	                 sizeof(UInt16));
594
	this->SetHandler((ReadFunction)&EmRegsVZ::StdRead,
594
	this->SetHandler((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((ReadFunction)&EmRegsVZHandEra330::StdRead,
599
                         (WriteFunction)&EmRegsVZHandEra330::spiCont1Write,
599
                         (WriteFunction)&EmRegsVZHandEra330::spiCont1Write,
600
	                 addressof(spiCont1),
600
	                 addressof(spiCont1),
601
	                 sizeof(UInt16));
601
	                 sizeof(UInt16));
(-)Emulator_Src_3.5.orig/SrcShared/Hardware/EmRegsVZPalmM505.cpp (-1 / +1 lines)
Lines 50-56 Link Here
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 ((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
}

Return to bug 91501