diff --git a/packages/linux/patches/linux-2.6.36.2-051_add_ite-cir_driver-0.1.patch b/packages/linux/linux-2.6.36.2-051_add_ite-cir_driver-0.2.patch similarity index 99% rename from packages/linux/patches/linux-2.6.36.2-051_add_ite-cir_driver-0.1.patch rename to packages/linux/linux-2.6.36.2-051_add_ite-cir_driver-0.2.patch index 50ab76d383..307255ab74 100644 --- a/packages/linux/patches/linux-2.6.36.2-051_add_ite-cir_driver-0.1.patch +++ b/packages/linux/linux-2.6.36.2-051_add_ite-cir_driver-0.2.patch @@ -1,6 +1,6 @@ diff -Naur linux-2.6.36.2/drivers/media/IR/ite-cir.c linux-2.6.36.2.patch/drivers/media/IR/ite-cir.c --- linux-2.6.36.2/drivers/media/IR/ite-cir.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2.patch/drivers/media/IR/ite-cir.c 2010-12-11 22:21:11.644823047 +0100 ++++ linux-2.6.36.2.patch/drivers/media/IR/ite-cir.c 2010-12-11 23:43:35.587999217 +0100 @@ -0,0 +1,1334 @@ +/* + * Driver for ITE Tech Inc. IT8712F/IT8512 CIR @@ -807,7 +807,7 @@ diff -Naur linux-2.6.36.2/drivers/media/IR/ite-cir.c linux-2.6.36.2.patch/driver + + +/* set the rx carrier freq range, guess it's in Hz... */ -+static int ite_set_rx_carrier_range(struct rc_dev *rcdev, u32 carrier_low, u32 ++static int ite_set_rx_carrier_range(struct ir_dev *rcdev, u32 carrier_low, u32 + carrier_high) +{ + unsigned long flags; @@ -824,7 +824,7 @@ diff -Naur linux-2.6.36.2/drivers/media/IR/ite-cir.c linux-2.6.36.2.patch/driver + + +/* set the tx carrier freq, guess it's in Hz... */ -+static int ite_set_tx_carrier(struct rc_dev *rcdev, u32 carrier) ++static int ite_set_tx_carrier(struct ir_dev *rcdev, u32 carrier) +{ + unsigned long flags; + struct ite_dev *dev = rcdev->priv; @@ -838,7 +838,7 @@ diff -Naur linux-2.6.36.2/drivers/media/IR/ite-cir.c linux-2.6.36.2.patch/driver +} + +/* set the tx duty cycle by controlling the pulse width */ -+static int ite_set_tx_duty_cycle(struct rc_dev *rcdev, u32 duty_cycle) ++static int ite_set_tx_duty_cycle(struct ir_dev *rcdev, u32 duty_cycle) +{ + unsigned long flags; + struct ite_dev *dev = rcdev->priv; @@ -854,7 +854,7 @@ diff -Naur linux-2.6.36.2/drivers/media/IR/ite-cir.c linux-2.6.36.2.patch/driver +/* transmit out IR pulses; what you get here is a batch of alternating + * pulse/space/pulse/space lengths that we should write out completely through + * the FIFO, blocking on a full FIFO */ -+static int ite_tx_ir(struct rc_dev *rcdev, int *txbuf, u32 n) ++static int ite_tx_ir(struct ir_dev *rcdev, int *txbuf, u32 n) +{ + unsigned long flags; + struct ite_dev *dev = rcdev->priv; @@ -1000,7 +1000,7 @@ diff -Naur linux-2.6.36.2/drivers/media/IR/ite-cir.c linux-2.6.36.2.patch/driver +} + +/* idle the receiver if needed */ -+static void ite_s_idle(struct rc_dev *rcdev, bool enable) ++static void ite_s_idle(struct ir_dev *rcdev, bool enable) +{ + unsigned long flags; + struct ite_dev *dev = rcdev->priv; @@ -1015,7 +1015,7 @@ diff -Naur linux-2.6.36.2/drivers/media/IR/ite-cir.c linux-2.6.36.2.patch/driver +} + +/* activate the device for use */ -+static int ite_open(struct rc_dev *rcdev) ++static int ite_open(struct ir_dev *rcdev) +{ + struct ite_dev *dev = rcdev->priv; + unsigned long flags; @@ -1034,7 +1034,7 @@ diff -Naur linux-2.6.36.2/drivers/media/IR/ite-cir.c linux-2.6.36.2.patch/driver +} + +/* deactivate the device for use */ -+static void ite_close(struct rc_dev *rcdev) ++static void ite_close(struct ir_dev *rcdev) +{ + struct ite_dev *dev = rcdev->priv; + unsigned long flags; @@ -1060,7 +1060,7 @@ diff -Naur linux-2.6.36.2/drivers/media/IR/ite-cir.c linux-2.6.36.2.patch/driver +{ + const struct ite_dev_params *dev_desc = NULL; + struct ite_dev *itdev = NULL; -+ struct rc_dev *rdev = NULL; ++ struct ir_dev *rdev = NULL; + int ret = -ENOMEM; + int model_no; + @@ -1176,7 +1176,7 @@ diff -Naur linux-2.6.36.2/drivers/media/IR/ite-cir.c linux-2.6.36.2.patch/driver + /* set up ir-core props */ + rdev->priv = itdev; + rdev->driver_type = RC_DRIVER_IR_RAW; -+ rdev->allowed_protos = RC_TYPE_ALL; ++ rdev->allowed_protos = IR_TYPE_ALL; + rdev->open = ite_open; + rdev->close = ite_close; + rdev->s_idle = ite_s_idle; @@ -1338,7 +1338,7 @@ diff -Naur linux-2.6.36.2/drivers/media/IR/ite-cir.c linux-2.6.36.2.patch/driver +module_exit(ite_exit); diff -Naur linux-2.6.36.2/drivers/media/IR/ite-cir.h linux-2.6.36.2.patch/drivers/media/IR/ite-cir.h --- linux-2.6.36.2/drivers/media/IR/ite-cir.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.36.2.patch/drivers/media/IR/ite-cir.h 2010-12-11 22:18:26.839935455 +0100 ++++ linux-2.6.36.2.patch/drivers/media/IR/ite-cir.h 2010-12-11 22:53:05.359095723 +0100 @@ -0,0 +1,446 @@ +/* + * Driver for ITE Tech Inc. IT8712F/IT8512F CIR @@ -1465,7 +1465,7 @@ diff -Naur linux-2.6.36.2/drivers/media/IR/ite-cir.h linux-2.6.36.2.patch/driver +/* ITE CIR device structure */ +struct ite_dev { + struct pnp_dev *pdev; -+ struct rc_dev *rdev; ++ struct ir_dev *rdev; + struct ir_raw_event rawir; + + /* sync data */ @@ -1788,7 +1788,7 @@ diff -Naur linux-2.6.36.2/drivers/media/IR/ite-cir.h linux-2.6.36.2.patch/driver +#define IT8708_CGPINT 0x01 diff -Naur linux-2.6.36.2/drivers/media/IR/Kconfig linux-2.6.36.2.patch/drivers/media/IR/Kconfig --- linux-2.6.36.2/drivers/media/IR/Kconfig 2010-12-09 23:17:27.000000000 +0100 -+++ linux-2.6.36.2.patch/drivers/media/IR/Kconfig 2010-12-11 22:18:02.932662125 +0100 ++++ linux-2.6.36.2.patch/drivers/media/IR/Kconfig 2010-12-11 22:50:14.406094135 +0100 @@ -127,6 +127,19 @@ To compile this driver as a module, choose M here: the module will be called ene_ir.