From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Wilcox Subject: Re: [PATCH] Add SPI-5 constants to scsi.h Date: Tue, 21 Sep 2004 13:31:44 +0100 Sender: linux-scsi-owner@vger.kernel.org Message-ID: <20040921123144.GV642@parcelfarce.linux.theplanet.co.uk> References: <20040921115059.GU642@parcelfarce.linux.theplanet.co.uk> <20040921130438.A22311@infradead.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from parcelfarce.linux.theplanet.co.uk ([195.92.249.252]:23709 "EHLO www.linux.org.uk") by vger.kernel.org with ESMTP id S267618AbUIUMbp (ORCPT ); Tue, 21 Sep 2004 08:31:45 -0400 Content-Disposition: inline In-Reply-To: <20040921130438.A22311@infradead.org> List-Id: linux-scsi@vger.kernel.org To: Christoph Hellwig Cc: Matthew Wilcox , linux-scsi@vger.kernel.org On Tue, Sep 21, 2004 at 01:04:38PM +0100, Christoph Hellwig wrote: > On Tue, Sep 21, 2004 at 12:50:59PM +0100, Matthew Wilcox wrote: > > > > Add the new constant names from SPI-5 to > > > What about having a section ala > > /* > * Old SCSI2 names, don't use in new code > */ > #define ABORT ABORT_TASK_SET > #define BUS_DEVICE_RESET TARGET_RESET > > instead of intermixing them with the rest of the defines? Sure... Index: linux-2.6/include/scsi/scsi.h =================================================================== RCS file: /var/cvs/linux-2.6/include/scsi/scsi.h,v retrieving revision 1.10 diff -u -p -r1.10 scsi.h --- linux-2.6/include/scsi/scsi.h 13 Sep 2004 15:24:18 -0000 1.10 +++ linux-2.6/include/scsi/scsi.h 21 Sep 2004 12:30:39 -0000 @@ -246,24 +246,36 @@ struct scsi_lun { #define EXTENDED_SDTR 0x01 #define EXTENDED_EXTENDED_IDENTIFY 0x02 /* SCSI-I only */ #define EXTENDED_WDTR 0x03 +#define EXTENDED_PPR 0x04 +#define EXTENDED_MODIFY_BIDI_DATA_PTR 0x05 #define SAVE_POINTERS 0x02 #define RESTORE_POINTERS 0x03 #define DISCONNECT 0x04 #define INITIATOR_ERROR 0x05 -#define ABORT 0x06 +#define ABORT_TASK_SET 0x06 #define MESSAGE_REJECT 0x07 #define NOP 0x08 #define MSG_PARITY_ERROR 0x09 #define LINKED_CMD_COMPLETE 0x0a #define LINKED_FLG_CMD_COMPLETE 0x0b -#define BUS_DEVICE_RESET 0x0c - +#define TARGET_RESET 0x0c +#define ABORT_TASK 0x0d +#define CLEAR_TASK_SET 0x0e #define INITIATE_RECOVERY 0x0f /* SCSI-II only */ #define RELEASE_RECOVERY 0x10 /* SCSI-II only */ - +#define CLEAR_ACA 0x16 +#define LOGICAL_UNIT_RESET 0x17 #define SIMPLE_QUEUE_TAG 0x20 #define HEAD_OF_QUEUE_TAG 0x21 #define ORDERED_QUEUE_TAG 0x22 +#define IGNORE_WIDE_RESIDUE 0x23 +#define ACA 0x24 +#define QAS_REQUEST 0x55 +#define IDENTIFY 0x80 + +/* Old SCSI2 names, don't use in new code */ +#define BUS_DEVICE_RESET TARGET_RESET +#define ABORT ABORT_TASK_SET /* * Host byte codes -- "Next the statesmen will invent cheap lies, putting the blame upon the nation that is attacked, and every man will be glad of those conscience-soothing falsities, and will diligently study them, and refuse to examine any refutations of them; and thus he will by and by convince himself that the war is just, and will thank God for the better sleep he enjoys after this process of grotesque self-deception." -- Mark Twain