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/alpha/alpha/busdma_machdep.c | 10 +++++----- sys/alpha/alpha/interrupt.c | 4 ++-- sys/alpha/include/pmap.h | 8 ++++---- sys/alpha/tc/espvar.h | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'sys/alpha') diff --git a/sys/alpha/alpha/busdma_machdep.c b/sys/alpha/alpha/busdma_machdep.c index d01433b..f480322 100644 --- a/sys/alpha/alpha/busdma_machdep.c +++ b/sys/alpha/alpha/busdma_machdep.c @@ -62,12 +62,12 @@ struct bounce_page { bus_addr_t busaddr; /* Physical address */ vm_offset_t datavaddr; /* kva of client data */ bus_size_t datacount; /* client data count */ - STAILQ_ENTRY(bounce_page) links; + STAILQ_ENTRY(struct bounce_page) links; }; int busdma_swi_pending; -static STAILQ_HEAD(bp_list, bounce_page) bounce_page_list; +static STAILQ_HEAD(bp_list, struct bounce_page) bounce_page_list; static int free_bpages; static int reserved_bpages; static int active_bpages; @@ -85,11 +85,11 @@ struct bus_dmamap { bus_dmamap_callback_t *callback; void *callback_arg; void *sgmaphandle; /* handle into sgmap */ - STAILQ_ENTRY(bus_dmamap) links; + STAILQ_ENTRY(struct bus_dmamap) links; }; -static STAILQ_HEAD(, bus_dmamap) bounce_map_waitinglist; -static STAILQ_HEAD(, bus_dmamap) bounce_map_callbacklist; +static STAILQ_HEAD(, struct bus_dmamap) bounce_map_waitinglist; +static STAILQ_HEAD(, struct bus_dmamap) bounce_map_callbacklist; static struct bus_dmamap nobounce_dmamap; static int alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages); diff --git a/sys/alpha/alpha/interrupt.c b/sys/alpha/alpha/interrupt.c index db6f542..120d3be 100644 --- a/sys/alpha/alpha/interrupt.c +++ b/sys/alpha/alpha/interrupt.c @@ -293,10 +293,10 @@ badaddr_read(addr, size, rptr) #define HASHVEC(vector) ((vector) % 31) -LIST_HEAD(alpha_intr_list, alpha_intr); +LIST_HEAD(alpha_intr_list, struct alpha_intr); struct alpha_intr { - LIST_ENTRY(alpha_intr) list; /* chain handlers in this hash bucket */ + LIST_ENTRY(struct alpha_intr) list; /* chain handlers in this hash bucket */ int vector; /* vector to match */ driver_intr_t *intr; /* handler function */ void *arg; /* argument to handler */ diff --git a/sys/alpha/include/pmap.h b/sys/alpha/include/pmap.h index 134c9a2..4b65301 100644 --- a/sys/alpha/include/pmap.h +++ b/sys/alpha/include/pmap.h @@ -162,7 +162,7 @@ struct pv_entry; struct md_page { int pv_list_count; int pv_flags; - TAILQ_HEAD(,pv_entry) pv_list; + TAILQ_HEAD(, struct pv_entry) pv_list; }; #define PV_TABLE_MOD 0x01 /* modified */ @@ -171,7 +171,7 @@ struct md_page { struct pmap { pt_entry_t *pm_lev1; /* KVA of lev0map */ vm_object_t pm_pteobj; /* Container for pte's */ - TAILQ_HEAD(,pv_entry) pm_pvlist; /* list of mappings in pmap */ + TAILQ_HEAD(, struct pv_entry) pm_pvlist;/* list of mappings in pmap */ int pm_count; /* reference count */ int pm_flags; /* pmap flags */ int pm_active; /* active flag */ @@ -199,8 +199,8 @@ extern pmap_t kernel_pmap; typedef struct pv_entry { pmap_t pv_pmap; /* pmap where mapping lies */ vm_offset_t pv_va; /* virtual address for mapping */ - TAILQ_ENTRY(pv_entry) pv_list; - TAILQ_ENTRY(pv_entry) pv_plist; + TAILQ_ENTRY(struct pv_entry) pv_list; + TAILQ_ENTRY(struct pv_entry) pv_plist; vm_page_t pv_ptem; /* VM page for pte */ } *pv_entry_t; diff --git a/sys/alpha/tc/espvar.h b/sys/alpha/tc/espvar.h index 1efbbc0..edca635 100644 --- a/sys/alpha/tc/espvar.h +++ b/sys/alpha/tc/espvar.h @@ -49,7 +49,7 @@ * occasionally xs->retries. */ struct ecb { - TAILQ_ENTRY(ecb) chain; + TAILQ_ENTRY(struct ecb) chain; struct scsi_xfer *xs; /* SCSI xfer ctrl block from above */ int flags; /* Status */ #define ECB_QNONE 0 @@ -173,7 +173,7 @@ struct esp_softc { u_char sc_espfflags; /* Lists of command blocks */ - TAILQ_HEAD(ecb_list, ecb) free_list, + TAILQ_HEAD(ecb_list, struct ecb) free_list, ready_list, nexus_list; -- cgit v1.1