BSD 4_3_Net_2 release

[unix-history] / usr / src / sys / vax / vax / mscp.c

diff --git a/usr/src/sys/vax/vax/mscp.c b/usr/src/sys/vax/vax/mscp.c
index 7b7b124..33f92d9 100644 (file)
--- a/usr/src/sys/vax/vax/mscp.c
+++ b/usr/src/sys/vax/vax/mscp.c
@@ -1,24 +1,54 @@
 /*
 /*

- * Copyright (c) 1987 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.

  *
  *

- *     @(#)mscp.c      1.3 (Berkeley) %G%
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)mscp.c      7.5 (Berkeley) 12/16/90

  */
 
 /*
  * MSCP generic driver routines
  */
 
  */
 
 /*
  * MSCP generic driver routines
  */
 

-#include "param.h"
-#include "buf.h"
-#include "errno.h"
-#include "dkstat.h"
-#include "ioctl.h"
-#include "disklabel.h"
-#include "syslog.h"
+#include "sys/param.h"
+#include "sys/buf.h"
+#include "sys/errno.h"
+#include "sys/dkstat.h"
+#include "sys/ioctl.h"
+#include "sys/disklabel.h"
+#include "sys/syslog.h"

 
 

-#include "../vaxuba/ubavar.h"
+#include "../uba/ubavar.h"

 
 #include "mscp.h"
 #include "mscpvar.h"
 
 #include "mscp.h"
 #include "mscpvar.h"


@@ -458,7 +488,8 @@ Emulex SC41/MS screwup: %s%d, got %d correct, then changed 0x%x to 0x%x\n",
 
                        case MSCP_FAILED:       /* no luck */
                                diskerr(bp, drivename, "hard error",
 
                        case MSCP_FAILED:       /* no luck */
                                diskerr(bp, drivename, "hard error",

-                                   LOG_PRINTF, -1, &md->md_lab[ui->ui_unit]);
+                                   LOG_PRINTF, -1, md->md_lab ?
+                                   &md->md_lab[ui->ui_unit] : md->md_lab);

                                mscp_printevent(mp);
                                bp->b_flags |= B_ERROR;
                                bp->b_error = EIO;
                                mscp_printevent(mp);
                                bp->b_flags |= B_ERROR;
                                bp->b_error = EIO;