diff options
author | Andy Walls <awalls@radix.net> | 2009-01-17 08:59:31 -0500 |
---|---|---|
committer | Andy Walls <awalls@radix.net> | 2009-01-17 08:59:31 -0500 |
commit | c6138eadff2f01fd6d20a1f9a39b6ba4cbeff85b (patch) | |
tree | 4ad3708cf7dc5ff01b2e657e314883ab2330c658 /linux/drivers/media/video/pvrusb2/pvrusb2-hdw.h | |
parent | 708ba0701edccea0b0fc2b0ea9303337a85ff05c (diff) | |
parent | b0fc8c78cb5fd9394d8d4ff3198bdc9390b96001 (diff) | |
download | mediapointer-dvb-s2-c6138eadff2f01fd6d20a1f9a39b6ba4cbeff85b.tar.gz mediapointer-dvb-s2-c6138eadff2f01fd6d20a1f9a39b6ba4cbeff85b.tar.bz2 |
Merge from master v4l-dvb repo
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-hdw.h')
-rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-hdw.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.h b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.h index 732546fa3..e4d04a7fe 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.h +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.h @@ -138,6 +138,9 @@ unsigned long pvr2_hdw_get_sn(struct pvr2_hdw *); /* Retrieve bus location info of device */ const char *pvr2_hdw_get_bus_info(struct pvr2_hdw *); +/* Retrieve per-instance string identifier for this specific device */ +const char *pvr2_hdw_get_device_identifier(struct pvr2_hdw *); + /* Called when hardware has been unplugged */ void pvr2_hdw_disconnect(struct pvr2_hdw *); @@ -242,8 +245,7 @@ void pvr2_hdw_v4l_store_minor_number(struct pvr2_hdw *, enum pvr2_v4l_type index,int); /* Direct read/write access to chip's registers: - match_type - how to interpret match_chip (e.g. driver ID, i2c address) - match_chip - chip match value (e.g. I2C_DRIVERD_xxxx) + match - specify criteria to identify target chip (this is a v4l dbg struct) reg_id - register number to access setFl - true to set the register, false to read it val_ptr - storage location for source / result. */ |