diff options
| author | Adam Jackson <ajax@benzedrine.nwnk.net> | 2006-08-10 20:43:15 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@benzedrine.nwnk.net> | 2006-08-10 20:43:15 -0400 |
| commit | e1921f014b102e3eecf3b41972f8672cf23264d6 (patch) | |
| tree | 40d35405b674216dd16a9741e5688ac41de03d89 | |
| parent | db82e12fac5eaa16a39fc1bd0bc31ad95089dc95 (diff) | |
Rename some mode tokens to better reflect their use.
Per #5386, M_T_EDID -> M_T_DRIVER, since it's really for any driver-detected
mode. Also add M_T_PREFERRED bit, to select a 'best' mode out of a set.
| -rw-r--r-- | hw/xfree86/common/xf86str.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h index 0c33afba2..ae9d9aef4 100644 --- a/hw/xfree86/common/xf86str.h +++ b/hw/xfree86/common/xf86str.h @@ -119,14 +119,19 @@ typedef enum { MODE_ERROR = -1 /* error condition */ } ModeStatus; +/* + * The mode sets are, from best to worst: USERDEF, DRIVER, and DEFAULT/BUILTIN. + * Preferred will bubble a mode to the top within a set. + */ # define M_T_BUILTIN 0x01 /* built-in mode */ # define M_T_CLOCK_C (0x02 | M_T_BUILTIN) /* built-in mode - configure clock */ # define M_T_CRTC_C (0x04 | M_T_BUILTIN) /* built-in mode - configure CRTC */ # define M_T_CLOCK_CRTC_C (M_T_CLOCK_C | M_T_CRTC_C) /* built-in mode - configure CRTC and clock */ +# define M_T_PREFERRED 0x08 /* preferred mode within a set */ # define M_T_DEFAULT 0x10 /* (VESA) default modes */ # define M_T_USERDEF 0x20 /* One of the modes from the config file */ -# define M_T_EDID 0x40 /* Mode from the EDID info from the monitor */ +# define M_T_DRIVER 0x40 /* Supplied by the driver (EDID, etc) */ /* Video mode */ typedef struct _DisplayModeRec { |