From owner-FreeBSD-users-jp@jp.freebsd.org  Tue Feb  4 10:14:08 1997
Received: by jaz.jp.freebsd.org (8.8.5+2.7Wbeta5/8.7.3) id KAA08781
	Tue, 4 Feb 1997 10:14:08 +0900 (JST)
Received: by jaz.jp.freebsd.org (8.8.5+2.7Wbeta5/8.7.3) with ESMTP id KAA08776
	for <FreeBSD-users-jp@jp.freebsd.org>; Tue, 4 Feb 1997 10:14:07 +0900 (JST)
Received: from fdmmail.fujitsu.co.jp by fgwmail2.fujitsu.co.jp (8.8.5+2.7Wbeta5/3.5Wpl3-MX970128-Fujitsu Mail Gateway)
	id KAA07514; Tue, 4 Feb 1997 10:14:02 +0900 (JST)
Received: from festdssv.tokyo.se.fujitsu.co.jp by fdmmail.fujitsu.co.jp (8.6.12+2.5Wb4/3.3W9-MX970127-Fujitsu Domain Mail Master)
	id KAA26658; Tue, 4 Feb 1997 10:13:27 +0900
Received: from fest100.tokyo.se.fujitsu.co.jp (fest100.tokyo.se.fujitsu.co.jp [164.71.203.139]) by festdssv.tokyo.se.fujitsu.co.jp (8.7.1+2.6Wbeta4/3.3W9)
	id BAA03573; Tue, 4 Feb 1997 01:11:47 GMT
Message-Id: <9702040114.AA00038@fest100.tokyo.se.fujitsu.co.jp>
From: Hidetoshi Kimura <h-kimura@tokyo.se.fujitsu.co.jp>
Date: Tue, 04 Feb 1997 10:14:08 +0900
To: FreeBSD-users-jp@jp.freebsd.org
MIME-Version: 1.0
X-Mailer: AL-Mail 1.30
Content-Type: text/plain; charset=iso-2022-jp
Reply-To: FreeBSD-users-jp@jp.freebsd.org
Precedence: bulk
X-Distribute: distribute [version 2.1 (Alpha) patchlevel=19]
X-Sequence: FreeBSD-users-jp 9428
Subject: [FreeBSD-users-jp 9428] SCSI_DETACH Patch
Errors-To: owner-FreeBSD-users-jp@jp.freebsd.org
Sender: owner-FreeBSD-users-jp@jp.freebsd.org

$BLZB<!wIY;NDL$G$9!#(J

  ncv$B$OD4;R0-$$$N$G!"(Jscsiconf.h$B$H(Jspc.c$B$KBP$9$k%Q%C%A$r@h$K(J
  $BDs6!$7$^$9!#(J

  $B0J2<$KE:IU$7$^$9$N$G!";n$7$F$_$F$$$?$@$1$k$H=u$+$j$^$9!#(J
  $B;d$N4D6-$G$O(Jaic+CD-ROM$B$G$N$_3NG'$7$F$^$9$N$G!"$b$7$+$7$?(J
  $B$iITET9g$,$"$k$+$b$7$l$^$;$s!#(J

  spc.c$B$N%Q%C%A$K4X$7$F$OL$%F%9%H$G$9!"0lIt<j0c$$$K$h$j(J
  $B%Q%C%A$,$&$^$/Ev$?$i$J$$$+$b$7$l$^$;$s$,!#$=$N;~$O<j$G(J
  $BEv$F$F2<$5$$!J$9$_$^$;$s!K!#(J

----------------------------------------------------------
*** scsi/scsiconf.h.PAO	Tue Feb  4 02:28:21 1997
--- scsi/scsiconf.h	Tue Feb  4 03:16:44 1997
***************
*** 170,177 ****
--- 170,184 ----
  
  /* 80*/ struct extend_array *links;
  
+ #ifdef SCSI_DETACH
+ /* 84*/ u_char *free_unit;
+ #else
  /* 84*/ int free_unit;
+ #endif
  /* 88*/ struct scsi_device *next;	/* Next in list in the registry. */
+ #ifdef SCSI_DETACH
+ 	int max_unit_count;
+ #endif
  };
  
  /* SCSI_DEVICE_ENTRIES: A macro to generate all the entry points from the
***************
*** 485,490 ****
--- 492,505 ----
  errval scsi_change_def( struct scsi_link *sc_link, u_int32_t flags);
  #endif
  #endif	/* KERNEL */
+ 
+ #ifdef SCSI_DETACH
+ void	scsi_unit_use		__P((struct scsi_device *, int));
+ void	scsi_unit_unuse		__P((struct scsi_device *, int));
+ int	scsi_free_unit_get	__P((struct scsi_device *));
+ struct	scsibus_data		*scsi_extend_get(int);
+ void	scswi_detachdev		__P((struct scsibus_data *));
+ #endif
  
  #define SCSI_EXTERNALLEN (sizeof(struct scsi_link))
  
*** i386/isa/spc.c.PAO	Tue Feb  4 18:50:33 1997
--- i386/isa/spc.c	Tue Feb  4 16:00:32 1997
***************
*** 188,193 ****
--- 188,196 ----
  static int	spc_init(struct spc_data *);
  static void	spc_cleanup(struct spc_data *);
  static void	spc_dumpreg(int, const char *);
+ #ifdef SCSI_DETACH
+ static void	spcdetach __P((struct isa_device *dev));
+ #endif
  
  /* pccard support */
  #if NCRD > 0
***************
*** 298,303 ****
--- 301,309 ----
       */
  
      spc->alive = 0;
+ #ifdef SCSI_DETACH
+ 	spcdetach(&dp->isahd);
+ #endif
  #if 0
      printf("spc%d: unload\n", unit);
  #endif
***************
*** 384,389 ****
--- 390,408 ----
  
      return 16;
  }
+ 
+ #ifdef SCSI_DETACH
+ static void
+ spcdetach(dev)
+ struct isa_device *dev;
+ {
+ 	int unit = dev->id_unit;
+ 	struct scsibus_data *scbus;
+ 
+ 	scbus = (struct scsibus_data 
*)scsi_extend_get(spcdata[unit]->sc_link.scsibus);
+ 	scsi_detachdev(scbus);
+ }
+ #endif
  
  static int
  spc_attach(struct isa_device *dvp)
-------------------------------------------------------

$BLZB<(J  $B=(G/(J
NiftyID:NAC00507
E-Mail:h-kimura@tokyo.se.fujitsu.co.jp
