diff options
Diffstat (limited to 'drivers/media/video/cx18/cx18-driver.h')
| -rw-r--r-- | drivers/media/video/cx18/cx18-driver.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h index a2a6c58d12fe..de14ab59a206 100644 --- a/drivers/media/video/cx18/cx18-driver.h +++ b/drivers/media/video/cx18/cx18-driver.h | |||
| @@ -358,7 +358,7 @@ struct cx18 { | |||
| 358 | u32 v4l2_cap; /* V4L2 capabilities of card */ | 358 | u32 v4l2_cap; /* V4L2 capabilities of card */ |
| 359 | u32 hw_flags; /* Hardware description of the board */ | 359 | u32 hw_flags; /* Hardware description of the board */ |
| 360 | unsigned mdl_offset; | 360 | unsigned mdl_offset; |
| 361 | struct cx18_scb *scb; /* pointer to SCB */ | 361 | struct cx18_scb __iomem *scb; /* pointer to SCB */ |
| 362 | 362 | ||
| 363 | struct cx18_av_state av_state; | 363 | struct cx18_av_state av_state; |
| 364 | 364 | ||
| @@ -380,7 +380,8 @@ struct cx18 { | |||
| 380 | int stream_buf_size[CX18_MAX_STREAMS]; /* Stream buffer size */ | 380 | int stream_buf_size[CX18_MAX_STREAMS]; /* Stream buffer size */ |
| 381 | struct cx18_stream streams[CX18_MAX_STREAMS]; /* Stream data */ | 381 | struct cx18_stream streams[CX18_MAX_STREAMS]; /* Stream data */ |
| 382 | unsigned long i_flags; /* global cx18 flags */ | 382 | unsigned long i_flags; /* global cx18 flags */ |
| 383 | atomic_t capturing; /* count number of active capture streams */ | 383 | atomic_t ana_capturing; /* count number of active analog capture streams */ |
| 384 | atomic_t tot_capturing; /* total count number of active capture streams */ | ||
| 384 | spinlock_t lock; /* lock access to this struct */ | 385 | spinlock_t lock; /* lock access to this struct */ |
| 385 | int search_pack_header; | 386 | int search_pack_header; |
| 386 | 387 | ||
| @@ -423,6 +424,10 @@ struct cx18 { | |||
| 423 | struct mutex i2c_bus_lock[2]; | 424 | struct mutex i2c_bus_lock[2]; |
| 424 | struct i2c_client *i2c_clients[I2C_CLIENTS_MAX]; | 425 | struct i2c_client *i2c_clients[I2C_CLIENTS_MAX]; |
| 425 | 426 | ||
| 427 | /* gpio */ | ||
| 428 | u32 gpio_dir; | ||
| 429 | u32 gpio_val; | ||
| 430 | |||
| 426 | /* v4l2 and User settings */ | 431 | /* v4l2 and User settings */ |
| 427 | 432 | ||
| 428 | /* codec settings */ | 433 | /* codec settings */ |
