Fresh code drop from the vendor. This fixes some critical bugs and adds

support for a new class of controllers.  Also adjust MAINTAINER at the
approval of msmith.

Obtained from:	mark_salyzyn@adaptec.com

1 files changed, 15 insertions, 24 deletions

diff --git a/sys/dev/asr/i2omsg.h b/sys/dev/asr/i2omsg.h
index bb28d62..f6e200d 100644
--- a/sys/dev/asr/i2omsg.h
+++ b/sys/dev/asr/i2omsg.h
@@ -3,16 +3,16 @@
  * Copyright (c) 1996-2000 Distributed Processing Technology Corporation
  * Copyright (c) 2000 Adaptec Corporation.
  * All rights reserved.
- * 
+ *
  * Copyright 1999 I2O Special Interest Group (I2O SIG).  All rights reserved.
  * All rights reserved
- * 
+ *
  * TERMS AND CONDITIONS OF USE
- * 
+ *
  * Redistribution and use in source form, with or without modification, are
  * permitted provided that redistributions of source code must retain the
  * above copyright notice, this list of conditions and the following disclaimer.
- * 
+ *
  * This software is provided `as is' by Distributed Processing Technology and
  * any express or implied warranties, including, but not limited to, the
  * implied warranties of merchantability and fitness for a particular purpose,
@@ -24,7 +24,7 @@
  * contract, strict liability, or tort (including negligence or otherwise)
  * arising in any way out of the use of this driver software, even if advised
  * of the possibility of such damage.
- * 
+ *
  * This header file, and any modifications of this header file, are provided
  * contingent upon your agreement and adherence to the here-listed terms and
  * conditions.  By accepting and/or using this header file, you agree to abide
@@ -33,45 +33,45 @@
  * without reference to conflict-of-law provisions.  If you do not agree
  * to these terms and conditions, please delete this file, and any copies,
  * permanently, without making any use thereof.
- * 
+ *
  * THIS HEADER FILE IS PROVIDED FREE OF CHARGE ON AN AS-IS BASIS WITHOUT
  * WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
  * TO IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE.  I2O SIG DOES NOT WARRANT THAT THIS HEADER FILE WILL MEET THE
  * USER'S REQUIREMENTS OR THAT ITS OPERATION WILL BE UNINTERRUPTED OR
  * ERROR-FREE.
- * 
+ *
  * I2O SIG DISCLAIMS ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF
  * ANY PROPRIETARY RIGHTS, RELATING TO THE IMPLEMENTATION OF THE I2O
  * SPECIFICATIONS.  I2O SIG DOES NOT WARRANT OR REPRESENT THAT SUCH
  * IMPLEMENTATIONS WILL NOT INFRINGE SUCH RIGHTS.
- * 
+ *
  * THE USER OF THIS HEADER FILE SHALL HAVE NO RECOURSE TO I2O SIG FOR ANY
  * ACTUAL OR CONSEQUENTIAL DAMAGES INCLUDING, BUT NOT LIMITED TO, LOST DATA
  * OR LOST PROFITS ARISING OUT OF THE USE OR INABILITY TO USE THIS PROGRAM.
- * 
+ *
  * I2O SIG grants the user of this header file a license to copy, distribute,
  * and modify it, for any purpose, under the following terms.  Any copying,
  * distribution, or modification of this header file must not delete or alter
  * the copyright notice of I2O SIG or any of these Terms and Conditions.
- * 
+ *
  * Any distribution of this header file must not include a charge for the
  * header file (unless such charges are strictly for the physical acts of
  * copying or transferring copies).  However, distribution of a product in
  * which this header file is embedded may include a charge so long as any
  * such charge does not include any charge for the header file itself.
- * 
+ *
  * Any modification of this header file constitutes a derivative work based
  * on this header file.  Any distribution of such derivative work: (1) must
  * include prominent notices that the header file has been changed from the
- * original, together with the dates of any changes; (2) automatically includes 
+ * original, together with the dates of any changes; (2) automatically includes
  * this same license to the original header file from I2O SIG, without any
  * restriction thereon from the distributing user; and (3) must include a
  * grant of license of the modified file under the same terms and conditions
  * as these Terms and Conditions.
- * 
+ *
  * The I2O SIG Web site can be found at: http://www.i2osig.org
- * 
+ *
  * The I2O SIG encourages you to deposit derivative works based on this
  * header file at the I2O SIG Web site.  Furthermore, to become a Registered
  * Developer of the I2O SIG, sign up at the Web site or call 415.750.8352
@@ -430,16 +430,7 @@ typedef struct _I2O_FAILURE_REPLY_MESSAGE_FRAME {
         BF                      reserved1:12;
 #   endif
     U32                         AgeLimit;
-/* i2odep.h looks after this, but for portability sake ... */
-#if (!defined(__FAR__))
-# if (defined(__BORLANDC__))
-#  define __FAR__ far
-# else
-#  define __FAR__
-# endif
-#endif
-/* Not really `far, but it is a *long* physical pointer reference */
-    I2O_MESSAGE_FRAME __FAR__ * PreservedMFA;
+    U32                         PreservedMFA;
 } I2O_FAILURE_REPLY_MESSAGE_FRAME, *PI2O_FAILURE_REPLY_MESSAGE_FRAME;
 
 /* I2O Transport Message Reply for Transaction Error. */