head 1.3; access; symbols pkgsrc-2024Q4:1.2.0.78 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.76 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.74 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.72 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.70 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.68 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.66 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.64 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.62 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.60 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.58 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.56 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.54 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.52 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.50 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.48 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.46 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.44 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.40 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.20 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.42 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.38 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.36 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.34 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.32 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.30 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.28 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.26 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.24 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.22 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.18 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.16 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.14 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.12 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.10 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.8 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.6 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.4 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.2 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.1.0.94 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.92 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.90 pkgsrc-2014Q3-base:1.1 pkgsrc-2014Q2:1.1.0.88 pkgsrc-2014Q2-base:1.1 pkgsrc-2014Q1:1.1.0.86 pkgsrc-2014Q1-base:1.1 pkgsrc-2013Q4:1.1.0.84 pkgsrc-2013Q4-base:1.1 pkgsrc-2013Q3:1.1.0.82 pkgsrc-2013Q3-base:1.1 pkgsrc-2013Q2:1.1.0.80 pkgsrc-2013Q2-base:1.1 pkgsrc-2013Q1:1.1.0.78 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.76 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.74 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.72 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.70 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.68 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.66 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.64 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.62 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.60 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.58 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.56 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.54 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.52 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.50 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.48 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.46 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.44 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.42 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.40 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.38 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.36 pkgsrc-2008Q1:1.1.0.34 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.32 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.30 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.28 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.26 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.24 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.22 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.20 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.18 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.16 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.14 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.12 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.10 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.8 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.6 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.4 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.2 pkgsrc-2004Q1-base:1.1; locks; strict; comment @# @; 1.3 date 2025.01.31.10.48.27; author micha; state dead; branches; next 1.2; commitid eZz11DvctyWySCHF; 1.2 date 2015.04.21.17.15.20; author joerg; state Exp; branches; next 1.1; commitid GACaLCIvDCjtStiy; 1.1 date 2004.03.20.20.21.22; author kristerw; state Exp; branches; next ; desc @@ 1.3 log @emulators/palmosemulator: Remove for FLTK 1.4 transition Part of Step 1. @ text @$NetBSD: patch-ak,v 1.2 2015/04/21 17:15:20 joerg Exp $ --- SrcShared/Hardware/EmRegs328.cpp.orig 2002-03-29 13:11:18.000000000 +0000 +++ SrcShared/Hardware/EmRegs328.cpp @@@@ -141,13 +141,13 @@@@ const HwrM68328Type kInitial68328Registe 0x2400, // Word pllControl; // $200: PLL Control Register 0x0123, // Word pllFreqSel; // $202: PLL Frequency Select Register 0x0000, // Word pllTest; // $204: PLL Test Register - { 0 }, // Byte __filler44; + 0, // Byte __filler44; 0x1F, // Byte pwrControl; // $207: Power Control Register { 0 }, // Byte ___filler3[0x300-0x208]; 0x00, // Byte intVector; // $300: Interrupt Vector Register - { 0 }, // Byte ___filler4; + 0, // Byte ___filler4; 0x0000, // Word intControl; // $302: Interrupt Control Register 0x00FF, // Word intMaskHi; // $304: Interrupt Mask Register/HIGH word 0xFFFF, // Word intMaskLo; // $306: Interrupt Mask Register/LOW word @@@@ -162,21 +162,21 @@@@ const HwrM68328Type kInitial68328Registe 0x00, // Byte portADir; // $400: Port A Direction Register 0x00, // Byte portAData; // $401: Port A Data Register - { 0 }, // Byte ___filler5; + 0, // Byte ___filler5; 0x00, // Byte portASelect; // $403: Port A Select Register { 0 }, // Byte ___filler6[4]; 0x00, // Byte portBDir; // $408: Port B Direction Register 0x00, // Byte portBData; // $409: Port B Data Register - { 0 }, // Byte ___filler7; + 0, // Byte ___filler7; 0x00, // Byte portBSelect; // $40B: Port B Select Register { 0 }, // Byte ___filler8[4]; 0x00, // Byte portCDir; // $410: Port C Direction Register 0x00, // Byte portCData; // $411: Port C Data Register - { 0 }, // Byte ___filler9; + 0, // Byte ___filler9; 0x00, // Byte portCSelect; // $413: Port C Select Register { 0 }, // Byte ___filler10[4]; @@@@ -184,10 +184,10 @@@@ const HwrM68328Type kInitial68328Registe 0x00, // Byte portDDir; // $418: Port D Direction Register 0x00, // Byte portDData; // $419: Port D Data Register 0xFF, // Byte portDPullupEn; // $41A: Port D Pull-up Enable - { 0 }, // Byte ___filler11; + 0, // Byte ___filler11; 0x00, // Byte portDPolarity; // $41C: Port D Polarity Register 0x00, // Byte portDIntReqEn; // $41D: Port D Interrupt Request Enable - { 0 }, // Byte ___filler12; + 0, // Byte ___filler12; 0x00, // Byte portDIntEdge; // $41F: Port D IRQ Edge Register 0x00, // Byte portEDir; // $420: Port E Direction Register @@@@ -213,7 +213,7 @@@@ const HwrM68328Type kInitial68328Registe 0x00, // Byte portJDir; // $438: Port J Direction Register 0x00, // Byte portJData; // $439: Port J Data Register - { 0 }, // Byte ___filler19; + 0, // Byte ___filler19; 0x00, // Byte portJSelect; // $43B: Port J Select Register { 0 }, // Byte ___filler19a[4]; @@@@ -279,7 +279,7 @@@@ const HwrM68328Type kInitial68328Registe { 0 }, // Byte ___filler28[0xA00-0x90A]; 0x00000000, // DWord lcdStartAddr; // $A00: Screen Starting Address Register - { 0 }, // Byte ___filler29; + 0, // Byte ___filler29; 0xFF, // Byte lcdPageWidth; // $A05: Virtual Page Width Register { 0 }, // Byte ___filler30[2]; 0x03FF, // Word lcdScreenWidth; // $A08: Screen Width Register @@@@ -288,7 +288,7 @@@@ const HwrM68328Type kInitial68328Registe 0x0000, // Word lcdCursorXPos; // $A18: Cursor X Position 0x0000, // Word lcdCursorYPos; // $A1A: Cursor Y Position 0x0101, // Word lcdCursorWidthHeight; // $A1C: Cursor Width and Height - { 0 }, // Byte ___filler32; + 0, // Byte ___filler32; 0x7F, // Byte lcdBlinkControl; // $A1F: Blink Control Register 0x00, // Byte lcdPanelControl; // $A20: Panel Interface Control Register 0x00, // Byte lcdPolarity; // $A21: Polarity Config Register @@@@ -1592,7 +1592,7 @@@@ uint32 EmRegs328::uartRead (emuptr addre { // If this is a full read, get the next byte from the FIFO. - Bool refreshRxData = (address == addressof (uReceive)) && (size == 2); + Bool refreshRxData = (address == my_addressof (uReceive)) && (size == 2); // See if there's anything new ("Put the data on the bus") @@@@ -1753,7 +1753,7 @@@@ void EmRegs328::intStatusHiWrite (emuptr // accessing the upper byte, just return. If we're accessing the lower // byte, we can treat it as a 2-byte access. - else if (size == 1 && address == addressof (intStatusHi)) + else if (size == 1 && address == my_addressof (intStatusHi)) return; // Now we can treat the rest of this function as a word-write to intStatusHi. @@@@ -2000,8 +2000,8 @@@@ void EmRegs328::uartWrite(emuptr address // be transmitted. Bool sendTxData = - ((address == addressof (uTransmit)) && (size == 2)) || - ((address == addressof (uTransmit) + 1) && (size == 1)); + ((address == my_addressof (uTransmit)) && (size == 2)) || + ((address == my_addressof (uTransmit) + 1) && (size == 1)); // React to any changes. @@@@ -2025,22 +2025,22 @@@@ void EmRegs328::lcdRegisterWrite(emuptr // Note what changed. - if (address == addressof (lcdScreenWidth)) + if (address == my_addressof (lcdScreenWidth)) { EmScreen::InvalidateAll (); } - else if (address == addressof (lcdScreenHeight)) + else if (address == my_addressof (lcdScreenHeight)) { EmScreen::InvalidateAll (); } - else if (address == addressof (lcdPanelControl)) + else if (address == my_addressof (lcdPanelControl)) { if (((value ^ oldValue) & hwr328LcdPanelControlGrayScale) != 0) { EmScreen::InvalidateAll (); } } - else if (address == addressof (lcdStartAddr)) + else if (address == my_addressof (lcdStartAddr)) { // Make sure the low-bit is always zero. @@@@ -2049,7 +2049,7 @@@@ void EmRegs328::lcdRegisterWrite(emuptr EmScreen::InvalidateAll (); } - else if (address == addressof (lcdPageWidth)) + else if (address == my_addressof (lcdPageWidth)) { if (value != oldValue) { @@@@ -2088,7 +2088,7 @@@@ void EmRegs328::rtcIntStatusWrite(emuptr // doing a byte-write to the lower byte, this extension will happen // automatically. - if (address == addressof (rtcIntStatus) && size == 1) + if (address == my_addressof (rtcIntStatus) && size == 1) value <<= 8; // Get the current value. @ 1.2 log @addressof is part of STL, so rename the macro. @ text @d1 1 a1 1 $NetBSD: patch-ak,v 1.1 2004/03/20 20:21:22 kristerw Exp $ @ 1.1 log @Make this compile when using gcc 3.3 by correcting constructs of the form int foo = {0}; @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- SrcShared/Hardware/EmRegs328.cpp.orig Sat Mar 20 17:48:57 2004 +++ SrcShared/Hardware/EmRegs328.cpp Sat Mar 20 18:11:46 2004 @@@@ -141,13 +141,13 @@@@ d21 1 a21 1 @@@@ -162,21 +162,21 @@@@ d46 1 a46 1 @@@@ -184,10 +184,10 @@@@ d59 1 a59 1 @@@@ -213,7 +213,7 @@@@ d68 1 a68 1 @@@@ -279,7 +279,7 @@@@ d77 1 a77 1 @@@@ -288,7 +288,7 @@@@ d86 74 @