Commit a49a7a46 authored by Patrick Lerda's avatar Patrick Lerda Committed by Mauro Carvalho Chehab
Browse files

media: smipcie: add universal ir capability 



smipcie: switch to RC_DRIVER_IR_RAW.

Signed-off-by: default avatarPatrick Lerda <patrick9876@free.fr>
Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent b1f37757

drivers/media/pci/smipcie/smipcie-ir.c

+45 −87
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


#include "smipcie.h"



#define SMI_SAMPLE_PERIOD 83

#define SMI_SAMPLE_IDLEMIN (10000 / SMI_SAMPLE_PERIOD)



static void smi_ir_enableInterrupt(struct smi_rc *ir)

{

	struct smi_dev *dev = ir->dev;
@@ -42,90 +45,38 @@ static void smi_ir_stop(struct smi_rc *ir) 
	struct smi_dev *dev = ir->dev;



	smi_ir_disableInterrupt(ir);

	smi_clear(IR_Init_Reg, 0x80);

	smi_clear(IR_Init_Reg, rbIRen);

}



#define BITS_PER_COMMAND 14

#define GROUPS_PER_BIT 2

#define IR_RC5_MIN_BIT 36

#define IR_RC5_MAX_BIT 52

static u32 smi_decode_rc5(u8 *pData, u8 size)

static void smi_raw_process(struct rc_dev *rc_dev, const u8 *buffer,

			    const u8 length)

{

	u8 index, current_bit, bit_count;

	u8 group_array[BITS_PER_COMMAND * GROUPS_PER_BIT + 4];

	u8 group_index = 0;

	u32 command = 0xFFFFFFFF;



	group_array[group_index++] = 1;



	for (index = 0; index < size; index++) {



		current_bit = (pData[index] & 0x80) ? 1 : 0;

		bit_count = pData[index] & 0x7f;



		if ((current_bit == 1) && (bit_count >= 2*IR_RC5_MAX_BIT + 1)) {

			goto process_code;

		} else if ((bit_count >= IR_RC5_MIN_BIT) &&

			   (bit_count <= IR_RC5_MAX_BIT)) {

				group_array[group_index++] = current_bit;

		} else if ((bit_count > IR_RC5_MAX_BIT) &&

			   (bit_count <= 2*IR_RC5_MAX_BIT)) {

				group_array[group_index++] = current_bit;

				group_array[group_index++] = current_bit;

		} else {

			goto invalid_timing;

		}

		if (group_index >= BITS_PER_COMMAND*GROUPS_PER_BIT)

			goto process_code;



		if ((group_index == BITS_PER_COMMAND*GROUPS_PER_BIT - 1)

		    && (group_array[group_index-1] == 0)) {

			group_array[group_index++] = 1;

			goto process_code;

		}

	}



process_code:

	if (group_index == (BITS_PER_COMMAND*GROUPS_PER_BIT-1))

		group_array[group_index++] = 1;

	struct ir_raw_event rawir = {};

	int cnt;



	if (group_index == BITS_PER_COMMAND*GROUPS_PER_BIT) {

		command = 0;

		for (index = 0; index < (BITS_PER_COMMAND*GROUPS_PER_BIT);

		     index = index + 2) {

			if ((group_array[index] == 1) &&

			    (group_array[index+1] == 0)) {

				command |= (1 << (BITS_PER_COMMAND -

						   (index/2) - 1));

			} else if ((group_array[index] == 0) &&

				   (group_array[index+1] == 1)) {

				/* */

			} else {

				command = 0xFFFFFFFF;

				goto invalid_timing;

	for (cnt = 0; cnt < length; cnt++) {

		if (buffer[cnt] & 0x7f) {

			rawir.pulse = (buffer[cnt] & 0x80) == 0;

			rawir.duration = ((buffer[cnt] & 0x7f) +

					 (rawir.pulse ? 0 : -1)) *

					 rc_dev->rx_resolution;

			ir_raw_event_store_with_filter(rc_dev, &rawir);

		}

	}

}



invalid_timing:

	return command;

}



static void smi_ir_decode(struct work_struct *work)

static void smi_ir_decode(struct smi_rc *ir)

{

	struct smi_rc *ir = container_of(work, struct smi_rc, work);

	struct smi_dev *dev = ir->dev;

	struct rc_dev *rc_dev = ir->rc_dev;

	u32 dwIRControl, dwIRData, dwIRCode, scancode;

	u8 index, ucIRCount, readLoop, rc5_command, rc5_system, toggle;

	u32 dwIRControl, dwIRData;

	u8 index, ucIRCount, readLoop;



	dwIRControl = smi_read(IR_Init_Reg);



	if (dwIRControl & rbIRVld) {

		ucIRCount = (u8) smi_read(IR_Data_Cnt);



		if (ucIRCount < 4)

			goto end_ir_decode;



		readLoop = ucIRCount/4;

		if (ucIRCount % 4)

			readLoop += 1;
@@ -137,19 +88,21 @@ static void smi_ir_decode(struct work_struct *work) 
			ir->irData[index*4 + 2] = (u8)(dwIRData >> 16);

			ir->irData[index*4 + 3] = (u8)(dwIRData >> 24);

		}

		dwIRCode = smi_decode_rc5(ir->irData, ucIRCount);



		if (dwIRCode != 0xFFFFFFFF) {

			rc5_command = dwIRCode & 0x3F;

			rc5_system = (dwIRCode & 0x7C0) >> 6;

			toggle = (dwIRCode & 0x800) ? 1 : 0;

			scancode = rc5_system << 8 | rc5_command;

			rc_keydown(rc_dev, RC_PROTO_RC5, scancode, toggle);

		smi_raw_process(rc_dev, ir->irData, ucIRCount);

		smi_set(IR_Init_Reg, rbIRVld);

	}



	if (dwIRControl & rbIRhighidle) {

		struct ir_raw_event rawir = {};



		rawir.pulse = 0;

		rawir.duration = US_TO_NS(SMI_SAMPLE_PERIOD *

					  SMI_SAMPLE_IDLEMIN);

		ir_raw_event_store_with_filter(rc_dev, &rawir);

		smi_set(IR_Init_Reg, rbIRhighidle);

	}

end_ir_decode:

	smi_set(IR_Init_Reg, 0x04);

	smi_ir_enableInterrupt(ir);



	ir_raw_event_handle(rc_dev);

}



/* ir functions call by main driver.*/
@@ -160,7 +113,8 @@ int smi_ir_irq(struct smi_rc *ir, u32 int_status) 
	if (int_status & IR_X_INT) {

		smi_ir_disableInterrupt(ir);

		smi_ir_clearInterrupt(ir);

		schedule_work(&ir->work);

		smi_ir_decode(ir);

		smi_ir_enableInterrupt(ir);

		handled = 1;

	}

	return handled;
@@ -170,9 +124,11 @@ void smi_ir_start(struct smi_rc *ir) 
{

	struct smi_dev *dev = ir->dev;



	smi_write(IR_Idle_Cnt_Low, 0x00140070);

	smi_write(IR_Idle_Cnt_Low,

		  (((SMI_SAMPLE_PERIOD - 1) & 0xFFFF) << 16) |

		  (SMI_SAMPLE_IDLEMIN & 0xFFFF));

	msleep(20);

	smi_set(IR_Init_Reg, 0x90);

	smi_set(IR_Init_Reg, rbIRen | rbIRhighidle);



	smi_ir_enableInterrupt(ir);

}
@@ -183,7 +139,7 @@ int smi_ir_init(struct smi_dev *dev) 
	struct rc_dev *rc_dev;

	struct smi_rc *ir = &dev->ir;



	rc_dev = rc_allocate_device(RC_DRIVER_SCANCODE);

	rc_dev = rc_allocate_device(RC_DRIVER_IR_RAW);

	if (!rc_dev)

		return -ENOMEM;
@@ -193,6 +149,7 @@ int smi_ir_init(struct smi_dev *dev) 
	snprintf(ir->input_phys, sizeof(ir->input_phys), "pci-%s/ir0",

		 pci_name(dev->pci_dev));



	rc_dev->allowed_protocols = RC_PROTO_BIT_ALL_IR_DECODER;

	rc_dev->driver_name = "SMI_PCIe";

	rc_dev->input_phys = ir->input_phys;

	rc_dev->device_name = ir->device_name;
@@ -203,11 +160,12 @@ int smi_ir_init(struct smi_dev *dev) 
	rc_dev->dev.parent = &dev->pci_dev->dev;



	rc_dev->map_name = dev->info->rc_map;

	rc_dev->timeout = MS_TO_NS(100);

	rc_dev->rx_resolution = US_TO_NS(SMI_SAMPLE_PERIOD);



	ir->rc_dev = rc_dev;

	ir->dev = dev;



	INIT_WORK(&ir->work, smi_ir_decode);

	smi_ir_disableInterrupt(ir);



	ret = rc_register_device(rc_dev);

drivers/media/pci/smipcie/smipcie.h

+0 −1
Original line number Diff line number Diff line
@@ -241,7 +241,6 @@ struct smi_rc { 
	struct rc_dev *rc_dev;

	char input_phys[64];

	char device_name[64];

	struct work_struct work;

	u8 irData[256];



	int users;

CRA Git | Maintained and supported by SUSTech CRA and CCSE