pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/emulators/palmosemulator addressof is part of STL, so ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/7d449a4e59bb
branches: trunk
changeset: 650343:7d449a4e59bb
user: joerg <joerg%pkgsrc.org@localhost>
date: Tue Apr 21 17:15:20 2015 +0000
description:
addressof is part of STL, so rename the macro.
diffstat:
emulators/palmosemulator/distinfo | 24 +-
emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegs328Prv.h | 22 ++
emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegsASICSymbol1700.cpp | 41 +++
emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegsEZPrv.h | 22 ++
emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegsEZTRGpro.cpp | 13 +
emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegsMediaQ11xx.cpp | 36 +++
emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegsPLDPalmVIIEZ.cpp | 22 ++
emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegsSED1375.cpp | 40 +++
emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegsSED1376.cpp | 31 ++
emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegsUSBPhilipsPDIUSBD12.cpp | 24 ++
emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegsUSBVisor.cpp | 22 ++
emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegsVZHandEra330.cpp | 29 ++
emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegsVZPalmM505.cpp | 13 +
emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegsVZPrv.h | 22 ++
emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegsVZTemp.cpp | 24 ++
emulators/palmosemulator/patches/patch-SrcShared_PreferenceMgr.cpp | 63 ++++++
emulators/palmosemulator/patches/patch-SrcShared_PreferenceMgr.h | 32 +++
emulators/palmosemulator/patches/patch-ak | 92 +++++++-
emulators/palmosemulator/patches/patch-al | 89 +++++++-
emulators/palmosemulator/patches/patch-am | 105 +++++++++-
20 files changed, 741 insertions(+), 25 deletions(-)
diffs (truncated from 950 to 300 lines):
diff -r 3a967cf0b3a6 -r 7d449a4e59bb emulators/palmosemulator/distinfo
--- a/emulators/palmosemulator/distinfo Tue Apr 21 17:07:29 2015 +0000
+++ b/emulators/palmosemulator/distinfo Tue Apr 21 17:15:20 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2012/06/19 20:29:34 asau Exp $
+$NetBSD: distinfo,v 1.12 2015/04/21 17:15:20 joerg Exp $
SHA1 (palmosemulator/emulator_src_3.5.tar.gz) = 2debd7690736397d0af41f7b2d482df65391fc65
RMD160 (palmosemulator/emulator_src_3.5.tar.gz) = fbb6761e4c43ecc9fb20d90d2ae0ec6ccf1c3f27
@@ -6,6 +6,22 @@
SHA1 (palmosemulator/emulator-skins-19.tar.gz) = 70b0497061d6877a4e3c6a378fa647c64fe3e019
RMD160 (palmosemulator/emulator-skins-19.tar.gz) = 9b4e16f50b1d2b9ad9b17e3a104c34a983d0a4ba
Size (palmosemulator/emulator-skins-19.tar.gz) = 2443913 bytes
+SHA1 (patch-SrcShared_Hardware_EmRegs328Prv.h) = 6f60a4ef6056eee5909407f8369b3e1a21327bc6
+SHA1 (patch-SrcShared_Hardware_EmRegsASICSymbol1700.cpp) = a2154e85ad61cdaa9cc09829c6107842a0e9044b
+SHA1 (patch-SrcShared_Hardware_EmRegsEZPrv.h) = c4ecc99e5fd3a77891975c7d25af1e6a3ddbda96
+SHA1 (patch-SrcShared_Hardware_EmRegsEZTRGpro.cpp) = 319cc4f187eebdac7a46cbea5a432d4de8928f16
+SHA1 (patch-SrcShared_Hardware_EmRegsMediaQ11xx.cpp) = 66000dcb239dabaae8b6357f5b11ae9c67c21df6
+SHA1 (patch-SrcShared_Hardware_EmRegsPLDPalmVIIEZ.cpp) = c73d094601a4a4eccf4717b725469a59dd0e5add
+SHA1 (patch-SrcShared_Hardware_EmRegsSED1375.cpp) = 29fad68dcea246ec3ea75fac9eb86a95cf6f6a54
+SHA1 (patch-SrcShared_Hardware_EmRegsSED1376.cpp) = 4fe29a5caeac779843da1865898583aa49d1b534
+SHA1 (patch-SrcShared_Hardware_EmRegsUSBPhilipsPDIUSBD12.cpp) = 7d7ef982ab35214b1e27e882b9466a989ffe8418
+SHA1 (patch-SrcShared_Hardware_EmRegsUSBVisor.cpp) = dd22c6b01631ad4ecdd65b59cd7cfcaef9448334
+SHA1 (patch-SrcShared_Hardware_EmRegsVZHandEra330.cpp) = aa77709d63a9aff4faa143e8b7e38ea5b8f9aadf
+SHA1 (patch-SrcShared_Hardware_EmRegsVZPalmM505.cpp) = f242fab2da6db5273c304ad1c04d7dc28f0dddce
+SHA1 (patch-SrcShared_Hardware_EmRegsVZPrv.h) = 44c6460fd81dc3f59f1107f6584c68e8d8ed59b5
+SHA1 (patch-SrcShared_Hardware_EmRegsVZTemp.cpp) = c25b0c9ca60d16fcc04d192e13c9966e24651ea2
+SHA1 (patch-SrcShared_PreferenceMgr.cpp) = 49bf7e195c2f71cc8035b1e3faa13ca9fdeb9f8b
+SHA1 (patch-SrcShared_PreferenceMgr.h) = bcefbff3f92489a4b3699d1273d8679820e94cbc
SHA1 (patch-SrcUnix_EmDlgFltk.cpp) = 2b8582982dc02dfaa298f20ba342eebd58098207
SHA1 (patch-aa) = eef35ce5c3d91bf56903bb48c0c78bd333591fcc
SHA1 (patch-ab) = 061379a827d338e411e8ea53dc071cb668a6c524
@@ -17,9 +33,9 @@
SHA1 (patch-ah) = e3a79fa2c376711ea6479907cca923d1e872683e
SHA1 (patch-ai) = 0cbff6b3080ee9aa7e366ba4ba368d93f0560e04
SHA1 (patch-aj) = 958f070f7bc19f6a4c2f12a9d0ba280ed64136cb
-SHA1 (patch-ak) = d693bd15c982c95663f9f595fdcad6f80d5c2477
-SHA1 (patch-al) = 50342df4bb9d020f0b72be608d0656351dae4463
-SHA1 (patch-am) = 2790c8b567a94d86bced52d59cf62b4448b62731
+SHA1 (patch-ak) = 67fb02a1bdf657ef2d526accd6e368b38104803a
+SHA1 (patch-al) = 3603f0f1c124788910d1b3b8dcc7f9bcfd8f32d9
+SHA1 (patch-am) = 06e295c0c76e9d5691b3c6b88f4c281f22b673f5
SHA1 (patch-an) = 93e326e3ab9f532d5bab1cc987c179e8337a823d
SHA1 (patch-ao) = 9ace708f71d33802059db53c9242f0d89a77e4da
SHA1 (patch-ap) = 1fe9bf4a1d70230f2abb9375b9e439a3a163b4d7
diff -r 3a967cf0b3a6 -r 7d449a4e59bb emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegs328Prv.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegs328Prv.h Tue Apr 21 17:15:20 2015 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-SrcShared_Hardware_EmRegs328Prv.h,v 1.1 2015/04/21 17:15:20 joerg Exp $
+
+--- SrcShared/Hardware/EmRegs328Prv.h.orig 2015-04-17 19:10:12.000000000 +0000
++++ SrcShared/Hardware/EmRegs328Prv.h
+@@ -24,7 +24,7 @@ const uint32 kMemorySize = sizeof (HwrM
+
+ // Macro to return the Dragonball address of the specified register
+
+-#define addressof(x) (kMemoryStart + offsetof(HwrM68328Type, x))
++#define my_addressof(x) (kMemoryStart + offsetof(HwrM68328Type, x))
+
+
+ // Macros for reading/writing Dragonball registers.
+@@ -39,7 +39,7 @@ const uint32 kMemorySize = sizeof (HwrM
+ // Macro for installing Dragonball register handlers
+
+ #define INSTALL_HANDLER(read, write, reg) \
+- this->SetHandler ((ReadFunction) &EmRegs328::read, (WriteFunction) &EmRegs328::write, addressof (reg), sizeof (f68328Regs.reg))
++ this->SetHandler ((ReadFunction) &EmRegs328::read, (WriteFunction) &EmRegs328::write, my_addressof (reg), sizeof (f68328Regs.reg))
+
+
+ #endif /* EmRegs328Prv_h */
diff -r 3a967cf0b3a6 -r 7d449a4e59bb emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegsASICSymbol1700.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegsASICSymbol1700.cpp Tue Apr 21 17:15:20 2015 +0000
@@ -0,0 +1,41 @@
+$NetBSD: patch-SrcShared_Hardware_EmRegsASICSymbol1700.cpp,v 1.1 2015/04/21 17:15:20 joerg Exp $
+
+--- SrcShared/Hardware/EmRegsASICSymbol1700.cpp.orig 2015-04-17 19:10:12.000000000 +0000
++++ SrcShared/Hardware/EmRegsASICSymbol1700.cpp
+@@ -17,7 +17,7 @@
+ // Given a register (specified by its field name), return its address
+ // in emulated space.
+
+-#define addressof(reg) \
++#define my_addressof(reg) \
+ (this->GetAddressStart () + fRegs.offsetof_##reg ())
+
+
+@@ -26,7 +26,7 @@
+ #define INSTALL_HANDLER(read, write, reg) \
+ this->SetHandler ( (ReadFunction) &EmRegsASICSymbol1700::read, \
+ (WriteFunction) &EmRegsASICSymbol1700::write, \
+- addressof (reg), \
++ my_addressof (reg), \
+ fRegs.reg.GetSize ())
+
+
+@@ -117,15 +117,15 @@ void EmRegsASICSymbol1700::SetSubBankHan
+ // installation of a field that's an array.
+ this->SetHandler ( (ReadFunction) &EmRegsASICSymbol1700::StdReadBE, \
+ (WriteFunction) &EmRegsASICSymbol1700::StdWriteBE, \
+- addressof (S24IO), \
++ my_addressof (S24IO), \
+ 64);
+ this->SetHandler ( (ReadFunction) &EmRegsASICSymbol1700::StdReadBE, \
+ (WriteFunction) &EmRegsASICSymbol1700::StdWriteBE, \
+- addressof (S24Attribute), \
++ my_addressof (S24Attribute), \
+ 32);
+ this->SetHandler ( (ReadFunction) &EmRegsASICSymbol1700::StdReadBE, \
+ (WriteFunction) &EmRegsASICSymbol1700::StdWriteBE, \
+- addressof (UART8251MacroSelect),\
++ my_addressof (UART8251MacroSelect),\
+ 4);
+
+ // INSTALL_HANDLER (StdReadBE, StdWriteBE, S24IO);
diff -r 3a967cf0b3a6 -r 7d449a4e59bb emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegsEZPrv.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegsEZPrv.h Tue Apr 21 17:15:20 2015 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-SrcShared_Hardware_EmRegsEZPrv.h,v 1.1 2015/04/21 17:15:20 joerg Exp $
+
+--- SrcShared/Hardware/EmRegsEZPrv.h.orig 2015-04-17 19:10:13.000000000 +0000
++++ SrcShared/Hardware/EmRegsEZPrv.h
+@@ -24,7 +24,7 @@ const uint32 kMemorySize = sizeof (HwrM
+
+ // Macro to return the DragonballEZ address of the specified register
+
+-#define addressof(x) (kMemoryStart + offsetof(HwrM68EZ328Type, x))
++#define my_addressof(x) (kMemoryStart + offsetof(HwrM68EZ328Type, x))
+
+
+ // Macros for reading/writing DragonballEZ registers.
+@@ -39,7 +39,7 @@ const uint32 kMemorySize = sizeof (HwrM
+ // Macro for installing DragonballEZ register handlers
+
+ #define INSTALL_HANDLER(read, write, reg) \
+- this->SetHandler ((ReadFunction) &EmRegsEZ::read, (WriteFunction) &EmRegsEZ::write, addressof (reg), sizeof (f68EZ328Regs.reg))
++ this->SetHandler ((ReadFunction) &EmRegsEZ::read, (WriteFunction) &EmRegsEZ::write, my_addressof (reg), sizeof (f68EZ328Regs.reg))
+
+
+ #endif /* EmRegsEZPrv_h */
diff -r 3a967cf0b3a6 -r 7d449a4e59bb emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegsEZTRGpro.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegsEZTRGpro.cpp Tue Apr 21 17:15:20 2015 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-SrcShared_Hardware_EmRegsEZTRGpro.cpp,v 1.1 2015/04/21 17:15:20 joerg Exp $
+
+--- SrcShared/Hardware/EmRegsEZTRGpro.cpp.orig 2015-04-17 19:10:12.000000000 +0000
++++ SrcShared/Hardware/EmRegsEZTRGpro.cpp
+@@ -231,7 +231,7 @@ void EmRegsEZTRGpro::SetSubBankHandlers(
+ EmRegsEZ::SetSubBankHandlers();
+ this->SetHandler((ReadFunction)&EmRegs::StdRead,
+ (WriteFunction)&EmRegsEZTRGpro::spiWrite,
+- addressof(spiMasterData),
++ my_addressof(spiMasterData),
+ sizeof(f68EZ328Regs.spiMasterData));
+ }
+
diff -r 3a967cf0b3a6 -r 7d449a4e59bb emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegsMediaQ11xx.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegsMediaQ11xx.cpp Tue Apr 21 17:15:20 2015 +0000
@@ -0,0 +1,36 @@
+$NetBSD: patch-SrcShared_Hardware_EmRegsMediaQ11xx.cpp,v 1.1 2015/04/21 17:15:20 joerg Exp $
+
+--- SrcShared/Hardware/EmRegsMediaQ11xx.cpp.orig 2015-04-17 19:10:12.000000000 +0000
++++ SrcShared/Hardware/EmRegsMediaQ11xx.cpp
+@@ -659,7 +659,7 @@
+ // Given a register (specified by its field name), return its address
+ // in emulated space.
+
+-#define addressof(x) ( \
++#define my_addressof(x) ( \
+ ((emuptr) fRegs.x.GetPtr ()) - \
+ ((emuptr) fRegs.GetPtr ()) + \
+ ((emuptr) this->GetAddressStart ()) \
+@@ -671,7 +671,7 @@
+ #define INSTALL_HANDLER(read, write, reg) \
+ this->SetHandler ( (ReadFunction) &EmRegsMediaQ11xx::read, \
+ (WriteFunction) &EmRegsMediaQ11xx::write, \
+- addressof (reg), 4)
++ my_addressof (reg), 4)
+
+ // Private inline function for reading a LE register.
+
+@@ -1456,11 +1456,11 @@ void EmRegsMediaQ11xx::SetSubBankHandler
+
+ this->SetHandler ( (ReadFunction) &EmRegsMediaQ11xx::MQRead,
+ (WriteFunction) &EmRegsMediaQ11xx::invalidateWrite,
+- addressof (cpREG), 0x0400);
++ my_addressof (cpREG), 0x0400);
+
+ this->SetHandler ( (ReadFunction) &EmRegsMediaQ11xx::MQRead,
+ (WriteFunction) &EmRegsMediaQ11xx::SourceFifoWrite,
+- addressof (sfREG), 0x0400);
++ my_addressof (sfREG), 0x0400);
+
+ INSTALL_HANDLER (MQRead, MQWrite, udREG[0x00]);
+ INSTALL_HANDLER (MQRead, MQWrite, udREG[0x01]);
diff -r 3a967cf0b3a6 -r 7d449a4e59bb emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegsPLDPalmVIIEZ.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegsPLDPalmVIIEZ.cpp Tue Apr 21 17:15:20 2015 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-SrcShared_Hardware_EmRegsPLDPalmVIIEZ.cpp,v 1.1 2015/04/21 17:15:20 joerg Exp $
+
+--- SrcShared/Hardware/EmRegsPLDPalmVIIEZ.cpp.orig 2015-04-17 19:10:12.000000000 +0000
++++ SrcShared/Hardware/EmRegsPLDPalmVIIEZ.cpp
+@@ -23,7 +23,7 @@
+ // Given a register (specified by its field name), return its address
+ // in emulated space.
+
+-#define addressof(reg) \
++#define my_addressof(reg) \
+ (this->GetAddressStart () + fRegs.offsetof_##reg ())
+
+
+@@ -32,7 +32,7 @@
+ #define INSTALL_HANDLER(read, write, reg) \
+ this->SetHandler ( (ReadFunction) &EmRegsPLDPalmVIIEZ::read, \
+ (WriteFunction) &EmRegsPLDPalmVIIEZ::write, \
+- addressof (reg), \
++ my_addressof (reg), \
+ fRegs.reg.GetSize ())
+
+
diff -r 3a967cf0b3a6 -r 7d449a4e59bb emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegsSED1375.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegsSED1375.cpp Tue Apr 21 17:15:20 2015 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-SrcShared_Hardware_EmRegsSED1375.cpp,v 1.1 2015/04/21 17:15:20 joerg Exp $
+
+--- SrcShared/Hardware/EmRegsSED1375.cpp.orig 2015-04-17 19:10:12.000000000 +0000
++++ SrcShared/Hardware/EmRegsSED1375.cpp
+@@ -25,7 +25,7 @@
+ // Given a register (specified by its field name), return its address
+ // in emulated space.
+
+-#define addressof(reg) \
++#define my_addressof(reg) \
+ (this->GetAddressStart () + fRegs.offsetof_##reg ())
+
+
+@@ -34,7 +34,7 @@
+ #define INSTALL_HANDLER(read, write, reg) \
+ this->SetHandler ( (ReadFunction) &EmRegsSED1375::read, \
+ (WriteFunction) &EmRegsSED1375::write, \
+- addressof (reg), \
++ my_addressof (reg), \
+ fRegs.reg.GetSize ())
+
+
+@@ -425,7 +425,7 @@ uint32 EmRegsSED1375::lookUpTableDataRea
+ {
+ colorData = (uint8) ((clutEntry & kCLUTBlueMask) << 4); // Get the 4 bits of blue.
+
+- address = (emuptr) (addressof (lookUpTableAddress));
++ address = (emuptr) (my_addressof (lookUpTableAddress));
+ EmRegsSED1375::lookUpTableAddressWrite (address, 1, (clutIndex + 1) & 0xFF);
+ }
+
+@@ -470,7 +470,7 @@ void EmRegsSED1375::lookUpTableDataWrite
+ fClutData[clutIndex] &= ~kCLUTBlueMask; // Clear out old red bits.
+ fClutData[clutIndex] |= newColor >> 4; // Save in new blue bits.
+
+- address = (emuptr) (addressof (lookUpTableAddress));
++ address = (emuptr) (my_addressof (lookUpTableAddress));
+ EmRegsSED1375::lookUpTableAddressWrite (address, 1, (clutIndex + 1) & 0xFF);
+ }
+
diff -r 3a967cf0b3a6 -r 7d449a4e59bb emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegsSED1376.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/palmosemulator/patches/patch-SrcShared_Hardware_EmRegsSED1376.cpp Tue Apr 21 17:15:20 2015 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-SrcShared_Hardware_EmRegsSED1376.cpp,v 1.1 2015/04/21 17:15:20 joerg Exp $
+
+--- SrcShared/Hardware/EmRegsSED1376.cpp.orig 2015-04-17 19:10:12.000000000 +0000
++++ SrcShared/Hardware/EmRegsSED1376.cpp
+@@ -23,7 +23,7 @@
+ // Given a register (specified by its field name), return its address
+ // in emulated space.
+
+-#define addressof(reg) \
++#define my_addressof(reg) \
+ (this->GetAddressStart () + fRegs.offsetof_##reg ())
+
+
+@@ -32,7 +32,7 @@
+ #define INSTALL_HANDLER(read, write, reg) \
+ this->SetHandler ( (ReadFunction) &EmRegsSED1376::read, \
+ (WriteFunction) &EmRegsSED1376::write, \
+- addressof (reg), \
++ my_addressof (reg), \
+ fRegs.reg.GetSize ())
+
+ // Panel type register [10h]
+@@ -457,7 +457,7 @@ void EmRegsSED1376VisorPrism::SetSubBank
+ #define INSTALL_HANDLER(read, write, reg) \
+ this->SetHandler ( (ReadFunction) &EmRegsSED1376VisorPrism::read, \
+ (WriteFunction) &EmRegsSED1376VisorPrism::write, \
+- addressof (reg), \
Home |
Main Index |
Thread Index |
Old Index