Page MenuHomeFreeBSD
Files F101283547

D9653.diff
No OneTemporary
Actions

D9653.diff
View Options

Index: sys/cam/cam_xpt.h
===================================================================
--- sys/cam/cam_xpt.h
+++ sys/cam/cam_xpt.h
@@ -34,7 +34,6 @@
#ifdef _KERNEL
#include <sys/cdefs.h>
-#include "opt_printf.h"
#endif
/* Forward Declarations */
@@ -55,15 +54,6 @@
#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.
Index: sys/cam/cam_xpt.c
===================================================================
--- sys/cam/cam_xpt.c
+++ sys/cam/cam_xpt.c
@@ -27,6 +27,8 @@
* SUCH DAMAGE.
*/
+#include "opt_printf.h"
+
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -72,6 +74,15 @@
#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.
Index: sys/conf/config.mk
===================================================================
--- sys/conf/config.mk
+++ sys/conf/config.mk
@@ -27,6 +27,8 @@
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:
Index: sys/modules/cam/Makefile
===================================================================
--- sys/modules/cam/Makefile
+++ sys/modules/cam/Makefile
@@ -15,6 +15,7 @@
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

File Metadata

Mime Type
text/plain
Expires
Mon, Oct 28, 4:52 AM (14 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14365162
Default Alt Text
D9653.diff (2 KB)

Event Timeline