CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: skrll Date: Tue Apr 6 07:44:09 UTC 2010 Modified Files: src/sys/arch/hppa/hppa: trap.c Log Message: Include SSBREAKPOINT in the PTRACE #ifdef/#endif. To generate a diff of this commit: cvs rdiff -u -r1.86 -r1.87 src/sys/arch/hppa/hppa/trap.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/hppa/hppa/trap.c diff -u src/sys/arch/hppa/hppa/trap.c:1.86 src/sys/arch/hppa/hppa/trap.c:1.87 --- src/sys/arch/hppa/hppa/trap.c:1.86 Sat Apr 3 07:46:02 2010 +++ src/sys/arch/hppa/hppa/trap.c Tue Apr 6 07:44:09 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.c,v 1.86 2010/04/03 07:46:02 skrll Exp $ */ +/* $NetBSD: trap.c,v 1.87 2010/04/06 07:44:09 skrll Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -58,7 +58,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.86 2010/04/03 07:46:02 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.87 2010/04/06 07:44:09 skrll Exp $); /* #define INTRDEBUG */ /* #define TRAPDEBUG */ @@ -109,11 +109,12 @@ void ss_clear_breakpoints(struct lwp *l); int ss_put_value(struct lwp *, vaddr_t, u_int); int ss_get_value(struct lwp *, vaddr_t, u_int *); -#endif /* single-step breakpoint */ #define SSBREAKPOINT (HPPA_BREAK_KERNEL | (HPPA_BREAK_SS 13)) +#endif + #if defined(DEBUG) || defined(DIAGNOSTIC) /* * 0x6fc1000 is a stwm r1, d(sr0, sp), which is the last
CVS commit: src/sys/arch/hp700/include
Module Name:src Committed By: skrll Date: Tue Apr 6 07:47:48 UTC 2010 Modified Files: src/sys/arch/hp700/include: intr.h Log Message: G/C setsoftnet and hp700_intr_schedule prototype. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hp700/include/intr.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/hp700/include/intr.h diff -u src/sys/arch/hp700/include/intr.h:1.17 src/sys/arch/hp700/include/intr.h:1.18 --- src/sys/arch/hp700/include/intr.h:1.17 Sat Apr 3 07:46:01 2010 +++ src/sys/arch/hp700/include/intr.h Tue Apr 6 07:47:48 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.17 2010/04/03 07:46:01 skrll Exp $ */ +/* $NetBSD: intr.h,v 1.18 2010/04/06 07:47:48 skrll Exp $ */ /* $OpenBSD: intr.h,v 1.26 2009/12/29 13:11:40 jsing Exp $ */ /*- @@ -89,9 +89,6 @@ #include sys/spl.h #define setsoftast(l) ((l)-l_md.md_astpending = 1) -#define setsoftnet() hp700_intr_schedule(softnetmask) - -void hp700_intr_schedule(int); #endif /* !_LOCORE */
CVS commit: src/sys/arch/hp700/include
Module Name:src
Committed By: skrll
Date: Tue Apr 6 07:58:31 UTC 2010
Modified Files:
src/sys/arch/hp700/include: cpu.h
Log Message:
Add hppa_cpu_ispa20_p
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/hp700/include/cpu.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/hp700/include/cpu.h
diff -u src/sys/arch/hp700/include/cpu.h:1.44 src/sys/arch/hp700/include/cpu.h:1.45
--- src/sys/arch/hp700/include/cpu.h:1.44 Sat Apr 3 07:46:01 2010
+++ src/sys/arch/hp700/include/cpu.h Tue Apr 6 07:58:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.44 2010/04/03 07:46:01 skrll Exp $ */
+/* $NetBSD: cpu.h,v 1.45 2010/04/06 07:58:31 skrll Exp $ */
/* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */
@@ -282,6 +282,13 @@
extern int (*cpu_desidhash)(void);
+static __inline bool
+hppa_cpu_ispa20_p(void)
+{
+
+ return (hppa_cpu_info-hci_features HPPA_FTRS_W32B) != 0;
+}
+
void delay(u_int);
void hppa_init(paddr_t, void *);
void trap(int, struct trapframe *);
CVS commit: src/sys/arch
Module Name:src
Committed By: skrll
Date: Tue Apr 6 08:09:47 UTC 2010
Modified Files:
src/sys/arch/hp700/hp700: machdep.c
src/sys/arch/hppa/hppa: hppa_machdep.c
Log Message:
Use hppa_cpu_ispa20_p
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/hp700/hp700/machdep.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/hppa/hppa/hppa_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/hp700/machdep.c
diff -u src/sys/arch/hp700/hp700/machdep.c:1.81 src/sys/arch/hp700/hp700/machdep.c:1.82
--- src/sys/arch/hp700/hp700/machdep.c:1.81 Sat Mar 20 23:31:27 2010
+++ src/sys/arch/hp700/hp700/machdep.c Tue Apr 6 08:09:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.81 2010/03/20 23:31:27 chs Exp $ */
+/* $NetBSD: machdep.c,v 1.82 2010/04/06 08:09:46 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.81 2010/03/20 23:31:27 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.82 2010/04/06 08:09:46 skrll Exp $);
#include opt_cputype.h
#include opt_ddb.h
@@ -787,7 +787,7 @@
cpu_revision = (*cpu_desidhash)();
/* force strong ordering for now */
- if (hppa_cpu_info-hci_features HPPA_FTRS_W32B)
+ if (hppa_cpu_ispa20_p())
kpsw |= PSW_O;
snprintf(cpu_model, sizeof(cpu_model), HP9000/%s, model);
@@ -1694,7 +1694,7 @@
if (pimerror 0) {
printf( - WARNING: could not transfer PIM info (%d), pimerror);
} else {
- if (hppa_cpu_info-hci_features HPPA_FTRS_W32B)
+ if (hppa_cpu_ispa20_p())
hppa_pim64_dump(check_type);
else
hppa_pim_dump(check_type);
@@ -1969,4 +1969,3 @@
{
}
#endif /* MODULAR */
-
Index: src/sys/arch/hppa/hppa/hppa_machdep.c
diff -u src/sys/arch/hppa/hppa/hppa_machdep.c:1.21 src/sys/arch/hppa/hppa/hppa_machdep.c:1.22
--- src/sys/arch/hppa/hppa/hppa_machdep.c:1.21 Sat Apr 3 07:46:02 2010
+++ src/sys/arch/hppa/hppa/hppa_machdep.c Tue Apr 6 08:09:47 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hppa_machdep.c,v 1.21 2010/04/03 07:46:02 skrll Exp $ */
+/* $NetBSD: hppa_machdep.c,v 1.22 2010/04/06 08:09:47 skrll Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hppa_machdep.c,v 1.21 2010/04/03 07:46:02 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: hppa_machdep.c,v 1.22 2010/04/06 08:09:47 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -252,7 +252,7 @@
#endif
tf-tf_ipsw = gr[0] |
- (hppa_cpu_info-hci_features HPPA_FTRS_W32B ? PSW_O : 0);
+ (hppa_cpu_ispa20_p() ? PSW_O : 0);
tf-tf_r1 = gr[1];
tf-tf_rp = gr[2];
tf-tf_r3 = gr[3];
CVS commit: src/sys/dev/ieee1394
Module Name:src Committed By: reinoud Date: Tue Apr 6 10:45:15 UTC 2010 Modified Files: src/sys/dev/ieee1394: firewire.c Log Message: KASSERT(FALSE) to enter the debugger on this check. When DDB is not defined but KGDB is, this would result in cpu_Debugger() dont being defined! Please be kind to developers that use KGDB instead of DDB! :) To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/dev/ieee1394/firewire.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/dev/ieee1394/firewire.c diff -u src/sys/dev/ieee1394/firewire.c:1.29 src/sys/dev/ieee1394/firewire.c:1.30 --- src/sys/dev/ieee1394/firewire.c:1.29 Mon Mar 29 07:34:02 2010 +++ src/sys/dev/ieee1394/firewire.c Tue Apr 6 10:45:15 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: firewire.c,v 1.29 2010/03/29 07:34:02 kiyohara Exp $ */ +/* $NetBSD: firewire.c,v 1.30 2010/04/06 10:45:15 reinoud Exp $ */ /*- * Copyright (c) 2003 Hidetoshi Shimokawa * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa @@ -37,7 +37,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: firewire.c,v 1.29 2010/03/29 07:34:02 kiyohara Exp $); +__KERNEL_RCSID(0, $NetBSD: firewire.c,v 1.30 2010/04/06 10:45:15 reinoud Exp $); #include sys/param.h #include sys/bus.h @@ -1489,7 +1489,7 @@ xfer-tl, xfer-flag); fw_dump_hdr(xfer-send.hdr, send); fw_dump_hdr(xfer-recv.hdr, recv); - cpu_Debugger(); + KASSERT(FALSE); return; } #endif
CVS commit: src
Module Name:src Committed By: christos Date: Tue Apr 6 13:50:22 UTC 2010 Modified Files: src/lib/libc/sys: ptrace.2 src/sys/kern: kern_lwp.c kern_sig.c sys_process.c src/sys/sys: lwp.h Log Message: PR/43128: Paul Koning: Threads support in ptrace() is insufficient for gdb to debug threaded live apps: Add an optional lwpid in PT_STEP and PT_CONTINUE to indicate which lwp to operate on, and implement the glue required to make it work. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/lib/libc/sys/ptrace.2 cvs rdiff -u -r1.141 -r1.142 src/sys/kern/kern_lwp.c cvs rdiff -u -r1.304 -r1.305 src/sys/kern/kern_sig.c cvs rdiff -u -r1.153 -r1.154 src/sys/kern/sys_process.c cvs rdiff -u -r1.128 -r1.129 src/sys/sys/lwp.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/ptrace.2 diff -u src/lib/libc/sys/ptrace.2:1.31 src/lib/libc/sys/ptrace.2:1.32 --- src/lib/libc/sys/ptrace.2:1.31 Mon Mar 22 15:30:55 2010 +++ src/lib/libc/sys/ptrace.2 Tue Apr 6 09:50:22 2010 @@ -1,7 +1,7 @@ -.\ $NetBSD: ptrace.2,v 1.31 2010/03/22 19:30:55 joerg Exp $ +.\ $NetBSD: ptrace.2,v 1.32 2010/04/06 13:50:22 christos Exp $ .\ .\ This file is in the public domain. -.Dd March 12, 2007 +.Dd April 6, 2010 .Dt PTRACE 2 .Os .Sh NAME @@ -149,7 +149,9 @@ to indicate that execution is to pick up where it left off. .Fa data provides a signal number to be delivered to the traced process as it -resumes execution, or 0 if no signal is to be sent. +resumes execution, or 0 if no signal is to be sent. If a negative +value is supplied, that is the negative of the LWP ID of the thread to +be resumed, and only that thread executes. .It Dv PT_KILL The traced process terminates, as if .Dv PT_CONTINUE @@ -256,8 +258,8 @@ call currently does not stop the child process so it can generate inconsistent data. .It Dv PT_LWPINFO -Returns information about the specific thread from the process specified -in the +Returns information about a thread from the list of threads for the +process specified in the .Fa pid argument. The @@ -274,8 +276,15 @@ .Pp where .Fa pl_lwpid -contains the thread for which to get info. +contains a thread LWP ID. Information is returned for the thread +following the one with the specified ID in the process thread list, +or for the first thread if +.Fa pl_lwpid +is 0. Upon return +.Fa pl_lwpid +contains the LWP ID of the thread that was found, or 0 if there is +no thread after the one whose LWP ID was supplied in the call. .Fa pl_event contains the event that stopped the thread. Possible @@ -303,6 +312,14 @@ Execution continues as in request PT_CONTINUE; however as soon as possible after execution of at least one instruction, execution stops again. +If the +.Fa data +argument is greater than 0, it contains the LWP ID of the thread to be +stepped, and any other threads are continued. If the +.Fa data +argument is less than zero, it contains the negative of the LWP ID of +the +thread to be stepped, and only that thread executes. .It Dv PT_GETREGS This request reads the traced process' machine registers into the .Dq Li struct reg @@ -310,6 +327,10 @@ .In machine/reg.h ) pointed to by .Fa addr . +The +.Fa data +argument contains the LWP ID of the thread whose registers are to +be read. If zero is supplied, the first thread of the process is read. .It Dv PT_SETREGS This request is the converse of .Dv PT_GETREGS ; @@ -319,6 +340,10 @@ .In machine/reg.h ) pointed to by .Fa addr . +The +.Fa data +argument contains the LWP ID of the thread whose registers are to +be written. If zero is supplied, the first thread of the process is written. .It Dv PT_GETFPREGS This request reads the traced process' floating-point registers into the @@ -327,6 +352,11 @@ .In machine/reg.h ) pointed to by .Fa addr . +The +.Fa data +argument contains the LWP ID of the thread whose registers are to +be read. If zero is supplied, the first thread of the process is +read. .It Dv PT_SETFPREGS This request is the converse of .Dv PT_GETFPREGS ; @@ -336,6 +366,11 @@ .In machine/reg.h ) pointed to by .Fa addr . +The +.Fa data +argument contains the LWP ID of the thread whose registers are to +be written. If zero is supplied, the first thread of the process is +written. .\ .It Dv PT_SYSCALL .\ This request is like .\ .Dv PT_CONTINUE Index: src/sys/kern/kern_lwp.c diff -u src/sys/kern/kern_lwp.c:1.141 src/sys/kern/kern_lwp.c:1.142 --- src/sys/kern/kern_lwp.c:1.141 Mon Mar 1 16:10:17 2010 +++ src/sys/kern/kern_lwp.c Tue Apr 6 09:50:22 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_lwp.c,v 1.141 2010/03/01 21:10:17 darran Exp $ */ +/* $NetBSD: kern_lwp.c,v 1.142 2010/04/06 13:50:22 christos Exp $ */ /*- * Copyright (c) 2001, 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -209,7 +209,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: kern_lwp.c,v
CVS commit: src/sys/arch/hpc/include
Module Name:src Committed By: nonaka Date: Tue Apr 6 16:23:17 UTC 2010 Modified Files: src/sys/arch/hpc/include: platid_generated.h platid_mask.h Log Message: regen. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/hpc/include/platid_generated.h \ src/sys/arch/hpc/include/platid_mask.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/hpc/include/platid_generated.h diff -u src/sys/arch/hpc/include/platid_generated.h:1.23 src/sys/arch/hpc/include/platid_generated.h:1.24 --- src/sys/arch/hpc/include/platid_generated.h:1.23 Thu Jan 29 21:20:42 2009 +++ src/sys/arch/hpc/include/platid_generated.h Tue Apr 6 16:23:17 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: platid_generated.h,v 1.23 2009/01/29 21:20:42 nonaka Exp $ */ +/* $NetBSD: platid_generated.h,v 1.24 2010/04/06 16:23:17 nonaka Exp $ */ /*- * Copyright (c) 1999-2001 @@ -560,13 +560,14 @@ ((PLATID_MACH_CASIO_CASSIOPEIAA_A55V_NUM PLATID_SUBMODEL_SHIFT)| \ PLATID_MACH_CASIO_CASSIOPEIAA_AXX) #endif /* hpcsh */ -#ifdef hpcmips +#if defined(hpcmips) || defined(hpcarm) #ifndef SPEC_PLATFORM #define SPEC_MACH_SHARP #endif /* !SPEC_PLATFORM */ #define PLATID_MACH_SHARP_NUM 4 #define PLATID_MACH_SHARP \ ((PLATID_MACH_SHARP_NUM PLATID_VENDOR_SHIFT)) +#if defined(hpcmips) #ifndef SPEC_PLATFORM #define SPEC_MACH_SHARP_TRIPAD #endif /* !SPEC_PLATFORM */ @@ -673,6 +674,51 @@ ((PLATID_MACH_SHARP_MOBILON_HC1200_NUM PLATID_SUBMODEL_SHIFT)| \ PLATID_MACH_SHARP_MOBILON_HC) #endif /* hpcmips */ +#if defined(hpcarm) +#ifndef SPEC_PLATFORM +#define SPEC_MACH_SHARP_WZERO3 +#endif /* !SPEC_PLATFORM */ +#define PLATID_MACH_SHARP_WZERO3_NUM 4 +#define PLATID_MACH_SHARP_WZERO3 \ + ((PLATID_MACH_SHARP_WZERO3_NUM PLATID_SERIES_SHIFT)| \ +PLATID_MACH_SHARP) +#ifndef SPEC_PLATFORM +#define SPEC_MACH_SHARP_WZERO3_WS003SH +#endif /* !SPEC_PLATFORM */ +#define PLATID_MACH_SHARP_WZERO3_WS003SH_NUM 1 +#define PLATID_MACH_SHARP_WZERO3_WS003SH \ + ((PLATID_MACH_SHARP_WZERO3_WS003SH_NUM PLATID_MODEL_SHIFT)| \ +PLATID_MACH_SHARP_WZERO3) +#ifndef SPEC_PLATFORM +#define SPEC_MACH_SHARP_WZERO3_WS004SH +#endif /* !SPEC_PLATFORM */ +#define PLATID_MACH_SHARP_WZERO3_WS004SH_NUM 2 +#define PLATID_MACH_SHARP_WZERO3_WS004SH \ + ((PLATID_MACH_SHARP_WZERO3_WS004SH_NUM PLATID_MODEL_SHIFT)| \ +PLATID_MACH_SHARP_WZERO3) +#ifndef SPEC_PLATFORM +#define SPEC_MACH_SHARP_WZERO3_WS007SH +#endif /* !SPEC_PLATFORM */ +#define PLATID_MACH_SHARP_WZERO3_WS007SH_NUM 3 +#define PLATID_MACH_SHARP_WZERO3_WS007SH \ + ((PLATID_MACH_SHARP_WZERO3_WS007SH_NUM PLATID_MODEL_SHIFT)| \ +PLATID_MACH_SHARP_WZERO3) +#ifndef SPEC_PLATFORM +#define SPEC_MACH_SHARP_WZERO3_WS011SH +#endif /* !SPEC_PLATFORM */ +#define PLATID_MACH_SHARP_WZERO3_WS011SH_NUM 4 +#define PLATID_MACH_SHARP_WZERO3_WS011SH \ + ((PLATID_MACH_SHARP_WZERO3_WS011SH_NUM PLATID_MODEL_SHIFT)| \ +PLATID_MACH_SHARP_WZERO3) +#ifndef SPEC_PLATFORM +#define SPEC_MACH_SHARP_WZERO3_WS020SH +#endif /* !SPEC_PLATFORM */ +#define PLATID_MACH_SHARP_WZERO3_WS020SH_NUM 5 +#define PLATID_MACH_SHARP_WZERO3_WS020SH \ + ((PLATID_MACH_SHARP_WZERO3_WS020SH_NUM PLATID_MODEL_SHIFT)| \ +PLATID_MACH_SHARP_WZERO3) +#endif /* hpcarm */ +#endif /* hpcmips || hpcarm */ #ifdef hpcmips #ifndef SPEC_PLATFORM #define SPEC_MACH_FUJITSU Index: src/sys/arch/hpc/include/platid_mask.h diff -u src/sys/arch/hpc/include/platid_mask.h:1.23 src/sys/arch/hpc/include/platid_mask.h:1.24 --- src/sys/arch/hpc/include/platid_mask.h:1.23 Thu Jan 29 21:20:42 2009 +++ src/sys/arch/hpc/include/platid_mask.h Tue Apr 6 16:23:17 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: platid_mask.h,v 1.23 2009/01/29 21:20:42 nonaka Exp $ */ +/* $NetBSD: platid_mask.h,v 1.24 2010/04/06 16:23:17 nonaka Exp $ */ /*- * Copyright (c) 1999-2001 @@ -398,11 +398,12 @@ # define CASIO_CASSIOPEIAA_A55V ((int)platid_mask_MACH_CASIO_CASSIOPEIAA_A55V) #endif #endif /* hpcsh */ -#ifdef hpcmips +#if defined(hpcmips) || defined(hpcarm) extern platid_t platid_mask_MACH_SHARP; #ifdef PLATID_DEFINE_MASK_NICKNAME # define SHARP ((int)platid_mask_MACH_SHARP) #endif +#if defined(hpcmips) extern platid_t platid_mask_MACH_SHARP_TRIPAD; #ifdef PLATID_DEFINE_MASK_NICKNAME # define SHARP_TRIPAD ((int)platid_mask_MACH_SHARP_TRIPAD) @@ -464,6 +465,33 @@ # define SHARP_MOBILON_HC1200 ((int)platid_mask_MACH_SHARP_MOBILON_HC1200) #endif #endif /* hpcmips */ +#if defined(hpcarm) +extern platid_t platid_mask_MACH_SHARP_WZERO3; +#ifdef PLATID_DEFINE_MASK_NICKNAME +# define SHARP_WZERO3 ((int)platid_mask_MACH_SHARP_WZERO3) +#endif +extern platid_t platid_mask_MACH_SHARP_WZERO3_WS003SH; +#ifdef PLATID_DEFINE_MASK_NICKNAME +# define SHARP_WZERO3_WS003SH ((int)platid_mask_MACH_SHARP_WZERO3_WS003SH) +#endif +extern platid_t platid_mask_MACH_SHARP_WZERO3_WS004SH; +#ifdef PLATID_DEFINE_MASK_NICKNAME +# define SHARP_WZERO3_WS004SH
CVS commit: src/sys
Module Name:src
Committed By: nonaka
Date: Tue Apr 6 15:29:19 UTC 2010
Modified Files:
src/sys/arch/landisk/dev: rs5c313_landisk.c
src/sys/dev/ic: rs5c313.c rs5c313reg.h rs5c313var.h
Log Message:
Added support RICOH 5C316.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/landisk/dev/rs5c313_landisk.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/ic/rs5c313.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/ic/rs5c313reg.h \
src/sys/dev/ic/rs5c313var.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/landisk/dev/rs5c313_landisk.c
diff -u src/sys/arch/landisk/dev/rs5c313_landisk.c:1.4 src/sys/arch/landisk/dev/rs5c313_landisk.c:1.5
--- src/sys/arch/landisk/dev/rs5c313_landisk.c:1.4 Sun May 4 19:43:05 2008
+++ src/sys/arch/landisk/dev/rs5c313_landisk.c Tue Apr 6 15:29:19 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rs5c313_landisk.c,v 1.4 2008/05/04 19:43:05 martin Exp $ */
+/* $NetBSD: rs5c313_landisk.c,v 1.5 2010/04/06 15:29:19 nonaka Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rs5c313_landisk.c,v 1.4 2008/05/04 19:43:05 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: rs5c313_landisk.c,v 1.5 2010/04/06 15:29:19 nonaka Exp $);
#include sys/param.h
#include sys/systm.h
@@ -91,6 +91,7 @@
struct rs5c313_softc *sc = device_private(self);
sc-sc_dev = self;
+ sc-sc_model = MODEL_5C313;
sc-sc_ops = rs5c313_landisk_ops;
rs5c313_attach(sc);
}
Index: src/sys/dev/ic/rs5c313.c
diff -u src/sys/dev/ic/rs5c313.c:1.8 src/sys/dev/ic/rs5c313.c:1.9
--- src/sys/dev/ic/rs5c313.c:1.8 Sun May 4 19:43:06 2008
+++ src/sys/dev/ic/rs5c313.c Tue Apr 6 15:29:19 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rs5c313.c,v 1.8 2008/05/04 19:43:06 martin Exp $ */
+/* $NetBSD: rs5c313.c,v 1.9 2010/04/06 15:29:19 nonaka Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rs5c313.c,v 1.8 2008/05/04 19:43:06 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: rs5c313.c,v 1.9 2010/04/06 15:29:19 nonaka Exp $);
#include sys/param.h
#include sys/systm.h
@@ -61,9 +61,28 @@
rs5c313_attach(struct rs5c313_softc *sc)
{
device_t self = sc-sc_dev;
+ const char *model;
+
+ switch (sc-sc_model) {
+ case MODEL_5C313:
+ model = 5C313;
+ sc-sc_ctrl[0] = CTRL_24H;
+ sc-sc_ctrl[1] = CTRL2_NTEST;
+ break;
+
+ case MODEL_5C316:
+ model = 5C316;
+ sc-sc_ctrl[0] = 0;
+ sc-sc_ctrl[1] = CTRL2_24H|CTRL2_NTEST;
+ break;
+
+ default:
+ aprint_error(unknown model (%d)\n, sc-sc_model);
+ return;
+ }
aprint_naive(\n);
- aprint_normal(: real time clock\n);
+ aprint_normal(: RICOH %s real time clock\n, model);
sc-sc_todr.cookie = sc;
sc-sc_todr.todr_gettime_ymdhms = rs5c313_todr_gettime_ymdhms;
@@ -99,7 +118,7 @@
aprint_error_dev(self, time not valid\n);
rs5c313_write_reg(sc, RS5C313_TINT, 0);
- rs5c313_write_reg(sc, RS5C313_CTRL, (CTRL_BASE | CTRL_ADJ));
+ rs5c313_write_reg(sc, RS5C313_CTRL, (sc-sc_ctrl[0] | CTRL_ADJ));
for (retry = 1000; retry 0; --retry) {
if (rs5c313_read_reg(sc, RS5C313_CTRL) CTRL_BSY)
@@ -107,13 +126,13 @@
else
break;
}
-
if (retry == 0) {
status = EIO;
goto done;
}
- rs5c313_write_reg(sc, RS5C313_CTRL, CTRL_BASE);
+ rs5c313_write_reg(sc, RS5C313_CTRL, sc-sc_ctrl[0]);
+ rs5c313_write_reg(sc, RS5C313_CTRL2, sc-sc_ctrl[1]);
done:
rtc_ce(sc, 0);
@@ -141,14 +160,13 @@
for (retry = 10; retry 0; --retry) {
rtc_ce(sc, 1);
- rs5c313_write_reg(sc, RS5C313_CTRL, CTRL_BASE);
+ rs5c313_write_reg(sc, RS5C313_CTRL, sc-sc_ctrl[0]);
if ((rs5c313_read_reg(sc, RS5C313_CTRL) CTRL_BSY) == 0)
break;
rtc_ce(sc, 0);
delay(1);
}
-
if (retry == 0) {
splx(s);
return EIO;
@@ -173,7 +191,6 @@
rtc_ce(sc, 0);
splx(s);
-
dt-dt_year = (dt-dt_year % 100) + 1900;
if (dt-dt_year POSIX_BASE_YEAR) {
dt-dt_year += 100;
@@ -197,7 +214,7 @@
for (retry = 10; retry 0; --retry) {
rtc_ce(sc, 1);
- rs5c313_write_reg(sc, RS5C313_CTRL, CTRL_BASE);
+ rs5c313_write_reg(sc, RS5C313_CTRL, sc-sc_ctrl[0]);
if ((rs5c313_read_reg(sc, RS5C313_CTRL) CTRL_BSY) == 0)
break;
Index: src/sys/dev/ic/rs5c313reg.h
diff -u src/sys/dev/ic/rs5c313reg.h:1.2 src/sys/dev/ic/rs5c313reg.h:1.3
--- src/sys/dev/ic/rs5c313reg.h:1.2 Sun May 4 19:43:06 2008
+++ src/sys/dev/ic/rs5c313reg.h Tue Apr 6 15:29:19 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rs5c313reg.h,v 1.2 2008/05/04 19:43:06 martin Exp $ */
+/* $NetBSD: rs5c313reg.h,v 1.3 2010/04/06 15:29:19 nonaka Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -30,24 +30,40 @@
#define _DEV_IC_RS5C313REG_H_
/*
- * RICOH RS5C313 Real Time Clock
+ * RICOH RS5C3[12]x Real Time Clock
*/
-#define RS5C313_SEC1 0
-#define RS5C313_SEC10 1
-#define RS5C313_MIN1 2
-#define RS5C313_MIN10 3
-#define RS5C313_HOUR1 4
-#define
CVS commit: src/sys/arch/zaurus/dev
Module Name:src
Committed By: nonaka
Date: Tue Apr 6 15:56:14 UTC 2010
Modified Files:
src/sys/arch/zaurus/dev: zmci.c
Log Message:
Enable SD 4bit bus width mode.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/dev/zmci.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/zaurus/dev/zmci.c
diff -u src/sys/arch/zaurus/dev/zmci.c:1.1 src/sys/arch/zaurus/dev/zmci.c:1.2
--- src/sys/arch/zaurus/dev/zmci.c:1.1 Tue Apr 21 03:00:30 2009
+++ src/sys/arch/zaurus/dev/zmci.c Tue Apr 6 15:56:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: zmci.c,v 1.1 2009/04/21 03:00:30 nonaka Exp $ */
+/* $NetBSD: zmci.c,v 1.2 2010/04/06 15:56:14 nonaka Exp $ */
/*-
* Copyright (c) 2006-2008 NONAKA Kimihiro non...@netbsd.org
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zmci.c,v 1.1 2009/04/21 03:00:30 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: zmci.c,v 1.2 2010/04/06 15:56:14 nonaka Exp $);
#include sys/param.h
#include sys/device.h
@@ -119,7 +119,7 @@
sc-sc.sc_tag.set_power = zmci_set_power;
sc-sc.sc_tag.card_detect = zmci_card_detect;
sc-sc.sc_tag.write_protect = zmci_write_protect;
- sc-sc.sc_caps = 0;
+ sc-sc.sc_caps = PMC_CAPS_4BIT;
if (pxamci_attach_sub(self, pxa)) {
aprint_error_dev(self, unable to attach MMC controller\n);
CVS commit: src/sys/arch/arm/xscale
Module Name:src
Committed By: nonaka
Date: Tue Apr 6 15:55:46 UTC 2010
Modified Files:
src/sys/arch/arm/xscale: pxa2x0_mci.c
Log Message:
Enable DMA transfer.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/xscale/pxa2x0_mci.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/arm/xscale/pxa2x0_mci.c
diff -u src/sys/arch/arm/xscale/pxa2x0_mci.c:1.4 src/sys/arch/arm/xscale/pxa2x0_mci.c:1.5
--- src/sys/arch/arm/xscale/pxa2x0_mci.c:1.4 Sat Mar 13 12:28:44 2010
+++ src/sys/arch/arm/xscale/pxa2x0_mci.c Tue Apr 6 15:55:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_mci.c,v 1.4 2010/03/13 12:28:44 nonaka Exp $ */
+/* $NetBSD: pxa2x0_mci.c,v 1.5 2010/04/06 15:55:46 nonaka Exp $ */
/* $OpenBSD: pxa2x0_mmc.c,v 1.5 2009/02/23 18:09:55 miod Exp $ */
/*
@@ -18,7 +18,7 @@
*/
/*-
- * Copyright (c) 2007-2009 NONAKA Kimihiro non...@netbsd.org
+ * Copyright (c) 2007-2010 NONAKA Kimihiro non...@netbsd.org
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -54,7 +54,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pxa2x0_mci.c,v 1.4 2010/03/13 12:28:44 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: pxa2x0_mci.c,v 1.5 2010/04/06 15:55:46 nonaka Exp $);
#include sys/param.h
#include sys/device.h
@@ -79,18 +79,18 @@
#include arm/xscale/pxa2x0_mci.h
#ifdef PXAMCI_DEBUG
-int pxamci_debug = 1;
+int pxamci_debug = 9;
#define DPRINTF(n,s) do { if ((n) = pxamci_debug) printf s; } while (0)
#else
#define DPRINTF(n,s) do {} while (0)
#endif
-#ifndef DEBUG
-#define STOPCLK_TIMO 2 /* ms */
-#define EXECCMD_TIMO 2 /* ms */
+#ifndef PXAMCI_DEBUG
+#define STOPCLK_TIMO 2 /* sec */
+#define EXECCMD_TIMO 2 /* sec */
#else
-#define STOPCLK_TIMO 2 /* ms */
-#define EXECCMD_TIMO 5 /* ms */
+#define STOPCLK_TIMO 2 /* sec */
+#define EXECCMD_TIMO 5 /* sec */
#endif
static int pxamci_host_reset(sdmmc_chipset_handle_t);
@@ -155,6 +155,14 @@
#define CSR_CLR_4(sc, reg, val) \
CSR_WRITE_4(sc, reg, CSR_READ_4(sc, reg) ~(val))
+#if 0 /* XXX */
+#define DMA_ALIGNED(addr) \
+ (((u_long)(addr) 0x7) == 0 || !CPU_IS_PXA250)
+#else
+#define DMA_ALIGNED(addr) \
+ (((u_long)(addr) 0x1f) == 0)
+#endif
+
static void
pxamci_enable_intr(struct pxamci_softc *sc, uint32_t mask)
{
@@ -238,9 +246,6 @@
sc-sc_buswidth = 1;
/* setting DMA */
-#if 1 /* XXX */
- SET(sc-sc_caps, PMC_CAPS_NO_DMA); /* disable DMA */
-#endif
if (!ISSET(sc-sc_caps, PMC_CAPS_NO_DMA)) {
aprint_normal_dev(sc-sc_dev, using DMA transfer\n);
@@ -301,10 +306,8 @@
saa.saa_caps = 0;
if (!ISSET(sc-sc_caps, PMC_CAPS_NO_DMA))
SET(saa.saa_caps, SMC_CAPS_DMA);
-#if notyet
if (CPU_IS_PXA270 ISSET(sc-sc_caps, PMC_CAPS_4BIT))
SET(saa.saa_caps, SMC_CAPS_4BIT_MODE);
-#endif
sc-sc_sdmmc = config_found(sc-sc_dev, saa, NULL);
if (sc-sc_sdmmc == NULL) {
@@ -612,9 +615,12 @@
cmdat |= CMDAT_DATA_EN;
/* setting DMA */
- if (!ISSET(sc-sc_caps, PMC_CAPS_NO_DMA)) {
+ if (!ISSET(sc-sc_caps, PMC_CAPS_NO_DMA)
+ DMA_ALIGNED(cmd-c_data)) {
struct dmac_xfer_desc *dx_desc;
+ DPRINTF(1,(%s: using DMA\n,device_xname(sc-sc_dev)));
+
cmdat |= CMDAT_MMC_DMA_EN;
if (ISSET(cmd-c_flags, SCF_CMD_READ)) {
@@ -641,6 +647,8 @@
goto err;
}
} else {
+ DPRINTF(1,(%s: using PIO\n,device_xname(sc-sc_dev)));
+
cmd-c_resid = cmd-c_datalen;
cmd-c_buf = cmd-c_data;
@@ -739,7 +747,7 @@
ostatus =
#endif
status = CSR_READ_4(sc, MMC_I_REG) ~CSR_READ_4(sc, MMC_I_MASK);
- DPRINTF(9,(%s: intr status = %08x\n, device_xname(sc-sc_dev),
+ DPRINTF(10,(%s: intr status = %08x\n, device_xname(sc-sc_dev),
status));
/*
@@ -762,7 +770,8 @@
pxamci_disable_intr(sc, MMC_I_RES_ERR);
CLR(status, MMC_I_RES_ERR|MMC_I_END_CMD_RES);
if (!ISSET(sc-sc_caps, PMC_CAPS_NO_DMA)
- (sc-sc_cmd-c_datalen 0)) {
+ (sc-sc_cmd-c_datalen 0)
+ DMA_ALIGNED(sc-sc_cmd-c_data)) {
if (ISSET(sc-sc_cmd-c_flags, SCF_CMD_READ)) {
pxa2x0_dmac_abort_xfer(sc-sc_rxdx);
} else {
@@ -796,7 +805,8 @@
pxamci_intr_done(sc);
pxamci_disable_intr(sc, MMC_I_DAT_ERR);
CLR(status, MMC_I_DAT_ERR);
- if (!ISSET(sc-sc_caps, PMC_CAPS_NO_DMA)) {
+ if (!ISSET(sc-sc_caps, PMC_CAPS_NO_DMA)
+ DMA_ALIGNED(sc-sc_cmd-c_data)) {
if (ISSET(sc-sc_cmd-c_flags, SCF_CMD_READ)) {
pxa2x0_dmac_abort_xfer(sc-sc_rxdx);
} else {
@@ -820,7 +830,7 @@
}
if (ISSET(status, MMC_I_TXFIFO_WR_REQ|MMC_I_RXFIFO_RD_REQ)) {
- DPRINTF(9,(%s: handling MMC_I_xxFIFO_xx_REQ\n,
+ DPRINTF(10,(%s: handling MMC_I_xxFIFO_xx_REQ\n,
device_xname(sc-sc_dev)));
pxamci_intr_data(sc);
CLR(status, MMC_I_TXFIFO_WR_REQ|MMC_I_RXFIFO_RD_REQ);
@@ -920,18 +930,20 @@
cmd-c_error = EIO;
if (cmd-c_error == 0 cmd-c_datalen 0) {
- /* workaround for erratum #91 */
if (!ISSET(sc-sc_caps, PMC_CAPS_NO_DMA)
- CPU_IS_PXA270
-
CVS commit: src/sys/arch/atari/dev
Module Name:src Committed By: tsutsui Date: Tue Apr 6 15:32:36 UTC 2010 Modified Files: src/sys/arch/atari/dev: if_ne_mb.c Log Message: Use callout_schedule(9) rather than callout_reset(9) on polling as callout(9) man says. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/atari/dev/if_ne_mb.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/if_ne_mb.c diff -u src/sys/arch/atari/dev/if_ne_mb.c:1.1 src/sys/arch/atari/dev/if_ne_mb.c:1.2 --- src/sys/arch/atari/dev/if_ne_mb.c:1.1 Thu Apr 1 17:07:52 2010 +++ src/sys/arch/atari/dev/if_ne_mb.c Tue Apr 6 15:32:36 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: if_ne_mb.c,v 1.1 2010/04/01 17:07:52 tsutsui Exp $ */ +/* $NetBSD: if_ne_mb.c,v 1.2 2010/04/06 15:32:36 tsutsui Exp $ */ /* * Copyright (c) 2010 Izumi Tsutsui. All rights reserved. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_ne_mb.c,v 1.1 2010/04/01 17:07:52 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: if_ne_mb.c,v 1.2 2010/04/06 15:32:36 tsutsui Exp $); #include sys/param.h #include sys/systm.h @@ -285,7 +285,7 @@ (void)dp8390_intr(dsc); splx(s); - callout_reset(sc-sc_poll, ETHERNEC_TICK, ne_mb_poll, sc); + callout_schedule(sc-sc_poll, ETHERNEC_TICK); } /*
CVS commit: src/sys/arch/hpc/hpc
Module Name:src
Committed By: nonaka
Date: Tue Apr 6 16:18:24 UTC 2010
Modified Files:
src/sys/arch/hpc/hpc: platid_mask.c platid_name.c
Log Message:
regen.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/hpc/hpc/platid_mask.c \
src/sys/arch/hpc/hpc/platid_name.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/hpc/hpc/platid_mask.c
diff -u src/sys/arch/hpc/hpc/platid_mask.c:1.23 src/sys/arch/hpc/hpc/platid_mask.c:1.24
--- src/sys/arch/hpc/hpc/platid_mask.c:1.23 Thu Jan 29 21:26:14 2009
+++ src/sys/arch/hpc/hpc/platid_mask.c Tue Apr 6 16:18:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: platid_mask.c,v 1.23 2009/01/29 21:26:14 nonaka Exp $ */
+/* $NetBSD: platid_mask.c,v 1.24 2010/04/06 16:18:24 nonaka Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -400,11 +400,12 @@
PLATID_MACH_CASIO_CASSIOPEIAA_A55V
}};
#endif /* hpcsh */
-#ifdef hpcmips
+#if defined(hpcmips) || defined(hpcarm)
platid_t platid_mask_MACH_SHARP = {{
PLATID_WILD,
PLATID_MACH_SHARP
}};
+#if defined(hpcmips)
platid_t platid_mask_MACH_SHARP_TRIPAD = {{
PLATID_WILD,
PLATID_MACH_SHARP_TRIPAD
@@ -466,6 +467,33 @@
PLATID_MACH_SHARP_MOBILON_HC1200
}};
#endif /* hpcmips */
+#if defined(hpcarm)
+platid_t platid_mask_MACH_SHARP_WZERO3 = {{
+ PLATID_WILD,
+ PLATID_MACH_SHARP_WZERO3
+}};
+platid_t platid_mask_MACH_SHARP_WZERO3_WS003SH = {{
+ PLATID_CPU_ARM_XSCALE_PXA270,
+ PLATID_MACH_SHARP_WZERO3_WS003SH
+}};
+platid_t platid_mask_MACH_SHARP_WZERO3_WS004SH = {{
+ PLATID_CPU_ARM_XSCALE_PXA270,
+ PLATID_MACH_SHARP_WZERO3_WS004SH
+}};
+platid_t platid_mask_MACH_SHARP_WZERO3_WS007SH = {{
+ PLATID_CPU_ARM_XSCALE_PXA270,
+ PLATID_MACH_SHARP_WZERO3_WS007SH
+}};
+platid_t platid_mask_MACH_SHARP_WZERO3_WS011SH = {{
+ PLATID_CPU_ARM_XSCALE_PXA270,
+ PLATID_MACH_SHARP_WZERO3_WS011SH
+}};
+platid_t platid_mask_MACH_SHARP_WZERO3_WS020SH = {{
+ PLATID_CPU_ARM_XSCALE_PXA270,
+ PLATID_MACH_SHARP_WZERO3_WS020SH
+}};
+#endif /* hpcarm */
+#endif /* hpcmips || hpcarm */
#ifdef hpcmips
platid_t platid_mask_MACH_FUJITSU = {{
PLATID_WILD,
Index: src/sys/arch/hpc/hpc/platid_name.c
diff -u src/sys/arch/hpc/hpc/platid_name.c:1.23 src/sys/arch/hpc/hpc/platid_name.c:1.24
--- src/sys/arch/hpc/hpc/platid_name.c:1.23 Thu Jan 29 21:20:42 2009
+++ src/sys/arch/hpc/hpc/platid_name.c Tue Apr 6 16:18:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: platid_name.c,v 1.23 2009/01/29 21:20:42 nonaka Exp $ */
+/* $NetBSD: platid_name.c,v 1.24 2010/04/06 16:18:24 nonaka Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -227,9 +227,10 @@
{ platid_mask_MACH_CASIO_CASSIOPEIAA_A55V,
TEXT(CASIO Cassiopeia A-55V) },
#endif /* hpcsh */
-#ifdef hpcmips
+#if defined(hpcmips) || defined(hpcarm)
{ platid_mask_MACH_SHARP,
TEXT(Sharp) },
+#if defined(hpcmips)
{ platid_mask_MACH_SHARP_TRIPAD,
TEXT(Sharp Tripad) },
{ platid_mask_MACH_SHARP_TRIPAD_PV,
@@ -261,6 +262,21 @@
{ platid_mask_MACH_SHARP_MOBILON_HC1200,
TEXT(Sharp Mobilon HC1200) },
#endif /* hpcmips */
+#if defined(hpcarm)
+ { platid_mask_MACH_SHARP_WZERO3,
+ TEXT(Sharp WZERO3) },
+ { platid_mask_MACH_SHARP_WZERO3_WS003SH,
+ TEXT(Sharp W-ZERO3 (WS003SH)) },
+ { platid_mask_MACH_SHARP_WZERO3_WS004SH,
+ TEXT(Sharp W-ZERO3 (WS004SH)) },
+ { platid_mask_MACH_SHARP_WZERO3_WS007SH,
+ TEXT(Sharp W-ZERO3[es] (WS007SH)) },
+ { platid_mask_MACH_SHARP_WZERO3_WS011SH,
+ TEXT(Sharp Advanced/W-ZERO3[es] (WS011SH)) },
+ { platid_mask_MACH_SHARP_WZERO3_WS020SH,
+ TEXT(Sharp WILLCOM 03 (WS020SH)) },
+#endif /* hpcarm */
+#endif /* hpcmips || hpcarm */
#ifdef hpcmips
{ platid_mask_MACH_FUJITSU,
TEXT(Fujitsu) },
CVS commit: src/sys/arch/hpc/conf
Module Name:src
Committed By: nonaka
Date: Tue Apr 6 16:15:34 UTC 2010
Modified Files:
src/sys/arch/hpc/conf: platid.def
Log Message:
Added W-ZERO3 series.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/hpc/conf/platid.def
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/hpc/conf/platid.def
diff -u src/sys/arch/hpc/conf/platid.def:1.24 src/sys/arch/hpc/conf/platid.def:1.25
--- src/sys/arch/hpc/conf/platid.def:1.24 Thu Jan 29 21:18:23 2009
+++ src/sys/arch/hpc/conf/platid.def Tue Apr 6 16:15:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: platid.def,v 1.24 2009/01/29 21:18:23 nonaka Exp $ */
+/* $NetBSD: platid.def,v 1.25 2010/04/06 16:15:34 nonaka Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -166,8 +166,9 @@
#endif /* hpcsh */
}
-#ifdef hpcmips
+#if defined(hpcmips) || defined(hpcarm)
Sharp {
+#if defined(hpcmips)
Tripad {
PV {
CPU=MIPS_VR_4111 PV6000
@@ -191,8 +192,19 @@
CPU=MIPS_TX_3912 HC1200
}
}
-}
#endif /* hpcmips */
+#if defined(hpcarm)
+ WZERO3 {
+CPU=ARM_XSCALE_PXA270
+WS003SH - W-ZERO3 (WS003SH)
+WS004SH - W-ZERO3 (WS004SH)
+WS007SH - W-ZERO3[es] (WS007SH)
+WS011SH - Advanced/W-ZERO3[es] (WS011SH)
+WS020SH - WILLCOM 03 (WS020SH)
+ }
+#endif /* hpcarm */
+}
+#endif /* hpcmips || hpcarm */
#ifdef hpcmips
Fujitsu {
CVS commit: src/sys/dev/sdmmc
Module Name:src
Committed By: nonaka
Date: Tue Apr 6 15:10:09 UTC 2010
Modified Files:
src/sys/dev/sdmmc: sdmmc.c sdmmc_mem.c sdmmcchip.h sdmmcreg.h
sdmmcvar.h
Log Message:
- mention MMC SPI mode.
- support SD 4bit bus width mode.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/sdmmc/sdmmc.c \
src/sys/dev/sdmmc/sdmmcchip.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/sdmmc/sdmmc_mem.c \
src/sys/dev/sdmmc/sdmmcreg.h
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/sdmmc/sdmmcvar.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/sdmmc/sdmmc.c
diff -u src/sys/dev/sdmmc/sdmmc.c:1.1 src/sys/dev/sdmmc/sdmmc.c:1.2
--- src/sys/dev/sdmmc/sdmmc.c:1.1 Tue Apr 21 03:00:30 2009
+++ src/sys/dev/sdmmc/sdmmc.c Tue Apr 6 15:10:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sdmmc.c,v 1.1 2009/04/21 03:00:30 nonaka Exp $ */
+/* $NetBSD: sdmmc.c,v 1.2 2010/04/06 15:10:09 nonaka Exp $ */
/* $OpenBSD: sdmmc.c,v 1.18 2009/01/09 10:58:38 jsg Exp $ */
/*
@@ -50,7 +50,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sdmmc.c,v 1.1 2009/04/21 03:00:30 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: sdmmc.c,v 1.2 2010/04/06 15:10:09 nonaka Exp $);
#include sys/param.h
#include sys/device.h
@@ -59,6 +59,7 @@
#include sys/malloc.h
#include sys/proc.h
#include sys/systm.h
+#include sys/callout.h
#include dev/sdmmc/sdmmc_ioreg.h
#include dev/sdmmc/sdmmcchip.h
@@ -85,6 +86,7 @@
static void sdmmc_doattach(device_t);
static void sdmmc_task_thread(void *);
static void sdmmc_discover_task(void *);
+static void sdmmc_polling_card(void *);
static void sdmmc_card_attach(struct sdmmc_softc *);
static void sdmmc_card_detach(struct sdmmc_softc *, int);
static int sdmmc_print(void *, const char *);
@@ -115,6 +117,7 @@
sc-sc_dev = self;
sc-sc_sct = saa-saa_sct;
+ sc-sc_spi_sct = saa-saa_spi_sct;
sc-sc_sch = saa-saa_sch;
sc-sc_dmat = saa-saa_dmat;
sc-sc_clkmin = saa-saa_clkmin;
@@ -133,6 +136,12 @@
}
}
+ if (ISSET(sc-sc_caps, SMC_CAPS_POLL_CARD_DET)) {
+ callout_init(sc-sc_card_detect_ch, 0);
+ callout_reset(sc-sc_card_detect_ch, hz,
+ sdmmc_polling_card, sc);
+ }
+
SIMPLEQ_INIT(sc-sf_head);
TAILQ_INIT(sc-sc_tskq);
TAILQ_INIT(sc-sc_intrq);
@@ -291,6 +300,29 @@
}
}
+static void
+sdmmc_polling_card(void *arg)
+{
+ struct sdmmc_softc *sc = (struct sdmmc_softc *)arg;
+ int card_detect;
+ int s;
+
+ s = splsdmmc();
+ card_detect = sdmmc_chip_card_detect(sc-sc_sct, sc-sc_sch);
+ if (card_detect) {
+ if (!ISSET(sc-sc_flags, SMF_CARD_PRESENT)) {
+ sdmmc_needs_discover(sc-sc_dev);
+ }
+ } else {
+ if (ISSET(sc-sc_flags, SMF_CARD_PRESENT)) {
+ sdmmc_needs_discover(sc-sc_dev);
+ }
+ }
+ splx(s);
+
+ callout_schedule(sc-sc_card_detect_ch, hz);
+}
+
/*
* Called from process context when a card is present.
*/
@@ -325,6 +357,15 @@
}
/*
+ * Initialize the I/O functions and memory cards.
+ */
+ error = sdmmc_init(sc);
+ if (error) {
+ aprint_error_dev(sc-sc_dev, init failed\n);
+ goto err;
+ }
+
+ /*
* Set SD/MMC bus clock.
*/
#ifdef SDMMC_DEBUG
@@ -338,15 +379,6 @@
#endif
(void)sdmmc_chip_bus_clock(sc-sc_sct, sc-sc_sch, sc-sc_busclk);
- /*
- * Initialize the I/O functions and memory cards.
- */
- error = sdmmc_init(sc);
- if (error) {
- aprint_error_dev(sc-sc_dev, init failed\n);
- goto err;
- }
-
SIMPLEQ_FOREACH(sf, sc-sf_head, sf_list) {
if (ISSET(sc-sc_flags, SMF_IO_MODE) sf-number 1)
continue;
@@ -475,13 +507,16 @@
/* XXX wait for card to power up */
sdmmc_delay(10);
- /* Initialize SD I/O card function(s). */
- error = sdmmc_io_enable(sc);
- if (error)
- goto out;
+ if (!ISSET(sc-sc_caps, SMC_CAPS_SPI_MODE)) {
+ /* Initialize SD I/O card function(s). */
+ error = sdmmc_io_enable(sc);
+ if (error)
+ goto out;
+ }
- /* Initialize SD/MMC memory card(s). */
- if (ISSET(sc-sc_flags, SMF_MEM_MODE))
+ /* Initialize SD/MMC memory card(s). */
+ if (ISSET(sc-sc_caps, SMC_CAPS_SPI_MODE) ||
+ ISSET(sc-sc_flags, SMF_MEM_MODE))
error = sdmmc_mem_enable(sc);
out:
@@ -495,8 +530,10 @@
{
/* XXX complete commands if card is still present. */
- /* Make sure no card is still selected. */
- (void)sdmmc_select_card(sc, NULL);
+ if (!ISSET(sc-sc_caps, SMC_CAPS_SPI_MODE)) {
+ /* Make sure no card is still selected. */
+ (void)sdmmc_select_card(sc, NULL);
+ }
/* Turn off bus power and clock. */
(void)sdmmc_chip_bus_width(sc-sc_sct, sc-sc_sch, 1);
@@ -566,9 +603,11 @@
sdmmc_scan(struct sdmmc_softc *sc)
{
- /* Scan for I/O functions. */
- if (ISSET(sc-sc_flags, SMF_IO_MODE))
- sdmmc_io_scan(sc);
+ if (!ISSET(sc-sc_caps, SMC_CAPS_SPI_MODE)) {
+ /* Scan for I/O functions. */
+ if (ISSET(sc-sc_flags, SMF_IO_MODE))
+ sdmmc_io_scan(sc);
+ }
/* Scan for memory cards on the bus. */
if (ISSET(sc-sc_flags, SMF_MEM_MODE))
@@ -593,9 +632,12 @@
/* Initialize all identified card
CVS commit: src/lib/libc/sys
Module Name:src Committed By: wiz Date: Tue Apr 6 14:27:00 UTC 2010 Modified Files: src/lib/libc/sys: ptrace.2 Log Message: New sentence, new line. Sort errors. Remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/lib/libc/sys/ptrace.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/ptrace.2 diff -u src/lib/libc/sys/ptrace.2:1.32 src/lib/libc/sys/ptrace.2:1.33 --- src/lib/libc/sys/ptrace.2:1.32 Tue Apr 6 13:50:22 2010 +++ src/lib/libc/sys/ptrace.2 Tue Apr 6 14:26:59 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: ptrace.2,v 1.32 2010/04/06 13:50:22 christos Exp $ +.\ $NetBSD: ptrace.2,v 1.33 2010/04/06 14:26:59 wiz Exp $ .\ .\ This file is in the public domain. .Dd April 6, 2010 @@ -149,9 +149,9 @@ to indicate that execution is to pick up where it left off. .Fa data provides a signal number to be delivered to the traced process as it -resumes execution, or 0 if no signal is to be sent. If a negative -value is supplied, that is the negative of the LWP ID of the thread to -be resumed, and only that thread executes. +resumes execution, or 0 if no signal is to be sent. +If a negative value is supplied, that is the negative of the LWP +ID of the thread to be resumed, and only that thread executes. .It Dv PT_KILL The traced process terminates, as if .Dv PT_CONTINUE @@ -276,9 +276,10 @@ .Pp where .Fa pl_lwpid -contains a thread LWP ID. Information is returned for the thread -following the one with the specified ID in the process thread list, -or for the first thread if +contains a thread LWP ID. +Information is returned for the thread following the one with the +specified ID in the process thread list, or for the first thread +if .Fa pl_lwpid is 0. Upon return @@ -315,11 +316,11 @@ If the .Fa data argument is greater than 0, it contains the LWP ID of the thread to be -stepped, and any other threads are continued. If the +stepped, and any other threads are continued. +If the .Fa data argument is less than zero, it contains the negative of the LWP ID of -the -thread to be stepped, and only that thread executes. +the thread to be stepped, and only that thread executes. .It Dv PT_GETREGS This request reads the traced process' machine registers into the .Dq Li struct reg @@ -327,10 +328,11 @@ .In machine/reg.h ) pointed to by .Fa addr . -The +The .Fa data argument contains the LWP ID of the thread whose registers are to -be read. If zero is supplied, the first thread of the process is read. +be read. +If zero is supplied, the first thread of the process is read. .It Dv PT_SETREGS This request is the converse of .Dv PT_GETREGS ; @@ -340,10 +342,11 @@ .In machine/reg.h ) pointed to by .Fa addr . -The +The .Fa data argument contains the LWP ID of the thread whose registers are to -be written. If zero is supplied, the first thread of the process is written. +be written. +If zero is supplied, the first thread of the process is written. .It Dv PT_GETFPREGS This request reads the traced process' floating-point registers into the @@ -352,11 +355,11 @@ .In machine/reg.h ) pointed to by .Fa addr . -The +The .Fa data argument contains the LWP ID of the thread whose registers are to -be read. If zero is supplied, the first thread of the process is -read. +be read. +If zero is supplied, the first thread of the process is read. .It Dv PT_SETFPREGS This request is the converse of .Dv PT_GETFPREGS ; @@ -366,26 +369,29 @@ .In machine/reg.h ) pointed to by .Fa addr . -The +The .Fa data argument contains the LWP ID of the thread whose registers are to -be written. If zero is supplied, the first thread of the process is -written. +be written. +If zero is supplied, the first thread of the process is written. .\ .It Dv PT_SYSCALL .\ This request is like .\ .Dv PT_CONTINUE .\ except that the process will stop next time it executes any system -.\ call. Information about the system call can be examined with +.\ call. +.\ Information about the system call can be examined with .\ .Dv PT_READ_U .\ and potentially modified with .\ .Dv PT_WRITE_U .\ through the .\ .Li u_kproc.kp_proc.p_md -.\ element of the user structure (see below). If the process is continued +.\ element of the user structure (see below). +.\ If the process is continued .\ with another .\ .Dv PT_SYSCALL .\ request, it will stop again on exit from the syscall, at which point -.\ the return values can be examined and potentially changed. The +.\ the return values can be examined and potentially changed. +.\ The .\ .Li u_kproc.kp_proc.p_md .\ element is of type .\ .Dq Li struct mdproc , @@ -501,8 +507,19 @@ .Bl -tag -width 4n .It Bq Er EAGAIN Process is currently exec'ing and cannot be traced. -.It Bq Er ESRCH -No process having the specified process ID exists. +.It Bq Er EBUSY +.Bl -bullet -compact +.It +.Dv PT_ATTACH +was attempted
CVS commit: src/external/bsd/flex/dist
Module Name:src Committed By: christos Date: Tue Apr 6 17:39:47 UTC 2010 Modified Files: src/external/bsd/flex/dist: gen.c Log Message: use the m4 define not the cpp one for reject. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/flex/dist/gen.c 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/gen.c diff -u src/external/bsd/flex/dist/gen.c:1.5 src/external/bsd/flex/dist/gen.c:1.6 --- src/external/bsd/flex/dist/gen.c:1.5 Mon Nov 2 15:52:39 2009 +++ src/external/bsd/flex/dist/gen.c Tue Apr 6 13:39:47 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: gen.c,v 1.5 2009/11/02 20:52:39 christos Exp $ */ +/* $NetBSD: gen.c,v 1.6 2010/04/06 17:39:47 christos Exp $ */ /* gen - actual generation (writing) of flex scanners */ @@ -509,10 +509,10 @@ indent_puts (YY_G(yy_lp) = yy_accept[yy_current_state];); if (!variable_trailing_context_rules) - outn (#ifdef YY_USES_REJECT); + outn (m4_ifdef( [[M4_YY_USES_REJECT]],\n[[); outn (find_rule: /* we branch to this label when backing up */); if (!variable_trailing_context_rules) - outn (#endif); + outn (]])\n); indent_puts (for ( ; ; ) /* until we find what rule we matched */);
CVS commit: src/share/man/man8/man8.i386
Module Name:src Committed By: tnn Date: Tue Apr 6 20:15:22 UTC 2010 Modified Files: src/share/man/man8/man8.i386: pxeboot.8 Log Message: The pxeboot manpage implies that boot.cfg gets loaded by default, but this is no longer true following i386/stand/pxeboot/main.c v1.23. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/share/man/man8/man8.i386/pxeboot.8 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/man8/man8.i386/pxeboot.8 diff -u src/share/man/man8/man8.i386/pxeboot.8:1.15 src/share/man/man8/man8.i386/pxeboot.8:1.16 --- src/share/man/man8/man8.i386/pxeboot.8:1.15 Fri Apr 10 23:22:30 2009 +++ src/share/man/man8/man8.i386/pxeboot.8 Tue Apr 6 20:15:22 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: pxeboot.8,v 1.15 2009/04/10 23:22:30 wiz Exp $ +.\ $NetBSD: pxeboot.8,v 1.16 2010/04/06 20:15:22 tnn Exp $ .\ .\ Copyright (c) 2003 .\ Matthias Drochner. All rights reserved. @@ -24,7 +24,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd April 10, 2008 +.Dd April 06, 2010 .Dt PXEBOOT 8 i386 .Os .Sh NAME @@ -45,6 +45,20 @@ .Pq Tn PXE specification. .Pp +This manual page assumes the +.Nm +program has been configured +via +.Xr installboot 8 +to use a +.Xr boot.cfg 5 +file. For historical reasons +.Xr boot.cfg 5 +is NOT loaded by default. +See +.Sx EXAMPLES +for how to enable it. +.Pp Network booting a system through .Tn PXE is a two-stage process: @@ -245,6 +259,15 @@ .It Pa /usr/mdec/pxeboot_ia32.bin .El .Sh EXAMPLES +To enable +.Xr boot.cfg 5 +support in the +.Nm +program: +.Bd -literal -offset indent +installboot -e -o bootconf pxeboot_ia32.bin +.Ed +.Pp The first .Pa /etc/dhcpd.conf example shows a simple configuration which just loads @@ -293,7 +316,6 @@ } } } -} .Ed .Pp The following
CVS commit: src/sys/arch/i386/include
Module Name:src Committed By: jld Date: Tue Apr 6 20:43:57 UTC 2010 Modified Files: src/sys/arch/i386/include: pte.h Log Message: Fix typos in PAE comment. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/i386/include/pte.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/i386/include/pte.h diff -u src/sys/arch/i386/include/pte.h:1.21 src/sys/arch/i386/include/pte.h:1.22 --- src/sys/arch/i386/include/pte.h:1.21 Fri Feb 26 19:25:07 2010 +++ src/sys/arch/i386/include/pte.h Tue Apr 6 20:43:57 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pte.h,v 1.21 2010/02/26 19:25:07 jym Exp $ */ +/* $NetBSD: pte.h,v 1.22 2010/04/06 20:43:57 jld Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -164,10 +164,10 @@ * * The PAE extension extends the size of the PTE to 64 bits (52bits physical * address) and is compatible with the amd64 PTE format. The first level - * maps 2M, the second 1G, so a third level page table is intruduced to + * maps 2M, the second 1G, so a third level page table is introduced to * map the 4GB virtual address space. This PD has only 4 entries. - * We can't use recursive mapping at level 3 to map the PD pages, as - * this would eat one GB of address space. In addition, Xen impose restrictions + * We can't use recursive mapping at level 3 to map the PD pages, as this + * would eat one GB of address space. In addition, Xen imposes restrictions * on the entries we put in the L3 page (for example, the page pointed to by * the last slot can't be shared among different L3 pages), which makes * handling this L3 page in the same way we do for L2 on i386 (or L4 on amd64)
CVS commit: src/sys/arch/i386/stand/pxeboot
Module Name:src
Committed By: tnn
Date: Tue Apr 6 21:18:59 UTC 2010
Modified Files:
src/sys/arch/i386/stand/pxeboot: main.c
Log Message:
Add multiboot command. This lets us netboot the xen+dom0 kernel combo.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/i386/stand/pxeboot/main.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/i386/stand/pxeboot/main.c
diff -u src/sys/arch/i386/stand/pxeboot/main.c:1.24 src/sys/arch/i386/stand/pxeboot/main.c:1.25
--- src/sys/arch/i386/stand/pxeboot/main.c:1.24 Sun Jan 17 14:54:44 2010
+++ src/sys/arch/i386/stand/pxeboot/main.c Tue Apr 6 21:18:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.24 2010/01/17 14:54:44 drochner Exp $ */
+/* $NetBSD: main.c,v 1.25 2010/04/06 21:18:59 tnn Exp $ */
/*
* Copyright (c) 1996
@@ -64,6 +64,7 @@
void command_boot(char *);
void command_consdev(char *);
void command_modules(char *);
+void command_multiboot(char *);
const struct bootblk_command commands[] = {
{ help, command_help },
@@ -72,6 +73,7 @@
{ boot, command_boot },
{ consdev, command_consdev },
{ modules,command_modules },
+ { multiboot, command_multiboot },
{ load, module_add },
{ vesa, command_vesa },
{ NULL, NULL },
@@ -193,6 +195,7 @@
(ex. \netbsd.old -s\\n
consdev {pc|com[0123]|com[0123]kbd|auto}\n
vesa {enabled|disabled|list|modenum}\n
+ multiboot [filename] [args]\n
modules {enabled|disabled}\n
load {path_to_module}\n
help|?\n
@@ -264,3 +267,16 @@
else
printf(invalid flag, must be 'enabled' or 'disabled'.\n);
}
+
+void
+command_multiboot(char *arg)
+{
+ char *filename;
+
+ filename = arg;
+ if (exec_multiboot(filename, gettrailer(arg)) 0)
+ printf(multiboot: %s: %s\n, filename,
+ strerror(errno));
+ else
+ printf(boot returned\n);
+}
CVS commit: src/share/man/man8/man8.i386
Module Name:src Committed By: wiz Date: Tue Apr 6 22:41:41 UTC 2010 Modified Files: src/share/man/man8/man8.i386: pxeboot.8 Log Message: Fix Dd argument (no leading zeroes). New sentence, new line. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/share/man/man8/man8.i386/pxeboot.8 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/man8/man8.i386/pxeboot.8 diff -u src/share/man/man8/man8.i386/pxeboot.8:1.16 src/share/man/man8/man8.i386/pxeboot.8:1.17 --- src/share/man/man8/man8.i386/pxeboot.8:1.16 Tue Apr 6 20:15:22 2010 +++ src/share/man/man8/man8.i386/pxeboot.8 Tue Apr 6 22:41:41 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: pxeboot.8,v 1.16 2010/04/06 20:15:22 tnn Exp $ +.\ $NetBSD: pxeboot.8,v 1.17 2010/04/06 22:41:41 wiz Exp $ .\ .\ Copyright (c) 2003 .\ Matthias Drochner. All rights reserved. @@ -24,7 +24,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd April 06, 2010 +.Dd April 6, 2010 .Dt PXEBOOT 8 i386 .Os .Sh NAME @@ -48,11 +48,12 @@ This manual page assumes the .Nm program has been configured -via +via .Xr installboot 8 to use a .Xr boot.cfg 5 -file. For historical reasons +file. +For historical reasons .Xr boot.cfg 5 is NOT loaded by default. See
CVS commit: src/gnu/dist/gdb6/sim/ppc
Module Name:src
Committed By: christos
Date: Tue Apr 6 23:02:10 UTC 2010
Modified Files:
src/gnu/dist/gdb6/sim/ppc: emul_netbsd.c
Log Message:
update system call table to reflect reality.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 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.1.1.2 src/gnu/dist/gdb6/sim/ppc/emul_netbsd.c:1.2
--- src/gnu/dist/gdb6/sim/ppc/emul_netbsd.c:1.1.1.2 Sun Jul 2 16:29:05 2006
+++ src/gnu/dist/gdb6/sim/ppc/emul_netbsd.c Tue Apr 6 19:02:10 2010
@@ -1039,21 +1039,21 @@
/* 4 */ { do_write, write },
/* 5 */ { do_open, open },
/* 6 */ { do_close, close },
- /* 7 */ { 0, wait4 },
+ { 0, }, /* 7 is old wait4 */
{ 0, }, /* 8 is old creat */
/* 9 */ { 0, link },
/* 10 */ { 0, unlink },
{ 0, }, /* 11 is obsolete execv */
/* 12 */ { 0, chdir },
/* 13 */ { 0, fchdir },
- /* 14 */ { 0, mknod },
+ { 0, }, /* 14 is old mknod */
/* 15 */ { 0, chmod },
/* 16 */ { 0, chown },
/* 17 */ { do_break, break },
- /* 18 */ { 0, getfsstat },
+ { 0, }, /* 18 is old getfsstat */
{ 0, }, /* 19 is old lseek */
/* 20 */ { do_getpid, getpid },
- /* 21 */ { 0, mount },
+ { 0, } /* 21 is old mount */
/* 22 */ { 0, unmount },
/* 23 */ { 0, setuid },
/* 24 */ { do_getuid, getuid },
@@ -1078,16 +1078,16 @@
/* 43 */ { do_getegid, getegid },
/* 44 */ { 0, profil },
/* 45 */ { 0, ktrace },
- /* 46 */ { 0, sigaction },
+ { 0, }, /* 46 is old sigaction */
/* 47 */ { do_getgid, getgid },
- /* 48 */ { do_sigprocmask, sigprocmask },
+ { 0, }, /* 48 is old sigprocmask */
/* 49 */ { 0, getlogin },
/* 50 */ { 0, setlogin },
/* 51 */ { 0, acct },
- /* 52 */ { 0, sigpending },
- /* 53 */ { 0, sigaltstack },
+ { 0, }, /* 52 is old sigpending */
+ { 0, }, /* 53 is old sigaltstack */
/* 54 */ { do_ioctl, ioctl },
- /* 55 */ { 0, reboot },
+ { 0, }, /* 55 is old reboot */
/* 56 */ { 0, revoke },
/* 57 */ { 0, symlink },
/* 58 */ { 0, readlink },
@@ -1097,7 +1097,7 @@
{ 0, }, /* 62 is old fstat */
{ 0, }, /* 63 is old getkerninfo */
{ 0, }, /* 64 is old getpagesize */
- /* 65 */ { 0, msync },
+ { 0, }, /* 65 is old msync */
/* 66 */ { 0, vfork },
{ 0, }, /* 67 is obsolete vread */
{ 0, }, /* 68 is obsolete vwrite */
@@ -1115,27 +1115,27 @@
/* 80 */ { 0, setgroups },
/* 81 */ { 0, getpgrp },
/* 82 */ { 0, setpgid },
- /* 83 */ { 0, setitimer },
+ { 0, }, /* 83 is old setitimer */
{ 0, }, /* 84 is old wait */
- /* 85 */ { 0, swapon },
- /* 86 */ { 0, getitimer },
+ { 0, }, /* 85 is old swapon */
+ { 0, }, /* 86 is old getitimer */
{ 0, }, /* 87 is old gethostname */
{ 0, }, /* 88 is old sethostname */
{ 0, }, /* 89 is old getdtablesize */
{ do_dup2, dup2 },
{ 0, }, /* 91 */
/* 92 */ { do_fcntl, fcntl },
- /* 93 */ { 0, select },
+ { 0, }, /* 93 is old select */
{ 0, }, /* 94 */
/* 95 */ { 0, fsync },
/* 96 */ { 0, setpriority },
- /* 97 */ { 0, socket },
- /* 98 */ { 0, connect },
+ { 0, }, /* 97 is old socket */
+ { 0, }, /* 98 is old connect */
{ 0, }, /* 99 is old accept */
/* 100 */ { 0, getpriority },
{ 0, }, /* 101 is old send */
{ 0, }, /* 102 is old recv */
- /* 103 */ { 0, sigreturn },
+ { 0, }, /* 103 is old sigreturn */
/* 104 */ { 0, bind },
/* 105 */ { 0, setsockopt },
/* 106 */ { 0, listen },
@@ -1143,23 +1143,23 @@
{ 0, }, /* 108 is old sigvec */
{ 0, }, /* 109 is old sigblock */
{ 0, }, /* 110 is old sigsetmask */
- /* 111 */ { 0, sigsuspend },
+ { 0, }, /* 111 is old sigsuspend */
{ 0, }, /* 112 is old sigstack */
{ 0, }, /* 113 is old recvmsg */
{ 0, }, /* 114 is old sendmsg */
/* - is obsolete vtrace */ { 0, vtrace 115 },
- /* 116 */ { do_gettimeofday, gettimeofday },
- /* 117 */ { do_getrusage, getrusage },
+ { 0, }, /* 116 is old gettimeofday */
+ { 0, }, /* 117 is old getrusage */
/* 118 */ { 0, getsockopt },
- /* 119 */ { 0, resuba },
+ /* - is obsolete resuba */ { 0, resuba 119 },
/* 120 */ { 0, readv },
/* 121 */ { 0, writev },
- /* 122 */ { 0, settimeofday },
+ { 0, }, /* 122 is old settimeofday */
/* 123 */ { 0, fchown },
/* 124 */ { 0, fchmod },
{ 0, }, /* 125 is old recvfrom */
- { 0, }, /* 126 is old setreuid */
- { 0, }, /* 127 is old setregid */
+ /* 126 */ { 0, setreuid },
+ /* 127 */ { 0, setregid },
/* 128 */ { 0, rename },
{ 0, }, /* 129 is old truncate */
{ 0, }, /* 130 is old ftruncate */
@@ -1170,9 +1170,9 @@
/* 135 */ { 0, socketpair },
/* 136 */ { 0, mkdir },
/* 137 */ { 0, rmdir },
- /* 138 */ { 0, utimes },
+ { 0, }, /* 138 is old utimes */
{ 0, }, /* 139 is obsolete 4.2 sigreturn */
- /* 140 */ { 0, adjtime },
+ { 0, }, /* 140 is old adjtime */
{ 0, }, /*
CVS commit: src/usr.bin/make
Module Name:src
Committed By: sjg
Date: Wed Apr 7 00:11:28 UTC 2010
Modified Files:
src/usr.bin/make: compat.c job.c main.c make.1 make.c make.h nonints.h
parse.c
Log Message:
Add:
.error message
.warning message
based on FreeBSD implementation.
add .info while were at it.
.ERROR: a target to run on error.
We pass the failing GNode to PrintOnError so it can set
.ERROR_TARGET.
.MAKE.MAKEFILE_PREFERENCE
As a means to control make's list of prefered makefile names.
(Default: makefile Makefile)
.MAKE.DEPENDFILE
Names the file to read dependencies from
(Default .depend)
.MAKE.MODE
Processed after all makefiles are read.
Can put make into compat mode (more to come).
Fix:
compat.c: Error code should not be sent to debug_file.
Make_DoAllVar: use DONE_ALLSRC to avoid processing a node multiple times.
ReadMakefile: we can simply use doing_depend to control setting MAKEFILE.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/usr.bin/make/compat.c
cvs rdiff -u -r1.146 -r1.147 src/usr.bin/make/job.c
cvs rdiff -u -r1.175 -r1.176 src/usr.bin/make/main.c
cvs rdiff -u -r1.167 -r1.168 src/usr.bin/make/make.1
cvs rdiff -u -r1.78 -r1.79 src/usr.bin/make/make.c
cvs rdiff -u -r1.79 -r1.80 src/usr.bin/make/make.h
cvs rdiff -u -r1.57 -r1.58 src/usr.bin/make/nonints.h
cvs rdiff -u -r1.160 -r1.161 src/usr.bin/make/parse.c
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/compat.c
diff -u src/usr.bin/make/compat.c:1.76 src/usr.bin/make/compat.c:1.77
--- src/usr.bin/make/compat.c:1.76 Sun Feb 22 07:33:00 2009
+++ src/usr.bin/make/compat.c Wed Apr 7 00:11:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: compat.c,v 1.76 2009/02/22 07:33:00 dholland Exp $ */
+/* $NetBSD: compat.c,v 1.77 2010/04/07 00:11:27 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: compat.c,v 1.76 2009/02/22 07:33:00 dholland Exp $;
+static char rcsid[] = $NetBSD: compat.c,v 1.77 2010/04/07 00:11:27 sjg Exp $;
#else
#include sys/cdefs.h
#ifndef lint
#if 0
static char sccsid[] = @(#)compat.c 8.2 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: compat.c,v 1.76 2009/02/22 07:33:00 dholland Exp $);
+__RCSID($NetBSD: compat.c,v 1.77 2010/04/07 00:11:27 sjg Exp $);
#endif
#endif /* not lint */
#endif
@@ -407,7 +407,7 @@
}
fprintf(debug_file, \n);
}
- fprintf(debug_file, *** Error code %d, status);
+ printf(*** Error code %d, status);
}
} else {
status = WTERMSIG(reason); /* signaled */
@@ -574,7 +574,7 @@
} else if (keepgoing) {
pgn-flags = ~REMAKE;
} else {
- PrintOnError(\n\nStop.);
+ PrintOnError(gn, \n\nStop.);
exit(1);
}
} else if (gn-made == ERROR) {
@@ -665,7 +665,7 @@
if (gn != NULL) {
Compat_Make(gn, gn);
if (gn-made == ERROR) {
-PrintOnError(\n\nStop.);
+PrintOnError(gn, \n\nStop.);
exit(1);
}
}
@@ -706,7 +706,7 @@
if (errors == 0) {
Compat_Make(ENDNode, ENDNode);
if (gn-made == ERROR) {
- PrintOnError(\n\nStop.);
+ PrintOnError(gn, \n\nStop.);
exit(1);
}
}
Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.146 src/usr.bin/make/job.c:1.147
--- src/usr.bin/make/job.c:1.146 Fri Jun 26 01:26:32 2009
+++ src/usr.bin/make/job.c Wed Apr 7 00:11:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.146 2009/06/26 01:26:32 sjg Exp $ */
+/* $NetBSD: job.c,v 1.147 2010/04/07 00:11:27 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: job.c,v 1.146 2009/06/26 01:26:32 sjg Exp $;
+static char rcsid[] = $NetBSD: job.c,v 1.147 2010/04/07 00:11:27 sjg Exp $;
#else
#include sys/cdefs.h
#ifndef lint
#if 0
static char sccsid[] = @(#)job.c 8.2 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: job.c,v 1.146 2009/06/26 01:26:32 sjg Exp $);
+__RCSID($NetBSD: job.c,v 1.147 2010/04/07 00:11:27 sjg Exp $);
#endif
#endif /* not lint */
#endif
@@ -1225,8 +1225,8 @@
static const char msg[] = : don't know how to make;
if (gn-flags FROM_DEPEND) {
- fprintf(stdout, %s: ignoring stale .depend for %s\n,
- progname, gn-name);
+ fprintf(stdout, %s: ignoring stale %s for %s\n,
+ progname, makeDependfile, gn-name);
return TRUE;
}
@@ -1897,7 +1897,7 @@
#else
Compat_Make(targ, targ);
if (targ-made == ERROR) {
- PrintOnError(\n\nStop.);
+ PrintOnError(targ, \n\nStop.);
exit(1);
}
#endif
@@ -2227,7 +2227,7 @@
if (begin != NULL) {
JobRun(begin);
if (begin-made == ERROR) {
- PrintOnError(\n\nStop.);
+ PrintOnError(begin, \n\nStop.);
exit(1);
