summaryrefslogtreecommitdiffstats
path: root/sys/dev/isp/isp.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/isp/isp.c')
-rw-r--r--sys/dev/isp/isp.c405
1 files changed, 203 insertions, 202 deletions
diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c
index a1f4ac0..219c62c 100644
--- a/sys/dev/isp/isp.c
+++ b/sys/dev/isp/isp.c
@@ -32,17 +32,18 @@
* (qlogicisp.c) and Dave Miller's SBus version of same (qlogicisp.c). Some
* ideas dredged from the Solaris driver.
*/
+#ifdef __FreeBSD__
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+#endif
/*
* Include header file appropriate for platform we're building on.
*/
-
#ifdef __NetBSD__
#include <dev/ic/isp_netbsd.h>
#endif
#ifdef __FreeBSD__
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
#include <dev/isp/isp_freebsd.h>
#endif
#ifdef __OpenBSD__
@@ -113,12 +114,12 @@ static const char bun[] =
/*
* Local function prototypes.
*/
-static int isp_parse_async(struct ispsoftc *, u_int16_t);
+static int isp_parse_async(struct ispsoftc *, uint16_t);
static int isp_handle_other_response(struct ispsoftc *, int, isphdr_t *,
- u_int16_t *);
+ uint16_t *);
static void
isp_parse_status(struct ispsoftc *, ispstatusreq_t *, XS_T *);
-static void isp_fastpost_complete(struct ispsoftc *, u_int16_t);
+static void isp_fastpost_complete(struct ispsoftc *, uint16_t);
static int isp_mbox_continue(struct ispsoftc *);
static void isp_scsi_init(struct ispsoftc *);
static void isp_scsi_channel_init(struct ispsoftc *, int);
@@ -126,7 +127,7 @@ static void isp_fibre_init(struct ispsoftc *);
static void isp_mark_getpdb_all(struct ispsoftc *);
static int isp_getmap(struct ispsoftc *, fcpos_map_t *);
static int isp_getpdb(struct ispsoftc *, int, isp_pdb_t *);
-static u_int64_t isp_get_portname(struct ispsoftc *, int, int);
+static uint64_t isp_get_portname(struct ispsoftc *, int, int);
static int isp_fclink_test(struct ispsoftc *, int);
static char *isp2100_fw_statename(int);
static int isp_pdb_sync(struct ispsoftc *);
@@ -142,11 +143,11 @@ static void isp_update(struct ispsoftc *);
static void isp_update_bus(struct ispsoftc *, int);
static void isp_setdfltparm(struct ispsoftc *, int);
static int isp_read_nvram(struct ispsoftc *);
-static void isp_rdnvram_word(struct ispsoftc *, int, u_int16_t *);
-static void isp_parse_nvram_1020(struct ispsoftc *, u_int8_t *);
-static void isp_parse_nvram_1080(struct ispsoftc *, int, u_int8_t *);
-static void isp_parse_nvram_12160(struct ispsoftc *, int, u_int8_t *);
-static void isp_parse_nvram_2100(struct ispsoftc *, u_int8_t *);
+static void isp_rdnvram_word(struct ispsoftc *, int, uint16_t *);
+static void isp_parse_nvram_1020(struct ispsoftc *, uint8_t *);
+static void isp_parse_nvram_1080(struct ispsoftc *, int, uint8_t *);
+static void isp_parse_nvram_12160(struct ispsoftc *, int, uint8_t *);
+static void isp_parse_nvram_2100(struct ispsoftc *, uint8_t *);
/*
* Reset Hardware.
@@ -160,7 +161,7 @@ void
isp_reset(struct ispsoftc *isp)
{
mbreg_t mbs;
- u_int16_t code_org;
+ uint16_t code_org;
int loops, i, dodnld = 1;
char *btype = "????";
@@ -282,7 +283,7 @@ isp_reset(struct ispsoftc *isp)
*/
} else if (IS_ULTRA2(isp)) {
static const char m[] = "bus %d is in %s Mode";
- u_int16_t l;
+ uint16_t l;
sdparam *sdp = isp->isp_param;
isp->isp_clock = 100;
@@ -524,7 +525,7 @@ again:
* be done later after fetching from NVRAM.
*/
if (IS_SCSI(isp)) {
- u_int16_t tmp = isp->isp_mdvec->dv_conf1;
+ uint16_t tmp = isp->isp_mdvec->dv_conf1;
/*
* Busted FIFO. Turn off all but burst enables.
*/
@@ -1037,7 +1038,7 @@ isp_scsi_init(struct ispsoftc *isp)
#endif
#endif
if (mbs.param[1] != 0) {
- u_int16_t sfeat = mbs.param[1];
+ uint16_t sfeat = mbs.param[1];
isp_mboxcmd(isp, &mbs, MBLOGALL);
if (mbs.param[0] == MBOX_COMMAND_COMPLETE) {
isp_prt(isp, ISP_LOGINFO,
@@ -1080,7 +1081,7 @@ isp_scsi_channel_init(struct ispsoftc *isp, int channel)
*/
for (tgt = 0; tgt < MAX_TARGETS; tgt++) {
int lun;
- u_int16_t sdf;
+ uint16_t sdf;
if (sdp->isp_devparam[tgt].dev_enable == 0) {
continue;
@@ -1179,7 +1180,7 @@ isp_fibre_init(struct ispsoftc *isp)
isp_icb_t local, *icbp = &local;
mbreg_t mbs;
int loopid;
- u_int64_t nwwn, pwwn;
+ uint64_t nwwn, pwwn;
fcp = isp->isp_param;
@@ -1406,10 +1407,10 @@ isp_fibre_init(struct ispsoftc *isp)
MAKE_NODE_NAME_FROM_WWN(icbp->icb_portname, pwwn);
isp_prt(isp, ISP_LOGDEBUG1,
"Setting ICB Node 0x%08x%08x Port 0x%08x%08x",
- ((u_int32_t) (nwwn >> 32)),
- ((u_int32_t) (nwwn & 0xffffffff)),
- ((u_int32_t) (pwwn >> 32)),
- ((u_int32_t) (pwwn & 0xffffffff)));
+ ((uint32_t) (nwwn >> 32)),
+ ((uint32_t) (nwwn & 0xffffffff)),
+ ((uint32_t) (pwwn >> 32)),
+ ((uint32_t) (pwwn & 0xffffffff)));
} else {
isp_prt(isp, ISP_LOGDEBUG1, "Not using any WWNs");
icbp->icb_fwoptions &= ~(ICBOPT_BOTH_WWNS|ICBOPT_FULL_LOGIN);
@@ -1548,10 +1549,10 @@ isp_getpdb(struct ispsoftc *isp, int id, isp_pdb_t *pdbp)
return (-1);
}
-static u_int64_t
+static uint64_t
isp_get_portname(struct ispsoftc *isp, int loopid, int nodename)
{
- u_int64_t wwn = 0;
+ uint64_t wwn = 0;
mbreg_t mbs;
MEMZERO(&mbs, sizeof (mbs));
@@ -1569,14 +1570,14 @@ isp_get_portname(struct ispsoftc *isp, int loopid, int nodename)
isp_mboxcmd(isp, &mbs, MBLOGALL & ~MBOX_COMMAND_PARAM_ERROR);
if (mbs.param[0] == MBOX_COMMAND_COMPLETE) {
wwn =
- (((u_int64_t)(mbs.param[2] & 0xff)) << 56) |
- (((u_int64_t)(mbs.param[2] >> 8)) << 48) |
- (((u_int64_t)(mbs.param[3] & 0xff)) << 40) |
- (((u_int64_t)(mbs.param[3] >> 8)) << 32) |
- (((u_int64_t)(mbs.param[6] & 0xff)) << 24) |
- (((u_int64_t)(mbs.param[6] >> 8)) << 16) |
- (((u_int64_t)(mbs.param[7] & 0xff)) << 8) |
- (((u_int64_t)(mbs.param[7] >> 8)));
+ (((uint64_t)(mbs.param[2] & 0xff)) << 56) |
+ (((uint64_t)(mbs.param[2] >> 8)) << 48) |
+ (((uint64_t)(mbs.param[3] & 0xff)) << 40) |
+ (((uint64_t)(mbs.param[3] >> 8)) << 32) |
+ (((uint64_t)(mbs.param[6] & 0xff)) << 24) |
+ (((uint64_t)(mbs.param[6] >> 8)) << 16) |
+ (((uint64_t)(mbs.param[7] & 0xff)) << 8) |
+ (((uint64_t)(mbs.param[7] >> 8)));
}
return (wwn);
}
@@ -1597,7 +1598,7 @@ isp_fclink_test(struct ispsoftc *isp, int usdelay)
};
mbreg_t mbs;
int count, check_for_fabric;
- u_int8_t lwfs;
+ uint8_t lwfs;
fcparam *fcp;
struct lportdb *lp;
isp_pdb_t pdb;
@@ -1614,8 +1615,8 @@ isp_fclink_test(struct ispsoftc *isp, int usdelay)
lwfs = FW_CONFIG_WAIT;
count = 0;
while (count < usdelay) {
- u_int64_t enano;
- u_int32_t wrk;
+ uint64_t enano;
+ uint32_t wrk;
NANOTIME_T hra, hrb;
GET_NANOTIME(&hra);
@@ -1640,7 +1641,7 @@ isp_fclink_test(struct ispsoftc *isp, int usdelay)
isp_prt(isp, ISP_LOGDEBUG1,
"usec%d: 0x%lx->0x%lx enano 0x%x%08x",
count, (long) GET_NANOSEC(&hra), (long) GET_NANOSEC(&hrb),
- (u_int32_t)(enano >> 32), (u_int32_t)(enano & 0xffffffff));
+ (uint32_t)(enano >> 32), (uint32_t)(enano & 0xffffffff));
/*
* If the elapsed time is less than 1 millisecond,
@@ -1648,23 +1649,23 @@ isp_fclink_test(struct ispsoftc *isp, int usdelay)
* waiting.
*
* This peculiar code is an attempt to try and avoid
- * invoking u_int64_t math support functions for some
+ * invoking uint64_t math support functions for some
* platforms where linkage is a problem.
*/
if (enano < (1000 * 1000)) {
count += 1000;
enano = (1000 * 1000) - enano;
- while (enano > (u_int64_t) 4000000000U) {
+ while (enano > (uint64_t) 4000000000U) {
USEC_SLEEP(isp, 4000000);
- enano -= (u_int64_t) 4000000000U;
+ enano -= (uint64_t) 4000000000U;
}
wrk = enano;
wrk /= 1000;
USEC_SLEEP(isp, wrk);
} else {
- while (enano > (u_int64_t) 4000000000U) {
+ while (enano > (uint64_t) 4000000000U) {
count += 4000000;
- enano -= (u_int64_t) 4000000000U;
+ enano -= (uint64_t) 4000000000U;
}
wrk = enano;
count += (wrk / 1000);
@@ -1751,23 +1752,23 @@ isp_fclink_test(struct ispsoftc *isp, int usdelay)
*/
lp = &fcp->portdb[loopid];
lp->node_wwn =
- (((u_int64_t)pdb.pdb_nodename[0]) << 56) |
- (((u_int64_t)pdb.pdb_nodename[1]) << 48) |
- (((u_int64_t)pdb.pdb_nodename[2]) << 40) |
- (((u_int64_t)pdb.pdb_nodename[3]) << 32) |
- (((u_int64_t)pdb.pdb_nodename[4]) << 24) |
- (((u_int64_t)pdb.pdb_nodename[5]) << 16) |
- (((u_int64_t)pdb.pdb_nodename[6]) << 8) |
- (((u_int64_t)pdb.pdb_nodename[7]));
+ (((uint64_t)pdb.pdb_nodename[0]) << 56) |
+ (((uint64_t)pdb.pdb_nodename[1]) << 48) |
+ (((uint64_t)pdb.pdb_nodename[2]) << 40) |
+ (((uint64_t)pdb.pdb_nodename[3]) << 32) |
+ (((uint64_t)pdb.pdb_nodename[4]) << 24) |
+ (((uint64_t)pdb.pdb_nodename[5]) << 16) |
+ (((uint64_t)pdb.pdb_nodename[6]) << 8) |
+ (((uint64_t)pdb.pdb_nodename[7]));
lp->port_wwn =
- (((u_int64_t)pdb.pdb_portname[0]) << 56) |
- (((u_int64_t)pdb.pdb_portname[1]) << 48) |
- (((u_int64_t)pdb.pdb_portname[2]) << 40) |
- (((u_int64_t)pdb.pdb_portname[3]) << 32) |
- (((u_int64_t)pdb.pdb_portname[4]) << 24) |
- (((u_int64_t)pdb.pdb_portname[5]) << 16) |
- (((u_int64_t)pdb.pdb_portname[6]) << 8) |
- (((u_int64_t)pdb.pdb_portname[7]));
+ (((uint64_t)pdb.pdb_portname[0]) << 56) |
+ (((uint64_t)pdb.pdb_portname[1]) << 48) |
+ (((uint64_t)pdb.pdb_portname[2]) << 40) |
+ (((uint64_t)pdb.pdb_portname[3]) << 32) |
+ (((uint64_t)pdb.pdb_portname[4]) << 24) |
+ (((uint64_t)pdb.pdb_portname[5]) << 16) |
+ (((uint64_t)pdb.pdb_portname[6]) << 8) |
+ (((uint64_t)pdb.pdb_portname[7]));
lp->roles =
(pdb.pdb_prli_svc3 & SVC3_ROLE_MASK) >> SVC3_ROLE_SHIFT;
lp->portid = BITS2WORD(pdb.pdb_portid_bits);
@@ -1931,7 +1932,7 @@ isp_pdb_sync(struct ispsoftc *isp)
* for the moment.
*/
for (lp = &fcp->portdb[base]; lp < &fcp->portdb[lim]; lp++) {
- u_int32_t portid;
+ uint32_t portid;
mbreg_t mbs;
loopid = lp - fcp->portdb;
@@ -1966,29 +1967,29 @@ isp_pdb_sync(struct ispsoftc *isp)
if (lp->loggedin && lp->force_logout == 0 &&
isp_getpdb(isp, lp->loopid, &pdb) == 0) {
int nrole;
- u_int64_t nwwnn, nwwpn;
+ uint64_t nwwnn, nwwpn;
nwwnn =
- (((u_int64_t)pdb.pdb_nodename[0]) << 56) |
- (((u_int64_t)pdb.pdb_nodename[1]) << 48) |
- (((u_int64_t)pdb.pdb_nodename[2]) << 40) |
- (((u_int64_t)pdb.pdb_nodename[3]) << 32) |
- (((u_int64_t)pdb.pdb_nodename[4]) << 24) |
- (((u_int64_t)pdb.pdb_nodename[5]) << 16) |
- (((u_int64_t)pdb.pdb_nodename[6]) << 8) |
- (((u_int64_t)pdb.pdb_nodename[7]));
+ (((uint64_t)pdb.pdb_nodename[0]) << 56) |
+ (((uint64_t)pdb.pdb_nodename[1]) << 48) |
+ (((uint64_t)pdb.pdb_nodename[2]) << 40) |
+ (((uint64_t)pdb.pdb_nodename[3]) << 32) |
+ (((uint64_t)pdb.pdb_nodename[4]) << 24) |
+ (((uint64_t)pdb.pdb_nodename[5]) << 16) |
+ (((uint64_t)pdb.pdb_nodename[6]) << 8) |
+ (((uint64_t)pdb.pdb_nodename[7]));
nwwpn =
- (((u_int64_t)pdb.pdb_portname[0]) << 56) |
- (((u_int64_t)pdb.pdb_portname[1]) << 48) |
- (((u_int64_t)pdb.pdb_portname[2]) << 40) |
- (((u_int64_t)pdb.pdb_portname[3]) << 32) |
- (((u_int64_t)pdb.pdb_portname[4]) << 24) |
- (((u_int64_t)pdb.pdb_portname[5]) << 16) |
- (((u_int64_t)pdb.pdb_portname[6]) << 8) |
- (((u_int64_t)pdb.pdb_portname[7]));
+ (((uint64_t)pdb.pdb_portname[0]) << 56) |
+ (((uint64_t)pdb.pdb_portname[1]) << 48) |
+ (((uint64_t)pdb.pdb_portname[2]) << 40) |
+ (((uint64_t)pdb.pdb_portname[3]) << 32) |
+ (((uint64_t)pdb.pdb_portname[4]) << 24) |
+ (((uint64_t)pdb.pdb_portname[5]) << 16) |
+ (((uint64_t)pdb.pdb_portname[6]) << 8) |
+ (((uint64_t)pdb.pdb_portname[7]));
nrole = (pdb.pdb_prli_svc3 & SVC3_ROLE_MASK) >>
SVC3_ROLE_SHIFT;
if (pdb.pdb_loopid == lp->loopid && lp->portid ==
- (u_int32_t) BITS2WORD(pdb.pdb_portid_bits) &&
+ (uint32_t) BITS2WORD(pdb.pdb_portid_bits) &&
nwwnn == lp->node_wwn && nwwpn == lp->port_wwn &&
lp->roles == nrole && lp->force_logout == 0) {
lp->loggedin = lp->valid = 1;
@@ -2125,7 +2126,7 @@ isp_pdb_sync(struct ispsoftc *isp)
goto dump_em;
}
- if (lp->portid != (u_int32_t) BITS2WORD(pdb.pdb_portid_bits)) {
+ if (lp->portid != (uint32_t) BITS2WORD(pdb.pdb_portid_bits)) {
isp_prt(isp, ISP_LOGWARN, pdbmfail2,
lp->portid, BITS2WORD(pdb.pdb_portid_bits));
goto dump_em;
@@ -2134,23 +2135,23 @@ isp_pdb_sync(struct ispsoftc *isp)
lp->roles =
(pdb.pdb_prli_svc3 & SVC3_ROLE_MASK) >> SVC3_ROLE_SHIFT;
lp->node_wwn =
- (((u_int64_t)pdb.pdb_nodename[0]) << 56) |
- (((u_int64_t)pdb.pdb_nodename[1]) << 48) |
- (((u_int64_t)pdb.pdb_nodename[2]) << 40) |
- (((u_int64_t)pdb.pdb_nodename[3]) << 32) |
- (((u_int64_t)pdb.pdb_nodename[4]) << 24) |
- (((u_int64_t)pdb.pdb_nodename[5]) << 16) |
- (((u_int64_t)pdb.pdb_nodename[6]) << 8) |
- (((u_int64_t)pdb.pdb_nodename[7]));
+ (((uint64_t)pdb.pdb_nodename[0]) << 56) |
+ (((uint64_t)pdb.pdb_nodename[1]) << 48) |
+ (((uint64_t)pdb.pdb_nodename[2]) << 40) |
+ (((uint64_t)pdb.pdb_nodename[3]) << 32) |
+ (((uint64_t)pdb.pdb_nodename[4]) << 24) |
+ (((uint64_t)pdb.pdb_nodename[5]) << 16) |
+ (((uint64_t)pdb.pdb_nodename[6]) << 8) |
+ (((uint64_t)pdb.pdb_nodename[7]));
lp->port_wwn =
- (((u_int64_t)pdb.pdb_portname[0]) << 56) |
- (((u_int64_t)pdb.pdb_portname[1]) << 48) |
- (((u_int64_t)pdb.pdb_portname[2]) << 40) |
- (((u_int64_t)pdb.pdb_portname[3]) << 32) |
- (((u_int64_t)pdb.pdb_portname[4]) << 24) |
- (((u_int64_t)pdb.pdb_portname[5]) << 16) |
- (((u_int64_t)pdb.pdb_portname[6]) << 8) |
- (((u_int64_t)pdb.pdb_portname[7]));
+ (((uint64_t)pdb.pdb_portname[0]) << 56) |
+ (((uint64_t)pdb.pdb_portname[1]) << 48) |
+ (((uint64_t)pdb.pdb_portname[2]) << 40) |
+ (((uint64_t)pdb.pdb_portname[3]) << 32) |
+ (((uint64_t)pdb.pdb_portname[4]) << 24) |
+ (((uint64_t)pdb.pdb_portname[5]) << 16) |
+ (((uint64_t)pdb.pdb_portname[6]) << 8) |
+ (((uint64_t)pdb.pdb_portname[7]));
/*
* Check to make sure this all makes sense.
*/
@@ -2277,23 +2278,23 @@ isp_scan_loop(struct ispsoftc *isp)
* Save the pertinent info locally.
*/
lp->node_wwn =
- (((u_int64_t)pdb.pdb_nodename[0]) << 56) |
- (((u_int64_t)pdb.pdb_nodename[1]) << 48) |
- (((u_int64_t)pdb.pdb_nodename[2]) << 40) |
- (((u_int64_t)pdb.pdb_nodename[3]) << 32) |
- (((u_int64_t)pdb.pdb_nodename[4]) << 24) |
- (((u_int64_t)pdb.pdb_nodename[5]) << 16) |
- (((u_int64_t)pdb.pdb_nodename[6]) << 8) |
- (((u_int64_t)pdb.pdb_nodename[7]));
+ (((uint64_t)pdb.pdb_nodename[0]) << 56) |
+ (((uint64_t)pdb.pdb_nodename[1]) << 48) |
+ (((uint64_t)pdb.pdb_nodename[2]) << 40) |
+ (((uint64_t)pdb.pdb_nodename[3]) << 32) |
+ (((uint64_t)pdb.pdb_nodename[4]) << 24) |
+ (((uint64_t)pdb.pdb_nodename[5]) << 16) |
+ (((uint64_t)pdb.pdb_nodename[6]) << 8) |
+ (((uint64_t)pdb.pdb_nodename[7]));
lp->port_wwn =
- (((u_int64_t)pdb.pdb_portname[0]) << 56) |
- (((u_int64_t)pdb.pdb_portname[1]) << 48) |
- (((u_int64_t)pdb.pdb_portname[2]) << 40) |
- (((u_int64_t)pdb.pdb_portname[3]) << 32) |
- (((u_int64_t)pdb.pdb_portname[4]) << 24) |
- (((u_int64_t)pdb.pdb_portname[5]) << 16) |
- (((u_int64_t)pdb.pdb_portname[6]) << 8) |
- (((u_int64_t)pdb.pdb_portname[7]));
+ (((uint64_t)pdb.pdb_portname[0]) << 56) |
+ (((uint64_t)pdb.pdb_portname[1]) << 48) |
+ (((uint64_t)pdb.pdb_portname[2]) << 40) |
+ (((uint64_t)pdb.pdb_portname[3]) << 32) |
+ (((uint64_t)pdb.pdb_portname[4]) << 24) |
+ (((uint64_t)pdb.pdb_portname[5]) << 16) |
+ (((uint64_t)pdb.pdb_portname[6]) << 8) |
+ (((uint64_t)pdb.pdb_portname[7]));
lp->roles =
(pdb.pdb_prli_svc3 & SVC3_ROLE_MASK) >> SVC3_ROLE_SHIFT;
lp->portid = BITS2WORD(pdb.pdb_portid_bits);
@@ -2513,7 +2514,7 @@ static int
isp_scan_fabric(struct ispsoftc *isp, int ftype)
{
fcparam *fcp = isp->isp_param;
- u_int32_t portid, first_portid, last_portid;
+ uint32_t portid, first_portid, last_portid;
int hicap, last_port_same;
if (fcp->isp_onfabric == 0) {
@@ -2537,7 +2538,7 @@ isp_scan_fabric(struct ispsoftc *isp, int ftype)
sns_screq_t *rq;
sns_ga_nxt_rsp_t *rs0, *rs1;
struct lportdb lcl;
- u_int8_t sc[SNS_GA_NXT_RESP_SIZE];
+ uint8_t sc[SNS_GA_NXT_RESP_SIZE];
rq = (sns_screq_t *)sc;
MEMZERO((void *) rq, SNS_GA_NXT_REQ_SIZE);
@@ -2571,7 +2572,7 @@ isp_scan_fabric(struct ispsoftc *isp, int ftype)
}
MEMORYBARRIER(isp, SYNC_SFORCPU, 0x100, SNS_GA_NXT_RESP_SIZE);
rs1 = (sns_ga_nxt_rsp_t *) sc;
- rs0 = (sns_ga_nxt_rsp_t *) ((u_int8_t *)fcp->isp_scratch+0x100);
+ rs0 = (sns_ga_nxt_rsp_t *) ((uint8_t *)fcp->isp_scratch+0x100);
isp_get_ga_nxt_response(isp, rs0, rs1);
if (rs1->snscb_cthdr.ct_response != FS_ACC) {
int level;
@@ -2588,9 +2589,9 @@ isp_scan_fabric(struct ispsoftc *isp, int ftype)
return (0);
}
portid =
- (((u_int32_t) rs1->snscb_port_id[0]) << 16) |
- (((u_int32_t) rs1->snscb_port_id[1]) << 8) |
- (((u_int32_t) rs1->snscb_port_id[2]));
+ (((uint32_t) rs1->snscb_port_id[0]) << 16) |
+ (((uint32_t) rs1->snscb_port_id[1]) << 8) |
+ (((uint32_t) rs1->snscb_port_id[2]));
/*
* XXX: We should check to make sure that this entry
@@ -2609,23 +2610,23 @@ isp_scan_fabric(struct ispsoftc *isp, int ftype)
lcl.fc4_type = ftype;
lcl.portid = portid;
lcl.node_wwn =
- (((u_int64_t)rs1->snscb_nodename[0]) << 56) |
- (((u_int64_t)rs1->snscb_nodename[1]) << 48) |
- (((u_int64_t)rs1->snscb_nodename[2]) << 40) |
- (((u_int64_t)rs1->snscb_nodename[3]) << 32) |
- (((u_int64_t)rs1->snscb_nodename[4]) << 24) |
- (((u_int64_t)rs1->snscb_nodename[5]) << 16) |
- (((u_int64_t)rs1->snscb_nodename[6]) << 8) |
- (((u_int64_t)rs1->snscb_nodename[7]));
+ (((uint64_t)rs1->snscb_nodename[0]) << 56) |
+ (((uint64_t)rs1->snscb_nodename[1]) << 48) |
+ (((uint64_t)rs1->snscb_nodename[2]) << 40) |
+ (((uint64_t)rs1->snscb_nodename[3]) << 32) |
+ (((uint64_t)rs1->snscb_nodename[4]) << 24) |
+ (((uint64_t)rs1->snscb_nodename[5]) << 16) |
+ (((uint64_t)rs1->snscb_nodename[6]) << 8) |
+ (((uint64_t)rs1->snscb_nodename[7]));
lcl.port_wwn =
- (((u_int64_t)rs1->snscb_portname[0]) << 56) |
- (((u_int64_t)rs1->snscb_portname[1]) << 48) |
- (((u_int64_t)rs1->snscb_portname[2]) << 40) |
- (((u_int64_t)rs1->snscb_portname[3]) << 32) |
- (((u_int64_t)rs1->snscb_portname[4]) << 24) |
- (((u_int64_t)rs1->snscb_portname[5]) << 16) |
- (((u_int64_t)rs1->snscb_portname[6]) << 8) |
- (((u_int64_t)rs1->snscb_portname[7]));
+ (((uint64_t)rs1->snscb_portname[0]) << 56) |
+ (((uint64_t)rs1->snscb_portname[1]) << 48) |
+ (((uint64_t)rs1->snscb_portname[2]) << 40) |
+ (((uint64_t)rs1->snscb_portname[3]) << 32) |
+ (((uint64_t)rs1->snscb_portname[4]) << 24) |
+ (((uint64_t)rs1->snscb_portname[5]) << 16) |
+ (((uint64_t)rs1->snscb_portname[6]) << 8) |
+ (((uint64_t)rs1->snscb_portname[7]));
/*
* Does this fabric object support the type we want?
@@ -2727,7 +2728,7 @@ isp_scan_fabric(struct ispsoftc *isp, int ftype)
}
MEMORYBARRIER(isp, SYNC_SFORCPU, IGPOFF, GIDLEN);
rs1 = (sns_gid_ft_rsp_t *) fcp->tport;
- rs0 = (sns_gid_ft_rsp_t *) ((u_int8_t *)fcp->isp_scratch+IGPOFF);
+ rs0 = (sns_gid_ft_rsp_t *) ((uint8_t *)fcp->isp_scratch+IGPOFF);
isp_get_gid_ft_response(isp, rs0, rs1, NGENT);
if (rs1->snscb_cthdr.ct_response != FS_ACC) {
int level;
@@ -2765,9 +2766,9 @@ isp_scan_fabric(struct ispsoftc *isp, int ftype)
MEMZERO(&lcl, sizeof (lcl));
lcl.fc4_type = ftype;
lcl.portid =
- (((u_int32_t) rs1->snscb_ports[i].portid[0]) << 16) |
- (((u_int32_t) rs1->snscb_ports[i].portid[1]) << 8) |
- (((u_int32_t) rs1->snscb_ports[i].portid[2]));
+ (((uint32_t) rs1->snscb_ports[i].portid[0]) << 16) |
+ (((uint32_t) rs1->snscb_ports[i].portid[1]) << 8) |
+ (((uint32_t) rs1->snscb_ports[i].portid[2]));
MEMZERO((void *) gq, sizeof (sns_gxn_id_req_t));
gq->snscb_rblen = SNS_GXN_ID_RESP_SIZE >> 1;
@@ -2803,7 +2804,7 @@ isp_scan_fabric(struct ispsoftc *isp, int ftype)
return (-1);
}
MEMORYBARRIER(isp, SYNC_SFORCPU, GXOFF, SNS_GXN_ID_RESP_SIZE);
- gs0 = (sns_gxn_id_rsp_t *) ((u_int8_t *)fcp->isp_scratch+GXOFF);
+ gs0 = (sns_gxn_id_rsp_t *) ((uint8_t *)fcp->isp_scratch+GXOFF);
isp_get_gxn_id_response(isp, gs0, gs1);
if (gs1->snscb_cthdr.ct_response != FS_ACC) {
isp_prt(isp, ISP_LOGWARN, swrej, "GPN_ID",
@@ -2816,14 +2817,14 @@ isp_scan_fabric(struct ispsoftc *isp, int ftype)
continue;
}
lcl.port_wwn =
- (((u_int64_t)gs1->snscb_wwn[0]) << 56) |
- (((u_int64_t)gs1->snscb_wwn[1]) << 48) |
- (((u_int64_t)gs1->snscb_wwn[2]) << 40) |
- (((u_int64_t)gs1->snscb_wwn[3]) << 32) |
- (((u_int64_t)gs1->snscb_wwn[4]) << 24) |
- (((u_int64_t)gs1->snscb_wwn[5]) << 16) |
- (((u_int64_t)gs1->snscb_wwn[6]) << 8) |
- (((u_int64_t)gs1->snscb_wwn[7]));
+ (((uint64_t)gs1->snscb_wwn[0]) << 56) |
+ (((uint64_t)gs1->snscb_wwn[1]) << 48) |
+ (((uint64_t)gs1->snscb_wwn[2]) << 40) |
+ (((uint64_t)gs1->snscb_wwn[3]) << 32) |
+ (((uint64_t)gs1->snscb_wwn[4]) << 24) |
+ (((uint64_t)gs1->snscb_wwn[5]) << 16) |
+ (((uint64_t)gs1->snscb_wwn[6]) << 8) |
+ (((uint64_t)gs1->snscb_wwn[7]));
MEMZERO((void *) gq, sizeof (sns_gxn_id_req_t));
gq->snscb_rblen = SNS_GXN_ID_RESP_SIZE >> 1;
@@ -2859,7 +2860,7 @@ isp_scan_fabric(struct ispsoftc *isp, int ftype)
return (-1);
}
MEMORYBARRIER(isp, SYNC_SFORCPU, GXOFF, SNS_GXN_ID_RESP_SIZE);
- gs0 = (sns_gxn_id_rsp_t *) ((u_int8_t *)fcp->isp_scratch+GXOFF);
+ gs0 = (sns_gxn_id_rsp_t *) ((uint8_t *)fcp->isp_scratch+GXOFF);
isp_get_gxn_id_response(isp, gs0, gs1);
if (gs1->snscb_cthdr.ct_response != FS_ACC) {
isp_prt(isp, ISP_LOGWARN, swrej, "GNN_ID",
@@ -2872,14 +2873,14 @@ isp_scan_fabric(struct ispsoftc *isp, int ftype)
continue;
}
lcl.node_wwn =
- (((u_int64_t)gs1->snscb_wwn[0]) << 56) |
- (((u_int64_t)gs1->snscb_wwn[1]) << 48) |
- (((u_int64_t)gs1->snscb_wwn[2]) << 40) |
- (((u_int64_t)gs1->snscb_wwn[3]) << 32) |
- (((u_int64_t)gs1->snscb_wwn[4]) << 24) |
- (((u_int64_t)gs1->snscb_wwn[5]) << 16) |
- (((u_int64_t)gs1->snscb_wwn[6]) << 8) |
- (((u_int64_t)gs1->snscb_wwn[7]));
+ (((uint64_t)gs1->snscb_wwn[0]) << 56) |
+ (((uint64_t)gs1->snscb_wwn[1]) << 48) |
+ (((uint64_t)gs1->snscb_wwn[2]) << 40) |
+ (((uint64_t)gs1->snscb_wwn[3]) << 32) |
+ (((uint64_t)gs1->snscb_wwn[4]) << 24) |
+ (((uint64_t)gs1->snscb_wwn[5]) << 16) |
+ (((uint64_t)gs1->snscb_wwn[6]) << 8) |
+ (((uint64_t)gs1->snscb_wwn[7]));
/*
* The QLogic f/w is bouncing this with a parameter error.
@@ -2923,7 +2924,7 @@ isp_scan_fabric(struct ispsoftc *isp, int ftype)
return (-1);
}
MEMORYBARRIER(isp, SYNC_SFORCPU, GXOFF, SNS_GFF_ID_RESP_SIZE);
- fs0 = (sns_gff_id_rsp_t *) ((u_int8_t *)fcp->isp_scratch+GXOFF);
+ fs0 = (sns_gff_id_rsp_t *) ((uint8_t *)fcp->isp_scratch+GXOFF);
isp_get_gff_id_response(isp, fs0, fs1);
if (fs1->snscb_cthdr.ct_response != FS_ACC) {
isp_prt(isp, /* ISP_LOGDEBUG0 */ ISP_LOGWARN,
@@ -2983,7 +2984,7 @@ static void
isp_register_fc4_type(struct ispsoftc *isp)
{
fcparam *fcp = isp->isp_param;
- u_int8_t local[SNS_RFT_ID_REQ_SIZE];
+ uint8_t local[SNS_RFT_ID_REQ_SIZE];
sns_screq_t *reqp = (sns_screq_t *) local;
mbreg_t mbs;
@@ -3028,8 +3029,8 @@ int
isp_start(XS_T *xs)
{
struct ispsoftc *isp;
- u_int16_t nxti, optr, handle;
- u_int8_t local[QENTRY_LEN];
+ uint16_t nxti, optr, handle;
+ uint8_t local[QENTRY_LEN];
ispreq_t *reqp, *qep;
int target, i;
@@ -3275,7 +3276,7 @@ isp_start(XS_T *xs)
*/
reqp = (ispreq_t *) local;
if (isp->isp_sendmarker) {
- u_int8_t n = (IS_DUALBUS(isp)? 2: 1);
+ uint8_t n = (IS_DUALBUS(isp)? 2: 1);
/*
* Check ports to send markers for...
*/
@@ -3405,7 +3406,7 @@ isp_control(struct ispsoftc *isp, ispctl_t ctl, void *arg)
XS_T *xs;
mbreg_t mbs;
int bus, tgt;
- u_int16_t handle;
+ uint16_t handle;
MEMZERO(&mbs, sizeof (mbs));
@@ -3613,10 +3614,10 @@ isp_control(struct ispsoftc *isp, ispctl_t ctl, void *arg)
#endif
void
-isp_intr(struct ispsoftc *isp, u_int16_t isr, u_int16_t sema, u_int16_t mbox)
+isp_intr(struct ispsoftc *isp, uint16_t isr, uint16_t sema, uint16_t mbox)
{
XS_T *complist[MAX_REQUESTQ_COMPLETIONS], *xs;
- u_int16_t iptr, optr, junk;
+ uint16_t iptr, optr, junk;
int i, nlooked = 0, ndone = 0;
again:
@@ -3765,7 +3766,7 @@ again:
ispstatusreq_t local, *sp = &local;
isphdr_t *hp;
int type;
- u_int16_t oop;
+ uint16_t oop;
int buddaboom = 0;
hp = (isphdr_t *) ISP_QUEUE_ENTRY(isp->isp_result, optr);
@@ -3876,7 +3877,7 @@ again:
}
xs = isp_find_xs(isp, sp->req_handle);
if (xs == NULL) {
- u_int8_t ts = sp->req_completion_status & 0xff;
+ uint8_t ts = sp->req_completion_status & 0xff;
MEMZERO(hp, QENTRY_LEN); /* PERF */
/*
* Only whine if this isn't the expected fallout of
@@ -4058,7 +4059,7 @@ again:
*/
static int
-isp_parse_async(struct ispsoftc *isp, u_int16_t mbox)
+isp_parse_async(struct ispsoftc *isp, uint16_t mbox)
{
int rval = 0;
int bus;
@@ -4385,7 +4386,7 @@ isp_parse_async(struct ispsoftc *isp, u_int16_t mbox)
if (bus & 0x100) {
int i, nh;
- u_int16_t handles[16];
+ uint16_t handles[16];
for (nh = 0, i = 1; i < MAX_MAILBOX(isp); i++) {
if ((bus & (1 << i)) == 0) {
@@ -4414,7 +4415,7 @@ isp_parse_async(struct ispsoftc *isp, u_int16_t mbox)
static int
isp_handle_other_response(struct ispsoftc *isp, int type,
- isphdr_t *hp, u_int16_t *optrp)
+ isphdr_t *hp, uint16_t *optrp)
{
switch (type) {
case RQSTYPE_STATUS_CONT:
@@ -4847,7 +4848,7 @@ isp_parse_status(struct ispsoftc *isp, ispstatusreq_t *sp, XS_T *xs)
}
static void
-isp_fastpost_complete(struct ispsoftc *isp, u_int16_t fph)
+isp_fastpost_complete(struct ispsoftc *isp, uint16_t fph)
{
XS_T *xs;
@@ -4883,7 +4884,7 @@ static int
isp_mbox_continue(struct ispsoftc *isp)
{
mbreg_t mbs;
- u_int16_t *ptr;
+ uint16_t *ptr;
switch (isp->isp_lastmbxcmd) {
case MBOX_WRITE_RAM_WORD:
@@ -4931,7 +4932,7 @@ isp_mbox_continue(struct ispsoftc *isp)
#define HIWRD(x) ((x) >> 16)
#define LOWRD(x) ((x) & 0xffff)
#define ISPOPMAP(a, b) (((a) << 16) | (b))
-static const u_int32_t mbpscsi[] = {
+static const uint32_t mbpscsi[] = {
ISPOPMAP(0x01, 0x01), /* 0x00: MBOX_NO_OP */
ISPOPMAP(0x1f, 0x01), /* 0x01: MBOX_LOAD_RAM */
ISPOPMAP(0x03, 0x01), /* 0x02: MBOX_EXEC_FIRMWARE */
@@ -5127,7 +5128,7 @@ static char *scsi_mbcmd_names[] = {
};
#endif
-static const u_int32_t mbpfc[] = {
+static const uint32_t mbpfc[] = {
ISPOPMAP(0x01, 0x01), /* 0x00: MBOX_NO_OP */
ISPOPMAP(0x1f, 0x01), /* 0x01: MBOX_LOAD_RAM */
ISPOPMAP(0x03, 0x01), /* 0x02: MBOX_EXEC_FIRMWARE */
@@ -5400,7 +5401,7 @@ static void
isp_mboxcmd_qnw(struct ispsoftc *isp, mbreg_t *mbp, int nodelay)
{
unsigned int ibits, obits, box, opcode;
- const u_int32_t *mcp;
+ const uint32_t *mcp;
if (IS_FC(isp)) {
mcp = mbpfc;
@@ -5441,7 +5442,7 @@ isp_mboxcmd(struct ispsoftc *isp, mbreg_t *mbp, int logmask)
{
char *cname, *xname, tname[16], mname[16];
unsigned int lim, ibits, obits, box, opcode;
- const u_int32_t *mcp;
+ const uint32_t *mcp;
if (IS_FC(isp)) {
mcp = mbpfc;
@@ -5632,7 +5633,7 @@ isp_update_bus(struct ispsoftc *isp, int bus)
MEMZERO(&mbs, sizeof (mbs));
for (tgt = 0; tgt < MAX_TARGETS; tgt++) {
- u_int16_t flags, period, offset;
+ uint16_t flags, period, offset;
int get;
if (sdp->isp_devparam[tgt].dev_enable == 0) {
@@ -5802,8 +5803,8 @@ isp_setdfltparm(struct ispsoftc *isp, int channel)
}
if (isp->isp_confopts & ISP_CFG_OWNWWNN) {
isp_prt(isp, ISP_LOGCONFIG, "Using Node WWN 0x%08x%08x",
- (u_int32_t) (DEFAULT_NODEWWN(isp) >> 32),
- (u_int32_t) (DEFAULT_NODEWWN(isp) & 0xffffffff));
+ (uint32_t) (DEFAULT_NODEWWN(isp) >> 32),
+ (uint32_t) (DEFAULT_NODEWWN(isp) & 0xffffffff));
ISP_NODEWWN(isp) = DEFAULT_NODEWWN(isp);
} else {
/*
@@ -5814,8 +5815,8 @@ isp_setdfltparm(struct ispsoftc *isp, int channel)
}
if (isp->isp_confopts & ISP_CFG_OWNWWPN) {
isp_prt(isp, ISP_LOGCONFIG, "Using Port WWN 0x%08x%08x",
- (u_int32_t) (DEFAULT_PORTWWN(isp) >> 32),
- (u_int32_t) (DEFAULT_PORTWWN(isp) & 0xffffffff));
+ (uint32_t) (DEFAULT_PORTWWN(isp) >> 32),
+ (uint32_t) (DEFAULT_PORTWWN(isp) & 0xffffffff));
ISP_PORTWWN(isp) = DEFAULT_PORTWWN(isp);
} else {
/*
@@ -5912,7 +5913,7 @@ isp_setdfltparm(struct ispsoftc *isp, int channel)
* the default to the SAFE default state- that's not the goal state.
*/
for (tgt = 0; tgt < MAX_TARGETS; tgt++) {
- u_int8_t off, per;
+ uint8_t off, per;
sdp->isp_devparam[tgt].actv_offset = 0;
sdp->isp_devparam[tgt].actv_period = 0;
sdp->isp_devparam[tgt].actv_flags = 0;
@@ -5990,7 +5991,7 @@ isp_reinit(struct ispsoftc *isp)
isp->isp_nactive = 0;
for (i = 0; i < isp->isp_maxcmds; i++) {
- u_int16_t handle;
+ uint16_t handle;
xs = isp->isp_xflist[i];
if (xs == NULL) {
continue;
@@ -6015,10 +6016,10 @@ static int
isp_read_nvram(struct ispsoftc *isp)
{
int i, amt;
- u_int8_t csum, minversion;
+ uint8_t csum, minversion;
union {
- u_int8_t _x[ISP2100_NVRAM_SIZE];
- u_int16_t _s[ISP2100_NVRAM_SIZE>>1];
+ uint8_t _x[ISP2100_NVRAM_SIZE];
+ uint16_t _s[ISP2100_NVRAM_SIZE>>1];
} _n;
#define nvram_data _n._x
#define nvram_words _n._s
@@ -6086,10 +6087,10 @@ isp_read_nvram(struct ispsoftc *isp)
}
static void
-isp_rdnvram_word(struct ispsoftc *isp, int wo, u_int16_t *rp)
+isp_rdnvram_word(struct ispsoftc *isp, int wo, uint16_t *rp)
{
int i, cbits;
- u_int16_t bit, rqst;
+ uint16_t bit, rqst;
ISP_WRITE(isp, BIU_NVRAM, BIU_NVRAM_SELECT);
USEC_DELAY(2);
@@ -6134,7 +6135,7 @@ isp_rdnvram_word(struct ispsoftc *isp, int wo, u_int16_t *rp)
*/
*rp = 0;
for (i = 0; i < 16; i++) {
- u_int16_t rv;
+ uint16_t rv;
*rp <<= 1;
ISP_WRITE(isp, BIU_NVRAM, BIU_NVRAM_SELECT|BIU_NVRAM_CLOCK);
USEC_DELAY(2);
@@ -6152,7 +6153,7 @@ isp_rdnvram_word(struct ispsoftc *isp, int wo, u_int16_t *rp)
}
static void
-isp_parse_nvram_1020(struct ispsoftc *isp, u_int8_t *nvram_data)
+isp_parse_nvram_1020(struct ispsoftc *isp, uint8_t *nvram_data)
{
sdparam *sdp = (sdparam *) isp->isp_param;
int tgt;
@@ -6278,7 +6279,7 @@ isp_parse_nvram_1020(struct ispsoftc *isp, u_int8_t *nvram_data)
}
static void
-isp_parse_nvram_1080(struct ispsoftc *isp, int bus, u_int8_t *nvram_data)
+isp_parse_nvram_1080(struct ispsoftc *isp, int bus, uint8_t *nvram_data)
{
sdparam *sdp = (sdparam *) isp->isp_param;
int tgt;
@@ -6370,7 +6371,7 @@ isp_parse_nvram_1080(struct ispsoftc *isp, int bus, u_int8_t *nvram_data)
}
static void
-isp_parse_nvram_12160(struct ispsoftc *isp, int bus, u_int8_t *nvram_data)
+isp_parse_nvram_12160(struct ispsoftc *isp, int bus, uint8_t *nvram_data)
{
sdparam *sdp = (sdparam *) isp->isp_param;
int tgt;
@@ -6461,10 +6462,10 @@ isp_parse_nvram_12160(struct ispsoftc *isp, int bus, u_int8_t *nvram_data)
}
static void
-isp_parse_nvram_2100(struct ispsoftc *isp, u_int8_t *nvram_data)
+isp_parse_nvram_2100(struct ispsoftc *isp, uint8_t *nvram_data)
{
fcparam *fcp = (fcparam *) isp->isp_param;
- u_int64_t wwn;
+ uint64_t wwn;
/*
* There is NVRAM storage for both Port and Node entities-
@@ -6480,9 +6481,9 @@ isp_parse_nvram_2100(struct ispsoftc *isp, u_int8_t *nvram_data)
wwn = ISP2100_NVRAM_PORT_NAME(nvram_data);
if (wwn) {
isp_prt(isp, ISP_LOGCONFIG, "NVRAM Port WWN 0x%08x%08x",
- (u_int32_t) (wwn >> 32), (u_int32_t) (wwn & 0xffffffff));
+ (uint32_t) (wwn >> 32), (uint32_t) (wwn & 0xffffffff));
if ((wwn >> 60) == 0) {
- wwn |= (((u_int64_t) 2)<< 60);
+ wwn |= (((uint64_t) 2)<< 60);
}
}
fcp->isp_portwwn = wwn;
@@ -6490,14 +6491,14 @@ isp_parse_nvram_2100(struct ispsoftc *isp, u_int8_t *nvram_data)
wwn = ISP2200_NVRAM_NODE_NAME(nvram_data);
if (wwn) {
isp_prt(isp, ISP_LOGCONFIG, "NVRAM Node WWN 0x%08x%08x",
- (u_int32_t) (wwn >> 32),
- (u_int32_t) (wwn & 0xffffffff));
+ (uint32_t) (wwn >> 32),
+ (uint32_t) (wwn & 0xffffffff));
if ((wwn >> 60) == 0) {
- wwn |= (((u_int64_t) 2)<< 60);
+ wwn |= (((uint64_t) 2)<< 60);
}
}
} else {
- wwn &= ~((u_int64_t) 0xfff << 48);
+ wwn &= ~((uint64_t) 0xfff << 48);
}
fcp->isp_nodewwn = wwn;
@@ -6517,13 +6518,13 @@ isp_parse_nvram_2100(struct ispsoftc *isp, u_int8_t *nvram_data)
* for the Port WWN.
*/
if (fcp->isp_nodewwn && fcp->isp_portwwn) {
- if ((fcp->isp_nodewwn & (((u_int64_t) 0xfff) << 48)) != 0 &&
+ if ((fcp->isp_nodewwn & (((uint64_t) 0xfff) << 48)) != 0 &&
(fcp->isp_nodewwn >> 60) == 2) {
- fcp->isp_nodewwn &= ~((u_int64_t) 0xfff << 48);
+ fcp->isp_nodewwn &= ~((uint64_t) 0xfff << 48);
}
- if ((fcp->isp_portwwn & (((u_int64_t) 0xfff) << 48)) == 0 &&
+ if ((fcp->isp_portwwn & (((uint64_t) 0xfff) << 48)) == 0 &&
(fcp->isp_portwwn >> 60) == 2) {
- fcp->isp_portwwn |= ((u_int64_t) 1 << 56);
+ fcp->isp_portwwn |= ((uint64_t) 1 << 56);
}
}
@@ -6561,7 +6562,7 @@ isp2200_fw_dump(struct ispsoftc *isp)
{
int i, j;
mbreg_t mbs;
- u_int16_t *ptr;
+ uint16_t *ptr;
MEMZERO(&mbs, sizeof (mbs));
ptr = FCPARAM(isp)->isp_dump_data;
@@ -6706,7 +6707,7 @@ isp2300_fw_dump(struct ispsoftc *isp)
{
int i, j;
mbreg_t mbs;
- u_int16_t *ptr;
+ uint16_t *ptr;
MEMZERO(&mbs, sizeof (mbs));
ptr = FCPARAM(isp)->isp_dump_data;
OpenPOWER on IntegriCloud