diff options
Diffstat (limited to 'sys/dev/microcode')
| -rw-r--r-- | sys/dev/microcode/aic7xxx/aic7xxx_seq.h | 2 | ||||
| -rw-r--r-- | sys/dev/microcode/aic7xxx/aicasm.c | 6 | ||||
| -rw-r--r-- | sys/dev/microcode/aic7xxx/aicasm_gram.y | 33 | ||||
| -rw-r--r-- | sys/dev/microcode/aic7xxx/aicasm_symbol.h | 22 |
4 files changed, 30 insertions, 33 deletions
diff --git a/sys/dev/microcode/aic7xxx/aic7xxx_seq.h b/sys/dev/microcode/aic7xxx/aic7xxx_seq.h index 9a1bde59aff..ea000ec0201 100644 --- a/sys/dev/microcode/aic7xxx/aic7xxx_seq.h +++ b/sys/dev/microcode/aic7xxx/aic7xxx_seq.h @@ -863,7 +863,7 @@ ahc_patch0_func(struct ahc_softc *ahc) return (0); } -typedef int patch_func_t __P((struct ahc_softc *)); +typedef int patch_func_t(struct ahc_softc *); struct patch { patch_func_t *patch_func; u_int32_t begin :10, diff --git a/sys/dev/microcode/aic7xxx/aicasm.c b/sys/dev/microcode/aic7xxx/aicasm.c index 402aaf11b9f..6f3cf4080fe 100644 --- a/sys/dev/microcode/aic7xxx/aicasm.c +++ b/sys/dev/microcode/aic7xxx/aicasm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aicasm.c,v 1.5 2002/03/19 02:49:20 millert Exp $ */ +/* $OpenBSD: aicasm.c,v 1.6 2002/03/19 21:07:25 millert Exp $ */ /* * Aic7xxx SCSI host adapter firmware asssembler * @@ -80,7 +80,7 @@ extern int yy_flex_debug; extern int yydebug; #endif extern FILE *yyin; -extern int yyparse __P((void)); +extern int yyparse(void); int main(argc, argv) @@ -342,7 +342,7 @@ ahc_patch%d_func(struct ahc_softc *ahc) } fprintf(ofile, -"typedef int patch_func_t __P((struct ahc_softc *)); +"typedef int patch_func_t(struct ahc_softc *); struct patch { patch_func_t *patch_func; u_int32_t begin :10, diff --git a/sys/dev/microcode/aic7xxx/aicasm_gram.y b/sys/dev/microcode/aic7xxx/aicasm_gram.y index 38b0dbcb53e..5e211b591c6 100644 --- a/sys/dev/microcode/aic7xxx/aicasm_gram.y +++ b/sys/dev/microcode/aic7xxx/aicasm_gram.y @@ -54,24 +54,21 @@ static int instruction_ptr; static int sram_or_scb_offset; static int download_constant_count; -static void process_bitmask __P((int mask_type, symbol_t *sym, int mask)); -static void initialize_symbol __P((symbol_t *symbol)); -static void process_register __P((symbol_t **p_symbol)); -static void format_1_instr __P((int opcode, symbol_ref_t *dest, - expression_t *immed, symbol_ref_t *src, - int ret)); -static void format_2_instr __P((int opcode, symbol_ref_t *dest, - expression_t *places, symbol_ref_t *src, - int ret)); -static void format_3_instr __P((int opcode, symbol_ref_t *src, - expression_t *immed, symbol_ref_t *address)); -static void test_readable_symbol __P((symbol_t *symbol)); -static void test_writable_symbol __P((symbol_t *symbol)); -static void type_check __P((symbol_t *symbol, expression_t *expression, - int and_op)); -static void make_expression __P((expression_t *immed, int value)); -static void add_conditional __P((symbol_t *symbol)); -static int is_download_const __P((expression_t *immed)); +static void process_bitmask(int mask_type, symbol_t *sym, int mask); +static void initialize_symbol(symbol_t *symbol); +static void process_register(symbol_t **p_symbol); +static void format_1_instr(int opcode, symbol_ref_t *dest, expression_t *immed, + symbol_ref_t *src, int ret); +static void format_2_instr(int opcode, symbol_ref_t *dest, expression_t *places, + symbol_ref_t *src, int ret); +static void format_3_instr(int opcode, symbol_ref_t *src, expression_t *immed, + symbol_ref_t *address); +static void test_readable_symbol(symbol_t *symbol); +static void test_writable_symbol(symbol_t *symbol); +static void type_check(symbol_t *symbol, expression_t *expression, int and_op); +static void make_expression(expression_t *immed, int value); +static void add_conditional(symbol_t *symbol); +static int is_download_const(expression_t *immed); #define YYDEBUG 1 #define SRAM_SYMNAME "SRAM_BASE" diff --git a/sys/dev/microcode/aic7xxx/aicasm_symbol.h b/sys/dev/microcode/aic7xxx/aicasm_symbol.h index a145c784634..c77e046ac50 100644 --- a/sys/dev/microcode/aic7xxx/aicasm_symbol.h +++ b/sys/dev/microcode/aic7xxx/aicasm_symbol.h @@ -1,4 +1,4 @@ -/* $OpenBSD: aicasm_symbol.h,v 1.4 2002/03/19 02:49:20 millert Exp $ */ +/* $OpenBSD: aicasm_symbol.h,v 1.5 2002/03/19 21:07:25 millert Exp $ */ /* * Aic7xxx SCSI host adapter firmware asssembler symbol table definitions * @@ -138,25 +138,25 @@ typedef struct scope { SLIST_HEAD(scope_list, scope); TAILQ_HEAD(scope_tailq, scope); -void symbol_delete __P((symbol_t *symbol)); +void symbol_delete(symbol_t *symbol); -void symtable_open __P((void)); +void symtable_open(void); -void symtable_close __P((void)); +void symtable_close(void); symbol_t * - symtable_get __P((char *name)); + symtable_get(char *name); symbol_node_t * - symlist_search __P((symlist_t *symlist, char *symname)); + symlist_search(symlist_t *symlist, char *symname); void - symlist_add __P((symlist_t *symlist, symbol_t *symbol, int how)); + symlist_add(symlist_t *symlist, symbol_t *symbol, int how); #define SYMLIST_INSERT_HEAD 0x00 #define SYMLIST_SORT 0x01 -void symlist_free __P((symlist_t *symlist)); +void symlist_free(symlist_t *symlist); -void symlist_merge __P((symlist_t *symlist_dest, symlist_t *symlist_src1, - symlist_t *symlist_src2)); -void symtable_dump __P((FILE *ofile)); +void symlist_merge(symlist_t *symlist_dest, symlist_t *symlist_src1, + symlist_t *symlist_src2); +void symtable_dump(FILE *ofile); |