2014-05-24 18:53:57

by Szymon Janc

Subject: [PATCH 1/2] input: Update uhid_copy.h to version from Linux 3.14

---
profiles/input/uhid_copy.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/profiles/input/uhid_copy.h b/profiles/input/uhid_copy.h
index 381b062..23a6287 100644
--- a/profiles/input/uhid_copy.h
+++ b/profiles/input/uhid_copy.h
@@ -30,7 +30,7 @@ enum uhid_event_type {
UHID_OPEN,
UHID_CLOSE,
UHID_OUTPUT,
- UHID_OUTPUT_EV,
+ UHID_OUTPUT_EV, /* obsolete! */
UHID_INPUT,
UHID_FEATURE,
UHID_FEATURE_ANSWER,
@@ -69,6 +69,8 @@ struct uhid_output_req {
__u8 rtype;
} __attribute__((__packed__));

+/* Obsolete! Newer kernels will no longer send these events but instead convert
+ * it into raw output reports via UHID_OUTPUT. */
struct uhid_output_ev_req {
__u16 type;
__u16 code;
@@ -86,7 +88,7 @@ struct uhid_feature_answer_req {
__u16 err;
__u16 size;
__u8 data[UHID_DATA_MAX];
-};
+} __attribute__((__packed__));

struct uhid_event {
__u32 type;
--
2.0.0.rc4

2014-05-25 16:01:12

by Luiz Augusto von Dentz

Subject: Re: [PATCH 2/2] shared/uhid: Use uhid_copy.h instead of system header

Hi Szymon,

On Sat, May 24, 2014 at 9:53 PM, Szymon Janc <[email protected]> wrote:
> ---
> src/shared/uhid.h | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/shared/uhid.h b/src/shared/uhid.h
> index fcf5379..459a249 100644
> --- a/src/shared/uhid.h
> +++ b/src/shared/uhid.h
> @@ -23,7 +23,8 @@
>
> #include <stdbool.h>
> #include <stdint.h>
> -#include <linux/uhid.h>
> +
> +#include "profiles/input/uhid_copy.h"
>
> struct bt_uhid;
>
> --
> 2.0.0.rc4

Maybe we should move uhid_copy to shared or just merge it in uhid.h,
anyway no code should be using uhid_copy alone now that we bt_uhid in
place.


--
Luiz Augusto von Dentz

2014-05-25 10:01:00

by Johan Hedberg

Subject: Re: [PATCH 1/2] input: Update uhid_copy.h to version from Linux 3.14

Hi Szymon,

On Sat, May 24, 2014, Szymon Janc wrote:
> ---
> profiles/input/uhid_copy.h | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)

Both patches have been applied. Thanks.

Johan

2014-05-24 18:53:58

by Szymon Janc

Subject: [PATCH 2/2] shared/uhid: Use uhid_copy.h instead of system header

---
src/shared/uhid.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/shared/uhid.h b/src/shared/uhid.h
index fcf5379..459a249 100644
--- a/src/shared/uhid.h
+++ b/src/shared/uhid.h
@@ -23,7 +23,8 @@

#include <stdbool.h>
#include <stdint.h>
-#include <linux/uhid.h>
+
+#include "profiles/input/uhid_copy.h"

struct bt_uhid;

--
2.0.0.rc4