From 8110904381e06d9c0216db626d287ad6d8f0dcf8 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Tue, 30 Aug 2011 23:08:59 +0200 Subject: Console declaration cleanup * device/cons.h: Add multiple inclusion _DEVICE_CONS_H macro protector. (struct consdev): Add function members prototypes. * i386/i386/xen.h: Include . * i386/i386at/com.c (comcnprobe, comcninit, comcngetc, comcnputc): Move prototypes... * i386/i386at/com.h: ... here. Include . * i386/i386at/cons_conf.c [MACH_HYP]: Include . [!MACH_HYP]: Include "kd.h". [!MACH_HYP && NCOM > 0]: Include "com.h". (hypcnprobe, hypcninit, hypcngetc, hypcnputc, kdcnprobe, kdcninit, kdcngetc, kdcnputc comcnprobe, comcninit, comcngetc, comcnputc): Remove prototypes. * i386/i386at/kd.c (kdcnputc): Make it return int, -1 on error, 0 on success. (kdcnprobe, kdcninit, kdcngetc, kdcnputc): Move prototypes... * i386/i386at/kd.h: ... here. Include . * xen/console.c (hypcnprobe): Remove unused `my_console' local variable. * xen/console.h: Include (hypcnputc, hypcngetc, hypcnprobe, hypcninit): Add prototypes. --- device/cons.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'device') diff --git a/device/cons.h b/device/cons.h index a6b04ff..c210f8c 100644 --- a/device/cons.h +++ b/device/cons.h @@ -21,16 +21,18 @@ * Utah $Hdr: cons.h 1.10 94/12/14$ */ +#ifndef _DEVICE_CONS_H +#define _DEVICE_CONS_H #include struct consdev { #ifdef MACH_KERNEL char *cn_name; /* name of device in dev_name_list */ #endif - int (*cn_probe)(); /* probe hardware and fill in consdev info */ - int (*cn_init)(); /* turn on as console */ - int (*cn_getc)(); /* kernel getchar interface */ - int (*cn_putc)(); /* kernel putchar interface */ + int (*cn_probe)(struct consdev *cp); /* probe hardware and fill in consdev info */ + int (*cn_init)(struct consdev *cp); /* turn on as console */ + int (*cn_getc)(dev_t dev, int wait); /* kernel getchar interface */ + int (*cn_putc)(dev_t dev, int c); /* kernel putchar interface */ dev_t cn_dev; /* major/minor of device */ short cn_pri; /* pecking order; the higher the better */ }; @@ -57,3 +59,4 @@ extern int cngetc(void); extern int cnmaygetc(void); extern void cnputc(char); +#endif /* _DEVICE_CONS_H */ -- cgit v1.2.3