kern/170076: [PATCH] lpt: check readiness with predefined macros

[Arvydas Sidorenko]

>Number:         170076
>Category:       kern
>Synopsis:       [PATCH] lpt: check readiness with predefined macros
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 22 21:10:10 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Arvydas Sidorenko
>Release:        
>Organization:
>Environment:
>Description:

>How-To-Repeat:

>Fix:
>From cd8ed3e8a1f2d2ebb618e697c432d9fcf85f13a7 Mon Sep 17 00:00:00 2001
From: Arvydas Sidorenko <asido4 at gmail.com>
Date: Fri, 20 Jul 2012 01:28:52 +0200
Subject: [PATCH] lpt: check readiness with predefined macros

Signed-off-by: Arvydas Sidorenko <asido4 at gmail.com>
---
 sys/dev/ppbus/lpt.c |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c
index 3a28efd2..8d89323 100644
--- a/sys/dev/ppbus/lpt.c
+++ b/sys/dev/ppbus/lpt.c
@@ -242,8 +242,7 @@ lpt_port_test(device_t ppbus, u_char data, u_char mask)
 	do {
 		DELAY(10);
 		temp = ppb_rdtr(ppbus) & mask;
-	}
-	while (temp != data && --timeout);
+	} while (temp != data && --timeout);
 	lprintf(("out=%x\tin=%x\ttout=%d\n", data, temp, timeout));
 	return (temp == data);
 }
@@ -564,9 +563,7 @@ lptopen(struct cdev *dev, int flags, int fmt, struct thread *td)
 		}
 
 		/* is printer online and ready for output */
-	} while ((ppb_rstr(ppbus) &
-			(LPS_SEL|LPS_OUT|LPS_NBSY|LPS_NERR)) !=
-					(LPS_SEL|LPS_NBSY|LPS_NERR));
+	} while ((ppb_rstr(ppbus) & RDY_MASK) != LP_READY);
 
 	sc->sc_control = LPC_SEL|LPC_NINIT;
 	if (sc->sc_flags & LP_AUTOLF)
@@ -623,9 +620,7 @@ lptclose(struct cdev *dev, int flags, int fmt, struct thread *td)
 
 	/* if the last write was interrupted, don't complete it */
 	if ((!(sc->sc_state  & INTERRUPTED)) && (sc->sc_irq & LP_USE_IRQ))
-		while ((ppb_rstr(ppbus) &
-			(LPS_SEL|LPS_OUT|LPS_NBSY|LPS_NERR)) !=
-			(LPS_SEL|LPS_NBSY|LPS_NERR) || sc->sc_xfercnt)
+		while (((ppb_rstr(ppbus) & RDY_MASK) != LP_READY) || sc->sc_xfercnt)
 			/* wait 1 second, give up if we get a signal */
 			if (ppb_sleep(ppbus, lptdev, LPPRI | PCATCH, "lpclose",
 			    hz) != EWOULDBLOCK)
-- 
1.7.8.6


>Release-Note:
>Audit-Trail:
>Unformatted: