CVS commit: [nick-hppapmap] src/sys/arch/hp700/dev
Module Name:src Committed By: skrll Date: Wed Apr 29 14:17:45 UTC 2009 Modified Files: src/sys/arch/hp700/dev [nick-hppapmap]: com_dino.c Log Message: Whitespace. To generate a diff of this commit: cvs rdiff -u -r1.3.12.1 -r1.3.12.2 src/sys/arch/hp700/dev/com_dino.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/hp700/dev/com_dino.c diff -u src/sys/arch/hp700/dev/com_dino.c:1.3.12.1 src/sys/arch/hp700/dev/com_dino.c:1.3.12.2 --- src/sys/arch/hp700/dev/com_dino.c:1.3.12.1 Sun Dec 28 16:46:32 2008 +++ src/sys/arch/hp700/dev/com_dino.c Wed Apr 29 14:17:44 2009 @@ -42,7 +42,6 @@ #include hp700/dev/cpudevs.h #include hp700/hp700/machdep.h - void *dino_intr_establish(void *sc, int irq, int pri, int (*handler)(void *v), void *arg);
CVS commit: [nick-hppapmap] src/sys/arch/hp700/dev
Module Name:src Committed By: skrll Date: Wed Apr 29 14:20:37 UTC 2009 Modified Files: src/sys/arch/hp700/dev [nick-hppapmap]: pdc.c Log Message: Whitespace (remove diff to HEAD) To generate a diff of this commit: cvs rdiff -u -r1.25.4.2 -r1.25.4.3 src/sys/arch/hp700/dev/pdc.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/hp700/dev/pdc.c diff -u src/sys/arch/hp700/dev/pdc.c:1.25.4.2 src/sys/arch/hp700/dev/pdc.c:1.25.4.3 --- src/sys/arch/hp700/dev/pdc.c:1.25.4.2 Tue Apr 28 12:54:40 2009 +++ src/sys/arch/hp700/dev/pdc.c Wed Apr 29 14:20:37 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pdc.c,v 1.25.4.2 2009/04/28 12:54:40 skrll Exp $ */ +/* $NetBSD: pdc.c,v 1.25.4.3 2009/04/29 14:20:37 skrll Exp $ */ /* $OpenBSD: pdc.c,v 1.14 2001/04/29 21:05:43 mickey Exp $ */ @@ -33,7 +33,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pdc.c,v 1.25.4.2 2009/04/28 12:54:40 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: pdc.c,v 1.25.4.3 2009/04/29 14:20:37 skrll Exp $); #include sys/param.h #include sys/systm.h @@ -427,7 +427,6 @@ *pdc_consbuf = c; err = pdc_call(pdc_cniodc, 0, pz_cons-pz_hpa, IODC_IO_CONSOUT, pz_cons-pz_spa, pz_cons-pz_layers, pdcret, 0, pdc_consbuf, 1, 0); - hp700_pagezero_unmap(pagezero_cookie); splx(s);
CVS commit: [nick-hppapmap] src/sys/arch/hp700/dev
Module Name:src
Committed By: skrll
Date: Wed Apr 29 15:42:27 UTC 2009
Modified Files:
src/sys/arch/hp700/dev [nick-hppapmap]: dino.c
Log Message:
Sync with HEAD.
To generate a diff of this commit:
cvs rdiff -u -r1.6.2.3 -r1.6.2.4 src/sys/arch/hp700/dev/dino.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/hp700/dev/dino.c
diff -u src/sys/arch/hp700/dev/dino.c:1.6.2.3 src/sys/arch/hp700/dev/dino.c:1.6.2.4
--- src/sys/arch/hp700/dev/dino.c:1.6.2.3 Sat Apr 25 15:09:14 2009
+++ src/sys/arch/hp700/dev/dino.c Wed Apr 29 15:42:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dino.c,v 1.6.2.3 2009/04/25 15:09:14 skrll Exp $ */
+/* $NetBSD: dino.c,v 1.6.2.4 2009/04/29 15:42:27 skrll Exp $ */
/* $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dino.c,v 1.6.2.3 2009/04/25 15:09:14 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: dino.c,v 1.6.2.4 2009/04/29 15:42:27 skrll Exp $);
/* #include cardbus.h */
@@ -388,7 +388,7 @@
void
dino_intr_disestablish(void *v, void *cookie)
{
- panic(There is no hp700_intr_disestablish()!);
+ /* XXX Implement me */
}
CVS commit: [nick-hppapmap] src/sys/arch/hp700/dev
Module Name:src
Committed By: skrll
Date: Tue Apr 28 12:54:40 UTC 2009
Modified Files:
src/sys/arch/hp700/dev [nick-hppapmap]: pdc.c
Log Message:
Remove some unnecessary includes.
To generate a diff of this commit:
cvs rdiff -u -r1.25.4.1 -r1.25.4.2 src/sys/arch/hp700/dev/pdc.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/hp700/dev/pdc.c
diff -u src/sys/arch/hp700/dev/pdc.c:1.25.4.1 src/sys/arch/hp700/dev/pdc.c:1.25.4.2
--- src/sys/arch/hp700/dev/pdc.c:1.25.4.1 Mon Oct 27 08:02:40 2008
+++ src/sys/arch/hp700/dev/pdc.c Tue Apr 28 12:54:40 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pdc.c,v 1.25.4.1 2008/10/27 08:02:40 skrll Exp $ */
+/* $NetBSD: pdc.c,v 1.25.4.2 2009/04/28 12:54:40 skrll Exp $ */
/* $OpenBSD: pdc.c,v 1.14 2001/04/29 21:05:43 mickey Exp $ */
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pdc.c,v 1.25.4.1 2008/10/27 08:02:40 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: pdc.c,v 1.25.4.2 2009/04/28 12:54:40 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -54,10 +54,6 @@
#include hp700/hp700/machdep.h
-#include machine/db_machdep.h /* type definitions */
-#include ddb/db_interface.h
-
-
typedef
struct pdc_softc {
struct device sc_dv;
CVS commit: [nick-hppapmap] src/sys/arch/hp700/dev
Module Name:src Committed By: skrll Date: Sat Apr 25 15:09:14 UTC 2009 Modified Files: src/sys/arch/hp700/dev [nick-hppapmap]: dino.c elroy.c Log Message: memset 0 pcibus_attach_args To generate a diff of this commit: cvs rdiff -u -r1.6.2.2 -r1.6.2.3 src/sys/arch/hp700/dev/dino.c cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/hp700/dev/elroy.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/hp700/dev/dino.c diff -u src/sys/arch/hp700/dev/dino.c:1.6.2.2 src/sys/arch/hp700/dev/dino.c:1.6.2.3 --- src/sys/arch/hp700/dev/dino.c:1.6.2.2 Sun Dec 28 16:07:54 2008 +++ src/sys/arch/hp700/dev/dino.c Sat Apr 25 15:09:14 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: dino.c,v 1.6.2.2 2008/12/28 16:07:54 skrll Exp $ */ +/* $NetBSD: dino.c,v 1.6.2.3 2009/04/25 15:09:14 skrll Exp $ */ /* $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */ @@ -29,7 +29,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: dino.c,v 1.6.2.2 2008/12/28 16:07:54 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: dino.c,v 1.6.2.3 2009/04/25 15:09:14 skrll Exp $); /* #include cardbus.h */ @@ -1690,12 +1690,12 @@ nca.ca_nmodules = MAXMODBUS; pdc_scanbus(self, nca, dino_callback); + memset(pba, 0, sizeof(pba)); pba.pba_iot = sc-sc_iot; pba.pba_memt = sc-sc_memt; pba.pba_dmat = sc-sc_dmatag; pba.pba_pc = sc-sc_pc; pba.pba_bus = 0; - pba.pba_bridgetag = NULL; pba.pba_flags = PCI_FLAGS_IO_ENABLED | PCI_FLAGS_MEM_ENABLED; config_found_ia(self, pcibus, pba, pcibusprint); } Index: src/sys/arch/hp700/dev/elroy.c diff -u src/sys/arch/hp700/dev/elroy.c:1.1.2.2 src/sys/arch/hp700/dev/elroy.c:1.1.2.3 --- src/sys/arch/hp700/dev/elroy.c:1.1.2.2 Mon Jan 19 13:16:13 2009 +++ src/sys/arch/hp700/dev/elroy.c Sat Apr 25 15:09:14 2009 @@ -1,6 +1,6 @@ -/* $NetBSD: elroy.c,v 1.1.2.2 2009/01/19 13:16:13 skrll Exp $ */ +/* $NetBSD: elroy.c,v 1.1.2.3 2009/04/25 15:09:14 skrll Exp $ */ -/* $OpenBSD: elroy.c,v 1.4 2007/08/28 21:19:44 kettenis Exp $ */ +/* $OpenBSD: elroy.c,v 1.5 2009/03/30 21:24:57 kettenis Exp $ */ /* * Copyright (c) 2005 Michael Shalayeff @@ -1275,12 +1275,12 @@ sc-sc_dmatag = elroy_dmat; sc-sc_dmatag._cookie = sc; + memset(pba, 0, sizeof(pba)); // pba.pba_busname = pci; pba.pba_iot = sc-sc_iot; pba.pba_memt = sc-sc_memt; pba.pba_dmat = sc-sc_dmatag; pba.pba_pc = sc-sc_pc; - pba.pba_bridgetag = NULL; // pba.pba_domain = pci_ndomains++; pba.pba_bus = 0; /* (le32toh(elroy_read32(r-busnum)) 0xff) 4; */ pba.pba_flags = PCI_FLAGS_IO_ENABLED | PCI_FLAGS_MEM_ENABLED;
