diff options
| author | Adam Jackson <ajax@redhat.com> | 2011-03-25 18:55:27 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2011-03-25 18:55:27 -0400 |
| commit | 82b83468d0ce39c52975a9a4dccbebc6abf6968e (patch) | |
| tree | 2e2b528bce575847ee453ef009ae3c32be147576 | |
| parent | ac3d39b14d5e9eaf2326d291d8416ba400956611 (diff) | |
Fix build on bigendian
Signed-off-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rwxr-xr-x | src/vb_init.c | 4 | ||||
| -rwxr-xr-x | src/xgi_accel.c | 15 |
3 files changed, 6 insertions, 15 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 96e7018..505f4c1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -36,6 +36,8 @@ xgi_drv_la_SOURCES = \ vb_def.h \ vb_ext.c \ vb_ext.h \ + vb_i2c.c \ + vb_i2c.h \ vb_init.c \ vb_init.h \ vb_setmode.c \ diff --git a/src/vb_init.c b/src/vb_init.c index 8338410..50980c4 100755 --- a/src/vb_init.c +++ b/src/vb_init.c @@ -131,6 +131,8 @@ static void XGINew_SetDRAMDefaultRegister340(PXGI_HW_DEVICE_INFO, USHORT, static void XGINew_SetDRAMDefaultRegisterXG45(PXGI_HW_DEVICE_INFO, USHORT, PVB_DEVICE_INFO); static UCHAR XGINew_Get340DRAMType(PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO); +/* horrible */ +#define XGINew_GetXG20DRAMType XGINew_Get340DRAMType static int XGINew_SetDDRChannel(int index, UCHAR ChannelNo, UCHAR XGINew_ChannelAB, const USHORT DRAMTYPE_TABLE[][5], @@ -1451,7 +1453,7 @@ void XGINew_SetDRAMDefaultRegister340( PXGI_HW_DEVICE_INFO HwDeviceExtension , } temp3 = 0 ; - for( k = 0 ; k < 4 ; k++ ) + for( k = 1 ; k < 4 ; k++ ) { XGI_SetRegANDOR((XGIIOADDRESS) P3d4 , 0x6E , 0xFC , temp3 ) ; /* CR6E_D[1:0] select channel */ temp2 = 0 ; diff --git a/src/xgi_accel.c b/src/xgi_accel.c index c072691..4536c81 100755 --- a/src/xgi_accel.c +++ b/src/xgi_accel.c @@ -200,20 +200,7 @@ extern int FbDevExist; #endif #if X_BYTE_ORDER == X_BIG_ENDIAN -static CARD32 BE_SWAP32 (CARD32 val) -{ - PDEBUG(ErrorF("X_BIG_ENDIAN...\n")); - if (CurrentColorDepth == 8) - return ((((val) & 0x000000ff) << 24) | \ - (((val) & 0x0000ff00) << 8) | \ - (((val) & 0x00ff0000) >> 8) | \ - (((val) & 0xff000000) >> 24)); - if (CurrentColorDepth == 24) - return val; - if (CurrentColorDepth == 16) - return ((((val) & 0x0000ffff) << 16) | \ - (((val) & 0xffff0000) >> 16)); -} +#define BE_SWAP32(x) swapl(x) #else static CARD32 BE_SWAP32 (CARD32 val) { |