CVS commit: src/sys/arch/algor/conf
Module Name:src Committed By: christos Date: Sun Jun 6 13:59:48 UTC 2021 Modified Files: src/sys/arch/algor/conf: std.algor64 Log Message: Don't reset MACHINE_ARCH; it can be mipsn64el now, and we need to be able to find the compiler. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/algor/conf/std.algor64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/conf/std.algor64 diff -u src/sys/arch/algor/conf/std.algor64:1.2 src/sys/arch/algor/conf/std.algor64:1.3 --- src/sys/arch/algor/conf/std.algor64:1.2 Sun Dec 13 19:46:00 2009 +++ src/sys/arch/algor/conf/std.algor64 Sun Jun 6 09:59:48 2021 @@ -1,8 +1,8 @@ -# $NetBSD: std.algor64,v 1.2 2009/12/14 00:46:00 matt Exp $ +# $NetBSD: std.algor64,v 1.3 2021/06/06 13:59:48 christos Exp $ # standard, required pmax info no makeoptions MACHINE_ARCH -makeoptions MACHINE_ARCH="mips64el" +#makeoptions MACHINE_ARCH="mips64el" # Standard exec-package options options EXEC_ELF64 # 64-bit ELF support (native format)
CVS commit: src/sys/arch/algor
Module Name:src Committed By: thorpej Date: Sat Nov 14 02:23:04 UTC 2020 Modified Files: src/sys/arch/algor/algor: algor_p4032_intr.c algor_p5064_intr.c algor_p6032_intr.c src/sys/arch/algor/pci: pcib.c Log Message: malloc(9) -> kmem(9) To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/arch/algor/algor/algor_p4032_intr.c cvs rdiff -u -r1.29 -r1.30 src/sys/arch/algor/algor/algor_p5064_intr.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/algor/algor/algor_p6032_intr.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/algor/pci/pcib.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/algor/algor_p4032_intr.c diff -u src/sys/arch/algor/algor/algor_p4032_intr.c:1.26 src/sys/arch/algor/algor/algor_p4032_intr.c:1.27 --- src/sys/arch/algor/algor/algor_p4032_intr.c:1.26 Sun Nov 10 21:16:21 2019 +++ src/sys/arch/algor/algor/algor_p4032_intr.c Sat Nov 14 02:23:04 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: algor_p4032_intr.c,v 1.26 2019/11/10 21:16:21 chs Exp $ */ +/* $NetBSD: algor_p4032_intr.c,v 1.27 2020/11/14 02:23:04 thorpej Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: algor_p4032_intr.c,v 1.26 2019/11/10 21:16:21 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: algor_p4032_intr.c,v 1.27 2020/11/14 02:23:04 thorpej Exp $"); #include "opt_ddb.h" #define __INTR_PRIVATE @@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: algor_p4032_ #include #include #include -#include +#include #include #include @@ -352,7 +352,7 @@ algor_p4032_intr_establish(int irq, int KASSERT(irq == irqmap->irqidx); - ih = malloc(sizeof(*ih), M_DEVBUF, M_WAITOK); + ih = kmem_alloc(sizeof(*ih), KM_SLEEP); ih->ih_func = func; ih->ih_arg = arg; ih->ih_irq = 0; @@ -408,7 +408,7 @@ algor_p4032_intr_disestablish(void *cook splx(s); - free(ih, M_DEVBUF); + kmem_free(ih, sizeof(*ih)); } void Index: src/sys/arch/algor/algor/algor_p5064_intr.c diff -u src/sys/arch/algor/algor/algor_p5064_intr.c:1.29 src/sys/arch/algor/algor/algor_p5064_intr.c:1.30 --- src/sys/arch/algor/algor/algor_p5064_intr.c:1.29 Sun Nov 10 21:16:21 2019 +++ src/sys/arch/algor/algor/algor_p5064_intr.c Sat Nov 14 02:23:04 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: algor_p5064_intr.c,v 1.29 2019/11/10 21:16:21 chs Exp $ */ +/* $NetBSD: algor_p5064_intr.c,v 1.30 2020/11/14 02:23:04 thorpej Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: algor_p5064_intr.c,v 1.29 2019/11/10 21:16:21 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: algor_p5064_intr.c,v 1.30 2020/11/14 02:23:04 thorpej Exp $"); #include "opt_ddb.h" #define __INTR_PRIVATE @@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: algor_p5064_ #include #include #include -#include +#include #include #include @@ -445,7 +445,7 @@ algor_p5064_intr_establish(int irq, int KASSERT(irq == irqmap->irqidx); - ih = malloc(sizeof(*ih), M_DEVBUF, M_WAITOK); + ih = kmem_alloc(sizeof(*ih), KM_SLEEP); ih->ih_func = func; ih->ih_arg = arg; ih->ih_irq = 0; @@ -501,7 +501,7 @@ algor_p5064_intr_disestablish(void *cook splx(s); - free(ih, M_DEVBUF); + kmem_free(ih, sizeof(*ih)); } void Index: src/sys/arch/algor/algor/algor_p6032_intr.c diff -u src/sys/arch/algor/algor/algor_p6032_intr.c:1.23 src/sys/arch/algor/algor/algor_p6032_intr.c:1.24 --- src/sys/arch/algor/algor/algor_p6032_intr.c:1.23 Sun Nov 10 21:16:21 2019 +++ src/sys/arch/algor/algor/algor_p6032_intr.c Sat Nov 14 02:23:04 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: algor_p6032_intr.c,v 1.23 2019/11/10 21:16:21 chs Exp $ */ +/* $NetBSD: algor_p6032_intr.c,v 1.24 2020/11/14 02:23:04 thorpej Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: algor_p6032_intr.c,v 1.23 2019/11/10 21:16:21 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: algor_p6032_intr.c,v 1.24 2020/11/14 02:23:04 thorpej Exp $"); #include "opt_ddb.h" #define __INTR_PRIVATE @@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: algor_p6032_ #include #include #include -#include +#include #include #include @@ -313,7 +313,7 @@ algor_p6032_intr_establish(int irq, int KASSERT(irq == irqmap->irqidx); - ih = malloc(sizeof(*ih), M_DEVBUF, M_WAITOK); + ih = kmem_alloc(sizeof(*ih), KM_SLEEP); ih->ih_func = func; ih->ih_arg = arg; ih->ih_irq = 0; @@ -365,7 +365,7 @@ algor_p6032_intr_disestablish(void *cook splx(s); - free(ih, M_DEVBUF); + kmem_free(ih, sizeof(*ih)); } void Index: src/sys/arch/algor/pci/pcib.c diff -u src/sys/arch/algor/pci/pcib.c:1.25 src/sys/arch/algor/pci/pcib.c:1.26 --- src/sys/arch/algor/pci/pcib.c:1.25 Sun Nov 10 21:16:22 2019 +++ src/sys/arch/algor/pci/pcib.c Sat Nov 14 02:23:04 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pcib.c,v 1.25 2019/11/10 21:16:22 chs Exp $ */
CVS commit: src/sys/arch/algor/algor
Module Name:src Committed By: mrg Date: Mon Aug 17 07:22:47 UTC 2020 Modified Files: src/sys/arch/algor/algor: machdep.c Log Message: remove duplicate symbol now published in shared mips. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/arch/algor/algor/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/algor/machdep.c diff -u src/sys/arch/algor/algor/machdep.c:1.55 src/sys/arch/algor/algor/machdep.c:1.56 --- src/sys/arch/algor/algor/machdep.c:1.55 Thu Dec 22 14:47:54 2016 +++ src/sys/arch/algor/algor/machdep.c Mon Aug 17 07:22:46 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.55 2016/12/22 14:47:54 cherry Exp $ */ +/* $NetBSD: machdep.c,v 1.56 2020/08/17 07:22:46 mrg Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -68,7 +68,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.55 2016/12/22 14:47:54 cherry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.56 2020/08/17 07:22:46 mrg Exp $"); #include "opt_algor_p4032.h" #include "opt_algor_p5064.h" @@ -532,7 +532,6 @@ cpu_startup(void) } int waittime = -1; -struct pcb dumppcb; void cpu_reboot(int howto, char *bootstr)
CVS commit: src/sys/arch/algor/dev
Module Name:src Committed By: dholland Date: Tue May 31 03:51:55 UTC 2016 Modified Files: src/sys/arch/algor/dev: bonito_mainbus.c Log Message: If ALGOR_P6032 is not defined, set sc_bonito to NULL instead of using random garbage off the stack. PR 51012 from David Binderman. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/algor/dev/bonito_mainbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/dev/bonito_mainbus.c diff -u src/sys/arch/algor/dev/bonito_mainbus.c:1.16 src/sys/arch/algor/dev/bonito_mainbus.c:1.17 --- src/sys/arch/algor/dev/bonito_mainbus.c:1.16 Tue Jun 9 22:47:12 2015 +++ src/sys/arch/algor/dev/bonito_mainbus.c Tue May 31 03:51:55 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: bonito_mainbus.c,v 1.16 2015/06/09 22:47:12 matt Exp $ */ +/* $NetBSD: bonito_mainbus.c,v 1.17 2016/05/31 03:51:55 dholland Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: bonito_mainbus.c,v 1.16 2015/06/09 22:47:12 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bonito_mainbus.c,v 1.17 2016/05/31 03:51:55 dholland Exp $"); #include "opt_algor_p6032.h" @@ -85,6 +85,9 @@ bonito_mainbus_attach(device_t parent, d */ #if defined(ALGOR_P6032) bc = _configuration.ac_bonito; +#else + /* I guess... XXX? */ + bc = NULL; #endif sc->sc_bonito = bc;
CVS commit: src/sys/arch/algor
Module Name:src Committed By: matt Date: Tue Jun 9 22:47:12 UTC 2015 Modified Files: src/sys/arch/algor/algor: led.c src/sys/arch/algor/dev: bonito_mainbus.c Log Message: #include mips/cpuregs.h To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/algor/algor/led.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/algor/dev/bonito_mainbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/algor/led.c diff -u src/sys/arch/algor/algor/led.c:1.7 src/sys/arch/algor/algor/led.c:1.8 --- src/sys/arch/algor/algor/led.c:1.7 Sat Jul 9 16:03:00 2011 +++ src/sys/arch/algor/algor/led.c Tue Jun 9 22:47:12 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: led.c,v 1.7 2011/07/09 16:03:00 matt Exp $ */ +/* $NetBSD: led.c,v 1.8 2015/06/09 22:47:12 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: led.c,v 1.7 2011/07/09 16:03:00 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: led.c,v 1.8 2015/06/09 22:47:12 matt Exp $); #include opt_algor_p4032.h #include opt_algor_p5064.h @@ -38,6 +38,8 @@ __KERNEL_RCSID(0, $NetBSD: led.c,v 1.7 #include sys/param.h +#include mips/cpuregs.h + #include algor/autoconf.h #ifdef ALGOR_P4032 Index: src/sys/arch/algor/dev/bonito_mainbus.c diff -u src/sys/arch/algor/dev/bonito_mainbus.c:1.15 src/sys/arch/algor/dev/bonito_mainbus.c:1.16 --- src/sys/arch/algor/dev/bonito_mainbus.c:1.15 Sat Oct 27 17:17:24 2012 +++ src/sys/arch/algor/dev/bonito_mainbus.c Tue Jun 9 22:47:12 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: bonito_mainbus.c,v 1.15 2012/10/27 17:17:24 chs Exp $ */ +/* $NetBSD: bonito_mainbus.c,v 1.16 2015/06/09 22:47:12 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bonito_mainbus.c,v 1.15 2012/10/27 17:17:24 chs Exp $); +__KERNEL_RCSID(0, $NetBSD: bonito_mainbus.c,v 1.16 2015/06/09 22:47:12 matt Exp $); #include opt_algor_p6032.h @@ -43,6 +43,7 @@ __KERNEL_RCSID(0, $NetBSD: bonito_mainb #include algor/autoconf.h +#include mips/cpuregs.h #include mips/bonito/bonitoreg.h #ifdef ALGOR_P6032
CVS commit: src/sys/arch/algor/conf
Module Name:src Committed By: riz Date: Sat Oct 13 06:06:50 UTC 2012 Modified Files: src/sys/arch/algor/conf: P5064 Log Message: Bump SYMTAB_SPACE 475000-485000. To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.74 src/sys/arch/algor/conf/P5064 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/conf/P5064 diff -u src/sys/arch/algor/conf/P5064:1.73 src/sys/arch/algor/conf/P5064:1.74 --- src/sys/arch/algor/conf/P5064:1.73 Fri Aug 17 20:11:37 2012 +++ src/sys/arch/algor/conf/P5064 Sat Oct 13 06:06:49 2012 @@ -1,4 +1,4 @@ -# $NetBSD: P5064,v 1.73 2012/08/17 20:11:37 abs Exp $ +# $NetBSD: P5064,v 1.74 2012/10/13 06:06:49 riz Exp $ # # Algorithmics P-5064 kernel. # @@ -7,7 +7,7 @@ include arch/algor/conf/std.algor #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident P5064-$Revision: 1.73 $ +#ident P5064-$Revision: 1.74 $ maxusers 32 @@ -25,7 +25,7 @@ options DIAGNOSTIC # Cheap kernel cons options DDB # kernel debugger makeoptions DEBUG=-g #makeoptions DEBUGLIST=pattern1 pattern2 ... -options SYMTAB_SPACE=475000 +options SYMTAB_SPACE=485000 # File systems file-system FFS # Fast file system
CVS commit: src/sys/arch/algor/algor
Module Name:src Committed By: matt Date: Fri Mar 2 16:19:52 UTC 2012 Modified Files: src/sys/arch/algor/algor: machdep.c Log Message: Remove conflicting/redundant common declarations. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/arch/algor/algor/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/algor/machdep.c diff -u src/sys/arch/algor/algor/machdep.c:1.51 src/sys/arch/algor/algor/machdep.c:1.52 --- src/sys/arch/algor/algor/machdep.c:1.51 Sat Jul 9 16:03:00 2011 +++ src/sys/arch/algor/algor/machdep.c Fri Mar 2 16:19:52 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.51 2011/07/09 16:03:00 matt Exp $ */ +/* $NetBSD: machdep.c,v 1.52 2012/03/02 16:19:52 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -68,7 +68,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.51 2011/07/09 16:03:00 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.52 2012/03/02 16:19:52 matt Exp $); #include opt_algor_p4032.h #include opt_algor_p5064.h @@ -149,13 +149,9 @@ struct p5064_config p5064_configuration; struct p6032_config p6032_configuration; #endif -/* Our exported CPU info; we can have only one. */ -struct cpu_info cpu_info_store; - /* Maps for VM objects. */ struct vm_map *phys_map = NULL; -int physmem; /* # pages of physical memory */ int maxmem; /* max memory per process */ int mem_cluster_cnt;
CVS commit: src/sys/arch/algor/conf
Module Name:src Committed By: matt Date: Sun Feb 5 19:30:43 UTC 2012 Modified Files: src/sys/arch/algor/conf: P5064-64 Log Message: Bump SYMTAB_SPACE To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/algor/conf/P5064-64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/conf/P5064-64 diff -u src/sys/arch/algor/conf/P5064-64:1.3 src/sys/arch/algor/conf/P5064-64:1.4 --- src/sys/arch/algor/conf/P5064-64:1.3 Sun Feb 20 07:51:21 2011 +++ src/sys/arch/algor/conf/P5064-64 Sun Feb 5 19:30:42 2012 @@ -1,4 +1,4 @@ -# $NetBSD: P5064-64,v 1.3 2011/02/20 07:51:21 matt Exp $ +# $NetBSD: P5064-64,v 1.4 2012/02/05 19:30:42 matt Exp $ # # Algorithmics P-5064 kernel (64-bit). # @@ -8,5 +8,5 @@ include arch/algor/conf/P5064 include arch/algor/conf/std.algor64 no options SYMTAB_SPACE -options SYMTAB_SPACE=60 -#ident P5064-64-$Revision: 1.3 $ +options SYMTAB_SPACE=62 +#ident P5064-64-$Revision: 1.4 $
CVS commit: src/sys/arch/algor/conf
Module Name:src Committed By: christos Date: Sat Feb 4 19:02:25 UTC 2012 Modified Files: src/sys/arch/algor/conf: P5064 Log Message: Bump symtab space To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 src/sys/arch/algor/conf/P5064 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/conf/P5064 diff -u src/sys/arch/algor/conf/P5064:1.71 src/sys/arch/algor/conf/P5064:1.72 --- src/sys/arch/algor/conf/P5064:1.71 Sun Dec 18 06:10:33 2011 +++ src/sys/arch/algor/conf/P5064 Sat Feb 4 14:02:25 2012 @@ -1,4 +1,4 @@ -# $NetBSD: P5064,v 1.71 2011/12/18 11:10:33 kiyohara Exp $ +# $NetBSD: P5064,v 1.72 2012/02/04 19:02:25 christos Exp $ # # Algorithmics P-5064 kernel. # @@ -7,7 +7,7 @@ include arch/algor/conf/std.algor #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident P5064-$Revision: 1.71 $ +#ident P5064-$Revision: 1.72 $ maxusers 32 @@ -25,7 +25,7 @@ options DIAGNOSTIC # Cheap kernel cons options DDB # kernel debugger makeoptions DEBUG=-g #makeoptions DEBUGLIST=pattern1 pattern2 ... -options SYMTAB_SPACE=47 +options SYMTAB_SPACE=475000 # File systems file-system FFS # Fast file system
CVS commit: src/sys/arch/algor/conf
Module Name:src Committed By: kiyohara Date: Sun Dec 18 11:10:33 UTC 2011 Modified Files: src/sys/arch/algor/conf: P5064 Log Message: SYMTAB_SPACE. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/arch/algor/conf/P5064 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/conf/P5064 diff -u src/sys/arch/algor/conf/P5064:1.70 src/sys/arch/algor/conf/P5064:1.71 --- src/sys/arch/algor/conf/P5064:1.70 Sun Dec 18 05:49:22 2011 +++ src/sys/arch/algor/conf/P5064 Sun Dec 18 11:10:33 2011 @@ -1,4 +1,4 @@ -# $NetBSD: P5064,v 1.70 2011/12/18 05:49:22 dholland Exp $ +# $NetBSD: P5064,v 1.71 2011/12/18 11:10:33 kiyohara Exp $ # # Algorithmics P-5064 kernel. # @@ -7,7 +7,7 @@ include arch/algor/conf/std.algor #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident P5064-$Revision: 1.70 $ +#ident P5064-$Revision: 1.71 $ maxusers 32 @@ -25,7 +25,7 @@ options DIAGNOSTIC # Cheap kernel cons options DDB # kernel debugger makeoptions DEBUG=-g #makeoptions DEBUGLIST=pattern1 pattern2 ... -options SYMTAB_SPACE=465000 +options SYMTAB_SPACE=47 # File systems file-system FFS # Fast file system
CVS commit: src/sys/arch/algor/conf
Module Name:src Committed By: kiyohara Date: Thu Dec 15 16:06:18 UTC 2011 Modified Files: src/sys/arch/algor/conf: P4032 P6032 Log Message: SYMTAB_SPACE. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/sys/arch/algor/conf/P4032 cvs rdiff -u -r1.62 -r1.63 src/sys/arch/algor/conf/P6032 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/conf/P4032 diff -u src/sys/arch/algor/conf/P4032:1.61 src/sys/arch/algor/conf/P4032:1.62 --- src/sys/arch/algor/conf/P4032:1.61 Wed Nov 30 14:34:11 2011 +++ src/sys/arch/algor/conf/P4032 Thu Dec 15 16:06:18 2011 @@ -1,4 +1,4 @@ -# $NetBSD: P4032,v 1.61 2011/11/30 14:34:11 kiyohara Exp $ +# $NetBSD: P4032,v 1.62 2011/12/15 16:06:18 kiyohara Exp $ # # Algorithmics P-4032 kernel. # @@ -7,7 +7,7 @@ include arch/algor/conf/std.algor #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident P4032-$Revision: 1.61 $ +#ident P4032-$Revision: 1.62 $ maxusers 32 @@ -30,7 +30,7 @@ options DIAGNOSTIC # Cheap kernel cons options DDB # kernel debugger makeoptions DEBUG=-g #makeoptions DEBUGLIST=pattern1 pattern2 ... -options SYMTAB_SPACE=405000 +options SYMTAB_SPACE=425000 # File systems file-system FFS # Fast file system Index: src/sys/arch/algor/conf/P6032 diff -u src/sys/arch/algor/conf/P6032:1.62 src/sys/arch/algor/conf/P6032:1.63 --- src/sys/arch/algor/conf/P6032:1.62 Thu Dec 1 14:18:02 2011 +++ src/sys/arch/algor/conf/P6032 Thu Dec 15 16:06:18 2011 @@ -1,4 +1,4 @@ -# $NetBSD: P6032,v 1.62 2011/12/01 14:18:02 kiyohara Exp $ +# $NetBSD: P6032,v 1.63 2011/12/15 16:06:18 kiyohara Exp $ # # Algorithmics P-6032 kernel. # @@ -7,7 +7,7 @@ include arch/algor/conf/std.algor #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident P6032-$Revision: 1.62 $ +#ident P6032-$Revision: 1.63 $ maxusers 32 @@ -25,7 +25,7 @@ options DIAGNOSTIC # Cheap kernel cons options DDB # kernel debugger makeoptions DEBUG=-g #makeoptions DEBUGLIST=pattern1 pattern2 ... -options SYMTAB_SPACE=425000 +options SYMTAB_SPACE=45 # File systems file-system FFS # Fast file system
CVS commit: src/sys/arch/algor/conf
Module Name:src Committed By: kiyohara Date: Thu Dec 1 14:18:02 UTC 2011 Modified Files: src/sys/arch/algor/conf: P6032 Log Message: Increase SYMTAB_SPACE for evbmips. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/sys/arch/algor/conf/P6032 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/conf/P6032 diff -u src/sys/arch/algor/conf/P6032:1.61 src/sys/arch/algor/conf/P6032:1.62 --- src/sys/arch/algor/conf/P6032:1.61 Tue Nov 22 21:24:53 2011 +++ src/sys/arch/algor/conf/P6032 Thu Dec 1 14:18:02 2011 @@ -1,4 +1,4 @@ -# $NetBSD: P6032,v 1.61 2011/11/22 21:24:53 tls Exp $ +# $NetBSD: P6032,v 1.62 2011/12/01 14:18:02 kiyohara Exp $ # # Algorithmics P-6032 kernel. # @@ -7,7 +7,7 @@ include arch/algor/conf/std.algor #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident P6032-$Revision: 1.61 $ +#ident P6032-$Revision: 1.62 $ maxusers 32 @@ -25,7 +25,7 @@ options DIAGNOSTIC # Cheap kernel cons options DDB # kernel debugger makeoptions DEBUG=-g #makeoptions DEBUGLIST=pattern1 pattern2 ... -options SYMTAB_SPACE=424000 +options SYMTAB_SPACE=425000 # File systems file-system FFS # Fast file system
CVS commit: src/sys/arch/algor/conf
Module Name:src Committed By: kiyohara Date: Wed Nov 30 14:34:11 UTC 2011 Modified Files: src/sys/arch/algor/conf: P4032 Log Message: Increase SYMTAB_SPACE for evbmips. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/arch/algor/conf/P4032 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/conf/P4032 diff -u src/sys/arch/algor/conf/P4032:1.60 src/sys/arch/algor/conf/P4032:1.61 --- src/sys/arch/algor/conf/P4032:1.60 Tue Nov 22 21:24:52 2011 +++ src/sys/arch/algor/conf/P4032 Wed Nov 30 14:34:11 2011 @@ -1,4 +1,4 @@ -# $NetBSD: P4032,v 1.60 2011/11/22 21:24:52 tls Exp $ +# $NetBSD: P4032,v 1.61 2011/11/30 14:34:11 kiyohara Exp $ # # Algorithmics P-4032 kernel. # @@ -7,7 +7,7 @@ include arch/algor/conf/std.algor #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident P4032-$Revision: 1.60 $ +#ident P4032-$Revision: 1.61 $ maxusers 32 @@ -30,7 +30,7 @@ options DIAGNOSTIC # Cheap kernel cons options DDB # kernel debugger makeoptions DEBUG=-g #makeoptions DEBUGLIST=pattern1 pattern2 ... -options SYMTAB_SPACE=404000 +options SYMTAB_SPACE=405000 # File systems file-system FFS # Fast file system
CVS commit: src/sys/arch/algor/conf
Module Name:src Committed By: dyoung Date: Sun Jul 17 23:39:47 UTC 2011 Modified Files: src/sys/arch/algor/conf: P4032 P5064 Log Message: Increase SYMTAB_SPACE. How do we automate this? To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/arch/algor/conf/P4032 cvs rdiff -u -r1.67 -r1.68 src/sys/arch/algor/conf/P5064 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/conf/P4032 diff -u src/sys/arch/algor/conf/P4032:1.58 src/sys/arch/algor/conf/P4032:1.59 --- src/sys/arch/algor/conf/P4032:1.58 Sat Jul 9 17:13:32 2011 +++ src/sys/arch/algor/conf/P4032 Sun Jul 17 23:39:46 2011 @@ -1,4 +1,4 @@ -# $NetBSD: P4032,v 1.58 2011/07/09 17:13:32 dyoung Exp $ +# $NetBSD: P4032,v 1.59 2011/07/17 23:39:46 dyoung Exp $ # # Algorithmics P-4032 kernel. # @@ -7,7 +7,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident P4032-$Revision: 1.58 $ +#ident P4032-$Revision: 1.59 $ maxusers 32 @@ -30,7 +30,7 @@ options DDB # kernel debugger makeoptions DEBUG=-g #makeoptions DEBUGLIST=pattern1 pattern2 ... -options SYMTAB_SPACE=402000 +options SYMTAB_SPACE=404000 # File systems file-system FFS # Fast file system Index: src/sys/arch/algor/conf/P5064 diff -u src/sys/arch/algor/conf/P5064:1.67 src/sys/arch/algor/conf/P5064:1.68 --- src/sys/arch/algor/conf/P5064:1.67 Sat Jul 9 17:13:32 2011 +++ src/sys/arch/algor/conf/P5064 Sun Jul 17 23:39:46 2011 @@ -1,4 +1,4 @@ -# $NetBSD: P5064,v 1.67 2011/07/09 17:13:32 dyoung Exp $ +# $NetBSD: P5064,v 1.68 2011/07/17 23:39:46 dyoung Exp $ # # Algorithmics P-5064 kernel. # @@ -7,7 +7,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident P5064-$Revision: 1.67 $ +#ident P5064-$Revision: 1.68 $ maxusers 32 @@ -25,7 +25,7 @@ options DDB # kernel debugger makeoptions DEBUG=-g #makeoptions DEBUGLIST=pattern1 pattern2 ... -options SYMTAB_SPACE=464000 +options SYMTAB_SPACE=465000 # File systems file-system FFS # Fast file system
CVS commit: src/sys/arch/algor/include
Module Name:src Committed By: dyoung Date: Wed Jul 13 04:53:39 UTC 2011 Modified Files: src/sys/arch/algor/include: types.h Removed Files: src/sys/arch/algor/include: bus.h Log Message: Switch algor to new-style sys/bus.h. While I'm here, get rid of __HAVE_DEVICE_REGISTER. To generate a diff of this commit: cvs rdiff -u -r1.16 -r0 src/sys/arch/algor/include/bus.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/algor/include/types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/include/types.h diff -u src/sys/arch/algor/include/types.h:1.5 src/sys/arch/algor/include/types.h:1.6 --- src/sys/arch/algor/include/types.h:1.5 Sun Jan 20 18:09:04 2008 +++ src/sys/arch/algor/include/types.h Wed Jul 13 04:53:39 2011 @@ -1,5 +1,5 @@ -/* $NetBSD: types.h,v 1.5 2008/01/20 18:09:04 joerg Exp $ */ +/* $NetBSD: types.h,v 1.6 2011/07/13 04:53:39 dyoung Exp $ */ #include mips/types.h -#define __HAVE_DEVICE_REGISTER +#define __HAVE_NEW_STYLE_BUS_H
CVS commit: src/sys/arch/algor/conf
Module Name:src Committed By: dyoung Date: Sat Jul 9 17:13:32 UTC 2011 Modified Files: src/sys/arch/algor/conf: P4032 P5064 P6032 Log Message: Increase SYMTAB_SPACE, again. Why it should be necessary over and over, I do not know. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/arch/algor/conf/P4032 cvs rdiff -u -r1.66 -r1.67 src/sys/arch/algor/conf/P5064 cvs rdiff -u -r1.59 -r1.60 src/sys/arch/algor/conf/P6032 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/conf/P4032 diff -u src/sys/arch/algor/conf/P4032:1.57 src/sys/arch/algor/conf/P4032:1.58 --- src/sys/arch/algor/conf/P4032:1.57 Thu Jun 30 20:09:17 2011 +++ src/sys/arch/algor/conf/P4032 Sat Jul 9 17:13:32 2011 @@ -1,4 +1,4 @@ -# $NetBSD: P4032,v 1.57 2011/06/30 20:09:17 wiz Exp $ +# $NetBSD: P4032,v 1.58 2011/07/09 17:13:32 dyoung Exp $ # # Algorithmics P-4032 kernel. # @@ -7,7 +7,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident P4032-$Revision: 1.57 $ +#ident P4032-$Revision: 1.58 $ maxusers 32 @@ -30,7 +30,7 @@ options DDB # kernel debugger makeoptions DEBUG=-g #makeoptions DEBUGLIST=pattern1 pattern2 ... -options SYMTAB_SPACE=40 +options SYMTAB_SPACE=402000 # File systems file-system FFS # Fast file system Index: src/sys/arch/algor/conf/P5064 diff -u src/sys/arch/algor/conf/P5064:1.66 src/sys/arch/algor/conf/P5064:1.67 --- src/sys/arch/algor/conf/P5064:1.66 Fri Jul 1 22:10:31 2011 +++ src/sys/arch/algor/conf/P5064 Sat Jul 9 17:13:32 2011 @@ -1,4 +1,4 @@ -# $NetBSD: P5064,v 1.66 2011/07/01 22:10:31 dyoung Exp $ +# $NetBSD: P5064,v 1.67 2011/07/09 17:13:32 dyoung Exp $ # # Algorithmics P-5064 kernel. # @@ -7,7 +7,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident P5064-$Revision: 1.66 $ +#ident P5064-$Revision: 1.67 $ maxusers 32 @@ -25,7 +25,7 @@ options DDB # kernel debugger makeoptions DEBUG=-g #makeoptions DEBUGLIST=pattern1 pattern2 ... -options SYMTAB_SPACE=462000 +options SYMTAB_SPACE=464000 # File systems file-system FFS # Fast file system Index: src/sys/arch/algor/conf/P6032 diff -u src/sys/arch/algor/conf/P6032:1.59 src/sys/arch/algor/conf/P6032:1.60 --- src/sys/arch/algor/conf/P6032:1.59 Fri Jul 1 22:28:07 2011 +++ src/sys/arch/algor/conf/P6032 Sat Jul 9 17:13:32 2011 @@ -1,4 +1,4 @@ -# $NetBSD: P6032,v 1.59 2011/07/01 22:28:07 dyoung Exp $ +# $NetBSD: P6032,v 1.60 2011/07/09 17:13:32 dyoung Exp $ # # Algorithmics P-6032 kernel. # @@ -7,7 +7,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident P6032-$Revision: 1.59 $ +#ident P6032-$Revision: 1.60 $ maxusers 32 @@ -25,7 +25,7 @@ options DDB # kernel debugger makeoptions DEBUG=-g #makeoptions DEBUGLIST=pattern1 pattern2 ... -options SYMTAB_SPACE=421000 +options SYMTAB_SPACE=424000 # File systems file-system FFS # Fast file system
CVS commit: src/sys/arch/algor/include
Module Name:src Committed By: dyoung Date: Sat Jul 9 17:22:08 UTC 2011 Modified Files: src/sys/arch/algor/include: bus_defs.h bus_funcs.h Log Message: Use the definitions in mips/bus_{dma,space}_{defs,funcs}.h. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/algor/include/bus_defs.h \ src/sys/arch/algor/include/bus_funcs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/include/bus_defs.h diff -u src/sys/arch/algor/include/bus_defs.h:1.1 src/sys/arch/algor/include/bus_defs.h:1.2 --- src/sys/arch/algor/include/bus_defs.h:1.1 Fri Jul 1 17:09:58 2011 +++ src/sys/arch/algor/include/bus_defs.h Sat Jul 9 17:22:08 2011 @@ -1,392 +1,10 @@ -/* $NetBSD: bus_defs.h,v 1.1 2011/07/01 17:09:58 dyoung Exp $ */ - -/*- - * Copyright (c) 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility, - * NASA Ames Research Center. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in the - *documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * Copyright (c) 1996 Carnegie-Mellon University. - * All rights reserved. - * - * Author: Chris G. Demetriou - * - * Permission to use, copy, modify and distribute this software and - * its documentation is hereby granted, provided that both the copyright - * notice and this permission notice appear in all copies of the - * software, derivative works or modified versions, and any portions - * thereof, and that both notices appear in supporting documentation. - * - * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS AS IS - * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND - * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * Carnegie Mellon requests users of this software to return to - * - * Software Distribution Coordinator or software.distribut...@cs.cmu.edu - * School of Computer Science - * Carnegie Mellon University - * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie the - * rights to redistribute these changes. - */ +/* $NetBSD: bus_defs.h,v 1.2 2011/07/09 17:22:08 dyoung Exp $ */ #ifndef _ALGOR_BUS_DEFS_H_ #define _ALGOR_BUS_DEFS_H_ +#define _MIPS_NEED_BUS_DMA_BOUNCE -#include sys/types.h - -#ifdef _KERNEL -/* - * Addresses (in bus space). - */ -typedef u_long bus_addr_t; -typedef u_long bus_size_t; - -/* - * Turn on BUS_SPACE_DEBUG if the global DEBUG option is enabled. - */ -#if defined(DEBUG) !defined(BUS_SPACE_DEBUG) -#define BUS_SPACE_DEBUG -#endif - -#ifdef BUS_SPACE_DEBUG -#include sys/systm.h /* for printf() prototype */ -/* - * Macros for checking the aligned-ness of pointers passed to bus - * space ops. Strict alignment is required by the MIPS architecture, - * and a trap will occur if unaligned access is performed. These - * may aid in the debugging of a broken device driver by displaying - * useful information about the problem. - */ -#define __BUS_SPACE_ALIGNED_ADDRESS(p, t)\ - u_long)(p)) (sizeof(t)-1)) == 0) - -#define __BUS_SPACE_ADDRESS_SANITY(p, t, d)\ -({ \ - if (__BUS_SPACE_ALIGNED_ADDRESS((p), t) == 0) { \ - printf(%s 0x%lx not aligned to %zu bytes %s:%d\n, \ - d, (u_long)(p), sizeof(t), __FILE__, __LINE__); \ - }\ - (void) 0; \ -}) - -#define BUS_SPACE_ALIGNED_POINTER(p, t) __BUS_SPACE_ALIGNED_ADDRESS(p, t) -#else -#define __BUS_SPACE_ADDRESS_SANITY(p, t, d) (void) 0 -#define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t) -#endif /* BUS_SPACE_DEBUG */ -#endif /*
CVS commit: src/sys/arch/algor/algor
Module Name:src Committed By: dyoung Date: Fri Jul 1 18:30:36 UTC 2011 Modified Files: src/sys/arch/algor/algor: algor_p4032_dma.c algor_p4032_intr.c algor_p4032var.h algor_p5064_dma.c algor_p5064_intr.c algor_p5064var.h algor_p6032_dma.c algor_p6032_intr.c algor_p6032var.h autoconf.c bus_dma.c machdep.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/algor/algor/algor_p4032_dma.c \ src/sys/arch/algor/algor/algor_p4032var.h cvs rdiff -u -r1.22 -r1.23 src/sys/arch/algor/algor/algor_p4032_intr.c \ src/sys/arch/algor/algor/bus_dma.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/algor/algor/algor_p5064_dma.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/algor/algor/algor_p5064_intr.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/algor/algor/algor_p5064var.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/algor/algor/algor_p6032_dma.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/algor/algor/algor_p6032_intr.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/algor/algor/algor_p6032var.h cvs rdiff -u -r1.18 -r1.19 src/sys/arch/algor/algor/autoconf.c cvs rdiff -u -r1.49 -r1.50 src/sys/arch/algor/algor/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/algor/algor_p4032_dma.c diff -u src/sys/arch/algor/algor/algor_p4032_dma.c:1.6 src/sys/arch/algor/algor/algor_p4032_dma.c:1.7 --- src/sys/arch/algor/algor/algor_p4032_dma.c:1.6 Mon Apr 28 20:23:10 2008 +++ src/sys/arch/algor/algor/algor_p4032_dma.c Fri Jul 1 18:30:36 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: algor_p4032_dma.c,v 1.6 2008/04/28 20:23:10 martin Exp $ */ +/* $NetBSD: algor_p4032_dma.c,v 1.7 2011/07/01 18:30:36 dyoung Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -34,12 +34,12 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: algor_p4032_dma.c,v 1.6 2008/04/28 20:23:10 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: algor_p4032_dma.c,v 1.7 2011/07/01 18:30:36 dyoung Exp $); #include sys/param.h #define _ALGOR_BUS_DMA_PRIVATE -#include machine/bus.h +#include sys/bus.h #include algor/algor/algor_p4032reg.h #include algor/algor/algor_p4032var.h Index: src/sys/arch/algor/algor/algor_p4032var.h diff -u src/sys/arch/algor/algor/algor_p4032var.h:1.6 src/sys/arch/algor/algor/algor_p4032var.h:1.7 --- src/sys/arch/algor/algor/algor_p4032var.h:1.6 Sun Feb 20 07:51:21 2011 +++ src/sys/arch/algor/algor/algor_p4032var.h Fri Jul 1 18:30:36 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: algor_p4032var.h,v 1.6 2011/02/20 07:51:21 matt Exp $ */ +/* $NetBSD: algor_p4032var.h,v 1.7 2011/07/01 18:30:36 dyoung Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include machine/bus.h +#include sys/bus.h #include dev/pci/pcivar.h struct p4032_config { Index: src/sys/arch/algor/algor/algor_p4032_intr.c diff -u src/sys/arch/algor/algor/algor_p4032_intr.c:1.22 src/sys/arch/algor/algor/algor_p4032_intr.c:1.23 --- src/sys/arch/algor/algor/algor_p4032_intr.c:1.22 Thu Apr 7 04:01:40 2011 +++ src/sys/arch/algor/algor/algor_p4032_intr.c Fri Jul 1 18:30:36 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: algor_p4032_intr.c,v 1.22 2011/04/07 04:01:40 dyoung Exp $ */ +/* $NetBSD: algor_p4032_intr.c,v 1.23 2011/07/01 18:30:36 dyoung Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: algor_p4032_intr.c,v 1.22 2011/04/07 04:01:40 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: algor_p4032_intr.c,v 1.23 2011/07/01 18:30:36 dyoung Exp $); #include opt_ddb.h #define __INTR_PRIVATE @@ -51,7 +51,7 @@ #include sys/kernel.h #include sys/cpu.h -#include machine/bus.h +#include sys/bus.h #include machine/autoconf.h #include machine/intr.h Index: src/sys/arch/algor/algor/bus_dma.c diff -u src/sys/arch/algor/algor/bus_dma.c:1.22 src/sys/arch/algor/algor/bus_dma.c:1.23 --- src/sys/arch/algor/algor/bus_dma.c:1.22 Mon Dec 14 00:45:59 2009 +++ src/sys/arch/algor/algor/bus_dma.c Fri Jul 1 18:30:36 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_dma.c,v 1.22 2009/12/14 00:45:59 matt Exp $ */ +/* $NetBSD: bus_dma.c,v 1.23 2011/07/01 18:30:36 dyoung Exp $ */ /*- * Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.22 2009/12/14 00:45:59 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.23 2011/07/01 18:30:36 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -47,7 +47,7 @@ #include mips/cache.h #define _ALGOR_BUS_DMA_PRIVATE -#include machine/bus.h +#include sys/bus.h #include machine/cpu.h #include machine/locore.h Index: src/sys/arch/algor/algor/algor_p5064_dma.c diff -u src/sys/arch/algor/algor/algor_p5064_dma.c:1.4
CVS commit: src/sys/arch/algor
Module Name:src Committed By: dyoung Date: Fri Jul 1 18:31:32 UTC 2011 Modified Files: src/sys/arch/algor/dev: bonito_mainbus.c com_mainbus.c lpt_mainbus.c mainbus.c mcclock_mainbus.c vtpbc_mainbus.c src/sys/arch/algor/isa: isadma_bounce.c mcclock_isa.c src/sys/arch/algor/pci: pcib.c vtpbc.c Log Message: #include sys/bus.h instead of machine/bus.h. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/algor/dev/bonito_mainbus.c \ src/sys/arch/algor/dev/com_mainbus.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/algor/dev/lpt_mainbus.c \ src/sys/arch/algor/dev/mcclock_mainbus.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/algor/dev/mainbus.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/algor/dev/vtpbc_mainbus.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/algor/isa/isadma_bounce.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/algor/isa/mcclock_isa.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/algor/pci/pcib.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/algor/pci/vtpbc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/dev/bonito_mainbus.c diff -u src/sys/arch/algor/dev/bonito_mainbus.c:1.12 src/sys/arch/algor/dev/bonito_mainbus.c:1.13 --- src/sys/arch/algor/dev/bonito_mainbus.c:1.12 Tue May 17 17:34:47 2011 +++ src/sys/arch/algor/dev/bonito_mainbus.c Fri Jul 1 18:31:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bonito_mainbus.c,v 1.12 2011/05/17 17:34:47 dyoung Exp $ */ +/* $NetBSD: bonito_mainbus.c,v 1.13 2011/07/01 18:31:31 dyoung Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bonito_mainbus.c,v 1.12 2011/05/17 17:34:47 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: bonito_mainbus.c,v 1.13 2011/07/01 18:31:31 dyoung Exp $); #include opt_algor_p6032.h @@ -40,7 +40,7 @@ #include sys/reboot.h #include sys/device.h -#include machine/bus.h +#include sys/bus.h #include machine/autoconf.h #include mips/bonito/bonitoreg.h Index: src/sys/arch/algor/dev/com_mainbus.c diff -u src/sys/arch/algor/dev/com_mainbus.c:1.12 src/sys/arch/algor/dev/com_mainbus.c:1.13 --- src/sys/arch/algor/dev/com_mainbus.c:1.12 Fri Nov 27 03:23:03 2009 +++ src/sys/arch/algor/dev/com_mainbus.c Fri Jul 1 18:31:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: com_mainbus.c,v 1.12 2009/11/27 03:23:03 rmind Exp $ */ +/* $NetBSD: com_mainbus.c,v 1.13 2011/07/01 18:31:31 dyoung Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: com_mainbus.c,v 1.12 2009/11/27 03:23:03 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: com_mainbus.c,v 1.13 2011/07/01 18:31:31 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -51,7 +51,7 @@ #include machine/autoconf.h #include machine/intr.h -#include machine/bus.h +#include sys/bus.h #include dev/ic/comreg.h #include dev/ic/comvar.h Index: src/sys/arch/algor/dev/lpt_mainbus.c diff -u src/sys/arch/algor/dev/lpt_mainbus.c:1.10 src/sys/arch/algor/dev/lpt_mainbus.c:1.11 --- src/sys/arch/algor/dev/lpt_mainbus.c:1.10 Fri Nov 27 03:23:04 2009 +++ src/sys/arch/algor/dev/lpt_mainbus.c Fri Jul 1 18:31:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: lpt_mainbus.c,v 1.10 2009/11/27 03:23:04 rmind Exp $ */ +/* $NetBSD: lpt_mainbus.c,v 1.11 2011/07/01 18:31:31 dyoung Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: lpt_mainbus.c,v 1.10 2009/11/27 03:23:04 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: lpt_mainbus.c,v 1.11 2011/07/01 18:31:31 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -49,7 +49,7 @@ #include machine/autoconf.h #include machine/intr.h -#include machine/bus.h +#include sys/bus.h #include dev/ic/lptreg.h #include dev/ic/lptvar.h Index: src/sys/arch/algor/dev/mcclock_mainbus.c diff -u src/sys/arch/algor/dev/mcclock_mainbus.c:1.10 src/sys/arch/algor/dev/mcclock_mainbus.c:1.11 --- src/sys/arch/algor/dev/mcclock_mainbus.c:1.10 Sat Mar 29 05:42:45 2008 +++ src/sys/arch/algor/dev/mcclock_mainbus.c Fri Jul 1 18:31:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mcclock_mainbus.c,v 1.10 2008/03/29 05:42:45 tsutsui Exp $ */ +/* $NetBSD: mcclock_mainbus.c,v 1.11 2011/07/01 18:31:31 dyoung Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -29,7 +29,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: mcclock_mainbus.c,v 1.10 2008/03/29 05:42:45 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: mcclock_mainbus.c,v 1.11 2011/07/01 18:31:31 dyoung Exp $); #include sys/param.h #include sys/kernel.h @@ -37,7 +37,7 @@ #include sys/device.h #include machine/autoconf.h -#include machine/bus.h +#include sys/bus.h #include dev/clock_subr.h #include
CVS commit: src/sys/arch/algor/conf
Module Name:src Committed By: dyoung Date: Fri Jul 1 22:28:07 UTC 2011 Modified Files: src/sys/arch/algor/conf: P6032 Log Message: Increase SYMTAB_SPACE. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/arch/algor/conf/P6032 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/conf/P6032 diff -u src/sys/arch/algor/conf/P6032:1.58 src/sys/arch/algor/conf/P6032:1.59 --- src/sys/arch/algor/conf/P6032:1.58 Thu Jun 30 20:09:17 2011 +++ src/sys/arch/algor/conf/P6032 Fri Jul 1 22:28:07 2011 @@ -1,4 +1,4 @@ -# $NetBSD: P6032,v 1.58 2011/06/30 20:09:17 wiz Exp $ +# $NetBSD: P6032,v 1.59 2011/07/01 22:28:07 dyoung Exp $ # # Algorithmics P-6032 kernel. # @@ -7,7 +7,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident P6032-$Revision: 1.58 $ +#ident P6032-$Revision: 1.59 $ maxusers 32 @@ -25,7 +25,7 @@ options DDB # kernel debugger makeoptions DEBUG=-g #makeoptions DEBUGLIST=pattern1 pattern2 ... -options SYMTAB_SPACE=42 +options SYMTAB_SPACE=421000 # File systems file-system FFS # Fast file system
CVS commit: src/sys/arch/algor/conf
Module Name:src Committed By: dyoung Date: Wed May 25 22:32:18 UTC 2011 Modified Files: src/sys/arch/algor/conf: P5064 Log Message: Increase SYMTAB_SPACE. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sys/arch/algor/conf/P5064 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/conf/P5064 diff -u src/sys/arch/algor/conf/P5064:1.63 src/sys/arch/algor/conf/P5064:1.64 --- src/sys/arch/algor/conf/P5064:1.63 Mon Mar 7 15:56:26 2011 +++ src/sys/arch/algor/conf/P5064 Wed May 25 22:32:18 2011 @@ -1,4 +1,4 @@ -# $NetBSD: P5064,v 1.63 2011/03/07 15:56:26 jakllsch Exp $ +# $NetBSD: P5064,v 1.64 2011/05/25 22:32:18 dyoung Exp $ # # Algorithmics P-5064 kernel. # @@ -7,7 +7,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident P5064-$Revision: 1.63 $ +#ident P5064-$Revision: 1.64 $ maxusers 32 @@ -25,7 +25,7 @@ options DDB # kernel debugger makeoptions DEBUG=-g #makeoptions DEBUGLIST=pattern1 pattern2 ... -options SYMTAB_SPACE=46 +options SYMTAB_SPACE=461000 # File systems file-system FFS # Fast file system
CVS commit: src/sys/arch/algor/algor
Module Name:src Committed By: dyoung Date: Thu Apr 7 04:01:41 UTC 2011 Modified Files: src/sys/arch/algor/algor: algor_p4032_intr.c algor_p6032_intr.c Log Message: Fix more const pci_attach_args fallout. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/algor/algor/algor_p4032_intr.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/algor/algor/algor_p6032_intr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/algor/algor_p4032_intr.c diff -u src/sys/arch/algor/algor/algor_p4032_intr.c:1.21 src/sys/arch/algor/algor/algor_p4032_intr.c:1.22 --- src/sys/arch/algor/algor/algor_p4032_intr.c:1.21 Sun Feb 20 07:51:21 2011 +++ src/sys/arch/algor/algor/algor_p4032_intr.c Thu Apr 7 04:01:40 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: algor_p4032_intr.c,v 1.21 2011/02/20 07:51:21 matt Exp $ */ +/* $NetBSD: algor_p4032_intr.c,v 1.22 2011/04/07 04:01:40 dyoung Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: algor_p4032_intr.c,v 1.21 2011/02/20 07:51:21 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: algor_p4032_intr.c,v 1.22 2011/04/07 04:01:40 dyoung Exp $); #include opt_ddb.h #define __INTR_PRIVATE @@ -219,7 +219,8 @@ void *algor_p4032_intr_establish(int, int (*)(void *), void *); void algor_p4032_intr_disestablish(void *); -int algor_p4032_pci_intr_map(struct pci_attach_args *, pci_intr_handle_t *); +int algor_p4032_pci_intr_map(const struct pci_attach_args *, + pci_intr_handle_t *); const char *algor_p4032_pci_intr_string(void *, pci_intr_handle_t); const struct evcnt *algor_p4032_pci_intr_evcnt(void *, pci_intr_handle_t); void *algor_p4032_pci_intr_establish(void *, pci_intr_handle_t, int, @@ -485,7 +486,7 @@ */ int -algor_p4032_pci_intr_map(struct pci_attach_args *pa, +algor_p4032_pci_intr_map(const struct pci_attach_args *pa, pci_intr_handle_t *ihp) { static const int pciirqmap[6/*device*/][4/*pin*/] = { Index: src/sys/arch/algor/algor/algor_p6032_intr.c diff -u src/sys/arch/algor/algor/algor_p6032_intr.c:1.18 src/sys/arch/algor/algor/algor_p6032_intr.c:1.19 --- src/sys/arch/algor/algor/algor_p6032_intr.c:1.18 Sat Mar 5 14:04:02 2011 +++ src/sys/arch/algor/algor/algor_p6032_intr.c Thu Apr 7 04:01:40 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: algor_p6032_intr.c,v 1.18 2011/03/05 14:04:02 matt Exp $ */ +/* $NetBSD: algor_p6032_intr.c,v 1.19 2011/04/07 04:01:40 dyoung Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: algor_p6032_intr.c,v 1.18 2011/03/05 14:04:02 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: algor_p6032_intr.c,v 1.19 2011/04/07 04:01:40 dyoung Exp $); #include opt_ddb.h #define __INTR_PRIVATE @@ -175,7 +175,8 @@ void *algor_p6032_intr_establish(int, int (*)(void *), void *); void algor_p6032_intr_disestablish(void *); -int algor_p6032_pci_intr_map(struct pci_attach_args *, pci_intr_handle_t *); +int algor_p6032_pci_intr_map(const struct pci_attach_args *, + pci_intr_handle_t *); const char *algor_p6032_pci_intr_string(void *, pci_intr_handle_t); const struct evcnt *algor_p6032_pci_intr_evcnt(void *, pci_intr_handle_t); void *algor_p6032_pci_intr_establish(void *, pci_intr_handle_t, int, @@ -419,7 +420,7 @@ */ int -algor_p6032_pci_intr_map(struct pci_attach_args *pa, +algor_p6032_pci_intr_map(const struct pci_attach_args *pa, pci_intr_handle_t *ihp) { static const int pciirqmap[6/*device*/][4/*pin*/] = {
CVS commit: src/sys/arch/algor/conf
Module Name:src Committed By: dyoung Date: Thu Apr 7 04:02:29 UTC 2011 Modified Files: src/sys/arch/algor/conf: P6032 Log Message: Increase SYMTAB_SPACE so that this kernel will build. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/arch/algor/conf/P6032 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/conf/P6032 diff -u src/sys/arch/algor/conf/P6032:1.55 src/sys/arch/algor/conf/P6032:1.56 --- src/sys/arch/algor/conf/P6032:1.55 Sat Mar 5 14:02:08 2011 +++ src/sys/arch/algor/conf/P6032 Thu Apr 7 04:02:29 2011 @@ -1,4 +1,4 @@ -# $NetBSD: P6032,v 1.55 2011/03/05 14:02:08 matt Exp $ +# $NetBSD: P6032,v 1.56 2011/04/07 04:02:29 dyoung Exp $ # # Algorithmics P-6032 kernel. # @@ -7,7 +7,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident P6032-$Revision: 1.55 $ +#ident P6032-$Revision: 1.56 $ maxusers 32 @@ -25,7 +25,7 @@ options DDB # kernel debugger makeoptions DEBUG=-g #makeoptions DEBUGLIST=pattern1 pattern2 ... -options SYMTAB_SPACE=37 +options SYMTAB_SPACE=38 # File systems file-system FFS # Fast file system
CVS commit: src/sys/arch/algor
Module Name:src Committed By: dyoung Date: Wed Apr 6 01:24:44 UTC 2011 Modified Files: src/sys/arch/algor: Makefile Log Message: Fix target 'tags'. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/algor/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/Makefile diff -u src/sys/arch/algor/Makefile:1.3 src/sys/arch/algor/Makefile:1.4 --- src/sys/arch/algor/Makefile:1.3 Sat Oct 25 22:27:36 2008 +++ src/sys/arch/algor/Makefile Wed Apr 6 01:24:43 2011 @@ -1,25 +1,31 @@ -# $NetBSD: Makefile,v 1.3 2008/10/25 22:27:36 apb Exp $ +# $NetBSD: Makefile,v 1.4 2011/04/06 01:24:43 dyoung Exp $ # Makefile for algor tags file and boot blocks # Find where mips source files are for inclusion in tags .include ../mips/Makefile.inc -TALGOR= ../algor/tags -SALGOR= ../algor/algor/*.[ch] ../algor/include/*.h ../algor/isa/*.[ch] \ - ../algor/pci/*.[ch] -AALGOR= ../algor/algor/*.S +TALGOR= ${SYSDIR}/arch/algor/tags +SALGOR= ${SYSDIR}/arch/algor/algor/*.[ch] +SALGOR+= ${SYSDIR}/arch/algor/dev/*.[ch] +SALGOR+= ${SYSDIR}/arch/algor/include/*.h +SALGOR+= ${SYSDIR}/arch/algor/isa/*.[ch] +SALGOR+= ${SYSDIR}/arch/algor/pci/*.[ch] +AALGOR= ${SYSDIR}/arch/algor/algor/*.S # Directories in which to place tags links DALGOR= algor include isa pci .include ../../kern/Make.tags.inc tags: - -ctags -wdtf ${TALGOR} ${SALGOR} ${SMIPS} ${COMM} + -rm -f ${TALGOR} + -echo ${SALGOR} ${SMIPS} | xargs ctags -wadtf ${TALGOR} + -${FINDCOMM} | xargs ctags -wadtf ${TALGOR} egrep ^LEAF(.*)|^[AN]LEAF(.*)|^NON_LEAF(.*) ${AALGOR} ${AMIPS} | \ - ${TOOL_SED} s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/; \ - ${TARC} + ${TOOL_SED} -e \ + s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/; \ + ${TALGOR} sort -o ${TALGOR} ${TALGOR} links:
CVS commit: src/sys/arch/algor
Module Name:src Committed By: dyoung Date: Wed Apr 6 01:25:18 UTC 2011 Modified Files: src/sys/arch/algor/algor: algor_p5064_intr.c src/sys/arch/algor/include: pci_machdep.h Log Message: Fix fallout from pci_attach_args constification. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/algor/algor/algor_p5064_intr.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/algor/include/pci_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/algor/algor_p5064_intr.c diff -u src/sys/arch/algor/algor/algor_p5064_intr.c:1.24 src/sys/arch/algor/algor/algor_p5064_intr.c:1.25 --- src/sys/arch/algor/algor/algor_p5064_intr.c:1.24 Sun Feb 20 07:51:21 2011 +++ src/sys/arch/algor/algor/algor_p5064_intr.c Wed Apr 6 01:25:18 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: algor_p5064_intr.c,v 1.24 2011/02/20 07:51:21 matt Exp $ */ +/* $NetBSD: algor_p5064_intr.c,v 1.25 2011/04/06 01:25:18 dyoung Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: algor_p5064_intr.c,v 1.24 2011/02/20 07:51:21 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: algor_p5064_intr.c,v 1.25 2011/04/06 01:25:18 dyoung Exp $); #include opt_ddb.h #define __INTR_PRIVATE @@ -290,14 +290,15 @@ void *algor_p5064_intr_establish(int, int (*)(void *), void *); void algor_p5064_intr_disestablish(void *); -int algor_p5064_pci_intr_map(struct pci_attach_args *, pci_intr_handle_t *); +int algor_p5064_pci_intr_map(const struct pci_attach_args *, + pci_intr_handle_t *); const char *algor_p5064_pci_intr_string(void *, pci_intr_handle_t); const struct evcnt *algor_p5064_pci_intr_evcnt(void *, pci_intr_handle_t); void *algor_p5064_pci_intr_establish(void *, pci_intr_handle_t, int, int (*)(void *), void *); void algor_p5064_pci_intr_disestablish(void *, void *); void *algor_p5064_pciide_compat_intr_establish(void *, device_t, - struct pci_attach_args *, int, int (*)(void *), void *); + const struct pci_attach_args *, int, int (*)(void *), void *); void algor_p5064_pci_conf_interrupt(void *, int, int, int, int, int *); const struct evcnt *algor_p5064_isa_intr_evcnt(void *, int); @@ -573,7 +574,7 @@ */ int -algor_p5064_pci_intr_map(struct pci_attach_args *pa, +algor_p5064_pci_intr_map(const struct pci_attach_args *pa, pci_intr_handle_t *ihp) { static const int pciirqmap[6/*device*/][4/*pin*/] = { @@ -667,7 +668,7 @@ void * algor_p5064_pciide_compat_intr_establish(void *v, device_t dev, -struct pci_attach_args *pa, int chan, int (*func)(void *), void *arg) +const struct pci_attach_args *pa, int chan, int (*func)(void *), void *arg) { pci_chipset_tag_t pc = pa-pa_pc; void *cookie; Index: src/sys/arch/algor/include/pci_machdep.h diff -u src/sys/arch/algor/include/pci_machdep.h:1.7 src/sys/arch/algor/include/pci_machdep.h:1.8 --- src/sys/arch/algor/include/pci_machdep.h:1.7 Thu Feb 16 18:20:31 2006 +++ src/sys/arch/algor/include/pci_machdep.h Wed Apr 6 01:25:18 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_machdep.h,v 1.7 2006/02/16 18:20:31 thorpej Exp $ */ +/* $NetBSD: pci_machdep.h,v 1.8 2011/04/06 01:25:18 dyoung Exp $ */ /* * Copyright (c) 1996 Carnegie-Mellon University. @@ -60,7 +60,7 @@ void (*pc_conf_write)(void *, pcitag_t, int, pcireg_t); void *pc_intr_v; - int (*pc_intr_map)(struct pci_attach_args *, + int (*pc_intr_map)(const struct pci_attach_args *, pci_intr_handle_t *); const char *(*pc_intr_string)(void *, pci_intr_handle_t); const struct evcnt *(*pc_intr_evcnt)(void *, pci_intr_handle_t); @@ -73,7 +73,7 @@ /* algor-specific */ void *(*pc_pciide_compat_intr_establish)(void *, - struct device *, struct pci_attach_args *, int, + device_t, const struct pci_attach_args *, int, int (*)(void *), void *); };
CVS commit: src/sys/arch/algor/pci
Module Name:src Committed By: dyoung Date: Wed Apr 6 01:37:59 UTC 2011 Modified Files: src/sys/arch/algor/pci: pciide_machdep.c Log Message: Fix fallout of pci_attach_args constification. This should be the last one for algor. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/algor/pci/pciide_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/pci/pciide_machdep.c diff -u src/sys/arch/algor/pci/pciide_machdep.c:1.3 src/sys/arch/algor/pci/pciide_machdep.c:1.4 --- src/sys/arch/algor/pci/pciide_machdep.c:1.3 Tue Mar 18 20:46:35 2008 +++ src/sys/arch/algor/pci/pciide_machdep.c Wed Apr 6 01:37:59 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pciide_machdep.c,v 1.3 2008/03/18 20:46:35 cube Exp $ */ +/* $NetBSD: pciide_machdep.c,v 1.4 2011/04/06 01:37:59 dyoung Exp $ */ /* * Copyright (c) 1998 Christopher G. Demetriou. All rights reserved. @@ -42,7 +42,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: pciide_machdep.c,v 1.3 2008/03/18 20:46:35 cube Exp $); +__KERNEL_RCSID(0, $NetBSD: pciide_machdep.c,v 1.4 2011/04/06 01:37:59 dyoung Exp $); #include sys/param.h #include sys/systm.h @@ -57,7 +57,7 @@ void * pciide_machdep_compat_intr_establish(device_t dev, -struct pci_attach_args *pa, int chan, int (*func)(void *), void *arg) +const struct pci_attach_args *pa, int chan, int (*func)(void *), void *arg) { pci_chipset_tag_t pc = pa-pa_pc;
CVS commit: src/sys/arch/algor/include
Module Name:src Committed By: tsutsui Date: Fri Mar 18 16:35:04 UTC 2011 Modified Files: src/sys/arch/algor/include: param.h Log Message: - include mips/mips_param.h after MACHINE is defined - remove redundant comment To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/algor/include/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/include/param.h diff -u src/sys/arch/algor/include/param.h:1.10 src/sys/arch/algor/include/param.h:1.11 --- src/sys/arch/algor/include/param.h:1.10 Tue Feb 8 20:20:07 2011 +++ src/sys/arch/algor/include/param.h Fri Mar 18 16:35:03 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.10 2011/02/08 20:20:07 rmind Exp $ */ +/* $NetBSD: param.h,v 1.11 2011/03/18 16:35:03 tsutsui Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -42,18 +42,14 @@ #define _ALGOR_PARAM_H_ /* - * Machine-dependent constants (VM, etc) common across MIPS cpus - */ - -#include mips/mips_param.h - -/* * Machine dependent constants for Algorithmics boards. */ #define _MACHINE algor #define MACHINE algor +#include mips/mips_param.h + #define DEV_BSIZE 512 #define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */ #define BLKDEV_IOSIZE 2048
CVS commit: src/sys/arch/algor/conf
Module Name:src Committed By: matt Date: Sat Mar 5 14:02:08 UTC 2011 Modified Files: src/sys/arch/algor/conf: P6032 Log Message: Increase SYMTAB_SPACE To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/sys/arch/algor/conf/P6032 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/conf/P6032 diff -u src/sys/arch/algor/conf/P6032:1.54 src/sys/arch/algor/conf/P6032:1.55 --- src/sys/arch/algor/conf/P6032:1.54 Tue Nov 23 11:13:53 2010 +++ src/sys/arch/algor/conf/P6032 Sat Mar 5 14:02:08 2011 @@ -1,4 +1,4 @@ -# $NetBSD: P6032,v 1.54 2010/11/23 11:13:53 hannken Exp $ +# $NetBSD: P6032,v 1.55 2011/03/05 14:02:08 matt Exp $ # # Algorithmics P-6032 kernel. # @@ -7,7 +7,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident P6032-$Revision: 1.54 $ +#ident P6032-$Revision: 1.55 $ maxusers 32 @@ -25,7 +25,7 @@ options DDB # kernel debugger makeoptions DEBUG=-g #makeoptions DEBUGLIST=pattern1 pattern2 ... -options SYMTAB_SPACE=36 +options SYMTAB_SPACE=37 # File systems file-system FFS # Fast file system
CVS commit: src/sys/arch/algor
Module Name:src Committed By: matt Date: Sun Feb 20 07:51:22 UTC 2011 Modified Files: src/sys/arch/algor/algor: algor_p4032_intr.c algor_p4032var.h algor_p5064_intr.c algor_p5064var.h algor_p6032_intr.c cpu.c interrupt.c machdep.c src/sys/arch/algor/conf: P4032 P5064 P5064-64 files.algor src/sys/arch/algor/dev: mainbus.c src/sys/arch/algor/include: autoconf.h intr.h src/sys/arch/algor/isa: isadma_bounce.c Log Message: Merge forward from matt-nb5-mips64. Adapt to new interrupt/spl framework. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/algor/algor/algor_p4032_intr.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/algor/algor/algor_p4032var.h cvs rdiff -u -r1.23 -r1.24 src/sys/arch/algor/algor/algor_p5064_intr.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/algor/algor/algor_p5064var.h \ src/sys/arch/algor/algor/cpu.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/algor/algor/algor_p6032_intr.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/algor/algor/interrupt.c cvs rdiff -u -r1.48 -r1.49 src/sys/arch/algor/algor/machdep.c cvs rdiff -u -r1.55 -r1.56 src/sys/arch/algor/conf/P4032 cvs rdiff -u -r1.61 -r1.62 src/sys/arch/algor/conf/P5064 cvs rdiff -u -r1.2 -r1.3 src/sys/arch/algor/conf/P5064-64 cvs rdiff -u -r1.26 -r1.27 src/sys/arch/algor/conf/files.algor cvs rdiff -u -r1.20 -r1.21 src/sys/arch/algor/dev/mainbus.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/algor/include/autoconf.h cvs rdiff -u -r1.13 -r1.14 src/sys/arch/algor/include/intr.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/algor/isa/isadma_bounce.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/algor/algor_p4032_intr.c diff -u src/sys/arch/algor/algor/algor_p4032_intr.c:1.20 src/sys/arch/algor/algor/algor_p4032_intr.c:1.21 --- src/sys/arch/algor/algor/algor_p4032_intr.c:1.20 Mon May 26 15:59:29 2008 +++ src/sys/arch/algor/algor/algor_p4032_intr.c Sun Feb 20 07:51:21 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: algor_p4032_intr.c,v 1.20 2008/05/26 15:59:29 tsutsui Exp $ */ +/* $NetBSD: algor_p4032_intr.c,v 1.21 2011/02/20 07:51:21 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -38,9 +38,10 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: algor_p4032_intr.c,v 1.20 2008/05/26 15:59:29 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: algor_p4032_intr.c,v 1.21 2011/02/20 07:51:21 matt Exp $); #include opt_ddb.h +#define __INTR_PRIVATE #include sys/param.h #include sys/queue.h @@ -99,7 +100,7 @@ #define IRQMAP_8BITBASE NPCIIRQS #define NIRQMAPS (IRQMAP_8BITBASE + N8BITIRQS) -const char *p4032_intrnames[NIRQMAPS] = { +const char * const p4032_intrnames[NIRQMAPS] = { /* * PCI INTERRUPTS */ @@ -205,12 +206,12 @@ }; struct p4032_cpuintr p4032_cpuintrs[NINTRS]; -const char *p4032_cpuintrnames[NINTRS] = { +const char * const p4032_cpuintrnames[NINTRS] = { int 0 (pci), int 1 (8-bit), }; -const char *p4032_intrgroups[NINTRS] = { +const char * const p4032_intrgroups[NINTRS] = { pci, 8-bit, }; @@ -226,7 +227,7 @@ void algor_p4032_pci_intr_disestablish(void *, void *); void algor_p4032_pci_conf_interrupt(void *, int, int, int, int, int *); -void algor_p4032_iointr(u_int32_t, u_int32_t, u_int32_t, u_int32_t); +void algor_p4032_iointr(int, vaddr_t, uint32_t); void algor_p4032_intr_init(struct p4032_config *acp) @@ -242,7 +243,6 @@ evcnt_attach_dynamic(p4032_cpuintrs[i].cintr_count, EVCNT_TYPE_INTR, NULL, mips, p4032_cpuintrnames[i]); } - evcnt_attach_static(mips_int5_evcnt); for (i = 0; i NIRQMAPS; i++) { irqmap = p4032_irqmap[i]; @@ -414,8 +414,7 @@ } void -algor_p4032_iointr(u_int32_t status, u_int32_t cause, u_int32_t pc, -u_int32_t ipending) +algor_p4032_iointr(int ipl, vaddr_t pc, u_int32_t ipending) { const struct p4032_irqmap *irqmap; struct algor_intrhand *ih; @@ -452,9 +451,6 @@ * XXX the floppy interrupt here. */ - cause = ~MIPS_INT_MASK_3; - _splset(MIPS_SR_INT_IE | - ((status ~cause) MIPS_HARD_INT_MASK)); } /* @@ -481,11 +477,7 @@ (*ih-ih_func)(ih-ih_arg); } } - cause = ~(MIPS_INT_MASK_0 level); } - - /* Re-enable anything that we have processed. */ - _splset(MIPS_SR_INT_IE | ((status ~cause) MIPS_HARD_INT_MASK)); } /* Index: src/sys/arch/algor/algor/algor_p4032var.h diff -u src/sys/arch/algor/algor/algor_p4032var.h:1.5 src/sys/arch/algor/algor/algor_p4032var.h:1.6 --- src/sys/arch/algor/algor/algor_p4032var.h:1.5 Mon Apr 28 20:23:10 2008 +++ src/sys/arch/algor/algor/algor_p4032var.h Sun Feb 20 07:51:21 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: algor_p4032var.h,v 1.5 2008/04/28 20:23:10 martin Exp $ */ +/* $NetBSD: algor_p4032var.h,v 1.6 2011/02/20 07:51:21 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -72,7 +72,7 @@ void
CVS commit: src/sys/arch/algor/conf
Module Name:src Committed By: he Date: Fri Jan 21 22:37:12 UTC 2011 Modified Files: src/sys/arch/algor/conf: P4032 Log Message: Bump SYMTAB_SPACE so that it fits again. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/sys/arch/algor/conf/P4032 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/conf/P4032 diff -u src/sys/arch/algor/conf/P4032:1.54 src/sys/arch/algor/conf/P4032:1.55 --- src/sys/arch/algor/conf/P4032:1.54 Tue Nov 23 11:13:53 2010 +++ src/sys/arch/algor/conf/P4032 Fri Jan 21 22:37:11 2011 @@ -1,4 +1,4 @@ -# $NetBSD: P4032,v 1.54 2010/11/23 11:13:53 hannken Exp $ +# $NetBSD: P4032,v 1.55 2011/01/21 22:37:11 he Exp $ # # Algorithmics P-4032 kernel. # @@ -7,7 +7,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident P4032-$Revision: 1.54 $ +#ident P4032-$Revision: 1.55 $ maxusers 32 @@ -30,7 +30,7 @@ options DDB # kernel debugger makeoptions DEBUG=-g #makeoptions DEBUGLIST=pattern1 pattern2 ... -options SYMTAB_SPACE=34 +options SYMTAB_SPACE=35 # File systems file-system FFS # Fast file system
CVS commit: src/sys/arch/algor/include
Module Name:src Committed By: uebayasi Date: Thu Dec 9 05:15:06 UTC 2010 Modified Files: src/sys/arch/algor/include: bus.h Log Message: Fix DEBUG build. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/algor/include/bus.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/include/bus.h diff -u src/sys/arch/algor/include/bus.h:1.14 src/sys/arch/algor/include/bus.h:1.15 --- src/sys/arch/algor/include/bus.h:1.14 Mon Apr 28 20:23:10 2008 +++ src/sys/arch/algor/include/bus.h Thu Dec 9 05:15:06 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: bus.h,v 1.14 2008/04/28 20:23:10 martin Exp $ */ +/* $NetBSD: bus.h,v 1.15 2010/12/09 05:15:06 uebayasi Exp $ */ /*- * Copyright (c) 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc. @@ -85,7 +85,7 @@ #define __BUS_SPACE_ADDRESS_SANITY(p, t, d)\ ({ \ if (__BUS_SPACE_ALIGNED_ADDRESS((p), t) == 0) { \ - printf(%s 0x%lx not aligned to %lu bytes %s:%d\n, \ + printf(%s 0x%lx not aligned to %zu bytes %s:%d\n, \ d, (u_long)(p), sizeof(t), __FILE__, __LINE__); \ }\ (void) 0; \
CVS commit: src/sys/arch/algor/algor
Module Name:src Committed By: uebayasi Date: Mon Nov 15 06:08:32 UTC 2010 Modified Files: src/sys/arch/algor/algor: machdep.c Log Message: curlwp needs sys/lwp.h. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/arch/algor/algor/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/algor/machdep.c diff -u src/sys/arch/algor/algor/machdep.c:1.45 src/sys/arch/algor/algor/machdep.c:1.46 --- src/sys/arch/algor/algor/machdep.c:1.45 Mon Feb 8 19:02:25 2010 +++ src/sys/arch/algor/algor/machdep.c Mon Nov 15 06:08:32 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.45 2010/02/08 19:02:25 joerg Exp $ */ +/* $NetBSD: machdep.c,v 1.46 2010/11/15 06:08:32 uebayasi Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -106,7 +106,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.45 2010/02/08 19:02:25 joerg Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.46 2010/11/15 06:08:32 uebayasi Exp $); #include opt_algor_p4032.h #include opt_algor_p5064.h @@ -129,6 +129,7 @@ #include sys/termios.h #include sys/ksyms.h #include sys/device.h +#include sys/lwp.h #include net/if.h #include net/if_ether.h
CVS commit: src/sys/arch/algor/conf
Module Name:src Committed By: uebayasi Date: Sat Nov 13 04:01:42 UTC 2010 Modified Files: src/sys/arch/algor/conf: P6032 Log Message: Bump symtab space (35 - 36). To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/sys/arch/algor/conf/P6032 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/conf/P6032 diff -u src/sys/arch/algor/conf/P6032:1.52 src/sys/arch/algor/conf/P6032:1.53 --- src/sys/arch/algor/conf/P6032:1.52 Fri Apr 16 13:48:28 2010 +++ src/sys/arch/algor/conf/P6032 Sat Nov 13 04:01:42 2010 @@ -1,4 +1,4 @@ -# $NetBSD: P6032,v 1.52 2010/04/16 13:48:28 pooka Exp $ +# $NetBSD: P6032,v 1.53 2010/11/13 04:01:42 uebayasi Exp $ # # Algorithmics P-6032 kernel. # @@ -7,7 +7,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident P6032-$Revision: 1.52 $ +#ident P6032-$Revision: 1.53 $ maxusers 32 @@ -25,7 +25,7 @@ options DDB # kernel debugger makeoptions DEBUG=-g #makeoptions DEBUGLIST=pattern1 pattern2 ... -options SYMTAB_SPACE=35 +options SYMTAB_SPACE=36 # File systems file-system FFS # Fast file system
CVS commit: src/sys/arch/algor/conf
Module Name:src Committed By: he Date: Fri Feb 19 15:25:28 UTC 2010 Modified Files: src/sys/arch/algor/conf: P5064 Log Message: Bump SYMTAB_SPACE so that it fits again. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/arch/algor/conf/P5064 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/conf/P5064 diff -u src/sys/arch/algor/conf/P5064:1.57 src/sys/arch/algor/conf/P5064:1.58 --- src/sys/arch/algor/conf/P5064:1.57 Fri Mar 6 20:31:46 2009 +++ src/sys/arch/algor/conf/P5064 Fri Feb 19 15:25:28 2010 @@ -1,4 +1,4 @@ -# $NetBSD: P5064,v 1.57 2009/03/06 20:31:46 joerg Exp $ +# $NetBSD: P5064,v 1.58 2010/02/19 15:25:28 he Exp $ # # Algorithmics P-5064 kernel. # @@ -7,7 +7,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident P5064-$Revision: 1.57 $ +#ident P5064-$Revision: 1.58 $ maxusers 32 @@ -25,7 +25,7 @@ options DDB # kernel debugger makeoptions DEBUG=-g #makeoptions DEBUGLIST=pattern1 pattern2 ... -options SYMTAB_SPACE=39 +options SYMTAB_SPACE=40 # File systems file-system FFS # Fast file system
CVS commit: src/sys/arch/algor/algor
Module Name:src Committed By: snj Date: Mon Oct 26 00:59:39 UTC 2009 Modified Files: src/sys/arch/algor/algor: algor_p6032_dma.c Log Message: Fix a typo in a comment. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/algor/algor/algor_p6032_dma.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/algor/algor_p6032_dma.c diff -u src/sys/arch/algor/algor/algor_p6032_dma.c:1.4 src/sys/arch/algor/algor/algor_p6032_dma.c:1.5 --- src/sys/arch/algor/algor/algor_p6032_dma.c:1.4 Mon Apr 28 20:23:10 2008 +++ src/sys/arch/algor/algor/algor_p6032_dma.c Mon Oct 26 00:59:39 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: algor_p6032_dma.c,v 1.4 2008/04/28 20:23:10 martin Exp $ */ +/* $NetBSD: algor_p6032_dma.c,v 1.5 2009/10/26 00:59:39 snj Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: algor_p6032_dma.c,v 1.4 2008/04/28 20:23:10 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: algor_p6032_dma.c,v 1.5 2009/10/26 00:59:39 snj Exp $); #include sys/param.h @@ -75,7 +75,7 @@ t-_dmamem_mmap = _bus_dmamem_mmap; /* - * Initialize the DMA tag usd for ISA DMA. + * Initialize the DMA tag used for ISA DMA. */ t = acp-ac_isa_dmat; t-_cookie = acp;
CVS commit: src/sys/arch/algor/pci
Module Name:src Committed By: dyoung Date: Wed Aug 19 15:17:00 UTC 2009 Modified Files: src/sys/arch/algor/pci: pcib.c Log Message: Define, and hook into the isa_chipset_tag_t, pcib_isa_detach_hook(). To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/algor/pci/pcib.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/algor/pci/pcib.c diff -u src/sys/arch/algor/pci/pcib.c:1.20 src/sys/arch/algor/pci/pcib.c:1.21 --- src/sys/arch/algor/pci/pcib.c:1.20 Sat Mar 14 15:35:59 2009 +++ src/sys/arch/algor/pci/pcib.c Wed Aug 19 15:17:00 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pcib.c,v 1.20 2009/03/14 15:35:59 dsl Exp $ */ +/* $NetBSD: pcib.c,v 1.21 2009/08/19 15:17:00 dyoung Exp $ */ /*- * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: pcib.c,v 1.20 2009/03/14 15:35:59 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: pcib.c,v 1.21 2009/08/19 15:17:00 dyoung Exp $); #include opt_algor_p5064.h #include opt_algor_p6032.h @@ -119,6 +119,7 @@ void pcib_isa_attach_hook(struct device *, struct device *, struct isabus_attach_args *); +void pcib_isa_detach_hook(isa_chipset_tag_t, device_t); int pcib_intr(void *); @@ -316,6 +317,7 @@ iba.iba_ic = sc-sc_ic; iba.iba_ic-ic_attach_hook = pcib_isa_attach_hook; + iba.iba_ic-ic_detach_hook = pcib_isa_detach_hook; (void) config_found_ia(sc-sc_dev, isabus, iba, isabusprint); } @@ -329,6 +331,13 @@ } void +pcib_isa_detach_hook(isa_chipset_tag_t ic, device_t self) +{ + + /* Nothing to do. */ +} + +void pcib_set_icus(struct pcib_softc *sc) {