Commit Graph

23 Commits

Author SHA1 Message Date
Ruslan Ermilov
5e4440632e Backout rev. 1.22 as the change that caused problems was also backed out. 2001-05-24 08:47:57 +00:00
Ruslan Ermilov
a6882bcc15 Work around the side effect of src/include/Makefile,v 1.137 changes.
(The proper fix is to add missing #include directives.)
2001-05-21 17:06:26 +00:00
Ruslan Ermilov
207ef320ab Execute this script in a "C" locale environment.
Currently, cs_CZ.ISO_8859-2 locale's collation sequence is
broken, and this caused grep(1) to skip some include files.

Reported by:	Michal Mertl <mime@traveller.cz>
2001-04-06 14:40:26 +00:00
Ruslan Ermilov
5c9b69e3ac Traverse ${DESTDIR}/usr/include in lexographical order.
This should fix problems reported recently on -current.
2001-03-27 16:15:25 +00:00
Kenneth D. Merry
3393f8daa3 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
2001-03-27 05:45:52 +00:00
Ruslan Ermilov
6bc4ee4976 Unbreak world build by adding the necessary <net/ethernet.h> include.
Submitted by:	Nickolay Dudorov <nnd@wint.itfs.nsk.su>
2000-08-02 07:37:44 +00:00
Ruslan Ermilov
a7e7621042 Fix an off-by-nine error when building a list of includes. 2000-08-01 08:15:06 +00:00
Jun-ichiro itojun Hagino
82b5a7cc73 more pre-requisite for new ipv6 ioctls 2000-07-04 16:26:47 +00:00
Poul-Henning Kamp
b1637716a8 sys/dkbad.h is no more. 1999-12-08 19:47:08 +00:00
Marcel Moolenaar
e2366ecc70 Avoid hardcoding any paths and variables. The include directory must
now be specified on the command line. Accept a '-s' option which
controls whether a switch-statement is to be used instead of a series
of if-statements.

Replace cpp with gcc -E.

Discussed with: bde
1999-12-03 12:50:02 +00:00
Guido van Rooij
80d3cdcb56 Unbreak build world by readding the necessary ipfilter includes. 1999-11-24 15:38:35 +00:00
Doug Rabson
5736689c84 ioctlname() is actually passed a register_t.
Pointed out by: bde
1999-11-10 08:41:08 +00:00
Doug Rabson
647fc635a3 Fix a boatload of warnings in the generated code on the alpha. 1999-11-09 22:32:29 +00:00
Peter Wemm
4e05e22361 Ack, ip_mroute.h is not an ipfilter include. :-/
Submitted by:	Mike Heffner <spock@techfour.net>
1999-10-11 16:14:22 +00:00
Peter Wemm
dd461ee06d Don't #include ipfilter includes that aren't there anymore. 1999-10-10 17:49:25 +00:00
Nick Hibma
03026827d2 Remove the inclusion of device.h. It's no longer there. 1999-10-06 07:45:30 +00:00
Poul-Henning Kamp
b55099e93d we don't have <sys/disk.h> anymore. 1999-05-08 05:48:54 +00:00
Bruce Evans
511a1b6f79 Generate code to interpret ioctl numbers for all ioctls defined in
headers under /usr/include, not just for the ones in <sys/ioctl.h>.
The generated file includes all headers that seem to define ioctls,
so build errors will probably occur if headers become less self-
sufficient than they are already.  This is a feature.  Build errors
shall not be fixed by adding more includes here.

Optionally generate a case statement instead of a list of if
statements.  This source must be edited to change this.  The case
statement should be non-optional.  It currently can't be, because
many ioctl numbers are not unique.
1998-10-16 15:33:17 +00:00
Garrett Wollman
628d2ac1b0 Fix up programs which expect <net/if.h> to include <sys/time.h> to instead
do it themselves.  (Some of these programs actually depended on this
beyond compiling the definition of struct ifinfo!)  Also fix up some
other #include messes while we're at it.
1996-12-10 17:11:53 +00:00
Bruce Evans
e18efcbd6a Run the headers through cpp -dM to find the #defines. The direct search
has been broken at least since 4.4Lite moved most of the #defines out of
<sys/ioctl.h>.  This should be done better.  Only a few headers are
searched.

Added some #includes so that ioctl.c compiles.  The networking headers
have a maze of undocumented interdependencies and ioctl.c now actually
supports networking ioctls.
1996-06-23 17:05:10 +00:00
David Greenman
0bb10c6613 Include queue.h in preparation for upcoming struct socket changes. 1996-03-11 12:56:07 +00:00
Steven Wallace
26e65fa36f Added $DESTDIR to
$DESTDIR/usr/include/sys/ioctl.h $DESTDIR/usr/include/sys/ioctl_compat.h
so ioctl.c is generated properly using 2.0 include files in $DESTDIR.
1994-09-15 05:47:41 +00:00
Rodney W. Grimes
9b50d90275 BSD 4.4 Lite Usr.bin Sources 1994-05-27 12:33:43 +00:00