details: https://anonhg.NetBSD.org/pkgsrc/rev/4ab6ade6c231
branches: trunk
changeset: 471178:4ab6ade6c231
user: kristerw <kristerw%pkgsrc.org@localhost>
date: Sat Mar 20 20:21:22 2004 +0000
description:
Make this compile when using gcc 3.3 by correcting constructs of the form
int foo = {0};
diffstat:
emulators/palmosemulator/distinfo | 5 +-
emulators/palmosemulator/patches/patch-ak | 85 +++++++++++++++++++++++++++++++
emulators/palmosemulator/patches/patch-al | 65 +++++++++++++++++++++++
emulators/palmosemulator/patches/patch-am | 51 ++++++++++++++++++
4 files changed, 205 insertions(+), 1 deletions(-)
diffs (229 lines):
diff -r 3010b7b308cf -r 4ab6ade6c231 emulators/palmosemulator/distinfo
--- a/emulators/palmosemulator/distinfo Sat Mar 20 20:08:38 2004 +0000
+++ b/emulators/palmosemulator/distinfo Sat Mar 20 20:21:22 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2003/01/05 03:31:25 dsainty Exp $
+$NetBSD: distinfo,v 1.3 2004/03/20 20:21:22 kristerw Exp $
SHA1 (palmosemulator/emulator_src_3.5.tar.gz) = 2debd7690736397d0af41f7b2d482df65391fc65
Size (palmosemulator/emulator_src_3.5.tar.gz) = 3162363 bytes
@@ -14,3 +14,6 @@
SHA1 (patch-ah) = e3a79fa2c376711ea6479907cca923d1e872683e
SHA1 (patch-ai) = 0cbff6b3080ee9aa7e366ba4ba368d93f0560e04
SHA1 (patch-aj) = 958f070f7bc19f6a4c2f12a9d0ba280ed64136cb
+SHA1 (patch-ak) = d693bd15c982c95663f9f595fdcad6f80d5c2477
+SHA1 (patch-al) = 50342df4bb9d020f0b72be608d0656351dae4463
+SHA1 (patch-am) = 2790c8b567a94d86bced52d59cf62b4448b62731
diff -r 3010b7b308cf -r 4ab6ade6c231 emulators/palmosemulator/patches/patch-ak
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/palmosemulator/patches/patch-ak Sat Mar 20 20:21:22 2004 +0000
@@ -0,0 +1,85 @@
+$NetBSD: patch-ak,v 1.1 2004/03/20 20:21:22 kristerw Exp $
+
+--- 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 @@
+ 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 @@
+
+ 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 @@
+ 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 @@
+
+ 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 @@
+ { 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 @@
+ 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
diff -r 3010b7b308cf -r 4ab6ade6c231 emulators/palmosemulator/patches/patch-al
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/palmosemulator/patches/patch-al Sat Mar 20 20:21:22 2004 +0000
@@ -0,0 +1,65 @@
+$NetBSD: patch-al,v 1.1 2004/03/20 20:21:22 kristerw Exp $
+
+--- SrcShared/Hardware/EmRegsEZ.cpp.orig Sat Mar 20 20:22:20 2004
++++ SrcShared/Hardware/EmRegsEZ.cpp Sat Mar 20 20:24:11 2004
+@@ -84,13 +84,13 @@
+ 0x2430, // Word pllControl; // $200: PLL Control Register
+ 0x0123, // Word pllFreqSel; // $202: PLL Frequency Select Register
+ 0, // !!! ---> Marked as reserved in 1.4 Word pllTest; // $204: PLL Test Register (do not access)
+- { 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
+@@ -183,7 +183,7 @@
+ { 0 }, // Byte ___filler28[0xA00-0x90C];
+
+ 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
+@@ -192,17 +192,17 @@
+ 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
+- { 0 }, // Byte ___filler33;
++ 0, // Byte ___filler33;
+ 0x00, // Byte lcdACDRate; // $A23: ACD (M) Rate Control Register
+- { 0 }, // Byte ___filler34;
++ 0, // Byte ___filler34;
+ 0x00, // Byte lcdPixelClock; // $A25: Pixel Clock Divider Register
+- { 0 }, // Byte ___filler35;
++ 0, // Byte ___filler35;
+ 0x40, // Byte lcdClockControl; // $A27: Clocking Control Register
+- { 0 }, // Byte ___filler36;
++ 0, // Byte ___filler36;
+ 0xFF, // Byte lcdRefreshRateAdj; // $A29: Refresh Rate Adjustment Register
+ { 0 }, // Byte ___filler2003[0xA2D-0xA2A];
+ 0x00, // Byte lcdPanningOffset; // $A2D: Panning Offset Register
+@@ -210,10 +210,10 @@
+ { 0 }, // Byte ___filler37[0xA31-0xA2E];
+
+ 0xB9, // Byte lcdFrameRate; // $A31: Frame Rate Control Modulation Register
+- { 0 }, // Byte ___filler2004;
++ 0, // Byte ___filler2004;
+ 0x84, // Byte lcdGrayPalette; // $A33: Gray Palette Mapping Register
+ 0x00, // Byte lcdReserved; // $A34: Reserved
+- { 0 }, // Byte ___filler2005;
++ 0, // Byte ___filler2005;
+ 0x0000, // Word lcdContrastControlPWM; // $A36: Contrast Control
+
+ { 0 }, // Byte ___filler40[0xB00-0xA38];
diff -r 3010b7b308cf -r 4ab6ade6c231 emulators/palmosemulator/patches/patch-am
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/palmosemulator/patches/patch-am Sat Mar 20 20:21:22 2004 +0000
@@ -0,0 +1,51 @@
+$NetBSD: patch-am,v 1.1 2004/03/20 20:21:22 kristerw Exp $
+
+--- SrcShared/Hardware/EmRegsVZ.cpp.orig Sat Mar 20 20:28:32 2004
++++ SrcShared/Hardware/EmRegsVZ.cpp Sat Mar 20 20:30:42 2004
+@@ -270,7 +270,7 @@
+ { 0 }, // UInt8 ___filler28a[0xA00-0x91E];
+
+ 0x00000000, // UInt32 lcdStartAddr; // $A00: Screen Starting Address Register
+- { 0 }, // UInt8 ___filler29;
++ 0, // UInt8 ___filler29;
+ 0xFF, // UInt8 lcdPageWidth; // $A05: Virtual Page Width Register
+ { 0 }, // UInt8 ___filler30[2];
+ 0x03F0, // UInt16 lcdScreenWidth; // $A08: Screen Width Register
+@@ -279,29 +279,29 @@
+ 0x0000, // UInt16 lcdCursorXPos; // $A18: Cursor X Position
+ 0x0000, // UInt16 lcdCursorYPos; // $A1A: Cursor Y Position
+ 0x0101, // UInt16 lcdCursorWidthHeight; // $A1C: Cursor Width and Height
+- { 0 }, // UInt8 ___filler32;
++ 0, // UInt8 ___filler32;
+ 0x7F, // UInt8 lcdBlinkControl; // $A1F: Blink Control Register
+ 0x00, // UInt8 lcdPanelControl; // $A20: Panel Interface Configuration Register
+ 0x00, // UInt8 lcdPolarity; // $A21: Polarity Config Register
+- { 0 }, // UInt8 ___filler33;
++ 0, // UInt8 ___filler33;
+ 0x00, // UInt8 lcdACDRate; // $A23: ACD (M) Rate Control Register
+- { 0 }, // UInt8 ___filler34;
++ 0, // UInt8 ___filler34;
+ 0x00, // UInt8 lcdPixelClock; // $A25: Pixel Clock Divider Register
+- { 0 }, // UInt8 ___filler35;
++ 0, // UInt8 ___filler35;
+ 0x00, // UInt8 lcdClockControl; // $A27: Clocking Control Register
+ 0x00FF, // UInt16 lcdRefreshRateAdj; // $A28: Refresh Rate Adjustment Register
+- { 0 }, // UInt8 ___filler37;
++ 0, // UInt8 ___filler37;
+ 0x00, // UInt8 lcdReserved1; // $A2B: Reserved
+- { 0 }, // UInt8 ___filler38;
++ 0, // UInt8 ___filler38;
+ 0x00, // UInt8 lcdPanningOffset; // $A2D: Panning Offset Register
+
+ { 0 }, // UInt8 ___filler39[0xA31-0xA2E];
+
+ 0x00, // UInt8 lcdFrameRate; // $A31: Frame Rate Control Modulation Register
+- { 0 }, // UInt8 ___filler2004;
++ 0, // UInt8 ___filler2004;
+ 0x84, // UInt8 lcdGrayPalette; // $A33: Gray Palette Mapping Register
+ 0x00, // UInt8 lcdReserved2; // $A34: Reserved
+- { 0 }, // UInt8 ___filler2005;
++ 0, // UInt8 ___filler2005;
+ 0x0000, // UInt16 lcdContrastControlPWM; // $A36: Contrast Control
+ 0x00, // UInt8 lcdRefreshModeControl; // $A38: Refresh Mode Control Register
+ 0x62, // UInt8 lcdDMAControl; // $A39: DMA Control Register