aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/xgifb/vgatypes.h
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2010-06-17 13:10:47 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-06-22 14:33:19 -0700
commit108afbf8aef6520f2f34b3add94b059b60c44139 (patch)
treee7bdf9ab86b558c0023441f51dc741b641a2467e /drivers/staging/xgifb/vgatypes.h
parent82d6eb5b2ecd4ccdd44a23115fc499ecefc77706 (diff)
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>
Diffstat (limited to 'drivers/staging/xgifb/vgatypes.h')
-rw-r--r--drivers/staging/xgifb/vgatypes.h31
1 files changed, 6 insertions, 25 deletions
diff --git a/drivers/staging/xgifb/vgatypes.h b/drivers/staging/xgifb/vgatypes.h
index a85f21a7aeb..a518d27c0d1 100644
--- a/drivers/staging/xgifb/vgatypes.h
+++ b/drivers/staging/xgifb/vgatypes.h
@@ -4,25 +4,6 @@
#include <linux/ioctl.h>
-#ifndef CHAR
-typedef char CHAR;
-#endif
-
-#ifndef SHORT
-typedef short SHORT;
-#endif
-
-#ifndef LONG
-typedef long LONG;
-#endif
-
-#ifndef UCHAR
-typedef unsigned char UCHAR;
-#endif
-
-typedef unsigned long XGIIOADDRESS;
-
-
#ifndef VBIOS_VER_MAX_LENGTH
#define VBIOS_VER_MAX_LENGTH 4
#endif
@@ -74,8 +55,8 @@ typedef enum _XGI_LCD_TYPE {
#ifndef PXGI_DSReg
typedef struct _XGI_DSReg
{
- UCHAR jIdx;
- UCHAR jVal;
+ unsigned char jIdx;
+ unsigned char jVal;
} XGI_DSReg, *PXGI_DSReg;
#endif
@@ -109,13 +90,13 @@ struct _XGI_HW_DEVICE_INFO
unsigned long ul2ndVideoMemorySize;
unsigned char *pj2ndIOAddress;
- UCHAR jChipType; /* Used to Identify Graphics Chip */
+ unsigned char jChipType; /* Used to Identify Graphics Chip */
/* defined in the data structure type */
/* "XGI_CHIP_TYPE" */
- UCHAR jChipRevision; /* Used to Identify Graphics Chip Revision */
+ unsigned char jChipRevision; /* Used to Identify Graphics Chip Revision */
- UCHAR ujVBChipID; /* the ID of video bridge */
+ unsigned char ujVBChipID; /* the ID of video bridge */
/* defined in the data structure type */
/* "XGI_VB_CHIP_TYPE" */
@@ -152,7 +133,7 @@ struct _XGI_HW_DEVICE_INFO
PXGI_QUERYSPACE pQueryNorthBridgeSpace;
- UCHAR szVBIOSVer[VBIOS_VER_MAX_LENGTH];
+ unsigned char szVBIOSVer[VBIOS_VER_MAX_LENGTH];
};
#endif