[Linuxwacom-devel] [PATCH input-wacom 1/3] Enable support for ISDv4 0x5013

[Jason Gerecke]

Commit 5ecf18a introduced the definitions necessary for the 0x5013 device
to work with pre-3.17 kernels, but forgot to then also add the device to
the wacom_ids table (which would have prevented the devices from ever
actually being probed by the kernel).

Signed-off-by: Jason Gerecke <***@wacom.com>
---
2.6.30/wacom_wac.c | 1 +
2.6.38/wacom_wac.c | 1 +
3.7/wacom_wac.c | 1 +
3 files changed, 3 insertions(+)

diff --git a/2.6.30/wacom_wac.c b/2.6.30/wacom_wac.c
index 69d90ed..17dca90 100644
--- a/2.6.30/wacom_wac.c
+++ b/2.6.30/wacom_wac.c
@@ -2301,6 +2301,7 @@ const struct usb_device_id wacom_ids[] = {
{ USB_DEVICE_WACOM(0x5000) },
{ USB_DEVICE_WACOM(0x5002) },
{ USB_DEVICE_WACOM(0x5010) },
+ { USB_DEVICE_WACOM(0x5013) },
{ USB_DEVICE_WACOM(0x300) },
{ USB_DEVICE_WACOM(0x301) },
{ USB_DEVICE_DETAILED(0x302, USB_CLASS_HID, 0, 0) },
diff --git a/2.6.38/wacom_wac.c b/2.6.38/wacom_wac.c
index cca9393..91bf137 100644
--- a/2.6.38/wacom_wac.c
+++ b/2.6.38/wacom_wac.c
@@ -2845,6 +2845,7 @@ const struct usb_device_id wacom_ids[] = {
{ USB_DEVICE_WACOM(0x5000) },
{ USB_DEVICE_WACOM(0x5002) },
{ USB_DEVICE_WACOM(0x5010) },
+ { USB_DEVICE_WACOM(0x5013) },
{ USB_DEVICE_WACOM(0x47) },
{ USB_DEVICE_WACOM(0xF4) },
{ USB_DEVICE_WACOM(0xF8) },
diff --git a/3.7/wacom_wac.c b/3.7/wacom_wac.c
index 3669516..3aac8ea 100644
--- a/3.7/wacom_wac.c
+++ b/3.7/wacom_wac.c
@@ -2804,6 +2804,7 @@ const struct usb_device_id wacom_ids[] = {
{ USB_DEVICE_WACOM(0x5000) },
{ USB_DEVICE_WACOM(0x5002) },
{ USB_DEVICE_WACOM(0x5010) },
+ { USB_DEVICE_WACOM(0x5013) },
{ USB_DEVICE_WACOM(0x47) },
{ USB_DEVICE_WACOM(0xF4) },
{ USB_DEVICE_WACOM(0xF8) },

[Jason Gerecke]

At the moment, Travis-CI only considers a build as failing if there is
a compile issue. While this should obviously never happen in committed
code, less well-tested directories *cough*2.6.36*cough* occasionally broke.
This commit further strengthens the requirements, failing the build if
any warnings are present. The driver has built without warnings (sans
two specifically excluded false-positives, and three recently-noticed
true positives) for quite some time, so enabling this shouldn't actually
be too annoying.

In order to prevent the occasional warning generated within the kernel
headers themselves from breaking the build, we forcefully use "-isystem"
for key paths that are included by Kbuild as plain "-I".

Signed-off-by: Jason Gerecke <***@wacom.com>
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 17412aa..196b7c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,4 +30,4 @@ install:
- make -C ${KERNELDIR}/${KERNEL} defconfig prepare modules_prepare

script:
- - ./autogen.sh --with-kernel=${KERNELDIR}/${KERNEL} && make
+ - ./autogen.sh --with-kernel=${KERNELDIR}/${KERNEL} && make EXTRA_CFLAGS="-Werror -Wno-type-limits -Wno-unused-function -isystem ${KERNELDIR}/${KERNEL}/arch/x86/include -isystem ${KERNELDIR}/${KERNEL}/arch/x86/include/uapi -isystem ${KERNELDIR}/${KERNEL}/include/linux"

[Jason Gerecke]

This commit allows users or scripts to define the EXTRA_CFLAGS variable
when running 'make' to change the options used while compiling the module.
For instance, it could be used as follows to temporarily treat warnings
as errors:

$ ./autogen.sh
$ make EXTRA_CFLAGS="-Werror"

Signed-off-by: Jason Gerecke <***@wacom.com>
---
2.6.30/Makefile.in | 2 +-
2.6.36/Makefile.in | 2 +-
2.6.38/Makefile.in | 2 +-
3.17/Makefile.in | 2 +-
3.7/Makefile.in | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/2.6.30/Makefile.in b/2.6.30/Makefile.in
index e2e7727..38876be 100644
--- a/2.6.30/Makefile.in
+++ b/2.6.30/Makefile.in
@@ -6,7 +6,7 @@ ifneq ($(KERNELRELEASE),)

ifneq ($(CONFIG_USB_WACOM),y)
WCM_VERSION := $(shell cd $(KBUILD_EXTMOD)/.. && ./git-version-gen)
-ccflags-y := -DWACOM_VERSION_SUFFIX=\"-$(WCM_VERSION)\" -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers
+ccflags-y := -DWACOM_VERSION_SUFFIX=\"-$(WCM_VERSION)\" -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers $(EXTRA_CFLAGS)
wacom-objs := wacom_wac.o wacom_sys.o
obj-m += wacom.o
obj-m += wacom_w8001.o
diff --git a/2.6.36/Makefile.in b/2.6.36/Makefile.in
index e2e7727..38876be 100644
--- a/2.6.36/Makefile.in
+++ b/2.6.36/Makefile.in
@@ -6,7 +6,7 @@ ifneq ($(KERNELRELEASE),)

ifneq ($(CONFIG_USB_WACOM),y)
WCM_VERSION := $(shell cd $(KBUILD_EXTMOD)/.. && ./git-version-gen)
-ccflags-y := -DWACOM_VERSION_SUFFIX=\"-$(WCM_VERSION)\" -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers
+ccflags-y := -DWACOM_VERSION_SUFFIX=\"-$(WCM_VERSION)\" -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers $(EXTRA_CFLAGS)
wacom-objs := wacom_wac.o wacom_sys.o
obj-m += wacom.o
obj-m += wacom_w8001.o
diff --git a/2.6.38/Makefile.in b/2.6.38/Makefile.in
index 1e5978c..da131dc 100644
--- a/2.6.38/Makefile.in
+++ b/2.6.38/Makefile.in
@@ -6,7 +6,7 @@ ifneq ($(KERNELRELEASE),)

ifneq ($(CONFIG_USB_WACOM),y)
WCM_VERSION := $(shell cd $(KBUILD_EXTMOD)/.. && ./git-version-gen)
-ccflags-y := -DWACOM_VERSION_SUFFIX=\"-$(WCM_VERSION)\" -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers
+ccflags-y := -DWACOM_VERSION_SUFFIX=\"-$(WCM_VERSION)\" -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers $(EXTRA_CFLAGS)
wacom-objs := wacom_wac.o wacom_sys.o
obj-m += wacom.o
obj-m += wacom_w8001.o
diff --git a/3.17/Makefile.in b/3.17/Makefile.in
index 55c49ca..4359f25 100644
--- a/3.17/Makefile.in
+++ b/3.17/Makefile.in
@@ -6,7 +6,7 @@ ifneq ($(KERNELRELEASE),)

ifneq ($(CONFIG_HID_WACOM),y)
WCM_VERSION := $(shell cd $(KBUILD_EXTMOD)/.. && ./git-version-gen)
-ccflags-y := -DWACOM_VERSION_SUFFIX=\"-$(WCM_VERSION)\" -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers
+ccflags-y := -DWACOM_VERSION_SUFFIX=\"-$(WCM_VERSION)\" -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers $(EXTRA_CFLAGS)
wacom-objs := wacom_wac.o wacom_sys.o
obj-m += wacom.o
obj-m += wacom_w8001.o
diff --git a/3.7/Makefile.in b/3.7/Makefile.in
index 7d6db95..900cd11 100644
--- a/3.7/Makefile.in
+++ b/3.7/Makefile.in
@@ -6,7 +6,7 @@ ifneq ($(KERNELRELEASE),)

ifneq ($(CONFIG_USB_WACOM),y)
WCM_VERSION := $(shell cd $(KBUILD_EXTMOD)/.. && ./git-version-gen)
-ccflags-y := -DWACOM_VERSION_SUFFIX=\"-$(WCM_VERSION)\" -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers
+ccflags-y := -DWACOM_VERSION_SUFFIX=\"-$(WCM_VERSION)\" -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers $(EXTRA_CFLAGS)
wacom-objs := wacom_wac.o wacom_sys.o
obj-m += wacom.o
obj-m += wacom_w8001.o