summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/files4
-rw-r--r--sys/dev/ic/isp.c12
-rw-r--r--sys/dev/ic/isp_inline.h4
-rw-r--r--sys/dev/ic/isp_openbsd.c4
-rw-r--r--sys/dev/ic/isp_openbsd.h4
-rw-r--r--sys/dev/ic/isp_target.c8
-rw-r--r--sys/dev/ic/isp_target.h6
-rw-r--r--sys/dev/ic/isp_tpublic.h20
-rw-r--r--sys/dev/ic/ispmbox.h8
-rw-r--r--sys/dev/ic/ispreg.h12
-rw-r--r--sys/dev/ic/ispvar.h8
-rw-r--r--sys/dev/pci/files.pci4
-rw-r--r--sys/dev/pci/isp_pci.c6
-rw-r--r--sys/dev/sbus/isp_sbus.c6
14 files changed, 53 insertions, 53 deletions
diff --git a/sys/conf/files b/sys/conf/files
index 4827ed740c8..6cfc49eb7d8 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-# $OpenBSD: files,v 1.423 2008/01/19 23:53:53 marco Exp $
+# $OpenBSD: files,v 1.424 2008/01/21 20:00:32 sobrado Exp $
# $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@@ -179,7 +179,7 @@ file dev/ic/ami.c ami
device mfi: scsi
file dev/ic/mfi.c mfi
-# Qlogic ISP 10x0 SCSI Controllers
+# QLogic ISP 10x0 SCSI Controllers
device isp: scsi
file dev/ic/isp.c isp
file dev/ic/isp_openbsd.c isp
diff --git a/sys/dev/ic/isp.c b/sys/dev/ic/isp.c
index 15de82d85dc..bc1f4bdbb44 100644
--- a/sys/dev/ic/isp.c
+++ b/sys/dev/ic/isp.c
@@ -1,7 +1,7 @@
-/* $OpenBSD: isp.c,v 1.40 2007/10/16 23:41:42 fgsch Exp $ */
+/* $OpenBSD: isp.c,v 1.41 2008/01/21 20:00:33 sobrado Exp $ */
/*
* Machine and OS Independent (well, as best as possible)
- * code for the Qlogic ISP SCSI adapters.
+ * code for the QLogic ISP SCSI adapters.
*
* Copyright (c) 1997, 1998, 1999, 2000, 2001 by Matthew Jacob
* Feral Software
@@ -1879,7 +1879,7 @@ isp_pdb_sync(struct ispsoftc *isp)
* If we'd been logged in- see if we still are and we haven't
* changed. If so, no need to log ourselves out, etc..
*
- * Unfortunately, our charming Qlogic f/w has decided to
+ * Unfortunately, our charming QLogic f/w has decided to
* return a valid port database entry for a fabric device
* that has, in fact, gone away. And it hangs trying to
* log it out.
@@ -3218,7 +3218,7 @@ isp_start(XS_T *xs)
/*
* Fibre Channel always requires some kind of tag.
- * The Qlogic drivers seem be happy not to use a tag,
+ * The QLogic drivers seem be happy not to use a tag,
* but this breaks for some devices (IBM drives).
*/
if (XS_TAG_P(xs)) {
@@ -3267,7 +3267,7 @@ isp_start(XS_T *xs)
/*
* Set up DMA and/or do any bus swizzling of the request entry
- * so that the Qlogic F/W understands what is being asked of it.
+ * so that the QLogic F/W understands what is being asked of it.
*/
i = ISP_DMASETUP(isp, xs, reqp, &nxti, optr);
if (i != CMD_QUEUED) {
@@ -6315,7 +6315,7 @@ isp_parse_nvram_2100(struct ispsoftc *isp, u_int8_t *nvram_data)
* I can find. However, we should account for this being set
* at some point in the future.
*
- * Qlogic WWNs have an NAA of 2, but usually nothing shows up in
+ * QLogic WWNs have an NAA of 2, but usually nothing shows up in
* bits 48..60. In the case of the 2202, it appears that they do
* use bit 48 to distinguish between the two instances on the card.
* The 2204, which I've never seen, *probably* extends this method.
diff --git a/sys/dev/ic/isp_inline.h b/sys/dev/ic/isp_inline.h
index 5c8ead1aa71..5dcd5c35a28 100644
--- a/sys/dev/ic/isp_inline.h
+++ b/sys/dev/ic/isp_inline.h
@@ -1,6 +1,6 @@
-/* $OpenBSD: isp_inline.h,v 1.13 2004/08/02 19:55:45 art Exp $ */
+/* $OpenBSD: isp_inline.h,v 1.14 2008/01/21 20:00:33 sobrado Exp $ */
/*
- * Qlogic Host Adapter Inline Functions
+ * QLogic Host Adapter Inline Functions
*
* Copyright (c) 1999, 2000, 2001 by Matthew Jacob
* Feral Software
diff --git a/sys/dev/ic/isp_openbsd.c b/sys/dev/ic/isp_openbsd.c
index c89484d3993..02369781da5 100644
--- a/sys/dev/ic/isp_openbsd.c
+++ b/sys/dev/ic/isp_openbsd.c
@@ -1,6 +1,6 @@
-/* $OpenBSD: isp_openbsd.c,v 1.30 2007/04/10 17:47:55 miod Exp $ */
+/* $OpenBSD: isp_openbsd.c,v 1.31 2008/01/21 20:00:33 sobrado Exp $ */
/*
- * Platform (OpenBSD) dependent common attachment code for Qlogic adapters.
+ * Platform (OpenBSD) dependent common attachment code for QLogic adapters.
*
* Copyright (c) 1999, 2000, 2001 by Matthew Jacob
* All rights reserved.
diff --git a/sys/dev/ic/isp_openbsd.h b/sys/dev/ic/isp_openbsd.h
index edcb0781130..f08f1a95968 100644
--- a/sys/dev/ic/isp_openbsd.h
+++ b/sys/dev/ic/isp_openbsd.h
@@ -1,6 +1,6 @@
-/* $OpenBSD: isp_openbsd.h,v 1.26 2004/08/02 19:55:45 art Exp $ */
+/* $OpenBSD: isp_openbsd.h,v 1.27 2008/01/21 20:00:33 sobrado Exp $ */
/*
- * OpenBSD Specific definitions for the Qlogic ISP Host Adapter
+ * OpenBSD Specific definitions for the QLogic ISP Host Adapter
*/
/*
* Copyright (C) 1999, 2000, 2001 by Matthew Jacob
diff --git a/sys/dev/ic/isp_target.c b/sys/dev/ic/isp_target.c
index 24c0e1c6035..d04983a9188 100644
--- a/sys/dev/ic/isp_target.c
+++ b/sys/dev/ic/isp_target.c
@@ -1,6 +1,6 @@
-/* $OpenBSD: isp_target.c,v 1.14 2007/02/14 00:53:48 jsg Exp $ */
+/* $OpenBSD: isp_target.c,v 1.15 2008/01/21 20:00:33 sobrado Exp $ */
/*
- * Machine and OS Independent Target Mode Code for the Qlogic SCSI/FC adapters.
+ * Machine and OS Independent Target Mode Code for the QLogic SCSI/FC adapters.
*
* Copyright (c) 1999, 2000, 2001 by Matthew Jacob
* All rights reserved.
@@ -66,7 +66,7 @@ static void isp_handle_ctio(struct ispsoftc *, ct_entry_t *);
static void isp_handle_ctio2(struct ispsoftc *, ct2_entry_t *);
/*
- * The Qlogic driver gets an interrupt to look at response queue entries.
+ * The QLogic driver gets an interrupt to look at response queue entries.
* Some of these are status completions for initiatior mode commands, but
* if target mode is enabled, we get a whole wad of response queue entries
* to be handled here.
@@ -86,7 +86,7 @@ static void isp_handle_ctio2(struct ispsoftc *, ct2_entry_t *);
* be moved and/or status to be sent) and finally finishing with sending
* to the f/w's response queue an ATIO which then completes the handshake
* with the f/w for that command. There's a lot of variations on this theme,
- * including flags you can set in the CTIO for the Qlogic 2X00 fibre channel
+ * including flags you can set in the CTIO for the QLogic 2X00 fibre channel
* cards that 'auto-replenish' the f/w's ATIO count, but this is the basic
* gist of it.
*
diff --git a/sys/dev/ic/isp_target.h b/sys/dev/ic/isp_target.h
index ba571eb52a3..30be9e4a50a 100644
--- a/sys/dev/ic/isp_target.h
+++ b/sys/dev/ic/isp_target.h
@@ -1,8 +1,8 @@
-/* $OpenBSD: isp_target.h,v 1.11 2002/08/17 17:42:04 mjacob Exp $ */
+/* $OpenBSD: isp_target.h,v 1.12 2008/01/21 20:00:33 sobrado Exp $ */
/* @(#)isp_target.h 1.3 */
/*
- * Qlogic Target Mode Structure and Flag Definitions
+ * QLogic Target Mode Structure and Flag Definitions
*
* Copyright (c) 1997, 1998
* Patrick Stirling
@@ -513,7 +513,7 @@ typedef struct {
#ifdef ISP_TARGET_FUNCTIONS
/*
* The functions below are for the publicly available
- * target mode functions that are internal to the Qlogic driver.
+ * target mode functions that are internal to the QLogic driver.
*/
/*
diff --git a/sys/dev/ic/isp_tpublic.h b/sys/dev/ic/isp_tpublic.h
index 7b2dcc743c7..c590765cb33 100644
--- a/sys/dev/ic/isp_tpublic.h
+++ b/sys/dev/ic/isp_tpublic.h
@@ -1,6 +1,6 @@
-/* $OpenBSD: isp_tpublic.h,v 1.9 2007/04/10 17:47:55 miod Exp $ */
+/* $OpenBSD: isp_tpublic.h,v 1.10 2008/01/21 20:00:33 sobrado Exp $ */
/*
- * Qlogic ISP Host Adapter Public Target Interface Structures && Routines
+ * QLogic ISP Host Adapter Public Target Interface Structures && Routines
*---------------------------------------
* Copyright (c) 2000, 2001 by Matthew Jacob
* All rights reserved.
@@ -97,7 +97,7 @@ typedef struct {
* bus host adapters) that this applies to (consider it an extra Port
* parameter). The iid, tgt and lun values are deliberately chosen to be
* fat so that, for example, World Wide Names can be used instead of
- * the units that the Qlogic firmware uses (in the case where the MD
+ * the units that the QLogic firmware uses (in the case where the MD
* layer maintains a port database, for example).
*
* The cd_tagtype field specifies what kind of command tag has been
@@ -107,11 +107,11 @@ typedef struct {
*
* N.B.: when the MD layer sends this command to outside software
* the outside software likely *MUST* return the same cd_tagval that
- * was in place because this value is likely what the Qlogic f/w uses
+ * was in place because this value is likely what the QLogic f/w uses
* to identify a command.
*
* The cd_cdb contains storage for the passed in command descriptor block.
- * This is the maximum size we can get out of the Qlogic f/w. There's no
+ * This is the maximum size we can get out of the QLogic f/w. There's no
* passed in length because whoever decodes the command to act upon it
* will know what the appropriate length is.
*
@@ -241,7 +241,7 @@ typedef struct tmd_cmd {
#define CDFH_PRIVATE_0 0x80 /* private layer flags */
/*
- * Action codes set by the Qlogic MD target driver for
+ * Action codes set by the QLogic MD target driver for
* the external layer to figure out what to do with.
*/
typedef enum {
@@ -255,7 +255,7 @@ typedef enum {
/*
* Action codes set by the external layer for the
- * MD Qlogic driver to figure out what to do with.
+ * MD QLogic driver to figure out what to do with.
*/
typedef enum {
QIN_HBA_REG=6, /* the argument is a pointer to a hba_register_t */
@@ -270,16 +270,16 @@ typedef enum {
* A word about the START/CONT/DONE/FIN dance:
*
* When the HBA is enabled for receiving commands, one may show up
- * without notice. When that happens, the Qlogic target mode driver
+ * without notice. When that happens, the QLogic target mode driver
* gets a tmd_cmd_t, fills it with the info that just arrived, and
* calls the outer layer with a QOUT_TMD_START code and pointer to
* the tmd_cmd_t.
*
* The outer layer decodes the command, fetches data, prepares stuff,
* whatever, and starts by passing back the pointer with a QIN_TMD_CONT
- * code which causes the Qlogic target mode driver to generate CTIOs to
+ * code which causes the QLogic target mode driver to generate CTIOs to
* satisfy whatever action needs to be taken. When those CTIOs complete,
- * the Qlogic target driver sends the pointer to the cmd_tmd_t back with
+ * the QLogic target driver sends the pointer to the cmd_tmd_t back with
* a QOUT_TMD_DONE code. This repeats for as long as necessary.
*
* The outer layer signals it wants to end the command by settings within
diff --git a/sys/dev/ic/ispmbox.h b/sys/dev/ic/ispmbox.h
index ec855c78953..ed46ebec861 100644
--- a/sys/dev/ic/ispmbox.h
+++ b/sys/dev/ic/ispmbox.h
@@ -1,6 +1,6 @@
-/* $OpenBSD: ispmbox.h,v 1.19 2003/03/03 18:38:10 mjacob Exp $ */
+/* $OpenBSD: ispmbox.h,v 1.20 2008/01/21 20:00:33 sobrado Exp $ */
/*
- * Mailbox and Queue Entry Definitions for for Qlogic ISP SCSI adapters.
+ * Mailbox and Queue Entry Definitions for for QLogic ISP SCSI adapters.
*
* Copyright (c) 1997, 1998, 1999, 2000 by Matthew Jacob
* All rights reserved.
@@ -451,7 +451,7 @@ typedef struct {
} ispstatus_cont_t;
/*
- * For Qlogic 2X00, the high order byte of SCSI status has
+ * For QLogic 2X00, the high order byte of SCSI status has
* additional meaning.
*/
#define RQCS_RU 0x800 /* Residual Under */
@@ -704,7 +704,7 @@ typedef struct isp_icb {
* This is an at most 128 byte map that returns either
* the LILP or Firmware generated list of ports.
*
- * We deviate a bit from the returned qlogic format to
+ * We deviate a bit from the returned QLogic format to
* use an extra bit to say whether this was a LILP or
* f/w generated map.
*/
diff --git a/sys/dev/ic/ispreg.h b/sys/dev/ic/ispreg.h
index 206a11bdbc4..75b15f8e37e 100644
--- a/sys/dev/ic/ispreg.h
+++ b/sys/dev/ic/ispreg.h
@@ -1,7 +1,7 @@
-/* $OpenBSD: ispreg.h,v 1.13 2003/10/21 18:58:49 jmc Exp $ */
+/* $OpenBSD: ispreg.h,v 1.14 2008/01/21 20:00:33 sobrado Exp $ */
/*
* Machine Independent (well, as best as possible) register
- * definitions for Qlogic ISP SCSI adapters.
+ * definitions for QLogic ISP SCSI adapters.
*
* Copyright (c) 1997, 1998, 1999, 2000 by Matthew Jacob
* All rights reserved.
@@ -31,7 +31,7 @@
#define _ISPREG_H
/*
- * Hardware definitions for the Qlogic ISP registers.
+ * Hardware definitions for the QLogic ISP registers.
*/
/*
@@ -681,7 +681,7 @@
#define ISPBSMX(c, byte, shift, mask) \
(((c)[(byte)] >> (shift)) & (mask))
/*
- * Qlogic 1020/1040 NVRAM is an array of 128 bytes.
+ * QLogic 1020/1040 NVRAM is an array of 128 bytes.
*
* Some portion of the front of this is for general host adapter properties
* This is followed by an array of per-target parameters, and is tailed off
@@ -741,7 +741,7 @@
#define ISP_NVRAM_TGT_LUN_DISABLE(c, t) ISPBSMX(c, _IxT(t, 3), 5, 0x01)
/*
- * Qlogic 1080/1240 NVRAM is an array of 256 bytes.
+ * QLogic 1080/1240 NVRAM is an array of 256 bytes.
*
* Some portion of the front of this is for general host adapter properties
* This is followed by an array of per-target parameters, and is tailed off
@@ -924,7 +924,7 @@
ISPBSMX(c, _IxT16(t, 4, (b)), 7, 0x01)
/*
- * Qlogic 2XXX NVRAM is an array of 256 bytes.
+ * QLogic 2XXX NVRAM is an array of 256 bytes.
*
* Some portion of the front of this is for general RISC engine parameters,
* mostly reflecting the state of the last INITIALIZE FIRMWARE mailbox command.
diff --git a/sys/dev/ic/ispvar.h b/sys/dev/ic/ispvar.h
index f5a79060800..93368f4fd11 100644
--- a/sys/dev/ic/ispvar.h
+++ b/sys/dev/ic/ispvar.h
@@ -1,6 +1,6 @@
-/* $OpenBSD: ispvar.h,v 1.23 2007/04/10 17:47:55 miod Exp $ */
+/* $OpenBSD: ispvar.h,v 1.24 2008/01/21 20:00:33 sobrado Exp $ */
/*
- * Soft Definitions for for Qlogic ISP SCSI adapters.
+ * Soft Definitions for for QLogic ISP SCSI adapters.
*
* Copyright (c) 1997, 1998, 1999, 2000 by Matthew Jacob
* All rights reserved.
@@ -653,7 +653,7 @@ void isp_done(XS_T *);
* below).
*
* ISPCTL_SCAN_LOOP does a local loop scan. This is only done if the connection
- * topology is NL or FL port (private or public loop). Since the Qlogic f/w
+ * topology is NL or FL port (private or public loop). Since the QLogic f/w
* 'automatically' manages local loop connections, this function essentially
* notes the arrival, departure, and possible shuffling around of local loop
* entities. Thus for each arrival and departure this generates an isp_async
@@ -883,7 +883,7 @@ void isp_prt(struct ispsoftc *, int level, const char *, ...);
* read from NVRAM (possibly corrected for card botches).
* Each platform can take that information and override
* it or ignore and return the Node and Port WWNs to be
- * used when sending the Qlogic f/w the Initialization Control
+ * used when sending the QLogic f/w the Initialization Control
* Block.
*
* (XXX these do endian specific transformations- in transition XXX)
diff --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci
index 80a4a4fec3a..d303c4123f7 100644
--- a/sys/dev/pci/files.pci
+++ b/sys/dev/pci/files.pci
@@ -1,4 +1,4 @@
-# $OpenBSD: files.pci,v 1.249 2007/12/31 14:51:19 dlg Exp $
+# $OpenBSD: files.pci,v 1.250 2008/01/21 20:00:33 sobrado Exp $
# $NetBSD: files.pci,v 1.20 1996/09/24 17:47:15 christos Exp $
#
# Config file and device description for machine-independent PCI code.
@@ -208,7 +208,7 @@ file dev/pci/cac_pci.c cac_pci
attach ciss at pci with ciss_pci
file dev/pci/ciss_pci.c ciss_pci
-# Qlogic ISP 10x0 (PCI) family
+# QLogic ISP 10x0 (PCI) family
# device declaration in sys/conf/files
attach isp at pci with isp_pci
file dev/pci/isp_pci.c isp_pci
diff --git a/sys/dev/pci/isp_pci.c b/sys/dev/pci/isp_pci.c
index 8b278b788c4..ded079a6bb0 100644
--- a/sys/dev/pci/isp_pci.c
+++ b/sys/dev/pci/isp_pci.c
@@ -1,6 +1,6 @@
-/* $OpenBSD: isp_pci.c,v 1.40 2007/09/22 16:03:23 krw Exp $ */
+/* $OpenBSD: isp_pci.c,v 1.41 2008/01/21 20:00:33 sobrado Exp $ */
/*
- * PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
+ * PCI specific probe and attach routines for QLogic ISP SCSI adapters.
*
*---------------------------------------
* Copyright (c) 1997, 1998, 1999 by Matthew Jacob
@@ -334,7 +334,7 @@ struct cfattach isp_pci_ca = {
#ifdef DEBUG
const char vstring[] =
- "Qlogic ISP Driver, NetBSD (pci) Platform Version %d.%d Core Version %d.%d";
+ "QLogic ISP Driver, NetBSD (pci) Platform Version %d.%d Core Version %d.%d";
#endif
const struct pci_matchid ispdev[] = {
diff --git a/sys/dev/sbus/isp_sbus.c b/sys/dev/sbus/isp_sbus.c
index a9703d5a39b..0abb1879d31 100644
--- a/sys/dev/sbus/isp_sbus.c
+++ b/sys/dev/sbus/isp_sbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isp_sbus.c,v 1.10 2007/09/11 13:39:34 gilles Exp $ */
+/* $OpenBSD: isp_sbus.c,v 1.11 2008/01/21 20:00:33 sobrado Exp $ */
/* $NetBSD: isp_sbus.c,v 1.46 2001/09/26 20:53:14 eeh Exp $ */
/*
@@ -30,7 +30,7 @@
* Please coordinate with Matthew Jacob on changes you wish to make here.
*/
/*
- * SBus specific probe and attach routines for Qlogic ISP SCSI adapters.
+ * SBus specific probe and attach routines for QLogic ISP SCSI adapters.
*
* Copyright (c) 1997, 2001 by Matthew Jacob
* NASA AMES Research Center
@@ -142,7 +142,7 @@ isp_match(struct device *parent, void *vcf, void *aux)
#ifdef DEBUG
if (rv && oneshot) {
oneshot = 0;
- printf("Qlogic ISP Driver, NetBSD (sbus) Platform Version "
+ printf("QLogic ISP Driver, NetBSD (sbus) Platform Version "
"%d.%d Core Version %d.%d\n",
ISP_PLATFORM_VERSION_MAJOR, ISP_PLATFORM_VERSION_MINOR,
ISP_CORE_VERSION_MAJOR, ISP_CORE_VERSION_MINOR);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 14:03:05 +0000