From 2639570a5e4ee5946262292b73cef75d0757c6aa Mon Sep 17 00:00:00 2001 From: jkh Date: Thu, 3 Oct 1996 00:42:27 +0000 Subject: [PATCH] scresume erroneously used before declared. Move the function rather than add another APM ifdef just for the forward decl. [Boy, sure a lot of warnings in here!] --- sys/dev/syscons/syscons.c | 20 ++++++++++---------- sys/i386/isa/syscons.c | 20 ++++++++++---------- sys/isa/syscons.c | 20 ++++++++++---------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index dcf925afde87..c371dd5a7bab 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.174 1996/10/01 07:38:14 jkh Exp $ + * $Id: syscons.c,v 1.176 1996/10/02 22:00:38 sos Exp $ */ #include "sc.h" @@ -352,6 +352,15 @@ scprobe(struct isa_device *dev) return (IO_KBDSIZE); } +#if NAPM > 0 +static int +scresume(void *dummy) +{ + shfts = ctls = alts = agrs = metas = 0; + return 0; +} +#endif + static int scattach(struct isa_device *dev) { @@ -435,15 +444,6 @@ scattach(struct isa_device *dev) return 0; } -#if NAPM > 0 -static int -scresume(void *dummy) -{ - shfts = ctls = alts = agrs = metas = 0; - return 0; -} -#endif - struct tty *scdevtotty(dev_t dev) { diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c index dcf925afde87..c371dd5a7bab 100644 --- a/sys/i386/isa/syscons.c +++ b/sys/i386/isa/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.174 1996/10/01 07:38:14 jkh Exp $ + * $Id: syscons.c,v 1.176 1996/10/02 22:00:38 sos Exp $ */ #include "sc.h" @@ -352,6 +352,15 @@ scprobe(struct isa_device *dev) return (IO_KBDSIZE); } +#if NAPM > 0 +static int +scresume(void *dummy) +{ + shfts = ctls = alts = agrs = metas = 0; + return 0; +} +#endif + static int scattach(struct isa_device *dev) { @@ -435,15 +444,6 @@ scattach(struct isa_device *dev) return 0; } -#if NAPM > 0 -static int -scresume(void *dummy) -{ - shfts = ctls = alts = agrs = metas = 0; - return 0; -} -#endif - struct tty *scdevtotty(dev_t dev) { diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c index dcf925afde87..c371dd5a7bab 100644 --- a/sys/isa/syscons.c +++ b/sys/isa/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.174 1996/10/01 07:38:14 jkh Exp $ + * $Id: syscons.c,v 1.176 1996/10/02 22:00:38 sos Exp $ */ #include "sc.h" @@ -352,6 +352,15 @@ scprobe(struct isa_device *dev) return (IO_KBDSIZE); } +#if NAPM > 0 +static int +scresume(void *dummy) +{ + shfts = ctls = alts = agrs = metas = 0; + return 0; +} +#endif + static int scattach(struct isa_device *dev) { @@ -435,15 +444,6 @@ scattach(struct isa_device *dev) return 0; } -#if NAPM > 0 -static int -scresume(void *dummy) -{ - shfts = ctls = alts = agrs = metas = 0; - return 0; -} -#endif - struct tty *scdevtotty(dev_t dev) {