diff mbox

HID: hid-debug: Show rdesc for unclaimed devices

Message ID 1345573364-341-1-git-send-email-rydberg@euromail.se (mailing list archive)
State New, archived
Delegated to: Jiri Kosina
Headers show

Commit Message

Henrik Rydberg Aug. 21, 2012, 6:22 p.m. UTC
Since commit a7197c2e, the raw report descriptor is available also for
unclaimed devices. This patchs make it show in the rdesc debugfs node.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
---
 drivers/hid/hid-debug.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Comments

Jiri Kosina Aug. 27, 2012, 3:07 p.m. UTC | #1
On Tue, 21 Aug 2012, Henrik Rydberg wrote:

> Since commit a7197c2e, the raw report descriptor is available also for
> unclaimed devices. This patchs make it show in the rdesc debugfs node.

Definitely nice to have. Applied, thanks Henrik.

> 
> Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
> ---
>  drivers/hid/hid-debug.c | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
> index 01dd9a7..933fff0 100644
> --- a/drivers/hid/hid-debug.c
> +++ b/drivers/hid/hid-debug.c
> @@ -911,15 +911,21 @@ static void hid_dump_input_mapping(struct hid_device *hid, struct seq_file *f)
>  
>  }
>  
> -
>  static int hid_debug_rdesc_show(struct seq_file *f, void *p)
>  {
>  	struct hid_device *hdev = f->private;
> +	const __u8 *rdesc = hdev->rdesc;
> +	unsigned rsize = hdev->rsize;
>  	int i;
>  
> +	if (!rdesc) {
> +		rdesc = hdev->dev_rdesc;
> +		rsize = hdev->dev_rsize;
> +	}
> +
>  	/* dump HID report descriptor */
> -	for (i = 0; i < hdev->rsize; i++)
> -		seq_printf(f, "%02x ", hdev->rdesc[i]);
> +	for (i = 0; i < rsize; i++)
> +		seq_printf(f, "%02x ", rdesc[i]);
>  	seq_printf(f, "\n\n");
>  
>  	/* dump parsed data and input mappings */
> -- 
> 1.7.11.5
>
diff mbox

Patch

diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
index 01dd9a7..933fff0 100644
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -911,15 +911,21 @@  static void hid_dump_input_mapping(struct hid_device *hid, struct seq_file *f)
 
 }
 
-
 static int hid_debug_rdesc_show(struct seq_file *f, void *p)
 {
 	struct hid_device *hdev = f->private;
+	const __u8 *rdesc = hdev->rdesc;
+	unsigned rsize = hdev->rsize;
 	int i;
 
+	if (!rdesc) {
+		rdesc = hdev->dev_rdesc;
+		rsize = hdev->dev_rsize;
+	}
+
 	/* dump HID report descriptor */
-	for (i = 0; i < hdev->rsize; i++)
-		seq_printf(f, "%02x ", hdev->rdesc[i]);
+	for (i = 0; i < rsize; i++)
+		seq_printf(f, "%02x ", rdesc[i]);
 	seq_printf(f, "\n\n");
 
 	/* dump parsed data and input mappings */