diff options
author | yokota <yokota@FreeBSD.org> | 1998-09-26 03:34:10 +0000 |
---|---|---|
committer | yokota <yokota@FreeBSD.org> | 1998-09-26 03:34:10 +0000 |
commit | 1c1cbd96995f5b3daa2e0f71f53ce1b8604df354 (patch) | |
tree | 20de337723e2dde19d234d5018ff5e4df03abe97 | |
parent | 7897bd89f85a0dcd0646f46b5e63c5af4ee8ea7b (diff) | |
download | FreeBSD-src-1c1cbd96995f5b3daa2e0f71f53ce1b8604df354.zip FreeBSD-src-1c1cbd96995f5b3daa2e0f71f53ce1b8604df354.tar.gz |
- Use `u_long cmd' ioctl arg.
- Fix some external function declaration.
Submitted by: bde
-rw-r--r-- | sys/dev/syscons/scvesactl.c | 15 | ||||
-rw-r--r-- | sys/dev/syscons/syscons.c | 6 | ||||
-rw-r--r-- | sys/dev/syscons/syscons.h | 5 | ||||
-rw-r--r-- | sys/i386/isa/scvesactl.c | 15 | ||||
-rw-r--r-- | sys/i386/isa/syscons.c | 6 | ||||
-rw-r--r-- | sys/i386/isa/syscons.h | 5 |
6 files changed, 18 insertions, 34 deletions
diff --git a/sys/dev/syscons/scvesactl.c b/sys/dev/syscons/scvesactl.c index dfecc3c..5f2c1dd 100644 --- a/sys/dev/syscons/scvesactl.c +++ b/sys/dev/syscons/scvesactl.c @@ -23,7 +23,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: scvesactl.c,v 1.2 1998/09/23 09:59:00 yokota Exp $ + * $Id: scvesactl.c,v 1.3 1998/09/25 11:55:46 yokota Exp $ */ #include "sc.h" @@ -44,17 +44,10 @@ #include <i386/isa/videoio.h> #include <i386/isa/syscons.h> -static int (*prev_user_ioctl)(dev_t dev, int cmd, caddr_t data, int flag, - struct proc *p); +static d_ioctl_t *prev_user_ioctl; -/* external functions */ -struct tty *scdevtotty(dev_t dev); - -/* functions in this module */ -int vesa_ioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p); - -int -vesa_ioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p) +static int +vesa_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) { scr_stat *scp; struct tty *tp; diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 6af764f..233332e 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.278 1998/09/15 18:16:37 sos Exp $ + * $Id: syscons.c,v 1.279 1998/09/23 09:59:00 yokota Exp $ */ #include "sc.h" @@ -211,8 +211,7 @@ static int extra_history_size = static void none_saver(int blank) { } static void (*current_saver)(int blank) = none_saver; static void (*default_saver)(int blank) = none_saver; - int (*sc_user_ioctl)(dev_t dev, int cmd, caddr_t data, - int flag, struct proc *p) = NULL; + d_ioctl_t *sc_user_ioctl; static int sticky_splash = FALSE; @@ -310,7 +309,6 @@ static d_close_t scclose; static d_read_t scread; static d_write_t scwrite; static d_ioctl_t scioctl; - d_devtotty_t scdevtotty; static d_mmap_t scmmap; #define CDEV_MAJOR 12 diff --git a/sys/dev/syscons/syscons.h b/sys/dev/syscons/syscons.h index dd4ec8c..3e4822e 100644 --- a/sys/dev/syscons/syscons.h +++ b/sys/dev/syscons/syscons.h @@ -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.h,v 1.40 1998/09/15 18:16:38 sos Exp $ + * $Id: syscons.h,v 1.41 1998/09/23 09:59:00 yokota Exp $ */ #ifndef _I386_ISA_SYSCONS_H_ @@ -203,7 +203,7 @@ typedef struct default_attr { /* misc prototypes used by different syscons related LKM's */ /* syscons.c */ -extern int (*sc_user_ioctl)(dev_t dev, int cmd, caddr_t data, int flag, +extern int (*sc_user_ioctl)(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p); int set_mode(scr_stat *scp); @@ -224,6 +224,7 @@ int sc_clean_up(scr_stat *scp); void sc_alloc_scr_buffer(scr_stat *scp, int wait, int clear); void sc_alloc_cut_buffer(scr_stat *scp, int wait); void sc_alloc_history_buffer(scr_stat *scp, int lines, int extra, int wait); +struct tty *scdevtotty(dev_t dev); /* scvidctl.c */ int sc_set_text_mode(scr_stat *scp, struct tty *tp, int mode, diff --git a/sys/i386/isa/scvesactl.c b/sys/i386/isa/scvesactl.c index dfecc3c..5f2c1dd 100644 --- a/sys/i386/isa/scvesactl.c +++ b/sys/i386/isa/scvesactl.c @@ -23,7 +23,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: scvesactl.c,v 1.2 1998/09/23 09:59:00 yokota Exp $ + * $Id: scvesactl.c,v 1.3 1998/09/25 11:55:46 yokota Exp $ */ #include "sc.h" @@ -44,17 +44,10 @@ #include <i386/isa/videoio.h> #include <i386/isa/syscons.h> -static int (*prev_user_ioctl)(dev_t dev, int cmd, caddr_t data, int flag, - struct proc *p); +static d_ioctl_t *prev_user_ioctl; -/* external functions */ -struct tty *scdevtotty(dev_t dev); - -/* functions in this module */ -int vesa_ioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p); - -int -vesa_ioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p) +static int +vesa_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) { scr_stat *scp; struct tty *tp; diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c index 6af764f..233332e 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.278 1998/09/15 18:16:37 sos Exp $ + * $Id: syscons.c,v 1.279 1998/09/23 09:59:00 yokota Exp $ */ #include "sc.h" @@ -211,8 +211,7 @@ static int extra_history_size = static void none_saver(int blank) { } static void (*current_saver)(int blank) = none_saver; static void (*default_saver)(int blank) = none_saver; - int (*sc_user_ioctl)(dev_t dev, int cmd, caddr_t data, - int flag, struct proc *p) = NULL; + d_ioctl_t *sc_user_ioctl; static int sticky_splash = FALSE; @@ -310,7 +309,6 @@ static d_close_t scclose; static d_read_t scread; static d_write_t scwrite; static d_ioctl_t scioctl; - d_devtotty_t scdevtotty; static d_mmap_t scmmap; #define CDEV_MAJOR 12 diff --git a/sys/i386/isa/syscons.h b/sys/i386/isa/syscons.h index dd4ec8c..3e4822e 100644 --- a/sys/i386/isa/syscons.h +++ b/sys/i386/isa/syscons.h @@ -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.h,v 1.40 1998/09/15 18:16:38 sos Exp $ + * $Id: syscons.h,v 1.41 1998/09/23 09:59:00 yokota Exp $ */ #ifndef _I386_ISA_SYSCONS_H_ @@ -203,7 +203,7 @@ typedef struct default_attr { /* misc prototypes used by different syscons related LKM's */ /* syscons.c */ -extern int (*sc_user_ioctl)(dev_t dev, int cmd, caddr_t data, int flag, +extern int (*sc_user_ioctl)(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p); int set_mode(scr_stat *scp); @@ -224,6 +224,7 @@ int sc_clean_up(scr_stat *scp); void sc_alloc_scr_buffer(scr_stat *scp, int wait, int clear); void sc_alloc_cut_buffer(scr_stat *scp, int wait); void sc_alloc_history_buffer(scr_stat *scp, int lines, int extra, int wait); +struct tty *scdevtotty(dev_t dev); /* scvidctl.c */ int sc_set_text_mode(scr_stat *scp, struct tty *tp, int mode, |