summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--linux/drivers/media/dvb/dvb-usb/a800.c16
-rw-r--r--linux/drivers/media/dvb/dvb-usb/dibusb-mb.c6
-rw-r--r--linux/drivers/media/dvb/dvb-usb/dibusb-mc.c2
-rw-r--r--linux/drivers/media/dvb/dvb-usb/digitv.c2
-rw-r--r--linux/drivers/media/dvb/dvb-usb/dtt200u.c2
-rw-r--r--linux/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c6
-rw-r--r--linux/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c6
-rw-r--r--linux/drivers/media/dvb/dvb-usb/dvb-usb-init.c8
-rw-r--r--linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c8
-rw-r--r--linux/drivers/media/dvb/dvb-usb/dvb-usb-urb.c14
-rw-r--r--linux/drivers/media/dvb/dvb-usb/dvb-usb.h140
-rw-r--r--linux/drivers/media/dvb/dvb-usb/nova-t-usb2.c2
-rw-r--r--linux/drivers/media/dvb/dvb-usb/vp7045.c2
13 files changed, 149 insertions, 65 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/a800.c b/linux/drivers/media/dvb/dvb-usb/a800.c
index a0e24d223..9e8526c2d 100644
--- a/linux/drivers/media/dvb/dvb-usb/a800.c
+++ b/linux/drivers/media/dvb/dvb-usb/a800.c
@@ -1,7 +1,7 @@
/* DVB USB framework compliant Linux driver for the AVerMedia AverTV DVB-T
* USB2.0 (A800) DVB-T receiver.
*
- * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
+ * Copyright (C) 2005 Patrick Boettcher (patrick.boettcher@desy.de)
*
* Thanks to
* - AVerMedia who kindly provided information and
@@ -22,6 +22,7 @@ MODULE_PARM_DESC(debug, "set debugging level (rc=1 (or-able))." DVB_USB_DEBUG_ST
static int a800_power_ctrl(struct dvb_usb_device *d, int onoff)
{
+ /* do nothing for the AVerMedia */
return 0;
}
@@ -62,17 +63,6 @@ static struct dvb_usb_rc_key a800_rc_keys[] = {
{ 0x02, 0x15, KEY_MENU }, /* MENU */
};
-/*1. Make a vendor request with the following parameters:
- * Request = 0x04
- * Index = 0;
- * Value = 0;
- * TransferBufferLength = 5;
- * TransferBuffer = TransferBufferPointer;
- *
- *2. Send the command to the A800 device, then you can get 5 bytes of data back:
- * Control byte | custom code | ~custom code | data code | ~data code
- * Control byte: 0x00: no data 0x01: data is available 0x02: repeat (repeat the previous valid data)
- */
int a800_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
{
u8 key[5];
@@ -125,7 +115,7 @@ static struct dvb_usb_properties a800_properties = {
.rc_interval = DEFAULT_RC_INTERVAL,
.rc_key_map = a800_rc_keys,
.rc_key_map_size = ARRAY_SIZE(a800_rc_keys),
- .query_rc = a800_rc_query,
+ .rc_query = a800_rc_query,
.i2c_algo = &dibusb_i2c_algo,
diff --git a/linux/drivers/media/dvb/dvb-usb/dibusb-mb.c b/linux/drivers/media/dvb/dvb-usb/dibusb-mb.c
index 87819aed6..edca79948 100644
--- a/linux/drivers/media/dvb/dvb-usb/dibusb-mb.c
+++ b/linux/drivers/media/dvb/dvb-usb/dibusb-mb.c
@@ -136,7 +136,7 @@ static struct dvb_usb_properties dibusb1_1_properties = {
.rc_interval = DEFAULT_RC_INTERVAL,
.rc_key_map = dibusb_rc_keys,
.rc_key_map_size = 63, /* wow, that is ugly ... I want to load it to the driver dynamically */
- .query_rc = dibusb_rc_query,
+ .rc_query = dibusb_rc_query,
.i2c_algo = &dibusb_i2c_algo,
@@ -208,7 +208,7 @@ static struct dvb_usb_properties dibusb1_1_an2235_properties = {
.rc_interval = DEFAULT_RC_INTERVAL,
.rc_key_map = dibusb_rc_keys,
.rc_key_map_size = 63, /* wow, that is ugly ... I want to load it to the driver dynamically */
- .query_rc = dibusb_rc_query,
+ .rc_query = dibusb_rc_query,
.i2c_algo = &dibusb_i2c_algo,
@@ -252,7 +252,7 @@ static struct dvb_usb_properties dibusb2_0b_properties = {
.rc_interval = DEFAULT_RC_INTERVAL,
.rc_key_map = dibusb_rc_keys,
.rc_key_map_size = 63, /* wow, that is ugly ... I want to load it to the driver dynamically */
- .query_rc = dibusb_rc_query,
+ .rc_query = dibusb_rc_query,
.i2c_algo = &dibusb_i2c_algo,
diff --git a/linux/drivers/media/dvb/dvb-usb/dibusb-mc.c b/linux/drivers/media/dvb/dvb-usb/dibusb-mc.c
index f680b9aa7..88f22df74 100644
--- a/linux/drivers/media/dvb/dvb-usb/dibusb-mc.c
+++ b/linux/drivers/media/dvb/dvb-usb/dibusb-mc.c
@@ -51,7 +51,7 @@ static struct dvb_usb_properties dibusb_mc_properties = {
.rc_interval = DEFAULT_RC_INTERVAL,
.rc_key_map = dibusb_rc_keys,
.rc_key_map_size = 63, /* FIXME */
- .query_rc = dibusb_rc_query,
+ .rc_query = dibusb_rc_query,
.i2c_algo = &dibusb_i2c_algo,
diff --git a/linux/drivers/media/dvb/dvb-usb/digitv.c b/linux/drivers/media/dvb/dvb-usb/digitv.c
index 5dc95fc7f..1457675ed 100644
--- a/linux/drivers/media/dvb/dvb-usb/digitv.c
+++ b/linux/drivers/media/dvb/dvb-usb/digitv.c
@@ -232,7 +232,7 @@ static struct dvb_usb_properties digitv_properties = {
.rc_interval = 1000,
.rc_key_map = digitv_rc_keys,
.rc_key_map_size = ARRAY_SIZE(digitv_rc_keys),
- .query_rc = digitv_rc_query,
+ .rc_query = digitv_rc_query,
.identify_state = digitv_identify_state,
diff --git a/linux/drivers/media/dvb/dvb-usb/dtt200u.c b/linux/drivers/media/dvb/dvb-usb/dtt200u.c
index 459112667..b68985c79 100644
--- a/linux/drivers/media/dvb/dvb-usb/dtt200u.c
+++ b/linux/drivers/media/dvb/dvb-usb/dtt200u.c
@@ -109,7 +109,7 @@ static struct dvb_usb_properties dtt200u_properties = {
.rc_interval = 200,
.rc_key_map = dtt200u_rc_keys,
.rc_key_map_size = ARRAY_SIZE(dtt200u_rc_keys),
- .query_rc = dtt200u_rc_query,
+ .rc_query = dtt200u_rc_query,
.generic_bulk_ctrl_endpoint = 0x01,
diff --git a/linux/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c b/linux/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
index f33a16c61..bdd72f779 100644
--- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
+++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
@@ -128,20 +128,20 @@ err_dmx:
err:
return ret;
success:
- d->init_state |= DVB_USB_STATE_DVB;
+ d->state |= DVB_USB_STATE_DVB;
return 0;
}
int dvb_usb_dvb_exit(struct dvb_usb_device *d)
{
- if (d->init_state & DVB_USB_STATE_DVB) {
- d->init_state &= ~DVB_USB_STATE_DVB;
+ if (d->state & DVB_USB_STATE_DVB) {
deb_info("unregistering DVB part\n");
dvb_net_release(&d->dvb_net);
d->demux.dmx.close(&d->demux.dmx);
dvb_dmxdev_release(&d->dmxdev);
dvb_dmx_release(&d->demux);
dvb_unregister_adapter(&d->dvb_adap);
+ d->state &= ~DVB_USB_STATE_DVB;
}
return 0;
}
diff --git a/linux/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c b/linux/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
index 4f027e542..baab40cf9 100644
--- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
+++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
@@ -34,15 +34,15 @@ int dvb_usb_i2c_init(struct dvb_usb_device *d)
if ((ret = i2c_add_adapter(&d->i2c_adap)) < 0)
err("could not add i2c adapter");
- d->init_state |= DVB_USB_STATE_I2C;
+ d->state |= DVB_USB_STATE_I2C;
return ret;
}
int dvb_usb_i2c_exit(struct dvb_usb_device *d)
{
- if (d->init_state & DVB_USB_STATE_I2C)
+ if (d->state & DVB_USB_STATE_I2C)
i2c_del_adapter(&d->i2c_adap);
- d->init_state &= ~DVB_USB_STATE_I2C;
+ d->state &= ~DVB_USB_STATE_I2C;
return 0;
}
diff --git a/linux/drivers/media/dvb/dvb-usb/dvb-usb-init.c b/linux/drivers/media/dvb/dvb-usb/dvb-usb-init.c
index 20ec6e35b..f45867662 100644
--- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-init.c
+++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-init.c
@@ -21,14 +21,14 @@ MODULE_PARM_DESC(debug, "set debugging level (1=info,xfer=2,alot=4,ts=8,err=16,r
/* general initialization functions */
int dvb_usb_exit(struct dvb_usb_device *d)
{
- deb_info("init_state before exiting everything: %x\n",d->init_state);
+ deb_info("state before exiting everything: %x\n",d->state);
dvb_usb_remote_exit(d);
dvb_usb_fe_exit(d);
dvb_usb_i2c_exit(d);
dvb_usb_dvb_exit(d);
dvb_usb_urb_exit(d);
- deb_info("init_state should be zero now: %x\n",d->init_state);
- d->init_state = DVB_USB_STATE_INIT;
+ deb_info("state should be zero now: %x\n",d->state);
+ d->state = DVB_USB_STATE_INIT;
kfree(d->priv);
kfree(d);
return 0;
@@ -41,7 +41,7 @@ static int dvb_usb_init(struct dvb_usb_device *d)
sema_init(&d->usb_sem, 1);
sema_init(&d->i2c_sem, 1);
- d->init_state = DVB_USB_STATE_INIT;
+ d->state = DVB_USB_STATE_INIT;
/* check the capabilites and set appropriate variables */
diff --git a/linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c b/linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
index 70d133076..9f1e23f82 100644
--- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
+++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
@@ -21,7 +21,7 @@ static void dvb_usb_read_remote_control(void *data)
/* TODO: need a lock here. We can simply skip checking for the remote control
if we're busy. */
- if (d->props.query_rc(d,&event,&state)) {
+ if (d->props.rc_query(d,&event,&state)) {
err("error while querying for an remote control event.");
goto schedule;
}
@@ -118,19 +118,19 @@ int dvb_usb_remote_init(struct dvb_usb_device *d)
info("schedule remote query interval to %d msecs.",d->props.rc_interval);
schedule_delayed_work(&d->rc_query_work,msecs_to_jiffies(d->props.rc_interval));
- d->init_state |= DVB_USB_STATE_REMOTE;
+ d->state |= DVB_USB_STATE_REMOTE;
return 0;
}
int dvb_usb_remote_exit(struct dvb_usb_device *d)
{
- if (d->init_state & DVB_USB_STATE_REMOTE) {
+ if (d->state & DVB_USB_STATE_REMOTE) {
cancel_delayed_work(&d->rc_query_work);
flush_scheduled_work();
input_unregister_device(&d->rc_input_dev);
}
- d->init_state &= ~DVB_USB_STATE_REMOTE;
+ d->state &= ~DVB_USB_STATE_REMOTE;
return 0;
}
diff --git a/linux/drivers/media/dvb/dvb-usb/dvb-usb-urb.c b/linux/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
index f6721f0ea..e691f6036 100644
--- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
+++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-urb.c
@@ -86,7 +86,7 @@ static void dvb_usb_bulk_urb_complete(struct urb *urb, struct pt_regs *ptregs)
}
if (d->feedcount > 0 && urb->actual_length > 0) {
- if (d->init_state & DVB_USB_STATE_DVB)
+ if (d->state & DVB_USB_STATE_DVB)
dvb_dmx_swfilter(&d->demux, (u8*) urb->transfer_buffer,urb->actual_length);
} else
deb_ts("URB dropped because of feedcount.\n");
@@ -135,7 +135,7 @@ static int dvb_usb_bulk_urb_init(struct dvb_usb_device *d)
deb_info("allocation successful\n");
memset(d->buffer,0,bufsize);
- d->init_state |= DVB_USB_STATE_URB_BUF;
+ d->state |= DVB_USB_STATE_URB_BUF;
/* allocate the URBs */
for (i = 0; i < d->props.urb.count; i++) {
@@ -172,7 +172,7 @@ int dvb_usb_urb_init(struct dvb_usb_device *d)
if (d->urb_list == NULL)
return -ENOMEM;
memset(d->urb_list,0,d->props.urb.count * sizeof(struct urb *));
- d->init_state |= DVB_USB_STATE_URB_LIST;
+ d->state |= DVB_USB_STATE_URB_LIST;
switch (d->props.urb.type) {
case DVB_USB_BULK:
@@ -192,7 +192,7 @@ int dvb_usb_urb_exit(struct dvb_usb_device *d)
dvb_usb_urb_kill(d);
- if (d->init_state & DVB_USB_STATE_URB_LIST) {
+ if (d->state & DVB_USB_STATE_URB_LIST) {
for (i = 0; i < d->urbs_initialized; i++) {
if (d->urb_list[i] != NULL) {
deb_info("freeing URB no. %d.\n",i);
@@ -203,14 +203,14 @@ int dvb_usb_urb_exit(struct dvb_usb_device *d)
d->urbs_initialized = 0;
/* free the urb array */
kfree(d->urb_list);
- d->init_state &= ~DVB_USB_STATE_URB_LIST;
+ d->state &= ~DVB_USB_STATE_URB_LIST;
}
- if (d->init_state & DVB_USB_STATE_URB_BUF)
+ if (d->state & DVB_USB_STATE_URB_BUF)
pci_free_consistent(NULL,
d->props.urb.u.bulk.buffersize * d->props.urb.count,
d->buffer,d->dma_handle);
- d->init_state &= ~DVB_USB_STATE_URB_BUF;
+ d->state &= ~DVB_USB_STATE_URB_BUF;
return 0;
}
diff --git a/linux/drivers/media/dvb/dvb-usb/dvb-usb.h b/linux/drivers/media/dvb/dvb-usb/dvb-usb.h
index 1b02ee001..ee2cacc05 100644
--- a/linux/drivers/media/dvb/dvb-usb/dvb-usb.h
+++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb.h
@@ -50,14 +50,31 @@
#undef warn
#define warn(format, arg...) printk(KERN_WARNING DVB_USB_LOG_PREFIX ": " format "\n" , ## arg)
+/**
+ * struct dvb_usb_device_description - name and its according USB IDs
+ * @name: real name of the box, regardless which DVB USB device class is in use
+ * @cold_ids: array of struct usb_device_id which describe the device in
+ * pre-firmware state
+ * @warm_ids: array of struct usb_device_id which describe the device in
+ * post-firmware state
+ *
+ * Each DVB USB device class can have one or more actual devices, this struct
+ * assigns a name to it.
+ */
struct dvb_usb_device_description {
- const char *name; /* real name of the box */
+ const char *name;
#define DVB_USB_ID_MAX_NUM 15
- struct usb_device_id *cold_ids[DVB_USB_ID_MAX_NUM]; /* list of USB ids when this device is at pre firmware state */
- struct usb_device_id *warm_ids[DVB_USB_ID_MAX_NUM]; /* list of USB ids when this device is at post firmware state */
+ struct usb_device_id *cold_ids[DVB_USB_ID_MAX_NUM];
+ struct usb_device_id *warm_ids[DVB_USB_ID_MAX_NUM];
};
+/**
+ * struct dvb_usb_rc_key - a remote control key and its input-event
+ * @custom: the vendor/custom part of the key
+ * @data: the actual key part
+ * @event: the input event assigned to key identified by custom and data
+ */
struct dvb_usb_rc_key {
u8 custom,data;
u32 event;
@@ -65,7 +82,54 @@ struct dvb_usb_rc_key {
struct dvb_usb_device;
-/* properties of an dvb-usb-device */
+/**
+ * struct dvb_usb_properties - properties of a dvb-usb-device
+ * @caps: capabilites of the DVB USB device.
+ * @pid_filter_count: number of PID filter position in the optional hardware
+ * PID-filter.
+ *
+ * @usb_ctrl: which USB device-side controller is in use. Needed for firmware
+ * download.
+ * @firmware: name of the firmware file.
+ *
+ * @size_of_priv: how many bytes shall be allocated for the private field
+ * of struct dvb_usb_device.
+ *
+ * @power_ctrl: called to enable/disable power of the device.
+ * @streaming_crtl: called to start and stop the MPEG2-TS streaming of the
+ * device (not URB submitting/killing).
+ * @pid_filter_ctrl: called to en/disable the PID filter, if any.
+ * @pid_filter: called to set/unset a PID for filtering.
+ *
+ * @read_mac_address: called to read the MAC address of the device.
+ *
+ * @frontend_attach: called to attach the possible frontends (fill fe-field
+ * of struct dvb_usb_device).
+ * @tuner_attach: called to attach the correct tuner and to fill pll_addr,
+ * pll_desc and pll_init_buf of struct dvb_usb_device).
+ * @identify_state: called to determine the state (cold or warm), when it
+ * is not distinguishable by the USB IDs.
+ *
+ * @rc_key_map: a hard-wired array of struct dvb_usb_rc_key (NULL to disable
+ * remote control handling).
+ * @rc_key_map_size: number of items in @rc_key_map.
+ * @rc_query: called to query an event event.
+ * @rc_interval: time in ms between two queries.
+ *
+ * @i2c_algo: i2c_algorithm if the device has I2CoverUSB.
+ *
+ * @generic_bulk_ctrl_endpoint: most of the DVB USB devices have a generic
+ * endpoint which received control messages with bulk transfers. When this
+ * is non-zero, one can use dvb_usb_generic_rw and dvb_usb_generic_write-
+ * helper functions.
+ *
+ * @urb: describes the kind of USB transfer used for MPEG2-TS-streaming.
+ * Currently only BULK is implemented
+ *
+ * @num_device_descs: number of struct dvb_usb_device_description in @devices
+ * @devices: array of struct dvb_usb_device_description compatibles with these
+ * properties.
+ */
struct dvb_usb_properties {
#define DVB_USB_HAS_PID_FILTER 0x01
@@ -78,25 +142,22 @@ struct dvb_usb_properties {
#define CYPRESS_AN2135 0
#define CYPRESS_AN2235 1
#define CYPRESS_FX2 2
- int usb_ctrl; /* usb controller */
- const char *firmware; /* valid firmware filenames */
+ int usb_ctrl;
+ const char *firmware;
int size_of_priv;
- int (*streaming_ctrl) (struct dvb_usb_device *, int); /* control the MPEG2-TS streaming of the device */
- int (*pid_filter) (struct dvb_usb_device *, int, u16, int); /* if the device has a hardware pid filter */
- int (*pid_filter_ctrl) (struct dvb_usb_device *, int); /* if the device has a hardware pid filter to en-/disable */
-
- int (*read_mac_address) (struct dvb_usb_device *, u8 []); /* callback for reading the MAC address */
+ int (*power_ctrl) (struct dvb_usb_device *, int);
+ int (*streaming_ctrl) (struct dvb_usb_device *, int);
+ int (*pid_filter_ctrl) (struct dvb_usb_device *, int);
+ int (*pid_filter) (struct dvb_usb_device *, int, u16, int);
- int (*power_ctrl) (struct dvb_usb_device *, int); /* power control callback of the device */
+ int (*read_mac_address) (struct dvb_usb_device *, u8 []);
+ int (*frontend_attach) (struct dvb_usb_device *);
+ int (*tuner_attach) (struct dvb_usb_device *);
- int (*frontend_attach) (struct dvb_usb_device *); /* each device has to know about its frontends */
- int (*tuner_attach) (struct dvb_usb_device *); /* each device has to know about its tuners */
-
- int (*identify_state) (struct usb_device *, struct dvb_usb_properties *, struct dvb_usb_device_description **, int *);
- /* if the state (cold or warm) is not distinguishable by the USB IDs,
- * the dvb-usb-device has to provie this callback to determine it*/
+ int (*identify_state) (struct usb_device *, struct dvb_usb_properties *,
+ struct dvb_usb_device_description **, int *);
/* remote control properties */
#define REMOTE_NO_KEY_PRESSED 0x00
@@ -104,16 +165,13 @@ struct dvb_usb_properties {
#define REMOTE_KEY_REPEAT 0x02
struct dvb_usb_rc_key *rc_key_map;
int rc_key_map_size;
- int (*query_rc) (struct dvb_usb_device *, u32 *, int *); /* remote query callback - NULL no ir-receiver */
+ int (*rc_query) (struct dvb_usb_device *, u32 *, int *);
int rc_interval;
-/* i2c algorithm, if any */
struct i2c_algorithm *i2c_algo;
-/* endpoint for generic bulk read/write operations (used by many drivers for controlling the device) */
int generic_bulk_ctrl_endpoint;
-/* MPEG2 TS transfer description */
struct {
#define DVB_USB_BULK 1
#define DVB_USB_ISOC 2
@@ -136,6 +194,42 @@ struct dvb_usb_properties {
struct dvb_usb_device_description devices[];
};
+
+/**
+ * struct dvb_usb_device - object of a DVB USB device
+ * @props: copy of the struct dvb_usb_properties this device belongs to.
+ * @desc: pointer to the device's struct dvb_usb_device_description.
+ * @state: initialization and runtime state of the device.
+ *
+ * @udev: pointer to the device's struct usb_device.
+ * @urb_list: array of dynamically allocated struct urb for the MPEG2-TS-
+ * streaming.
+ * @buffer: buffer used to streaming.
+ * @dma_handle: dma_addr_t for buffer.
+ * @urbs_initialized: number of URBs initialized.
+ * @urbs_submitted: number of URBs submitted.
+ * @feedcount: number of reqested feeds (used for streaming-activation)
+ * @pid_filtering: is hardware pid_filtering used or not.
+ * @usb_sem: semaphore of USB control messages (reading needs two messages)
+ * @i2c_sem: semaphore for i2c-transfers
+ * @i2c_adap: device's i2c_adapter if it uses I2CoverUSB
+ * @dvb_adap: device's dvb_adapter.
+ * @dmxdev: device's dmxdev.
+ * @demux: device's software demuxer.
+ * @dvb_net: device's dvb_net interfaces.
+ * @dvb_frontend: device's frontend.
+ * @max_feed_count: how many feeds can be handled simultaneously by this
+ * device
+ * @fe_sleep: rerouted frontend-sleep function.
+ * @fe_init: rerouted frontend-init (wakeup) function.
+ * @rc_input_dev: input device for the remote control.
+ * @rc_query_work: struct work_struct frequent rc queries
+ * @last_event: last triggered event
+ * @last_state: last state (no, pressed, repeat)
+ * @owner: owner of the dvb_adapter
+ * @priv: private data of the actual driver (allocate by dvb-usb, size defined
+ * in size_of_priv of dvb_usb_properties).
+ */
struct dvb_usb_device {
struct dvb_usb_properties props;
struct dvb_usb_device_description *desc;
@@ -147,7 +241,7 @@ struct dvb_usb_device {
#define DVB_USB_STATE_I2C 0x008
#define DVB_USB_STATE_REMOTE 0x010
#define DVB_USB_STATE_URB_SUBMIT 0x020
- int init_state;
+ int state;
/* usb */
struct usb_device *udev;
diff --git a/linux/drivers/media/dvb/dvb-usb/nova-t-usb2.c b/linux/drivers/media/dvb/dvb-usb/nova-t-usb2.c
index 575c85b4e..8f4c20496 100644
--- a/linux/drivers/media/dvb/dvb-usb/nova-t-usb2.c
+++ b/linux/drivers/media/dvb/dvb-usb/nova-t-usb2.c
@@ -175,7 +175,7 @@ static struct dvb_usb_properties nova_t_properties = {
.rc_interval = 100,
.rc_key_map = haupp_rc_keys,
.rc_key_map_size = ARRAY_SIZE(haupp_rc_keys),
- .query_rc = nova_t_rc_query,
+ .rc_query = nova_t_rc_query,
.i2c_algo = &dibusb_i2c_algo,
diff --git a/linux/drivers/media/dvb/dvb-usb/vp7045.c b/linux/drivers/media/dvb/dvb-usb/vp7045.c
index a7885ef7e..2820a8df2 100644
--- a/linux/drivers/media/dvb/dvb-usb/vp7045.c
+++ b/linux/drivers/media/dvb/dvb-usb/vp7045.c
@@ -199,7 +199,7 @@ static struct dvb_usb_properties vp7045_properties = {
.rc_interval = 400,
.rc_key_map = vp7045_rc_keys,
.rc_key_map_size = ARRAY_SIZE(vp7045_rc_keys),
- .query_rc = vp7045_rc_query,
+ .rc_query = vp7045_rc_query,
/* parameter for the MPEG2-data transfer */
.urb = {
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 21:16:25 +0000