aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2013-03-19 16:02:54 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-21 06:54:13 -0400
commit11ad03a5630fbf109615ce17da1a031b9950f3f9 (patch)
tree015340349b405afbc51931981ff0ffa56b1f2501
parentd8a18e88c952f155b953d4b164818940ae8686a4 (diff)
[media] siano: use defines for firmware names
There are too many firmwares there. As we need to add MODULE_FIMWARE() macros, the better is to define their names on just one place and use the macros for both cards/device type tables and MODULE_FIRMWARE(). Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat
-rw-r--r--drivers/media/common/siano/sms-cards.c14
-rw-r--r--drivers/media/common/siano/smscoreapi.c56
-rw-r--r--drivers/media/common/siano/smscoreapi.h24
3 files changed, 59 insertions, 35 deletions
diff --git a/drivers/media/common/siano/sms-cards.c b/drivers/media/common/siano/sms-cards.c
index bb6e558b8120..6680134d2336 100644
--- a/drivers/media/common/siano/sms-cards.c
+++ b/drivers/media/common/siano/sms-cards.c
@@ -54,26 +54,26 @@ static struct sms_board sms_boards[] = {
54 [SMS1XXX_BOARD_HAUPPAUGE_CATAMOUNT] = { 54 [SMS1XXX_BOARD_HAUPPAUGE_CATAMOUNT] = {
55 .name = "Hauppauge Catamount", 55 .name = "Hauppauge Catamount",
56 .type = SMS_STELLAR, 56 .type = SMS_STELLAR,
57 .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-stellar-dvbt-01.fw", 57 .fw[DEVICE_MODE_DVBT_BDA] = SMS_FW_DVBT_STELLAR,
58 .default_mode = DEVICE_MODE_DVBT_BDA, 58 .default_mode = DEVICE_MODE_DVBT_BDA,
59 }, 59 },
60 [SMS1XXX_BOARD_HAUPPAUGE_OKEMO_A] = { 60 [SMS1XXX_BOARD_HAUPPAUGE_OKEMO_A] = {
61 .name = "Hauppauge Okemo-A", 61 .name = "Hauppauge Okemo-A",
62 .type = SMS_NOVA_A0, 62 .type = SMS_NOVA_A0,
63 .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-nova-a-dvbt-01.fw", 63 .fw[DEVICE_MODE_DVBT_BDA] = SMS_FW_DVBT_NOVA_A,
64 .default_mode = DEVICE_MODE_DVBT_BDA, 64 .default_mode = DEVICE_MODE_DVBT_BDA,
65 }, 65 },
66 [SMS1XXX_BOARD_HAUPPAUGE_OKEMO_B] = { 66 [SMS1XXX_BOARD_HAUPPAUGE_OKEMO_B] = {
67 .name = "Hauppauge Okemo-B", 67 .name = "Hauppauge Okemo-B",
68 .type = SMS_NOVA_B0, 68 .type = SMS_NOVA_B0,
69 .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-nova-b-dvbt-01.fw", 69 .fw[DEVICE_MODE_DVBT_BDA] = SMS_FW_DVBT_NOVA_B,
70 .default_mode = DEVICE_MODE_DVBT_BDA, 70 .default_mode = DEVICE_MODE_DVBT_BDA,
71 }, 71 },
72 [SMS1XXX_BOARD_HAUPPAUGE_WINDHAM] = { 72 [SMS1XXX_BOARD_HAUPPAUGE_WINDHAM] = {
73 .name = "Hauppauge WinTV MiniStick", 73 .name = "Hauppauge WinTV MiniStick",
74 .type = SMS_NOVA_B0, 74 .type = SMS_NOVA_B0,
75 .fw[DEVICE_MODE_ISDBT_BDA] = "sms1xxx-hcw-55xxx-isdbt-02.fw", 75 .fw[DEVICE_MODE_ISDBT_BDA] = SMS_FW_ISDBT_HCW_55XXX,
76 .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-hcw-55xxx-dvbt-02.fw", 76 .fw[DEVICE_MODE_DVBT_BDA] = SMS_FW_DVBT_HCW_55XXX,
77 .default_mode = DEVICE_MODE_DVBT_BDA, 77 .default_mode = DEVICE_MODE_DVBT_BDA,
78 .rc_codes = RC_MAP_HAUPPAUGE, 78 .rc_codes = RC_MAP_HAUPPAUGE,
79 .board_cfg.leds_power = 26, 79 .board_cfg.leds_power = 26,
@@ -87,7 +87,7 @@ static struct sms_board sms_boards[] = {
87 [SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD] = { 87 [SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD] = {
88 .name = "Hauppauge WinTV MiniCard", 88 .name = "Hauppauge WinTV MiniCard",
89 .type = SMS_NOVA_B0, 89 .type = SMS_NOVA_B0,
90 .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-hcw-55xxx-dvbt-02.fw", 90 .fw[DEVICE_MODE_DVBT_BDA] = SMS_FW_DVBT_HCW_55XXX,
91 .default_mode = DEVICE_MODE_DVBT_BDA, 91 .default_mode = DEVICE_MODE_DVBT_BDA,
92 .lna_ctrl = 29, 92 .lna_ctrl = 29,
93 .board_cfg.foreign_lna0_ctrl = 29, 93 .board_cfg.foreign_lna0_ctrl = 29,
@@ -97,7 +97,7 @@ static struct sms_board sms_boards[] = {
97 [SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2] = { 97 [SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2] = {
98 .name = "Hauppauge WinTV MiniCard", 98 .name = "Hauppauge WinTV MiniCard",
99 .type = SMS_NOVA_B0, 99 .type = SMS_NOVA_B0,
100 .fw[DEVICE_MODE_DVBT_BDA] = "sms1xxx-hcw-55xxx-dvbt-02.fw", 100 .fw[DEVICE_MODE_DVBT_BDA] = SMS_FW_DVBT_HCW_55XXX,
101 .default_mode = DEVICE_MODE_DVBT_BDA, 101 .default_mode = DEVICE_MODE_DVBT_BDA,
102 .lna_ctrl = -1, 102 .lna_ctrl = -1,
103 }, 103 },
diff --git a/drivers/media/common/siano/smscoreapi.c b/drivers/media/common/siano/smscoreapi.c
index b5e40aa9651a..b7aa63f9d9f6 100644
--- a/drivers/media/common/siano/smscoreapi.c
+++ b/drivers/media/common/siano/smscoreapi.c
@@ -1048,50 +1048,50 @@ exit_fw_download:
1048 1048
1049static char *smscore_fw_lkup[][DEVICE_MODE_MAX] = { 1049static char *smscore_fw_lkup[][DEVICE_MODE_MAX] = {
1050 [SMS_NOVA_A0] = { 1050 [SMS_NOVA_A0] = {
1051 [DEVICE_MODE_DVBT] = "dvb_nova_12mhz.inp", 1051 [DEVICE_MODE_DVBT] = SMS_FW_DVB_NOVA_12MHZ,
1052 [DEVICE_MODE_DVBH] = "dvb_nova_12mhz.inp", 1052 [DEVICE_MODE_DVBH] = SMS_FW_DVB_NOVA_12MHZ,
1053 [DEVICE_MODE_DAB_TDMB] = "tdmb_nova_12mhz.inp", 1053 [DEVICE_MODE_DAB_TDMB] = SMS_FW_TDMB_NOVA_12MHZ,
1054 [DEVICE_MODE_DVBT_BDA] = "dvb_nova_12mhz.inp", 1054 [DEVICE_MODE_DVBT_BDA] = SMS_FW_DVB_NOVA_12MHZ,
1055 [DEVICE_MODE_ISDBT] = "isdbt_nova_12mhz.inp", 1055 [DEVICE_MODE_ISDBT] = SMS_FW_ISDBT_NOVA_12MHZ,
1056 [DEVICE_MODE_ISDBT_BDA] = "isdbt_nova_12mhz.inp", 1056 [DEVICE_MODE_ISDBT_BDA] = SMS_FW_ISDBT_NOVA_12MHZ,
1057 }, 1057 },
1058 [SMS_NOVA_B0] = { 1058 [SMS_NOVA_B0] = {
1059 [DEVICE_MODE_DVBT] = "dvb_nova_12mhz_b0.inp", 1059 [DEVICE_MODE_DVBT] = SMS_FW_DVB_NOVA_12MHZ_B0,
1060 [DEVICE_MODE_DVBH] = "dvb_nova_12mhz_b0.inp", 1060 [DEVICE_MODE_DVBH] = SMS_FW_DVB_NOVA_12MHZ_B0,
1061 [DEVICE_MODE_DAB_TDMB] = "tdmb_nova_12mhz_b0.inp", 1061 [DEVICE_MODE_DAB_TDMB] = SMS_FW_TDMB_NOVA_12MHZ_B0,
1062 [DEVICE_MODE_DVBT_BDA] = "dvb_nova_12mhz_b0.inp", 1062 [DEVICE_MODE_DVBT_BDA] = SMS_FW_DVB_NOVA_12MHZ_B0,
1063 [DEVICE_MODE_ISDBT] = "isdbt_nova_12mhz_b0.inp", 1063 [DEVICE_MODE_ISDBT] = SMS_FW_ISDBT_NOVA_12MHZ_B0,
1064 [DEVICE_MODE_ISDBT_BDA] = "isdbt_nova_12mhz_b0.inp", 1064 [DEVICE_MODE_ISDBT_BDA] = SMS_FW_ISDBT_NOVA_12MHZ_B0,
1065 [DEVICE_MODE_FM_RADIO] = "fm_radio.inp", 1065 [DEVICE_MODE_FM_RADIO] = SMS_FW_FM_RADIO,
1066 [DEVICE_MODE_FM_RADIO_BDA] = "fm_radio.inp", 1066 [DEVICE_MODE_FM_RADIO_BDA] = SMS_FW_FM_RADIO,
1067 }, 1067 },
1068 [SMS_VEGA] = { 1068 [SMS_VEGA] = {
1069 [DEVICE_MODE_CMMB] = "cmmb_vega_12mhz.inp", 1069 [DEVICE_MODE_CMMB] = SMS_FW_CMMB_VEGA_12MHZ,
1070 }, 1070 },
1071 [SMS_VENICE] = { 1071 [SMS_VENICE] = {
1072 [DEVICE_MODE_CMMB] = "cmmb_venice_12mhz.inp", 1072 [DEVICE_MODE_CMMB] = SMS_FW_CMMB_VENICE_12MHZ,
1073 }, 1073 },
1074 [SMS_MING] = { 1074 [SMS_MING] = {
1075 [DEVICE_MODE_CMMB] = "cmmb_ming_app.inp", 1075 [DEVICE_MODE_CMMB] = SMS_FW_CMMB_MING_APP,
1076 }, 1076 },
1077 [SMS_PELE] = { 1077 [SMS_PELE] = {
1078 [DEVICE_MODE_ISDBT] = "isdbt_pele.inp", 1078 [DEVICE_MODE_ISDBT] = SMS_FW_ISDBT_PELE,
1079 [DEVICE_MODE_ISDBT_BDA] = "isdbt_pele.inp", 1079 [DEVICE_MODE_ISDBT_BDA] = SMS_FW_ISDBT_PELE,
1080 }, 1080 },
1081 [SMS_RIO] = { 1081 [SMS_RIO] = {
1082 [DEVICE_MODE_DVBT] = "dvb_rio.inp", 1082 [DEVICE_MODE_DVBT] = SMS_FW_DVB_RIO,
1083 [DEVICE_MODE_DVBH] = "dvbh_rio.inp", 1083 [DEVICE_MODE_DVBH] = SMS_FW_DVBH_RIO,
1084 [DEVICE_MODE_DVBT_BDA] = "dvb_rio.inp", 1084 [DEVICE_MODE_DVBT_BDA] = SMS_FW_DVB_RIO,
1085 [DEVICE_MODE_ISDBT] = "isdbt_rio.inp", 1085 [DEVICE_MODE_ISDBT] = SMS_FW_ISDBT_RIO,
1086 [DEVICE_MODE_ISDBT_BDA] = "isdbt_rio.inp", 1086 [DEVICE_MODE_ISDBT_BDA] = SMS_FW_ISDBT_RIO,
1087 [DEVICE_MODE_FM_RADIO] = "fm_radio_rio.inp", 1087 [DEVICE_MODE_FM_RADIO] = SMS_FW_FM_RADIO_RIO,
1088 [DEVICE_MODE_FM_RADIO_BDA] = "fm_radio_rio.inp", 1088 [DEVICE_MODE_FM_RADIO_BDA] = SMS_FW_FM_RADIO_RIO,
1089 }, 1089 },
1090 [SMS_DENVER_1530] = { 1090 [SMS_DENVER_1530] = {
1091 [DEVICE_MODE_ATSC] = "atsc_denver.inp", 1091 [DEVICE_MODE_ATSC] = SMS_FW_ATSC_DENVER,
1092 }, 1092 },
1093 [SMS_DENVER_2160] = { 1093 [SMS_DENVER_2160] = {
1094 [DEVICE_MODE_DAB_TDMB] = "tdmb_denver.inp", 1094 [DEVICE_MODE_DAB_TDMB] = SMS_FW_TDMB_DENVER,
1095 }, 1095 },
1096}; 1096};
1097 1097
diff --git a/drivers/media/common/siano/smscoreapi.h b/drivers/media/common/siano/smscoreapi.h
index 53b81cbc1bda..a9672e04c64f 100644
--- a/drivers/media/common/siano/smscoreapi.h
+++ b/drivers/media/common/siano/smscoreapi.h
@@ -44,6 +44,30 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
44#define min(a, b) (((a) < (b)) ? (a) : (b)) 44#define min(a, b) (((a) < (b)) ? (a) : (b))
45#endif 45#endif
46 46
47/* Define the firmware names used by the driver */
48#define SMS_FW_ATSC_DENVER "atsc_denver.inp"
49#define SMS_FW_CMMB_MING_APP "cmmb_ming_app.inp"
50#define SMS_FW_CMMB_VEGA_12MHZ "cmmb_vega_12mhz.inp"
51#define SMS_FW_CMMB_VENICE_12MHZ "cmmb_venice_12mhz.inp"
52#define SMS_FW_DVBH_RIO "dvbh_rio.inp"
53#define SMS_FW_DVB_NOVA_12MHZ_B0 "dvb_nova_12mhz_b0.inp"
54#define SMS_FW_DVB_NOVA_12MHZ "dvb_nova_12mhz.inp"
55#define SMS_FW_DVB_RIO "dvb_rio.inp"
56#define SMS_FW_FM_RADIO "fm_radio.inp"
57#define SMS_FW_FM_RADIO_RIO "fm_radio_rio.inp"
58#define SMS_FW_DVBT_HCW_55XXX "sms1xxx-hcw-55xxx-dvbt-02.fw"
59#define SMS_FW_ISDBT_HCW_55XXX "sms1xxx-hcw-55xxx-isdbt-02.fw"
60#define SMS_FW_ISDBT_NOVA_12MHZ_B0 "isdbt_nova_12mhz_b0.inp"
61#define SMS_FW_ISDBT_NOVA_12MHZ "isdbt_nova_12mhz.inp"
62#define SMS_FW_ISDBT_PELE "isdbt_pele.inp"
63#define SMS_FW_ISDBT_RIO "isdbt_rio.inp"
64#define SMS_FW_DVBT_NOVA_A "sms1xxx-nova-a-dvbt-01.fw"
65#define SMS_FW_DVBT_NOVA_B "sms1xxx-nova-b-dvbt-01.fw"
66#define SMS_FW_DVBT_STELLAR "sms1xxx-stellar-dvbt-01.fw"
67#define SMS_FW_TDMB_DENVER "tdmb_denver.inp"
68#define SMS_FW_TDMB_NOVA_12MHZ_B0 "tdmb_nova_12mhz_b0.inp"
69#define SMS_FW_TDMB_NOVA_12MHZ "tdmb_nova_12mhz.inp"
70
47#define SMS_PROTOCOL_MAX_RAOUNDTRIP_MS (10000) 71#define SMS_PROTOCOL_MAX_RAOUNDTRIP_MS (10000)
48#define SMS_ALLOC_ALIGNMENT 128 72#define SMS_ALLOC_ALIGNMENT 128
49#define SMS_DMA_ALIGNMENT 16 73#define SMS_DMA_ALIGNMENT 16
generated by cgit v1.2.2 (git 2.25.0) at 2025-03-23 01:16:41 -0400