UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

V4L/DVB (11605): patch: s2255drv: code cleanup 

This patch does:
	- remove unused structure items.
	- define Response values;
	- change Driver revision printk.

Signed-off-by: Dean Anderson <dean@sensoray.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Dean Anderson 2009-04-23 16:04:41 -03:00 committed by Mauro Carvalho Chehab
parent 7fc08bbb99
commit abce21f40f
1 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
drivers/media/video/s2255drv.c
View File

@ -77,6 +77,8 @@
#define MAX_CHANNELS 4 #define MAX_CHANNELS 4
#define S2255_MARKER_FRAME 0x2255DA4AL #define S2255_MARKER_FRAME 0x2255DA4AL
#define S2255_MARKER_RESPONSE 0x2255ACACL #define S2255_MARKER_RESPONSE 0x2255ACACL
#define S2255_RESPONSE_SETMODE 0x01
#define S2255_RESPONSE_FW 0x10
#define S2255_USB_XFER_SIZE (16 * 1024) #define S2255_USB_XFER_SIZE (16 * 1024)
#define MAX_CHANNELS 4 #define MAX_CHANNELS 4
#define MAX_PIPE_BUFFERS 1 #define MAX_PIPE_BUFFERS 1
@ -178,9 +180,6 @@ struct s2255_bufferi {
struct s2255_dmaqueue { struct s2255_dmaqueue {
struct list_head active; struct list_head active;
/* thread for acquisition */
struct task_struct *kthread;
int frame;
struct s2255_dev *dev; struct s2255_dev *dev;
int channel; int channel;
}; };
@ -210,16 +209,11 @@ struct s2255_pipeinfo {
u32 max_transfer_size; u32 max_transfer_size;
u32 cur_transfer_size; u32 cur_transfer_size;
u8 *transfer_buffer; u8 *transfer_buffer;
u32 transfer_flags;;
u32 state; u32 state;
u32 prev_state;
u32 urb_size;
void *stream_urb; void *stream_urb;
void *dev; /* back pointer to s2255_dev struct*/ void *dev; /* back pointer to s2255_dev struct*/
u32 err_count; u32 err_count;
u32 buf_index;
u32 idx; u32 idx;
u32 priority_set;
}; };
struct s2255_fmt; /*forward declaration */ struct s2255_fmt; /*forward declaration */
@ -239,8 +233,6 @@ struct s2255_dev {
struct list_head s2255_devlist; struct list_head s2255_devlist;
struct timer_list timer; struct timer_list timer;
struct s2255_fw *fw_data; struct s2255_fw *fw_data;
int board_num;
int is_open;
struct s2255_pipeinfo pipes[MAX_PIPE_BUFFERS]; struct s2255_pipeinfo pipes[MAX_PIPE_BUFFERS];
struct s2255_bufferi buffer[MAX_CHANNELS]; struct s2255_bufferi buffer[MAX_CHANNELS];
struct s2255_mode mode[MAX_CHANNELS]; struct s2255_mode mode[MAX_CHANNELS];
@ -297,9 +289,10 @@ struct s2255_fh {
int resources[MAX_CHANNELS]; int resources[MAX_CHANNELS];
}; };
#define CUR_USB_FWVER 774 /* current cypress EEPROM firmware version */ /* current cypress EEPROM firmware version */
#define S2255_CUR_USB_FWVER ((3 << 8) | 6)
#define S2255_MAJOR_VERSION 1 #define S2255_MAJOR_VERSION 1
#define S2255_MINOR_VERSION 13 #define S2255_MINOR_VERSION 14
#define S2255_RELEASE 0 #define S2255_RELEASE 0
#define S2255_VERSION KERNEL_VERSION(S2255_MAJOR_VERSION, \ #define S2255_VERSION KERNEL_VERSION(S2255_MAJOR_VERSION, \
S2255_MINOR_VERSION, \ S2255_MINOR_VERSION, \
@ -1818,7 +1811,6 @@ static int s2255_probe_v4l(struct s2255_dev *dev)
INIT_LIST_HEAD(&dev->vidq[i].active); INIT_LIST_HEAD(&dev->vidq[i].active);
dev->vidq[i].dev = dev; dev->vidq[i].dev = dev;
dev->vidq[i].channel = i; dev->vidq[i].channel = i;
dev->vidq[i].kthread = NULL;
/* register 4 video devices */ /* register 4 video devices */
dev->vdev[i] = video_device_alloc(); dev->vdev[i] = video_device_alloc();
memcpy(dev->vdev[i], &template, sizeof(struct video_device)); memcpy(dev->vdev[i], &template, sizeof(struct video_device));
@ -1839,7 +1831,9 @@ static int s2255_probe_v4l(struct s2255_dev *dev)
return ret; return ret;
} }
} }
printk(KERN_INFO "Sensoray 2255 V4L driver\n"); printk(KERN_INFO "Sensoray 2255 V4L driver Revision: %d.%d\n",
S2255_MAJOR_VERSION,
S2255_MINOR_VERSION);
return ret; return ret;
} }
@ -1929,14 +1923,14 @@ static int save_frame(struct s2255_dev *dev, struct s2255_pipeinfo *pipe_info)
if (!(cc >= 0 && cc < MAX_CHANNELS)) if (!(cc >= 0 && cc < MAX_CHANNELS))
break; break;
switch (pdword[2]) { switch (pdword[2]) {
case 0x01: case S2255_RESPONSE_SETMODE:
/* check if channel valid */ /* check if channel valid */
/* set mode ready */ /* set mode ready */
dev->setmode_ready[cc] = 1; dev->setmode_ready[cc] = 1;
wake_up(&dev->wait_setmode[cc]); wake_up(&dev->wait_setmode[cc]);
dprintk(5, "setmode ready %d\n", cc); dprintk(5, "setmode ready %d\n", cc);
break; break;
case 0x10: case S2255_RESPONSE_FW:
dev->chn_ready |= (1 << cc); dev->chn_ready |= (1 << cc);
if ((dev->chn_ready & 0x0f) != 0x0f) if ((dev->chn_ready & 0x0f) != 0x0f)
@ -2172,10 +2166,15 @@ static int s2255_board_init(struct s2255_dev *dev)
/* query the firmware */ /* query the firmware */
fw_ver = s2255_get_fx2fw(dev); fw_ver = s2255_get_fx2fw(dev);
printk(KERN_INFO "2255 usb firmware version %d \n", fw_ver); printk(KERN_INFO "2255 usb firmware version %d.%d\n",
if (fw_ver < CUR_USB_FWVER) (fw_ver >> 8) & 0xff,
fw_ver & 0xff);
if (fw_ver < S2255_CUR_USB_FWVER)
dev_err(&dev->udev->dev, dev_err(&dev->udev->dev,
"usb firmware not up to date %d\n", fw_ver); "usb firmware not up to date %d.%d\n",
(fw_ver >> 8) & 0xff,
fw_ver & 0xff);
for (j = 0; j < MAX_CHANNELS; j++) { for (j = 0; j < MAX_CHANNELS; j++) {
dev->b_acquire[j] = 0; dev->b_acquire[j] = 0;
@ -2283,8 +2282,7 @@ static int s2255_start_readpipe(struct s2255_dev *dev)
for (i = 0; i < MAX_PIPE_BUFFERS; i++) { for (i = 0; i < MAX_PIPE_BUFFERS; i++) {
pipe_info->state = 1; pipe_info->state = 1;
pipe_info->buf_index = (u32) i; pipe_info->err_count = 0;
pipe_info->priority_set = 0;
pipe_info->stream_urb = usb_alloc_urb(0, GFP_KERNEL); pipe_info->stream_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!pipe_info->stream_urb) { if (!pipe_info->stream_urb) {
dev_err(&dev->udev->dev, dev_err(&dev->udev->dev,
@ -2298,7 +2296,6 @@ static int s2255_start_readpipe(struct s2255_dev *dev)
pipe_info->cur_transfer_size, pipe_info->cur_transfer_size,
read_pipe_completion, pipe_info); read_pipe_completion, pipe_info);
pipe_info->urb_size = sizeof(pipe_info->stream_urb);
dprintk(4, "submitting URB %p\n", pipe_info->stream_urb); dprintk(4, "submitting URB %p\n", pipe_info->stream_urb);
retval = usb_submit_urb(pipe_info->stream_urb, GFP_KERNEL); retval = usb_submit_urb(pipe_info->stream_urb, GFP_KERNEL);
if (retval) { if (retval) {
@ -2403,8 +2400,6 @@ static void s2255_stop_readpipe(struct s2255_dev *dev)
if (pipe_info->state == 0) if (pipe_info->state == 0)
continue; continue;
pipe_info->state = 0; pipe_info->state = 0;
pipe_info->prev_state = 1;
} }
} }
@ -2542,7 +2537,9 @@ static int s2255_probe(struct usb_interface *interface,
s2255_probe_v4l(dev); s2255_probe_v4l(dev);
usb_reset_device(dev->udev); usb_reset_device(dev->udev);
/* load 2255 board specific */ /* load 2255 board specific */
s2255_board_init(dev); retval = s2255_board_init(dev);
if (retval)
goto error;
dprintk(4, "before probe done %p\n", dev); dprintk(4, "before probe done %p\n", dev);
spin_lock_init(&dev->slock); spin_lock_init(&dev->slock);