CVS commit: src/sys/arch/mips/sibyte/pci

2011-04-05 Thread David Young
Module Name:src
Committed By:   dyoung
Date:   Wed Apr  6 01:44:46 UTC 2011

Modified Files:
src/sys/arch/mips/sibyte/pci: sbbrz_pci.c

Log Message:
Fix pci_attach_args constification fallout.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/sibyte/pci/sbbrz_pci.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/mips/sibyte/pci/sbbrz_pci.c
diff -u src/sys/arch/mips/sibyte/pci/sbbrz_pci.c:1.2 src/sys/arch/mips/sibyte/pci/sbbrz_pci.c:1.3
--- src/sys/arch/mips/sibyte/pci/sbbrz_pci.c:1.2	Thu Feb 17 14:24:12 2011
+++ src/sys/arch/mips/sibyte/pci/sbbrz_pci.c	Wed Apr  6 01:44:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sbbrz_pci.c,v 1.2 2011/02/17 14:24:12 matt Exp $ */
+/* $NetBSD: sbbrz_pci.c,v 1.3 2011/04/06 01:44:45 dyoung Exp $ */
 
 /*
  * Copyright 2000, 2001
@@ -64,7 +64,7 @@
 
 #include 			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: sbbrz_pci.c,v 1.2 2011/02/17 14:24:12 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbbrz_pci.c,v 1.3 2011/04/06 01:44:45 dyoung Exp $");
 
 #include 
 #include 
@@ -93,7 +93,7 @@
 static void	sbbrz_pci_conf_interrupt(void *, int, int, int, int, int *);
 #endif
 
-static int	sbbrz_pci_intr_map(struct pci_attach_args *,
+static int	sbbrz_pci_intr_map(const struct pci_attach_args *,
 		pci_intr_handle_t *);
 static const char *
 		sbbrz_pci_intr_string(void *, pci_intr_handle_t);
@@ -209,7 +209,7 @@
 }
 
 int
-sbbrz_pci_intr_map(struct pci_attach_args *pa, pci_intr_handle_t *ihp)
+sbbrz_pci_intr_map(const struct pci_attach_args *pa, pci_intr_handle_t *ihp)
 {
 	int bus, device, func;
 	sbbrz_pci_decompose_tag(NULL, pa->pa_intrtag, &bus, &device, &func);



CVS commit: src/sys/arch/mips/sibyte/pci

2011-02-17 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Thu Feb 17 14:24:12 UTC 2011

Added Files:
src/sys/arch/mips/sibyte/pci: sbbrz.c sbbrz_bus_io.c sbbrz_bus_mem.c
sbbrz_pci.c sbbrzvar.h sbpcihb.c

Log Message:
Add PCI support for BCM1125/1250.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.2 src/sys/arch/mips/sibyte/pci/sbbrz.c \
src/sys/arch/mips/sibyte/pci/sbbrz_bus_io.c \
src/sys/arch/mips/sibyte/pci/sbbrz_bus_mem.c \
src/sys/arch/mips/sibyte/pci/sbbrz_pci.c \
src/sys/arch/mips/sibyte/pci/sbbrzvar.h \
src/sys/arch/mips/sibyte/pci/sbpcihb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/sys/arch/mips/sibyte/pci/sbbrz.c
diff -u /dev/null src/sys/arch/mips/sibyte/pci/sbbrz.c:1.2
--- /dev/null	Thu Feb 17 14:24:12 2011
+++ src/sys/arch/mips/sibyte/pci/sbbrz.c	Thu Feb 17 14:24:12 2011
@@ -0,0 +1,221 @@
+/* $NetBSD: sbbrz.c,v 1.2 2011/02/17 14:24:12 matt Exp $ */
+
+/*
+ * Copyright 2000, 2001
+ * Broadcom Corporation. All rights reserved.
+ * 
+ * This software is furnished under license and may be used and copied only
+ * in accordance with the following terms and conditions.  Subject to these
+ * conditions, you may download, copy, install, use, modify and distribute
+ * modified or unmodified copies of this software in source and/or binary
+ * form. No title or ownership is transferred hereby.
+ * 
+ * 1) Any source code used, modified or distributed must reproduce and
+ *retain this copyright notice and list of conditions as they appear in
+ *the source file.
+ * 
+ * 2) No right is granted to use any trade name, trademark, or logo of
+ *Broadcom Corporation. Neither the "Broadcom Corporation" name nor any
+ *trademark or logo of Broadcom Corporation may be used to endorse or
+ *promote products derived from this software without the prior written
+ *permission of Broadcom Corporation.
+ * 
+ * 3) THIS SOFTWARE IS PROVIDED "AS-IS" AND ANY EXPRESS OR IMPLIED
+ *WARRANTIES, INCLUDING BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF
+ *MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
+ *NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL BROADCOM BE LIABLE
+ *FOR ANY DAMAGES WHATSOEVER, AND IN PARTICULAR, BROADCOM SHALL NOT BE
+ *LIABLE FOR 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), EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* from: $NetBSD: apecs.c,v 1.38 2000/06/29 08:58:45 mrg Exp */
+
+/*-
+ * Copyright (c) 2000, 2010 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * 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) 1995, 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 LIABIL