diff options
| author | Charles Clément <caratorn@gmail.com> | 2010-05-02 18:29:57 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-11 11:36:01 -0700 |
| commit | 4752e51a1dcab1a17a1ee0b46735465a033d83b0 (patch) | |
| tree | bbf3ddb51127a1a4588c54dc8d7fa44a984d9961 /drivers | |
| parent | 4212c686381a0ab62601ea7a272e7ff4c2ea4cb7 (diff) | |
| download | linux-stable-4752e51a1dcab1a17a1ee0b46735465a033d83b0.tar.gz linux-stable-4752e51a1dcab1a17a1ee0b46735465a033d83b0.tar.bz2 linux-stable-4752e51a1dcab1a17a1ee0b46735465a033d83b0.zip | |
Staging: crystalhd: Cleanup all WIN* references
Signed-off-by: Charles Clément <caratorn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/crystalhd/TODO | 1 | ||||
| -rw-r--r-- | drivers/staging/crystalhd/bc_dts_defs.h | 4 | ||||
| -rw-r--r-- | drivers/staging/crystalhd/bc_dts_types.h | 23 |
3 files changed, 2 insertions, 26 deletions
diff --git a/drivers/staging/crystalhd/TODO b/drivers/staging/crystalhd/TODO index 69be5d0cb80c..daca2d4d2a2f 100644 --- a/drivers/staging/crystalhd/TODO +++ b/drivers/staging/crystalhd/TODO @@ -1,7 +1,6 @@ - Testing - Cleanup return codes - Cleanup typedefs -- Cleanup all WIN* references - Allocate an Accelerator device class specific Major number, since we don't have any other open sourced accelerators, it is the only one in that category for now. diff --git a/drivers/staging/crystalhd/bc_dts_defs.h b/drivers/staging/crystalhd/bc_dts_defs.h index c34cc07127b8..f9dd0e3e240d 100644 --- a/drivers/staging/crystalhd/bc_dts_defs.h +++ b/drivers/staging/crystalhd/bc_dts_defs.h @@ -238,7 +238,7 @@ typedef struct _BC_PIB_EXT_VC1 { /*------------------------------------------------------* * Picture Information Block * *------------------------------------------------------*/ -#if defined(_WIN32) || defined(_WIN64) || defined(__LINUX_USER__) +#if defined(__LINUX_USER__) /* Values for 'pulldown' field. '0' means no pulldown information * was present for this picture. */ enum { @@ -358,7 +358,7 @@ enum { #define VDEC_FLAG_PICTURE_META_DATA_PRESENT (0x40000) -#endif /* _WIN32 || _WIN64 */ +#endif /* __LINUX_USER__ */ enum _BC_OUTPUT_FORMAT { MODE420 = 0x0, diff --git a/drivers/staging/crystalhd/bc_dts_types.h b/drivers/staging/crystalhd/bc_dts_types.h index 95a2f875f1e7..6fd8089415d6 100644 --- a/drivers/staging/crystalhd/bc_dts_types.h +++ b/drivers/staging/crystalhd/bc_dts_types.h @@ -29,15 +29,6 @@ #include <stdint.h> #endif -#if defined(_WIN64) || defined(_WIN32) -typedef uint32_t U32; -typedef int32_t S32; -typedef uint16_t U16; -typedef int16_t S16; -typedef unsigned char U8; -typedef char S8; -#endif - #ifndef PVOID typedef void *PVOID; #endif @@ -46,20 +37,6 @@ typedef void *PVOID; typedef int BOOL; #endif -#ifdef WIN32 - typedef unsigned __int64 U64; -#elif defined(_WIN64) - typedef uint64_t U64; -#endif - -#ifdef _WIN64 -#if !(defined(POINTER_32)) -#define POINTER_32 __ptr32 -#endif -#else /* _WIN32 */ -#define POINTER_32 -#endif - #if defined(__KERNEL__) || defined(__LINUX_USER__) #ifdef __LINUX_USER__ /* Don't include these for KERNEL */ |