summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Hughes <richard@hughsie.com>2014-06-06 19:41:41 +0100
committerRichard Hughes <richard@hughsie.com>2014-06-09 09:38:04 +0100
commit7553651b1d13672d6b166c6b4255e02206adc2bc (patch)
treee5f44af555048c4d3454cfa9da563bf724ce0a0a
parentef892039c8bea1b8d1827f1adbc3e09beb003b22 (diff)
downloadcolord-7553651b1d13672d6b166c6b4255e02206adc2bc.tar.gz
colorhug: Add references to the ColorHug2 device
-rw-r--r--lib/colorhug/ch-common.c3
-rw-r--r--lib/colorhug/ch-common.h2
-rw-r--r--lib/colorhug/ch-device.c3
3 files changed, 8 insertions, 0 deletions
diff --git a/lib/colorhug/ch-common.c b/lib/colorhug/ch-common.c
index 9553739..f2e239b 100644
--- a/lib/colorhug/ch-common.c
+++ b/lib/colorhug/ch-common.c
@@ -390,6 +390,9 @@ ch_device_mode_to_string (ChDeviceMode device_mode)
case CH_DEVICE_MODE_FIRMWARE_PLUS:
str = "firmware-plus";
break;
+ case CH_DEVICE_MODE_FIRMWARE2:
+ str = "firmware2";
+ break;
default:
str = "unknown";
break;
diff --git a/lib/colorhug/ch-common.h b/lib/colorhug/ch-common.h
index dc7a85d..d8327db 100644
--- a/lib/colorhug/ch-common.h
+++ b/lib/colorhug/ch-common.h
@@ -35,6 +35,7 @@ G_BEGIN_DECLS
#define CH_USB_VID 0x273f
#define CH_USB_PID_BOOTLOADER 0x1000
#define CH_USB_PID_FIRMWARE 0x1001
+#define CH_USB_PID_FIRMWARE2 0x1004
#define CH_USB_PID_FIRMWARE_PLUS 0x1002
#define CH_USB_PID_BOOTLOADER_PLUS 0x1003
#define CH_USB_CONFIG 0x0001
@@ -1033,6 +1034,7 @@ typedef enum {
CH_DEVICE_MODE_FIRMWARE,
CH_DEVICE_MODE_BOOTLOADER_PLUS,
CH_DEVICE_MODE_FIRMWARE_PLUS,
+ CH_DEVICE_MODE_FIRMWARE2, /* since 1.2.2 */
CH_DEVICE_MODE_LAST
} ChDeviceMode;
diff --git a/lib/colorhug/ch-device.c b/lib/colorhug/ch-device.c
index 6f18446..fbee137 100644
--- a/lib/colorhug/ch-device.c
+++ b/lib/colorhug/ch-device.c
@@ -112,6 +112,9 @@ ch_device_get_mode (GUsbDevice *device)
case CH_USB_PID_FIRMWARE:
state = CH_DEVICE_MODE_FIRMWARE;
break;
+ case CH_USB_PID_FIRMWARE2:
+ state = CH_DEVICE_MODE_FIRMWARE2;
+ break;
case CH_USB_PID_FIRMWARE_PLUS:
state = CH_DEVICE_MODE_FIRMWARE_PLUS;
break;