Ver código fonte

Staging: crystalhd: Cleanup all WIN* references

Signed-off-by: Charles Clément <caratorn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Charles Clément 15 anos atrás
pai
commit
4752e51a1d

+ 0 - 1
drivers/staging/crystalhd/TODO

@@ -1,7 +1,6 @@
 - Testing
 - Testing
 - Cleanup return codes
 - Cleanup return codes
 - Cleanup typedefs
 - Cleanup typedefs
-- Cleanup all WIN* references
 - Allocate an Accelerator device class specific Major number,
 - Allocate an Accelerator device class specific Major number,
   since we don't have any other open sourced accelerators, it is the only
   since we don't have any other open sourced accelerators, it is the only
   one in that category for now.
   one in that category for now.

+ 2 - 2
drivers/staging/crystalhd/bc_dts_defs.h

@@ -238,7 +238,7 @@ typedef struct _BC_PIB_EXT_VC1 {
 /*------------------------------------------------------*
 /*------------------------------------------------------*
  *    Picture Information Block				*
  *    Picture Information Block				*
  *------------------------------------------------------*/
  *------------------------------------------------------*/
-#if defined(_WIN32) || defined(_WIN64) || defined(__LINUX_USER__)
+#if defined(__LINUX_USER__)
 /* Values for 'pulldown' field.  '0' means no pulldown information
 /* Values for 'pulldown' field.  '0' means no pulldown information
  * was present for this picture. */
  * was present for this picture. */
 enum {
 enum {
@@ -358,7 +358,7 @@ enum {
 
 
 #define VDEC_FLAG_PICTURE_META_DATA_PRESENT	(0x40000)
 #define VDEC_FLAG_PICTURE_META_DATA_PRESENT	(0x40000)
 
 
-#endif /* _WIN32 || _WIN64 */
+#endif /* __LINUX_USER__ */
 
 
 enum _BC_OUTPUT_FORMAT {
 enum _BC_OUTPUT_FORMAT {
 	MODE420				= 0x0,
 	MODE420				= 0x0,

+ 0 - 23
drivers/staging/crystalhd/bc_dts_types.h

@@ -29,15 +29,6 @@
 #include <stdint.h>
 #include <stdint.h>
 #endif
 #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
 #ifndef PVOID
 typedef void	*PVOID;
 typedef void	*PVOID;
 #endif
 #endif
@@ -46,20 +37,6 @@ typedef void	*PVOID;
 typedef int	BOOL;
 typedef int	BOOL;
 #endif
 #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__)
 #if defined(__KERNEL__) || defined(__LINUX_USER__)
 
 
 #ifdef __LINUX_USER__	/* Don't include these for KERNEL */
 #ifdef __LINUX_USER__	/* Don't include these for KERNEL */