diff options
| author | Matt Jacob <mjacob@FreeBSD.org> | 2000-10-27 21:57:32 +0000 |
|---|---|---|
| committer | Matt Jacob <mjacob@FreeBSD.org> | 2000-10-27 21:57:32 +0000 |
| commit | b732878ddf8daca30f9d97f75363b5c527720086 (patch) | |
| tree | bde1ca9ef587f1ef71cb7b95bf7e46bf83105c04 /sys/dev/isp | |
| parent | baed60567991d70a013ca6ba207e537ff62450a2 (diff) | |
Notes
Diffstat (limited to 'sys/dev/isp')
| -rw-r--r-- | sys/dev/isp/isp_freebsd.h | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h index d7062595432d..3948785c78d5 100644 --- a/sys/dev/isp/isp_freebsd.h +++ b/sys/dev/isp/isp_freebsd.h @@ -1,9 +1,7 @@ /* $FreeBSD$ */ /* * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions (CAM version) - * * Copyright (c) 1997, 1998, 1999, 2000 by Matthew Jacob - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,7 +28,7 @@ #define _ISP_FREEBSD_H #define ISP_PLATFORM_VERSION_MAJOR 4 -#define ISP_PLATFORM_VERSION_MINOR 5 +#define ISP_PLATFORM_VERSION_MINOR 6 #include <sys/param.h> @@ -230,9 +228,9 @@ struct isposinfo { #define DEFAULT_IID(x) 7 #define DEFAULT_LOOPID(x) 109 #define DEFAULT_NODEWWN(isp) (isp)->isp_osinfo.default_wwn -#define DEFAULT_PORTWWN(isp) \ - isp_port_from_node_wwn((isp), (isp)->isp_osinfo.default_wwn) -#define PORT_FROM_NODE_WWN isp_port_from_node_wwn +#define DEFAULT_PORTWWN(isp) (isp)->isp_osinfo.default_wwn +#define ISP_NODEWWN(isp) FCPARAM(isp)->isp_nodewwn +#define ISP_PORTWWN(isp) FCPARAM(isp)->isp_portwwn #define ISP_UNSWIZZLE_AND_COPY_PDBP(isp, dest, src) \ if((void *)src != (void *)dest) bcopy(src, dest, sizeof (isp_pdb_t)) @@ -402,18 +400,6 @@ strncat(char *d, const char *s, size_t c) return (t); } -static INLINE u_int64_t isp_port_from_node_wwn(struct ispsoftc *, u_int64_t); -static INLINE u_int64_t -isp_port_from_node_wwn(struct ispsoftc *isp, u_int64_t node_wwn) -{ - u_int64_t rv = node_wwn; - if ((node_wwn >> 60) == 2) { - rv = node_wwn | - (((u_int64_t)(isp->isp_unit+1)) << 48); - } - return (rv); -} - /* * Common inline functions */ |