Commit graph

28 commits

Author SHA1 Message Date
Javier Martinez Canillas
b6cdc4056f staging: xgifb: use DEFINE_PCI_DEVICE_TABLE() macro
Use DEFINE_PCI_DEVICE_TABLE() to make xgifb_pci_table const and marked as __devinitconst

Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-08-31 14:32:30 -07:00
Bill Pemberton
6e5db771e1 Staging: xgifb: increase VBIOS_VER_MAX_LENGTH to 5
VBIOS_VER_MAX_LENGTH was set to 4, but the value "0.84" is strcpy'd
into it.  That value is 5 long including the trailing NULL.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-22 14:33:36 -07:00
Bill Pemberton
6eed8dc793 Staging: xgifb: remove externs in XGI_accel.c
Remove 2 extern variables definations from XGI_accel.c that were
defined in other .h files.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-22 14:33:36 -07:00
Bill Pemberton
a9253883a6 Staging: xgifb: remove __KERNEL__ #ifdef in XGIfb.h
The code inside this #ifdef declared a couple extern functions that
weren't used anywhere, so remove the whole #ifdef

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-22 14:33:36 -07:00
Bill Pemberton
b06bce7727 Staging: xgifb: remove XGI.h
This was not included anywhere and just defined a debugging macro.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-22 14:33:36 -07:00
Bill Pemberton
a3e735a5a2 Staging: xgifb: Remove XGI_TV_PLUG typedef
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-22 14:33:34 -07:00
Bill Pemberton
716083c63b Staging: xgifb: Remove typedefs in XGIfb.h
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-22 14:33:34 -07:00
Bill Pemberton
80adad85ea Staging: xgifb: Remove typedefs in vb_struct.h
This removes all the remaining typedefs in vb_struct.h

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-22 14:33:34 -07:00
Bill Pemberton
e4147abe8b Staging: xgifb: Remove XGI_HW_DEVICE_INFO and PXGI_HW_DEVICE_INFO typedefs
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-22 14:33:33 -07:00
Bill Pemberton
1d9f9a9ba8 Staging: xgifb: Remove XGI_DSReg and PXGI_DSReg typedefs
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-22 14:33:33 -07:00
Bill Pemberton
621a683fe8 Staging: xgifb: Remove XGI_LCD_TYPE and XGI_VB_CHIP_TYPE typedefs
There is no need for these to be typedefs as a simple enum will do.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-22 14:33:33 -07:00
Bill Pemberton
108afbf8ae Staging: xgifb: Remove SHORT, UCHAR, and LONG typedef
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-22 14:33:19 -07:00
Bill Pemberton
82d6eb5b2e Staging: xgifb: Remove USHORT, ULONG, BOOLEAN, and VOID typedefs
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-22 14:32:32 -07:00
Bill Pemberton
490ce818c6 Staging: xgifb: Remove unused code
Remove code that was removed using #if 0

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-22 14:30:54 -07:00
Bill Pemberton
fc3678a6c0 Staging: xgifb: Remove PUSHORT, PLONGU, and PVOID typedefs
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-22 14:30:53 -07:00
Bill Pemberton
274afb73bd Staging: xgifb: Remove PUCHAR typedef
PUCHAR was unsigned char *, use that instead

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-22 14:30:53 -07:00
Bill Pemberton
dda08c5968 Staging: xgifb: Remove defines for TRUE, FALSE, and NULL
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-22 14:30:53 -07:00
Bill Pemberton
1e59f7119f Staging: xgifb: Remove port macros in osdef.h
The port related macros in osdef.h are replaced with calls to out?()
and in?().  This removes the last macros defined in osdef.h, so this
file is no longer needed.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-22 14:30:07 -07:00
Bill Pemberton
cc75bb02db Staging: xgifb: Remove XGI_SetMemory and XGI_MemoryCopy
These were just macros for memset and memcpy, so use those instead.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-22 14:25:48 -07:00
Bill Pemberton
f2f58e14ef Staging: xgifb: Remove use of LINUX_KERNEL define
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-22 14:20:44 -07:00
Bill Pemberton
84c7603c38 Staging: xgifb: Remove use of LINUX_XF86 define
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-22 14:20:37 -07:00
Bill Pemberton
784cfe1d07 Staging: xgifb: Remove use of TC define
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-22 14:20:37 -07:00
Bill Pemberton
af49a7c9ec Staging: xgifb: Remove use of WINCE_HEADER define
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-22 14:20:37 -07:00
Bill Pemberton
bf4fc6ac01 Staging: xgifb: Remove code for WIN2000
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-22 14:20:37 -07:00
Bill Pemberton
23aada9cc3 Staging: xgifb: remove use of LINUX_VERSION_CODE
Remove ifdefs that check LINUX_VERSION_CODE as this is
not needed in the staging tree.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-22 14:20:37 -07:00
Bill Pemberton
acf82e0501 Staging: xgifb: use %lx instead of %x in printk format
This fixes compiler warning  format '%x' expects type 'unsigned int',
but argument 2 has type 'long unsigned int'

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-22 14:20:36 -07:00
Huang Weiyi
b8564d7b38 Staging: XGI: remove duplicated #include
Remove duplicated #include('s) in
  drivers/staging/xgifb/XGI_main_26.c
  drivers/staging/xgifb/vb_init.c

Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-18 16:54:24 -07:00
apatard@mandriva.com
d7636e0b07 staging: Add framebuffer driver for XGI chipsets
This driver handles XG20, XG21, XG40, XG42 chipsets from XGI. They're
also known as Z7,Z9,Z11 chipsets. It's based on the SiS fb driver but
has been heavily modified by XGI to support their newer chipsets.


Signed-off-by: Arnaud Patard <apatard@mandriva.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-06-04 13:38:51 -07:00