diff options
| -rw-r--r-- | man/ati.man | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 8 | ||||
| -rw-r--r-- | src/ati.c | 8 | ||||
| -rw-r--r-- | src/atimach64probe.c | 2 | ||||
| -rw-r--r-- | src/atimisc.c | 10 |
5 files changed, 15 insertions, 15 deletions
diff --git a/man/ati.man b/man/ati.man index c6c7d01c..d8d84ebd 100644 --- a/man/ati.man +++ b/man/ati.man @@ -17,7 +17,7 @@ ati \- ATI video driver is an __xservername__ wrapper driver for ATI video cards. It autodetects whether your hardware has a Radeon, Rage 128, or Mach64 or earlier class of chipset, and loads the radeon(__drivermansuffix__), -r128(__drivermansuffix__), or atimisc driver as +r128(__drivermansuffix__), or mach64 driver as appropriate. .SH SUPPORTED HARDWARE The diff --git a/src/Makefile.am b/src/Makefile.am index 0f96e1c5..661dcd83 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -86,10 +86,10 @@ ati_drv_ladir = @moduledir@/drivers ati_drv_la_SOURCES = \ ati.c atimodule.c -atimisc_drv_la_LTLIBRARIES = atimisc_drv.la -atimisc_drv_la_LDFLAGS = -module -avoid-version -atimisc_drv_ladir = @moduledir@/drivers -atimisc_drv_la_SOURCES = \ +mach64_drv_la_LTLIBRARIES = mach64_drv.la +mach64_drv_la_LDFLAGS = -module -avoid-version +mach64_drv_ladir = @moduledir@/drivers +mach64_drv_la_SOURCES = \ atibus.c atichip.c atiprobe.c atividmem.c \ atiadjust.c atiaudio.c aticlock.c aticonfig.c aticonsole.c \ atidac.c atidecoder.c atidsp.c atii2c.c \ @@ -233,12 +233,12 @@ ATIProbe /* Call Mach64 driver probe */ if (DoMach64) { - pointer atimisc = xf86LoadDrvSubModule(pDriver, "atimisc"); + pointer mach64 = xf86LoadDrvSubModule(pDriver, "mach64"); - if (!atimisc) + if (!mach64) { xf86Msg(X_ERROR, - ATI_NAME ": Failed to load \"atimisc\" module.\n"); + ATI_NAME ": Failed to load \"mach64\" module.\n"); return FALSE; } @@ -247,7 +247,7 @@ ATIProbe if (Mach64Probe(pDriver, flags)) return TRUE; - xf86UnloadSubModule(atimisc); + xf86UnloadSubModule(mach64); } return FALSE; diff --git a/src/atimach64probe.c b/src/atimach64probe.c index 2f716a15..b365b09f 100644 --- a/src/atimach64probe.c +++ b/src/atimach64probe.c @@ -110,7 +110,7 @@ _X_EXPORT const OptionInfoRec * Mach64AvailableOptions(int chipid, int busid) { /* - * Return options defined in the atimisc submodule which will have been + * Return options defined in the mach64 submodule which will have been * loaded by this point. */ return ATIOptionsWeak(); diff --git a/src/atimisc.c b/src/atimisc.c index b10d08fa..7deda6e9 100644 --- a/src/atimisc.c +++ b/src/atimisc.c @@ -31,7 +31,7 @@ static XF86ModuleVersionInfo ATIVersionRec = { - "atimisc", + "mach64", MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, @@ -67,7 +67,7 @@ ATISetup if (!LoaderSymbol(ATI_NAME)) xf86LoadOneModule(ATI_DRIVER_NAME, Options); - /* ati & atimisc module versions must match */ + /* ati & mach64 module versions must match */ do { XF86ModuleData *pModuleData = LoaderSymbol("atiModuleData"); @@ -83,7 +83,7 @@ ATISetup } xf86Msg(X_ERROR, - "\"ati\" and \"atimisc\" module versions must" + "\"ati\" and \"mach64\" module versions must" " match.\n"); if (ErrorMajor) @@ -101,8 +101,8 @@ ATISetup return (pointer)TRUE; } -/* The following record must be called atimiscModuleData */ -_X_EXPORT XF86ModuleData atimiscModuleData = +/* The following record must be called mach64ModuleData */ +_X_EXPORT XF86ModuleData mach64ModuleData = { &ATIVersionRec, ATISetup, |