CVS commit: src/usr.bin/make
Module Name:src
Committed By: wiz
Date: Wed Apr 7 06:45:21 UTC 2010
Modified Files:
src/usr.bin/make: make.1
Log Message:
Sort a bit more.
To generate a diff of this commit:
cvs rdiff -u -r1.168 -r1.169 src/usr.bin/make/make.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/make.1
diff -u src/usr.bin/make/make.1:1.168 src/usr.bin/make/make.1:1.169
--- src/usr.bin/make/make.1:1.168 Wed Apr 7 00:11:27 2010
+++ src/usr.bin/make/make.1 Wed Apr 7 06:45:21 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: make.1,v 1.168 2010/04/07 00:11:27 sjg Exp $
+.\ $NetBSD: make.1,v 1.169 2010/04/07 06:45:21 wiz Exp $
.\
.\ Copyright (c) 1990, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -653,50 +653,12 @@
.Nm
and cannot be confused with the special target with the same name.
.It Va .MAKE.DEPENDFILE
-Names the makefile (default
+Names the makefile (default
.Ql Pa .depend )
from which generated dependencies are read.
.It Va .MAKE.EXPORTED
The list of variables exported by
.Nm .
-.It Va .MAKE.MAKEFILE_PREFERENCE
-The ordered list of makefile names
-(default
-.Ql Pa makefile ,
-.Ql Pa Makefile )
-that
-.Nm
-will look for.
-.It Va .MAKE.MAKEFILES
-The list of makefiles read by
-.Nm ,
-which is useful for tracking dependencies.
-Each makefile is recorded only once, regardless of the number of times read.
-.It Va .MAKE.MODE
-Processed after reading all makefiles.
-Can affect the mode that
-.Nm
-runs in.
-Currently just
-.Ql Pa compat
-mode.
-.It Va .MAKE.LEVEL
-The recursion depth of
-.Nm .
-The initial instance of
-.Nm
-will be 0, and an incremented value is put into the environment
-to be seen by the next generation.
-This allows tests like:
-.Li .if ${.MAKE.LEVEL} == 0
-to protect things which should only be evaluated in the initial instance of
-.Nm .
-.It Va .MAKE.PID
-The process-id of
-.Nm .
-.It Va .MAKE.PPID
-The parent process-id of
-.Nm .
.It Va .MAKE.JOB.PREFIX
If
.Nm
@@ -727,6 +689,38 @@
entered into the environment for all programs which
.Nm
executes.
+.It Va .MAKE.LEVEL
+The recursion depth of
+.Nm .
+The initial instance of
+.Nm
+will be 0, and an incremented value is put into the environment
+to be seen by the next generation.
+This allows tests like:
+.Li .if ${.MAKE.LEVEL} == 0
+to protect things which should only be evaluated in the initial instance of
+.Nm .
+.It Va .MAKE.MAKEFILE_PREFERENCE
+The ordered list of makefile names
+(default
+.Ql Pa makefile ,
+.Ql Pa Makefile )
+that
+.Nm
+will look for.
+.It Va .MAKE.MAKEFILES
+The list of makefiles read by
+.Nm ,
+which is useful for tracking dependencies.
+Each makefile is recorded only once, regardless of the number of times read.
+.It Va .MAKE.MODE
+Processed after reading all makefiles.
+Can affect the mode that
+.Nm
+runs in.
+Currently just
+.Ql Pa compat
+mode.
.It Va .MAKEOVERRIDES
This variable is used to record the names of variables assigned to
on the command line, so that they may be exported as part of
@@ -741,6 +735,12 @@
is re-exported whenever
.Ql Va .MAKEOVERRIDES
is modified.
+.It Va .MAKE.PID
+The process-id of
+.Nm .
+.It Va .MAKE.PPID
+The parent process-id of
+.Nm .
.It Va MAKE_PRINT_VAR_ON_ERROR
When
.Nm
@@ -1313,6 +1313,9 @@
is equivalent to exporting a variable.
.It Ic .info Ar message
The message is printed along with the name of the makefile and line number.
+.It Ic .undef Ar variable
+Un-define the specified global variable.
+Only global variables may be un-defined.
.It Ic .unexport Ar variable ...
The opposite of
.Ql .export .
@@ -1349,9 +1352,6 @@
Actually
.Ql Ev .MAKE.LEVEL
will also be pushed into the new environment.
-.It Ic .undef Ar variable
-Un-define the specified global variable.
-Only global variables may be un-defined.
.It Ic .warning Ar message
The message prefixed by
.Ql Pa warning:
@@ -1663,7 +1663,7 @@
The
.Ic .ERROR_TARGET
variable is set to the target that failed.
-See also
+See also
.Ic MAKE_PRINT_VAR_ON_ERROR .
.It Ic .IGNORE
Mark each of the sources with the
CVS commit: src/external/bsd/atf/dist/tools
Module Name:src Committed By: wiz Date: Wed Apr 7 07:32:48 UTC 2010 Modified Files: src/external/bsd/atf/dist/tools: atf-format.1 Log Message: Fix typo, reported by Ryo HAYASAKA in PR 43134. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/atf/dist/tools/atf-format.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/atf/dist/tools/atf-format.1 diff -u src/external/bsd/atf/dist/tools/atf-format.1:1.1.1.1 src/external/bsd/atf/dist/tools/atf-format.1:1.2 --- src/external/bsd/atf/dist/tools/atf-format.1:1.1.1.1 Mon Jan 19 07:11:52 2009 +++ src/external/bsd/atf/dist/tools/atf-format.1 Wed Apr 7 07:32:48 2010 @@ -76,7 +76,7 @@ .It Fl h Shows a short summary of all available options and their purpose. .It Fl l Ar length -Specifies the length in characters of te tag. +Specifies the length in characters of the tag. Useful if the tag is shorter than the desired length, which happens when formatting two-column tables. .It Fl r
CVS commit: src/external/bsd/flex/bin
Module Name:src
Committed By: tron
Date: Wed Apr 7 08:56:50 UTC 2010
Modified Files:
src/external/bsd/flex/bin: Makefile
Log Message:
Ignore the unused label find_rule in the generated file scan.c
to fix the build.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/flex/bin/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/flex/bin/Makefile
diff -u src/external/bsd/flex/bin/Makefile:1.6 src/external/bsd/flex/bin/Makefile:1.7
--- src/external/bsd/flex/bin/Makefile:1.6 Sat Oct 31 23:36:29 2009
+++ src/external/bsd/flex/bin/Makefile Wed Apr 7 08:56:49 2010
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.4 (Berkeley) 6/24/90
-# $NetBSD: Makefile,v 1.6 2009/10/31 23:36:29 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2010/04/07 08:56:49 tron Exp $
#
# By default, flex will be configured to generate 8-bit scanners only if the
# -8 flag is given. If you want it to always generate 8-bit scanners, add
@@ -46,6 +46,8 @@
DPADD+=${LIBM}
.endif
+COPTS.scan.c+= -Wno-unused-label
+
MAN = flex.1
LINKS= ${BINDIR}/lex ${BINDIR}/flex \
CVS commit: src/sbin/fdisk
Module Name:src Committed By: wiz Date: Wed Apr 7 09:40:58 UTC 2010 Modified Files: src/sbin/fdisk: fdisk.8 Log Message: Minor punctuation fixes, improve and sort SYNOPSIS, sort flag descriptions. From Bug Hunting in PR 43130. To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sbin/fdisk/fdisk.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/fdisk/fdisk.8 diff -u src/sbin/fdisk/fdisk.8:1.69 src/sbin/fdisk/fdisk.8:1.70 --- src/sbin/fdisk/fdisk.8:1.69 Wed Dec 23 20:56:18 2009 +++ src/sbin/fdisk/fdisk.8 Wed Apr 7 09:40:58 2010 @@ -1,6 +1,6 @@ -.\ $NetBSD: fdisk.8,v 1.69 2009/12/23 20:56:18 dsl Exp $ +.\ $NetBSD: fdisk.8,v 1.70 2010/04/07 09:40:58 wiz Exp $ .\ -.Dd December 23, 2009 +.Dd April 6, 2010 .Dt FDISK 8 .Os .Sh NAME @@ -8,15 +8,15 @@ .Nd MS-DOS partition maintenance program .Sh SYNOPSIS .Nm -.Op Fl afiuvBFS +.Op Fl aBFfiSuv .Bk -words -.Op Fl 0 | 1 | 2 | 3 | E Ar number -.Ek -.Bk -words -.Op Fl t Ar disktab +.Oo +.Fl 0 | 1 | 2 | 3 | E Ar number +.Op Fl s Ar id/start/size Ns Bq Ar /bootmenu +.Oc .Ek .Bk -words -.Op Fl T Ar disktype +.Op Fl r Ar file | Fl w Ar file .Ek .Bk -words .Op Fl A Ar ptn_alignment Ns Bq Ar /ptn_0_offset @@ -25,13 +25,13 @@ .Op Fl b Ar cylinders/heads/sectors .Ek .Bk -words -.Op Fl s Ar id/start/size Ns Bq Ar /bootmenu +.Op Fl c Ar bootcode .Ek .Bk -words -.Op Fl c Ar bootcode +.Op Fl T Ar disktype .Ek .Bk -words -.Op Fl r|w Ar file +.Op Fl t Ar disktab .Ek .Bk -words .Op Ar device @@ -89,7 +89,7 @@ The standard MBR boot code will only boot the .Sq active partition. -However +However, .Nx contains additional boot programs which allow the user to interactively select which of the partitions to boot. @@ -162,10 +162,6 @@ Specify partition slot 2 to be printed or updated. .It Fl 3 Specify partition slot 3 to be printed or updated. -.It Fl a -Change the active partition. -In interactive mode this question will be asked after the partitions -have been processed. .It Fl A Ar ptn_alignment Ns Bq Ar /ptn_0_offset Specify the alignment for all partitions and optionally the offset for the first partition of the disk and of extended partitions. @@ -185,6 +181,16 @@ In all other cases the alignment default to a cylinder and the offset to a track (both using the BIOS geometry). The 1MB alignment is the same as that used by recent windows versions. +.It Fl a +Change the active partition. +In interactive mode this question will be asked after the partitions +have been processed. +.It Fl B +On an i386 or amd64 system, interactively update the boot selector settings. +(The boot selector permits the user to interactively select the boot +partition, and thus which operating system is run, at system boot time; see +.Xr mbr 8 +for more information.) .It Fl b Ar cylinders/heads/sectors Specify the BIOS geometry parameters for .Ar cylinders , @@ -199,13 +205,6 @@ information. If that fails then either the geometry from the disklabel or 63 sectors and 16 heads is used. -.It Fl B -On an i386 or amd64 system, interactively update the boot selector settings. -(The boot selector permits the user to interactively select the boot -partition, and thus which operating system is run, at system boot time. -See -.Xr mbr 8 -for more information.) .It Fl c Ar bootcode Specify the filename that .Nm @@ -229,6 +228,25 @@ to be printed or updated. If the specified extended partition doesn't exist on updating partition data an additional extended partition will be created. +.It Fl F +Indicate that +.Ar device +is a regular file. +Unless the geometry of +.Ar device +is told to +.Nm +by +.Fl T Ar disktype , +.Nm +will count the 512-byte sectors in +.Ar device +and produce a fake geometry. +If +.Ar device +is a regular file, +.Fl F +will be used implicitly. .It Fl f Run .Nm @@ -252,25 +270,6 @@ fields .Pq only Ar start No and Ar size No can be specified by Fl s No option . They will be automatically computed using the BIOS geometry. -.It Fl F -Indicate that -.Ar device -is a regular file. -Unless the geometry of -.Ar device -is told to -.Nm -by -.Fl T Ar disktype , -.Nm -will count the 512-byte sectors in -.Ar device -and produce a fake geometry. -If -.Ar device -is a regular file, -.Fl F -will be used implicitly. .It Fl i Explicitly request initialisation of the master boot code (similar to what @@ -289,6 +288,11 @@ instead of the specified disk. The geometry information used is still that of the disk volume. Any changes are written back to the file. +.It Fl S +When used with no other flags print a series of +.Pa /bin/sh +commands for setting variables to the partition information. +This could be used by installation scripts. .It Fl s Ar id/start/size Ns Bq Ar /bootmenu Specify the partition .Ar id , @@ -298,11 +302,11 @@ .Ar bootmenu . This flag requires the use of a partition selection flag .Pq Fl 0 , 1 , 2 , 3
CVS commit: src/share/man/man4
Module Name:src Committed By: tsutsui Date: Wed Apr 7 11:07:29 UTC 2010 Modified Files: src/share/man/man4: ne.4 Log Message: Fix quoting in previous. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/share/man/man4/ne.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/ne.4 diff -u src/share/man/man4/ne.4:1.14 src/share/man/man4/ne.4:1.15 --- src/share/man/man4/ne.4:1.14 Sat Apr 3 11:00:11 2010 +++ src/share/man/man4/ne.4 Wed Apr 7 11:07:29 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: ne.4,v 1.14 2010/04/03 11:00:11 tsutsui Exp $ +.\ $NetBSD: ne.4,v 1.15 2010/04/07 11:07:29 tsutsui Exp $ .\ .\ Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -52,14 +52,14 @@ .Ss amigappc .Cd ne* at zbus0 # AriadneII, X-surf .Ss atari -.Cd ne0 at mainbus0 # EtherNEC on Atari ROM cartridge slot +.Cd ne0 at mainbus0 # EtherNEC on Atari ROM cartridge slot .Ss evbarm -.Cd ne0 at obio? addr 0x0e000200 intr 5 # on-board Asix AX88796 +.Cd ne0 at obio? addr 0x0e000200 intr 5 # on-board Asix AX88796 .Ss x68k -.Cd ne* at intio0 addr 0xece300 intr 249 # Nereid Ethernet -.Cd ne* at intio0 addr 0xeceb00 intr 248 # Nereid Ethernet -.Cd neptune0 at intio0 addr 0xece000 intr 249 # Neptune-X -.Cd neptune1 at intio0 addr 0xece400 intr 249 # Neptune-X at alt. addr. +.Cd ne* at intio0 addr 0xece300 intr 249 # Nereid Ethernet +.Cd ne* at intio0 addr 0xeceb00 intr 248 # Nereid Ethernet +.Cd neptune0 at intio0 addr 0xece000 intr 249 # Neptune-X +.Cd neptune1 at intio0 addr 0xece400 intr 249 # Neptune-X at alt. addr. .Cd ne* at neptune? addr 0x300 .Sh DESCRIPTION The
CVS commit: src/share/man/man4
Module Name:src Committed By: tsutsui Date: Wed Apr 7 11:10:25 UTC 2010 Modified Files: src/share/man/man4: ne.4 Log Message: Add a recently committed evbsh3 variant in SYNOPSIS. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/share/man/man4/ne.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/ne.4 diff -u src/share/man/man4/ne.4:1.15 src/share/man/man4/ne.4:1.16 --- src/share/man/man4/ne.4:1.15 Wed Apr 7 11:07:29 2010 +++ src/share/man/man4/ne.4 Wed Apr 7 11:10:25 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: ne.4,v 1.15 2010/04/07 11:07:29 tsutsui Exp $ +.\ $NetBSD: ne.4,v 1.16 2010/04/07 11:10:25 tsutsui Exp $ .\ .\ Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -55,6 +55,8 @@ .Cd ne0 at mainbus0 # EtherNEC on Atari ROM cartridge slot .Ss evbarm .Cd ne0 at obio? addr 0x0e000200 intr 5 # on-board Asix AX88796 +.Ss evbsh3 +.Cd ne0 at mainbus? # Realtek RTL8019AS .Ss x68k .Cd ne* at intio0 addr 0xece300 intr 249 # Nereid Ethernet .Cd ne* at intio0 addr 0xeceb00 intr 248 # Nereid Ethernet
CVS commit: src/sys/arch/i386/i386
Module Name:src Committed By: pooka Date: Wed Apr 7 11:16:30 UTC 2010 Modified Files: src/sys/arch/i386/i386: lock_stubs.S Log Message: Fix fmt'ing error in comment from rev 1.22. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/i386/i386/lock_stubs.S 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/i386/i386/lock_stubs.S diff -u src/sys/arch/i386/i386/lock_stubs.S:1.23 src/sys/arch/i386/i386/lock_stubs.S:1.24 --- src/sys/arch/i386/i386/lock_stubs.S:1.23 Fri Apr 24 17:45:40 2009 +++ src/sys/arch/i386/i386/lock_stubs.S Wed Apr 7 11:16:30 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: lock_stubs.S,v 1.23 2009/04/24 17:45:40 ad Exp $ */ +/* $NetBSD: lock_stubs.S,v 1.24 2010/04/07 11:16:30 pooka Exp $ */ /*- * Copyright (c) 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -30,12 +30,12 @@ */ /* - * Where possible we make * each routine fit into an assumed 64-byte cache - * line. Please check * alignment with 'objdump -d' after making changes. + * Where possible we make each routine fit into an assumed 64-byte cache + * line. Please check alignment with 'objdump -d' after making changes. */ #include machine/asm.h -__KERNEL_RCSID(0, $NetBSD: lock_stubs.S,v 1.23 2009/04/24 17:45:40 ad Exp $); +__KERNEL_RCSID(0, $NetBSD: lock_stubs.S,v 1.24 2010/04/07 11:16:30 pooka Exp $); #include opt_lockdebug.h
CVS commit: src/sys/arch/evbsh3/evbsh3
Module Name:src Committed By: nonaka Date: Wed Apr 7 11:48:15 UTC 2010 Removed Files: src/sys/arch/evbsh3/evbsh3: clock_machdep.c Log Message: delete unused file. To generate a diff of this commit: cvs rdiff -u -r1.5 -r0 src/sys/arch/evbsh3/evbsh3/clock_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbsh3/conf
Module Name:src Committed By: nonaka Date: Wed Apr 7 11:54:46 UTC 2010 Modified Files: src/sys/arch/evbsh3/conf: T_SH7706LSR Log Message: fix comment. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbsh3/conf/T_SH7706LSR 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/evbsh3/conf/T_SH7706LSR diff -u src/sys/arch/evbsh3/conf/T_SH7706LSR:1.1 src/sys/arch/evbsh3/conf/T_SH7706LSR:1.2 --- src/sys/arch/evbsh3/conf/T_SH7706LSR:1.1 Tue Apr 6 15:54:30 2010 +++ src/sys/arch/evbsh3/conf/T_SH7706LSR Wed Apr 7 11:54:46 2010 @@ -1,4 +1,4 @@ -# $NetBSD: T_SH7706LSR,v 1.1 2010/04/06 15:54:30 nonaka Exp $ +# $NetBSD: T_SH7706LSR,v 1.2 2010/04/07 11:54:46 nonaka Exp $ # # TAC T-SH7706LSR Rev.1 config file # @@ -86,7 +86,7 @@ scif0 at shb? # Network interface -ne0 at mainbus?# Realtek RTL8019AS +ne0 at mainbus?# AX88796BLF # MMC SPI ssumci0 at mainbus?
CVS commit: src/sys/arch/atari/dev
Module Name:src
Committed By: tsutsui
Date: Wed Apr 7 12:39:59 UTC 2010
Modified Files:
src/sys/arch/atari/dev: fd.c
Log Message:
extern inline - static inline
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/atari/dev/fd.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/atari/dev/fd.c
diff -u src/sys/arch/atari/dev/fd.c:1.72 src/sys/arch/atari/dev/fd.c:1.73
--- src/sys/arch/atari/dev/fd.c:1.72 Tue Oct 20 19:10:10 2009
+++ src/sys/arch/atari/dev/fd.c Wed Apr 7 12:39:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.72 2009/10/20 19:10:10 snj Exp $ */
+/* $NetBSD: fd.c,v 1.73 2010/04/07 12:39:59 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -44,7 +44,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fd.c,v 1.72 2009/10/20 19:10:10 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: fd.c,v 1.73 2010/04/07 12:39:59 tsutsui Exp $);
#include sys/param.h
#include sys/systm.h
@@ -216,23 +216,24 @@
static int fdselect(int, int, int);
static void fddeselect(void);
static void fdmoff(struct fd_softc *);
- u_char read_fdreg(u_short);
- void write_fdreg(u_short, u_short);
- u_char read_dmastat(void);
-extern inline u_char read_fdreg(u_short regno)
+static inline u_char read_fdreg(u_short);
+static inline void write_fdreg(u_short, u_short);
+static inline u_char read_dmastat(void);
+
+static inline u_char read_fdreg(u_short regno)
{
DMA-dma_mode = regno;
return(DMA-dma_data);
}
-extern inline void write_fdreg(u_short regno, u_short val)
+static inline void write_fdreg(u_short regno, u_short val)
{
DMA-dma_mode = regno;
DMA-dma_data = val;
}
-extern inline u_char read_dmastat(void)
+static inline u_char read_dmastat(void)
{
DMA-dma_mode = FDC_CS | DMA_SCREG;
return(DMA-dma_stat);
CVS commit: src/gnu/dist/gdb6/sim/ppc
Module Name:src
Committed By: christos
Date: Wed Apr 7 12:58:33 UTC 2010
Modified Files:
src/gnu/dist/gdb6/sim/ppc: emul_netbsd.c
Log Message:
fix syntax errors
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/gnu/dist/gdb6/sim/ppc/emul_netbsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/dist/gdb6/sim/ppc/emul_netbsd.c
diff -u src/gnu/dist/gdb6/sim/ppc/emul_netbsd.c:1.2 src/gnu/dist/gdb6/sim/ppc/emul_netbsd.c:1.3
--- src/gnu/dist/gdb6/sim/ppc/emul_netbsd.c:1.2 Tue Apr 6 19:02:10 2010
+++ src/gnu/dist/gdb6/sim/ppc/emul_netbsd.c Wed Apr 7 08:58:33 2010
@@ -738,7 +738,7 @@
if (WITH_TRACE ppc_trace[trace_os_emul])
printf_filtered (0x%lx, 0x%lx, (long)t_addr, (long)tz_addr);
- SYS(gettimeofday);
+ SYS(__gettimeofday50);
emul_write_status(processor, status, err);
if (status == 0) {
if (t_addr != 0)
@@ -768,7 +768,7 @@
if (WITH_TRACE ppc_trace[trace_os_emul])
printf_filtered (%d, 0x%lx, who, (long)rusage_addr);
- SYS(getrusage);
+ SYS(__getrusage50);
emul_write_status(processor, status, err);
if (status == 0) {
if (rusage_addr != 0)
@@ -1053,7 +1053,7 @@
{ 0, }, /* 18 is old getfsstat */
{ 0, }, /* 19 is old lseek */
/* 20 */ { do_getpid, getpid },
- { 0, } /* 21 is old mount */
+ { 0, }, /* 21 is old mount */
/* 22 */ { 0, unmount },
/* 23 */ { 0, setuid },
/* 24 */ { do_getuid, getuid },
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Wed Apr 7 13:10:46 UTC 2010 Modified Files: src/sys/kern: sys_process.c Log Message: fix build for ports that don't have PT_STEP (Havard Eidnes) To generate a diff of this commit: cvs rdiff -u -r1.154 -r1.155 src/sys/kern/sys_process.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/kern/sys_process.c diff -u src/sys/kern/sys_process.c:1.154 src/sys/kern/sys_process.c:1.155 --- src/sys/kern/sys_process.c:1.154 Tue Apr 6 09:50:22 2010 +++ src/sys/kern/sys_process.c Wed Apr 7 09:10:46 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: sys_process.c,v 1.154 2010/04/06 13:50:22 christos Exp $ */ +/* $NetBSD: sys_process.c,v 1.155 2010/04/07 13:10:46 christos Exp $ */ /*- * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. @@ -118,7 +118,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: sys_process.c,v 1.154 2010/04/06 13:50:22 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: sys_process.c,v 1.155 2010/04/07 13:10:46 christos Exp $); #include opt_ptrace.h #include opt_ktrace.h @@ -227,7 +227,10 @@ syscallarg(int) data; } */ struct proc *p = l-l_proc; - struct lwp *lt, *lt2; + struct lwp *lt; +#ifdef PT_STEP + struct lwp *lt2; +#endif struct proc *t;/* target process */ struct uio uio; struct iovec iov;
CVS commit: src/sys/arch/atari/dev
Module Name:src
Committed By: tsutsui
Date: Wed Apr 7 13:14:23 UTC 2010
Modified Files:
src/sys/arch/atari/dev: fd.c
Log Message:
- split device_t/softc
- use device_lookup_private() directly rather than via local macro
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/atari/dev/fd.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/atari/dev/fd.c
diff -u src/sys/arch/atari/dev/fd.c:1.73 src/sys/arch/atari/dev/fd.c:1.74
--- src/sys/arch/atari/dev/fd.c:1.73 Wed Apr 7 12:39:59 2010
+++ src/sys/arch/atari/dev/fd.c Wed Apr 7 13:14:23 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.73 2010/04/07 12:39:59 tsutsui Exp $ */
+/* $NetBSD: fd.c,v 1.74 2010/04/07 13:14:23 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -44,7 +44,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fd.c,v 1.73 2010/04/07 12:39:59 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: fd.c,v 1.74 2010/04/07 13:14:23 tsutsui Exp $);
#include sys/param.h
#include sys/systm.h
@@ -129,7 +129,7 @@
* Private per device data
*/
struct fd_softc {
- struct device sc_dv; /* generic device info */
+ device_t sc_dev; /* generic device info */
struct disk dkdev; /* generic disk info */
struct bufq_state *bufq; /* queue of buf's */
struct callout sc_motor_ch;
@@ -263,11 +263,11 @@
*/
extern struct cfdriver fd_cd;
-static int fdcmatch(struct device *, struct cfdata *, void *);
+static int fdcmatch(device_t, cfdata_t, void *);
static int fdcprint(void *, const char *);
-static void fdcattach(struct device *, struct device *, void *);
+static void fdcattach(device_t, device_t, void *);
-CFATTACH_DECL(fdc, sizeof(struct device),
+CFATTACH_DECL_NEW(fdc, 0,
fdcmatch, fdcattach, NULL, NULL);
const struct bdevsw fd_bdevsw = {
@@ -280,19 +280,19 @@
};
static int
-fdcmatch(struct device *pdp, struct cfdata *cfp, void *auxp)
+fdcmatch(device_t parent, cfdata_t match, void *aux)
{
static int fdc_matched = 0;
/* Match only once */
- if(strcmp(fdc, auxp) || fdc_matched)
+ if(strcmp(fdc, aux) || fdc_matched)
return(0);
fdc_matched = 1;
return(1);
}
static void
-fdcattach(struct device *pdp, struct device *dp, void *auxp)
+fdcattach(device_t parent, device_t self, void *aux)
{
struct fd_softc fdsoftc;
int i, nfound, first_found;
@@ -315,12 +315,13 @@
if(!nfound)
first_found = i;
nfound++;
- config_found(dp, (void*)i, fdcprint);
+ config_found(self, (void*)i, fdcprint);
}
}
if(nfound) {
- struct fd_softc *fdsc = getsoftc(fd_cd, first_found);
+ struct fd_softc *fdsc =
+ device_lookup_private(fd_cd, first_found);
/*
* Make sure motor will be turned of when a floppy is
@@ -340,38 +341,39 @@
}
static int
-fdcprint(void *auxp, const char *pnp)
+fdcprint(void *aux, const char *pnp)
{
if (pnp != NULL)
- aprint_normal(fd%d at %s:, (int)auxp, pnp);
+ aprint_normal(fd%d at %s:, (int)aux, pnp);
return(UNCONF);
}
-static int fdmatch(struct device *, struct cfdata *, void *);
-static void fdattach(struct device *, struct device *, void *);
+static int fdmatch(device_t, cfdata_t, void *);
+static void fdattach(device_t, device_t, void *);
struct dkdriver fddkdriver = { fdstrategy };
-CFATTACH_DECL(fd, sizeof(struct fd_softc),
+CFATTACH_DECL_NEW(fd, sizeof(struct fd_softc),
fdmatch, fdattach, NULL, NULL);
extern struct cfdriver fd_cd;
static int
-fdmatch(struct device *pdp, struct cfdata *cfp, void *auxp)
+fdmatch(device_t parent, cfdata_t match, void *aux)
{
return(1);
}
static void
-fdattach(struct device *pdp, struct device *dp, void *auxp)
+fdattach(device_t parent, device_t self, void *aux)
{
struct fd_softc *sc;
struct fd_types *type;
u_short swtch;
- sc = device_private(dp);
+ sc = device_private(self);
+ sc-sc_dev = self;
callout_init(sc-sc_motor_ch, 0);
@@ -383,14 +385,14 @@
def_type = (swtch CFG_SWITCH_NOHD) ? FLP_TYPE_720 : FLP_TYPE_144;
type = fdtypes[def_type];
- printf(: %s %d cyl, %d head, %d sec\n, type-descr,
+ aprint_normal(: %s %d cyl, %d head, %d sec\n, type-descr,
type-nblocks / (type-nsectors * type-nheads), type-nheads,
type-nsectors);
/*
* Initialize and attach the disk structure.
*/
- disk_init(sc-dkdev, sc-sc_dv.dv_xname, fddkdriver);
+ disk_init(sc-dkdev, device_xname(sc-sc_dev), fddkdriver);
disk_attach(sc-dkdev);
}
@@ -399,7 +401,7 @@
{
struct fd_softc *sc;
- sc = getsoftc(fd_cd, DISKUNIT(dev));
+ sc = device_lookup_private(fd_cd, DISKUNIT(dev));
if((sc-flags FLPF_HAVELAB) == 0)
return(EBADF);
@@ -453,7 +455,7 @@
if(FLP_TYPE(dev) = NR_TYPES)
return(ENXIO);
- if((sc = getsoftc(fd_cd, DISKUNIT(dev))) == NULL)
+ if((sc = device_lookup_private(fd_cd, DISKUNIT(dev))) == NULL)
return(ENXIO);
/*
@@ -544,7 +546,7 @@
{
struct fd_softc *sc;
- sc = getsoftc(fd_cd,
CVS commit: src/sys/arch/atari/dev
Module Name:src
Committed By: tsutsui
Date: Wed Apr 7 13:53:05 UTC 2010
Modified Files:
src/sys/arch/atari/dev: fd.c
Log Message:
Misc KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/atari/dev/fd.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/atari/dev/fd.c
diff -u src/sys/arch/atari/dev/fd.c:1.74 src/sys/arch/atari/dev/fd.c:1.75
--- src/sys/arch/atari/dev/fd.c:1.74 Wed Apr 7 13:14:23 2010
+++ src/sys/arch/atari/dev/fd.c Wed Apr 7 13:53:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.74 2010/04/07 13:14:23 tsutsui Exp $ */
+/* $NetBSD: fd.c,v 1.75 2010/04/07 13:53:05 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -44,7 +44,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fd.c,v 1.74 2010/04/07 13:14:23 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: fd.c,v 1.75 2010/04/07 13:53:05 tsutsui Exp $);
#include sys/param.h
#include sys/systm.h
@@ -72,6 +72,8 @@
#include atari/dev/ym2149reg.h
#include atari/dev/fdreg.h
+#include ioconf.h
+
/*
* Be verbose for debugging
*/
@@ -121,9 +123,9 @@
static short nopens = 0; /* Number of opens executed */
static short fd_state = FLP_IDLE; /* Current driver state */
-static int lock_stat= 0; /* DMA locking status */
+static int lock_stat = 0; /* DMA locking status */
static short fd_cmd = 0; /* command being executed */
-static const char *fd_error= NULL; /* error from fd_xfer_ok() */
+static const char *fd_error = NULL; /* error from fd_xfer_ok() */
/*
* Private per device data
@@ -142,11 +144,11 @@
short flags; /* misc flags */
short part; /* Current open partition */
int sector; /* logical sector for I/O */
- char *io_data; /* KVA for data transfer */
+ uint8_t *io_data; /* KVA for data transfer */
int io_bytes; /* bytes left for I/O */
int io_dir; /* B_READ/B_WRITE */
int errcnt; /* current error count */
- u_char *bounceb; /* Bounce buffer */
+ uint8_t *bounceb; /* Bounce buffer */
};
@@ -217,26 +219,34 @@
static void fddeselect(void);
static void fdmoff(struct fd_softc *);
-static inline u_char read_fdreg(u_short);
+static u_short rd_cfg_switch(void);
+
+static inline uint8_t read_fdreg(u_short);
static inline void write_fdreg(u_short, u_short);
-static inline u_char read_dmastat(void);
+static inline uint8_t read_dmastat(void);
-static inline u_char read_fdreg(u_short regno)
+static inline
+uint8_t read_fdreg(u_short regno)
{
+
DMA-dma_mode = regno;
- return(DMA-dma_data);
+ return DMA-dma_data;
}
-static inline void write_fdreg(u_short regno, u_short val)
+static inline
+void write_fdreg(u_short regno, u_short val)
{
+
DMA-dma_mode = regno;
DMA-dma_data = val;
}
-static inline u_char read_dmastat(void)
+static inline
+uint8_t read_dmastat(void)
{
+
DMA-dma_mode = FDC_CS | DMA_SCREG;
- return(DMA-dma_stat);
+ return DMA-dma_stat;
}
/*
@@ -246,10 +256,11 @@
* Note: This location _must_ be read as an u_short. Failure to do so
* will return garbage!
*/
-static u_short rd_cfg_switch(void);
-static u_short rd_cfg_switch(void)
+static u_short
+rd_cfg_switch(void)
{
- return(*((volatile u_short *)AD_CFG_SWITCH));
+
+ return *(volatile u_short *)AD_CFG_SWITCH;
}
/*
@@ -261,8 +272,6 @@
/*
* Autoconfig stuff
*/
-extern struct cfdriver fd_cd;
-
static int fdcmatch(device_t, cfdata_t, void *);
static int fdcprint(void *, const char *);
static void fdcattach(device_t, device_t, void *);
@@ -282,25 +291,25 @@
static int
fdcmatch(device_t parent, cfdata_t match, void *aux)
{
- static int fdc_matched = 0;
+ static int fdc_matched = 0;
/* Match only once */
- if(strcmp(fdc, aux) || fdc_matched)
- return(0);
+ if (strcmp(fdc, aux) || fdc_matched)
+ return 0;
fdc_matched = 1;
- return(1);
+ return 1;
}
static void
fdcattach(device_t parent, device_t self, void *aux)
{
struct fd_softc fdsoftc;
- int i, nfound, first_found;
+ int i, nfound, first_found;
nfound = first_found = 0;
printf(\n);
fddeselect();
- for(i = 0; i NR_DRIVES; i++) {
+ for (i = 0; i NR_DRIVES; i++) {
/*
* Test if unit is present
@@ -308,18 +317,18 @@
fdsoftc.unit = i;
fdsoftc.flags = 0;
st_dmagrab((dma_farg)fdcint, (dma_farg)fdtestdrv, fdsoftc,
-lock_stat, 0);
+ lock_stat, 0);
st_dmafree(fdsoftc, lock_stat);
- if(!(fdsoftc.flags FLPF_NOTRESP)) {
- if(!nfound)
+ if ((fdsoftc.flags FLPF_NOTRESP) == 0) {
+ if (nfound == 0)
first_found = i;
nfound++;
- config_found(self, (void*)i, fdcprint);
+ config_found(self, (void *)i, fdcprint);
}
}
- if(nfound) {
+ if (nfound != 0) {
struct fd_softc *fdsc =
device_lookup_private(fd_cd, first_found);
@@ -335,7 +344,7 @@
* enable disk related interrupts
*/
MFP-mf_ierb |= IB_DINT;
- MFP-mf_iprb = (u_int8_t)~IB_DINT;
+ MFP-mf_iprb =
CVS commit: src/crypto/dist/ipsec-tools/src/libipsec
Module Name:src Committed By: vanhu Date: Wed Apr 7 14:53:52 UTC 2010 Modified Files: src/crypto/dist/ipsec-tools/src/libipsec: ipsec_strerror.c Log Message: by Eric Preston: fixed a typo To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.c diff -u src/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.c:1.5 src/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.c:1.6 --- src/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.c:1.5 Wed Jul 18 12:07:50 2007 +++ src/crypto/dist/ipsec-tools/src/libipsec/ipsec_strerror.c Wed Apr 7 14:53:52 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: ipsec_strerror.c,v 1.5 2007/07/18 12:07:50 vanhu Exp $ */ +/* $NetBSD: ipsec_strerror.c,v 1.6 2010/04/07 14:53:52 vanhu Exp $ */ /* $KAME: ipsec_strerror.c,v 1.7 2000/07/30 00:45:12 itojun Exp $ */ @@ -63,7 +63,7 @@ Invalid key length,/*EIPSEC_INVAL_KEYLEN*/ Invalid address family, /*EIPSEC_INVAL_FAMILY*/ Invalid prefix length, /*EIPSEC_INVAL_PREFIXLEN*/ -Invalid direciton,/*EIPSEC_INVAL_DIR*/ +Invalid direction,/*EIPSEC_INVAL_DIR*/ SPI range violation,/*EIPSEC_INVAL_SPI*/ No protocol specified, /*EIPSEC_NO_PROTO*/ No algorithm specified, /*EIPSEC_NO_ALGS*/
CVS commit: src/sys/fs/msdosfs
Module Name:src
Committed By: pooka
Date: Wed Apr 7 15:19:09 UTC 2010
Modified Files:
src/sys/fs/msdosfs: msdosfs_vfsops.c
Log Message:
* Don't care about VOP_CLOSE() error in unmount. In the extremely
unlike event it did fail, the kernel would double lutz to doom
(in failure devvp now remains unmountable until reboot. fans
of complicated untested error branches may attempt to gunk this
up. i'm not one of them).
* cosmetic surgery: cut extra ;
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/fs/msdosfs/msdosfs_vfsops.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/fs/msdosfs/msdosfs_vfsops.c
diff -u src/sys/fs/msdosfs/msdosfs_vfsops.c:1.79 src/sys/fs/msdosfs/msdosfs_vfsops.c:1.80
--- src/sys/fs/msdosfs/msdosfs_vfsops.c:1.79 Sun Jan 31 10:30:40 2010
+++ src/sys/fs/msdosfs/msdosfs_vfsops.c Wed Apr 7 15:19:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_vfsops.c,v 1.79 2010/01/31 10:30:40 mlelstv Exp $ */
+/* $NetBSD: msdosfs_vfsops.c,v 1.80 2010/04/07 15:19:09 pooka Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: msdosfs_vfsops.c,v 1.79 2010/01/31 10:30:40 mlelstv Exp $);
+__KERNEL_RCSID(0, $NetBSD: msdosfs_vfsops.c,v 1.80 2010/04/07 15:19:09 pooka Exp $);
#if defined(_KERNEL_OPT)
#include opt_compat_netbsd.h
@@ -811,7 +811,7 @@
return (0);
-error_exit:;
+error_exit:
if (bp)
brelse(bp, BC_AGE);
if (pmp) {
@@ -871,14 +871,14 @@
}
#endif
vn_lock(pmp-pm_devvp, LK_EXCLUSIVE | LK_RETRY);
- error = VOP_CLOSE(pmp-pm_devvp,
+ (void) VOP_CLOSE(pmp-pm_devvp,
pmp-pm_flags MSDOSFSMNT_RONLY ? FREAD : FREAD|FWRITE, NOCRED);
vput(pmp-pm_devvp);
free(pmp-pm_inusemap, M_MSDOSFSFAT);
free(pmp, M_MSDOSFSMNT);
mp-mnt_data = NULL;
mp-mnt_flag = ~MNT_LOCAL;
- return (error);
+ return (0);
}
int
CVS commit: src/external/bsd/flex/dist
Module Name:src
Committed By: christos
Date: Wed Apr 7 16:14:07 UTC 2010
Modified Files:
src/external/bsd/flex/dist: scan.l
Log Message:
Rename the macro name so that the scanner does not get confused and thinks
it is using REJECT.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/flex/dist/scan.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/flex/dist/scan.l
diff -u src/external/bsd/flex/dist/scan.l:1.2 src/external/bsd/flex/dist/scan.l:1.3
--- src/external/bsd/flex/dist/scan.l:1.2 Mon Oct 26 00:27:15 2009
+++ src/external/bsd/flex/dist/scan.l Wed Apr 7 12:14:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: scan.l,v 1.2 2009/10/26 04:27:15 christos Exp $ */
+/* $NetBSD: scan.l,v 1.3 2010/04/07 16:14:07 christos Exp $ */
/* scan.l - scanner for flex input -*-C-*- */
@@ -83,9 +83,9 @@
for ( i = strlen( str ) - 1; i = start; --i ) \
unput((str)[i])
-#define CHECK_REJECT(str) \
+#define CHECK_RE_JECT(str) \
if ( all_upper( str ) ) \
- reject = true;
+ reject = true
#define CHECK_YYMORE(str) \
if ( all_lower( str ) ) \
@@ -877,7 +877,7 @@
CODEBLOCK,ACTION{
reject {
ACTION_ECHO;
- CHECK_REJECT(yytext);
+ CHECK_RE_JECT(yytext);
}
yymore {
ACTION_ECHO;
CVS commit: src/external/bsd/flex/bin
Module Name:src
Committed By: christos
Date: Wed Apr 7 16:14:35 UTC 2010
Modified Files:
src/external/bsd/flex/bin: Makefile
Log Message:
previous workaround not needed.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/flex/bin/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/flex/bin/Makefile
diff -u src/external/bsd/flex/bin/Makefile:1.7 src/external/bsd/flex/bin/Makefile:1.8
--- src/external/bsd/flex/bin/Makefile:1.7 Wed Apr 7 04:56:49 2010
+++ src/external/bsd/flex/bin/Makefile Wed Apr 7 12:14:35 2010
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.4 (Berkeley) 6/24/90
-# $NetBSD: Makefile,v 1.7 2010/04/07 08:56:49 tron Exp $
+# $NetBSD: Makefile,v 1.8 2010/04/07 16:14:35 christos Exp $
#
# By default, flex will be configured to generate 8-bit scanners only if the
# -8 flag is given. If you want it to always generate 8-bit scanners, add
@@ -46,8 +46,6 @@
DPADD+=${LIBM}
.endif
-COPTS.scan.c+= -Wno-unused-label
-
MAN = flex.1
LINKS= ${BINDIR}/lex ${BINDIR}/flex \
CVS commit: src/gnu/dist/gdb6/sim/ppc
Module Name:src
Committed By: christos
Date: Wed Apr 7 17:13:10 UTC 2010
Modified Files:
src/gnu/dist/gdb6/sim/ppc: emul_netbsd.c
Log Message:
don't pretend to have do_fstatvfs
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/gnu/dist/gdb6/sim/ppc/emul_netbsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/dist/gdb6/sim/ppc/emul_netbsd.c
diff -u src/gnu/dist/gdb6/sim/ppc/emul_netbsd.c:1.3 src/gnu/dist/gdb6/sim/ppc/emul_netbsd.c:1.4
--- src/gnu/dist/gdb6/sim/ppc/emul_netbsd.c:1.3 Wed Apr 7 08:58:33 2010
+++ src/gnu/dist/gdb6/sim/ppc/emul_netbsd.c Wed Apr 7 13:13:10 2010
@@ -1390,7 +1390,7 @@
/* 355 */ { 0, uuidgen },
/* 356 */ { 0, getvfsstat },
/* 357 */ { 0, statvfs1 },
- /* 358 */ { do_fstatvfs, fstatvfs1 },
+ /* 358 */ { 0, fstatvfs1 },
{ 0, }, /* 359 is old fhstatvfs1 */
/* 360 */ { 0, extattrctl },
/* 361 */ { 0, extattr_set_file },
CVS commit: src/sys
Module Name:src
Committed By: jakllsch
Date: Wed Apr 7 17:51:16 UTC 2010
Modified Files:
src/sys/arch/alpha/conf: GENERIC std.alpha
src/sys/dev/ata: satafis_subr.c satafisreg.h satafisvar.h
src/sys/dev/ic: ahcisata_core.c siisata.c siisatareg.h
Log Message:
satafis:
- Add function to parse RDH FIS for use in implementing AT_READREG.
- Correct and clean up some structure definitions.
- Sprinkle a bit of const.
- Remove dependency on dev/ic/wdcreg.h, WDCTL_4BIT doesn't seem
to be specified by any recent ATA standard, and it seems to make
no difference in practice.
- Stop using WDSD_IBM, these bits have been obsolete since before SATA.
siisata:
- Implement AT_READREG.
- Reap now-unneeded dev/ic/wdcreg.h.
- Whitespace and slight debug code cleanup.
- Some possibly-uncessary code reordering.
ahcisata:
- Implement AT_READREG.
- Reap now-unneeded dev/ic/wdcreg.h.
To generate a diff of this commit:
cvs rdiff -u -r1.331 -r1.332 src/sys/arch/alpha/conf/GENERIC
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/alpha/conf/std.alpha
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/ata/satafis_subr.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/ata/satafisreg.h
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/ata/satafisvar.h
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/ic/ahcisata_core.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/ic/siisata.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/ic/siisatareg.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/alpha/conf/GENERIC
diff -u src/sys/arch/alpha/conf/GENERIC:1.331 src/sys/arch/alpha/conf/GENERIC:1.332
--- src/sys/arch/alpha/conf/GENERIC:1.331 Sun Mar 7 09:39:42 2010
+++ src/sys/arch/alpha/conf/GENERIC Wed Apr 7 17:51:16 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.331 2010/03/07 09:39:42 plunky Exp $
+# $NetBSD: GENERIC,v 1.332 2010/04/07 17:51:16 jakllsch Exp $
#
# This machine description file is used to generate the default NetBSD
# kernel.
@@ -19,7 +19,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident GENERIC-$Revision: 1.331 $
+ident GENERIC-$Revision: 1.332 $
maxusers 32
@@ -767,3 +767,5 @@
options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
#options PAX_SEGVGUARD=0 # PaX Segmentation fault guard
options PAX_ASLR=0 # PaX Address Space Layout Randomization
+
+ath* at pci? dev ? function?
Index: src/sys/arch/alpha/conf/std.alpha
diff -u src/sys/arch/alpha/conf/std.alpha:1.25 src/sys/arch/alpha/conf/std.alpha:1.26
--- src/sys/arch/alpha/conf/std.alpha:1.25 Wed Oct 17 19:52:57 2007
+++ src/sys/arch/alpha/conf/std.alpha Wed Apr 7 17:51:16 2010
@@ -1,4 +1,4 @@
-# $NetBSD: std.alpha,v 1.25 2007/10/17 19:52:57 garbled Exp $
+# $NetBSD: std.alpha,v 1.26 2010/04/07 17:51:16 jakllsch Exp $
#
# Standard/required configuration info for NetBSD/alpha.
@@ -12,3 +12,6 @@
options EXEC_ECOFF # (native) ECOFF binary support
options EXEC_ELF64 # (native) ELF64 binary support
options EXEC_SCRIPT # shell script support
+
+# Atheros HAL options
+include external/isc/atheros_hal/conf/std.ath_hal
Index: src/sys/dev/ata/satafis_subr.c
diff -u src/sys/dev/ata/satafis_subr.c:1.4 src/sys/dev/ata/satafis_subr.c:1.5
--- src/sys/dev/ata/satafis_subr.c:1.4 Mon Oct 19 18:41:12 2009
+++ src/sys/dev/ata/satafis_subr.c Wed Apr 7 17:51:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: satafis_subr.c,v 1.4 2009/10/19 18:41:12 bouyer Exp $ */
+/* $NetBSD: satafis_subr.c,v 1.5 2010/04/07 17:51:16 jakllsch Exp $ */
/*-
* Copyright (c) 2009 Jonathan A. Kollasch.
@@ -51,7 +51,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: satafis_subr.c,v 1.4 2009/10/19 18:41:12 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: satafis_subr.c,v 1.5 2010/04/07 17:51:16 jakllsch Exp $);
#include sys/param.h
#include sys/systm.h
@@ -64,8 +64,6 @@
#include dev/ata/satafisreg.h
#include dev/ata/satafisvar.h
-#include dev/ic/wdcreg.h /* for WDCTL_4BIT */
-
#include atapibus.h
void
@@ -74,7 +72,7 @@
memset(fis, 0, RHD_FISLEN);
fis[fis_type] = RHD_FISTYPE;
- fis[rhd_cdpmp] = 0x80; /* xxx magic */
+ fis[rhd_c] = RHD_C;
fis[rhd_command] = ata_c-r_command;
fis[rhd_features] = ata_c-r_features;
fis[rhd_sector] = ata_c-r_sector;
@@ -82,9 +80,6 @@
fis[rhd_cyl_hi] = (ata_c-r_cyl 8) 0xff;
fis[rhd_dh] = ata_c-r_head 0x0f;
fis[rhd_seccnt] = ata_c-r_count;
- fis[rhd_control] = WDCTL_4BIT;
-
- return;
}
void
@@ -98,7 +93,7 @@
memset(fis, 0, RHD_FISLEN);
fis[fis_type] = RHD_FISTYPE;
- fis[rhd_cdpmp] = 0x80; /* xxx magic */
+ fis[rhd_c] = RHD_C;
if (ata_bio-flags ATA_LBA48) {
fis[rhd_command] = (ata_bio-flags ATA_READ) ?
WDCC_READDMA_EXT : WDCC_WRITEDMA_EXT;
@@ -120,8 +115,6 @@
fis[rhd_seccnt] = nblks 0xff;
fis[rhd_seccnt_exp] = (ata_bio-flags ATA_LBA48) ?
((nblks 8) 0xff) : 0;
- fis[rhd_control] = WDCTL_4BIT;
- return;
}
#if NATAPIBUS 0
@@ -131,26 +124,30 @@
memset(fis, 0, RHD_FISLEN);
fis[fis_type] =
CVS commit: [matt-nb5-mips64] src/sys/dev/pci
Module Name:src
Committed By: cliff
Date: Wed Apr 7 18:32:27 UTC 2010
Modified Files:
src/sys/dev/pci [matt-nb5-mips64]: pcidevs pcidevs.h pcidevs_data.h
Log Message:
add RMI XLR PCI-X bridge
To generate a diff of this commit:
cvs rdiff -u -r1.962.4.1.4.1 -r1.962.4.1.4.2 src/sys/dev/pci/pcidevs \
src/sys/dev/pci/pcidevs_data.h
cvs rdiff -u -r1.963.4.1.4.1 -r1.963.4.1.4.2 src/sys/dev/pci/pcidevs.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/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.962.4.1.4.1 src/sys/dev/pci/pcidevs:1.962.4.1.4.2
--- src/sys/dev/pci/pcidevs:1.962.4.1.4.1 Mon Nov 9 10:13:14 2009
+++ src/sys/dev/pci/pcidevs Wed Apr 7 18:32:20 2010
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.962.4.1.4.1 2009/11/09 10:13:14 cliff Exp $
+$NetBSD: pcidevs,v 1.962.4.1.4.2 2010/04/07 18:32:20 cliff Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -1375,6 +1375,7 @@
product AVM T1 0x1200 Primary Rate T1 ISDN Interface
/* RMI products */
+product RMI XLR_PCIX 0x000b XLR PCI-X bridge
product RMI XLS_PCIE 0xabcd XLS PCIe-PCIe bridge
/* B B Electronics Products */
Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.962.4.1.4.1 src/sys/dev/pci/pcidevs_data.h:1.962.4.1.4.2
--- src/sys/dev/pci/pcidevs_data.h:1.962.4.1.4.1 Mon Nov 9 10:13:14 2009
+++ src/sys/dev/pci/pcidevs_data.h Wed Apr 7 18:32:21 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs_data.h,v 1.962.4.1.4.1 2009/11/09 10:13:14 cliff Exp $ */
+/* $NetBSD: pcidevs_data.h,v 1.962.4.1.4.2 2010/04/07 18:32:21 cliff Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.962.4.1 2009/03/20 13:01:35 msaitoh Exp
+ * NetBSD: pcidevs,v 1.962.4.1.4.1 2009/11/09 10:13:14 cliff Exp
*/
/*
@@ -5000,6 +5000,10 @@
Primary Rate T1 ISDN Interface,
},
{
+ PCI_VENDOR_RMI, PCI_PRODUCT_RMI_XLR_PCIX,
+ XLR PCI-X bridge,
+ },
+ {
PCI_VENDOR_RMI, PCI_PRODUCT_RMI_XLS_PCIE,
XLS PCIe-PCIe bridge,
},
@@ -14520,4 +14524,4 @@
Video Controller,
},
};
-const int pci_nproducts = 3028;
+const int pci_nproducts = 3029;
Index: src/sys/dev/pci/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.963.4.1.4.1 src/sys/dev/pci/pcidevs.h:1.963.4.1.4.2
--- src/sys/dev/pci/pcidevs.h:1.963.4.1.4.1 Mon Nov 9 10:13:14 2009
+++ src/sys/dev/pci/pcidevs.h Wed Apr 7 18:32:21 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs.h,v 1.963.4.1.4.1 2009/11/09 10:13:14 cliff Exp $ */
+/* $NetBSD: pcidevs.h,v 1.963.4.1.4.2 2010/04/07 18:32:21 cliff Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.962.4.1 2009/03/20 13:01:35 msaitoh Exp
+ * NetBSD: pcidevs,v 1.962.4.1.4.1 2009/11/09 10:13:14 cliff Exp
*/
/*
@@ -1382,6 +1382,7 @@
#define PCI_PRODUCT_AVM_T1 0x1200 /* Primary Rate T1 ISDN Interface */
/* RMI products */
+#define PCI_PRODUCT_RMI_XLR_PCIX 0x000b /* XLR PCI-X bridge */
#define PCI_PRODUCT_RMI_XLS_PCIE 0xabcd /* XLS PCIe-PCIe bridge */
/* B B Electronics Products */
CVS commit: src/sys/arch/alpha/conf
Module Name:src Committed By: jakllsch Date: Wed Apr 7 18:51:34 UTC 2010 Modified Files: src/sys/arch/alpha/conf: GENERIC Log Message: Clean up accidential commit. To generate a diff of this commit: cvs rdiff -u -r1.332 -r1.333 src/sys/arch/alpha/conf/GENERIC 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/alpha/conf/GENERIC diff -u src/sys/arch/alpha/conf/GENERIC:1.332 src/sys/arch/alpha/conf/GENERIC:1.333 --- src/sys/arch/alpha/conf/GENERIC:1.332 Wed Apr 7 17:51:16 2010 +++ src/sys/arch/alpha/conf/GENERIC Wed Apr 7 18:51:34 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.332 2010/04/07 17:51:16 jakllsch Exp $ +# $NetBSD: GENERIC,v 1.333 2010/04/07 18:51:34 jakllsch Exp $ # # This machine description file is used to generate the default NetBSD # kernel. @@ -19,7 +19,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident GENERIC-$Revision: 1.332 $ +ident GENERIC-$Revision: 1.333 $ maxusers 32 @@ -767,5 +767,3 @@ options PAX_MPROTECT=0 # PaX mprotect(2) restrictions #options PAX_SEGVGUARD=0 # PaX Segmentation fault guard options PAX_ASLR=0 # PaX Address Space Layout Randomization - -ath* at pci? dev ? function?
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/rmi
Module Name:src Committed By: cliff Date: Wed Apr 7 19:23:51 UTC 2010 Modified Files: src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixlreg.h Log Message: - add PCI-X regs - improve names for XLR and XLS specific and common PCI-X, PCIe regs and macros To generate a diff of this commit: cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/sys/arch/mips/rmi/rmixlreg.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/mips/rmi/rmixlreg.h diff -u src/sys/arch/mips/rmi/rmixlreg.h:1.1.2.10 src/sys/arch/mips/rmi/rmixlreg.h:1.1.2.11 --- src/sys/arch/mips/rmi/rmixlreg.h:1.1.2.10 Wed Mar 24 19:14:09 2010 +++ src/sys/arch/mips/rmi/rmixlreg.h Wed Apr 7 19:23:50 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: rmixlreg.h,v 1.1.2.10 2010/03/24 19:14:09 cliff Exp $ */ +/* $NetBSD: rmixlreg.h,v 1.1.2.11 2010/04/07 19:23:50 cliff Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -232,6 +232,10 @@ #define RMIXL_IO_DEV_PIC 0x08000 /* Programmable Interrupt Controller */ #if defined(MIPS64_XLR) #define RMIXL_IO_DEV_PCIX 0x09000 /* PCI-X */ +#define RMIXL_IO_DEV_PCIX_EL \ + RMIXL_IO_DEV_PCIX /* PXI-X little endian */ +#define RMIXL_IO_DEV_PCIX_EB \ + (RMIXL_IO_DEV_PCIX | __BIT(11)) /* PXI-X big endian */ #define RMIXL_IO_DEV_HT 0x0a000 /* HyperTransport */ #endif /* MIPS64_XLR */ #define RMIXL_IO_DEV_SAE 0x0b000 /* Security Acceleration Engine */ @@ -299,12 +303,29 @@ #define RMIXL_SBC_DRAM_CHNBD_DTR(n) _RMIXL_OFFSET(0x010 + (n)) /* DRAM Region Channels B,D Address Translation Regs[0-7] */ #define RMIXL_SBC_DRAM_BRIDGE_CFG _RMIXL_OFFSET(0x18) /* SBC DRAM config reg */ -#define RMIXL_SBC_XLS_IO_BAR _RMIXL_OFFSET(0x19) /* I/O Config Base Addr reg */ -#define RMIXL_SBC_XLS_FLASH_BAR _RMIXL_OFFSET(0x20) /* Flash Memory Base Addr reg */ -#define RMIXL_SBC_PCIE_CFG_BAR _RMIXL_OFFSET(0x40) /* PCI Configuration BAR */ -#define RMIXL_SBC_PCIE_ECFG_BAR _RMIXL_OFFSET(0x41) /* PCI Extended Configuration BAR */ -#define RMIXL_SBC_PCIE_MEM_BAR _RMIXL_OFFSET(0x42) /* PCI Memory region BAR */ -#define RMIXL_SBC_PCIE_IO_BAR _RMIXL_OFFSET(0x43) /* PCI IO region BAR */ +#if defined(MIPS64_XLR) +#define RMIXLR_SBC_IO_BAR _RMIXL_OFFSET(0x19) /* I/O Config Base Addr reg */ +#define RMIXLR_SBC_FLASH_BAR _RMIXL_OFFSET(0x1a) /* Flash Memory Base Addr reg */ +#define RMIXLR_SBC_SRAM_BAR _RMIXL_OFFSET(0x1b) /* SRAM Base Addr reg */ +#define RMIXLR_SBC_HTMEM_BAR _RMIXL_OFFSET(0x1c) /* HyperTransport Mem Base Addr reg */ +#define RMIXLR_SBC_HTINT_BAR _RMIXL_OFFSET(0x1d) /* HyperTransport Interrupt Base Addr reg */ +#define RMIXLR_SBC_HTPIC_BAR _RMIXL_OFFSET(0x1e) /* HyperTransport Legacy PIC Base Addr reg */ +#define RMIXLR_SBC_HTSM_BAR _RMIXL_OFFSET(0x1f) /* HyperTransport System Management Base Addr reg */ +#define RMIXLR_SBC_HTIO_BAR _RMIXL_OFFSET(0x20) /* HyperTransport IO Base Addr reg */ +#define RMIXLR_SBC_HTCFG_BAR _RMIXL_OFFSET(0x21) /* HyperTransport Configuration Base Addr reg */ +#define RMIXLR_SBC_PCIX_CFG_BAR _RMIXL_OFFSET(0x22) /* PCI-X Configuration Base Addr reg */ +#define RMIXLR_SBC_PCIX_MEM_BAR _RMIXL_OFFSET(0x23) /* PCI-X Mem Base Addr reg */ +#define RMIXLR_SBC_PCIX_IO_BAR _RMIXL_OFFSET(0x24) /* PCI-X IO Base Addr reg */ +#define RMIXLR_SBC_SYS2IO_CREDITS _RMIXL_OFFSET(0x35) /* System Bridge I/O Transaction Credits register */ +#endif /* MIPS64_XLR */ +#if defined(MIPS64_XLS) +#define RMIXLS_SBC_IO_BAR _RMIXL_OFFSET(0x19) /* I/O Config Base Addr reg */ +#define RMIXLS_SBC_FLASH_BAR _RMIXL_OFFSET(0x20) /* Flash Memory Base Addr reg */ +#define RMIXLS_SBC_PCIE_CFG_BAR _RMIXL_OFFSET(0x40) /* PCI Configuration BAR */ +#define RMIXLS_SBC_PCIE_ECFG_BAR _RMIXL_OFFSET(0x41) /* PCI Extended Configuration BAR */ +#define RMIXLS_SBC_PCIE_MEM_BAR _RMIXL_OFFSET(0x42) /* PCI Memory region BAR */ +#define RMIXLS_SBC_PCIE_IO_BAR _RMIXL_OFFSET(0x43) /* PCI IO region BAR */ +#endif /* MIPS64_XLS */ /* * Address Error registers @@ -369,9 +390,50 @@ #define RMIXL_DRAM_CFG_DRAM_MODE __BITS(1,0) /* 1=DDR2 */ /* - * RMIXL_SBC_PCIE_CFG_BAR bit defines + * RMIXL_SBC_XLR_PCIX_CFG_BAR bit defines + */ +#define RMIXL_PCIX_CFG_BAR_BASE __BITS(31,17) /* phys address bits 39:25 */ +#define RMIXL_PCIX_CFG_BAR_BA_SHIFT (25 - 17) +#define RMIXL_PCIX_CFG_BAR_TO_BA(r) \ + (((r) RMIXL_PCIX_CFG_BAR_BASE) RMIXL_PCIX_CFG_BAR_BA_SHIFT) +#define RMIXL_PCIX_CFG_BAR_RESV __BITS(16,1) /* (reserved) */ +#define RMIXL_PCIX_CFG_BAR_ENB __BIT(0) /* 1=Enable */ +#define RMIXL_PCIX_CFG_SIZE __BIT(25) +#define RMIXL_PCIX_CFG_BAR(ba, en) \ + ((uint32_t)(((ba) (25 - 17)) | ((en) ? RMIXL_PCIX_CFG_BAR_ENB : 0))) + +/* + * RMIXLR_SBC_PCIX_MEM_BAR bit defines + */ +#define RMIXL_PCIX_MEM_BAR_BASE __BITS(31,16) /* phys address bits 39:24 */ +#define RMIXL_PCIX_MEM_BAR_TO_BA(r) \ + (((r) RMIXL_PCIX_MEM_BAR_BASE) (24 - 16)) +#define RMIXL_PCIX_MEM_BAR_MASK __BITS(15,1) /* phys address mask bits 38:24 */ +#define
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/rmi
Module Name:src
Committed By: cliff
Date: Wed Apr 7 19:24:13 UTC 2010
Modified Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixlvar.h
Log Message:
- bus space related fields renamed to reflect use by both pcie and pcix
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.16 -r1.1.2.17 src/sys/arch/mips/rmi/rmixlvar.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/mips/rmi/rmixlvar.h
diff -u src/sys/arch/mips/rmi/rmixlvar.h:1.1.2.16 src/sys/arch/mips/rmi/rmixlvar.h:1.1.2.17
--- src/sys/arch/mips/rmi/rmixlvar.h:1.1.2.16 Mon Mar 29 23:31:38 2010
+++ src/sys/arch/mips/rmi/rmixlvar.h Wed Apr 7 19:24:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixlvar.h,v 1.1.2.16 2010/03/29 23:31:38 cliff Exp $ */
+/* $NetBSD: rmixlvar.h,v 1.1.2.17 2010/04/07 19:24:13 cliff Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -110,18 +110,18 @@
struct rmixl_config {
uint64_t rc_io_pbase;
- bus_addr_t rc_pcie_cfg_pbase;
- bus_size_t rc_pcie_cfg_size;
- bus_addr_t rc_pcie_ecfg_pbase;
- bus_size_t rc_pcie_ecfg_size;
+ bus_addr_t rc_pci_cfg_pbase;
+ bus_size_t rc_pci_cfg_size;
+ bus_addr_t rc_pci_ecfg_pbase;
+ bus_size_t rc_pci_ecfg_size;
bus_addr_t rc_pci_mem_pbase;
bus_size_t rc_pci_mem_size;
bus_addr_t rc_pci_io_pbase;
bus_size_t rc_pci_io_size;
struct mips_bus_space rc_obio_eb_memt; /* DEVIO -eb */
struct mips_bus_space rc_obio_el_memt; /* DEVIO -el */
- struct mips_bus_space rc_pcie_cfg_memt; /* PCI CFG */
- struct mips_bus_space rc_pcie_ecfg_memt; /* PCI ECFG */
+ struct mips_bus_space rc_pci_cfg_memt; /* PCI CFG */
+ struct mips_bus_space rc_pci_ecfg_memt; /* PCI ECFG */
struct mips_bus_space rc_pci_memt; /* PCI MEM */
struct mips_bus_space rc_pci_iot; /* PCI IO */
struct mips_bus_dma_tag rc_64bit_dmat;
@@ -130,10 +130,10 @@
struct extent *rc_phys_ex; /* Note: MB units */
struct extent *rc_obio_eb_ex;
struct extent *rc_obio_el_ex;
- struct extent *rc_pcie_cfg_ex;
- struct extent *rc_pcie_ecfg_ex;
- struct extent *rc_pcie_mem_ex;
- struct extent *rc_pcie_io_ex;
+ struct extent *rc_pci_cfg_ex;
+ struct extent *rc_pci_ecfg_ex;
+ struct extent *rc_pci_mem_ex;
+ struct extent *rc_pci_io_ex;
int rc_mallocsafe;
rmixlfw_info_t rc_psb_info;
rmixlfw_psb_type_t rc_psb_type;
@@ -146,10 +146,10 @@
extern void rmixl_obio_eb_bus_mem_init(bus_space_tag_t, void *);
extern void rmixl_obio_el_bus_mem_init(bus_space_tag_t, void *);
-extern void rmixl_pcie_cfg_bus_mem_init(bus_space_tag_t, void *);
-extern void rmixl_pcie_ecfg_bus_mem_init(bus_space_tag_t, void *);
-extern void rmixl_pcie_bus_mem_init(bus_space_tag_t, void *);
-extern void rmixl_pcie_bus_io_init(bus_space_tag_t, void *);
+extern void rmixl_pci_cfg_bus_mem_init(bus_space_tag_t, void *);
+extern void rmixl_pci_ecfg_bus_mem_init(bus_space_tag_t, void *);
+extern void rmixl_pci_bus_mem_init(bus_space_tag_t, void *);
+extern void rmixl_pci_bus_io_init(bus_space_tag_t, void *);
extern void rmixl_addr_error_init(void);
extern int rmixl_addr_error_check(void);
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/rmi
Module Name:src
Committed By: cliff
Date: Wed Apr 7 19:25:48 UTC 2010
Added Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_pcix.c rmixl_pcixvar.h
Log Message:
- add driver for RMI XLR PCI-X interface
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.2.1 src/sys/arch/mips/rmi/rmixl_pcix.c \
src/sys/arch/mips/rmi/rmixl_pcixvar.h
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/rmi/rmixl_pcix.c
diff -u /dev/null src/sys/arch/mips/rmi/rmixl_pcix.c:1.1.2.1
--- /dev/null Wed Apr 7 19:25:48 2010
+++ src/sys/arch/mips/rmi/rmixl_pcix.c Wed Apr 7 19:25:48 2010
@@ -0,0 +1,993 @@
+/* $NetBSD: rmixl_pcix.c,v 1.1.2.1 2010/04/07 19:25:48 cliff Exp $ */
+
+/*
+ * Copyright (c) 2001 Wasabi Systems, Inc.
+ * All rights reserved.
+ *
+ * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *must display the following acknowledgement:
+ * This product includes software developed for the NetBSD Project by
+ * Wasabi Systems, Inc.
+ * 4. The name of Wasabi Systems, Inc. may not be used to endorse
+ *or promote products derived from this software without specific prior
+ *written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC
+ * 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.
+ */
+
+/*
+ * PCI configuration support for RMI XLR SoC
+ */
+
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: rmixl_pcix.c,v 1.1.2.1 2010/04/07 19:25:48 cliff Exp $);
+
+#include opt_pci.h
+#include pci.h
+
+#include sys/cdefs.h
+
+#include sys/param.h
+#include sys/systm.h
+#include sys/device.h
+#include sys/extent.h
+#include sys/malloc.h
+
+#include uvm/uvm_extern.h
+
+#include machine/bus.h
+#include machine/intr.h
+
+#include mips/rmi/rmixlreg.h
+#include mips/rmi/rmixlvar.h
+#include mips/rmi/rmixl_intr.h
+#include mips/rmi/rmixl_pcixvar.h
+
+#include mips/rmi/rmixl_obiovar.h
+
+#include dev/pci/pcivar.h
+#include dev/pci/pcidevs.h
+#include dev/pci/pciconf.h
+
+#ifdef PCI_NETBSD_CONFIGURE
+#include mips/cache.h
+#endif
+
+#include machine/pci_machdep.h
+
+#ifdef PCI_DEBUG
+int rmixl_pcix_debug = PCI_DEBUG;
+# define DPRINTF(x) do { if (rmixl_pcix_debug) printf x ; } while (0)
+#else
+# define DPRINTF(x)
+#endif
+
+#ifndef DDB
+# define STATIC static
+#else
+# define STATIC
+#endif
+
+
+/*
+ * XLR PCI-X Extended Configuration Registers
+ * Note:
+ * - MSI-related regs are omitted
+ * - Device mode regs are omitted
+ */
+#define RMIXL_PCIX_ECFG_HOST_BAR0_ADDR 0x100 /* Host BAR0 Address */
+#define RMIXL_PCIX_ECFG_HOST_BAR1_ADDR 0x104 /* Host BAR1 Address */
+#define RMIXL_PCIX_ECFG_HOST_BAR2_ADDR 0x108 /* Host BAR2 Address */
+#define RMIXL_PCIX_ECFG_HOST_BAR3_ADDR 0x10c /* Host BAR3 Address */
+#define RMIXL_PCIX_ECFG_HOST_BAR4_ADDR 0x110 /* Host BAR4 Address */
+#define RMIXL_PCIX_ECFG_HOST_BAR5_ADDR 0x114 /* Host BAR5 Address */
+#define RMIXL_PCIX_ECFG_HOST_BAR0_SIZE 0x118 /* Host BAR0 Size */
+#define RMIXL_PCIX_ECFG_HOST_BAR1_SIZE 0x11c /* Host BAR1 Size */
+#define RMIXL_PCIX_ECFG_HOST_BAR2_SIZE 0x120 /* Host BAR2 Size */
+#define RMIXL_PCIX_ECFG_HOST_BAR3_SIZE 0x124 /* Host BAR3 Size */
+#define RMIXL_PCIX_ECFG_HOST_BAR4_SIZE 0x128 /* Host BAR4 Size */
+#define RMIXL_PCIX_ECFG_HOST_BAR5_SIZE 0x12c /* Host BAR5 Size */
+#define RMIXL_PCIX_ECFG_MATCH_BIT_ADDR 0x130 /* Match Bit Address BAR */
+#define RMIXL_PCIX_ECFG_MATCH_BIT_SIZE 0x134 /* Match Bit Size BAR */
+#define RMIXL_PCIX_ECFG_XLR_CONTROL 0x138 /* XLR Control reg */
+#define RMIXL_PCIX_ECFG_INTR_CONTROL 0x13c /* Interrupt Control reg */
+#define RMIXL_PCIX_ECFG_INTR_STATUS 0x140 /* Interrupt Status reg */
+#define RMIXL_PCIX_ECFG_INTR_ERR_STATUS 0x144 /*
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/rmi
Module Name:src
Committed By: cliff
Date: Wed Apr 7 19:26:14 UTC 2010
Modified Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_pcie.c
Log Message:
- use new PCIE register macro names
- use new bus space related field names in struct rmixl_config
- don't match if not running on an XLS chip
- rmixl_pcie_intr_string() properly decomposes pci_intr_handle_t to obtain irq
- in rmixl_pcie_make_pih() and rmixl_pcie_decompose_pih() KASSERTS,
no check for 0 needed on unsigned
- fix assignment of 'other' in rmixl_pcie_intr_disestablish()
when bit number is = 32
- in rmixl_pcie_intr_establish(), change = to == in a couple asserts
- in rmixl_pcie_intr_establish(), if rmixl_intr_establish() fails,
report irq properly in panic message
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/sys/arch/mips/rmi/rmixl_pcie.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/rmi/rmixl_pcie.c
diff -u src/sys/arch/mips/rmi/rmixl_pcie.c:1.1.2.10 src/sys/arch/mips/rmi/rmixl_pcie.c:1.1.2.11
--- src/sys/arch/mips/rmi/rmixl_pcie.c:1.1.2.10 Mon Mar 29 23:32:21 2010
+++ src/sys/arch/mips/rmi/rmixl_pcie.c Wed Apr 7 19:26:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pcie.c,v 1.1.2.10 2010/03/29 23:32:21 cliff Exp $ */
+/* $NetBSD: rmixl_pcie.c,v 1.1.2.11 2010/04/07 19:26:14 cliff Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rmixl_pcie.c,v 1.1.2.10 2010/03/29 23:32:21 cliff Exp $);
+__KERNEL_RCSID(0, $NetBSD: rmixl_pcie.c,v 1.1.2.11 2010/04/07 19:26:14 cliff Exp $);
#include opt_pci.h
#include pci.h
@@ -230,9 +230,9 @@
enabling %s at phys %# PRIxBUSADDR , size %lu MB\n, \
__STRING(reg), __STRING(reg), ba, size)); \
RMIXL_IOREG_WRITE(RMIXL_IO_DEV_BRIDGE + \
- RMIXL_PCIE_CONCAT3(RMIXL_SBC_PCIE_,reg,_BAR), bar); \
+ RMIXL_PCIE_CONCAT3(RMIXLS_SBC_PCIE_,reg,_BAR), bar); \
bar = RMIXL_IOREG_READ(RMIXL_IO_DEV_BRIDGE + \
- RMIXL_PCIE_CONCAT3(RMIXL_SBC_PCIE_,reg,_BAR)); \
+ RMIXL_PCIE_CONCAT3(RMIXLS_SBC_PCIE_,reg,_BAR)); \
DPRINTF((%s: %s BAR %#x\n, __func__, __STRING(reg), bar)); \
}
@@ -251,6 +251,12 @@
{
uint32_t r;
+ /*
+ * PCIe interface exists on XLS chips only
+ */
+ if (! cpu_rmixls(mips_options.mips_cpu))
+ return 0;
+
/* XXX
* for now there is only one PCIe Interface on chip
* this could change with furture RMI XL family designs
@@ -298,33 +304,33 @@
* get PCI config space base addr from SBC PCIe CFG BAR
* initialize it if necessary
*/
- bar = RMIXL_IOREG_READ(RMIXL_IO_DEV_BRIDGE + RMIXL_SBC_PCIE_CFG_BAR);
+ bar = RMIXL_IOREG_READ(RMIXL_IO_DEV_BRIDGE + RMIXLS_SBC_PCIE_CFG_BAR);
DPRINTF((%s: PCIE_CFG_BAR %#x\n, __func__, bar));
if ((bar RMIXL_PCIE_CFG_BAR_ENB) == 0) {
u_long n = RMIXL_PCIE_CFG_SIZE / (1024 * 1024);
RMIXL_PCIE_BAR_INIT(CFG, bar, n, n);
}
- rcp-rc_pcie_cfg_pbase = (bus_addr_t)RMIXL_PCIE_CFG_BAR_TO_BA(bar);
- rcp-rc_pcie_cfg_size = (bus_size_t)RMIXL_PCIE_CFG_SIZE;
+ rcp-rc_pci_cfg_pbase = (bus_addr_t)RMIXL_PCIE_CFG_BAR_TO_BA(bar);
+ rcp-rc_pci_cfg_size = (bus_size_t)RMIXL_PCIE_CFG_SIZE;
/*
* get PCIE Extended config space base addr from SBC PCIe ECFG BAR
* initialize it if necessary
*/
- bar = RMIXL_IOREG_READ(RMIXL_IO_DEV_BRIDGE + RMIXL_SBC_PCIE_ECFG_BAR);
+ bar = RMIXL_IOREG_READ(RMIXL_IO_DEV_BRIDGE + RMIXLS_SBC_PCIE_ECFG_BAR);
DPRINTF((%s: PCIE_ECFG_BAR %#x\n, __func__, bar));
if ((bar RMIXL_PCIE_ECFG_BAR_ENB) == 0) {
u_long n = RMIXL_PCIE_ECFG_SIZE / (1024 * 1024);
RMIXL_PCIE_BAR_INIT(ECFG, bar, n, n);
}
- rcp-rc_pcie_ecfg_pbase = (bus_addr_t)RMIXL_PCIE_ECFG_BAR_TO_BA(bar);
- rcp-rc_pcie_ecfg_size = (bus_size_t)RMIXL_PCIE_ECFG_SIZE;
+ rcp-rc_pci_ecfg_pbase = (bus_addr_t)RMIXL_PCIE_ECFG_BAR_TO_BA(bar);
+ rcp-rc_pci_ecfg_size = (bus_size_t)RMIXL_PCIE_ECFG_SIZE;
/*
* get PCI MEM space base [addr, size] from SBC PCIe MEM BAR
* initialize it if necessary
*/
- bar = RMIXL_IOREG_READ(RMIXL_IO_DEV_BRIDGE + RMIXL_SBC_PCIE_MEM_BAR);
+ bar = RMIXL_IOREG_READ(RMIXL_IO_DEV_BRIDGE + RMIXLS_SBC_PCIE_MEM_BAR);
DPRINTF((%s: PCIE_MEM_BAR %#x\n, __func__, bar));
if ((bar RMIXL_PCIE_MEM_BAR_ENB) == 0) {
u_long n = 256;/* 256 MB */
@@ -337,7 +343,7 @@
* get PCI IO space base [addr, size] from SBC PCIe IO BAR
* initialize it if necessary
*/
- bar = RMIXL_IOREG_READ(RMIXL_IO_DEV_BRIDGE + RMIXL_SBC_PCIE_IO_BAR);
+ bar = RMIXL_IOREG_READ(RMIXL_IO_DEV_BRIDGE + RMIXLS_SBC_PCIE_IO_BAR);
DPRINTF((%s: PCIE_IO_BAR %#x\n, __func__, bar));
if ((bar RMIXL_PCIE_IO_BAR_ENB) == 0) {
u_long n = 32;/* 32 MB */
@@ -349,17 +355,17 @@
/*
* initialize the PCI CFG, ECFG bus space tags
*/
- rmixl_pcie_cfg_bus_mem_init(rcp-rc_pcie_cfg_memt, rcp);
- sc-sc_pcie_cfg_memt = rcp-rc_pcie_cfg_memt;
+ rmixl_pci_cfg_bus_mem_init(rcp-rc_pci_cfg_memt, rcp);
+
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/rmi
Module Name:src
Committed By: cliff
Date: Wed Apr 7 19:26:32 UTC 2010
Modified Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_pcievar.h
Log Message:
- rename bus space related fields in rmixl_pcie_softc
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/arch/mips/rmi/rmixl_pcievar.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/mips/rmi/rmixl_pcievar.h
diff -u src/sys/arch/mips/rmi/rmixl_pcievar.h:1.1.2.5 src/sys/arch/mips/rmi/rmixl_pcievar.h:1.1.2.6
--- src/sys/arch/mips/rmi/rmixl_pcievar.h:1.1.2.5 Mon Mar 29 23:32:42 2010
+++ src/sys/arch/mips/rmi/rmixl_pcievar.h Wed Apr 7 19:26:32 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pcievar.h,v 1.1.2.5 2010/03/29 23:32:42 cliff Exp $ */
+/* $NetBSD: rmixl_pcievar.h,v 1.1.2.6 2010/04/07 19:26:32 cliff Exp $ */
#ifndef _MIPS_RMI_PCIE_VAR_H_
#define _MIPS_RMI_PCIE_VAR_H_
@@ -49,8 +49,8 @@
typedef struct rmixl_pcie_softc {
device_t sc_dev;
struct mips_pci_chipset sc_pci_chipset;
- bus_space_tag_t sc_pcie_cfg_memt;
- bus_space_tag_t sc_pcie_ecfg_memt;
+ bus_space_tag_t sc_pci_cfg_memt;
+ bus_space_tag_t sc_pci_ecfg_memt;
bus_dma_tag_t sc_29bit_dmat;
bus_dma_tag_t sc_32bit_dmat;
bus_dma_tag_t sc_64bit_dmat;
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/rmi
Module Name:src Committed By: cliff Date: Wed Apr 7 19:30:11 UTC 2010 Modified Files: src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_pcie_cfg_space.c rmixl_pcie_ecfg_space.c rmixl_pcie_io_space.c rmixl_pcie_mem_space.c Log Message: - these bus spaces can be used by pcix or pcie interfaces, use names changed to reflet that - also these files will soon be renamed accordingly To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/mips/rmi/rmixl_pcie_cfg_space.c \ src/sys/arch/mips/rmi/rmixl_pcie_ecfg_space.c \ src/sys/arch/mips/rmi/rmixl_pcie_io_space.c \ src/sys/arch/mips/rmi/rmixl_pcie_mem_space.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/rmi/rmixl_pcie_cfg_space.c diff -u src/sys/arch/mips/rmi/rmixl_pcie_cfg_space.c:1.1.2.2 src/sys/arch/mips/rmi/rmixl_pcie_cfg_space.c:1.1.2.3 --- src/sys/arch/mips/rmi/rmixl_pcie_cfg_space.c:1.1.2.2 Wed Nov 18 01:16:07 2009 +++ src/sys/arch/mips/rmi/rmixl_pcie_cfg_space.c Wed Apr 7 19:30:11 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: rmixl_pcie_cfg_space.c,v 1.1.2.2 2009/11/18 01:16:07 cliff Exp $ */ +/* $NetBSD: rmixl_pcie_cfg_space.c,v 1.1.2.3 2010/04/07 19:30:11 cliff Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rmixl_pcie_cfg_space.c,v 1.1.2.2 2009/11/18 01:16:07 cliff Exp $); +__KERNEL_RCSID(0, $NetBSD: rmixl_pcie_cfg_space.c,v 1.1.2.3 2010/04/07 19:30:11 cliff Exp $); #include sys/types.h #include sys/param.h @@ -45,20 +45,20 @@ #include mips/rmi/rmixlreg.h #include mips/rmi/rmixlvar.h -#define CHIP rmixl_pcie_cfg +#define CHIP rmixl_pci_cfg #define CHIP_MEM /* defined */ #define CHIP_ACCESS_SIZE 1 #define CHIP_LITTLE_ENDIAN #define CHIP_EX_MALLOC_SAFE(v) (((struct rmixl_config *)(v))-rc_mallocsafe) -#define CHIP_EXTENT(v) (((struct rmixl_config *)(v))-rc_pcie_cfg_ex) +#define CHIP_EXTENT(v) (((struct rmixl_config *)(v))-rc_pci_cfg_ex) /* MEM region 1 */ #define CHIP_W1_BUS_START(v) \ - (((struct rmixl_config *)(v))-rc_pcie_cfg_pbase) + (((struct rmixl_config *)(v))-rc_pci_cfg_pbase) #define CHIP_W1_BUS_END(v) \ (CHIP_W1_SYS_START(v) + \ - (((struct rmixl_config *)(v))-rc_pcie_cfg_size) - 1) + (((struct rmixl_config *)(v))-rc_pci_cfg_size) - 1) #define CHIP_W1_SYS_START(v) CHIP_W1_BUS_START(v) #define CHIP_W1_SYS_END(v) CHIP_W1_BUS_END(v) Index: src/sys/arch/mips/rmi/rmixl_pcie_ecfg_space.c diff -u src/sys/arch/mips/rmi/rmixl_pcie_ecfg_space.c:1.1.2.2 src/sys/arch/mips/rmi/rmixl_pcie_ecfg_space.c:1.1.2.3 --- src/sys/arch/mips/rmi/rmixl_pcie_ecfg_space.c:1.1.2.2 Wed Nov 18 01:16:07 2009 +++ src/sys/arch/mips/rmi/rmixl_pcie_ecfg_space.c Wed Apr 7 19:30:11 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: rmixl_pcie_ecfg_space.c,v 1.1.2.2 2009/11/18 01:16:07 cliff Exp $ */ +/* $NetBSD: rmixl_pcie_ecfg_space.c,v 1.1.2.3 2010/04/07 19:30:11 cliff Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rmixl_pcie_ecfg_space.c,v 1.1.2.2 2009/11/18 01:16:07 cliff Exp $); +__KERNEL_RCSID(0, $NetBSD: rmixl_pcie_ecfg_space.c,v 1.1.2.3 2010/04/07 19:30:11 cliff Exp $); #include sys/types.h #include sys/param.h @@ -45,20 +45,20 @@ #include mips/rmi/rmixlreg.h #include mips/rmi/rmixlvar.h -#define CHIP rmixl_pcie_ecfg +#define CHIP rmixl_pci_ecfg #define CHIP_MEM /* defined */ #define CHIP_ACCESS_SIZE 1 #define CHIP_LITTLE_ENDIAN #define CHIP_EX_MALLOC_SAFE(v) (((struct rmixl_config *)(v))-rc_mallocsafe) -#define CHIP_EXTENT(v) (((struct rmixl_config *)(v))-rc_pcie_ecfg_ex) +#define CHIP_EXTENT(v) (((struct rmixl_config *)(v))-rc_pci_ecfg_ex) /* MEM region 1 */ #define CHIP_W1_BUS_START(v) \ - (((struct rmixl_config *)(v))-rc_pcie_ecfg_pbase) + (((struct rmixl_config *)(v))-rc_pci_ecfg_pbase) #define CHIP_W1_BUS_END(v) \ (CHIP_W1_SYS_START(v) + \ - (((struct rmixl_config *)(v))-rc_pcie_ecfg_size) - 1) + (((struct rmixl_config *)(v))-rc_pci_ecfg_size) - 1) #define CHIP_W1_SYS_START(v) CHIP_W1_BUS_START(v) #define CHIP_W1_SYS_END(v) CHIP_W1_BUS_END(v) Index: src/sys/arch/mips/rmi/rmixl_pcie_io_space.c diff -u src/sys/arch/mips/rmi/rmixl_pcie_io_space.c:1.1.2.2 src/sys/arch/mips/rmi/rmixl_pcie_io_space.c:1.1.2.3 --- src/sys/arch/mips/rmi/rmixl_pcie_io_space.c:1.1.2.2 Wed Nov 18 01:16:07 2009 +++ src/sys/arch/mips/rmi/rmixl_pcie_io_space.c Wed Apr 7 19:30:11 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: rmixl_pcie_io_space.c,v 1.1.2.2 2009/11/18 01:16:07 cliff Exp $ */ +/* $NetBSD: rmixl_pcie_io_space.c,v 1.1.2.3 2010/04/07 19:30:11 cliff Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rmixl_pcie_io_space.c,v 1.1.2.2 2009/11/18 01:16:07 cliff Exp $); +__KERNEL_RCSID(0, $NetBSD:
CVS commit: [matt-nb5-mips64] src/sys/arch
Module Name:src
Committed By: cliff
Date: Wed Apr 7 19:31:37 UTC 2010
Modified Files:
src/sys/arch/evbmips/conf [matt-nb5-mips64]: XLSATX
src/sys/arch/mips/conf [matt-nb5-mips64]: files.rmixl
Log Message:
- configure XLR PCI-X interface
- this config can be used on XLS or XLR chip systems
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/sys/arch/evbmips/conf/XLSATX
cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/sys/arch/mips/conf/files.rmixl
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/evbmips/conf/XLSATX
diff -u src/sys/arch/evbmips/conf/XLSATX:1.1.2.6 src/sys/arch/evbmips/conf/XLSATX:1.1.2.7
--- src/sys/arch/evbmips/conf/XLSATX:1.1.2.6 Fri Jan 29 00:36:04 2010
+++ src/sys/arch/evbmips/conf/XLSATX Wed Apr 7 19:31:37 2010
@@ -1,8 +1,8 @@
-# $NetBSD: XLSATX,v 1.1.2.6 2010/01/29 00:36:04 cliff Exp $
+# $NetBSD: XLSATX,v 1.1.2.7 2010/04/07 19:31:37 cliff Exp $
include arch/evbmips/conf/std.rmixl
-#ident XLSATX-$Revision: 1.1.2.6 $
+#ident XLSATX-$Revision: 1.1.2.7 $
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@@ -75,6 +75,7 @@
#file-system PORTAL # portal filesystem (still experimental)
#file-system PROCFS # /proc
#file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system TMPFS # Efficient memory file system
#file-system UNION # union file system
#file-system MSDOSFS # MS-DOS FAT filesystem(s).
#file-system CODA # Coda File System; also needs vcoda (below)
@@ -142,6 +143,8 @@
obio0 at cpunode?
com0 at obio0 addr 0x14000 mult 4 intr 9
options COM_REGMAP
+rmixl_pcix0 at obio0
+pci* at rmixl_pcix0
rmixl_pcie0 at obio0
pci0 at rmixl_pcie0
ppb* at pci?
Index: src/sys/arch/mips/conf/files.rmixl
diff -u src/sys/arch/mips/conf/files.rmixl:1.1.2.10 src/sys/arch/mips/conf/files.rmixl:1.1.2.11
--- src/sys/arch/mips/conf/files.rmixl:1.1.2.10 Sun Mar 21 21:21:41 2010
+++ src/sys/arch/mips/conf/files.rmixl Wed Apr 7 19:31:37 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.rmixl,v 1.1.2.10 2010/03/21 21:21:41 cliff Exp $
+# $NetBSD: files.rmixl,v 1.1.2.11 2010/04/07 19:31:37 cliff Exp $
#
# Configuration info for RMI XLP, XLR, XLS
#
@@ -31,21 +31,26 @@
file arch/mips/rmi/rmixl_obio.c obio_rmixl
filearch/mips/rmi/rmixl_obio_eb_space.c obio_rmixl
filearch/mips/rmi/rmixl_obio_el_space.c obio_rmixl
-filearch/mips/rmi/rmixl_pcie_cfg_space.c pci
-filearch/mips/rmi/rmixl_pcie_ecfg_space.c pci
-filearch/mips/rmi/rmixl_pcie_io_space.c pci
-filearch/mips/rmi/rmixl_pcie_mem_space.c pci
+filearch/mips/rmi/rmixl_pcie_cfg_space.c rmixl_pcix | rmixl_pcie
+filearch/mips/rmi/rmixl_pcie_ecfg_space.c rmixl_pcie
+filearch/mips/rmi/rmixl_pcie_io_space.c rmixl_pcix | rmixl_pcie
+filearch/mips/rmi/rmixl_pcie_mem_space.c rmixl_pcix | rmixl_pcie
# NS16550 compatible serial ports
attach com at obio with com_rmixl
file arch/mips/rmi/rmixl_com.c com_rmixl
defparam opt_com.hCONSADDR CONSFREQ CONSPEED CONMODE
-# PCI
+# PCIe
device rmixl_pcie: pcibus
attach rmixl_pcie at obio
filearch/mips/rmi/rmixl_pcie.c rmixl_pcie
+# PCI-X
+device rmixl_pcix: pcibus
+attach rmixl_pcix at obio
+filearch/mips/rmi/rmixl_pcix.c rmixl_pcix
+
# On-chip USB interface
define rmixl_usbi { [addr=-1], [size=-1], [intr=-1] }
device rmixl_usbi: rmixl_usbi
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src
Committed By: yhardy
Date: Wed Apr 7 19:56:01 UTC 2010
Modified Files:
src/external/mit/xorg/lib/dri/i915: Makefile
src/external/mit/xorg/lib/dri/i965: Makefile
Log Message:
Don't link libOSMesa, this functionality is provided by mesa_dri.so.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/dri/i915/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/dri/i965/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/dri/i915/Makefile
diff -u src/external/mit/xorg/lib/dri/i915/Makefile:1.6 src/external/mit/xorg/lib/dri/i915/Makefile:1.7
--- src/external/mit/xorg/lib/dri/i915/Makefile:1.6 Tue Jan 12 03:56:17 2010
+++ src/external/mit/xorg/lib/dri/i915/Makefile Wed Apr 7 19:56:01 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/01/12 03:56:17 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2010/04/07 19:56:01 yhardy Exp $
MODULE= i915
@@ -59,6 +59,5 @@
CPPFLAGS+= -DI915 -DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP
LIBDPLIBS+= drm_intel ${.CURDIR}/../../libdrm_intel
-LIBDPLIBS+= OSMesa ${.CURDIR}/../../libOSMesa
.include ${.CURDIR}/../dri.mk
Index: src/external/mit/xorg/lib/dri/i965/Makefile
diff -u src/external/mit/xorg/lib/dri/i965/Makefile:1.8 src/external/mit/xorg/lib/dri/i965/Makefile:1.9
--- src/external/mit/xorg/lib/dri/i965/Makefile:1.8 Tue Jan 12 03:56:17 2010
+++ src/external/mit/xorg/lib/dri/i965/Makefile Wed Apr 7 19:56:01 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/01/12 03:56:17 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2010/04/07 19:56:01 yhardy Exp $
MODULE= i965
@@ -90,6 +90,5 @@
COPTS.brw_draw_upload.c= -Wno-error
LIBDPLIBS+= drm_intel ${.CURDIR}/../../libdrm_intel
-LIBDPLIBS+= OSMesa ${.CURDIR}/../../libOSMesa
.include ${.CURDIR}/../dri.mk
CVS commit: src/external/mit/xorg/lib/dri/libmesa
Module Name:src
Committed By: yhardy
Date: Wed Apr 7 20:04:16 UTC 2010
Modified Files:
src/external/mit/xorg/lib/dri/libmesa: Makefile
Log Message:
i915 and i965 dri modules need glapi.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/dri/libmesa/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/dri/libmesa/Makefile
diff -u src/external/mit/xorg/lib/dri/libmesa/Makefile:1.4 src/external/mit/xorg/lib/dri/libmesa/Makefile:1.5
--- src/external/mit/xorg/lib/dri/libmesa/Makefile:1.4 Thu Oct 8 19:06:50 2009
+++ src/external/mit/xorg/lib/dri/libmesa/Makefile Wed Apr 7 20:04:16 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/10/08 19:06:50 snj Exp $
+# $NetBSD: Makefile,v 1.5 2010/04/07 20:04:16 yhardy Exp $
.include bsd.own.mk
@@ -7,7 +7,7 @@
SHLIB_MAJOR= 0
-MESA_SRC_MODULES= main math vbo tnl shader swrast slang ss
+MESA_SRC_MODULES= glapi main math vbo tnl shader swrast slang ss
CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mesa/main \
-I${X11SRCDIR.MesaLib}/src/mesa/glapi \
CVS commit: src/sys/netinet6
Module Name:src
Committed By: oki
Date: Wed Apr 7 22:59:15 UTC 2010
Modified Files:
src/sys/netinet6: in6.c
Log Message:
ip6_sprintf: compress the zeros of representation of the IPv6 address.
see RFC4291 section 2.2 item 2.
To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 src/sys/netinet6/in6.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/netinet6/in6.c
diff -u src/sys/netinet6/in6.c:1.154 src/sys/netinet6/in6.c:1.155
--- src/sys/netinet6/in6.c:1.154 Sat Sep 19 13:11:02 2009
+++ src/sys/netinet6/in6.c Wed Apr 7 22:59:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: in6.c,v 1.154 2009/09/19 13:11:02 christos Exp $ */
+/* $NetBSD: in6.c,v 1.155 2010/04/07 22:59:15 oki Exp $ */
/* $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: in6.c,v 1.154 2009/09/19 13:11:02 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: in6.c,v 1.155 2010/04/07 22:59:15 oki Exp $);
#include opt_inet.h
#include opt_pfil_hooks.h
@@ -1873,6 +1873,7 @@
{
static char ip6buf[8][48];
int i;
+ char *bp;
char *cp;
const u_int16_t *a = (const u_int16_t *)addr;
const u_int8_t *d;
@@ -1905,9 +1906,16 @@
continue;
}
d = (const u_char *)a;
- *cp++ = hexdigits[*d 4];
- *cp++ = hexdigits[*d++ 0xf];
- *cp++ = hexdigits[*d 4];
+ bp = cp;
+ *cp = hexdigits[*d 4];
+ if (*cp != '0')
+ cp++;
+ *cp = hexdigits[*d++ 0xf];
+ if (cp != bp || *cp != '0')
+ cp++;
+ *cp = hexdigits[*d 4];
+ if (cp != bp || *cp != '0')
+ cp++;
*cp++ = hexdigits[*d 0xf];
*cp++ = ':';
a++;
CVS commit: src/sys/external/intel-public/acpica/dist
Module Name:src Committed By: jruoho Date: Thu Apr 8 04:28:57 UTC 2010 Update of /cvsroot/src/sys/external/intel-public/acpica/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21948 Log Message: Import ACPICA 20100121. Selected changes between 20090730 and 20100121: * A post-order callback was added to AcpiWalkNamespace(). * The ACPI_INTEGER type was removed and replaced with UINT64. Support for this type remains (for the time being) for compatibility reasons. * AcpiGetDevices() was optimized to not run extra _STA methods. * Fixed possible mutex acquisition errors when running _REG methods. * iASL was fixed not to fault when the maximum number of errors is reached. * Various miscellaneous fixes and improvements, including, for example, improved object repair capabilities, memory leak fixes, better type conversions, module-level code execution, etc. Status: Vendor Tag: intel Release Tags: acpica-20100121 U src/sys/external/intel-public/acpica/dist/changes.txt U src/sys/external/intel-public/acpica/dist/osunixxf.c U src/sys/external/intel-public/acpica/dist/README U src/sys/external/intel-public/acpica/dist/common/adisasm.c U src/sys/external/intel-public/acpica/dist/common/adfile.c N src/sys/external/intel-public/acpica/dist/common/dmextern.c U src/sys/external/intel-public/acpica/dist/common/adwalk.c U src/sys/external/intel-public/acpica/dist/common/dmrestag.c U src/sys/external/intel-public/acpica/dist/common/dmtable.c U src/sys/external/intel-public/acpica/dist/common/dmtbdump.c C src/sys/external/intel-public/acpica/dist/common/dmtbinfo.c U src/sys/external/intel-public/acpica/dist/common/getopt.c U src/sys/external/intel-public/acpica/dist/compiler/aslcompiler.h U src/sys/external/intel-public/acpica/dist/compiler/aslanalyze.c U src/sys/external/intel-public/acpica/dist/compiler/aslcodegen.c U src/sys/external/intel-public/acpica/dist/compiler/aslcompile.c U src/sys/external/intel-public/acpica/dist/compiler/aslcompiler.l U src/sys/external/intel-public/acpica/dist/compiler/aslcompiler.y U src/sys/external/intel-public/acpica/dist/compiler/asldefine.h U src/sys/external/intel-public/acpica/dist/compiler/aslerror.c U src/sys/external/intel-public/acpica/dist/compiler/aslfiles.c U src/sys/external/intel-public/acpica/dist/compiler/aslfold.c U src/sys/external/intel-public/acpica/dist/compiler/aslglobal.h U src/sys/external/intel-public/acpica/dist/compiler/asllength.c U src/sys/external/intel-public/acpica/dist/compiler/asllisting.c U src/sys/external/intel-public/acpica/dist/compiler/aslload.c U src/sys/external/intel-public/acpica/dist/compiler/asllookup.c U src/sys/external/intel-public/acpica/dist/compiler/aslmain.c U src/sys/external/intel-public/acpica/dist/compiler/aslmap.c U src/sys/external/intel-public/acpica/dist/compiler/aslopcodes.c U src/sys/external/intel-public/acpica/dist/compiler/asloperands.c U src/sys/external/intel-public/acpica/dist/compiler/aslopt.c U src/sys/external/intel-public/acpica/dist/compiler/aslresource.c U src/sys/external/intel-public/acpica/dist/compiler/aslrestype1.c U src/sys/external/intel-public/acpica/dist/compiler/aslrestype2.c U src/sys/external/intel-public/acpica/dist/compiler/aslstartup.c U src/sys/external/intel-public/acpica/dist/compiler/aslstubs.c U src/sys/external/intel-public/acpica/dist/compiler/asltransform.c U src/sys/external/intel-public/acpica/dist/compiler/asltree.c U src/sys/external/intel-public/acpica/dist/compiler/asltypes.h U src/sys/external/intel-public/acpica/dist/compiler/aslutils.c U src/sys/external/intel-public/acpica/dist/compiler/Makefile U src/sys/external/intel-public/acpica/dist/compiler/readme.txt U src/sys/external/intel-public/acpica/dist/debugger/dbdisply.c C src/sys/external/intel-public/acpica/dist/debugger/dbcmds.c U src/sys/external/intel-public/acpica/dist/debugger/dbfileio.c C src/sys/external/intel-public/acpica/dist/debugger/dbexec.c U src/sys/external/intel-public/acpica/dist/debugger/dbhistry.c C src/sys/external/intel-public/acpica/dist/debugger/dbinput.c U src/sys/external/intel-public/acpica/dist/debugger/dbstats.c C src/sys/external/intel-public/acpica/dist/debugger/dbutils.c U src/sys/external/intel-public/acpica/dist/debugger/dbxface.c U src/sys/external/intel-public/acpica/dist/disassembler/dmbuffer.c U src/sys/external/intel-public/acpica/dist/disassembler/dmnames.c U src/sys/external/intel-public/acpica/dist/disassembler/dmobject.c U src/sys/external/intel-public/acpica/dist/disassembler/dmopcode.c C src/sys/external/intel-public/acpica/dist/disassembler/dmresrc.c C src/sys/external/intel-public/acpica/dist/disassembler/dmresrcl.c U src/sys/external/intel-public/acpica/dist/disassembler/dmresrcs.c U src/sys/external/intel-public/acpica/dist/disassembler/dmutils.c U src/sys/external/intel-public/acpica/dist/disassembler/dmwalk.c U src/sys/external/intel-public/acpica/dist/dispatcher/dsfield.c U
CVS commit: src/sys/external/intel-public/acpica/dist/namespace
Module Name:src
Committed By: jruoho
Date: Thu Apr 8 04:34:22 UTC 2010
Modified Files:
src/sys/external/intel-public/acpica/dist/namespace: nsinit.c
nsrepair2.c
Log Message:
__UNCONST(3).
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/intel-public/acpica/dist/namespace/nsinit.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/intel-public/acpica/dist/namespace/nsrepair2.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/external/intel-public/acpica/dist/namespace/nsinit.c
diff -u src/sys/external/intel-public/acpica/dist/namespace/nsinit.c:1.3 src/sys/external/intel-public/acpica/dist/namespace/nsinit.c:1.4
--- src/sys/external/intel-public/acpica/dist/namespace/nsinit.c:1.3 Thu Apr 8 04:31:49 2010
+++ src/sys/external/intel-public/acpica/dist/namespace/nsinit.c Thu Apr 8 04:34:22 2010
@@ -270,7 +270,7 @@
* part of the ACPI specification.
*/
Info.EvaluateInfo-PrefixNode = AcpiGbl_RootNode;
-Info.EvaluateInfo-Pathname = METHOD_NAME__INI;
+Info.EvaluateInfo-Pathname = __UNCONST(METHOD_NAME__INI);
Info.EvaluateInfo-Parameters = NULL;
Info.EvaluateInfo-Flags = ACPI_IGNORE_RETURN_VALUE;
Index: src/sys/external/intel-public/acpica/dist/namespace/nsrepair2.c
diff -u src/sys/external/intel-public/acpica/dist/namespace/nsrepair2.c:1.1.1.1 src/sys/external/intel-public/acpica/dist/namespace/nsrepair2.c:1.2
--- src/sys/external/intel-public/acpica/dist/namespace/nsrepair2.c:1.1.1.1 Thu Apr 8 04:28:31 2010
+++ src/sys/external/intel-public/acpica/dist/namespace/nsrepair2.c Thu Apr 8 04:34:22 2010
@@ -319,7 +319,7 @@
Status = AcpiNsCheckSortedList (Data, ReturnObject, 2, 1,
-ACPI_SORT_ASCENDING, AmbientIlluminance);
+ ACPI_SORT_ASCENDING, __UNCONST(AmbientIlluminance));
return (Status);
}
@@ -443,7 +443,7 @@
Status = AcpiNsCheckSortedList (Data, ReturnObject, 5, 1,
-ACPI_SORT_DESCENDING, PowerDissipation);
+ ACPI_SORT_DESCENDING, __UNCONST(PowerDissipation));
return (Status);
}
@@ -488,7 +488,7 @@
* should be proportional to the power.
*/
Status =AcpiNsCheckSortedList (Data, ReturnObject, 6, 0,
-ACPI_SORT_DESCENDING, CpuFrequency);
+ ACPI_SORT_DESCENDING, __UNCONST(CpuFrequency));
if (ACPI_FAILURE (Status))
{
return (Status);
CVS commit: src
Module Name:src
Committed By: jruoho
Date: Thu Apr 8 04:37:14 UTC 2010
Modified Files:
src/external/intel-public/acpica/bin/iasl: Makefile
src/sys/external/intel-public/acpica/conf: files.acpica
Log Message:
Add new files from ACPICA 20100121.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/intel-public/acpica/bin/iasl/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/intel-public/acpica/conf/files.acpica
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/intel-public/acpica/bin/iasl/Makefile
diff -u src/external/intel-public/acpica/bin/iasl/Makefile:1.1 src/external/intel-public/acpica/bin/iasl/Makefile:1.2
--- src/external/intel-public/acpica/bin/iasl/Makefile:1.1 Tue Aug 18 23:42:40 2009
+++ src/external/intel-public/acpica/bin/iasl/Makefile Thu Apr 8 04:37:14 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/08/18 23:42:40 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2010/04/08 04:37:14 jruoho Exp $
PROG= iasl
BINDIR= /usr/bin
@@ -82,6 +82,7 @@
SRCS+= psutils.c
SRCS+= pswalk.c
.PATH: ${TOPDIR}/../dispatcher
+SRCS+= dmextern.c
SRCS+= dswscope.c
SRCS+= dswstate.c
SRCS+= dsfield.c
Index: src/sys/external/intel-public/acpica/conf/files.acpica
diff -u src/sys/external/intel-public/acpica/conf/files.acpica:1.1 src/sys/external/intel-public/acpica/conf/files.acpica:1.2
--- src/sys/external/intel-public/acpica/conf/files.acpica:1.1 Tue Aug 18 16:38:51 2009
+++ src/sys/external/intel-public/acpica/conf/files.acpica Thu Apr 8 04:37:14 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.acpica,v 1.1 2009/08/18 16:38:51 jmcneill Exp $
+# $NetBSD: files.acpica,v 1.2 2010/04/08 04:37:14 jruoho Exp $
define acpica
makeoptions acpi CPPFLAGS+=-I$S/external/intel-public/acpica/dist/include
@@ -97,6 +97,7 @@
file external/intel-public/acpica/dist/namespace/nsparse.c acpica
file external/intel-public/acpica/dist/namespace/nspredef.c acpica
file external/intel-public/acpica/dist/namespace/nsrepair.c acpica
+file external/intel-public/acpica/dist/namespace/nsrepair2.c acpica
file external/intel-public/acpica/dist/namespace/nssearch.c acpica
file external/intel-public/acpica/dist/namespace/nsutils.c acpica
file external/intel-public/acpica/dist/namespace/nswalk.c acpica
