diff options
Diffstat (limited to 'drivers/staging/sm750fb/sm750_cursor.c')
| -rw-r--r-- | drivers/staging/sm750fb/sm750_cursor.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/drivers/staging/sm750fb/sm750_cursor.c b/drivers/staging/sm750fb/sm750_cursor.c index b1651b0d2034..b64dc8a4a8fb 100644 --- a/drivers/staging/sm750fb/sm750_cursor.c +++ b/drivers/staging/sm750fb/sm750_cursor.c @@ -54,6 +54,7 @@ void sm750_hw_cursor_enable(struct lynx_cursor *cursor) reg = (cursor->offset & HWC_ADDRESS_ADDRESS_MASK) | HWC_ADDRESS_ENABLE; poke32(HWC_ADDRESS, reg); } + void sm750_hw_cursor_disable(struct lynx_cursor *cursor) { poke32(HWC_ADDRESS, 0); @@ -65,15 +66,17 @@ void sm750_hw_cursor_setSize(struct lynx_cursor *cursor, cursor->w = w; cursor->h = h; } + void sm750_hw_cursor_setPos(struct lynx_cursor *cursor, int x, int y) { u32 reg; - reg = (((y << HWC_LOCATION_Y_SHIFT) & HWC_LOCATION_Y_MASK) | - (x & HWC_LOCATION_X_MASK)); + reg = ((y << HWC_LOCATION_Y_SHIFT) & HWC_LOCATION_Y_MASK) | + (x & HWC_LOCATION_X_MASK); poke32(HWC_LOCATION, reg); } + void sm750_hw_cursor_setColor(struct lynx_cursor *cursor, u32 fg, u32 bg) { @@ -111,14 +114,14 @@ void sm750_hw_cursor_setData(struct lynx_cursor *cursor, data = 0; for (j = 0; j < 8; j++) { - if (mask & (0x80>>j)) { + if (mask & (0x80 >> j)) { if (rop == ROP_XOR) opr = mask ^ color; else opr = mask & color; /* 2 stands for forecolor and 1 for backcolor */ - data |= ((opr & (0x80>>j))?2:1)<<(j*2); + data |= ((opr & (0x80 >> j)) ? 2 : 1) << (j * 2); } } iowrite16(data, pbuffer); @@ -131,10 +134,7 @@ void sm750_hw_cursor_setData(struct lynx_cursor *cursor, } else { pbuffer += sizeof(u16); } - } - - } @@ -165,19 +165,18 @@ void sm750_hw_cursor_setData2(struct lynx_cursor *cursor, data = 0; for (j = 0; j < 8; j++) { - if (mask & (1<<j)) - data |= ((color & (1<<j))?1:2)<<(j*2); + if (mask & (1 << j)) + data |= ((color & (1 << j)) ? 1 : 2) << (j * 2); } iowrite16(data, pbuffer); /* assume pitch is 1,2,4,8,...*/ - if (!(i&(pitch-1))) { + if (!(i & (pitch - 1))) { /* need a return */ pstart += offset; pbuffer = pstart; } else { pbuffer += sizeof(u16); } - } } |