Skip to content

L
linux
Commit cfa89a3e authored by Michael Hunold's avatar Michael Hunold Committed by Linus Torvalds
Browse files
Options

[PATCH] clean up the parts according to the comments on kernel mailing list 

clean up the parts according to the comments on kernel mailing list
(mainly by Christoph Hellwig)

 - ugly WRITE_RPS0 define in saa7146_hlp.c has been replaced by a proper
   inline (I hope)
 - use <linux/types.h> not <asm/types.h> everywhere
 - include <asm/*.h> headers after <linux/*.h> ones
 - revert the indentation from "static <newline> xxx to "static xxx"
parent ea40a8d8
Show whitespace changes
Inline Side-by-side
Showing with 597 additions and 1129 deletions
drivers/media/common/saa7146_core.c
View file @ cfa89a3e
......@@ -49,8 +49,7 @@ static void dump_registers(struct saa7146_dev* dev)
****************************************************************************/
/* this is videobuf_vmalloc_to_sg() from video-buf.c */
static
struct scatterlist* vmalloc_to_sg(unsigned char *virt, int nr_pages)
static struct scatterlist* vmalloc_to_sg(unsigned char *virt, int nr_pages)
{
struct scatterlist *sglist;
struct page *pg;
......@@ -255,8 +254,7 @@ static irqreturn_t interrupt_hw(int irq, void *dev_id, struct pt_regs *regs)
/*********************************************************************************/
/* configuration-functions */
static
int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent)
static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent)
{
unsigned long adr = 0, len = 0;
struct saa7146_dev* dev = kmalloc (sizeof(struct saa7146_dev),GFP_KERNEL);
......@@ -418,8 +416,7 @@ int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent)
return err;
}
static
void saa7146_remove_one(struct pci_dev *pdev)
static void saa7146_remove_one(struct pci_dev *pdev)
{
struct saa7146_dev* dev = (struct saa7146_dev*) pci_get_drvdata(pdev);
DEB_EE(("dev:%p\n",dev));
......@@ -478,8 +475,7 @@ int saa7146_unregister_extension(struct saa7146_extension* ext)
return 0;
}
static
int __init saa7146_init_module(void)
static int __init saa7146_init_module(void)
{
if( 0 == initialized ) {
INIT_LIST_HEAD(&saa7146_devices);
......@@ -489,8 +485,7 @@ int __init saa7146_init_module(void)
return 0;
}
static
void __exit saa7146_cleanup_module(void)
static void __exit saa7146_cleanup_module(void)
{
}
......
drivers/media/common/saa7146_fops.c
View file @ cfa89a3e
......@@ -144,8 +144,7 @@ void saa7146_buffer_timeout(unsigned long data)
/********************************************************************************/
/* file operations */
static
int fops_open(struct inode *inode, struct file *file)
static int fops_open(struct inode *inode, struct file *file)
{
unsigned int minor = minor(inode->i_rdev);
struct saa7146_dev *h = NULL, *dev = NULL;
......@@ -463,15 +462,13 @@ int saa7146_unregister_device(struct video_device *vid, struct saa7146_dev* dev)
return 0;
}
static
int __init saa7146_vv_init_module(void)
static int __init saa7146_vv_init_module(void)
{
return 0;
}
static
void __exit saa7146_vv_cleanup_module(void)
static void __exit saa7146_vv_cleanup_module(void)
{
}
......
drivers/media/common/saa7146_hlp.c
View file @ cfa89a3e
......@@ -5,8 +5,7 @@
#define my_max(type,x,y) \
({ type __x = (x), __y = (y); __x > __y ? __x: __y; })
static
void calculate_output_format_register(struct saa7146_dev* saa, u32 palette, u32* clip_format)
static void calculate_output_format_register(struct saa7146_dev* saa, u32 palette, u32* clip_format)
{
/* clear out the necessary bits */
*clip_format &= 0x0000ffff;
......@@ -14,21 +13,18 @@ void calculate_output_format_register(struct saa7146_dev* saa, u32 palette, u32*
*clip_format |= (( ((palette&0xf00)>>8) << 30) | ((palette&0x00f) << 24) | (((palette&0x0f0)>>4) << 16));
}
static
void calculate_bcs_ctrl_register(struct saa7146_dev *dev, int brightness, int contrast, int colour, u32 *bcs_ctrl)
static void calculate_bcs_ctrl_register(struct saa7146_dev *dev, int brightness, int contrast, int colour, u32 *bcs_ctrl)
{
*bcs_ctrl = ((brightness << 24) | (contrast << 16) | (colour << 0));
}
static
void calculate_hps_source_and_sync(struct saa7146_dev *dev, int source, int sync, u32* hps_ctrl)
static void calculate_hps_source_and_sync(struct saa7146_dev *dev, int source, int sync, u32* hps_ctrl)
{
*hps_ctrl &= ~(MASK_30 | MASK_31 | MASK_28);
*hps_ctrl |= (source << 30) | (sync << 28);
}
static
void calculate_hxo_and_hyo(struct saa7146_vv *vv, u32* hps_h_scale, u32* hps_ctrl)
static void calculate_hxo_and_hyo(struct saa7146_vv *vv, u32* hps_h_scale, u32* hps_ctrl)
{
int hyo = 0, hxo = 0;
......@@ -73,8 +69,7 @@ static struct {
u8 h_attenuation[] = { 1, 2, 4, 8, 2, 4, 8, 16, 0};
/* calculate horizontal scale registers */
static
int calculate_h_scale_registers(struct saa7146_dev *dev,
static int calculate_h_scale_registers(struct saa7146_dev *dev,
int in_x, int out_x, int flip_lr,
u32* hps_ctrl, u32* hps_v_gain, u32* hps_h_prescale, u32* hps_h_scale)
{
......@@ -221,8 +216,7 @@ static struct {
u16 v_attenuation[] = { 2, 4, 8, 16, 32, 64, 128, 256, 0};
/* calculate vertical scale registers */
static
int calculate_v_scale_registers(struct saa7146_dev *dev, enum v4l2_field field,
static int calculate_v_scale_registers(struct saa7146_dev *dev, enum v4l2_field field,
int in_y, int out_y, u32* hps_v_scale, u32* hps_v_gain)
{
int lpi = 0;
......@@ -318,8 +312,7 @@ int calculate_v_scale_registers(struct saa7146_dev *dev, enum v4l2_field field,
}
/* simple bubble-sort algorithm with duplicate elimination */
static
int sort_and_eliminate(u32* values, int* count)
static int sort_and_eliminate(u32* values, int* count)
{
int low = 0, high = 0, top = 0, temp = 0;
int cur = 0, next = 0;
......@@ -351,8 +344,7 @@ int sort_and_eliminate(u32* values, int* count)
return 0;
}
static
void calculate_clipping_registers_rect(struct saa7146_dev *dev, struct saa7146_fh *fh,
static void calculate_clipping_registers_rect(struct saa7146_dev *dev, struct saa7146_fh *fh,
struct saa7146_video_dma *vdma2, u32* clip_format, u32* arbtr_ctrl, enum v4l2_field field)
{
struct saa7146_vv *vv = dev->vv_data;
......@@ -484,8 +476,7 @@ void calculate_clipping_registers_rect(struct saa7146_dev *dev, struct saa7146_f
}
/* disable clipping */
static
void saa7146_disable_clipping(struct saa7146_dev *dev)
static void saa7146_disable_clipping(struct saa7146_dev *dev)
{
u32 clip_format = saa7146_read(dev, CLIP_FORMAT_CTRL);
......@@ -500,8 +491,7 @@ void saa7146_disable_clipping(struct saa7146_dev *dev)
saa7146_write(dev, MC1, (MASK_21));
}
static
void saa7146_set_clipping_rect(struct saa7146_dev *dev, struct saa7146_fh *fh)
static void saa7146_set_clipping_rect(struct saa7146_dev *dev, struct saa7146_fh *fh)
{
enum v4l2_field field = fh->ov.win.field;
int clipcount = fh->ov.nclips;
......@@ -543,8 +533,7 @@ void saa7146_set_clipping_rect(struct saa7146_dev *dev, struct saa7146_fh *fh)
saa7146_write(dev, MC1, (MASK_05 | MASK_21));
}
static
void saa7146_set_window(struct saa7146_dev *dev, int width, int height, enum v4l2_field field)
static void saa7146_set_window(struct saa7146_dev *dev, int width, int height, enum v4l2_field field)
{
struct saa7146_vv *vv = dev->vv_data;
......@@ -580,8 +569,7 @@ void saa7146_set_window(struct saa7146_dev *dev, int width, int height, enum v4l
}
/* calculate the new memory offsets for a desired position */
static
void saa7146_set_position(struct saa7146_dev *dev, int w_x, int w_y, int w_height, enum v4l2_field field)
static void saa7146_set_position(struct saa7146_dev *dev, int w_x, int w_y, int w_height, enum v4l2_field field)
{
struct saa7146_vv *vv = dev->vv_data;
......@@ -624,8 +612,7 @@ void saa7146_set_position(struct saa7146_dev *dev, int w_x, int w_y, int w_heigh
saa7146_write_out_dma(dev, 1, &vdma1);
}
static
void saa7146_set_output_format(struct saa7146_dev *dev, unsigned long palette)
static void saa7146_set_output_format(struct saa7146_dev *dev, unsigned long palette)
{
u32 clip_format = saa7146_read(dev, CLIP_FORMAT_CTRL);
......@@ -742,8 +729,7 @@ void saa7146_write_out_dma(struct saa7146_dev* dev, int which, struct saa7146_vi
printk("vdma%d.num_line_byte: 0x%08x\n", which,vdma->num_line_byte);
*/
}
static
int calculate_video_dma_grab_packed(struct saa7146_dev* dev, struct saa7146_buf *buf)
static int calculate_video_dma_grab_packed(struct saa7146_dev* dev, struct saa7146_buf *buf)
{
struct saa7146_vv *vv = dev->vv_data;
struct saa7146_video_dma vdma1;
......@@ -791,8 +777,7 @@ int calculate_video_dma_grab_packed(struct saa7146_dev* dev, struct saa7146_buf
return 0;
}
static
int calc_planar_422(struct saa7146_vv *vv, struct saa7146_buf *buf, struct saa7146_video_dma *vdma2, struct saa7146_video_dma *vdma3)
static int calc_planar_422(struct saa7146_vv *vv, struct saa7146_buf *buf, struct saa7146_video_dma *vdma2, struct saa7146_video_dma *vdma3)
{
int height = buf->fmt->height;
int width = buf->fmt->width;
......@@ -822,8 +807,7 @@ int calc_planar_422(struct saa7146_vv *vv, struct saa7146_buf *buf, struct saa71
return 0;
}
static
int calc_planar_420(struct saa7146_vv *vv, struct saa7146_buf *buf, struct saa7146_video_dma *vdma2, struct saa7146_video_dma *vdma3)
static int calc_planar_420(struct saa7146_vv *vv, struct saa7146_buf *buf, struct saa7146_video_dma *vdma2, struct saa7146_video_dma *vdma3)
{
int height = buf->fmt->height;
int width = buf->fmt->width;
......@@ -853,8 +837,7 @@ int calc_planar_420(struct saa7146_vv *vv, struct saa7146_buf *buf, struct saa71
}
static
int calculate_video_dma_grab_planar(struct saa7146_dev* dev, struct saa7146_buf *buf)
static int calculate_video_dma_grab_planar(struct saa7146_dev* dev, struct saa7146_buf *buf)
{
struct saa7146_vv *vv = dev->vv_data;
struct saa7146_video_dma vdma1;
......@@ -949,13 +932,9 @@ int calculate_video_dma_grab_planar(struct saa7146_dev* dev, struct saa7146_buf
return 0;
}
#define WRITE_RPS0(x) dev->d_rps0.cpu_addr[ count++ ] = cpu_to_le32(x)
static
void program_capture_engine(struct saa7146_dev *dev, int planar)
static void program_capture_engine(struct saa7146_dev *dev, int planar)
{
struct saa7146_vv *vv = dev->vv_data;
int count = 0;
unsigned long e_wait = vv->current_hps_sync == SAA7146_HPS_SYNC_PORT_A ? CMD_E_FID_A : CMD_E_FID_B;
unsigned long o_wait = vv->current_hps_sync == SAA7146_HPS_SYNC_PORT_A ? CMD_O_FID_A : CMD_O_FID_B;
......@@ -966,9 +945,6 @@ void program_capture_engine(struct saa7146_dev *dev, int planar)
o_wait = tmp;
}
/* write beginning of rps-program */
count = 0;
/* wait for o_fid_a/b / e_fid_a/b toggle only if bit 0 is not set*/
WRITE_RPS0(CMD_PAUSE | CMD_OAN | CMD_SIG0 | e_wait);
WRITE_RPS0(CMD_PAUSE | CMD_OAN | CMD_SIG0 | o_wait);
......
drivers/media/common/saa7146_i2c.c
View file @ cfa89a3e
#include <media/saa7146_vv.h>
/* helper function */
static
void my_wait(struct saa7146_dev *dev, long ms)
static void my_wait(struct saa7146_dev *dev, long ms)
{
set_current_state(TASK_INTERRUPTIBLE);
schedule_timeout((((ms+10)/10)*HZ)/1000);
......@@ -19,8 +18,7 @@ u32 saa7146_i2c_func(struct i2c_adapter *adapter)
}
/* this function returns the status-register of our i2c-device */
static inline
u32 saa7146_i2c_status(struct saa7146_dev *dev)
static inline u32 saa7146_i2c_status(struct saa7146_dev *dev)
{
u32 iicsta = saa7146_read(dev, I2C_STATUS);
/*
......@@ -33,8 +31,7 @@ u32 saa7146_i2c_status(struct saa7146_dev *dev)
sent through the saa7146. have a look at the specifications p. 122 ff
to understand this. it returns the number of u32s to send, or -1
in case of an error. */
static
int saa7146_i2c_msg_prepare(const struct i2c_msg m[], int num, u32 *op)
static int saa7146_i2c_msg_prepare(const struct i2c_msg m[], int num, u32 *op)
{
int h1, h2;
int i, j, addr;
......@@ -98,8 +95,7 @@ int saa7146_i2c_msg_prepare(const struct i2c_msg m[], int num, u32 *op)
which bytes were read through the adapter and write them back to the corresponding
i2c-message. but instead, we simply write back all bytes.
fixme: this could be improved. */
static
int saa7146_i2c_msg_cleanup(const struct i2c_msg m[], int num, u32 *op)
static int saa7146_i2c_msg_cleanup(const struct i2c_msg m[], int num, u32 *op)
{
int i, j;
int op_count = 0;
......@@ -121,8 +117,7 @@ int saa7146_i2c_msg_cleanup(const struct i2c_msg m[], int num, u32 *op)
}
/* this functions resets the i2c-device and returns 0 if everything was fine, otherwise -1 */
static
int saa7146_i2c_reset(struct saa7146_dev *dev)
static int saa7146_i2c_reset(struct saa7146_dev *dev)
{
/* get current status */
u32 status = saa7146_i2c_status(dev);
......@@ -186,8 +181,7 @@ int saa7146_i2c_reset(struct saa7146_dev *dev)
/* this functions writes out the data-byte 'dword' to the i2c-device.
it returns 0 if ok, -1 if the transfer failed, -2 if the transfer
failed badly (e.g. address error) */
static
int saa7146_i2c_writeout(struct saa7146_dev *dev, u32* dword)
static int saa7146_i2c_writeout(struct saa7146_dev *dev, u32* dword)
{
u32 status = 0, mc2 = 0;
int timeout;
......@@ -373,8 +367,7 @@ int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg msgs[], i
}
/* utility functions */
static
int saa7146_i2c_xfer(struct i2c_adapter* adapter, struct i2c_msg msg[], int num)
static int saa7146_i2c_xfer(struct i2c_adapter* adapter, struct i2c_msg msg[], int num)
{
struct saa7146_dev* dev = i2c_get_adapdata(adapter);
......@@ -388,8 +381,7 @@ int saa7146_i2c_xfer(struct i2c_adapter* adapter, struct i2c_msg msg[], int num)
#include <linux/i2c-id.h>
/* exported algorithm data */
static
struct i2c_algorithm saa7146_algo = {
static struct i2c_algorithm saa7146_algo = {
.name = "saa7146 i2c algorithm",
.id = I2C_ALGO_SAA7146,
.master_xfer = saa7146_i2c_xfer,
......
drivers/media/common/saa7146_vbi.c
View file @ cfa89a3e
......@@ -2,17 +2,14 @@
static int vbi_pixel_to_capture = 720 * 2;
#define WRITE_RPS1(x) dev->d_rps1.cpu_addr[ count++ ] = cpu_to_le32(x)
static
int vbi_workaround(struct saa7146_dev *dev)
static int vbi_workaround(struct saa7146_dev *dev)
{
struct saa7146_vv *vv = dev->vv_data;
u32 *cpu;
dma_addr_t dma_addr;
int i, count;
int i;
DECLARE_WAITQUEUE(wait, current);
......@@ -36,19 +33,6 @@ int vbi_workaround(struct saa7146_dev *dev)
saa7146_write(dev, NUM_LINE_BYTE3, (2<<16)|((vbi_pixel_to_capture)<<0));
saa7146_write(dev, MC2, MASK_04|MASK_20);
/* we have to do the workaround two times to be sure that
everything is ok */
for(i = 0; i < 2; i++) {
/* indicate to the irq handler that we do the workaround */
saa7146_write(dev, MC2, MASK_31|MASK_15);
saa7146_write(dev, NUM_LINE_BYTE3, (1<<16)|(2<<0));
saa7146_write(dev, MC2, MASK_04|MASK_20);
count = 0;
/* load brs-control register */
WRITE_RPS1(CMD_WR_REG | (1 << 8) | (BRS_CTRL/4));
/* BXO = 1h, BRS to outbound */
......@@ -85,6 +69,16 @@ int vbi_workaround(struct saa7146_dev *dev)
/* stop rps1 */
WRITE_RPS1(CMD_STOP);
/* we have to do the workaround twice to be sure that
everything is ok */
for(i = 0; i < 2; i++) {
/* indicate to the irq handler that we do the workaround */
saa7146_write(dev, MC2, MASK_31|MASK_15);
saa7146_write(dev, NUM_LINE_BYTE3, (1<<16)|(2<<0));
saa7146_write(dev, MC2, MASK_04|MASK_20);
/* enable rps1 irqs */
IER_ENABLE(dev,MASK_28);
......@@ -194,8 +188,7 @@ void saa7146_set_vbi_capture(struct saa7146_dev *dev, struct saa7146_buf *buf, s
saa7146_write(dev, MC1, (MASK_13 | MASK_29));
}
static
int buffer_activate(struct saa7146_dev *dev,
static int buffer_activate(struct saa7146_dev *dev,
struct saa7146_buf *buf,
struct saa7146_buf *next)
{
......@@ -209,8 +202,7 @@ int buffer_activate(struct saa7146_dev *dev,
return 0;
}
static
int buffer_prepare(struct file *file, struct videobuf_buffer *vb,enum v4l2_field field)
static int buffer_prepare(struct file *file, struct videobuf_buffer *vb,enum v4l2_field field)
{
struct saa7146_fh *fh = file->private_data;
struct saa7146_dev *dev = fh->dev;
......@@ -259,8 +251,7 @@ int buffer_prepare(struct file *file, struct videobuf_buffer *vb,enum v4l2_field
return err;
}
static int
buffer_setup(struct file *file, unsigned int *count, unsigned int *size)
static int buffer_setup(struct file *file, unsigned int *count, unsigned int *size)
{
int llength,lines;
......@@ -275,8 +266,7 @@ buffer_setup(struct file *file, unsigned int *count, unsigned int *size)
return 0;
}
static
void buffer_queue(struct file *file, struct videobuf_buffer *vb)
static void buffer_queue(struct file *file, struct videobuf_buffer *vb)
{
struct saa7146_fh *fh = file->private_data;
struct saa7146_dev *dev = fh->dev;
......@@ -287,8 +277,7 @@ void buffer_queue(struct file *file, struct videobuf_buffer *vb)
saa7146_buffer_queue(dev,&vv->vbi_q,buf);
}
static
void buffer_release(struct file *file, struct videobuf_buffer *vb)
static void buffer_release(struct file *file, struct videobuf_buffer *vb)
{
struct saa7146_fh *fh = file->private_data;
struct saa7146_dev *dev = fh->dev;
......@@ -298,8 +287,7 @@ void buffer_release(struct file *file, struct videobuf_buffer *vb)
saa7146_dma_free(dev,buf);
}
static
struct videobuf_queue_ops vbi_qops = {
static struct videobuf_queue_ops vbi_qops = {
.buf_setup = buffer_setup,
.buf_prepare = buffer_prepare,
.buf_queue = buffer_queue,
......@@ -308,8 +296,7 @@ struct videobuf_queue_ops vbi_qops = {
/* ------------------------------------------------------------------ */
static
void vbi_stop(struct saa7146_fh *fh)
static void vbi_stop(struct saa7146_fh *fh)
{
struct saa7146_dev *dev = fh->dev;
struct saa7146_vv *vv = dev->vv_data;
......@@ -331,8 +318,7 @@ void vbi_stop(struct saa7146_fh *fh)
spin_unlock_irqrestore(&dev->slock, flags);
}
static
void vbi_read_timeout(unsigned long data)
static void vbi_read_timeout(unsigned long data)
{
struct saa7146_fh *fh = (struct saa7146_fh *)data;
struct saa7146_dev *dev = fh->dev;
......@@ -342,8 +328,7 @@ void vbi_read_timeout(unsigned long data)
vbi_stop(fh);
}
static
void vbi_init(struct saa7146_dev *dev, struct saa7146_vv *vv)
static void vbi_init(struct saa7146_dev *dev, struct saa7146_vv *vv)
{
DEB_VBI(("dev:%p\n",dev));
......@@ -357,8 +342,7 @@ void vbi_init(struct saa7146_dev *dev, struct saa7146_vv *vv)
init_waitqueue_head(&vv->vbi_wq);
}
static
void vbi_open(struct saa7146_dev *dev, struct saa7146_fh *fh)
static void vbi_open(struct saa7146_dev *dev, struct saa7146_fh *fh)
{
DEB_VBI(("dev:%p, fh:%p\n",dev,fh));
......@@ -389,8 +373,7 @@ void vbi_open(struct saa7146_dev *dev, struct saa7146_fh *fh)
vbi_workaround(dev);
}
static
void vbi_close(struct saa7146_dev *dev, struct saa7146_fh *fh, struct file *file)
static void vbi_close(struct saa7146_dev *dev, struct saa7146_fh *fh, struct file *file)
{
struct saa7146_vv *vv = dev->vv_data;
DEB_VBI(("dev:%p, fh:%p\n",dev,fh));
......@@ -400,8 +383,7 @@ void vbi_close(struct saa7146_dev *dev, struct saa7146_fh *fh, struct file *file
}
}
static
void vbi_irq_done(struct saa7146_dev *dev, unsigned long status)
static void vbi_irq_done(struct saa7146_dev *dev, unsigned long status)
{
struct saa7146_vv *vv = dev->vv_data;
spin_lock(&dev->slock);
......@@ -420,8 +402,7 @@ void vbi_irq_done(struct saa7146_dev *dev, unsigned long status)
spin_unlock(&dev->slock);
}
static
ssize_t vbi_read(struct file *file, char *data, size_t count, loff_t *ppos)
static ssize_t vbi_read(struct file *file, char *data, size_t count, loff_t *ppos)
{
struct saa7146_fh *fh = file->private_data;
struct saa7146_dev *dev = fh->dev;
......
drivers/media/common/saa7146_video.c
View file @ cfa89a3e
#include <media/saa7146_vv.h>
static
int memory = 32;
static int memory = 32;
MODULE_PARM(memory,"i");
MODULE_PARM_DESC(memory, "maximum memory usage for capture buffers (default: 32Mb)");
/* format descriptions for capture and preview */
static
struct saa7146_format formats[] = {
static struct saa7146_format formats[] = {
{
.name = "RGB-8 (3-3-2)",
.pixelformat = V4L2_PIX_FMT_RGB332,
......@@ -63,8 +61,7 @@ struct saa7146_format formats[] = {
due to this, it's impossible to provide additional *packed* formats, which are simply byte swapped
(like V4L2_PIX_FMT_YUYV) ... 8-( */
static
int NUM_FORMATS = sizeof(formats)/sizeof(struct saa7146_format);
static int NUM_FORMATS = sizeof(formats)/sizeof(struct saa7146_format);
struct saa7146_format* format_by_fourcc(struct saa7146_dev *dev, int fourcc)
{
......@@ -80,8 +77,7 @@ struct saa7146_format* format_by_fourcc(struct saa7146_dev *dev, int fourcc)
return NULL;
}
static
int g_fmt(struct saa7146_fh *fh, struct v4l2_format *f)
static int g_fmt(struct saa7146_fh *fh, struct v4l2_format *f)
{
struct saa7146_dev *dev = fh->dev;
DEB_EE(("dev:%p, fh:%p\n",dev,fh));
......@@ -104,8 +100,7 @@ int g_fmt(struct saa7146_fh *fh, struct v4l2_format *f)
}
}
static
int try_win(struct saa7146_dev *dev, struct v4l2_window *win)
static int try_win(struct saa7146_dev *dev, struct v4l2_window *win)
{
struct saa7146_vv *vv = dev->vv_data;
enum v4l2_field field;
......@@ -161,8 +156,7 @@ int try_win(struct saa7146_dev *dev, struct v4l2_window *win)
return 0;
}
static
int try_fmt(struct saa7146_fh *fh, struct v4l2_format *f)
static int try_fmt(struct saa7146_fh *fh, struct v4l2_format *f)
{
struct saa7146_dev *dev = fh->dev;
struct saa7146_vv *vv = dev->vv_data;
......@@ -226,8 +220,7 @@ int try_fmt(struct saa7146_fh *fh, struct v4l2_format *f)
}
}
static
int start_preview(struct saa7146_fh *fh)
static int start_preview(struct saa7146_fh *fh)
{
struct saa7146_dev *dev = fh->dev;
struct saa7146_vv *vv = dev->vv_data;
......@@ -273,8 +266,7 @@ int start_preview(struct saa7146_fh *fh)
return 0;
}
static
int stop_preview(struct saa7146_fh *fh)
static int stop_preview(struct saa7146_fh *fh)
{
struct saa7146_dev *dev = fh->dev;
struct saa7146_vv *vv = dev->vv_data;
......@@ -298,8 +290,7 @@ int stop_preview(struct saa7146_fh *fh)
return 0;
}
static
int s_fmt(struct saa7146_fh *fh, struct v4l2_format *f)
static int s_fmt(struct saa7146_fh *fh, struct v4l2_format *f)
{
struct saa7146_dev *dev = fh->dev;
struct saa7146_vv *vv = dev->vv_data;
......@@ -358,8 +349,7 @@ int s_fmt(struct saa7146_fh *fh, struct v4l2_format *f)
/********************************************************************************/
/* device controls */
static
struct v4l2_queryctrl controls[] = {
static struct v4l2_queryctrl controls[] = {
{
id: V4L2_CID_BRIGHTNESS,
name: "Brightness",
......@@ -398,13 +388,11 @@ struct v4l2_queryctrl controls[] = {
type: V4L2_CTRL_TYPE_BOOLEAN,
},
};
static
int NUM_CONTROLS = sizeof(controls)/sizeof(struct v4l2_queryctrl);
static int NUM_CONTROLS = sizeof(controls)/sizeof(struct v4l2_queryctrl);
#define V4L2_CID_PRIVATE_LASTP1 (V4L2_CID_PRIVATE_BASE + 0)
static
struct v4l2_queryctrl* ctrl_by_id(int id)
static struct v4l2_queryctrl* ctrl_by_id(int id)
{
int i;
......@@ -414,8 +402,7 @@ struct v4l2_queryctrl* ctrl_by_id(int id)
return NULL;
}
static
int get_control(struct saa7146_fh *fh, struct v4l2_control *c)
static int get_control(struct saa7146_fh *fh, struct v4l2_control *c)
{
struct saa7146_dev *dev = fh->dev;
struct saa7146_vv *vv = dev->vv_data;
......@@ -457,8 +444,7 @@ int get_control(struct saa7146_fh *fh, struct v4l2_control *c)
return 0;
}
static
int set_control(struct saa7146_fh *fh, struct v4l2_control *c)
static int set_control(struct saa7146_fh *fh, struct v4l2_control *c)
{
struct saa7146_dev *dev = fh->dev;
struct saa7146_vv *vv = dev->vv_data;
......@@ -548,8 +534,7 @@ int set_control(struct saa7146_fh *fh, struct v4l2_control *c)
/********************************************************************************/
/* common pagetable functions */
static
int saa7146_pgtable_build(struct saa7146_dev *dev, struct saa7146_buf *buf)
static int saa7146_pgtable_build(struct saa7146_dev *dev, struct saa7146_buf *buf)
{
struct pci_dev *pci = dev->pci;
struct scatterlist *list = buf->vb.dma.sglist;
......@@ -667,8 +652,7 @@ int saa7146_pgtable_build(struct saa7146_dev *dev, struct saa7146_buf *buf)
/********************************************************************************/
/* file operations */
static
int video_begin(struct saa7146_fh *fh)
static int video_begin(struct saa7146_fh *fh)
{
struct saa7146_dev *dev = fh->dev;
struct saa7146_vv *vv = dev->vv_data;
......@@ -701,8 +685,7 @@ int video_begin(struct saa7146_fh *fh)
return 0;
}
static
int video_end(struct saa7146_fh *fh)
static int video_end(struct saa7146_fh *fh)
{
struct saa7146_dev *dev = fh->dev;
struct saa7146_vv *vv = dev->vv_data;
......@@ -1115,8 +1098,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
/*********************************************************************************/
/* buffer handling functions */
static
int buffer_activate (struct saa7146_dev *dev,
static int buffer_activate (struct saa7146_dev *dev,
struct saa7146_buf *buf,
struct saa7146_buf *next)
{
......@@ -1129,8 +1111,7 @@ int buffer_activate (struct saa7146_dev *dev,
return 0;
}
static
int buffer_prepare(struct file *file, struct videobuf_buffer *vb, enum v4l2_field field)
static int buffer_prepare(struct file *file, struct videobuf_buffer *vb, enum v4l2_field field)
{
struct saa7146_fh *fh = file->private_data;
struct saa7146_dev *dev = fh->dev;
......@@ -1208,8 +1189,7 @@ int buffer_prepare(struct file *file, struct videobuf_buffer *vb, enum v4l2_fiel
return err;
}
static
int buffer_setup(struct file *file, unsigned int *count, unsigned int *size)
static int buffer_setup(struct file *file, unsigned int *count, unsigned int *size)
{
struct saa7146_fh *fh = file->private_data;
......@@ -1228,8 +1208,7 @@ int buffer_setup(struct file *file, unsigned int *count, unsigned int *size)
return 0;
}
static
void buffer_queue(struct file *file, struct videobuf_buffer *vb)
static void buffer_queue(struct file *file, struct videobuf_buffer *vb)
{
struct saa7146_fh *fh = file->private_data;
struct saa7146_dev *dev = fh->dev;
......@@ -1241,8 +1220,7 @@ void buffer_queue(struct file *file, struct videobuf_buffer *vb)
}
static
void buffer_release(struct file *file, struct videobuf_buffer *vb)
static void buffer_release(struct file *file, struct videobuf_buffer *vb)
{
struct saa7146_fh *fh = file->private_data;
struct saa7146_dev *dev = fh->dev;
......@@ -1252,8 +1230,7 @@ void buffer_release(struct file *file, struct videobuf_buffer *vb)
saa7146_dma_free(dev,buf);
}
static
struct videobuf_queue_ops video_qops = {
static struct videobuf_queue_ops video_qops = {
.buf_setup = buffer_setup,
.buf_prepare = buffer_prepare,
.buf_queue = buffer_queue,
......@@ -1263,8 +1240,7 @@ struct videobuf_queue_ops video_qops = {
/********************************************************************************/
/* file operations */
static
void video_init(struct saa7146_dev *dev, struct saa7146_vv *vv)
static void video_init(struct saa7146_dev *dev, struct saa7146_vv *vv)
{
INIT_LIST_HEAD(&vv->video_q.queue);
......@@ -1282,8 +1258,7 @@ void video_init(struct saa7146_dev *dev, struct saa7146_vv *vv)
}
static
void video_open(struct saa7146_dev *dev, struct saa7146_fh *fh)
static void video_open(struct saa7146_dev *dev, struct saa7146_fh *fh)
{
struct saa7146_format *sfmt;
......@@ -1304,8 +1279,7 @@ void video_open(struct saa7146_dev *dev, struct saa7146_fh *fh)
}
static
void video_close(struct saa7146_dev *dev, struct saa7146_fh *fh, struct file *file)
static void video_close(struct saa7146_dev *dev, struct saa7146_fh *fh, struct file *file)
{
struct saa7146_vv *vv = dev->vv_data;
unsigned long flags;
......@@ -1326,8 +1300,7 @@ void video_close(struct saa7146_dev *dev, struct saa7146_fh *fh, struct file *fi
}
static
void video_irq_done(struct saa7146_dev *dev, unsigned long st)
static void video_irq_done(struct saa7146_dev *dev, unsigned long st)
{
struct saa7146_vv *vv = dev->vv_data;
struct saa7146_dmaqueue *q = &vv->video_q;
......@@ -1344,8 +1317,7 @@ void video_irq_done(struct saa7146_dev *dev, unsigned long st)
spin_unlock(&dev->slock);
}
static
ssize_t video_read(struct file *file, char *data, size_t count, loff_t *ppos)
static ssize_t video_read(struct file *file, char *data, size_t count, loff_t *ppos)
{
struct saa7146_fh *fh = file->private_data;
struct saa7146_dev *dev = fh->dev;
......
drivers/media/dvb/dvb-core/demux.h
View file @ cfa89a3e
......@@ -25,7 +25,7 @@
#ifndef __DEMUX_H
#define __DEMUX_H
#include <asm/types.h>
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/list.h>
#include <linux/time.h>
......
drivers/media/dvb/dvb-core/dmxdev.c
View file @ cfa89a3e
......@@ -21,8 +21,6 @@
*
*/
#include <asm/uaccess.h>
#include <asm/system.h>
#include <linux/spinlock.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
......@@ -31,6 +29,8 @@
#include <linux/poll.h>
#include <linux/ioctl.h>
#include <linux/wait.h>
#include <asm/uaccess.h>
#include <asm/system.h>
#include "dmxdev.h"
#include "dvb_functions.h"
......@@ -52,8 +52,7 @@ dvb_dmxdev_file_to_dvr(struct dmxdev *dmxdev, struct file *file)
return (struct dmxdev_dvr *) file->private_data;
}
static inline void
dvb_dmxdev_buffer_init(struct dmxdev_buffer *buffer)
static inline void dvb_dmxdev_buffer_init(struct dmxdev_buffer *buffer)
{
buffer->data=0;
buffer->size=8192;
......@@ -63,8 +62,7 @@ dvb_dmxdev_buffer_init(struct dmxdev_buffer *buffer)
init_waitqueue_head(&buffer->queue);
}
static inline
int dvb_dmxdev_buffer_write(struct dmxdev_buffer *buf, const u8 *src, int len)
static inline int dvb_dmxdev_buffer_write(struct dmxdev_buffer *buf, const u8 *src, int len)
{
int split;
int free;
......@@ -98,9 +96,8 @@ int dvb_dmxdev_buffer_write(struct dmxdev_buffer *buf, const u8 *src, int len)
return len;
}
static ssize_t
dvb_dmxdev_buffer_read(struct dmxdev_buffer *src, int non_blocking,
char *buf, size_t count, loff_t *ppos)
static ssize_t dvb_dmxdev_buffer_read(struct dmxdev_buffer *src,
int non_blocking, char *buf, size_t count, loff_t *ppos)
{
unsigned long todo=count;
int split, avail, error;
......@@ -159,8 +156,7 @@ dvb_dmxdev_buffer_read(struct dmxdev_buffer *src, int non_blocking,
return count;
}
static struct dmx_frontend *
get_fe(struct dmx_demux *demux, int type)
static struct dmx_frontend * get_fe(struct dmx_demux *demux, int type)
{
struct list_head *head, *pos;
......@@ -174,8 +170,7 @@ get_fe(struct dmx_demux *demux, int type)
return 0;
}
static inline void
dvb_dmxdev_dvr_state_set(struct dmxdev_dvr *dmxdevdvr, int state)
static inline void dvb_dmxdev_dvr_state_set(struct dmxdev_dvr *dmxdevdvr, int state)
{
spin_lock_irq(&dmxdevdvr->dev->lock);
dmxdevdvr->state=state;
......@@ -258,8 +253,8 @@ static int dvb_dvr_release(struct inode *inode, struct file *file)
return 0;
}
static ssize_t
dvb_dvr_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
static ssize_t dvb_dvr_write(struct file *file, const char *buf,
size_t count, loff_t *ppos)
{
struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
struct dmxdev *dmxdev=(struct dmxdev *) dvbdev->priv;
......@@ -276,8 +271,8 @@ dvb_dvr_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
return ret;
}
static ssize_t
dvb_dvr_read(struct file *file, char *buf, size_t count, loff_t *ppos)
static ssize_t dvb_dvr_read(struct file *file, char *buf, size_t count,
loff_t *ppos)
{
struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
struct dmxdev *dmxdev=(struct dmxdev *) dvbdev->priv;
......@@ -291,16 +286,14 @@ dvb_dvr_read(struct file *file, char *buf, size_t count, loff_t *ppos)
return ret;
}
static inline void
dvb_dmxdev_filter_state_set(struct dmxdev_filter *dmxdevfilter, int state)
static inline void dvb_dmxdev_filter_state_set(struct dmxdev_filter *dmxdevfilter, int state)
{
spin_lock_irq(&dmxdevfilter->dev->lock);
dmxdevfilter->state=state;
spin_unlock_irq(&dmxdevfilter->dev->lock);
}
static int
dvb_dmxdev_set_buffer_size(struct dmxdev_filter *dmxdevfilter, unsigned long size)
static int dvb_dmxdev_set_buffer_size(struct dmxdev_filter *dmxdevfilter, unsigned long size)
{
struct dmxdev_buffer *buf=&dmxdevfilter->buffer;
void *mem;
......@@ -329,8 +322,7 @@ dvb_dmxdev_set_buffer_size(struct dmxdev_filter *dmxdevfilter, unsigned long siz
return 0;
}
static void
dvb_dmxdev_filter_timeout(unsigned long data)
static void dvb_dmxdev_filter_timeout(unsigned long data)
{
struct dmxdev_filter *dmxdevfilter=(struct dmxdev_filter *)data;
......@@ -341,8 +333,7 @@ dvb_dmxdev_filter_timeout(unsigned long data)
wake_up(&dmxdevfilter->buffer.queue);
}
static void
dvb_dmxdev_filter_timer(struct dmxdev_filter *dmxdevfilter)
static void dvb_dmxdev_filter_timer(struct dmxdev_filter *dmxdevfilter)
{
struct dmx_sct_filter_params *para=&dmxdevfilter->params.sec;
......@@ -355,8 +346,7 @@ dvb_dmxdev_filter_timer(struct dmxdev_filter *dmxdevfilter)
}
}
static int
dvb_dmxdev_section_callback(const u8 *buffer1, size_t buffer1_len,
static int dvb_dmxdev_section_callback(const u8 *buffer1, size_t buffer1_len,
const u8 *buffer2, size_t buffer2_len,
struct dmx_section_filter *filter, enum dmx_success success)
{
......@@ -392,8 +382,7 @@ dvb_dmxdev_section_callback(const u8 *buffer1, size_t buffer1_len,
return 0;
}
static int
dvb_dmxdev_ts_callback(const u8 *buffer1, size_t buffer1_len,
static int dvb_dmxdev_ts_callback(const u8 *buffer1, size_t buffer1_len,
const u8 *buffer2, size_t buffer2_len,
struct dmx_ts_feed *feed, enum dmx_success success)
{
......@@ -431,8 +420,7 @@ dvb_dmxdev_ts_callback(const u8 *buffer1, size_t buffer1_len,
/* stop feed but only mark the specified filter as stopped (state set) */
static int
dvb_dmxdev_feed_stop(struct dmxdev_filter *dmxdevfilter)
static int dvb_dmxdev_feed_stop(struct dmxdev_filter *dmxdevfilter)
{
dvb_dmxdev_filter_state_set(dmxdevfilter, DMXDEV_STATE_SET);
......@@ -453,8 +441,7 @@ dvb_dmxdev_feed_stop(struct dmxdev_filter *dmxdevfilter)
/* start feed associated with the specified filter */
static
int dvb_dmxdev_feed_start(struct dmxdev_filter *filter)
static int dvb_dmxdev_feed_start(struct dmxdev_filter *filter)
{
dvb_dmxdev_filter_state_set (filter, DMXDEV_STATE_GO);
......@@ -476,8 +463,7 @@ int dvb_dmxdev_feed_start(struct dmxdev_filter *filter)
/* restart section feed if it has filters left associated with it,
otherwise release the feed */
static
int dvb_dmxdev_feed_restart(struct dmxdev_filter *filter)
static int dvb_dmxdev_feed_restart(struct dmxdev_filter *filter)
{
int i;
struct dmxdev *dmxdev = filter->dev;
......@@ -496,8 +482,7 @@ int dvb_dmxdev_feed_restart(struct dmxdev_filter *filter)
return 0;
}
static int
dvb_dmxdev_filter_stop(struct dmxdev_filter *dmxdevfilter)
static int dvb_dmxdev_filter_stop(struct dmxdev_filter *dmxdevfilter)
{
if (dmxdevfilter->state<DMXDEV_STATE_GO)
return 0;
......@@ -532,8 +517,7 @@ dvb_dmxdev_filter_stop(struct dmxdev_filter *dmxdevfilter)
return 0;
}
static inline int
dvb_dmxdev_filter_reset(struct dmxdev_filter *dmxdevfilter)
static inline int dvb_dmxdev_filter_reset(struct dmxdev_filter *dmxdevfilter)
{
if (dmxdevfilter->state<DMXDEV_STATE_SET)
return 0;
......@@ -544,8 +528,7 @@ dvb_dmxdev_filter_reset(struct dmxdev_filter *dmxdevfilter)
return 0;
}
static int
dvb_dmxdev_filter_start(struct dmxdev_filter *filter)
static int dvb_dmxdev_filter_start(struct dmxdev_filter *filter)
{
struct dmxdev *dmxdev = filter->dev;
void *mem;
......@@ -742,8 +725,7 @@ static int dvb_demux_open(struct inode *inode, struct file *file)
}
static
int dvb_dmxdev_filter_free(struct dmxdev *dmxdev, struct dmxdev_filter *dmxdevfilter)
static int dvb_dmxdev_filter_free(struct dmxdev *dmxdev, struct dmxdev_filter *dmxdevfilter)
{
if (down_interruptible(&dmxdev->mutex))
return -ERESTARTSYS;
......@@ -772,8 +754,7 @@ int dvb_dmxdev_filter_free(struct dmxdev *dmxdev, struct dmxdev_filter *dmxdevfi
return 0;
}
static inline void
invert_mode(dmx_filter_t *filter)
static inline void invert_mode(dmx_filter_t *filter)
{
int i;
......@@ -782,8 +763,7 @@ invert_mode(dmx_filter_t *filter)
}
static int
dvb_dmxdev_filter_set(struct dmxdev *dmxdev,
static int dvb_dmxdev_filter_set(struct dmxdev *dmxdev,
struct dmxdev_filter *dmxdevfilter,
struct dmx_sct_filter_params *params)
{
......@@ -804,8 +784,7 @@ dvb_dmxdev_filter_set(struct dmxdev *dmxdev,
return 0;
}
static int
dvb_dmxdev_pes_filter_set(struct dmxdev *dmxdev,
static int dvb_dmxdev_pes_filter_set(struct dmxdev *dmxdev,
struct dmxdev_filter *dmxdevfilter,
struct dmx_pes_filter_params *params)
{
......@@ -826,9 +805,8 @@ dvb_dmxdev_pes_filter_set(struct dmxdev *dmxdev,
return 0;
}
static ssize_t
dvb_dmxdev_read_sec(struct dmxdev_filter *dfil, struct file *file,
char *buf, size_t count, loff_t *ppos)
static ssize_t dvb_dmxdev_read_sec(struct dmxdev_filter *dfil,
struct file *file, char *buf, size_t count, loff_t *ppos)
{
int result, hcount;
int done=0;
......@@ -985,8 +963,7 @@ static int dvb_demux_ioctl(struct inode *inode, struct file *file,
}
static
unsigned int dvb_demux_poll (struct file *file, poll_table *wait)
static unsigned int dvb_demux_poll (struct file *file, poll_table *wait)
{
struct dmxdev_filter *dmxdevfilter = dvb_dmxdev_file_to_filter(file);
unsigned int mask = 0;
......@@ -1011,8 +988,7 @@ unsigned int dvb_demux_poll (struct file *file, poll_table *wait)
}
static
int dvb_demux_release(struct inode *inode, struct file *file)
static int dvb_demux_release(struct inode *inode, struct file *file)
{
struct dmxdev_filter *dmxdevfilter = dvb_dmxdev_file_to_filter(file);
struct dmxdev *dmxdev = dmxdevfilter->dev;
......@@ -1067,8 +1043,7 @@ static int dvb_dvr_ioctl(struct inode *inode, struct file *file,
}
static
unsigned int dvb_dvr_poll (struct file *file, poll_table *wait)
static unsigned int dvb_dvr_poll (struct file *file, poll_table *wait)
{
struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
struct dmxdev *dmxdev = (struct dmxdev *) dvbdev->priv;
......@@ -1091,8 +1066,7 @@ unsigned int dvb_dvr_poll (struct file *file, poll_table *wait)
}
static
struct file_operations dvb_dvr_fops = {
static struct file_operations dvb_dvr_fops = {
.owner = THIS_MODULE,
.read = dvb_dvr_read,
.write = dvb_dvr_write,
......@@ -1102,8 +1076,7 @@ struct file_operations dvb_dvr_fops = {
.poll = dvb_dvr_poll,
};
static
struct dvb_device dvbdev_dvr = {
static struct dvb_device dvbdev_dvr = {
.priv = 0,
.users = 1,
.writers = 1,
......
drivers/media/dvb/dvb-core/dmxdev.h
View file @ cfa89a3e
......@@ -24,14 +24,14 @@
#ifndef _DMXDEV_H_
#define _DMXDEV_H_
#include <asm/types.h>
#include <asm/semaphore.h>
#include <linux/types.h>
#include <linux/spinlock.h>
#include <linux/kernel.h>
#include <linux/timer.h>
#include <linux/wait.h>
#include <linux/fs.h>
#include <linux/string.h>
#include <asm/semaphore.h>
#include <linux/dvb/dmx.h>
......
drivers/media/dvb/dvb-core/dvb_demux.c
View file @ cfa89a3e
......@@ -21,7 +21,6 @@
*
*/
#include <asm/uaccess.h>
#include <linux/spinlock.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
......@@ -29,6 +28,7 @@
#include <linux/poll.h>
#include <linux/string.h>
#include <linux/crc32.h>
#include <asm/uaccess.h>
#include "dvb_demux.h"
#include "dvb_functions.h"
......@@ -75,22 +75,19 @@ struct list_head *dmx_get_demuxes(void)
******************************************************************************/
static inline
u16 section_length(const u8 *buf)
static inline u16 section_length(const u8 *buf)
{
return 3+((buf[1]&0x0f)<<8)+buf[2];
}
static inline
u16 ts_pid(const u8 *buf)
static inline u16 ts_pid(const u8 *buf)
{
return ((buf[1]&0x1f)<<8)+buf[2];
}
static inline
int payload(const u8 *tsp)
static inline int payload(const u8 *tsp)
{
if (!(tsp[3]&0x10)) // no payload?
return 0;
......@@ -117,15 +114,13 @@ void dvb_set_crc32(u8 *data, int length)
}
static
u32 dvb_dmx_crc32 (struct dvb_demux_feed *f, const u8 *src, size_t len)
static u32 dvb_dmx_crc32 (struct dvb_demux_feed *f, const u8 *src, size_t len)
{
return (f->feed.sec.crc_val = crc32_le (f->feed.sec.crc_val, src, len));
}
static
void dvb_dmx_memcopy (struct dvb_demux_feed *f, u8 *d, const u8 *s, size_t len)
static void dvb_dmx_memcopy (struct dvb_demux_feed *f, u8 *d, const u8 *s, size_t len)
{
memcpy (d, s, len);
}
......@@ -135,8 +130,7 @@ void dvb_dmx_memcopy (struct dvb_demux_feed *f, u8 *d, const u8 *s, size_t len)
* Software filter functions
******************************************************************************/
static inline
int dvb_dmx_swfilter_payload (struct dvb_demux_feed *feed, const u8 *buf)
static inline int dvb_dmx_swfilter_payload (struct dvb_demux_feed *feed, const u8 *buf)
{
int count = payload(buf);
int p;
......@@ -165,8 +159,7 @@ int dvb_dmx_swfilter_payload (struct dvb_demux_feed *feed, const u8 *buf)
}
static
int dvb_dmx_swfilter_sectionfilter (struct dvb_demux_feed *feed,
static int dvb_dmx_swfilter_sectionfilter (struct dvb_demux_feed *feed,
struct dvb_demux_filter *f)
{
u8 neq = 0;
......@@ -189,8 +182,7 @@ int dvb_dmx_swfilter_sectionfilter (struct dvb_demux_feed *feed,
}
static inline
int dvb_dmx_swfilter_section_feed (struct dvb_demux_feed *feed)
static inline int dvb_dmx_swfilter_section_feed (struct dvb_demux_feed *feed)
{
struct dvb_demux *demux = feed->demux;
struct dvb_demux_filter *f = feed->filter;
......@@ -222,8 +214,7 @@ int dvb_dmx_swfilter_section_feed (struct dvb_demux_feed *feed)
}
static
int dvb_dmx_swfilter_section_packet(struct dvb_demux_feed *feed, const u8 *buf)
static int dvb_dmx_swfilter_section_packet(struct dvb_demux_feed *feed, const u8 *buf)
{
struct dvb_demux *demux = feed->demux;
struct dmx_section_feed *sec = &feed->feed.sec;
......@@ -349,8 +340,7 @@ int dvb_dmx_swfilter_section_packet(struct dvb_demux_feed *feed, const u8 *buf)
}
static inline
void dvb_dmx_swfilter_packet_type(struct dvb_demux_feed *feed, const u8 *buf)
static inline void dvb_dmx_swfilter_packet_type(struct dvb_demux_feed *feed, const u8 *buf)
{
switch(feed->type) {
case DMX_TYPE_TS:
......@@ -442,8 +432,7 @@ void dvb_dmx_swfilter(struct dvb_demux *demux, const u8 *buf, size_t count)
}
static
struct dvb_demux_filter* dvb_dmx_filter_alloc(struct dvb_demux *demux)
static struct dvb_demux_filter * dvb_dmx_filter_alloc(struct dvb_demux *demux)
{
int i;
......@@ -459,8 +448,7 @@ struct dvb_demux_filter* dvb_dmx_filter_alloc(struct dvb_demux *demux)
return &demux->filter[i];
}
static
struct dvb_demux_feed* dvb_dmx_feed_alloc(struct dvb_demux *demux)
static struct dvb_demux_feed * dvb_dmx_feed_alloc(struct dvb_demux *demux)
{
int i;
......@@ -477,8 +465,7 @@ struct dvb_demux_feed* dvb_dmx_feed_alloc(struct dvb_demux *demux)
}
static
int dmx_pid_set (u16 pid, struct dvb_demux_feed *feed)
static int dmx_pid_set (u16 pid, struct dvb_demux_feed *feed)
{
struct dvb_demux *demux = feed->demux;
struct list_head *pos, *n, *head=&demux->feed_list;
......@@ -505,8 +492,7 @@ int dmx_pid_set (u16 pid, struct dvb_demux_feed *feed)
}
static
int dmx_ts_feed_set (struct dmx_ts_feed* ts_feed, u16 pid, int ts_type,
static int dmx_ts_feed_set (struct dmx_ts_feed* ts_feed, u16 pid, int ts_type,
enum dmx_ts_pes pes_type, size_t callback_length,
size_t circular_buffer_size, int descramble,
struct timespec timeout)
......@@ -581,8 +567,7 @@ int dmx_ts_feed_set (struct dmx_ts_feed* ts_feed, u16 pid, int ts_type,
}
static
int dmx_ts_feed_start_filtering(struct dmx_ts_feed* ts_feed)
static int dmx_ts_feed_start_filtering(struct dmx_ts_feed* ts_feed)
{
struct dvb_demux_feed *feed = (struct dvb_demux_feed *) ts_feed;
struct dvb_demux *demux = feed->demux;
......@@ -615,8 +600,7 @@ int dmx_ts_feed_start_filtering(struct dmx_ts_feed* ts_feed)
return 0;
}
static
int dmx_ts_feed_stop_filtering(struct dmx_ts_feed* ts_feed)
static int dmx_ts_feed_stop_filtering(struct dmx_ts_feed* ts_feed)
{
struct dvb_demux_feed *feed = (struct dvb_demux_feed *) ts_feed;
struct dvb_demux *demux = feed->demux;
......@@ -646,8 +630,7 @@ int dmx_ts_feed_stop_filtering(struct dmx_ts_feed* ts_feed)
return ret;
}
static
int dvbdmx_allocate_ts_feed (struct dmx_demux *dmx, struct dmx_ts_feed **ts_feed,
static int dvbdmx_allocate_ts_feed (struct dmx_demux *dmx, struct dmx_ts_feed **ts_feed,
dmx_ts_cb callback)
{
struct dvb_demux *demux = (struct dvb_demux *) dmx;
......@@ -692,8 +675,7 @@ int dvbdmx_allocate_ts_feed (struct dmx_demux *dmx, struct dmx_ts_feed **ts_feed
return 0;
}
static
int dvbdmx_release_ts_feed(struct dmx_demux *dmx, struct dmx_ts_feed *ts_feed)
static int dvbdmx_release_ts_feed(struct dmx_demux *dmx, struct dmx_ts_feed *ts_feed)
{
struct dvb_demux *demux = (struct dvb_demux *) dmx;
struct dvb_demux_feed *feed = (struct dvb_demux_feed *) ts_feed;
......@@ -738,8 +720,7 @@ int dvbdmx_release_ts_feed(struct dmx_demux *dmx, struct dmx_ts_feed *ts_feed)
* dmx_section_feed API calls
******************************************************************************/
static int
dmx_section_feed_allocate_filter(struct dmx_section_feed* feed,
static int dmx_section_feed_allocate_filter(struct dmx_section_feed* feed,
struct dmx_section_filter** filter)
{
struct dvb_demux_feed *dvbdmxfeed=(struct dvb_demux_feed *) feed;
......@@ -771,8 +752,7 @@ dmx_section_feed_allocate_filter(struct dmx_section_feed* feed,
}
static int
dmx_section_feed_set(struct dmx_section_feed* feed,
static int dmx_section_feed_set(struct dmx_section_feed* feed,
u16 pid, size_t circular_buffer_size,
int descramble, int check_crc)
{
......@@ -843,8 +823,7 @@ static void prepare_secfilters(struct dvb_demux_feed *dvbdmxfeed)
}
static int
dmx_section_feed_start_filtering(struct dmx_section_feed *feed)
static int dmx_section_feed_start_filtering(struct dmx_section_feed *feed)
{
struct dvb_demux_feed *dvbdmxfeed=(struct dvb_demux_feed *) feed;
struct dvb_demux *dvbdmx=dvbdmxfeed->demux;
......@@ -885,8 +864,7 @@ dmx_section_feed_start_filtering(struct dmx_section_feed *feed)
}
static int
dmx_section_feed_stop_filtering(struct dmx_section_feed* feed)
static int dmx_section_feed_stop_filtering(struct dmx_section_feed* feed)
{
struct dvb_demux_feed *dvbdmxfeed=(struct dvb_demux_feed *) feed;
struct dvb_demux *dvbdmx=dvbdmxfeed->demux;
......@@ -909,8 +887,7 @@ dmx_section_feed_stop_filtering(struct dmx_section_feed* feed)
}
static int
dmx_section_feed_release_filter(struct dmx_section_feed *feed,
static int dmx_section_feed_release_filter(struct dmx_section_feed *feed,
struct dmx_section_filter* filter)
{
struct dvb_demux_filter *dvbdmxfilter=(struct dvb_demux_filter *) filter, *f;
......@@ -1071,8 +1048,7 @@ static int dvbdmx_add_frontend(struct dmx_demux *demux, struct dmx_frontend *fro
}
static int
dvbdmx_remove_frontend(struct dmx_demux *demux, struct dmx_frontend *frontend)
static int dvbdmx_remove_frontend(struct dmx_demux *demux, struct dmx_frontend *frontend)
{
struct dvb_demux *dvbdemux=(struct dvb_demux *) demux;
struct list_head *pos, *n, *head=&dvbdemux->frontend_list;
......@@ -1087,8 +1063,7 @@ dvbdmx_remove_frontend(struct dmx_demux *demux, struct dmx_frontend *frontend)
}
static struct list_head *
dvbdmx_get_frontends(struct dmx_demux *demux)
static struct list_head * dvbdmx_get_frontends(struct dmx_demux *demux)
{
struct dvb_demux *dvbdemux=(struct dvb_demux *) demux;
......
drivers/media/dvb/dvb-core/dvb_demux.h
View file @ cfa89a3e
......@@ -25,10 +25,10 @@
#ifndef _DVB_DEMUX_H_
#define _DVB_DEMUX_H_
#include <asm/semaphore.h>
#include <linux/time.h>
#include <linux/timer.h>
#include <linux/spinlock.h>
#include <asm/semaphore.h>
#include "demux.h"
......
drivers/media/dvb/dvb-core/dvb_filter.c
View file @ cfa89a3e
......@@ -26,8 +26,7 @@ u32 ac3_frames[3][32] =
#if 0
static
void setup_ts2pes(ipack *pa, ipack *pv, u16 *pida, u16 *pidv,
static void setup_ts2pes(ipack *pa, ipack *pv, u16 *pida, u16 *pidv,
void (*pes_write)(u8 *buf, int count, void *data),
void *priv)
{
......@@ -41,8 +40,7 @@ void setup_ts2pes(ipack *pa, ipack *pv, u16 *pida, u16 *pidv,
#endif
#if 0
static
void ts_to_pes(ipack *p, u8 *buf) // don't need count (=188)
static void ts_to_pes(ipack *p, u8 *buf) // don't need count (=188)
{
u8 off = 0;
......@@ -68,8 +66,7 @@ void ts_to_pes(ipack *p, u8 *buf) // don't need count (=188)
#if 0
/* needs 5 byte input, returns picture coding type*/
static
int read_picture_header(u8 *headr, struct mpg_picture *pic, int field, int pr)
static int read_picture_header(u8 *headr, struct mpg_picture *pic, int field, int pr)
{
u8 pct;
......@@ -115,8 +112,7 @@ int read_picture_header(u8 *headr, struct mpg_picture *pic, int field, int pr)
#if 0
/* needs 4 byte input */
static
int read_gop_header(u8 *headr, struct mpg_picture *pic, int pr)
static int read_gop_header(u8 *headr, struct mpg_picture *pic, int pr)
{
if (pr) printk("GOP header: ");
......@@ -147,8 +143,7 @@ int read_gop_header(u8 *headr, struct mpg_picture *pic, int pr)
#if 0
/* needs 8 byte input */
static
int read_sequence_header(u8 *headr, struct dvb_video_info *vi, int pr)
static int read_sequence_header(u8 *headr, struct dvb_video_info *vi, int pr)
{
int sw;
int form = -1;
......@@ -262,8 +257,7 @@ int read_sequence_header(u8 *headr, struct dvb_video_info *vi, int pr)
#if 0
static
int get_vinfo(u8 *mbuf, int count, struct dvb_video_info *vi, int pr)
static int get_vinfo(u8 *mbuf, int count, struct dvb_video_info *vi, int pr)
{
u8 *headr;
int found = 0;
......@@ -292,8 +286,7 @@ int get_vinfo(u8 *mbuf, int count, struct dvb_video_info *vi, int pr)
#if 0
static
int get_ainfo(u8 *mbuf, int count, struct dvb_audio_info *ai, int pr)
static int get_ainfo(u8 *mbuf, int count, struct dvb_audio_info *ai, int pr)
{
u8 *headr;
int found = 0;
......@@ -399,8 +392,7 @@ int dvb_filter_get_ac3info(u8 *mbuf, int count, struct dvb_audio_info *ai, int p
#if 0
static
u8 *skip_pes_header(u8 **bufp)
static u8 *skip_pes_header(u8 **bufp)
{
u8 *inbuf = *bufp;
u8 *buf = inbuf;
......@@ -438,8 +430,7 @@ u8 *skip_pes_header(u8 **bufp)
#endif
#if 0
static
void initialize_quant_matrix( u32 *matrix )
static void initialize_quant_matrix( u32 *matrix )
{
int i;
......@@ -466,8 +457,7 @@ void initialize_quant_matrix( u32 *matrix )
#endif
#if 0
static
void initialize_mpg_picture(struct mpg_picture *pic)
static void initialize_mpg_picture(struct mpg_picture *pic)
{
int i;
......@@ -494,8 +484,7 @@ void initialize_mpg_picture(struct mpg_picture *pic)
#endif
#if 0
static
void mpg_set_picture_parameter( int32_t field_type, struct mpg_picture *pic )
static void mpg_set_picture_parameter( int32_t field_type, struct mpg_picture *pic )
{
int16_t last_h_offset;
int16_t last_v_offset;
......@@ -533,8 +522,7 @@ void mpg_set_picture_parameter( int32_t field_type, struct mpg_picture *pic )
#endif
#if 0
static
void init_mpg_picture( struct mpg_picture *pic, int chan, int32_t field_type)
static void init_mpg_picture( struct mpg_picture *pic, int chan, int32_t field_type)
{
pic->picture_header = 0;
pic->sequence_header_data
......
drivers/media/dvb/dvb-core/dvb_frontend.c
View file @ cfa89a3e
......@@ -22,8 +22,6 @@
* Or, point your browser to http://www.gnu.org/copyleft/gpl.html
*/
#include <asm/processor.h>
#include <asm/semaphore.h>
#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/sched.h>
......@@ -32,6 +30,8 @@
#include <linux/poll.h>
#include <linux/module.h>
#include <linux/list.h>
#include <asm/processor.h>
#include <asm/semaphore.h>
#include "dvb_frontend.h"
#include "dvbdev.h"
......@@ -102,8 +102,7 @@ static LIST_HEAD(frontend_notifier_list);
static DECLARE_MUTEX(frontend_mutex);
static
int dvb_frontend_internal_ioctl (struct dvb_frontend *frontend,
static int dvb_frontend_internal_ioctl (struct dvb_frontend *frontend,
unsigned int cmd, void *arg)
{
int err = -EOPNOTSUPP;
......@@ -131,8 +130,7 @@ int dvb_frontend_internal_ioctl (struct dvb_frontend *frontend,
* should make it still possible to receive the requested transponder
* on both tuners...
*/
static
void dvb_bend_frequency (struct dvb_frontend_data *this_fe, int recursive)
static void dvb_bend_frequency (struct dvb_frontend_data *this_fe, int recursive)
{
struct list_head *entry;
int stepsize = this_fe->info->frequency_stepsize;
......@@ -185,8 +183,7 @@ void dvb_bend_frequency (struct dvb_frontend_data *this_fe, int recursive)
}
static
void dvb_call_frontend_notifiers (struct dvb_frontend_data *fe,
static void dvb_call_frontend_notifiers (struct dvb_frontend_data *fe,
fe_status_t s)
{
dprintk ("%s\n", __FUNCTION__);
......@@ -210,8 +207,7 @@ void dvb_call_frontend_notifiers (struct dvb_frontend_data *fe,
}
static
void dvb_frontend_add_event (struct dvb_frontend_data *fe, fe_status_t status)
static void dvb_frontend_add_event (struct dvb_frontend_data *fe, fe_status_t status)
{
struct dvb_fe_events *events = &fe->events;
struct dvb_frontend_event *e;
......@@ -249,8 +245,7 @@ void dvb_frontend_add_event (struct dvb_frontend_data *fe, fe_status_t status)
}
static
int dvb_frontend_get_event (struct dvb_frontend_data *fe,
static int dvb_frontend_get_event (struct dvb_frontend_data *fe,
struct dvb_frontend_event *event, int flags)
{
struct dvb_fe_events *events = &fe->events;
......@@ -288,8 +283,7 @@ int dvb_frontend_get_event (struct dvb_frontend_data *fe,
}
static
int dvb_frontend_set_parameters (struct dvb_frontend_data *fe,
static int dvb_frontend_set_parameters (struct dvb_frontend_data *fe,
struct dvb_frontend_parameters *param,
int first_trial)
{
......@@ -321,8 +315,7 @@ int dvb_frontend_set_parameters (struct dvb_frontend_data *fe,
return err;
}
static
void dvb_frontend_init (struct dvb_frontend_data *fe)
static void dvb_frontend_init (struct dvb_frontend_data *fe)
{
struct dvb_frontend *frontend = &fe->frontend;
......@@ -334,8 +327,7 @@ void dvb_frontend_init (struct dvb_frontend_data *fe)
}
static
void update_delay (int *quality, int *delay, int locked)
static void update_delay (int *quality, int *delay, int locked)
{
int q2;
......@@ -360,8 +352,7 @@ void update_delay (int *quality, int *delay, int locked)
* here we only come when we have lost the lock bit,
* let's try to do something useful...
*/
static
void dvb_frontend_recover (struct dvb_frontend_data *fe)
static void dvb_frontend_recover (struct dvb_frontend_data *fe)
{
dprintk ("%s\n", __FUNCTION__);
......@@ -409,8 +400,7 @@ void dvb_frontend_recover (struct dvb_frontend_data *fe)
static
int dvb_frontend_is_exiting (struct dvb_frontend_data *fe)
static int dvb_frontend_is_exiting (struct dvb_frontend_data *fe)
{
if (fe->exit)
return 1;
......@@ -423,8 +413,7 @@ int dvb_frontend_is_exiting (struct dvb_frontend_data *fe)
}
static
int dvb_frontend_thread (void *data)
static int dvb_frontend_thread (void *data)
{
struct dvb_frontend_data *fe = (struct dvb_frontend_data *) data;
char name [15];
......@@ -502,8 +491,7 @@ int dvb_frontend_thread (void *data)
}
static
void dvb_frontend_stop (struct dvb_frontend_data *fe)
static void dvb_frontend_stop (struct dvb_frontend_data *fe)
{
dprintk ("%s\n", __FUNCTION__);
......@@ -532,8 +520,7 @@ void dvb_frontend_stop (struct dvb_frontend_data *fe)
}
static
int dvb_frontend_start (struct dvb_frontend_data *fe)
static int dvb_frontend_start (struct dvb_frontend_data *fe)
{
int ret;
......@@ -567,8 +554,7 @@ int dvb_frontend_start (struct dvb_frontend_data *fe)
}
static
int dvb_frontend_ioctl (struct inode *inode, struct file *file,
static int dvb_frontend_ioctl (struct inode *inode, struct file *file,
unsigned int cmd, void *parg)
{
struct dvb_device *dvbdev = file->private_data;
......@@ -611,8 +597,7 @@ int dvb_frontend_ioctl (struct inode *inode, struct file *file,
}
static
unsigned int dvb_frontend_poll (struct file *file, struct poll_table_struct *wait)
static unsigned int dvb_frontend_poll (struct file *file, struct poll_table_struct *wait)
{
struct dvb_device *dvbdev = file->private_data;
struct dvb_frontend_data *fe = dvbdev->priv;
......@@ -628,8 +613,7 @@ unsigned int dvb_frontend_poll (struct file *file, struct poll_table_struct *wai
}
static
int dvb_frontend_open (struct inode *inode, struct file *file)
static int dvb_frontend_open (struct inode *inode, struct file *file)
{
struct dvb_device *dvbdev = file->private_data;
struct dvb_frontend_data *fe = dvbdev->priv;
......@@ -653,8 +637,7 @@ int dvb_frontend_open (struct inode *inode, struct file *file)
}
static
int dvb_frontend_release (struct inode *inode, struct file *file)
static int dvb_frontend_release (struct inode *inode, struct file *file)
{
struct dvb_device *dvbdev = file->private_data;
struct dvb_frontend_data *fe = dvbdev->priv;
......@@ -855,8 +838,7 @@ dvb_remove_frontend_notifier (struct dvb_adapter *adapter,
}
static
struct file_operations dvb_frontend_fops = {
static struct file_operations dvb_frontend_fops = {
.owner = THIS_MODULE,
.ioctl = dvb_generic_ioctl,
.poll = dvb_frontend_poll,
......
drivers/media/dvb/dvb-core/dvb_frontend.h
View file @ cfa89a3e
......@@ -25,7 +25,7 @@
#ifndef _DVB_FRONTEND_H_
#define _DVB_FRONTEND_H_
#include <asm/types.h>
#include <linux/types.h>
#include <linux/sched.h>
#include <linux/ioctl.h>
#include <linux/i2c.h>
......
drivers/media/dvb/dvb-core/dvb_functions.c
View file @ cfa89a3e
#include <linux/smp_lock.h>
#include <linux/version.h>
#include <asm/uaccess.h>
#include <linux/string.h>
#include <linux/smp_lock.h>
#include <linux/version.h>
#include <linux/fs.h>
#include <asm/uaccess.h>
#include <linux/errno.h>
#include <linux/module.h>
#include <linux/ioctl.h>
#include <linux/slab.h>
#include <linux/fs.h>
#include <asm/uaccess.h>
void dvb_kernel_thread_setup (const char *thread_name)
{
......
drivers/media/dvb/dvb-core/dvb_i2c.c
View file @ cfa89a3e
......@@ -19,11 +19,11 @@
* Or, point your browser to http://www.gnu.org/copyleft/gpl.html
*/
#include <asm/semaphore.h>
#include <linux/errno.h>
#include <linux/slab.h>
#include <linux/list.h>
#include <linux/module.h>
#include <asm/semaphore.h>
#include "dvb_i2c.h"
#include "dvb_functions.h"
......@@ -41,8 +41,7 @@ LIST_HEAD(dvb_i2c_devicelist);
DECLARE_MUTEX(dvb_i2c_mutex);
static
int register_i2c_client (struct dvb_i2c_bus *i2c, struct dvb_i2c_device *dev)
static int register_i2c_client (struct dvb_i2c_bus *i2c, struct dvb_i2c_device *dev)
{
struct dvb_i2c_device *client;
......@@ -60,8 +59,7 @@ int register_i2c_client (struct dvb_i2c_bus *i2c, struct dvb_i2c_device *dev)
}
static
void try_attach_device (struct dvb_i2c_bus *i2c, struct dvb_i2c_device *dev)
static void try_attach_device (struct dvb_i2c_bus *i2c, struct dvb_i2c_device *dev)
{
if (dev->owner) {
if (!try_module_get(dev->owner))
......@@ -77,8 +75,7 @@ void try_attach_device (struct dvb_i2c_bus *i2c, struct dvb_i2c_device *dev)
}
static
void detach_device (struct dvb_i2c_bus *i2c, struct dvb_i2c_device *dev)
static void detach_device (struct dvb_i2c_bus *i2c, struct dvb_i2c_device *dev)
{
dev->detach (i2c);
......@@ -87,8 +84,7 @@ void detach_device (struct dvb_i2c_bus *i2c, struct dvb_i2c_device *dev)
}
static
void unregister_i2c_client_from_bus (struct dvb_i2c_device *dev,
static void unregister_i2c_client_from_bus (struct dvb_i2c_device *dev,
struct dvb_i2c_bus *i2c)
{
struct list_head *entry, *n;
......@@ -106,8 +102,7 @@ void unregister_i2c_client_from_bus (struct dvb_i2c_device *dev,
}
static
void unregister_i2c_client_from_all_busses (struct dvb_i2c_device *dev)
static void unregister_i2c_client_from_all_busses (struct dvb_i2c_device *dev)
{
struct list_head *entry, *n;
......@@ -121,8 +116,7 @@ void unregister_i2c_client_from_all_busses (struct dvb_i2c_device *dev)
}
static
void unregister_all_clients_from_bus (struct dvb_i2c_bus *i2c)
static void unregister_all_clients_from_bus (struct dvb_i2c_bus *i2c)
{
struct list_head *entry, *n;
......@@ -136,8 +130,7 @@ void unregister_all_clients_from_bus (struct dvb_i2c_bus *i2c)
}
static
void probe_device_on_all_busses (struct dvb_i2c_device *dev)
static void probe_device_on_all_busses (struct dvb_i2c_device *dev)
{
struct list_head *entry;
......@@ -151,8 +144,7 @@ void probe_device_on_all_busses (struct dvb_i2c_device *dev)
}
static
void probe_devices_on_bus (struct dvb_i2c_bus *i2c)
static void probe_devices_on_bus (struct dvb_i2c_bus *i2c)
{
struct list_head *entry;
......@@ -166,8 +158,7 @@ void probe_devices_on_bus (struct dvb_i2c_bus *i2c)
}
static
struct dvb_i2c_bus* dvb_find_i2c_bus (int (*xfer) (struct dvb_i2c_bus *i2c,
static struct dvb_i2c_bus* dvb_find_i2c_bus (int (*xfer) (struct dvb_i2c_bus *i2c,
const struct i2c_msg msgs[],
int num),
struct dvb_adapter *adapter,
......
drivers/media/dvb/dvb-core/dvb_ksyms.c
View file @ cfa89a3e
#include <asm/uaccess.h>
#include <linux/errno.h>
#include <linux/module.h>
#include <linux/ioctl.h>
#include <linux/slab.h>
#include <linux/fs.h>
#include <asm/uaccess.h>
#include "dmxdev.h"
#include "dvb_demux.h"
......
drivers/media/dvb/dvb-core/dvb_net.c
View file @ cfa89a3e
......@@ -24,12 +24,12 @@
*
*/
#include <asm/uaccess.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/ioctl.h>
#include <linux/slab.h>
#include <asm/uaccess.h>
#include <linux/dvb/net.h>
......@@ -98,8 +98,7 @@ unsigned short my_eth_type_trans(struct sk_buff *skb, struct net_device *dev)
return htons(ETH_P_802_2);
}
static void
dvb_net_sec(struct net_device *dev, const u8 *pkt, int pkt_len)
static void dvb_net_sec(struct net_device *dev, const u8 *pkt, int pkt_len)
{
u8 *eth;
struct sk_buff *skb;
......@@ -135,8 +134,7 @@ dvb_net_sec(struct net_device *dev, const u8 *pkt, int pkt_len)
netif_rx(skb);
}
static int
dvb_net_callback(const u8 *buffer1, size_t buffer1_len,
static int dvb_net_callback(const u8 *buffer1, size_t buffer1_len,
const u8 *buffer2, size_t buffer2_len,
struct dmx_section_filter *filter,
enum dmx_success success)
......@@ -149,8 +147,7 @@ dvb_net_callback(const u8 *buffer1, size_t buffer1_len,
return 0;
}
static int
dvb_net_tx(struct sk_buff *skb, struct net_device *dev)
static int dvb_net_tx(struct sk_buff *skb, struct net_device *dev)
{
return 0;
}
......@@ -160,8 +157,7 @@ static u8 mask_allmulti[6]={0xff, 0xff, 0xff, 0x00, 0x00, 0x00};
static u8 mac_allmulti[6]={0x01, 0x00, 0x5e, 0x00, 0x00, 0x00};
static u8 mask_promisc[6]={0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
static int
dvb_net_filter_set(struct net_device *dev,
static int dvb_net_filter_set(struct net_device *dev,
struct dmx_section_filter **secfilter,
u8 *mac, u8 *mac_mask)
{
......@@ -203,8 +199,7 @@ dvb_net_filter_set(struct net_device *dev,
return 0;
}
static int
dvb_net_feed_start(struct net_device *dev)
static int dvb_net_feed_start(struct net_device *dev)
{
int ret, i;
struct dvb_net_priv *priv = (struct dvb_net_priv*) dev->priv;
......@@ -255,8 +250,7 @@ dvb_net_feed_start(struct net_device *dev)
return 0;
}
static void
dvb_net_feed_stop(struct net_device *dev)
static void dvb_net_feed_stop(struct net_device *dev)
{
struct dvb_net_priv *priv = (struct dvb_net_priv*) dev->priv;
int i;
......@@ -286,8 +280,7 @@ dvb_net_feed_stop(struct net_device *dev)
printk("%s: no feed to stop\n", dev->name);
}
static int
dvb_add_mc_filter(struct net_device *dev, struct dev_mc_list *mc)
static int dvb_add_mc_filter(struct net_device *dev, struct dev_mc_list *mc)
{
struct dvb_net_priv *priv = (struct dvb_net_priv*) dev->priv;
int ret;
......@@ -303,8 +296,7 @@ dvb_add_mc_filter(struct net_device *dev, struct dev_mc_list *mc)
return ret;
}
static void
dvb_net_set_multi(struct net_device *dev)
static void dvb_net_set_multi(struct net_device *dev)
{
struct dvb_net_priv *priv = (struct dvb_net_priv*) dev->priv;
struct dev_mc_list *mc;
......@@ -346,16 +338,14 @@ dvb_net_set_multi(struct net_device *dev)
}
}
static int
dvb_net_set_config(struct net_device *dev, struct ifmap *map)
static int dvb_net_set_config(struct net_device *dev, struct ifmap *map)
{
if (netif_running(dev))
return -EBUSY;
return 0;
}
static int
dvb_net_set_mac(struct net_device *dev, void *p)
static int dvb_net_set_mac(struct net_device *dev, void *p)
{
struct sockaddr *addr=p;
int update;
......@@ -370,29 +360,25 @@ dvb_net_set_mac(struct net_device *dev, void *p)
}
static int
dvb_net_open(struct net_device *dev)
static int dvb_net_open(struct net_device *dev)
{
dvb_net_feed_start(dev);
return 0;
}
static int
dvb_net_stop(struct net_device *dev)
static int dvb_net_stop(struct net_device *dev)
{
dvb_net_feed_stop(dev);
return 0;
}
static struct net_device_stats *
dvb_net_get_stats(struct net_device *dev)
static struct net_device_stats * dvb_net_get_stats(struct net_device *dev)
{
return &((struct dvb_net_priv*) dev->priv)->stats;
}
static int
dvb_net_init_dev(struct net_device *dev)
static int dvb_net_init_dev(struct net_device *dev)
{
ether_setup(dev);
......@@ -414,8 +400,7 @@ dvb_net_init_dev(struct net_device *dev)
return 0;
}
static int
get_if(struct dvb_net *dvbnet)
static int get_if(struct dvb_net *dvbnet)
{
int i;
......@@ -534,8 +519,7 @@ int dvb_net_do_ioctl(struct inode *inode, struct file *file,
return 0;
}
static int
dvb_net_ioctl(struct inode *inode, struct file *file,
static int dvb_net_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
return dvb_usercopy(inode, file, cmd, arg, dvb_net_do_ioctl);
......
drivers/media/dvb/dvb-core/dvb_ringbuffer.c
View file @ cfa89a3e
......@@ -32,12 +32,12 @@
#define __KERNEL_SYSCALLS__
#include <asm/uaccess.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/string.h>
#include <asm/uaccess.h>
#include "dvb_ringbuffer.h"
......
drivers/media/dvb/dvb-core/dvbdev.c
View file @ cfa89a3e
......@@ -21,8 +21,7 @@
*
*/
#include <asm/types.h>
#include <asm/semaphore.h>
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/string.h>
#include <linux/module.h>
......@@ -31,6 +30,7 @@
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/version.h>
#include <asm/semaphore.h>
#include "dvbdev.h"
#include "dvb_functions.h"
......@@ -51,8 +51,7 @@ static char *dnames[] = {
#define DVB_MAX_IDS 4
#define nums2minor(num,type,id) ((num << 6) | (id << 4) | type)
static
struct dvb_device* dvbdev_find_device (int minor)
static struct dvb_device* dvbdev_find_device (int minor)
{
struct list_head *entry;
......@@ -72,8 +71,7 @@ struct dvb_device* dvbdev_find_device (int minor)
}
static
int dvb_device_open(struct inode *inode, struct file *file)
static int dvb_device_open(struct inode *inode, struct file *file)
{
struct dvb_device *dvbdev;
......@@ -157,8 +155,7 @@ int dvb_generic_ioctl(struct inode *inode, struct file *file,
}
static
int dvbdev_get_free_id (struct dvb_adapter *adap, int type)
static int dvbdev_get_free_id (struct dvb_adapter *adap, int type)
{
u32 id = 0;
......@@ -234,8 +231,7 @@ void dvb_unregister_device(struct dvb_device *dvbdev)
}
static
int dvbdev_get_free_adapter_num (void)
static int dvbdev_get_free_adapter_num (void)
{
int num = 0;
......@@ -303,8 +299,7 @@ int dvb_unregister_adapter(struct dvb_adapter *adap)
}
static
int __init init_dvbdev(void)
static int __init init_dvbdev(void)
{
devfs_mk_dir("dvb");
......@@ -317,8 +312,7 @@ int __init init_dvbdev(void)
}
static
void __exit exit_dvbdev(void)
static void __exit exit_dvbdev(void)
{
unregister_chrdev(DVB_MAJOR, "DVB");
devfs_remove("dvb");
......
drivers/media/dvb/dvb-core/dvbdev.h
View file @ cfa89a3e
......@@ -24,7 +24,7 @@
#ifndef _DVBDEV_H_
#define _DVBDEV_H_
#include <asm/types.h>
#include <linux/types.h>
#include <linux/poll.h>
#include <linux/fs.h>
#include <linux/devfs_fs_kernel.h>
......
drivers/media/dvb/frontends/alps_bsrv2.c
View file @ cfa89a3e
......@@ -32,8 +32,7 @@ static int debug = 0;
#define dprintk if (debug) printk
static
struct dvb_frontend_info bsrv2_info = {
static struct dvb_frontend_info bsrv2_info = {
.name = "Alps BSRV2",
.type = FE_QPSK,
.frequency_min = 950000,
......@@ -52,8 +51,7 @@ struct dvb_frontend_info bsrv2_info = {
static
u8 init_1893_tab [] = {
static u8 init_1893_tab [] = {
0x01, 0xA4, 0x35, 0x81, 0x2A, 0x0d, 0x55, 0xC4,
0x09, 0x69, 0x00, 0x86, 0x4c, 0x28, 0x7F, 0x00,
0x00, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
......@@ -64,8 +62,7 @@ u8 init_1893_tab [] = {
};
static
u8 init_1893_wtab[] =
static u8 init_1893_wtab[] =
{
1,1,1,1,1,1,1,1, 1,1,0,0,1,1,0,0,
0,1,0,0,0,0,0,0, 1,0,1,1,0,0,0,1,
......@@ -74,8 +71,7 @@ u8 init_1893_wtab[] =
};
static
int ves1893_writereg (struct dvb_i2c_bus *i2c, u8 reg, u8 data)
static int ves1893_writereg (struct dvb_i2c_bus *i2c, u8 reg, u8 data)
{
u8 buf [] = { 0x00, reg, data };
struct i2c_msg msg = { .addr = 0x08, .flags = 0, .buf = buf, .len = 3 };
......@@ -90,8 +86,7 @@ int ves1893_writereg (struct dvb_i2c_bus *i2c, u8 reg, u8 data)
}
static
u8 ves1893_readreg (struct dvb_i2c_bus *i2c, u8 reg)
static u8 ves1893_readreg (struct dvb_i2c_bus *i2c, u8 reg)
{
int ret;
u8 b0 [] = { 0x00, reg };
......@@ -108,8 +103,7 @@ u8 ves1893_readreg (struct dvb_i2c_bus *i2c, u8 reg)
}
static
int sp5659_write (struct dvb_i2c_bus *i2c, u8 data [4])
static int sp5659_write (struct dvb_i2c_bus *i2c, u8 data [4])
{
int ret;
struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = 4 };
......@@ -128,8 +122,7 @@ int sp5659_write (struct dvb_i2c_bus *i2c, u8 data [4])
* set up the downconverter frequency divisor for a
* reference clock comparision frequency of 125 kHz.
*/
static
int sp5659_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq, u8 pwr)
static int sp5659_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq, u8 pwr)
{
u32 div = (freq + 479500) / 125;
u8 buf [4] = { (div >> 8) & 0x7f, div & 0xff, 0x95, (pwr << 5) | 0x30 };
......@@ -138,8 +131,7 @@ int sp5659_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq, u8 pwr)
}
static
int ves1893_init (struct dvb_i2c_bus *i2c)
static int ves1893_init (struct dvb_i2c_bus *i2c)
{
int i;
......@@ -153,8 +145,7 @@ int ves1893_init (struct dvb_i2c_bus *i2c)
}
static
int ves1893_clr_bit (struct dvb_i2c_bus *i2c)
static int ves1893_clr_bit (struct dvb_i2c_bus *i2c)
{
ves1893_writereg (i2c, 0, init_1893_tab[0] & 0xfe);
ves1893_writereg (i2c, 0, init_1893_tab[0]);
......@@ -163,8 +154,7 @@ int ves1893_clr_bit (struct dvb_i2c_bus *i2c)
}
static
int ves1893_set_inversion (struct dvb_i2c_bus *i2c, fe_spectral_inversion_t inversion)
static int ves1893_set_inversion (struct dvb_i2c_bus *i2c, fe_spectral_inversion_t inversion)
{
u8 val;
......@@ -186,8 +176,7 @@ int ves1893_set_inversion (struct dvb_i2c_bus *i2c, fe_spectral_inversion_t inve
}
static
int ves1893_set_fec (struct dvb_i2c_bus *i2c, fe_code_rate_t fec)
static int ves1893_set_fec (struct dvb_i2c_bus *i2c, fe_code_rate_t fec)
{
if (fec == FEC_AUTO)
return ves1893_writereg (i2c, 0x0d, 0x08);
......@@ -198,15 +187,13 @@ int ves1893_set_fec (struct dvb_i2c_bus *i2c, fe_code_rate_t fec)
}
static
fe_code_rate_t ves1893_get_fec (struct dvb_i2c_bus *i2c)
static fe_code_rate_t ves1893_get_fec (struct dvb_i2c_bus *i2c)
{
return FEC_1_2 + ((ves1893_readreg (i2c, 0x0d) >> 4) & 0x7);
}
static
int ves1893_set_symbolrate (struct dvb_i2c_bus *i2c, u32 srate)
static int ves1893_set_symbolrate (struct dvb_i2c_bus *i2c, u32 srate)
{
u32 BDR;
u32 ratio;
......@@ -289,8 +276,7 @@ int ves1893_set_symbolrate (struct dvb_i2c_bus *i2c, u32 srate)
}
static
int ves1893_set_voltage (struct dvb_i2c_bus *i2c, fe_sec_voltage_t voltage)
static int ves1893_set_voltage (struct dvb_i2c_bus *i2c, fe_sec_voltage_t voltage)
{
switch (voltage) {
case SEC_VOLTAGE_13:
......@@ -305,8 +291,7 @@ int ves1893_set_voltage (struct dvb_i2c_bus *i2c, fe_sec_voltage_t voltage)
}
static
int bsrv2_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
static int bsrv2_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
{
struct dvb_i2c_bus *i2c = fe->i2c;
......@@ -430,8 +415,7 @@ int bsrv2_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
}
static
int bsrv2_attach (struct dvb_i2c_bus *i2c)
static int bsrv2_attach (struct dvb_i2c_bus *i2c)
{
if ((ves1893_readreg (i2c, 0x1e) & 0xf0) != 0xd0)
return -ENODEV;
......@@ -442,22 +426,19 @@ int bsrv2_attach (struct dvb_i2c_bus *i2c)
}
static
void bsrv2_detach (struct dvb_i2c_bus *i2c)
static void bsrv2_detach (struct dvb_i2c_bus *i2c)
{
dvb_unregister_frontend (bsrv2_ioctl, i2c);
}
static
int __init init_bsrv2 (void)
static int __init init_bsrv2 (void)
{
return dvb_register_i2c_device (THIS_MODULE, bsrv2_attach, bsrv2_detach);
}
static
void __exit exit_bsrv2 (void)
static void __exit exit_bsrv2 (void)
{
dvb_unregister_i2c_device (bsrv2_attach);
}
......
drivers/media/dvb/frontends/alps_tdlb7.c
View file @ cfa89a3e
......@@ -70,8 +70,7 @@ static char * mcfile = "/usr/lib/DVB/driver/frontends/Sc_main.mc";
static int errno;
static
struct dvb_frontend_info tdlb7_info = {
static struct dvb_frontend_info tdlb7_info = {
.name = "Alps TDLB7",
.type = FE_OFDM,
.frequency_min = 470000000,
......@@ -90,8 +89,7 @@ struct dvb_frontend_info tdlb7_info = {
};
static
int sp8870_writereg (struct dvb_i2c_bus *i2c, u16 reg, u16 data)
static int sp8870_writereg (struct dvb_i2c_bus *i2c, u16 reg, u16 data)
{
u8 buf [] = { reg >> 8, reg & 0xff, data >> 8, data & 0xff };
struct i2c_msg msg = { .addr = 0x71, .flags = 0, .buf = buf, .len = 4 };
......@@ -106,8 +104,7 @@ int sp8870_writereg (struct dvb_i2c_bus *i2c, u16 reg, u16 data)
}
static
u16 sp8870_readreg (struct dvb_i2c_bus *i2c, u16 reg)
static u16 sp8870_readreg (struct dvb_i2c_bus *i2c, u16 reg)
{
int ret;
u8 b0 [] = { reg >> 8 , reg & 0xff };
......@@ -124,8 +121,7 @@ u16 sp8870_readreg (struct dvb_i2c_bus *i2c, u16 reg)
}
static
int sp5659_write (struct dvb_i2c_bus *i2c, u8 data [4])
static int sp5659_write (struct dvb_i2c_bus *i2c, u8 data [4])
{
int ret;
struct i2c_msg msg = { .addr = 0x60, .flags = 0, .buf = data, .len = 4 };
......@@ -139,8 +135,7 @@ int sp5659_write (struct dvb_i2c_bus *i2c, u8 data [4])
}
static
int sp5659_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq)
static int sp5659_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq)
{
u32 div = (freq + 36200000) / 166666;
u8 buf [4];
......@@ -160,8 +155,7 @@ int sp5659_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq)
}
static
int sp8870_read_code(const char *fn, char **fp)
static int sp8870_read_code(const char *fn, char **fp)
{
int fd;
loff_t l;
......@@ -197,8 +191,7 @@ int sp8870_read_code(const char *fn, char **fp)
}
static
int sp8870_load_code(struct dvb_i2c_bus *i2c)
static int sp8870_load_code(struct dvb_i2c_bus *i2c)
{
/* this takes a long time. is there a way to do it faster? */
char *lcode;
......@@ -245,8 +238,7 @@ int sp8870_load_code(struct dvb_i2c_bus *i2c)
};
static
int sp8870_init (struct dvb_i2c_bus *i2c)
static int sp8870_init (struct dvb_i2c_bus *i2c)
{
dprintk ("%s\n", __FUNCTION__);
......@@ -285,8 +277,7 @@ int sp8870_init (struct dvb_i2c_bus *i2c)
}
static
int tdlb7_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
static int tdlb7_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
{
struct dvb_i2c_bus *i2c = fe->i2c;
......@@ -415,8 +406,7 @@ int tdlb7_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
}
static
int tdlb7_attach (struct dvb_i2c_bus *i2c)
static int tdlb7_attach (struct dvb_i2c_bus *i2c)
{
struct i2c_msg msg = { .addr = 0x71, .flags = 0, .buf = NULL, .len = 0 };
......@@ -440,8 +430,7 @@ int tdlb7_attach (struct dvb_i2c_bus *i2c)
}
static
void tdlb7_detach (struct dvb_i2c_bus *i2c)
static void tdlb7_detach (struct dvb_i2c_bus *i2c)
{
dprintk ("%s\n", __FUNCTION__);
......@@ -449,8 +438,7 @@ void tdlb7_detach (struct dvb_i2c_bus *i2c)
}
static
int __init init_tdlb7 (void)
static int __init init_tdlb7 (void)
{
dprintk ("%s\n", __FUNCTION__);
......@@ -458,8 +446,7 @@ int __init init_tdlb7 (void)
}
static
void __exit exit_tdlb7 (void)
static void __exit exit_tdlb7 (void)
{
dprintk ("%s\n", __FUNCTION__);
......
drivers/media/dvb/frontends/alps_tdmb7.c
View file @ cfa89a3e
......@@ -34,8 +34,7 @@ static int debug = 0;
#define dprintk if (debug) printk
static
struct dvb_frontend_info tdmb7_info = {
static struct dvb_frontend_info tdmb7_info = {
.name = "Alps TDMB7",
.type = FE_OFDM,
.frequency_min = 470000000,
......@@ -55,8 +54,7 @@ struct dvb_frontend_info tdmb7_info = {
};
static
u8 init_tab [] = {
static u8 init_tab [] = {
0x04, 0x10,
0x05, 0x09,
0x06, 0x00,
......@@ -78,8 +76,7 @@ u8 init_tab [] = {
};
static
int cx22700_writereg (struct dvb_i2c_bus *i2c, u8 reg, u8 data)
static int cx22700_writereg (struct dvb_i2c_bus *i2c, u8 reg, u8 data)
{
int ret;
u8 buf [] = { reg, data };
......@@ -97,8 +94,7 @@ int cx22700_writereg (struct dvb_i2c_bus *i2c, u8 reg, u8 data)
}
static
u8 cx22700_readreg (struct dvb_i2c_bus *i2c, u8 reg)
static u8 cx22700_readreg (struct dvb_i2c_bus *i2c, u8 reg)
{
int ret;
u8 b0 [] = { reg };
......@@ -117,8 +113,7 @@ u8 cx22700_readreg (struct dvb_i2c_bus *i2c, u8 reg)
}
static
int pll_write (struct dvb_i2c_bus *i2c, u8 data [4])
static int pll_write (struct dvb_i2c_bus *i2c, u8 data [4])
{
struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = 4 };
int ret;
......@@ -138,8 +133,7 @@ int pll_write (struct dvb_i2c_bus *i2c, u8 data [4])
* set up the downconverter frequency divisor for a
* reference clock comparision frequency of 125 kHz.
*/
static
int pll_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq)
static int pll_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq)
{
u32 div = (freq + 36166667) / 166667;
#if 1 //ALPS_SETTINGS
......@@ -156,8 +150,7 @@ int pll_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq)
}
static
int cx22700_init (struct dvb_i2c_bus *i2c)
static int cx22700_init (struct dvb_i2c_bus *i2c)
{
int i;
......@@ -177,8 +170,7 @@ int cx22700_init (struct dvb_i2c_bus *i2c)
}
static
int cx22700_set_inversion (struct dvb_i2c_bus *i2c, int inversion)
static int cx22700_set_inversion (struct dvb_i2c_bus *i2c, int inversion)
{
u8 val;
......@@ -199,8 +191,7 @@ int cx22700_set_inversion (struct dvb_i2c_bus *i2c, int inversion)
}
static
int cx22700_set_tps (struct dvb_i2c_bus *i2c, struct dvb_ofdm_parameters *p)
static int cx22700_set_tps (struct dvb_i2c_bus *i2c, struct dvb_ofdm_parameters *p)
{
static const u8 qam_tab [4] = { 0, 1, 0, 2 };
static const u8 fec_tab [6] = { 0, 1, 2, 0, 3, 4 };
......@@ -263,8 +254,7 @@ int cx22700_set_tps (struct dvb_i2c_bus *i2c, struct dvb_ofdm_parameters *p)
}
static
int cx22700_get_tps (struct dvb_i2c_bus *i2c, struct dvb_ofdm_parameters *p)
static int cx22700_get_tps (struct dvb_i2c_bus *i2c, struct dvb_ofdm_parameters *p)
{
static const fe_modulation_t qam_tab [3] = { QPSK, QAM_16, QAM_64 };
static const fe_code_rate_t fec_tab [5] = { FEC_1_2, FEC_2_3, FEC_3_4,
......@@ -311,8 +301,7 @@ int cx22700_get_tps (struct dvb_i2c_bus *i2c, struct dvb_ofdm_parameters *p)
}
static
int tdmb7_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
static int tdmb7_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
{
struct dvb_i2c_bus *i2c = fe->i2c;
......@@ -413,8 +402,7 @@ int tdmb7_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
static
int tdmb7_attach (struct dvb_i2c_bus *i2c)
static int tdmb7_attach (struct dvb_i2c_bus *i2c)
{
struct i2c_msg msg = { .addr = 0x43, .flags = 0, .buf = NULL,. len = 0 };
......@@ -429,8 +417,7 @@ int tdmb7_attach (struct dvb_i2c_bus *i2c)
}
static
void tdmb7_detach (struct dvb_i2c_bus *i2c)
static void tdmb7_detach (struct dvb_i2c_bus *i2c)
{
dprintk ("%s\n", __FUNCTION__);
......@@ -438,8 +425,7 @@ void tdmb7_detach (struct dvb_i2c_bus *i2c)
}
static
int __init init_tdmb7 (void)
static int __init init_tdmb7 (void)
{
dprintk ("%s\n", __FUNCTION__);
......@@ -447,8 +433,7 @@ int __init init_tdmb7 (void)
}
static
void __exit exit_tdmb7 (void)
static void __exit exit_tdmb7 (void)
{
dprintk ("%s\n", __FUNCTION__);
......
drivers/media/dvb/frontends/at76c651.c
View file @ cfa89a3e
......@@ -74,8 +74,7 @@ static struct dvb_frontend_info at76c651_info = {
};
#if ! defined(__powerpc__)
static __inline__ int
__ilog2(unsigned long x)
static __inline__ int __ilog2(unsigned long x)
{
int i;
......@@ -89,8 +88,7 @@ __ilog2(unsigned long x)
}
#endif
static int
at76c651_writereg(struct dvb_i2c_bus *i2c, u8 reg, u8 data)
static int at76c651_writereg(struct dvb_i2c_bus *i2c, u8 reg, u8 data)
{
int ret;
......@@ -110,8 +108,7 @@ at76c651_writereg(struct dvb_i2c_bus *i2c, u8 reg, u8 data)
}
static u8
at76c651_readreg(struct dvb_i2c_bus *i2c, u8 reg)
static u8 at76c651_readreg(struct dvb_i2c_bus *i2c, u8 reg)
{
int ret;
......@@ -129,8 +126,7 @@ at76c651_readreg(struct dvb_i2c_bus *i2c, u8 reg)
}
static int
at76c651_set_auto_config(struct dvb_i2c_bus *i2c)
static int at76c651_set_auto_config(struct dvb_i2c_bus *i2c)
{
at76c651_writereg(i2c, 0x06, 0x01);
......@@ -149,8 +145,7 @@ at76c651_set_auto_config(struct dvb_i2c_bus *i2c)
}
static int
at76c651_set_bbfreq(struct dvb_i2c_bus *i2c)
static int at76c651_set_bbfreq(struct dvb_i2c_bus *i2c)
{
at76c651_writereg(i2c, 0x04, 0x3f);
......@@ -160,24 +155,21 @@ at76c651_set_bbfreq(struct dvb_i2c_bus *i2c)
}
static int
at76c651_reset(struct dvb_i2c_bus *i2c)
static int at76c651_reset(struct dvb_i2c_bus *i2c)
{
return at76c651_writereg(i2c, 0x07, 0x01);
}
static int
at76c651_disable_interrupts(struct dvb_i2c_bus *i2c)
static int at76c651_disable_interrupts(struct dvb_i2c_bus *i2c)
{
return at76c651_writereg(i2c, 0x0b, 0x00);
}
static int
at76c651_switch_tuner_i2c(struct dvb_i2c_bus *i2c, u8 enable)
static int at76c651_switch_tuner_i2c(struct dvb_i2c_bus *i2c, u8 enable)
{
if (enable)
......@@ -187,8 +179,7 @@ at76c651_switch_tuner_i2c(struct dvb_i2c_bus *i2c, u8 enable)
}
static int
dat7021_write(struct dvb_i2c_bus *i2c, u32 tw)
static int dat7021_write(struct dvb_i2c_bus *i2c, u32 tw)
{
int ret;
......@@ -210,8 +201,7 @@ dat7021_write(struct dvb_i2c_bus *i2c, u32 tw)
}
static int
dat7021_set_tv_freq(struct dvb_i2c_bus *i2c, u32 freq)
static int dat7021_set_tv_freq(struct dvb_i2c_bus *i2c, u32 freq)
{
u32 dw;
......@@ -239,8 +229,7 @@ dat7021_set_tv_freq(struct dvb_i2c_bus *i2c, u32 freq)
}
static int
at76c651_set_symbolrate(struct dvb_i2c_bus *i2c, u32 symbolrate)
static int at76c651_set_symbolrate(struct dvb_i2c_bus *i2c, u32 symbolrate)
{
u8 exponent;
......@@ -266,8 +255,7 @@ at76c651_set_symbolrate(struct dvb_i2c_bus *i2c, u32 symbolrate)
}
static int
at76c651_set_qam(struct dvb_i2c_bus *i2c, fe_modulation_t qam)
static int at76c651_set_qam(struct dvb_i2c_bus *i2c, fe_modulation_t qam)
{
u8 qamsel = 0;
......@@ -309,8 +297,7 @@ at76c651_set_qam(struct dvb_i2c_bus *i2c, fe_modulation_t qam)
}
static int
at76c651_set_inversion(struct dvb_i2c_bus *i2c,
static int at76c651_set_inversion(struct dvb_i2c_bus *i2c,
fe_spectral_inversion_t inversion)
{
......@@ -338,8 +325,7 @@ at76c651_set_inversion(struct dvb_i2c_bus *i2c,
}
static int
at76c651_set_parameters(struct dvb_i2c_bus *i2c,
static int at76c651_set_parameters(struct dvb_i2c_bus *i2c,
struct dvb_frontend_parameters *p)
{
......@@ -352,8 +338,7 @@ at76c651_set_parameters(struct dvb_i2c_bus *i2c,
}
static int
at76c651_set_defaults(struct dvb_i2c_bus *i2c)
static int at76c651_set_defaults(struct dvb_i2c_bus *i2c)
{
at76c651_set_symbolrate(i2c, 6900000);
......@@ -366,8 +351,7 @@ at76c651_set_defaults(struct dvb_i2c_bus *i2c)
}
static int
at76c651_ioctl(struct dvb_frontend *fe, unsigned int cmd, void *arg)
static int at76c651_ioctl(struct dvb_frontend *fe, unsigned int cmd, void *arg)
{
switch (cmd) {
......@@ -463,8 +447,7 @@ at76c651_ioctl(struct dvb_frontend *fe, unsigned int cmd, void *arg)
}
static int
at76c651_attach(struct dvb_i2c_bus *i2c)
static int at76c651_attach(struct dvb_i2c_bus *i2c)
{
if (at76c651_readreg(i2c, 0x0e) != 0x65) {
......@@ -503,8 +486,7 @@ at76c651_attach(struct dvb_i2c_bus *i2c)
}
static void
at76c651_detach(struct dvb_i2c_bus *i2c)
static void at76c651_detach(struct dvb_i2c_bus *i2c)
{
dvb_unregister_frontend(at76c651_ioctl, i2c);
......@@ -513,8 +495,7 @@ at76c651_detach(struct dvb_i2c_bus *i2c)
}
static int __init
at76c651_init(void)
static int __init at76c651_init(void)
{
return dvb_register_i2c_device(THIS_MODULE, at76c651_attach,
......@@ -522,8 +503,7 @@ at76c651_init(void)
}
static void __exit
at76c651_exit(void)
static void __exit at76c651_exit(void)
{
dvb_unregister_i2c_device(at76c651_attach);
......
drivers/media/dvb/frontends/cx24110.c
View file @ cfa89a3e
......@@ -44,8 +44,7 @@ static int debug = 0;
#define dprintk if (debug) printk
static
struct dvb_frontend_info cx24110_info = {
static struct dvb_frontend_info cx24110_info = {
.name = "Conexant CX24110 with CX24108 tuner, aka HM1221/HM1811",
.type = FE_QPSK,
.frequency_min = 950000,
......@@ -66,8 +65,7 @@ struct dvb_frontend_info cx24110_info = {
/* fixme: are these values correct? especially ..._tolerance and caps */
static
struct {u8 reg; u8 data;} cx24110_regdata[]=
static struct {u8 reg; u8 data;} cx24110_regdata[]=
/* Comments beginning with @ denote this value should
be the default */
{{0x09,0x01}, /* SoftResetAll */
......@@ -130,8 +128,7 @@ struct {u8 reg; u8 data;} cx24110_regdata[]=
};
static
int cx24110_writereg (struct dvb_i2c_bus *i2c, int reg, int data)
static int cx24110_writereg (struct dvb_i2c_bus *i2c, int reg, int data)
{
u8 buf [] = { reg, data };
struct i2c_msg msg = { .addr = 0x55, .flags = 0, .buf = buf, .len = 2 };
......@@ -148,8 +145,7 @@ int cx24110_writereg (struct dvb_i2c_bus *i2c, int reg, int data)
}
static
u8 cx24110_readreg (struct dvb_i2c_bus *i2c, u8 reg)
static u8 cx24110_readreg (struct dvb_i2c_bus *i2c, u8 reg)
{
int ret;
u8 b0 [] = { reg };
......@@ -166,8 +162,7 @@ u8 cx24110_readreg (struct dvb_i2c_bus *i2c, u8 reg)
}
static
int cx24108_write (struct dvb_i2c_bus *i2c, u32 data)
static int cx24108_write (struct dvb_i2c_bus *i2c, u32 data)
{
/* tuner data is 21 bits long, must be left-aligned in data */
/* tuner cx24108 is written through a dedicated 3wire interface on the demod chip */
......@@ -201,8 +196,7 @@ dprintk("cx24110 debug: cx24108_write(%8.8x)\n",data);
}
static
int cx24108_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq)
static int cx24108_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq)
{
/* fixme (low): error handling */
int i, a, n, pump;
......@@ -266,8 +260,7 @@ int cx24108_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq)
}
static
int cx24110_init (struct dvb_i2c_bus *i2c)
static int cx24110_init (struct dvb_i2c_bus *i2c)
{
/* fixme (low): error handling */
int i;
......@@ -282,8 +275,7 @@ int cx24110_init (struct dvb_i2c_bus *i2c)
}
static
int cx24110_set_inversion (struct dvb_i2c_bus *i2c, fe_spectral_inversion_t inversion)
static int cx24110_set_inversion (struct dvb_i2c_bus *i2c, fe_spectral_inversion_t inversion)
{
/* fixme (low): error handling */
......@@ -318,8 +310,7 @@ int cx24110_set_inversion (struct dvb_i2c_bus *i2c, fe_spectral_inversion_t inve
}
static
int cx24110_set_fec (struct dvb_i2c_bus *i2c, fe_code_rate_t fec)
static int cx24110_set_fec (struct dvb_i2c_bus *i2c, fe_code_rate_t fec)
{
/* fixme (low): error handling */
......@@ -365,8 +356,7 @@ int cx24110_set_fec (struct dvb_i2c_bus *i2c, fe_code_rate_t fec)
}
static
fe_code_rate_t cx24110_get_fec (struct dvb_i2c_bus *i2c)
static fe_code_rate_t cx24110_get_fec (struct dvb_i2c_bus *i2c)
{
int i;
......@@ -383,8 +373,7 @@ fe_code_rate_t cx24110_get_fec (struct dvb_i2c_bus *i2c)
}
static
int cx24110_set_symbolrate (struct dvb_i2c_bus *i2c, u32 srate)
static int cx24110_set_symbolrate (struct dvb_i2c_bus *i2c, u32 srate)
{
/* fixme (low): add error handling */
u32 ratio;
......@@ -466,8 +455,7 @@ dprintk("cx24110 debug: entering %s(%d)\n",__FUNCTION__,srate);
}
static
int cx24110_set_voltage (struct dvb_i2c_bus *i2c, fe_sec_voltage_t voltage)
static int cx24110_set_voltage (struct dvb_i2c_bus *i2c, fe_sec_voltage_t voltage)
{
switch (voltage) {
case SEC_VOLTAGE_13:
......@@ -494,8 +482,7 @@ static void sendDiSEqCMessage(struct dvb_i2c_bus *i2c, struct dvb_diseqc_master_
}
static
int cx24110_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
static int cx24110_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
{
struct dvb_i2c_bus *i2c = fe->i2c;
static int lastber=0, lastbyer=0,lastbler=0, lastesn0=0, sum_bler=0;
......@@ -656,8 +643,7 @@ int cx24110_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
}
static
int cx24110_attach (struct dvb_i2c_bus *i2c)
static int cx24110_attach (struct dvb_i2c_bus *i2c)
{
u8 sig;
......@@ -671,22 +657,19 @@ int cx24110_attach (struct dvb_i2c_bus *i2c)
}
static
void cx24110_detach (struct dvb_i2c_bus *i2c)
static void cx24110_detach (struct dvb_i2c_bus *i2c)
{
dvb_unregister_frontend (cx24110_ioctl, i2c);
}
static
int __init init_cx24110 (void)
static int __init init_cx24110 (void)
{
return dvb_register_i2c_device (THIS_MODULE, cx24110_attach, cx24110_detach);
}
static
void __exit exit_cx24110 (void)
static void __exit exit_cx24110 (void)
{
dvb_unregister_i2c_device (cx24110_attach);
}
......
drivers/media/dvb/frontends/dvb_dummy_fe.c
View file @ cfa89a3e
......@@ -30,8 +30,7 @@ static int sct = 0;
/* depending on module parameter sct deliver different infos
*/
static
struct dvb_frontend_info dvb_s_dummyfe_info = {
static struct dvb_frontend_info dvb_s_dummyfe_info = {
.name = "DVB-S dummy frontend",
.type = FE_QPSK,
.frequency_min = 950000,
......@@ -48,8 +47,7 @@ struct dvb_frontend_info dvb_s_dummyfe_info = {
FE_CAN_QPSK
};
static
struct dvb_frontend_info dvb_c_dummyfe_info = {
static struct dvb_frontend_info dvb_c_dummyfe_info = {
.name = "DVB-C dummy frontend",
.type = FE_QAM,
.frequency_stepsize = 62500,
......@@ -103,8 +101,7 @@ struct dvb_frontend_info *frontend_info(void)
}
static
int dvbdummyfe_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
static int dvbdummyfe_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
{
switch (cmd) {
case FE_GET_INFO:
......@@ -176,23 +173,20 @@ int dvbdummyfe_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
}
static
int dvbdummyfe_attach (struct dvb_i2c_bus *i2c)
static int dvbdummyfe_attach (struct dvb_i2c_bus *i2c)
{
dvb_register_frontend (dvbdummyfe_ioctl, i2c, NULL, frontend_info());
return 0;
}
static
void dvbdummyfe_detach (struct dvb_i2c_bus *i2c)
static void dvbdummyfe_detach (struct dvb_i2c_bus *i2c)
{
dvb_unregister_frontend (dvbdummyfe_ioctl, i2c);
}
static
int __init init_dvbdummyfe (void)
static int __init init_dvbdummyfe (void)
{
return dvb_register_i2c_device (THIS_MODULE,
dvbdummyfe_attach,
......@@ -201,8 +195,7 @@ int __init init_dvbdummyfe (void)
}
static
void __exit exit_dvbdummyfe (void)
static void __exit exit_dvbdummyfe (void)
{
dvb_unregister_i2c_device (dvbdummyfe_attach);
return;
......
drivers/media/dvb/frontends/grundig_29504-401.c
View file @ cfa89a3e
......@@ -52,8 +52,7 @@ struct dvb_frontend_info grundig_29504_401_info = {
};
static
int l64781_writereg (struct dvb_i2c_bus *i2c, u8 reg, u8 data)
static int l64781_writereg (struct dvb_i2c_bus *i2c, u8 reg, u8 data)
{
int ret;
u8 buf [] = { reg, data };
......@@ -67,8 +66,7 @@ int l64781_writereg (struct dvb_i2c_bus *i2c, u8 reg, u8 data)
}
static
u8 l64781_readreg (struct dvb_i2c_bus *i2c, u8 reg)
static u8 l64781_readreg (struct dvb_i2c_bus *i2c, u8 reg)
{
int ret;
u8 b0 [] = { reg };
......@@ -85,8 +83,7 @@ u8 l64781_readreg (struct dvb_i2c_bus *i2c, u8 reg)
}
static
int tsa5060_write (struct dvb_i2c_bus *i2c, u8 data [4])
static int tsa5060_write (struct dvb_i2c_bus *i2c, u8 data [4])
{
int ret;
struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = 4 };
......@@ -103,8 +100,7 @@ int tsa5060_write (struct dvb_i2c_bus *i2c, u8 data [4])
* reference clock comparision frequency of 166666 Hz.
* frequency offset is 36125000 Hz.
*/
static
int tsa5060_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq)
static int tsa5060_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq)
{
u32 div;
u8 buf [4];
......@@ -127,8 +123,7 @@ int tsa5060_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq)
}
static
void apply_tps (struct dvb_i2c_bus *i2c)
static void apply_tps (struct dvb_i2c_bus *i2c)
{
l64781_writereg (i2c, 0x2a, 0x00);
l64781_writereg (i2c, 0x2a, 0x01);
......@@ -142,8 +137,7 @@ void apply_tps (struct dvb_i2c_bus *i2c)
}
static
void reset_afc (struct dvb_i2c_bus *i2c)
static void reset_afc (struct dvb_i2c_bus *i2c)
{
/* Set AFC stall for the AFC_INIT_FRQ setting, TIM_STALL for
timing offset */
......@@ -161,8 +155,7 @@ void reset_afc (struct dvb_i2c_bus *i2c)
}
static
int apply_frontend_param (struct dvb_i2c_bus *i2c,
static int apply_frontend_param (struct dvb_i2c_bus *i2c,
struct dvb_frontend_parameters *param)
{
/* The coderates for FEC_NONE, FEC_4_5 and FEC_FEC_6_7 are arbitrary */
......@@ -274,8 +267,7 @@ int apply_frontend_param (struct dvb_i2c_bus *i2c,
}
static
void reset_and_configure (struct dvb_i2c_bus *i2c)
static void reset_and_configure (struct dvb_i2c_bus *i2c)
{
u8 buf [] = { 0x06 };
struct i2c_msg msg = { .addr = 0x00, .flags = 0, .buf = buf, .len = 1 };
......@@ -285,8 +277,7 @@ void reset_and_configure (struct dvb_i2c_bus *i2c)
static
int init (struct dvb_i2c_bus *i2c)
static int init (struct dvb_i2c_bus *i2c)
{
reset_and_configure (i2c);
......@@ -424,8 +415,7 @@ int grundig_29504_401_ioctl (struct dvb_frontend *fe,
}
static
int l64781_attach (struct dvb_i2c_bus *i2c)
static int l64781_attach (struct dvb_i2c_bus *i2c)
{
u8 b0 [] = { 0x1a };
u8 b1 [] = { 0x00 };
......@@ -449,23 +439,20 @@ int l64781_attach (struct dvb_i2c_bus *i2c)
}
static
void l64781_detach (struct dvb_i2c_bus *i2c)
static void l64781_detach (struct dvb_i2c_bus *i2c)
{
dvb_unregister_frontend (grundig_29504_401_ioctl, i2c);
}
static
int __init init_grundig_29504_401 (void)
static int __init init_grundig_29504_401 (void)
{
return dvb_register_i2c_device (THIS_MODULE,
l64781_attach, l64781_detach);
}
static
void __exit exit_grundig_29504_401 (void)
static void __exit exit_grundig_29504_401 (void)
{
dvb_unregister_i2c_device (l64781_attach);
}
......
drivers/media/dvb/frontends/grundig_29504-491.c
View file @ cfa89a3e
......@@ -37,8 +37,7 @@ static int debug = 0;
#define dprintk if (debug) printk
static
struct dvb_frontend_info grundig_29504_491_info = {
static struct dvb_frontend_info grundig_29504_491_info = {
.name = "Grundig 29504-491, (TDA8083 based)",
.type = FE_QPSK,
.frequency_min = 950000, /* FIXME: guessed! */
......@@ -59,8 +58,7 @@ struct dvb_frontend_info grundig_29504_491_info = {
static
u8 tda8083_init_tab [] = {
static u8 tda8083_init_tab [] = {
0x04, 0x00, 0x4a, 0x79, 0x04, 0x00, 0xff, 0xea,
0x48, 0x42, 0x79, 0x60, 0x70, 0x52, 0x9a, 0x10,
0x0e, 0x10, 0xf2, 0xa7, 0x93, 0x0b, 0x05, 0xc8,
......@@ -71,8 +69,7 @@ u8 tda8083_init_tab [] = {
static
int tda8083_writereg (struct dvb_i2c_bus *i2c, u8 reg, u8 data)
static int tda8083_writereg (struct dvb_i2c_bus *i2c, u8 reg, u8 data)
{
int ret;
u8 buf [] = { reg, data };
......@@ -88,8 +85,7 @@ int tda8083_writereg (struct dvb_i2c_bus *i2c, u8 reg, u8 data)
}
static
int tda8083_readregs (struct dvb_i2c_bus *i2c, u8 reg1, u8 *b, u8 len)
static int tda8083_readregs (struct dvb_i2c_bus *i2c, u8 reg1, u8 *b, u8 len)
{
int ret;
struct i2c_msg msg [] = { { .addr = 0x68, .flags = 0, .buf = &reg1, .len = 1 },
......@@ -105,8 +101,7 @@ int tda8083_readregs (struct dvb_i2c_bus *i2c, u8 reg1, u8 *b, u8 len)
}
static inline
u8 tda8083_readreg (struct dvb_i2c_bus *i2c, u8 reg)
static inline u8 tda8083_readreg (struct dvb_i2c_bus *i2c, u8 reg)
{
u8 val;
......@@ -116,8 +111,7 @@ u8 tda8083_readreg (struct dvb_i2c_bus *i2c, u8 reg)
}
static
int tsa5522_write (struct dvb_i2c_bus *i2c, u8 data [4])
static int tsa5522_write (struct dvb_i2c_bus *i2c, u8 data [4])
{
int ret;
struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = 4 };
......@@ -135,8 +129,7 @@ int tsa5522_write (struct dvb_i2c_bus *i2c, u8 data [4])
* set up the downconverter frequency divisor for a
* reference clock comparision frequency of 125 kHz.
*/
static
int tsa5522_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq)
static int tsa5522_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq)
{
u32 div = freq / 125;
u8 buf [4] = { (div >> 8) & 0x7f, div & 0xff, 0x8e, 0x00 };
......@@ -145,8 +138,7 @@ int tsa5522_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq)
}
static int
tda8083_init (struct dvb_i2c_bus *i2c)
static int tda8083_init (struct dvb_i2c_bus *i2c)
{
int i;
......@@ -159,8 +151,7 @@ tda8083_init (struct dvb_i2c_bus *i2c)
}
static int
tda8083_set_inversion (struct dvb_i2c_bus *i2c, fe_spectral_inversion_t inversion)
static int tda8083_set_inversion (struct dvb_i2c_bus *i2c, fe_spectral_inversion_t inversion)
{
/* XXX FIXME: implement other modes than FEC_AUTO */
if (inversion == INVERSION_AUTO)
......@@ -170,8 +161,7 @@ tda8083_set_inversion (struct dvb_i2c_bus *i2c, fe_spectral_inversion_t inversio
}
static int
tda8083_set_fec (struct dvb_i2c_bus *i2c, fe_code_rate_t fec)
static int tda8083_set_fec (struct dvb_i2c_bus *i2c, fe_code_rate_t fec)
{
if (fec == FEC_AUTO)
return tda8083_writereg (i2c, 0x07, 0xff);
......@@ -183,8 +173,7 @@ tda8083_set_fec (struct dvb_i2c_bus *i2c, fe_code_rate_t fec)
}
static
fe_code_rate_t tda8083_get_fec (struct dvb_i2c_bus *i2c)
static fe_code_rate_t tda8083_get_fec (struct dvb_i2c_bus *i2c)
{
u8 index;
static fe_code_rate_t fec_tab [] = { FEC_8_9, FEC_1_2, FEC_2_3, FEC_3_4,
......@@ -199,8 +188,7 @@ fe_code_rate_t tda8083_get_fec (struct dvb_i2c_bus *i2c)
}
static
int tda8083_set_symbolrate (struct dvb_i2c_bus *i2c, u32 srate)
static int tda8083_set_symbolrate (struct dvb_i2c_bus *i2c, u32 srate)
{
u32 ratio;
u32 tmp;
......@@ -240,8 +228,7 @@ int tda8083_set_symbolrate (struct dvb_i2c_bus *i2c, u32 srate)
}
static
void tda8083_wait_diseqc_fifo (struct dvb_i2c_bus *i2c, int timeout)
static void tda8083_wait_diseqc_fifo (struct dvb_i2c_bus *i2c, int timeout)
{
unsigned long start = jiffies;
......@@ -253,8 +240,7 @@ void tda8083_wait_diseqc_fifo (struct dvb_i2c_bus *i2c, int timeout)
}
static
int tda8083_send_diseqc_msg (struct dvb_i2c_bus *i2c,
static int tda8083_send_diseqc_msg (struct dvb_i2c_bus *i2c,
struct dvb_diseqc_master_cmd *m)
{
int i;
......@@ -272,8 +258,7 @@ int tda8083_send_diseqc_msg (struct dvb_i2c_bus *i2c,
}
static
int tda8083_send_diseqc_burst (struct dvb_i2c_bus *i2c, fe_sec_mini_cmd_t burst)
static int tda8083_send_diseqc_burst (struct dvb_i2c_bus *i2c, fe_sec_mini_cmd_t burst)
{
switch (burst) {
case SEC_MINI_A:
......@@ -292,8 +277,7 @@ int tda8083_send_diseqc_burst (struct dvb_i2c_bus *i2c, fe_sec_mini_cmd_t burst)
}
static
int tda8083_set_tone (struct dvb_i2c_bus *i2c, fe_sec_tone_mode_t tone)
static int tda8083_set_tone (struct dvb_i2c_bus *i2c, fe_sec_tone_mode_t tone)
{
tda8083_writereg (i2c, 0x26, 0xf1);
......@@ -308,8 +292,7 @@ int tda8083_set_tone (struct dvb_i2c_bus *i2c, fe_sec_tone_mode_t tone)
}
static
int tda8083_set_voltage (struct dvb_i2c_bus *i2c, fe_sec_voltage_t voltage)
static int tda8083_set_voltage (struct dvb_i2c_bus *i2c, fe_sec_voltage_t voltage)
{
switch (voltage) {
case SEC_VOLTAGE_13:
......@@ -322,8 +305,7 @@ int tda8083_set_voltage (struct dvb_i2c_bus *i2c, fe_sec_voltage_t voltage)
}
static
int grundig_29504_491_ioctl (struct dvb_frontend *fe, unsigned int cmd,
static int grundig_29504_491_ioctl (struct dvb_frontend *fe, unsigned int cmd,
void *arg)
{
struct dvb_i2c_bus *i2c = fe->i2c;
......@@ -454,8 +436,7 @@ int grundig_29504_491_ioctl (struct dvb_frontend *fe, unsigned int cmd,
}
static
int tda8083_attach (struct dvb_i2c_bus *i2c)
static int tda8083_attach (struct dvb_i2c_bus *i2c)
{
if ((tda8083_readreg (i2c, 0x00)) != 0x05)
return -ENODEV;
......@@ -467,23 +448,20 @@ int tda8083_attach (struct dvb_i2c_bus *i2c)
}
static
void tda8083_detach (struct dvb_i2c_bus *i2c)
static void tda8083_detach (struct dvb_i2c_bus *i2c)
{
dvb_unregister_frontend (grundig_29504_491_ioctl, i2c);
}
static
int __init init_tda8083 (void)
static int __init init_tda8083 (void)
{
return dvb_register_i2c_device (THIS_MODULE,
tda8083_attach, tda8083_detach);
}
static
void __exit exit_tda8083 (void)
static void __exit exit_tda8083 (void)
{
dvb_unregister_i2c_device (tda8083_attach);
}
......
drivers/media/dvb/frontends/stv0299.c
View file @ cfa89a3e
......@@ -60,8 +60,7 @@
/* Master Clock = 88 MHz */
#define M_CLK (88000000UL)
static
struct dvb_frontend_info uni0299_info = {
static struct dvb_frontend_info uni0299_info = {
.name = "STV0299/TSA5059/SL1935 based",
.type = FE_QPSK,
.frequency_min = 950000,
......@@ -80,8 +79,7 @@ struct dvb_frontend_info uni0299_info = {
};
static
u8 init_tab [] = {
static u8 init_tab [] = {
0x04, 0x7d, /* F22FR = 0x7d */
/* F22 = f_VCO / 128 / 0x7d = 22 kHz */
......@@ -144,8 +142,7 @@ u8 init_tab [] = {
};
static
int stv0299_writereg (struct dvb_i2c_bus *i2c, u8 reg, u8 data)
static int stv0299_writereg (struct dvb_i2c_bus *i2c, u8 reg, u8 data)
{
int ret;
u8 buf [] = { reg, data };
......@@ -161,8 +158,7 @@ int stv0299_writereg (struct dvb_i2c_bus *i2c, u8 reg, u8 data)
}
static
u8 stv0299_readreg (struct dvb_i2c_bus *i2c, u8 reg)
static u8 stv0299_readreg (struct dvb_i2c_bus *i2c, u8 reg)
{
int ret;
u8 b0 [] = { reg };
......@@ -179,8 +175,7 @@ u8 stv0299_readreg (struct dvb_i2c_bus *i2c, u8 reg)
}
static
int stv0299_readregs (struct dvb_i2c_bus *i2c, u8 reg1, u8 *b, u8 len)
static int stv0299_readregs (struct dvb_i2c_bus *i2c, u8 reg1, u8 *b, u8 len)
{
int ret;
struct i2c_msg msg [] = { { .addr = 0x68, .flags = 0, .buf = &reg1, .len = 1 },
......@@ -195,8 +190,7 @@ int stv0299_readregs (struct dvb_i2c_bus *i2c, u8 reg1, u8 *b, u8 len)
}
static
int pll_write (struct dvb_i2c_bus *i2c, u8 addr, u8 *data, int len)
static int pll_write (struct dvb_i2c_bus *i2c, u8 addr, u8 *data, int len)
{
int ret;
u8 rpt1 [] = { 0x05, 0xb5 }; /* enable i2c repeater on stv0299 */
......@@ -214,8 +208,7 @@ int pll_write (struct dvb_i2c_bus *i2c, u8 addr, u8 *data, int len)
}
static
int sl1935_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq, int ftype)
static int sl1935_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq, int ftype)
{
u8 buf[4];
u32 div;
......@@ -245,8 +238,7 @@ int sl1935_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq, int ftype)
* set up the downconverter frequency divisor for a
* reference clock comparision frequency of 125 kHz.
*/
static
int tsa5059_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq, int ftype)
static int tsa5059_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq, int ftype)
{
u8 addr = (ftype == PHILIPS_SU1278SH) ? 0x60 : 0x61;
u32 div = freq / 125;
......@@ -270,8 +262,7 @@ int tsa5059_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq, int ftype)
#define MIN2(a,b) ((a) < (b) ? (a) : (b))
#define MIN3(a,b,c) MIN2(MIN2(a,b),c)
static
int tua6100_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq,
static int tua6100_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq,
int ftype, int srate)
{
u8 reg0 [2] = { 0x00, 0x00 };
......@@ -392,8 +383,7 @@ int tua6100_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq,
}
static
int pll_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq, int ftype, int srate)
static int pll_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq, int ftype, int srate)
{
if (ftype == LG_TDQF_S001F)
return sl1935_set_tv_freq(i2c, freq, ftype);
......@@ -404,8 +394,7 @@ int pll_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq, int ftype, int srate)
}
#if 0
static
int tsa5059_read_status (struct dvb_i2c_bus *i2c)
static int tsa5059_read_status (struct dvb_i2c_bus *i2c)
{
int ret;
u8 rpt1 [] = { 0x05, 0xb5 };
......@@ -426,8 +415,7 @@ int tsa5059_read_status (struct dvb_i2c_bus *i2c)
#endif
static
int stv0299_init (struct dvb_i2c_bus *i2c, int ftype)
static int stv0299_init (struct dvb_i2c_bus *i2c, int ftype)
{
int i;
......@@ -452,8 +440,7 @@ int stv0299_init (struct dvb_i2c_bus *i2c, int ftype)
}
static
int stv0299_check_inversion (struct dvb_i2c_bus *i2c)
static int stv0299_check_inversion (struct dvb_i2c_bus *i2c)
{
dprintk ("%s\n", __FUNCTION__);
......@@ -469,8 +456,7 @@ int stv0299_check_inversion (struct dvb_i2c_bus *i2c)
}
static
int stv0299_set_FEC (struct dvb_i2c_bus *i2c, fe_code_rate_t fec)
static int stv0299_set_FEC (struct dvb_i2c_bus *i2c, fe_code_rate_t fec)
{
dprintk ("%s\n", __FUNCTION__);
......@@ -493,8 +479,7 @@ int stv0299_set_FEC (struct dvb_i2c_bus *i2c, fe_code_rate_t fec)
}
static
fe_code_rate_t stv0299_get_fec (struct dvb_i2c_bus *i2c)
static fe_code_rate_t stv0299_get_fec (struct dvb_i2c_bus *i2c)
{
static fe_code_rate_t fec_tab [] = { FEC_2_3, FEC_3_4, FEC_5_6,
FEC_7_8, FEC_1_2 };
......@@ -512,8 +497,7 @@ fe_code_rate_t stv0299_get_fec (struct dvb_i2c_bus *i2c)
}
static
int stv0299_wait_diseqc_fifo (struct dvb_i2c_bus *i2c, int timeout)
static int stv0299_wait_diseqc_fifo (struct dvb_i2c_bus *i2c, int timeout)
{
unsigned long start = jiffies;
......@@ -531,8 +515,7 @@ int stv0299_wait_diseqc_fifo (struct dvb_i2c_bus *i2c, int timeout)
}
static
int stv0299_wait_diseqc_idle (struct dvb_i2c_bus *i2c, int timeout)
static int stv0299_wait_diseqc_idle (struct dvb_i2c_bus *i2c, int timeout)
{
unsigned long start = jiffies;
......@@ -550,8 +533,7 @@ int stv0299_wait_diseqc_idle (struct dvb_i2c_bus *i2c, int timeout)
}
static
int stv0299_send_diseqc_msg (struct dvb_i2c_bus *i2c,
static int stv0299_send_diseqc_msg (struct dvb_i2c_bus *i2c,
struct dvb_diseqc_master_cmd *m)
{
u8 val;
......@@ -582,8 +564,7 @@ int stv0299_send_diseqc_msg (struct dvb_i2c_bus *i2c,
}
static
int stv0299_send_diseqc_burst (struct dvb_i2c_bus *i2c, fe_sec_mini_cmd_t burst)
static int stv0299_send_diseqc_burst (struct dvb_i2c_bus *i2c, fe_sec_mini_cmd_t burst)
{
u8 val;
......@@ -610,8 +591,7 @@ int stv0299_send_diseqc_burst (struct dvb_i2c_bus *i2c, fe_sec_mini_cmd_t burst)
}
static
int stv0299_set_tone (struct dvb_i2c_bus *i2c, fe_sec_tone_mode_t tone)
static int stv0299_set_tone (struct dvb_i2c_bus *i2c, fe_sec_tone_mode_t tone)
{
u8 val;
......@@ -635,8 +615,7 @@ int stv0299_set_tone (struct dvb_i2c_bus *i2c, fe_sec_tone_mode_t tone)
}
static
int stv0299_set_voltage (struct dvb_i2c_bus *i2c, fe_sec_voltage_t voltage)
static int stv0299_set_voltage (struct dvb_i2c_bus *i2c, fe_sec_voltage_t voltage)
{
u8 reg0x08;
u8 reg0x0c;
......@@ -672,8 +651,7 @@ int stv0299_set_voltage (struct dvb_i2c_bus *i2c, fe_sec_voltage_t voltage)
}
static
int stv0299_set_symbolrate (struct dvb_i2c_bus *i2c, u32 srate)
static int stv0299_set_symbolrate (struct dvb_i2c_bus *i2c, u32 srate)
{
u32 ratio;
u32 tmp;
......@@ -711,8 +689,7 @@ int stv0299_set_symbolrate (struct dvb_i2c_bus *i2c, u32 srate)
}
static
int stv0299_get_symbolrate (struct dvb_i2c_bus *i2c)
static int stv0299_get_symbolrate (struct dvb_i2c_bus *i2c)
{
u32 Mclk = M_CLK / 4096L;
u32 srate;
......@@ -743,8 +720,7 @@ int stv0299_get_symbolrate (struct dvb_i2c_bus *i2c)
}
static
int uni0299_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
static int uni0299_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
{
int tuner_type = (long) fe->data;
struct dvb_i2c_bus *i2c = fe->i2c;
......@@ -881,8 +857,7 @@ int uni0299_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
return 0;
}
static
long probe_tuner (struct dvb_i2c_bus *i2c)
static long probe_tuner (struct dvb_i2c_bus *i2c)
{
/* read the status register of TSA5059 */
u8 rpt[] = { 0x05, 0xb5 };
......@@ -935,8 +910,7 @@ long probe_tuner (struct dvb_i2c_bus *i2c)
}
static
int uni0299_attach (struct dvb_i2c_bus *i2c)
static int uni0299_attach (struct dvb_i2c_bus *i2c)
{
long tuner_type;
u8 id = stv0299_readreg (i2c, 0x00);
......@@ -958,8 +932,7 @@ int uni0299_attach (struct dvb_i2c_bus *i2c)
}
static
void uni0299_detach (struct dvb_i2c_bus *i2c)
static void uni0299_detach (struct dvb_i2c_bus *i2c)
{
dprintk ("%s\n", __FUNCTION__);
......@@ -967,16 +940,14 @@ void uni0299_detach (struct dvb_i2c_bus *i2c)
}
static
int __init init_uni0299 (void)
static int __init init_uni0299 (void)
{
dprintk ("%s\n", __FUNCTION__);
return dvb_register_i2c_device (NULL, uni0299_attach, uni0299_detach);
}
static
void __exit exit_uni0299 (void)
static void __exit exit_uni0299 (void)
{
dprintk ("%s\n", __FUNCTION__);
......
drivers/media/dvb/frontends/ves1820.c
View file @ cfa89a3e
......@@ -72,8 +72,7 @@
static
struct dvb_frontend_info ves1820_info = {
static struct dvb_frontend_info ves1820_info = {
.name = "VES1820 based DVB-C frontend",
.type = FE_QAM,
.frequency_stepsize = 62500,
......@@ -94,8 +93,7 @@ struct dvb_frontend_info ves1820_info = {
static
u8 ves1820_inittab [] =
static u8 ves1820_inittab [] =
{
0x69, 0x6A, 0x9B, 0x0A, 0x52, 0x46, 0x26, 0x1A,
0x43, 0x6A, 0xAA, 0xAA, 0x1E, 0x85, 0x43, 0x28,
......@@ -107,8 +105,7 @@ u8 ves1820_inittab [] =
};
static
int ves1820_writereg (struct dvb_frontend *fe, u8 reg, u8 data)
static int ves1820_writereg (struct dvb_frontend *fe, u8 reg, u8 data)
{
u8 addr = GET_DEMOD_ADDR(fe->data);
u8 buf[] = { 0x00, reg, data };
......@@ -128,8 +125,7 @@ int ves1820_writereg (struct dvb_frontend *fe, u8 reg, u8 data)
}
static
u8 ves1820_readreg (struct dvb_frontend *fe, u8 reg)
static u8 ves1820_readreg (struct dvb_frontend *fe, u8 reg)
{
u8 b0 [] = { 0x00, reg };
u8 b1 [] = { 0 };
......@@ -148,8 +144,7 @@ u8 ves1820_readreg (struct dvb_frontend *fe, u8 reg)
}
static
int tuner_write (struct dvb_i2c_bus *i2c, u8 addr, u8 data [4])
static int tuner_write (struct dvb_i2c_bus *i2c, u8 addr, u8 data [4])
{
int ret;
struct i2c_msg msg = { addr: addr, .flags = 0, .buf = data, .len = 4 };
......@@ -167,8 +162,7 @@ int tuner_write (struct dvb_i2c_bus *i2c, u8 addr, u8 data [4])
* set up the downconverter frequency divisor for a
* reference clock comparision frequency of 62.5 kHz.
*/
static
int tuner_set_tv_freq (struct dvb_frontend *fe, u32 freq)
static int tuner_set_tv_freq (struct dvb_frontend *fe, u32 freq)
{
u32 div, ifreq;
static u8 addr [] = { 0x61, 0x62 };
......@@ -203,8 +197,7 @@ int tuner_set_tv_freq (struct dvb_frontend *fe, u32 freq)
}
static
int ves1820_setup_reg0 (struct dvb_frontend *fe, u8 reg0,
static int ves1820_setup_reg0 (struct dvb_frontend *fe, u8 reg0,
fe_spectral_inversion_t inversion)
{
reg0 |= GET_REG0(fe->data) & 0x62;
......@@ -235,8 +228,7 @@ int ves1820_setup_reg0 (struct dvb_frontend *fe, u8 reg0,
}
static
int ves1820_init (struct dvb_frontend *fe)
static int ves1820_init (struct dvb_frontend *fe)
{
int i;
......@@ -253,8 +245,7 @@ int ves1820_init (struct dvb_frontend *fe)
}
static
int ves1820_set_symbolrate (struct dvb_frontend *fe, u32 symbolrate)
static int ves1820_set_symbolrate (struct dvb_frontend *fe, u32 symbolrate)
{
s32 BDR;
s32 BDRI;
......@@ -309,8 +300,7 @@ int ves1820_set_symbolrate (struct dvb_frontend *fe, u32 symbolrate)
}
static
int ves1820_set_parameters (struct dvb_frontend *fe,
static int ves1820_set_parameters (struct dvb_frontend *fe,
struct dvb_frontend_parameters *p)
{
static const u8 reg0x00 [] = { 0x00, 0x04, 0x08, 0x0c, 0x10 };
......@@ -339,8 +329,7 @@ int ves1820_set_parameters (struct dvb_frontend *fe,
static
int ves1820_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
static int ves1820_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
{
switch (cmd) {
case FE_GET_INFO:
......@@ -450,13 +439,12 @@ int ves1820_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
}
static
long probe_tuner (struct dvb_i2c_bus *i2c)
static long probe_tuner (struct dvb_i2c_bus *i2c)
{
static const
struct i2c_msg msg1 = { .addr = 0x61, .flags = 0, .buf = NULL, .len = 0 };
static const
struct i2c_msg msg2 = { .addr = 0x62, .flags = 0, .buf = NULL, .len = 0 };
static const struct i2c_msg msg1 =
{ .addr = 0x61, .flags = 0, .buf = NULL, .len = 0 };
static const struct i2c_msg msg2 =
{ .addr = 0x62, .flags = 0, .buf = NULL, .len = 0 };
int type;
if (i2c->xfer(i2c, &msg1, 1) == 1) {
......@@ -476,8 +464,7 @@ long probe_tuner (struct dvb_i2c_bus *i2c)
}
static
u8 read_pwm (struct dvb_i2c_bus *i2c)
static u8 read_pwm (struct dvb_i2c_bus *i2c)
{
u8 b = 0xff;
u8 pwm;
......@@ -495,8 +482,7 @@ u8 read_pwm (struct dvb_i2c_bus *i2c)
}
static
long probe_demod_addr (struct dvb_i2c_bus *i2c)
static long probe_demod_addr (struct dvb_i2c_bus *i2c)
{
u8 b [] = { 0x00, 0x1a };
u8 id;
......@@ -515,8 +501,7 @@ long probe_demod_addr (struct dvb_i2c_bus *i2c)
}
static
int ves1820_attach (struct dvb_i2c_bus *i2c)
static int ves1820_attach (struct dvb_i2c_bus *i2c)
{
void *data = NULL;
long demod_addr;
......@@ -539,23 +524,20 @@ int ves1820_attach (struct dvb_i2c_bus *i2c)
}
static
void ves1820_detach (struct dvb_i2c_bus *i2c)
static void ves1820_detach (struct dvb_i2c_bus *i2c)
{
dvb_unregister_frontend (ves1820_ioctl, i2c);
}
static
int __init init_ves1820 (void)
static int __init init_ves1820 (void)
{
return dvb_register_i2c_device (THIS_MODULE,
ves1820_attach, ves1820_detach);
}
static
void __exit exit_ves1820 (void)
static void __exit exit_ves1820 (void)
{
dvb_unregister_i2c_device (ves1820_attach);
}
......
drivers/media/dvb/ttpci/av7110.c
View file @ cfa89a3e
......@@ -58,19 +58,19 @@
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/pci.h>
#include <asm/system.h>
#include <asm/bitops.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/semaphore.h>
#include <linux/init.h>
#include <linux/vmalloc.h>
#include <linux/netdevice.h>
#include <linux/inetdevice.h>
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
#include <asm/system.h>
#include <asm/bitops.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/semaphore.h>
#include <linux/dvb/frontend.h>
#include "dvb_i2c.h"
......@@ -119,8 +119,7 @@ int av7110_num = 0;
/* This DEBI code is based on the Stradis driver
by Nathan Laredo <laredo@gnu.org> */
static
int wait_for_debi_done(struct av7110 *av7110)
static int wait_for_debi_done(struct av7110 *av7110)
{
struct saa7146_dev *dev = av7110->dev;
int start;
......@@ -199,16 +198,14 @@ static u32 debiread(struct av7110 *av7110, u32 config, int addr, int count)
/* fixme: val can be a pointer to a memory or an u32 value -- this
won't work on 64bit platforms! */
static inline void
iwdebi(struct av7110 *av7110, u32 config, int addr, u32 val, int count)
static inline void iwdebi(struct av7110 *av7110, u32 config, int addr, u32 val, int count)
{
if (count>4 && val)
memcpy(av7110->debi_virt, (char *) val, count);
debiwrite(av7110, config, addr, val, count);
}
static inline u32
irdebi(struct av7110 *av7110, u32 config, int addr, u32 val, int count)
static inline u32 irdebi(struct av7110 *av7110, u32 config, int addr, u32 val, int count)
{
u32 res;
......@@ -220,8 +217,7 @@ irdebi(struct av7110 *av7110, u32 config, int addr, u32 val, int count)
/* DEBI outside interrupts, only for count<=4! */
static inline void
wdebi(struct av7110 *av7110, u32 config, int addr, u32 val, int count)
static inline void wdebi(struct av7110 *av7110, u32 config, int addr, u32 val, int count)
{
unsigned long flags;
......@@ -230,8 +226,7 @@ wdebi(struct av7110 *av7110, u32 config, int addr, u32 val, int count)
spin_unlock_irqrestore(&av7110->debilock, flags);
}
static inline u32
rdebi(struct av7110 *av7110, u32 config, int addr, u32 val, int count)
static inline u32 rdebi(struct av7110 *av7110, u32 config, int addr, u32 val, int count)
{
unsigned long flags;
u32 res;
......@@ -243,8 +238,7 @@ rdebi(struct av7110 *av7110, u32 config, int addr, u32 val, int count)
}
static inline char
chtrans(char c)
static inline char chtrans(char c)
{
if (c<32 || c>126)
c=0x20;
......@@ -254,8 +248,7 @@ chtrans(char c)
/* handle mailbox registers of the dual ported RAM */
static inline void
ARM_ResetMailBox(struct av7110 *av7110)
static inline void ARM_ResetMailBox(struct av7110 *av7110)
{
unsigned long flags;
......@@ -268,20 +261,17 @@ ARM_ResetMailBox(struct av7110 *av7110)
spin_unlock_irqrestore(&av7110->debilock, flags);
}
static inline void
ARM_ClearMailBox(struct av7110 *av7110)
static inline void ARM_ClearMailBox(struct av7110 *av7110)
{
iwdebi(av7110, DEBINOSWAP, IRQ_RX, 0, 2);
}
static inline void
ARM_ClearIrq(struct av7110 *av7110)
static inline void ARM_ClearIrq(struct av7110 *av7110)
{
irdebi(av7110, DEBINOSWAP, IRQ_RX, 0, 2);
}
static void
reset_arm(struct av7110 *av7110)
static void reset_arm(struct av7110 *av7110)
{
saa7146_setgpio(av7110->dev, RESET_LINE, SAA7146_GPIO_OUTLO);
......@@ -307,8 +297,7 @@ reset_arm(struct av7110 *av7110)
printk("av7110: ARM RESET\n");
}
static void
recover_arm(struct av7110 *av7110)
static void recover_arm(struct av7110 *av7110)
{
DEB_EE(("av7110: %p\n",av7110));
......@@ -324,8 +313,7 @@ recover_arm(struct av7110 *av7110)
outcom(av7110, COMTYPE_PIDFILTER, SetIR, 1, av7110->ir_config);
}
static void
arm_error(struct av7110 *av7110)
static void arm_error(struct av7110 *av7110)
{
DEB_EE(("av7110: %p\n",av7110));
......@@ -376,8 +364,7 @@ static int arm_thread(void *data)
}
static int
record_cb(struct dvb_filter_pes2ts *p2t, u8 *buf, size_t len)
static int record_cb(struct dvb_filter_pes2ts *p2t, u8 *buf, size_t len)
{
struct dvb_demux_feed *dvbdmxfeed=(struct dvb_demux_feed *) p2t->priv;
......@@ -394,8 +381,7 @@ record_cb(struct dvb_filter_pes2ts *p2t, u8 *buf, size_t len)
return dvb_filter_pes2ts(p2t, buf, len);
}
static int
dvb_filter_pes2ts_cb(void *priv, unsigned char *data)
static int dvb_filter_pes2ts_cb(void *priv, unsigned char *data)
{
struct dvb_demux_feed *dvbdmxfeed=(struct dvb_demux_feed *) priv;
......@@ -407,8 +393,7 @@ dvb_filter_pes2ts_cb(void *priv, unsigned char *data)
return 0;
}
static int
AV_StartRecord(struct av7110 *av7110, int av,
static int AV_StartRecord(struct av7110 *av7110, int av,
struct dvb_demux_feed *dvbdmxfeed)
{
struct dvb_demux *dvbdmx=dvbdmxfeed->demux;
......@@ -453,8 +438,7 @@ AV_StartRecord(struct av7110 *av7110, int av,
return 0;
}
static int
AV_StartPlay(struct av7110 *av7110, int av)
static int AV_StartPlay(struct av7110 *av7110, int av)
{
DEB_EE(("av7110: %p\n",av7110));
......@@ -487,8 +471,7 @@ AV_StartPlay(struct av7110 *av7110, int av)
return av7110->playing;
}
static void
AV_Stop(struct av7110 *av7110, int av)
static void AV_Stop(struct av7110 *av7110, int av)
{
DEB_EE(("av7110: %p\n",av7110));
......@@ -613,8 +596,7 @@ void CI_handle(struct av7110 *av7110, u8 *data, u16 len)
}
static inline int
DvbDmxFilterCallback(u8 * buffer1, size_t buffer1_len,
static inline int DvbDmxFilterCallback(u8 * buffer1, size_t buffer1_len,
u8 * buffer2, size_t buffer2_len,
struct dvb_demux_filter *dvbdmxfilter,
enum dmx_success success,
......@@ -675,8 +657,7 @@ u8 pshead[0x26] = {
//#define DEBUG_TIMING
inline static void
print_time(char *s)
static inline void print_time(char *s)
{
#ifdef DEBUG_TIMING
struct timeval tv;
......@@ -685,8 +666,7 @@ print_time(char *s)
#endif
}
static void
ci_get_data(struct dvb_ringbuffer *cibuf, u8 *data, int len)
static void ci_get_data(struct dvb_ringbuffer *cibuf, u8 *data, int len)
{
if (dvb_ringbuffer_free(cibuf) < len+2)
return;
......@@ -699,8 +679,7 @@ ci_get_data(struct dvb_ringbuffer *cibuf, u8 *data, int len)
wake_up_interruptible(&cibuf->queue);
}
static
void debiirq (unsigned long data)
static void debiirq (unsigned long data)
{
struct av7110 *av7110 = (struct av7110*) data;
int type=av7110->debitype;
......@@ -830,8 +809,7 @@ void debiirq (unsigned long data)
spin_unlock(&av7110->debilock);
}
static int
pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen)
static int pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen)
{
int len;
u32 sync;
......@@ -875,8 +853,7 @@ pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen)
}
static
void gpioirq (unsigned long data)
static void gpioirq (unsigned long data)
{
struct av7110 *av7110 = (struct av7110*) data;
u32 rxbuf, txbuf;
......@@ -1185,8 +1162,7 @@ static int OutCommand(struct av7110 *av7110, u16* buf, int length)
return 0;
}
inline static int
SOutCommand(struct av7110 *av7110, u16* buf, int length)
static inline int SOutCommand(struct av7110 *av7110, u16* buf, int length)
{
int ret;
......@@ -1327,8 +1303,7 @@ static int CommandRequest(struct av7110 *av7110, u16 *Buff, int length, u16 *buf
}
static inline int
RequestParameter(struct av7110 *av7110, u16 tag, u16* Buff, s16 length)
static inline int RequestParameter(struct av7110 *av7110, u16 tag, u16* Buff, s16 length)
{
int ret;
ret = CommandRequest(av7110, &tag, 0, Buff, length);
......@@ -1342,8 +1317,7 @@ RequestParameter(struct av7110 *av7110, u16 tag, u16* Buff, s16 length)
* Firmware commands
****************************************************************************/
static inline int
msp_writereg(struct av7110 *av7110, u8 dev, u16 reg, u16 val)
static inline int msp_writereg(struct av7110 *av7110, u8 dev, u16 reg, u16 val)
{
u8 msg[5]={ dev, reg>>8, reg&0xff, val>>8 , val&0xff };
struct dvb_i2c_bus *i2c = av7110->i2c_bus;
......@@ -1356,16 +1330,14 @@ msp_writereg(struct av7110 *av7110, u8 dev, u16 reg, u16 val)
return i2c->xfer(i2c, &msgs, 1);
}
inline static int
SendDAC(struct av7110 *av7110, u8 addr, u8 data)
static inline int SendDAC(struct av7110 *av7110, u8 addr, u8 data)
{
DEB_EE(("av7110: %p\n",av7110));
return outcom(av7110, COMTYPE_AUDIODAC, AudioDAC, 2, addr, data);
}
static int
SetVolume(struct av7110 *av7110, int volleft, int volright)
static int SetVolume(struct av7110 *av7110, int volleft, int volright)
{
int err, vol, val, balance = 0;
......@@ -1406,41 +1378,41 @@ SetVolume(struct av7110 *av7110, int volleft, int volright)
#ifdef CONFIG_DVB_AV7110_OSD
inline static int ResetBlend(struct av7110 *av7110, u8 windownr)
static inline int ResetBlend(struct av7110 *av7110, u8 windownr)
{
return outcom(av7110, COMTYPE_OSD, SetNonBlend, 1, windownr);
}
inline static int SetColorBlend(struct av7110 *av7110, u8 windownr)
static inline int SetColorBlend(struct av7110 *av7110, u8 windownr)
{
return outcom(av7110, COMTYPE_OSD, SetCBlend, 1, windownr);
}
inline static int SetWindowBlend(struct av7110 *av7110, u8 windownr, u8 blending)
static inline int SetWindowBlend(struct av7110 *av7110, u8 windownr, u8 blending)
{
return outcom(av7110, COMTYPE_OSD, SetWBlend, 2, windownr, blending);
}
inline static int SetBlend_(struct av7110 *av7110, u8 windownr,
static inline int SetBlend_(struct av7110 *av7110, u8 windownr,
enum av7110_osd_palette_type colordepth, u16 index, u8 blending)
{
return outcom(av7110, COMTYPE_OSD, SetBlend, 4,
windownr, colordepth, index, blending);
}
inline static int SetColor_(struct av7110 *av7110, u8 windownr,
static inline int SetColor_(struct av7110 *av7110, u8 windownr,
enum av7110_osd_palette_type colordepth, u16 index, u16 colorhi, u16 colorlo)
{
return outcom(av7110, COMTYPE_OSD, SetColor, 5,
windownr, colordepth, index, colorhi, colorlo);
}
inline static int BringToTop(struct av7110 *av7110, u8 windownr)
static inline int BringToTop(struct av7110 *av7110, u8 windownr)
{
return outcom(av7110, COMTYPE_OSD, WTop, 1, windownr);
}
inline static int SetFont(struct av7110 *av7110, u8 windownr, u8 fontsize,
static inline int SetFont(struct av7110 *av7110, u8 windownr, u8 fontsize,
u16 colorfg, u16 colorbg)
{
return outcom(av7110, COMTYPE_OSD, Set_Font, 4,
......@@ -1508,36 +1480,36 @@ static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, u8* buf)
return ret;
}
inline static int DrawLine(struct av7110 *av7110, u8 windownr,
static inline int DrawLine(struct av7110 *av7110, u8 windownr,
u16 x, u16 y, u16 dx, u16 dy, u16 color)
{
return outcom(av7110, COMTYPE_OSD, DLine, 6,
windownr, x, y, dx, dy, color);
}
inline static int DrawBlock(struct av7110 *av7110, u8 windownr,
static inline int DrawBlock(struct av7110 *av7110, u8 windownr,
u16 x, u16 y, u16 dx, u16 dy, u16 color)
{
return outcom(av7110, COMTYPE_OSD, DBox, 6,
windownr, x, y, dx, dy, color);
}
inline static int HideWindow(struct av7110 *av7110, u8 windownr)
static inline int HideWindow(struct av7110 *av7110, u8 windownr)
{
return outcom(av7110, COMTYPE_OSD, WHide, 1, windownr);
}
inline static int MoveWindowRel(struct av7110 *av7110, u8 windownr, u16 x, u16 y)
static inline int MoveWindowRel(struct av7110 *av7110, u8 windownr, u16 x, u16 y)
{
return outcom(av7110, COMTYPE_OSD, WMoveD, 3, windownr, x, y);
}
inline static int MoveWindowAbs(struct av7110 *av7110, u8 windownr, u16 x, u16 y)
static inline int MoveWindowAbs(struct av7110 *av7110, u8 windownr, u16 x, u16 y)
{
return outcom(av7110, COMTYPE_OSD, WMoveA, 3, windownr, x, y);
}
inline static int DestroyOSDWindow(struct av7110 *av7110, u8 windownr)
static inline int DestroyOSDWindow(struct av7110 *av7110, u8 windownr)
{
return outcom(av7110, COMTYPE_OSD, WDestroy, 1, windownr);
}
......@@ -1552,8 +1524,7 @@ static void DestroyOSDWindows(struct av7110 *av7110)
}
#endif
static inline int
CreateOSDWindow(struct av7110 *av7110, u8 windownr,
static inline int CreateOSDWindow(struct av7110 *av7110, u8 windownr,
enum av7110_window_display_type disptype, u16 width, u16 height)
{
return outcom(av7110, COMTYPE_OSD, WCreate, 4,
......@@ -1564,8 +1535,7 @@ CreateOSDWindow(struct av7110 *av7110, u8 windownr,
static enum av7110_osd_palette_type bpp2pal[8]={Pal1Bit, Pal2Bit, 0, Pal4Bit, 0, 0, 0, Pal8Bit};
static enum av7110_window_display_type bpp2bit[8]={BITMAP1, BITMAP2, 0, BITMAP4, 0, 0, 0, BITMAP8};
static inline int
LoadBitmap(struct av7110 *av7110, u16 format, u16 dx, u16 dy, int inc, u8* data)
static inline int LoadBitmap(struct av7110 *av7110, u16 format, u16 dx, u16 dy, int inc, u8* data)
{
int bpp;
int i;
......@@ -1624,8 +1594,7 @@ LoadBitmap(struct av7110 *av7110, u16 format, u16 dx, u16 dy, int inc, u8* data)
return outcom(av7110, COMTYPE_OSD, LoadBmp, 3, format, dx, dy);
}
static int
BlitBitmap(struct av7110 *av7110, u16 win, u16 x, u16 y, u16 trans)
static int BlitBitmap(struct av7110 *av7110, u16 win, u16 x, u16 y, u16 trans)
{
DECLARE_WAITQUEUE(wait, current);
......@@ -1650,8 +1619,7 @@ BlitBitmap(struct av7110 *av7110, u16 win, u16 x, u16 y, u16 trans)
return -1;
}
static inline int
ReleaseBitmap(struct av7110 *av7110)
static inline int ReleaseBitmap(struct av7110 *av7110)
{
DEB_EE(("av7110: %p\n",av7110));
......@@ -1677,8 +1645,7 @@ static u32 RGB2YUV(u16 R, u16 G, u16 B)
return Cr|(Cb<<16)|(Y<<8);
}
static void
OSDSetColor(struct av7110 *av7110, u8 color, u8 r, u8 g, u8 b, u8 blend)
static void OSDSetColor(struct av7110 *av7110, u8 color, u8 r, u8 g, u8 b, u8 blend)
{
u16 ch, cl;
u32 yuv;
......@@ -1692,8 +1659,7 @@ OSDSetColor(struct av7110 *av7110, u8 color, u8 r, u8 g, u8 b, u8 blend)
color, ((blend>>4)&0x0f));
}
static int
OSDSetBlock(struct av7110 *av7110, int x0, int y0, int x1, int y1, int inc, u8 *data)
static int OSDSetBlock(struct av7110 *av7110, int x0, int y0, int x1, int y1, int inc, u8 *data)
{
uint w, h, bpp, bpl, size, lpb, bnum, brest;
int i;
......@@ -1723,8 +1689,7 @@ OSDSetBlock(struct av7110 *av7110, int x0, int y0, int x1, int y1, int inc, u8 *
return 0;
}
static int
OSD_DrawCommand(struct av7110 *av7110, osd_cmd_t *dc)
static int OSD_DrawCommand(struct av7110 *av7110, osd_cmd_t *dc)
{
switch (dc->cmd) {
case OSD_Close:
......@@ -1830,8 +1795,7 @@ OSD_DrawCommand(struct av7110 *av7110, osd_cmd_t *dc)
}
static int
dvb_osd_ioctl(struct inode *inode, struct file *file,
static int dvb_osd_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, void *parg)
{
struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
......@@ -1866,8 +1830,7 @@ static struct dvb_device dvbdev_osd = {
/* get version of the firmware ROM, RTSL, video ucode and ARM application */
static void
firmversion(struct av7110 *av7110)
static void firmversion(struct av7110 *av7110)
{
u16 buf[20];
......@@ -1898,8 +1861,7 @@ firmversion(struct av7110 *av7110)
return;
}
static int
waitdebi(struct av7110 *av7110, int adr, int state)
static int waitdebi(struct av7110 *av7110, int adr, int state)
{
int k;
......@@ -1913,8 +1875,7 @@ waitdebi(struct av7110 *av7110, int adr, int state)
}
static int
load_dram(struct av7110 *av7110, u32 *data, int len)
static int load_dram(struct av7110 *av7110, u32 *data, int len)
{
int i;
int blocks, rest;
......@@ -1962,8 +1923,7 @@ load_dram(struct av7110 *av7110, u32 *data, int len)
}
static u8
bootcode[] = {
static u8 bootcode[] = {
0xea, 0x00, 0x00, 0x0e, 0xe1, 0xb0, 0xf0, 0x0e, /* 0x0000 */
0xe2, 0x5e, 0xf0, 0x04, 0xe2, 0x5e, 0xf0, 0x04,
0xe2, 0x5e, 0xf0, 0x08, 0xe2, 0x5e, 0xf0, 0x04,
......@@ -1989,8 +1949,7 @@ bootcode[] = {
#include "av7110_firm.h"
static int
bootarm(struct av7110 *av7110)
static int bootarm(struct av7110 *av7110)
{
struct saa7146_dev *dev= av7110->dev;
u32 ret;
......@@ -2069,8 +2028,7 @@ bootarm(struct av7110 *av7110)
return 0;
}
static inline int
SetPIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid,
static inline int SetPIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid,
u16 subpid, u16 pcrpid)
{
DEB_EE(("av7110: %p\n",av7110));
......@@ -2088,8 +2046,7 @@ SetPIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid,
pcrpid, vpid, apid, ttpid, subpid);
}
static void
ChangePIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid,
static void ChangePIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid,
u16 subpid, u16 pcrpid)
{
DEB_EE(("av7110: %p\n",av7110));
......@@ -2113,8 +2070,7 @@ ChangePIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid,
}
static void
SetMode(struct av7110 *av7110, int mode)
static void SetMode(struct av7110 *av7110, int mode)
{
DEB_EE(("av7110: %p\n",av7110));
......@@ -2129,23 +2085,20 @@ SetMode(struct av7110 *av7110, int mode)
}
}
inline static void
TestMode(struct av7110 *av7110, int mode)
static inline void TestMode(struct av7110 *av7110, int mode)
{
DEB_EE(("av7110: %p\n",av7110));
outcom(av7110, COMTYPE_ENCODER, SetTestMode, 1, mode);
}
inline static void
VidMode(struct av7110 *av7110, int mode)
static inline void VidMode(struct av7110 *av7110, int mode)
{
DEB_EE(("av7110: %p\n",av7110));
outcom(av7110, COMTYPE_ENCODER, SetVidMode, 1, mode);
}
static int inline
vidcom(struct av7110 *av7110, u32 com, u32 arg)
static inline int vidcom(struct av7110 *av7110, u32 com, u32 arg)
{
DEB_EE(("av7110: %p\n",av7110));
return outcom(av7110, 0x80, 0x02, 4,
......@@ -2153,24 +2106,21 @@ vidcom(struct av7110 *av7110, u32 com, u32 arg)
(arg>>16), (arg&0xffff));
}
static int inline
audcom(struct av7110 *av7110, u32 com)
static inline int audcom(struct av7110 *av7110, u32 com)
{
DEB_EE(("av7110: %p\n",av7110));
return outcom(av7110, 0x80, 0x03, 4,
(com>>16), (com&0xffff));
}
inline static void
Set22K(struct av7110 *av7110, int state)
static inline void Set22K(struct av7110 *av7110, int state)
{
DEB_EE(("av7110: %p\n",av7110));
outcom(av7110, COMTYPE_AUDIODAC, (state ? ON22K : OFF22K), 0);
}
static
int SendDiSEqCMsg(struct av7110 *av7110, int len, u8 *msg, unsigned long burst)
static int SendDiSEqCMsg(struct av7110 *av7110, int len, u8 *msg, unsigned long burst)
{
int i;
u16 buf[18] = { ((COMTYPE_AUDIODAC << 8) + SendDiSEqC),
......@@ -2202,8 +2152,7 @@ int SendDiSEqCMsg(struct av7110 *av7110, int len, u8 *msg, unsigned long burst)
* I2C client commands
****************************************************************************/
static inline int
i2c_writereg(struct av7110 *av7110, u8 id, u8 reg, u8 val)
static inline int i2c_writereg(struct av7110 *av7110, u8 id, u8 reg, u8 val)
{
u8 msg[2]={ reg, val };
struct dvb_i2c_bus *i2c = av7110->i2c_bus;
......@@ -2216,8 +2165,7 @@ i2c_writereg(struct av7110 *av7110, u8 id, u8 reg, u8 val)
return i2c->xfer (i2c, &msgs, 1);
}
static inline u8
i2c_readreg(struct av7110 *av7110, u8 id, u8 reg)
static inline u8 i2c_readreg(struct av7110 *av7110, u8 id, u8 reg)
{
struct dvb_i2c_bus *i2c = av7110->i2c_bus;
u8 mm1[] = {0x00};
......@@ -2247,8 +2195,7 @@ static int sw2mode[16] = {
VIDEO_MODE_PAL, VIDEO_MODE_PAL, VIDEO_MODE_PAL, VIDEO_MODE_PAL,
};
static void
get_video_format(struct av7110 *av7110, u8 *buf, int count)
static void get_video_format(struct av7110 *av7110, u8 *buf, int count)
{
int i;
int hsize,vsize;
......@@ -2274,8 +2221,7 @@ get_video_format(struct av7110 *av7110, u8 *buf, int count)
}
}
static inline long
aux_ring_buffer_write(struct dvb_ringbuffer *rbuf, const char *buf, unsigned long count)
static inline long aux_ring_buffer_write(struct dvb_ringbuffer *rbuf, const char *buf, unsigned long count)
{
unsigned long todo = count;
int free;
......@@ -2297,8 +2243,7 @@ aux_ring_buffer_write(struct dvb_ringbuffer *rbuf, const char *buf, unsigned lon
return count-todo;
}
static void
play_video_cb(u8 *buf, int count, void *priv)
static void play_video_cb(u8 *buf, int count, void *priv)
{
struct av7110 *av7110=(struct av7110 *) priv;
DEB_EE(("av7110: %p\n",av7110));
......@@ -2310,8 +2255,7 @@ play_video_cb(u8 *buf, int count, void *priv)
aux_ring_buffer_write(&av7110->aout, buf, count);
}
static void
play_audio_cb(u8 *buf, int count, void *priv)
static void play_audio_cb(u8 *buf, int count, void *priv)
{
struct av7110 *av7110=(struct av7110 *) priv;
DEB_EE(("av7110: %p\n",av7110));
......@@ -2321,8 +2265,7 @@ play_audio_cb(u8 *buf, int count, void *priv)
#define FREE_COND (dvb_ringbuffer_free(&av7110->avout)>=20*1024 && dvb_ringbuffer_free(&av7110->aout)>=20*1024)
static ssize_t
dvb_play(struct av7110 *av7110, const u8 *buf,
static ssize_t dvb_play(struct av7110 *av7110, const u8 *buf,
unsigned long count, int nonblock, int type, int umem)
{
unsigned long todo = count, n;
......@@ -2360,8 +2303,7 @@ dvb_play(struct av7110 *av7110, const u8 *buf,
return count-todo;
}
static ssize_t
dvb_aplay(struct av7110 *av7110, const u8 *buf,
static ssize_t dvb_aplay(struct av7110 *av7110, const u8 *buf,
unsigned long count, int nonblock, int type)
{
unsigned long todo = count, n;
......@@ -2678,8 +2620,7 @@ int av7110_ioctl(struct saa7146_dev *dev, unsigned int cmd, void *arg)
return 0;
}
static
unsigned int dvb_audio_poll(struct file *file, poll_table *wait)
static unsigned int dvb_audio_poll(struct file *file, poll_table *wait)
{
struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
......@@ -2713,8 +2654,7 @@ unsigned int dvb_audio_poll(struct file *file, poll_table *wait)
* hardware filter functions
******************************************************************************/
static int
StartHWFilter(struct dvb_demux_filter *dvbdmxfilter)
static int StartHWFilter(struct dvb_demux_filter *dvbdmxfilter)
{
struct dvb_demux_feed *dvbdmxfeed=dvbdmxfilter->feed;
struct av7110 *av7110=(struct av7110 *) dvbdmxfeed->demux->priv;
......@@ -2757,8 +2697,7 @@ StartHWFilter(struct dvb_demux_filter *dvbdmxfilter)
return ret;
}
static int
StopHWFilter(struct dvb_demux_filter *dvbdmxfilter)
static int StopHWFilter(struct dvb_demux_filter *dvbdmxfilter)
{
struct av7110 *av7110=(struct av7110 *) dvbdmxfilter->feed->demux->priv;
u16 buf[3];
......@@ -2793,8 +2732,7 @@ StopHWFilter(struct dvb_demux_filter *dvbdmxfilter)
}
static int
av7110_write_to_decoder(struct dvb_demux_feed *feed, const u8 *buf, size_t len)
static int av7110_write_to_decoder(struct dvb_demux_feed *feed, const u8 *buf, size_t len)
{
struct dvb_demux *demux = feed->demux;
struct av7110 *av7110 = (struct av7110 *) demux->priv;
......@@ -2833,8 +2771,7 @@ av7110_write_to_decoder(struct dvb_demux_feed *feed, const u8 *buf, size_t len)
}
static void
dvb_feed_start_pid(struct dvb_demux_feed *dvbdmxfeed)
static void dvb_feed_start_pid(struct dvb_demux_feed *dvbdmxfeed)
{
struct dvb_demux *dvbdmx=dvbdmxfeed->demux;
struct av7110 *av7110=(struct av7110 *) dvbdmx->priv;
......@@ -2872,8 +2809,7 @@ dvb_feed_start_pid(struct dvb_demux_feed *dvbdmxfeed)
}
}
static void
dvb_feed_stop_pid(struct dvb_demux_feed *dvbdmxfeed)
static void dvb_feed_stop_pid(struct dvb_demux_feed *dvbdmxfeed)
{
struct dvb_demux *dvbdmx=dvbdmxfeed->demux;
struct av7110 *av7110=(struct av7110 *) dvbdmx->priv;
......@@ -2910,8 +2846,7 @@ dvb_feed_stop_pid(struct dvb_demux_feed *dvbdmxfeed)
ChangePIDs(av7110, npids[1], npids[0], npids[2], npids[3], npids[4]);
}
static int
av7110_start_feed(struct dvb_demux_feed *feed)
static int av7110_start_feed(struct dvb_demux_feed *feed)
{
struct dvb_demux *demux = feed->demux;
struct av7110 *av7110 = (struct av7110 *) demux->priv;
......@@ -2969,8 +2904,7 @@ av7110_start_feed(struct dvb_demux_feed *feed)
}
static int
av7110_stop_feed(struct dvb_demux_feed *feed)
static int av7110_stop_feed(struct dvb_demux_feed *feed)
{
struct dvb_demux *demux = feed->demux;
struct av7110 *av7110 = (struct av7110 *) demux->priv;
......@@ -3010,8 +2944,7 @@ av7110_stop_feed(struct dvb_demux_feed *feed)
}
static void
restart_feeds(struct av7110 *av7110)
static void restart_feeds(struct av7110 *av7110)
{
struct dvb_demux *dvbdmx=&av7110->demux;
struct dvb_demux_feed *feed;
......@@ -3078,8 +3011,7 @@ static int dvb_get_stc(struct dmx_demux *demux, unsigned int num,
* SEC device file operations
******************************************************************************/
static
int av7110_diseqc_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
static int av7110_diseqc_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
{
struct av7110 *av7110 = fe->before_after_data;
......@@ -3169,8 +3101,7 @@ int ci_ll_reset(struct dvb_ringbuffer *cibuf, struct file *file,
return 0;
}
static ssize_t
ci_ll_write(struct dvb_ringbuffer *cibuf, struct file *file, const char *buf, size_t count, loff_t *ppos)
static ssize_t ci_ll_write(struct dvb_ringbuffer *cibuf, struct file *file, const char *buf, size_t count, loff_t *ppos)
{
int free;
int non_blocking=file->f_flags&O_NONBLOCK;
......@@ -3192,8 +3123,7 @@ ci_ll_write(struct dvb_ringbuffer *cibuf, struct file *file, const char *buf, si
return dvb_ringbuffer_write(cibuf,buf,count,1);
}
static ssize_t
ci_ll_read(struct dvb_ringbuffer *cibuf, struct file *file, char *buf, size_t count, loff_t *ppos)
static ssize_t ci_ll_read(struct dvb_ringbuffer *cibuf, struct file *file, char *buf, size_t count, loff_t *ppos)
{
int avail;
int non_blocking=file->f_flags&O_NONBLOCK;
......@@ -3218,8 +3148,7 @@ ci_ll_read(struct dvb_ringbuffer *cibuf, struct file *file, char *buf, size_t co
return dvb_ringbuffer_read(cibuf,buf,len,1);
}
static int
dvb_ca_open(struct inode *inode, struct file *file)
static int dvb_ca_open(struct inode *inode, struct file *file)
{
struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
struct av7110 *av7110=(struct av7110 *) dvbdev->priv;
......@@ -3233,8 +3162,7 @@ dvb_ca_open(struct inode *inode, struct file *file)
return 0;
}
static
unsigned int dvb_ca_poll (struct file *file, poll_table *wait)
static unsigned int dvb_ca_poll (struct file *file, poll_table *wait)
{
struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
......@@ -3255,8 +3183,7 @@ unsigned int dvb_ca_poll (struct file *file, poll_table *wait)
return mask;
}
static
int dvb_ca_ioctl(struct inode *inode, struct file *file,
static int dvb_ca_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, void *parg)
{
struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
......@@ -3344,8 +3271,7 @@ int dvb_ca_ioctl(struct inode *inode, struct file *file,
return 0;
}
static ssize_t
dvb_ca_write(struct file *file, const char *buf,
static ssize_t dvb_ca_write(struct file *file, const char *buf,
size_t count, loff_t *ppos)
{
struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
......@@ -3355,8 +3281,7 @@ dvb_ca_write(struct file *file, const char *buf,
return ci_ll_write(&av7110->ci_wbuffer, file, buf, count, ppos);
}
static ssize_t
dvb_ca_read(struct file *file, char *buf, size_t count, loff_t *ppos)
static ssize_t dvb_ca_read(struct file *file, char *buf, size_t count, loff_t *ppos)
{
struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
struct av7110 *av7110=(struct av7110 *) dvbdev->priv;
......@@ -3370,8 +3295,7 @@ dvb_ca_read(struct file *file, char *buf, size_t count, loff_t *ppos)
/******************************************************************************
* Video MPEG decoder events
******************************************************************************/
static
void dvb_video_add_event (struct av7110 *av7110, struct video_event *event)
static void dvb_video_add_event (struct av7110 *av7110, struct video_event *event)
{
struct dvb_video_events *events = &av7110->video_events;
int wp;
......@@ -3398,8 +3322,7 @@ void dvb_video_add_event (struct av7110 *av7110, struct video_event *event)
}
static
int dvb_video_get_event (struct av7110 *av7110, struct video_event *event, int flags)
static int dvb_video_get_event (struct av7110 *av7110, struct video_event *event, int flags)
{
struct dvb_video_events *events = &av7110->video_events;
......@@ -3439,8 +3362,7 @@ int dvb_video_get_event (struct av7110 *av7110, struct video_event *event, int f
* DVB device file operations
******************************************************************************/
static
unsigned int dvb_video_poll(struct file *file, poll_table *wait)
static unsigned int dvb_video_poll(struct file *file, poll_table *wait)
{
struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
......@@ -3463,8 +3385,7 @@ unsigned int dvb_video_poll(struct file *file, poll_table *wait)
return mask;
}
static ssize_t
dvb_video_write(struct file *file, const char *buf,
static ssize_t dvb_video_write(struct file *file, const char *buf,
size_t count, loff_t *ppos)
{
struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
......@@ -3478,8 +3399,7 @@ dvb_video_write(struct file *file, const char *buf,
return dvb_play(av7110, buf, count, file->f_flags&O_NONBLOCK, 1, 1);
}
static ssize_t
dvb_audio_write(struct file *file, const char *buf,
static ssize_t dvb_audio_write(struct file *file, const char *buf,
size_t count, loff_t *ppos)
{
struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
......@@ -3498,8 +3418,7 @@ u8 iframe_header[] = { 0x00, 0x00, 0x01, 0xe0, 0x00, 0x00, 0x80, 0x00, 0x00 };
#define MIN_IFRAME 400000
static int
play_iframe(struct av7110 *av7110, u8 *buf, unsigned int len, int nonblock)
static int play_iframe(struct av7110 *av7110, u8 *buf, unsigned int len, int nonblock)
{
int i, n=1;
......@@ -3522,8 +3441,7 @@ play_iframe(struct av7110 *av7110, u8 *buf, unsigned int len, int nonblock)
}
static int
dvb_video_ioctl(struct inode *inode, struct file *file,
static int dvb_video_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, void *parg)
{
struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
......@@ -3718,8 +3636,7 @@ dvb_video_ioctl(struct inode *inode, struct file *file,
return ret;
}
static int
dvb_audio_ioctl(struct inode *inode, struct file *file,
static int dvb_audio_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, void *parg)
{
struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
......@@ -3959,8 +3876,7 @@ static struct dvb_device dvbdev_ca = {
};
static
void av7110_before_after_tune (fe_status_t s, void *data)
static void av7110_before_after_tune (fe_status_t s, void *data)
{
struct av7110 *av7110 = data;
......@@ -3987,8 +3903,7 @@ void av7110_before_after_tune (fe_status_t s, void *data)
}
static
int av7110_register(struct av7110 *av7110)
static int av7110_register(struct av7110 *av7110)
{
int ret, i;
struct dvb_demux *dvbdemux=&av7110->demux;
......@@ -4098,8 +4013,7 @@ int av7110_register(struct av7110 *av7110)
}
static void
dvb_unregister(struct av7110 *av7110)
static void dvb_unregister(struct av7110 *av7110)
{
struct dvb_demux *dvbdemux=&av7110->demux;
......@@ -4133,8 +4047,7 @@ dvb_unregister(struct av7110 *av7110)
// }
}
static
int master_xfer (struct dvb_i2c_bus *i2c, const struct i2c_msg msgs[], int num)
static int master_xfer (struct dvb_i2c_bus *i2c, const struct i2c_msg msgs[], int num)
{
struct saa7146_dev *dev = i2c->data;
return saa7146_i2c_transfer(dev, msgs, num, 6);
......@@ -4151,8 +4064,7 @@ struct saa7146_extension_ioctls ioctls[] = {
{ 0, 0 }
};
static
int av7110_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_data *pci_ext)
static int av7110_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_data *pci_ext)
{
struct av7110 *av7110 = NULL;
int ret = 0;
......@@ -4356,8 +4268,7 @@ int av7110_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_data *p
return ret;
}
static
int av7110_detach (struct saa7146_dev* saa)
static int av7110_detach (struct saa7146_dev* saa)
{
struct av7110 *av7110 = (struct av7110*)saa->ext_priv;
DEB_EE(("av7110: %p\n",av7110));
......@@ -4397,8 +4308,7 @@ int av7110_detach (struct saa7146_dev* saa)
}
static
void av7110_irq(struct saa7146_dev* dev, u32 *isr)
static void av7110_irq(struct saa7146_dev* dev, u32 *isr)
{
struct av7110 *av7110 = (struct av7110*)dev->ext_priv;
......@@ -4414,15 +4324,13 @@ void av7110_irq(struct saa7146_dev* dev, u32 *isr)
/* FIXME: these values are experimental values that look better than the
values from the latest "official" driver -- at least for me... (MiHu) */
static
struct saa7146_standard standard[] = {
static struct saa7146_standard standard[] = {
{ "PAL", V4L2_STD_PAL, 0x15, 288, 576, 0x4a, 708, 709, 576, 768 },
// { "PAL", V4L2_STD_PAL, 0x15, 288, 576, 0x3a, 720, 721, 576, 768 },
{ "NTSC", V4L2_STD_NTSC, 0x10, 244, 480, 0x40, 708, 709, 480, 640 },
};
static
struct saa7146_extension av7110_extension;
static struct saa7146_extension av7110_extension;
#define MAKE_AV7110_INFO(x_var,x_name) \
static struct saa7146_pci_extension_data x_var = { \
......@@ -4439,8 +4347,7 @@ MAKE_AV7110_INFO(unkwn1, "Technotrend/Hauppauge PCI rev?(unknown1)?");
MAKE_AV7110_INFO(unkwn2, "Technotrend/Hauppauge PCI rev?(unknown2)?");
MAKE_AV7110_INFO(nexus, "Technotrend/Hauppauge Nexus PCI DVB-S");
static
struct pci_device_id pci_tbl[] = {
static struct pci_device_id pci_tbl[] = {
MAKE_EXTENSION_PCI(fs_1_5, 0x110a, 0xffff),
MAKE_EXTENSION_PCI(fs_1_5, 0x110a, 0x0000),
MAKE_EXTENSION_PCI(fs_1_3, 0x13c2, 0x0000),
......@@ -4480,8 +4387,7 @@ static int std_callback(struct saa7146_dev* dev, struct saa7146_standard *std)
}
static
struct saa7146_ext_vv av7110_vv_data = {
static struct saa7146_ext_vv av7110_vv_data = {
.inputs = 1,
.audios = 1,
.capabilities = 0,
......@@ -4495,8 +4401,7 @@ struct saa7146_ext_vv av7110_vv_data = {
.ioctl = av7110_ioctl,
};
static
struct saa7146_extension av7110_extension = {
static struct saa7146_extension av7110_extension = {
.name = "dvb\0",
.ext_vv_data = &av7110_vv_data,
......@@ -4510,8 +4415,7 @@ struct saa7146_extension av7110_extension = {
};
static
int __init av7110_init(void)
static int __init av7110_init(void)
{
if (saa7146_register_extension(&av7110_extension))
return -ENODEV;
......@@ -4522,8 +4426,7 @@ int __init av7110_init(void)
}
static
void __exit av7110_exit(void)
static void __exit av7110_exit(void)
{
av7110_ir_exit();
saa7146_unregister_extension(&av7110_extension);
......
drivers/media/dvb/ttpci/av7110_firm.h
View file @ cfa89a3e
#include <asm/types.h>
#include <linux/types.h>
u8 Dpram [] __initdata = {
0xe5, 0x9f, 0xf0, 0x1c, 0xe1, 0xb0, 0xf0, 0x0e,
drivers/media/dvb/ttpci/av7110_ipack.c
View file @ cfa89a3e
......@@ -40,8 +40,7 @@ void av7110_ipack_free(struct ipack * p)
}
static
void send_ipack(struct ipack *p)
static void send_ipack(struct ipack *p)
{
int off;
struct dvb_audio_info ai;
......@@ -122,8 +121,7 @@ void av7110_ipack_flush(struct ipack *p)
}
static
void write_ipack(struct ipack *p, const u8 *data, int count)
static void write_ipack(struct ipack *p, const u8 *data, int count)
{
u8 headr[3] = { 0x00, 0x00, 0x01} ;
......
drivers/media/dvb/ttpci/av7110_ir.c
View file @ cfa89a3e
#include <asm/types.h>
#include <asm/bitops.h>
#include <linux/types.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/input.h>
#include <linux/proc_fs.h>
#include <asm/bitops.h>
#include "av7110.h"
......@@ -18,8 +18,7 @@ static struct input_dev input_dev;
static u32 ir_config;
static
u16 key_map [256] = {
static u16 key_map [256] = {
KEY_0, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7,
KEY_8, KEY_9, KEY_BACK, 0, KEY_POWER, KEY_MUTE, 0, KEY_INFO,
KEY_VOLUMEUP, KEY_VOLUMEDOWN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
......@@ -43,8 +42,7 @@ u16 key_map [256] = {
};
static
void av7110_emit_keyup (unsigned long data)
static void av7110_emit_keyup (unsigned long data)
{
if (!data || !test_bit (data, input_dev.key))
return;
......@@ -53,12 +51,10 @@ void av7110_emit_keyup (unsigned long data)
}
static
struct timer_list keyup_timer = { function: av7110_emit_keyup };
static struct timer_list keyup_timer = { function: av7110_emit_keyup };
static
void av7110_emit_key (u32 ircom)
static void av7110_emit_key (u32 ircom)
{
u8 data;
u8 addr;
......@@ -117,8 +113,7 @@ void av7110_emit_key (u32 ircom)
old_toggle = new_toggle;
}
static
void input_register_keys (void)
static void input_register_keys (void)
{
int i;
......@@ -139,8 +134,7 @@ static void input_repeat_key(unsigned long data)
}
static
int av7110_ir_write_proc (struct file *file, const char *buffer,
static int av7110_ir_write_proc (struct file *file, const char *buffer,
unsigned long count, void *data)
{
char *page;
......
drivers/media/dvb/ttpci/budget-av.c
View file @ cfa89a3e
......@@ -46,8 +46,7 @@ struct budget_av {
****************************************************************************/
static
u8 i2c_readreg (struct dvb_i2c_bus *i2c, u8 id, u8 reg)
static u8 i2c_readreg (struct dvb_i2c_bus *i2c, u8 id, u8 reg)
{
u8 mm1[] = {0x00};
u8 mm2[] = {0x00};
......@@ -66,8 +65,7 @@ u8 i2c_readreg (struct dvb_i2c_bus *i2c, u8 id, u8 reg)
}
static
int i2c_writereg (struct dvb_i2c_bus *i2c, u8 id, u8 reg, u8 val)
static int i2c_writereg (struct dvb_i2c_bus *i2c, u8 id, u8 reg, u8 val)
{
u8 msg[2]={ reg, val };
struct i2c_msg msgs;
......@@ -80,8 +78,7 @@ int i2c_writereg (struct dvb_i2c_bus *i2c, u8 id, u8 reg, u8 val)
}
static const
u8 saa7113_tab[] = {
static const u8 saa7113_tab[] = {
0x01, 0x08,
0x02, 0xc0,
0x03, 0x33,
......@@ -111,8 +108,7 @@ u8 saa7113_tab[] = {
};
static
int saa7113_init (struct budget_av *budget_av)
static int saa7113_init (struct budget_av *budget_av)
{
struct budget *budget = &budget_av->budget;
const u8 *data = saa7113_tab;
......@@ -136,8 +132,7 @@ int saa7113_init (struct budget_av *budget_av)
}
static
int saa7113_setinput (struct budget_av *budget_av, int input)
static int saa7113_setinput (struct budget_av *budget_av, int input)
{
struct budget *budget = &budget_av->budget;
......@@ -155,8 +150,7 @@ int saa7113_setinput (struct budget_av *budget_av, int input)
}
static
int budget_av_detach (struct saa7146_dev *dev)
static int budget_av_detach (struct saa7146_dev *dev)
{
struct budget_av *budget_av = (struct budget_av*) dev->ext_priv;
int err;
......@@ -177,8 +171,7 @@ int budget_av_detach (struct saa7146_dev *dev)
}
static
int budget_av_attach (struct saa7146_dev* dev,
static int budget_av_attach (struct saa7146_dev* dev,
struct saa7146_pci_extension_data *info)
{
struct budget_av *budget_av;
......@@ -255,8 +248,7 @@ static struct v4l2_input knc1_inputs[KNC1_INPUTS] = {
};
static
struct saa7146_extension_ioctls ioctls[] = {
static struct saa7146_extension_ioctls ioctls[] = {
{ VIDIOC_ENUMINPUT, SAA7146_EXCLUSIVE },
{ VIDIOC_G_INPUT, SAA7146_EXCLUSIVE },
{ VIDIOC_S_INPUT, SAA7146_EXCLUSIVE },
......@@ -264,8 +256,7 @@ struct saa7146_extension_ioctls ioctls[] = {
};
static
int av_ioctl(struct saa7146_dev *dev, unsigned int cmd, void *arg)
static int av_ioctl(struct saa7146_dev *dev, unsigned int cmd, void *arg)
{
struct budget_av *budget_av = (struct budget_av*) dev->ext_priv;
/*
......@@ -307,15 +298,13 @@ int av_ioctl(struct saa7146_dev *dev, unsigned int cmd, void *arg)
return 0;
}
static
struct saa7146_standard standard[] = {
static struct saa7146_standard standard[] = {
{ "PAL", V4L2_STD_PAL, SAA7146_PAL_VALUES },
{ "NTSC", V4L2_STD_NTSC, SAA7146_NTSC_VALUES },
};
static
struct saa7146_ext_vv vv_data = {
static struct saa7146_ext_vv vv_data = {
.inputs = 2,
.capabilities = 0, // perhaps later: V4L2_CAP_VBI_CAPTURE, but that need tweaking with the saa7113
.flags = 0,
......@@ -332,8 +321,7 @@ static struct saa7146_extension budget_extension;
MAKE_BUDGET_INFO(knc1, "KNC1 DVB-S", BUDGET_KNC1);
static
struct pci_device_id pci_tbl [] = {
static struct pci_device_id pci_tbl [] = {
MAKE_EXTENSION_PCI(knc1, 0x1131, 0x4f56),
{
.vendor = 0,
......@@ -342,8 +330,7 @@ struct pci_device_id pci_tbl [] = {
MODULE_DEVICE_TABLE(pci, pci_tbl);
static
struct saa7146_extension budget_extension = {
static struct saa7146_extension budget_extension = {
.name = "budget dvb /w video in\0",
.pci_tbl = pci_tbl,
......@@ -358,8 +345,7 @@ struct saa7146_extension budget_extension = {
};
static
int __init budget_av_init(void)
static int __init budget_av_init(void)
{
DEB_EE((".\n"));
......@@ -370,8 +356,7 @@ int __init budget_av_init(void)
}
static
void __exit budget_av_exit(void)
static void __exit budget_av_exit(void)
{
DEB_EE((".\n"));
saa7146_unregister_extension(&budget_extension);
......
drivers/media/dvb/ttpci/budget-ci.c
View file @ cfa89a3e
......@@ -68,8 +68,7 @@ void gpio_set(struct saa7146_dev* saa, u8 pin, u8 data)
static
int wait_for_debi_done(struct saa7146_dev *saa)
static int wait_for_debi_done(struct saa7146_dev *saa)
{
int start = jiffies;
......@@ -103,8 +102,7 @@ int wait_for_debi_done(struct saa7146_dev *saa)
}
static
u32 debiread (struct saa7146_dev *saa, u32 config, int addr, int count)
static u32 debiread (struct saa7146_dev *saa, u32 config, int addr, int count)
{
u32 result = 0;
......@@ -131,8 +129,7 @@ u32 debiread (struct saa7146_dev *saa, u32 config, int addr, int count)
/* DEBI during interrupt */
static inline
u32 irdebi(struct saa7146_dev *saa, u32 config, int addr, u32 val, int count)
static inline u32 irdebi(struct saa7146_dev *saa, u32 config, int addr, u32 val, int count)
{
u32 res;
res = debiread(saa, config, addr, count);
......@@ -148,8 +145,7 @@ u32 irdebi(struct saa7146_dev *saa, u32 config, int addr, u32 val, int count)
Hauppauge (from NOVA-CI-s box product)
i've taken a "middle of the road" approach and note the differences
*/
static
u16 key_map[64] = {
static u16 key_map[64] = {
/* 0x0X */
KEY_0, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8,
KEY_9,
......@@ -199,8 +195,7 @@ static
};
static
void msp430_ir_debounce (unsigned long data)
static void msp430_ir_debounce (unsigned long data)
{
struct input_dev *dev = (struct input_dev *) data;
......@@ -217,8 +212,7 @@ void msp430_ir_debounce (unsigned long data)
static
void msp430_ir_interrupt (unsigned long data)
static void msp430_ir_interrupt (unsigned long data)
{
struct budget_ci *budget_ci = (struct budget_ci*) data;
struct saa7146_dev *saa = budget_ci->budget.dev;
......@@ -256,8 +250,7 @@ void msp430_ir_interrupt (unsigned long data)
}
static
int msp430_ir_init (struct budget_ci *budget_ci)
static int msp430_ir_init (struct budget_ci *budget_ci)
{
struct saa7146_dev *saa = budget_ci->budget.dev;
int i;
......@@ -284,8 +277,7 @@ int msp430_ir_init (struct budget_ci *budget_ci)
}
static
void msp430_ir_deinit (struct budget_ci *budget_ci)
static void msp430_ir_deinit (struct budget_ci *budget_ci)
{
struct saa7146_dev *saa = budget_ci->budget.dev;
struct input_dev *dev = &budget_ci->input_dev;
......@@ -301,8 +293,7 @@ void msp430_ir_deinit (struct budget_ci *budget_ci)
}
static
void budget_ci_irq (struct saa7146_dev *dev, u32 *isr)
static void budget_ci_irq (struct saa7146_dev *dev, u32 *isr)
{
struct budget_ci *budget_ci = (struct budget_ci*) dev->ext_priv;
......@@ -317,8 +308,7 @@ void budget_ci_irq (struct saa7146_dev *dev, u32 *isr)
static
int budget_ci_attach (struct saa7146_dev* dev,
static int budget_ci_attach (struct saa7146_dev* dev,
struct saa7146_pci_extension_data *info)
{
struct budget_ci *budget_ci;
......@@ -346,8 +336,7 @@ int budget_ci_attach (struct saa7146_dev* dev,
static
int budget_ci_detach (struct saa7146_dev* dev)
static int budget_ci_detach (struct saa7146_dev* dev)
{
struct budget_ci *budget_ci = (struct budget_ci*) dev->ext_priv;
int err;
......@@ -369,8 +358,7 @@ static struct saa7146_extension budget_extension;
MAKE_BUDGET_INFO(ttbci, "TT-Budget/WinTV-NOVA-CI PCI", BUDGET_TT_HW_DISEQC);
static
struct pci_device_id pci_tbl[] = {
static struct pci_device_id pci_tbl[] = {
MAKE_EXTENSION_PCI(ttbci, 0x13c2, 0x100c),
MAKE_EXTENSION_PCI(ttbci, 0x13c2, 0x100f),
{
......@@ -380,8 +368,7 @@ struct pci_device_id pci_tbl[] = {
MODULE_DEVICE_TABLE(pci, pci_tbl);
static
struct saa7146_extension budget_extension = {
static struct saa7146_extension budget_extension = {
.name = "budget_ci dvb\0",
.flags = 0,
.ext_vv_data = NULL,
......@@ -396,8 +383,7 @@ struct saa7146_extension budget_extension = {
};
static
int __init budget_ci_init(void)
static int __init budget_ci_init(void)
{
if (saa7146_register_extension(&budget_extension))
return -ENODEV;
......@@ -406,8 +392,7 @@ int __init budget_ci_init(void)
}
static
void __exit budget_ci_exit(void)
static void __exit budget_ci_exit(void)
{
DEB_EE((".\n"));
saa7146_unregister_extension(&budget_extension);
......
drivers/media/dvb/ttpci/budget-core.c
View file @ cfa89a3e
......@@ -6,8 +6,7 @@ int budget_debug = 0;
* TT budget / WinTV Nova
****************************************************************************/
static
int stop_ts_capture(struct budget *budget)
static int stop_ts_capture(struct budget *budget)
{
DEB_EE(("budget: %p\n",budget));
......@@ -20,8 +19,7 @@ int stop_ts_capture(struct budget *budget)
}
static
int start_ts_capture (struct budget *budget)
static int start_ts_capture (struct budget *budget)
{
struct saa7146_dev *dev=budget->dev;
......@@ -62,8 +60,7 @@ int start_ts_capture (struct budget *budget)
}
static
void vpeirq (unsigned long data)
static void vpeirq (unsigned long data)
{
struct budget *budget = (struct budget*) data;
u8 *mem = (u8 *)(budget->grabbing);
......@@ -100,8 +97,7 @@ void vpeirq (unsigned long data)
* DVB API SECTION
****************************************************************************/
static
int budget_start_feed(struct dvb_demux_feed *feed)
static int budget_start_feed(struct dvb_demux_feed *feed)
{
struct dvb_demux *demux = feed->demux;
struct budget *budget = (struct budget*) demux->priv;
......@@ -114,8 +110,7 @@ int budget_start_feed(struct dvb_demux_feed *feed)
return start_ts_capture (budget);
}
static
int budget_stop_feed(struct dvb_demux_feed *feed)
static int budget_stop_feed(struct dvb_demux_feed *feed)
{
struct dvb_demux *demux = feed->demux;
struct budget *budget = (struct budget *) demux->priv;
......@@ -126,8 +121,7 @@ int budget_stop_feed(struct dvb_demux_feed *feed)
}
static
int budget_register(struct budget *budget)
static int budget_register(struct budget *budget)
{
struct dvb_demux *dvbdemux=&budget->demux;
int ret;
......@@ -178,8 +172,7 @@ int budget_register(struct budget *budget)
}
static
void budget_unregister(struct budget *budget)
static void budget_unregister(struct budget *budget)
{
struct dvb_demux *dvbdemux=&budget->demux;
......@@ -196,8 +189,7 @@ void budget_unregister(struct budget *budget)
}
static
int master_xfer (struct dvb_i2c_bus *i2c, const struct i2c_msg msgs[], int num)
static int master_xfer (struct dvb_i2c_bus *i2c, const struct i2c_msg msgs[], int num)
{
struct saa7146_dev *dev = i2c->data;
return saa7146_i2c_transfer(dev, msgs, num, 6);
......
drivers/media/dvb/ttpci/budget-patch.c
View file @ cfa89a3e
......@@ -39,16 +39,14 @@ static struct saa7146_extension budget_extension;
MAKE_BUDGET_INFO(fs_1_3,"Siemens/Technotrend/Hauppauge PCI rev1.3+Budget_Patch", BUDGET_PATCH);
static
struct pci_device_id pci_tbl[] = {
static struct pci_device_id pci_tbl[] = {
MAKE_EXTENSION_PCI(fs_1_3,0x13c2, 0x0000),
{
.vendor = 0,
}
};
static
int wdebi(struct budget_patch *budget, u32 config, int addr, u32 val, int count)
static int wdebi(struct budget_patch *budget, u32 config, int addr, u32 val, int count)
{
struct saa7146_dev *dev=budget->dev;
......@@ -68,8 +66,7 @@ int wdebi(struct budget_patch *budget, u32 config, int addr, u32 val, int count)
}
static
int SOutCommand(struct budget_patch *budget, u16* buf, int length)
static int SOutCommand(struct budget_patch *budget, u16* buf, int length)
{
int i;
......@@ -88,8 +85,7 @@ int SOutCommand(struct budget_patch *budget, u16* buf, int length)
}
static
void av7110_set22k(struct budget_patch *budget, int state)
static void av7110_set22k(struct budget_patch *budget, int state)
{
u16 buf[2] = {( COMTYPE_AUDIODAC << 8) | (state ? ON22K : OFF22K), 0};
......@@ -98,8 +94,7 @@ void av7110_set22k(struct budget_patch *budget, int state)
}
static int
av7110_send_diseqc_msg(struct budget_patch *budget, int len, u8 *msg, int burst)
static int av7110_send_diseqc_msg(struct budget_patch *budget, int len, u8 *msg, int burst)
{
int i;
u16 buf[18] = { ((COMTYPE_AUDIODAC << 8) | SendDiSEqC),
......@@ -166,12 +161,10 @@ int budget_patch_diseqc_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *
}
static
int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_data *info)
static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_data *info)
{
struct budget_patch *budget;
int err;
int cnt;
if (!(budget = kmalloc (sizeof(struct budget_patch), GFP_KERNEL)))
return -ENOMEM;
......@@ -195,9 +188,8 @@ int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_d
** which seems that can be done perfectly without this :-)).
*/
#define WRITE_RPS1(x) dev->d_rps1.cpu_addr[ cnt++ ] = cpu_to_le32(x)
// Setup RPS1 "program" (p35)
cnt = 0; // Setup RPS1 "program" (p35)
// Wait reset Source Line Counter Threshold (p36)
WRITE_RPS1(cpu_to_le32(CMD_PAUSE | RPS_INV | EVT_HS));
// Wait Source Line Counter Threshold (p36)
......@@ -236,8 +228,7 @@ int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_d
}
static
int budget_patch_detach (struct saa7146_dev* dev)
static int budget_patch_detach (struct saa7146_dev* dev)
{
struct budget_patch *budget = (struct budget_patch*) dev->ext_priv;
int err;
......@@ -253,8 +244,7 @@ int budget_patch_detach (struct saa7146_dev* dev)
}
static
int __init budget_patch_init(void)
static int __init budget_patch_init(void)
{
if (saa7146_register_extension(&budget_extension))
return -ENODEV;
......@@ -263,16 +253,14 @@ int __init budget_patch_init(void)
}
static
void __exit budget_patch_exit(void)
static void __exit budget_patch_exit(void)
{
DEB_EE((".\n"));
saa7146_unregister_extension(&budget_extension);
}
static
struct saa7146_extension budget_extension = {
static struct saa7146_extension budget_extension = {
.name = "budget_patch dvb\0",
.flags = 0,
.ext_vv_data = NULL,
......
drivers/media/dvb/ttpci/budget.c
View file @ cfa89a3e
......@@ -32,8 +32,7 @@
#include "budget.h"
#include "dvb_functions.h"
static
void Set22K (struct budget *budget, int state)
static void Set22K (struct budget *budget, int state)
{
struct saa7146_dev *dev=budget->dev;
DEB_EE(("budget: %p\n",budget));
......@@ -45,8 +44,7 @@ void Set22K (struct budget *budget, int state)
/* taken from the Skyvision DVB driver by
Ralph Metzler <rjkm@metzlerbros.de> */
static
void DiseqcSendBit (struct budget *budget, int data)
static void DiseqcSendBit (struct budget *budget, int data)
{
struct saa7146_dev *dev=budget->dev;
DEB_EE(("budget: %p\n",budget));
......@@ -58,8 +56,7 @@ void DiseqcSendBit (struct budget *budget, int data)
}
static
void DiseqcSendByte (struct budget *budget, int data)
static void DiseqcSendByte (struct budget *budget, int data)
{
int i, par=1, d;
......@@ -75,8 +72,7 @@ void DiseqcSendByte (struct budget *budget, int data)
}
static
int SendDiSEqCMsg (struct budget *budget, int len, u8 *msg, unsigned long burst)
static int SendDiSEqCMsg (struct budget *budget, int len, u8 *msg, unsigned long burst)
{
struct saa7146_dev *dev=budget->dev;
int i;
......@@ -146,8 +142,7 @@ int budget_diseqc_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
}
static
int budget_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_data *info)
static int budget_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_data *info)
{
struct budget *budget = NULL;
int err;
......@@ -174,8 +169,7 @@ int budget_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_data *i
}
static
int budget_detach (struct saa7146_dev* dev)
static int budget_detach (struct saa7146_dev* dev)
{
struct budget *budget = (struct budget*) dev->ext_priv;
int err;
......@@ -202,8 +196,7 @@ MAKE_BUDGET_INFO(satel, "SATELCO Multimedia PCI", BUDGET_TT_HW_DISEQC);
/* Uncomment for Budget Patch */
/*MAKE_BUDGET_INFO(fs_1_3,"Siemens/Technotrend/Hauppauge PCI rev1.3+Budget_Patch", BUDGET_PATCH);*/
static
struct pci_device_id pci_tbl[] = {
static struct pci_device_id pci_tbl[] = {
/* Uncomment for Budget Patch */
/*MAKE_EXTENSION_PCI(fs_1_3,0x13c2, 0x0000),*/
MAKE_EXTENSION_PCI(ttbs, 0x13c2, 0x1003),
......@@ -217,8 +210,7 @@ struct pci_device_id pci_tbl[] = {
MODULE_DEVICE_TABLE(pci, pci_tbl);
static
struct saa7146_extension budget_extension = {
static struct saa7146_extension budget_extension = {
.name = "budget dvb\0",
.flags = 0,
.ext_vv_data = NULL,
......@@ -233,8 +225,7 @@ struct saa7146_extension budget_extension = {
};
static
int __init budget_init(void)
static int __init budget_init(void)
{
if (saa7146_register_extension(&budget_extension))
return -ENODEV;
......@@ -243,8 +234,7 @@ int __init budget_init(void)
}
static
void __exit budget_exit(void)
static void __exit budget_exit(void)
{
DEB_EE((".\n"));
saa7146_unregister_extension(&budget_extension);
......
include/media/saa7146_vv.h
View file @ cfa89a3e
......@@ -9,6 +9,16 @@
#define MAX_SAA7146_CAPTURE_BUFFERS 32 /* arbitrary */
#define BUFFER_TIMEOUT (HZ/2) /* 0.5 seconds */
#define WRITE_RPS0(x) do { \
static int count = 0; \
dev->d_rps0.cpu_addr[ count++ ] = cpu_to_le32(x); \
} while (0);
#define WRITE_RPS1(x) do { \
static int count = 0; \
dev->d_rps1.cpu_addr[ count++ ] = cpu_to_le32(x); \
} while (0);
struct saa7146_video_dma {
u32 base_odd;
u32 base_even;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7