BSD 4_4 release

[unix-history] / usr / src / sys / news3400 / fb / fb_probe.c

diff --git a/usr/src/sys/news3400/fb/fb_probe.c b/usr/src/sys/news3400/fb/fb_probe.c
index af4d19e..dd8bc04 100644 (file)
--- a/usr/src/sys/news3400/fb/fb_probe.c
+++ b/usr/src/sys/news3400/fb/fb_probe.c
@@ -1,19 +1,43 @@
 /*
 /*

- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1992, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * This code is derived from software contributed to Berkeley by
  * Sony Corp. and Kazumasa Utashiro of Software Research Associates, Inc.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * Sony Corp. and Kazumasa Utashiro of Software Research Associates, Inc.
  *

- * %sccs.include.redist.c%
+ * 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.

  *
  * from: $Hdr: fb_probe.c,v 4.300 91/06/09 06:32:57 root Rel41 $ SONY
  *
  *
  * from: $Hdr: fb_probe.c,v 4.300 91/06/09 06:32:57 root Rel41 $ SONY
  *

- *     @(#)fb_probe.c  7.2 (Berkeley) %G%
+ *     @(#)fb_probe.c  8.1 (Berkeley) 6/11/93

  */
 
  */
 

-#include <machine/fix_machine_type.h>
-

 #ifdef IPC_MRX
 #include "../../iop/framebuf.h"
 #include "types.h"
 #ifdef IPC_MRX
 #include "../../iop/framebuf.h"
 #include "types.h"


@@ -43,36 +67,6 @@ int  nfbdev = 0;
 static int     cons_dev = -1;
 extern struct fbdevsw  fbdevsw[];
 
 static int     cons_dev = -1;
 extern struct fbdevsw  fbdevsw[];
 

-#if defined(news1700)
-struct autodev autodev[] = {
-       -1, (char *)0xf0600000, (char *)0xf0610000,
-       -1, (char *)0xf0620000, (char *)0xf0630000,
-       -1, (char *)0xf0640000, (char *)0xf0650000,
-       -1, (char *)0xf0660000, (char *)0xf0670000,
-       -1, (char *)0xf0680000, (char *)0xf0690000,
-       -1, (char *)0xf06a0000, (char *)0xf06b0000,
-       -1, (char *)0xf06c0000, (char *)0xf06d0000,
-       -1, (char *)0xf06e0000, (char *)0xf06f0000,
-};
-
-#define AUTOSEL        1
-#endif /* defined(news1700) */
-
-#ifdef news1800
-struct autodev autodev[] = {
-       -1, (char *)0x20600000, (char *)0x20610000,
-       -1, (char *)0x20620000, (char *)0x20630000,
-       -1, (char *)0x20640000, (char *)0x20650000,
-       -1, (char *)0x20660000, (char *)0x20670000,
-       -1, (char *)0x20680000, (char *)0x20690000,
-       -1, (char *)0x206a0000, (char *)0x206b0000,
-       -1, (char *)0x206c0000, (char *)0x206d0000,
-       -1, (char *)0x206e0000, (char *)0x206f0000,
-};
-
-#define AUTOSEL        1
-#endif /* news1800 */
-

 #ifdef news3400
 struct autodev autodev[] = {
        -1, (char *)0xb8600000, (char *)0xb8610000,
 #ifdef news3400
 struct autodev autodev[] = {
        -1, (char *)0xb8600000, (char *)0xb8610000,