diff options
-rw-r--r-- | drivers/video/s1d13xxxfb.c | 50 | ||||
-rw-r--r-- | include/video/s1d13xxxfb.h | 6 |
2 files changed, 0 insertions, 56 deletions
diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c index a6247fc081ab..28b1c6c3d8ac 100644 --- a/drivers/video/s1d13xxxfb.c +++ b/drivers/video/s1d13xxxfb.c | |||
@@ -410,28 +410,6 @@ s1d13xxxfb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info) | |||
410 | ************************************************************/ | 410 | ************************************************************/ |
411 | 411 | ||
412 | /** | 412 | /** |
413 | * bltbit_wait_bitset - waits for change in register value | ||
414 | * @info : framebuffer structure | ||
415 | * @bit : value expected in register | ||
416 | * @timeout : ... | ||
417 | * | ||
418 | * waits until value changes INTO bit | ||
419 | */ | ||
420 | static u8 | ||
421 | bltbit_wait_bitset(struct fb_info *info, u8 bit, int timeout) | ||
422 | { | ||
423 | while (!(s1d13xxxfb_readreg(info->par, S1DREG_BBLT_CTL0) & bit)) { | ||
424 | udelay(10); | ||
425 | if (!--timeout) { | ||
426 | dbg_blit("wait_bitset timeout\n"); | ||
427 | break; | ||
428 | } | ||
429 | } | ||
430 | |||
431 | return timeout; | ||
432 | } | ||
433 | |||
434 | /** | ||
435 | * bltbit_wait_bitclear - waits for change in register value | 413 | * bltbit_wait_bitclear - waits for change in register value |
436 | * @info : frambuffer structure | 414 | * @info : frambuffer structure |
437 | * @bit : value currently in register | 415 | * @bit : value currently in register |
@@ -454,34 +432,6 @@ bltbit_wait_bitclear(struct fb_info *info, u8 bit, int timeout) | |||
454 | return timeout; | 432 | return timeout; |
455 | } | 433 | } |
456 | 434 | ||
457 | /** | ||
458 | * bltbit_fifo_status - checks the current status of the fifo | ||
459 | * @info : framebuffer structure | ||
460 | * | ||
461 | * returns number of free words in buffer | ||
462 | */ | ||
463 | static u8 | ||
464 | bltbit_fifo_status(struct fb_info *info) | ||
465 | { | ||
466 | u8 status; | ||
467 | |||
468 | status = s1d13xxxfb_readreg(info->par, S1DREG_BBLT_CTL0); | ||
469 | |||
470 | /* its empty so room for 16 words */ | ||
471 | if (status & BBLT_FIFO_EMPTY) | ||
472 | return 16; | ||
473 | |||
474 | /* its full so we dont want to add */ | ||
475 | if (status & BBLT_FIFO_FULL) | ||
476 | return 0; | ||
477 | |||
478 | /* its atleast half full but we can add one atleast */ | ||
479 | if (status & BBLT_FIFO_NOT_FULL) | ||
480 | return 1; | ||
481 | |||
482 | return 0; | ||
483 | } | ||
484 | |||
485 | /* | 435 | /* |
486 | * s1d13xxxfb_bitblt_copyarea - accelerated copyarea function | 436 | * s1d13xxxfb_bitblt_copyarea - accelerated copyarea function |
487 | * @info : framebuffer structure | 437 | * @info : framebuffer structure |
diff --git a/include/video/s1d13xxxfb.h b/include/video/s1d13xxxfb.h index f0736cff2ca3..55f534491a3d 100644 --- a/include/video/s1d13xxxfb.h +++ b/include/video/s1d13xxxfb.h | |||
@@ -136,12 +136,6 @@ | |||
136 | #define S1DREG_DELAYOFF 0xFFFE | 136 | #define S1DREG_DELAYOFF 0xFFFE |
137 | #define S1DREG_DELAYON 0xFFFF | 137 | #define S1DREG_DELAYON 0xFFFF |
138 | 138 | ||
139 | #define BBLT_FIFO_EMPTY 0x00 | ||
140 | #define BBLT_FIFO_NOT_EMPTY 0x40 | ||
141 | #define BBLT_FIFO_NOT_FULL 0x30 | ||
142 | #define BBLT_FIFO_HALF_FULL 0x20 | ||
143 | #define BBLT_FIFO_FULL 0x10 | ||
144 | |||
145 | #define BBLT_SOLID_FILL 0x0c | 139 | #define BBLT_SOLID_FILL 0x0c |
146 | 140 | ||
147 | 141 | ||