diff options
author | jake <jake@FreeBSD.org> | 2000-05-23 20:41:01 +0000 |
---|---|---|
committer | jake <jake@FreeBSD.org> | 2000-05-23 20:41:01 +0000 |
commit | d93fbc99166053b75c2eeb69b5cb603cfaf79ec0 (patch) | |
tree | a4f130be4544ce7cfe4afa8c93f996b871433cb8 /sys/dev/aic7xxx | |
parent | e814d2a0db522b0f163eef55a56d05aa226951f3 (diff) | |
download | FreeBSD-src-d93fbc99166053b75c2eeb69b5cb603cfaf79ec0.zip FreeBSD-src-d93fbc99166053b75c2eeb69b5cb603cfaf79ec0.tar.gz |
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
Diffstat (limited to 'sys/dev/aic7xxx')
-rw-r--r-- | sys/dev/aic7xxx/aic7xxx.h | 10 | ||||
-rw-r--r-- | sys/dev/aic7xxx/aicasm.c | 6 | ||||
-rw-r--r-- | sys/dev/aic7xxx/aicasm.h | 4 | ||||
-rw-r--r-- | sys/dev/aic7xxx/aicasm/aicasm.c | 6 | ||||
-rw-r--r-- | sys/dev/aic7xxx/aicasm/aicasm.h | 4 | ||||
-rw-r--r-- | sys/dev/aic7xxx/aicasm/aicasm_scan.l | 4 | ||||
-rw-r--r-- | sys/dev/aic7xxx/aicasm/aicasm_symbol.h | 14 | ||||
-rw-r--r-- | sys/dev/aic7xxx/aicasm_scan.l | 4 | ||||
-rw-r--r-- | sys/dev/aic7xxx/aicasm_symbol.h | 14 | ||||
-rw-r--r-- | sys/dev/aic7xxx/sequencer.h | 2 |
10 files changed, 34 insertions, 34 deletions
diff --git a/sys/dev/aic7xxx/aic7xxx.h b/sys/dev/aic7xxx/aic7xxx.h index 534f2e4..5aed8ce 100644 --- a/sys/dev/aic7xxx/aic7xxx.h +++ b/sys/dev/aic7xxx/aic7xxx.h @@ -250,7 +250,7 @@ struct hardware_scb { struct scb { struct hardware_scb *hscb; - SLIST_ENTRY(scb) links; /* for chaining */ + SLIST_ENTRY(struct scb) links; /* for chaining */ union ccb *ccb; /* the ccb for this cmd */ scb_flag flags; bus_dmamap_t dmamap; @@ -432,13 +432,13 @@ struct sg_map_node { bus_dmamap_t sg_dmamap; bus_addr_t sg_physaddr; struct ahc_dma_seg* sg_vaddr; - SLIST_ENTRY(sg_map_node) links; + SLIST_ENTRY(struct sg_map_node) links; }; struct scb_data { struct hardware_scb *hscbs; /* Array of hardware SCBs */ struct scb *scbarray; /* Array of kernel SCBs */ - SLIST_HEAD(, scb) free_scbs; /* + SLIST_HEAD(, struct scb) free_scbs; /* * Pool of SCBs ready to be assigned * commands to execute. */ @@ -454,7 +454,7 @@ struct scb_data { bus_dmamap_t sense_dmamap; bus_addr_t sense_busaddr; bus_dma_tag_t sg_dmat; /* dmat for our sg segments */ - SLIST_HEAD(, sg_map_node) sg_maps; + SLIST_HEAD(, struct sg_map_node) sg_maps; u_int8_t numscbs; u_int8_t maxhscbs; /* Number of SCBs on the card */ u_int8_t init_level; /* @@ -472,7 +472,7 @@ struct ahc_softc { /* * CCBs that have been send to the controller */ - LIST_HEAD(, ccb_hdr) pending_ccbs; + LIST_HEAD(, struct ccb_hdr) pending_ccbs; /* * Target mode related state kept on a per enabled lun basis. diff --git a/sys/dev/aic7xxx/aicasm.c b/sys/dev/aic7xxx/aicasm.c index 9af5c83..a7f9c85 100644 --- a/sys/dev/aic7xxx/aicasm.c +++ b/sys/dev/aic7xxx/aicasm.c @@ -42,14 +42,14 @@ #include "sequencer.h" typedef struct patch { - STAILQ_ENTRY(patch) links; + STAILQ_ENTRY(struct patch) links; int patch_func; u_int begin; u_int skip_instr; u_int skip_patch; } patch_t; -STAILQ_HEAD(patch_list, patch) patches; +STAILQ_HEAD(patch_list, struct patch) patches; static void usage(void); static void back_patch(void); @@ -70,7 +70,7 @@ FILE *regfile; char *listfilename; FILE *listfile; -static STAILQ_HEAD(,instruction) seq_program; +static STAILQ_HEAD(, struct instruction) seq_program; struct scope_list scope_stack; symlist_t patch_functions; diff --git a/sys/dev/aic7xxx/aicasm.h b/sys/dev/aic7xxx/aicasm.h index 7e6b468..2f729b3 100644 --- a/sys/dev/aic7xxx/aicasm.h +++ b/sys/dev/aic7xxx/aicasm.h @@ -41,7 +41,7 @@ typedef struct path_entry { char *directory; int quoted_includes_only; - SLIST_ENTRY(path_entry) links; + SLIST_ENTRY(struct path_entry) links; } *path_entry_t; typedef enum { @@ -50,7 +50,7 @@ typedef enum { SOURCE_FILE } include_type; -SLIST_HEAD(path_list, path_entry); +SLIST_HEAD(path_list, struct path_entry); extern struct path_list search_path; extern struct scope_list scope_stack; diff --git a/sys/dev/aic7xxx/aicasm/aicasm.c b/sys/dev/aic7xxx/aicasm/aicasm.c index 9af5c83..a7f9c85 100644 --- a/sys/dev/aic7xxx/aicasm/aicasm.c +++ b/sys/dev/aic7xxx/aicasm/aicasm.c @@ -42,14 +42,14 @@ #include "sequencer.h" typedef struct patch { - STAILQ_ENTRY(patch) links; + STAILQ_ENTRY(struct patch) links; int patch_func; u_int begin; u_int skip_instr; u_int skip_patch; } patch_t; -STAILQ_HEAD(patch_list, patch) patches; +STAILQ_HEAD(patch_list, struct patch) patches; static void usage(void); static void back_patch(void); @@ -70,7 +70,7 @@ FILE *regfile; char *listfilename; FILE *listfile; -static STAILQ_HEAD(,instruction) seq_program; +static STAILQ_HEAD(, struct instruction) seq_program; struct scope_list scope_stack; symlist_t patch_functions; diff --git a/sys/dev/aic7xxx/aicasm/aicasm.h b/sys/dev/aic7xxx/aicasm/aicasm.h index 7e6b468..2f729b3 100644 --- a/sys/dev/aic7xxx/aicasm/aicasm.h +++ b/sys/dev/aic7xxx/aicasm/aicasm.h @@ -41,7 +41,7 @@ typedef struct path_entry { char *directory; int quoted_includes_only; - SLIST_ENTRY(path_entry) links; + SLIST_ENTRY(struct path_entry) links; } *path_entry_t; typedef enum { @@ -50,7 +50,7 @@ typedef enum { SOURCE_FILE } include_type; -SLIST_HEAD(path_list, path_entry); +SLIST_HEAD(path_list, struct path_entry); extern struct path_list search_path; extern struct scope_list scope_stack; diff --git a/sys/dev/aic7xxx/aicasm/aicasm_scan.l b/sys/dev/aic7xxx/aicasm/aicasm_scan.l index 28689cb..51a13f2 100644 --- a/sys/dev/aic7xxx/aicasm/aicasm_scan.l +++ b/sys/dev/aic7xxx/aicasm/aicasm_scan.l @@ -200,10 +200,10 @@ typedef struct include { YY_BUFFER_STATE buffer; int lineno; char *filename; - SLIST_ENTRY(include) links; + SLIST_ENTRY(struct include) links; }include_t; -SLIST_HEAD(, include) include_stack; +SLIST_HEAD(, struct include) include_stack; void include_file(file_name, type) diff --git a/sys/dev/aic7xxx/aicasm/aicasm_symbol.h b/sys/dev/aic7xxx/aicasm/aicasm_symbol.h index 79809db..d86b4f0 100644 --- a/sys/dev/aic7xxx/aicasm/aicasm_symbol.h +++ b/sys/dev/aic7xxx/aicasm/aicasm_symbol.h @@ -58,7 +58,7 @@ struct reg_info { int typecheck_masks; }; -typedef SLIST_HEAD(symlist, symbol_node) symlist_t; +typedef SLIST_HEAD(symlist, struct symbol_node) symlist_t; struct mask_info { symlist_t symrefs; @@ -106,7 +106,7 @@ typedef struct symbol_ref { } symbol_ref_t; typedef struct symbol_node { - SLIST_ENTRY(symbol_node) links; + SLIST_ENTRY(struct symbol_node) links; symbol_t *symbol; }symbol_node_t; @@ -123,9 +123,9 @@ typedef struct patch_info { } patch_info_t; typedef struct scope { - SLIST_ENTRY(scope) scope_stack_links; - TAILQ_ENTRY(scope) scope_links; - TAILQ_HEAD(, scope) inner_scope; + SLIST_ENTRY(struct scope) scope_stack_links; + TAILQ_ENTRY(struct scope) scope_links; + TAILQ_HEAD(, struct scope) inner_scope; scope_type type; int inner_scope_patches; int begin_addr; @@ -134,8 +134,8 @@ typedef struct scope { int func_num; } scope_t; -SLIST_HEAD(scope_list, scope); -TAILQ_HEAD(scope_tailq, scope); +SLIST_HEAD(scope_list, struct scope); +TAILQ_HEAD(scope_tailq, struct scope); void symbol_delete __P((symbol_t *symbol)); diff --git a/sys/dev/aic7xxx/aicasm_scan.l b/sys/dev/aic7xxx/aicasm_scan.l index 28689cb..51a13f2 100644 --- a/sys/dev/aic7xxx/aicasm_scan.l +++ b/sys/dev/aic7xxx/aicasm_scan.l @@ -200,10 +200,10 @@ typedef struct include { YY_BUFFER_STATE buffer; int lineno; char *filename; - SLIST_ENTRY(include) links; + SLIST_ENTRY(struct include) links; }include_t; -SLIST_HEAD(, include) include_stack; +SLIST_HEAD(, struct include) include_stack; void include_file(file_name, type) diff --git a/sys/dev/aic7xxx/aicasm_symbol.h b/sys/dev/aic7xxx/aicasm_symbol.h index 79809db..d86b4f0 100644 --- a/sys/dev/aic7xxx/aicasm_symbol.h +++ b/sys/dev/aic7xxx/aicasm_symbol.h @@ -58,7 +58,7 @@ struct reg_info { int typecheck_masks; }; -typedef SLIST_HEAD(symlist, symbol_node) symlist_t; +typedef SLIST_HEAD(symlist, struct symbol_node) symlist_t; struct mask_info { symlist_t symrefs; @@ -106,7 +106,7 @@ typedef struct symbol_ref { } symbol_ref_t; typedef struct symbol_node { - SLIST_ENTRY(symbol_node) links; + SLIST_ENTRY(struct symbol_node) links; symbol_t *symbol; }symbol_node_t; @@ -123,9 +123,9 @@ typedef struct patch_info { } patch_info_t; typedef struct scope { - SLIST_ENTRY(scope) scope_stack_links; - TAILQ_ENTRY(scope) scope_links; - TAILQ_HEAD(, scope) inner_scope; + SLIST_ENTRY(struct scope) scope_stack_links; + TAILQ_ENTRY(struct scope) scope_links; + TAILQ_HEAD(, struct scope) inner_scope; scope_type type; int inner_scope_patches; int begin_addr; @@ -134,8 +134,8 @@ typedef struct scope { int func_num; } scope_t; -SLIST_HEAD(scope_list, scope); -TAILQ_HEAD(scope_tailq, scope); +SLIST_HEAD(scope_list, struct scope); +TAILQ_HEAD(scope_tailq, struct scope); void symbol_delete __P((symbol_t *symbol)); diff --git a/sys/dev/aic7xxx/sequencer.h b/sys/dev/aic7xxx/sequencer.h index 4f05491..a84951c 100644 --- a/sys/dev/aic7xxx/sequencer.h +++ b/sys/dev/aic7xxx/sequencer.h @@ -69,7 +69,7 @@ struct instruction { union ins_formats format; u_int srcline; struct symbol *patch_label; - STAILQ_ENTRY(instruction) links; + STAILQ_ENTRY(struct instruction) links; }; #define AIC_OP_OR 0x0 |