diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-25 09:46:32 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-05-20 06:26:25 -0400 |
commit | bccd2d8a39a65b008e5af96404139c2260a42fc7 (patch) | |
tree | a7da84218286418d56b3e94116a5cc6ddeb7cbf7 /drivers/media/dvb/frontends/drxd_firm.h | |
parent | 935c630c2cf402419342d66acd04804da8c0704a (diff) |
[media] drxd: don't re-define u8/u16/u32 types
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/frontends/drxd_firm.h')
-rw-r--r-- | drivers/media/dvb/frontends/drxd_firm.h | 79 |
1 files changed, 38 insertions, 41 deletions
diff --git a/drivers/media/dvb/frontends/drxd_firm.h b/drivers/media/dvb/frontends/drxd_firm.h index 367930a11426..41597e89941c 100644 --- a/drivers/media/dvb/frontends/drxd_firm.h +++ b/drivers/media/dvb/frontends/drxd_firm.h | |||
@@ -24,12 +24,9 @@ | |||
24 | #ifndef _DRXD_FIRM_H_ | 24 | #ifndef _DRXD_FIRM_H_ |
25 | #define _DRXD_FIRM_H_ | 25 | #define _DRXD_FIRM_H_ |
26 | 26 | ||
27 | #include <linux/types.h> | ||
27 | #include "drxd_map_firm.h" | 28 | #include "drxd_map_firm.h" |
28 | 29 | ||
29 | typedef unsigned char u8_t; | ||
30 | typedef unsigned short u16_t; | ||
31 | typedef unsigned long u32_t; | ||
32 | |||
33 | #define VERSION_MAJOR 1 | 30 | #define VERSION_MAJOR 1 |
34 | #define VERSION_MINOR 4 | 31 | #define VERSION_MINOR 4 |
35 | #define VERSION_PATCH 23 | 32 | #define VERSION_PATCH 23 |
@@ -77,42 +74,42 @@ typedef unsigned long u32_t; | |||
77 | #define DIFF_TARGET (4) | 74 | #define DIFF_TARGET (4) |
78 | #define DIFF_MARGIN (1) | 75 | #define DIFF_MARGIN (1) |
79 | 76 | ||
80 | extern u8_t DRXD_InitAtomicRead[]; | 77 | extern u8 DRXD_InitAtomicRead[]; |
81 | extern u8_t DRXD_HiI2cPatch_1[]; | 78 | extern u8 DRXD_HiI2cPatch_1[]; |
82 | extern u8_t DRXD_HiI2cPatch_3[]; | 79 | extern u8 DRXD_HiI2cPatch_3[]; |
83 | 80 | ||
84 | extern u8_t DRXD_InitSC[]; | 81 | extern u8 DRXD_InitSC[]; |
85 | 82 | ||
86 | extern u8_t DRXD_ResetCEFR[]; | 83 | extern u8 DRXD_ResetCEFR[]; |
87 | extern u8_t DRXD_InitFEA2_1[]; | 84 | extern u8 DRXD_InitFEA2_1[]; |
88 | extern u8_t DRXD_InitFEA2_2[]; | 85 | extern u8 DRXD_InitFEA2_2[]; |
89 | extern u8_t DRXD_InitCPA2[]; | 86 | extern u8 DRXD_InitCPA2[]; |
90 | extern u8_t DRXD_InitCEA2[]; | 87 | extern u8 DRXD_InitCEA2[]; |
91 | extern u8_t DRXD_InitEQA2[]; | 88 | extern u8 DRXD_InitEQA2[]; |
92 | extern u8_t DRXD_InitECA2[]; | 89 | extern u8 DRXD_InitECA2[]; |
93 | extern u8_t DRXD_ResetECA2[]; | 90 | extern u8 DRXD_ResetECA2[]; |
94 | extern u8_t DRXD_ResetECRAM[]; | 91 | extern u8 DRXD_ResetECRAM[]; |
95 | 92 | ||
96 | extern u8_t DRXD_A2_microcode[]; | 93 | extern u8 DRXD_A2_microcode[]; |
97 | extern u32_t DRXD_A2_microcode_length; | 94 | extern u32 DRXD_A2_microcode_length; |
98 | 95 | ||
99 | extern u8_t DRXD_InitFEB1_1[]; | 96 | extern u8 DRXD_InitFEB1_1[]; |
100 | extern u8_t DRXD_InitFEB1_2[]; | 97 | extern u8 DRXD_InitFEB1_2[]; |
101 | extern u8_t DRXD_InitCPB1[]; | 98 | extern u8 DRXD_InitCPB1[]; |
102 | extern u8_t DRXD_InitCEB1[]; | 99 | extern u8 DRXD_InitCEB1[]; |
103 | extern u8_t DRXD_InitEQB1[]; | 100 | extern u8 DRXD_InitEQB1[]; |
104 | extern u8_t DRXD_InitECB1[]; | 101 | extern u8 DRXD_InitECB1[]; |
105 | 102 | ||
106 | extern u8_t DRXD_InitDiversityFront[]; | 103 | extern u8 DRXD_InitDiversityFront[]; |
107 | extern u8_t DRXD_InitDiversityEnd[]; | 104 | extern u8 DRXD_InitDiversityEnd[]; |
108 | extern u8_t DRXD_DisableDiversity[]; | 105 | extern u8 DRXD_DisableDiversity[]; |
109 | extern u8_t DRXD_StartDiversityFront[]; | 106 | extern u8 DRXD_StartDiversityFront[]; |
110 | extern u8_t DRXD_StartDiversityEnd[]; | 107 | extern u8 DRXD_StartDiversityEnd[]; |
111 | 108 | ||
112 | extern u8_t DRXD_DiversityDelay8MHZ[]; | 109 | extern u8 DRXD_DiversityDelay8MHZ[]; |
113 | extern u8_t DRXD_DiversityDelay6MHZ[]; | 110 | extern u8 DRXD_DiversityDelay6MHZ[]; |
114 | 111 | ||
115 | extern u8_t DRXD_B1_microcode[]; | 112 | extern u8 DRXD_B1_microcode[]; |
116 | extern u32_t DRXD_B1_microcode_length; | 113 | extern u32 DRXD_B1_microcode_length; |
117 | 114 | ||
118 | #endif | 115 | #endif |