54c54
< __FBSDID("$FreeBSD: head/sys/dev/ppbus/lpt.c 184164 2008-10-22 15:00:22Z jhb $");
---
> __FBSDID("$FreeBSD: head/sys/dev/ppbus/lpt.c 185003 2008-11-16 17:42:02Z jhb $");
90c90
< #define lprintf(args)
---
> #define lprintf(args)
92c92
< #define lprintf(args) \
---
> #define lprintf(args) \
116,121c116,121
< #define LP_POS_INIT 0x04 /* if we are a postive init signal */
< #define LP_POS_ACK 0x08 /* if we are a positive going ack */
< #define LP_NO_PRIME 0x10 /* don't prime the printer at all */
< #define LP_PRIMEOPEN 0x20 /* prime on every open */
< #define LP_AUTOLF 0x40 /* tell printer to do an automatic lf */
< #define LP_BYPASS 0x80 /* bypass printer ready checks */
---
> #define LP_POS_INIT 0x04 /* if we are a postive init signal */
> #define LP_POS_ACK 0x08 /* if we are a positive going ack */
> #define LP_NO_PRIME 0x10 /* don't prime the printer at all */
> #define LP_PRIMEOPEN 0x20 /* prime on every open */
> #define LP_AUTOLF 0x40 /* tell printer to do an automatic lf */
> #define LP_BYPASS 0x80 /* bypass printer ready checks */
128,131c128,131
< #define LP_HAS_IRQ 0x01 /* we have an irq available */
< #define LP_USE_IRQ 0x02 /* we are using our irq */
< #define LP_ENABLE_IRQ 0x04 /* enable IRQ on open */
< #define LP_ENABLE_EXT 0x10 /* we shall use advanced mode when possible */
---
> #define LP_HAS_IRQ 0x01 /* we have an irq available */
> #define LP_USE_IRQ 0x02 /* we are using our irq */
> #define LP_ENABLE_IRQ 0x04 /* enable IRQ on open */
> #define LP_ENABLE_EXT 0x10 /* we shall use advanced mode when possible */
136d135
<
139c138
< #define LPT_NAME "lpt" /* our official name */
---
> #define LPT_NAME "lpt" /* our official name */
145c144
< #define DEVTOSOFTC(dev) \
---
> #define DEVTOSOFTC(dev) \
159,162c158,162
< #define LPTOUT (1<<4) /* timeout while not selected */
< #define TOUT (1<<5) /* timeout while not selected */
< #define LPTINIT (1<<6) /* waiting to initialize for open */
< #define INTERRUPTED (1<<7) /* write call was interrupted */
---
> #define LPTOUT (1<<4) /* timeout while not selected */
> #define TOUT (1<<5) /* timeout while not selected */
> #define LPTINIT (1<<6) /* waiting to initialize for open */
> #define INTERRUPTED (1<<7) /* write call was interrupted */
> #define HAVEBUS (1<<8) /* the driver owns the bus */
164,166d163
< #define HAVEBUS (1<<8) /* the driver owns the bus */
<
<
168,169c165,166
< #define RDY_MASK (LPS_SEL|LPS_OUT|LPS_NBSY|LPS_NERR) /* ready ? */
< #define LP_READY (LPS_SEL|LPS_NBSY|LPS_NERR)
---
> #define RDY_MASK (LPS_SEL|LPS_OUT|LPS_NBSY|LPS_NERR) /* ready ? */
> #define LP_READY (LPS_SEL|LPS_NBSY|LPS_NERR)
506c503
< if((sc->sc_flags & LP_PRIMEOPEN) || sc->sc_primed == 0) {
---
> if ((sc->sc_flags & LP_PRIMEOPEN) || sc->sc_primed == 0) {
585c582
< device_t ppbus = device_get_parent(lptdev);
---
> device_t ppbus = device_get_parent(lptdev);
597c594
< if((!(sc->sc_state & INTERRUPTED)) && (sc->sc_irq & LP_USE_IRQ))
---
> if ((!(sc->sc_state & INTERRUPTED)) && (sc->sc_irq & LP_USE_IRQ))
693c690
< device_t ppbus = device_get_parent(lptdev);
---
> device_t ppbus = device_get_parent(lptdev);
739c736
< device_t ppbus = device_get_parent(lptdev);
---
> device_t ppbus = device_get_parent(lptdev);
741c738
< if(sc->sc_flags & LP_BYPASS) {
---
> if (sc->sc_flags & LP_BYPASS) {
780c777
< sc->sc_state |= INTERRUPTED;
---
> sc->sc_state |= INTERRUPTED;
809c806
< if(!(sc->sc_irq & LP_USE_IRQ) && (sc->sc_xfercnt)) {
---
> if (!(sc->sc_irq & LP_USE_IRQ) && (sc->sc_xfercnt)) {
831d827
<
836c832
< device_t ppbus = device_get_parent(lptdev);
---
> device_t ppbus = device_get_parent(lptdev);
840c836
<
---
>
856c852
< sc->sc_backoff = hz/LPTOUTINITIAL;
---
> sc->sc_backoff = hz / LPTOUTINITIAL;
867c863,864
< if(--(sc->sc_xfercnt) > 0) return;
---
> if (--(sc->sc_xfercnt) > 0)
> return;
876c873
< if(!(sc->sc_state & INTERRUPTED))
---
> if (!(sc->sc_state & INTERRUPTED))
881c878
< if(((sts & (LPS_NERR | LPS_OUT) ) != LPS_NERR) &&
---
> if (((sts & (LPS_NERR | LPS_OUT) ) != LPS_NERR) &&
910c907
< if(sc->sc_irq & LP_HAS_IRQ) {
---
> if (sc->sc_irq & LP_HAS_IRQ) {
942c939
<
---
>