Skip to content

Commit

Permalink
staging: xgifb: delete duplicated LCD data
Browse files Browse the repository at this point in the history 
Delete duplicated LCD data tables. Replace as follows:

	XGI_ExtLCD1400x1050Data		==> xgifb_lcd_1400x1050
	XGI_StLCD1400x1050Data		==> xgifb_lcd_1400x1050
	XGI_ExtLCD1280x1024x75Data	==> xgifb_lcd_1280x1024x75
	XGI_StLCD1280x1024x75Data	==> xgifb_lcd_1280x1024x75
	XGI_ExtLCDDes1400x1050Data	==> xgifb_lcddes_1400x1050
	XGI_StLCDDes1400x1050Data	==> xgifb_lcddes_1400x1050
	XGI_ExtLCDDLDes1400x1050Data	==> xgifb_lcddldes_1400x1050
	XGI_StLCDDLDes1400x1050Data	==> xgifb_lcddldes_1400x1050
	XGI_ExtLCDDes1024x768x75Data	==> xgifb_lcddes_1024x768x75
	XGI_StLCDDes1024x768x75Data	==> xgifb_lcddes_1024x768x75
	XGI_ExtLCDDes1280x1024x75Data	==> xgifb_lcddes_1280x1024x75
	XGI_StLCDDes1280x1024x75Data	==> xgifb_lcddes_1280x1024x75
	XGI_ExtLCDDLDes1280x1024x75Data ==> xgifb_lcddldes_1280x1024x75
	XGI_StLCDDLDes1280x1024x75Data	==> xgifb_lcddldes_1280x1024x75

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Aaro Koskinen authored and Greg Kroah-Hartman committed Sep 6, 2011
1 parent 2555e94 commit ada2bda
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 114 deletions.
32 changes: 7 additions & 25 deletions drivers/staging/xgifb/vb_setmode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2155,10 +2155,8 @@ static void *XGI_GetLcdPtr(unsigned short BX, unsigned short ModeNo,
return &XGI_CetLCD1280x1024Data[tempal];
break;
case 6:
return &XGI_ExtLCD1400x1050Data[tempal];
break;
case 7:
return &XGI_StLCD1400x1050Data[tempal];
return &xgifb_lcd_1400x1050[tempal];
break;
case 8:
return &XGI_CetLCD1400x1050Data[tempal];
Expand All @@ -2182,10 +2180,8 @@ static void *XGI_GetLcdPtr(unsigned short BX, unsigned short ModeNo,
return &XGI_CetLCD1024x768x75Data[tempal];
break;
case 15:
return &XGI_ExtLCD1280x1024x75Data[tempal];
break;
case 16:
return &XGI_StLCD1280x1024x75Data[tempal];
return &xgifb_lcd_1280x1024x75[tempal];
break;
case 17:
return &XGI_CetLCD1280x1024x75Data[tempal];
Expand Down Expand Up @@ -2229,18 +2225,12 @@ static void *XGI_GetLcdPtr(unsigned short BX, unsigned short ModeNo,
return &XGI_CetLCDDes1280x1024Data[tempal];
break;
case 6:
if ((pVBInfo->VBType & VB_XGI301LV) ||
(pVBInfo->VBType & VB_XGI302LV))
return &XGI_ExtLCDDLDes1400x1050Data[tempal];
else
return &XGI_ExtLCDDes1400x1050Data[tempal];
break;
case 7:
if ((pVBInfo->VBType & VB_XGI301LV) ||
(pVBInfo->VBType & VB_XGI302LV))
return &XGI_StLCDDLDes1400x1050Data[tempal];
return &xgifb_lcddldes_1400x1050[tempal];
else
return &XGI_StLCDDes1400x1050Data[tempal];
return &xgifb_lcddes_1400x1050[tempal];
break;
case 8:
return &XGI_CetLCDDes1400x1050Data[tempal];
Expand All @@ -2266,27 +2256,19 @@ static void *XGI_GetLcdPtr(unsigned short BX, unsigned short ModeNo,
return &XGI_NoScalingDesData[tempal];
break;
case 13:
return &XGI_ExtLCDDes1024x768x75Data[tempal];
break;
case 14:
return &XGI_StLCDDes1024x768x75Data[tempal];
return &xgifb_lcddes_1024x768x75[tempal];
break;
case 15:
return &XGI_CetLCDDes1024x768x75Data[tempal];
break;
case 16:
if ((pVBInfo->VBType & VB_XGI301LV) ||
(pVBInfo->VBType & VB_XGI302LV))
return &XGI_ExtLCDDLDes1280x1024x75Data[tempal];
else
return &XGI_ExtLCDDes1280x1024x75Data[tempal];
break;
case 17:
if ((pVBInfo->VBType & VB_XGI301LV) ||
(pVBInfo->VBType & VB_XGI302LV))
return &XGI_StLCDDLDes1280x1024x75Data[tempal];
return &xgifb_lcddldes_1280x1024x75[tempal];
else
return &XGI_StLCDDes1280x1024x75Data[tempal];
return &xgifb_lcddes_1280x1024x75[tempal];
break;
case 18:
if ((pVBInfo->VBType & VB_XGI301LV) ||
Expand Down
96 changes: 7 additions & 89 deletions drivers/staging/xgifb/vb_table.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1004,21 +1004,7 @@ static struct XGI330_LCDDataStruct XGI_CetLCD1280x1024Data[] = {
{1, 1, 1688, 1066, 1688, 1066} /* 08 (1400x1050x60Hz) */
};

static struct XGI330_LCDDataStruct XGI_StLCD1400x1050Data[] = {
{211, 100, 2100, 408, 1688, 1066}, /* 00 (320x200,320x400,
640x200,640x400) */
{211, 64, 1536, 358, 1688, 1066}, /* 01 (320x350,640x350) */
{211, 100, 2100, 408, 1688, 1066}, /* 02 (360x400,720x400) */
{211, 64, 1536, 358, 1688, 1066}, /* 03 (720x350) */
{211, 48, 840, 488, 1688, 1066}, /* 04 (640x480x60Hz) */
{211, 72, 1008, 609, 1688, 1066}, /* 05 (800x600x60Hz) */
{211, 128, 1400, 776, 1688, 1066}, /* 06 (1024x768x60Hz) */
{1, 1, 1688, 1066, 1688, 1066}, /* 07 (1280x1024x60Hz
w/o Scaling) */
{1, 1, 1688, 1066, 1688, 1066} /* 08 (1400x1050x60Hz) */
};

static struct XGI330_LCDDataStruct XGI_ExtLCD1400x1050Data[] = {
static struct XGI330_LCDDataStruct xgifb_lcd_1400x1050[] = {
{211, 100, 2100, 408, 1688, 1066}, /* 00 (320x200,320x400,
640x200,640x400) */
{211, 64, 1536, 358, 1688, 1066}, /* 01 (320x350,640x350) */
Expand Down Expand Up @@ -1110,19 +1096,7 @@ static struct XGI330_LCDDataStruct XGI_CetLCD1024x768x75Data[] = {
{1, 1, 1312, 800, 1312, 800} /* ; 06 (1024x768x75Hz) */
};

static struct XGI330_LCDDataStruct XGI_ExtLCD1280x1024x75Data[] = {
{211, 60, 1024, 501, 1688, 1066}, /* ; 00 (320x200,320x400,
640x200,640x400) */
{211, 60, 1024, 508, 1688, 1066}, /* ; 01 (320x350,640x350) */
{211, 60, 1024, 501, 1688, 1066}, /* ; 02 (360x400,720x400) */
{211, 60, 1024, 508, 1688, 1066}, /* ; 03 (720x350) */
{211, 45, 768, 498, 1688, 1066}, /* ; 04 (640x480x75Hz) */
{211, 75, 1024, 625, 1688, 1066}, /* ; 05 (800x600x75Hz) */
{211, 120, 1280, 798, 1688, 1066}, /* ; 06 (1024x768x75Hz) */
{1, 1, 1688, 1066, 1688, 1066} /* ; 07 (1280x1024x75Hz) */
};

static struct XGI330_LCDDataStruct XGI_StLCD1280x1024x75Data[] = {
static struct XGI330_LCDDataStruct xgifb_lcd_1280x1024x75[] = {
{211, 60, 1024, 501, 1688, 1066}, /* ; 00 (320x200,320x400,
640x200,640x400) */
{211, 60, 1024, 508, 1688, 1066}, /* ; 01 (320x350,640x350) */
Expand Down Expand Up @@ -1258,7 +1232,7 @@ static struct XGI330_LCDDataDesStruct XGI_CetLCDDes1280x1024Data[] = {
{9, 1337, 1065, 1024} /* 07 (1280x1024x60Hz) */
};

static struct XGI330_LCDDataDesStruct XGI_StLCDDLDes1400x1050Data[] = {
static struct XGI330_LCDDataDesStruct xgifb_lcddldes_1400x1050[] = {
{18, 1464, 0, 1051}, /* 00 (320x200,320x400,640x200,640x400) */
{18, 1464, 0, 1051}, /* 01 (320x350,640x350) */
{18, 1464, 0, 1051}, /* 02 (360x400,720x400) */
Expand All @@ -1270,31 +1244,7 @@ static struct XGI330_LCDDataDesStruct XGI_StLCDDLDes1400x1050Data[] = {
{18, 1464, 0, 1051} /* 08 (1400x1050x60Hz) */
};

static struct XGI330_LCDDataDesStruct XGI_ExtLCDDLDes1400x1050Data[] = {
{18, 1464, 0, 1051}, /* 00 (320x200,320x400,640x200,640x400) */
{18, 1464, 0, 1051}, /* 01 (320x350,640x350) */
{18, 1464, 0, 1051}, /* 02 (360x400,720x400) */
{18, 1464, 0, 1051}, /* 03 (720x350) */
{18, 1464, 0, 1051}, /* 04 (640x480x60Hz) */
{18, 1464, 0, 1051}, /* 05 (800x600x60Hz) */
{18, 1464, 0, 1051}, /* 06 (1024x768x60Hz) */
{1646, 1406, 1053, 1038}, /* 07 (1280x1024x60Hz) */
{18, 1464, 0, 1051} /* 08 (1400x1050x60Hz) */
};

static struct XGI330_LCDDataDesStruct XGI_StLCDDes1400x1050Data[] = {
{9, 1455, 0, 1051}, /* 00 (320x200,320x400,640x200,640x400) */
{9, 1455, 0, 1051}, /* 01 (320x350,640x350) */
{9, 1455, 0, 1051}, /* 02 (360x400,720x400) */
{9, 1455, 0, 1051}, /* 03 (720x350) */
{9, 1455, 0, 1051}, /* 04 (640x480x60Hz) */
{9, 1455, 0, 1051}, /* 05 (800x600x60Hz) */
{9, 1455, 0, 1051}, /* 06 (1024x768x60Hz) */
{1637, 1397, 1053, 1038}, /* 07 (1280x1024x60Hz) */
{9, 1455, 0, 1051} /* 08 (1400x1050x60Hz) */
};

static struct XGI330_LCDDataDesStruct XGI_ExtLCDDes1400x1050Data[] = {
static struct XGI330_LCDDataDesStruct xgifb_lcddes_1400x1050[] = {
{9, 1455, 0, 1051}, /* 00 (320x200,320x400,640x200,640x400) */
{9, 1455, 0, 1051}, /* 01 (320x350,640x350) */
{9, 1455, 0, 1051}, /* 02 (360x400,720x400) */
Expand Down Expand Up @@ -1395,17 +1345,7 @@ static struct XGI330_LCDDataDesStruct2 XGI_NoScalingDesData[] = {
};

/* ;;1024x768x75Hz */
static struct XGI330_LCDDataDesStruct XGI_ExtLCDDes1024x768x75Data[] = {
{9, 1049, 0, 769}, /* ; 00 (320x200,320x400,640x200,640x400) */
{9, 1049, 0, 769}, /* ; 01 (320x350,640x350) */
{9, 1049, 0, 769}, /* ; 02 (360x400,720x400) */
{9, 1049, 0, 769}, /* ; 03 (720x350) */
{9, 1049, 0, 769}, /* ; 04 (640x480x75Hz) */
{9, 1049, 0, 769}, /* ; 05 (800x600x75Hz) */
{9, 1049, 0, 769} /* ; 06 (1024x768x75Hz) */
};

static struct XGI330_LCDDataDesStruct XGI_StLCDDes1024x768x75Data[] = {
static struct XGI330_LCDDataDesStruct xgifb_lcddes_1024x768x75[] = {
{9, 1049, 0, 769}, /* ; 00 (320x200,320x400,640x200,640x400) */
{9, 1049, 0, 769}, /* ; 01 (320x350,640x350) */
{9, 1049, 0, 769}, /* ; 02 (360x400,720x400) */
Expand All @@ -1427,18 +1367,7 @@ static struct XGI330_LCDDataDesStruct XGI_CetLCDDes1024x768x75Data[] = {
};

/* ;;1280x1024x75Hz */
static struct XGI330_LCDDataDesStruct XGI_ExtLCDDLDes1280x1024x75Data[] = {
{18, 1314, 0, 1025}, /* ; 00 (320x200,320x400,640x200,640x400) */
{18, 1314, 0, 1025}, /* ; 01 (320x350,640x350) */
{18, 1314, 0, 1025}, /* ; 02 (360x400,720x400) */
{18, 1314, 0, 1025}, /* ; 03 (720x350) */
{18, 1314, 0, 1025}, /* ; 04 (640x480x60Hz) */
{18, 1314, 0, 1025}, /* ; 05 (800x600x60Hz) */
{18, 1314, 0, 1025}, /* ; 06 (1024x768x60Hz) */
{18, 1314, 0, 1025} /* ; 07 (1280x1024x60Hz) */
};

static struct XGI330_LCDDataDesStruct XGI_StLCDDLDes1280x1024x75Data[] = {
static struct XGI330_LCDDataDesStruct xgifb_lcddldes_1280x1024x75[] = {
{18, 1314, 0, 1025}, /* ; 00 (320x200,320x400,640x200,640x400) */
{18, 1314, 0, 1025}, /* ; 01 (320x350,640x350) */
{18, 1314, 0, 1025}, /* ; 02 (360x400,720x400) */
Expand All @@ -1462,18 +1391,7 @@ static struct XGI330_LCDDataDesStruct XGI_CetLCDDLDes1280x1024x75Data[] = {
};

/* ;;1280x1024x75Hz */
static struct XGI330_LCDDataDesStruct XGI_ExtLCDDes1280x1024x75Data[] = {
{9, 1305, 0, 1025}, /* ; 00 (320x200,320x400,640x200,640x400) */
{9, 1305, 0, 1025}, /* ; 01 (320x350,640x350) */
{9, 1305, 0, 1025}, /* ; 02 (360x400,720x400) */
{9, 1305, 0, 1025}, /* ; 03 (720x350) */
{9, 1305, 0, 1025}, /* ; 04 (640x480x60Hz) */
{9, 1305, 0, 1025}, /* ; 05 (800x600x60Hz) */
{9, 1305, 0, 1025}, /* ; 06 (1024x768x60Hz) */
{9, 1305, 0, 1025} /* ; 07 (1280x1024x60Hz) */
};

static struct XGI330_LCDDataDesStruct XGI_StLCDDes1280x1024x75Data[] = {
static struct XGI330_LCDDataDesStruct xgifb_lcddes_1280x1024x75[] = {
{9, 1305, 0, 1025}, /* ; 00 (320x200,320x400,640x200,640x400) */
{9, 1305, 0, 1025}, /* ; 01 (320x350,640x350) */
{9, 1305, 0, 1025}, /* ; 02 (360x400,720x400) */
Expand Down

0 comments on commit ada2bda

Please sign in to comment.