base: Redesign internal frame buffer handling

[gem5.git] / src / dev / arm / pl111.hh

diff --git a/src/dev/arm/pl111.hh b/src/dev/arm/pl111.hh
index a7c1584731ddd951a7ec95ccbb3e2a8a06686e58..85973bbc7374c65352fb8a123df286ddbe10be46 100644 (file)
--- a/src/dev/arm/pl111.hh
+++ b/src/dev/arm/pl111.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 ARM Limited
+ * Copyright (c) 2010-2012, 2015 ARM Limited
  * All rights reserved
  *
  * The license below extends only to copyright in the software and shall
@@ -47,13 +47,15 @@
 #define __DEV_ARM_PL111_HH__
 
 #include <fstream>
+#include <memory>
 
+#include "base/bitmap.hh"
+#include "base/framebuffer.hh"
 #include "dev/arm/amba_device.hh"
 #include "params/Pl111.hh"
 #include "sim/serialize.hh"
 
 class VncInput;
-class Bitmap;
 
 class Pl111: public AmbaDmaDevice
 {
@@ -256,11 +258,14 @@ class Pl111: public AmbaDmaDevice
     /** Pixel clock */
     Tick pixelClock;
 
+    PixelConverter converter;
+    FrameBuffer fb;
+
     /** VNC server */
     VncInput *vnc;
 
     /** Helper to write out bitmaps */
-    Bitmap *bmp;
+    Bitmap bmp;
 
     /** Picture of what the current frame buffer looks like */
     std::ostream *pic;
@@ -295,6 +300,8 @@ class Pl111: public AmbaDmaDevice
     /** Number of pending dma reads */
     uint32_t dmaPendingNum;
 
+    PixelConverter pixelConverter() const;
+
     /** Send updated parameters to the vnc server */
     void updateVideoParams();