Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

USB: SisUSB2VGA: Lindent drivers/usb/misc/sisusbvga/sisusb_init.c

Better indentation

Signed-off-by: Felipe Balbi <felipe.lima@indt.org.br>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Felipe Balbi and committed by
Greg Kroah-Hartman
22b2c526 1c1772a2

+133 -129
+133 -129
drivers/usb/misc/sisusbvga/sisusb_init.c
··· 55 55 /* POINTER INITIALIZATION */ 56 56 /*********************************************/ 57 57 58 - static void 59 - SiSUSB_InitPtr(struct SiS_Private *SiS_Pr) 58 + static void SiSUSB_InitPtr(struct SiS_Private *SiS_Pr) 60 59 { 61 - SiS_Pr->SiS_ModeResInfo = SiSUSB_ModeResInfo; 62 - SiS_Pr->SiS_StandTable = SiSUSB_StandTable; 60 + SiS_Pr->SiS_ModeResInfo = SiSUSB_ModeResInfo; 61 + SiS_Pr->SiS_StandTable = SiSUSB_StandTable; 63 62 64 - SiS_Pr->SiS_SModeIDTable = SiSUSB_SModeIDTable; 65 - SiS_Pr->SiS_EModeIDTable = SiSUSB_EModeIDTable; 66 - SiS_Pr->SiS_RefIndex = SiSUSB_RefIndex; 67 - SiS_Pr->SiS_CRT1Table = SiSUSB_CRT1Table; 63 + SiS_Pr->SiS_SModeIDTable = SiSUSB_SModeIDTable; 64 + SiS_Pr->SiS_EModeIDTable = SiSUSB_EModeIDTable; 65 + SiS_Pr->SiS_RefIndex = SiSUSB_RefIndex; 66 + SiS_Pr->SiS_CRT1Table = SiSUSB_CRT1Table; 68 67 69 - SiS_Pr->SiS_VCLKData = SiSUSB_VCLKData; 68 + SiS_Pr->SiS_VCLKData = SiSUSB_VCLKData; 70 69 } 71 70 72 71 /*********************************************/ ··· 74 75 75 76 static void 76 77 SiS_SetReg(struct SiS_Private *SiS_Pr, unsigned long port, 77 - unsigned short index, unsigned short data) 78 + unsigned short index, unsigned short data) 78 79 { 79 80 sisusb_setidxreg(SiS_Pr->sisusb, port, index, data); 80 81 } 81 82 82 83 static void 83 84 SiS_SetRegByte(struct SiS_Private *SiS_Pr, unsigned long port, 84 - unsigned short data) 85 + unsigned short data) 85 86 { 86 87 sisusb_setreg(SiS_Pr->sisusb, port, data); 87 88 } 88 89 89 90 static unsigned char 90 - SiS_GetReg(struct SiS_Private *SiS_Pr, unsigned long port, 91 - unsigned short index) 91 + SiS_GetReg(struct SiS_Private *SiS_Pr, unsigned long port, unsigned short index) 92 92 { 93 93 u8 data; 94 94 ··· 108 110 109 111 static void 110 112 SiS_SetRegANDOR(struct SiS_Private *SiS_Pr, unsigned long port, 111 - unsigned short index, unsigned short DataAND, 112 - unsigned short DataOR) 113 + unsigned short index, unsigned short DataAND, 114 + unsigned short DataOR) 113 115 { 114 116 sisusb_setidxregandor(SiS_Pr->sisusb, port, index, DataAND, DataOR); 115 117 } 116 118 117 119 static void 118 120 SiS_SetRegAND(struct SiS_Private *SiS_Pr, unsigned long port, 119 - unsigned short index, unsigned short DataAND) 121 + unsigned short index, unsigned short DataAND) 120 122 { 121 123 sisusb_setidxregand(SiS_Pr->sisusb, port, index, DataAND); 122 124 } 123 125 124 126 static void 125 - SiS_SetRegOR(struct SiS_Private *SiS_Pr,unsigned long port, 126 - unsigned short index, unsigned short DataOR) 127 + SiS_SetRegOR(struct SiS_Private *SiS_Pr, unsigned long port, 128 + unsigned short index, unsigned short DataOR) 127 129 { 128 130 sisusb_setidxregor(SiS_Pr->sisusb, port, index, DataOR); 129 131 } ··· 132 134 /* HELPER: DisplayOn, DisplayOff */ 133 135 /*********************************************/ 134 136 135 - static void 136 - SiS_DisplayOn(struct SiS_Private *SiS_Pr) 137 + static void SiS_DisplayOn(struct SiS_Private *SiS_Pr) 137 138 { 138 139 SiS_SetRegAND(SiS_Pr, SiS_Pr->SiS_P3c4, 0x01, 0xDF); 139 140 } ··· 141 144 /* HELPER: Init Port Addresses */ 142 145 /*********************************************/ 143 146 144 - static void 145 - SiSUSBRegInit(struct SiS_Private *SiS_Pr, unsigned long BaseAddr) 147 + static void SiSUSBRegInit(struct SiS_Private *SiS_Pr, unsigned long BaseAddr) 146 148 { 147 149 SiS_Pr->SiS_P3c4 = BaseAddr + 0x14; 148 150 SiS_Pr->SiS_P3d4 = BaseAddr + 0x24; ··· 164 168 /* HELPER: GetSysFlags */ 165 169 /*********************************************/ 166 170 167 - static void 168 - SiS_GetSysFlags(struct SiS_Private *SiS_Pr) 171 + static void SiS_GetSysFlags(struct SiS_Private *SiS_Pr) 169 172 { 170 173 SiS_Pr->SiS_MyCR63 = 0x63; 171 174 } ··· 173 178 /* HELPER: Init PCI & Engines */ 174 179 /*********************************************/ 175 180 176 - static void 177 - SiSInitPCIetc(struct SiS_Private *SiS_Pr) 181 + static void SiSInitPCIetc(struct SiS_Private *SiS_Pr) 178 182 { 179 183 SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3c4, 0x20, 0xa1); 180 184 /* - Enable 2D (0x40) ··· 189 195 /* HELPER: SET SEGMENT REGISTERS */ 190 196 /*********************************************/ 191 197 192 - static void 193 - SiS_SetSegRegLower(struct SiS_Private *SiS_Pr, unsigned short value) 198 + static void SiS_SetSegRegLower(struct SiS_Private *SiS_Pr, unsigned short value) 194 199 { 195 200 unsigned short temp; 196 201 ··· 202 209 SiS_SetRegByte(SiS_Pr, SiS_Pr->SiS_P3cd, temp); 203 210 } 204 211 205 - static void 206 - SiS_SetSegRegUpper(struct SiS_Private *SiS_Pr, unsigned short value) 212 + static void SiS_SetSegRegUpper(struct SiS_Private *SiS_Pr, unsigned short value) 207 213 { 208 214 unsigned short temp; 209 215 ··· 215 223 SiS_SetRegByte(SiS_Pr, SiS_Pr->SiS_P3cd, temp); 216 224 } 217 225 218 - static void 219 - SiS_SetSegmentReg(struct SiS_Private *SiS_Pr, unsigned short value) 226 + static void SiS_SetSegmentReg(struct SiS_Private *SiS_Pr, unsigned short value) 220 227 { 221 228 SiS_SetSegRegLower(SiS_Pr, value); 222 229 SiS_SetSegRegUpper(SiS_Pr, value); 223 230 } 224 231 225 - static void 226 - SiS_ResetSegmentReg(struct SiS_Private *SiS_Pr) 232 + static void SiS_ResetSegmentReg(struct SiS_Private *SiS_Pr) 227 233 { 228 234 SiS_SetSegmentReg(SiS_Pr, 0); 229 235 } ··· 237 247 SiS_SetSegmentReg(SiS_Pr, value); 238 248 } 239 249 240 - static void 241 - SiS_ResetSegmentRegOver(struct SiS_Private *SiS_Pr) 250 + static void SiS_ResetSegmentRegOver(struct SiS_Private *SiS_Pr) 242 251 { 243 252 SiS_SetSegmentRegOver(SiS_Pr, 0); 244 253 } 245 254 246 - static void 247 - SiS_ResetSegmentRegisters(struct SiS_Private *SiS_Pr) 255 + static void SiS_ResetSegmentRegisters(struct SiS_Private *SiS_Pr) 248 256 { 249 257 SiS_ResetSegmentReg(SiS_Pr); 250 258 SiS_ResetSegmentRegOver(SiS_Pr); ··· 254 266 255 267 static int 256 268 SiS_SearchModeID(struct SiS_Private *SiS_Pr, unsigned short *ModeNo, 257 - unsigned short *ModeIdIndex) 269 + unsigned short *ModeIdIndex) 258 270 { 259 271 if ((*ModeNo) <= 0x13) { 260 272 ··· 265 277 266 278 } else { 267 279 268 - for(*ModeIdIndex = 0; ;(*ModeIdIndex)++) { 280 + for (*ModeIdIndex = 0;; (*ModeIdIndex)++) { 269 281 270 - if (SiS_Pr->SiS_EModeIDTable[*ModeIdIndex].Ext_ModeID == (*ModeNo)) 282 + if (SiS_Pr->SiS_EModeIDTable[*ModeIdIndex].Ext_ModeID == 283 + (*ModeNo)) 271 284 break; 272 285 273 - if (SiS_Pr->SiS_EModeIDTable[*ModeIdIndex].Ext_ModeID == 0xFF) 286 + if (SiS_Pr->SiS_EModeIDTable[*ModeIdIndex].Ext_ModeID == 287 + 0xFF) 274 288 return 0; 275 289 } 276 290 ··· 285 295 /* HELPER: ENABLE CRT1 */ 286 296 /*********************************************/ 287 297 288 - static void 289 - SiS_HandleCRT1(struct SiS_Private *SiS_Pr) 298 + static void SiS_HandleCRT1(struct SiS_Private *SiS_Pr) 290 299 { 291 300 /* Enable CRT1 gating */ 292 301 SiS_SetRegAND(SiS_Pr, SiS_Pr->SiS_P3d4, SiS_Pr->SiS_MyCR63, 0xbf); ··· 297 308 298 309 static unsigned short 299 310 SiS_GetColorDepth(struct SiS_Private *SiS_Pr, unsigned short ModeNo, 300 - unsigned short ModeIdIndex) 311 + unsigned short ModeIdIndex) 301 312 { 302 - static const unsigned short ColorDepth[6] = { 1, 2, 4, 4, 6, 8}; 313 + static const unsigned short ColorDepth[6] = { 1, 2, 4, 4, 6, 8 }; 303 314 unsigned short modeflag; 304 315 short index; 305 316 ··· 310 321 } 311 322 312 323 index = (modeflag & ModeTypeMask) - ModeEGA; 313 - if (index < 0) index = 0; 324 + if (index < 0) 325 + index = 0; 314 326 return ColorDepth[index]; 315 327 } 316 328 ··· 321 331 322 332 static unsigned short 323 333 SiS_GetOffset(struct SiS_Private *SiS_Pr, unsigned short ModeNo, 324 - unsigned short ModeIdIndex, unsigned short rrti) 334 + unsigned short ModeIdIndex, unsigned short rrti) 325 335 { 326 336 unsigned short xres, temp, colordepth, infoflag; 327 337 ··· 358 368 SRdata = SiS_Pr->SiS_StandTable[StandTableIndex].SR[0] | 0x20; 359 369 SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3c4, 0x01, SRdata); 360 370 361 - for(i = 2; i <= 4; i++) { 362 - SRdata = SiS_Pr->SiS_StandTable[StandTableIndex].SR[i-1]; 371 + for (i = 2; i <= 4; i++) { 372 + SRdata = SiS_Pr->SiS_StandTable[StandTableIndex].SR[i - 1]; 363 373 SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3c4, i, SRdata); 364 374 } 365 375 } ··· 388 398 389 399 SiS_SetRegAND(SiS_Pr, SiS_Pr->SiS_P3d4, 0x11, 0x7f); 390 400 391 - for(i = 0; i <= 0x18; i++) { 401 + for (i = 0; i <= 0x18; i++) { 392 402 CRTCdata = SiS_Pr->SiS_StandTable[StandTableIndex].CRTC[i]; 393 403 SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3d4, i, CRTCdata); 394 404 } ··· 404 414 unsigned char ARdata; 405 415 unsigned short i; 406 416 407 - for(i = 0; i <= 0x13; i++) { 417 + for (i = 0; i <= 0x13; i++) { 408 418 ARdata = SiS_Pr->SiS_StandTable[StandTableIndex].ATTR[i]; 409 419 SiS_GetRegByte(SiS_Pr, SiS_Pr->SiS_P3da); 410 420 SiS_SetRegByte(SiS_Pr, SiS_Pr->SiS_P3c0, i); ··· 429 439 unsigned char GRdata; 430 440 unsigned short i; 431 441 432 - for(i = 0; i <= 0x08; i++) { 442 + for (i = 0; i <= 0x08; i++) { 433 443 GRdata = SiS_Pr->SiS_StandTable[StandTableIndex].GRC[i]; 434 444 SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3ce, i, GRdata); 435 445 } ··· 444 454 /* CLEAR EXTENDED REGISTERS */ 445 455 /*********************************************/ 446 456 447 - static void 448 - SiS_ClearExt1Regs(struct SiS_Private *SiS_Pr, unsigned short ModeNo) 457 + static void SiS_ClearExt1Regs(struct SiS_Private *SiS_Pr, unsigned short ModeNo) 449 458 { 450 459 int i; 451 460 452 - for(i = 0x0A; i <= 0x0E; i++) { 461 + for (i = 0x0A; i <= 0x0E; i++) { 453 462 SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3c4, i, 0x00); 454 463 } 455 464 ··· 461 472 462 473 static unsigned short 463 474 SiS_GetRatePtr(struct SiS_Private *SiS_Pr, unsigned short ModeNo, 464 - unsigned short ModeIdIndex) 475 + unsigned short ModeIdIndex) 465 476 { 466 477 unsigned short rrti, i, index, temp; 467 478 468 479 if (ModeNo <= 0x13) 469 480 return 0xFFFF; 470 481 471 - index = SiS_GetReg(SiS_Pr,SiS_Pr->SiS_P3d4, 0x33) & 0x0F; 472 - if (index > 0) index--; 482 + index = SiS_GetReg(SiS_Pr, SiS_Pr->SiS_P3d4, 0x33) & 0x0F; 483 + if (index > 0) 484 + index--; 473 485 474 486 rrti = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].REFindex; 475 487 ModeNo = SiS_Pr->SiS_RefIndex[rrti].ModeID; ··· 480 490 if (SiS_Pr->SiS_RefIndex[rrti + i].ModeID != ModeNo) 481 491 break; 482 492 483 - temp = SiS_Pr->SiS_RefIndex[rrti + i].Ext_InfoFlag & ModeTypeMask; 493 + temp = 494 + SiS_Pr->SiS_RefIndex[rrti + i].Ext_InfoFlag & ModeTypeMask; 484 495 if (temp < SiS_Pr->SiS_ModeType) 485 496 break; 486 497 487 498 i++; 488 499 index--; 489 - } while(index != 0xFFFF); 500 + } while (index != 0xFFFF); 490 501 491 502 i--; 492 503 ··· 498 507 /* SYNC */ 499 508 /*********************************************/ 500 509 501 - static void 502 - SiS_SetCRT1Sync(struct SiS_Private *SiS_Pr, unsigned short rrti) 510 + static void SiS_SetCRT1Sync(struct SiS_Private *SiS_Pr, unsigned short rrti) 503 511 { 504 512 unsigned short sync = SiS_Pr->SiS_RefIndex[rrti].Ext_InfoFlag >> 8; 505 513 sync &= 0xC0; ··· 512 522 513 523 static void 514 524 SiS_SetCRT1CRTC(struct SiS_Private *SiS_Pr, unsigned short ModeNo, 515 - unsigned short ModeIdIndex, unsigned short rrti) 525 + unsigned short ModeIdIndex, unsigned short rrti) 516 526 { 517 - unsigned char index; 527 + unsigned char index; 518 528 unsigned short temp, i, j, modeflag; 519 529 520 - SiS_SetRegAND(SiS_Pr, SiS_Pr->SiS_P3d4,0x11,0x7f); 530 + SiS_SetRegAND(SiS_Pr, SiS_Pr->SiS_P3d4, 0x11, 0x7f); 521 531 522 532 modeflag = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_ModeFlag; 523 533 524 534 index = SiS_Pr->SiS_RefIndex[rrti].Ext_CRT1CRTC; 525 535 526 - for(i = 0,j = 0; i <= 7; i++, j++) { 536 + for (i = 0, j = 0; i <= 7; i++, j++) { 527 537 SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3d4, j, 528 - SiS_Pr->SiS_CRT1Table[index].CR[i]); 538 + SiS_Pr->SiS_CRT1Table[index].CR[i]); 529 539 } 530 - for(j = 0x10; i <= 10; i++, j++) { 540 + for (j = 0x10; i <= 10; i++, j++) { 531 541 SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3d4, j, 532 - SiS_Pr->SiS_CRT1Table[index].CR[i]); 542 + SiS_Pr->SiS_CRT1Table[index].CR[i]); 533 543 } 534 - for(j = 0x15; i <= 12; i++, j++) { 544 + for (j = 0x15; i <= 12; i++, j++) { 535 545 SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3d4, j, 536 - SiS_Pr->SiS_CRT1Table[index].CR[i]); 546 + SiS_Pr->SiS_CRT1Table[index].CR[i]); 537 547 } 538 - for(j = 0x0A; i <= 15; i++, j++) { 548 + for (j = 0x0A; i <= 15; i++, j++) { 539 549 SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3c4, j, 540 - SiS_Pr->SiS_CRT1Table[index].CR[i]); 550 + SiS_Pr->SiS_CRT1Table[index].CR[i]); 541 551 } 542 552 543 553 temp = SiS_Pr->SiS_CRT1Table[index].CR[16] & 0xE0; 544 - SiS_SetReg(SiS_Pr,SiS_Pr->SiS_P3c4, 0x0E, temp); 554 + SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3c4, 0x0E, temp); 545 555 546 556 temp = ((SiS_Pr->SiS_CRT1Table[index].CR[16]) & 0x01) << 5; 547 - if (modeflag & DoubleScanMode) temp |= 0x80; 557 + if (modeflag & DoubleScanMode) 558 + temp |= 0x80; 548 559 SiS_SetRegANDOR(SiS_Pr, SiS_Pr->SiS_P3d4, 0x09, 0x5F, temp); 549 560 550 561 if (SiS_Pr->SiS_ModeType > ModeVGA) ··· 560 569 561 570 static void 562 571 SiS_SetCRT1Offset(struct SiS_Private *SiS_Pr, unsigned short ModeNo, 563 - unsigned short ModeIdIndex, unsigned short rrti) 572 + unsigned short ModeIdIndex, unsigned short rrti) 564 573 { 565 574 unsigned short du = SiS_GetOffset(SiS_Pr, ModeNo, ModeIdIndex, rrti); 566 - unsigned short infoflag = SiS_Pr->SiS_RefIndex[rrti].Ext_InfoFlag; 575 + unsigned short infoflag = SiS_Pr->SiS_RefIndex[rrti].Ext_InfoFlag; 567 576 unsigned short temp; 568 577 569 578 temp = (du >> 8) & 0x0f; ··· 571 580 572 581 SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3d4, 0x13, (du & 0xFF)); 573 582 574 - if (infoflag & InterlaceMode) du >>= 1; 583 + if (infoflag & InterlaceMode) 584 + du >>= 1; 575 585 576 586 du <<= 5; 577 587 temp = (du >> 8) & 0xff; 578 - if (du & 0xff) temp++; 588 + if (du & 0xff) 589 + temp++; 579 590 temp++; 580 591 SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3c4, 0x10, temp); 581 592 } ··· 588 595 589 596 static void 590 597 SiS_SetCRT1VCLK(struct SiS_Private *SiS_Pr, unsigned short ModeNo, 591 - unsigned short rrti) 598 + unsigned short rrti) 592 599 { 593 600 unsigned short index = SiS_Pr->SiS_RefIndex[rrti].Ext_CRTVCLK; 594 601 unsigned short clka = SiS_Pr->SiS_VCLKData[index].SR2B; 595 602 unsigned short clkb = SiS_Pr->SiS_VCLKData[index].SR2C; 596 603 597 - SiS_SetRegAND(SiS_Pr, SiS_Pr->SiS_P3c4,0x31,0xCF); 604 + SiS_SetRegAND(SiS_Pr, SiS_Pr->SiS_P3c4, 0x31, 0xCF); 598 605 599 - SiS_SetReg(SiS_Pr,SiS_Pr->SiS_P3c4,0x2B,clka); 600 - SiS_SetReg(SiS_Pr,SiS_Pr->SiS_P3c4,0x2C,clkb); 601 - SiS_SetReg(SiS_Pr,SiS_Pr->SiS_P3c4,0x2D,0x01); 606 + SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3c4, 0x2B, clka); 607 + SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3c4, 0x2C, clkb); 608 + SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3c4, 0x2D, 0x01); 602 609 } 603 610 604 611 /*********************************************/ ··· 607 614 608 615 static void 609 616 SiS_SetCRT1FIFO_310(struct SiS_Private *SiS_Pr, unsigned short ModeNo, 610 - unsigned short mi) 617 + unsigned short mi) 611 618 { 612 619 unsigned short modeflag = SiS_Pr->SiS_EModeIDTable[mi].Ext_ModeFlag; 613 620 ··· 632 639 633 640 static void 634 641 SiS_SetVCLKState(struct SiS_Private *SiS_Pr, unsigned short ModeNo, 635 - unsigned short rrti) 642 + unsigned short rrti) 636 643 { 637 644 unsigned short data = 0, VCLK = 0, index = 0; 638 645 ··· 641 648 VCLK = SiS_Pr->SiS_VCLKData[index].CLOCK; 642 649 } 643 650 644 - if (VCLK >= 166) data |= 0x0c; 651 + if (VCLK >= 166) 652 + data |= 0x0c; 645 653 SiS_SetRegANDOR(SiS_Pr, SiS_Pr->SiS_P3c4, 0x32, 0xf3, data); 646 654 647 655 if (VCLK >= 166) ··· 662 668 663 669 static void 664 670 SiS_SetCRT1ModeRegs(struct SiS_Private *SiS_Pr, unsigned short ModeNo, 665 - unsigned short ModeIdIndex, unsigned short rrti) 671 + unsigned short ModeIdIndex, unsigned short rrti) 666 672 { 667 673 unsigned short data, infoflag = 0, modeflag; 668 674 ··· 682 688 data |= 0x02; 683 689 data |= ((SiS_Pr->SiS_ModeType - ModeVGA) << 2); 684 690 } 685 - if (infoflag & InterlaceMode) data |= 0x20; 691 + if (infoflag & InterlaceMode) 692 + data |= 0x20; 686 693 } 687 694 SiS_SetRegANDOR(SiS_Pr, SiS_Pr->SiS_P3c4, 0x06, 0xC0, data); 688 695 689 696 data = 0; 690 697 if (infoflag & InterlaceMode) { 691 698 /* data = (Hsync / 8) - ((Htotal / 8) / 2) + 3 */ 692 - unsigned short hrs = (SiS_GetReg(SiS_Pr, SiS_Pr->SiS_P3d4, 0x04) | 693 - ((SiS_GetReg(SiS_Pr, SiS_Pr->SiS_P3c4, 0x0b) & 0xc0) << 2)) - 3; 694 - unsigned short hto = (SiS_GetReg(SiS_Pr, SiS_Pr->SiS_P3d4, 0x00) | 695 - ((SiS_GetReg(SiS_Pr, SiS_Pr->SiS_P3c4, 0x0b) & 0x03) << 8)) + 5; 699 + unsigned short hrs = 700 + (SiS_GetReg(SiS_Pr, SiS_Pr->SiS_P3d4, 0x04) | 701 + ((SiS_GetReg(SiS_Pr, SiS_Pr->SiS_P3c4, 0x0b) & 0xc0) << 2)) 702 + - 3; 703 + unsigned short hto = 704 + (SiS_GetReg(SiS_Pr, SiS_Pr->SiS_P3d4, 0x00) | 705 + ((SiS_GetReg(SiS_Pr, SiS_Pr->SiS_P3c4, 0x0b) & 0x03) << 8)) 706 + + 5; 696 707 data = hrs - (hto >> 1) + 3; 697 708 } 698 709 SiS_SetReg(SiS_Pr, SiS_Pr->SiS_P3d4, 0x19, (data & 0xFF)); ··· 738 739 739 740 static void 740 741 SiS_WriteDAC(struct SiS_Private *SiS_Pr, unsigned long DACData, 741 - unsigned short shiftflag, unsigned short dl, unsigned short ah, 742 - unsigned short al, unsigned short dh) 742 + unsigned short shiftflag, unsigned short dl, unsigned short ah, 743 + unsigned short al, unsigned short dh) 743 744 { 744 745 unsigned short d1, d2, d3; 745 746 746 747 switch (dl) { 747 - case 0: 748 - d1 = dh; d2 = ah; d3 = al; 749 - break; 750 - case 1: 751 - d1 = ah; d2 = al; d3 = dh; 752 - break; 753 - default: 754 - d1 = al; d2 = dh; d3 = ah; 748 + case 0: 749 + d1 = dh; 750 + d2 = ah; 751 + d3 = al; 752 + break; 753 + case 1: 754 + d1 = ah; 755 + d2 = al; 756 + d3 = dh; 757 + break; 758 + default: 759 + d1 = al; 760 + d2 = dh; 761 + d3 = ah; 755 762 } 756 763 SiS_SetRegByte(SiS_Pr, DACData, (d1 << shiftflag)); 757 764 SiS_SetRegByte(SiS_Pr, DACData, (d2 << shiftflag)); ··· 765 760 } 766 761 767 762 static void 768 - SiS_LoadDAC(struct SiS_Private *SiS_Pr, unsigned short ModeNo, unsigned short mi) 763 + SiS_LoadDAC(struct SiS_Private *SiS_Pr, unsigned short ModeNo, 764 + unsigned short mi) 769 765 { 770 766 unsigned short data, data2, time, i, j, k, m, n, o; 771 767 unsigned short si, di, bx, sf; ··· 800 794 801 795 SiS_SetRegByte(SiS_Pr, DACAddr, 0x00); 802 796 803 - for(i = 0; i < j; i++) { 797 + for (i = 0; i < j; i++) { 804 798 data = table[i]; 805 - for(k = 0; k < 3; k++) { 799 + for (k = 0; k < 3; k++) { 806 800 data2 = 0; 807 - if (data & 0x01) data2 += 0x2A; 808 - if (data & 0x02) data2 += 0x15; 801 + if (data & 0x01) 802 + data2 += 0x2A; 803 + if (data & 0x02) 804 + data2 += 0x15; 809 805 SiS_SetRegByte(SiS_Pr, DACData, (data2 << sf)); 810 806 data >>= 2; 811 807 } 812 808 } 813 809 814 810 if (time == 256) { 815 - for(i = 16; i < 32; i++) { 811 + for (i = 16; i < 32; i++) { 816 812 data = table[i] << sf; 817 - for(k = 0; k < 3; k++) 813 + for (k = 0; k < 3; k++) 818 814 SiS_SetRegByte(SiS_Pr, DACData, data); 819 815 } 820 816 si = 32; 821 - for(m = 0; m < 9; m++) { 817 + for (m = 0; m < 9; m++) { 822 818 di = si; 823 819 bx = si + 4; 824 - for(n = 0; n < 3; n++) { 825 - for(o = 0; o < 5; o++) { 820 + for (n = 0; n < 3; n++) { 821 + for (o = 0; o < 5; o++) { 826 822 SiS_WriteDAC(SiS_Pr, DACData, sf, n, 827 - table[di], table[bx], table[si]); 823 + table[di], table[bx], 824 + table[si]); 828 825 si++; 829 826 } 830 827 si -= 2; 831 - for(o = 0; o < 3; o++) { 828 + for (o = 0; o < 3; o++) { 832 829 SiS_WriteDAC(SiS_Pr, DACData, sf, n, 833 - table[di], table[si], table[bx]); 830 + table[di], table[si], 831 + table[bx]); 834 832 si--; 835 833 } 836 834 } 837 - si += 5; 835 + si += 5; 838 836 } 839 837 } 840 838 } ··· 849 839 850 840 static void 851 841 SiS_SetCRT1Group(struct SiS_Private *SiS_Pr, unsigned short ModeNo, 852 - unsigned short ModeIdIndex) 842 + unsigned short ModeIdIndex) 853 843 { 854 844 unsigned short StandTableIndex, rrti; 855 845 ··· 890 880 /* SiSSetMode() */ 891 881 /*********************************************/ 892 882 893 - int 894 - SiSUSBSetMode(struct SiS_Private *SiS_Pr, unsigned short ModeNo) 883 + int SiSUSBSetMode(struct SiS_Private *SiS_Pr, unsigned short ModeNo) 895 884 { 896 885 unsigned short ModeIdIndex; 897 - unsigned long BaseAddr = SiS_Pr->IOAddress; 886 + unsigned long BaseAddr = SiS_Pr->IOAddress; 898 887 899 888 SiSUSB_InitPtr(SiS_Pr); 900 889 SiSUSBRegInit(SiS_Pr, BaseAddr); ··· 909 900 ModeNo &= 0x7f; 910 901 911 902 SiS_Pr->SiS_ModeType = 912 - SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_ModeFlag & ModeTypeMask; 903 + SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_ModeFlag & ModeTypeMask; 913 904 914 905 SiS_Pr->SiS_SetFlag = LowModeTests; 915 906 ··· 927 918 return 1; 928 919 } 929 920 930 - int 931 - SiSUSBSetVESAMode(struct SiS_Private *SiS_Pr, unsigned short VModeNo) 921 + int SiSUSBSetVESAMode(struct SiS_Private *SiS_Pr, unsigned short VModeNo) 932 922 { 933 923 unsigned short ModeNo = 0; 934 924 int i; ··· 959 951 } 960 952 961 953 #endif /* INCL_SISUSB_CON */ 962 - 963 - 964 - 965 -