summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2008-11-02 03:17:23 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2008-11-02 03:17:23 +0000
commit6ebb14a8cb39d39392bf0901d2e06995511d02f0 (patch)
treefd453eeae08c9a571ff9bff071fddd29a638e6bb /sys/dev
parent378dfed71025762ca2e582f15a29aacf04154659 (diff)
Start updating isp. Just new defines, comments, whitespace, anything that
doesn't change the .o. Use isp_stds.h.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/ispmbox.h24
-rw-r--r--sys/dev/ic/ispvar.h5
2 files changed, 5 insertions, 24 deletions
diff --git a/sys/dev/ic/ispmbox.h b/sys/dev/ic/ispmbox.h
index 830672d9f07..b2ec96b60b6 100644
--- a/sys/dev/ic/ispmbox.h
+++ b/sys/dev/ic/ispmbox.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ispmbox.h,v 1.21 2008/10/27 00:46:09 krw Exp $ */
+/* $OpenBSD: ispmbox.h,v 1.22 2008/11/02 03:17:22 krw Exp $ */
/* $FreeBSD: src/sys/dev/isp/ispmbox.h,v 1.59 2007/03/10 02:39:54 mjacob Exp $ */
/*-
* Copyright (c) 1997-2007 by Matthew Jacob
@@ -1159,28 +1159,6 @@ typedef struct {
* Common elements from the above two structures that are actually useful to us.
*/
-/*
- * CT definition
- *
- * This is as the QLogic f/w documentations defines it- which is just opposite,
- * bit wise, from what the specification defines it as. Additionally, the
- * ct_response and ct_resid (really from FC-GS-2) need to be byte swapped.
- */
-
-typedef struct {
- u_int8_t ct_revision;
- u_int8_t ct_portid[3];
- u_int8_t ct_fcs_type;
- u_int8_t ct_fcs_subtype;
- u_int8_t ct_options;
- u_int8_t ct_res0;
- u_int16_t ct_response;
- u_int16_t ct_resid;
- u_int8_t ct_res1;
- u_int8_t ct_reason;
- u_int8_t ct_explanation;
- u_int8_t ct_vunique;
-} ct_hdr_t;
#define FS_ACC 0x8002
#define FS_RJT 0x8001
diff --git a/sys/dev/ic/ispvar.h b/sys/dev/ic/ispvar.h
index 48167c895d7..fe90c295954 100644
--- a/sys/dev/ic/ispvar.h
+++ b/sys/dev/ic/ispvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ispvar.h,v 1.25 2008/10/25 22:18:10 krw Exp $ */
+/* $OpenBSD: ispvar.h,v 1.26 2008/11/02 03:17:22 krw Exp $ */
/* $FreeBSD: src/sys/dev/isp/ispvar.h,v 1.85 2007/07/02 20:08:20 mjacob Exp $ */
/*-
* Copyright (c) 1997-2007 by Matthew Jacob
@@ -34,6 +34,7 @@
#define _ISPVAR_H
#if defined(__NetBSD__) || defined(__OpenBSD__)
+#include <dev/ic/isp_stds.h>
#include <dev/ic/ispmbox.h>
#ifdef ISP_TARGET_MODE
#include <dev/ic/isp_target.h>
@@ -41,6 +42,7 @@
#endif
#endif
#ifdef __FreeBSD__
+#include <dev/isp/isp_stds.h>
#include <dev/isp/ispmbox.h>
#ifdef ISP_TARGET_MODE
#include <dev/isp/isp_target.h>
@@ -48,6 +50,7 @@
#endif
#endif
#ifdef __linux__
+#include "isp_stds.h"
#include "ispmbox.h"
#ifdef ISP_TARGET_MODE
#include "isp_target.h"