[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>
This commit is contained in:
parent
861360a56d
commit
8a4d9a9cf9
5 changed files with 18 additions and 18 deletions
|
@ -136,11 +136,11 @@ static void solo_capture_config(struct solo_dev *solo_dev)
|
||||||
int solo_osd_print(struct solo_enc_dev *solo_enc)
|
int solo_osd_print(struct solo_enc_dev *solo_enc)
|
||||||
{
|
{
|
||||||
struct solo_dev *solo_dev = solo_enc->solo_dev;
|
struct solo_dev *solo_dev = solo_enc->solo_dev;
|
||||||
unsigned char *str = solo_enc->osd_text;
|
u8 *str = solo_enc->osd_text;
|
||||||
u8 *buf = solo_enc->osd_buf;
|
u8 *buf = solo_enc->osd_buf;
|
||||||
u32 reg;
|
u32 reg;
|
||||||
const struct font_desc *vga = find_font("VGA8x16");
|
const struct font_desc *vga = find_font("VGA8x16");
|
||||||
const unsigned char *vga_data;
|
const u8 *vga_data;
|
||||||
int i, j;
|
int i, j;
|
||||||
|
|
||||||
if (WARN_ON_ONCE(!vga))
|
if (WARN_ON_ONCE(!vga))
|
||||||
|
@ -154,7 +154,7 @@ int solo_osd_print(struct solo_enc_dev *solo_enc)
|
||||||
}
|
}
|
||||||
|
|
||||||
memset(buf, 0, SOLO_OSD_WRITE_SIZE);
|
memset(buf, 0, SOLO_OSD_WRITE_SIZE);
|
||||||
vga_data = (const unsigned char *)vga->data;
|
vga_data = (const u8 *)vga->data;
|
||||||
|
|
||||||
for (i = 0; *str; i++, str++) {
|
for (i = 0; *str; i++, str++) {
|
||||||
for (j = 0; j < 16; j++) {
|
for (j = 0; j < 16; j++) {
|
||||||
|
|
|
@ -56,8 +56,8 @@
|
||||||
struct solo_snd_pcm {
|
struct solo_snd_pcm {
|
||||||
int on;
|
int on;
|
||||||
spinlock_t lock;
|
spinlock_t lock;
|
||||||
struct solo_dev *solo_dev;
|
struct solo_dev *solo_dev;
|
||||||
unsigned char *g723_buf;
|
u8 *g723_buf;
|
||||||
dma_addr_t g723_dma;
|
dma_addr_t g723_dma;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
#ifndef __SOLO6X10_JPEG_H
|
#ifndef __SOLO6X10_JPEG_H
|
||||||
#define __SOLO6X10_JPEG_H
|
#define __SOLO6X10_JPEG_H
|
||||||
|
|
||||||
static const unsigned char jpeg_header[] = {
|
static const u8 jpeg_header[] = {
|
||||||
0xff, 0xd8, 0xff, 0xfe, 0x00, 0x0d, 0x42, 0x6c,
|
0xff, 0xd8, 0xff, 0xfe, 0x00, 0x0d, 0x42, 0x6c,
|
||||||
0x75, 0x65, 0x63, 0x68, 0x65, 0x72, 0x72, 0x79,
|
0x75, 0x65, 0x63, 0x68, 0x65, 0x72, 0x72, 0x79,
|
||||||
0x20, 0xff, 0xdb, 0x00, 0x43, 0x00, 0x20, 0x16,
|
0x20, 0xff, 0xdb, 0x00, 0x43, 0x00, 0x20, 0x16,
|
||||||
|
@ -106,7 +106,7 @@ static const unsigned char jpeg_header[] = {
|
||||||
/* This is the byte marker for the start of the DQT */
|
/* This is the byte marker for the start of the DQT */
|
||||||
#define DQT_START 17
|
#define DQT_START 17
|
||||||
#define DQT_LEN 138
|
#define DQT_LEN 138
|
||||||
static const unsigned char jpeg_dqt[4][DQT_LEN] = {
|
static const u8 jpeg_dqt[4][DQT_LEN] = {
|
||||||
{
|
{
|
||||||
0xff, 0xdb, 0x00, 0x43, 0x00,
|
0xff, 0xdb, 0x00, 0x43, 0x00,
|
||||||
0x08, 0x06, 0x06, 0x07, 0x06, 0x05, 0x08, 0x07,
|
0x08, 0x06, 0x06, 0x07, 0x06, 0x05, 0x08, 0x07,
|
||||||
|
|
|
@ -38,28 +38,28 @@
|
||||||
#define DMA_ALIGN 4096
|
#define DMA_ALIGN 4096
|
||||||
|
|
||||||
/* 6010 M4V */
|
/* 6010 M4V */
|
||||||
static unsigned char vop_6010_ntsc_d1[] = {
|
static u8 vop_6010_ntsc_d1[] = {
|
||||||
0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x20,
|
0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x20,
|
||||||
0x02, 0x48, 0x1d, 0xc0, 0x00, 0x40, 0x00, 0x40,
|
0x02, 0x48, 0x1d, 0xc0, 0x00, 0x40, 0x00, 0x40,
|
||||||
0x00, 0x40, 0x00, 0x80, 0x00, 0x97, 0x53, 0x04,
|
0x00, 0x40, 0x00, 0x80, 0x00, 0x97, 0x53, 0x04,
|
||||||
0x1f, 0x4c, 0x58, 0x10, 0xf0, 0x71, 0x18, 0x3f,
|
0x1f, 0x4c, 0x58, 0x10, 0xf0, 0x71, 0x18, 0x3f,
|
||||||
};
|
};
|
||||||
|
|
||||||
static unsigned char vop_6010_ntsc_cif[] = {
|
static u8 vop_6010_ntsc_cif[] = {
|
||||||
0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x20,
|
0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x20,
|
||||||
0x02, 0x48, 0x1d, 0xc0, 0x00, 0x40, 0x00, 0x40,
|
0x02, 0x48, 0x1d, 0xc0, 0x00, 0x40, 0x00, 0x40,
|
||||||
0x00, 0x40, 0x00, 0x80, 0x00, 0x97, 0x53, 0x04,
|
0x00, 0x40, 0x00, 0x80, 0x00, 0x97, 0x53, 0x04,
|
||||||
0x1f, 0x4c, 0x2c, 0x10, 0x78, 0x51, 0x18, 0x3f,
|
0x1f, 0x4c, 0x2c, 0x10, 0x78, 0x51, 0x18, 0x3f,
|
||||||
};
|
};
|
||||||
|
|
||||||
static unsigned char vop_6010_pal_d1[] = {
|
static u8 vop_6010_pal_d1[] = {
|
||||||
0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x20,
|
0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x20,
|
||||||
0x02, 0x48, 0x15, 0xc0, 0x00, 0x40, 0x00, 0x40,
|
0x02, 0x48, 0x15, 0xc0, 0x00, 0x40, 0x00, 0x40,
|
||||||
0x00, 0x40, 0x00, 0x80, 0x00, 0x97, 0x53, 0x04,
|
0x00, 0x40, 0x00, 0x80, 0x00, 0x97, 0x53, 0x04,
|
||||||
0x1f, 0x4c, 0x58, 0x11, 0x20, 0x71, 0x18, 0x3f,
|
0x1f, 0x4c, 0x58, 0x11, 0x20, 0x71, 0x18, 0x3f,
|
||||||
};
|
};
|
||||||
|
|
||||||
static unsigned char vop_6010_pal_cif[] = {
|
static u8 vop_6010_pal_cif[] = {
|
||||||
0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x20,
|
0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x20,
|
||||||
0x02, 0x48, 0x15, 0xc0, 0x00, 0x40, 0x00, 0x40,
|
0x02, 0x48, 0x15, 0xc0, 0x00, 0x40, 0x00, 0x40,
|
||||||
0x00, 0x40, 0x00, 0x80, 0x00, 0x97, 0x53, 0x04,
|
0x00, 0x40, 0x00, 0x80, 0x00, 0x97, 0x53, 0x04,
|
||||||
|
@ -67,25 +67,25 @@ static unsigned char vop_6010_pal_cif[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
/* 6110 h.264 */
|
/* 6110 h.264 */
|
||||||
static unsigned char vop_6110_ntsc_d1[] = {
|
static u8 vop_6110_ntsc_d1[] = {
|
||||||
0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x00, 0x1e,
|
0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x00, 0x1e,
|
||||||
0x9a, 0x74, 0x05, 0x81, 0xec, 0x80, 0x00, 0x00,
|
0x9a, 0x74, 0x05, 0x81, 0xec, 0x80, 0x00, 0x00,
|
||||||
0x00, 0x01, 0x68, 0xce, 0x32, 0x28, 0x00, 0x00,
|
0x00, 0x01, 0x68, 0xce, 0x32, 0x28, 0x00, 0x00,
|
||||||
};
|
};
|
||||||
|
|
||||||
static unsigned char vop_6110_ntsc_cif[] = {
|
static u8 vop_6110_ntsc_cif[] = {
|
||||||
0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x00, 0x1e,
|
0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x00, 0x1e,
|
||||||
0x9a, 0x74, 0x0b, 0x0f, 0xc8, 0x00, 0x00, 0x00,
|
0x9a, 0x74, 0x0b, 0x0f, 0xc8, 0x00, 0x00, 0x00,
|
||||||
0x01, 0x68, 0xce, 0x32, 0x28, 0x00, 0x00, 0x00,
|
0x01, 0x68, 0xce, 0x32, 0x28, 0x00, 0x00, 0x00,
|
||||||
};
|
};
|
||||||
|
|
||||||
static unsigned char vop_6110_pal_d1[] = {
|
static u8 vop_6110_pal_d1[] = {
|
||||||
0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x00, 0x1e,
|
0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x00, 0x1e,
|
||||||
0x9a, 0x74, 0x05, 0x80, 0x93, 0x20, 0x00, 0x00,
|
0x9a, 0x74, 0x05, 0x80, 0x93, 0x20, 0x00, 0x00,
|
||||||
0x00, 0x01, 0x68, 0xce, 0x32, 0x28, 0x00, 0x00,
|
0x00, 0x01, 0x68, 0xce, 0x32, 0x28, 0x00, 0x00,
|
||||||
};
|
};
|
||||||
|
|
||||||
static unsigned char vop_6110_pal_cif[] = {
|
static u8 vop_6110_pal_cif[] = {
|
||||||
0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x00, 0x1e,
|
0x00, 0x00, 0x00, 0x01, 0x67, 0x42, 0x00, 0x1e,
|
||||||
0x9a, 0x74, 0x0b, 0x04, 0xb2, 0x00, 0x00, 0x00,
|
0x9a, 0x74, 0x0b, 0x04, 0xb2, 0x00, 0x00, 0x00,
|
||||||
0x01, 0x68, 0xce, 0x32, 0x28, 0x00, 0x00, 0x00,
|
0x01, 0x68, 0xce, 0x32, 0x28, 0x00, 0x00, 0x00,
|
||||||
|
@ -149,7 +149,7 @@ void solo_update_mode(struct solo_enc_dev *solo_enc)
|
||||||
{
|
{
|
||||||
struct solo_dev *solo_dev = solo_enc->solo_dev;
|
struct solo_dev *solo_dev = solo_enc->solo_dev;
|
||||||
int vop_len;
|
int vop_len;
|
||||||
unsigned char *vop;
|
u8 *vop;
|
||||||
|
|
||||||
solo_enc->interlaced = (solo_enc->mode & 0x08) ? 1 : 0;
|
solo_enc->interlaced = (solo_enc->mode & 0x08) ? 1 : 0;
|
||||||
solo_enc->bw_weight = max(solo_dev->fps / solo_enc->interval, 1);
|
solo_enc->bw_weight = max(solo_dev->fps / solo_enc->interval, 1);
|
||||||
|
|
|
@ -168,9 +168,9 @@ struct solo_enc_dev {
|
||||||
__aligned(4);
|
__aligned(4);
|
||||||
|
|
||||||
/* VOP stuff */
|
/* VOP stuff */
|
||||||
unsigned char vop[64];
|
u8 vop[64];
|
||||||
int vop_len;
|
int vop_len;
|
||||||
unsigned char jpeg_header[1024];
|
u8 jpeg_header[1024];
|
||||||
int jpeg_len;
|
int jpeg_len;
|
||||||
|
|
||||||
u32 fmt;
|
u32 fmt;
|
||||||
|
|
Loading…
Add table
Reference in a new issue