Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 289060
b: refs/heads/master
c: c3b3b3f
h: refs/heads/master
v: v3
  • Loading branch information
Peter Huewe authored and Greg Kroah-Hartman committed Feb 10, 2012
1 parent 6a521af commit c5388d6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 107 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ccc8cb25ae7c9213c641efb34a0cb58110315188
refs/heads/master: c3b3b3f9b0efa20a123244def80698669996b8ec
107 changes: 1 addition & 106 deletions trunk/drivers/staging/xgifb/vb_def.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,8 @@
#define VB_YPbPr1080i 0x03

#define LVDSCRT1Len 15

#define SupportCHTV 0x0800
#define SupportCRT2in301C 0x0100 /* for 301C */
#define SetCHTVOverScan 0x8000
#define PanelRGB18Bit 0x0100
#define PanelRGB24Bit 0x0000

#define Panel_320x480 0x07 /*fstn*/
/* [ycchen] 02/12/03 Modify for Multi-Sync. LCD Support */
Expand All @@ -29,102 +25,31 @@

#define XGI_CRT2_PORT_00 (0x00 - 0x030)

#define _PanelType00 0x00
#define _PanelType01 0x08
#define _PanelType02 0x10
#define _PanelType03 0x18
#define _PanelType04 0x20
#define _PanelType05 0x28
#define _PanelType06 0x30
#define _PanelType07 0x38
#define _PanelType08 0x40
#define _PanelType09 0x48
#define _PanelType0A 0x50
#define _PanelType0B 0x58
#define _PanelType0C 0x60
#define _PanelType0D 0x68
#define _PanelType0E 0x70
#define _PanelType0F 0x78

/* =============================================================
for 310
============================================================== */
/* add LCDDataList for GetLCDPtr */
#define LCDDataList (VBIOSTablePointerStart+0x22)
/* */
/* Modify from 310.inc */
/* */
/* */

#define ModeSoftSetting 0x04

#define BoardTVType 0x02

#define SoftDRAMType 0x80 /* DRAMSetting */

/* ---------------- SetMode Stack */
#define CRT1Len 15
#define VCLKLen 4
#define VGA_XGI340 0x0001 /* 340 series */

#define VB_NoLCD 0x8000
#define VB_LVDS_NS 0x0001 /* 3rd party chip */

#define ModeText 0x0000
#define ModeEGA 0x0002 /* 16 colors mode */
#define ModeVGA 0x0003 /* 256 colors mode */

#define DACInfoFlag 0x0018

#define MemoryInfoFlag 0x01e0
#define MemorySizeShift 5

#define Charx8Dot 0x0200
#define LineCompareOff 0x0400
#define CRT2Mode 0x0800
#define HalfDCLK 0x1000
#define NoSupportSimuTV 0x2000
#define DoubleScanMode 0x8000

/* -------------- Ext_InfoFlag */
#define SupportAllCRT2 0x0078
#define SupportTV 0x0008
#define SupportLCD 0x0020
#define SupportRAMDAC2 0x0040
#define NoSupportTV 0x0070
#define NoSupportHiVisionTV 0x0060
#define NoSupportLCD 0x0058
#define SupportTV1024 0x0800 /* 301btest */
#define InterlaceMode 0x0080
#define SyncPP 0x0000
#define SyncPN 0x4000
#define SyncNP 0x8000
#define SyncNN 0xC000

/* -------------- SetMode Stack/Scratch */
#define SetSimuScanMode 0x0001 /* VBInfo/CR30 & CR31 */
#define SetCRT2ToTV 0x089C
#define SetCRT2ToAVIDEO 0x0004
#define SetCRT2ToSVIDEO 0x0008
#define SetCRT2ToSCART 0x0010
#define SetCRT2ToLCD 0x0020
#define SetCRT2ToRAMDAC 0x0040
#define XGI_SetCRT2ToLCDA 0x0100
#define SetInSlaveMode 0x0200
#define SetNotSimuMode 0x0400
#define LoadDACFlag 0x1000
#define DriverMode 0x4000
#define SetCRT2ToDualEdge 0x8000

#define ProgrammingCRT2 0x0001 /* Set Flag */
#define ReserveTVOption 0x0008
#define GatingCRT 0x0800
#define DisableChB 0x1000
#define EnableChB 0x2000
#define DisableChA 0x4000
#define EnableChA 0x8000

#define SetNTSCTV 0x0000 /* TV Info */
#define SetTVLowResolution 0x0400
#define TVSimuMode 0x0800
#define RPLLDIV2XO 0x1000
Expand Down Expand Up @@ -167,24 +92,14 @@

#define TVSense 0xc7

#define TVOverScan 0x10 /* CR35 */

#define YPbPrMode 0xe0
#define YPbPrMode525i 0x00
#define YPbPrMode525p 0x20
#define YPbPrMode750p 0x40
#define YPbPrMode1080i 0x60


#define LCDRGB18Bit 0x01 /* CR37 */
#define LCDNonExpanding 0x10
#define LCDSync 0x20
#define LCDSyncBit 0xe0 /* H/V polarity & sync ID */

#define ScalingLCD 0x08

#define EnableDualEdge 0x01 /* CR38 */
#define SetToLCDA 0x02
#define SetYPbPr 0x04

/* ---------------------- VUMA Information */
Expand All @@ -207,28 +122,13 @@
/* translated from asm code 301def.h */
/* */
/* --------------------------------------------------------- */
#define LCDDataLen 8
#define TVDataLen 12
#define LVDSCRT1Len_H 8
#define LVDSCRT1Len_V 7
#define LVDSDataLen 6
#define LVDSDesDataLen 6
#define LCDDesDataLen 6
#define LVDSDesDataLen2 8
#define LCDDesDataLen2 8
#define CHTVRegLen 16

#define StHiTVHT 892
#define StHiTVVT 1126
#define StHiTextTVHT 1000
#define StHiTextTVVT 1126
#define ExtHiTVHT 2100
#define ExtHiTVVT 1125
#define NTSCHT 1716
#define NTSCVT 525
#define NTSC1024x768HT 1908
#define PALHT 1728
#define PALVT 625

#define YPbPrTV525iHT 1716 /* YPbPr */
#define YPbPrTV525iVT 525
Expand All @@ -237,15 +137,10 @@
#define YPbPrTV750pHT 1650
#define YPbPrTV750pVT 750

#define CRT2Delay1 0x04 /* XGI301 */
#define CRT2Delay2 0x0A /* 301B,302 */


#define VCLK25_175 0x00
#define VCLK28_322 0x01
#define VCLK31_5 0x02
#define VCLK36 0x03
#define VCLK40 0x04
#define VCLK43_163 0x05
#define VCLK44_9 0x06
#define VCLK49_5 0x07
Expand Down Expand Up @@ -289,7 +184,7 @@
#define XGI_YPbPr750pVCLK 0x57

#define VCLK39_77 0x40
#define YPbPr525pVCLK 0x3A
#define YPbPr525pVCLK 0x3A
#define NTSC1024VCLK 0x41
#define VCLK35_2 0x49 /* ; 800x480 */
#define VCLK122_61 0x4A
Expand Down

0 comments on commit c5388d6

Please sign in to comment.