The E6 is so far found only in the x220t, size measured and rounded to the
nearest inch.

The other tablets may be of varying size.

Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
Reviewed-by: Bastien Nocera <had...@hadess.net>
---
Squashed the two together and updated the class for all serial tablet. The
E6 so far has a fixed size, if it starts showing up in other devices with
different sizes we may have to remove this. The others lose their size
information, the test has been updated to this condition:

/* ISDv4 are built-in, they may be of varying size */
if (libwacom_get_class(device) != WCLASS_ISDV4) {
        assert(libwacom_get_width(device) > 0);
        assert(libwacom_get_height(device) > 0);
}


Bastien: left your rev-by in, no significant changes.

 data/isdv4-e3.tablet       |    1 +
 data/isdv4-e6.tablet       |    3 +++
 data/serial-wacf004.tablet |    1 +
 3 files changed, 5 insertions(+)

diff --git a/data/isdv4-e3.tablet b/data/isdv4-e3.tablet
index a676f35..6e68cb4 100644
--- a/data/isdv4-e3.tablet
+++ b/data/isdv4-e3.tablet
@@ -3,6 +3,7 @@
 [Device]
 Name=Wacom ISDv4 E3
 DeviceMatch=usb:056a:00e3;serial:056a:00e3
+Class=ISDV4
 
 [Features]
 Stylus=true
diff --git a/data/isdv4-e6.tablet b/data/isdv4-e6.tablet
index 579831b..328a702 100644
--- a/data/isdv4-e6.tablet
+++ b/data/isdv4-e6.tablet
@@ -3,6 +3,9 @@
 [Device]
 Name=Wacom ISDv4 E6
 DeviceMatch=usb:056a:00e6
+Class=ISDV4
+Width=11
+Height=6
 
 [Features]
 Stylus=true
diff --git a/data/serial-wacf004.tablet b/data/serial-wacf004.tablet
index 3d2f0e3..d1ba472 100644
--- a/data/serial-wacf004.tablet
+++ b/data/serial-wacf004.tablet
@@ -1,6 +1,7 @@
 [Device]
 Name=Wacom Serial Tablet WACf004
 DeviceMatch=serial:0000:0000
+Class=ISDV4
 
 [Features]
 Stylus=true
-- 
1.7.10


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel

Reply via email to