d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Use `u_long cmd' ioctl arg.

Browse Source 
- Fix some external function declaration.
Submitted by: bde
This commit is contained in:
yokota 1998-09-26 03:34:10 +00:00
parent 7897bd89f8
commit 1c1cbd9699
6 changed files with 18 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/dev/syscons/scvesactl.c
View File

@ -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;

6
sys/dev/syscons/syscons.c
View File

@ -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

5
sys/dev/syscons/syscons.h
View File

@ -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,

15
sys/i386/isa/scvesactl.c
View File

@ -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;

6
sys/i386/isa/syscons.c
View File

@ -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

5
sys/i386/isa/syscons.h
View File

@ -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,