sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Gabe Black 2014-11-18 02:38:23 -08:00
parent a08cfd797b
commit b5fd6050a2
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/dev/arm/pl111.hh
View file

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