1 files changed, 226 insertions, 252 deletions

diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
index a9710b52c..075882877 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
@@ -19,6 +19,7 @@
  *
  */
 
+#include <linux/config.h>
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <asm/semaphore.h>
@@ -26,49 +27,18 @@
 #include "pvrusb2-sysfs.h"
 #include "pvrusb2-hdw.h"
 #include "pvrusb2-debug.h"
+#ifdef CONFIG_VIDEO_PVRUSB2_DEBUGIFC
 #include "pvrusb2-debugifc.h"
+#endif /* CONFIG_VIDEO_PVRUSB2_DEBUGIFC */
 
 #define pvr2_sysfs_trace(...) pvr2_trace(PVR2_TRACE_SYSFS,__VA_ARGS__)
 
-static char *item_names[PVR2_CID_COUNT] = {
-	[PVR2_CID_BRIGHTNESS] = "ctl_brightness",
-	[PVR2_CID_CONTRAST] = "ctl_contrast",
-	[PVR2_CID_SATURATION] = "ctl_saturation",
-	[PVR2_CID_HUE] = "ctl_hue",
-	[PVR2_CID_VOLUME] = "ctl_volume",
-	[PVR2_CID_BALANCE] = "ctl_balance",
-	[PVR2_CID_BASS] = "ctl_bass",
-	[PVR2_CID_TREBLE] = "ctl_treble",
-	[PVR2_CID_MUTE] = "ctl_mute",
-	[PVR2_CID_SRATE] = "ctl_srate",
-	[PVR2_CID_AUDIOBITRATE] = "ctl_audio_bitrate",
-	[PVR2_CID_AUDIOCRC] = "ctl_audio_crc",
-	[PVR2_CID_AUDIOEMPHASIS] = "ctl_audio_emphasis",
-	[PVR2_CID_VBR] = "ctl_vbr",
-	[PVR2_CID_AVERAGEVIDEOBITRATE] = "ctl_video_average_bitrate",
-	[PVR2_CID_PEAKVIDEOBITRATE] = "ctl_video_peak_bitrate",
-	[PVR2_CID_VIDEOSTANDARD] = "ctl_video_standard",
-	[PVR2_CID_INPUT] = "ctl_input",
-	[PVR2_CID_AUDIOMODE] = "ctl_audio_mode",
-	[PVR2_CID_FREQUENCY] = "ctl_frequency",
-	[PVR2_CID_HRES] = "ctl_resolution_hor",
-	[PVR2_CID_VRES] = "ctl_resolution_ver",
-	[PVR2_CID_INTERLACE] = "ctl_interlace",
-	[PVR2_CID_AUDIOLAYER] = "ctl_audio_layer",
-	[PVR2_CID_CHANNEL] = "ctl_channel",
-	[PVR2_CID_CHANPROG_ID] = "ctl_freq_table_channel",
-	[PVR2_CID_CHANPROG_FREQ] = "ctl_freq_table_value",
-	[PVR2_CID_SIGNAL_PRESENT] = "ctl_signal_present",
-	[PVR2_CID_STREAMING_ENABLED] = "ctl_streaming_enabled",
-	[PVR2_CID_HSM] = "ctl_usb_speed",
-	[PVR2_CID_SUBSYS_MASK] = "ctl_debug_subsys_mask",
-	[PVR2_CID_SUBSYS_STREAM_MASK] = "ctl_debug_subsys_stream_mask",
-};
-
 struct pvr2_sysfs {
 	struct pvr2_channel channel;
 	struct class_device *class_dev;
+#ifdef CONFIG_VIDEO_PVRUSB2_DEBUGIFC
 	struct pvr2_sysfs_debugifc *debugifc;
+#endif /* CONFIG_VIDEO_PVRUSB2_DEBUGIFC */
 	struct pvr2_sysfs_ctl_item *item_first;
 	struct pvr2_sysfs_ctl_item *item_last;
 	struct sysfs_ops kops;
@@ -77,22 +47,27 @@ struct pvr2_sysfs {
 	struct class_device_attribute attr_unit_number;
 };
 
+#ifdef CONFIG_VIDEO_PVRUSB2_DEBUGIFC
 struct pvr2_sysfs_debugifc {
 	struct class_device_attribute attr_debugcmd;
 	struct class_device_attribute attr_debuginfo;
 };
+#endif /* CONFIG_VIDEO_PVRUSB2_DEBUGIFC */
 
 struct pvr2_sysfs_ctl_item {
 	struct class_device_attribute attr_name;
 	struct class_device_attribute attr_min;
 	struct class_device_attribute attr_max;
 	struct class_device_attribute attr_enum;
+	struct class_device_attribute attr_bits;
 	struct class_device_attribute attr_val;
-	int attr_id;
+	struct class_device_attribute attr_custom;
+	struct pvr2_ctrl *cptr;
 	struct pvr2_sysfs *chptr;
 	struct pvr2_sysfs_ctl_item *item_next;
-	struct attribute *attr_gen[5];
+	struct attribute *attr_gen[6];
 	struct attribute_group grp;
+	char name[80];
 };
 
 struct pvr2_sysfs_class {
@@ -101,13 +76,16 @@ struct pvr2_sysfs_class {
 
 static ssize_t show_name(int id,struct class_device *class_dev,char *buf)
 {
+	struct pvr2_ctrl *cptr;
 	struct pvr2_sysfs *sfp;
 	const char *name;
 
 	sfp = (struct pvr2_sysfs *)class_dev->class_data;
 	if (!sfp) return -EINVAL;
-	name = pvr2_hdw_get_ctl_name(sfp->channel.hdw,id);
+	cptr = pvr2_hdw_get_ctrl_by_index(sfp->channel.hdw,id);
+	if (!cptr) return -EINVAL;
 
+	name = pvr2_ctrl_get_desc(cptr);
 	pvr2_sysfs_trace("pvr2_sysfs(%p) show_name(cid=%d) is %s",sfp,id,name);
 
 	if (!name) return -EINVAL;
@@ -117,217 +95,173 @@ static ssize_t show_name(int id,struct class_device *class_dev,char *buf)
 
 static ssize_t show_min(int id,struct class_device *class_dev,char *buf)
 {
+	struct pvr2_ctrl *cptr;
 	struct pvr2_sysfs *sfp;
-	int val;
+	long val;
 
 	sfp = (struct pvr2_sysfs *)class_dev->class_data;
 	if (!sfp) return -EINVAL;
-	val = pvr2_hdw_get_ctl_min_value(sfp->channel.hdw,id);
+	cptr = pvr2_hdw_get_ctrl_by_index(sfp->channel.hdw,id);
+	if (!cptr) return -EINVAL;
+	val = pvr2_ctrl_get_min(cptr);
 
-	pvr2_sysfs_trace("pvr2_sysfs(%p) show_min(cid=%d) is %d",sfp,id,val);
+	pvr2_sysfs_trace("pvr2_sysfs(%p) show_min(cid=%d) is %ld",sfp,id,val);
 
-	return scnprintf(buf,PAGE_SIZE,"%d\n",val);
+	return scnprintf(buf,PAGE_SIZE,"%ld\n",val);
 }
 
 static ssize_t show_max(int id,struct class_device *class_dev,char *buf)
 {
+	struct pvr2_ctrl *cptr;
 	struct pvr2_sysfs *sfp;
-	int val;
+	long val;
 
 	sfp = (struct pvr2_sysfs *)class_dev->class_data;
 	if (!sfp) return -EINVAL;
-	val = pvr2_hdw_get_ctl_max_value(sfp->channel.hdw,id);
+	cptr = pvr2_hdw_get_ctrl_by_index(sfp->channel.hdw,id);
+	if (!cptr) return -EINVAL;
+	val = pvr2_ctrl_get_max(cptr);
 
-	pvr2_sysfs_trace("pvr2_sysfs(%p) show_max(cid=%d) is %d",sfp,id,val);
+	pvr2_sysfs_trace("pvr2_sysfs(%p) show_max(cid=%d) is %ld",sfp,id,val);
 
-	return scnprintf(buf,PAGE_SIZE,"%d\n",val);
+	return scnprintf(buf,PAGE_SIZE,"%ld\n",val);
 }
 
-static ssize_t show_val_int(int id,struct class_device *class_dev,char *buf)
+static ssize_t show_val_norm(int id,struct class_device *class_dev,char *buf)
 {
+	struct pvr2_ctrl *cptr;
 	struct pvr2_sysfs *sfp;
-	int val;
+	int val,ret;
+	unsigned int cnt = 0;
 
 	sfp = (struct pvr2_sysfs *)class_dev->class_data;
 	if (!sfp) return -EINVAL;
-	val = pvr2_hdw_get_ctl_value(sfp->channel.hdw,id);
+	cptr = pvr2_hdw_get_ctrl_by_index(sfp->channel.hdw,id);
+	if (!cptr) return -EINVAL;
 
-	pvr2_sysfs_trace("pvr2_sysfs(%p) show_val_int(cid=%d) is %d",
-			 sfp,id,val);
+	ret = pvr2_ctrl_get_value(cptr,&val);
+	if (ret < 0) return ret;
 
-	return scnprintf(buf,PAGE_SIZE,"%d\n",val);
+	ret = pvr2_ctrl_value_to_sym(cptr,~0,val,
+				     buf,PAGE_SIZE-1,&cnt);
+
+	pvr2_sysfs_trace("pvr2_sysfs(%p) show_val_norm(cid=%d) is %.*s (%d)",
+			 sfp,id,cnt,buf,val);
+	buf[cnt] = '\n';
+	return cnt+1;
 }
 
-static ssize_t show_val_enum(int id,struct class_device *class_dev,char *buf)
+static ssize_t show_val_custom(int id,struct class_device *class_dev,char *buf)
 {
+	struct pvr2_ctrl *cptr;
 	struct pvr2_sysfs *sfp;
-	int val;
-	const char *name;
+	int val,ret;
+	unsigned int cnt = 0;
 
 	sfp = (struct pvr2_sysfs *)class_dev->class_data;
 	if (!sfp) return -EINVAL;
-	val = pvr2_hdw_get_ctl_value(sfp->channel.hdw,id);
+	cptr = pvr2_hdw_get_ctrl_by_index(sfp->channel.hdw,id);
+	if (!cptr) return -EINVAL;
 
-	name = pvr2_hdw_get_ctl_value_name(sfp->channel.hdw,id,val);
+	ret = pvr2_ctrl_get_value(cptr,&val);
+	if (ret < 0) return ret;
 
-	pvr2_sysfs_trace("pvr2_sysfs(%p) show_val_enum(cid=%d) is %s (%d)",
-			 sfp,id,name,val);
+	ret = pvr2_ctrl_custom_value_to_sym(cptr,~0,val,
+					    buf,PAGE_SIZE-1,&cnt);
 
-	return scnprintf(buf,PAGE_SIZE,"%s\n",name);
+	pvr2_sysfs_trace("pvr2_sysfs(%p) show_val_custom(cid=%d) is %.*s (%d)",
+			 sfp,id,cnt,buf,val);
+	buf[cnt] = '\n';
+	return cnt+1;
 }
 
 static ssize_t show_enum(int id,struct class_device *class_dev,char *buf)
 {
+	struct pvr2_ctrl *cptr;
 	struct pvr2_sysfs *sfp;
-	int minval,maxval,val;
-	const char *name;
-	ssize_t cnt = 0;
+	long val;
+	unsigned int bcnt,ccnt,ecnt;
 
 	sfp = (struct pvr2_sysfs *)class_dev->class_data;
 	if (!sfp) return -EINVAL;
-	minval = pvr2_hdw_get_ctl_min_value(sfp->channel.hdw,id);
-	maxval = pvr2_hdw_get_ctl_max_value(sfp->channel.hdw,id);
-	for (val = minval; val <= maxval; val++) {
-		name = pvr2_hdw_get_ctl_value_name(sfp->channel.hdw,id,val);
-		cnt += scnprintf(buf+cnt,PAGE_SIZE-cnt,"%s\n",name);
+	cptr = pvr2_hdw_get_ctrl_by_index(sfp->channel.hdw,id);
+	if (!cptr) return -EINVAL;
+	ecnt = pvr2_ctrl_get_cnt(cptr);
+	bcnt = 0;
+	for (val = 0; val < ecnt; val++) {
+		pvr2_ctrl_get_valname(cptr,val,buf+bcnt,PAGE_SIZE-bcnt,&ccnt);
+		bcnt += ccnt;
+		if (bcnt >= PAGE_SIZE) break;
+		buf[bcnt] = '\n';
+		bcnt++;
 	}
 	pvr2_sysfs_trace("pvr2_sysfs(%p) show_enum(cid=%d)",sfp,id);
-	return cnt;
+	return bcnt;
 }
 
-static int store_val_any(int id,struct pvr2_sysfs *sfp,
-			 const char *buf,unsigned int count)
+static ssize_t show_bits(int id,struct class_device *class_dev,char *buf)
 {
-	int val,minval,maxval;
-	int ch,ret;
-	const char *nv;
-	unsigned int nl;
-	int negfl;
-
-	/* Trim leading / trailing whitespace */
-	while (count) {
-		ch = buf[0];
-		if ((ch > 32) && (ch < 127)) break;
-		buf++;
-		count--;
-	}
-	while (count) {
-		ch = buf[count-1];
-		if ((ch > 32) && (ch < 127)) break;
-		count--;
-	}
-
-	/* Is this an enum?  Look for a string value */
-	minval = pvr2_hdw_get_ctl_min_value(sfp->channel.hdw,id);
-	maxval = pvr2_hdw_get_ctl_max_value(sfp->channel.hdw,id);
-	for (val = minval; val <= maxval; val++) {
-		nv = pvr2_hdw_get_ctl_value_name(sfp->channel.hdw,id,val);
-		if ((!nv) && (val == minval)) break; /* Not an enum */
-		pvr2_sysfs_trace("pvr2_sysfs(%p) trying ctl_id %d val %d",
-				 sfp,id,val);
-		if (!nv) {
-			pvr2_sysfs_trace("pvr2_sysfs(%p) no pointer",sfp);
-			continue;
-		}
-		nl = strlen(nv);
-		if (nl != count) {
-			pvr2_sysfs_trace("pvr2_sysfs(%p) count mismatch"
-					 " %d != %d",
-					 sfp,count,nl);
-			continue;
-		}
-		if (memcmp(buf,nv,nl)) {
-			pvr2_sysfs_trace(
-				"pvr2_sysfs(%p) name mismatch"
-				" >>%.*s<< != >>%.*s<<",
-				sfp,nl,buf,nl,nv);
-			continue;
-		}
-		pvr2_sysfs_trace("pvr2_sysfs(%p) store_val_any(cid=%d)"
-				 " is enum %s",
-				 sfp,id,nv);
-		ret = pvr2_hdw_set_ctl_value(sfp->channel.hdw,id,val);
-		pvr2_hdw_commit_ctl(sfp->channel.hdw);
-		return 0;
-	}
-	if (val > minval) {
-		pvr2_sysfs_trace(
-			"pvr2_sysfs(%p) store_val_any(cid=%d)"
-			" unmatched enum >>%.*s<<",
-			sfp,id,count,buf);
-	}
+	struct pvr2_ctrl *cptr;
+	struct pvr2_sysfs *sfp;
+	int valid_bits,msk;
+	unsigned int bcnt,ccnt;
 
-	/* Try to parse as a number */
-	negfl = 0;
-	val = 0;
-	if (count) {
-		if (buf[0] == '-') {
-			negfl = !0;
-			buf++;
-			count--;
-		} else if (buf[0] == '+') {
-			buf++;
-			count--;
-		}
-	}
-	while (count) {
-		ch = buf[0];
-		if ((ch < '0') || (ch > '9')) break;
-		val = val * 10;
-		val += (ch - '0');
-		buf++;
-		count--;
-	}
-	if (!count) {
-		if (negfl) val = -val;
-		pvr2_sysfs_trace("pvr2_sysfs(%p) store_val_any(cid=%d)"
-				 " int is %d",
-				 sfp,id,val);
-
-		ret = pvr2_hdw_set_ctl_value(sfp->channel.hdw,id,val);
-		pvr2_hdw_commit_ctl(sfp->channel.hdw);
-		return ret;
+	sfp = (struct pvr2_sysfs *)class_dev->class_data;
+	if (!sfp) return -EINVAL;
+	cptr = pvr2_hdw_get_ctrl_by_index(sfp->channel.hdw,id);
+	if (!cptr) return -EINVAL;
+	valid_bits = pvr2_ctrl_get_mask(cptr);
+	bcnt = 0;
+	for (msk = 1; valid_bits; msk <<= 1) {
+		if (!(msk & valid_bits)) continue;
+		valid_bits &= ~msk;
+		pvr2_ctrl_get_valname(cptr,msk,buf+bcnt,PAGE_SIZE-bcnt,&ccnt);
+		bcnt += ccnt;
+		if (bcnt >= PAGE_SIZE) break;
+		buf[bcnt] = '\n';
+		bcnt++;
 	}
-
-	return -EINVAL;
+	pvr2_sysfs_trace("pvr2_sysfs(%p) show_bits(cid=%d)",sfp,id);
+	return bcnt;
 }
 
-static int store_val_multi(int id,struct pvr2_sysfs *sfp,
-			   const char *buf,unsigned int count)
+static int store_val_any(int id,int customfl,struct pvr2_sysfs *sfp,
+			 const char *buf,unsigned int count)
 {
-	unsigned int count2;
+	struct pvr2_ctrl *cptr;
 	int ret;
+	int mask,val;
 
-	while (count) {
-		count2 = 0;
-		while ((count2 < count) && (buf[count2] != '\n')) count2++;
-		ret = store_val_any(id,sfp,buf,count2);
-		if (ret < 0) return ret;
-		if (count2 < count) count2++;
-		buf += count2;
-		count -= count2;
+	cptr = pvr2_hdw_get_ctrl_by_index(sfp->channel.hdw,id);
+	if (customfl) {
+		ret = pvr2_ctrl_custom_sym_to_value(cptr,buf,count,&mask,&val);
+	} else {
+		ret = pvr2_ctrl_sym_to_value(cptr,buf,count,&mask,&val);
 	}
-	return 0;
+	if (ret < 0) return ret;
+	ret = pvr2_ctrl_set_mask_value(cptr,mask,val);
+	pvr2_hdw_commit_ctl(sfp->channel.hdw);
+	return ret;
 }
 
-static ssize_t store_val_int(int id,struct class_device *class_dev,
+static ssize_t store_val_norm(int id,struct class_device *class_dev,
 			     const char *buf,size_t count)
 {
 	struct pvr2_sysfs *sfp;
 	int ret;
 	sfp = (struct pvr2_sysfs *)class_dev->class_data;
-	ret = store_val_multi(id,sfp,buf,count);
+	ret = store_val_any(id,0,sfp,buf,count);
 	if (!ret) ret = count;
 	return ret;
 }
 
-static ssize_t store_val_enum(int id,struct class_device *class_dev,
-			      const char *buf,size_t count)
+static ssize_t store_val_custom(int id,struct class_device *class_dev,
+				const char *buf,size_t count)
 {
 	struct pvr2_sysfs *sfp;
 	int ret;
 	sfp = (struct pvr2_sysfs *)class_dev->class_data;
-	ret = store_val_multi(id,sfp,buf,count);
+	ret = store_val_any(id,1,sfp,buf,count);
 	if (!ret) ret = count;
 	return ret;
 }
@@ -357,57 +291,61 @@ static ssize_t sf_name##_##ctl_id(struct class_device *class_dev,const char *buf
 CREATE_SHOW_INSTANCE(show_name,ctl_id) \
 CREATE_SHOW_INSTANCE(show_min,ctl_id) \
 CREATE_SHOW_INSTANCE(show_max,ctl_id) \
-CREATE_SHOW_INSTANCE(show_val_int,ctl_id) \
-CREATE_SHOW_INSTANCE(show_val_enum,ctl_id) \
+CREATE_SHOW_INSTANCE(show_val_norm,ctl_id) \
+CREATE_SHOW_INSTANCE(show_val_custom,ctl_id) \
 CREATE_SHOW_INSTANCE(show_enum,ctl_id) \
-CREATE_STORE_INSTANCE(store_val_int,ctl_id) \
-CREATE_STORE_INSTANCE(store_val_enum,ctl_id)
+CREATE_SHOW_INSTANCE(show_bits,ctl_id) \
+CREATE_STORE_INSTANCE(store_val_norm,ctl_id) \
+CREATE_STORE_INSTANCE(store_val_custom,ctl_id) \
 
 CREATE_BATCH(0)
-	CREATE_BATCH(1)
-	CREATE_BATCH(2)
-	CREATE_BATCH(3)
-	CREATE_BATCH(4)
-	CREATE_BATCH(5)
-	CREATE_BATCH(6)
-	CREATE_BATCH(7)
-	CREATE_BATCH(8)
-	CREATE_BATCH(9)
-	CREATE_BATCH(10)
-	CREATE_BATCH(11)
-	CREATE_BATCH(12)
-	CREATE_BATCH(13)
-	CREATE_BATCH(14)
-	CREATE_BATCH(15)
-	CREATE_BATCH(16)
-	CREATE_BATCH(17)
-	CREATE_BATCH(18)
-	CREATE_BATCH(19)
-	CREATE_BATCH(20)
-	CREATE_BATCH(21)
-	CREATE_BATCH(22)
-	CREATE_BATCH(23)
-	CREATE_BATCH(24)
-	CREATE_BATCH(25)
-	CREATE_BATCH(26)
-	CREATE_BATCH(27)
-	CREATE_BATCH(28)
-	CREATE_BATCH(29)
-	CREATE_BATCH(30)
-	CREATE_BATCH(31)
-
-	struct pvr2_sysfs_func_set {
-		ssize_t (*show_name)(struct class_device *,char *);
-		ssize_t (*show_min)(struct class_device *,char *);
-		ssize_t (*show_max)(struct class_device *,char *);
-		ssize_t (*show_enum)(struct class_device *,char *);
-		ssize_t (*show_val_int)(struct class_device *,char *);
-		ssize_t (*show_val_enum)(struct class_device *,char *);
-		ssize_t (*store_val_int)(struct class_device *,
-					 const char *,size_t);
-		ssize_t (*store_val_enum)(struct class_device *,
-					  const char *,size_t);
-	};
+CREATE_BATCH(1)
+CREATE_BATCH(2)
+CREATE_BATCH(3)
+CREATE_BATCH(4)
+CREATE_BATCH(5)
+CREATE_BATCH(6)
+CREATE_BATCH(7)
+CREATE_BATCH(8)
+CREATE_BATCH(9)
+CREATE_BATCH(10)
+CREATE_BATCH(11)
+CREATE_BATCH(12)
+CREATE_BATCH(13)
+CREATE_BATCH(14)
+CREATE_BATCH(15)
+CREATE_BATCH(16)
+CREATE_BATCH(17)
+CREATE_BATCH(18)
+CREATE_BATCH(19)
+CREATE_BATCH(20)
+CREATE_BATCH(21)
+CREATE_BATCH(22)
+CREATE_BATCH(23)
+CREATE_BATCH(24)
+CREATE_BATCH(25)
+CREATE_BATCH(26)
+CREATE_BATCH(27)
+CREATE_BATCH(28)
+CREATE_BATCH(29)
+CREATE_BATCH(30)
+CREATE_BATCH(31)
+CREATE_BATCH(32)
+CREATE_BATCH(33)
+
+struct pvr2_sysfs_func_set {
+	ssize_t (*show_name)(struct class_device *,char *);
+	ssize_t (*show_min)(struct class_device *,char *);
+	ssize_t (*show_max)(struct class_device *,char *);
+	ssize_t (*show_enum)(struct class_device *,char *);
+	ssize_t (*show_bits)(struct class_device *,char *);
+	ssize_t (*show_val_norm)(struct class_device *,char *);
+	ssize_t (*store_val_norm)(struct class_device *,
+				  const char *,size_t);
+	ssize_t (*show_val_custom)(struct class_device *,char *);
+	ssize_t (*store_val_custom)(struct class_device *,
+				    const char *,size_t);
+};
 
 #define INIT_BATCH(ctl_id) \
 [ctl_id] = { \
@@ -415,10 +353,11 @@ CREATE_BATCH(0)
     .show_min = show_min_##ctl_id, \
     .show_max = show_max_##ctl_id, \
     .show_enum = show_enum_##ctl_id, \
-    .show_val_int = show_val_int_##ctl_id, \
-    .show_val_enum = show_val_enum_##ctl_id, \
-    .store_val_int = store_val_int_##ctl_id, \
-    .store_val_enum = store_val_enum_##ctl_id, \
+    .show_bits = show_bits_##ctl_id, \
+    .show_val_norm = show_val_norm_##ctl_id, \
+    .store_val_norm = store_val_norm_##ctl_id, \
+    .show_val_custom = show_val_custom_##ctl_id, \
+    .store_val_custom = store_val_custom_##ctl_id, \
 } \
 
 static struct pvr2_sysfs_func_set funcs[] = {
@@ -454,6 +393,8 @@ static struct pvr2_sysfs_func_set funcs[] = {
 	INIT_BATCH(29),
 	INIT_BATCH(30),
 	INIT_BATCH(31),
+	INIT_BATCH(32),
+	INIT_BATCH(33),
 };
 
 
@@ -461,19 +402,23 @@ static void pvr2_sysfs_add_control(struct pvr2_sysfs *sfp,int ctl_id)
 {
 	struct pvr2_sysfs_ctl_item *cip;
 	struct pvr2_sysfs_func_set *fp;
+	struct pvr2_ctrl *cptr;
+	unsigned int cnt,acnt;
 
 	if ((ctl_id < 0) || (ctl_id >= (sizeof(funcs)/sizeof(funcs[0])))) {
 		return;
 	}
 
 	fp = funcs + ctl_id;
+	cptr = pvr2_hdw_get_ctrl_by_index(sfp->channel.hdw,ctl_id);
+	if (!cptr) return;
 
 	cip = kmalloc(sizeof(*cip),GFP_KERNEL);
 	if (!cip) return;
 	memset(cip,0,sizeof(*cip));
 	pvr2_sysfs_trace("Creating pvr2_sysfs_ctl_item id=%p",cip);
 
-	cip->attr_id = ctl_id;
+	cip->cptr = cptr;
 
 	cip->chptr = sfp;
 	cip->item_next = 0;
@@ -503,38 +448,62 @@ static void pvr2_sysfs_add_control(struct pvr2_sysfs *sfp,int ctl_id)
 	cip->attr_val.attr.name = "cur_val";
 	cip->attr_val.attr.mode = S_IRUGO;
 
+	cip->attr_custom.attr.owner = THIS_MODULE;
+	cip->attr_custom.attr.name = "custom_val";
+	cip->attr_custom.attr.mode = S_IRUGO;
+
 	cip->attr_enum.attr.owner = THIS_MODULE;
 	cip->attr_enum.attr.name = "enum_val";
 	cip->attr_enum.attr.mode = S_IRUGO;
 	cip->attr_enum.show = fp->show_enum;
 
-	if (pvr2_hdw_get_ctl_rw(sfp->channel.hdw,ctl_id)) {
+	cip->attr_bits.attr.owner = THIS_MODULE;
+	cip->attr_bits.attr.name = "bit_val";
+	cip->attr_bits.attr.mode = S_IRUGO;
+	cip->attr_bits.show = fp->show_bits;
+
+	if (pvr2_ctrl_is_writable(cptr)) {
 		cip->attr_val.attr.mode |= S_IWUSR|S_IWGRP;
+		cip->attr_custom.attr.mode |= S_IWUSR|S_IWGRP;
 	}
 
-	cip->attr_gen[0] = &cip->attr_name.attr;
-	cip->attr_gen[1] = &cip->attr_val.attr;
-	if (pvr2_hdw_get_ctl_value_name(
-		    sfp->channel.hdw,ctl_id,
-		    pvr2_hdw_get_ctl_min_value(sfp->channel.hdw,ctl_id))) {
+	acnt = 0;
+	cip->attr_gen[acnt++] = &cip->attr_name.attr;
+	cip->attr_gen[acnt++] = &cip->attr_val.attr;
+	cip->attr_val.show = fp->show_val_norm;
+	cip->attr_val.store = fp->store_val_norm;
+	if (pvr2_ctrl_has_custom_symbols(cptr)) {
+		cip->attr_gen[acnt++] = &cip->attr_custom.attr;
+		cip->attr_custom.show = fp->show_val_custom;
+		cip->attr_custom.store = fp->store_val_custom;
+	}
+	switch (pvr2_ctrl_get_type(cptr)) {
+	case pvr2_ctl_enum:
 		// Control is an enumeration
-		cip->attr_gen[2] = &cip->attr_enum.attr;
-		cip->attr_val.show = fp->show_val_enum;
-		cip->attr_val.store = fp->store_val_enum;
-	} else {
+		cip->attr_gen[acnt++] = &cip->attr_enum.attr;
+		break;
+	case pvr2_ctl_int:
 		// Control is an integer
-		cip->attr_val.show = fp->show_val_int;
-		cip->attr_val.store = fp->store_val_int;
-		cip->attr_gen[2] = &cip->attr_min.attr;
-		cip->attr_gen[3] = &cip->attr_max.attr;
+		cip->attr_gen[acnt++] = &cip->attr_min.attr;
+		cip->attr_gen[acnt++] = &cip->attr_max.attr;
+		break;
+	case pvr2_ctl_bitmask:
+		// Control is an bitmask
+		cip->attr_gen[acnt++] = &cip->attr_bits.attr;
+		break;
+	default: break;
 	}
 
-	cip->grp.name = item_names[ctl_id];
+	cnt = scnprintf(cip->name,sizeof(cip->name)-1,"ctl_%s",
+			pvr2_ctrl_get_name(cptr));
+	cip->name[cnt] = 0;
+	cip->grp.name = cip->name;
 	cip->grp.attrs = cip->attr_gen;
 
 	sysfs_create_group(&sfp->class_dev->kobj,&cip->grp);
 }
 
+#ifdef CONFIG_VIDEO_PVRUSB2_DEBUGIFC
 static ssize_t debuginfo_show(struct class_device *,char *);
 static ssize_t debugcmd_show(struct class_device *,char *);
 static ssize_t debugcmd_store(struct class_device *,const char *,size_t count);
@@ -569,16 +538,15 @@ static void pvr2_sysfs_tear_down_debugifc(struct pvr2_sysfs *sfp)
 	kfree(sfp->debugifc);
 	sfp->debugifc = 0;
 }
+#endif /* CONFIG_VIDEO_PVRUSB2_DEBUGIFC */
 
 
 static void pvr2_sysfs_add_controls(struct pvr2_sysfs *sfp)
 {
-	unsigned int ctl_id;
-
-	for (ctl_id = 0;
-	     ctl_id < (sizeof(item_names)/sizeof(item_names[0])); ctl_id++) {
-		if (!item_names[ctl_id]) continue;
-		pvr2_sysfs_add_control(sfp,ctl_id);
+	unsigned int idx,cnt;
+	cnt = pvr2_hdw_get_ctrl_count(sfp->channel.hdw);
+	for (idx = 0; idx < cnt; idx++) {
+		pvr2_sysfs_add_control(sfp,idx);
 	}
 }
 
@@ -614,7 +582,9 @@ static void pvr2_sysfs_release(struct class_device *class_dev)
 static void class_dev_destroy(struct pvr2_sysfs *sfp)
 {
 	if (!sfp->class_dev) return;
+#ifdef CONFIG_VIDEO_PVRUSB2_DEBUGIFC
 	pvr2_sysfs_tear_down_debugifc(sfp);
+#endif /* CONFIG_VIDEO_PVRUSB2_DEBUGIFC */
 	pvr2_sysfs_tear_down_controls(sfp);
 	class_device_remove_file(sfp->class_dev,&sfp->attr_v4l_minor_number);
 	class_device_remove_file(sfp->class_dev,&sfp->attr_unit_number);
@@ -690,7 +660,9 @@ static void class_dev_create(struct pvr2_sysfs *sfp,
 	class_device_create_file(sfp->class_dev,&sfp->attr_unit_number);
 
 	pvr2_sysfs_add_controls(sfp);
+#ifdef CONFIG_VIDEO_PVRUSB2_DEBUGIFC
 	pvr2_sysfs_add_debugifc(sfp);
+#endif /* CONFIG_VIDEO_PVRUSB2_DEBUGIFC */
 }
 
 
@@ -761,6 +733,7 @@ void pvr2_sysfs_class_destroy(struct pvr2_sysfs_class *clp)
 }
 
 
+#ifdef CONFIG_VIDEO_PVRUSB2_DEBUGIFC
 static ssize_t debuginfo_show(struct class_device *class_dev,char *buf)
 {
 	struct pvr2_sysfs *sfp;
@@ -793,6 +766,7 @@ static ssize_t debugcmd_store(struct class_device *class_dev,
 	if (ret < 0) return ret;
 	return count;
 }
+#endif /* CONFIG_VIDEO_PVRUSB2_DEBUGIFC */
 
 
 /*