diff options
Diffstat (limited to 'graphics/sane-backends/files')
| -rw-r--r-- | graphics/sane-backends/files/patch-ad | 19 | ||||
| -rw-r--r-- | graphics/sane-backends/files/patch-ae | 172 | ||||
| -rw-r--r-- | graphics/sane-backends/files/patch-doc_Makefile.in | 36 |
3 files changed, 36 insertions, 191 deletions
diff --git a/graphics/sane-backends/files/patch-ad b/graphics/sane-backends/files/patch-ad deleted file mode 100644 index aa5e99f75678..000000000000 --- a/graphics/sane-backends/files/patch-ad +++ /dev/null @@ -1,19 +0,0 @@ ---- tools/Makefile.in.orig Sun Mar 5 22:45:19 2000 -+++ tools/Makefile.in Wed Apr 19 06:00:00 2000 -@@ -25,6 +25,7 @@ - MKDIR = $(top_srcdir)/mkinstalldirs - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_DATA = @INSTALL_DATA@ - RANLIB = @RANLIB@ - -@@ -65,7 +66,7 @@ - all: $(DESTINATIONS) - - install: sane-config -- $(INSTALL_PROGRAM) sane-config $(bindir)/sane-config -+ $(INSTALL_SCRIPT) sane-config $(bindir)/sane-config - - sane-config: sane-config.in $(top_builddir)/config.status - cd $(top_builddir) \ diff --git a/graphics/sane-backends/files/patch-ae b/graphics/sane-backends/files/patch-ae deleted file mode 100644 index 8d7ef7a6640a..000000000000 --- a/graphics/sane-backends/files/patch-ae +++ /dev/null @@ -1,172 +0,0 @@ ---- sanei/sanei_scsi.c.orig Fri Dec 1 05:02:30 2000 -+++ sanei/sanei_scsi.c Sat Dec 23 04:14:27 2000 -@@ -2425,6 +2425,169 @@ - cam_freeccb(ccb); - return SANE_STATUS_GOOD; - } -+ -+#define WE_HAVE_FIND_DEVICES -+ -+int -+cam_compare_inquiry(int fd, path_id_t path_id, -+ target_id_t target_id, lun_id_t target_lun, -+ const char *vendor, const char *product, const char *type) -+{ -+ struct ccb_dev_match cdm; -+ struct device_match_pattern *pattern; -+ struct scsi_inquiry_data *inq; -+ int retval = 0; -+ -+ /* build ccb for device match */ -+ bzero(&cdm, sizeof(cdm)); -+ cdm.ccb_h.func_code = XPT_DEV_MATCH; -+ -+ /* result buffer */ -+ cdm.match_buf_len = sizeof(struct dev_match_result); -+ cdm.matches = (struct dev_match_result *)malloc(cdm.match_buf_len); -+ cdm.num_matches = 0; -+ -+ /* pattern buffer */ -+ cdm.num_patterns = 1; -+ cdm.pattern_buf_len = sizeof(struct dev_match_pattern); -+ cdm.patterns = (struct dev_match_pattern *)malloc(cdm.pattern_buf_len); -+ -+ /* assemble conditions */ -+ cdm.patterns[0].type = DEV_MATCH_DEVICE; -+ pattern = &cdm.patterns[0].pattern.device_pattern; -+ pattern->flags = DEV_MATCH_PATH | DEV_MATCH_TARGET | DEV_MATCH_LUN; -+ pattern->path_id = path_id; -+ pattern->target_id = target_id; -+ pattern->target_lun = target_lun; -+ -+ if (ioctl(fd, CAMIOCOMMAND, &cdm) == -1) { -+ DBG (1, "error sending CAMIOCOMMAND ioctl"); -+ retval = -1; -+ goto ret; -+ } -+ -+ if ((cdm.ccb_h.status != CAM_REQ_CMP) -+ || ((cdm.status != CAM_DEV_MATCH_LAST) -+ && (cdm.status != CAM_DEV_MATCH_MORE))) { -+ DBG (1, "got CAM error %#x, CDM error %d\n", -+ cdm.ccb_h.status, cdm.status); -+ retval = -1; -+ goto ret; -+ } -+ -+ if (cdm.num_matches == 0) { -+ DBG (1, "not found\n"); -+ retval = -1; -+ goto ret; -+ } -+ -+ if (cdm.matches[0].type != DEV_MATCH_DEVICE) { -+ DBG (1, "no device match\n"); -+ retval = -1; -+ goto ret; -+ } -+ -+ inq = &cdm.matches[0].result.device_result.inq_data; -+ if ((vendor && cam_strmatch(inq->vendor, vendor, SID_VENDOR_SIZE)) || -+ (product && cam_strmatch(inq->product, product, SID_PRODUCT_SIZE))) -+ retval = 1; -+ -+ ret: -+ free(cdm.patterns); -+ free(cdm.matches); -+ return(retval); -+} -+ -+void -+sanei_scsi_find_devices (const char *findvendor, const char *findmodel, -+ const char *findtype, -+ int findbus, int findchannel, int findid, int findlun, -+ SANE_Status (*attach) (const char *dev)) -+{ -+ int fd; -+ struct ccb_dev_match cdm; -+ struct periph_match_pattern *pattern; -+ struct periph_match_result *result; -+ int i; -+ char devname[16]; -+ -+ DBG_INIT(); -+ -+ if ((fd = open(XPT_DEVICE, O_RDWR)) == -1) { -+ DBG (1, "could not open %s\n", XPT_DEVICE); -+ return; -+ } -+ -+ /* build ccb for device match */ -+ bzero(&cdm, sizeof(cdm)); -+ cdm.ccb_h.func_code = XPT_DEV_MATCH; -+ -+ /* result buffer */ -+ cdm.match_buf_len = sizeof(struct dev_match_result) * 100; -+ cdm.matches = (struct dev_match_result *)malloc(cdm.match_buf_len); -+ cdm.num_matches = 0; -+ -+ /* pattern buffer */ -+ cdm.num_patterns = 1; -+ cdm.pattern_buf_len = sizeof(struct dev_match_pattern); -+ cdm.patterns = (struct dev_match_pattern *)malloc(cdm.pattern_buf_len); -+ -+ /* assemble conditions ... findchannel is ignored */ -+ cdm.patterns[0].type = DEV_MATCH_PERIPH; -+ pattern = &cdm.patterns[0].pattern.periph_pattern; -+ pattern->flags = PERIPH_MATCH_NAME; -+ strcpy(pattern->periph_name, "pass"); -+ if (findbus != -1) { -+ pattern->path_id = findbus; -+ pattern->flags |= PERIPH_MATCH_PATH; -+ } -+ if (findid != -1) { -+ pattern->target_id = findid; -+ pattern->flags |= PERIPH_MATCH_TARGET; -+ } -+ if (findlun != -1) { -+ pattern->target_lun = findlun; -+ pattern->flags |= PERIPH_MATCH_LUN; -+ } -+ -+ /* result loop */ -+ do { -+ if (ioctl(fd, CAMIOCOMMAND, &cdm) == -1) { -+ DBG (1, "error sending CAMIOCOMMAND ioctl"); -+ break; -+ } -+ -+ if ((cdm.ccb_h.status != CAM_REQ_CMP) -+ || ((cdm.status != CAM_DEV_MATCH_LAST) -+ && (cdm.status != CAM_DEV_MATCH_MORE))) { -+ DBG (1, "got CAM error %#x, CDM error %d\n", -+ cdm.ccb_h.status, cdm.status); -+ break; -+ } -+ -+ for (i = 0; i < cdm.num_matches; i++) { -+ if (cdm.matches[i].type != DEV_MATCH_PERIPH) -+ continue; -+ result = &cdm.matches[i].result.periph_result; -+ DBG (4, "%s%d on scbus%d %d:%d\n", -+ result->periph_name, result->unit_number, -+ result->path_id, result->target_id, result->target_lun); -+ if (cam_compare_inquiry(fd, result->path_id, -+ result->target_id, result->target_lun, -+ findvendor, findmodel, findtype) == 0) { -+ sprintf(devname, "/dev/%s%d", result->periph_name, result->unit_number); -+ (*attach) (devname); -+ } -+ } -+ } while ((cdm.ccb_h.status == CAM_REQ_CMP) -+ && (cdm.status == CAM_DEV_MATCH_MORE)); -+ -+ free(cdm.patterns); -+ free(cdm.matches); -+ close(fd); -+ return; -+} -+ - #endif - - diff --git a/graphics/sane-backends/files/patch-doc_Makefile.in b/graphics/sane-backends/files/patch-doc_Makefile.in new file mode 100644 index 000000000000..96ef5ff78ac0 --- /dev/null +++ b/graphics/sane-backends/files/patch-doc_Makefile.in @@ -0,0 +1,36 @@ +--- doc/Makefile.in.orig Mon Jun 11 03:20:55 2001 ++++ doc/Makefile.in Tue Jul 3 04:48:46 2001 +@@ -20,7 +20,7 @@ + includedir = @includedir@ + oldincludedir = /usr/include + configdir = ${sysconfdir}/sane.d +-docdir=$(prefix)/doc/sane-@VERSION@ ++docdir=$(datadir)/doc/sane + + MKDIR = $(top_srcdir)/mkinstalldirs + INSTALL = @INSTALL@ +@@ -55,7 +55,7 @@ + EMACS = xemacs + WWW_PATH= /home/httpd/html/sane/ + +-all: sane.ps $(MANPAGES) ++all: $(MANPAGES) + + %.1 %.5 %.7: %.man + @sed -e 's|@DATADIR@|$(datadir)|g' \ +@@ -80,6 +80,7 @@ + echo installing $${page} in $(mandir)/man7/$${page}...; \ + $(INSTALL_DATA) $${page} $(mandir)/man7/$${page} || exit 1; \ + done ++ifndef NOPORTDOCS + $(MKDIR) $(docdir) + @for readme in $(READMES); do \ + echo installing $${readme} in $(docdir)/$${readme}...; \ +@@ -99,6 +100,7 @@ + echo installing $${doc} in $(docdir)/$${doc}...; \ + $(INSTALL_DATA) $${doc} $(docdir)/$${doc}; \ + done ++endif + + uninstall: + @for page in $(SECT1); do \ |