From 60f2abff5e98072fcb912d1d6070050f56f8c81b Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes.zellner@nokia.com>
Date: Mon, 18 Jun 2012 15:36:34 -0700
Subject: raspberry: remove unused screen size detection code

The fbdev fallback code now resides in the default implemenatation of
the hooks.

Change-Id: Id3d2cd23ab826b90c0e6d442bfb222aa8c291646
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
---
 .../devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp   | 29 ----------------------
 1 file changed, 29 deletions(-)

(limited to 'mkspecs')

diff --git a/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp b/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
index 599b696155..158e69418e 100644
--- a/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
+++ b/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
@@ -49,15 +49,6 @@
 
 #include <bcm_host.h>
 
-#if 0 //fb size query
-#include <stdio.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <linux/fb.h>
-#endif
-
 QT_BEGIN_NAMESPACE
 
 static DISPMANX_DISPLAY_HANDLE_T dispman_display = 0;
@@ -268,29 +259,9 @@ void QEglFSPiHooks::platformDestroy()
 
 QSize QEglFSPiHooks::screenSize() const
 {
-    //both mechanisms work
-#if 1
     uint32_t width, height;
     graphics_get_display_size(0 /* LCD */, &width, &height);
     return QSize(width, height);
-#else
-    int fd = open("/dev/fb0", O_RDONLY);
-    if (fd == -1) {
-        fprintf(stderr, "Failed to open fb to detect screen resolution!\n");
-        return QSize();
-    }
-
-    struct fb_var_screeninfo vinfo;
-    if (ioctl(fd, FBIOGET_VSCREENINFO, &vinfo) = -1) {
-        fprintf(stderr, "Could not query screen info variable\n");
-        close(fd);
-        return QSize();
-    }
-
-    close(fd);
-
-    return QSize(vinfo.xres, vinfo.yres);
-#endif
 }
 
 EGLNativeWindowType QEglFSPiHooks::createNativeWindow(const QSize &size, const QSurfaceFormat &format)
-- 
cgit v1.2.3