diff options
| author | Matt Jacob <mjacob@FreeBSD.org> | 2001-03-01 02:15:58 +0000 |
|---|---|---|
| committer | Matt Jacob <mjacob@FreeBSD.org> | 2001-03-01 02:15:58 +0000 |
| commit | c9a6d60b09babbede700b6246d7f284ad73c970b (patch) | |
| tree | ba2e2e052a8988d140733e3a8e818b8c8b453565 /sys/dev/isp/isp_freebsd.h | |
| parent | 3c75bb14be6de2698a94daa8d621ac3770b28b7a (diff) | |
| download | src-c9a6d60b09babbede700b6246d7f284ad73c970b.tar.gz src-c9a6d60b09babbede700b6246d7f284ad73c970b.zip | |
Go to a default port and default node wwn model. Eliminate isp_name
and isp_unit and just store the device_t, fer gosh sakes.... Include
sys/bus.h for use by isp_pci.c.
Notes
Notes:
svn path=/head/; revision=73246
Diffstat (limited to 'sys/dev/isp/isp_freebsd.h')
| -rw-r--r-- | sys/dev/isp/isp_freebsd.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h index 85a00666b1ae..e29c55b33aa2 100644 --- a/sys/dev/isp/isp_freebsd.h +++ b/sys/dev/isp/isp_freebsd.h @@ -28,7 +28,7 @@ #define _ISP_FREEBSD_H #define ISP_PLATFORM_VERSION_MAJOR 5 -#define ISP_PLATFORM_VERSION_MINOR 5 +#define ISP_PLATFORM_VERSION_MINOR 6 /* * We're not ready for primetime yet @@ -48,6 +48,7 @@ #include <sys/malloc.h> #include <sys/mutex.h> #include <sys/proc.h> +#include <sys/bus.h> #include <machine/bus_memio.h> #include <machine/bus_pio.h> @@ -94,9 +95,9 @@ typedef struct tstate { struct isposinfo { struct ispsoftc * next; - u_int64_t default_wwn; - char name[8]; - int unit; + u_int64_t default_port_wwn; + u_int64_t default_node_wwn; + device_t dev; struct cam_sim *sim; struct cam_path *path; struct cam_sim *sim2; @@ -256,8 +257,8 @@ 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)->isp_osinfo.default_wwn +#define DEFAULT_NODEWWN(isp) (isp)->isp_osinfo.default_node_wwn +#define DEFAULT_PORTWWN(isp) (isp)->isp_osinfo.default_port_wwn #define ISP_NODEWWN(isp) FCPARAM(isp)->isp_nodewwn #define ISP_PORTWWN(isp) FCPARAM(isp)->isp_portwwn @@ -289,8 +290,7 @@ struct isposinfo { #define isp_path isp_osinfo.path #define isp_sim2 isp_osinfo.sim2 #define isp_path2 isp_osinfo.path2 -#define isp_unit isp_osinfo.unit -#define isp_name isp_osinfo.name +#define isp_dev isp_osinfo.dev /* * prototypes for isp_pci && isp_freebsd to share |