--- a/baseport/syborg/fb/syborg_fb.h Thu Oct 15 17:58:46 2009 +0100
+++ b/baseport/syborg/fb/syborg_fb.h Wed Oct 21 10:29:21 2009 +0100
@@ -24,15 +24,61 @@
#include <kpower.h>
#include <system.h>
+
+
+// The definition of __portrait_display__ in the MMP file affects
+// both the display and the pointer component, so both must be
+// rebuilt if this setting is changed.
+
+
_LIT(KLitLcd,"SYBORG_FB");
-const TUint KConfigLcdWidth = 640;
+
+#ifdef __PORTRAIT_DISPLAY__ // portrait display selected
+
+# ifdef __DISPLAY_WVGA__
+
+#pragma comment(layout,"Portrait display enabled")
+const TUint KConfigLcdWidth = 854; // This must be left at 640, even with only 360 used by S60
+const TUint KConfigLcdHeight = 854;
+const TInt KConfigLcdHeightInTwips = 12860;
+const TInt KConfigLcdWidthInTwips = 12860;
+const TUint KConfigMouseWidth = 480; // Usable width for the mouse driver
+const TUint KConfigMouseMin = 0;
+
+# else //__DISPLAY_WVGA__
+
+#pragma comment(layout,"Portrait display enabled")
+const TUint KConfigLcdWidth = 640; // This must be left at 640, even with only 360 used by S60
+const TUint KConfigLcdHeight = 640;
+const TInt KConfigLcdHeightInTwips = 3550;
+const TInt KConfigLcdWidthInTwips = 3550;
+const TUint KConfigMouseWidth = 360; // Usable width for the mouse driver
+
+const TUint KConfigMouseMin = 0;
+# endif //__DISPLAY_WVGA__
+
+
+
+
+#else // __PORTRAIT_DISPLAY__ Landscape display selected
+
+#pragma comment(layout,"Landscape display enabled")
+const TUint KConfigLcdWidth = 640;
const TUint KConfigLcdHeight = 480;
-const TInt KConfigLcdWidthInTwips = 9638;
-const TInt KConfigLcdHeightInTwips = 7370;
+const TInt KConfigLcdWidthInTwips = 3550;
+const TInt KConfigLcdHeightInTwips = 2670;
+const TUint KConfigMouseWidth = 640; // Usable width for the mouse driver
+
+const TUint KConfigMouseMin = 120; // mouse range is 120 - 480, not 0 - 360
+#endif // __PORTRAIT_DISPLAY__
+
+
const TBool KConfigIsMono = 0;
const TBool KConfigIsPalettized = 0;
-const TInt KCOnfigOffsetToFirstPixel = 0;
+
+const TInt KConfigOffsetToFirstPixel = 0;
+
const TBool KConfigPixelOrderRGB = 0;
const TBool KConfigPixelOrderLandscape = 1;
const TInt KConfigLcdDisplayMode = 2;
@@ -41,7 +87,13 @@
const TInt KConfigBitsPerPixel = 24;
-const TInt KCOnfigOffsetBetweenLines = 2560;
+
+#ifdef __DISPLAY_WVGA__
+const TInt KConfigOffsetBetweenLines = 3416;
+#else //__DISPLAY_WVGA__
+const TInt KConfigOffsetBetweenLines = 2560;
+#endif //__DISPLAY_WVGA__
+
class DLcdPowerHandler : public DPowerHandler
{
@@ -72,7 +124,7 @@
TInt GetSpecifiedDisplayModeInfo(TInt aMode, TVideoInfoV01& aInfo);
TInt SetDisplayMode(TInt aMode);
TInt AllocateFrameBuffer();
-
+
TBool iDisplayOn;
DPlatChunkHw* iChunk;
DPlatChunkHw* iSecureChunk;
@@ -83,7 +135,7 @@
TDfcQue* iDfcQ;
TMessageQue iMsgQ; // to prevent a race condition with Power Manager trying to power up/down at the same time
TDfc iPowerUpDfc;
- TDfc iPowerDownDfc;
+ TDfc iPowerDownDfc;
private:
TVideoInfoV01 iVideoInfo;