state from 2014-09-07 13:30 MESZ

10 files changed, 387 insertions, 362 deletions

diff --git a/usb/55-Argyll.rules b/usb/55-Argyll.rules
index 9e083dc..5fef930 100644
--- a/usb/55-Argyll.rules
+++ b/usb/55-Argyll.rules
@@ -77,14 +77,14 @@ ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="f8da", ENV{COLOR_MEASUREMENT_DEVICE}
 ATTRS{idVendor}=="273f", ATTRS{idProduct}=="1001", ENV{COLOR_MEASUREMENT_DEVICE}="1"
 
 
-# Let users access these devices
-ENV{COLOR_MEASUREMENT_DEVICE}=="*?", TAG+="uaccess"
+# Let udev-acl manage these devices, if it's available
+TEST=="/var/run/ConsoleKit/database", ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}="1"
 
 # Otherwise, restrict access to members of the plugdev group,
 # which the user may have to add to the system.
-ENV{COLOR_MEASUREMENT_DEVICE}=="*?", MODE="660", GROUP="plugdev"
+ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}!="*?", MODE="660", GROUP="plugdev"
 
 # Set ID_VENDOR and ID_MODEL acording to VID and PID
-IMPORT{builtin}="hwdb --subsystem=usb"
+TEST=="/lib/udev/usb-db", IMPORT{program}="usb-db %p"
 
 LABEL="argyll_rules_end"
diff --git a/usb/ArgyllCMS.cat b/usb/ArgyllCMS.cat
index d401490..4634140 100644
--- a/usb/ArgyllCMS.cat
+++ b/usb/ArgyllCMS.cat
diff --git a/usb/ArgyllCMS.inf b/usb/ArgyllCMS.inf
index 64f5eca..115d981 100644
--- a/usb/ArgyllCMS.inf
+++ b/usb/ArgyllCMS.inf
@@ -1,213 +1,213 @@
-;--------------------------------------------------------------------------
-; Copyright 2012 Graeme W. Gill.
-; 
-; Permission is hereby granted, free of charge, to any person obtaining a copy
-; of this file, to deal
-; in this file without restriction, including without limitation the rights
-; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-; copies of this file, and to permit persons to whom this file is
-; furnished to do so, subject to the following conditions:
-; 
-; The above copyright notice and this permission notice shall be included in
-; all copies or substantial portions of this file.
-; 
-; THIS FILE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-; OUT OF OR IN CONNECTION WITH THIS FILE OR THE USE OR OTHER DEALINGS IN
-; THIS FILE.
-;--------------------------------------------------------------------------
-
-; ==== Strings ====
-
-[Strings]
-
-DeviceGUID          = {247e32a0-32f9-11df-aacc-0002a5d5c51b}
-
-Date                = "01/17/2012"		; MM/DD/YYYY
-libusb0ver          = "1.2.6.0"
-
-Libusb_ClassName    = "Argyll LibUSB-win32 devices"
-Libusb_DiskName     = "LibUSB-win32 Device Install Disk"
-
-libusb0_SvcDesc     = "LibUSB-win32 libusb0 - Kernel Driver 2012/1/17, 1.2.6.0"
-
-; ==== Version ====
-
-[Version]
-Signature = "$Windows NT$"
-DriverVer = %Date%,%libusb0ver%
-Provider  = "ArgyllCMS"
-
-; (Note the ClassGuid must not be quoted or a string substitution to work on Win2K)
-Class               = %Libusb_ClassName%
-ClassGuid           = {817cffe0-328b-11df-9b9f-0002a5d5c51b}	; LibUSB-win32 ClassGUID
-CatalogFile         = "ArgyllCMS.cat"
-CatalogFile.NTAMD64 = "ArgyllCMS_x64.cat"
-
-[ClassInstall32]
-AddReg=class_install_add_reg
-
-[class_install_add_reg]
-HKR,,,,%Libusb_ClassName%
-HKR,,Icon,,"-20"	; -20 is for the USB icon
-
-; ==== Files Sources and Destinations ====
-
-[SourceDisksNames]
-1 = %Libusb_DiskName%
-
-[SourceDisksFiles]
-libusb0.sys = 1,\bin\x86,
-
-[SourceDisksFiles.amd64]
-libusb0.sys = 1,\bin\amd64,
-
-[DestinationDirs]
-libusb0_files_sys = 10,system32\drivers
-
-; ==== libusb0 Device driver ====
-
-[libusb0_files_sys]
-libusb0.sys,libusb0.sys
-
-; For each one of these, there must be one for Services !!!
-[LIBUSB0_DEV]
-CopyFiles = Libusb0_files_sys
-
-[LIBUSB0_DEV.HW]
-AddReg = libusb0_add_reg_hw
-
-[libusb0_add_reg]
-HKR,,DevLoader,,*ntkern
-HKR,,NTMPDriver,,libusb0.sys
-
-[libusb0_add_reg_hw]
-HKR,,DeviceInterfaceGUIDs,0x10000,%DeviceGUID%
-HKR,,SurpriseRemovalOK,0x00010001,1				; Device properties
-
-[LIBUSB0_DEV.Services]
-AddService = libusb0, 0x00000002, libusb0_add_service
-
-[libusb0_add_service]
-DisplayName    = %libusb0_SvcDesc%
-ServiceType    = 1
-StartType      = 3
-ErrorControl   = 0
-ServiceBinary  = %12%\libusb0.sys
-
-; ==== Manufacturers ====
-
-[Manufacturer]
-"HCFR Association"=HCFR_Devices,NTx86,NTamd64
-"Sequel Imaging"=Sequel_Devices,NTx86,NTamd64
-"X-Rite"=X_Rite_Devices,NTx86,NTamd64
-"ColorVision"=ColorVision_Devices,NTx86,NTamd64
-"Gretag Macbeth/X-Rite"=GM_X_Rite_Devices,NTx86,NTamd64
-"Hughski Ltd"=Hughski_Devices,NTx86,NTamd64
-
-; ==== Devices ====
-
-[HCFR_Devices]
-"Colorimtre HCFR V3.1 (Argyll)" = LIBUSB0_DEV, USB\VID_04DB&PID_005B
-"Colorimtre HCFR V4.0 (Argyll)" = LIBUSB0_DEV, USB\VID_04D8&PID_FE17
-
-[Sequel_Devices]
-"Eye-One Display 1 (Argyll)"    = LIBUSB0_DEV, USB\VID_0670&PID_0001
-
-[X_Rite_Devices]
-"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5001
-"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5010
-"Eye-One Display 3 (Argyll)"    = LIBUSB0_DEV, USB\VID_0765&PID_5020
-"ColorMunki Smile (Argyll)"     = LIBUSB0_DEV, USB\VID_0765&PID_6003
-"DTP20 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D020
-"DTP92Q (Argyll)"               = LIBUSB0_DEV, USB\VID_0765&PID_D092
-"DTP94 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D094
-
-[ColorVision_Devices]
-"Spyder1 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0100
-"Spyder2 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0200
-"Spyder3 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0300
-"Spyder4 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0400
-
-[GM_X_Rite_Devices]
-"Eye-One Pro (Argyll)"          = LIBUSB0_DEV, USB\VID_0971&PID_2000
-"Eye-One Monitor (Argyll)"      = LIBUSB0_DEV, USB\VID_0971&PID_2001
-"Eye-One Display 2 (Argyll)"    = LIBUSB0_DEV, USB\VID_0971&PID_2003
-"Huey (Argyll)"                 = LIBUSB0_DEV, USB\VID_0971&PID_2005
-"ColorMunki (Argyll)"           = LIBUSB0_DEV, USB\VID_0971&PID_2007
-
-[Hughski_Devices]
-"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_273F&PID_1001
-"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_04D8&PID_F8DA
-
-
-[HCFR_Devices.NTx86]
-"Colorimtre HCFR V3.1 (Argyll)" = LIBUSB0_DEV, USB\VID_04DB&PID_005B
-"Colorimtre HCFR V4.0 (Argyll)" = LIBUSB0_DEV, USB\VID_04D8&PID_FE17
-
-[Sequel_Devices.NTx86]
-"Eye-One Display 1 (Argyll)"    = LIBUSB0_DEV, USB\VID_0670&PID_0001
-
-[X_Rite_Devices.NTx86]
-"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5001
-"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5010
-"Eye-One Display 3 (Argyll)"    = LIBUSB0_DEV, USB\VID_0765&PID_5020
-"ColorMunki Smile (Argyll)"     = LIBUSB0_DEV, USB\VID_0765&PID_6003
-"DTP20 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D020
-"DTP92Q (Argyll)"               = LIBUSB0_DEV, USB\VID_0765&PID_D092
-"DTP94 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D094
-
-[ColorVision_Devices.NTx86]
-"Spyder1 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0100
-"Spyder2 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0200
-"Spyder3 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0300
-"Spyder4 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0400
-
-[GM_X_Rite_Devices.NTx86]
-"Eye-One Pro (Argyll)"          = LIBUSB0_DEV, USB\VID_0971&PID_2000
-"Eye-One Monitor (Argyll)"      = LIBUSB0_DEV, USB\VID_0971&PID_2001
-"Eye-One Display 2 (Argyll)"    = LIBUSB0_DEV, USB\VID_0971&PID_2003
-"Huey (Argyll)"                 = LIBUSB0_DEV, USB\VID_0971&PID_2005
-"ColorMunki (Argyll)"           = LIBUSB0_DEV, USB\VID_0971&PID_2007
-
-[Hughski_Devices.NTx86]
-"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_273F&PID_1001
-"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_04D8&PID_F8DA
-
-
-[HCFR_Devices.NTamd64]
-"Colorimtre HCFR V3.1 (Argyll)" = LIBUSB0_DEV, USB\VID_04DB&PID_005B
-"Colorimtre HCFR V4.0 (Argyll)" = LIBUSB0_DEV, USB\VID_04D8&PID_FE17
-
-[Sequel_Devices.NTamd64]
-"Eye-One Display 1 (Argyll)"    = LIBUSB0_DEV, USB\VID_0670&PID_0001
-
-[X_Rite_Devices.NTamd64]
-"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5001
-"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5010
-"Eye-One Display 3 (Argyll)"    = LIBUSB0_DEV, USB\VID_0765&PID_5020
-"ColorMunki Smile (Argyll)"     = LIBUSB0_DEV, USB\VID_0765&PID_6003
-"DTP20 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D020
-"DTP92Q (Argyll)"               = LIBUSB0_DEV, USB\VID_0765&PID_D092
-"DTP94 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D094
-
-[ColorVision_Devices.NTamd64]
-"Spyder1 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0100
-"Spyder2 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0200
-"Spyder3 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0300
-"Spyder4 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0400
-
-[GM_X_Rite_Devices.NTamd64]
-"Eye-One Pro (Argyll)"          = LIBUSB0_DEV, USB\VID_0971&PID_2000
-"Eye-One Monitor (Argyll)"      = LIBUSB0_DEV, USB\VID_0971&PID_2001
-"Eye-One Display 2 (Argyll)"    = LIBUSB0_DEV, USB\VID_0971&PID_2003
-"Huey (Argyll)"                 = LIBUSB0_DEV, USB\VID_0971&PID_2005
-"ColorMunki (Argyll)"           = LIBUSB0_DEV, USB\VID_0971&PID_2007
-
-[Hughski_Devices.NTamd64]
-"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_273F&PID_1001
-"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_04D8&PID_F8DA
-
+;--------------------------------------------------------------------------

+; Copyright 2012 Graeme W. Gill.

+; 

+; Permission is hereby granted, free of charge, to any person obtaining a copy

+; of this file, to deal

+; in this file without restriction, including without limitation the rights

+; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+; copies of this file, and to permit persons to whom this file is

+; furnished to do so, subject to the following conditions:

+; 

+; The above copyright notice and this permission notice shall be included in

+; all copies or substantial portions of this file.

+; 

+; THIS FILE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+; OUT OF OR IN CONNECTION WITH THIS FILE OR THE USE OR OTHER DEALINGS IN

+; THIS FILE.

+;--------------------------------------------------------------------------

+

+; ==== Strings ====

+

+[Strings]

+

+DeviceGUID          = {247e32a0-32f9-11df-aacc-0002a5d5c51b}

+

+Date                = "01/17/2012"		; MM/DD/YYYY

+libusb0ver          = "1.2.6.0"

+

+Libusb_ClassName    = "Argyll LibUSB-win32 devices"

+Libusb_DiskName     = "LibUSB-win32 Device Install Disk"

+

+libusb0_SvcDesc     = "LibUSB-win32 libusb0 - Kernel Driver 2012/1/17, 1.2.6.0"

+

+; ==== Version ====

+

+[Version]

+Signature = "$Windows NT$"

+DriverVer = %Date%,%libusb0ver%

+Provider  = "ArgyllCMS"

+

+; (Note the ClassGuid must not be quoted or a string substitution to work on Win2K)

+Class               = %Libusb_ClassName%

+ClassGuid           = {817cffe0-328b-11df-9b9f-0002a5d5c51b}	; LibUSB-win32 ClassGUID

+CatalogFile         = "ArgyllCMS.cat"

+CatalogFile.NTAMD64 = "ArgyllCMS_x64.cat"

+

+[ClassInstall32]

+AddReg=class_install_add_reg

+

+[class_install_add_reg]

+HKR,,,,%Libusb_ClassName%

+HKR,,Icon,,"-20"	; -20 is for the USB icon

+

+; ==== Files Sources and Destinations ====

+

+[SourceDisksNames]

+1 = %Libusb_DiskName%

+

+[SourceDisksFiles]

+libusb0.sys = 1,\bin\x86,

+

+[SourceDisksFiles.amd64]

+libusb0.sys = 1,\bin\amd64,

+

+[DestinationDirs]

+libusb0_files_sys = 10,system32\drivers

+

+; ==== libusb0 Device driver ====

+

+[libusb0_files_sys]

+libusb0.sys,libusb0.sys

+

+; For each one of these, there must be one for Services !!!

+[LIBUSB0_DEV]

+CopyFiles = Libusb0_files_sys

+

+[LIBUSB0_DEV.HW]

+AddReg = libusb0_add_reg_hw

+

+[libusb0_add_reg]

+HKR,,DevLoader,,*ntkern

+HKR,,NTMPDriver,,libusb0.sys

+

+[libusb0_add_reg_hw]

+HKR,,DeviceInterfaceGUIDs,0x10000,%DeviceGUID%

+HKR,,SurpriseRemovalOK,0x00010001,1				; Device properties

+

+[LIBUSB0_DEV.Services]

+AddService = libusb0, 0x00000002, libusb0_add_service

+

+[libusb0_add_service]

+DisplayName    = %libusb0_SvcDesc%

+ServiceType    = 1

+StartType      = 3

+ErrorControl   = 0

+ServiceBinary  = %12%\libusb0.sys

+

+; ==== Manufacturers ====

+

+[Manufacturer]

+"HCFR Association"=HCFR_Devices,NTx86,NTamd64

+"Sequel Imaging"=Sequel_Devices,NTx86,NTamd64

+"X-Rite"=X_Rite_Devices,NTx86,NTamd64

+"ColorVision"=ColorVision_Devices,NTx86,NTamd64

+"Gretag Macbeth/X-Rite"=GM_X_Rite_Devices,NTx86,NTamd64

+"Hughski Ltd"=Hughski_Devices,NTx86,NTamd64

+

+; ==== Devices ====

+

+[HCFR_Devices]

+"Colorimtre HCFR V3.1 (Argyll)" = LIBUSB0_DEV, USB\VID_04DB&PID_005B

+"Colorimtre HCFR V4.0 (Argyll)" = LIBUSB0_DEV, USB\VID_04D8&PID_FE17

+

+[Sequel_Devices]

+"Eye-One Display 1 (Argyll)"    = LIBUSB0_DEV, USB\VID_0670&PID_0001

+

+[X_Rite_Devices]

+"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5001

+"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5010

+"Eye-One Display 3 (Argyll)"    = LIBUSB0_DEV, USB\VID_0765&PID_5020

+"ColorMunki Smile (Argyll)"     = LIBUSB0_DEV, USB\VID_0765&PID_6003

+"DTP20 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D020

+"DTP92Q (Argyll)"               = LIBUSB0_DEV, USB\VID_0765&PID_D092

+"DTP94 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D094

+

+[ColorVision_Devices]

+"Spyder1 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0100

+"Spyder2 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0200

+"Spyder3 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0300

+"Spyder4 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0400

+

+[GM_X_Rite_Devices]

+"Eye-One Pro (Argyll)"          = LIBUSB0_DEV, USB\VID_0971&PID_2000

+"Eye-One Monitor (Argyll)"      = LIBUSB0_DEV, USB\VID_0971&PID_2001

+"Eye-One Display 2 (Argyll)"    = LIBUSB0_DEV, USB\VID_0971&PID_2003

+"Huey (Argyll)"                 = LIBUSB0_DEV, USB\VID_0971&PID_2005

+"ColorMunki (Argyll)"           = LIBUSB0_DEV, USB\VID_0971&PID_2007

+

+[Hughski_Devices]

+"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_273F&PID_1001

+"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_04D8&PID_F8DA

+

+

+[HCFR_Devices.NTx86]

+"Colorimtre HCFR V3.1 (Argyll)" = LIBUSB0_DEV, USB\VID_04DB&PID_005B

+"Colorimtre HCFR V4.0 (Argyll)" = LIBUSB0_DEV, USB\VID_04D8&PID_FE17

+

+[Sequel_Devices.NTx86]

+"Eye-One Display 1 (Argyll)"    = LIBUSB0_DEV, USB\VID_0670&PID_0001

+

+[X_Rite_Devices.NTx86]

+"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5001

+"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5010

+"Eye-One Display 3 (Argyll)"    = LIBUSB0_DEV, USB\VID_0765&PID_5020

+"ColorMunki Smile (Argyll)"     = LIBUSB0_DEV, USB\VID_0765&PID_6003

+"DTP20 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D020

+"DTP92Q (Argyll)"               = LIBUSB0_DEV, USB\VID_0765&PID_D092

+"DTP94 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D094

+

+[ColorVision_Devices.NTx86]

+"Spyder1 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0100

+"Spyder2 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0200

+"Spyder3 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0300

+"Spyder4 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0400

+

+[GM_X_Rite_Devices.NTx86]

+"Eye-One Pro (Argyll)"          = LIBUSB0_DEV, USB\VID_0971&PID_2000

+"Eye-One Monitor (Argyll)"      = LIBUSB0_DEV, USB\VID_0971&PID_2001

+"Eye-One Display 2 (Argyll)"    = LIBUSB0_DEV, USB\VID_0971&PID_2003

+"Huey (Argyll)"                 = LIBUSB0_DEV, USB\VID_0971&PID_2005

+"ColorMunki (Argyll)"           = LIBUSB0_DEV, USB\VID_0971&PID_2007

+

+[Hughski_Devices.NTx86]

+"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_273F&PID_1001

+"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_04D8&PID_F8DA

+

+

+[HCFR_Devices.NTamd64]

+"Colorimtre HCFR V3.1 (Argyll)" = LIBUSB0_DEV, USB\VID_04DB&PID_005B

+"Colorimtre HCFR V4.0 (Argyll)" = LIBUSB0_DEV, USB\VID_04D8&PID_FE17

+

+[Sequel_Devices.NTamd64]

+"Eye-One Display 1 (Argyll)"    = LIBUSB0_DEV, USB\VID_0670&PID_0001

+

+[X_Rite_Devices.NTamd64]

+"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5001

+"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5010

+"Eye-One Display 3 (Argyll)"    = LIBUSB0_DEV, USB\VID_0765&PID_5020

+"ColorMunki Smile (Argyll)"     = LIBUSB0_DEV, USB\VID_0765&PID_6003

+"DTP20 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D020

+"DTP92Q (Argyll)"               = LIBUSB0_DEV, USB\VID_0765&PID_D092

+"DTP94 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D094

+

+[ColorVision_Devices.NTamd64]

+"Spyder1 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0100

+"Spyder2 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0200

+"Spyder3 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0300

+"Spyder4 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0400

+

+[GM_X_Rite_Devices.NTamd64]

+"Eye-One Pro (Argyll)"          = LIBUSB0_DEV, USB\VID_0971&PID_2000

+"Eye-One Monitor (Argyll)"      = LIBUSB0_DEV, USB\VID_0971&PID_2001

+"Eye-One Display 2 (Argyll)"    = LIBUSB0_DEV, USB\VID_0971&PID_2003

+"Huey (Argyll)"                 = LIBUSB0_DEV, USB\VID_0971&PID_2005

+"ColorMunki (Argyll)"           = LIBUSB0_DEV, USB\VID_0971&PID_2007

+

+[Hughski_Devices.NTamd64]

+"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_273F&PID_1001

+"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_04D8&PID_F8DA

+

diff --git a/usb/ArgyllCMS.inf.d b/usb/ArgyllCMS.inf.d
index cb7eb5d..7836493 100644
--- a/usb/ArgyllCMS.inf.d
+++ b/usb/ArgyllCMS.inf.d
@@ -1,34 +1,34 @@
-
-[HCFR_Devices#PLAT#]
-"Colorimtre HCFR V3.1 (Argyll)" = LIBUSB0_DEV, USB\VID_04DB&PID_005B
-"Colorimtre HCFR V4.0 (Argyll)" = LIBUSB0_DEV, USB\VID_04D8&PID_FE17
-
-[Sequel_Devices#PLAT#]
-"Eye-One Display 1 (Argyll)"    = LIBUSB0_DEV, USB\VID_0670&PID_0001
-
-[X_Rite_Devices#PLAT#]
-"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5001
-"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5010
-"Eye-One Display 3 (Argyll)"    = LIBUSB0_DEV, USB\VID_0765&PID_5020
-"ColorMunki Smile (Argyll)"     = LIBUSB0_DEV, USB\VID_0765&PID_6003
-"DTP20 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D020
-"DTP92Q (Argyll)"               = LIBUSB0_DEV, USB\VID_0765&PID_D092
-"DTP94 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D094
-
-[ColorVision_Devices#PLAT#]
-"Spyder1 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0100
-"Spyder2 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0200
-"Spyder3 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0300
-"Spyder4 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0400
-
-[GM_X_Rite_Devices#PLAT#]
-"Eye-One Pro (Argyll)"          = LIBUSB0_DEV, USB\VID_0971&PID_2000
-"Eye-One Monitor (Argyll)"      = LIBUSB0_DEV, USB\VID_0971&PID_2001
-"Eye-One Display 2 (Argyll)"    = LIBUSB0_DEV, USB\VID_0971&PID_2003
-"Huey (Argyll)"                 = LIBUSB0_DEV, USB\VID_0971&PID_2005
-"ColorMunki (Argyll)"           = LIBUSB0_DEV, USB\VID_0971&PID_2007
-
-[Hughski_Devices#PLAT#]
-"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_273F&PID_1001
-"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_04D8&PID_F8DA
-
+

+[HCFR_Devices#PLAT#]

+"Colorimtre HCFR V3.1 (Argyll)" = LIBUSB0_DEV, USB\VID_04DB&PID_005B

+"Colorimtre HCFR V4.0 (Argyll)" = LIBUSB0_DEV, USB\VID_04D8&PID_FE17

+

+[Sequel_Devices#PLAT#]

+"Eye-One Display 1 (Argyll)"    = LIBUSB0_DEV, USB\VID_0670&PID_0001

+

+[X_Rite_Devices#PLAT#]

+"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5001

+"HueyL (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_5010

+"Eye-One Display 3 (Argyll)"    = LIBUSB0_DEV, USB\VID_0765&PID_5020

+"ColorMunki Smile (Argyll)"     = LIBUSB0_DEV, USB\VID_0765&PID_6003

+"DTP20 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D020

+"DTP92Q (Argyll)"               = LIBUSB0_DEV, USB\VID_0765&PID_D092

+"DTP94 (Argyll)"                = LIBUSB0_DEV, USB\VID_0765&PID_D094

+

+[ColorVision_Devices#PLAT#]

+"Spyder1 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0100

+"Spyder2 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0200

+"Spyder3 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0300

+"Spyder4 (Argyll)"              = LIBUSB0_DEV, USB\VID_085C&PID_0400

+

+[GM_X_Rite_Devices#PLAT#]

+"Eye-One Pro (Argyll)"          = LIBUSB0_DEV, USB\VID_0971&PID_2000

+"Eye-One Monitor (Argyll)"      = LIBUSB0_DEV, USB\VID_0971&PID_2001

+"Eye-One Display 2 (Argyll)"    = LIBUSB0_DEV, USB\VID_0971&PID_2003

+"Huey (Argyll)"                 = LIBUSB0_DEV, USB\VID_0971&PID_2005

+"ColorMunki (Argyll)"           = LIBUSB0_DEV, USB\VID_0971&PID_2007

+

+[Hughski_Devices#PLAT#]

+"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_273F&PID_1001

+"ColorHug (Argyll)"             = LIBUSB0_DEV, USB\VID_04D8&PID_F8DA

+

diff --git a/usb/ArgyllCMS.inf.t b/usb/ArgyllCMS.inf.t
index d810d4f..5721a3f 100644
--- a/usb/ArgyllCMS.inf.t
+++ b/usb/ArgyllCMS.inf.t
@@ -1,111 +1,111 @@
-;--------------------------------------------------------------------------
-; Copyright 2012 Graeme W. Gill.
-; 
-; Permission is hereby granted, free of charge, to any person obtaining a copy
-; of this file, to deal
-; in this file without restriction, including without limitation the rights
-; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-; copies of this file, and to permit persons to whom this file is
-; furnished to do so, subject to the following conditions:
-; 
-; The above copyright notice and this permission notice shall be included in
-; all copies or substantial portions of this file.
-; 
-; THIS FILE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-; OUT OF OR IN CONNECTION WITH THIS FILE OR THE USE OR OTHER DEALINGS IN
-; THIS FILE.
-;--------------------------------------------------------------------------
-
-; ==== Strings ====
-
-[Strings]
-
-DeviceGUID          = {247e32a0-32f9-11df-aacc-0002a5d5c51b}
-
-Date                = "01/17/2012"		; MM/DD/YYYY
-libusb0ver          = "1.2.6.0"
-
-Libusb_ClassName    = "Argyll LibUSB-win32 devices"
-Libusb_DiskName     = "LibUSB-win32 Device Install Disk"
-
-libusb0_SvcDesc     = "LibUSB-win32 libusb0 - Kernel Driver 2012/1/17, 1.2.6.0"
-
-; ==== Version ====
-
-[Version]
-Signature = "$Windows NT$"
-DriverVer = %Date%,%libusb0ver%
-Provider  = "ArgyllCMS"
-
-; (Note the ClassGuid must not be quoted or a string substitution to work on Win2K)
-Class               = %Libusb_ClassName%
-ClassGuid           = {817cffe0-328b-11df-9b9f-0002a5d5c51b}	; LibUSB-win32 ClassGUID
-CatalogFile         = "ArgyllCMS.cat"
-CatalogFile.NTAMD64 = "ArgyllCMS_x64.cat"
-
-[ClassInstall32]
-AddReg=class_install_add_reg
-
-[class_install_add_reg]
-HKR,,,,%Libusb_ClassName%
-HKR,,Icon,,"-20"	; -20 is for the USB icon
-
-; ==== Files Sources and Destinations ====
-
-[SourceDisksNames]
-1 = %Libusb_DiskName%
-
-[SourceDisksFiles]
-libusb0.sys = 1,\bin\x86,
-
-[SourceDisksFiles.amd64]
-libusb0.sys = 1,\bin\amd64,
-
-[DestinationDirs]
-libusb0_files_sys = 10,system32\drivers
-
-; ==== libusb0 Device driver ====
-
-[libusb0_files_sys]
-libusb0.sys,libusb0.sys
-
-; For each one of these, there must be one for Services !!!
-[LIBUSB0_DEV]
-CopyFiles = Libusb0_files_sys
-
-[LIBUSB0_DEV.HW]
-AddReg = libusb0_add_reg_hw
-
-[libusb0_add_reg]
-HKR,,DevLoader,,*ntkern
-HKR,,NTMPDriver,,libusb0.sys
-
-[libusb0_add_reg_hw]
-HKR,,DeviceInterfaceGUIDs,0x10000,%DeviceGUID%
-HKR,,SurpriseRemovalOK,0x00010001,1				; Device properties
-
-[LIBUSB0_DEV.Services]
-AddService = libusb0, 0x00000002, libusb0_add_service
-
-[libusb0_add_service]
-DisplayName    = %libusb0_SvcDesc%
-ServiceType    = 1
-StartType      = 3
-ErrorControl   = 0
-ServiceBinary  = %12%\libusb0.sys
-
-; ==== Manufacturers ====
-
-[Manufacturer]
-"HCFR Association"=HCFR_Devices,NTx86,NTamd64
-"Sequel Imaging"=Sequel_Devices,NTx86,NTamd64
-"X-Rite"=X_Rite_Devices,NTx86,NTamd64
-"ColorVision"=ColorVision_Devices,NTx86,NTamd64
-"Gretag Macbeth/X-Rite"=GM_X_Rite_Devices,NTx86,NTamd64
-"Hughski Ltd"=Hughski_Devices,NTx86,NTamd64
-
-; ==== Devices ====
+;--------------------------------------------------------------------------

+; Copyright 2012 Graeme W. Gill.

+; 

+; Permission is hereby granted, free of charge, to any person obtaining a copy

+; of this file, to deal

+; in this file without restriction, including without limitation the rights

+; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

+; copies of this file, and to permit persons to whom this file is

+; furnished to do so, subject to the following conditions:

+; 

+; The above copyright notice and this permission notice shall be included in

+; all copies or substantial portions of this file.

+; 

+; THIS FILE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+; OUT OF OR IN CONNECTION WITH THIS FILE OR THE USE OR OTHER DEALINGS IN

+; THIS FILE.

+;--------------------------------------------------------------------------

+

+; ==== Strings ====

+

+[Strings]

+

+DeviceGUID          = {247e32a0-32f9-11df-aacc-0002a5d5c51b}

+

+Date                = "01/17/2012"		; MM/DD/YYYY

+libusb0ver          = "1.2.6.0"

+

+Libusb_ClassName    = "Argyll LibUSB-win32 devices"

+Libusb_DiskName     = "LibUSB-win32 Device Install Disk"

+

+libusb0_SvcDesc     = "LibUSB-win32 libusb0 - Kernel Driver 2012/1/17, 1.2.6.0"

+

+; ==== Version ====

+

+[Version]

+Signature = "$Windows NT$"

+DriverVer = %Date%,%libusb0ver%

+Provider  = "ArgyllCMS"

+

+; (Note the ClassGuid must not be quoted or a string substitution to work on Win2K)

+Class               = %Libusb_ClassName%

+ClassGuid           = {817cffe0-328b-11df-9b9f-0002a5d5c51b}	; LibUSB-win32 ClassGUID

+CatalogFile         = "ArgyllCMS.cat"

+CatalogFile.NTAMD64 = "ArgyllCMS_x64.cat"

+

+[ClassInstall32]

+AddReg=class_install_add_reg

+

+[class_install_add_reg]

+HKR,,,,%Libusb_ClassName%

+HKR,,Icon,,"-20"	; -20 is for the USB icon

+

+; ==== Files Sources and Destinations ====

+

+[SourceDisksNames]

+1 = %Libusb_DiskName%

+

+[SourceDisksFiles]

+libusb0.sys = 1,\bin\x86,

+

+[SourceDisksFiles.amd64]

+libusb0.sys = 1,\bin\amd64,

+

+[DestinationDirs]

+libusb0_files_sys = 10,system32\drivers

+

+; ==== libusb0 Device driver ====

+

+[libusb0_files_sys]

+libusb0.sys,libusb0.sys

+

+; For each one of these, there must be one for Services !!!

+[LIBUSB0_DEV]

+CopyFiles = Libusb0_files_sys

+

+[LIBUSB0_DEV.HW]

+AddReg = libusb0_add_reg_hw

+

+[libusb0_add_reg]

+HKR,,DevLoader,,*ntkern

+HKR,,NTMPDriver,,libusb0.sys

+

+[libusb0_add_reg_hw]

+HKR,,DeviceInterfaceGUIDs,0x10000,%DeviceGUID%

+HKR,,SurpriseRemovalOK,0x00010001,1				; Device properties

+

+[LIBUSB0_DEV.Services]

+AddService = libusb0, 0x00000002, libusb0_add_service

+

+[libusb0_add_service]

+DisplayName    = %libusb0_SvcDesc%

+ServiceType    = 1

+StartType      = 3

+ErrorControl   = 0

+ServiceBinary  = %12%\libusb0.sys

+

+; ==== Manufacturers ====

+

+[Manufacturer]

+"HCFR Association"=HCFR_Devices,NTx86,NTamd64

+"Sequel Imaging"=Sequel_Devices,NTx86,NTamd64

+"X-Rite"=X_Rite_Devices,NTx86,NTamd64

+"ColorVision"=ColorVision_Devices,NTx86,NTamd64

+"Gretag Macbeth/X-Rite"=GM_X_Rite_Devices,NTx86,NTamd64

+"Hughski Ltd"=Hughski_Devices,NTx86,NTamd64

+

+; ==== Devices ====

diff --git a/usb/ArgyllCMS_x64.cat b/usb/ArgyllCMS_x64.cat
index d401490..11d6f5f 100644
--- a/usb/ArgyllCMS_x64.cat
+++ b/usb/ArgyllCMS_x64.cat
diff --git a/usb/Jamfile b/usb/Jamfile
index 403e3f2..8df0fba 100644
--- a/usb/Jamfile
+++ b/usb/Jamfile
@@ -42,6 +42,14 @@ if $(CREATE_INFS) = true {
 	GenFileNND ArgyllCMS.inf : "sed s/#PLAT#// $(_d) >> $(_i)" : ArgyllCMS.inf.t ArgyllCMS.inf.d ;
 	GenFileNND ArgyllCMS.inf : "sed s/#PLAT#/.NTx86/ $(_d) >> $(_i)" : ArgyllCMS.inf.t ArgyllCMS.inf.d ; 
 	GenFileNND ArgyllCMS.inf : "sed s/#PLAT#/.NTamd64/ $(_d) >> $(_i)" : ArgyllCMS.inf.t ArgyllCMS.inf.d ;
+
+	# If we have the tools and the .inf file has changed,
+	# create valid (but unsigned) .cat files.
+	if $(NT) && [ GLOB $(PATH) : inf2cat.exe ] {
+		_b  = [ NormPaths makecat.bat ] ;
+		# echo "SUBDIR = '" $(SUBDIR) "'" ;
+		GenFileNNDnc ArgyllCMS.cat : $(_b) $(SUBDIR) : ArgyllCMS.inf ;
+	}
 }
 
 
diff --git a/usb/Readme.txt b/usb/Readme.txt
index 999db32..f8a1c2b 100644
--- a/usb/Readme.txt
+++ b/usb/Readme.txt
@@ -6,3 +6,6 @@ library that uses the device drivers.
 The source to the kernel driver is here, but not built with
 Argyll. The pre-built, signed drivers are used.
 
+The libusb-win32 .dll is not by ArgyllCMS.
+
+
diff --git a/usb/afiles b/usb/afiles
index fe1116b..4dbc3c1 100644
--- a/usb/afiles
+++ b/usb/afiles
@@ -4,6 +4,7 @@ binfiles.osx
 binfiles.lx
 Readme.txt
 Jamfile
+makecat.bat
 45-Argyll.rules
 55-Argyll.rules
 Argyll
diff --git a/usb/makecat.bat b/usb/makecat.bat
new file mode 100644
index 0000000..b6aa61e
--- /dev/null
+++ b/usb/makecat.bat
@@ -0,0 +1,13 @@
+rem Create plausible .cat files
+rem got directory %1
+cd %1
+rmdir /S /Q tmp 
+mkdir tmp\bin\x86
+mkdir tmp\bin\amd64
+copy ArgyllCMS.inf tmp
+copy bin\libusb-win32-bin-README.txt tmp\bin
+copy bin\amd64\libusb0.sys tmp\bin\amd64\libusb0.sys 
+copy bin\x86\libusb0.sys tmp\bin\x86\libusb0.sys 
+inf2cat /v /driver:tmp /os:2000,XP_X86,Vista_X86,7_X86,XP_X64,Vista_X64,7_X64 
+copy tmp\argyllcms.cat ArgyllCMS.cat
+copy tmp\argyllcms_x64.cat ArgyllCMS_x64.cat