diff options
Diffstat (limited to 'src/rdc_tool.c')
| -rw-r--r-- | src/rdc_tool.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/rdc_tool.c b/src/rdc_tool.c index 4ba363a..5fbe75a 100644 --- a/src/rdc_tool.c +++ b/src/rdc_tool.c @@ -17,6 +17,7 @@ * For technical support : * <jason.lin@rdc.com.tw> */ + #ifdef HAVE_CONFIG_H #include <config.h> @@ -44,20 +45,20 @@ #include "xf86PciInfo.h" #include "xf86Pci.h" -/* framebuffer offscreen manager */ + #include "xf86fbman.h" -/* include xaa includes */ + #include "xaa.h" #include "xaarop.h" -/* H/W cursor support */ + #include "xf86Cursor.h" -/* Driver specific headers */ + #include "rdc.h" -/* Prototype type declaration*/ + Bool RDCMapMem(ScrnInfoPtr pScrn); Bool RDCUnmapMem(ScrnInfoPtr pScrn); Bool RDCMapMMIO(ScrnInfoPtr pScrn); @@ -173,7 +174,7 @@ Bool RDCMapVBIOS(ScrnInfoPtr pScrn) xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, ErrorLevel, "==Enter RDCMapVBIOS()==\n"); pRDC->ulROMType = 0; - // Map C000 + if (pRDC->ulROMType == 0) { pRDC->BIOSVirtualAddr = xf86MapVidMem(pScrn->scrnIndex, VIDMEM_READONLY, BIOS_ROM_PHY_BASE, BIOS_ROM_SIZE); @@ -188,17 +189,17 @@ Bool RDCMapVBIOS(ScrnInfoPtr pScrn) } } - // read ROM file + if (pRDC->ulROMType == 0) { - // open BIOS ROM file + fpVBIOS = fopen(BIOS_ROM_PATH_FILE, "r"); if (!fpVBIOS) { xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, InfoLevel, "BIOS ROM file \"/root/RDCVBIOS.ROM\" not found()==\n"); } - // memory allocate + pRDC->BIOSVirtualAddr = xnfalloc(BIOS_ROM_SIZE); if (!pRDC->BIOSVirtualAddr) { @@ -206,7 +207,7 @@ Bool RDCMapVBIOS(ScrnInfoPtr pScrn) fclose (fpVBIOS); } - // set ROM type + if (fpVBIOS && pRDC->BIOSVirtualAddr) { pRDC->ulROMType = 2; @@ -221,7 +222,7 @@ Bool RDCMapVBIOS(ScrnInfoPtr pScrn) if (pRDC->ulROMType == 0) { xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, ErrorLevel, "==Exit1 RDCMapVBIOS()== No VBIOS\n"); - return false; // no VBIOS and ROM file + return false; } xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, InfoLevel, "pRDC->ulROMType = %d\n", pRDC->ulROMType); @@ -236,7 +237,7 @@ Bool RDCMapVBIOS(ScrnInfoPtr pScrn) RDCUnmapVBIOS(pScrn); xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, ErrorLevel, "==Exit2 RDCMapVBIOS()== Not RDC VBIOS\n"); - return false; // not RDC VGA BIOS + return false; } } |