From owner-freebsd-multimedia@FreeBSD.ORG Sun Feb 20 11:37:25 2011 Return-Path: Delivered-To: multimedia@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 607331065674 for ; Sun, 20 Feb 2011 11:37:25 +0000 (UTC) (envelope-from nox@jelal.kn-bremen.de) Received: from smtp.kn-bremen.de (gelbbaer.kn-bremen.de [78.46.108.116]) by mx1.freebsd.org (Postfix) with ESMTP id 234078FC0C for ; Sun, 20 Feb 2011 11:37:24 +0000 (UTC) Received: by smtp.kn-bremen.de (Postfix, from userid 10) id 2ECF21E000CC; Sun, 20 Feb 2011 12:18:29 +0100 (CET) Received: from triton8.kn-bremen.de (noident@localhost [127.0.0.1]) by triton8.kn-bremen.de (8.14.4/8.14.3) with ESMTP id p1KBFWdM022126; Sun, 20 Feb 2011 12:15:32 +0100 (CET) (envelope-from nox@triton8.kn-bremen.de) Received: (from nox@localhost) by triton8.kn-bremen.de (8.14.4/8.14.3/Submit) id p1KBFWMg022125; Sun, 20 Feb 2011 12:15:32 +0100 (CET) (envelope-from nox) From: Juergen Lock Date: Sun, 20 Feb 2011 12:15:32 +0100 To: hselasky@FreeBSD.org Message-ID: <20110220111532.GA20755@triton8.kn-bremen.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Cc: multimedia@FreeBSD.org Subject: Just tested sending ir with the updated lirc and mceusb... X-BeenThere: freebsd-multimedia@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Multimedia discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 11:37:25 -0000 ..and found a few more lirc ioctls that needed fixing (or at least for 64 bit hosts), so here is an update to my remote patch in webcamd svn: Index: patches/lirc-patches.diff =================================================================== --- patches/lirc-patches.diff (revision 1750) +++ patches/lirc-patches.diff (working copy) @@ -1,3 +1,46 @@ +--- ../v4l-dvb/linux/drivers/media/IR/ir-lirc-codec.c.orig ++++ ../v4l-dvb/linux/drivers/media/IR/ir-lirc-codec.c +@@ -104,7 +104,7 @@ static int ir_lirc_ioctl(struct inode *n + struct ir_input_dev *ir_dev; + int ret = 0; + void *drv_data; +- unsigned long val; ++ __u32 val; + + lirc = lirc_get_pdata(filep); + if (!lirc) +@@ -118,7 +118,7 @@ static int ir_lirc_ioctl(struct inode *n + + switch (cmd) { + case LIRC_SET_TRANSMITTER_MASK: +- ret = get_user(val, (unsigned long *)arg); ++ ret = get_user(val, (__u32 *)arg); + if (ret) + return ret; + +@@ -129,7 +129,7 @@ static int ir_lirc_ioctl(struct inode *n + break; + + case LIRC_SET_SEND_CARRIER: +- ret = get_user(val, (unsigned long *)arg); ++ ret = get_user(val, (__u32 *)arg); + if (ret) + return ret; + +@@ -141,11 +141,11 @@ static int ir_lirc_ioctl(struct inode *n + + case LIRC_GET_SEND_MODE: + val = LIRC_CAN_SEND_PULSE & LIRC_CAN_SEND_MASK; +- ret = put_user(val, (unsigned long *)arg); ++ ret = put_user(val, (__u32 *)arg); + break; + + case LIRC_SET_SEND_MODE: +- ret = get_user(val, (unsigned long *)arg); ++ ret = get_user(val, (__u32 *)arg); + if (ret) + return ret; + --- ../v4l-dvb/linux/drivers/media/IR/lirc_dev.c.orig +++ ../v4l-dvb/linux/drivers/media/IR/lirc_dev.c @@ -519,7 +519,7 @@ EXPORT_SYMBOL(lirc_dev_fop_poll); @@ -36,6 +79,33 @@ if (!result && !(LIRC_MODE2REC(mode) & ir->d.features)) result = -EINVAL; /* +@@ -563,7 +563,7 @@ int lirc_dev_fop_ioctl(struct inode *ino + */ + break; + case LIRC_GET_LENGTH: +- result = put_user(ir->d.code_length, (unsigned long *)arg); ++ result = put_user(ir->d.code_length, (__u32 *)arg); + break; + case LIRC_GET_MIN_TIMEOUT: + if (!(ir->d.features & LIRC_CAN_SET_REC_TIMEOUT) || +@@ -572,7 +572,7 @@ int lirc_dev_fop_ioctl(struct inode *ino + break; + } + +- result = put_user(ir->d.min_timeout, (unsigned long *)arg); ++ result = put_user(ir->d.min_timeout, (__u32 *)arg); + break; + case LIRC_GET_MAX_TIMEOUT: + if (!(ir->d.features & LIRC_CAN_SET_REC_TIMEOUT) || +@@ -581,7 +581,7 @@ int lirc_dev_fop_ioctl(struct inode *ino + break; + } + +- result = put_user(ir->d.max_timeout, (unsigned long *)arg); ++ result = put_user(ir->d.max_timeout, (__u32 *)arg); + break; + default: + result = -EINVAL; --- ../v4l-dvb/linux/drivers/media/IR/lirc_dev.h.orig +++ ../v4l-dvb/linux/drivers/media/IR/lirc_dev.h @@ -128,7 +128,7 @@ struct lirc_driver {