Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/dev/ic/com.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/ic/com.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.251.4.1 retrieving revision 1.251.4.2 diff -u -p -r1.251.4.1 -r1.251.4.2 --- src/sys/dev/ic/com.c 2006/10/22 06:05:44 1.251.4.1 +++ src/sys/dev/ic/com.c 2006/12/10 07:17:05 1.251.4.2 @@ -1,4 +1,4 @@ -/* $NetBSD: com.c,v 1.251.4.1 2006/10/22 06:05:44 yamt Exp $ */ +/* $NetBSD: com.c,v 1.251.4.2 2006/12/10 07:17:05 yamt Exp $ */ /*- * Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc. @@ -73,7 +73,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.251.4.1 2006/10/22 06:05:44 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.251.4.2 2006/12/10 07:17:05 yamt Exp $"); #include "opt_com.h" #include "opt_ddb.h" @@ -290,7 +290,7 @@ const bus_size_t com_std_map[16] = COM_R /*ARGSUSED*/ int -comspeed(long speed, long frequency, int type __unused) +comspeed(long speed, long frequency, int type) { #define divrnd(n, q) (((n)*2/(q)+1)/2) /* divide and round off */ @@ -398,6 +398,8 @@ com_attach_subr(struct com_softc *sc) #endif const char *fifo_msg = NULL; + aprint_naive("\n"); + callout_init(&sc->sc_diag_callout); simple_lock_init(&sc->sc_lock); @@ -571,7 +573,7 @@ fifodone: sc->sc_powerhook = powerhook_establish(sc->sc_dev.dv_xname, com_power, sc); if (sc->sc_powerhook == NULL) - printf("%s: WARNING: unable to establish power hook\n", + aprint_error("%s: WARNING: unable to establish power hook\n", sc->sc_dev.dv_xname); SET(sc->sc_hwflags, COM_HW_DEV_OK); @@ -628,7 +630,7 @@ com_config(struct com_softc *sc) } int -com_detach(struct device *self, int flags __unused) +com_detach(struct device *self, int flags) { struct com_softc *sc = (struct com_softc *)self; int maj, mn; @@ -770,7 +772,7 @@ com_shutdown(struct com_softc *sc) } int -comopen(dev_t dev, int flag, int mode __unused, struct lwp *l) +comopen(dev_t dev, int flag, int mode, struct lwp *l) { struct com_softc *sc; struct tty *tp; @@ -926,7 +928,7 @@ bad: } int -comclose(dev_t dev, int flag, int mode __unused, struct lwp *l __unused) +comclose(dev_t dev, int flag, int mode, struct lwp *l) { struct com_softc *sc = device_lookup(&com_cd, COMUNIT(dev)); struct tty *tp = sc->sc_tty; @@ -1770,7 +1772,7 @@ out: * Stop output on a line. */ void -comstop(struct tty *tp, int flag __unused) +comstop(struct tty *tp, int flag) { struct com_softc *sc = device_lookup(&com_cd, COMUNIT(tp->t_dev)); int s; @@ -2485,7 +2487,7 @@ comcnputc(dev_t dev, int c) } void -comcnpollc(dev_t dev __unused, int on __unused) +comcnpollc(dev_t dev, int on) { } @@ -2543,7 +2545,7 @@ com_kgdb_attach(bus_space_tag_t iot, bus /* ARGSUSED */ int -com_kgdb_getc(void *arg __unused) +com_kgdb_getc(void *arg) { return (com_common_getc(NODEV, &comkgdbregs)); @@ -2551,7 +2553,7 @@ com_kgdb_getc(void *arg __unused) /* ARGSUSED */ void -com_kgdb_putc(void *arg __unused, int c) +com_kgdb_putc(void *arg, int c) { com_common_putc(NODEV, &comkgdbregs, c);