Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 197184
b: refs/heads/master
c: 4752e51
h: refs/heads/master
v: v3
  • Loading branch information
Charles Clément authored and Greg Kroah-Hartman committed May 11, 2010
1 parent 6d387a1 commit 3f6d01b
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 27 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4212c686381a0ab62601ea7a272e7ff4c2ea4cb7
refs/heads/master: 4752e51a1dcab1a17a1ee0b46735465a033d83b0
1 change: 0 additions & 1 deletion trunk/drivers/staging/crystalhd/TODO
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/crystalhd/bc_dts_defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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,
Expand Down
23 changes: 0 additions & 23 deletions trunk/drivers/staging/crystalhd/bc_dts_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 */
Expand Down

0 comments on commit 3f6d01b

Please sign in to comment.