Move inclusion of opt_printf.h around so that we can compile all the

SCSI modules outside of a sub-build from the kernel.

Differential Revision: https://reviews.freebsd.org/D9653
Sponsored by: Netflix
This commit is contained in:
Warner Losh 2017-02-25 22:11:10 +00:00
parent e801ac7852
commit 2379d1d6ed
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=314283
4 changed files with 14 additions and 10 deletions

View File

@ -27,6 +27,8 @@
* SUCH DAMAGE.
*/
#include "opt_printf.h"
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@ -72,6 +74,15 @@ __FBSDID("$FreeBSD$");
#include "opt_cam.h"
/* Wild guess based on not wanting to grow the stack too much */
#define XPT_PRINT_MAXLEN 512
#ifdef PRINTF_BUFR_SIZE
#define XPT_PRINT_LEN PRINTF_BUFR_SIZE
#else
#define XPT_PRINT_LEN 128
#endif
_Static_assert(XPT_PRINT_LEN <= XPT_PRINT_MAXLEN, "XPT_PRINT_LEN is too large");
/*
* This is the maximum number of high powered commands (e.g. start unit)
* that can be outstanding at a particular time.

View File

@ -34,7 +34,6 @@
#ifdef _KERNEL
#include <sys/cdefs.h>
#include "opt_printf.h"
#endif
/* Forward Declarations */
@ -55,15 +54,6 @@ struct cam_path;
#ifdef _KERNEL
/* Wild guess based on not wanting to grow the stack too much */
#define XPT_PRINT_MAXLEN 512
#ifdef PRINTF_BUFR_SIZE
#define XPT_PRINT_LEN PRINTF_BUFR_SIZE
#else
#define XPT_PRINT_LEN 128
#endif
_Static_assert(XPT_PRINT_LEN <= XPT_PRINT_MAXLEN, "XPT_PRINT_LEN is too large");
/*
* Definition of an async handler callback block. These are used to add
* SIMs and peripherals to the async callback lists.

View File

@ -27,6 +27,8 @@ opt_mrouting.h:
echo "#define MROUTING 1" > ${.TARGET}
opt_natm.h:
echo "#define NATM 1" > ${.TARGET}
opt_printf.h:
echo "#define PRINTF_BUFR_SIZE 128" > ${.TARGET}
opt_scsi.h:
echo "#define SCSI_DELAY 15000" > ${.TARGET}
opt_wlan.h:

View File

@ -15,6 +15,7 @@ SRCS+= opt_pt.h
SRCS+= opt_sa.h
SRCS+= opt_ses.h
SRCS+= opt_ddb.h
SRCS+= opt_printf.h
SRCS+= device_if.h bus_if.h vnode_if.h
SRCS+= cam.c
SRCS+= cam_compat.c