xnu-792.6.61.tar.gz

[apple/xnu.git] / bsd / dev / i386 / cons.h

diff --git a/bsd/dev/i386/cons.h b/bsd/dev/i386/cons.h
index 67a391a839aa9e4c135d1c609160625e5b98b8d3..e14004aa24558660b83e21e6f8bf51c1dbeb2c2d 100644 (file)
--- a/bsd/dev/i386/cons.h
+++ b/bsd/dev/i386/cons.h
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.

  * 
  * 

- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.

  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -27,14 +24,14 @@
  */
  
 struct consdev {
  */
  
 struct consdev {

-       char    *cn_name;       /* name of device in dev_name_list */
-       int     (*cn_probe)();  /* probe hardware and fill in consdev info */
-       int     (*cn_init)();   /* turn on as console */
-       int     (*cn_getc)();   /* kernel getchar interface */
-       int     (*cn_putc)();   /* kernel putchar interface */
-       struct  tty *cn_tp;     /* tty structure for console device */
-       dev_t   cn_dev;         /* major/minor of device */
-       short   cn_pri;         /* pecking order; the higher the better */
+       char    *cn_name;               /* name of device in dev_name_list */
+       int     (*cn_probe)(void);      /* probe hardware, fill consdev info */
+       int     (*cn_init)(void);       /* turn on as console */
+       int     (*cn_getc)(void);       /* kernel getchar interface */
+       int     (*cn_putc)(void);       /* kernel putchar interface */
+       struct  tty *cn_tp;             /* tty structure for console device */
+       dev_t   cn_dev;                 /* major/minor of device */
+       short   cn_pri;                 /* pecking order; higher the better */

 };
 
 /* values for cn_pri - reflect our policy for console selection */
 };
 
 /* values for cn_pri - reflect our policy for console selection */