diff options
author | Ismael Luceno <ismael@iodev.co.uk> | 2014-12-24 06:35:59 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-01-27 07:02:07 -0500 |
commit | 8a4d9a9cf90202c37308ddd84818100c27c4155c (patch) | |
tree | 4d0eceb790242c63562b9d74bde299cd3729f6a8 /drivers/media/pci | |
parent | 861360a56d0bcbc0bec92a1f1266c66880b2e5ae (diff) |
[media] solo6x10: s/unsigned char/u8/
s/unsigned char/u8/
Signed-off-by: Ismael Luceno <ismael@iodev.co.uk>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/pci')
-rw-r--r-- | drivers/media/pci/solo6x10/solo6x10-enc.c | 6 | ||||
-rw-r--r-- | drivers/media/pci/solo6x10/solo6x10-g723.c | 4 | ||||
-rw-r--r-- | drivers/media/pci/solo6x10/solo6x10-jpeg.h | 4 | ||||
-rw-r--r-- | drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 18 | ||||
-rw-r--r-- | drivers/media/pci/solo6x10/solo6x10.h | 4 |
5 files changed, 18 insertions, 18 deletions
diff --git a/drivers/media/pci/solo6x10/solo6x10-enc.c b/drivers/media/pci/solo6x10/solo6x10-enc.c index d19c0aef5abc..d28211bb9674 100644 --- a/drivers/media/pci/solo6x10/solo6x10-enc.c +++ b/drivers/media/pci/solo6x10/solo6x10-enc.c | |||
@@ -136,11 +136,11 @@ static void solo_capture_config(struct solo_dev *solo_dev) | |||
136 | int solo_osd_print(struct solo_enc_dev *solo_enc) | 136 | int solo_osd_print(struct solo_enc_dev *solo_enc) |
137 | { | 137 | { |
138 | struct solo_dev *solo_dev = solo_enc->solo_dev; | 138 | struct solo_dev *solo_dev = solo_enc->solo_dev; |
139 | unsigned char *str = solo_enc->osd_text; | 139 | u8 *str = solo_enc->osd_text; |
140 | u8 *buf = solo_enc->osd_buf; | 140 | u8 *buf = solo_enc->osd_buf; |
141 | u32 reg; | 141 | u32 reg; |
142 | const struct font_desc *vga = find_font("VGA8x16"); | 142 | const struct font_desc *vga = find_font("VGA8x16"); |
143 | const unsigned char *vga_data; | 143 | const u8 *vga_data; |
144 | int i, j; | 144 | int i, j; |
145 | 145 | ||
146 | if (WARN_ON_ONCE(!vga)) | 146 | if (WARN_ON_ONCE(!vga)) |
@@ -154,7 +154,7 @@ int solo_osd_print(struct solo_enc_dev *solo_enc) | |||
154 | } | 154 | } |
155 | 155 | ||
156 | memset(buf, 0, SOLO_OSD_WRITE_SIZE); | 156 | memset(buf, 0, SOLO_OSD_WRITE_SIZE); |
157 | vga_data = (const unsigned char *)vga->data; | 157 | vga_data = (const u8 *)vga->data; |
158 | 158 | ||
159 | for (i = 0; *str; i++, str++) { | 159 | for (i = 0; *str; i++, str++) { |
160 | for (j = 0; j < 16; j++) { | 160 | for (j = 0; j < 16; j++) { |
diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c index c7141f2e63bd..7ddc76709caa 100644 --- a/drivers/media/pci/solo6x10/solo6x10-g723.c +++ b/drivers/media/pci/solo6x10/solo6x10-g723.c | |||
@@ -56,8 +56,8 @@ | |||
56 | struct solo_snd_pcm { | 56 | struct solo_snd_pcm { |
57 | int on; | 57 | int on; |
58 | spinlock_t lock; | 58 | spinlock_t lock; |
59 | struct solo_dev *solo_dev; | 59 | struct solo_dev *solo_dev; |
60 | unsigned char *g723_buf; | 60 | u8 *g723_buf; |
61 | dma_addr_t g723_dma; | 61 | dma_addr_t g723_dma; |
62 | }; | 62 | }; |
63 | 63 | ||
diff --git a/drivers/media/pci/solo6x10/solo6x10-jpeg.h b/drivers/media/pci/solo6x10/solo6x10-jpeg.h index 1c66a46da514..3c611bd3f2d8 100644 --- a/drivers/media/pci/solo6x10/solo6x10-jpeg.h +++ b/drivers/media/pci/solo6x10/solo6x10-jpeg.h | |||
@@ -21,7 +21,7 @@ | |||
21 | #ifndef __SOLO6X10_JPEG_H | 21 | #ifndef __SOLO6X10_JPEG_H |
22 | #define __SOLO6X10_JPEG_H | 22 | #define __SOLO6X10_JPEG_H |
23 | 23 | ||
24 | static const unsigned char jpeg_header[] = { | 24 | static const u8 jpeg_header[] = { |
25 | 0xff, 0xd8, 0xff, 0xfe, 0x00, 0x0d, 0x42, 0x6c, | 25 | 0xff, 0xd8, 0xff, 0xfe, 0x00, 0x0d, 0x42, 0x6c, |
26 | 0x75, 0x65, 0x63, 0x68, 0x65, 0x72, 0x72, 0x79, | 26 | 0x75, 0x65, 0x63, 0x68, 0x65, 0x72, 0x72, 0x79, |
27 | 0x20, 0xff, 0xdb, 0x00, 0x43, 0x00, 0x20, 0x16, | 27 | 0x20, 0xff, 0xdb, 0x00, 0x43, 0x00, 0x20, 0x16, |
@@ -106,7 +106,7 @@ static const unsigned char jpeg_header[] = { | |||
106 | /* This is the byte marker for the start of the DQT */ | 106 | /* This is the byte marker for the start of the DQT */ |
107 | #define DQT_START 17 | 107 | #define DQT_START 17 |
108 | #define DQT_LEN 138 | 108 | #define DQT_LEN 138 |
109 | static const unsigned char jpeg_dqt[4][DQT_LEN] = { | 109 | static const u8 jpeg_dqt[4][DQT_LEN] = { |
110 | { | 110 | { |
111 | 0xff, 0xdb, 0x00, 0x43, 0x00, | 111 | 0xff, 0xdb, 0x00, 0x43, 0x00, |
112 | 0x08, 0x06, 0x06, 0x07, 0x06, 0x05, 0x08, 0x07, | 112 | 0x08, 0x06, 0x06, 0x07, 0x06, 0x05, 0x08, 0x07, |
diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c index 1c9688f58c5c..53fff5425c13 100644 --- a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c +++ b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | |||
@@ -38,28 +38,28 @@ | |||
38 | #define DMA_ALIGN 4096 | 38 | #define DMA_ALIGN 4096 |
39 | 39 | ||
40 | /* 6010 M4V */ | 40 | /* 6010 M4V */ |
41 | static unsigned char vop_6010_ntsc_d1[] = { | 41 | static u8 vop_6010_ntsc_d1[] = { |
42 | 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x20, | 42 | 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x20, |
43 | 0x02, 0x48, 0x1d, 0xc0, 0x00, 0x40, 0x00, 0x40, | 43 | 0x02, 0x48, 0x1d, 0xc0, 0x00, 0x40, 0x00, 0x40, |
44 | 0x00, 0x40, 0x00, 0x80, 0x00, 0x97, 0x53, 0x04, | 44 | 0x00, 0x40, 0x00, 0x80, 0x00, 0x97, 0x53, 0x04, |
45 | 0x1f, 0x4c, 0x58, 0x10, 0xf0, 0x71, 0x18, 0x3f, | 45 | 0x1f, 0x4c, 0x58, 0x10, 0xf0, 0x71, 0x18, 0x3f, |
46 | }; | 46 | }; |
47 | 47 | ||
48 | static unsigned char vop_6010_ntsc_cif[] = { | 48 | static u8 vop_6010_ntsc_cif[] = { |
49 | 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x20, | 49 | 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x20, |
50 | 0x02, 0x48, 0x1d, 0xc0, 0x00, 0x40, 0x00, 0x40, | 50 | 0x02, 0x48, 0x1d, 0xc0, 0x00, 0x40, 0x00, 0x40, |
51 | 0x00, 0x40, 0x00, 0x80, 0x00, 0x97, 0x53, 0x04, | 51 | 0x00, 0x40, 0x00, 0x80, 0x00, 0x97, 0x53, 0x04, |
52 | 0x1f, 0x4c, 0x2c, 0x10, 0x78, 0x51, 0x18, 0x3f, | 52 | 0x1f, 0x4c, 0x2c, 0x10, 0x78, 0x51, 0x18, 0x3f, |
53 | }; | 53 | }; |
54 | 54 | ||
55 | static unsigned char vop_6010_pal_d1[] = { | 55 | static u8 vop_6010_pal_d1[] = { |
56 | 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x20, | 56 | 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x20, |
57 | 0x02, 0x48, 0x15, 0xc0, 0x00, 0x40, 0x00, 0x40, | 57 | 0x02, 0x48, 0x15, 0xc0, 0x00, 0x40, 0x00, 0x40, |
58 | 0x00, 0x40, 0x00, 0x80, 0x00, 0x97, 0x53, 0x04, | 58 | 0x00, 0x40, 0x00, 0x80, 0x00, 0x97, 0x53, 0x04, |
59 | 0x1f, 0x4c, 0x58, 0x11, 0x20, 0x71, 0x18, 0x3f, | 59 | 0x1f, 0x4c, 0x58, 0x11, 0x20, 0x71, 0x18, 0x3f, |
60 | }; | 60 | }; |
61 | 61 | ||
62 | static unsigned char vop_6010_pal_cif[] = { | 62 | static u8 vop_6010_pal_cif[] = { |
63 | 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x20, | 63 | 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x20, |
64 | 0x02, 0x48, 0x15, 0xc0, 0x00, 0x40, 0x00, 0x40, | 64 | 0x02, 0x48, 0x15, 0xc0, 0x00, 0x40, 0x00, 0x40, |
65 | 0x00, 0x40, 0x00, 0x80, 0x00, 0x97, 0x53, 0x04, | 65 | 0x00, 0x40, 0x00, 0x80, 0x00, 0x97, 0x53, 0x04, |
@@ -67,25 +67,25 @@ static unsigned char vop_6010_pal_cif[] = { | |||
67 | }; | 67 | }; |
68 | 68 | ||
69 | /* 6110 h.264 */ | 69 | /* 6110 h.264 */ |
70 | static unsigned char vop_6110_ntsc_d1[] = { | 70 | static u8 vop_6110_ntsc_d1[] = { |
71 | 0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x00, 0x1e, | 71 | 0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x00, 0x1e, |
72 | 0x9a, 0x74, 0x05, 0x81, 0xec, 0x80, 0x00, 0x00, | 72 | 0x9a, 0x74, 0x05, 0x81, 0xec, 0x80, 0x00, 0x00, |
73 | 0x00, 0x01, 0x68, 0xce, 0x32, 0x28, 0x00, 0x00, | 73 | 0x00, 0x01, 0x68, 0xce, 0x32, 0x28, 0x00, 0x00, |
74 | }; | 74 | }; |
75 | 75 | ||
76 | static unsigned char vop_6110_ntsc_cif[] = { | 76 | static u8 vop_6110_ntsc_cif[] = { |
77 | 0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x00, 0x1e, | 77 | 0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x00, 0x1e, |
78 | 0x9a, 0x74, 0x0b, 0x0f, 0xc8, 0x00, 0x00, 0x00, | 78 | 0x9a, 0x74, 0x0b, 0x0f, 0xc8, 0x00, 0x00, 0x00, |
79 | 0x01, 0x68, 0xce, 0x32, 0x28, 0x00, 0x00, 0x00, | 79 | 0x01, 0x68, 0xce, 0x32, 0x28, 0x00, 0x00, 0x00, |
80 | }; | 80 | }; |
81 | 81 | ||
82 | static unsigned char vop_6110_pal_d1[] = { | 82 | static u8 vop_6110_pal_d1[] = { |
83 | 0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x00, 0x1e, | 83 | 0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x00, 0x1e, |
84 | 0x9a, 0x74, 0x05, 0x80, 0x93, 0x20, 0x00, 0x00, | 84 | 0x9a, 0x74, 0x05, 0x80, 0x93, 0x20, 0x00, 0x00, |
85 | 0x00, 0x01, 0x68, 0xce, 0x32, 0x28, 0x00, 0x00, | 85 | 0x00, 0x01, 0x68, 0xce, 0x32, 0x28, 0x00, 0x00, |
86 | }; | 86 | }; |
87 | 87 | ||
88 | static unsigned char vop_6110_pal_cif[] = { | 88 | static u8 vop_6110_pal_cif[] = { |
89 | 0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x00, 0x1e, | 89 | 0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x00, 0x1e, |
90 | 0x9a, 0x74, 0x0b, 0x04, 0xb2, 0x00, 0x00, 0x00, | 90 | 0x9a, 0x74, 0x0b, 0x04, 0xb2, 0x00, 0x00, 0x00, |
91 | 0x01, 0x68, 0xce, 0x32, 0x28, 0x00, 0x00, 0x00, | 91 | 0x01, 0x68, 0xce, 0x32, 0x28, 0x00, 0x00, 0x00, |
@@ -149,7 +149,7 @@ void solo_update_mode(struct solo_enc_dev *solo_enc) | |||
149 | { | 149 | { |
150 | struct solo_dev *solo_dev = solo_enc->solo_dev; | 150 | struct solo_dev *solo_dev = solo_enc->solo_dev; |
151 | int vop_len; | 151 | int vop_len; |
152 | unsigned char *vop; | 152 | u8 *vop; |
153 | 153 | ||
154 | solo_enc->interlaced = (solo_enc->mode & 0x08) ? 1 : 0; | 154 | solo_enc->interlaced = (solo_enc->mode & 0x08) ? 1 : 0; |
155 | solo_enc->bw_weight = max(solo_dev->fps / solo_enc->interval, 1); | 155 | solo_enc->bw_weight = max(solo_dev->fps / solo_enc->interval, 1); |
diff --git a/drivers/media/pci/solo6x10/solo6x10.h b/drivers/media/pci/solo6x10/solo6x10.h index 6c9bc707773f..1ca54b08b3aa 100644 --- a/drivers/media/pci/solo6x10/solo6x10.h +++ b/drivers/media/pci/solo6x10/solo6x10.h | |||
@@ -168,9 +168,9 @@ struct solo_enc_dev { | |||
168 | __aligned(4); | 168 | __aligned(4); |
169 | 169 | ||
170 | /* VOP stuff */ | 170 | /* VOP stuff */ |
171 | unsigned char vop[64]; | 171 | u8 vop[64]; |
172 | int vop_len; | 172 | int vop_len; |
173 | unsigned char jpeg_header[1024]; | 173 | u8 jpeg_header[1024]; |
174 | int jpeg_len; | 174 | int jpeg_len; |
175 | 175 | ||
176 | u32 fmt; | 176 | u32 fmt; |