CVS commit: [nick-hppapmap] src/sys/arch/hp700/dev

[Nick Hudson]

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;