| syscons.c (44628) | syscons.c (45720) |
|---|---|
| 1/*- 2 * Copyright (c) 1992-1998 S�ren Schmidt 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 11 unchanged lines hidden (view full) --- 20 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 * | 1/*- 2 * Copyright (c) 1992-1998 S�ren Schmidt 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 11 unchanged lines hidden (view full) --- 20 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 * |
| 28 * $Id: syscons.c,v 1.298 1999/02/05 11:52:11 yokota Exp $ | 28 * $Id: syscons.c,v 1.299 1999/03/10 10:36:53 yokota Exp $ |
| 29 */ 30 31#include "sc.h" 32#include "splash.h" 33#ifdef __i386__ 34#include "apm.h" 35#endif 36#include "opt_ddb.h" --- 1827 unchanged lines hidden (view full) --- 1864#if __i386__ 1865 1866/* XXX kludge! */ 1867extern struct isa_driver scdriver; 1868 1869static void 1870sccnprobe(struct consdev *cp) 1871{ | 29 */ 30 31#include "sc.h" 32#include "splash.h" 33#ifdef __i386__ 34#include "apm.h" 35#endif 36#include "opt_ddb.h" --- 1827 unchanged lines hidden (view full) --- 1864#if __i386__ 1865 1866/* XXX kludge! */ 1867extern struct isa_driver scdriver; 1868 1869static void 1870sccnprobe(struct consdev *cp) 1871{ |
| 1872#if 0 |
|
| 1872 struct isa_device *dvp; 1873 1874 /* 1875 * Take control if we are the highest priority enabled display device. 1876 */ 1877 dvp = find_display(); 1878 if (dvp == NULL || dvp->id_driver != &scdriver) { 1879 cp->cn_pri = CN_DEAD; 1880 return; 1881 } 1882 1883 if (!scvidprobe(dvp->id_unit, dvp->id_flags, TRUE)) { 1884 cp->cn_pri = CN_DEAD; 1885 return; 1886 } 1887 sckbdprobe(dvp->id_unit, dvp->id_flags, TRUE); | 1873 struct isa_device *dvp; 1874 1875 /* 1876 * Take control if we are the highest priority enabled display device. 1877 */ 1878 dvp = find_display(); 1879 if (dvp == NULL || dvp->id_driver != &scdriver) { 1880 cp->cn_pri = CN_DEAD; 1881 return; 1882 } 1883 1884 if (!scvidprobe(dvp->id_unit, dvp->id_flags, TRUE)) { 1885 cp->cn_pri = CN_DEAD; 1886 return; 1887 } 1888 sckbdprobe(dvp->id_unit, dvp->id_flags, TRUE); |
| 1889#else 1890 if (!scvidprobe(0, 0, TRUE)) { 1891 cp->cn_pri = CN_DEAD; 1892 return; 1893 } 1894 sckbdprobe(0, 0, TRUE); 1895#endif |
|
| 1888 1889 /* initialize required fields */ 1890 cp->cn_dev = makedev(CDEV_MAJOR, SC_CONSOLE); 1891 cp->cn_pri = CN_INTERNAL; 1892} 1893 1894static void 1895sccninit(struct consdev *cp) --- 2641 unchanged lines hidden --- | 1896 1897 /* initialize required fields */ 1898 cp->cn_dev = makedev(CDEV_MAJOR, SC_CONSOLE); 1899 cp->cn_pri = CN_INTERNAL; 1900} 1901 1902static void 1903sccninit(struct consdev *cp) --- 2641 unchanged lines hidden --- |