From 95e1ffb15694e54f29f8baaa4232152b703c2a5a Mon Sep 17 00:00:00 2001 From: christos Date: Sun, 11 Dec 2005 12:16:03 +0000 Subject: merge ktrace-lwp. --- sys/dev/microcode/aic7xxx/aic79xx.reg | 2 +- sys/dev/microcode/aic7xxx/aic79xx.seq | 2 +- sys/dev/microcode/aic7xxx/aic7xxx.reg | 2 +- sys/dev/microcode/aic7xxx/aic7xxx.seq | 2 +- sys/dev/microcode/aic7xxx/aicasm.c | 4 ++-- sys/dev/microcode/aic7xxx/aicasm.h | 2 +- sys/dev/microcode/aic7xxx/aicasm_gram.y | 2 +- sys/dev/microcode/aic7xxx/aicasm_macro_scan.l | 2 +- sys/dev/microcode/aic7xxx/aicasm_scan.l | 2 +- sys/dev/microcode/aic7xxx/aicasm_symbol.c | 4 ++-- sys/dev/microcode/cyclades-z/cyzfirm.h | 2 +- sys/dev/microcode/cyclades-z/cyzfirm2h.c | 6 +++--- sys/dev/microcode/daic/dnload.h-dist | 2 +- sys/dev/microcode/i8255x/rcvbundl.h | 2 +- sys/dev/microcode/isp/asm_1040.h | 2 +- sys/dev/microcode/isp/asm_1080.h | 2 +- sys/dev/microcode/isp/asm_12160.h | 2 +- sys/dev/microcode/isp/asm_2100.h | 2 +- sys/dev/microcode/isp/asm_2200.h | 2 +- sys/dev/microcode/isp/asm_2300.h | 2 +- sys/dev/microcode/isp/asm_sbus.h | 2 +- sys/dev/microcode/siop/ncr53cxxx.c | 6 +++--- sys/dev/microcode/tigon/ti_fw.h | 2 +- sys/dev/microcode/tigon/ti_fw2.h | 2 +- sys/dev/microcode/typhoon/3c990img.h | 2 +- sys/dev/microcode/wi/spectrum24t_cf.h | 2 +- 26 files changed, 32 insertions(+), 32 deletions(-) (limited to 'sys/dev/microcode') diff --git a/sys/dev/microcode/aic7xxx/aic79xx.reg b/sys/dev/microcode/aic7xxx/aic79xx.reg index edab97414d5..2537d919a59 100644 --- a/sys/dev/microcode/aic7xxx/aic79xx.reg +++ b/sys/dev/microcode/aic7xxx/aic79xx.reg @@ -1,4 +1,4 @@ -/* $NetBSD: aic79xx.reg,v 1.10 2005/02/27 00:27:23 perry Exp $ */ +/* $NetBSD: aic79xx.reg,v 1.11 2005/12/11 12:22:18 christos Exp $ */ /* * Aic79xx register and scratch ram definitions. diff --git a/sys/dev/microcode/aic7xxx/aic79xx.seq b/sys/dev/microcode/aic7xxx/aic79xx.seq index 97671a156aa..82ea0f3c02e 100644 --- a/sys/dev/microcode/aic7xxx/aic79xx.seq +++ b/sys/dev/microcode/aic7xxx/aic79xx.seq @@ -1,4 +1,4 @@ -/* $NetBSD: aic79xx.seq,v 1.9 2005/02/27 00:27:23 perry Exp $ */ +/* $NetBSD: aic79xx.seq,v 1.10 2005/12/11 12:22:18 christos Exp $ */ /* * Adaptec U320 device driver firmware for Linux and FreeBSD. diff --git a/sys/dev/microcode/aic7xxx/aic7xxx.reg b/sys/dev/microcode/aic7xxx/aic7xxx.reg index a30829cb033..5af1034c74f 100644 --- a/sys/dev/microcode/aic7xxx/aic7xxx.reg +++ b/sys/dev/microcode/aic7xxx/aic7xxx.reg @@ -39,7 +39,7 @@ * * $FreeBSD: /repoman/r/ncvs/src/sys/dev/aic7xxx/aic7xxx.reg,v 1.43 2003/01/20 20:44:55 gibbs Exp $ */ -VERSION = "$NetBSD: aic7xxx.reg,v 1.3 2005/02/27 00:27:23 perry Exp $" +VERSION = "$NetBSD: aic7xxx.reg,v 1.4 2005/12/11 12:22:18 christos Exp $" /* * This file is processed by the aic7xxx_asm utility for use in assembling diff --git a/sys/dev/microcode/aic7xxx/aic7xxx.seq b/sys/dev/microcode/aic7xxx/aic7xxx.seq index b1b5dd74c0d..caca26c6ae4 100644 --- a/sys/dev/microcode/aic7xxx/aic7xxx.seq +++ b/sys/dev/microcode/aic7xxx/aic7xxx.seq @@ -40,7 +40,7 @@ * $FreeBSD: /repoman/r/ncvs/src/sys/dev/aic7xxx/aic7xxx.seq,v 1.123 2003/01/20 20:44:55 gibbs Exp $ */ -VERSION = "$NetBSD: aic7xxx.seq,v 1.16 2005/02/27 00:27:23 perry Exp $" +VERSION = "$NetBSD: aic7xxx.seq,v 1.17 2005/12/11 12:22:18 christos Exp $" PATCH_ARG_LIST = "struct ahc_softc *ahc" PREFIX = "ahc_" diff --git a/sys/dev/microcode/aic7xxx/aicasm.c b/sys/dev/microcode/aic7xxx/aicasm.c index 7a524748c32..e04387910c8 100644 --- a/sys/dev/microcode/aic7xxx/aicasm.c +++ b/sys/dev/microcode/aic7xxx/aicasm.c @@ -1,4 +1,4 @@ -/* $NetBSD: aicasm.c,v 1.5 2003/07/14 15:42:39 lukem Exp $ */ +/* $NetBSD: aicasm.c,v 1.6 2005/12/11 12:22:18 christos Exp $ */ /* * Aic7xxx SCSI host adapter firmware asssembler @@ -43,7 +43,7 @@ */ #include -__RCSID("$NetBSD: aicasm.c,v 1.5 2003/07/14 15:42:39 lukem Exp $"); +__RCSID("$NetBSD: aicasm.c,v 1.6 2005/12/11 12:22:18 christos Exp $"); #include #include diff --git a/sys/dev/microcode/aic7xxx/aicasm.h b/sys/dev/microcode/aic7xxx/aicasm.h index 6af7fe97391..880f32ed8d4 100644 --- a/sys/dev/microcode/aic7xxx/aicasm.h +++ b/sys/dev/microcode/aic7xxx/aicasm.h @@ -1,4 +1,4 @@ -/* $NetBSD: aicasm.h,v 1.3 2005/02/27 00:27:23 perry Exp $ */ +/* $NetBSD: aicasm.h,v 1.4 2005/12/11 12:22:18 christos Exp $ */ /* * Assembler for the sequencer program downloaded to Aic7xxx SCSI host adapters diff --git a/sys/dev/microcode/aic7xxx/aicasm_gram.y b/sys/dev/microcode/aic7xxx/aicasm_gram.y index f1d02b37403..3c0110fff34 100644 --- a/sys/dev/microcode/aic7xxx/aicasm_gram.y +++ b/sys/dev/microcode/aic7xxx/aicasm_gram.y @@ -1,5 +1,5 @@ %{ -/* $NetBSD: aicasm_gram.y,v 1.4 2005/02/27 00:27:23 perry Exp $ */ +/* $NetBSD: aicasm_gram.y,v 1.5 2005/12/11 12:22:18 christos Exp $ */ /* * Parser for the Aic7xxx SCSI Host adapter sequencer assembler. diff --git a/sys/dev/microcode/aic7xxx/aicasm_macro_scan.l b/sys/dev/microcode/aic7xxx/aicasm_macro_scan.l index 305af46dccc..c638d261132 100644 --- a/sys/dev/microcode/aic7xxx/aicasm_macro_scan.l +++ b/sys/dev/microcode/aic7xxx/aicasm_macro_scan.l @@ -1,5 +1,5 @@ %{ -/* $NetBSD: aicasm_macro_scan.l,v 1.2 2005/02/27 00:27:23 perry Exp $ */ +/* $NetBSD: aicasm_macro_scan.l,v 1.3 2005/12/11 12:22:18 christos Exp $ */ /* * Sub-Lexical Analyzer for macro invokation in diff --git a/sys/dev/microcode/aic7xxx/aicasm_scan.l b/sys/dev/microcode/aic7xxx/aicasm_scan.l index cf47619eca0..d9cb42ba4b8 100644 --- a/sys/dev/microcode/aic7xxx/aicasm_scan.l +++ b/sys/dev/microcode/aic7xxx/aicasm_scan.l @@ -1,5 +1,5 @@ %{ -/* $NetBSD: aicasm_scan.l,v 1.4 2005/02/27 00:27:23 perry Exp $ */ +/* $NetBSD: aicasm_scan.l,v 1.5 2005/12/11 12:22:18 christos Exp $ */ /* * Lexical Analyzer for the Aic7xxx SCSI Host adapter sequencer assembler. * diff --git a/sys/dev/microcode/aic7xxx/aicasm_symbol.c b/sys/dev/microcode/aic7xxx/aicasm_symbol.c index c2176919cc7..377bba7bc14 100644 --- a/sys/dev/microcode/aic7xxx/aicasm_symbol.c +++ b/sys/dev/microcode/aic7xxx/aicasm_symbol.c @@ -1,4 +1,4 @@ -/* $NetBSD: aicasm_symbol.c,v 1.4 2003/07/14 15:42:40 lukem Exp $ */ +/* $NetBSD: aicasm_symbol.c,v 1.5 2005/12/11 12:22:18 christos Exp $ */ /* * Aic7xxx SCSI host adapter firmware asssembler symbol table implementation @@ -43,7 +43,7 @@ */ #include -__RCSID("$NetBSD: aicasm_symbol.c,v 1.4 2003/07/14 15:42:40 lukem Exp $"); +__RCSID("$NetBSD: aicasm_symbol.c,v 1.5 2005/12/11 12:22:18 christos Exp $"); #include diff --git a/sys/dev/microcode/cyclades-z/cyzfirm.h b/sys/dev/microcode/cyclades-z/cyzfirm.h index dbd5cbfe8b6..9d43c07ffb4 100644 --- a/sys/dev/microcode/cyclades-z/cyzfirm.h +++ b/sys/dev/microcode/cyclades-z/cyzfirm.h @@ -1,4 +1,4 @@ -/* $NetBSD: cyzfirm.h,v 1.5 2005/06/27 03:36:25 thorpej Exp $ */ +/* $NetBSD: cyzfirm.h,v 1.6 2005/12/11 12:22:18 christos Exp $ */ /* * Firmware for Cyclades Z series multiport serial boards. diff --git a/sys/dev/microcode/cyclades-z/cyzfirm2h.c b/sys/dev/microcode/cyclades-z/cyzfirm2h.c index 4afce9952e1..dfad90527cc 100644 --- a/sys/dev/microcode/cyclades-z/cyzfirm2h.c +++ b/sys/dev/microcode/cyclades-z/cyzfirm2h.c @@ -1,4 +1,4 @@ -/* $NetBSD: cyzfirm2h.c,v 1.4 2005/06/27 03:36:25 thorpej Exp $ */ +/* $NetBSD: cyzfirm2h.c,v 1.5 2005/12/11 12:22:18 christos Exp $ */ /*- * Copyright (c) 2000 Zembu Labs, Inc. @@ -39,7 +39,7 @@ */ #include -__RCSID("$NetBSD: cyzfirm2h.c,v 1.4 2005/06/27 03:36:25 thorpej Exp $"); +__RCSID("$NetBSD: cyzfirm2h.c,v 1.5 2005/12/11 12:22:18 christos Exp $"); #include #include @@ -99,7 +99,7 @@ main(int argc, char *argv[]) err(1, "unable to mmap input file"); (void) close(i); - fprintf(out_file, "/*\t$NetBSD: cyzfirm2h.c,v 1.4 2005/06/27 03:36:25 thorpej Exp $\t*/\n\n"); + fprintf(out_file, "/*\t$NetBSD: cyzfirm2h.c,v 1.5 2005/12/11 12:22:18 christos Exp $\t*/\n\n"); fprintf(out_file, "\ /* * Firmware for Cyclades Z series multiport serial boards. diff --git a/sys/dev/microcode/daic/dnload.h-dist b/sys/dev/microcode/daic/dnload.h-dist index af778909f65..637d49b62c1 100644 --- a/sys/dev/microcode/daic/dnload.h-dist +++ b/sys/dev/microcode/daic/dnload.h-dist @@ -1,4 +1,4 @@ -/* $NetBSD: dnload.h-dist,v 1.4 2003/12/04 13:57:31 keihan Exp $ */ +/* $NetBSD: dnload.h-dist,v 1.5 2005/12/11 12:22:27 christos Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. diff --git a/sys/dev/microcode/i8255x/rcvbundl.h b/sys/dev/microcode/i8255x/rcvbundl.h index b78ca02f1ca..337c2e13924 100644 --- a/sys/dev/microcode/i8255x/rcvbundl.h +++ b/sys/dev/microcode/i8255x/rcvbundl.h @@ -1,4 +1,4 @@ -/* $NetBSD: rcvbundl.h,v 1.2 2005/02/27 00:27:23 perry Exp $ */ +/* $NetBSD: rcvbundl.h,v 1.3 2005/12/11 12:22:27 christos Exp $ */ /* Copyright (c) 1999-2001, Intel Corporation diff --git a/sys/dev/microcode/isp/asm_1040.h b/sys/dev/microcode/isp/asm_1040.h index c9719ad8f99..42a2dbf7995 100644 --- a/sys/dev/microcode/isp/asm_1040.h +++ b/sys/dev/microcode/isp/asm_1040.h @@ -1,4 +1,4 @@ -/* $NetBSD: asm_1040.h,v 1.3 2005/02/27 00:27:23 perry Exp $ */ +/* $NetBSD: asm_1040.h,v 1.4 2005/12/11 12:22:27 christos Exp $ */ /* * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc. * All rights reserved. diff --git a/sys/dev/microcode/isp/asm_1080.h b/sys/dev/microcode/isp/asm_1080.h index f657ec04171..a6d0e508bb7 100644 --- a/sys/dev/microcode/isp/asm_1080.h +++ b/sys/dev/microcode/isp/asm_1080.h @@ -1,4 +1,4 @@ -/* $NetBSD: asm_1080.h,v 1.3 2005/02/27 00:27:23 perry Exp $ */ +/* $NetBSD: asm_1080.h,v 1.4 2005/12/11 12:22:27 christos Exp $ */ /* * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc. * All rights reserved. diff --git a/sys/dev/microcode/isp/asm_12160.h b/sys/dev/microcode/isp/asm_12160.h index 0d72559f9d6..6848d5cdc81 100644 --- a/sys/dev/microcode/isp/asm_12160.h +++ b/sys/dev/microcode/isp/asm_12160.h @@ -1,4 +1,4 @@ -/* $NetBSD: asm_12160.h,v 1.5 2005/02/27 00:27:23 perry Exp $ */ +/* $NetBSD: asm_12160.h,v 1.6 2005/12/11 12:22:27 christos Exp $ */ /* @(#)asm_12160.h 1.4 */ /* * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc. diff --git a/sys/dev/microcode/isp/asm_2100.h b/sys/dev/microcode/isp/asm_2100.h index 6d3c9157b55..0b47046ebd0 100644 --- a/sys/dev/microcode/isp/asm_2100.h +++ b/sys/dev/microcode/isp/asm_2100.h @@ -1,4 +1,4 @@ -/* $NetBSD: asm_2100.h,v 1.6 2005/02/27 00:27:23 perry Exp $ */ +/* $NetBSD: asm_2100.h,v 1.7 2005/12/11 12:22:27 christos Exp $ */ /* * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc. * All rights reserved. diff --git a/sys/dev/microcode/isp/asm_2200.h b/sys/dev/microcode/isp/asm_2200.h index bfd8a6bbed0..c9bbb78fbf5 100644 --- a/sys/dev/microcode/isp/asm_2200.h +++ b/sys/dev/microcode/isp/asm_2200.h @@ -1,4 +1,4 @@ -/* $NetBSD: asm_2200.h,v 1.6 2005/02/27 00:27:24 perry Exp $ */ +/* $NetBSD: asm_2200.h,v 1.7 2005/12/11 12:22:27 christos Exp $ */ /* @(#)asm_2200.h 1.6 */ /* * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 by Qlogic, Inc. diff --git a/sys/dev/microcode/isp/asm_2300.h b/sys/dev/microcode/isp/asm_2300.h index 7123723b247..539a5b73088 100644 --- a/sys/dev/microcode/isp/asm_2300.h +++ b/sys/dev/microcode/isp/asm_2300.h @@ -1,4 +1,4 @@ -/* $NetBSD: asm_2300.h,v 1.6 2005/02/27 00:27:24 perry Exp $ */ +/* $NetBSD: asm_2300.h,v 1.7 2005/12/11 12:22:27 christos Exp $ */ /* @(#)asm_2300.h 1.7 */ /* * Copyright (C) 2001 Qlogic, Inc. diff --git a/sys/dev/microcode/isp/asm_sbus.h b/sys/dev/microcode/isp/asm_sbus.h index 998799f9772..910534ba8cf 100644 --- a/sys/dev/microcode/isp/asm_sbus.h +++ b/sys/dev/microcode/isp/asm_sbus.h @@ -1,4 +1,4 @@ -/* $NetBSD: asm_sbus.h,v 1.19 2005/05/31 00:49:12 christos Exp $ */ +/* $NetBSD: asm_sbus.h,v 1.20 2005/12/11 12:22:28 christos Exp $ */ /* * Copyright (C) 1995, 1996, 1997, 1998, 1999 Qlogic, Inc. * All rights reserved. diff --git a/sys/dev/microcode/siop/ncr53cxxx.c b/sys/dev/microcode/siop/ncr53cxxx.c index e6dd4655d79..506c9991726 100644 --- a/sys/dev/microcode/siop/ncr53cxxx.c +++ b/sys/dev/microcode/siop/ncr53cxxx.c @@ -1,4 +1,4 @@ -/* $NetBSD: ncr53cxxx.c,v 1.14 2005/02/11 06:21:22 simonb Exp $ */ +/* $NetBSD: ncr53cxxx.c,v 1.15 2005/12/11 12:22:36 christos Exp $ */ /* * Copyright (c) 1995,1999 Michael L. Hitch @@ -33,7 +33,7 @@ /* ncr53cxxx.c - SCSI SCRIPTS Assembler */ #include -__RCSID("$NetBSD: ncr53cxxx.c,v 1.14 2005/02/11 06:21:22 simonb Exp $"); +__RCSID("$NetBSD: ncr53cxxx.c,v 1.15 2005/12/11 12:22:36 christos Exp $"); #include #include @@ -418,7 +418,7 @@ main (int argc, char *argv[]) if (outfp) { time_t cur_time; - fprintf(outfp, "/*\t$NetBSD: ncr53cxxx.c,v 1.14 2005/02/11 06:21:22 simonb Exp $\t*/\n"); + fprintf(outfp, "/*\t$NetBSD: ncr53cxxx.c,v 1.15 2005/12/11 12:22:36 christos Exp $\t*/\n"); fprintf(outfp, "/*\n"); fprintf(outfp, " *\tDO NOT EDIT - this file is automatically generated.\n"); time(&cur_time); diff --git a/sys/dev/microcode/tigon/ti_fw.h b/sys/dev/microcode/tigon/ti_fw.h index 0cec9937dcd..3726bd9da58 100644 --- a/sys/dev/microcode/tigon/ti_fw.h +++ b/sys/dev/microcode/tigon/ti_fw.h @@ -1,4 +1,4 @@ -/* $NetBSD: ti_fw.h,v 1.2 2005/02/27 00:27:29 perry Exp $ */ +/* $NetBSD: ti_fw.h,v 1.3 2005/12/11 12:22:36 christos Exp $ */ /* * Firmware for Alteon Tigon 1 chip. diff --git a/sys/dev/microcode/tigon/ti_fw2.h b/sys/dev/microcode/tigon/ti_fw2.h index c7010df888a..7be56b46e90 100644 --- a/sys/dev/microcode/tigon/ti_fw2.h +++ b/sys/dev/microcode/tigon/ti_fw2.h @@ -1,4 +1,4 @@ -/* $NetBSD: ti_fw2.h,v 1.2 2005/02/27 00:27:29 perry Exp $ */ +/* $NetBSD: ti_fw2.h,v 1.3 2005/12/11 12:22:36 christos Exp $ */ /* * Generated by genfw.c diff --git a/sys/dev/microcode/typhoon/3c990img.h b/sys/dev/microcode/typhoon/3c990img.h index cb5dd139157..afa1e807fef 100644 --- a/sys/dev/microcode/typhoon/3c990img.h +++ b/sys/dev/microcode/typhoon/3c990img.h @@ -1,4 +1,4 @@ -/* $NetBSD: 3c990img.h,v 1.2 2005/02/27 00:27:29 perry Exp $ */ +/* $NetBSD: 3c990img.h,v 1.3 2005/12/11 12:22:36 christos Exp $ */ /* * Copyright 1999-2002 3Com Corporation. All Rights Reserved. diff --git a/sys/dev/microcode/wi/spectrum24t_cf.h b/sys/dev/microcode/wi/spectrum24t_cf.h index 5d8cfd5ec07..cc8450bcade 100644 --- a/sys/dev/microcode/wi/spectrum24t_cf.h +++ b/sys/dev/microcode/wi/spectrum24t_cf.h @@ -1,4 +1,4 @@ -/* $NetBSD: spectrum24t_cf.h,v 1.2 2005/02/27 00:27:29 perry Exp $ */ +/* $NetBSD: spectrum24t_cf.h,v 1.3 2005/12/11 12:22:37 christos Exp $ */ /* * Copyright (c) 2001 Symbol Technologies Inc. -- http://www.symbol.com -- cgit