pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics/argyllcms
Module Name: pkgsrc
Committed By: jakllsch
Date: Mon Mar 10 15:38:12 UTC 2025
Modified Files:
pkgsrc/graphics/argyllcms: Makefile distinfo
pkgsrc/graphics/argyllcms/patches: patch-Jamtop patch-spectro_hidio.c
patch-spectro_usbio.c patch-spectro_usbio__bsd.c
Log Message:
Update argyllcms to 3.3.0
pkgsrc changes:
fix build on Linux
upstream changes:
[V3.2.0 -> V3.3.0] 27th September 2024
Improved reliability of i1Pro2 startup by adding recovery delay after the getmisc instruction.
Fixed i1pro2/3 driver to be more forgiving of wavelength calibration pushing filter offsets outside the range of raw CCD range.
Fixed numerical bug in targen when using -V and -c with profile with zero black.
Added support for Spyder X2 (thanks to Chris Minasians and A.K. for helping make an instrument available).
Added support for JETI 2501 spectrometer thanks to to Omardis.
Added -T option to targen to allow separate total ink limit for text and spacer text.
Modified targen CMYK chart generation to apply a level of luminance boost to the resulting OFPS samples. This partially compensates for the overall darkening of the test set due to exploring the
combined K response of the device. While this will reduce the sampling density and resulting profile accuracy in darker parts of the gamut, it should improve the accuracy of colors for realistic
prints, which typically have a lighter average than the device CMYK gamut.
Added extra diagnostics and -p plot detail to printcal. Added -z flag to allow setting a resulting calibration table resolution to values other than 256.
Fix 3.2.0 bug introduced into spectro/Jamfile install that omitted spec2cie from binary distributions.
[V3.1.0 -> V3.2.0] 17th April 2024
Added extra diagnostics to printcal.
Added colprof -nI option, that adds inverse gamut mapping to Perceptual and Saturation A2B tables, if they are being created. This is not recommended for source profiles, since it handicaps true
gamut mapping, but may be a workaround to faulty Adobe Lightroom BPC for Perceptual intent in output profiles.
Added error message for ColorMunki spectro sensor internal cable being disconnected.
Fixed bug in Appearance B2A conversion that appeared in V3.0 release.
Fixed crash in chartread strip reading when given faulty .ti2 file.
Tweaked i1d3 Rev B AIO adaptive integration time to reduce measure time to be more comparable to just using Rev A commands.
Re-worked ARGYLL_NOT_INTERACTIVE stdin to work much better on MSWin when connected to a pipe. Removed code that empties stdin before expecting use input when ARGYLL_NOT_INTERACTIVE.
Fixed OS X dispwin -c etc.
Fixed colprof IGNORE_DISP_ZEROS heuristic so that it doesn't reject OLED red measurements that have a Z value of 0.0.
Added -H option to colprof to allow setting the charTargetTag to given string, rather than automatically filling with .ti3 data.
Changed instrument monitoring thread debug messages to only be shown on -D9, so they don't interfere with messages shown at -D8.
[V3.0.2 -> V3.1.0] 1st December 2023
Added MSWindows USB uninstaller and libwdi based installer installer to make use on MSWindows easier.
Added UbsDk MSWindows usb driver support code, but it is currently disabled because the release versions of UsbDk have limited usefulness as a general USB driver.
Fixed bug in CMYK profile B2A table creation that sometimes resulted in bumpy black generation. (Only occurred when compiled using recent gcc with code optimization.)
Changed ICC profile serialization of pure ASCII text tags to emit a warning rather than error if they are fed non-ASCII utf8 input.
Made ICC code a little more robust against bad profiles. (Thanks to David Hoyt).
Fixed latent bug in X11 plot code that caused window not to be created or updated when dowait == 0. This shows up on Linux as failure of spotread -S to show spectral plot.
Fixed problem with colorhug not noticing errors from the instrument.
Updated scanin/it8Wolf.cht to improve accuracy of grey wedge patch recognition.
Merged some Debian patches, including spelling fixes.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/argyllcms/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/argyllcms/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/argyllcms/patches/patch-Jamtop \
pkgsrc/graphics/argyllcms/patches/patch-spectro_hidio.c \
pkgsrc/graphics/argyllcms/patches/patch-spectro_usbio.c \
pkgsrc/graphics/argyllcms/patches/patch-spectro_usbio__bsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/graphics/argyllcms/Makefile
diff -u pkgsrc/graphics/argyllcms/Makefile:1.2 pkgsrc/graphics/argyllcms/Makefile:1.3
--- pkgsrc/graphics/argyllcms/Makefile:1.2 Fri Nov 24 20:25:39 2023
+++ pkgsrc/graphics/argyllcms/Makefile Mon Mar 10 15:38:12 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2023/11/24 20:25:39 jakllsch Exp $
+# $NetBSD: Makefile,v 1.3 2025/03/10 15:38:12 jakllsch Exp $
-DISTNAME= Argyll_V3.0.2_src
+DISTNAME= Argyll_V3.3.0_src
PKGNAME= ${DISTNAME:S/_V/cms-/:S/_src$//:tl}
CATEGORIES= graphics
MASTER_SITES= http://www.argyllcms.com/
@@ -20,8 +20,6 @@ PKGCONFIG_OVERRIDE+= tiff/libtiff-4.pc.i
PKGCONFIG_OVERRIDE+= xml/mxml.pc.in
PKGCONFIG_OVERRIDE+= zlib/zlib.pc.in
-BUILDLINK_TRANSFORM+= rm:-ldl
-
TOOL_DEPENDS+= jam>=2.5.2:../../devel/jam
do-build:
Index: pkgsrc/graphics/argyllcms/distinfo
diff -u pkgsrc/graphics/argyllcms/distinfo:1.1 pkgsrc/graphics/argyllcms/distinfo:1.2
--- pkgsrc/graphics/argyllcms/distinfo:1.1 Fri Nov 17 17:37:48 2023
+++ pkgsrc/graphics/argyllcms/distinfo Mon Mar 10 15:38:12 2025
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.1 2023/11/17 17:37:48 jakllsch Exp $
+$NetBSD: distinfo,v 1.2 2025/03/10 15:38:12 jakllsch Exp $
-BLAKE2s (Argyll_V3.0.2_src.zip) = 6b5ae8db701693424e0bb4b5670089e866984cef20cb86e49316748bc153d9bf
-SHA512 (Argyll_V3.0.2_src.zip) = befd9f3a1b06b8a403deaed38dd01cf93ae511bf200a37cae4516455050f0178fe51c6fa705579093795f2043ca19e7f79facd165f9e888cf80a3684fb586745
-Size (Argyll_V3.0.2_src.zip) = 14202724 bytes
-SHA1 (patch-Jamtop) = 2d68e70172ea3f5c651a9d6367489ada08f258ea
+BLAKE2s (Argyll_V3.3.0_src.zip) = 31e822b2632c3c6d23059ac7b0a94e144a361015e24928a4a3edec91a7980062
+SHA512 (Argyll_V3.3.0_src.zip) = 96e9aeaec991ae005ea7156a691c1cff508fa1cad538261b1a128bceb763d641b93ab86b586eaa8b89eb37334f3eaaf97ac412db51b116690a9228232361651d
+Size (Argyll_V3.3.0_src.zip) = 14761699 bytes
+SHA1 (patch-Jamtop) = b2df031cea2ac829e18d52033a469f1fbe1bef93
SHA1 (patch-spectro_Jamfile) = 1e40d46df292dc73b55163c66e7bb4c7f89acf19
-SHA1 (patch-spectro_hidio.c) = cf9bae6bf2032ce5184c0760991aa3fe8f206fed
+SHA1 (patch-spectro_hidio.c) = bf61035b9ccca00a4da4af717db26c9f3048fe78
SHA1 (patch-spectro_hidio.h) = cdf6600dd0c346fcc1e6b2d514e8a488dc3c771f
SHA1 (patch-spectro_icoms__ux.c) = 729883ffb5c7060a9b87b23f8eb79fd6458e13f4
-SHA1 (patch-spectro_usbio.c) = decbe4f2e4d359e10678dbf6ad46d79bf9e16a21
-SHA1 (patch-spectro_usbio__bsd.c) = afe1ec7565bb2226dd525e65e14353e98c75c1ed
+SHA1 (patch-spectro_usbio.c) = 762d01c3dd65c27605e2abfb3cfc957bef1ba8e5
+SHA1 (patch-spectro_usbio__bsd.c) = 27e70463027b00e780664acf00e010591a942efe
Index: pkgsrc/graphics/argyllcms/patches/patch-Jamtop
diff -u pkgsrc/graphics/argyllcms/patches/patch-Jamtop:1.1 pkgsrc/graphics/argyllcms/patches/patch-Jamtop:1.2
--- pkgsrc/graphics/argyllcms/patches/patch-Jamtop:1.1 Fri Nov 17 17:37:48 2023
+++ pkgsrc/graphics/argyllcms/patches/patch-Jamtop Mon Mar 10 15:38:12 2025
@@ -1,12 +1,12 @@
-$NetBSD: patch-Jamtop,v 1.1 2023/11/17 17:37:48 jakllsch Exp $
+$NetBSD: patch-Jamtop,v 1.2 2025/03/10 15:38:12 jakllsch Exp $
Search and use pkgsrc ${X11BASE} and ${PREFIX} paths.
Recognize pkgsrc libpng16.so (somewhat haphazardly).
Recognize NetBSD.
---- Jamtop.orig 2023-10-23 00:55:56.000000000 +0000
+--- Jamtop.orig 2024-09-24 22:29:00.000000000 +0000
+++ Jamtop
-@@ -83,7 +83,11 @@ if $(UNIX) {
+@@ -86,7 +86,11 @@ if $(UNIX) {
# Hmm. Would be nice to use pkg-config here, if system has it.
} else {
@@ -19,7 +19,7 @@ Recognize NetBSD.
LibWinH = /usr/X11R6/include ;
} else if [ GLOB /usr/include/X11 : X.h ] {
LibWinH = /usr/include ;
-@@ -94,7 +98,11 @@ if $(UNIX) {
+@@ -97,7 +101,11 @@ if $(UNIX) {
}
if $(HOST64) {
@@ -32,7 +32,7 @@ Recognize NetBSD.
LibWinD = /usr/X11R6/lib ;
} else if [ GLOB /usr/lib/x86_64-linux-gnu : libX11.so libX11.a ] {
LibWinD = /usr/lib/x86_64-linux-gnu ;
-@@ -108,7 +116,11 @@ if $(UNIX) {
+@@ -111,7 +119,11 @@ if $(UNIX) {
ECHO Unable to locate the 64 bit X11 library files ;
}
} else {
@@ -45,7 +45,7 @@ Recognize NetBSD.
LibWinD = /usr/X11R6/lib ;
} else if [ GLOB /usr/lib/i386-linux-gnu : libX11.so libX11.a ] {
LibWinD = /usr/lib/i386-linux-gnu ;
-@@ -123,6 +135,9 @@ if $(UNIX) {
+@@ -126,6 +138,9 @@ if $(UNIX) {
if $(OS) = FREEBSD {
LINKFLAGS += -g -lrt -lusb ;
GUILINKFLAGS += -L$(LibWinD) -g -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss ;
@@ -55,20 +55,24 @@ Recognize NetBSD.
} else if $(OS) = OPENBSD {
LINKFLAGS += ;
GUILINKFLAGS += -L$(LibWinD) -g -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -L/usr/local/lib ;
-@@ -153,11 +168,14 @@ rule CheckForLibrary {
+@@ -156,7 +171,8 @@ rule CheckForLibrary {
}
if ! $(BUILTIN_$(UCASE)) && $(UNIX) {
-- if [ GLOB /usr/include$(subd) : $(lcase).h $(lcase)lib.h ]
-+ if [ GLOB $(PREFIX)/include$(subd) : $(lcase).h $(lcase)lib.h ]
+- if [ GLOB /usr/include$(subd) : $(lcase).h $(lcase)lib.h ]
++ if [ GLOB $(PREFIX)/include$(subd) : $(lcase).h $(lcase)lib.h ]
+ || [ GLOB /usr/include$(subd) : $(lcase).h $(lcase)lib.h ]
- || [ GLOB /usr/local/include$(subd) : $(lcase).h $(lcase)lib.h ]
+ || [ GLOB /usr/local/include$(subd) : $(lcase).h $(lcase)lib.h ]
|| [ GLOB /usr/include/x86_64-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
- || [ GLOB /usr/include/i386-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ] {
-- if [ GLOB /usr/lib : lib$(lcase).so ] || [ GLOB /usr/lib : lib$(lcase).a ]
-+ if [ GLOB $(PREFIX)/lib : lib$(lcase).so ] || [ GLOB $(PREFIX)/lib : lib$(lcase).a ]
-+ || [ GLOB $(PREFIX)/lib : lib$(lcase)16.so ] || [ GLOB $(PREFIX)/lib : lib$(lcase)16.a ]
-+ || [ GLOB /usr/lib : lib$(lcase).so ] || [ GLOB /usr/lib : lib$(lcase).a ]
- || [ GLOB /usr/local/lib : lib$(lcase).so ] || [ GLOB /usr/local/lib : lib$(lcase).a ]
- || [ GLOB /usr/lib64 : lib$(lcase).so ] || [ GLOB /usr/lib64 : lib$(lcase).a ]
- || [ GLOB /usr/lib/x86_64-linux-gnu : lib$(lcase).so ]
+ || [ GLOB /usr/include/i386-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
+@@ -183,7 +199,9 @@ rule CheckForLibrary {
+ || [ GLOB /usr/include/sparc-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
+ || [ GLOB /usr/include/sparc64-linux-gnu$(subd) : $(lcase).h $(lcase)lib.h ]
+ || [ GLOB /usr/include/x86_64-linux-gnux32$(subd) : $(lcase).h $(lcase)lib.h ] {
+- if [ GLOB /usr/lib : lib$(lcase).so ] || [ GLOB /usr/lib : lib$(lcase).a ]
++ if [ GLOB $(PREFIX)/lib : lib$(lcase).so ] || [ GLOB $(PREFIX)/lib : lib$(lcase).a ]
++ || [ GLOB $(PREFIX)/lib : lib$(lcase)16.so ] || [ GLOB $(PREFIX)/lib : lib$(lcase)16.a ]
++ || [ GLOB /usr/lib : lib$(lcase).so ] || [ GLOB /usr/lib : lib$(lcase).a ]
+ || [ GLOB /usr/local/lib : lib$(lcase).so ]
+ || [ GLOB /usr/local/lib : lib$(lcase).a ]
+ || [ GLOB /usr/lib64 : lib$(lcase).so ]
Index: pkgsrc/graphics/argyllcms/patches/patch-spectro_hidio.c
diff -u pkgsrc/graphics/argyllcms/patches/patch-spectro_hidio.c:1.1 pkgsrc/graphics/argyllcms/patches/patch-spectro_hidio.c:1.2
--- pkgsrc/graphics/argyllcms/patches/patch-spectro_hidio.c:1.1 Fri Nov 17 17:37:48 2023
+++ pkgsrc/graphics/argyllcms/patches/patch-spectro_hidio.c Mon Mar 10 15:38:12 2025
@@ -1,8 +1,8 @@
-$NetBSD: patch-spectro_hidio.c,v 1.1 2023/11/17 17:37:48 jakllsch Exp $
+$NetBSD: patch-spectro_hidio.c,v 1.2 2025/03/10 15:38:12 jakllsch Exp $
Recognize NetBSD.
---- spectro/hidio.c.orig 2023-10-23 00:56:17.000000000 +0000
+--- spectro/hidio.c.orig 2024-09-24 22:29:21.000000000 +0000
+++ spectro/hidio.c
@@ -92,6 +92,10 @@
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
@@ -147,10 +147,12 @@ Recognize NetBSD.
if (bwrittenp != NULL)
*bwrittenp = bwritten;
-@@ -1117,6 +1212,10 @@ int hid_copy_hid_idevice(icoms *d, icomp
+@@ -1116,7 +1211,11 @@ int hid_copy_hid_idevice(icoms *d, icomp
+ IOObjectRetain(d->hidd->ioob);
#endif /* __MAC_OS_X_VERSION_MAX_ALLOWED < 1060 */
#endif /* UNIX_APPLE */
- #if defined (UNIX_X11)
+-#if defined (UNIX_X11)
++#if defined (UNIX_X11) && defined (__NetBSD__)
+ if ((d->hidd->dpath = strdup(s->hidd->dpath)) == NULL) {
+ a1loge(d->log, ICOM_SYS, "hid_copy_hid_idevice: malloc\n");
+ return ICOM_SYS;
@@ -158,10 +160,12 @@ Recognize NetBSD.
#endif
return ICOM_OK;
}
-@@ -1140,6 +1239,8 @@ void hid_del_hid_idevice(struct hid_idev
+@@ -1139,7 +1238,9 @@ void hid_del_hid_idevice(struct hid_idev
+ IOObjectRelease(hidd->ioob);
#endif /* __MAC_OS_X_VERSION_MAX_ALLOWED < 1060 */
#endif /* UNIX_APPLE */
- #if defined (UNIX_X11)
+-#if defined (UNIX_X11)
++#if defined (UNIX_X11) && defined (__NetBSD__)
+ if (hidd->dpath != NULL)
+ free(hidd->dpath);
#endif
Index: pkgsrc/graphics/argyllcms/patches/patch-spectro_usbio.c
diff -u pkgsrc/graphics/argyllcms/patches/patch-spectro_usbio.c:1.1 pkgsrc/graphics/argyllcms/patches/patch-spectro_usbio.c:1.2
--- pkgsrc/graphics/argyllcms/patches/patch-spectro_usbio.c:1.1 Fri Nov 17 17:37:48 2023
+++ pkgsrc/graphics/argyllcms/patches/patch-spectro_usbio.c Mon Mar 10 15:38:12 2025
@@ -1,15 +1,15 @@
-$NetBSD: patch-spectro_usbio.c,v 1.1 2023/11/17 17:37:48 jakllsch Exp $
+$NetBSD: patch-spectro_usbio.c,v 1.2 2025/03/10 15:38:12 jakllsch Exp $
Attempt to add NetBSD support to spectro/usbio
---- spectro/usbio.c.orig 2023-10-23 00:56:17.000000000 +0000
+--- spectro/usbio.c.orig 2024-09-24 22:29:21.000000000 +0000
+++ spectro/usbio.c
-@@ -96,7 +96,7 @@ static int icoms_usb_wait_io(
+@@ -101,7 +101,7 @@ static int icoms_usb_wait_io(
# include "usbio_ox.c"
#endif
#if defined(UNIX_X11)
--# if defined(__FreeBSD__) || defined(__OpenBSD__)
-+# if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__OpenBSD__)
+-# if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__)
++# if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined (__NetBSD__)
# include "usbio_bsd.c"
# else
# include "usbio_lx.c"
Index: pkgsrc/graphics/argyllcms/patches/patch-spectro_usbio__bsd.c
diff -u pkgsrc/graphics/argyllcms/patches/patch-spectro_usbio__bsd.c:1.1 pkgsrc/graphics/argyllcms/patches/patch-spectro_usbio__bsd.c:1.2
--- pkgsrc/graphics/argyllcms/patches/patch-spectro_usbio__bsd.c:1.1 Fri Nov 17 17:37:48 2023
+++ pkgsrc/graphics/argyllcms/patches/patch-spectro_usbio__bsd.c Mon Mar 10 15:38:12 2025
@@ -1,15 +1,15 @@
-$NetBSD: patch-spectro_usbio__bsd.c,v 1.1 2023/11/17 17:37:48 jakllsch Exp $
+$NetBSD: patch-spectro_usbio__bsd.c,v 1.2 2025/03/10 15:38:12 jakllsch Exp $
Attempt to make actually function with NetBSD ugen(4).
---- spectro/usbio_bsd.c.orig 2023-10-23 00:56:17.000000000 +0000
+--- spectro/usbio_bsd.c.orig 2024-09-24 22:29:21.000000000 +0000
+++ spectro/usbio_bsd.c
-@@ -67,13 +67,15 @@ icompaths *p
- #if defined(__FreeBSD__)
+@@ -69,13 +69,16 @@ icompaths *p
+ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
"/dev/usb/[0-9]*.*.0", /* FreeBSD >= 8 */
"/dev/ugen[0-9]*", /* FreeBSD < 8, but no .E */
+#elif defined(__NetBSD__)
-+ "/dev/ugen[0-9]*.00", /* NetBSD */
++ "/dev/ugen[0-9]*.00", /* NetBSD */
#else
- "/dev/ugen/[0-9]*.00", /* NetBSD, OpenBSD */
+ "/dev/ugen/[0-9]*.00", /* OpenBSD */
@@ -17,12 +17,12 @@ Attempt to make actually function with N
NULL
};
int vid, pid;
-- int nconfig = 0, nep = 0;
-+ unsigned int configix, nconfig, nep;
+ int nconfig = 0, nep = 0;
++ int configix;
char *dpath;
devType itype;
struct usb_idevice *usbd = NULL;
-@@ -85,6 +87,9 @@ icompaths *p
+@@ -87,6 +90,9 @@ icompaths *p
glob_t g;
int fd;
struct usb_device_info di;
@@ -32,7 +32,7 @@ Attempt to make actually function with N
int rv, found = 0;
if (paths[j] == NULL)
-@@ -121,12 +126,8 @@ icompaths *p
+@@ -123,12 +129,8 @@ icompaths *p
continue;
}
@@ -47,7 +47,7 @@ Attempt to make actually function with N
/* Allocate an idevice so that we can fill in the end point information */
if ((usbd = (struct usb_idevice *) calloc(sizeof(struct usb_idevice), 1)) == NULL) {
-@@ -136,8 +137,56 @@ icompaths *p
+@@ -138,8 +140,55 @@ icompaths *p
return ICOM_SYS;
}
@@ -95,7 +95,6 @@ Attempt to make actually function with N
+ usbd->EPINFO(ad).addr = ad;
+ usbd->EPINFO(ad).packetsize = UGETW(ued.ued_desc.wMaxPacketSize);
+ usbd->EPINFO(ad).type = ued.ued_desc.bmAttributes & IUSB_ENDPOINT_TYPE_MASK;
-+ usbd->EPINFO(ad).interface = uid.uid_desc.bInterfaceNumber;
+ usbd->EPINFO(ad).fd = -1;
+
+ a1logd(p->log, 6, "set ep ad 0x%x packetsize %d type %d\n",ad,usbd->EPINFO(ad).packetsize,usbd->EPINFO(ad).type);
@@ -105,7 +104,7 @@ Attempt to make actually function with N
/* Found a known instrument ? */
if ((itype = inst_usb_match(vid, pid, nep)) != instUnknown) {
char pname[400], *cp;
-@@ -310,7 +359,6 @@ char **pnames /* List of process names
+@@ -312,7 +361,6 @@ char **pnames /* List of process names
if (p->is_open)
p->close_port(p);
@@ -113,7 +112,7 @@ Attempt to make actually function with N
/* Make sure the port is open */
if (!p->is_open) {
int rv, i, iface;
-@@ -345,12 +393,16 @@ char **pnames /* List of process names
+@@ -347,12 +395,16 @@ char **pnames /* List of process names
p->cconfig = 1;
if (p->cconfig != config) {
@@ -130,7 +129,7 @@ Attempt to make actually function with N
}
/* We're done */
-@@ -363,6 +415,7 @@ char **pnames /* List of process names
+@@ -365,6 +417,7 @@ char **pnames /* List of process names
/* Claim all the interfaces */
for (iface = 0; iface < p->nifce; iface++) {
@@ -138,7 +137,7 @@ Attempt to make actually function with N
if ((rv = ioctl(p->usbd->fd, USBDEVFS_CLAIMINTERFACE, &iface)) < 0) {
struct usbdevfs_getdriver getd;
getd.interface = iface;
-@@ -387,6 +440,30 @@ char **pnames /* List of process names
+@@ -389,6 +442,30 @@ char **pnames /* List of process names
return ICOM_SYS;
}
}
@@ -169,7 +168,7 @@ Attempt to make actually function with N
}
/* Clear any errors. */
-@@ -408,25 +485,10 @@ char **pnames /* List of process names
+@@ -410,25 +487,10 @@ char **pnames /* List of process names
p->rd_qa = 8;
a1logd(p->log, 8, "usb_open_port: 'serial' read quanta = packet size = %d\n",p->rd_qa);
@@ -195,7 +194,7 @@ Attempt to make actually function with N
/* Install the cleanup signal handlers, and add to our cleanup list */
usb_install_signal_handlers(p);
-@@ -445,88 +507,23 @@ static int icoms_usb_transaction(
+@@ -447,88 +509,23 @@ static int icoms_usb_transaction(
int length,
unsigned int timeout /* In msec */
) {
@@ -291,7 +290,7 @@ Attempt to make actually function with N
if (cancelt != NULL) {
amutex_lock(cancelt->cmtx);
cancelt->hcancel = (void *)&req;
-@@ -534,85 +531,7 @@ a1logd(p->log, 8, "icoms_usb_transaction
+@@ -536,85 +533,7 @@ a1logd(p->log, 8, "icoms_usb_transaction
amutex_unlock(cancelt->cond); /* Signal any thread waiting for IO start */
amutex_unlock(cancelt->cmtx);
}
@@ -378,7 +377,7 @@ Attempt to make actually function with N
/* requested size wasn't transferred ? */
if (reqrv == ICOM_OK && xlength != length)
-@@ -621,6 +540,7 @@ a1logd(p->log, 8, "icoms_usb_transaction
+@@ -623,6 +542,7 @@ a1logd(p->log, 8, "icoms_usb_transaction
if (transferred != NULL)
*transferred = xlength;
@@ -386,7 +385,7 @@ Attempt to make actually function with N
done:;
if (cancelt != NULL) {
amutex_lock(cancelt->cmtx);
-@@ -630,20 +550,7 @@ done:;
+@@ -632,20 +552,7 @@ done:;
cancelt->state = 2;
amutex_unlock(cancelt->cmtx);
}
@@ -408,7 +407,7 @@ Attempt to make actually function with N
if (in_usb_rw < 0)
exit(0);
-@@ -651,7 +558,6 @@ done:;
+@@ -653,7 +560,6 @@ done:;
in_usb_rw--;
a1logd(p->log, 8, "coms_usb_transaction: returning err 0x%x and %d bytes\n",reqrv, xlength);
@@ -416,7 +415,7 @@ Attempt to make actually function with N
return reqrv;
}
-@@ -666,51 +572,34 @@ int value, int index, unsigned char *byt
+@@ -668,51 +574,34 @@ int value, int index, unsigned char *byt
int timeout) {
int reqrv = ICOM_OK;
int dirw = (requesttype & IUSB_REQ_DIR_MASK) == IUSB_REQ_HOST_TO_DEV ? 1 : 0;
@@ -484,7 +483,7 @@ Attempt to make actually function with N
/* Cancel i/o in another thread */
int icoms_usb_cancel_io(
-@@ -718,8 +607,9 @@ int icoms_usb_cancel_io(
+@@ -720,8 +609,9 @@ int icoms_usb_cancel_io(
usb_cancelt *cancelt
) {
int rv = ICOM_OK;
@@ -495,7 +494,7 @@ Attempt to make actually function with N
usb_lock_cancel(cancelt);
if (cancelt->hcancel != NULL)
rv = cancel_req(p, (usbio_req *)cancelt->hcancel, -1);
-@@ -740,6 +630,8 @@ int icoms_usb_resetep(
+@@ -742,6 +632,8 @@ int icoms_usb_resetep(
) {
int rv = ICOM_OK;
@@ -504,7 +503,7 @@ Attempt to make actually function with N
#ifdef NEVER // ~~99
if ((rv = ioctl(p->usbd->fd, USBDEVFS_RESETEP, &ep)) != 0) {
a1logd(p->log, 1, "icoms_usb_resetep failed with %d\n",rv);
-@@ -757,6 +649,8 @@ int icoms_usb_clearhalt(
+@@ -759,6 +651,8 @@ int icoms_usb_clearhalt(
) {
int rv = ICOM_OK;
Home |
Main Index |
Thread Index |
Old Index