diff options
Diffstat (limited to 'linux/drivers/media/dvb/frontends/dib3000-common.h')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/dib3000-common.h | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/linux/drivers/media/dvb/frontends/dib3000-common.h b/linux/drivers/media/dvb/frontends/dib3000-common.h index 1e65c301a..385fcfe4c 100644 --- a/linux/drivers/media/dvb/frontends/dib3000-common.h +++ b/linux/drivers/media/dvb/frontends/dib3000-common.h @@ -29,16 +29,9 @@ #include "dib3000.h" /* info and err, taken from usb.h, if there is anything available like by default. */ -#define err(format, arg...) printk(KERN_ERR "%s: " format "\n" , __FILE__ , ## arg) -#define info(format, arg...) printk(KERN_INFO "%s: " format "\n" , __FILE__ , ## arg) -#define warn(format, arg...) printk(KERN_WARNING "%s: " format "\n" , __FILE__ , ## arg) - -/* a PID for the pid_filter list, when in use */ -struct dib3000_pid -{ - u16 pid; - int active; -}; +#define err(format, arg...) printk(KERN_ERR "dib3000mX: " format "\n" , ## arg) +#define info(format, arg...) printk(KERN_INFO "dib3000mX: " format "\n" , ## arg) +#define warn(format, arg...) printk(KERN_WARNING "dib3000mX: " format "\n" , ## arg) /* frontend state */ struct dib3000_state { @@ -49,11 +42,6 @@ struct dib3000_state { /* configuration settings */ struct dib3000_config config; - spinlock_t pid_list_lock; - struct dib3000_pid *pid_list; - - int feedcount; - struct dvb_frontend frontend; int timing_offset; int timing_offset_comp_done; @@ -66,11 +54,6 @@ struct dib3000_state { extern int dib3000_read_reg(struct dib3000_state *state, u16 reg); extern int dib3000_write_reg(struct dib3000_state *state, u16 reg, u16 val); -extern int dib3000_init_pid_list(struct dib3000_state *state, int num); -extern void dib3000_dealloc_pid_list(struct dib3000_state *state); -extern int dib3000_get_pid_index(struct dib3000_pid pid_list[], int num_pids, - int pid, spinlock_t *pid_list_lock,int onoff); - extern int dib3000_search_status(u16 irq,u16 lock); /* handy shortcuts */ |