Skip to contentSkip to conversation

v4l-utils: convert board_list to vector

PATCH New Rosen Penev 1 participant 1 message Apr 20, 2021 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 v4l-utils: convert board_list to vector

Removes boilerplate code with a slight reduction in size.

Ran through git clang-format

---
 utils/v4l2-dbg/v4l2-dbg-ac97.h    |  78 +++++-----
 utils/v4l2-dbg/v4l2-dbg-bttv.h    | 132 ++++++++---------
 utils/v4l2-dbg/v4l2-dbg-em28xx.h  | 105 ++++++--------
 utils/v4l2-dbg/v4l2-dbg-micron.h  |  34 ++---
 utils/v4l2-dbg/v4l2-dbg-saa7134.h | 230 +++++++++++++++---------------
 utils/v4l2-dbg/v4l2-dbg-tvp5150.h | 146 +++++++++----------
 utils/v4l2-dbg/v4l2-dbg.cpp       |  94 ++++++------
 7 files changed, 390 insertions(+), 429 deletions(-)
utils/v4l2-dbg/v4l2-dbg-ac97.h +39 -39
index a37c87842..263f34551 100644
@@ -22,46 +22,46 @@
 #define AC97_PREFIX "AC97_"
 #define EM202_PREFIX "EM202_"
 
-static struct board_regs ac97_regs[] = {
+static const std::vector<board_regs> ac97_regs{
 	/* general ac97 registers */
-	{0x00, AC97_PREFIX "RESET", 2},
-	{0x02, AC97_PREFIX "MASTER_VOL", 2},
-	{0x04, AC97_PREFIX "LINE_LEVEL_VOL", 2},
-	{0x06, AC97_PREFIX "MASTER_MONO_VOL", 2},
-	{0x0a, AC97_PREFIX "PC_BEEP_VOL", 2},
-	{0x0c, AC97_PREFIX "PHONE_VOL", 2},
-	{0x0e, AC97_PREFIX "MIC_VOL", 2},
-	{0x10, AC97_PREFIX "LINEIN_VOL", 2},
-	{0x12, AC97_PREFIX "CD_VOL", 2},
-	{0x14, AC97_PREFIX "VIDEO_VOL", 2},
-	{0x16, AC97_PREFIX "AUX_VOL", 2},
-	{0x18, AC97_PREFIX "PCM_OUT_VOL", 2},
-	{0x1a, AC97_PREFIX "RECORD_SELECT", 2},
-	{0x1c, AC97_PREFIX "RECORD_GAIN", 2},
-	{0x20, AC97_PREFIX "GENERAL_PURPOSE", 2},
-	{0x22, AC97_PREFIX "3D_CTRL", 2},
-	{0x24, AC97_PREFIX "AUD_INT_AND_PAG", 2},
-	{0x26, AC97_PREFIX "POWER_DOWN_CTRL", 2},
-	{0x28, AC97_PREFIX "EXT_AUD_ID", 2},
-	{0x2a, AC97_PREFIX "EXT_AUD_CTRL", 2},
-	{0x2c, AC97_PREFIX "PCM_OUT_FRONT_SRATE", 2},
-	{0x2e, AC97_PREFIX "PCM_OUT_SURR_SRATE", 2},
-	{0x30, AC97_PREFIX "PCM_OUT_LFE_SRATE", 2},
-	{0x32, AC97_PREFIX "PCM_IN_SRATE", 2},
-	{0x36, AC97_PREFIX "LFE_MASTER_VOL", 2},
-	{0x38, AC97_PREFIX "SURR_MASTER_VOL", 2},
-	{0x3a, AC97_PREFIX "SPDIF_OUT_CTRL", 2},
-	{0x7c, AC97_PREFIX "VENDOR_ID1", 2},
-	{0x7e, AC97_PREFIX "VENDOR_ID2", 2},
+	{ 0x00, AC97_PREFIX "RESET", 2 },
+	{ 0x02, AC97_PREFIX "MASTER_VOL", 2 },
+	{ 0x04, AC97_PREFIX "LINE_LEVEL_VOL", 2 },
+	{ 0x06, AC97_PREFIX "MASTER_MONO_VOL", 2 },
+	{ 0x0a, AC97_PREFIX "PC_BEEP_VOL", 2 },
+	{ 0x0c, AC97_PREFIX "PHONE_VOL", 2 },
+	{ 0x0e, AC97_PREFIX "MIC_VOL", 2 },
+	{ 0x10, AC97_PREFIX "LINEIN_VOL", 2 },
+	{ 0x12, AC97_PREFIX "CD_VOL", 2 },
+	{ 0x14, AC97_PREFIX "VIDEO_VOL", 2 },
+	{ 0x16, AC97_PREFIX "AUX_VOL", 2 },
+	{ 0x18, AC97_PREFIX "PCM_OUT_VOL", 2 },
+	{ 0x1a, AC97_PREFIX "RECORD_SELECT", 2 },
+	{ 0x1c, AC97_PREFIX "RECORD_GAIN", 2 },
+	{ 0x20, AC97_PREFIX "GENERAL_PURPOSE", 2 },
+	{ 0x22, AC97_PREFIX "3D_CTRL", 2 },
+	{ 0x24, AC97_PREFIX "AUD_INT_AND_PAG", 2 },
+	{ 0x26, AC97_PREFIX "POWER_DOWN_CTRL", 2 },
+	{ 0x28, AC97_PREFIX "EXT_AUD_ID", 2 },
+	{ 0x2a, AC97_PREFIX "EXT_AUD_CTRL", 2 },
+	{ 0x2c, AC97_PREFIX "PCM_OUT_FRONT_SRATE", 2 },
+	{ 0x2e, AC97_PREFIX "PCM_OUT_SURR_SRATE", 2 },
+	{ 0x30, AC97_PREFIX "PCM_OUT_LFE_SRATE", 2 },
+	{ 0x32, AC97_PREFIX "PCM_IN_SRATE", 2 },
+	{ 0x36, AC97_PREFIX "LFE_MASTER_VOL", 2 },
+	{ 0x38, AC97_PREFIX "SURR_MASTER_VOL", 2 },
+	{ 0x3a, AC97_PREFIX "SPDIF_OUT_CTRL", 2 },
+	{ 0x7c, AC97_PREFIX "VENDOR_ID1", 2 },
+	{ 0x7e, AC97_PREFIX "VENDOR_ID2", 2 },
 
 	/* em202 vendor specific registers */
-	{0x3e, EM202_PREFIX "EXT_MODEM_CTRL", 2},
-	{0x4c, EM202_PREFIX "GPIO_CONF", 2},
-	{0x4e, EM202_PREFIX "GPIO_POLARITY", 2},
-	{0x50, EM202_PREFIX "GPIO_STICKY", 2},
-	{0x52, EM202_PREFIX "GPIO_MASK", 2},
-	{0x54, EM202_PREFIX "GPIO_STATUS", 2},
-	{0x6a, EM202_PREFIX "SPDIF_OUT_SEL", 2},
-	{0x72, EM202_PREFIX "ANTIPOP", 2},
-	{0x74, EM202_PREFIX "EAPD_GPIO_ACCESS", 2},
+	{ 0x3e, EM202_PREFIX "EXT_MODEM_CTRL", 2 },
+	{ 0x4c, EM202_PREFIX "GPIO_CONF", 2 },
+	{ 0x4e, EM202_PREFIX "GPIO_POLARITY", 2 },
+	{ 0x50, EM202_PREFIX "GPIO_STICKY", 2 },
+	{ 0x52, EM202_PREFIX "GPIO_MASK", 2 },
+	{ 0x54, EM202_PREFIX "GPIO_STATUS", 2 },
+	{ 0x6a, EM202_PREFIX "SPDIF_OUT_SEL", 2 },
+	{ 0x72, EM202_PREFIX "ANTIPOP", 2 },
+	{ 0x74, EM202_PREFIX "EAPD_GPIO_ACCESS", 2 },
 };
utils/v4l2-dbg/v4l2-dbg-bttv.h +66 -66

143 lines not on this page · raw message

utils/v4l2-dbg/v4l2-dbg-em28xx.h +42 -63

111 lines not on this page · raw message

utils/v4l2-dbg/v4l2-dbg-micron.h +12 -22
index 694e05de5..52aee9aa5 100644
@@ -21,26 +21,16 @@
 /* Register name prefix */
 #define MT9V011_PREFIX "MT9V011_"
 
-static struct board_regs mt9v011_regs[] = {
-	{0x00, MT9V011_PREFIX "CHIP_VERSION", 0},
-	{0x01, MT9V011_PREFIX "ROWSTART", 0},
-	{0x02, MT9V011_PREFIX "COLSTART", 0},
-	{0x03, MT9V011_PREFIX "HEIGHT", 0},
-	{0x04, MT9V011_PREFIX "WIDTH", 0},
-	{0x05, MT9V011_PREFIX "HBLANK", 0},
-	{0x06, MT9V011_PREFIX "VBLANK", 0},
-	{0x07, MT9V011_PREFIX "OUT_CTRL", 0},
-	{0x09, MT9V011_PREFIX "SHUTTER_WIDTH", 0},
-	{0x0a, MT9V011_PREFIX "CLK_SPEED", 0},
-	{0x0b, MT9V011_PREFIX "RESTART", 0},
-	{0x0c, MT9V011_PREFIX "SHUTTER_DELAY", 0},
-	{0x0d, MT9V011_PREFIX "RESET", 0},
-	{0x1e, MT9V011_PREFIX "DIGITAL_ZOOM", 0},
-	{0x20, MT9V011_PREFIX "READ_MODE", 0},
-	{0x2b, MT9V011_PREFIX "GREEN_1_GAIN", 0},
-	{0x2c, MT9V011_PREFIX "BLUE_GAIN", 0},
-	{0x2d, MT9V011_PREFIX "RED_GAIN", 0},
-	{0x2e, MT9V011_PREFIX "GREEN_2_GAIN", 0},
-	{0x35, MT9V011_PREFIX "GLOBAL_GAIN", 0},
-	{0xf1, MT9V011_PREFIX "CHIP_ENABLE", 0},
+static const std::vector<board_regs> mt9v011_regs{
+	{ 0x00, MT9V011_PREFIX "CHIP_VERSION", 0 },  { 0x01, MT9V011_PREFIX "ROWSTART", 0 },
+	{ 0x02, MT9V011_PREFIX "COLSTART", 0 },	     { 0x03, MT9V011_PREFIX "HEIGHT", 0 },
+	{ 0x04, MT9V011_PREFIX "WIDTH", 0 },	     { 0x05, MT9V011_PREFIX "HBLANK", 0 },
+	{ 0x06, MT9V011_PREFIX "VBLANK", 0 },	     { 0x07, MT9V011_PREFIX "OUT_CTRL", 0 },
+	{ 0x09, MT9V011_PREFIX "SHUTTER_WIDTH", 0 }, { 0x0a, MT9V011_PREFIX "CLK_SPEED", 0 },
+	{ 0x0b, MT9V011_PREFIX "RESTART", 0 },	     { 0x0c, MT9V011_PREFIX "SHUTTER_DELAY", 0 },
+	{ 0x0d, MT9V011_PREFIX "RESET", 0 },	     { 0x1e, MT9V011_PREFIX "DIGITAL_ZOOM", 0 },
+	{ 0x20, MT9V011_PREFIX "READ_MODE", 0 },     { 0x2b, MT9V011_PREFIX "GREEN_1_GAIN", 0 },
+	{ 0x2c, MT9V011_PREFIX "BLUE_GAIN", 0 },     { 0x2d, MT9V011_PREFIX "RED_GAIN", 0 },
+	{ 0x2e, MT9V011_PREFIX "GREEN_2_GAIN", 0 },  { 0x35, MT9V011_PREFIX "GLOBAL_GAIN", 0 },
+	{ 0xf1, MT9V011_PREFIX "CHIP_ENABLE", 0 },
 };
utils/v4l2-dbg/v4l2-dbg-saa7134.h +115 -115

234 lines not on this page · raw message

utils/v4l2-dbg/v4l2-dbg-tvp5150.h +73 -73

150 lines not on this page · raw message

utils/v4l2-dbg/v4l2-dbg.cpp +43 -51

164 lines not on this page · raw message

Signature · 1 line
2.30.2