Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2631.git;a=commitdiff;h=d29a5d5825f59bcf3cecd2f71646017c45e7d91f
commit d29a5d5825f59bcf3cecd2f71646017c45e7d91f Author: Miklos Vajna <vmik...@frugalware.org> Date: Fri Sep 11 14:44:49 2009 +0200 lirc-0.8.5-5-i686 - add kernel-2.6.31.patch diff --git a/source/apps/lirc/FrugalBuild b/source/apps/lirc/FrugalBuild index 60887df..a179efa 100644 --- a/source/apps/lirc/FrugalBuild +++ b/source/apps/lirc/FrugalBuild @@ -3,7 +3,7 @@ pkgname=lirc pkgver=0.8.5 -pkgrel=4 +pkgrel=5 pkgdesc="LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls." url="http://www.lirc.org/"; Finclude kernel-module sourceforge @@ -21,7 +21,7 @@ groups=('apps') archs=('i686' 'x86_64') backup=(etc/lirc{d,md}.conf etc/sysconfig/lirc) source=(${sour...@]} rc.lirc lirc.logrotate lirc.sysconfig README.Frugalware \ - lirc-fix-conditional-ftdi.patch) + lirc-fix-conditional-ftdi.patch kernel-2.6.31.patch) unset install build() { @@ -56,6 +56,7 @@ sha1sums=('2ee0f0e74cf4f80c8a533ce1d0c33c78aa705127' \ '4342b004eb53d51fcbb9af2cf136bb4990874608' \ '504e0cd04780e75b6a8ab6836815c1ed9058db78' \ '0b80c73e902920c028dca98a9006aaa313c6e120' \ - '91b50e945a313ffdbc86bdab464d6b3f8ffbada7') + '91b50e945a313ffdbc86bdab464d6b3f8ffbada7' \ + 'b5835cfa988d8a6e6b54b2bfe77163a2a6599253') # optimization OK diff --git a/source/apps/lirc/kernel-2.6.31.patch b/source/apps/lirc/kernel-2.6.31.patch new file mode 100644 index 0000000..a4fdd46 --- /dev/null +++ b/source/apps/lirc/kernel-2.6.31.patch @@ -0,0 +1,185 @@ +diff --git a/drivers/lirc_i2c/lirc_i2c.c b/drivers/lirc_i2c/lirc_i2c.c +index c848fea..f9bc588 100644 +--- a/drivers/lirc_i2c/lirc_i2c.c ++++ b/drivers/lirc_i2c/lirc_i2c.c +@@ -361,12 +361,24 @@ static struct lirc_driver lirc_template = { + .owner = THIS_MODULE, + }; + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) + static int ir_attach(struct i2c_adapter *adap, int addr, + unsigned short flags, int kind); +-static int ir_detach(struct i2c_client *client); + static int ir_probe(struct i2c_adapter *adap); ++# else ++static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id); ++#endif ++static int ir_remove(struct i2c_client *client); + static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31) ++static const struct i2c_device_id ir_receiver_id[] = { ++ /* Generic entry for any IR receiver */ ++ { "ir_video", 0 }, ++ /* IR device specific entries could be added here */ ++ { } ++}; ++#endif + static struct i2c_driver driver = { + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 16) + .name = "i2c ir driver", +@@ -378,34 +390,80 @@ static struct i2c_driver driver = { + }, + #endif + .id = I2C_DRIVERID_EXP3, /* FIXME */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) + .attach_adapter = ir_probe, +- .detach_client = ir_detach, ++ .detach_client = ir_remove, ++#else ++ .probe = ir_probe, ++ .remove = ir_remove, ++ .id_table = ir_receiver_id, ++#endif + .command = ir_command, + }; + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) + static struct i2c_client client_template = { + .name = "unset", + .driver = &driver + }; ++#endif + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) + static int ir_attach(struct i2c_adapter *adap, int addr, + unsigned short flags, int kind) ++#else ++static void pcf_probe(struct i2c_client *client, struct IR *ir) ++{ ++ int ret1, ret2, ret3, ret4; ++ ++ ret1 = i2c_smbus_write_byte(client, 0xff); ++ ret2 = i2c_smbus_read_byte(client); ++ ret3 = i2c_smbus_write_byte(client, 0x00); ++ ret4 = i2c_smbus_read_byte(client); ++ ++ /* in the Asus TV-Box: bit 1-0 */ ++ if (((ret2 & 0x03) == 0x03) && ((ret4 & 0x03) == 0x00)) { ++ ir->bits = (unsigned char) ~0x07; ++ ir->flag = 0x04; ++ /* in the Creative/VisionTek BreakOut-Box: bit 7-6 */ ++ } else if (((ret2 & 0xc0) == 0xc0) && ((ret4 & 0xc0) == 0x00)) { ++ ir->bits = (unsigned char) ~0xe0; ++ ir->flag = 0x20; ++ } ++ ++ return; ++} ++ ++static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) ++#endif + { + struct IR *ir; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) + int err, retval; + + client_template.adapter = adap; + client_template.addr = addr; ++#else ++ struct i2c_adapter *adap = client->adapter; ++ unsigned short addr = client->addr; ++ int retval; ++#endif + + ir = kmalloc(sizeof(struct IR), GFP_KERNEL); + if (!ir) + return -ENOMEM; + memcpy(&ir->l, &lirc_template, sizeof(struct lirc_driver)); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) + memcpy(&ir->c, &client_template, sizeof(struct i2c_client)); + + ir->c.adapter = adap; + ir->c.addr = addr; + i2c_set_clientdata(&ir->c, ir); ++#else ++ memcpy(&ir->c, client, sizeof(struct i2c_client)); ++ ++ i2c_set_clientdata(client, ir); ++#endif + ir->l.data = ir; + ir->l.minor = minor; + ir->l.sample_rate = 10; +@@ -470,11 +528,15 @@ static int ir_attach(struct i2c_adapter *adap, int addr, + break; + case 0x21: + case 0x23: ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) ++ ir->bits = flags & 0xff; ++ ir->flag = (flags >> 8) & 0xff; ++#else ++ pcf_probe(client, ir); ++#endif + strlcpy(ir->c.name, "TV-Box IR", I2C_NAME_SIZE); + ir->l.code_length = 8; + ir->l.add_to_buf = add_to_buf_pcf8574; +- ir->bits = flags & 0xff; +- ir->flag = (flags >> 8) & 0xff; + break; + default: + /* shouldn't happen */ +@@ -485,18 +547,22 @@ static int ir_attach(struct i2c_adapter *adap, int addr, + printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n", + adap->id, addr, ir->c.name); + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) + /* register device */ + err = i2c_attach_client(&ir->c); + if (err) { + kfree(ir); + return err; + } ++#endif + + retval = lirc_register_driver(&ir->l); + + if (retval < 0) { + printk(KERN_ERR "lirc_i2c: failed to register driver!\n"); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) + i2c_detach_client(&ir->c); ++#endif + kfree(ir); + return retval; + } +@@ -506,19 +572,22 @@ static int ir_attach(struct i2c_adapter *adap, int addr, + return 0; + } + +-static int ir_detach(struct i2c_client *client) ++static int ir_remove(struct i2c_client *client) + { + struct IR *ir = i2c_get_clientdata(client); + + /* unregister device */ + lirc_unregister_driver(ir->l.minor); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) + i2c_detach_client(&ir->c); ++#endif + + /* free memory */ + kfree(ir); + return 0; + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) + static int ir_probe(struct i2c_adapter *adap) + { + /* +@@ -656,6 +725,7 @@ attach_fail: + return rc; + + } ++#endif + + static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg) + { _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
