xfree86: Remove Option "TextClockFreq"
No modern driver pays attention to this. Presumably there existed hardware once where you couldn't just read the right values out of the CRTC. Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
parent
6755aa2c12
commit
35f0257360
|
@ -2168,7 +2168,6 @@ configDevice(GDevPtr devicep, XF86ConfDevicePtr conf_device, Bool active)
|
||||||
devicep->IOBase = conf_device->dev_io_base;
|
devicep->IOBase = conf_device->dev_io_base;
|
||||||
devicep->clockchip = conf_device->dev_clockchip;
|
devicep->clockchip = conf_device->dev_clockchip;
|
||||||
devicep->busID = conf_device->dev_busid;
|
devicep->busID = conf_device->dev_busid;
|
||||||
devicep->textClockFreq = conf_device->dev_textclockfreq;
|
|
||||||
devicep->chipID = conf_device->dev_chipid;
|
devicep->chipID = conf_device->dev_chipid;
|
||||||
devicep->chipRev = conf_device->dev_chiprev;
|
devicep->chipRev = conf_device->dev_chiprev;
|
||||||
devicep->options = conf_device->dev_option_lst;
|
devicep->options = conf_device->dev_option_lst;
|
||||||
|
|
|
@ -267,7 +267,6 @@ configureDeviceSection(int screennum)
|
||||||
for (i = 0; (i < MAXDACSPEEDS) && (i < CONF_MAXDACSPEEDS); i++)
|
for (i = 0; (i < MAXDACSPEEDS) && (i < CONF_MAXDACSPEEDS); i++)
|
||||||
ptr->dev_dacSpeeds[i] = DevToConfig[screennum].GDev.dacSpeeds[i];
|
ptr->dev_dacSpeeds[i] = DevToConfig[screennum].GDev.dacSpeeds[i];
|
||||||
ptr->dev_videoram = DevToConfig[screennum].GDev.videoRam;
|
ptr->dev_videoram = DevToConfig[screennum].GDev.videoRam;
|
||||||
ptr->dev_textclockfreq = DevToConfig[screennum].GDev.textClockFreq;
|
|
||||||
ptr->dev_bios_base = DevToConfig[screennum].GDev.BiosBase;
|
ptr->dev_bios_base = DevToConfig[screennum].GDev.BiosBase;
|
||||||
ptr->dev_mem_base = DevToConfig[screennum].GDev.MemBase;
|
ptr->dev_mem_base = DevToConfig[screennum].GDev.MemBase;
|
||||||
ptr->dev_io_base = DevToConfig[screennum].GDev.IOBase;
|
ptr->dev_io_base = DevToConfig[screennum].GDev.IOBase;
|
||||||
|
|
|
@ -403,7 +403,6 @@ typedef struct {
|
||||||
Bool active;
|
Bool active;
|
||||||
Bool inUse;
|
Bool inUse;
|
||||||
int videoRam;
|
int videoRam;
|
||||||
int textClockFreq;
|
|
||||||
unsigned long BiosBase; /* Base address of video BIOS */
|
unsigned long BiosBase; /* Base address of video BIOS */
|
||||||
unsigned long MemBase; /* Frame buffer base address */
|
unsigned long MemBase; /* Frame buffer base address */
|
||||||
unsigned long IOBase;
|
unsigned long IOBase;
|
||||||
|
@ -753,7 +752,6 @@ typedef struct _ScrnInfoRec {
|
||||||
unsigned long memPhysBase; /* Physical address of FB */
|
unsigned long memPhysBase; /* Physical address of FB */
|
||||||
unsigned long fbOffset; /* Offset of FB in the above */
|
unsigned long fbOffset; /* Offset of FB in the above */
|
||||||
int memClk; /* memory clock */
|
int memClk; /* memory clock */
|
||||||
int textClockFreq; /* clock of text mode */
|
|
||||||
Bool flipPixels; /* swap default black/white */
|
Bool flipPixels; /* swap default black/white */
|
||||||
void *options;
|
void *options;
|
||||||
|
|
||||||
|
|
|
@ -1449,12 +1449,6 @@ This optional entry specifies the chip revision number.
|
||||||
This can be used to override the auto-detection, but that should only be done
|
This can be used to override the auto-detection, but that should only be done
|
||||||
when the driver-specific documentation recommends it.
|
when the driver-specific documentation recommends it.
|
||||||
.TP 7
|
.TP 7
|
||||||
.BI "TextClockFreq " "freq"
|
|
||||||
This optional entry specifies the pixel clock frequency that is used
|
|
||||||
for the regular text mode.
|
|
||||||
The frequency is specified in MHz.
|
|
||||||
This is rarely used.
|
|
||||||
.TP 7
|
|
||||||
.BI "MatchSeat " "seat\-id"
|
.BI "MatchSeat " "seat\-id"
|
||||||
Only apply this
|
Only apply this
|
||||||
.B Device
|
.B Device
|
||||||
|
|
|
@ -83,7 +83,6 @@ xf86ConfigSymTabRec DeviceTab[] = {
|
||||||
{CARD, "card"},
|
{CARD, "card"},
|
||||||
{DRIVER, "driver"},
|
{DRIVER, "driver"},
|
||||||
{BUSID, "busid"},
|
{BUSID, "busid"},
|
||||||
{TEXTCLOCKFRQ, "textclockfreq"},
|
|
||||||
{IRQ, "irq"},
|
{IRQ, "irq"},
|
||||||
{SCREEN, "screen"},
|
{SCREEN, "screen"},
|
||||||
{-1, ""},
|
{-1, ""},
|
||||||
|
@ -212,11 +211,6 @@ xf86parseDeviceSection(void)
|
||||||
ptr->dev_clocks = i;
|
ptr->dev_clocks = i;
|
||||||
xf86unGetToken(token);
|
xf86unGetToken(token);
|
||||||
break;
|
break;
|
||||||
case TEXTCLOCKFRQ:
|
|
||||||
if ((token = xf86getSubToken(&(ptr->dev_comment))) != NUMBER)
|
|
||||||
Error(NUMBER_MSG, "TextClockFreq");
|
|
||||||
ptr->dev_textclockfreq = (int) (xf86_lex_val.realnum * 1000.0 + 0.5);
|
|
||||||
break;
|
|
||||||
case MATCHSEAT:
|
case MATCHSEAT:
|
||||||
if (xf86getSubToken(&(ptr->dev_comment)) != STRING)
|
if (xf86getSubToken(&(ptr->dev_comment)) != STRING)
|
||||||
Error(QUOTE_MSG, "MatchSeat");
|
Error(QUOTE_MSG, "MatchSeat");
|
||||||
|
@ -312,10 +306,6 @@ xf86printDeviceSection(FILE * cf, XF86ConfDevicePtr ptr)
|
||||||
fprintf(cf, "%.1f ", (double) ptr->dev_clock[i] / 1000.0);
|
fprintf(cf, "%.1f ", (double) ptr->dev_clock[i] / 1000.0);
|
||||||
fprintf(cf, "\n");
|
fprintf(cf, "\n");
|
||||||
}
|
}
|
||||||
if (ptr->dev_textclockfreq) {
|
|
||||||
fprintf(cf, "\tTextClockFreq %.1f\n",
|
|
||||||
(double) ptr->dev_textclockfreq / 1000.0);
|
|
||||||
}
|
|
||||||
if (ptr->dev_busid)
|
if (ptr->dev_busid)
|
||||||
fprintf(cf, "\tBusID \"%s\"\n", ptr->dev_busid);
|
fprintf(cf, "\tBusID \"%s\"\n", ptr->dev_busid);
|
||||||
if (ptr->dev_screen > 0)
|
if (ptr->dev_screen > 0)
|
||||||
|
|
|
@ -211,7 +211,6 @@ typedef struct {
|
||||||
const char *dev_ramdac;
|
const char *dev_ramdac;
|
||||||
int dev_dacSpeeds[CONF_MAXDACSPEEDS];
|
int dev_dacSpeeds[CONF_MAXDACSPEEDS];
|
||||||
int dev_videoram;
|
int dev_videoram;
|
||||||
int dev_textclockfreq;
|
|
||||||
unsigned long dev_bios_base;
|
unsigned long dev_bios_base;
|
||||||
unsigned long dev_mem_base;
|
unsigned long dev_mem_base;
|
||||||
unsigned long dev_io_base;
|
unsigned long dev_io_base;
|
||||||
|
|
|
@ -187,7 +187,6 @@ typedef enum {
|
||||||
CHIPREV,
|
CHIPREV,
|
||||||
CARD,
|
CARD,
|
||||||
BUSID,
|
BUSID,
|
||||||
TEXTCLOCKFRQ,
|
|
||||||
IRQ,
|
IRQ,
|
||||||
|
|
||||||
/* Keyboard tokens */
|
/* Keyboard tokens */
|
||||||
|
|
|
@ -57,7 +57,6 @@ typedef struct {
|
||||||
Bool active;
|
Bool active;
|
||||||
Bool inUse;
|
Bool inUse;
|
||||||
int videoRam;
|
int videoRam;
|
||||||
int textClockFreq;
|
|
||||||
void *options;
|
void *options;
|
||||||
int screen; /* For multi-CRTC cards */
|
int screen; /* For multi-CRTC cards */
|
||||||
} GDevRec, *GDevPtr;
|
} GDevRec, *GDevPtr;
|
||||||
|
|
Loading…
Reference in New Issue