diff options
| -rw-r--r-- | sys/dev/aac/aac.c | 5 | ||||
| -rw-r--r-- | sys/dev/aac/aac_ioctl.h | 3 | ||||
| -rw-r--r-- | sys/dev/aac/aacvar.h | 3 | ||||
| -rw-r--r-- | sys/sys/aac_ioctl.h | 3 |
4 files changed, 5 insertions, 9 deletions
diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c index 7be607b..2fec4cf 100644 --- a/sys/dev/aac/aac.c +++ b/sys/dev/aac/aac.c @@ -840,7 +840,7 @@ aac_complete(void *context, int pending) &fib)) break; /* nothing to do */ - /* get the command, unmap and queue for later processing */ + /* get the command, unmap and hand off for processing */ cm = sc->aac_commands + fib->Header.SenderData; if (cm == NULL) { AAC_PRINT_FIB(sc, fib); @@ -848,7 +848,7 @@ aac_complete(void *context, int pending) } aac_remove_busy(cm); - aac_unmap_command(cm); /* XXX defer? */ + aac_unmap_command(cm); cm->cm_flags |= AAC_CMD_COMPLETED; /* is there a completion handler? */ @@ -2401,7 +2401,6 @@ aac_ioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, d_thread_t *td) case AACQ_BIO: case AACQ_READY: case AACQ_BUSY: - case AACQ_COMPLETE: bcopy(&sc->aac_qstat[as->as_item], &as->as_qstat, sizeof(struct aac_qstat)); break; diff --git a/sys/dev/aac/aac_ioctl.h b/sys/dev/aac/aac_ioctl.h index 9dac2ab..f01cf70 100644 --- a/sys/dev/aac/aac_ioctl.h +++ b/sys/dev/aac/aac_ioctl.h @@ -35,8 +35,7 @@ #define AACQ_BIO 1 #define AACQ_READY 2 #define AACQ_BUSY 3 -#define AACQ_COMPLETE 4 -#define AACQ_COUNT 5 /* total number of queues */ +#define AACQ_COUNT 4 /* total number of queues */ struct aac_qstat { u_int32_t q_length; diff --git a/sys/dev/aac/aacvar.h b/sys/dev/aac/aacvar.h index a094f8b..f2ee0f3 100644 --- a/sys/dev/aac/aacvar.h +++ b/sys/dev/aac/aacvar.h @@ -165,8 +165,7 @@ struct aac_command #define AAC_ON_AACQ_FREE (1<<5) #define AAC_ON_AACQ_READY (1<<6) #define AAC_ON_AACQ_BUSY (1<<7) -#define AAC_ON_AACQ_COMPLETE (1<<8) -#define AAC_ON_AACQ_MASK ((1<<5)|(1<<6)|(1<<7)|(1<<8)) +#define AAC_ON_AACQ_MASK ((1<<5)|(1<<6)|(1<<7)) #define AAC_QUEUE_FRZN (1<<9) /* Freeze the processing of * commands on the queue. */ diff --git a/sys/sys/aac_ioctl.h b/sys/sys/aac_ioctl.h index 9dac2ab..f01cf70 100644 --- a/sys/sys/aac_ioctl.h +++ b/sys/sys/aac_ioctl.h @@ -35,8 +35,7 @@ #define AACQ_BIO 1 #define AACQ_READY 2 #define AACQ_BUSY 3 -#define AACQ_COMPLETE 4 -#define AACQ_COUNT 5 /* total number of queues */ +#define AACQ_COUNT 4 /* total number of queues */ struct aac_qstat { u_int32_t q_length; |
