BSD 4_4_Lite1 release

[unix-history] / usr / src / sys / sys / dkstat.h

diff --git a/usr/src/sys/sys/dkstat.h b/usr/src/sys/sys/dkstat.h
index b5ef557..f7f5f15 100644 (file)
--- a/usr/src/sys/sys/dkstat.h
+++ b/usr/src/sys/sys/dkstat.h
@@ -1,35 +1,64 @@
-/*
- * Copyright (c) 1982, 1986 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+/*-
+ * Copyright (c) 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ * (c) UNIX System Laboratories, Inc.
+ * All or some portions of this file are derived from material licensed
+ * to the University of California by American Telephone and Telegraph
+ * Co. or Unix System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.

  *
  *

- *     @(#)dkstat.h    7.4 (Berkeley) 5/29/89
- */
-
-/*
- * Instrumentation
+ * 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.
+ *
+ *     @(#)dkstat.h    8.2 (Berkeley) 1/21/94

  */
  */

-#define        CPUSTATES       4

 
 #define        CP_USER         0
 #define        CP_NICE         1
 #define        CP_SYS          2
 
 #define        CP_USER         0
 #define        CP_NICE         1
 #define        CP_SYS          2

-#define        CP_IDLE         3
+#define        CP_INTR         3
+#define        CP_IDLE         4
+#define        CPUSTATES       5

 
 #define        DK_NDRIVE       8
 
 #define        DK_NDRIVE       8

-

 #ifdef KERNEL
 #ifdef KERNEL

-long   cp_time[CPUSTATES];
-int    dk_ndrive;
-int    dk_busy;
-long   dk_time[DK_NDRIVE];
-long   dk_seek[DK_NDRIVE];
-long   dk_xfer[DK_NDRIVE];
-long   dk_wds[DK_NDRIVE];
-long   dk_wpms[DK_NDRIVE];
+long cp_time[CPUSTATES];
+long dk_seek[DK_NDRIVE];
+long dk_time[DK_NDRIVE];
+long dk_wds[DK_NDRIVE];
+long dk_wpms[DK_NDRIVE];
+long dk_xfer[DK_NDRIVE];
+
+int dk_busy;
+int dk_ndrive;

 
 

-long   tk_nin;
-long   tk_cancc;
-long   tk_rawcc;
-long   tk_nout;
+long tk_cancc;
+long tk_nin;
+long tk_nout;
+long tk_rawcc;

 #endif
 #endif