2012-08-21 18:18:12

by Henrik Rydberg

Subject: [PATCH] HID: hid-debug: Show rdesc for unclaimed devices

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 <[email protected]>
---
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

2012-08-27 15:08:07

by Jiri Kosina

Subject: Re: [PATCH] HID: hid-debug: Show rdesc for unclaimed devices

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 <[email protected]>
> ---
> 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
>

--
Jiri Kosina
SUSE Labs