56c56
< * $FreeBSD: head/sys/dev/amr/amrvar.h 174544 2007-12-12 05:55:03Z scottl $
---
> * $FreeBSD: head/sys/dev/amr/amrvar.h 175622 2008-01-24 07:26:53Z scottl $
102a103,105
> typedef STAILQ_HEAD(, amr_command) ac_qhead_t;
> typedef STAILQ_ENTRY(amr_command) ac_link_t;
>
114c117
< TAILQ_ENTRY(amr_command) ac_link;
---
> ac_link_t ac_link;
136a140
> u_int ac_retries;
222c226
< TAILQ_HEAD(,amr_command) amr_ready; /* commands ready to be submitted */
---
> ac_qhead_t amr_ready; /* commands ready to be submitted */
225,226c229
< TAILQ_HEAD(,amr_command) amr_completed;
< TAILQ_HEAD(,amr_command) amr_freecmds;
---
> ac_qhead_t amr_freecmds;
322a326,332
> amr_init_qhead(ac_qhead_t *head)
> {
>
> STAILQ_INIT(head);
> }
>
> static __inline void
326c336
< TAILQ_INSERT_TAIL(&ac->ac_sc->amr_ready, ac, ac_link);
---
> STAILQ_INSERT_TAIL(&ac->ac_sc->amr_ready, ac, ac_link);
333c343
< TAILQ_INSERT_HEAD(&ac->ac_sc->amr_ready, ac, ac_link);
---
> STAILQ_INSERT_HEAD(&ac->ac_sc->amr_ready, ac, ac_link);
341,342c351,352
< if ((ac = TAILQ_FIRST(&sc->amr_ready)) != NULL)
< TAILQ_REMOVE(&sc->amr_ready, ac, ac_link);
---
> if ((ac = STAILQ_FIRST(&sc->amr_ready)) != NULL)
> STAILQ_REMOVE_HEAD(&sc->amr_ready, ac_link);
347c357
< amr_enqueue_completed(struct amr_command *ac)
---
> amr_enqueue_completed(struct amr_command *ac, ac_qhead_t *head)
350c360
< TAILQ_INSERT_TAIL(&ac->ac_sc->amr_completed, ac, ac_link);
---
> STAILQ_INSERT_TAIL(head, ac, ac_link);
354c364
< amr_dequeue_completed(struct amr_softc *sc)
---
> amr_dequeue_completed(struct amr_softc *sc, ac_qhead_t *head)
358,359c368,369
< if ((ac = TAILQ_FIRST(&sc->amr_completed)) != NULL)
< TAILQ_REMOVE(&sc->amr_completed, ac, ac_link);
---
> if ((ac = STAILQ_FIRST(head)) != NULL)
> STAILQ_REMOVE_HEAD(head, ac_link);
367c377
< TAILQ_INSERT_TAIL(&ac->ac_sc->amr_freecmds, ac, ac_link);
---
> STAILQ_INSERT_HEAD(&ac->ac_sc->amr_freecmds, ac, ac_link);
375,376c385,386
< if ((ac = TAILQ_FIRST(&sc->amr_freecmds)) != NULL)
< TAILQ_REMOVE(&sc->amr_freecmds, ac, ac_link);
---
> if ((ac = STAILQ_FIRST(&sc->amr_freecmds)) != NULL)
> STAILQ_REMOVE_HEAD(&sc->amr_freecmds, ac_link);