diff options
| author |   Bill Pemberton <wfp5p@virginia.edu> | 2010-06-17 13:10:52 -0400 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-22 14:33:34 -0700 |
| commit | 716083c63bf31649e08df25a4f4548689451330d (patch) | |
| tree | 68bd0bd7c68efafda94f9e1cfb38337b9d55be6f /drivers/staging/xgifb | |
| parent | Staging: xgifb: Remove typedefs in vb_struct.h (diff) | |
| download | linux-dev-716083c63bf31649e08df25a4f4548689451330d.tar.xz linux-dev-716083c63bf31649e08df25a4f4548689451330d.zip | |
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>
Diffstat (limited to 'drivers/staging/xgifb')
| -rw-r--r-- | drivers/staging/xgifb/XGI_main_26.c | 2 | ||||
| -rw-r--r-- | drivers/staging/xgifb/XGIfb.h | 20 |
2 files changed, 10 insertions, 12 deletions
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index 67d3874fb73d..976c39bb2866 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c @@ -1615,7 +1615,7 @@ static int XGIfb_ioctl(struct fb_info *info, unsigned int cmd, break; case XGIFB_GET_INFO: /* TW: New for communication with X driver */ { - XGIfb_info *x = (XGIfb_info *)arg; + struct XGIfb_info *x = (struct XGIfb_info *)arg; //x->XGIfb_id = XGIFB_ID; x->XGIfb_version = VER_MAJOR; diff --git a/drivers/staging/xgifb/XGIfb.h b/drivers/staging/xgifb/XGIfb.h index 41bf163d4e6b..46954d7de328 100644 --- a/drivers/staging/xgifb/XGIfb.h +++ b/drivers/staging/xgifb/XGIfb.h @@ -27,7 +27,7 @@ #define XGIFB_ID 0x53495346 /* Identify myself with 'XGIF' */ #endif -typedef enum _XGI_CHIP_TYPE { +enum XGI_CHIP_TYPE { XGI_VGALegacy = 0, XGI_300, XGI_630, @@ -53,9 +53,9 @@ typedef enum _XGI_CHIP_TYPE { XG21, XG27, MAX_XGI_CHIP -} XGI_CHIP_TYPE; +}; -typedef enum _TVTYPE { +enum xgi_tvtype { TVMODE_NTSC = 0, TVMODE_PAL, TVMODE_HIVISION, @@ -63,13 +63,11 @@ typedef enum _TVTYPE { TVTYPE_PALN, // vicki@030226 TVTYPE_NTSCJ, // vicki@030226 TVMODE_TOTAL -} XGI_TV_TYPE; - +}; -typedef struct _XGIFB_INFO XGIfb_info; -struct _XGIFB_INFO { -unsigned long XGIfb_id; +struct XGIfb_info { + unsigned long XGIfb_id; int chip_id; /* PCI ID of detected chip */ int memory; /* video memory in KB which XGIfb manages */ int heapstart; /* heap start (= XGIfb "mem" argument) in KB */ @@ -132,9 +130,9 @@ struct ap_data { unsigned long iobase; unsigned int mem_size; unsigned long disp_state; - XGI_CHIP_TYPE chip; + enum XGI_CHIP_TYPE chip; unsigned char hasVB; - XGI_TV_TYPE TV_type; + enum xgi_tvtype TV_type; XGI_TV_PLUG TV_plug; unsigned long version; char reserved[256]; @@ -184,7 +182,7 @@ struct video_info{ unsigned char TV_type; unsigned char TV_plug; - XGI_CHIP_TYPE chip; + enum XGI_CHIP_TYPE chip; unsigned char revision_id; unsigned short DstColor; |