head	1.8;
access;
symbols
	RELENG_8_4:1.8.0.2
	RELENG_9_1_0_RELEASE:1.7.2.1.4.2
	RELENG_9_1:1.7.2.1.0.4
	RELENG_9_1_BP:1.7.2.1
	RELENG_8_3_0_RELEASE:1.5.32.1.8.1
	RELENG_8_3:1.5.32.1.0.8
	RELENG_8_3_BP:1.5.32.1
	RELENG_9_0_0_RELEASE:1.7.2.1.2.1
	RELENG_9_0:1.7.2.1.0.2
	RELENG_9_0_BP:1.7.2.1
	RELENG_9:1.7.0.2
	RELENG_9_BP:1.7
	RELENG_7_4_0_RELEASE:1.5.36.1
	RELENG_8_2_0_RELEASE:1.5.32.1.6.1
	RELENG_7_4:1.5.0.36
	RELENG_7_4_BP:1.5
	RELENG_8_2:1.5.32.1.0.6
	RELENG_8_2_BP:1.5.32.1
	RELENG_8_1_0_RELEASE:1.5.32.1.4.1
	RELENG_8_1:1.5.32.1.0.4
	RELENG_8_1_BP:1.5.32.1
	RELENG_7_3_0_RELEASE:1.5.34.1
	RELENG_7_3:1.5.0.34
	RELENG_7_3_BP:1.5
	RELENG_8_0_0_RELEASE:1.5.32.1.2.1
	RELENG_8_0:1.5.32.1.0.2
	RELENG_8_0_BP:1.5.32.1
	RELENG_8:1.5.0.32
	RELENG_8_BP:1.5
	RELENG_7_2_0_RELEASE:1.5.30.1
	RELENG_7_2:1.5.0.30
	RELENG_7_2_BP:1.5
	RELENG_7_1_0_RELEASE:1.5.28.1
	RELENG_6_4_0_RELEASE:1.5.26.1
	RELENG_7_1:1.5.0.28
	RELENG_7_1_BP:1.5
	RELENG_6_4:1.5.0.26
	RELENG_6_4_BP:1.5
	RELENG_7_0_0_RELEASE:1.5
	RELENG_6_3_0_RELEASE:1.5
	RELENG_7_0:1.5.0.24
	RELENG_7_0_BP:1.5
	RELENG_6_3:1.5.0.22
	RELENG_6_3_BP:1.5
	RELENG_7:1.5.0.20
	RELENG_7_BP:1.5
	RELENG_6_2_0_RELEASE:1.5
	RELENG_6_2:1.5.0.18
	RELENG_6_2_BP:1.5
	RELENG_5_5_0_RELEASE:1.5
	RELENG_5_5:1.5.0.16
	RELENG_5_5_BP:1.5
	RELENG_6_1_0_RELEASE:1.5
	RELENG_6_1:1.5.0.14
	RELENG_6_1_BP:1.5
	RELENG_6_0_0_RELEASE:1.5
	RELENG_6_0:1.5.0.12
	RELENG_6_0_BP:1.5
	RELENG_6:1.5.0.10
	RELENG_6_BP:1.5
	RELENG_5_4_0_RELEASE:1.5
	RELENG_5_4:1.5.0.8
	RELENG_5_4_BP:1.5
	RELENG_4_11_0_RELEASE:1.3.2.1
	RELENG_4_11:1.3.2.1.0.8
	RELENG_4_11_BP:1.3.2.1
	RELENG_5_3_0_RELEASE:1.5
	RELENG_5_3:1.5.0.6
	RELENG_5_3_BP:1.5
	RELENG_5:1.5.0.4
	RELENG_5_BP:1.5
	RELENG_4_10_0_RELEASE:1.3.2.1
	RELENG_4_10:1.3.2.1.0.6
	RELENG_4_10_BP:1.3.2.1
	RELENG_5_2_1_RELEASE:1.5
	RELENG_5_2_0_RELEASE:1.5
	RELENG_5_2:1.5.0.2
	RELENG_5_2_BP:1.5
	RELENG_4_9_0_RELEASE:1.3.2.1
	RELENG_4_9:1.3.2.1.0.4
	RELENG_4_9_BP:1.3.2.1
	RELENG_5_1_0_RELEASE:1.3
	RELENG_5_1:1.3.0.6
	RELENG_5_1_BP:1.3
	RELENG_4_8_0_RELEASE:1.3.2.1
	RELENG_4_8:1.3.2.1.0.2
	RELENG_4_8_BP:1.3.2.1
	RELENG_5_0_0_RELEASE:1.3
	RELENG_5_0:1.3.0.4
	RELENG_5_0_BP:1.3
	RELENG_4:1.3.0.2;
locks; strict;
comment	@# @;


1.8
date	2012.11.17.01.50.00;	author svnexp;	state Exp;
branches
	1.8.2.1;
next	1.7;

1.7
date	2011.05.17.17.37.58;	author phk;	state Exp;
branches
	1.7.2.1;
next	1.6;

1.6
date	2010.01.02.09.58.07;	author ed;	state Exp;
branches;
next	1.5;

1.5
date	2003.08.18.15.25.39;	author obrien;	state Exp;
branches
	1.5.10.1
	1.5.20.1
	1.5.26.1
	1.5.28.1
	1.5.30.1
	1.5.32.1
	1.5.34.1
	1.5.36.1;
next	1.4;

1.4
date	2003.08.17.08.28.45;	author gordon;	state Exp;
branches;
next	1.3;

1.3
date	2002.01.06.08.47.19;	author kbyanc;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2001.05.20.12.45.53;	author ru;	state Exp;
branches;
next	1.1;

1.1
date	2001.03.27.05.44.58;	author ken;	state Exp;
branches;
next	;

1.8.2.1
date	2012.11.17.01.50.00;	author svnexp;	state dead;
branches;
next	1.8.2.2;

1.8.2.2
date	2013.03.28.13.03.20;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.7.2.1.2.1
	1.7.2.1.4.1;
next	1.7.2.2;

1.7.2.2
date	2012.11.17.11.36.25;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.7.2.1.2.2;

1.7.2.1.2.2
date	2012.11.17.08.36.26;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.7.2.1.4.2;

1.7.2.1.4.2
date	2012.11.17.08.47.15;	author svnexp;	state Exp;
branches;
next	;

1.5.10.1
date	2012.11.17.07.40.36;	author svnexp;	state Exp;
branches;
next	;

1.5.20.1
date	2012.11.17.08.02.59;	author svnexp;	state Exp;
branches;
next	;

1.5.26.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.5.28.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.5.30.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.5.32.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.5.32.1.2.1
	1.5.32.1.4.1
	1.5.32.1.6.1
	1.5.32.1.8.1;
next	1.5.32.2;

1.5.32.2
date	2012.11.17.10.36.10;	author svnexp;	state Exp;
branches;
next	;

1.5.32.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.5.32.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.5.32.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.5.32.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.5.32.1.8.2;

1.5.32.1.8.2
date	2012.11.17.08.24.51;	author svnexp;	state Exp;
branches;
next	;

1.5.34.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.5.36.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.5.36.2;

1.5.36.2
date	2012.11.17.08.16.50;	author svnexp;	state Exp;
branches;
next	;

1.3.2.1
date	2002.10.10.19.24.35;	author kbyanc;	state Exp;
branches;
next	1.3.2.2;

1.3.2.2
date	2012.11.17.07.24.00;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.8
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/lib/libsbuf/Makefile 222033 2011-05-17 17:37:58Z phk $

LIB=		sbuf
SHLIBDIR?= 	/lib
SRCS=		subr_sbuf.c 

SHLIB_MAJOR	= 6

SYMBOL_MAPS=    ${.CURDIR}/Symbol.map
VERSION_DEF=	${.CURDIR}/Version.def

.PATH:	${.CURDIR}/../../sys/kern

.include <bsd.lib.mk>
@


1.8.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:03:20 +0000
@
text
@d1 14
@


1.8.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 10
# $FreeBSD: releng/8.4/lib/libsbuf/Makefile 119071 2003-08-18 15:25:39Z obrien $

LIB=	sbuf
SHLIBDIR?= /lib
SRCS=	subr_sbuf.c 
WARNS?= 2

.PATH:	${.CURDIR}/../../sys/kern

.include <bsd.lib.mk>
@


1.7
log
@SVN rev 222033 on 2011-05-17 17:37:58Z by phk

Bump shlib version
Instigate symbol versioning
Pray that I don't break the build.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.7.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.7.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/lib/libsbuf/Makefile 222033 2011-05-17 17:37:58Z phk $
@


1.7.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.7.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/lib/libsbuf/Makefile 222033 2011-05-17 17:37:58Z phk $
@


1.7.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.7.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/lib/libsbuf/Makefile 222033 2011-05-17 17:37:58Z phk $
@


1.6
log
@SVN rev 201381 on 2010-01-02 09:58:07Z by ed

Build lib/ with WARNS=6 by default.

Similar to libexec/, do the same with lib/. Make WARNS=6 the norm and
lower it when needed.

I'm setting WARNS?=0 for secure/. It seems secure/ includes the
Makefile.inc provided by lib/. I'm not going to touch that directory.
Most of the code there is contributed anyway.
@
text
@d3 8
a10 3
LIB=	sbuf
SHLIBDIR?= /lib
SRCS=	subr_sbuf.c 
@


1.5
log
@style.Makefile(5)
@
text
@a5 1
WARNS?= 2
@


1.5.20.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/lib/libsbuf/Makefile 119071 2003-08-18 15:25:39Z obrien $
@


1.5.10.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/lib/libsbuf/Makefile 119071 2003-08-18 15:25:39Z obrien $
@


1.5.36.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.5.36.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/lib/libsbuf/Makefile 119071 2003-08-18 15:25:39Z obrien $
@


1.5.34.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.5.32.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.5.32.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/lib/libsbuf/Makefile 119071 2003-08-18 15:25:39Z obrien $
@


1.5.32.1.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.5.32.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/lib/libsbuf/Makefile 119071 2003-08-18 15:25:39Z obrien $
@


1.5.32.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.5.32.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.5.32.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.5.30.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.5.28.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.5.26.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.4
log
@Stage 3 of dynamic root support. Make all the libraries needed to run
binaries in /bin and /sbin installed in /lib. Only the versioned files
reside in /lib, the .so symlink continues to live /usr/lib so the
toolchain doesn't need to be modified.
@
text
@d4 1
a4 1
SHLIBDIR?=	/lib
@


1.3
log
@Enable WARNS?=2.
@
text
@d4 1
@


1.3.2.1
log
@MFC libsbuf (rev 1.1 - 1.3).

Approved by:	des
@
text
@@


1.3.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/lib/libsbuf/Makefile 104817 2002-10-10 19:24:35Z kbyanc $
@


1.2
log
@Removed -I${.CURDIR}/../../sys from CFLAGS.
@
text
@d1 1
a1 1
# $FreeBSD: src/lib/libsbuf/Makefile,v 1.1 2001/03/27 05:44:58 ken Exp $
d5 1
@


1.1
log
@Rewrite of the CAM error recovery code.

Some of the major changes include:

	- The SCSI error handling portion of cam_periph_error() has
	  been broken out into a number of subfunctions to better
	  modularize the code that handles the hierarchy of SCSI errors.
	  As a result, the code is now much easier to read.

	- String handling and error printing has been significantly
	  revamped.  We now use sbufs to do string formatting instead
	  of using printfs (for the kernel) and snprintf/strncat (for
	  userland) as before.

	  There is a new catchall error printing routine,
	  cam_error_print() and its string-based counterpart,
	  cam_error_string() that allow the kernel and userland
	  applications to pass in a CCB and have errors printed out
	  properly, whether or not they're SCSI errors.  Among other
	  things, this helped eliminate a fair amount of duplicate code
	  in camcontrol.

	  We now print out more information than before, including
	  the CAM status and SCSI status and the error recovery action
	  taken to remedy the problem.

	- sbufs are now available in userland, via libsbuf.  This
	  change was necessary since most of the error printing code
	  is shared between libcam and the kernel.

	- A new transfer settings interface is included in this checkin.
	  This code is #ifdef'ed out, and is primarily intended to aid
	  discussion with HBA driver authors on the final form the
	  interface should take.  There is example code in the ahc(4)
	  driver that implements the HBA driver side of the new
	  interface.  The new transfer settings code won't be enabled
	  until we're ready to switch all HBA drivers over to the new
	  interface.

src/Makefile.inc1,
lib/Makefile:		Add libsbuf.  It must be built before libcam,
			since libcam uses sbuf routines.

libcam/Makefile:	libcam now depends on libsbuf.

libsbuf/Makefile:	Add a makefile for libsbuf.  This pulls in the
			sbuf sources from sys/kern.

bsd.libnames.mk:	Add LIBSBUF.

camcontrol/Makefile:	Add -lsbuf.  Since camcontrol is statically
			linked, we can't depend on the dynamic linker
			to pull in libsbuf.

camcontrol.c:		Use cam_error_print() instead of checking for
			CAM_SCSI_STATUS_ERROR on every failed CCB.

sbuf.9:			Change the prototypes for sbuf_cat() and
			sbuf_cpy() so that the source string is now a
			const char *.  This is more in line wth the
			standard system string functions, and helps
			eliminate warnings when dealing with a const
			source buffer.

			Fix a typo.

cam.c:			Add description strings for the various CAM
			error status values, as well as routines to
			look up those strings.

			Add new cam_error_string() and
			cam_error_print() routines for userland and
			the kernel.

cam.h:			Add a new CAM flag, CAM_RETRY_SELTO.

			Add enumerated types for the various options
			available with cam_error_print() and
			cam_error_string().

cam_ccb.h:		Add new transfer negotiation structures/types.

			Change inq_len in the ccb_getdev structure to
			be "reserved".  This field has never been
			filled in, and will be removed when we next
			bump the CAM version.

cam_debug.h:		Fix typo.

cam_periph.c:		Modularize cam_periph_error().  The SCSI error
			handling part of cam_periph_error() is now
			in camperiphscsistatuserror() and
			camperiphscsisenseerror().

			In cam_periph_lock(), increase the reference
			count on the periph while we wait for our lock
			attempt to succeed so that the periph won't go
			away while we're sleeping.

cam_xpt.c:		Add new transfer negotiation code.  (ifdefed
			out)

			Add a new function, xpt_path_string().  This
			is a string/sbuf analog to xpt_print_path().

scsi_all.c:		Revamp string handing and error printing code.
			We now use sbufs for much of the string
			formatting code.  More of that code is shared
			between userland the kernel.

scsi_all.h:		Get rid of SS_TURSTART, it wasn't terribly
			useful in the first place.

			Add a new error action, SS_REQSENSE.  (Send a
			request sense and then retry the command.)
			This is useful when the controller hasn't
			performed autosense for some reason.

			Change the default actions around a bit.

scsi_cd.c,
scsi_da.c,
scsi_pt.c,
scsi_ses.c:		SF_RETRY_SELTO -> CAM_RETRY_SELTO.  Selection
			timeouts shouldn't be covered by a sense flag.

scsi_pass.[ch]:		SF_RETRY_SELTO -> CAM_RETRY_SELTO.

			Get rid of the last vestiges of a read/write
			interface.

libkern/bsearch.c,
sys/libkern.h,
conf/files:		Add bsearch.c, which is needed for some of the
			new table lookup routines.

aic7xxx_freebsd.c:	Define AHC_NEW_TRAN_SETTINGS if
			CAM_NEW_TRAN_CODE is defined.

sbuf.h,
subr_sbuf.c:		Add the appropriate #ifdefs so sbufs can
			compile and run in userland.

			Change sbuf_printf() to use vsnprintf()
			instead of kvprintf(), which is only available
			in the kernel.

			Change the source string for sbuf_cpy() and
			sbuf_cat() to be a const char *.

			Add __BEGIN_DECLS and __END_DECLS around
			function prototypes since they're now exported
			to userland.

kdump/mkioctls:		Include stdio.h before cam.h since cam.h now
			includes a function with a FILE * argument.

Submitted by:	gibbs (mostly)
Reviewed by:	jdp, marcel (libsbuf makefile changes)
Reviewed by:	des (sbuf changes)
Reviewed by:	ken
@
text
@d1 1
a1 1
# $FreeBSD$
a6 3

SDIR= ${.CURDIR}/../../sys
CFLAGS+=-I${SDIR}
@

