diff options
| author | bde <bde@FreeBSD.org> | 1995-12-22 15:39:45 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1995-12-22 15:39:45 +0000 |
| commit | 21be36c769fe438ab27f0e577d82c2c5b7a6fb61 (patch) | |
| tree | 3845317c7d4c5f441697689c31a228480fbc29b6 /sys/i386/isa/asc.c | |
| parent | bc17df0725c0256cd32f5c43819dbc0348be2162 (diff) | |
| download | FreeBSD-src-21be36c769fe438ab27f0e577d82c2c5b7a6fb61.zip FreeBSD-src-21be36c769fe438ab27f0e577d82c2c5b7a6fb61.tar.gz | |
Renamed private DEBUG macro to avoid warnings when DEBUG is an option.
Diffstat (limited to 'sys/i386/isa/asc.c')
| -rw-r--r-- | sys/i386/isa/asc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/i386/isa/asc.c b/sys/i386/isa/asc.c index f075808..4b89e9b 100644 --- a/sys/i386/isa/asc.c +++ b/sys/i386/isa/asc.c @@ -34,7 +34,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* - * $Id: asc.c,v 1.12 1995/12/15 00:29:27 bde Exp $ + * $Id: asc.c,v 1.13 1995/12/16 21:32:19 bde Exp $ */ #include "asc.h" @@ -165,7 +165,7 @@ struct asc_unit { #define SLEEPING 0x10 #define SEL_COLL 0x20 #define PBM_MODE 0x40 -#define DEBUG 0x80 +#define FLAG_DEBUG 0x80 int geometry; /* resolution as geomtab index */ int linesize; /* length of one scan line (from geom.table) */ int blen; /* length of buffer in lines */ @@ -394,7 +394,7 @@ ascprobe (struct isa_device *isdp) int stb; scu->base = isdp->id_iobase; /*** needed by the following macros ***/ - scu->flags = DEBUG; + scu->flags = FLAG_DEBUG; if ( isdp->id_iobase < 0 ) { lprintf("asc%d.probe: no iobase given\n", unit); @@ -444,7 +444,7 @@ ascprobe (struct isa_device *isdp) asc_reset(scu); /* lprintf("asc%d.probe: ok\n", unit); */ - scu->flags &= ~DEBUG; + scu->flags &= ~FLAG_DEBUG; scu->icnt = 0; return PROBE_SUCCESS; } @@ -464,7 +464,7 @@ ascattach(struct isa_device *isdp) char name[32]; #endif - scu->flags |= DEBUG; + scu->flags |= FLAG_DEBUG; printf("asc%d: [GI1904/Trust Ami-Scan Grey, type S2]\n", unit); /* initialize buffer structure */ @@ -474,7 +474,7 @@ ascattach(struct isa_device *isdp) scu->flags |= ATTACHED; /* lprintf("asc%d.attach: ok\n", unit); */ - scu->flags &= ~DEBUG; + scu->flags &= ~FLAG_DEBUG; #ifdef FREEBSD_1_X scu->selp = (pid_t)0; @@ -585,7 +585,7 @@ ascopen(dev_t dev, int flags, int fmt, struct proc *p) } scu->flags = ATTACHED | OPEN; - if ( minor(dev) & DBUG_MASK ) scu->flags |= DEBUG; + if ( minor(dev) & DBUG_MASK ) scu->flags |= FLAG_DEBUG; switch(minor(dev) & FRMT_MASK) { case FRMT_PBM: @@ -671,7 +671,7 @@ ascclose(dev_t dev, int flags, int fmt, struct proc *p) scu->sbuf.size = INVALID; scu->sbuf.rptr = INVALID; - scu->flags &= ~(DEBUG | OPEN | READING); + scu->flags &= ~(FLAG_DEBUG | OPEN | READING); return SUCCESS; } @@ -739,7 +739,7 @@ ascread(dev_t dev, struct uio *uio, int ioflag) if ( res == 0 ) res = SUCCESS; } splx(sps); /* lower priority... */ - if (scu->flags & DEBUG) + if (scu->flags & FLAG_DEBUG) tsleep((caddr_t)scu, ASCPRI | PCATCH, "ascdly",hz); lprintf("asc%d.read(after): " "sz 0x%x, rptr 0x%x, wptr 0x%x, cnt 0x%x bcnt 0x%x flags 0x%x icnt %d\n", |
