diff options
| author | Archie Cobbs <archie@FreeBSD.org> | 1998-12-07 21:58:50 +0000 |
|---|---|---|
| committer | Archie Cobbs <archie@FreeBSD.org> | 1998-12-07 21:58:50 +0000 |
| commit | f1d19042b082d95f07a0027e596ba2405aa8a9a5 (patch) | |
| tree | b856be4db5efb04d68d01039a157119ac8613b9f /sys/dev/syscons | |
| parent | f769cca5eb9fed523269d85eefe74037ff7bd1b5 (diff) | |
Notes
Diffstat (limited to 'sys/dev/syscons')
| -rw-r--r-- | sys/dev/syscons/scvesactl.c | 7 | ||||
| -rw-r--r-- | sys/dev/syscons/syscons.c | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sys/dev/syscons/scvesactl.c b/sys/dev/syscons/scvesactl.c index aabfe1901b56..39ac7ea17f6e 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.5 1998/09/26 03:38:40 yokota Exp $ + * $Id: scvesactl.c,v 1.6 1998/10/01 11:39:17 yokota Exp $ */ #include "sc.h" @@ -52,11 +52,8 @@ vesa_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) { scr_stat *scp; struct tty *tp; - video_info_t info; video_adapter_t *adp; int mode; - int error; - int s; tp = scdevtotty(dev); if (!tp) @@ -84,7 +81,6 @@ vesa_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) if (!(adp->va_flags & V_ADP_MODECHANGE)) return ENODEV; mode = (cmd & 0xff) + M_VESA_BASE; -vesa_text: return sc_set_text_mode(scp, tp, mode, 0, 0, 0); /* graphics modes */ @@ -112,7 +108,6 @@ vesa_text: if (!(adp->va_flags & V_ADP_MODECHANGE)) return ENODEV; mode = (cmd & 0xff) + M_VESA_BASE; -vesa_graphics: return sc_set_graphics_mode(scp, tp, mode); } diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index a9c6fc9994ac..f26d3b3ec716 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.286 1998/11/03 02:37:46 yokota Exp $ + * $Id: syscons.c,v 1.287 1998/11/08 12:39:02 dfr Exp $ */ #include "sc.h" @@ -640,7 +640,9 @@ static int scattach(struct isa_device *dev) { scr_stat *scp; +#if defined(VESA) && defined(VM86) video_info_t info; +#endif dev_t cdev = makedev(CDEV_MAJOR, 0); #ifdef DEVFS int vc; @@ -924,7 +926,6 @@ scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) int i; struct tty *tp; scr_stat *scp; - video_adapter_t *adp; int s; tp = scdevtotty(dev); |