diff options
author | Guennadi Liakhovetski <lyakh@axis700.grange> | 2009-12-24 08:12:15 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-02-26 13:11:00 -0500 |
commit | 81355e40826acea76274c2ef5ff7d156ff28d183 (patch) | |
tree | 585f0303198aadec76006fc2d154a06c450ac571 /drivers/media | |
parent | 3675c750cf2effc6a2d9582cd1b9d3043aded3b6 (diff) |
soc-camera: adjust coding style to match V4L preferences
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/soc_mediabus.c | 45 |
1 files changed, 30 insertions, 15 deletions
diff --git a/drivers/media/video/soc_mediabus.c b/drivers/media/video/soc_mediabus.c index f8d5c87dc2aa..0149290ee5a6 100644 --- a/drivers/media/video/soc_mediabus.c +++ b/drivers/media/video/soc_mediabus.c | |||
@@ -24,91 +24,106 @@ static const struct soc_mbus_pixelfmt mbus_fmt[] = { | |||
24 | .bits_per_sample = 8, | 24 | .bits_per_sample = 8, |
25 | .packing = SOC_MBUS_PACKING_2X8_PADHI, | 25 | .packing = SOC_MBUS_PACKING_2X8_PADHI, |
26 | .order = SOC_MBUS_ORDER_LE, | 26 | .order = SOC_MBUS_ORDER_LE, |
27 | }, [MBUS_IDX(YVYU8_2X8_LE)] = { | 27 | }, |
28 | [MBUS_IDX(YVYU8_2X8_LE)] = { | ||
28 | .fourcc = V4L2_PIX_FMT_YVYU, | 29 | .fourcc = V4L2_PIX_FMT_YVYU, |
29 | .name = "YVYU", | 30 | .name = "YVYU", |
30 | .bits_per_sample = 8, | 31 | .bits_per_sample = 8, |
31 | .packing = SOC_MBUS_PACKING_2X8_PADHI, | 32 | .packing = SOC_MBUS_PACKING_2X8_PADHI, |
32 | .order = SOC_MBUS_ORDER_LE, | 33 | .order = SOC_MBUS_ORDER_LE, |
33 | }, [MBUS_IDX(YUYV8_2X8_BE)] = { | 34 | }, |
35 | [MBUS_IDX(YUYV8_2X8_BE)] = { | ||
34 | .fourcc = V4L2_PIX_FMT_UYVY, | 36 | .fourcc = V4L2_PIX_FMT_UYVY, |
35 | .name = "UYVY", | 37 | .name = "UYVY", |
36 | .bits_per_sample = 8, | 38 | .bits_per_sample = 8, |
37 | .packing = SOC_MBUS_PACKING_2X8_PADHI, | 39 | .packing = SOC_MBUS_PACKING_2X8_PADHI, |
38 | .order = SOC_MBUS_ORDER_LE, | 40 | .order = SOC_MBUS_ORDER_LE, |
39 | }, [MBUS_IDX(YVYU8_2X8_BE)] = { | 41 | }, |
42 | [MBUS_IDX(YVYU8_2X8_BE)] = { | ||
40 | .fourcc = V4L2_PIX_FMT_VYUY, | 43 | .fourcc = V4L2_PIX_FMT_VYUY, |
41 | .name = "VYUY", | 44 | .name = "VYUY", |
42 | .bits_per_sample = 8, | 45 | .bits_per_sample = 8, |
43 | .packing = SOC_MBUS_PACKING_2X8_PADHI, | 46 | .packing = SOC_MBUS_PACKING_2X8_PADHI, |
44 | .order = SOC_MBUS_ORDER_LE, | 47 | .order = SOC_MBUS_ORDER_LE, |
45 | }, [MBUS_IDX(RGB555_2X8_PADHI_LE)] = { | 48 | }, |
49 | [MBUS_IDX(RGB555_2X8_PADHI_LE)] = { | ||
46 | .fourcc = V4L2_PIX_FMT_RGB555, | 50 | .fourcc = V4L2_PIX_FMT_RGB555, |
47 | .name = "RGB555", | 51 | .name = "RGB555", |
48 | .bits_per_sample = 8, | 52 | .bits_per_sample = 8, |
49 | .packing = SOC_MBUS_PACKING_2X8_PADHI, | 53 | .packing = SOC_MBUS_PACKING_2X8_PADHI, |
50 | .order = SOC_MBUS_ORDER_LE, | 54 | .order = SOC_MBUS_ORDER_LE, |
51 | }, [MBUS_IDX(RGB555_2X8_PADHI_BE)] = { | 55 | }, |
56 | [MBUS_IDX(RGB555_2X8_PADHI_BE)] = { | ||
52 | .fourcc = V4L2_PIX_FMT_RGB555X, | 57 | .fourcc = V4L2_PIX_FMT_RGB555X, |
53 | .name = "RGB555X", | 58 | .name = "RGB555X", |
54 | .bits_per_sample = 8, | 59 | .bits_per_sample = 8, |
55 | .packing = SOC_MBUS_PACKING_2X8_PADHI, | 60 | .packing = SOC_MBUS_PACKING_2X8_PADHI, |
56 | .order = SOC_MBUS_ORDER_LE, | 61 | .order = SOC_MBUS_ORDER_LE, |
57 | }, [MBUS_IDX(RGB565_2X8_LE)] = { | 62 | }, |
63 | [MBUS_IDX(RGB565_2X8_LE)] = { | ||
58 | .fourcc = V4L2_PIX_FMT_RGB565, | 64 | .fourcc = V4L2_PIX_FMT_RGB565, |
59 | .name = "RGB565", | 65 | .name = "RGB565", |
60 | .bits_per_sample = 8, | 66 | .bits_per_sample = 8, |
61 | .packing = SOC_MBUS_PACKING_2X8_PADHI, | 67 | .packing = SOC_MBUS_PACKING_2X8_PADHI, |
62 | .order = SOC_MBUS_ORDER_LE, | 68 | .order = SOC_MBUS_ORDER_LE, |
63 | }, [MBUS_IDX(RGB565_2X8_BE)] = { | 69 | }, |
70 | [MBUS_IDX(RGB565_2X8_BE)] = { | ||
64 | .fourcc = V4L2_PIX_FMT_RGB565X, | 71 | .fourcc = V4L2_PIX_FMT_RGB565X, |
65 | .name = "RGB565X", | 72 | .name = "RGB565X", |
66 | .bits_per_sample = 8, | 73 | .bits_per_sample = 8, |
67 | .packing = SOC_MBUS_PACKING_2X8_PADHI, | 74 | .packing = SOC_MBUS_PACKING_2X8_PADHI, |
68 | .order = SOC_MBUS_ORDER_LE, | 75 | .order = SOC_MBUS_ORDER_LE, |
69 | }, [MBUS_IDX(SBGGR8_1X8)] = { | 76 | }, |
77 | [MBUS_IDX(SBGGR8_1X8)] = { | ||
70 | .fourcc = V4L2_PIX_FMT_SBGGR8, | 78 | .fourcc = V4L2_PIX_FMT_SBGGR8, |
71 | .name = "Bayer 8 BGGR", | 79 | .name = "Bayer 8 BGGR", |
72 | .bits_per_sample = 8, | 80 | .bits_per_sample = 8, |
73 | .packing = SOC_MBUS_PACKING_NONE, | 81 | .packing = SOC_MBUS_PACKING_NONE, |
74 | .order = SOC_MBUS_ORDER_LE, | 82 | .order = SOC_MBUS_ORDER_LE, |
75 | }, [MBUS_IDX(SBGGR10_1X10)] = { | 83 | }, |
84 | [MBUS_IDX(SBGGR10_1X10)] = { | ||
76 | .fourcc = V4L2_PIX_FMT_SBGGR10, | 85 | .fourcc = V4L2_PIX_FMT_SBGGR10, |
77 | .name = "Bayer 10 BGGR", | 86 | .name = "Bayer 10 BGGR", |
78 | .bits_per_sample = 10, | 87 | .bits_per_sample = 10, |
79 | .packing = SOC_MBUS_PACKING_EXTEND16, | 88 | .packing = SOC_MBUS_PACKING_EXTEND16, |
80 | .order = SOC_MBUS_ORDER_LE, | 89 | .order = SOC_MBUS_ORDER_LE, |
81 | }, [MBUS_IDX(GREY8_1X8)] = { | 90 | }, |
91 | [MBUS_IDX(GREY8_1X8)] = { | ||
82 | .fourcc = V4L2_PIX_FMT_GREY, | 92 | .fourcc = V4L2_PIX_FMT_GREY, |
83 | .name = "Grey", | 93 | .name = "Grey", |
84 | .bits_per_sample = 8, | 94 | .bits_per_sample = 8, |
85 | .packing = SOC_MBUS_PACKING_NONE, | 95 | .packing = SOC_MBUS_PACKING_NONE, |
86 | .order = SOC_MBUS_ORDER_LE, | 96 | .order = SOC_MBUS_ORDER_LE, |
87 | }, [MBUS_IDX(Y10_1X10)] = { | 97 | }, |
98 | [MBUS_IDX(Y10_1X10)] = { | ||
88 | .fourcc = V4L2_PIX_FMT_Y10, | 99 | .fourcc = V4L2_PIX_FMT_Y10, |
89 | .name = "Grey 10bit", | 100 | .name = "Grey 10bit", |
90 | .bits_per_sample = 10, | 101 | .bits_per_sample = 10, |
91 | .packing = SOC_MBUS_PACKING_EXTEND16, | 102 | .packing = SOC_MBUS_PACKING_EXTEND16, |
92 | .order = SOC_MBUS_ORDER_LE, | 103 | .order = SOC_MBUS_ORDER_LE, |
93 | }, [MBUS_IDX(SBGGR10_2X8_PADHI_LE)] = { | 104 | }, |
105 | [MBUS_IDX(SBGGR10_2X8_PADHI_LE)] = { | ||
94 | .fourcc = V4L2_PIX_FMT_SBGGR10, | 106 | .fourcc = V4L2_PIX_FMT_SBGGR10, |
95 | .name = "Bayer 10 BGGR", | 107 | .name = "Bayer 10 BGGR", |
96 | .bits_per_sample = 8, | 108 | .bits_per_sample = 8, |
97 | .packing = SOC_MBUS_PACKING_2X8_PADHI, | 109 | .packing = SOC_MBUS_PACKING_2X8_PADHI, |
98 | .order = SOC_MBUS_ORDER_LE, | 110 | .order = SOC_MBUS_ORDER_LE, |
99 | }, [MBUS_IDX(SBGGR10_2X8_PADLO_LE)] = { | 111 | }, |
112 | [MBUS_IDX(SBGGR10_2X8_PADLO_LE)] = { | ||
100 | .fourcc = V4L2_PIX_FMT_SBGGR10, | 113 | .fourcc = V4L2_PIX_FMT_SBGGR10, |
101 | .name = "Bayer 10 BGGR", | 114 | .name = "Bayer 10 BGGR", |
102 | .bits_per_sample = 8, | 115 | .bits_per_sample = 8, |
103 | .packing = SOC_MBUS_PACKING_2X8_PADLO, | 116 | .packing = SOC_MBUS_PACKING_2X8_PADLO, |
104 | .order = SOC_MBUS_ORDER_LE, | 117 | .order = SOC_MBUS_ORDER_LE, |
105 | }, [MBUS_IDX(SBGGR10_2X8_PADHI_BE)] = { | 118 | }, |
119 | [MBUS_IDX(SBGGR10_2X8_PADHI_BE)] = { | ||
106 | .fourcc = V4L2_PIX_FMT_SBGGR10, | 120 | .fourcc = V4L2_PIX_FMT_SBGGR10, |
107 | .name = "Bayer 10 BGGR", | 121 | .name = "Bayer 10 BGGR", |
108 | .bits_per_sample = 8, | 122 | .bits_per_sample = 8, |
109 | .packing = SOC_MBUS_PACKING_2X8_PADHI, | 123 | .packing = SOC_MBUS_PACKING_2X8_PADHI, |
110 | .order = SOC_MBUS_ORDER_BE, | 124 | .order = SOC_MBUS_ORDER_BE, |
111 | }, [MBUS_IDX(SBGGR10_2X8_PADLO_BE)] = { | 125 | }, |
126 | [MBUS_IDX(SBGGR10_2X8_PADLO_BE)] = { | ||
112 | .fourcc = V4L2_PIX_FMT_SBGGR10, | 127 | .fourcc = V4L2_PIX_FMT_SBGGR10, |
113 | .name = "Bayer 10 BGGR", | 128 | .name = "Bayer 10 BGGR", |
114 | .bits_per_sample = 8, | 129 | .bits_per_sample = 8, |