Date: Mon, 20 Nov 2006 00:05:05 +0100 (CET) From: Stefan Richter Subject: ieee1394: raw1394: defer feature removal of old isoch interface Known to be affected: - libdc1394: prefers video1394 for now, old-style raw1394 support might be dropped eventually - OpenH323 PWLib, AVC video input module: uses libraw1394's old API Signed-off-by: Stefan Richter Signed-off-by: Dan Dennedy --- Update: defer to June 2007, don't advertise video1394 as alternative Documentation/feature-removal-schedule.txt | 11 ++++++----- drivers/ieee1394/raw1394.c | 17 +++++++++++++++++ 2 files changed, 23 insertions(+), 5 deletions(-) Index: linux/Documentation/feature-removal-schedule.txt =================================================================== --- linux.orig/Documentation/feature-removal-schedule.txt 2006-11-11 12:42:21.000000000 +0100 +++ linux/Documentation/feature-removal-schedule.txt 2006-11-11 15:49:42.000000000 +0100 @@ -30,11 +30,12 @@ Who: Adrian Bunk --------------------------- What: raw1394: requests of type RAW1394_REQ_ISO_SEND, RAW1394_REQ_ISO_LISTEN -When: November 2006 -Why: Deprecated in favour of the new ioctl-based rawiso interface, which is - more efficient. You should really be using libraw1394 for raw1394 - access anyway. -Who: Jody McIntyre +When: June 2007 +Why: Deprecated in favour of the more efficient and robust rawiso interface. + Affected are applications which use the deprecated part of libraw1394 + (raw1394_iso_write, raw1394_start_iso_write, raw1394_start_iso_rcv, + raw1394_stop_iso_rcv) or bypass libraw1394. +Who: Dan Dennedy , Stefan Richter --------------------------- Index: linux/drivers/ieee1394/raw1394.c =================================================================== --- linux.orig/drivers/ieee1394/raw1394.c 2006-11-11 12:42:21.000000000 +0100 +++ linux/drivers/ieee1394/raw1394.c 2006-11-11 14:59:50.000000000 +0100 @@ -99,6 +99,21 @@ static struct hpsb_address_ops arm_ops = static void queue_complete_cb(struct pending_request *req); +#include +static void print_old_iso_deprecation(void) +{ + static pid_t p; + + if (p == current->pid) + return; + p = current->pid; + printk(KERN_WARNING "raw1394: WARNING - Program \"%s\" uses unsupported" + " isochronous request types which will be removed in a next" + " kernel release\n", current->comm); + printk(KERN_WARNING "raw1394: Update your software to use libraw1394's" + " newer interface\n"); +} + static struct pending_request *__alloc_pending_request(gfp_t flags) { struct pending_request *req; @@ -2292,6 +2307,7 @@ static int state_connected(struct file_i return sizeof(struct raw1394_request); case RAW1394_REQ_ISO_SEND: + print_old_iso_deprecation(); return handle_iso_send(fi, req, node); case RAW1394_REQ_ARM_REGISTER: @@ -2310,6 +2326,7 @@ static int state_connected(struct file_i return reset_notification(fi, req); case RAW1394_REQ_ISO_LISTEN: + print_old_iso_deprecation(); handle_iso_listen(fi, req); return sizeof(struct raw1394_request);