Skip to content

Commit

Permalink
[media] dvb_usb_v2: multiple small tweaks around the code
Browse files Browse the repository at this point in the history 
Naming, small code changes, debug writings, etc.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Antti Palosaari authored and Mauro Carvalho Chehab committed Aug 4, 2012
1 parent 9f6f82e commit 831511b
Show file tree
Hide file tree
Showing 4 changed files with 109 additions and 133 deletions.
4 changes: 2 additions & 2 deletions drivers/media/dvb/dvb-usb/anysee.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1264,7 +1264,7 @@ static int anysee_init(struct dvb_usb_device *d)
return 0;
}

static void anysee_disconnect(struct dvb_usb_device *d)
static void anysee_exit(struct dvb_usb_device *d)
{
return anysee_ci_release(d);
}
Expand All @@ -1287,7 +1287,7 @@ static struct dvb_usb_device_properties anysee_props = {
.get_rc_config = anysee_get_rc_config,
.frontend_ctrl = anysee_frontend_ctrl,
.streaming_ctrl = anysee_streaming_ctrl,
.disconnect = anysee_disconnect,
.exit = anysee_exit,

.num_adapters = 1,
.adapter = {
Expand Down
111 changes: 52 additions & 59 deletions drivers/media/dvb/dvb-usb/dvb_usb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@
#ifndef DVB_USB_H
#define DVB_USB_H

#include <linux/input.h>
#include <linux/usb.h>
#include <linux/usb/input.h>
#include <linux/firmware.h>
#include <linux/mutex.h>
#include <media/rc-core.h>

#include "dvb_frontend.h"
Expand Down Expand Up @@ -65,15 +63,35 @@
.rc_map = (rc), \
})

struct dvb_usb_device;
struct dvb_usb_adapter;

struct dvb_usb_driver_info {
const char *name;
const char *rc_map;
const struct dvb_usb_device_properties *props;
};

struct dvb_usb_device;
struct dvb_usb_adapter;
struct usb_data_stream;
/**
* struct dvb_rc properties of remote controller, using rc-core
* @rc_codes: name of rc codes table
* @protocol: type of protocol(s) currently used by the driver
* @allowed_protos: protocol(s) supported by the driver
* @driver_type: Used to point if a device supports raw mode
* @change_protocol: callback to change protocol
* @rc_query: called to query an event event.
* @rc_interval: time in ms between two queries.
* @bulk_mode: device supports bulk mode for RC (disable polling mode)
*/
struct dvb_usb_rc {
char *map_name;
u64 allowed_protos;
int (*change_protocol)(struct rc_dev *dev, u64 rc_type);
int (*query) (struct dvb_usb_device *d);
unsigned int interval;
const enum rc_driver_type driver_type;
bool bulk_mode;
};

/**
* Properties of USB streaming - TODO this structure should be somewhere else
Expand All @@ -83,13 +101,13 @@ struct usb_data_stream;
struct usb_data_stream_properties {
#define USB_BULK 1
#define USB_ISOC 2
int type;
int count;
int endpoint;
u8 type;
u8 count;
u8 endpoint;

union {
struct {
int buffersize; /* per URB */
unsigned int buffersize; /* per URB */
} bulk;
struct {
int framesperurb;
Expand Down Expand Up @@ -124,37 +142,15 @@ struct dvb_usb_adapter_properties {
#define DVB_USB_ADAP_HAS_PID_FILTER 0x01
#define DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF 0x02
#define DVB_USB_ADAP_NEED_PID_FILTERING 0x04
int caps;
int size_of_priv;
u8 caps;

int pid_filter_count;
u8 pid_filter_count;
int (*pid_filter_ctrl) (struct dvb_usb_adapter *, int);
int (*pid_filter) (struct dvb_usb_adapter *, int, u16, int);

struct usb_data_stream_properties stream;
};

/**
* struct dvb_rc properties of remote controller, using rc-core
* @rc_codes: name of rc codes table
* @protocol: type of protocol(s) currently used by the driver
* @allowed_protos: protocol(s) supported by the driver
* @driver_type: Used to point if a device supports raw mode
* @change_protocol: callback to change protocol
* @rc_query: called to query an event event.
* @rc_interval: time in ms between two queries.
* @bulk_mode: device supports bulk mode for RC (disable polling mode)
*/
struct dvb_usb_rc {
char *map_name;
u64 allowed_protos;
int (*change_protocol)(struct rc_dev *dev, u64 rc_type);
int (*query) (struct dvb_usb_device *d);
int interval;
const enum rc_driver_type driver_type;
bool bulk_mode;
};

/**
* struct dvb_usb_device_properties - properties of a dvb-usb-device
* @owner: owner of the dvb_adapter
Expand Down Expand Up @@ -196,8 +192,11 @@ struct dvb_usb_device_properties {
const char *driver_name;
struct module *owner;
short *adapter_nr;

u8 bInterfaceNumber;
int size_of_priv;
unsigned int size_of_priv;
u8 generic_bulk_ctrl_endpoint;
u8 generic_bulk_ctrl_endpoint_response;

#define WARM 0
#define COLD 1
Expand All @@ -207,11 +206,12 @@ struct dvb_usb_device_properties {
int (*download_firmware) (struct dvb_usb_device *,
const struct firmware *);

int num_adapters;
int (*get_adapter_count) (struct dvb_usb_device *);
struct dvb_usb_adapter_properties adapter[MAX_NO_OF_ADAPTER_PER_DEVICE];
struct i2c_algorithm *i2c_algo;

int (*power_ctrl) (struct dvb_usb_device *, int);
unsigned int num_adapters;
struct dvb_usb_adapter_properties adapter[MAX_NO_OF_ADAPTER_PER_DEVICE];
int (*get_adapter_count) (struct dvb_usb_device *);
int (*power_ctrl) (struct dvb_usb_device *, int);
int (*read_config) (struct dvb_usb_device *d);
int (*read_mac_address) (struct dvb_usb_adapter *, u8 []);
int (*frontend_attach) (struct dvb_usb_adapter *);
Expand All @@ -221,18 +221,13 @@ struct dvb_usb_device_properties {
int (*fe_ioctl_override) (struct dvb_frontend *,
unsigned int, void *, unsigned int);
int (*init) (struct dvb_usb_device *);
void (*disconnect) (struct dvb_usb_device *);
void (*exit) (struct dvb_usb_device *);
int (*get_rc_config) (struct dvb_usb_device *, struct dvb_usb_rc *);
#define DVB_USB_FE_TS_TYPE_188 0
#define DVB_USB_FE_TS_TYPE_204 1
#define DVB_USB_FE_TS_TYPE_RAW 2
int (*get_stream_config) (struct dvb_frontend *, u8 *,
struct usb_data_stream_properties *);

struct i2c_algorithm *i2c_algo;

int generic_bulk_ctrl_endpoint;
int generic_bulk_ctrl_endpoint_response;
};

/**
Expand All @@ -247,12 +242,12 @@ struct dvb_usb_device_properties {
*/
#define MAX_NO_URBS_FOR_DATA_STREAM 10
struct usb_data_stream {
struct usb_device *udev;
struct usb_data_stream_properties props;
struct usb_device *udev;
struct usb_data_stream_properties props;

#define USB_STATE_INIT 0x00
#define USB_STATE_URB_BUF 0x01
int state;
u8 state;

void (*complete) (struct usb_data_stream *, u8 *, size_t);

Expand Down Expand Up @@ -297,26 +292,23 @@ struct usb_data_stream {
struct dvb_usb_adapter {
const struct dvb_usb_adapter_properties *props;
struct usb_data_stream stream;
u8 id;
u8 id;
u8 ts_type;
int pid_filtering;
int feed_count;
int max_feed_count;

/* sync frontend and streaming as those are different tasks */
struct mutex sync_mutex;
bool pid_filtering;
u8 feed_count;
u8 max_feed_count;
s8 active_fe;

/* dvb */
struct dvb_adapter dvb_adap;
struct dmxdev dmxdev;
struct dvb_demux demux;
struct dvb_net dvb_net;
struct mutex sync_mutex;

struct dvb_frontend *fe[MAX_NO_OF_FE_PER_ADAP];
int (*fe_init[MAX_NO_OF_FE_PER_ADAP]) (struct dvb_frontend *);
int (*fe_sleep[MAX_NO_OF_FE_PER_ADAP]) (struct dvb_frontend *);

int active_fe;
};

/**
Expand Down Expand Up @@ -346,11 +338,12 @@ struct dvb_usb_device {
const struct dvb_usb_device_properties *props;
const char *name;
const char *rc_map;
struct dvb_usb_rc rc;

struct usb_device *udev;
struct usb_interface *intf;
struct dvb_usb_rc rc;
struct work_struct probe_work;
pid_t work_pid;
struct usb_interface *intf;
int powered;

/* locking */
Expand Down
Loading

0 comments on commit 831511b

Please sign in to comment.