CVS commit: src/sys/arch/sgimips/include

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Tue Apr  1 12:57:46 UTC 2014

Modified Files:
src/sys/arch/sgimips/include: pci_machdep.h

Log Message:
Add a missing comma


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sgimips/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/sgimips/include/pci_machdep.h
diff -u src/sys/arch/sgimips/include/pci_machdep.h:1.12 src/sys/arch/sgimips/include/pci_machdep.h:1.13
--- src/sys/arch/sgimips/include/pci_machdep.h:1.12	Sat Mar 29 19:28:30 2014
+++ src/sys/arch/sgimips/include/pci_machdep.h	Tue Apr  1 12:57:46 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_machdep.h,v 1.12 2014/03/29 19:28:30 christos Exp $	*/
+/*	$NetBSD: pci_machdep.h,v 1.13 2014/04/01 12:57:46 ozaki-r Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -93,7 +93,7 @@ void		pci_conf_write(pci_chipset_tag_t, 
 int		pci_conf_hook(pci_chipset_tag_t, int, int, int, pcireg_t);
 int		pci_intr_map(const struct pci_attach_args *,
 			pci_intr_handle_t *);
-const char	*pci_intr_string(pci_chipset_tag_t, pci_intr_handle_t, char *
+const char	*pci_intr_string(pci_chipset_tag_t, pci_intr_handle_t, char *,
 			size_t);
 const struct evcnt *pci_intr_evcnt(pci_chipset_tag_t, pci_intr_handle_t);
 void		*pci_intr_establish(pci_chipset_tag_t, pci_intr_handle_t,

CVS commit: src/sys/arch/sgimips/include

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Jul  4 12:18:53 UTC 2011

Modified Files:
src/sys/arch/sgimips/include: param.h

Log Message:
don't mark delay as extern inline.  it's defined normally in machdep.c.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sgimips/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/sgimips/include/param.h
diff -u src/sys/arch/sgimips/include/param.h:1.15 src/sys/arch/sgimips/include/param.h:1.16
--- src/sys/arch/sgimips/include/param.h:1.15	Fri Mar 18 16:33:41 2011
+++ src/sys/arch/sgimips/include/param.h	Mon Jul  4 12:18:53 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.15 2011/03/18 16:33:41 tsutsui Exp $	*/
+/*	$NetBSD: param.h,v 1.16 2011/07/04 12:18:53 mrg Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -54,7 +54,7 @@
 #ifdef _KERNEL
 #ifndef _LOCORE
 
-__inline extern void	delay(unsigned long);
+extern void	delay(unsigned long);
 #define DELAY(n)	delay(n)
 
 #include machine/intr.h

CVS commit: src/sys/arch/sgimips/include

[David Young]

Module Name:src
Committed By:   dyoung
Date:   Fri Jul  1 21:00:21 UTC 2011

Modified Files:
src/sys/arch/sgimips/include: autoconf.h z8530var.h

Log Message:
#include sys/bus.h instead of machine/bus.h.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sgimips/include/autoconf.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sgimips/include/z8530var.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/sgimips/include/autoconf.h
diff -u src/sys/arch/sgimips/include/autoconf.h:1.10 src/sys/arch/sgimips/include/autoconf.h:1.11
--- src/sys/arch/sgimips/include/autoconf.h:1.10	Wed Oct 17 19:57:04 2007
+++ src/sys/arch/sgimips/include/autoconf.h	Fri Jul  1 21:00:21 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.h,v 1.10 2007/10/17 19:57:04 garbled Exp $	*/
+/*	$NetBSD: autoconf.h,v 1.11 2011/07/01 21:00:21 dyoung Exp $	*/
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang
@@ -32,7 +32,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include machine/bus.h
+#include sys/bus.h
 
 struct mainbus_attach_args {
 	char		*ma_name;

Index: src/sys/arch/sgimips/include/z8530var.h
diff -u src/sys/arch/sgimips/include/z8530var.h:1.9 src/sys/arch/sgimips/include/z8530var.h:1.10
--- src/sys/arch/sgimips/include/z8530var.h:1.9	Sat Mar 29 19:15:35 2008
+++ src/sys/arch/sgimips/include/z8530var.h	Fri Jul  1 21:00:21 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: z8530var.h,v 1.9 2008/03/29 19:15:35 tsutsui Exp $	*/
+/*	$NetBSD: z8530var.h,v 1.10 2011/07/01 21:00:21 dyoung Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -83,7 +83,7 @@
  *	@(#)zsvar.h	8.1 (Berkeley) 6/11/93
  */
 
-#include machine/bus.h
+#include sys/bus.h
 #include dev/ic/z8530sc.h
 
 struct zs_channel {

CVS commit: src/sys/arch/sgimips/include

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Fri Mar 18 16:33:41 UTC 2011

Modified Files:
src/sys/arch/sgimips/include: param.h

Log Message:
Include mips/mips_param.h after MACHINE is defined.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sgimips/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/sgimips/include/param.h
diff -u src/sys/arch/sgimips/include/param.h:1.14 src/sys/arch/sgimips/include/param.h:1.15
--- src/sys/arch/sgimips/include/param.h:1.14	Sun Mar  6 20:34:55 2011
+++ src/sys/arch/sgimips/include/param.h	Fri Mar 18 16:33:41 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.14 2011/03/06 20:34:55 he Exp $	*/
+/*	$NetBSD: param.h,v 1.15 2011/03/18 16:33:41 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -41,12 +41,10 @@
 #define	MSGBUFSIZE	8192
 #endif
 
-#include mips/mips_param.h
-
 #define	_MACHINE	sgimips
-#ifdef _KERNEL
 #define	MACHINE		sgimips
-#endif
+
+#include mips/mips_param.h
 
 #define	DEV_BSIZE	512
 #define	DEV_BSHIFT	9		/* log2(DEV_BSIZE) */

CVS commit: src/sys/arch/sgimips/include

[Havard Eidnes]

Module Name:src
Committed By:   he
Date:   Sun Aug 23 08:32:23 UTC 2009

Modified Files:
src/sys/arch/sgimips/include: loadfile_machdep.h

Log Message:
Remove BOOT_AOUT here as well, mips no longer deals with a.out.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sgimips/include/loadfile_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/sgimips/include/loadfile_machdep.h
diff -u src/sys/arch/sgimips/include/loadfile_machdep.h:1.6 src/sys/arch/sgimips/include/loadfile_machdep.h:1.7
--- src/sys/arch/sgimips/include/loadfile_machdep.h:1.6	Mon Apr 28 20:23:34 2008
+++ src/sys/arch/sgimips/include/loadfile_machdep.h	Sun Aug 23 08:32:22 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: loadfile_machdep.h,v 1.6 2008/04/28 20:23:34 martin Exp $	 */
+/*	$NetBSD: loadfile_machdep.h,v 1.7 2009/08/23 08:32:22 he Exp $	 */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -32,7 +32,6 @@
 #ifndef _SGIMIPS_LOADFILE_MACHDEP_H_
 #define _SGIMIPS_LOADFILE_MACHDEP_H_
 
-#define BOOT_AOUT
 #define BOOT_ECOFF
 #define BOOT_ELF32