diff options
| -rw-r--r-- | sys/i386/isa/vesa.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sys/i386/isa/vesa.c b/sys/i386/isa/vesa.c index 2de1c459ef44..b6a6e44f04e5 100644 --- a/sys/i386/isa/vesa.c +++ b/sys/i386/isa/vesa.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: vesa.c,v 1.22 1999/03/31 15:27:00 yokota Exp $ + * $Id: vesa.c,v 1.15.2.5 1999/04/16 15:58:21 jlemon Exp $ */ #include "vga.h" @@ -216,7 +216,7 @@ vesa_bios_get_mode(int mode, struct vesa_mode *vmode) vm86_getptr(&vesa_vmcontext, (vm_offset_t)buf, &vmf.vmf_es, &vmf.vmf_di); err = vm86_datacall(0x10, &vmf, &vesa_vmcontext); - if ((err != 0) || (vmf.vmf_eax != 0x4f)) + if ((err != 0) || (vmf.vmf_ax != 0x4f)) return 1; bcopy(buf, vmode, sizeof(*vmode)); return 0; @@ -232,7 +232,7 @@ vesa_bios_set_mode(int mode) vmf.vmf_eax = 0x4f02; vmf.vmf_ebx = mode; err = vm86_intcall(0x10, &vmf); - return ((err != 0) || (vmf.vmf_eax != 0x4f)); + return ((err != 0) || (vmf.vmf_ax != 0x4f)); } static int @@ -245,7 +245,7 @@ vesa_bios_get_dac(void) vmf.vmf_eax = 0x4f08; vmf.vmf_ebx = 1; /* get DAC width */ err = vm86_intcall(0x10, &vmf); - if ((err != 0) || (vmf.vmf_eax != 0x4f)) + if ((err != 0) || (vmf.vmf_ax != 0x4f)) return 6; /* XXX */ return ((vmf.vmf_ebx >> 8) & 0x00ff); } @@ -260,7 +260,7 @@ vesa_bios_set_dac(int bits) vmf.vmf_eax = 0x4f08; vmf.vmf_ebx = (bits << 8); err = vm86_intcall(0x10, &vmf); - if ((err != 0) || (vmf.vmf_eax != 0x4f)) + if ((err != 0) || (vmf.vmf_ax != 0x4f)) return 6; /* XXX */ return ((vmf.vmf_ebx >> 8) & 0x00ff); } @@ -282,7 +282,7 @@ vesa_bios_save_palette(int start, int colors, u_char *palette, int bits) vm86_getptr(&vesa_vmcontext, (vm_offset_t)p, &vmf.vmf_es, &vmf.vmf_di); err = vm86_datacall(0x10, &vmf, &vesa_vmcontext); - if ((err != 0) || (vmf.vmf_eax != 0x4f)) + if ((err != 0) || (vmf.vmf_ax != 0x4f)) return 1; bits = 8 - bits; @@ -319,7 +319,7 @@ vesa_bios_load_palette(int start, int colors, u_char *palette, int bits) vm86_getptr(&vesa_vmcontext, (vm_offset_t)p, &vmf.vmf_es, &vmf.vmf_di); err = vm86_datacall(0x10, &vmf, &vesa_vmcontext); - return ((err != 0) || (vmf.vmf_eax != 0x4f)); + return ((err != 0) || (vmf.vmf_ax != 0x4f)); } static int @@ -333,9 +333,9 @@ vesa_bios_state_buf_size(void) vmf.vmf_ecx = STATE_MOST; vmf.vmf_edx = STATE_SIZE; err = vm86_intcall(0x10, &vmf); - if ((err != 0) || (vmf.vmf_eax != 0x4f)) + if ((err != 0) || (vmf.vmf_ax != 0x4f)) return 0; - return vmf.vmf_ebx*64; + return vmf.vmf_bx*64; } static int @@ -354,7 +354,7 @@ vesa_bios_save_restore(int code, void *p, size_t size) bcopy(p, buf, size); err = vm86_datacall(0x10, &vmf, &vesa_vmcontext); - return ((err != 0) || (vmf.vmf_eax != 0x4f)); + return ((err != 0) || (vmf.vmf_ax != 0x4f)); } static int @@ -367,7 +367,7 @@ vesa_bios_get_line_length(void) vmf.vmf_eax = 0x4f06; vmf.vmf_ebx = 1; /* get scan line length */ err = vm86_intcall(0x10, &vmf); - if ((err != 0) || (vmf.vmf_eax != 0x4f)) + if ((err != 0) || (vmf.vmf_ax != 0x4f)) return -1; return vmf.vmf_bx; /* line length in bytes */ } @@ -454,7 +454,7 @@ vesa_bios_init(void) vm86_getptr(&vesa_vmcontext, (vm_offset_t)vmbuf, &vmf.vmf_es, &vmf.vmf_di); err = vm86_datacall(0x10, &vmf, &vesa_vmcontext); - if ((err != 0) || (vmf.vmf_eax != 0x4f) || bcmp("VESA", vmbuf, 4)) + if ((err != 0) || (vmf.vmf_ax != 0x4f) || bcmp("VESA", vmbuf, 4)) return 1; bcopy(vmbuf, buf, sizeof(buf)); vesa_adp_info = (struct vesa_info *)buf; @@ -949,7 +949,7 @@ vesa_set_origin(video_adapter_t *adp, off_t offset) vmf.vmf_ebx = 0; /* WINDOW_A, XXX */ vmf.vmf_edx = offset/vesa_adp->va_window_gran; err = vm86_intcall(0x10, &vmf); - if ((err != 0) || (vmf.vmf_eax != 0x4f)) + if ((err != 0) || (vmf.vmf_ax != 0x4f)) return 1; bzero(&vmf, sizeof(vmf)); vmf.vmf_eax = 0x4f05; |