CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Fri Dec 27 08:39:56 UTC 2013 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add some Marvell 88SE9xxx devices. To generate a diff of this commit: cvs rdiff -u -r1.1173 -r1.1174 src/sys/dev/pci/pcidevs 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.1173 src/sys/dev/pci/pcidevs:1.1174 --- src/sys/dev/pci/pcidevs:1.1173 Wed Dec 25 16:04:54 2013 +++ src/sys/dev/pci/pcidevs Fri Dec 27 08:39:56 2013 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1173 2013/12/25 16:04:54 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1174 2013/12/27 08:39:56 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -2332,9 +2332,17 @@ product MARVELL MV78260 0x7826 MV78260 product MARVELL MV78460 0x7846 MV78460 SoC Armada XP product MARVELL 88W8660 0x8660 88W8660 SoC Orion1 +product MARVELL2 88SE9120 0x9120 88SE9120 SATA product MARVELL2 88SE9123 0x9123 88SE9123 SATA II PCI-E AHCI Controller product MARVELL2 88SE9125 0x9125 88SE9125 SATA III PCI-E AHCI Controller product MARVELL2 88SE9128 0x91a3 88SE9128 SATA +product MARVELL2 88SE9172 0x9172 88SE9172 SATA +product MARVELL2 88SE9182 0x9182 88SE9182 SATA +product MARVELL2 88SE9183 0x9183 88SE9183 SATA +product MARVELL2 88SE9215 0x9215 88SE9215 SATA +product MARVELL2 88SE9220 0x9220 88SE9220 SATA +product MARVELL2 88SE9230 0x9230 88SE9230 SATA +product MARVELL2 88SE9235 0x9235 88SE9235 SATA /* Global Sun Tech products */ product GLOBALSUN GL24110P 0x1101 GL24110P PCI IEEE 802.11b
CVS commit: src/sys/arch/arm
Module Name:src
Committed By: matt
Date: Fri Dec 27 12:16:01 UTC 2013
Modified Files:
src/sys/arch/arm/include: armreg.h
src/sys/arch/arm/vfp: vfp_init.c
Log Message:
Switch to using FP instructions instead of cp10/11 instructions.
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/arm/include/armreg.h
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/vfp/vfp_init.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/include/armreg.h
diff -u src/sys/arch/arm/include/armreg.h:1.83 src/sys/arch/arm/include/armreg.h:1.84
--- src/sys/arch/arm/include/armreg.h:1.83 Sat Sep 7 00:32:33 2013
+++ src/sys/arch/arm/include/armreg.h Fri Dec 27 12:16:01 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: armreg.h,v 1.83 2013/09/07 00:32:33 matt Exp $ */
+/* $NetBSD: armreg.h,v 1.84 2013/12/27 12:16:01 matt Exp $ */
/*
* Copyright (c) 1998, 2001 Ben Harris
@@ -650,6 +650,20 @@ static inline void armreg_##name##_write
__asm __volatile(mcr __insnstring :: r(__val)); \
}
+#define ARMREG_READ_INLINE2(name, __insnstring) \
+static inline uint32_t armreg_##name##_read(void) \
+{\
+ uint32_t __rv; \
+ __asm __volatile(__insnstring : =r(__rv)); \
+ return __rv; \
+}
+
+#define ARMREG_WRITE_INLINE2(name, __insnstring) \
+static inline void armreg_##name##_write(uint32_t __val) \
+{\
+ __asm __volatile(__insnstring :: r(__val)); \
+}
+
#define ARMREG_READ64_INLINE(name, __insnstring) \
static inline uint64_t armreg_##name##_read(void) \
{\
@@ -665,17 +679,17 @@ static inline void armreg_##name##_write
}
/* cp10 registers */
-ARMREG_READ_INLINE(fpsid, p10,7,%0,c0,c0,0) /* VFP System ID */
-ARMREG_READ_INLINE(fpscr, p10,7,%0,c1,c0,0) /* VFP Status/Control Register */
-ARMREG_WRITE_INLINE(fpscr, p10,7,%0,c1,c0,0) /* VFP Status/Control Register */
-ARMREG_READ_INLINE(mvfr1, p10,7,%0,c6,c0,0) /* Media and VFP Feature Register 1 */
-ARMREG_READ_INLINE(mvfr0, p10,7,%0,c7,c0,0) /* Media and VFP Feature Register 0 */
-ARMREG_READ_INLINE(fpexc, p10,7,%0,c8,c0,0) /* VFP Exception Register */
-ARMREG_WRITE_INLINE(fpexc, p10,7,%0,c8,c0,0) /* VFP Exception Register */
-ARMREG_READ_INLINE(fpinst, p10,7,%0,c9,c0,0) /* VFP Exception Instruction */
-ARMREG_WRITE_INLINE(fpinst, p10,7,%0,c9,c0,0) /* VFP Exception Instruction */
-ARMREG_READ_INLINE(fpinst2, p10,7,%0,c10,c0,0) /* VFP Exception Instruction 2 */
-ARMREG_WRITE_INLINE(fpinst2, p10,7,%0,c10,c0,0) /* VFP Exception Instruction 2 */
+ARMREG_READ_INLINE2(fpsid, vmrs\t%0, fpsid) /* VFP System ID */
+ARMREG_READ_INLINE2(fpscr, vmrs\t%0, fpscr) /* VFP Status/Control Register */
+ARMREG_WRITE_INLINE2(fpscr, vmsr\tfpscr, %0) /* VFP Status/Control Register */
+ARMREG_READ_INLINE2(mvfr1, vmrs\t%0, mvfr1) /* Media and VFP Feature Register 1 */
+ARMREG_READ_INLINE2(mvfr0, vmrs\t%0, mvfr0) /* Media and VFP Feature Register 0 */
+ARMREG_READ_INLINE2(fpexc, vmrs\t%0, fpexc) /* VFP Exception Register */
+ARMREG_WRITE_INLINE2(fpexc, vmsr\tfpexc, %0) /* VFP Exception Register */
+ARMREG_READ_INLINE2(fpinst, fmrx\t%0, fpinst) /* VFP Exception Instruction */
+ARMREG_WRITE_INLINE2(fpinst, fmxr\tfpinst, %0) /* VFP Exception Instruction */
+ARMREG_READ_INLINE2(fpinst2, fmrx\t%0, fpinst2) /* VFP Exception Instruction 2 */
+ARMREG_WRITE_INLINE2(fpinst2, fmxr\tfpinst2, %0) /* VFP Exception Instruction 2 */
/* cp15 c0 registers */
ARMREG_READ_INLINE(midr, p15,0,%0,c0,c0,0) /* Main ID Register */
Index: src/sys/arch/arm/vfp/vfp_init.c
diff -u src/sys/arch/arm/vfp/vfp_init.c:1.28 src/sys/arch/arm/vfp/vfp_init.c:1.29
--- src/sys/arch/arm/vfp/vfp_init.c:1.28 Sat Dec 14 15:47:18 2013
+++ src/sys/arch/arm/vfp/vfp_init.c Fri Dec 27 12:16:01 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vfp_init.c,v 1.28 2013/12/14 15:47:18 matt Exp $ */
+/* $NetBSD: vfp_init.c,v 1.29 2013/12/27 12:16:01 matt Exp $ */
/*
* Copyright (c) 2008 ARM Ltd
@@ -49,19 +49,24 @@ extern int cpu_neon_present;
#ifdef FPU_VFP
+#ifdef CPU_CORTEX
+__asm(.fpu\tvfpv4);
+#else
+__asm(.fpu\tvfp);
+#endif
+
/* FLDMD X, {d0-d15} */
static inline void
load_vfpregs_lo(const uint64_t *p)
{
- /* vldmia rN, {d0-d15} */
- __asm __volatile(ldc\tp11, c0, [%0], {32} :: r (p) : memory);
+ __asm __volatile(vldmia %0, {d0-d15} :: r (p) : memory);
}
/* FSTMD X, {d0-d15} */
static inline void
save_vfpregs_lo(uint64_t *p)
{
- __asm __volatile(stc\tp11, c0, [%0], {32} :: r (p) : memory);
+ __asm __volatile(vstmia %0, {d0-d15} :: r (p) : memory);
}
#ifdef CPU_CORTEX
@@ -69,14 +74,14 @@ save_vfpregs_lo(uint64_t *p)
static inline void
load_vfpregs_hi(const uint64_t *p)
{
- __asm __volatile(ldcl\tp11, c0, [%0], {32} :: r (p[16]) : memory);
+ __asm __volatile(vldmia\t%0, {d16-d31} :: r (p[16]) : memory);
}
/* FLDMD X, {d16-d31} */
static inline void
save_vfpregs_hi(uint64_t *p)
{
- __asm __volatile(stcl\tp11, c0, [%0], {32} :: r (p[16]) : memory);
+
CVS commit: src/sys/compat/linux/arch/alpha
Module Name:src
Committed By: njoly
Date: Fri Dec 27 14:17:32 UTC 2013
Modified Files:
src/sys/compat/linux/arch/alpha: linux_syscall.h linux_syscallargs.h
linux_syscalls.c linux_sysent.c
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/compat/linux/arch/alpha/linux_syscall.h \
src/sys/compat/linux/arch/alpha/linux_sysent.c
cvs rdiff -u -r1.86 -r1.87 \
src/sys/compat/linux/arch/alpha/linux_syscallargs.h
cvs rdiff -u -r1.88 -r1.89 src/sys/compat/linux/arch/alpha/linux_syscalls.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/compat/linux/arch/alpha/linux_syscall.h
diff -u src/sys/compat/linux/arch/alpha/linux_syscall.h:1.87 src/sys/compat/linux/arch/alpha/linux_syscall.h:1.88
--- src/sys/compat/linux/arch/alpha/linux_syscall.h:1.87 Sun Dec 8 15:56:12 2013
+++ src/sys/compat/linux/arch/alpha/linux_syscall.h Fri Dec 27 14:17:32 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscall.h,v 1.87 2013/12/08 15:56:12 njoly Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.88 2013/12/27 14:17:32 njoly Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.81 2013/12/08 15:55:10 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.82 2013/12/27 14:17:11 njoly Exp
*/
#ifndef _LINUX_SYS_SYSCALL_H_
@@ -594,6 +594,15 @@
/* syscall: tgkill ret: int args: int int int */
#define LINUX_SYS_tgkill 424
+/* syscall: stat64 ret: int args: const char * struct linux_stat64 * */
+#define LINUX_SYS_stat64 425
+
+/* syscall: lstat64 ret: int args: const char * struct linux_stat64 * */
+#define LINUX_SYS_lstat64 426
+
+/* syscall: fstat64 ret: int args: int struct linux_stat64 * */
+#define LINUX_SYS_fstat64 427
+
/* syscall: openat ret: int args: int const char * int ... */
#define LINUX_SYS_openat 450
@@ -606,6 +615,9 @@
/* syscall: fchownat ret: int args: int const char * uid_t gid_t int */
#define LINUX_SYS_fchownat 453
+/* syscall: fstatat64 ret: int args: int const char * struct linux_stat64 * int */
+#define LINUX_SYS_fstatat64 455
+
/* syscall: unlinkat ret: int args: int const char * int */
#define LINUX_SYS_unlinkat 456
Index: src/sys/compat/linux/arch/alpha/linux_sysent.c
diff -u src/sys/compat/linux/arch/alpha/linux_sysent.c:1.87 src/sys/compat/linux/arch/alpha/linux_sysent.c:1.88
--- src/sys/compat/linux/arch/alpha/linux_sysent.c:1.87 Sun Dec 8 15:56:12 2013
+++ src/sys/compat/linux/arch/alpha/linux_sysent.c Fri Dec 27 14:17:32 2013
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_sysent.c,v 1.87 2013/12/08 15:56:12 njoly Exp $ */
+/* $NetBSD: linux_sysent.c,v 1.88 2013/12/27 14:17:32 njoly Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.81 2013/12/08 15:55:10 njoly Exp
+ * created from NetBSD: syscalls.master,v 1.82 2013/12/27 14:17:11 njoly Exp
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: linux_sysent.c,v 1.87 2013/12/08 15:56:12 njoly Exp $);
+__KERNEL_RCSID(0, $NetBSD: linux_sysent.c,v 1.88 2013/12/27 14:17:32 njoly Exp $);
#if defined(_KERNEL_OPT)
#include opt_sysv.h
@@ -920,12 +920,12 @@ struct sysent linux_sysent[] = {
linux_sys_nosys }, /* 423 = unimplemented semtimedop */
{ ns(struct linux_sys_tgkill_args), 0,
(sy_call_t *)linux_sys_tgkill }, /* 424 = tgkill */
- { 0, 0, 0,
- linux_sys_nosys }, /* 425 = unimplemented stat64 */
- { 0, 0, 0,
- linux_sys_nosys }, /* 426 = unimplemented lstat64 */
- { 0, 0, 0,
- linux_sys_nosys }, /* 427 = unimplemented fstat64 */
+ { ns(struct linux_sys_stat64_args), SYCALL_ARG_PTR,
+ (sy_call_t *)linux_sys_stat64 }, /* 425 = stat64 */
+ { ns(struct linux_sys_lstat64_args), SYCALL_ARG_PTR,
+ (sy_call_t *)linux_sys_lstat64 }, /* 426 = lstat64 */
+ { ns(struct linux_sys_fstat64_args), SYCALL_ARG_PTR,
+ (sy_call_t *)linux_sys_fstat64 }, /* 427 = fstat64 */
{ 0, 0, 0,
linux_sys_nosys }, /* 428 = unimplemented vserver */
{ 0, 0, 0,
@@ -980,8 +980,8 @@ struct sysent linux_sysent[] = {
(sy_call_t *)linux_sys_fchownat }, /* 453 = fchownat */
{ 0, 0, 0,
linux_sys_nosys }, /* 454 = unimplemented futimesat */
- { 0, 0, 0,
- linux_sys_nosys }, /* 455 = unimplemented { int | linux_sys | | fstatat64 ( int fd , const char * path , struct linux_stat64 * sp , int flag ) ; } */
+ { ns(struct linux_sys_fstatat64_args), SYCALL_ARG_PTR,
+ (sy_call_t *)linux_sys_fstatat64 }, /* 455 = fstatat64 */
{ ns(struct linux_sys_unlinkat_args), SYCALL_ARG_PTR,
(sy_call_t *)linux_sys_unlinkat }, /* 456 = unlinkat */
{ ns(struct sys_renameat_args), SYCALL_ARG_PTR,
Index: src/sys/compat/linux/arch/alpha/linux_syscallargs.h
diff -u src/sys/compat/linux/arch/alpha/linux_syscallargs.h:1.86
CVS commit: src/sys/compat/linux
Module Name:src
Committed By: njoly
Date: Fri Dec 27 14:17:11 UTC 2013
Modified Files:
src/sys/compat/linux/arch/alpha: linux_types.h syscalls.master
src/sys/compat/linux/common: linux_file64.c
Log Message:
Add struct linux_stat64 definition for alpha, and enable syscalls that
use it.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/compat/linux/arch/alpha/linux_types.h
cvs rdiff -u -r1.81 -r1.82 src/sys/compat/linux/arch/alpha/syscalls.master
cvs rdiff -u -r1.54 -r1.55 src/sys/compat/linux/common/linux_file64.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/compat/linux/arch/alpha/linux_types.h
diff -u src/sys/compat/linux/arch/alpha/linux_types.h:1.6 src/sys/compat/linux/arch/alpha/linux_types.h:1.7
--- src/sys/compat/linux/arch/alpha/linux_types.h:1.6 Sun Jan 11 02:45:48 2009
+++ src/sys/compat/linux/arch/alpha/linux_types.h Fri Dec 27 14:17:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_types.h,v 1.6 2009/01/11 02:45:48 christos Exp $ */
+/* $NetBSD: linux_types.h,v 1.7 2013/12/27 14:17:11 njoly Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -67,4 +67,30 @@ struct linux_stat {
unsigned int lst_gen; /* unused */
};
+/* The stat64 structure increases the size of dev_t, blkcnt_t, adds
+ nanosecond resolution times, and padding for expansion. */
+#define LINUX_STAT64_HAS_NSEC 1
+struct linux_stat64 {
+ unsigned long lst_dev;
+ unsigned long lst_ino;
+ unsigned long lst_rdev;
+ long lst_size;
+ unsigned long lst_blocks;
+
+ unsigned int lst_mode;
+ unsigned int lst_uid;
+ unsigned int lst_gid;
+ unsigned int lst_blksize;
+ unsigned int lst_nlink;
+ unsigned int __pad0;
+
+ unsigned long lst_atime;
+ unsigned long lst_atime_nsec;
+ unsigned long lst_mtime;
+ unsigned long lst_mtime_nsec;
+ unsigned long lst_ctime;
+ unsigned long lst_ctime_nsec;
+ long __pad1[3];
+};
+
#endif /* !_ALPHA_LINUX_TYPES_H */
Index: src/sys/compat/linux/arch/alpha/syscalls.master
diff -u src/sys/compat/linux/arch/alpha/syscalls.master:1.81 src/sys/compat/linux/arch/alpha/syscalls.master:1.82
--- src/sys/compat/linux/arch/alpha/syscalls.master:1.81 Sun Dec 8 15:55:10 2013
+++ src/sys/compat/linux/arch/alpha/syscalls.master Fri Dec 27 14:17:11 2013
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.81 2013/12/08 15:55:10 njoly Exp $
+ $NetBSD: syscalls.master,v 1.82 2013/12/27 14:17:11 njoly Exp $
;
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -675,9 +675,12 @@
struct linux_timespec *rmtp); }
423 UNIMPL semtimedop
424 STD { int|linux_sys||tgkill(int tgid, int tid, int sig); }
-425 UNIMPL stat64
-426 UNIMPL lstat64
-427 UNIMPL fstat64
+425 STD { int|linux_sys||stat64(const char *path, \
+ struct linux_stat64 *sp); }
+426 STD { int|linux_sys||lstat64(const char *path, \
+ struct linux_stat64 *sp); }
+427 STD { int|linux_sys||fstat64(int fd, \
+ struct linux_stat64 *sp); }
428 UNIMPL vserver
429 UNIMPL mbind
430 UNIMPL get_mempolicy
@@ -709,7 +712,7 @@
453 STD { int|linux_sys||fchownat(int fd, const char *path, \
uid_t owner, gid_t group, int flag); }
454 UNIMPL futimesat
-455 UNIMPL { int|linux_sys||fstatat64(int fd, const char *path, \
+455 STD { int|linux_sys||fstatat64(int fd, const char *path, \
struct linux_stat64 *sp, int flag); }
456 STD { int|linux_sys||unlinkat(int fd, const char *path, \
int flag); }
Index: src/sys/compat/linux/common/linux_file64.c
diff -u src/sys/compat/linux/common/linux_file64.c:1.54 src/sys/compat/linux/common/linux_file64.c:1.55
--- src/sys/compat/linux/common/linux_file64.c:1.54 Mon Nov 18 01:32:52 2013
+++ src/sys/compat/linux/common/linux_file64.c Fri Dec 27 14:17:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_file64.c,v 1.54 2013/11/18 01:32:52 chs Exp $ */
+/* $NetBSD: linux_file64.c,v 1.55 2013/12/27 14:17:11 njoly Exp $ */
/*-
* Copyright (c) 1995, 1998, 2000, 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: linux_file64.c,v 1.54 2013/11/18 01:32:52 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: linux_file64.c,v 1.55 2013/12/27 14:17:11 njoly Exp $);
#include sys/param.h
#include sys/systm.h
@@ -67,8 +67,6 @@ __KERNEL_RCSID(0, $NetBSD: linux_file64
#include compat/linux/linux_syscallargs.h
-#ifndef alpha
-
static void bsd_to_linux_stat(struct stat *, struct linux_stat64 *);
/*
@@ -197,6 +195,7 @@ linux_sys_fstatat64(struct lwp *l, const
return copyout(tmplst, SCARG(uap, sp), sizeof tmplst);
}
+#ifndef __alpha__
int
linux_sys_truncate64(struct lwp *l, const struct linux_sys_truncate64_args *uap, register_t *retval)
{
@@ -230,7 +229,7 @@ linux_sys_ftruncate64(struct lwp *l, con
return sys_ftruncate(l, ta, retval);
}
-#endif /* !alpha */
+#endif /* __alpha__ */
/*
* Linux 'readdir' call. This code is mostly taken from the
CVS commit: src/sys/compat/linux/common
Module Name:src
Committed By: njoly
Date: Fri Dec 27 15:10:53 UTC 2013
Modified Files:
src/sys/compat/linux/common: linux_ipccall.c linux_ipccall.h
linux_socketcall.c linux_socketcall.h
Log Message:
Rename ipcall/socketcall specific defines to avoid conflict with
syscalls definitions. No functional changes.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/compat/linux/common/linux_ipccall.c
cvs rdiff -u -r1.15 -r1.16 src/sys/compat/linux/common/linux_ipccall.h
cvs rdiff -u -r1.42 -r1.43 src/sys/compat/linux/common/linux_socketcall.c
cvs rdiff -u -r1.16 -r1.17 src/sys/compat/linux/common/linux_socketcall.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/compat/linux/common/linux_ipccall.c
diff -u src/sys/compat/linux/common/linux_ipccall.c:1.32 src/sys/compat/linux/common/linux_ipccall.c:1.33
--- src/sys/compat/linux/common/linux_ipccall.c:1.32 Tue Aug 18 11:22:09 2009
+++ src/sys/compat/linux/common/linux_ipccall.c Fri Dec 27 15:10:53 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_ipccall.c,v 1.32 2009/08/18 11:22:09 drochner Exp $ */
+/* $NetBSD: linux_ipccall.c,v 1.33 2013/12/27 15:10:53 njoly Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: linux_ipccall.c,v 1.32 2009/08/18 11:22:09 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: linux_ipccall.c,v 1.33 2013/12/27 15:10:53 njoly Exp $);
#if defined(_KERNEL_OPT)
#include opt_sysv.h
@@ -91,11 +91,11 @@ linux_sys_ipc(struct lwp *l, const struc
switch (SCARG(uap, what)) {
#ifdef SYSVSEM
- case LINUX_SYS_semop:
+ case LINUX_SYS_SEMOP:
return linux_semop(l, uap, retval);
- case LINUX_SYS_semget:
+ case LINUX_SYS_SEMGET:
return linux_semget(l, uap, retval);
- case LINUX_SYS_semctl: {
+ case LINUX_SYS_SEMCTL: {
struct linux_sys_semctl_args bsa;
union linux_semun arg;
int error;
@@ -112,13 +112,13 @@ linux_sys_ipc(struct lwp *l, const struc
}
#endif
#ifdef SYSVMSG
- case LINUX_SYS_msgsnd:
+ case LINUX_SYS_MSGSND:
return linux_msgsnd(l, uap, retval);
- case LINUX_SYS_msgrcv:
+ case LINUX_SYS_MSGRCV:
return linux_msgrcv(l, uap, retval);
- case LINUX_SYS_msgget:
+ case LINUX_SYS_MSGGET:
return linux_msgget(l, uap, retval);
- case LINUX_SYS_msgctl: {
+ case LINUX_SYS_MSGCTL: {
struct linux_sys_msgctl_args bsa;
SCARG(bsa, msqid) = SCARG(uap, a1);
@@ -129,7 +129,7 @@ linux_sys_ipc(struct lwp *l, const struc
}
#endif
#ifdef SYSVSHM
- case LINUX_SYS_shmat: {
+ case LINUX_SYS_SHMAT: {
struct linux_sys_shmat_args bsa;
SCARG(bsa, shmid) = SCARG(uap, a1);
@@ -140,11 +140,11 @@ linux_sys_ipc(struct lwp *l, const struc
return linux_sys_shmat(l, bsa, retval);
}
- case LINUX_SYS_shmdt:
+ case LINUX_SYS_SHMDT:
return linux_shmdt(l, uap, retval);
- case LINUX_SYS_shmget:
+ case LINUX_SYS_SHMGET:
return linux_shmget(l, uap, retval);
- case LINUX_SYS_shmctl: {
+ case LINUX_SYS_SHMCTL: {
struct linux_sys_shmctl_args bsa;
SCARG(bsa, shmid) = SCARG(uap, a1);
Index: src/sys/compat/linux/common/linux_ipccall.h
diff -u src/sys/compat/linux/common/linux_ipccall.h:1.15 src/sys/compat/linux/common/linux_ipccall.h:1.16
--- src/sys/compat/linux/common/linux_ipccall.h:1.15 Tue Aug 18 11:22:09 2009
+++ src/sys/compat/linux/common/linux_ipccall.h Fri Dec 27 15:10:53 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_ipccall.h,v 1.15 2009/08/18 11:22:09 drochner Exp $ */
+/* $NetBSD: linux_ipccall.h,v 1.16 2013/12/27 15:10:53 njoly Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -45,17 +45,17 @@
* linux_ipc() call, and based on which the actual system calls
* are made.
*/
-#define LINUX_SYS_semop 1
-#define LINUX_SYS_semget 2
-#define LINUX_SYS_semctl 3
-#define LINUX_SYS_msgsnd 11
-#define LINUX_SYS_msgrcv 12
-#define LINUX_SYS_msgget 13
-#define LINUX_SYS_msgctl 14
-#define LINUX_SYS_shmat 21
-#define LINUX_SYS_shmdt 22
-#define LINUX_SYS_shmget 23
-#define LINUX_SYS_shmctl 24
+#define LINUX_SYS_SEMOP 1
+#define LINUX_SYS_SEMGET 2
+#define LINUX_SYS_SEMCTL 3
+#define LINUX_SYS_MSGSND 11
+#define LINUX_SYS_MSGRCV 12
+#define LINUX_SYS_MSGGET 13
+#define LINUX_SYS_MSGCTL 14
+#define LINUX_SYS_SHMAT 21
+#define LINUX_SYS_SHMDT 22
+#define LINUX_SYS_SHMGET 23
+#define LINUX_SYS_SHMCTL 24
# ifdef SYSVSEM
Index: src/sys/compat/linux/common/linux_socketcall.c
diff -u src/sys/compat/linux/common/linux_socketcall.c:1.42 src/sys/compat/linux/common/linux_socketcall.c:1.43
--- src/sys/compat/linux/common/linux_socketcall.c:1.42 Fri Jun 22 08:47:47 2012
+++ src/sys/compat/linux/common/linux_socketcall.c Fri Dec 27 15:10:53 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_socketcall.c,v 1.42 2012/06/22 08:47:47 martin Exp $ */
+/* $NetBSD: linux_socketcall.c,v 1.43 2013/12/27 15:10:53 njoly Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD
CVS commit: src/sys/compat/linux/common
Module Name:src
Committed By: njoly
Date: Fri Dec 27 16:58:50 UTC 2013
Modified Files:
src/sys/compat/linux/common: linux_termios.c
Log Message:
Add easy parts (TCOOFF/TCOON) of the TCXONC linux termios ioctl.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/compat/linux/common/linux_termios.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/compat/linux/common/linux_termios.c
diff -u src/sys/compat/linux/common/linux_termios.c:1.36 src/sys/compat/linux/common/linux_termios.c:1.37
--- src/sys/compat/linux/common/linux_termios.c:1.36 Fri Jul 4 10:13:52 2008
+++ src/sys/compat/linux/common/linux_termios.c Fri Dec 27 16:58:50 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_termios.c,v 1.36 2008/07/04 10:13:52 matthias Exp $ */
+/* $NetBSD: linux_termios.c,v 1.37 2013/12/27 16:58:50 njoly Exp $ */
/*-
* Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: linux_termios.c,v 1.36 2008/07/04 10:13:52 matthias Exp $);
+__KERNEL_RCSID(0, $NetBSD: linux_termios.c,v 1.37 2013/12/27 16:58:50 njoly Exp $);
#if defined(_KERNEL_OPT)
#include opt_ptm.h
@@ -348,6 +348,22 @@ linux_ioctl_termios(struct lwp *l, const
DPRINTF((TIOCSPTLCK %d\n, idat));
return 0;
#endif
+ case LINUX_TCXONC:
+ idat = (u_long)SCARG(uap, data);
+ switch (idat) {
+ case LINUX_TCOOFF:
+ SCARG(ia, com) = TIOCSTOP;
+ break;
+ case LINUX_TCOON:
+ SCARG(ia, com) = TIOCSTART;
+ break;
+ case LINUX_TCIOFF:
+ case LINUX_TCION:
+ default:
+ error = EINVAL;
+ goto out;
+ }
+ break;
default:
error = EINVAL;
goto out;
CVS import: src/sys/external/bsd/acpica/dist
Module Name:src Committed By: christos Date: Fri Dec 27 18:46:30 UTC 2013 Update of /cvsroot/src/sys/external/bsd/acpica/dist In directory ivanova.netbsd.org:/tmp/cvs-serv13684 Log Message: import new acpica Status: Vendor Tag: intel Release Tags: acpica-20131218 U src/sys/external/bsd/acpica/dist/changes.txt N src/sys/external/bsd/acpica/dist/Makefile U src/sys/external/bsd/acpica/dist/generate/lint/files.lnt U src/sys/external/bsd/acpica/dist/generate/lint/lint.bat U src/sys/external/bsd/acpica/dist/generate/lint/lset.bat U src/sys/external/bsd/acpica/dist/generate/lint/options.lnt U src/sys/external/bsd/acpica/dist/generate/lint/readme.txt U src/sys/external/bsd/acpica/dist/generate/lint/std16.lnt U src/sys/external/bsd/acpica/dist/generate/lint/std32.lnt U src/sys/external/bsd/acpica/dist/generate/lint/std64.lnt N src/sys/external/bsd/acpica/dist/generate/release/release.sh N src/sys/external/bsd/acpica/dist/generate/release/build.sh N src/sys/external/bsd/acpica/dist/generate/unix/Makefile.common U src/sys/external/bsd/acpica/dist/generate/unix/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/Makefile.config N src/sys/external/bsd/acpica/dist/generate/unix/Makefile.rules U src/sys/external/bsd/acpica/dist/generate/unix/readme.txt U src/sys/external/bsd/acpica/dist/generate/unix/acpibin/Makefile N src/sys/external/bsd/acpica/dist/generate/unix/acpidump/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/acpiexec/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/acpihelp/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/acpinames/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/acpisrc/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/acpixtract/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/iasl/Makefile N src/sys/external/bsd/acpica/dist/debugger/dbconvert.c C src/sys/external/bsd/acpica/dist/debugger/dbcmds.c C src/sys/external/bsd/acpica/dist/debugger/dbdisply.c C src/sys/external/bsd/acpica/dist/debugger/dbexec.c U src/sys/external/bsd/acpica/dist/debugger/dbfileio.c U src/sys/external/bsd/acpica/dist/debugger/dbhistry.c C src/sys/external/bsd/acpica/dist/debugger/dbinput.c U src/sys/external/bsd/acpica/dist/debugger/dbmethod.c U src/sys/external/bsd/acpica/dist/debugger/dbnames.c U src/sys/external/bsd/acpica/dist/debugger/dbstats.c C src/sys/external/bsd/acpica/dist/debugger/dbutils.c U src/sys/external/bsd/acpica/dist/debugger/dbxface.c U src/sys/external/bsd/acpica/dist/tests/misc/badcode.asl U src/sys/external/bsd/acpica/dist/tests/misc/grammar.asl U src/sys/external/bsd/acpica/dist/tests/templates/templates.sh U src/sys/external/bsd/acpica/dist/tests/templates/Makefile N src/sys/external/bsd/acpica/dist/common/acgetline.c U src/sys/external/bsd/acpica/dist/common/adfile.c U src/sys/external/bsd/acpica/dist/common/adisasm.c U src/sys/external/bsd/acpica/dist/common/adwalk.c N src/sys/external/bsd/acpica/dist/common/ahpredef.c U src/sys/external/bsd/acpica/dist/common/dmextern.c U src/sys/external/bsd/acpica/dist/common/dmrestag.c U src/sys/external/bsd/acpica/dist/common/dmtable.c U src/sys/external/bsd/acpica/dist/common/dmtbdump.c C src/sys/external/bsd/acpica/dist/common/dmtbinfo.c U src/sys/external/bsd/acpica/dist/common/getopt.c U src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h U src/sys/external/bsd/acpica/dist/compiler/aslanalyze.c U src/sys/external/bsd/acpica/dist/compiler/aslbtypes.c U src/sys/external/bsd/acpica/dist/compiler/aslcodegen.c C src/sys/external/bsd/acpica/dist/compiler/aslcompile.c U src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l U src/sys/external/bsd/acpica/dist/compiler/aslcompiler.y U src/sys/external/bsd/acpica/dist/compiler/asldefine.h U src/sys/external/bsd/acpica/dist/compiler/aslerror.c N src/sys/external/bsd/acpica/dist/compiler/aslfileio.c U src/sys/external/bsd/acpica/dist/compiler/aslfiles.c U src/sys/external/bsd/acpica/dist/compiler/aslfold.c U src/sys/external/bsd/acpica/dist/compiler/aslglobal.h N src/sys/external/bsd/acpica/dist/compiler/aslhex.c U src/sys/external/bsd/acpica/dist/compiler/asllength.c U src/sys/external/bsd/acpica/dist/compiler/asllisting.c N src/sys/external/bsd/acpica/dist/compiler/asllistsup.c U src/sys/external/bsd/acpica/dist/compiler/aslload.c U src/sys/external/bsd/acpica/dist/compiler/asllookup.c U src/sys/external/bsd/acpica/dist/compiler/aslmain.c U src/sys/external/bsd/acpica/dist/compiler/aslmap.c U src/sys/external/bsd/acpica/dist/compiler/aslmessages.h N src/sys/external/bsd/acpica/dist/compiler/aslmethod.c N src/sys/external/bsd/acpica/dist/compiler/aslnamesp.c N src/sys/external/bsd/acpica/dist/compiler/asloffset.c U src/sys/external/bsd/acpica/dist/compiler/aslopcodes.c U src/sys/external/bsd/acpica/dist/compiler/asloperands.c U src/sys/external/bsd/acpica/dist/compiler/aslopt.c N src/sys/external/bsd/acpica/dist/compiler/asloptions.c U src/sys/external/bsd/acpica/dist/compiler/aslpredef.c N
CVS commit: src/sys/external/bsd/acpica/conf
Module Name:src Committed By: christos Date: Fri Dec 27 18:51:08 UTC 2013 Modified Files: src/sys/external/bsd/acpica/conf: files.acpica Log Message: amend for new files To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/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/sys/external/bsd/acpica/conf/files.acpica diff -u src/sys/external/bsd/acpica/conf/files.acpica:1.4 src/sys/external/bsd/acpica/conf/files.acpica:1.5 --- src/sys/external/bsd/acpica/conf/files.acpica:1.4 Tue Jun 28 05:16:42 2011 +++ src/sys/external/bsd/acpica/conf/files.acpica Fri Dec 27 13:51:08 2013 @@ -1,4 +1,4 @@ -# $NetBSD: files.acpica,v 1.4 2011/06/28 09:16:42 jruoho Exp $ +# $NetBSD: files.acpica,v 1.5 2013/12/27 18:51:08 christos Exp $ define acpica makeoptions acpi CPPFLAGS+=-I$S/external/bsd/acpica/dist/include @@ -50,6 +50,7 @@ file external/bsd/acpica/dist/events/evg file external/bsd/acpica/dist/events/evgpeblk.c acpica file external/bsd/acpica/dist/events/evgpeinit.c acpica file external/bsd/acpica/dist/events/evgpeutil.c acpica +file external/bsd/acpica/dist/events/evhandler.c acpica file external/bsd/acpica/dist/events/evmisc.c acpica file external/bsd/acpica/dist/events/evregion.c acpica file external/bsd/acpica/dist/events/evrgnini.c acpica @@ -87,6 +88,7 @@ file external/bsd/acpica/dist/executer/e # hardware/ file external/bsd/acpica/dist/hardware/hwacpi.c acpica +file external/bsd/acpica/dist/hardware/hwesleep.c acpica file external/bsd/acpica/dist/hardware/hwgpe.c acpica file external/bsd/acpica/dist/hardware/hwpci.c acpica file external/bsd/acpica/dist/hardware/hwregs.c acpica @@ -94,12 +96,15 @@ file external/bsd/acpica/dist/hardware/h file external/bsd/acpica/dist/hardware/hwtimer.c acpica file external/bsd/acpica/dist/hardware/hwvalid.c acpica file external/bsd/acpica/dist/hardware/hwxface.c acpica +file external/bsd/acpica/dist/hardware/hwxfsleep.c acpica # namespace/ file external/bsd/acpica/dist/namespace/nsaccess.c acpica file external/bsd/acpica/dist/namespace/nsalloc.c acpica +file external/bsd/acpica/dist/namespace/nsarguments.c acpica file external/bsd/acpica/dist/namespace/nsdump.c acpica file external/bsd/acpica/dist/namespace/nsdumpdv.c acpica +file external/bsd/acpica/dist/namespace/nsconvert.c acpica file external/bsd/acpica/dist/namespace/nseval.c acpica file external/bsd/acpica/dist/namespace/nsinit.c acpica file external/bsd/acpica/dist/namespace/nsload.c acpica @@ -107,6 +112,7 @@ file external/bsd/acpica/dist/namespace/ file external/bsd/acpica/dist/namespace/nsobject.c acpica file external/bsd/acpica/dist/namespace/nsparse.c acpica file external/bsd/acpica/dist/namespace/nspredef.c acpica +file external/bsd/acpica/dist/namespace/nsprepkg.c acpica file external/bsd/acpica/dist/namespace/nsrepair.c acpica file external/bsd/acpica/dist/namespace/nsrepair2.c acpica file external/bsd/acpica/dist/namespace/nssearch.c acpica @@ -119,7 +125,9 @@ file external/bsd/acpica/dist/namespace/ # parser/ file external/bsd/acpica/dist/parser/psargs.c acpica file external/bsd/acpica/dist/parser/psloop.c acpica +file external/bsd/acpica/dist/parser/psobject.c acpica file external/bsd/acpica/dist/parser/psopcode.c acpica +file external/bsd/acpica/dist/parser/psopinfo.c acpica file external/bsd/acpica/dist/parser/psparse.c acpica file external/bsd/acpica/dist/parser/psscope.c acpica file external/bsd/acpica/dist/parser/pstree.c acpica @@ -138,6 +146,7 @@ file external/bsd/acpica/dist/resources/ file external/bsd/acpica/dist/resources/rslist.c acpica file external/bsd/acpica/dist/resources/rsmemory.c acpica file external/bsd/acpica/dist/resources/rsmisc.c acpica +file external/bsd/acpica/dist/resources/rsserial.c acpica file external/bsd/acpica/dist/resources/rsutils.c acpica file external/bsd/acpica/dist/resources/rsxface.c acpica @@ -145,18 +154,24 @@ file external/bsd/acpica/dist/resources/ file external/bsd/acpica/dist/tables/tbfadt.c acpica file external/bsd/acpica/dist/tables/tbfind.c acpica file external/bsd/acpica/dist/tables/tbinstal.c acpica +file external/bsd/acpica/dist/tables/tbprint.c acpica file external/bsd/acpica/dist/tables/tbutils.c acpica file external/bsd/acpica/dist/tables/tbxface.c acpica +file external/bsd/acpica/dist/tables/tbxfload.c acpica file external/bsd/acpica/dist/tables/tbxfroot.c acpica # utilities/ +file external/bsd/acpica/dist/utilities/utaddress.c acpica file external/bsd/acpica/dist/utilities/utalloc.c acpica +file external/bsd/acpica/dist/utilities/utbuffer.c acpica file external/bsd/acpica/dist/utilities/utcache.c acpica file external/bsd/acpica/dist/utilities/utcopy.c acpica file external/bsd/acpica/dist/utilities/utdebug.c acpica file external/bsd/acpica/dist/utilities/utdecode.c
CVS commit: src/sys/dev/acpi/acpica
Module Name:src Committed By: christos Date: Fri Dec 27 18:53:16 UTC 2013 Modified Files: src/sys/dev/acpi/acpica: README Log Message: - remove function list that was out of date - explain magical munging so that people are not scared to update in the future. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/acpi/acpica/README 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/acpi/acpica/README diff -u src/sys/dev/acpi/acpica/README:1.4 src/sys/dev/acpi/acpica/README:1.5 --- src/sys/dev/acpi/acpica/README:1.4 Sat Jul 24 02:10:43 2010 +++ src/sys/dev/acpi/acpica/README Fri Dec 27 13:53:16 2013 @@ -1,4 +1,4 @@ -# $NetBSD: README,v 1.4 2010/07/24 06:10:43 jruoho Exp $ +# $NetBSD: README,v 1.5 2013/12/27 18:53:16 christos Exp $ This is the Intel ACPI Component Architecture, Intel's reference implementation of the core operating system ACPI support. The @@ -8,7 +8,12 @@ system as the glue between the OS and th Please, do not import an updated ACPICA snapshot from Intel unless you absolutely know what you're doing -- The Intel directory layout changes from release to release, and we must munge it (by hand) into -something sane that we can use. +something sane that we can use. The current version of munge is: + + mv source/* . + rmdir source + mv components/* . + rmdir components The routines that the operating system must provide are documented in the following document: @@ -19,32 +24,9 @@ Copies of the document may be retrieved http://www.acpica.org/download/acpica-reference.pdf -Machine-dependent code must provide at least the following routines: - -ACPI_STATUS acpi_md_OsInitialize(void); -ACPI_STATUS acpi_md_OsTerminate(void); -ACPI_STATUS acpi_md_OsGetRootPointer(UINT32 Flags, - ACPI_PHYSICAL_ADDRESS *PhysicalAddress); - -UINT8 acpi_md_OsIn8(ACPI_IO_ADDRESS InPort); -UINT16 acpi_md_OsIn16(ACPI_IO_ADDRESS InPort); -UINT32 acpi_md_OsIn32(ACPI_IO_ADDRESS InPort); - -void acpi_md_OsOut8(ACPI_IO_ADDRESS OutPort, UINT8 Value); -void acpi_md_OsOut16(ACPI_IO_ADDRESS OutPort, UINT16 Value); -void acpi_md_OsOut32(ACPI_IO_ADDRESS OutPort, UINT32 Value); - -ACPI_STATUS acpi_md_OsInstallInterruptHandler(UINT32 InterruptNumber, - OSD_HANDLER ServiceRoutine, void *Context, void **cookiep); -void acpi_md_OsRemoveInterruptHandler(void *cookie); - -ACPI_STATUS acpi_md_OsMapMemory(ACPI_PHYSICAL_ADDRESS PhysicalAddress, - UINT32 Length, void **LogicalAddress); -void acpi_md_OsUnmapMemory(void *LogicalAddress, UINT32 Length); -ACPI_STATUS acpi_md_OsGetPhysicalAddress(void *LogicalAddress, - ACPI_PHYSICAL_ADDRESS *PhysicalAddress); - -BOOLEAN acpi_md_OsReadable(void *Pointer, UINT32 Length); -BOOLEAN acpi_md_OsWritable(void *Pointer, UINT32 Length); +Structure: - -- Jason R. Thorpe thor...@wasabisystems.com +sys/external/bsd/acpica/dist The imported source +sys/external/bsd/acpica/conf The config glue +sys/dev/acpi Device drivers +sys/dev/acpica OS dependent functions that are required
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: christos Date: Fri Dec 27 18:51:44 UTC 2013 Modified Files: src/sys/dev/acpi: acpi_timer.c Log Message: constant changed name To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/dev/acpi/acpi_timer.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/acpi/acpi_timer.c diff -u src/sys/dev/acpi/acpi_timer.c:1.21 src/sys/dev/acpi/acpi_timer.c:1.22 --- src/sys/dev/acpi/acpi_timer.c:1.21 Mon Aug 8 07:27:44 2011 +++ src/sys/dev/acpi/acpi_timer.c Fri Dec 27 13:51:44 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_timer.c,v 1.21 2011/08/08 11:27:44 jmcneill Exp $ */ +/* $NetBSD: acpi_timer.c,v 1.22 2013/12/27 18:51:44 christos Exp $ */ /*- * Copyright (c) 2006 Matthias Drochner droch...@netbsd.org @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: acpi_timer.c,v 1.21 2011/08/08 11:27:44 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: acpi_timer.c,v 1.22 2013/12/27 18:51:44 christos Exp $); #include sys/types.h #include sys/systm.h @@ -45,7 +45,7 @@ static struct timecounter acpi_timecount acpitimer_read_safe, 0, 0x00ff, - PM_TIMER_FREQUENCY, + ACPI_PM_TIMER_FREQUENCY, ACPI-Safe, 900, NULL,
CVS commit: src/sys/dev/acpi/acpica
Module Name:src
Committed By: christos
Date: Fri Dec 27 18:53:25 UTC 2013
Modified Files:
src/sys/dev/acpi/acpica: OsdHardware.c OsdMisc.c OsdSchedule.c
Log Message:
Add new functions
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/acpi/acpica/OsdHardware.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/acpi/acpica/OsdMisc.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/acpi/acpica/OsdSchedule.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/acpi/acpica/OsdHardware.c
diff -u src/sys/dev/acpi/acpica/OsdHardware.c:1.8 src/sys/dev/acpi/acpica/OsdHardware.c:1.9
--- src/sys/dev/acpi/acpica/OsdHardware.c:1.8 Thu Feb 17 05:23:43 2011
+++ src/sys/dev/acpi/acpica/OsdHardware.c Fri Dec 27 13:53:25 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: OsdHardware.c,v 1.8 2011/02/17 10:23:43 jruoho Exp $ */
+/* $NetBSD: OsdHardware.c,v 1.9 2013/12/27 18:53:25 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -44,7 +44,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: OsdHardware.c,v 1.8 2011/02/17 10:23:43 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: OsdHardware.c,v 1.9 2013/12/27 18:53:25 christos Exp $);
#include sys/param.h
#include sys/device.h
@@ -125,7 +125,7 @@ AcpiOsWritePort(ACPI_IO_ADDRESS Address,
* Read a value from a memory location.
*/
ACPI_STATUS
-AcpiOsReadMemory(ACPI_PHYSICAL_ADDRESS Address, UINT32 *Value, UINT32 Width)
+AcpiOsReadMemory(ACPI_PHYSICAL_ADDRESS Address, UINT64 *Value, UINT32 Width)
{
void *LogicalAddress;
ACPI_STATUS rv = AE_OK;
@@ -147,6 +147,10 @@ AcpiOsReadMemory(ACPI_PHYSICAL_ADDRESS A
*Value = *(volatile uint32_t *) LogicalAddress;
break;
+ case 64:
+ *Value = *(volatile uint64_t *) LogicalAddress;
+ break;
+
default:
rv = AE_BAD_PARAMETER;
}
@@ -162,7 +166,7 @@ AcpiOsReadMemory(ACPI_PHYSICAL_ADDRESS A
* Write a value to a memory location.
*/
ACPI_STATUS
-AcpiOsWriteMemory(ACPI_PHYSICAL_ADDRESS Address, UINT32 Value, UINT32 Width)
+AcpiOsWriteMemory(ACPI_PHYSICAL_ADDRESS Address, UINT64 Value, UINT32 Width)
{
void *LogicalAddress;
ACPI_STATUS rv = AE_OK;
@@ -184,6 +188,10 @@ AcpiOsWriteMemory(ACPI_PHYSICAL_ADDRESS
*(volatile uint32_t *) LogicalAddress = Value;
break;
+ case 64:
+ *(volatile uint64_t *) LogicalAddress = Value;
+ break;
+
default:
rv = AE_BAD_PARAMETER;
}
Index: src/sys/dev/acpi/acpica/OsdMisc.c
diff -u src/sys/dev/acpi/acpica/OsdMisc.c:1.12 src/sys/dev/acpi/acpica/OsdMisc.c:1.13
--- src/sys/dev/acpi/acpica/OsdMisc.c:1.12 Tue Jun 28 05:09:43 2011
+++ src/sys/dev/acpi/acpica/OsdMisc.c Fri Dec 27 13:53:25 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: OsdMisc.c,v 1.12 2011/06/28 09:09:43 jruoho Exp $ */
+/* $NetBSD: OsdMisc.c,v 1.13 2013/12/27 18:53:25 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: OsdMisc.c,v 1.12 2011/06/28 09:09:43 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: OsdMisc.c,v 1.13 2013/12/27 18:53:25 christos Exp $);
#include opt_acpi.h
#include opt_ddb.h
@@ -165,6 +165,30 @@ AcpiOsPredefinedOverride(const ACPI_PRED
return AE_OK;
}
+
+/*
+ * AcpiOsPhysicalTableOverride:
+ *
+ * ExistingTable - Header of current table (probably firmware)
+ * NewAddress - Where new table address is returned
+ * (Physical address)
+ * NewTableLength - Where new table length is returned
+ *
+ * RETURN: Status, address/length of new table. Null pointer returned
+ * if no table is available to override.
+ *
+ * DESCRIPTION: Returns AE_SUPPORT, function not used in user space.
+ */
+ACPI_STATUS
+AcpiOsPhysicalTableOverride (
+ACPI_TABLE_HEADER *ExistingTable,
+ACPI_PHYSICAL_ADDRESS *NewAddress,
+UINT32 *NewTableLength)
+{
+
+ return AE_SUPPORT;
+}
+
/*
* acpi_osd_debugger:
*
Index: src/sys/dev/acpi/acpica/OsdSchedule.c
diff -u src/sys/dev/acpi/acpica/OsdSchedule.c:1.16 src/sys/dev/acpi/acpica/OsdSchedule.c:1.17
--- src/sys/dev/acpi/acpica/OsdSchedule.c:1.16 Thu Feb 17 05:35:50 2011
+++ src/sys/dev/acpi/acpica/OsdSchedule.c Fri Dec 27 13:53:25 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: OsdSchedule.c,v 1.16 2011/02/17 10:35:50 jmcneill Exp $ */
+/* $NetBSD: OsdSchedule.c,v 1.17 2013/12/27 18:53:25 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: OsdSchedule.c,v 1.16 2011/02/17 10:35:50 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: OsdSchedule.c,v 1.17 2013/12/27 18:53:25 christos Exp $);
#include sys/param.h
#include sys/malloc.h
@@ -184,3 +184,16 @@ AcpiOsGetTimer(void)
return t;
}
+
+/*
+ *
+ * AcpiOsWaitEventsComplete:
+ *
+ * Wait for all asynchronous events to complete. This implementation
+ * does nothing.
+ */
+void
+AcpiOsWaitEventsComplete(void)
+{
+ return;
+}
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: christos
Date: Fri Dec 27 18:52:17 UTC 2013
Modified Files:
src/sys/dev/acpi: acpi_wdrt.c
Log Message:
function argument changed width
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/acpi/acpi_wdrt.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/acpi/acpi_wdrt.c
diff -u src/sys/dev/acpi/acpi_wdrt.c:1.2 src/sys/dev/acpi/acpi_wdrt.c:1.3
--- src/sys/dev/acpi/acpi_wdrt.c:1.2 Mon Jan 17 12:32:11 2011
+++ src/sys/dev/acpi/acpi_wdrt.c Fri Dec 27 13:52:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wdrt.c,v 1.2 2011/01/17 17:32:11 jmcneill Exp $ */
+/* $NetBSD: acpi_wdrt.c,v 1.3 2013/12/27 18:52:16 christos Exp $ */
/*
* Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca
@@ -35,7 +35,7 @@
/* #define ACPIWDRT_DEBUG */
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_wdrt.c,v 1.2 2011/01/17 17:32:11 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_wdrt.c,v 1.3 2013/12/27 18:52:16 christos Exp $);
#include sys/param.h
#include sys/device.h
@@ -100,8 +100,8 @@ static bool acpi_wdrt_suspend(device_t,
static int acpi_wdrt_setmode(struct sysmon_wdog *);
static int acpi_wdrt_tickle(struct sysmon_wdog *);
-static ACPI_STATUS acpi_wdrt_read_control(struct acpi_wdrt_softc *, uint32_t *);
-static ACPI_STATUS acpi_wdrt_write_control(struct acpi_wdrt_softc *, uint32_t);
+static ACPI_STATUS acpi_wdrt_read_control(struct acpi_wdrt_softc *, uint64_t *);
+static ACPI_STATUS acpi_wdrt_write_control(struct acpi_wdrt_softc *, uint64_t);
#if 0
static ACPI_STATUS acpi_wdrt_read_count(struct acpi_wdrt_softc *, uint32_t *);
#endif
@@ -121,7 +121,7 @@ acpi_wdrt_match(device_t parent, cfdata_
{
ACPI_TABLE_WDRT *wdrt;
ACPI_STATUS rv;
- uint32_t val;
+ uint64_t val;
rv = AcpiGetTable(ACPI_SIG_WDRT, 1, (ACPI_TABLE_HEADER **)wdrt);
if (ACPI_FAILURE(rv))
@@ -266,7 +266,7 @@ static int
acpi_wdrt_setmode(struct sysmon_wdog *smw)
{
struct acpi_wdrt_softc *sc = smw-smw_cookie;
- uint32_t val;
+ uint64_t val;
DPRINTF((%s: %s mode 0x%x period %u\n, device_xname(sc-sc_dev),
__func__, smw-smw_mode, smw-smw_period));
@@ -314,7 +314,7 @@ static int
acpi_wdrt_tickle(struct sysmon_wdog *smw)
{
struct acpi_wdrt_softc *sc = smw-smw_cookie;
- uint32_t val;
+ uint64_t val;
DPRINTF((%s: %s mode 0x%x period %u\n, device_xname(sc-sc_dev),
__func__, smw-smw_mode, smw-smw_period));
@@ -335,7 +335,7 @@ acpi_wdrt_tickle(struct sysmon_wdog *smw
}
static ACPI_STATUS
-acpi_wdrt_read_control(struct acpi_wdrt_softc *sc, uint32_t *val)
+acpi_wdrt_read_control(struct acpi_wdrt_softc *sc, uint64_t *val)
{
ACPI_STATUS rv;
@@ -353,7 +353,7 @@ acpi_wdrt_read_control(struct acpi_wdrt_
}
static ACPI_STATUS
-acpi_wdrt_write_control(struct acpi_wdrt_softc *sc, uint32_t val)
+acpi_wdrt_write_control(struct acpi_wdrt_softc *sc, uint64_t val)
{
ACPI_STATUS rv;
CVS commit: src/doc
Module Name:src Committed By: christos Date: Fri Dec 27 18:55:41 UTC 2013 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new acpica To generate a diff of this commit: cvs rdiff -u -r1.1078 -r1.1079 src/doc/3RDPARTY cvs rdiff -u -r1.1869 -r1.1870 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1078 src/doc/3RDPARTY:1.1079 --- src/doc/3RDPARTY:1.1078 Thu Dec 26 13:54:07 2013 +++ src/doc/3RDPARTY Fri Dec 27 13:55:40 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1078 2013/12/26 18:54:07 apb Exp $ +# $NetBSD: 3RDPARTY,v 1.1079 2013/12/27 18:55:40 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -40,7 +40,7 @@ # Package: acpica -Version: 20110623 +Version: 20131218 Current Vers: 20131218 Maintainer: Intel Archive Site: http://www.acpica.org/downloads/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1869 src/doc/CHANGES:1.1870 --- src/doc/CHANGES:1.1869 Thu Dec 26 13:56:23 2013 +++ src/doc/CHANGES Fri Dec 27 13:55:40 2013 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1869 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1870 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -318,3 +318,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: on an Amiga 500. [rkujawa 20131222] libc: Update to tzcode2013i. [christos 20131226] zoneinfo: Import tzdata2013i. [apb 20131226] + acpi(4): Updated ACPICA to 20131218. [christos 20131227]
CVS import: src/external/bsd/openpam/dist
Module Name:src Committed By: christos Date: Fri Dec 27 19:16:14 UTC 2013 Update of /cvsroot/src/external/bsd/openpam/dist In directory ivanova.netbsd.org:/tmp/cvs-serv8471 Log Message: Import openpam-20130907 Status: Vendor Tag: OPENPAM Release Tags: nummularia-20130907 U src/external/bsd/openpam/dist/CREDITS U src/external/bsd/openpam/dist/README U src/external/bsd/openpam/dist/depcomp U src/external/bsd/openpam/dist/autogen.sh U src/external/bsd/openpam/dist/configure.ac U src/external/bsd/openpam/dist/config.h.in U src/external/bsd/openpam/dist/missing U src/external/bsd/openpam/dist/config.sub U src/external/bsd/openpam/dist/HISTORY U src/external/bsd/openpam/dist/RELNOTES U src/external/bsd/openpam/dist/ltmain.sh N src/external/bsd/openpam/dist/mkpkgng.in U src/external/bsd/openpam/dist/aclocal.m4 N src/external/bsd/openpam/dist/compile N src/external/bsd/openpam/dist/test-driver U src/external/bsd/openpam/dist/LICENSE U src/external/bsd/openpam/dist/INSTALL U src/external/bsd/openpam/dist/Makefile.am U src/external/bsd/openpam/dist/install-sh U src/external/bsd/openpam/dist/TODO U src/external/bsd/openpam/dist/configure U src/external/bsd/openpam/dist/Makefile.in U src/external/bsd/openpam/dist/config.guess U src/external/bsd/openpam/dist/pamgdb.in U src/external/bsd/openpam/dist/doc/Makefile.am U src/external/bsd/openpam/dist/doc/Makefile.in C src/external/bsd/openpam/dist/doc/man/openpam_subst.3 C src/external/bsd/openpam/dist/doc/man/pam_start.3 C src/external/bsd/openpam/dist/doc/man/openpam_get_feature.3 C src/external/bsd/openpam/dist/doc/man/openpam_readline.3 C src/external/bsd/openpam/dist/doc/man/pam_vinfo.3 C src/external/bsd/openpam/dist/doc/man/pam_open_session.3 C src/external/bsd/openpam/dist/doc/man/pam_vprompt.3 C src/external/bsd/openpam/dist/doc/man/pam_info.3 C src/external/bsd/openpam/dist/doc/man/openpam_straddch.3 C src/external/bsd/openpam/dist/doc/man/pam_get_user.3 C src/external/bsd/openpam/dist/doc/man/pam_putenv.3 C src/external/bsd/openpam/dist/doc/man/pam_authenticate.3 C src/external/bsd/openpam/dist/doc/man/openpam_borrow_cred.3 C src/external/bsd/openpam/dist/doc/man/pam_get_item.3 C src/external/bsd/openpam/dist/doc/man/pam_verror.3 C src/external/bsd/openpam/dist/doc/man/pam_set_data.3 C src/external/bsd/openpam/dist/doc/man/pam.3 C src/external/bsd/openpam/dist/doc/man/pam_sm_close_session.3 C src/external/bsd/openpam/dist/doc/man/pam_close_session.3 C src/external/bsd/openpam/dist/doc/man/pam_setenv.3 C src/external/bsd/openpam/dist/doc/man/pam_acct_mgmt.3 C src/external/bsd/openpam/dist/doc/man/openpam_nullconv.3 C src/external/bsd/openpam/dist/doc/man/pam_sm_chauthtok.3 C src/external/bsd/openpam/dist/doc/man/pam_strerror.3 C src/external/bsd/openpam/dist/doc/man/pam.conf.5 C src/external/bsd/openpam/dist/doc/man/openpam_readword.3 C src/external/bsd/openpam/dist/doc/man/pam_getenvlist.3 C src/external/bsd/openpam/dist/doc/man/pam_sm_authenticate.3 C src/external/bsd/openpam/dist/doc/man/pam_sm_setcred.3 C src/external/bsd/openpam/dist/doc/man/pam_setcred.3 C src/external/bsd/openpam/dist/doc/man/openpam_log.3 C src/external/bsd/openpam/dist/doc/man/pam_error.3 C src/external/bsd/openpam/dist/doc/man/openpam_restore_cred.3 C src/external/bsd/openpam/dist/doc/man/openpam_readlinev.3 C src/external/bsd/openpam/dist/doc/man/pam_get_authtok.3 C src/external/bsd/openpam/dist/doc/man/openpam_get_option.3 C src/external/bsd/openpam/dist/doc/man/openpam_ttyconv.3 C src/external/bsd/openpam/dist/doc/man/pam_getenv.3 U src/external/bsd/openpam/dist/doc/man/Makefile.in C src/external/bsd/openpam/dist/doc/man/pam_end.3 U src/external/bsd/openpam/dist/doc/man/openpam.man C src/external/bsd/openpam/dist/doc/man/openpam_set_feature.3 C src/external/bsd/openpam/dist/doc/man/openpam_set_option.3 C src/external/bsd/openpam/dist/doc/man/pam_prompt.3 C src/external/bsd/openpam/dist/doc/man/openpam_free_envlist.3 C src/external/bsd/openpam/dist/doc/man/openpam_free_data.3 C src/external/bsd/openpam/dist/doc/man/pam_get_data.3 C src/external/bsd/openpam/dist/doc/man/pam_set_item.3 C src/external/bsd/openpam/dist/doc/man/pam_conv.3 C src/external/bsd/openpam/dist/doc/man/pam_sm_acct_mgmt.3 U src/external/bsd/openpam/dist/doc/man/Makefile.am U src/external/bsd/openpam/dist/doc/man/pam.man C src/external/bsd/openpam/dist/doc/man/openpam.3 C src/external/bsd/openpam/dist/doc/man/pam_chauthtok.3 C src/external/bsd/openpam/dist/doc/man/pam_sm_open_session.3 U src/external/bsd/openpam/dist/modules/Makefile.in U src/external/bsd/openpam/dist/modules/Makefile.am U src/external/bsd/openpam/dist/modules/pam_deny/Makefile.in C src/external/bsd/openpam/dist/modules/pam_deny/pam_deny.c U src/external/bsd/openpam/dist/modules/pam_deny/Makefile.am C src/external/bsd/openpam/dist/modules/pam_unix/pam_unix.c U src/external/bsd/openpam/dist/modules/pam_unix/Makefile.in U src/external/bsd/openpam/dist/modules/pam_unix/Makefile.am U
CVS import: src/external/bsd/openpam/dist/lib
Module Name:src Committed By: christos Date: Fri Dec 27 19:27:42 UTC 2013 Update of /cvsroot/src/external/bsd/openpam/dist/lib In directory ivanova.netbsd.org:/tmp/cvs-serv25807 Log Message: Import openpam-20130907 Status: Vendor Tag: OPENPAM Release Tags: nummularia-20130907 C src/external/bsd/openpam/dist/lib/openpam_get_option.c C src/external/bsd/openpam/dist/lib/pam_set_item.c U src/external/bsd/openpam/dist/lib/openpam_set_feature.c C src/external/bsd/openpam/dist/lib/pam_get_data.c C src/external/bsd/openpam/dist/lib/openpam_log.c C src/external/bsd/openpam/dist/lib/pam_start.c C src/external/bsd/openpam/dist/lib/pam_get_mapped_username.c C src/external/bsd/openpam/dist/lib/openpam_impl.h C src/external/bsd/openpam/dist/lib/pam_setcred.c C src/external/bsd/openpam/dist/lib/openpam_free_data.c C src/external/bsd/openpam/dist/lib/openpam_debug.h C src/external/bsd/openpam/dist/lib/pam_acct_mgmt.c C src/external/bsd/openpam/dist/lib/pam_getenv.c N src/external/bsd/openpam/dist/lib/openpam_asprintf.c C src/external/bsd/openpam/dist/lib/pam_sm_set_mapped_username.c C src/external/bsd/openpam/dist/lib/openpam_static.c C src/external/bsd/openpam/dist/lib/pam_vinfo.c N src/external/bsd/openpam/dist/lib/openpam_dlfunc.h C src/external/bsd/openpam/dist/lib/pam_sm_open_session.c N src/external/bsd/openpam/dist/lib/openpam_strlcat.c C src/external/bsd/openpam/dist/lib/pam_sm_setcred.c C src/external/bsd/openpam/dist/lib/openpam_configure.c C src/external/bsd/openpam/dist/lib/pam_sm_acct_mgmt.c C src/external/bsd/openpam/dist/lib/openpam_dispatch.c C src/external/bsd/openpam/dist/lib/pam_sm_authenticate.c C src/external/bsd/openpam/dist/lib/openpam_load.c U src/external/bsd/openpam/dist/lib/openpam_features.c C src/external/bsd/openpam/dist/lib/pam_set_mapped_authtok.c C src/external/bsd/openpam/dist/lib/openpam_subst.c N src/external/bsd/openpam/dist/lib/openpam_vasprintf.h N src/external/bsd/openpam/dist/lib/openpam_cred.h C src/external/bsd/openpam/dist/lib/openpam_constants.c C src/external/bsd/openpam/dist/lib/pam_get_mapped_authtok.c U src/external/bsd/openpam/dist/lib/openpam_readlinev.c C src/external/bsd/openpam/dist/lib/pam_prompt.c C src/external/bsd/openpam/dist/lib/pam_end.c C src/external/bsd/openpam/dist/lib/pam_sm_authenticate_secondary.c C src/external/bsd/openpam/dist/lib/pam_sm_close_session.c C src/external/bsd/openpam/dist/lib/openpam_set_option.c C src/external/bsd/openpam/dist/lib/pam_set_mapped_username.c C src/external/bsd/openpam/dist/lib/openpam_strlcpy.h U src/external/bsd/openpam/dist/lib/openpam_strlcat.h C src/external/bsd/openpam/dist/lib/openpam_borrow_cred.c C src/external/bsd/openpam/dist/lib/pam_set_data.c C src/external/bsd/openpam/dist/lib/pam_get_item.c C src/external/bsd/openpam/dist/lib/pam_error.c C src/external/bsd/openpam/dist/lib/pam_authenticate_secondary.c C src/external/bsd/openpam/dist/lib/pam_sm_set_mapped_authtok.c C src/external/bsd/openpam/dist/lib/pam_authenticate.c U src/external/bsd/openpam/dist/lib/openpam_get_feature.c C src/external/bsd/openpam/dist/lib/pam_sm_get_mapped_username.c C src/external/bsd/openpam/dist/lib/openpam_ttyconv.c C src/external/bsd/openpam/dist/lib/pam_close_session.c C src/external/bsd/openpam/dist/lib/openpam_restore_cred.c N src/external/bsd/openpam/dist/lib/openpam_asprintf.h C src/external/bsd/openpam/dist/lib/pam_putenv.c C src/external/bsd/openpam/dist/lib/pam_sm_chauthtok.c U src/external/bsd/openpam/dist/lib/Makefile.in U src/external/bsd/openpam/dist/lib/openpam_readword.c C src/external/bsd/openpam/dist/lib/pam_strerror.c C src/external/bsd/openpam/dist/lib/pam_vprompt.c C src/external/bsd/openpam/dist/lib/openpam_nullconv.c C src/external/bsd/openpam/dist/lib/pam_chauthtok.c C src/external/bsd/openpam/dist/lib/pam_sm_get_mapped_authtok.c C src/external/bsd/openpam/dist/lib/pam_getenvlist.c C src/external/bsd/openpam/dist/lib/openpam_readline.c N src/external/bsd/openpam/dist/lib/openpam_strlcpy.c U src/external/bsd/openpam/dist/lib/openpam_ctype.h C src/external/bsd/openpam/dist/lib/pam_info.c C src/external/bsd/openpam/dist/lib/openpam_constants.h C src/external/bsd/openpam/dist/lib/openpam_findenv.c C src/external/bsd/openpam/dist/lib/openpam_dynamic.c C src/external/bsd/openpam/dist/lib/pam_get_user.c C src/external/bsd/openpam/dist/lib/openpam_free_envlist.c N src/external/bsd/openpam/dist/lib/openpam_vasprintf.c C src/external/bsd/openpam/dist/lib/openpam_strlcmp.h C src/external/bsd/openpam/dist/lib/openpam_check_owner_perms.c U src/external/bsd/openpam/dist/lib/openpam_straddch.c U src/external/bsd/openpam/dist/lib/Makefile.am C src/external/bsd/openpam/dist/lib/pam_open_session.c C src/external/bsd/openpam/dist/lib/pam_verror.c C src/external/bsd/openpam/dist/lib/pam_setenv.c U src/external/bsd/openpam/dist/lib/openpam_features.h C src/external/bsd/openpam/dist/lib/pam_get_authtok.c 65 conflicts created by this import. Use the following command to help the merge:
CVS commit: src/lib/libpam
Module Name:src
Committed By: christos
Date: Fri Dec 27 20:11:50 UTC 2013
Modified Files:
src/lib/libpam: Makefile.inc
src/lib/libpam/libpam: config.h
Log Message:
updates for new version
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/lib/libpam/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/lib/libpam/libpam/config.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/libpam/Makefile.inc
diff -u src/lib/libpam/Makefile.inc:1.16 src/lib/libpam/Makefile.inc:1.17
--- src/lib/libpam/Makefile.inc:1.16 Fri Apr 5 22:20:49 2013
+++ src/lib/libpam/Makefile.inc Fri Dec 27 15:11:50 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.16 2013/04/06 02:20:49 christos Exp $
+# $NetBSD: Makefile.inc,v 1.17 2013/12/27 20:11:50 christos Exp $
# Copyright 1998 Juniper Networks, Inc.
# All rights reserved.
#
@@ -38,7 +38,7 @@ MODLIBDIR=/usr/lib/${MLIBDIR}/security
MODLIBDIR=/usr/lib/security
.endif
-CPPFLAGS+= -DOPENPAM_MODULES_DIR=\${MODLIBDIR}\
+CPPFLAGS+= -DOPENPAM_MODULES_DIRECTORY=\${MODLIBDIR}\
# No debugging
#CPPFLAGS+= -DDEBUG
Index: src/lib/libpam/libpam/config.h
diff -u src/lib/libpam/libpam/config.h:1.1 src/lib/libpam/libpam/config.h:1.2
--- src/lib/libpam/libpam/config.h:1.1 Fri Apr 5 22:20:49 2013
+++ src/lib/libpam/libpam/config.h Fri Dec 27 15:11:50 2013
@@ -4,12 +4,18 @@
/* Whether loading unversioned modules support is disabled */
/* #undef DISABLE_UNVERSIONED_MODULES */
+/* Define to 1 if you have the `asprintf' function. */
+#define HAVE_ASPRINTF 1
+
/* Define to 1 if you have the crypt.h header file. */
/* #undef HAVE_CRYPT_H */
/* Define to 1 if you have the dlfcn.h header file. */
#define HAVE_DLFCN_H 1
+/* Define to 1 if you have the `dlfunc' function. */
+/* #undef HAVE_DLFUNC */
+
/* Define to 1 if you have the `fdlopen' function. */
/* #undef HAVE_FDLOPEN */
@@ -22,12 +28,18 @@
/* Define to 1 if you have the `crypt' library (-lcrypt). */
#define HAVE_LIBCRYPT 1
+/* Define to 1 if you have the `crypto' library (-lcrypto). */
+#define HAVE_LIBCRYPTO 1
+
/* Define to 1 if you have the `dl' library (-ldl). */
/* #undef HAVE_LIBDL */
/* Define to 1 if you have the memory.h header file. */
#define HAVE_MEMORY_H 1
+/* Define to 1 if you have the `setlogmask' function. */
+#define HAVE_SETLOGMASK 1
+
/* Define to 1 if you have the stdint.h header file. */
#define HAVE_STDINT_H 1
@@ -58,22 +70,23 @@
/* Define to 1 if you have the unistd.h header file. */
#define HAVE_UNISTD_H 1
+/* Define to 1 if you have the `vasprintf' function. */
+#define HAVE_VASPRINTF 1
+
#ifndef __NetBSD__
/* OpenPAM library major number */
#define LIB_MAJ 2
-#endif
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#define LT_OBJDIR .libs/
+#endif
-/* Turn debugging on by default */
+/* Turn debugging macros on */
/* #undef OPENPAM_DEBUG */
-#ifndef __NetBSD__
/* OpenPAM modules directory */
-#define OPENPAM_MODULES_DIR ${exec_prefix}/lib/
-#endif
+/* #undef OPENPAM_MODULES_DIR */
/* Name of package */
#define PACKAGE openpam
@@ -85,16 +98,16 @@
#define PACKAGE_NAME OpenPAM
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING OpenPAM 20120526
+#define PACKAGE_STRING OpenPAM 20130907
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME openpam
/* Define to the home page for this package. */
-#define PACKAGE_URL
+#define PACKAGE_URL http://www.openpam.org/;
/* Define to the version of this package. */
-#define PACKAGE_VERSION 20120526
+#define PACKAGE_VERSION 20130907
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
@@ -122,7 +135,7 @@
/* Version number of package */
-#define VERSION 20120526
+#define VERSION 20130907
/* Define to 1 if on MINIX. */
/* #undef _MINIX */
CVS commit: src/external/bsd/openpam/dist/doc/man
Module Name:src Committed By: christos Date: Fri Dec 27 20:11:27 UTC 2013 Modified Files: src/external/bsd/openpam/dist/doc/man: pam_get_authtok.3 pam_get_user.3 Log Message: remove conflicts To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/openpam/dist/doc/man/pam_get_authtok.3 \ src/external/bsd/openpam/dist/doc/man/pam_get_user.3 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/openpam/dist/doc/man/pam_get_authtok.3 diff -u src/external/bsd/openpam/dist/doc/man/pam_get_authtok.3:1.4 src/external/bsd/openpam/dist/doc/man/pam_get_authtok.3:1.5 --- src/external/bsd/openpam/dist/doc/man/pam_get_authtok.3:1.4 Fri Dec 27 15:10:20 2013 +++ src/external/bsd/openpam/dist/doc/man/pam_get_authtok.3 Fri Dec 27 15:11:26 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: pam_get_authtok.3,v 1.4 2013/12/27 20:10:20 christos Exp $ +.\ $NetBSD: pam_get_authtok.3,v 1.5 2013/12/27 20:11:26 christos Exp $ .\ .\ Generated from pam_get_authtok.c by gendoc.pl .\ Id: pam_get_authtok.c 670 2013-03-17 19:26:07Z des @@ -76,8 +76,6 @@ If there is a mismatch, .Fn pam_get_authtok will return .Dv PAM_TRY_AGAIN . - pam_get_authtok.3 -=== .Sh MODULE OPTIONS When called by a service module, .Fn pam_get_authtok @@ -122,7 +120,6 @@ value, or .Dv PAM_AUTH_ERR if there is none. .El - 1.1.1.3 .Sh RETURN VALUES The .Fn pam_get_authtok Index: src/external/bsd/openpam/dist/doc/man/pam_get_user.3 diff -u src/external/bsd/openpam/dist/doc/man/pam_get_user.3:1.4 src/external/bsd/openpam/dist/doc/man/pam_get_user.3:1.5 --- src/external/bsd/openpam/dist/doc/man/pam_get_user.3:1.4 Fri Dec 27 15:10:20 2013 +++ src/external/bsd/openpam/dist/doc/man/pam_get_user.3 Fri Dec 27 15:11:26 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: pam_get_user.3,v 1.4 2013/12/27 20:10:20 christos Exp $ +.\ $NetBSD: pam_get_user.3,v 1.5 2013/12/27 20:11:26 christos Exp $ .\ .\ Generated from pam_get_user.c by gendoc.pl .\ Id: pam_get_user.c 670 2013-03-17 19:26:07Z des @@ -64,10 +64,7 @@ This option overrides both the argument and the .Dv PAM_USER_PROMPT item. - pam_get_user.3 -=== .El - 1.1.1.3 .Sh RETURN VALUES The .Fn pam_get_user
CVS commit: src/doc
Module Name:src Committed By: christos Date: Fri Dec 27 20:13:36 UTC 2013 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new openpam To generate a diff of this commit: cvs rdiff -u -r1.1079 -r1.1080 src/doc/3RDPARTY cvs rdiff -u -r1.1870 -r1.1871 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1079 src/doc/3RDPARTY:1.1080 --- src/doc/3RDPARTY:1.1079 Fri Dec 27 13:55:40 2013 +++ src/doc/3RDPARTY Fri Dec 27 15:13:36 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1079 2013/12/27 18:55:40 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1080 2013/12/27 20:13:36 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -877,7 +877,7 @@ Location: external/bsd/openldap/dist Notes: Package: OpenPAM -Version: 20120526 (Micrampelis) +Version: 20130907 (Nummularia) Current Vers: 20130907 (Nummularia) Maintainer: Dag-Erling Smørgrav d...@freebsd.org Archive Site: http://www.openpam.org/ @@ -887,7 +887,7 @@ Responsible: christos License: BSD (3-clause) Location: external/bsd/openpam/dist Notes: -Next import will need $ Id removal.. +Next import will need moving lib sources to lib/libpam Package: openresolv Version: 3.5.6 Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1870 src/doc/CHANGES:1.1871 --- src/doc/CHANGES:1.1870 Fri Dec 27 13:55:40 2013 +++ src/doc/CHANGES Fri Dec 27 15:13:36 2013 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1870 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1871 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -319,3 +319,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: libc: Update to tzcode2013i. [christos 20131226] zoneinfo: Import tzdata2013i. [apb 20131226] acpi(4): Updated ACPICA to 20131218. [christos 20131227] + openpam: Import 20130907 (Nummularia) [christos 20131227]
CVS commit: src/lib/libc/string
Module Name:src Committed By: christos Date: Fri Dec 27 20:25:11 UTC 2013 Removed Files: src/lib/libc/string: strncat.c Log Message: moved to common To generate a diff of this commit: cvs rdiff -u -r1.12 -r0 src/lib/libc/string/strncat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/string
Module Name:src
Committed By: christos
Date: Fri Dec 27 20:24:45 UTC 2013
Added Files:
src/common/lib/libc/string: strncat.c
Log Message:
kernel needs it now too.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/common/lib/libc/string/strncat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/common/lib/libc/string/strncat.c
diff -u /dev/null src/common/lib/libc/string/strncat.c:1.1
--- /dev/null Fri Dec 27 15:24:45 2013
+++ src/common/lib/libc/string/strncat.c Fri Dec 27 15:24:45 2013
@@ -0,0 +1,76 @@
+/* $NetBSD: strncat.c,v 1.1 2013/12/27 20:24:45 christos Exp $ */
+
+/*-
+ * Copyright (c) 1990, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * 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. Neither the name of the University nor the names of its contributors
+ *may be used to endorse or promote products derived from this software
+ *without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include sys/cdefs.h
+#if defined(LIBC_SCCS) !defined(lint)
+#if 0
+static char sccsid[] = @(#)strncat.c 8.1 (Berkeley) 6/4/93;
+#else
+__RCSID($NetBSD: strncat.c,v 1.1 2013/12/27 20:24:45 christos Exp $);
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include assert.h
+#include string.h
+
+#ifdef _FORTIFY_SOURCE
+#undef strncat
+#endif
+
+/*
+ * Concatenate src on the end of dst. At most strlen(dst)+n+1 bytes
+ * are written at dst (at most n+1 bytes being appended). Return dst.
+ */
+char *
+strncat(char *dst, const char *src, size_t n)
+{
+
+ _DIAGASSERT(dst != NULL);
+ _DIAGASSERT(src != NULL);
+
+ if (n != 0) {
+ char *d = dst;
+ const char *s = src;
+
+ while (*d != 0)
+ d++;
+ do {
+ if ((*d = *s++) == 0)
+break;
+ d++;
+ } while (--n != 0);
+ *d = 0;
+ }
+ return (dst);
+}
CVS commit: src/sys/lib/libkern
Module Name:src Committed By: christos Date: Fri Dec 27 20:25:33 UTC 2013 Modified Files: src/sys/lib/libkern: Makefile.libkern libkern.h Log Message: add strncat (for acpi) To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/lib/libkern/Makefile.libkern cvs rdiff -u -r1.111 -r1.112 src/sys/lib/libkern/libkern.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/lib/libkern/Makefile.libkern diff -u src/sys/lib/libkern/Makefile.libkern:1.28 src/sys/lib/libkern/Makefile.libkern:1.29 --- src/sys/lib/libkern/Makefile.libkern:1.28 Tue Dec 10 20:24:08 2013 +++ src/sys/lib/libkern/Makefile.libkern Fri Dec 27 15:25:33 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.libkern,v 1.28 2013/12/11 01:24:08 joerg Exp $ +# $NetBSD: Makefile.libkern,v 1.29 2013/12/27 20:25:33 christos Exp $ # # Variable definitions for libkern. @@ -88,7 +88,7 @@ SRCS+= rngtest.c SRCS+= memchr.c SRCS+= strcat.c strcmp.c strcpy.c strlen.c strnlen.c -SRCS+= strncmp.c strncpy.c +SRCS+= strncat.c strncmp.c strncpy.c SRCS+= strcasecmp.c strncasecmp.c SRCS+= xlat_mbr_fstype.c Index: src/sys/lib/libkern/libkern.h diff -u src/sys/lib/libkern/libkern.h:1.111 src/sys/lib/libkern/libkern.h:1.112 --- src/sys/lib/libkern/libkern.h:1.111 Sun Dec 15 16:15:41 2013 +++ src/sys/lib/libkern/libkern.h Fri Dec 27 15:25:33 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: libkern.h,v 1.111 2013/12/15 21:15:41 pooka Exp $ */ +/* $NetBSD: libkern.h,v 1.112 2013/12/27 20:25:33 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -292,6 +292,7 @@ char *strsep(char **, const char *); /* These exist in GCC 3.x, but we don't bother. */ char *strcat(char *, const char *); char *strncpy(char *, const char *, size_t); +char *strncat(char *, const char *, size_t); int strncmp(const char *, const char *, size_t); char *strchr(const char *, int); char *strrchr(const char *, int);
CVS commit: src/common/lib/libc/string
Module Name:src Committed By: christos Date: Fri Dec 27 20:26:53 UTC 2013 Modified Files: src/common/lib/libc/string: strncat.c Log Message: make it kernel friendly. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/string/strncat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/string/strncat.c diff -u src/common/lib/libc/string/strncat.c:1.1 src/common/lib/libc/string/strncat.c:1.2 --- src/common/lib/libc/string/strncat.c:1.1 Fri Dec 27 15:24:45 2013 +++ src/common/lib/libc/string/strncat.c Fri Dec 27 15:26:53 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: strncat.c,v 1.1 2013/12/27 20:24:45 christos Exp $ */ +/* $NetBSD: strncat.c,v 1.2 2013/12/27 20:26:53 christos Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -37,12 +37,16 @@ #if 0 static char sccsid[] = @(#)strncat.c 8.1 (Berkeley) 6/4/93; #else -__RCSID($NetBSD: strncat.c,v 1.1 2013/12/27 20:24:45 christos Exp $); +__RCSID($NetBSD: strncat.c,v 1.2 2013/12/27 20:26:53 christos Exp $); #endif #endif /* LIBC_SCCS and not lint */ +#if !defined(_KERNEL) !defined(_STANDALONE) #include assert.h #include string.h +#else +#include lib/libkern/libkern.h +#endif #ifdef _FORTIFY_SOURCE #undef strncat
CVS commit: src/sys/external/bsd/acpica/conf
Module Name:src Committed By: christos Date: Fri Dec 27 20:55:03 UTC 2013 Modified Files: src/sys/external/bsd/acpica/conf: files.acpica Log Message: add missing debugger files. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/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/sys/external/bsd/acpica/conf/files.acpica diff -u src/sys/external/bsd/acpica/conf/files.acpica:1.5 src/sys/external/bsd/acpica/conf/files.acpica:1.6 --- src/sys/external/bsd/acpica/conf/files.acpica:1.5 Fri Dec 27 13:51:08 2013 +++ src/sys/external/bsd/acpica/conf/files.acpica Fri Dec 27 15:55:03 2013 @@ -1,10 +1,11 @@ -# $NetBSD: files.acpica,v 1.5 2013/12/27 18:51:08 christos Exp $ +# $NetBSD: files.acpica,v 1.6 2013/12/27 20:55:03 christos Exp $ define acpica makeoptions acpi CPPFLAGS+=-I$S/external/bsd/acpica/dist/include # debugger/ file external/bsd/acpica/dist/debugger/dbcmds.c acpica acpi_debug ddb +file external/bsd/acpica/dist/debugger/dbconvert.c acpica acpi_debug ddb file external/bsd/acpica/dist/debugger/dbdisply.c acpica acpi_debug ddb file external/bsd/acpica/dist/debugger/dbexec.c acpica acpi_debug ddb file external/bsd/acpica/dist/debugger/dbfileio.c acpica acpi_debug ddb @@ -18,11 +19,13 @@ file external/bsd/acpica/dist/debugger/d # disassembler/ file external/bsd/acpica/dist/disassembler/dmbuffer.c acpica acpi_debug ddb +file external/bsd/acpica/dist/disassembler/dmdeferred.c acpica acpi_debug ddb file external/bsd/acpica/dist/disassembler/dmnames.c acpica acpi_debug ddb file external/bsd/acpica/dist/disassembler/dmobject.c acpica acpi_debug ddb file external/bsd/acpica/dist/disassembler/dmopcode.c acpica acpi_debug ddb file external/bsd/acpica/dist/disassembler/dmresrc.c acpica acpi_debug ddb file external/bsd/acpica/dist/disassembler/dmresrcl.c acpica acpi_debug ddb +file external/bsd/acpica/dist/disassembler/dmresrcl2.c acpica acpi_debug ddb file external/bsd/acpica/dist/disassembler/dmresrcs.c acpica acpi_debug ddb file external/bsd/acpica/dist/disassembler/dmutils.c acpica acpi_debug ddb file external/bsd/acpica/dist/disassembler/dmwalk.c acpica acpi_debug ddb @@ -140,6 +143,7 @@ file external/bsd/acpica/dist/resources/ file external/bsd/acpica/dist/resources/rscalc.c acpica file external/bsd/acpica/dist/resources/rscreate.c acpica file external/bsd/acpica/dist/resources/rsdump.c acpica +file external/bsd/acpica/dist/resources/rsdumpinfo.c acpica acpi_debug ddb file external/bsd/acpica/dist/resources/rsinfo.c acpica file external/bsd/acpica/dist/resources/rsio.c acpica file external/bsd/acpica/dist/resources/rsirq.c acpica
CVS commit: src/sys/dev/acpi/acpica
Module Name:src
Committed By: christos
Date: Fri Dec 27 20:55:59 UTC 2013
Modified Files:
src/sys/dev/acpi/acpica: OsdMisc.c
Log Message:
use ACPI_DEBUG not ACPI_DEBUGGER which is used internally by acpica
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/acpi/acpica/OsdMisc.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/acpi/acpica/OsdMisc.c
diff -u src/sys/dev/acpi/acpica/OsdMisc.c:1.13 src/sys/dev/acpi/acpica/OsdMisc.c:1.14
--- src/sys/dev/acpi/acpica/OsdMisc.c:1.13 Fri Dec 27 13:53:25 2013
+++ src/sys/dev/acpi/acpica/OsdMisc.c Fri Dec 27 15:55:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: OsdMisc.c,v 1.13 2013/12/27 18:53:25 christos Exp $ */
+/* $NetBSD: OsdMisc.c,v 1.14 2013/12/27 20:55:59 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: OsdMisc.c,v 1.13 2013/12/27 18:53:25 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: OsdMisc.c,v 1.14 2013/12/27 20:55:59 christos Exp $);
#include opt_acpi.h
#include opt_ddb.h
@@ -197,7 +197,7 @@ AcpiOsPhysicalTableOverride (
void
acpi_osd_debugger(void)
{
-#ifdef ACPI_DEBUGGER
+#ifdef ACPI_DEBUG
static int beenhere;
ACPI_PARSE_OBJECT obj;
label_t acpi_jmpbuf;
CVS commit: src/sys/external/bsd/acpica/dist
Module Name:src
Committed By: christos
Date: Fri Dec 27 20:55:41 UTC 2013
Modified Files:
src/sys/external/bsd/acpica/dist/debugger: dbcmds.c dbexec.c dbinput.c
dbmethod.c dbnames.c
src/sys/external/bsd/acpica/dist/include: acdebug.h
src/sys/external/bsd/acpica/dist/parser: psopinfo.c
src/sys/external/bsd/acpica/dist/resources: rsdumpinfo.c
src/sys/external/bsd/acpica/dist/utilities: uteval.c utmisc.c
Log Message:
fix debugging build.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/acpica/dist/debugger/dbcmds.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/acpica/dist/debugger/dbexec.c \
src/sys/external/bsd/acpica/dist/debugger/dbinput.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/sys/external/bsd/acpica/dist/debugger/dbmethod.c \
src/sys/external/bsd/acpica/dist/debugger/dbnames.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/acpica/dist/include/acdebug.h
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/acpica/dist/parser/psopinfo.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/acpica/dist/utilities/uteval.c \
src/sys/external/bsd/acpica/dist/utilities/utmisc.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/bsd/acpica/dist/debugger/dbcmds.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbcmds.c:1.4 src/sys/external/bsd/acpica/dist/debugger/dbcmds.c:1.5
--- src/sys/external/bsd/acpica/dist/debugger/dbcmds.c:1.4 Fri Dec 27 13:50:56 2013
+++ src/sys/external/bsd/acpica/dist/debugger/dbcmds.c Fri Dec 27 15:55:40 2013
@@ -1027,7 +1027,7 @@ GetCrs:
* tests both the AML-Resource conversion and the Resource-AML
* conversion.
*/
-(void) AcpiDmTestResourceConversion (Node, METHOD_NAME__CRS);
+(void) AcpiDmTestResourceConversion (Node, __UNCONST(METHOD_NAME__CRS));
/* Execute _SRS with the resource list */
Index: src/sys/external/bsd/acpica/dist/debugger/dbexec.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbexec.c:1.5 src/sys/external/bsd/acpica/dist/debugger/dbexec.c:1.6
--- src/sys/external/bsd/acpica/dist/debugger/dbexec.c:1.5 Fri Dec 27 13:50:56 2013
+++ src/sys/external/bsd/acpica/dist/debugger/dbexec.c Fri Dec 27 15:55:40 2013
@@ -319,6 +319,7 @@ AcpiDbGetCacheInfo (
*
**/
+#ifdef ACPI_DEBUG_OUTPUT
static UINT32
AcpiDbGetOutstandingAllocations (
void)
@@ -335,6 +336,7 @@ AcpiDbGetOutstandingAllocations (
return (Outstanding);
}
+#endif
/***
Index: src/sys/external/bsd/acpica/dist/debugger/dbinput.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbinput.c:1.5 src/sys/external/bsd/acpica/dist/debugger/dbinput.c:1.6
--- src/sys/external/bsd/acpica/dist/debugger/dbinput.c:1.5 Fri Dec 27 13:50:56 2013
+++ src/sys/external/bsd/acpica/dist/debugger/dbinput.c Fri Dec 27 15:55:40 2013
@@ -68,7 +68,7 @@ AcpiDbSingleThread (
static void
AcpiDbDisplayCommandInfo (
-char*Command,
+const char *Command,
BOOLEAN DisplayAll);
static void
@@ -77,7 +77,7 @@ AcpiDbDisplayHelp (
static BOOLEAN
AcpiDbMatchCommandHelp (
-char*Command,
+const char *Command,
const ACPI_DB_COMMAND_HELP *Help);
@@ -335,10 +335,10 @@ static const ACPI_DB_COMMAND_HELP Acpi
static BOOLEAN
AcpiDbMatchCommandHelp (
-char*Command,
+const char *Command,
const ACPI_DB_COMMAND_HELP *Help)
{
-char*Invocation = Help-Invocation;
+const char *Invocation = Help-Invocation;
UINT32 LineCount;
@@ -397,7 +397,7 @@ AcpiDbMatchCommandHelp (
static void
AcpiDbDisplayCommandInfo (
-char*Command,
+const char *Command,
BOOLEAN DisplayAll)
{
const ACPI_DB_COMMAND_HELP *Next;
Index: src/sys/external/bsd/acpica/dist/debugger/dbmethod.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbmethod.c:1.1.1.2 src/sys/external/bsd/acpica/dist/debugger/dbmethod.c:1.2
--- src/sys/external/bsd/acpica/dist/debugger/dbmethod.c:1.1.1.2 Fri Dec 27 13:46:01 2013
+++ src/sys/external/bsd/acpica/dist/debugger/dbmethod.c Fri Dec 27 15:55:40 2013
@@ -508,7 +508,8 @@ AcpiDbWalkForExecute (
case ACPI_TYPE_STRING:
-ThisParam-String.Pointer = This is the default argument string;
+ThisParam-String.Pointer = __UNCONST(
+ This is the default argument string);
ThisParam-String.Length = ACPI_STRLEN (ThisParam-String.Pointer);
break;
Index:
CVS commit: src/sys/arch/sparc64
Module Name:src Committed By: palle Date: Fri Dec 27 21:11:20 UTC 2013 Modified Files: src/sys/arch/sparc64/include: pmap.h src/sys/arch/sparc64/sparc64: genassym.cf locore.s pmap.c Log Message: a) make the hunt through the cpus list more generic b) sun4v: ensure that the interrupt stack is mapped permanently and the TSB is setup properly - parts from OpenBSD. OK martin@ To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/arch/sparc64/include/pmap.h cvs rdiff -u -r1.66 -r1.67 src/sys/arch/sparc64/sparc64/genassym.cf cvs rdiff -u -r1.350 -r1.351 src/sys/arch/sparc64/sparc64/locore.s cvs rdiff -u -r1.282 -r1.283 src/sys/arch/sparc64/sparc64/pmap.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/sparc64/include/pmap.h diff -u src/sys/arch/sparc64/include/pmap.h:1.56 src/sys/arch/sparc64/include/pmap.h:1.57 --- src/sys/arch/sparc64/include/pmap.h:1.56 Wed Sep 11 18:27:44 2013 +++ src/sys/arch/sparc64/include/pmap.h Fri Dec 27 21:11:19 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.56 2013/09/11 18:27:44 martin Exp $ */ +/* $NetBSD: pmap.h,v 1.57 2013/12/27 21:11:19 palle Exp $ */ /*- * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -212,6 +212,12 @@ void pmap_kprotect(vaddr_t, vm_prot_t); void pmap_copy_page_phys(paddr_t, paddr_t); void pmap_zero_page_phys(paddr_t); +#ifdef SUN4V +/* sun4v specific */ +void pmap_setup_intstack_sun4v(paddr_t); +void pmap_setup_tsb_sun4v(void); +#endif + /* Installed physical memory, as discovered during bootstrap. */ extern int phys_installed_size; extern struct mem_region *phys_installed; Index: src/sys/arch/sparc64/sparc64/genassym.cf diff -u src/sys/arch/sparc64/sparc64/genassym.cf:1.66 src/sys/arch/sparc64/sparc64/genassym.cf:1.67 --- src/sys/arch/sparc64/sparc64/genassym.cf:1.66 Wed Jul 20 12:06:00 2011 +++ src/sys/arch/sparc64/sparc64/genassym.cf Fri Dec 27 21:11:19 2013 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.66 2011/07/20 12:06:00 macallan Exp $ +# $NetBSD: genassym.cf,v 1.67 2013/12/27 21:11:19 palle Exp $ # # Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -150,6 +150,7 @@ define CI_UPAID offsetof(struct cpu_info define CI_MTX_COUNT offsetof(struct cpu_info, ci_mtx_count) define CI_SPINUP offsetof(struct cpu_info, ci_spinup) define CI_PADDR offsetof(struct cpu_info, ci_paddr) +define CI_CPUID offsetof(struct cpu_info, ci_cpuid) define CI_WANT_AST offsetof(struct cpu_info, ci_want_ast) define CI_WANT_RESCHED offsetof(struct cpu_info, ci_want_resched) define CI_EINTSTACK offsetof(struct cpu_info, ci_eintstack) Index: src/sys/arch/sparc64/sparc64/locore.s diff -u src/sys/arch/sparc64/sparc64/locore.s:1.350 src/sys/arch/sparc64/sparc64/locore.s:1.351 --- src/sys/arch/sparc64/sparc64/locore.s:1.350 Fri Dec 6 21:11:06 2013 +++ src/sys/arch/sparc64/sparc64/locore.s Fri Dec 27 21:11:19 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.350 2013/12/06 21:11:06 nakayama Exp $ */ +/* $NetBSD: locore.s,v 1.351 2013/12/27 21:11:19 palle Exp $ */ /* * Copyright (c) 2006-2010 Matthew R. Green @@ -4041,32 +4041,41 @@ dostart: ENTRY_NOPROFILE(cpu_initialize) /* for cosmetic reasons - nicer backtrace */ + + /* Cache the cputyp in %l6 for later user below */ + sethi %hi(_C_LABEL(cputyp)), %l6 + ld [%l6 + %lo(_C_LABEL(cputyp))], %l6 + /* * Step 5: is no more. */ /* - * Step 6: hunt through cpus list and find the one that - * matches our UPAID. + * Step 6: hunt through cpus list and find the one that matches our cpuid */ + + call _C_LABEL(cpu_myid) ! Retrieve cpuid in %o0 + mov %g0, %o0 + sethi %hi(_C_LABEL(cpus)), %l1 - ldxa [%g0] ASI_MID_REG, %l2 LDPTR [%l1 + %lo(_C_LABEL(cpus))], %l1 - srax %l2, 17, %l2 ! Isolate UPAID from CPU reg - and %l2, 0x1f, %l2 0: - ld [%l1 + CI_UPAID], %l3 ! Load UPAID - cmp %l3, %l2 ! Does it match? + ld [%l1 + CI_CPUID], %l3 ! Load CPUID + cmp %l3, %o0 ! Does it match? bne,a,pt %icc, 0b ! no LDPTR [%l1 + CI_NEXT], %l1 ! Load next cpu_info pointer - /* * Get pointer to our cpu_info struct */ mov %l1, %l7 ! save cpu_info pointer ldx [%l1 + CI_PADDR], %l1 ! Load the interrupt stack's PA + cmp %l6, CPU_SUN4V + be,pn %icc, 3f + nop + + /* sun4u */ sethi %hi(0xa000), %l2 ! V=1|SZ=01|NFO=0|IE=0 sllx %l2, 32, %l2 ! Shift it into place @@ -4087,7 +4096,14 @@ ENTRY_NOPROFILE(cpu_initialize) /* for c stxa %l0, [%l5] ASI_DMMU ! Make DMMU point to it stxa %l2, [%g0] ASI_DMMU_DATA_IN ! Store it membar #Sync - + + ba 4f + nop +3: + /* sun4v */ + call _C_LABEL(pmap_setup_intstack_sun4v) ! Call nice C function for mapping INTSTACK + mov %l1, %o0 +4: !! Setup kernel stack (we rely on curlwp on this cpu !! being lwp0 here and it's uarea is mapped special !! and already accessible here) @@ -4125,6 +4141,12 @@ ENTRY_NOPROFILE(cpu_initialize) /* for c /* * install our TSB pointers */ +
CVS commit: src/sys/modules/lua
Module Name:src Committed By: christos Date: Fri Dec 27 22:09:43 UTC 2013 Modified Files: src/sys/modules/lua: Makefile Log Message: Remove strncat now that it is part of the kernel anyway. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/modules/lua/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/lua/Makefile diff -u src/sys/modules/lua/Makefile:1.5 src/sys/modules/lua/Makefile:1.6 --- src/sys/modules/lua/Makefile:1.5 Mon Dec 2 01:07:22 2013 +++ src/sys/modules/lua/Makefile Fri Dec 27 17:09:43 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2013/12/02 06:07:22 lneto Exp $ +# $NetBSD: Makefile,v 1.6 2013/12/27 22:09:43 christos Exp $ .include ../Makefile.inc @@ -42,7 +42,6 @@ SRCS+= lbaselib.c \ # Compatability code SRCS+= strcspn.c \ - strncat.c \ strpbrk.c \ strspn.c
CVS commit: src/sys/arch/shark/conf
Module Name:src Committed By: matt Date: Fri Dec 27 22:13:32 UTC 2013 Modified Files: src/sys/arch/shark/conf: GENERIC Log Message: Bump SYMTAB_SPACE To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 src/sys/arch/shark/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/shark/conf/GENERIC diff -u src/sys/arch/shark/conf/GENERIC:1.112 src/sys/arch/shark/conf/GENERIC:1.113 --- src/sys/arch/shark/conf/GENERIC:1.112 Tue Aug 27 03:41:59 2013 +++ src/sys/arch/shark/conf/GENERIC Fri Dec 27 22:13:32 2013 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.112 2013/08/27 03:41:59 matt Exp $ +# $NetBSD: GENERIC,v 1.113 2013/12/27 22:13:32 matt Exp $ # # Generic Shark configuration. # @@ -7,7 +7,7 @@ include arch/shark/conf/std.shark options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.112 $ +#ident GENERIC-$Revision: 1.113 $ # estimated number of users maxusers 32 @@ -153,7 +153,7 @@ options MODULAR # new style module(7) options DIAGNOSTIC # internal consistency checks #options PMAP_DEBUG # Enable pmap_debug_level code options DDB # in-kernel debugger -options SYMTAB_SPACE=62 # reserve symbol space for DDB +options SYMTAB_SPACE=69 # reserve symbol space for DDB # (needed because we boot netbsd.aout) #options DDB_ONPANIC=0 # don't run DDB at panictime #options DDB_HISTORY_SIZE=100 # Enable history editing in DDB
CVS commit: src
Module Name:src Committed By: rjs Date: Sat Dec 28 02:32:01 UTC 2013 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/debug: mi src/distrib/sets/lists/man: mi src/usr.bin: Makefile Log Message: Only build shmif_dumpbus when rump is available. To generate a diff of this commit: cvs rdiff -u -r1.1054 -r1.1055 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.1454 -r1.1455 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.214 -r1.215 src/usr.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/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1054 src/distrib/sets/lists/base/mi:1.1055 --- src/distrib/sets/lists/base/mi:1.1054 Thu Dec 26 20:14:38 2013 +++ src/distrib/sets/lists/base/mi Sat Dec 28 02:32:01 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1054 2013/12/26 20:14:38 apb Exp $ +# $NetBSD: mi,v 1.1055 2013/12/28 02:32:01 rjs Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -689,7 +689,7 @@ ./usr/bin/sha1 base-util-bin ./usr/bin/shar base-util-bin ./usr/bin/shlockbase-util-bin -./usr/bin/shmif_dumpbusbase-util-bin +./usr/bin/shmif_dumpbusbase-util-bin rump ./usr/bin/showmountbase-nfsclient-bin ./usr/bin/shufflebase-util-bin ./usr/bin/skey base-util-bin skey Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.44 src/distrib/sets/lists/debug/mi:1.45 --- src/distrib/sets/lists/debug/mi:1.44 Wed Dec 25 22:08:24 2013 +++ src/distrib/sets/lists/debug/mi Sat Dec 28 02:32:01 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.44 2013/12/25 22:08:24 christos Exp $ +# $NetBSD: mi,v 1.45 2013/12/28 02:32:01 rjs Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib @@ -715,7 +715,7 @@ ./usr/libdata/debug/usr/bin/seq.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/sftp.debug comp-secsh-debug crypto,debug ./usr/libdata/debug/usr/bin/shlock.debug comp-util-debug debug -./usr/libdata/debug/usr/bin/shmif_dumpbus.debug comp-util-debug debug +./usr/libdata/debug/usr/bin/shmif_dumpbus.debug comp-util-debug debug,rump ./usr/libdata/debug/usr/bin/showmount.debug comp-nfsclient-debug debug ./usr/libdata/debug/usr/bin/shuffle.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/size.debug comp-util-debug binutils,debug Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1454 src/distrib/sets/lists/man/mi:1.1455 --- src/distrib/sets/lists/man/mi:1.1454 Wed Dec 25 22:08:24 2013 +++ src/distrib/sets/lists/man/mi Sat Dec 28 02:32:01 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1454 2013/12/25 22:08:24 christos Exp $ +# $NetBSD: mi,v 1.1455 2013/12/28 02:32:01 rjs Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -504,7 +504,7 @@ ./usr/share/man/cat1/sha1.0 man-util-catman .cat ./usr/share/man/cat1/shar.0 man-util-catman .cat ./usr/share/man/cat1/shlock.0 man-util-catman .cat -./usr/share/man/cat1/shmif_dumpbus.0 man-util-catman .cat +./usr/share/man/cat1/shmif_dumpbus.0 man-util-catman rump,.cat ./usr/share/man/cat1/shuffle.0 man-util-catman .cat ./usr/share/man/cat1/skey.0 man-util-catman skey,.cat ./usr/share/man/cat1/skeyaudit.0 man-util-catman skey,.cat @@ -3568,7 +3568,7 @@ ./usr/share/man/html1/sha1.html man-util-htmlman html ./usr/share/man/html1/shar.html man-util-htmlman html ./usr/share/man/html1/shlock.html man-util-htmlman html -./usr/share/man/html1/shmif_dumpbus.html man-util-htmlman html +./usr/share/man/html1/shmif_dumpbus.html man-util-htmlman rump,html ./usr/share/man/html1/shuffle.html man-util-htmlman html ./usr/share/man/html1/skey.html man-util-htmlman skey,html ./usr/share/man/html1/skeyaudit.html man-util-htmlman skey,html @@ -6282,7 +6282,7 @@ ./usr/share/man/man1/sha1.1 man-util-man .man ./usr/share/man/man1/shar.1 man-util-man .man ./usr/share/man/man1/shlock.1 man-util-man .man -./usr/share/man/man1/shmif_dumpbus.1 man-util-man .man +./usr/share/man/man1/shmif_dumpbus.1 man-util-man rump,.man ./usr/share/man/man1/shuffle.1 man-util-man .man ./usr/share/man/man1/skey.1 man-util-man skey,.man ./usr/share/man/man1/skeyaudit.1 man-util-man skey,.man Index: src/usr.bin/Makefile diff -u src/usr.bin/Makefile:1.214 src/usr.bin/Makefile:1.215 --- src/usr.bin/Makefile:1.214 Fri Nov 22 16:10:25 2013 +++ src/usr.bin/Makefile Sat Dec 28 02:32:01 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.214 2013/11/22 16:10:25 christos Exp $ +# $NetBSD: Makefile,v 1.215 2013/12/28 02:32:01 rjs Exp $ # from: @(#)Makefile 8.3 (Berkeley) 1/7/94 .include bsd.own.mk @@ -23,7 +23,7 @@ SUBDIR= apply asa at audio audiocfg \ printenv printf
CVS commit: src/etc
Module Name:src Committed By: christos Date: Sat Dec 28 03:18:39 UTC 2013 Modified Files: src/etc: ntp.conf Log Message: put a comment for mode7 To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/etc/ntp.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/ntp.conf diff -u src/etc/ntp.conf:1.14 src/etc/ntp.conf:1.15 --- src/etc/ntp.conf:1.14 Mon Jan 16 17:20:45 2012 +++ src/etc/ntp.conf Fri Dec 27 22:18:39 2013 @@ -1,4 +1,4 @@ -# $NetBSD: ntp.conf,v 1.14 2012/01/16 22:20:45 christos Exp $ +# $NetBSD: ntp.conf,v 1.15 2013/12/28 03:18:39 christos Exp $ # # NetBSD default Network Time Protocol (NTP) configuration file for ntpd @@ -32,6 +32,10 @@ tos minsane 2 # mdnstries 0 +# New ntpd disables the ntpdc protocol by default, to re-enable uncomment +# the following line +# enable mode7 + # Hereafter should be server or peer statements to configure other # hosts to exchange NTP packets with. Peers should be selected in such # a way that the network path to them is symmetric (that is, the series
CVS commit: src/external/bsd/ntp/dist
Module Name:src Committed By: christos Date: Sat Dec 28 03:20:15 UTC 2013 Modified Files: src/external/bsd/ntp/dist/include: ntp_config.h ntp_filegen.h ntp_fp.h ntp_request.h ntp_stdlib.h ntpd.h refclock_atom.h src/external/bsd/ntp/dist/lib/isc: backtrace.c event.c inet_ntop.c inet_pton.c log.c netaddr.c result.c sockaddr.c src/external/bsd/ntp/dist/lib/isc/include/isc: util.h src/external/bsd/ntp/dist/lib/isc/unix: file.c ifiter_getifaddrs.c net.c socket.c time.c src/external/bsd/ntp/dist/libntp: atoint.c atolfp.c atouint.c audio.c authkeys.c authreadkeys.c hextoint.c hextolfp.c humandate.c modetoa.c mstolfp.c ntp_calendar.c ntp_lineedit.c octtoint.c prettydate.c ssl_init.c src/external/bsd/ntp/dist/libparse: clk_rawdcf.c data_mbg.c info_trimble.c src/external/bsd/ntp/dist/ntpd: keyword-gen.c ntp_config.c ntp_control.c ntp_crypto.c ntp_filegen.c ntp_io.c ntp_keyword.h ntp_loopfilter.c ntp_parser.c ntp_parser.h ntp_parser.y ntp_peer.c ntp_proto.c ntp_refclock.c ntp_request.c ntp_restrict.c ntp_scanner.c ntp_util.c ntpd-opts.h ntpd.c refclock_acts.c refclock_arc.c refclock_chu.c refclock_datum.c refclock_heath.c refclock_irig.c refclock_jjy.c refclock_jupiter.c refclock_neoclock4x.c refclock_nmea.c refclock_oncore.c refclock_parse.c refclock_pcf.c refclock_shm.c refclock_wwvb.c src/external/bsd/ntp/dist/ntpdate: ntpdate.c src/external/bsd/ntp/dist/ntpdc: nl.pl ntpdc.c ntpdc.h ntpdc_ops.c src/external/bsd/ntp/dist/ntpq: ntpq-subs.c ntpq.c ntpq.h src/external/bsd/ntp/dist/sntp: crypto.c kod_management.c log.c log.h main.c networking.c networking.h sntp-opts.c src/external/bsd/ntp/dist/sntp/libopts: autoopts.c autoopts.h configfile.c enum.c file.c find.c init.c load.c makeshell.c nested.c numeric.c parse-duration.c pgusage.c putshell.c reset.c save.c stack.c streqvcmp.c tokenize.c usage.c src/external/bsd/ntp/dist/sntp/libopts/autoopts: options.h src/external/bsd/ntp/dist/sntp/libopts/compat: pathfind.c src/external/bsd/ntp/dist/util: ntp-keygen-opts.c ntp-keygen.c ntptime.c Removed Files: src/external/bsd/ntp/dist: compile config.guess config.sub depcomp excludes ltmain.sh missing version version.m4 ylwrap src/external/bsd/ntp/dist/ElectricFence: CHANGES COPYING Makefile.am Makefile.in README efence.c efence.h eftest.c libefence.3 page.c print.c tstheap.c src/external/bsd/ntp/dist/arlib: COPYING INSTALL Makefile.am Makefile.in README UNSHAR.HDR aclocal.m4 arlib.3 arlib.c arlib.h arplib.h configure configure.in depcomp install-sh missing sample.c src/external/bsd/ntp/dist/clockstuff: clktest.c src/external/bsd/ntp/dist/html: gadget.html manyopt.html src/external/bsd/ntp/dist/html/description_files: description.jpg src/external/bsd/ntp/dist/html/drivers: driver2.html src/external/bsd/ntp/dist/include: autogen-version.def copyright.def debug-opt.def homerc.def ntp_data_structures.h ntp_sprintf.h version.def version.texi src/external/bsd/ntp/dist/kernel: README chuinit.c clkinit.c tty_chu.c tty_chu_STREAMS.c tty_clk.c tty_clk_STREAMS.c src/external/bsd/ntp/dist/kernel/sys: chudefs.h clkdefs.h src/external/bsd/ntp/dist/libntp: fptoa.c fptoms.c inttoa.c memmove.c mfptoa.c mfptoms.c msutotsf.c strstr.c tsftomsu.c tstotv.c tvtots.c uinttoa.c src/external/bsd/ntp/dist/libopts: COPYING.gplv3 COPYING.lgplv3 COPYING.mbsd MakeDefs.inc Makefile.am Makefile.in README ag-char-map.h autoopts.c autoopts.h boolean.c configfile.c cook.c enumeration.c environment.c file.c genshell.c genshell.h libopts.c load.c makeshell.c nested.c numeric.c parse-duration.c parse-duration.h pgusage.c proto.h putshell.c reset.c restore.c save.c sort.c stack.c streqvcmp.c text_mmap.c time.c tokenize.c usage.c value-type.c value-type.h version.c xat-attribute.c xat-attribute.h src/external/bsd/ntp/dist/libopts/autoopts: options.h usage-txt.h src/external/bsd/ntp/dist/libopts/compat: compat.h pathfind.c snprintf.c strchr.c strdup.c windows-config.h src/external/bsd/ntp/dist/libopts/m4: libopts.m4 liboptschk.m4 src/external/bsd/ntp/dist/m4: define_dir.m4 libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4 ntp_cacheversion.m4 ntp_dir_sep.m4 ntp_lib_m.m4 ntp_lineeditlibs.m4 ntp_openssl.m4 ntp_vpathhack.m4 os_cflags.m4 src/external/bsd/ntp/dist/ntpd: .deps-ver complete.conf
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sat Dec 28 03:24:35 UTC 2013 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: mention new ntp To generate a diff of this commit: cvs rdiff -u -r1.1080 -r1.1081 src/doc/3RDPARTY cvs rdiff -u -r1.1871 -r1.1872 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1080 src/doc/3RDPARTY:1.1081 --- src/doc/3RDPARTY:1.1080 Fri Dec 27 15:13:36 2013 +++ src/doc/3RDPARTY Fri Dec 27 22:24:35 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1080 2013/12/27 20:13:36 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1081 2013/12/28 03:24:35 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -839,8 +839,8 @@ and ndbootd-raw.c. Restore saved config HAVE_STRICT_ALIGNMENT. Fix RCS IDs, import. Package: ntp -Version: 4.2.6p5 -Current Vers: 4.2.6p5 +Version: 4.2.7p404 +Current Vers: 4.2.6p5/4.2.7p404 Maintainer: David L. Mills mi...@udel.edu Archive Site: http://www.ntp.org/ Home Page: http://www.ntp.org/, http://support.ntp.org/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1871 src/doc/CHANGES:1.1872 --- src/doc/CHANGES:1.1871 Fri Dec 27 15:13:36 2013 +++ src/doc/CHANGES Fri Dec 27 22:24:35 2013 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1871 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1872 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -320,3 +320,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: zoneinfo: Import tzdata2013i. [apb 20131226] acpi(4): Updated ACPICA to 20131218. [christos 20131227] openpam: Import 20130907 (Nummularia) [christos 20131227] + ntp: import ntp 4.2.7p404. [kardel 201312]
CVS commit: src/distrib/sets/lists/man
Module Name:src Committed By: christos Date: Sat Dec 28 03:27:01 UTC 2013 Modified Files: src/distrib/sets/lists/man: mi Log Message: add new ntp man pages. To generate a diff of this commit: cvs rdiff -u -r1.1455 -r1.1456 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1455 src/distrib/sets/lists/man/mi:1.1456 --- src/distrib/sets/lists/man/mi:1.1455 Fri Dec 27 21:32:01 2013 +++ src/distrib/sets/lists/man/mi Fri Dec 27 22:27:01 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1455 2013/12/28 02:32:01 rjs Exp $ +# $NetBSD: mi,v 1.1456 2013/12/28 03:27:01 christos Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -2086,6 +2086,8 @@ ./usr/share/man/cat5/nologin.0 man-sysutil-catman .cat ./usr/share/man/cat5/npf.conf.0 man-npf-catman .cat,npf ./usr/share/man/cat5/nsswitch.conf.0 man-net-catman .cat +./usr/share/man/cat5/ntp.conf.0 man-ntp-catman .cat +./usr/share/man/cat5/ntp.keys.0 man-ntp-catman .cat ./usr/share/man/cat5/openssl.cnf.0 man-crypto-catman crypto,.cat ./usr/share/man/cat5/pam.conf.0 man-sys-catman .cat ./usr/share/man/cat5/passwd.0 man-sys-catman .cat @@ -5002,6 +5004,8 @@ ./usr/share/man/html5/nologin.html man-sysutil-htmlman html ./usr/share/man/html5/npf.conf.html man-npf-htmlman html,npf ./usr/share/man/html5/nsswitch.conf.html man-net-htmlman html +./usr/share/man/html5/ntp.conf.html man-ntp-htmlman html +./usr/share/man/html5/ntp.keys.html man-ntp-htmlman html ./usr/share/man/html5/openssl.cnf.html man-crypto-htmlman crypto,html ./usr/share/man/html5/pam.conf.html man-sys-htmlman html ./usr/share/man/html5/passwd.conf.html man-sys-htmlman html @@ -7864,6 +7868,8 @@ ./usr/share/man/man5/nologin.5 man-sysutil-man .man ./usr/share/man/man5/npf.conf.5 man-npf-man .man,npf ./usr/share/man/man5/nsswitch.conf.5 man-net-man .man +./usr/share/man/man5/ntp.conf.5 man-ntp-man .man +./usr/share/man/man5/ntp.keys.5 man-ntp-man .man ./usr/share/man/man5/openssl.cnf.5 man-crypto-man crypto,.man ./usr/share/man/man5/pam.conf.5 man-sys-man .man ./usr/share/man/man5/passwd.5 man-sys-man .man
CVS commit: src/external/bsd/ntp
Module Name:src Committed By: christos Date: Sat Dec 28 03:29:46 UTC 2013 Modified Files: src/external/bsd/ntp: ntp2netbsd Log Message: mention manual handling of man pages To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/ntp2netbsd 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/ntp/ntp2netbsd diff -u src/external/bsd/ntp/ntp2netbsd:1.3 src/external/bsd/ntp/ntp2netbsd:1.4 --- src/external/bsd/ntp/ntp2netbsd:1.3 Tue Jan 31 15:05:13 2012 +++ src/external/bsd/ntp/ntp2netbsd Fri Dec 27 22:29:46 2013 @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: ntp2netbsd,v 1.3 2012/01/31 20:05:13 kardel Exp $ +# $NetBSD: ntp2netbsd,v 1.4 2013/12/28 03:29:46 christos Exp $ # # Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. # All rights reserved. @@ -58,6 +58,8 @@ # - check for and remove img tags in html docs. # - update distrib/sets if necessary. # - update src/external/bsd/ntp/importdate to match the date of this import +# - build in the original distribution directory, then copy all the +# generated man pages in the respective program directories # if [ $# -ne 2 ]; then echo ntp2netbsd src dest; exit 1; fi
CVS commit: src/external/bsd/ntp/scripts
Module Name:src
Committed By: christos
Date: Sat Dec 28 03:36:16 UTC 2013
Modified Files:
src/external/bsd/ntp/scripts: mkver
Log Message:
update mkver
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/scripts/mkver
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/ntp/scripts/mkver
diff -u src/external/bsd/ntp/scripts/mkver:1.2 src/external/bsd/ntp/scripts/mkver:1.3
--- src/external/bsd/ntp/scripts/mkver:1.2 Wed Feb 1 02:54:58 2012
+++ src/external/bsd/ntp/scripts/mkver Fri Dec 27 22:36:15 2013
@@ -3,36 +3,28 @@ PROG=${1-UNKNOWN}
ConfStr=$PROG
-ConfStr=$ConfStr 4.2.6p5
+ConfStr=$ConfStr 4.2.7p404
case $CSET in
'') ;;
*) ConfStr=$ConfStr@$CSET ;;
esac
-case -lcrypto in
+case o in
'') ;;
- -lcrypto)
-ConfStr=${ConfStr}-o ;;
- *) ConfStr=${ConfStr}-? ;;
+ *) ConfStr=${ConfStr}-o ;;
esac
-ifile=`dirname $0`/../importdate
+ConfStr=$ConfStr `LC_TIME=C TZ=UTC date`
-if [ -f $ifile ]; then
- ConfStr=$ConfStr `cat $ifile`
-else
- ConfStr=$ConfStr `LC_TIME=C TZ= date`
-
- if [ ! -f .version ]; then
-echo 0 .version
- fi
- RUN=`cat .version`
- RUN=`expr $RUN + 1`
- echo $RUN .version
-
- ConfStr=$ConfStr (${RUN})
+if [ ! -f .version ]; then
+ echo 0 .version
fi
+RUN=`cat .version`
+RUN=`expr $RUN + 1`
+echo $RUN .version
+
+ConfStr=$ConfStr (${RUN})
echo Version ${ConfStr};
CVS commit: src
Module Name:src Committed By: christos Date: Sat Dec 28 03:39:07 UTC 2013 Modified Files: src: UPDATING Log Message: mention visible changes To generate a diff of this commit: cvs rdiff -u -r1.249 -r1.250 src/UPDATING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/UPDATING diff -u src/UPDATING:1.249 src/UPDATING:1.250 --- src/UPDATING:1.249 Wed Dec 4 09:47:41 2013 +++ src/UPDATING Fri Dec 27 22:39:07 2013 @@ -1,4 +1,4 @@ -$NetBSD: UPDATING,v 1.249 2013/12/04 14:47:41 mrg Exp $ +$NetBSD: UPDATING,v 1.250 2013/12/28 03:39:07 christos Exp $ This file (UPDATING) is intended to be a brief reference to recent changes that might cause problems in the build process, and a guide for @@ -16,6 +16,14 @@ See also: BUILDING, build.sh, Makefile. Recent changes: ^^^ +20131227: + 1. The new ntpd runs in a restricted mode to prevent amplification + attacks. If you need ntpdc to work you need to explicitly enable + mode7 in your config file. Make sure you put the necessary restrict + statements to avoid being exposed. + 2. strncat has moved from lib/libc to common/lib/libc; you might need + to make clean in libc + 20131129: The GMP sources were updated, and builds will likely fail without cleaning their build trees for both tools and in-tree, like below.
CVS commit: src/external/bsd/ntp/include
Module Name:src Committed By: christos Date: Sat Dec 28 03:51:52 UTC 2013 Modified Files: src/external/bsd/ntp/include: config.h Log Message: adjust for non-amd64 build To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/include/config.h 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/ntp/include/config.h diff -u src/external/bsd/ntp/include/config.h:1.5 src/external/bsd/ntp/include/config.h:1.6 --- src/external/bsd/ntp/include/config.h:1.5 Fri Dec 27 22:19:43 2013 +++ src/external/bsd/ntp/include/config.h Fri Dec 27 22:51:52 2013 @@ -1458,19 +1458,31 @@ /* #undef SCO5_CLOCK */ /* The size of `char*', as computed by sizeof. */ +#ifdef _LP64 #define SIZEOF_CHARP 8 +#else +#define SIZEOF_CHARP 4 +#endif /* The size of `int', as computed by sizeof. */ #define SIZEOF_INT 4 /* The size of `long', as computed by sizeof. */ +#ifdef _LP64 #define SIZEOF_LONG 8 +#else +#define SIZEOF_LONG 4 +#endif /* The size of `long long', as computed by sizeof. */ #define SIZEOF_LONG_LONG 8 /* The size of `pthread_t', as computed by sizeof. */ +#ifdef _LP64 #define SIZEOF_PTHREAD_T 8 +#else +#define SIZEOF_PTHREAD_T 4 +#endif /* The size of `short', as computed by sizeof. */ #define SIZEOF_SHORT 2 @@ -1505,7 +1517,7 @@ /* #undef STRERROR_R_CHAR_P */ /* canonical system (cpu-vendor-os) of where we should run */ -#define STR_SYSTEM x86_64-unknown-netbsd6.99.28 +#define STR_SYSTEM NetBSD /* Does Xettimeofday take 1 arg? */ /* #undef SYSV_TIMEOFDAY */ @@ -1564,6 +1576,7 @@ typedef unsigned int uintptr_t; #define WANT_IPV6 1 #endif +#ifndef __NetBSD__ /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ #if defined AC_APPLE_UNIVERSAL_BUILD @@ -1575,6 +1588,12 @@ typedef unsigned int uintptr_t; /* # undef WORDS_BIGENDIAN */ # endif #endif +#else +# include sys/endian.h +# if _BYTE_ORDER == _BIG_ENDIAN +# define WORDS_BIGENDIAN 1 +# endif +#endif /* routine worker child proc uses to exit. */ #define WORKER_CHILD_EXIT _exit
