mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 06:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

dvbsrc: drop needless wrapper around DVB API's dvb_diseqc_master_cmd

Browse source 
Its only purpose was to hold a wait time that was always 0
This commit is contained in:
Reynaldo H. Verdejo Pinochet 2016-12-05 23:38:53 -08:00
parent ff9cc21933
commit b00cdd944b
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sys/dvb/gstdvbsrc.c
View file

@ -2215,14 +2215,8 @@ gst_dvbsrc_output_frontend_stats (GstDvbSrc * src)
gst_element_post_message (GST_ELEMENT (src), message); gst_element_post_message (GST_ELEMENT (src), message);
} }
struct diseqc_cmd
{
struct dvb_diseqc_master_cmd cmd;
guint32 wait;
};
static void static void
diseqc_send_msg (int fd, fe_sec_voltage_t v, struct diseqc_cmd *cmd, diseqc_send_msg (int fd, fe_sec_voltage_t v, struct dvb_diseqc_master_cmd *cmd,
fe_sec_tone_mode_t t, fe_sec_mini_cmd_t b) fe_sec_tone_mode_t t, fe_sec_mini_cmd_t b)
{ {
gint err; gint err;
@ -2240,11 +2234,10 @@ diseqc_send_msg (int fd, fe_sec_voltage_t v, struct diseqc_cmd *cmd,
} }
g_usleep (15 * 1000); g_usleep (15 * 1000);
GST_LOG ("diseqc: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x", cmd->cmd.msg[0], GST_LOG ("diseqc: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x", cmd->msg[0],
cmd->cmd.msg[1], cmd->cmd.msg[2], cmd->cmd.msg[3], cmd->cmd.msg[4], cmd->msg[1], cmd->msg[2], cmd->msg[3], cmd->msg[4], cmd->msg[5]);
cmd->cmd.msg[5]);
LOOP_WHILE_EINTR (err, ioctl (fd, FE_DISEQC_SEND_MASTER_CMD, &cmd->cmd)); LOOP_WHILE_EINTR (err, ioctl (fd, FE_DISEQC_SEND_MASTER_CMD, cmd));
if (err) { if (err) {
GST_ERROR ("Sending DiSEqC command failed"); GST_ERROR ("Sending DiSEqC command failed");
return; return;
@ -2274,12 +2267,13 @@ diseqc_send_msg (int fd, fe_sec_voltage_t v, struct diseqc_cmd *cmd,
static void static void
diseqc (int secfd, int sat_no, int voltage, int tone) diseqc (int secfd, int sat_no, int voltage, int tone)
{ {
struct diseqc_cmd cmd = { {{0xe0, 0x10, 0x38, 0xf0, 0x00, 0x00}, 4}, 0 }; struct dvb_diseqc_master_cmd cmd =
{ {0xe0, 0x10, 0x38, 0xf0, 0x00, 0x00}, 4 };
/* param: high nibble: reset bits, low nibble set bits, /* param: high nibble: reset bits, low nibble set bits,
* bits are: option, position, polarizaion, band * bits are: option, position, polarizaion, band
*/ */
cmd.cmd.msg[3] = cmd.msg[3] =
0xf0 | (((sat_no * 4) & 0x0f) | (tone == SEC_TONE_ON ? 1 : 0) | 0xf0 | (((sat_no * 4) & 0x0f) | (tone == SEC_TONE_ON ? 1 : 0) |
(voltage == SEC_VOLTAGE_13 ? 0 : 2)); (voltage == SEC_VOLTAGE_13 ? 0 : 2));
/* send twice because some DiSEqC switches do not respond correctly the /* send twice because some DiSEqC switches do not respond correctly the