summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarko Kohtala <marko.kohtala@gmail.com>2006-01-08 01:05:06 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-08 20:14:07 -0800
commitd8a33496671e4533aed090793436d58debea6f3a (patch)
tree12f8732787f815941c8151123988e709a54e19b3
parentd1c4ac408fbab78a5f89ff583b68d2d11b421bb3 (diff)
downloadop-kernel-dev-d8a33496671e4533aed090793436d58debea6f3a.zip
op-kernel-dev-d8a33496671e4533aed090793436d58debea6f3a.tar.gz
[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 <marko.kohtala@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/linux/parport.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/parport.h b/include/linux/parport.h
index f7ff0b0..f67f838 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,
OpenPOWER on IntegriCloud