diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-09-02 18:16:41 -0300 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-09-02 18:16:41 -0300 |
| commit | cf5132907e4709c872089fe2d79837b2de4e45b7 (patch) | |
| tree | bc906cb4c35a838e7a9c8bb76d9f01b0e7c04f39 /src/smi_driver.c | |
| parent | a2a090e10f031aed6dbf6d143d6ce8abdf7a2392 (diff) | |
Rename global smi501 functions to have SMI501 prefix.
Functions renamed were setDPMS -> SMI501_SetDPMS,
regRead32 -> SMI501_Read32 and regWrite32 -> SMI501_Write32.
Also moved SMI_SetDPMS to start of smi_501.c to have extern
functions at start of the file.
Diffstat (limited to 'src/smi_driver.c')
| -rw-r--r-- | src/smi_driver.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/smi_driver.c b/src/smi_driver.c index b14f178..a989f60 100644 --- a/src/smi_driver.c +++ b/src/smi_driver.c @@ -1822,10 +1822,10 @@ SMI_DetectPanelSize(ScrnInfoPtr pScrn) pSmi->lcd = 1; } else if (IS_MSOC(pSmi)) { - pSmi->lcdWidth = FIELD_GET(regRead32(pSmi, PANEL_WINDOW_WIDTH), - PANEL_WINDOW_WIDTH, WIDTH); - pSmi->lcdHeight = FIELD_GET(regRead32(pSmi, PANEL_WINDOW_HEIGHT), - PANEL_WINDOW_HEIGHT, HEIGHT); + pSmi->lcdWidth = FIELD_GET(SMI501_Read32(pSmi, PANEL_WINDOW_WIDTH), + PANEL_WINDOW_WIDTH, WIDTH); + pSmi->lcdHeight = FIELD_GET(SMI501_Read32(pSmi, PANEL_WINDOW_HEIGHT), + PANEL_WINDOW_HEIGHT, HEIGHT); } else { /* panel size detection for hardware other than 730 */ @@ -2014,12 +2014,13 @@ SMI_DetectMem(ScrnInfoPtr pScrn) unsigned int value; unsigned int total_memory; - value = regRead32(pSmi, DRAM_CTRL); + value = SMI501_Read32(pSmi, DRAM_CTRL); if (FIELD_GET(value, DRAM_CTRL, SIZE) == DRAM_CTRL_SIZE_4) { /* * SM107 : Need to re-assign number of local memory banks */ - regWrite32(pSmi, DRAM_CTRL, FIELD_SET(value, DRAM_CTRL, BANKS, 2)); + SMI501_Write32(pSmi, DRAM_CTRL, FIELD_SET(value, DRAM_CTRL, + BANKS, 2)); total_memory = 4 * 1024; } else @@ -3659,9 +3660,8 @@ SMI_DisplayPowerManagementSet(ScrnInfoPtr pScrn, int PowerManagementMode, VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x24, SR24); #endif } - else { - setDPMS(pSmi, PowerManagementMode); - } + else + SMI501_SetDPMS(pSmi, PowerManagementMode); /* Save the current power state */ pSmi->CurrentDPMS = PowerManagementMode; |