*BSD News Article 6446


Return to BSD News archive

Newsgroups: comp.unix.bsd
Path: sserve!manuel.anu.edu.au!munnari.oz.au!sgiblab!spool.mu.edu!agate!tfs.com!tfs.com!julian
From: julian@tfs.com (Julian Elischer)
Subject: Two small patches for the SCSI beta3 release.
Message-ID: <1992Oct13.002025.4037@tfs.com>
Organization: TRW Financial Systems
Date: Tue, 13 Oct 1992 00:20:25 GMT
Lines: 67


the following patches fix a couple of problems that some people have
been having:


*** scsiconf.c.oops	Mon Oct 12 17:08:22 1992
--- scsiconf.c	Mon Oct 12 17:18:12 1992
***************
*** 148,155 ****
  
  #ifdef	KODAK_SCANNER
  	printf("waiting for scsi devices to settle\n");
! 	spinwait(1000 * 30);
  #endif	KODAK_SCANNER
  	targ = 0;
  	while(targ < 8)
  	{
--- 148,158 ----
  
  #ifdef	KODAK_SCANNER
  	printf("waiting for scsi devices to settle\n");
! #define SCSI_DELAY 15
! #else
! #define SCSI_DELAY 2
  #endif	KODAK_SCANNER
+ 	spinwait(1000 * SCSI_DELAY);
  	targ = 0;
  	while(targ < 8)
  	{
***************
*** 384,390 ****
  {
  	int	numents = (sizeof(knowndevs)/sizeof(struct scsidevs)) - 1;
  	int	count = 0;
! 	int			bestmatches;
  	struct	scsidevs	*bestmatch = (struct scsidevs *)0;
  	struct	scsidevs	*thisentry = knowndevs;
  
--- 387,393 ----
  {
  	int	numents = (sizeof(knowndevs)/sizeof(struct scsidevs)) - 1;
  	int	count = 0;
! 	int			bestmatches = 0;
  	struct	scsidevs	*bestmatch = (struct scsidevs *)0;
  	struct	scsidevs	*thisentry = knowndevs;
  
*** sd.c.oops	Mon Oct 12 17:05:47 1992
--- sd.c	Mon Oct 12 17:05:47 1992
***************
*** 791,797 ****
  	/*******************************************************\
  	* If the inflo is already loaded, use it		*
  	\*******************************************************/
! 	if(sd->flags & SDHAVELABEL) return;
  
  	bzero(&sd->disklabel,sizeof(struct disklabel));
  	/*******************************************************\
--- 791,797 ----
  	/*******************************************************\
  	* If the inflo is already loaded, use it		*
  	\*******************************************************/
! 	if(sd->flags & SDHAVELABEL) return(ESUCCESS);
  
  	bzero(&sd->disklabel,sizeof(struct disklabel));
  	/*******************************************************\