diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-25 07:19:53 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-25 07:29:23 -0500 |
commit | d56410e0a594150c5ca06319da7bc8901c4d455e (patch) | |
tree | f1462651ac1bcc5cec48219dbb422ac615231423 /drivers/media/video/cpia.h | |
parent | 9f6933be665ce3b049c274c99810ac754edabf19 (diff) |
V4L/DVB (3599b): Whitespace cleanups under drivers/media
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cpia.h')
-rw-r--r-- | drivers/media/video/cpia.h | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/drivers/media/video/cpia.h b/drivers/media/video/cpia.h index de6678200a57..dde27a6a4a09 100644 --- a/drivers/media/video/cpia.h +++ b/drivers/media/video/cpia.h | |||
@@ -52,10 +52,10 @@ | |||
52 | struct cpia_camera_ops | 52 | struct cpia_camera_ops |
53 | { | 53 | { |
54 | /* open sets privdata to point to structure for this camera. | 54 | /* open sets privdata to point to structure for this camera. |
55 | * Returns negative value on error, otherwise 0. | 55 | * Returns negative value on error, otherwise 0. |
56 | */ | 56 | */ |
57 | int (*open)(void *privdata); | 57 | int (*open)(void *privdata); |
58 | 58 | ||
59 | /* Registers callback function cb to be called with cbdata | 59 | /* Registers callback function cb to be called with cbdata |
60 | * when an image is ready. If cb is NULL, only single image grabs | 60 | * when an image is ready. If cb is NULL, only single image grabs |
61 | * should be used. cb should immediately call streamRead to read | 61 | * should be used. cb should immediately call streamRead to read |
@@ -63,8 +63,8 @@ struct cpia_camera_ops | |||
63 | * otherwise 0. | 63 | * otherwise 0. |
64 | */ | 64 | */ |
65 | int (*registerCallback)(void *privdata, void (*cb)(void *cbdata), | 65 | int (*registerCallback)(void *privdata, void (*cb)(void *cbdata), |
66 | void *cbdata); | 66 | void *cbdata); |
67 | 67 | ||
68 | /* transferCmd sends commands to the camera. command MUST point to | 68 | /* transferCmd sends commands to the camera. command MUST point to |
69 | * an 8 byte buffer in kernel space. data can be NULL if no extra | 69 | * an 8 byte buffer in kernel space. data can be NULL if no extra |
70 | * data is needed. The size of the data is given by the last 2 | 70 | * data is needed. The size of the data is given by the last 2 |
@@ -77,30 +77,30 @@ struct cpia_camera_ops | |||
77 | * Returns negative value on error, otherwise 0. | 77 | * Returns negative value on error, otherwise 0. |
78 | */ | 78 | */ |
79 | int (*streamStart)(void *privdata); | 79 | int (*streamStart)(void *privdata); |
80 | 80 | ||
81 | /* streamStop terminates stream capture mode. | 81 | /* streamStop terminates stream capture mode. |
82 | * Returns negative value on error, otherwise 0. | 82 | * Returns negative value on error, otherwise 0. |
83 | */ | 83 | */ |
84 | int (*streamStop)(void *privdata); | 84 | int (*streamStop)(void *privdata); |
85 | 85 | ||
86 | /* streamRead reads a frame from the camera. buffer points to a | 86 | /* streamRead reads a frame from the camera. buffer points to a |
87 | * buffer large enough to hold a complete frame in kernel space. | 87 | * buffer large enough to hold a complete frame in kernel space. |
88 | * noblock indicates if this should be a non blocking read. | 88 | * noblock indicates if this should be a non blocking read. |
89 | * Returns the number of bytes read, or negative value on error. | 89 | * Returns the number of bytes read, or negative value on error. |
90 | */ | 90 | */ |
91 | int (*streamRead)(void *privdata, u8 *buffer, int noblock); | 91 | int (*streamRead)(void *privdata, u8 *buffer, int noblock); |
92 | 92 | ||
93 | /* close disables the device until open() is called again. | 93 | /* close disables the device until open() is called again. |
94 | * Returns negative value on error, otherwise 0. | 94 | * Returns negative value on error, otherwise 0. |
95 | */ | 95 | */ |
96 | int (*close)(void *privdata); | 96 | int (*close)(void *privdata); |
97 | 97 | ||
98 | /* If wait_for_stream_ready is non-zero, wait until the streamState | 98 | /* If wait_for_stream_ready is non-zero, wait until the streamState |
99 | * is STREAM_READY before calling streamRead. | 99 | * is STREAM_READY before calling streamRead. |
100 | */ | 100 | */ |
101 | int wait_for_stream_ready; | 101 | int wait_for_stream_ready; |
102 | 102 | ||
103 | /* | 103 | /* |
104 | * Used to maintain lowlevel module usage counts | 104 | * Used to maintain lowlevel module usage counts |
105 | */ | 105 | */ |
106 | struct module *owner; | 106 | struct module *owner; |
@@ -215,14 +215,14 @@ struct cam_params { | |||
215 | u8 videoSize; /* CIF/QCIF */ | 215 | u8 videoSize; /* CIF/QCIF */ |
216 | u8 subSample; | 216 | u8 subSample; |
217 | u8 yuvOrder; | 217 | u8 yuvOrder; |
218 | } format; | 218 | } format; |
219 | struct { /* Intel QX3 specific data */ | 219 | struct { /* Intel QX3 specific data */ |
220 | u8 qx3_detected; /* a QX3 is present */ | 220 | u8 qx3_detected; /* a QX3 is present */ |
221 | u8 toplight; /* top light lit , R/W */ | 221 | u8 toplight; /* top light lit , R/W */ |
222 | u8 bottomlight; /* bottom light lit, R/W */ | 222 | u8 bottomlight; /* bottom light lit, R/W */ |
223 | u8 button; /* snapshot button pressed (R/O) */ | 223 | u8 button; /* snapshot button pressed (R/O) */ |
224 | u8 cradled; /* microscope is in cradle (R/O) */ | 224 | u8 cradled; /* microscope is in cradle (R/O) */ |
225 | } qx3; | 225 | } qx3; |
226 | struct { | 226 | struct { |
227 | u8 colStart; /* skip first 8*colStart pixels */ | 227 | u8 colStart; /* skip first 8*colStart pixels */ |
228 | u8 colEnd; /* finish at 8*colEnd pixels */ | 228 | u8 colEnd; /* finish at 8*colEnd pixels */ |
@@ -247,13 +247,13 @@ enum v4l_camstates { | |||
247 | struct cam_data { | 247 | struct cam_data { |
248 | struct list_head cam_data_list; | 248 | struct list_head cam_data_list; |
249 | 249 | ||
250 | struct mutex busy_lock; /* guard against SMP multithreading */ | 250 | struct mutex busy_lock; /* guard against SMP multithreading */ |
251 | struct cpia_camera_ops *ops; /* lowlevel driver operations */ | 251 | struct cpia_camera_ops *ops; /* lowlevel driver operations */ |
252 | void *lowlevel_data; /* private data for lowlevel driver */ | 252 | void *lowlevel_data; /* private data for lowlevel driver */ |
253 | u8 *raw_image; /* buffer for raw image data */ | 253 | u8 *raw_image; /* buffer for raw image data */ |
254 | struct cpia_frame decompressed_frame; | 254 | struct cpia_frame decompressed_frame; |
255 | /* buffer to hold decompressed frame */ | 255 | /* buffer to hold decompressed frame */ |
256 | int image_size; /* sizeof last decompressed image */ | 256 | int image_size; /* sizeof last decompressed image */ |
257 | int open_count; /* # of process that have camera open */ | 257 | int open_count; /* # of process that have camera open */ |
258 | 258 | ||
259 | /* camera status */ | 259 | /* camera status */ |
@@ -265,7 +265,7 @@ struct cam_data { | |||
265 | struct mutex param_lock; /* params lock for this camera */ | 265 | struct mutex param_lock; /* params lock for this camera */ |
266 | struct cam_params params; /* camera settings */ | 266 | struct cam_params params; /* camera settings */ |
267 | struct proc_dir_entry *proc_entry; /* /proc/cpia/videoX */ | 267 | struct proc_dir_entry *proc_entry; /* /proc/cpia/videoX */ |
268 | 268 | ||
269 | /* v4l */ | 269 | /* v4l */ |
270 | int video_size; /* VIDEO_SIZE_ */ | 270 | int video_size; /* VIDEO_SIZE_ */ |
271 | volatile enum v4l_camstates camstate; /* v4l layer status */ | 271 | volatile enum v4l_camstates camstate; /* v4l layer status */ |
@@ -277,7 +277,7 @@ struct cam_data { | |||
277 | /* mmap interface */ | 277 | /* mmap interface */ |
278 | int curframe; /* the current frame to grab into */ | 278 | int curframe; /* the current frame to grab into */ |
279 | u8 *frame_buf; /* frame buffer data */ | 279 | u8 *frame_buf; /* frame buffer data */ |
280 | struct cpia_frame frame[FRAME_NUM]; | 280 | struct cpia_frame frame[FRAME_NUM]; |
281 | /* FRAME_NUM-buffering, so we need a array */ | 281 | /* FRAME_NUM-buffering, so we need a array */ |
282 | 282 | ||
283 | int first_frame; | 283 | int first_frame; |
@@ -424,7 +424,7 @@ void cpia_unregister_camera(struct cam_data *cam); | |||
424 | #define DEB_BYTE(p)\ | 424 | #define DEB_BYTE(p)\ |
425 | DBG("%1d %1d %1d %1d %1d %1d %1d %1d \n",\ | 425 | DBG("%1d %1d %1d %1d %1d %1d %1d %1d \n",\ |
426 | (p)&0x80?1:0, (p)&0x40?1:0, (p)&0x20?1:0, (p)&0x10?1:0,\ | 426 | (p)&0x80?1:0, (p)&0x40?1:0, (p)&0x20?1:0, (p)&0x10?1:0,\ |
427 | (p)&0x08?1:0, (p)&0x04?1:0, (p)&0x02?1:0, (p)&0x01?1:0); | 427 | (p)&0x08?1:0, (p)&0x04?1:0, (p)&0x02?1:0, (p)&0x01?1:0); |
428 | 428 | ||
429 | #endif /* __KERNEL__ */ | 429 | #endif /* __KERNEL__ */ |
430 | 430 | ||