From c0b89ac5bfb90835ef01573267020e42d4fe070c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 23 Aug 2015 12:17:05 +0200 Subject: Imported Upstream version 1.8.0 --- usb/45-Argyll.rules | 2 +- usb/55-Argyll.rules | 9 +++++++-- usb/Argyll | 0 usb/Argyll.kext/Info.plist | 0 usb/Argyll.usermap | 3 +++ usb/ArgyllCMS.cat | Bin 3551 -> 3551 bytes usb/ArgyllCMS.inf | 0 usb/ArgyllCMS.inf.d | 0 usb/ArgyllCMS.inf.t | 0 usb/ArgyllCMS_x64.cat | Bin 3535 -> 3535 bytes usb/Jamfile | 0 usb/afiles | 0 usb/bin/amd64/libusb0.sys | Bin 52832 -> 0 bytes usb/bin/ia64/libusb0.sys | Bin 110176 -> 0 bytes usb/bin/libusb-win32-bin-README.txt | 27 --------------------------- usb/bin/x86/libusb0.sys | Bin 42592 -> 0 bytes usb/binfiles.lx | 0 usb/binfiles.msw | 0 usb/binfiles.osx | 0 usb/driver/AUTHORS.txt | 0 usb/driver/COPYING_GPL.txt | 0 usb/driver/LICENSE.txt | 0 usb/driver/Makefile | 0 usb/driver/README.txt | 0 usb/driver/abort_endpoint.c | 0 usb/driver/claim_interface.c | 0 usb/driver/clear_feature.c | 0 usb/driver/dispatch.c | 0 usb/driver/driver_api.h | 0 usb/driver/driver_debug.c | 0 usb/driver/driver_debug.h | 0 usb/driver/driver_registry.c | 0 usb/driver/get_configuration.c | 0 usb/driver/get_descriptor.c | 0 usb/driver/get_interface.c | 0 usb/driver/get_status.c | 0 usb/driver/ioctl.c | 0 usb/driver/libusb-win32-README-1.2.6.0.txt | 0 usb/driver/libusb_driver.c | 0 usb/driver/libusb_driver.h | 0 usb/driver/libusb_driver_rc.rc | 0 usb/driver/lusb_defdi_guids.h | 0 usb/driver/pnp.c | 0 usb/driver/power.c | 0 usb/driver/release_interface.c | 0 usb/driver/reset_device.c | 0 usb/driver/reset_endpoint.c | 0 usb/driver/set_configuration.c | 0 usb/driver/set_descriptor.c | 0 usb/driver/set_feature.c | 0 usb/driver/set_interface.c | 0 usb/driver/transfer.c | 0 usb/driver/usbd.def | 0 usb/driver/usbdlib_gcc.h | 0 usb/driver/vendor_request.c | 0 usb/install_kext.sh | 0 56 files changed, 11 insertions(+), 30 deletions(-) mode change 100644 => 100755 usb/45-Argyll.rules mode change 100644 => 100755 usb/55-Argyll.rules mode change 100644 => 100755 usb/Argyll mode change 100644 => 100755 usb/Argyll.kext/Info.plist mode change 100644 => 100755 usb/Argyll.usermap mode change 100644 => 100755 usb/ArgyllCMS.cat mode change 100644 => 100755 usb/ArgyllCMS.inf mode change 100644 => 100755 usb/ArgyllCMS.inf.d mode change 100644 => 100755 usb/ArgyllCMS.inf.t mode change 100644 => 100755 usb/ArgyllCMS_x64.cat mode change 100644 => 100755 usb/Jamfile mode change 100644 => 100755 usb/afiles delete mode 100644 usb/bin/amd64/libusb0.sys delete mode 100644 usb/bin/ia64/libusb0.sys delete mode 100644 usb/bin/libusb-win32-bin-README.txt delete mode 100644 usb/bin/x86/libusb0.sys mode change 100644 => 100755 usb/binfiles.lx mode change 100644 => 100755 usb/binfiles.msw mode change 100644 => 100755 usb/binfiles.osx mode change 100644 => 100755 usb/driver/AUTHORS.txt mode change 100644 => 100755 usb/driver/COPYING_GPL.txt mode change 100644 => 100755 usb/driver/LICENSE.txt mode change 100644 => 100755 usb/driver/Makefile mode change 100644 => 100755 usb/driver/README.txt mode change 100644 => 100755 usb/driver/abort_endpoint.c mode change 100644 => 100755 usb/driver/claim_interface.c mode change 100644 => 100755 usb/driver/clear_feature.c mode change 100644 => 100755 usb/driver/dispatch.c mode change 100644 => 100755 usb/driver/driver_api.h mode change 100644 => 100755 usb/driver/driver_debug.c mode change 100644 => 100755 usb/driver/driver_debug.h mode change 100644 => 100755 usb/driver/driver_registry.c mode change 100644 => 100755 usb/driver/get_configuration.c mode change 100644 => 100755 usb/driver/get_descriptor.c mode change 100644 => 100755 usb/driver/get_interface.c mode change 100644 => 100755 usb/driver/get_status.c mode change 100644 => 100755 usb/driver/ioctl.c mode change 100644 => 100755 usb/driver/libusb-win32-README-1.2.6.0.txt mode change 100644 => 100755 usb/driver/libusb_driver.c mode change 100644 => 100755 usb/driver/libusb_driver.h mode change 100644 => 100755 usb/driver/libusb_driver_rc.rc mode change 100644 => 100755 usb/driver/lusb_defdi_guids.h mode change 100644 => 100755 usb/driver/pnp.c mode change 100644 => 100755 usb/driver/power.c mode change 100644 => 100755 usb/driver/release_interface.c mode change 100644 => 100755 usb/driver/reset_device.c mode change 100644 => 100755 usb/driver/reset_endpoint.c mode change 100644 => 100755 usb/driver/set_configuration.c mode change 100644 => 100755 usb/driver/set_descriptor.c mode change 100644 => 100755 usb/driver/set_feature.c mode change 100644 => 100755 usb/driver/set_interface.c mode change 100644 => 100755 usb/driver/transfer.c mode change 100644 => 100755 usb/driver/usbd.def mode change 100644 => 100755 usb/driver/usbdlib_gcc.h mode change 100644 => 100755 usb/driver/vendor_request.c mode change 100644 => 100755 usb/install_kext.sh (limited to 'usb') diff --git a/usb/45-Argyll.rules b/usb/45-Argyll.rules old mode 100644 new mode 100755 index 538aa72..beeda7c --- a/usb/45-Argyll.rules +++ b/usb/45-Argyll.rules @@ -65,5 +65,5 @@ SYSFS{idVendor}=="04d8", SYSFS{idProduct}=="f8da", PROGRAM="/bin/sh -c 'K=%k; K= SYSFS{idVendor}=="273f", SYSFS{idProduct}=="1001", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord" SYSFS{idVendor}=="273f", SYSFS{idProduct}=="1004", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord" -# Image Engineering +# Image Engineering EX1 SYSFS{idVendor}=="2457", SYSFS{idProduct}=="4000", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord" diff --git a/usb/55-Argyll.rules b/usb/55-Argyll.rules old mode 100644 new mode 100755 index 527014b..704e7cf --- a/usb/55-Argyll.rules +++ b/usb/55-Argyll.rules @@ -80,9 +80,14 @@ ATTRS{idVendor}=="085c", ATTRS{idProduct}=="0400", ENV{COLORD_SENSOR_KIND}="spyd # Spyder 5 ATTRS{idVendor}=="085c", ATTRS{idProduct}=="0500", ENV{COLORD_SENSOR_KIND}="spyder5" ENV{COLORD_SENSOR_CAPS}="lcd crt ambient" -# JETI & KLEIN FTDI +# JETI & KLEIN serial port (not used) #KERNEL=="ttyUSB[0-9]*", TAG+="udev-acl", TAG+="uaccess" +# ArgyllCMS USB serial chip driver for JETI & KLEIN (not used) +#ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6001", ENV{COLORD_SENSOR_KIND}="FT232R" +#ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6015", ENV{COLORD_SENSOR_KIND}="FT231XS" + + # ColorHug, old and new USB ID's, ColorHug 2 ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="f8da", ENV{COLORD_SENSOR_KIND}="colorhug" ENV{COLORD_SENSOR_CAPS}="lcd" ENV{COLORD_IGNORE}="1" @@ -93,7 +98,7 @@ ATTRS{idVendor}=="273f", ATTRS{idProduct}=="1004", ENV{COLORD_SENSOR_KIND}="colo # ColorHug Spectro ATTRS{idVendor}=="273f", ATTRS{idProduct}=="1002", ENV{COLORD_SENSOR_KIND}="colorhug-spectro", ENV{COLORD_SENSOR_CAPS}="lcd" -# Image Engineering +# Image Engineering EX1 ATTRS{idVendor}=="2457", ATTRS{idProduct}=="4000", ENV{COLORD_SENSOR_KIND}="ex1", ENV{COLORD_SENSOR_CAPS}="lcd crt ambient" ######################################################### diff --git a/usb/Argyll b/usb/Argyll old mode 100644 new mode 100755 diff --git a/usb/Argyll.kext/Info.plist b/usb/Argyll.kext/Info.plist old mode 100644 new mode 100755 diff --git a/usb/Argyll.usermap b/usb/Argyll.usermap old mode 100644 new mode 100755 index 652728a..8890153 --- a/usb/Argyll.usermap +++ b/usb/Argyll.usermap @@ -54,3 +54,6 @@ Argyll 0x0003 0x0971 0x2005 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x000000 # ColorHug Argyll 0x0003 0x04D8 0xF8DA 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 Argyll 0x0003 0x273F 0x1001 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# +# Image Engineering EX1 +Argyll 0x0003 0x2457 0x4000 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 diff --git a/usb/ArgyllCMS.cat b/usb/ArgyllCMS.cat old mode 100644 new mode 100755 index 3fb638a..6d0305e Binary files a/usb/ArgyllCMS.cat and b/usb/ArgyllCMS.cat differ diff --git a/usb/ArgyllCMS.inf b/usb/ArgyllCMS.inf old mode 100644 new mode 100755 diff --git a/usb/ArgyllCMS.inf.d b/usb/ArgyllCMS.inf.d old mode 100644 new mode 100755 diff --git a/usb/ArgyllCMS.inf.t b/usb/ArgyllCMS.inf.t old mode 100644 new mode 100755 diff --git a/usb/ArgyllCMS_x64.cat b/usb/ArgyllCMS_x64.cat old mode 100644 new mode 100755 index ea6999a..e1f12c6 Binary files a/usb/ArgyllCMS_x64.cat and b/usb/ArgyllCMS_x64.cat differ diff --git a/usb/Jamfile b/usb/Jamfile old mode 100644 new mode 100755 diff --git a/usb/afiles b/usb/afiles old mode 100644 new mode 100755 diff --git a/usb/bin/amd64/libusb0.sys b/usb/bin/amd64/libusb0.sys deleted file mode 100644 index 0718dfb..0000000 Binary files a/usb/bin/amd64/libusb0.sys and /dev/null differ diff --git a/usb/bin/ia64/libusb0.sys b/usb/bin/ia64/libusb0.sys deleted file mode 100644 index f17914b..0000000 Binary files a/usb/bin/ia64/libusb0.sys and /dev/null differ diff --git a/usb/bin/libusb-win32-bin-README.txt b/usb/bin/libusb-win32-bin-README.txt deleted file mode 100644 index 455eb6b..0000000 --- a/usb/bin/libusb-win32-bin-README.txt +++ /dev/null @@ -1,27 +0,0 @@ -libusb-win32-bin v1.2.6.0 (01/17/2012) - [Package Information] - -ALL ARCHITECTURES: - x86\libusb0_x86.dll: x86 32-bit library. Must be renamed to libusb0.dll - On 64 bit, Installs to Windows\syswow64\libusb0.dll. - On 32 bit, Installs to Windows\system32\libusb0.dll. - - x86\inf-wizard.exe: inf-wizard application with embedded libusb-win32 - v1.2.6.0 binaries. - -X86 ONLY ARCHITECTURES: - x86\libusb0.sys: x86 32-bit driver. - Installs to Windows\system32\drivers\libusb0.sys - -AMD64-INTEL64 ONLY ARCHITECTURES: - amd64\libusb0.sys: x64 64-bit driver. - Installs to Windows\system32\drivers\libusb0.sys - - amd64\libusb0.dll: x64 64-bit library. - Installs to Windows\system32\libusb0.dll - -IA64 ONLY ARCHITECTURES: - ia64\libusb0.sys: IA64 64-bit driver. - Installs to Windows\system32\drivers\libusb0.sys - - ia64\libusb0.dll: IA64 64-bit library. - Installs to Windows\system32\libusb0.dll diff --git a/usb/bin/x86/libusb0.sys b/usb/bin/x86/libusb0.sys deleted file mode 100644 index 5322e5b..0000000 Binary files a/usb/bin/x86/libusb0.sys and /dev/null differ diff --git a/usb/binfiles.lx b/usb/binfiles.lx old mode 100644 new mode 100755 diff --git a/usb/binfiles.msw b/usb/binfiles.msw old mode 100644 new mode 100755 diff --git a/usb/binfiles.osx b/usb/binfiles.osx old mode 100644 new mode 100755 diff --git a/usb/driver/AUTHORS.txt b/usb/driver/AUTHORS.txt old mode 100644 new mode 100755 diff --git a/usb/driver/COPYING_GPL.txt b/usb/driver/COPYING_GPL.txt old mode 100644 new mode 100755 diff --git a/usb/driver/LICENSE.txt b/usb/driver/LICENSE.txt old mode 100644 new mode 100755 diff --git a/usb/driver/Makefile b/usb/driver/Makefile old mode 100644 new mode 100755 diff --git a/usb/driver/README.txt b/usb/driver/README.txt old mode 100644 new mode 100755 diff --git a/usb/driver/abort_endpoint.c b/usb/driver/abort_endpoint.c old mode 100644 new mode 100755 diff --git a/usb/driver/claim_interface.c b/usb/driver/claim_interface.c old mode 100644 new mode 100755 diff --git a/usb/driver/clear_feature.c b/usb/driver/clear_feature.c old mode 100644 new mode 100755 diff --git a/usb/driver/dispatch.c b/usb/driver/dispatch.c old mode 100644 new mode 100755 diff --git a/usb/driver/driver_api.h b/usb/driver/driver_api.h old mode 100644 new mode 100755 diff --git a/usb/driver/driver_debug.c b/usb/driver/driver_debug.c old mode 100644 new mode 100755 diff --git a/usb/driver/driver_debug.h b/usb/driver/driver_debug.h old mode 100644 new mode 100755 diff --git a/usb/driver/driver_registry.c b/usb/driver/driver_registry.c old mode 100644 new mode 100755 diff --git a/usb/driver/get_configuration.c b/usb/driver/get_configuration.c old mode 100644 new mode 100755 diff --git a/usb/driver/get_descriptor.c b/usb/driver/get_descriptor.c old mode 100644 new mode 100755 diff --git a/usb/driver/get_interface.c b/usb/driver/get_interface.c old mode 100644 new mode 100755 diff --git a/usb/driver/get_status.c b/usb/driver/get_status.c old mode 100644 new mode 100755 diff --git a/usb/driver/ioctl.c b/usb/driver/ioctl.c old mode 100644 new mode 100755 diff --git a/usb/driver/libusb-win32-README-1.2.6.0.txt b/usb/driver/libusb-win32-README-1.2.6.0.txt old mode 100644 new mode 100755 diff --git a/usb/driver/libusb_driver.c b/usb/driver/libusb_driver.c old mode 100644 new mode 100755 diff --git a/usb/driver/libusb_driver.h b/usb/driver/libusb_driver.h old mode 100644 new mode 100755 diff --git a/usb/driver/libusb_driver_rc.rc b/usb/driver/libusb_driver_rc.rc old mode 100644 new mode 100755 diff --git a/usb/driver/lusb_defdi_guids.h b/usb/driver/lusb_defdi_guids.h old mode 100644 new mode 100755 diff --git a/usb/driver/pnp.c b/usb/driver/pnp.c old mode 100644 new mode 100755 diff --git a/usb/driver/power.c b/usb/driver/power.c old mode 100644 new mode 100755 diff --git a/usb/driver/release_interface.c b/usb/driver/release_interface.c old mode 100644 new mode 100755 diff --git a/usb/driver/reset_device.c b/usb/driver/reset_device.c old mode 100644 new mode 100755 diff --git a/usb/driver/reset_endpoint.c b/usb/driver/reset_endpoint.c old mode 100644 new mode 100755 diff --git a/usb/driver/set_configuration.c b/usb/driver/set_configuration.c old mode 100644 new mode 100755 diff --git a/usb/driver/set_descriptor.c b/usb/driver/set_descriptor.c old mode 100644 new mode 100755 diff --git a/usb/driver/set_feature.c b/usb/driver/set_feature.c old mode 100644 new mode 100755 diff --git a/usb/driver/set_interface.c b/usb/driver/set_interface.c old mode 100644 new mode 100755 diff --git a/usb/driver/transfer.c b/usb/driver/transfer.c old mode 100644 new mode 100755 diff --git a/usb/driver/usbd.def b/usb/driver/usbd.def old mode 100644 new mode 100755 diff --git a/usb/driver/usbdlib_gcc.h b/usb/driver/usbdlib_gcc.h old mode 100644 new mode 100755 diff --git a/usb/driver/vendor_request.c b/usb/driver/vendor_request.c old mode 100644 new mode 100755 diff --git a/usb/install_kext.sh b/usb/install_kext.sh old mode 100644 new mode 100755 -- cgit v1.2.3