The datafiles already use them, might as well have the code for them Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> --- libwacom/libwacom-database.c | 4 ++++ libwacom/libwacom.c | 2 ++ libwacom/libwacom.h | 2 ++ 3 files changed, 8 insertions(+)
diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c index 652a94e..8351e06 100644 --- a/libwacom/libwacom-database.c +++ b/libwacom/libwacom-database.c @@ -60,6 +60,10 @@ libwacom_class_string_to_enum(const char *class) return WCLASS_BAMBOO; if (strcmp(class, "Graphire") == 0) return WCLASS_GRAPHIRE; + if (strcmp(class, "Intuos") == 0) + return WCLASS_INTUOS; + if (strcmp(class, "Intuos2") == 0) + return WCLASS_INTUOS2; return WCLASS_UNKNOWN; } diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c index 1c019b5..432d6e6 100644 --- a/libwacom/libwacom.c +++ b/libwacom/libwacom.c @@ -524,6 +524,8 @@ libwacom_print_device_description(int fd, WacomDevice *device) case WCLASS_BAMBOO: class_name = "Bamboo"; break; case WCLASS_GRAPHIRE: class_name = "Graphire";break; case WCLASS_ISDV4: class_name = "ISDV4"; break; + case WCLASS_INTUOS: class_name = "Intuos"; break; + case WCLASS_INTUOS2: class_name = "Intuos2"; break; default: g_assert_not_reached(); break; } diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h index 1efcf7d..b397865 100644 --- a/libwacom/libwacom.h +++ b/libwacom/libwacom.h @@ -126,6 +126,8 @@ typedef enum { WCLASS_BAMBOO, /**< Any Bamboo device */ WCLASS_GRAPHIRE, /**< Any Graphire device */ WCLASS_ISDV4, /**< Any serial ISDV4 device */ + WCLASS_INTUOS, /**< Any Intuos series */ + WCLASS_INTUOS2, /**< Any Intuos2 series */ } WacomClass; /** -- 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