summaryrefslogtreecommitdiffstats
path: root/drivers/fc4/fc.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-06-13 16:29:25 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-06-13 16:29:25 +0000
commitdb7d4daea91e105e3859cf461d7e53b9b77454b2 (patch)
tree9bb65b95440af09e8aca63abe56970dd3360cc57 /drivers/fc4/fc.h
parent9c1c01ead627bdda9211c9abd5b758d6c687d8ac (diff)
Merge with Linux 2.2.8.
Diffstat (limited to 'drivers/fc4/fc.h')
-rw-r--r--drivers/fc4/fc.h24
1 files changed, 16 insertions, 8 deletions
diff --git a/drivers/fc4/fc.h b/drivers/fc4/fc.h
index d1c991802..13f89d4c8 100644
--- a/drivers/fc4/fc.h
+++ b/drivers/fc4/fc.h
@@ -1,6 +1,6 @@
/* fc.h: Definitions for Fibre Channel Physical and Signaling Interface.
*
- * Copyright (C) 1996,1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
+ * Copyright (C) 1996-1997,1999 Jakub Jelinek (jj@ultra.linux.cz)
*
* Sources:
* Fibre Channel Physical & Signaling Interface (FC-PH), dpANS, 1994
@@ -11,13 +11,16 @@
#define __FC_H
/* World Wide Name */
-#define NAAID_IEEE 1
-#define NAAID_IEEE_EXT 2
-#define NAAID_LOCAL 3
-#define NAAID_IP 4
-#define NAAID_CCITT 12
-#define NAAID_CCITT_GRP 14
-
+#define NAAID_IEEE 1
+#define NAAID_IEEE_EXT 2
+#define NAAID_LOCAL 3
+#define NAAID_IP 4
+#define NAAID_IEEE_REG 5
+#define NAAID_IEEE_REG_EXT 6
+#define NAAID_CCITT 12
+#define NAAID_CCITT_GRP 14
+
+/* This is NAAID_IEEE_EXT scheme */
typedef struct {
u32 naaid:4;
u32 nportid:12;
@@ -165,6 +168,7 @@ typedef struct {
/* Extended SVC commands */
#define LS_RJT 0x01000000
#define LS_ACC 0x02000000
+#define LS_PRLI_ACC 0x02100014
#define LS_PLOGI 0x03000000
#define LS_FLOGI 0x04000000
#define LS_LOGO 0x05000000
@@ -182,7 +186,11 @@ typedef struct {
#define LS_TEST 0x11000000
#define LS_RRQ 0x12000000
#define LS_IDENT 0x20000000
+#define LS_PRLI 0x20100014
#define LS_DISPLAY 0x21000000
+#define LS_PRLO 0x21100014
+#define LS_PDISC 0x50000000
+#define LS_ADISC 0x52000000
typedef struct {
u8 fcph_hi, fcph_lo;