|
@@ -1,4 +1,4 @@
|
|
|
-From 0eec025cb7b92013244f93c750c94359356be834 Mon Sep 17 00:00:00 2001
|
|
|
+From cf11dbf84aaeda0e046bcd504f1cccfd66af0ab7 Mon Sep 17 00:00:00 2001
|
|
|
From: Maximilian Luz <luzmaximilian@gmail.com>
|
|
|
Date: Mon, 17 Aug 2020 01:23:20 +0200
|
|
|
Subject: [PATCH 4/6] surface-sam
|
|
@@ -5641,7 +5641,7 @@ index 000000000000..d667f605b74d
|
|
|
+MODULE_LICENSE("GPL");
|
|
|
diff --git a/drivers/misc/surface_aggregator/clients/surface_hid.c b/drivers/misc/surface_aggregator/clients/surface_hid.c
|
|
|
new file mode 100644
|
|
|
-index 000000000000..0dfc22568c66
|
|
|
+index 000000000000..f605e983398d
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/surface_aggregator/clients/surface_hid.c
|
|
|
@@ -0,0 +1,554 @@
|
|
@@ -5664,8 +5664,8 @@ index 000000000000..0dfc22568c66
|
|
|
+#include <linux/types.h>
|
|
|
+#include <linux/usb/ch9.h>
|
|
|
+
|
|
|
-+#include <include/linux/surface_aggregator/controller.h>
|
|
|
-+#include <include/linux/surface_aggregator/device.h>
|
|
|
++#include <linux/surface_aggregator/controller.h>
|
|
|
++#include <linux/surface_aggregator/device.h>
|
|
|
+
|
|
|
+#define SHID_RETRY 3
|
|
|
+#define shid_retry(fn, args...) ssam_retry(fn, SHID_RETRY, args)
|
|
@@ -7492,7 +7492,7 @@ index 000000000000..f18cc17d019d
|
|
|
+MODULE_LICENSE("GPL");
|
|
|
diff --git a/drivers/misc/surface_aggregator/clients/surface_keyboard.c b/drivers/misc/surface_aggregator/clients/surface_keyboard.c
|
|
|
new file mode 100644
|
|
|
-index 000000000000..df3664e0341c
|
|
|
+index 000000000000..11f14eaf51c4
|
|
|
--- /dev/null
|
|
|
+++ b/drivers/misc/surface_aggregator/clients/surface_keyboard.c
|
|
|
@@ -0,0 +1,601 @@
|
|
@@ -7516,8 +7516,8 @@ index 000000000000..df3664e0341c
|
|
|
+#include <linux/types.h>
|
|
|
+#include <linux/usb/ch9.h>
|
|
|
+
|
|
|
-+#include <include/linux/surface_aggregator/controller.h>
|
|
|
-+#include <include/linux/surface_aggregator/device.h>
|
|
|
++#include <linux/surface_aggregator/controller.h>
|
|
|
++#include <linux/surface_aggregator/device.h>
|
|
|
+
|
|
|
+#define SHID_RETRY 3
|
|
|
+#define shid_retry(fn, args...) ssam_retry(fn, SHID_RETRY, args)
|