From: Marko Kohtala Date: Sun, 8 Jan 2006 09:05:06 +0000 (-0800) Subject: [PATCH] parport: bring back an unused phase for ppdev ioctl X-Git-Tag: v2.6.16-rc1~702 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8a33496671e4533aed090793436d58debea6f3a;p=linux-2.6 [PATCH] parport: bring back an unused phase for ppdev ioctl Earlier fix removed unused phase, but that changed the values for other phases. Since these are exposed to userspace through ppdev, it is safer not to change them. Restore the unused phase value. Signed-off-by: Marko Kohtala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/include/linux/parport.h b/include/linux/parport.h index f7ff0b0c40..f67f838a3a 100644 --- a/include/linux/parport.h +++ b/include/linux/parport.h @@ -236,12 +236,14 @@ struct pardevice { /* IEEE1284 information */ -/* IEEE1284 phases */ +/* IEEE1284 phases. These are exposed to userland through ppdev IOCTL + * PP[GS]ETPHASE, so do not change existing values. */ enum ieee1284_phase { IEEE1284_PH_FWD_DATA, IEEE1284_PH_FWD_IDLE, IEEE1284_PH_TERMINATE, IEEE1284_PH_NEGOTIATION, + IEEE1284_PH_HBUSY_DNA, IEEE1284_PH_REV_IDLE, IEEE1284_PH_HBUSY_DAVAIL, IEEE1284_PH_REV_DATA,