summaryrefslogtreecommitdiff
path: root/usb
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-08-23 12:17:05 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-08-23 12:17:05 +0200
commitc0b89ac5bfb90835ef01573267020e42d4fe070c (patch)
tree733c16852d964d84b7565af4bdaff0bcca901b88 /usb
parent094535c010320967639e8e86f974d878e80baa72 (diff)
Imported Upstream version 1.8.0upstream/1.8.0
Diffstat (limited to 'usb')
-rwxr-xr-x[-rw-r--r--]usb/45-Argyll.rules2
-rwxr-xr-x[-rw-r--r--]usb/55-Argyll.rules9
-rwxr-xr-x[-rw-r--r--]usb/Argyll0
-rwxr-xr-x[-rw-r--r--]usb/Argyll.kext/Info.plist0
-rwxr-xr-x[-rw-r--r--]usb/Argyll.usermap3
-rwxr-xr-x[-rw-r--r--]usb/ArgyllCMS.catbin3551 -> 3551 bytes
-rwxr-xr-x[-rw-r--r--]usb/ArgyllCMS.inf0
-rwxr-xr-x[-rw-r--r--]usb/ArgyllCMS.inf.d0
-rwxr-xr-x[-rw-r--r--]usb/ArgyllCMS.inf.t0
-rwxr-xr-x[-rw-r--r--]usb/ArgyllCMS_x64.catbin3535 -> 3535 bytes
-rwxr-xr-x[-rw-r--r--]usb/Jamfile0
-rwxr-xr-x[-rw-r--r--]usb/afiles0
-rw-r--r--usb/bin/amd64/libusb0.sysbin52832 -> 0 bytes
-rw-r--r--usb/bin/ia64/libusb0.sysbin110176 -> 0 bytes
-rw-r--r--usb/bin/libusb-win32-bin-README.txt27
-rw-r--r--usb/bin/x86/libusb0.sysbin42592 -> 0 bytes
-rwxr-xr-x[-rw-r--r--]usb/binfiles.lx0
-rwxr-xr-x[-rw-r--r--]usb/binfiles.msw0
-rwxr-xr-x[-rw-r--r--]usb/binfiles.osx0
-rwxr-xr-x[-rw-r--r--]usb/driver/AUTHORS.txt0
-rwxr-xr-x[-rw-r--r--]usb/driver/COPYING_GPL.txt0
-rwxr-xr-x[-rw-r--r--]usb/driver/LICENSE.txt0
-rwxr-xr-x[-rw-r--r--]usb/driver/Makefile0
-rwxr-xr-x[-rw-r--r--]usb/driver/README.txt0
-rwxr-xr-x[-rw-r--r--]usb/driver/abort_endpoint.c0
-rwxr-xr-x[-rw-r--r--]usb/driver/claim_interface.c0
-rwxr-xr-x[-rw-r--r--]usb/driver/clear_feature.c0
-rwxr-xr-x[-rw-r--r--]usb/driver/dispatch.c0
-rwxr-xr-x[-rw-r--r--]usb/driver/driver_api.h0
-rwxr-xr-x[-rw-r--r--]usb/driver/driver_debug.c0
-rwxr-xr-x[-rw-r--r--]usb/driver/driver_debug.h0
-rwxr-xr-x[-rw-r--r--]usb/driver/driver_registry.c0
-rwxr-xr-x[-rw-r--r--]usb/driver/get_configuration.c0
-rwxr-xr-x[-rw-r--r--]usb/driver/get_descriptor.c0
-rwxr-xr-x[-rw-r--r--]usb/driver/get_interface.c0
-rwxr-xr-x[-rw-r--r--]usb/driver/get_status.c0
-rwxr-xr-x[-rw-r--r--]usb/driver/ioctl.c0
-rwxr-xr-x[-rw-r--r--]usb/driver/libusb-win32-README-1.2.6.0.txt0
-rwxr-xr-x[-rw-r--r--]usb/driver/libusb_driver.c0
-rwxr-xr-x[-rw-r--r--]usb/driver/libusb_driver.h0
-rwxr-xr-x[-rw-r--r--]usb/driver/libusb_driver_rc.rc0
-rwxr-xr-x[-rw-r--r--]usb/driver/lusb_defdi_guids.h0
-rwxr-xr-x[-rw-r--r--]usb/driver/pnp.c0
-rwxr-xr-x[-rw-r--r--]usb/driver/power.c0
-rwxr-xr-x[-rw-r--r--]usb/driver/release_interface.c0
-rwxr-xr-x[-rw-r--r--]usb/driver/reset_device.c0
-rwxr-xr-x[-rw-r--r--]usb/driver/reset_endpoint.c0
-rwxr-xr-x[-rw-r--r--]usb/driver/set_configuration.c0
-rwxr-xr-x[-rw-r--r--]usb/driver/set_descriptor.c0
-rwxr-xr-x[-rw-r--r--]usb/driver/set_feature.c0
-rwxr-xr-x[-rw-r--r--]usb/driver/set_interface.c0
-rwxr-xr-x[-rw-r--r--]usb/driver/transfer.c0
-rwxr-xr-x[-rw-r--r--]usb/driver/usbd.def0
-rwxr-xr-x[-rw-r--r--]usb/driver/usbdlib_gcc.h0
-rwxr-xr-x[-rw-r--r--]usb/driver/vendor_request.c0
-rwxr-xr-x[-rw-r--r--]usb/install_kext.sh0
56 files changed, 11 insertions, 30 deletions
diff --git a/usb/45-Argyll.rules b/usb/45-Argyll.rules
index 538aa72..beeda7c 100644..100755
--- 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
index 527014b..704e7cf 100644..100755
--- 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
index b7eebc2..b7eebc2 100644..100755
--- a/usb/Argyll
+++ b/usb/Argyll
diff --git a/usb/Argyll.kext/Info.plist b/usb/Argyll.kext/Info.plist
index 754e6d5..754e6d5 100644..100755
--- a/usb/Argyll.kext/Info.plist
+++ b/usb/Argyll.kext/Info.plist
diff --git a/usb/Argyll.usermap b/usb/Argyll.usermap
index 652728a..8890153 100644..100755
--- 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
index 3fb638a..6d0305e 100644..100755
--- a/usb/ArgyllCMS.cat
+++ b/usb/ArgyllCMS.cat
Binary files differ
diff --git a/usb/ArgyllCMS.inf b/usb/ArgyllCMS.inf
index 4de9f51..4de9f51 100644..100755
--- a/usb/ArgyllCMS.inf
+++ b/usb/ArgyllCMS.inf
diff --git a/usb/ArgyllCMS.inf.d b/usb/ArgyllCMS.inf.d
index c130cee..c130cee 100644..100755
--- a/usb/ArgyllCMS.inf.d
+++ b/usb/ArgyllCMS.inf.d
diff --git a/usb/ArgyllCMS.inf.t b/usb/ArgyllCMS.inf.t
index 635d9ef..635d9ef 100644..100755
--- a/usb/ArgyllCMS.inf.t
+++ b/usb/ArgyllCMS.inf.t
diff --git a/usb/ArgyllCMS_x64.cat b/usb/ArgyllCMS_x64.cat
index ea6999a..e1f12c6 100644..100755
--- a/usb/ArgyllCMS_x64.cat
+++ b/usb/ArgyllCMS_x64.cat
Binary files differ
diff --git a/usb/Jamfile b/usb/Jamfile
index 8df0fba..8df0fba 100644..100755
--- a/usb/Jamfile
+++ b/usb/Jamfile
diff --git a/usb/afiles b/usb/afiles
index 4dbc3c1..4dbc3c1 100644..100755
--- a/usb/afiles
+++ b/usb/afiles
diff --git a/usb/bin/amd64/libusb0.sys b/usb/bin/amd64/libusb0.sys
deleted file mode 100644
index 0718dfb..0000000
--- a/usb/bin/amd64/libusb0.sys
+++ /dev/null
Binary files differ
diff --git a/usb/bin/ia64/libusb0.sys b/usb/bin/ia64/libusb0.sys
deleted file mode 100644
index f17914b..0000000
--- a/usb/bin/ia64/libusb0.sys
+++ /dev/null
Binary files 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
--- a/usb/bin/x86/libusb0.sys
+++ /dev/null
Binary files differ
diff --git a/usb/binfiles.lx b/usb/binfiles.lx
index 7dd8767..7dd8767 100644..100755
--- a/usb/binfiles.lx
+++ b/usb/binfiles.lx
diff --git a/usb/binfiles.msw b/usb/binfiles.msw
index f498d92..f498d92 100644..100755
--- a/usb/binfiles.msw
+++ b/usb/binfiles.msw
diff --git a/usb/binfiles.osx b/usb/binfiles.osx
index 60ed4ec..60ed4ec 100644..100755
--- a/usb/binfiles.osx
+++ b/usb/binfiles.osx
diff --git a/usb/driver/AUTHORS.txt b/usb/driver/AUTHORS.txt
index 375ec6c..375ec6c 100644..100755
--- a/usb/driver/AUTHORS.txt
+++ b/usb/driver/AUTHORS.txt
diff --git a/usb/driver/COPYING_GPL.txt b/usb/driver/COPYING_GPL.txt
index 94a9ed0..94a9ed0 100644..100755
--- a/usb/driver/COPYING_GPL.txt
+++ b/usb/driver/COPYING_GPL.txt
diff --git a/usb/driver/LICENSE.txt b/usb/driver/LICENSE.txt
index d8dd99d..d8dd99d 100644..100755
--- a/usb/driver/LICENSE.txt
+++ b/usb/driver/LICENSE.txt
diff --git a/usb/driver/Makefile b/usb/driver/Makefile
index 18937ab..18937ab 100644..100755
--- a/usb/driver/Makefile
+++ b/usb/driver/Makefile
diff --git a/usb/driver/README.txt b/usb/driver/README.txt
index 0dc3ac0..0dc3ac0 100644..100755
--- a/usb/driver/README.txt
+++ b/usb/driver/README.txt
diff --git a/usb/driver/abort_endpoint.c b/usb/driver/abort_endpoint.c
index 3ec46e9..3ec46e9 100644..100755
--- a/usb/driver/abort_endpoint.c
+++ b/usb/driver/abort_endpoint.c
diff --git a/usb/driver/claim_interface.c b/usb/driver/claim_interface.c
index 9ec0fe5..9ec0fe5 100644..100755
--- a/usb/driver/claim_interface.c
+++ b/usb/driver/claim_interface.c
diff --git a/usb/driver/clear_feature.c b/usb/driver/clear_feature.c
index c3b5c24..c3b5c24 100644..100755
--- a/usb/driver/clear_feature.c
+++ b/usb/driver/clear_feature.c
diff --git a/usb/driver/dispatch.c b/usb/driver/dispatch.c
index 8eccb21..8eccb21 100644..100755
--- a/usb/driver/dispatch.c
+++ b/usb/driver/dispatch.c
diff --git a/usb/driver/driver_api.h b/usb/driver/driver_api.h
index 5339a81..5339a81 100644..100755
--- a/usb/driver/driver_api.h
+++ b/usb/driver/driver_api.h
diff --git a/usb/driver/driver_debug.c b/usb/driver/driver_debug.c
index 49f1878..49f1878 100644..100755
--- a/usb/driver/driver_debug.c
+++ b/usb/driver/driver_debug.c
diff --git a/usb/driver/driver_debug.h b/usb/driver/driver_debug.h
index a4f396f..a4f396f 100644..100755
--- a/usb/driver/driver_debug.h
+++ b/usb/driver/driver_debug.h
diff --git a/usb/driver/driver_registry.c b/usb/driver/driver_registry.c
index 3b0c67d..3b0c67d 100644..100755
--- a/usb/driver/driver_registry.c
+++ b/usb/driver/driver_registry.c
diff --git a/usb/driver/get_configuration.c b/usb/driver/get_configuration.c
index fa9b522..fa9b522 100644..100755
--- a/usb/driver/get_configuration.c
+++ b/usb/driver/get_configuration.c
diff --git a/usb/driver/get_descriptor.c b/usb/driver/get_descriptor.c
index 2b5172e..2b5172e 100644..100755
--- a/usb/driver/get_descriptor.c
+++ b/usb/driver/get_descriptor.c
diff --git a/usb/driver/get_interface.c b/usb/driver/get_interface.c
index b218281..b218281 100644..100755
--- a/usb/driver/get_interface.c
+++ b/usb/driver/get_interface.c
diff --git a/usb/driver/get_status.c b/usb/driver/get_status.c
index 2e77f91..2e77f91 100644..100755
--- a/usb/driver/get_status.c
+++ b/usb/driver/get_status.c
diff --git a/usb/driver/ioctl.c b/usb/driver/ioctl.c
index f059175..f059175 100644..100755
--- a/usb/driver/ioctl.c
+++ b/usb/driver/ioctl.c
diff --git a/usb/driver/libusb-win32-README-1.2.6.0.txt b/usb/driver/libusb-win32-README-1.2.6.0.txt
index 99445f7..99445f7 100644..100755
--- a/usb/driver/libusb-win32-README-1.2.6.0.txt
+++ b/usb/driver/libusb-win32-README-1.2.6.0.txt
diff --git a/usb/driver/libusb_driver.c b/usb/driver/libusb_driver.c
index 61ebf77..61ebf77 100644..100755
--- a/usb/driver/libusb_driver.c
+++ b/usb/driver/libusb_driver.c
diff --git a/usb/driver/libusb_driver.h b/usb/driver/libusb_driver.h
index e0a5d3c..e0a5d3c 100644..100755
--- a/usb/driver/libusb_driver.h
+++ b/usb/driver/libusb_driver.h
diff --git a/usb/driver/libusb_driver_rc.rc b/usb/driver/libusb_driver_rc.rc
index b0affc8..b0affc8 100644..100755
--- a/usb/driver/libusb_driver_rc.rc
+++ b/usb/driver/libusb_driver_rc.rc
diff --git a/usb/driver/lusb_defdi_guids.h b/usb/driver/lusb_defdi_guids.h
index 99833b0..99833b0 100644..100755
--- a/usb/driver/lusb_defdi_guids.h
+++ b/usb/driver/lusb_defdi_guids.h
diff --git a/usb/driver/pnp.c b/usb/driver/pnp.c
index b103650..b103650 100644..100755
--- a/usb/driver/pnp.c
+++ b/usb/driver/pnp.c
diff --git a/usb/driver/power.c b/usb/driver/power.c
index d29dd9b..d29dd9b 100644..100755
--- a/usb/driver/power.c
+++ b/usb/driver/power.c
diff --git a/usb/driver/release_interface.c b/usb/driver/release_interface.c
index bcd483c..bcd483c 100644..100755
--- a/usb/driver/release_interface.c
+++ b/usb/driver/release_interface.c
diff --git a/usb/driver/reset_device.c b/usb/driver/reset_device.c
index a0fd97b..a0fd97b 100644..100755
--- a/usb/driver/reset_device.c
+++ b/usb/driver/reset_device.c
diff --git a/usb/driver/reset_endpoint.c b/usb/driver/reset_endpoint.c
index 3396b93..3396b93 100644..100755
--- a/usb/driver/reset_endpoint.c
+++ b/usb/driver/reset_endpoint.c
diff --git a/usb/driver/set_configuration.c b/usb/driver/set_configuration.c
index 9f2fac1..9f2fac1 100644..100755
--- a/usb/driver/set_configuration.c
+++ b/usb/driver/set_configuration.c
diff --git a/usb/driver/set_descriptor.c b/usb/driver/set_descriptor.c
index 46bbad7..46bbad7 100644..100755
--- a/usb/driver/set_descriptor.c
+++ b/usb/driver/set_descriptor.c
diff --git a/usb/driver/set_feature.c b/usb/driver/set_feature.c
index 12e7745..12e7745 100644..100755
--- a/usb/driver/set_feature.c
+++ b/usb/driver/set_feature.c
diff --git a/usb/driver/set_interface.c b/usb/driver/set_interface.c
index 840600e..840600e 100644..100755
--- a/usb/driver/set_interface.c
+++ b/usb/driver/set_interface.c
diff --git a/usb/driver/transfer.c b/usb/driver/transfer.c
index 0a02aa1..0a02aa1 100644..100755
--- a/usb/driver/transfer.c
+++ b/usb/driver/transfer.c
diff --git a/usb/driver/usbd.def b/usb/driver/usbd.def
index 5c283bb..5c283bb 100644..100755
--- a/usb/driver/usbd.def
+++ b/usb/driver/usbd.def
diff --git a/usb/driver/usbdlib_gcc.h b/usb/driver/usbdlib_gcc.h
index 5dec851..5dec851 100644..100755
--- a/usb/driver/usbdlib_gcc.h
+++ b/usb/driver/usbdlib_gcc.h
diff --git a/usb/driver/vendor_request.c b/usb/driver/vendor_request.c
index f3a898b..f3a898b 100644..100755
--- a/usb/driver/vendor_request.c
+++ b/usb/driver/vendor_request.c
diff --git a/usb/install_kext.sh b/usb/install_kext.sh
index 22c181a..22c181a 100644..100755
--- a/usb/install_kext.sh
+++ b/usb/install_kext.sh