Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 219741
b: refs/heads/master
c: 602f2c9
h: refs/heads/master
i:
  219739: ee99542
v: v3
  • Loading branch information
Prashant P. Shah authored and Greg Kroah-Hartman committed Sep 5, 2010
1 parent d15cb7d commit d90c140
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 128 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: a24d60f45b9c8ed9e93cccd9fbd03fd58a703c00
refs/heads/master: 602f2c9620db779ff675f93c91899caa5383093a
185 changes: 58 additions & 127 deletions trunk/drivers/staging/xgifb/vb_util.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,200 +6,131 @@
#include <asm/io.h>
#include <linux/types.h>

void XGINew_SetReg1(unsigned long,unsigned short,unsigned short);
void XGINew_SetReg2(unsigned long,unsigned short,unsigned short);
void XGINew_SetReg3(unsigned long,unsigned short);
void XGINew_SetReg4(unsigned long,unsigned long);
void XGINew_SetReg1(unsigned long, unsigned short, unsigned short);
void XGINew_SetReg2(unsigned long, unsigned short, unsigned short);
void XGINew_SetReg3(unsigned long, unsigned short);
void XGINew_SetReg4(unsigned long, unsigned long);
unsigned char XGINew_GetReg1(unsigned long, unsigned short);
unsigned char XGINew_GetReg2(unsigned long);
unsigned long XGINew_GetReg3(unsigned long);
void XGINew_ClearDAC(unsigned char *);
void XGINew_SetRegANDOR(unsigned long Port,unsigned short Index,
unsigned short DataAND,unsigned short DataOR);
void XGINew_SetRegOR(unsigned long Port,unsigned short Index,
unsigned short DataOR);
void XGINew_SetRegAND(unsigned long Port,unsigned short Index,
unsigned short DataAND);

void XGINew_SetRegANDOR(unsigned long Port, unsigned short Index,
unsigned short DataAND, unsigned short DataOR);
void XGINew_SetRegOR(unsigned long Port, unsigned short Index,
unsigned short DataOR);
void XGINew_SetRegAND(unsigned long Port, unsigned short Index,
unsigned short DataAND);

/* --------------------------------------------------------------------- */
/* Function : XGINew_SetReg1 */
/* Input : */
/* Output : */
/* Description : SR CRTC GR */
/* --------------------------------------------------------------------- */
void XGINew_SetReg1( unsigned long port , unsigned short index , unsigned short data )
void XGINew_SetReg1(unsigned long port, unsigned short index,
unsigned short data)
{
outb(index, port);
outb(data, port + 1);
}


/* --------------------------------------------------------------------- */
/* Function : XGINew_SetReg2 */
/* Input : */
/* Output : */
/* Description : AR( 3C0 ) */
/* --------------------------------------------------------------------- */
/*void XGINew_SetReg2( unsigned long port , unsigned short index , unsigned short data )
/*
void XGINew_SetReg2(unsigned long port, unsigned short index, unsigned short data)
{
InPortByte((P unsigned char )port + 0x3da - 0x3c0) ;
OutPortByte( XGINew_P3c0 , index ) ;
OutPortByte( XGINew_P3c0 , data ) ;
OutPortByte( XGINew_P3c0 , 0x20 ) ;
}*/

InPortByte((P unsigned char)port + 0x3da - 0x3c0) ;
OutPortByte(XGINew_P3c0, index);
OutPortByte(XGINew_P3c0, data);
OutPortByte(XGINew_P3c0, 0x20);
}
*/

/* --------------------------------------------------------------------- */
/* Function : */
/* Input : */
/* Output : */
/* Description : */
/* --------------------------------------------------------------------- */
void XGINew_SetReg3( unsigned long port , unsigned short data )
void XGINew_SetReg3(unsigned long port, unsigned short data)
{
outb(data, port);
}


/* --------------------------------------------------------------------- */
/* Function : XGINew_SetReg4 */
/* Input : */
/* Output : */
/* Description : */
/* --------------------------------------------------------------------- */
void XGINew_SetReg4( unsigned long port , unsigned long data )
void XGINew_SetReg4(unsigned long port, unsigned long data)
{
outl(data, port);
}


/* --------------------------------------------------------------------- */
/* Function : XGINew_GetReg1 */
/* Input : */
/* Output : */
/* Description : */
/* --------------------------------------------------------------------- */
unsigned char XGINew_GetReg1(unsigned long port, unsigned short index)
{
unsigned char data ;
unsigned char data;

outb(index, port);
data = inb(port + 1) ;
return( data ) ;
outb(index, port);
data = inb(port + 1);
return data;
}


/* --------------------------------------------------------------------- */
/* Function : XGINew_GetReg2 */
/* Input : */
/* Output : */
/* Description : */
/* --------------------------------------------------------------------- */
unsigned char XGINew_GetReg2(unsigned long port)
{
unsigned char data ;
unsigned char data;

data = inb(port) ;
data = inb(port);

return( data ) ;
return data;
}


/* --------------------------------------------------------------------- */
/* Function : XGINew_GetReg3 */
/* Input : */
/* Output : */
/* Description : */
/* --------------------------------------------------------------------- */
unsigned long XGINew_GetReg3( unsigned long port )
unsigned long XGINew_GetReg3(unsigned long port)
{
unsigned long data ;
unsigned long data;

data = inl(port) ;
data = inl(port);

return( data ) ;
return data;
}



/* --------------------------------------------------------------------- */
/* Function : XGINew_SetRegANDOR */
/* Input : */
/* Output : */
/* Description : */
/* --------------------------------------------------------------------- */
void XGINew_SetRegANDOR( unsigned long Port , unsigned short Index , unsigned short DataAND , unsigned short DataOR )
void XGINew_SetRegANDOR(unsigned long Port, unsigned short Index,
unsigned short DataAND, unsigned short DataOR)
{
unsigned short temp ;
unsigned short temp;

temp = XGINew_GetReg1( Port , Index ) ; /* XGINew_Part1Port index 02 */
temp = ( temp & ( DataAND ) ) | DataOR ;
XGINew_SetReg1( Port , Index , temp ) ;
temp = XGINew_GetReg1(Port, Index); /* XGINew_Part1Port index 02 */
temp = (temp & (DataAND)) | DataOR;
XGINew_SetReg1(Port, Index, temp);
}


/* --------------------------------------------------------------------- */
/* Function : XGINew_SetRegAND */
/* Input : */
/* Output : */
/* Description : */
/* --------------------------------------------------------------------- */
void XGINew_SetRegAND(unsigned long Port,unsigned short Index,unsigned short DataAND)
void XGINew_SetRegAND(unsigned long Port, unsigned short Index,
unsigned short DataAND)
{
unsigned short temp ;
unsigned short temp;

temp = XGINew_GetReg1( Port , Index ) ; /* XGINew_Part1Port index 02 */
temp &= DataAND ;
XGINew_SetReg1( Port , Index , temp ) ;
temp = XGINew_GetReg1(Port, Index); /* XGINew_Part1Port index 02 */
temp &= DataAND;
XGINew_SetReg1(Port, Index, temp);
}


/* --------------------------------------------------------------------- */
/* Function : XGINew_SetRegOR */
/* Input : */
/* Output : */
/* Description : */
/* --------------------------------------------------------------------- */
void XGINew_SetRegOR( unsigned long Port , unsigned short Index , unsigned short DataOR )
void XGINew_SetRegOR(unsigned long Port, unsigned short Index,
unsigned short DataOR)
{
unsigned short temp ;
unsigned short temp;

temp = XGINew_GetReg1( Port , Index ) ; /* XGINew_Part1Port index 02 */
temp |= DataOR ;
XGINew_SetReg1( Port , Index , temp ) ;
temp = XGINew_GetReg1(Port, Index); /* XGINew_Part1Port index 02 */
temp |= DataOR;
XGINew_SetReg1(Port, Index, temp);
}

#if 0
/* --------------------------------------------------------------------- */
/* Function : NewDelaySecond */
/* Input : */
/* Output : */
/* Description : */
/* --------------------------------------------------------------------- */
void NewDelaySeconds( int seconds )
void NewDelaySeconds(int seconds)
{
int i ;
int i;

for (i = 0; i < seconds; i++) {

for( i = 0 ; i < seconds ; i++ )
{



}
}
}

/* --------------------------------------------------------------------- */
/* Function : Newdebugcode */
/* Input : */
/* Output : */
/* Description : */
/* --------------------------------------------------------------------- */
void Newdebugcode(unsigned char code)
{
// OutPortByte ( 0x80 , code ) ;
/* OutPortByte ( 0x300 , code ) ; */
/* NewDelaySeconds( 0x3 ) ; */
/* OutPortByte(0x80, code); */
/* OutPortByte(0x300, code); */
/* NewDelaySeconds(0x3); */
}
#endif

0 comments on commit d90c140

Please sign in to comment.