diff options
| author | Adam Jackson <ajax@redhat.com> | 2012-01-04 16:39:33 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-01-09 13:09:49 -0800 |
| commit | 8db029064bcbe378061e812bb8136608e3123226 (patch) | |
| tree | 17362afdb15645c8693513483ee5ae12a1da54ef | |
| parent | 63a8012947fc44ccb3d661dec88dbda14e7f3c04 (diff) | |
vgahw: Fix DACDelay() macro to use the driver's vtable
We don't want to unconditionally use I/O routines here, since if the
driver is using mmap'd VGA ports then the I/O handle won't be set up.
Tested-by: Jeff Chua <jeff.chua.linux@gmail.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | hw/xfree86/vgahw/vgaHW.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/xfree86/vgahw/vgaHW.h b/hw/xfree86/vgahw/vgaHW.h index e943aa391..d1ba9da89 100644 --- a/hw/xfree86/vgahw/vgaHW.h +++ b/hw/xfree86/vgahw/vgaHW.h @@ -170,10 +170,10 @@ typedef struct _vgaHWRec { #define BITS_PER_GUN 6 #define COLORMAP_SIZE 256 -#define DACDelay(hw) \ - do { \ - pci_io_read8((hw)->io, (hw)->IOBase + VGA_IN_STAT_1_OFFSET); \ - pci_io_read8((hw)->io, (hw)->IOBase + VGA_IN_STAT_1_OFFSET); \ +#define DACDelay(hw) \ + do { \ + (hw)->readST01((hw)); \ + (hw)->readST01((hw)); \ } while (0) /* Function Prototypes */ |