|
@@ -23,8 +23,8 @@
|
|
|
#define PEEK32(addr) \
|
|
|
readl(cursor->mmio + (addr))
|
|
|
|
|
|
-#define POKE32(addr,data) \
|
|
|
-writel((data),cursor->mmio + (addr))
|
|
|
+#define POKE32(addr, data) \
|
|
|
+writel((data), cursor->mmio + (addr))
|
|
|
|
|
|
/* cursor control for voyager and 718/750*/
|
|
|
#define HWC_ADDRESS 0x0
|
|
@@ -61,42 +61,42 @@ writel((data),cursor->mmio + (addr))
|
|
|
void hw_cursor_enable(struct lynx_cursor * cursor)
|
|
|
{
|
|
|
u32 reg;
|
|
|
- reg = FIELD_VALUE(0,HWC_ADDRESS,ADDRESS,cursor->offset)|
|
|
|
- FIELD_SET(0,HWC_ADDRESS,EXT,LOCAL)|
|
|
|
- FIELD_SET(0,HWC_ADDRESS,ENABLE,ENABLE);
|
|
|
- POKE32(HWC_ADDRESS,reg);
|
|
|
+ reg = FIELD_VALUE(0, HWC_ADDRESS, ADDRESS, cursor->offset)|
|
|
|
+ FIELD_SET(0, HWC_ADDRESS, EXT, LOCAL)|
|
|
|
+ FIELD_SET(0, HWC_ADDRESS, ENABLE, ENABLE);
|
|
|
+ POKE32(HWC_ADDRESS, reg);
|
|
|
}
|
|
|
void hw_cursor_disable(struct lynx_cursor * cursor)
|
|
|
{
|
|
|
- POKE32(HWC_ADDRESS,0);
|
|
|
+ POKE32(HWC_ADDRESS, 0);
|
|
|
}
|
|
|
|
|
|
void hw_cursor_setSize(struct lynx_cursor * cursor,
|
|
|
- int w,int h)
|
|
|
+ int w, int h)
|
|
|
{
|
|
|
cursor->w = w;
|
|
|
cursor->h = h;
|
|
|
}
|
|
|
void hw_cursor_setPos(struct lynx_cursor * cursor,
|
|
|
- int x,int y)
|
|
|
+ int x, int y)
|
|
|
{
|
|
|
u32 reg;
|
|
|
- reg = FIELD_VALUE(0,HWC_LOCATION,Y,y)|
|
|
|
- FIELD_VALUE(0,HWC_LOCATION,X,x);
|
|
|
- POKE32(HWC_LOCATION,reg);
|
|
|
+ reg = FIELD_VALUE(0, HWC_LOCATION, Y, y)|
|
|
|
+ FIELD_VALUE(0, HWC_LOCATION, X, x);
|
|
|
+ POKE32(HWC_LOCATION, reg);
|
|
|
}
|
|
|
void hw_cursor_setColor(struct lynx_cursor * cursor,
|
|
|
- u32 fg,u32 bg)
|
|
|
+ u32 fg, u32 bg)
|
|
|
{
|
|
|
- POKE32(HWC_COLOR_12,(fg<<16)|(bg&0xffff));
|
|
|
- POKE32(HWC_COLOR_3,0xffe0);
|
|
|
+ POKE32(HWC_COLOR_12, (fg<<16)|(bg&0xffff));
|
|
|
+ POKE32(HWC_COLOR_3, 0xffe0);
|
|
|
}
|
|
|
|
|
|
void hw_cursor_setData(struct lynx_cursor * cursor,
|
|
|
- u16 rop,const u8* pcol,const u8* pmsk)
|
|
|
+ u16 rop, const u8* pcol, const u8* pmsk)
|
|
|
{
|
|
|
- int i,j,count,pitch,offset;
|
|
|
- u8 color,mask,opr;
|
|
|
+ int i, j, count, pitch, offset;
|
|
|
+ u8 color, mask, opr;
|
|
|
u16 data;
|
|
|
void __iomem *pbuffer, *pstart;
|
|
|
|
|
@@ -184,9 +184,9 @@ void hw_cursor_setData(struct lynx_cursor * cursor,
|
|
|
|
|
|
|
|
|
void hw_cursor_setData2(struct lynx_cursor * cursor,
|
|
|
- u16 rop,const u8* pcol,const u8* pmsk)
|
|
|
+ u16 rop, const u8* pcol, const u8* pmsk)
|
|
|
{
|
|
|
- int i,j,count,pitch,offset;
|
|
|
+ int i, j, count, pitch, offset;
|
|
|
u8 color, mask;
|
|
|
u16 data;
|
|
|
void __iomem *pbuffer, *pstart;
|