Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make it compile with all the options.

This commit is contained in:
cube 2007-01-13 19:41:12 +00:00
parent 85272e875d
commit c7835953d1
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/ic/isp_inline.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: isp_inline.h,v 1.29 2006/11/16 01:32:51 christos Exp $ */
/* $NetBSD: isp_inline.h,v 1.30 2007/01/13 19:41:12 cube Exp $ */
/*
* This driver, which is contained in NetBSD in the files:
*
@ -165,12 +165,13 @@ isp_getrqentry(struct ispsoftc *isp, u_int16_t *iptrp,
return (0);
}
static INLINE void isp_print_qentry (struct ispsoftc *, char *, int, void *);
static INLINE void isp_print_qentry (struct ispsoftc *, const char *, int,
void *);
#define TBA (4 * (((QENTRY_LEN >> 2) * 3) + 1) + 1)
static INLINE void
isp_print_qentry(struct ispsoftc *isp, char *msg, int idx, void *arg)
isp_print_qentry(struct ispsoftc *isp, const char *msg, int idx, void *arg)
{
char tbuf[TBA];
int amt, i, j;

6
sys/dev/ic/isp_netbsd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: isp_netbsd.c,v 1.71 2006/11/16 01:32:51 christos Exp $ */
/* $NetBSD: isp_netbsd.c,v 1.72 2007/01/13 19:41:12 cube Exp $ */
/*
* This driver, which is contained in NetBSD in the files:
*
@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: isp_netbsd.c,v 1.71 2006/11/16 01:32:51 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: isp_netbsd.c,v 1.72 2007/01/13 19:41:12 cube Exp $");
#include <dev/ic/isp_netbsd.h>
#include <sys/scsiio.h>
@ -1122,7 +1122,7 @@ isp_async(struct ispsoftc *isp, ispasync_t cmd, void *arg)
isp_fw_dump(isp);
}
isp_reinit(isp);
isp_async(isp, ISPASYNC_FW_RESTART, NULL);
isp_async(isp, ISPASYNC_FW_RESTARTED, NULL);
#endif
break;
}

8
sys/dev/ic/isp_target.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: isp_target.c,v 1.28 2005/12/11 12:21:27 christos Exp $ */
/* $NetBSD: isp_target.c,v 1.29 2007/01/13 19:41:12 cube Exp $ */
/*
* This driver, which is contained in NetBSD in the files:
*
@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: isp_target.c,v 1.28 2005/12/11 12:21:27 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: isp_target.c,v 1.29 2007/01/13 19:41:12 cube Exp $");
#ifdef __NetBSD__
#include <dev/ic/isp_netbsd.h>
@ -910,7 +910,7 @@ isp_handle_ctio(struct ispsoftc *isp, ct_entry_t *ct)
{
void *xs;
int pl = ISP_LOGTDEBUG2;
char *fmsg = NULL;
const char *fmsg = NULL;
if (ct->ct_syshandle) {
xs = isp_find_xs(isp, ct->ct_syshandle);
@ -1070,7 +1070,7 @@ isp_handle_ctio2(struct ispsoftc *isp, ct2_entry_t *ct)
{
XS_T *xs;
int pl = ISP_LOGTDEBUG2;
char *fmsg = NULL;
const char *fmsg = NULL;
if (ct->ct_syshandle) {
xs = isp_find_xs(isp, ct->ct_syshandle);

6
sys/dev/ic/isp_target.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: isp_target.h,v 1.22 2005/12/11 12:21:27 christos Exp $ */
/* $NetBSD: isp_target.h,v 1.23 2007/01/13 19:41:12 cube Exp $ */
/*
* This driver, which is contained in NetBSD in the files:
*
@ -529,12 +529,14 @@ typedef struct {
#define ISP_TDQE(isp, msg, idx, arg) \
if (isp->isp_dblev & ISP_LOGTDEBUG2) isp_print_qentry(isp, msg, idx, arg)
#ifdef ISP_TARGET_FUNCTIONS
#ifdef ISP_TARGET_MODE
/*
* The functions below are for the publicly available
* target mode functions that are internal to the Qlogic driver.
*/
struct ispsoftc;
/*
* This function handles new response queue entry appropriate for target mode.
*/