From d93fbc99166053b75c2eeb69b5cb603cfaf79ec0 Mon Sep 17 00:00:00 2001 From: jake Date: Tue, 23 May 2000 20:41:01 +0000 Subject: Change the way that the queue(3) structures are declared; don't assume that the type argument to *_HEAD and *_ENTRY is a struct. Suggested by: phk Reviewed by: phk Approved by: mdodd --- sys/dev/dpt/dpt.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'sys/dev/dpt/dpt.h') diff --git a/sys/dev/dpt/dpt.h b/sys/dev/dpt/dpt.h index 6d6230e..777e775 100644 --- a/sys/dev/dpt/dpt.h +++ b/sys/dev/dpt/dpt.h @@ -894,7 +894,7 @@ typedef struct dpt_ccb { u_int32_t transaction_id; u_int32_t result; caddr_t data; - SLIST_ENTRY(dpt_ccb) links; + SLIST_ENTRY(struct dpt_ccb) links; #ifdef DPT_MEASURE_PERFORMANCE u_int32_t submitted_time; @@ -1016,7 +1016,7 @@ struct sg_map_node { bus_dmamap_t sg_dmamap; bus_addr_t sg_physaddr; dpt_sg_t* sg_vaddr; - SLIST_ENTRY(sg_map_node) links; + SLIST_ENTRY(struct sg_map_node) links; }; /* Main state machine and interface structure */ @@ -1039,14 +1039,14 @@ typedef struct dpt_softc { int pending_ccbs; int completed_ccbs; - SLIST_HEAD(, dpt_ccb) free_dccb_list; - LIST_HEAD(, ccb_hdr) pending_ccb_list; + SLIST_HEAD(, struct dpt_ccb) free_dccb_list; + LIST_HEAD(, struct ccb_hdr) pending_ccb_list; bus_dma_tag_t parent_dmat; bus_dma_tag_t dccb_dmat; /* dmat for our ccb array */ bus_dmamap_t dccb_dmamap; bus_dma_tag_t sg_dmat; /* dmat for our sg maps */ - SLIST_HEAD(, sg_map_node) sg_maps; + SLIST_HEAD(, struct sg_map_node) sg_maps; struct cam_sim *sims[MAX_CHANNELS]; struct cam_path *paths[MAX_CHANNELS]; @@ -1069,7 +1069,7 @@ typedef struct dpt_softc { u_int8_t irq; u_int8_t dma_channel; - TAILQ_ENTRY(dpt_softc) links; + TAILQ_ENTRY(struct dpt_softc) links; int unit; int init_level; @@ -1266,7 +1266,7 @@ dpt_time_delta(struct timeval start, (end.tv_usec - start.tv_usec) ); } -extern TAILQ_HEAD(dpt_softc_list, dpt_softc) dpt_softcs; +extern TAILQ_HEAD(dpt_softc_list, struct dpt_softc) dpt_softcs; extern int dpt_controllers_present; -- cgit v1.1