diff options
| author | George Sapountzis <gsap7@yahoo.gr> | 2008-01-12 16:17:47 +0200 |
|---|---|---|
| committer | George Sapountzis <gsap7@yahoo.gr> | 2008-01-16 16:15:48 +0200 |
| commit | 92f54400d5450b29b3a76d5ecc927cf0d73e156e (patch) | |
| tree | 90ca2b48868f9eb0f962f9f9a72baa80b4964b2b /src/atiprobe.c | |
| parent | 311ec7b6c54a50a4b8a5a445f7283da2b0b2e0f5 (diff) | |
mach64: add version (need not match with ati)
similar to r128/radeon
Diffstat (limited to 'src/atiprobe.c')
| -rw-r--r-- | src/atiprobe.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/atiprobe.c b/src/atiprobe.c index 38ce90d0..70e1a4a6 100644 --- a/src/atiprobe.c +++ b/src/atiprobe.c @@ -32,8 +32,8 @@ #include "atibus.h" #include "atichip.h" #include "atimach64io.h" +#include "atimach64version.h" #include "atiprobe.h" -#include "ativersion.h" #include "atividmem.h" #include "atiwonderio.h" @@ -58,7 +58,7 @@ ATIVGAWonderProbe if (!pATI->OptionProbeSparse) { xf86Msg(X_WARNING, - ATI_NAME ": Expected VGA Wonder capability at I/O port" + MACH64_NAME ": Expected VGA Wonder capability at I/O port" " 0x%04lX will not be probed\n" "set option \"probe_sparse\" to force probing.\n", pATI->CPIO_VGAWonder); @@ -96,13 +96,13 @@ ATIVGAWonderProbe (IOValue6 == 0)) { xf86MsgVerb(X_INFO, 3, - ATI_NAME ": VGA Wonder at I/O port 0x%04lX detected.\n", + MACH64_NAME ": VGA Wonder at I/O port 0x%04lX detected.\n", pATI->CPIO_VGAWonder); } else { xf86Msg(X_WARNING, - ATI_NAME ": Expected VGA Wonder capability at I/O port" + MACH64_NAME ": Expected VGA Wonder capability at I/O port" " 0x%04lX was not detected.\n", pATI->CPIO_VGAWonder); pATI->CPIO_VGAWonder = 0; } @@ -398,7 +398,7 @@ ATIMach64ProbeIO if (j == 0x03U) { - xf86Msg(X_WARNING, ATI_NAME ": " + xf86Msg(X_WARNING, MACH64_NAME ": " "PCI Mach64 in slot %d:%d:%d cannot be enabled\n" "because it has neither a block, nor a sparse, I/O base.\n", PCI_DEV_BUS(pVideo), PCI_DEV_DEV(pVideo), PCI_DEV_FUNC(pVideo)); @@ -418,7 +418,7 @@ ATIMach64ProbeIO */ if (!pATI->OptionProbeSparse) { - xf86Msg(X_WARNING, ATI_NAME ": " + xf86Msg(X_WARNING, MACH64_NAME ": " "PCI Mach64 in slot %d:%d:%d will not be probed\n" "set option \"probe_sparse\" to force sparse I/O probing.\n", PCI_DEV_BUS(pVideo), PCI_DEV_DEV(pVideo), PCI_DEV_FUNC(pVideo)); @@ -439,14 +439,14 @@ ATIMach64ProbeIO if (!ATIMach64Probe(pATI, pVideo, pATI->Chip)) { - xf86Msg(X_WARNING, ATI_NAME ": " + xf86Msg(X_WARNING, MACH64_NAME ": " "PCI Mach64 in slot %d:%d:%d could not be detected!\n", PCI_DEV_BUS(pVideo), PCI_DEV_DEV(pVideo), PCI_DEV_FUNC(pVideo)); } else { ProbeSuccess = TRUE; - xf86Msg(X_INFO, ATI_NAME ": " + xf86Msg(X_INFO, MACH64_NAME ": " "Shared PCI Mach64 in slot %d:%d:%d with sparse PIO base" " 0x%04lX detected.\n", PCI_DEV_BUS(pVideo), PCI_DEV_DEV(pVideo), PCI_DEV_FUNC(pVideo), @@ -471,7 +471,7 @@ SkipSparse: if (ATIMach64Probe(pATI, pVideo, pATI->Chip)) { ProbeSuccess = TRUE; - xf86Msg(X_INFO, ATI_NAME ": " + xf86Msg(X_INFO, MACH64_NAME ": " "Shared PCI Mach64 in slot %d:%d:%d with Block 0 base" " 0x%08lX detected.\n", PCI_DEV_BUS(pVideo), PCI_DEV_DEV(pVideo), PCI_DEV_FUNC(pVideo), @@ -479,7 +479,7 @@ SkipSparse: } else { - xf86Msg(X_WARNING, ATI_NAME ": " + xf86Msg(X_WARNING, MACH64_NAME ": " "PCI Mach64 in slot %d:%d:%d could not be detected!\n", PCI_DEV_BUS(pVideo), PCI_DEV_DEV(pVideo), PCI_DEV_FUNC(pVideo)); } @@ -497,7 +497,7 @@ SkipSparse: if (ATIMach64Probe(pATI, pVideo, pATI->Chip)) { ProbeSuccess = TRUE; - xf86Msg(X_INFO, ATI_NAME ": " + xf86Msg(X_INFO, MACH64_NAME ": " "Shared PCI/AGP Mach64 in slot %d:%d:%d detected.\n", PCI_DEV_BUS(pVideo), PCI_DEV_DEV(pVideo), PCI_DEV_FUNC(pVideo)); @@ -511,7 +511,7 @@ SkipSparse: } else { - xf86Msg(X_WARNING, ATI_NAME ": " + xf86Msg(X_WARNING, MACH64_NAME ": " "PCI/AGP Mach64 in slot %d:%d:%d could not be detected!\n", PCI_DEV_BUS(pVideo), PCI_DEV_DEV(pVideo), PCI_DEV_FUNC(pVideo)); } |