[src/netbsd-7]: src/sys/arch/sparc64/dev Pull up following revision(s) (reque...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/82c4b8e2966b
branches:  netbsd-7
changeset: 798505:82c4b8e2966b
user:      snj <snj%NetBSD.org@localhost>
date:      Fri Nov 07 21:17:21 2014 +0000

description:
Pull up following revision(s) (requested by nakayama in ticket #186):
        sys/arch/sparc64/dev/sab.c: revision 1.53
Convert sab_shutdown from deprecated shutdownhook_establish(9) API
to PMF(9) framework.
Tested on Ultra 60 with serial console.

diffstat:

 sys/arch/sparc64/dev/sab.c |  15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diffs (58 lines):

diff -r 46629f150a19 -r 82c4b8e2966b sys/arch/sparc64/dev/sab.c
--- a/sys/arch/sparc64/dev/sab.c        Fri Nov 07 08:40:43 2014 +0000
+++ b/sys/arch/sparc64/dev/sab.c        Fri Nov 07 21:17:21 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sab.c,v 1.52 2014/07/25 08:10:35 dholland Exp $        */
+/*     $NetBSD: sab.c,v 1.52.2.1 2014/11/07 21:17:21 snj Exp $ */
 /*     $OpenBSD: sab.c,v 1.7 2002/04/08 17:49:42 jason Exp $   */
 
 /*
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sab.c,v 1.52 2014/07/25 08:10:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sab.c,v 1.52.2.1 2014/11/07 21:17:21 snj Exp $");
 
 #include "opt_kgdb.h"
 #include <sys/types.h>
@@ -152,7 +152,7 @@
 int sabtty_speed(int);
 void sabtty_console_flags(struct sabtty_softc *);
 void sabtty_cnpollc(struct sabtty_softc *, int);
-void sabtty_shutdown(void *);
+bool sabtty_shutdown(device_t, int);
 int sabttyparam(struct sabtty_softc *, struct tty *, struct termios *);
 
 #ifdef KGDB
@@ -470,7 +470,7 @@
                        cn_tab->cn_getc = sab_cngetc;
                        maj = cdevsw_lookup_major(&sabtty_cdevsw);
                        cn_tab->cn_dev = makedev(maj, device_unit(self));
-                       shutdownhook_establish(sabtty_shutdown, sc);
+                       pmf_device_register1(self, NULL, NULL, sabtty_shutdown);
                        cn_init_magic(&sabtty_cnm_state);
                        cn_set_magic("\047\001"); /* default magic is BREAK */
                }
@@ -1321,10 +1321,10 @@
                sc->sc_flags |= SABTTYF_IS_RSC;
 }
 
-void
-sabtty_shutdown(void *vsc)
+bool
+sabtty_shutdown(device_t dev, int how)
 {
-       struct sabtty_softc *sc = vsc;
+       struct sabtty_softc *sc = device_private(dev);
 
        /* Have to put the chip back into single char mode */
        sc->sc_flags |= SABTTYF_DONTDDB;
@@ -1332,6 +1332,7 @@
        sabtty_cec_wait(sc);
        SAB_WRITE(sc, SAB_CMDR, SAB_CMDR_RRES);
        sabtty_cec_wait(sc);
+       return true;
 }
 
 #ifdef KGDB