Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Remove support for macofcons(4), it's not actually possi...
details: https://anonhg.NetBSD.org/src/rev/51c4c78d70da
branches: trunk
changeset: 830144:51c4c78d70da
user: sevan <sevan%NetBSD.org@localhost>
date: Mon Feb 26 23:09:32 2018 +0000
description:
Remove support for macofcons(4), it's not actually possible to build a kernel
with it enabled - See PR port-macppc/53004 and it may have further problems even
so.
>From <macallan>:
"There is some early console code that uses OF output but it causes problems
when we get close to MMU setup - I think it can go, it hasn't been enabled in
any config in at least a decade as far as I know."
diffstat:
sys/arch/macppc/conf/GENERIC | 6 +-
sys/arch/macppc/conf/GENERIC_601 | 6 +-
sys/arch/macppc/conf/MAMBO | 4 +-
sys/arch/macppc/conf/files.macppc | 6 +-
sys/arch/macppc/dev/ofcons.c | 349 --------------------------------------
sys/dev/DEVNAMES | 3 +-
6 files changed, 7 insertions(+), 367 deletions(-)
diffs (truncated from 465 to 300 lines):
diff -r d9172325bb47 -r 51c4c78d70da sys/arch/macppc/conf/GENERIC
--- a/sys/arch/macppc/conf/GENERIC Mon Feb 26 22:37:27 2018 +0000
+++ b/sys/arch/macppc/conf/GENERIC Mon Feb 26 23:09:32 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.343 2018/02/24 18:58:00 sevan Exp $
+# $NetBSD: GENERIC,v 1.344 2018/02/26 23:09:32 sevan Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.343 $"
+#ident "GENERIC-$Revision: 1.344 $"
maxusers 32
@@ -292,8 +292,6 @@
wsdisplay0 at wsemuldisplaydev? console 1
wsdisplay* at wsemuldisplaydev?
-#macofcons0 at pci? dev ? function ? # OpenFirmware console (for debugging)
-
# Other PCI devices
pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver
acardide* at pci? dev ? function ? # Acard IDE controllers
diff -r d9172325bb47 -r 51c4c78d70da sys/arch/macppc/conf/GENERIC_601
--- a/sys/arch/macppc/conf/GENERIC_601 Mon Feb 26 22:37:27 2018 +0000
+++ b/sys/arch/macppc/conf/GENERIC_601 Mon Feb 26 23:09:32 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_601,v 1.19 2018/02/24 18:58:00 sevan Exp $
+# $NetBSD: GENERIC_601,v 1.20 2018/02/26 23:09:32 sevan Exp $
#
# GENERIC machine description file
#
@@ -28,7 +28,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.19 $"
+ident "GENERIC-$Revision: 1.20 $"
maxusers 32
@@ -239,8 +239,6 @@
wsdisplay0 at wsemuldisplaydev? console 1
wsdisplay* at wsemuldisplaydev?
-#macofcons0 at pci? dev ? function ? # OpenFirmware console (for debugging)
-
obio* at pci? dev ? function ?
mc* at obio? # MACE ethernet
diff -r d9172325bb47 -r 51c4c78d70da sys/arch/macppc/conf/MAMBO
--- a/sys/arch/macppc/conf/MAMBO Mon Feb 26 22:37:27 2018 +0000
+++ b/sys/arch/macppc/conf/MAMBO Mon Feb 26 23:09:32 2018 +0000
@@ -6,7 +6,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.30 $"
+#ident "GENERIC-$Revision: 1.31 $"
maxusers 32
@@ -133,8 +133,6 @@
#ofb* at pci? dev ? function ? # Generic Open Firmware Framebuffer
pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver
obio* at pci? dev ? function ?
-macofcons0 at pci? dev ? function ? # OpenFirmware console (for debugging)
-#macofcons0 at mainbus? # OpenFirmware console (for debugging)
# PCI serial interfaces
nvram* at obio? # nvram
diff -r d9172325bb47 -r 51c4c78d70da sys/arch/macppc/conf/files.macppc
--- a/sys/arch/macppc/conf/files.macppc Mon Feb 26 22:37:27 2018 +0000
+++ b/sys/arch/macppc/conf/files.macppc Mon Feb 26 23:09:32 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.macppc,v 1.106 2017/12/18 15:53:38 skrll Exp $
+# $NetBSD: files.macppc,v 1.107 2018/02/26 23:09:32 sevan Exp $
#
# macppc-specific configuration info
@@ -265,10 +265,6 @@
#attach gpio at macgpio with gpio_gpio
file arch/macppc/dev/gpio.c macgpio
-device macofcons: tty
-attach macofcons at pci
-file arch/macppc/dev/ofcons.c macofcons needs-flag
-
attach com at mainbus with com_mainbus
file arch/macppc/dev/com_mainbus.c com_mainbus
diff -r d9172325bb47 -r 51c4c78d70da sys/arch/macppc/dev/ofcons.c
--- a/sys/arch/macppc/dev/ofcons.c Mon Feb 26 22:37:27 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,349 +0,0 @@
-/* $NetBSD: ofcons.c,v 1.29 2014/07/25 08:10:34 dholland Exp $ */
-
-/*
- * Copyright (C) 1995, 1996 Wolfgang Solfrank.
- * Copyright (C) 1995, 1996 TooLs GmbH.
- * All rights reserved.
- *
- * 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 TooLs GmbH.
- * 4. The name of TooLs GmbH may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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.
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofcons.c,v 1.29 2014/07/25 08:10:34 dholland Exp $");
-
-#include <sys/param.h>
-#include <sys/conf.h>
-#include <sys/device.h>
-#include <sys/proc.h>
-#include <sys/systm.h>
-#include <sys/tty.h>
-#include <sys/kauth.h>
-
-#include <dev/cons.h>
-#include <dev/ofw/openfirm.h>
-
-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcivar.h>
-
-#include <machine/adbsys.h>
-
-#include <machine/autoconf.h>
-
-#include "adb.h"
-
-struct ofcons_softc {
- struct tty *of_tty;
-};
-
-#define OFBURSTLEN 128 /* max number of bytes to write in one chunk */
-
-static int stdin, stdout;
-
-static int ofcmatch(device_t, cfdata_t, void *);
-static void ofcattach(device_t, device_t, void *);
-
-CFATTACH_DECL_NEW(macofcons, sizeof(struct ofcons_softc),
- ofcmatch, ofcattach, NULL, NULL);
-
-extern struct cfdriver macofcons_cd;
-
-dev_type_open(ofcopen);
-dev_type_close(ofcclose);
-dev_type_read(ofcread);
-dev_type_write(ofcwrite);
-dev_type_ioctl(ofcioctl);
-dev_type_tty(ofctty);
-dev_type_poll(ofcpoll);
-
-const struct cdevsw macofcons_cdevsw = {
- .d_open = ofcopen,
- .d_close = ofcclose,
- .d_read = ofcread,
- .d_write = ofcwrite,
- .d_ioctl = ofcioctl,
- .d_stop = nostop,
- .d_tty = ofctty,
- .d_poll = ofcpoll,
- .d_mmap = nommap,
- .d_kqfilter = ttykqfilter,
- .d_discard = nodiscard,
- .d_flag = D_TTY
-};
-
-/* For polled ADB mode */
-#if NADB > 0
-static int polledkey;
-extern int adb_polling;
-#endif /* NADB */
-
-static void ofcstart(struct tty *);
-static int ofcparam(struct tty *, struct termios *);
-static int ofcons_probe(void);
-
-static int
-ofcmatch(device_t parent, cfdata_t match, void *aux)
-{
- struct pci_attach_args *pa = aux;
- static int attached = 0;
-
- if (attached)
- return 0;
-
- if (PCI_CLASS(pa->pa_class) != PCI_CLASS_DISPLAY)
- return 0;
-
- if (!ofcons_probe())
- return 0;
-
- attached = 1;
- return 1;
-}
-
-static void
-ofcattach(device_t parent, device_t self, void *aux)
-{
- printf("\n");
-}
-
-int
-ofcopen(dev_t dev, int flag, int mode, struct lwp *l)
-{
- struct ofcons_softc *sc;
- struct tty *tp;
-
- sc = device_lookup_private(&macofcons_cd, minor(dev));
- if (!sc)
- return ENXIO;
- if (!(tp = sc->of_tty))
- sc->of_tty = tp = tty_alloc();
- tp->t_oproc = ofcstart;
- tp->t_param = ofcparam;
- tp->t_dev = dev;
- if (kauth_authorize_device_tty(l->l_cred, KAUTH_DEVICE_TTY_OPEN, tp))
- return (EBUSY);
- if (!(tp->t_state & TS_ISOPEN)) {
- ttychars(tp);
- tp->t_iflag = TTYDEF_IFLAG;
- tp->t_oflag = TTYDEF_OFLAG;
- tp->t_cflag = TTYDEF_CFLAG;
- tp->t_lflag = TTYDEF_LFLAG;
- tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED;
- ofcparam(tp, &tp->t_termios);
- ttsetwater(tp);
- }
- tp->t_state |= TS_CARR_ON;
-
- return (*tp->t_linesw->l_open)(dev, tp);
-}
-
-int
-ofcclose(dev_t dev, int flag, int mode, struct lwp *l)
-{
- struct ofcons_softc *sc = device_lookup_private(&macofcons_cd, minor(dev));
- struct tty *tp = sc->of_tty;
-
- (*tp->t_linesw->l_close)(tp, flag);
- ttyclose(tp);
- return 0;
-}
-
-int
-ofcread(dev_t dev, struct uio *uio, int flag)
-{
- struct ofcons_softc *sc = device_lookup_private(&macofcons_cd, minor(dev));
- struct tty *tp = sc->of_tty;
-
- return (*tp->t_linesw->l_read)(tp, uio, flag);
-}
-
-int
-ofcwrite(dev_t dev, struct uio *uio, int flag)
-{
- struct ofcons_softc *sc = device_lookup_private(&macofcons_cd, minor(dev));
- struct tty *tp = sc->of_tty;
-
- return (*tp->t_linesw->l_write)(tp, uio, flag);
-}
-
-int
-ofcpoll(dev_t dev, int events, struct lwp *l)
-{
- struct ofcons_softc *sc = device_lookup_private(&macofcons_cd, minor(dev));
- struct tty *tp = sc->of_tty;
-
- return ((*tp->t_linesw->l_poll)(tp, events, l));
-}
-
-int
-ofcioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
Home |
Main Index |
Thread Index |
Old Index