From: Gabe Black <gabeblack@google.com>
Date: Tue, 18 Nov 2014 10:38:23 +0000 (-0800)
Subject: dev: Use fixed size member variables to describe fixed size PL111 registers.
X-Git-Tag: stable_2015_04_15~121
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b5fd6050a2f1c3a597ce8e2c7b0f9d78596fc210;p=gem5.git

dev: Use fixed size member variables to describe fixed size PL111 registers.
---

diff --git a/src/dev/arm/pl111.hh b/src/dev/arm/pl111.hh
index 603cf943f..a7c158473 100644
--- a/src/dev/arm/pl111.hh
+++ b/src/dev/arm/pl111.hh
@@ -200,10 +200,10 @@ class Pl111: public AmbaDmaDevice
     TimingReg3 lcdTiming3;
 
     /** Upper panel frame base address register */
-    int lcdUpbase;
+    uint32_t lcdUpbase;
 
     /** Lower panel frame base address register */
-    int lcdLpbase;
+    uint32_t lcdLpbase;
 
     /** Control register */
     ControlReg lcdControl;
@@ -219,27 +219,27 @@ class Pl111: public AmbaDmaDevice
 
     /** 256x16-bit color palette registers
      * 256 palette entries organized as 128 locations of two entries per word */
-    int lcdPalette[LcdPaletteSize];
+    uint32_t lcdPalette[LcdPaletteSize];
 
     /** Cursor image RAM register
      * 256-word wide values defining images overlaid by the hw cursor mechanism */
-    int cursorImage[CrsrImageSize];
+    uint32_t cursorImage[CrsrImageSize];
 
     /** Cursor control register */
-    int clcdCrsrCtrl;
+    uint32_t clcdCrsrCtrl;
 
     /** Cursor configuration register */
-    int clcdCrsrConfig;
+    uint32_t clcdCrsrConfig;
 
     /** Cursor palette registers */
-    int clcdCrsrPalette0;
-    int clcdCrsrPalette1;
+    uint32_t clcdCrsrPalette0;
+    uint32_t clcdCrsrPalette1;
 
     /** Cursor XY position register */
-    int clcdCrsrXY;
+    uint32_t clcdCrsrXY;
 
     /** Cursor clip position register */
-    int clcdCrsrClip;
+    uint32_t clcdCrsrClip;
 
     /** Cursor interrupt mask set/clear register */
     InterruptReg clcdCrsrImsc;
@@ -290,10 +290,10 @@ class Pl111: public AmbaDmaDevice
     Addr curAddr;
 
     /** DMA FIFO watermark */
-    int waterMark;
+    uint32_t waterMark;
 
     /** Number of pending dma reads */
-    int dmaPendingNum;
+    uint32_t dmaPendingNum;
 
     /** Send updated parameters to the vnc server */
     void updateVideoParams();