video: fbdev: pvr2fb: remove function prototypes
Reorder code a bit and then remove no longer needed function prototypes. Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz
parent
66019bc26d
commit
db7f2cb965
|
|
@ -193,39 +193,6 @@ static unsigned int shdma = PVR2_CASCADE_CHAN;
|
|||
static unsigned int pvr2dma = ONCHIP_NR_DMA_CHANNELS;
|
||||
#endif
|
||||
|
||||
static int pvr2fb_setcolreg(unsigned int regno, unsigned int red, unsigned int green, unsigned int blue,
|
||||
unsigned int transp, struct fb_info *info);
|
||||
static int pvr2fb_blank(int blank, struct fb_info *info);
|
||||
static unsigned long get_line_length(int xres_virtual, int bpp);
|
||||
static void set_color_bitfields(struct fb_var_screeninfo *var);
|
||||
static int pvr2fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info);
|
||||
static int pvr2fb_set_par(struct fb_info *info);
|
||||
static void pvr2_update_display(struct fb_info *info);
|
||||
static void pvr2_init_display(struct fb_info *info);
|
||||
static void pvr2_do_blank(void);
|
||||
static irqreturn_t pvr2fb_interrupt(int irq, void *dev_id);
|
||||
static int pvr2_init_cable(void);
|
||||
static int pvr2_get_param(const struct pvr2_params *p, const char *s,
|
||||
int val, int size);
|
||||
#ifdef CONFIG_PVR2_DMA
|
||||
static ssize_t pvr2fb_write(struct fb_info *info, const char *buf,
|
||||
size_t count, loff_t *ppos);
|
||||
#endif
|
||||
|
||||
static struct fb_ops pvr2fb_ops = {
|
||||
.owner = THIS_MODULE,
|
||||
.fb_setcolreg = pvr2fb_setcolreg,
|
||||
.fb_blank = pvr2fb_blank,
|
||||
.fb_check_var = pvr2fb_check_var,
|
||||
.fb_set_par = pvr2fb_set_par,
|
||||
#ifdef CONFIG_PVR2_DMA
|
||||
.fb_write = pvr2fb_write,
|
||||
#endif
|
||||
.fb_fillrect = cfb_fillrect,
|
||||
.fb_copyarea = cfb_copyarea,
|
||||
.fb_imageblit = cfb_imageblit,
|
||||
};
|
||||
|
||||
static struct fb_videomode pvr2_modedb[] = {
|
||||
/*
|
||||
* Broadcast video modes (PAL and NTSC). I'm unfamiliar with
|
||||
|
|
@ -353,6 +320,36 @@ static int pvr2fb_setcolreg(unsigned int regno, unsigned int red,
|
|||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Determine the cable type and initialize the cable output format. Don't do
|
||||
* anything if the cable type has been overidden (via "cable:XX").
|
||||
*/
|
||||
|
||||
#define PCTRA 0xff80002c
|
||||
#define PDTRA 0xff800030
|
||||
#define VOUTC 0xa0702c00
|
||||
|
||||
static int pvr2_init_cable(void)
|
||||
{
|
||||
if (cable_type < 0) {
|
||||
fb_writel((fb_readl(PCTRA) & 0xfff0ffff) | 0x000a0000,
|
||||
PCTRA);
|
||||
cable_type = (fb_readw(PDTRA) >> 8) & 3;
|
||||
}
|
||||
|
||||
/* Now select the output format (either composite or other) */
|
||||
/* XXX: Save the previous val first, as this reg is also AICA
|
||||
related */
|
||||
if (cable_type == CT_COMPOSITE)
|
||||
fb_writel(3 << 8, VOUTC);
|
||||
else if (cable_type == CT_RGB)
|
||||
fb_writel(1 << 9, VOUTC);
|
||||
else
|
||||
fb_writel(0, VOUTC);
|
||||
|
||||
return cable_type;
|
||||
}
|
||||
|
||||
static int pvr2fb_set_par(struct fb_info *info)
|
||||
{
|
||||
struct pvr2fb_par *par = (struct pvr2fb_par *)info->par;
|
||||
|
|
@ -641,36 +638,6 @@ static irqreturn_t pvr2fb_interrupt(int irq, void *dev_id)
|
|||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
/*
|
||||
* Determine the cable type and initialize the cable output format. Don't do
|
||||
* anything if the cable type has been overidden (via "cable:XX").
|
||||
*/
|
||||
|
||||
#define PCTRA 0xff80002c
|
||||
#define PDTRA 0xff800030
|
||||
#define VOUTC 0xa0702c00
|
||||
|
||||
static int pvr2_init_cable(void)
|
||||
{
|
||||
if (cable_type < 0) {
|
||||
fb_writel((fb_readl(PCTRA) & 0xfff0ffff) | 0x000a0000,
|
||||
PCTRA);
|
||||
cable_type = (fb_readw(PDTRA) >> 8) & 3;
|
||||
}
|
||||
|
||||
/* Now select the output format (either composite or other) */
|
||||
/* XXX: Save the previous val first, as this reg is also AICA
|
||||
related */
|
||||
if (cable_type == CT_COMPOSITE)
|
||||
fb_writel(3 << 8, VOUTC);
|
||||
else if (cable_type == CT_RGB)
|
||||
fb_writel(1 << 9, VOUTC);
|
||||
else
|
||||
fb_writel(0, VOUTC);
|
||||
|
||||
return cable_type;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PVR2_DMA
|
||||
static ssize_t pvr2fb_write(struct fb_info *info, const char *buf,
|
||||
size_t count, loff_t *ppos)
|
||||
|
|
@ -741,6 +708,37 @@ static ssize_t pvr2fb_write(struct fb_info *info, const char *buf,
|
|||
}
|
||||
#endif /* CONFIG_PVR2_DMA */
|
||||
|
||||
static struct fb_ops pvr2fb_ops = {
|
||||
.owner = THIS_MODULE,
|
||||
.fb_setcolreg = pvr2fb_setcolreg,
|
||||
.fb_blank = pvr2fb_blank,
|
||||
.fb_check_var = pvr2fb_check_var,
|
||||
.fb_set_par = pvr2fb_set_par,
|
||||
#ifdef CONFIG_PVR2_DMA
|
||||
.fb_write = pvr2fb_write,
|
||||
#endif
|
||||
.fb_fillrect = cfb_fillrect,
|
||||
.fb_copyarea = cfb_copyarea,
|
||||
.fb_imageblit = cfb_imageblit,
|
||||
};
|
||||
|
||||
static int pvr2_get_param(const struct pvr2_params *p, const char *s, int val,
|
||||
int size)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0 ; i < size ; i++ ) {
|
||||
if (s != NULL) {
|
||||
if (!strncasecmp(p[i].name, s, strlen(s)))
|
||||
return p[i].val;
|
||||
} else {
|
||||
if (p[i].val == val)
|
||||
return (int)p[i].name;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
/**
|
||||
* pvr2fb_common_init
|
||||
*
|
||||
|
|
@ -990,23 +988,6 @@ static void __exit pvr2fb_pci_exit(void)
|
|||
}
|
||||
#endif /* CONFIG_PCI */
|
||||
|
||||
static int pvr2_get_param(const struct pvr2_params *p, const char *s, int val,
|
||||
int size)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0 ; i < size ; i++ ) {
|
||||
if (s != NULL) {
|
||||
if (!strncasecmp(p[i].name, s, strlen(s)))
|
||||
return p[i].val;
|
||||
} else {
|
||||
if (p[i].val == val)
|
||||
return (int)p[i].name;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
/*
|
||||
* Parse command arguments. Supported arguments are:
|
||||
* inverse Use inverse color maps
|
||||
|
|
|
|||
Loading…
Reference in New Issue