Commit 9b28ba01 authored by Daniel Scheller's avatar Daniel Scheller Committed by Mauro Carvalho Chehab
Browse files

media: ddbridge/mci: rename defines and fix i/q var types 



Adjustments to match the FPGA firmware, and the signal I/Q values are
reported as s16 types from the card firmware.

Picked up from the upstream dddvb GIT.

Signed-off-by: default avatarDaniel Scheller <d.scheller@gmx.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 3c7d5911

drivers/media/pci/ddbridge/ddbridge-mci.c

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ unlock: 
	memset(&cmd, 0, sizeof(cmd));



	if (state->base->iq_mode) {

		cmd.command = SX8_CMD_SELECT_IQOUT;

		cmd.command = SX8_CMD_ENABLE_IQOUTPUT;

		cmd.demod = state->demod;

		cmd.output = 0;

		mci_cmd(state, &cmd, NULL);

drivers/media/pci/ddbridge/ddbridge-mci.h

+28 −28
Original line number Diff line number Diff line
@@ -71,12 +71,12 @@ 
#define SX8_CMD_INPUT_DISABLE    (0x41)

#define SX8_CMD_START_IQ         (0x42)

#define SX8_CMD_STOP_IQ          (0x43)

#define SX8_CMD_SELECT_IQOUT    (0x44)

#define SX8_CMD_SELECT_TSOUT    (0x45)

#define SX8_CMD_ENABLE_IQOUTPUT  (0x44)

#define SX8_CMD_DISABLE_IQOUTPUT (0x45)



#define SX8_ERROR_UNSUPPORTED   (0x80)

#define MCI_ERROR_UNSUPPORTED    (0x80)



#define SX8_SUCCESS(status)     (status < SX8_ERROR_UNSUPPORTED)

#define MCI_SUCCESS(status)      (status < MCI_ERROR_UNSUPPORTED)



#define SX8_CMD_DIAG_READ8       (0xE0)

#define SX8_CMD_DIAG_READ32      (0xE1)
@@ -141,8 +141,8 @@ struct mci_result { 
			u32 ber_denominator;

		} dvbs2_signal_info;

		struct {

			u8 i_symbol;

			u8 q_symbol;

			s16 i;

			s16 q;

		} dvbs2_signal_iq;

	};

	u32 version[4];

CRA Git | Maintained and supported by SUSTech CRA and CCSE