CVS commit: src/sys/dev/pci
Module Name:src
Committed By: macallan
Date: Thu May 10 03:16:50 UTC 2012
Modified Files:
src/sys/dev/pci: trm.c trmreg.h
Log Message:
use MMIO if available
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/pci/trm.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/trmreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/trm.c
diff -u src/sys/dev/pci/trm.c:1.32 src/sys/dev/pci/trm.c:1.33
--- src/sys/dev/pci/trm.c:1.32 Sat Nov 13 13:52:08 2010
+++ src/sys/dev/pci/trm.c Thu May 10 03:16:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: trm.c,v 1.32 2010/11/13 13:52:08 uebayasi Exp $ */
+/* $NetBSD: trm.c,v 1.33 2012/05/10 03:16:50 macallan Exp $ */
/*-
* Copyright (c) 2002 Izumi Tsutsui. All rights reserved.
*
@@ -65,7 +65,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: trm.c,v 1.32 2010/11/13 13:52:08 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trm.c,v 1.33 2012/05/10 03:16:50 macallan Exp $");
/* #define TRM_DEBUG */
#ifdef TRM_DEBUG
@@ -412,11 +412,12 @@ trm_attach(device_t parent, device_t sel
pci_intr_handle_t ih;
pcireg_t command;
const char *intrstr;
+ int fl = 0;
sc->sc_dev = self;
/*
- * These cards do not allow memory mapped accesses
+ * Some cards do not allow memory mapped accesses
* pa_pc: chipset tag
* pa_tag: pci tag
*/
@@ -430,10 +431,17 @@ trm_attach(device_t parent, device_t sel
/*
* mask for get correct base address of pci IO port
*/
- if (pci_mapreg_map(pa, PCI_MAPREG_START, PCI_MAPREG_TYPE_IO, 0,
- &iot, &ioh, NULL, NULL)) {
- aprint_error(": unable to map registers\n");
- return;
+ if (command & PCI_COMMAND_MEM_ENABLE) {
+ fl = pci_mapreg_map(pa, TRM_BAR_MMIO, PCI_MAPREG_TYPE_MEM, 0, &iot,
+ &ioh, NULL, NULL);
+ }
+ if (fl != 0) {
+ aprint_verbose_dev(self, "couldn't map MMIO registers, tryion PIO\n");
+ if ((fl = pci_mapreg_map(pa, TRM_BAR_PIO, PCI_MAPREG_TYPE_IO, 0,
+ &iot, &ioh, NULL, NULL)) != 0) {
+ aprint_error(": unable to map registers (%d)\n", fl);
+ return;
+ }
}
/*
* test checksum of eeprom.. & initialize softc...
Index: src/sys/dev/pci/trmreg.h
diff -u src/sys/dev/pci/trmreg.h:1.1 src/sys/dev/pci/trmreg.h:1.2
--- src/sys/dev/pci/trmreg.h:1.1 Sat Nov 3 17:01:18 2001
+++ src/sys/dev/pci/trmreg.h Thu May 10 03:16:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: trmreg.h,v 1.1 2001/11/03 17:01:18 tsutsui Exp $ */
+/* $NetBSD: trmreg.h,v 1.2 2012/05/10 03:16:50 macallan Exp $ */
/*
* Device Driver for Tekram DC395U/UW/F, DC315/U
* PCI SCSI Bus Master Host Adapter
@@ -40,6 +40,10 @@
* (C)Copyright 1995-1999 Tekram Technology Co., Ltd. All rights reserved.
*/
+#define TRM_BAR_PIO 0x10
+/* DC-315 has an MMIO BAR */
+#define TRM_BAR_MMIO 0x14
+
/*
**
*
CVS commit: src/usr.bin/login
Module Name:src
Committed By: christos
Date: Thu May 10 01:25:25 UTC 2012
Modified Files:
src/usr.bin/login: common.c
Log Message:
dead for sigint
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/login/common.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/login/common.c
diff -u src/usr.bin/login/common.c:1.4 src/usr.bin/login/common.c:1.5
--- src/usr.bin/login/common.c:1.4 Sun Apr 22 19:26:19 2012
+++ src/usr.bin/login/common.c Wed May 9 21:25:24 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: common.c,v 1.4 2012/04/22 23:26:19 christos Exp $ */
+/* $NetBSD: common.c,v 1.5 2012/05/10 01:25:24 christos Exp $ */
/*-
* Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
@@ -29,7 +29,7 @@
* SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: common.c,v 1.4 2012/04/22 23:26:19 christos Exp $");
+__RCSID("$NetBSD: common.c,v 1.5 2012/05/10 01:25:24 christos Exp $");
#include
#include
@@ -147,7 +147,7 @@ motd(const char *fname)
}
/* ARGSUSED */
-void
+void __dead
sigint(int signo)
{
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Wed May 9 22:50:52 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Tickets 241-243. To generate a diff of this commit: cvs rdiff -u -r1.1.2.87 -r1.1.2.88 src/doc/CHANGES-6.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.87 src/doc/CHANGES-6.0:1.1.2.88 --- src/doc/CHANGES-6.0:1.1.2.87 Wed May 9 20:11:55 2012 +++ src/doc/CHANGES-6.0 Wed May 9 22:50:52 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.87 2012/05/09 20:11:55 riz Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.88 2012/05/09 22:50:52 riz Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -2258,3 +2258,24 @@ sys/dev/ic/ld_cac.c1.27 a CCB. [macallan, ticket #240] +sys/arch/evbppc/mpc85xx/machdep.c 1.23 +sys/arch/powerpc/booke/booke_pmap.c 1.13 +sys/arch/powerpc/booke/e500_tlb.c 1.8 +sys/arch/powerpc/conf/files.powerpc 1.83 +sys/arch/powerpc/conf/kern-mb.ldscript 1.1 +sys/arch/powerpc/include/booke/e500var.h 1.5 +sys/arch/powerpc/include/booke/pmap.h 1.9 + + Add minimal TLB support for PPC BookE. + [matt, ticket #241] + +sys/arch/powerpc/include/cpu.h 1.91 + + clang fix for PPC. + [matt, ticket #242] + +sys/arch/powerpc/booke/dev/pq3gpio.c 1.5 + + Fix P2020 GPIO support. + [matt, ticket #243] +
CVS commit: [netbsd-6] src/sys/arch/powerpc/booke/dev
Module Name:src
Committed By: riz
Date: Wed May 9 22:49:06 UTC 2012
Modified Files:
src/sys/arch/powerpc/booke/dev [netbsd-6]: pq3gpio.c
Log Message:
Pull up following revision(s) (requested by matt in ticket #243):
sys/arch/powerpc/booke/dev/pq3gpio.c: revision 1.5
Fix P2020 GPIO support (which has pins that are input/output instead of just
input or output).
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/powerpc/booke/dev/pq3gpio.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/powerpc/booke/dev/pq3gpio.c
diff -u src/sys/arch/powerpc/booke/dev/pq3gpio.c:1.4 src/sys/arch/powerpc/booke/dev/pq3gpio.c:1.4.8.1
--- src/sys/arch/powerpc/booke/dev/pq3gpio.c:1.4 Thu Jun 30 04:43:47 2011
+++ src/sys/arch/powerpc/booke/dev/pq3gpio.c Wed May 9 22:49:06 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3gpio.c,v 1.4 2011/06/30 04:43:47 matt Exp $ */
+/* $NetBSD: pq3gpio.c,v 1.4.8.1 2012/05/09 22:49:06 riz Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,12 +35,13 @@
*/
#define GLOBAL_PRIVATE
+#define GPIO_PRIVATE
#include "opt_mpc85xx.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: pq3gpio.c,v 1.4 2011/06/30 04:43:47 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3gpio.c,v 1.4.8.1 2012/05/09 22:49:06 riz Exp $");
#include
#include
@@ -108,6 +109,19 @@ pq3gpio_pin_write(void *v, int num, int
static void
pq3gpio_pin_ctl(void *v, int num, int ctl)
{
+ struct pq3gpio_group * const gc = v;
+ const u_int mask = 1 << (gc->gc_pins[num].pin_num ^ 31);
+uint32_t old, new;
+
+old = bus_space_read_4(gc->gc_bst, gc->gc_bsh, GPDIR);
+new = old;
+switch (ctl & (GPIO_PIN_INPUT|GPIO_PIN_OUTPUT)) {
+case GPIO_PIN_OUTPUT:new |= mask; break;
+case GPIO_PIN_INPUT: new &= ~mask; break;
+default:return;
+}
+if (old != new)
+ bus_space_write_4(gc->gc_bst, gc->gc_bsh, GPDIR, new);
}
static void
@@ -291,19 +305,21 @@ pq3gpio_p20x0_attach(device_t self, bus_
bus_space_handle_t bsh, u_int svr)
{
static const uint32_t gpio2pmuxcr_map[][2] = {
- { __BIT(10), PMUXCR_TSEC3_TS|PMUXCR_USB },
- { __BIT(11), PMUXCR_TSEC3_TS|PMUXCR_USB },
- { __BIT(12), PMUXCR_TSEC1_TS },
- { __BIT(13), PMUXCR_TSEC1_TS },
- { __BIT(14), PMUXCR_TSEC2_TS },
- { __BIT(15), PMUXCR_TSEC2_TS },
+ { __BIT(8), PMUXCR_SDHC_CD },
+ { __BIT(9), PMUXCR_SDHC_WP },
+ /*
+ * These are really two bits but the low bit MBZ so we ignore
+ * it.
+ */
+ { __BIT(10), PMUXCR_TSEC3_TS },
+ { __BIT(11), PMUXCR_TSEC3_TS },
};
- uint32_t pinmask = ~0; /* assume all bits are valid */
- size_t pincnt = 32;
+ uint32_t pinmask = 0x; /* assume all bits are valid */
+ size_t pincnt = 16;
const uint32_t pmuxcr = bus_space_read_4(bst, bsh, PMUXCR);
for (size_t i = 0; i < __arraycount(gpio2pmuxcr_map); i++) {
- if (pmuxcr & gpio2pmuxcr_map[i][1]) {
+ if ((pmuxcr & gpio2pmuxcr_map[i][1]) == 0) {
pinmask &= ~gpio2pmuxcr_map[i][0];
pincnt--;
}
@@ -312,10 +328,10 @@ pq3gpio_p20x0_attach(device_t self, bus_
/*
* Create GPIO pin groups
*/
- aprint_normal_dev(self, "%zu input pins, %zu output pins\n",
- pincnt, pincnt);
- pq3gpio_group_create(self, bst, bsh, GPINDR, pinmask, GPIO_PIN_INPUT);
- pq3gpio_group_create(self, bst, bsh, GPOUTDR, pinmask, GPIO_PIN_OUTPUT);
+ aprint_normal_dev(self, "%zu input/output pins\n",
+ pincnt);
+ pq3gpio_group_create(self, bst, bsh, GPDAT, pinmask,
+ GPIO_PIN_INPUT|GPIO_PIN_OUTPUT);
}
#endif /* P2020 */
CVS commit: [netbsd-6] src/sys/arch/powerpc/include
Module Name:src
Committed By: riz
Date: Wed May 9 22:47:04 UTC 2012
Modified Files:
src/sys/arch/powerpc/include [netbsd-6]: cpu.h
Log Message:
Pull up following revision(s) (requested by matt in ticket #242):
sys/arch/powerpc/include/cpu.h: revision 1.91
Don't use global asm for __clang__
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.89.2.1 src/sys/arch/powerpc/include/cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/include/cpu.h
diff -u src/sys/arch/powerpc/include/cpu.h:1.89 src/sys/arch/powerpc/include/cpu.h:1.89.2.1
--- src/sys/arch/powerpc/include/cpu.h:1.89 Tue Dec 13 11:03:52 2011
+++ src/sys/arch/powerpc/include/cpu.h Wed May 9 22:47:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.89 2011/12/13 11:03:52 kiyohara Exp $ */
+/* $NetBSD: cpu.h,v 1.89.2.1 2012/05/09 22:47:03 riz Exp $ */
/*
* Copyright (C) 1999 Wolfgang Solfrank.
@@ -213,8 +213,12 @@ curcpu(void)
return ci;
}
+#ifdef __clang__
+#define curlwp (curcpu()->ci_curlwp)
+#else
register struct lwp *powerpc_curlwp __asm("r13");
#define curlwp powerpc_curlwp
+#endif
#define curpcb (curcpu()->ci_curpcb)
#define curpm (curcpu()->ci_curpm)
CVS commit: src/sys/fs/tmpfs
Module Name:src Committed By: riastradh Date: Wed May 9 22:46:25 UTC 2012 Modified Files: src/sys/fs/tmpfs: tmpfs_rename.c Log Message: Fix omitted VN_KNOTE(fvp, NOTE_RENAME) in tmpfs_rename. Missed that line while refactoring tmpfs_rename to use genfs_rename. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/fs/tmpfs/tmpfs_rename.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/fs/tmpfs/tmpfs_rename.c diff -u src/sys/fs/tmpfs/tmpfs_rename.c:1.1 src/sys/fs/tmpfs/tmpfs_rename.c:1.2 --- src/sys/fs/tmpfs/tmpfs_rename.c:1.1 Wed May 9 00:16:07 2012 +++ src/sys/fs/tmpfs/tmpfs_rename.c Wed May 9 22:46:25 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: tmpfs_rename.c,v 1.1 2012/05/09 00:16:07 riastradh Exp $ */ +/* $NetBSD: tmpfs_rename.c,v 1.2 2012/05/09 22:46:25 riastradh Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tmpfs_rename.c,v 1.1 2012/05/09 00:16:07 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tmpfs_rename.c,v 1.2 2012/05/09 22:46:25 riastradh Exp $"); #include #include @@ -373,6 +373,8 @@ tmpfs_gro_rename(struct mount *mp, kauth VP_TO_TMPFS_NODE(tdvp)->tn_status |= TMPFS_NODE_MODIFIED; } + VN_KNOTE(fvp, NOTE_RENAME); + #if 0/* XXX */ genfs_rename_cache_purge(fdvp, fvp, tdvp, tvp); #endif
CVS commit: [netbsd-6] src/sys/arch
Module Name:src
Committed By: riz
Date: Wed May 9 22:42:32 UTC 2012
Modified Files:
src/sys/arch/evbppc/mpc85xx [netbsd-6]: machdep.c
src/sys/arch/powerpc/booke [netbsd-6]: booke_pmap.c e500_tlb.c
src/sys/arch/powerpc/conf [netbsd-6]: files.powerpc
src/sys/arch/powerpc/include/booke [netbsd-6]: e500var.h pmap.h
Added Files:
src/sys/arch/powerpc/conf [netbsd-6]: kern-mb.ldscript
Log Message:
Pull up following revision(s) (requested by matt in ticket #241):
sys/arch/powerpc/conf/kern-mb.ldscript: revision 1.1
sys/arch/powerpc/include/booke/pmap.h: revision 1.9
sys/arch/powerpc/booke/e500_tlb.c: revision 1.8
sys/arch/powerpc/conf/files.powerpc: revision 1.83
sys/arch/powerpc/booke/booke_pmap.c: revision 1.13
sys/arch/powerpc/include/booke/e500var.h: revision 1.5
sys/arch/evbppc/mpc85xx/machdep.c: revision 1.23
Add ldscript which aligns .data to a 1MB boundary. (used for testing)
Add PMAP_MINIMALTLB defflag
Add vsize_t to pmap_md_{un,}map_poolpage.
Add pmap_kvptefill prototype.
Slightly change pmap_bootstrap prototype.
Add e500_tlb_minimize prototype.
Add support PMAP_MINIMALTLB option. This changes the default use of TLB1
entries to map all of physical memory to using two TLB1 entries, one for
mapping text and one for data. The rest of memory is mapped using the
page table which is updated as needed. This is used to trap memory
corruption issues.
Add support for PMAP_MINIMALTLB.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.2.1 src/sys/arch/evbppc/mpc85xx/machdep.c
cvs rdiff -u -r1.12 -r1.12.2.1 src/sys/arch/powerpc/booke/booke_pmap.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/arch/powerpc/booke/e500_tlb.c
cvs rdiff -u -r1.82 -r1.82.8.1 src/sys/arch/powerpc/conf/files.powerpc
cvs rdiff -u -r0 -r1.1.6.2 src/sys/arch/powerpc/conf/kern-mb.ldscript
cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/powerpc/include/booke/e500var.h
cvs rdiff -u -r1.8 -r1.8.8.1 src/sys/arch/powerpc/include/booke/pmap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/mpc85xx/machdep.c
diff -u src/sys/arch/evbppc/mpc85xx/machdep.c:1.22 src/sys/arch/evbppc/mpc85xx/machdep.c:1.22.2.1
--- src/sys/arch/evbppc/mpc85xx/machdep.c:1.22 Fri Jan 27 18:52:54 2012
+++ src/sys/arch/evbppc/mpc85xx/machdep.c Wed May 9 22:42:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.22 2012/01/27 18:52:54 para Exp $ */
+/* $NetBSD: machdep.c,v 1.22.2.1 2012/05/09 22:42:32 riz Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -1126,44 +1126,20 @@ initppc(vaddr_t startkernel, vaddr_t end
/*
* Initialize the pmap.
*/
- pmap_bootstrap(startkernel, endkernel, availmemr, nmemr);
+ endkernel = pmap_bootstrap(startkernel, endkernel, availmemr, nmemr);
/*
* Let's take all the indirect calls via our stubs and patch
* them to be direct calls.
*/
cpu_fixup_stubs();
-#if 0
+
/*
* As a debug measure we can change the TLB entry that maps all of
* memory to one that encompasses the 64KB with the kernel vectors.
* All other pages will be soft faulted into the TLB as needed.
*/
- const uint32_t saved_mas0 = mfspr(SPR_MAS0);
- mtspr(SPR_MAS6, 0);
- __asm volatile("tlbsx\t0, %0" :: "b"(startkernel));
- uint32_t mas0 = mfspr(SPR_MAS0);
- uint32_t mas1 = mfspr(SPR_MAS1);
- uint32_t mas2 = mfspr(SPR_MAS2);
- uint32_t mas3 = mfspr(SPR_MAS3);
- KASSERT(mas3 & MAS3_SW);
- KASSERT(mas3 & MAS3_SR);
- KASSERT(mas3 & MAS3_SX);
- mas1 = (mas1 & ~MAS1_TSIZE) | MASX_TSIZE_64KB;
- pt_entry_t xpn_mask = ~0 << (10 + 2 * MASX_TSIZE_GET(mas1));
- mas2 = (mas2 & ~(MAS2_EPN)) | (startkernel & xpn_mask);
- mas3 = (mas3 & ~(MAS3_RPN|MAS3_SW)) | (startkernel & xpn_mask);
- printf(" %#lx=<%#x,%#x,%#x,%#x>", startkernel, mas0, mas1, mas2, mas3);
-#if 1
- mtspr(SPR_MAS1, mas1);
- mtspr(SPR_MAS2, mas2);
- mtspr(SPR_MAS3, mas3);
- extern void tlbwe(void);
- tlbwe();
- mtspr(SPR_MAS0, saved_mas0);
- printf("(ok)");
-#endif
-#endif
+ e500_tlb_minimize(endkernel);
/*
* Set some more MD helpers
Index: src/sys/arch/powerpc/booke/booke_pmap.c
diff -u src/sys/arch/powerpc/booke/booke_pmap.c:1.12 src/sys/arch/powerpc/booke/booke_pmap.c:1.12.2.1
--- src/sys/arch/powerpc/booke/booke_pmap.c:1.12 Thu Feb 2 18:59:44 2012
+++ src/sys/arch/powerpc/booke/booke_pmap.c Wed May 9 22:42:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: booke_pmap.c,v 1.12 2012/02/02 18:59:44 para Exp $ */
+/* $NetBSD: booke_pmap.c,v 1.12.2.1 2012/05/09 22:42:32 riz Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -38,7 +38,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: booke_pmap.c,v 1.12 2012/02/02 18:59:44 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: booke_pmap.c,v 1.12.2.1 2012/05/09 22:42:32 riz Exp $");
#include
#include
@@ -59,6 +59,8 @@ __KERNEL_RCSID(0, "$NetBSD
CVS commit: src/bin/expr
Module Name:src Committed By: jdf Date: Wed May 9 22:29:06 UTC 2012 Modified Files: src/bin/expr: expr.1 Log Message: Remove an unnecessary space in the manpage. Patch provided by Bug Hunting. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/bin/expr/expr.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/expr/expr.1 diff -u src/bin/expr/expr.1:1.31 src/bin/expr/expr.1:1.32 --- src/bin/expr/expr.1:1.31 Wed Mar 23 18:10:25 2011 +++ src/bin/expr/expr.1 Wed May 9 22:29:06 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: expr.1,v 1.31 2011/03/23 18:10:25 dholland Exp $ +.\" $NetBSD: expr.1,v 1.32 2012/05/09 22:29:06 jdf Exp $ .\" .\" Copyright (c) 2000,2003 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -81,7 +81,7 @@ against .Ar expr2 , which must be a regular expression. The regular expression is anchored -to the beginning of the string with an implicit +to the beginning of the string with an implicit .Dq ^ . .Pp If the match succeeds and the pattern contains at least one regular
CVS commit: src/distrib/sets/lists
Module Name:src
Committed By: christos
Date: Wed May 9 22:04:08 UTC 2012
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/man: mi
Log Message:
add {rndc,ddns}-confgen
To generate a diff of this commit:
cvs rdiff -u -r1.990 -r1.991 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1756 -r1.1757 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.1388 -r1.1389 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/base/mi
diff -u src/distrib/sets/lists/base/mi:1.990 src/distrib/sets/lists/base/mi:1.991
--- src/distrib/sets/lists/base/mi:1.990 Fri Apr 6 18:46:15 2012
+++ src/distrib/sets/lists/base/mi Wed May 9 18:04:05 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.990 2012/04/06 22:46:15 christos Exp $
+# $NetBSD: mi,v 1.991 2012/05/09 22:04:05 christos Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1187,6 +1187,7 @@
./usr/sbin/cron base-cron-bin
./usr/sbin/daicctlbase-isdn-bin
./usr/sbin/dbsymbase-sysutil-bin binutils
+./usr/sbin/ddns-confgenbase-bind-bin
./usr/sbin/dev_mkdbbase-sysutil-bin
./usr/sbin/dhcpdbase-dhcpd-bin
./usr/sbin/dhcrelaybase-dhcpd-bin
@@ -1408,7 +1409,7 @@
./usr/sbin/rip6querybase-netutil-bin inet6
./usr/sbin/rmt base-sysutil-bin
./usr/sbin/rndc base-bind-bin
-./usr/sbin/rndc-confgenbase-obsolete obsolete
+./usr/sbin/rndc-confgenbase-bind-bin
./usr/sbin/route6dbase-router-bin use_inet6
./usr/sbin/rpc.bootparamd base-bootserver-bin
./usr/sbin/rpc.lockdbase-nfsserver-bin
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1756 src/distrib/sets/lists/comp/mi:1.1757
--- src/distrib/sets/lists/comp/mi:1.1756 Sat May 5 13:52:27 2012
+++ src/distrib/sets/lists/comp/mi Wed May 9 18:04:05 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1756 2012/05/05 17:52:27 christos Exp $
+# $NetBSD: mi,v 1.1757 2012/05/09 22:04:05 christos Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -4086,6 +4086,7 @@
./usr/libdata/debug/usr/sbin/cron.debug comp-cron-debug debug
./usr/libdata/debug/usr/sbin/daicctl.debug comp-isdn-debug debug
./usr/libdata/debug/usr/sbin/dbsym.debug comp-sysutil-debug binutils,debug
+./usr/libdata/debug/usr/sbin/ddns-confgen.debug comp-bind-bin debug
./usr/libdata/debug/usr/sbin/dev_mkdb.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/dhcpd.debug comp-dhcpd-debug debug
./usr/libdata/debug/usr/sbin/dhcrelay.debug comp-dhcpd-debug debug
@@ -4255,7 +4256,7 @@
./usr/libdata/debug/usr/sbin/revnetgroup.debug comp-nis-debug yp,debug
./usr/libdata/debug/usr/sbin/rip6query.debug comp-netutil-debug inet6,debug
./usr/libdata/debug/usr/sbin/rmt.debug comp-sysutil-debug debug
-./usr/libdata/debug/usr/sbin/rndc-confgen.debug comp-obsolete obsolete
+./usr/libdata/debug/usr/sbin/rndc-confgen.debug comp-bind-bin debug
./usr/libdata/debug/usr/sbin/rndc.debug comp-bind-bin debug
./usr/libdata/debug/usr/sbin/route6d.debug comp-router-debug use_inet6,debug
./usr/libdata/debug/usr/sbin/rpc.bootparamd.debug comp-bootserver-debug debug
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1388 src/distrib/sets/lists/man/mi:1.1389
--- src/distrib/sets/lists/man/mi:1.1388 Sat Apr 21 08:27:26 2012
+++ src/distrib/sets/lists/man/mi Wed May 9 18:04:07 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1388 2012/04/21 12:27:26 roy Exp $
+# $NetBSD: mi,v 1.1389 2012/05/09 22:04:07 christos Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2240,6 +2240,7 @@
./usr/share/man/cat8/crash.0 man-sysutil-catman .cat
./usr/share/man/cat8/cron.0 man-cron-catman .cat
./usr/share/man/cat8/dbsym.0 man-sysutil-catman binutils,.cat
+./usr/share/man/cat8/ddns-confgen.0 man-bind-catman .cat
./usr/share/man/cat8/defer.0 man-postfix-catman postfix,.cat
./usr/share/man/cat8/dev_mkdb.0 man-sysutil-catman .cat
./usr/share/man/cat8/devpubd.0 man-sysutil-catman .cat
@@ -2742,7 +2743,7 @@
./usr/share/man/cat8/rlogind.0 man-netutil-catman .cat
./usr/share/man/cat8/rmail.0 man-obsolete obsolete
./usr/share/man/cat8/rmt.0 man-sysutil-catman .cat
-./usr/share/man/cat8/rndc-confgen.0 man-obsolete obsolete
+./usr/share/man/cat8/rndc-confgen.0 man-bind-catman .cat
./usr/share/man/cat8/rndc.0 man-bind-catman .cat
./usr/share/man/cat8/rndctl.0 man-sysutil-catman .cat
./usr/share/man/cat8/route.0 man-netutil-catman .cat
@@ -4972,6 +4973,7 @@
./usr/share/man/html8/crash.html man-sysutil-htmlman html
./usr/share/man/html8/cron.html man-cron-htmlman html
./usr/share/man/html8/dbsym.html man-sysutil-htmlman binutils,html
+./usr/share/man/html8/ddns-confgen.html man-bind-htmlman html
./usr/s
CVS commit: src/external/bsd/bind
Module Name:src
Committed By: christos
Date: Wed May 9 21:59:10 UTC 2012
Modified Files:
src/external/bsd/bind: Makefile.inc
src/external/bsd/bind/bin: Makefile Makefile.inc
Added Files:
src/external/bsd/bind/bin/confgen: Makefile Makefile.inc
src/external/bsd/bind/bin/confgen/ddns-confgen: Makefile
src/external/bsd/bind/bin/confgen/rndc-confgen: Makefile
Log Message:
add confgen programs
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/bind/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/bind/bin/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/bind/bin/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/bind/bin/confgen/Makefile \
src/external/bsd/bind/bin/confgen/Makefile.inc
cvs rdiff -u -r0 -r1.1 \
src/external/bsd/bind/bin/confgen/ddns-confgen/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/bsd/bind/bin/confgen/rndc-confgen/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/Makefile.inc
diff -u src/external/bsd/bind/Makefile.inc:1.12 src/external/bsd/bind/Makefile.inc:1.13
--- src/external/bsd/bind/Makefile.inc:1.12 Mon Jun 20 03:43:57 2011
+++ src/external/bsd/bind/Makefile.inc Wed May 9 17:59:10 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.12 2011/06/20 07:43:57 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.13 2012/05/09 21:59:10 christos Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -108,7 +108,7 @@ CPPFLAGS+=-DISC_PLATFORM_USETHREADS -I${
CPPFLAGS+=-I${IDIST}/lib/isc/nothreads/include
.endif
-.if exists(${.CURDIR}/../../Makefile.inc)
-.include "${.CURDIR}/../../Makefile.inc"
+.if exists(${.PARSEDIR}/../Makefile.inc)
+.include "${.PARSEDIR}/../Makefile.inc"
.endif
.endif
Index: src/external/bsd/bind/bin/Makefile
diff -u src/external/bsd/bind/bin/Makefile:1.3 src/external/bsd/bind/bin/Makefile:1.4
--- src/external/bsd/bind/bin/Makefile:1.3 Sun Sep 11 14:55:24 2011
+++ src/external/bsd/bind/bin/Makefile Wed May 9 17:59:10 2012
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2011/09/11 18:55:24 christos Exp $
+# $NetBSD: Makefile,v 1.4 2012/05/09 21:59:10 christos Exp $
-SUBDIR= html dig host named nslookup nsupdate rndc dnssec check tools
+SUBDIR= html dig host named nslookup nsupdate rndc dnssec check tools confgen
.include "Makefile.inc"
Index: src/external/bsd/bind/bin/Makefile.inc
diff -u src/external/bsd/bind/bin/Makefile.inc:1.1 src/external/bsd/bind/bin/Makefile.inc:1.2
--- src/external/bsd/bind/bin/Makefile.inc:1.1 Sat Apr 11 23:46:04 2009
+++ src/external/bsd/bind/bin/Makefile.inc Wed May 9 17:59:10 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2009/04/12 03:46:04 christos Exp $
+# $NetBSD: Makefile.inc,v 1.2 2012/05/09 21:59:10 christos Exp $
-.include "../Makefile.inc"
+.include "${.PARSEDIR}/../Makefile.inc"
WARNS?= 2
Added files:
Index: src/external/bsd/bind/bin/confgen/Makefile
diff -u /dev/null src/external/bsd/bind/bin/confgen/Makefile:1.1
--- /dev/null Wed May 9 17:59:10 2012
+++ src/external/bsd/bind/bin/confgen/Makefile Wed May 9 17:59:10 2012
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2012/05/09 21:59:10 christos Exp $
+
+SUBDIR= rndc-confgen ddns-confgen
+
+.include
Index: src/external/bsd/bind/bin/confgen/Makefile.inc
diff -u /dev/null src/external/bsd/bind/bin/confgen/Makefile.inc:1.1
--- /dev/null Wed May 9 17:59:10 2012
+++ src/external/bsd/bind/bin/confgen/Makefile.inc Wed May 9 17:59:10 2012
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile.inc,v 1.1 2012/05/09 21:59:10 christos Exp $
+
+PROG= ${.CURDIR:T}
+SRCS= ${PROG}.c keygen.c util.c os.c
+MAN= ${PROG}.8
+BINDIR= /usr/sbin
+
+.include "${.PARSEDIR}/../Makefile.inc"
+
+DIST=${IDIST}/bin/confgen
+
+CPPFLAGS+= -I${DIST}/include \
+-DRNDC_CONFFILE=\"${SYSCONFDIR}/rndc.conf\" \
+ -DRNDC_KEYFILE=\"${SYSCONFDIR}/rndc.key\" \
+
+
+.PATH: ${DIST} ${DIST}/unix
Index: src/external/bsd/bind/bin/confgen/ddns-confgen/Makefile
diff -u /dev/null src/external/bsd/bind/bin/confgen/ddns-confgen/Makefile:1.1
--- /dev/null Wed May 9 17:59:11 2012
+++ src/external/bsd/bind/bin/confgen/ddns-confgen/Makefile Wed May 9 17:59:10 2012
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2012/05/09 21:59:10 christos Exp $
+
+.include "${.PARSEDIR}/../Makefile.inc"
+
+.include
Index: src/external/bsd/bind/bin/confgen/rndc-confgen/Makefile
diff -u /dev/null src/external/bsd/bind/bin/confgen/rndc-confgen/Makefile:1.1
--- /dev/null Wed May 9 17:59:11 2012
+++ src/external/bsd/bind/bin/confgen/rndc-confgen/Makefile Wed May 9 17:59:10 2012
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2012/05/09 21:59:10 christos Exp $
+
+.include "${.PARSEDIR}/../Makefile.inc"
+
+.include
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Wed May 9 20:11:55 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Tickets 235-240. To generate a diff of this commit: cvs rdiff -u -r1.1.2.86 -r1.1.2.87 src/doc/CHANGES-6.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.86 src/doc/CHANGES-6.0:1.1.2.87 --- src/doc/CHANGES-6.0:1.1.2.86 Wed May 9 15:57:59 2012 +++ src/doc/CHANGES-6.0 Wed May 9 20:11:55 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.86 2012/05/09 15:57:59 riz Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.87 2012/05/09 20:11:55 riz Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -,3 +,39 @@ tools/Makefile.gnuhost1.38 Avoid tools build error on Cygwin hosts. [tsutsui, ticket #234] +distrib/common/bootimage/Makefile.bootimage 1.5 + + Add two optinal variables MBR_BOOTCODE and INSTALLBOOTOPTIONS for + liveimage/installimage builds. + [tsutsui, ticket #235] + +sys/arch/x68k/dev/fd.c1.97 +sys/arch/x68k/x68k/machdep.c 1.182 + + Make x68k's floppy driver actually work on machines with extended + high memories. + [tsutsui, ticket #236] + +sys/arch/zaurus/dev/zkbdmap.h 1.7 + + Fix wrong keycode in raw keycode map so that right shift key properly + works on Xserver on C7x0/860. + [tsutsui, ticket #237] + +Makefile 1.292 + + Stop doing 'make includes' in usr.bin since it is no longer + necessary. + [veego, ticket #238] + +sys/arch/powerpc/powerpc/vm_machdep.c 1.96 + + PowerPC stack fix, atf test t_clone:clone_basic now passes. + [matt, ticket #239] + +sys/dev/ic/ld_cac.c1.27 + + Stop the annoying "cac0: unable to alloc CCB" messages by reserving + a CCB. + [macallan, ticket #240] +
CVS commit: [netbsd-6] src/sys/dev/ic
Module Name:src Committed By: riz Date: Wed May 9 20:11:12 UTC 2012 Modified Files: src/sys/dev/ic [netbsd-6]: ld_cac.c Log Message: Pull up following revision(s) (requested by macallan in ticket #240): sys/dev/ic/ld_cac.c: revision 1.27 Reserve a CCB for the driver. Stops the annoying cac0: unable to alloc CCB messages. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.26.2.1 src/sys/dev/ic/ld_cac.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/ic/ld_cac.c diff -u src/sys/dev/ic/ld_cac.c:1.26 src/sys/dev/ic/ld_cac.c:1.26.2.1 --- src/sys/dev/ic/ld_cac.c:1.26 Thu Feb 2 19:43:03 2012 +++ src/sys/dev/ic/ld_cac.c Wed May 9 20:11:12 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: ld_cac.c,v 1.26 2012/02/02 19:43:03 tls Exp $ */ +/* $NetBSD: ld_cac.c,v 1.26.2.1 2012/05/09 20:11:12 riz Exp $ */ /*- * Copyright (c) 2000, 2006 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ld_cac.c,v 1.26 2012/02/02 19:43:03 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ld_cac.c,v 1.26.2.1 2012/05/09 20:11:12 riz Exp $"); #include #include @@ -103,7 +103,7 @@ ld_cac_attach(device_t parent, device_t ld->sc_secsize = CAC_GET2(dinfo.secsize); ld->sc_maxxfer = CAC_MAX_XFER; - ld->sc_maxqueuecnt = CAC_MAX_CCBS / cac->sc_nunits; /* XXX */ + ld->sc_maxqueuecnt = (CAC_MAX_CCBS - 1) / cac->sc_nunits; ld->sc_secperunit = CAC_GET2(dinfo.ncylinders) * CAC_GET1(dinfo.nheads) * CAC_GET1(dinfo.nsectors); ld->sc_start = ld_cac_start;
CVS commit: [netbsd-6] src/sys/arch/powerpc/powerpc
Module Name:src
Committed By: riz
Date: Wed May 9 20:09:15 UTC 2012
Modified Files:
src/sys/arch/powerpc/powerpc [netbsd-6]: vm_machdep.c
Log Message:
Pull up following revision(s) (requested by matt in ticket #239):
sys/arch/powerpc/powerpc/vm_machdep.c: revision 1.96
When a stack is specified, make sure the stack has enough for a previous
callframe in which the LR can be stored. (atf test t_clone:clone_basic
now passes).
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.94.2.1 src/sys/arch/powerpc/powerpc/vm_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/powerpc/vm_machdep.c
diff -u src/sys/arch/powerpc/powerpc/vm_machdep.c:1.94 src/sys/arch/powerpc/powerpc/vm_machdep.c:1.94.2.1
--- src/sys/arch/powerpc/powerpc/vm_machdep.c:1.94 Mon Feb 13 13:44:14 2012
+++ src/sys/arch/powerpc/powerpc/vm_machdep.c Wed May 9 20:09:15 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.94 2012/02/13 13:44:14 phx Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.94.2.1 2012/05/09 20:09:15 riz Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.94 2012/02/13 13:44:14 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.94.2.1 2012/05/09 20:09:15 riz Exp $");
#include "opt_altivec.h"
#include "opt_multiprocessor.h"
@@ -108,10 +108,13 @@ cpu_lwp_fork(struct lwp *l1, struct lwp
*l2->l_md.md_utf = *l1->l_md.md_utf;
/*
- * If specified, give the child a different stack.
+ * If specified, give the child a different stack. Make sure to
+ * reserve enough at the top to store the previous LR.
*/
if (stack != NULL) {
- l2->l_md.md_utf->tf_fixreg[1] = (register_t)stack + stacksize;
+ l2->l_md.md_utf->tf_fixreg[1] =
+ ((register_t)stack + stacksize - STACK_ALIGNBYTES)
+ & ~STACK_ALIGNBYTES;
}
/*
CVS commit: [netbsd-6] src
Module Name:src
Committed By: riz
Date: Wed May 9 20:06:37 UTC 2012
Modified Files:
src [netbsd-6]: Makefile
Log Message:
Pull up following revision(s) (requested by veego in ticket #238):
Makefile: revision 1.292
Add usr.bin to the exclude list for make includes.
This is no longer needed after flex was moved to the external framework.
To generate a diff of this commit:
cvs rdiff -u -r1.291 -r1.291.2.1 src/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/Makefile
diff -u src/Makefile:1.291 src/Makefile:1.291.2.1
--- src/Makefile:1.291 Tue Jan 24 17:37:34 2012
+++ src/Makefile Wed May 9 20:06:36 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.291 2012/01/24 17:37:34 abs Exp $
+# $NetBSD: Makefile,v 1.291.2.1 2012/05/09 20:06:36 riz Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -563,7 +563,7 @@ do-obsolete: .PHONY .MAKE
# (Tells not to recurse for them.)
#
-.for dir in bin etc distrib games libexec regress sbin usr.sbin tools
+.for dir in bin etc distrib games libexec regress sbin usr.bin usr.sbin tools
includes-${dir}: .PHONY
@true
.endfor
CVS commit: [netbsd-6] src/sys/arch/zaurus/dev
Module Name:src
Committed By: riz
Date: Wed May 9 20:03:53 UTC 2012
Modified Files:
src/sys/arch/zaurus/dev [netbsd-6]: zkbdmap.h
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #237):
sys/arch/zaurus/dev/zkbdmap.h: revision 1.7
Fix wrong raw keycode in xt_keymap_c860[] so that right shift properly works
on Xserver on C7x0/860. From steleto.
Should be pulled up to netbsd-6.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.2.1 src/sys/arch/zaurus/dev/zkbdmap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/zaurus/dev/zkbdmap.h
diff -u src/sys/arch/zaurus/dev/zkbdmap.h:1.6 src/sys/arch/zaurus/dev/zkbdmap.h:1.6.2.1
--- src/sys/arch/zaurus/dev/zkbdmap.h:1.6 Sun Jan 29 10:12:42 2012
+++ src/sys/arch/zaurus/dev/zkbdmap.h Wed May 9 20:03:53 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: zkbdmap.h,v 1.6 2012/01/29 10:12:42 tsutsui Exp $ */
+/* $NetBSD: zkbdmap.h,v 1.6.2.1 2012/05/09 20:03:53 riz Exp $ */
/* $OpenBSD: zaurus_kbdmap.h,v 1.19 2005/05/10 08:26:12 espie Exp $ */
/*
@@ -327,7 +327,7 @@ static const char xt_keymap_c860[] = {
/* KC(72), */ 0x00, /* NC */
/* KC(73), */ 0x00, /* NC */
/* KC(74), */ 0x00, /* NC */
-/* KC(75), */ 0x00, /* NC */
+/* KC(75), */ 0x36, /* KS_Shift_R, */
/* KC(76), */ 0x00, /* NC */
/* KC(77), */ 0x00, /* NC */
/* KC(78), */ 0x00, /* NC */
@@ -335,7 +335,7 @@ static const char xt_keymap_c860[] = {
/* KC(80), */ 0x00, /* NC */
/* KC(81), */ 0x00, /* NC */
/* KC(82), */ 0x00, /* NC */
-/* KC(83), */ 0x36, /* KS_Shift_R, */
+/* KC(83), */ 0x00, /* NC */
/* KC(84), */ 0x2a, /* KS_Shift_L, */
/* KC(85), */ 0x00, /* NC */
/* KC(86), */ 0x00, /* NC */
CVS commit: [netbsd-6] src/sys/arch/x68k
Module Name:src
Committed By: riz
Date: Wed May 9 20:01:51 UTC 2012
Modified Files:
src/sys/arch/x68k/dev [netbsd-6]: fd.c
src/sys/arch/x68k/x68k [netbsd-6]: machdep.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #236):
sys/arch/x68k/x68k/machdep.c: revision 1.182
sys/arch/x68k/dev/fd.c: revision 1.97
Make x68k's floppy driver actually work with proper bounce buffer xfer ops
on machines with extended high memories:
- dev/fd.c:
- add missing bus_dmamap_sync(9) POSTREAD/POSTWRITE ops
- x68k/machdep.c:
- update avail_end variable (which is used to check DMA'able memory range
in intio.c) properly per probed extended memory regions
The problem was found during debugging XM6i's FDC emulation by
Y.Sugahara, isaki@, and me.
Should be pulled up to netbsd-6.
To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.96.2.1 src/sys/arch/x68k/dev/fd.c
cvs rdiff -u -r1.181 -r1.181.2.1 src/sys/arch/x68k/x68k/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x68k/dev/fd.c
diff -u src/sys/arch/x68k/dev/fd.c:1.96 src/sys/arch/x68k/dev/fd.c:1.96.2.1
--- src/sys/arch/x68k/dev/fd.c:1.96 Thu Feb 2 19:43:01 2012
+++ src/sys/arch/x68k/dev/fd.c Wed May 9 20:01:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.96 2012/02/02 19:43:01 tls Exp $ */
+/* $NetBSD: fd.c,v 1.96.2.1 2012/05/09 20:01:51 riz Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.96 2012/02/02 19:43:01 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.96.2.1 2012/05/09 20:01:51 riz Exp $");
#include "opt_ddb.h"
#include "opt_m68k_arch.h"
@@ -148,6 +148,7 @@ struct fdc_softc {
u_int8_t *sc_addr; /* physical address */
struct dmac_channel_stat *sc_dmachan; /* intio DMA channel */
struct dmac_dma_xfer *sc_xfer; /* DMA transfer */
+ int sc_read;
struct fd_softc *sc_fd[4]; /* pointers to children */
TAILQ_HEAD(drivehead, fd_softc) sc_drives;
@@ -324,6 +325,7 @@ fdc_dmastart(struct fdc_softc *fdc, int
(u_int8_t*) (fdc->sc_addr +
fddata)); /* XXX */
+ fdc->sc_read = read;
dmac_start_xfer(fdc->sc_dmachan->ch_softc, fdc->sc_xfer);
}
@@ -332,6 +334,10 @@ fdcdmaintr(void *arg)
{
struct fdc_softc *fdc = arg;
+ bus_dmamap_sync(fdc->sc_dmat, fdc->sc_dmamap,
+ 0, fdc->sc_dmamap->dm_mapsize,
+ fdc->sc_read ?
+ BUS_DMASYNC_POSTREAD : BUS_DMASYNC_POSTWRITE);
bus_dmamap_unload(fdc->sc_dmat, fdc->sc_dmamap);
return 0;
Index: src/sys/arch/x68k/x68k/machdep.c
diff -u src/sys/arch/x68k/x68k/machdep.c:1.181 src/sys/arch/x68k/x68k/machdep.c:1.181.2.1
--- src/sys/arch/x68k/x68k/machdep.c:1.181 Sun Jan 29 12:43:00 2012
+++ src/sys/arch/x68k/x68k/machdep.c Wed May 9 20:01:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.181 2012/01/29 12:43:00 isaki Exp $ */
+/* $NetBSD: machdep.c,v 1.181.2.1 2012/05/09 20:01:51 riz Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.181 2012/01/29 12:43:00 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.181.2.1 2012/05/09 20:01:51 riz Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -174,6 +174,7 @@ void
x68k_init(void)
{
u_int i;
+ paddr_t msgbuf_pa;
/*
* Tell the VM system about available physical memory.
@@ -181,17 +182,25 @@ x68k_init(void)
uvm_page_physload(atop(avail_start), atop(avail_end),
atop(avail_start), atop(avail_end),
VM_FREELIST_MAINMEM);
+
+ /*
+ * avail_end was pre-decremented in pmap_bootstrap to compensate
+ * for msgbuf pages, but avail_end is also used to check DMA'able
+ * memory range for intio devices and it would be updated per
+ * probed extended memories, so explicitly save msgbuf address here.
+ */
+ msgbuf_pa = avail_end;
+
#ifdef EXTENDED_MEMORY
setmemrange();
#endif
/*
* Initialize error message buffer (at end of core).
- * avail_end was pre-decremented in pmap_bootstrap to compensate.
*/
for (i = 0; i < btoc(MSGBUFSIZE); i++)
pmap_kenter_pa((vaddr_t)msgbufaddr + i * PAGE_SIZE,
- avail_end + i * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, 0);
+ msgbuf_pa + i * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, 0);
pmap_update(pmap_kernel());
initmsgbuf(msgbufaddr, m68k_round_page(MSGBUFSIZE));
}
@@ -1146,6 +1155,8 @@ setmemrange(void)
atop(mlist[i].base), atop(h),
VM_FREELIST_HIGHMEM);
mem_size += h - (u_long) mlist[i].base;
+ if (avail_end < h)
+avail_end = h;
}
}
CVS commit: [netbsd-6] src/distrib/common/bootimage
Module Name:src
Committed By: riz
Date: Wed May 9 19:58:28 UTC 2012
Modified Files:
src/distrib/common/bootimage [netbsd-6]: Makefile.bootimage
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #235):
distrib/common/bootimage/Makefile.bootimage: revision 1.5
Add two optional variables for liveimage/installimage builds:
---
MBR_BOOTCODE
optional MBR bootcode which should be installed by fdisk(8)
(default: empty)
- specified MBR_BOOTCODE must exist in ${DESTDIR}/usr/mdec
- if MBR_BOOTCODE is not specified,
MBR_DEFAULT_BOOTCODE (default: mbr) will be used
if the target ${MACHINE} has the one in /usr/mdec
INSTALLBOOTOPTIONS
options passed to installboot(8), e.g., -o console=com0
(default: empty)
---
Proposed by Brook Milligan on current-users@:
http://mail-index.NetBSD.org/current-users/2012/04/16/msg019892.html
Also make USE_MBR work on ${MACHINE}s which don't have the default
/usr/mdec/mbr bootcode. (no such port has the liveimage target yet though)
XXX: tools fdisk(8) implicitly uses host's /usr/mdec/mbr for the default
XXX: bootcode even for non-x86 targets if host is x86
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.2.1 src/distrib/common/bootimage/Makefile.bootimage
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.3 src/distrib/common/bootimage/Makefile.bootimage:1.3.2.1
--- src/distrib/common/bootimage/Makefile.bootimage:1.3 Sun Jan 22 16:56:22 2012
+++ src/distrib/common/bootimage/Makefile.bootimage Wed May 9 19:58:27 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.3 2012/01/22 16:56:22 tsutsui Exp $
+# $NetBSD: Makefile.bootimage,v 1.3.2.1 2012/05/09 19:58:27 riz Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -40,6 +40,13 @@
# USE_MBR
# set yes if target disk image requires MBR partition
# (defautl: no)
+# MBR_BOOTCODE
+# optional MBR bootcode which should be installed by fdisk(8)
+# (default: empty)
+# - specified MBR_BOOTCODE must exist in ${DESTDIR}/usr/mdec
+# - if MBR_BOOTCODE is not specified,
+# MBR_DEFAULT_BOOTCODE (default: mbr) will be used
+# if the target ${MACHINE} has the one in /usr/mdec
# USE_SUNLABEL
# set yes if target disk image requires Sun's label
# (default: no)
@@ -92,6 +99,9 @@
# IMGMAKEFSOPTIONS
# options passed to makefs(8) to create root file system
# (default: -o bsize=16384,fsize=2048,density=8192)
+# INSTALLBOOTOPTIONS
+# options passed to installboot(8), e.g., -o console=com0
+# (default: empty)
# PRIMARY_BOOT
# primary boot loader that should be installed into
# the target image via installboot(8)
@@ -286,7 +296,7 @@ ${TARGETFS}: prepare_md_post
${IMGMAKEFSOPTIONS} \
${WORKFS} ${WORKDIR}
.if !empty(PRIMARY_BOOT) && ${INSTALLBOOT_AFTER_DISKLABEL} == "no"
- ${TOOL_INSTALLBOOT} -vm ${MACHINE} ${WORKFS} \
+ ${TOOL_INSTALLBOOT} -v -m ${MACHINE} ${INSTALLBOOTOPTIONS} ${WORKFS} \
${WORKDIR}/usr/mdec/${PRIMARY_BOOT} ${SECONDARY_BOOT_ARG}
.endif
@echo done.
@@ -301,6 +311,8 @@ DISKPROTO_IN?= ${DISTRIBDIR}/common/boot
DISKPROTO_IN?= ${DISTRIBDIR}/common/bootimage/diskproto.in
.endif
+MBR_DEFAULT_BOOTCODE?= mbr
+
OMIT_SWAPIMG?= no
WORKMBR?= work.mbr
@@ -328,14 +340,30 @@ ${WORKLABEL}:
mv ${WORKLABEL}.tmp ${WORKLABEL}
${IMGBASE}.img: ${TARGETFS} ${WORKLABEL}
-.if ${LABELSECTORS} != "0"
+.if ${USE_MBR} != "no"
@echo creating MBR labels...
${DD} if=/dev/zero of=${WORKMBR} seek=$$((${IMAGESECTORS} - 1)) count=1
- ${TOOL_FDISK} -f -u \
+ ${TOOL_FDISK} -f -i -u \
-b ${MBRCYLINDERS}/${MBRHEADS}/${MBRSECTORS} \
-0 -a -s ${MBRNETBSD}/${FSOFFSET}/${BSDPARTSECTORS} \
- -i -c ${WORKDIR}/usr/mdec/mbr\
-F ${WORKMBR}
+.if empty(MBR_BOOTCODE)
+ @if [ -f ${WORKDIR}/usr/mdec/${MBR_DEFAULT_BOOTCODE} ]; then \
+ echo ${TOOL_FDISK} -f \
+ -i -c ${WORKDIR}/usr/mdec/${MBR_DEFAULT_BOOTCODE} \
+ -F ${WORKMBR}; \
+ ${TOOL_FDISK} -f \
+ -i -c ${WORKDIR}/usr/mdec/${MBR_DEFAULT_BOOTCODE} \
+ -F ${WORKMBR}; \
+ fi
+.else
+ @if [ ! -f ${WORKDIR}/usr/mdec/${MBR_BOOTCODE} ]; then \
+ echo "${MBR_BOOTCODE} is not found in DESTDIR/usr/mdec, aborting"; \
+ false; \
+ fi
+ ${TOOL_FDISK} -f -i -c ${WORKDIR}/usr/mdec/${MBR_BOOTCODE} \
+ -F ${WORKMBR}
+.endif
${DD} if=${WORKMBR} count=${LABELSECTORS} | \
${CAT} - ${TARGETFS} > ${WORKIMG}
.else
@@ -354,7 +382,7 @@ ${IMGBASE}.img: ${TARGETFS} ${WORKLABEL}
.endif
${TOOL_DISKLABEL} -R -F ${WORKIMG} ${WORKLABEL}
.if !empty(PRIMARY_BOOT) && ${INSTALLBOOT_AFTER_DISKLABEL} != "no"
- ${TOOL_INSTALLBOOT} -vm ${MACHINE} ${WORKIMG} \
+ ${TOOL_INSTALLBO
CVS commit: [netbsd-6] src
Module Name:src
Committed By: riz
Date: Wed May 9 18:22:36 UTC 2012
Modified Files:
src/distrib/sets/lists/comp [netbsd-6]: mi
src/include [netbsd-6]: math.h
src/lib/libm [netbsd-6]: Makefile
src/lib/libm/man [netbsd-6]: lgamma.3
src/lib/libm/src [netbsd-6]: math_private.h
Added Files:
src/lib/libm/src [netbsd-6]: b_exp.c b_log.c b_tgamma.c s_tgammaf.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #232):
distrib/sets/lists/comp/mi: revision 1.1756
lib/libm/Makefile: revision 1.124
lib/libm/src/math_private.h: revision 1.17
lib/libm/src/b_tgamma.c: revision 1.1
lib/libm/man/lgamma.3: revision 1.22
lib/libm/src/b_log.c: revision 1.1
lib/libm/src/b_exp.c: revision 1.1
include/math.h: revision 1.58
lib/libm/src/s_tgammaf.c: revision 1.1
add tgamma{,f}
Add tgamma{,f} from FreeBSD via rudolf, netbsd at eq dot cz
oops, forgot to commit: add tgamma and tgammaf
To generate a diff of this commit:
cvs rdiff -u -r1.1738.2.1 -r1.1738.2.2 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.57 -r1.57.2.1 src/include/math.h
cvs rdiff -u -r1.120 -r1.120.4.1 src/lib/libm/Makefile
cvs rdiff -u -r1.21 -r1.21.56.1 src/lib/libm/man/lgamma.3
cvs rdiff -u -r0 -r1.1.2.2 src/lib/libm/src/b_exp.c src/lib/libm/src/b_log.c \
src/lib/libm/src/b_tgamma.c src/lib/libm/src/s_tgammaf.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/lib/libm/src/math_private.h
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/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1738.2.1 src/distrib/sets/lists/comp/mi:1.1738.2.2
--- src/distrib/sets/lists/comp/mi:1.1738.2.1 Fri Mar 2 18:27:44 2012
+++ src/distrib/sets/lists/comp/mi Wed May 9 18:22:32 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1738.2.1 2012/03/02 18:27:44 riz Exp $
+# $NetBSD: mi,v 1.1738.2.2 2012/05/09 18:22:32 riz Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -9145,6 +9145,8 @@
./usr/share/man/cat3/termname.0 comp-c-catman .cat
./usr/share/man/cat3/textdomain.0 comp-c-catman .cat
./usr/share/man/cat3/tfind.0 comp-c-catman .cat
+./usr/share/man/cat3/tgamma.0 comp-c-catman .cat
+./usr/share/man/cat3/tgammaf.0 comp-c-catman .cat
./usr/share/man/cat3/tgetent.0 comp-c-catman .cat
./usr/share/man/cat3/tgetflag.0 comp-c-catman .cat
./usr/share/man/cat3/tgetnum.0 comp-c-catman .cat
@@ -15365,6 +15367,8 @@
./usr/share/man/html3/termname.html comp-c-htmlman html
./usr/share/man/html3/textdomain.html comp-c-htmlman html
./usr/share/man/html3/tfind.html comp-c-htmlman html
+./usr/share/man/html3/tgamma.html comp-c-htmlman html
+./usr/share/man/html3/tgammaf.html comp-c-htmlman html
./usr/share/man/html3/tgetent.html comp-c-htmlman html
./usr/share/man/html3/tgetflag.html comp-c-htmlman html
./usr/share/man/html3/tgetnum.html comp-c-htmlman html
@@ -21651,6 +21655,8 @@
./usr/share/man/man3/termname.3 comp-c-man .man
./usr/share/man/man3/textdomain.3 comp-c-man .man
./usr/share/man/man3/tfind.3 comp-c-man .man
+./usr/share/man/man3/tgamma.3 comp-c-man .man
+./usr/share/man/man3/tgammaf.3 comp-c-man .man
./usr/share/man/man3/tgetent.3 comp-c-man .man
./usr/share/man/man3/tgetflag.3 comp-c-man .man
./usr/share/man/man3/tgetnum.3 comp-c-man .man
Index: src/include/math.h
diff -u src/include/math.h:1.57 src/include/math.h:1.57.2.1
--- src/include/math.h:1.57 Sun Feb 5 17:57:17 2012
+++ src/include/math.h Wed May 9 18:22:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: math.h,v 1.57 2012/02/05 17:57:17 matt Exp $ */
+/* $NetBSD: math.h,v 1.57.2.1 2012/05/09 18:22:36 riz Exp $ */
/*
*
@@ -321,6 +321,8 @@ float sqrtf(float);
float erff(float);
float erfcf(float);
float lgammaf(float);
+float tgammaf(float);
+double tgamma(double);
/* 7.12.9 nearest integer */
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.120 src/lib/libm/Makefile:1.120.4.1
--- src/lib/libm/Makefile:1.120 Sat Sep 17 10:51:52 2011
+++ src/lib/libm/Makefile Wed May 9 18:22:36 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.120 2011/09/17 10:51:52 jruoho Exp $
+# $NetBSD: Makefile,v 1.120.4.1 2012/05/09 18:22:36 riz Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -125,7 +125,8 @@ COPTS+= -fno-strict-aliasing
CPPFLAGS+=-DLIBM_SCCS
LIB= m
-COMMON_SRCS+= e_acos.c e_acosf.c e_acosh.c e_acoshf.c e_asin.c e_asinf.c \
+COMMON_SRCS+= b_exp.c b_log.c b_tgamma.c \
+ e_acos.c e_acosf.c e_acosh.c e_acoshf.c e_asin.c e_asinf.c \
e_atan2.c e_atan2f.c e_atanh.c e_atanhf.c e_cosh.c e_coshf.c e_exp.c \
e_expf.c e_fmod.c e_fmodf.c e_hypot.c e_hypotf.c e_j0.c e_j0f.c \
e_j1.c e_j1f.c e_jn.c e_jnf.c e_lgamma_r.c e_lgammaf_r.c e_log.c \
@@ -144,7 +145,7 @@ COMMON_SRCS+= e_acos.c e_acosf.c e_acosh
s_mat
CVS commit: src/lib/libusbhid
Module Name:src Committed By: khorben Date: Wed May 9 16:21:06 UTC 2012 Modified Files: src/lib/libusbhid: usb_hid_usages Log Message: Extended usb_hid_usages, with help from the equivalent file from FreeBSD. Favored NetBSD upon conflicts, except for a typo and consistency. ok riz@ To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/lib/libusbhid/usb_hid_usages Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libusbhid/usb_hid_usages diff -u src/lib/libusbhid/usb_hid_usages:1.5 src/lib/libusbhid/usb_hid_usages:1.6 --- src/lib/libusbhid/usb_hid_usages:1.5 Tue Jan 17 03:49:20 2012 +++ src/lib/libusbhid/usb_hid_usages Wed May 9 16:21:06 2012 @@ -1,4 +1,4 @@ -# $NetBSD: usb_hid_usages,v 1.5 2012/01/17 03:49:20 christos Exp $ +# $NetBSD: usb_hid_usages,v 1.6 2012/05/09 16:21:06 khorben Exp $ # # USB HID usage table # Syntax: @@ -19,6 +19,7 @@ 0x06 Keyboard 0x07 Keypad 0x08 Multi-axis Controller + 0x09 Tablet PC System Controls 0x30 X 0x31 Y 0x32 Z @@ -32,6 +33,8 @@ 0x3A Counted Buffer 0x3B Byte Count 0x3C Motion Wakeup + 0x3D Start + 0x3E Select 0x40 Vx 0x41 Vy 0x42 Vz @@ -39,6 +42,8 @@ 0x44 Vbry 0x45 Vbrx 0x46 Vno + 0x47 Feature Notification + 0x48 Resolution Multiplier 0x80 System Control 0x81 System Power Down 0x82 System Sleep @@ -53,10 +58,29 @@ 0x8B System Menu Left 0x8C System Menu Up 0x8D System Menu Down + 0x8E System Cold Restart + 0x8F System Warm Restart 0x90 D-pad Up 0x91 D-pad Down 0x92 D-pad Right 0x93 D-pad Left + 0xA0 System Dock + 0xA1 System Undock + 0xA2 System Setup + 0xA3 System Break + 0xA4 System Debugger Break + 0xA5 Application Break + 0xA6 Application Debugger Break + 0xA7 System Speaker Mute + 0xA8 System Hibernate + 0xB0 System Display Invert + 0xB1 System Display Internal + 0xB2 System Display External + 0xB3 System Display Both + 0xB4 System Display Dual + 0xB5 System Display Toggle Int/Ext + 0xB6 System Display Swap Primary/Secondary + 0xB7 System Display LCD Autoscale 2 Simulation Controls 0x00 Undefined @@ -542,6 +566,7 @@ 0x2E Ring Select 0x2F Phone Mute 0x30 Caller ID + 0x31 Send 0x50 Speed Dial 0x51 Store Number 0x52 Recall Number @@ -564,6 +589,8 @@ 0x9A Confirmation Tone 1 0x9B Confirmation Tone 2 0x9C Tones Off + 0x9D Outside Ringback + 0x9E Ringer 0xB0 Phone Key 0 0xB1 Phone Key 1 0xB2 Phone Key 2 @@ -586,6 +613,9 @@ 0x01 Consumer Control 0x02 Numeric Key Pad 0x03 Programmable Buttons + 0x04 Microphone + 0x05 Headphone + 0x06 Graphic Equalizer 0x20 +10 0x21 +100 0x22 AM/PM @@ -676,7 +706,9 @@ 0xC9 Show Counter 0xCA Tracking Increment 0xCB Tracking Decrement - 0xCD Pause/Play + 0xCC Stop/Eject + 0xCD Play/Pause + 0xCE Play/Skip 0xE0 Volume 0xE1 Balance 0xE2 Mute @@ -703,6 +735,11 @@ 0x106 Security Enable 0x107 Fire Alarm 0x108 Police Alarm + 0x109 Proximity + 0x10A Motion + 0x10B Duress Alarm + 0x10C Holdup Alarm + 0x10D Medical Alarm 0x150 Balance Right 0x151 Balance Left 0x152 Bass Increment @@ -763,10 +800,39 @@ 0x1A3 AL Next Task/Application 0x1A4 AL Previous Task/Application 0x1A5 AL Preemptive Halt Task/Application + 0x1A6 AL Integrated Help Center 0x1A7 AL My Documents + 0x1A8 AL Thesaurus + 0x1A9 AL Dictionary + 0x1AA AL Desktop 0x1AB AC Spell + 0x1AC AL Grammar Check + 0x1AD AL Wireless Status + 0x1AE AL Keyboard Layout + 0x1AF AL Virus Protection + 0x1B0 AL Encryption + 0x1B1 AL Screen Saver + 0x1B2 AL Alarms + 0x1B3 AL Clock + 0x1B4 AL File Browser + 0x1B5 AL Power Status 0x1B6 AL My Pictures 0x1B7 AL My Music + 0x1B8 AL Movie Browser + 0x1B9 AL Digital Rights Manager + 0x1BA AL Digital Wallet + 0x1BC AL Instant Messaging + 0x1BD AL OEM Feature/Tips/Tutorial Browser + 0x1BE AL OEM Help + 0x1BF AL Online Community + 0x1C0 AL Entertainment Content Browser + 0x1C1 AL Online Shopping Browser + 0x1C2 AL SmartCard Information/Help + 0x1C3 AL Market Monitor/Finance Browser + 0x1C4 AL Customized Corporate News Browser + 0x1C5 AL Online Activity Browser + 0x1C6 AL Research/Search Browser + 0x1C7 AL Audio Player 0x200 Generic GUI Application Controls 0x201 AC New 0x202 AC Open @@ -812,10 +878,102 @@ 0x23A AC Tile Horizontally 0x23B AC Tile Vertically 0x23C AC Format + 0x23D AC Edit + 0x23E AC Bold + 0x23F AC Italics + 0x240 AC Underline + 0x241 AC Strikethrough + 0x242 AC Subscript + 0x243 AC Superscript + 0x244 AC All Caps + 0x245 AC Rotate + 0x246 AC Resize + 0x247 AC Flip Horizontal + 0x248 AC Flip Vertical + 0x249 AC Mirror Horizontal + 0x24A AC Mirror Vertical + 0x24B AC Font Select + 0x24C AC Font Color + 0x24D AC Font Size + 0x24E AC Justify Left + 0x24F AC Justify Center H + 0x250 AC Justify Right + 0x251 AC Justify Block H + 0x252 AC Justify Top + 0x253 AC Justify Center V + 0x254 AC Justify Bottom + 0x255 AC Justify Block V + 0x256 AC Justify Decrease + 0x257 AC Justify Increase + 0x
CVS commit: [netbsd-6] src/doc
Module Name:src
Committed By: riz
Date: Wed May 9 15:57:59 UTC 2012
Modified Files:
src/doc [netbsd-6]: CHANGES-6.0
Log Message:
Tickets 230, 232-234.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.85 -r1.1.2.86 src/doc/CHANGES-6.0
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES-6.0
diff -u src/doc/CHANGES-6.0:1.1.2.85 src/doc/CHANGES-6.0:1.1.2.86
--- src/doc/CHANGES-6.0:1.1.2.85 Wed May 9 03:42:54 2012
+++ src/doc/CHANGES-6.0 Wed May 9 15:57:59 2012
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0,v 1.1.2.85 2012/05/09 03:42:54 riz Exp $
+# $NetBSD: CHANGES-6.0,v 1.1.2.86 2012/05/09 15:57:59 riz Exp $
A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012
until the 6.0 release:
@@ -2192,3 +2192,33 @@ usr.sbin/makemandb/makemandb.c 1.9
Clean up after removing man page aliases. PR#46419.
[wiz, ticket #229]
+bin/rcp/rcp.c 1.49
+
+ Don't reuse buffers across recursive calls.
+ [chs, ticket #230]
+
+distrib/sets/lists/comp/mi 1.1756
+include/math.h 1.58
+lib/libm/Makefile1.124
+lib/libm/man/lgamma.31.22
+lib/libm/src/b_exp.c1.1
+lib/libm/src/b_log.c1.1
+lib/libm/src/b_tgamma.c1.1
+lib/libm/src/math_private.h 1.17
+lib/libm/src/s_tgammaf.c 1.1
+
+ Add tgamma{,f} from FreeBSD.
+ [christos, ticket #232]
+
+sys/arch/amd64/amd64/db_memrw.c 1.10-1.11 via patch
+sys/arch/i386/i386/db_memrw.c 1.29
+
+ Fix a bug in db_write_text() function that prohibits its use
+ for code that spans multiple pages.
+ [jym, ticket #233]
+
+tools/Makefile.gnuhost1.38
+
+ Avoid tools build error on Cygwin hosts.
+ [tsutsui, ticket #234]
+
CVS commit: [netbsd-6] src/tools
Module Name:src
Committed By: riz
Date: Wed May 9 15:55:06 UTC 2012
Modified Files:
src/tools [netbsd-6]: Makefile.gnuhost
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #234):
tools/Makefile.gnuhost: revision 1.38
Replace not only space but also '(' and ')' on generating BUILD_PLATFORM
strings to appease shell's echo.
Cygwin's uname -r returns "1.7.9(0.237/5/3)" etc.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.37.2.1 src/tools/Makefile.gnuhost
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/Makefile.gnuhost
diff -u src/tools/Makefile.gnuhost:1.37 src/tools/Makefile.gnuhost:1.37.2.1
--- src/tools/Makefile.gnuhost:1.37 Sat Jan 21 22:31:15 2012
+++ src/tools/Makefile.gnuhost Wed May 9 15:55:06 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.gnuhost,v 1.37 2012/01/21 22:31:15 christos Exp $
+# $NetBSD: Makefile.gnuhost,v 1.37.2.1 2012/05/09 15:55:06 riz Exp $
#
# Rules used when building a GNU host package. Expects MODULE to be set.
#
@@ -97,7 +97,7 @@ MAKE_ARGS+= BISON=true DESTDIR= INSTALL=
ALL_TARGET?= all
INSTALL_TARGET?=install
-BUILD_PLATFORM!= uname -srm | tr ' ' '-'
+BUILD_PLATFORM!= uname -srm | tr ' ()' '-'
CONFIGURE_PLATFORM!= if [ -s .configure_done ]; then cat .configure_done; else echo none; fi
.if "${BUILD_PLATFORM}" != "${CONFIGURE_PLATFORM}"
configure_cleanup:
CVS commit: [netbsd-6] src/sys/arch
Module Name:src
Committed By: riz
Date: Wed May 9 15:50:38 UTC 2012
Modified Files:
src/sys/arch/amd64/amd64 [netbsd-6]: db_memrw.c
src/sys/arch/i386/i386 [netbsd-6]: db_memrw.c
Log Message:
Pull up following revision(s) (requested by jym in ticket #233):
sys/arch/amd64/amd64/db_memrw.c: revision 1.10
sys/arch/amd64/amd64/db_memrw.c: revision 1.11
sys/arch/i386/i386/db_memrw.c: revision 1.29
Use the current destination address to compute PTE, not the address of
origin.
Harmless, except when db_write_text() passes a page boundary.
From Bug Hunting.
XXX has to be pulled up to -5 and -6.
invlpg on a non canonical address is a noop, so no chance to invalidate
the TLB and the CPU will not notice the access right change.
This results in write protection faults in supervisor mode when patching
kernel code through ddb(4) (originally mapped as read only).
Bug reported by David Laight on port-amd64@ (thanks!), patch and test by
me.
i386 is unaffected as PG_LGFRAME does not mask the sign bits. For the
sake of correctness, use VA_SIGN_NEG(...) anyway.
XXX this is the patch that will be pulled-up to -5 and -6.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.4.1 src/sys/arch/amd64/amd64/db_memrw.c
cvs rdiff -u -r1.25 -r1.25.18.1 src/sys/arch/i386/i386/db_memrw.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/amd64/amd64/db_memrw.c
diff -u src/sys/arch/amd64/amd64/db_memrw.c:1.9 src/sys/arch/amd64/amd64/db_memrw.c:1.9.4.1
--- src/sys/arch/amd64/amd64/db_memrw.c:1.9 Wed Nov 23 01:15:02 2011
+++ src/sys/arch/amd64/amd64/db_memrw.c Wed May 9 15:50:38 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: db_memrw.c,v 1.9 2011/11/23 01:15:02 jym Exp $ */
+/* $NetBSD: db_memrw.c,v 1.9.4.1 2012/05/09 15:50:38 riz Exp $ */
/*-
* Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
@@ -51,7 +51,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.9 2011/11/23 01:15:02 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.9.4.1 2012/05/09 15:50:38 riz Exp $");
#include
#include
@@ -111,7 +111,7 @@ db_write_text(vaddr_t addr, size_t size,
/*
* Get the PTE for the page.
*/
- ppte = kvtopte(addr);
+ ppte = kvtopte((vaddr_t)dst);
pte = *ppte;
if ((pte & PG_V) == 0) {
@@ -123,7 +123,7 @@ db_write_text(vaddr_t addr, size_t size,
* Get the VA for the page.
*/
if (pte & PG_PS)
- pgva = (vaddr_t)dst & PG_LGFRAME;
+ pgva = VA_SIGN_NEG((vaddr_t)dst & PG_LGFRAME);
else
pgva = x86_trunc_page(dst);
Index: src/sys/arch/i386/i386/db_memrw.c
diff -u src/sys/arch/i386/i386/db_memrw.c:1.25 src/sys/arch/i386/i386/db_memrw.c:1.25.18.1
--- src/sys/arch/i386/i386/db_memrw.c:1.25 Tue Mar 10 20:05:30 2009
+++ src/sys/arch/i386/i386/db_memrw.c Wed May 9 15:50:38 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: db_memrw.c,v 1.25 2009/03/10 20:05:30 bouyer Exp $ */
+/* $NetBSD: db_memrw.c,v 1.25.18.1 2012/05/09 15:50:38 riz Exp $ */
/*-
* Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.25 2009/03/10 20:05:30 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.25.18.1 2012/05/09 15:50:38 riz Exp $");
#include "opt_xen.h"
@@ -111,7 +111,7 @@ db_write_text(vaddr_t addr, size_t size,
/*
* Get the PTE for the page.
*/
- pte = kvtopte(addr);
+ pte = kvtopte((vaddr_t)dst);
oldpte = *pte;
if ((oldpte & PG_V) == 0) {
CVS commit: [netbsd-6] src/bin/rcp
Module Name:src
Committed By: riz
Date: Wed May 9 15:42:09 UTC 2012
Modified Files:
src/bin/rcp [netbsd-6]: rcp.c
Log Message:
Pull up following revision(s) (requested by chs in ticket #230):
bin/rcp/rcp.c: revision 1.49
allocate a separate buffer in each call to sink().
reusing the buffer across recursive calls just doesn't work right.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.48.8.1 src/bin/rcp/rcp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/rcp/rcp.c
diff -u src/bin/rcp/rcp.c:1.48 src/bin/rcp/rcp.c:1.48.8.1
--- src/bin/rcp/rcp.c:1.48 Mon Aug 31 07:11:16 2009
+++ src/bin/rcp/rcp.c Wed May 9 15:42:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rcp.c,v 1.48 2009/08/31 07:11:16 dholland Exp $ */
+/* $NetBSD: rcp.c,v 1.48.8.1 2012/05/09 15:42:08 riz Exp $ */
/*
* Copyright (c) 1983, 1990, 1992, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)rcp.c 8.2 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: rcp.c,v 1.48 2009/08/31 07:11:16 dholland Exp $");
+__RCSID("$NetBSD: rcp.c,v 1.48.8.1 2012/05/09 15:42:08 riz Exp $");
#endif
#endif /* not lint */
@@ -485,6 +485,8 @@ sink(int argc, char *argv[])
char ch, *cp, *np, *targ, *vect[1], buf[BUFSIZ];
const char *why;
off_t size;
+ char *namebuf = NULL;
+ size_t cursize = 0;
#define atime tv[0]
#define mtime tv[1]
@@ -507,7 +509,7 @@ sink(int argc, char *argv[])
for (first = 1;; first = 0) {
cp = buf;
if (read(rem, cp, 1) <= 0)
- return;
+ goto out;
if (*cp++ == '\n')
SCREWUP("unexpected ");
do {
@@ -528,7 +530,7 @@ sink(int argc, char *argv[])
}
if (buf[0] == 'E') {
(void)write(rem, "", 1);
- return;
+ goto out;
}
if (ch == '\n')
@@ -582,20 +584,19 @@ sink(int argc, char *argv[])
if (*cp++ != ' ')
SCREWUP("size not delimited");
if (targisdir) {
- static char *namebuf;
- static size_t cursize;
char *newnamebuf;
size_t need;
- need = strlen(targ) + strlen(cp) + 250;
+ need = strlen(targ) + strlen(cp) + 2;
if (need > cursize) {
+need += 256;
newnamebuf = realloc(namebuf, need);
if (newnamebuf != NULL) {
namebuf = newnamebuf;
cursize = need;
} else {
- /* note: run_err is not fatal */
run_err("%s", strerror(errno));
+ exit(1);
}
}
(void)snprintf(namebuf, cursize, "%s%s%s", targ,
@@ -726,6 +727,13 @@ bad: run_err("%s: %s", np, strerror(er
break;
}
}
+
+out:
+ if (namebuf) {
+ free(namebuf);
+ }
+ return;
+
screwup:
run_err("protocol error: %s", why);
exit(1);
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: cegger
Date: Wed May 9 13:58:09 UTC 2012
Modified Files:
src/sys/arch/x86/x86: cpu_ucode_amd.c
Log Message:
fix crash when booting with -x.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x86/x86/cpu_ucode_amd.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/x86/x86/cpu_ucode_amd.c
diff -u src/sys/arch/x86/x86/cpu_ucode_amd.c:1.1 src/sys/arch/x86/x86/cpu_ucode_amd.c:1.2
--- src/sys/arch/x86/x86/cpu_ucode_amd.c:1.1 Fri Jan 13 16:05:15 2012
+++ src/sys/arch/x86/x86/cpu_ucode_amd.c Wed May 9 13:58:09 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_ucode_amd.c,v 1.1 2012/01/13 16:05:15 cegger Exp $ */
+/* $NetBSD: cpu_ucode_amd.c,v 1.2 2012/05/09 13:58:09 cegger Exp $ */
/*
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu_ucode_amd.c,v 1.1 2012/01/13 16:05:15 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_ucode_amd.c,v 1.2 2012/05/09 13:58:09 cegger Exp $");
#include "opt_xen.h"
#include "opt_cpu_ucode.h"
@@ -168,7 +168,7 @@ cpu_apply_cb(void *arg0, void *arg1)
hdr = (struct microcode_amd_header *)mc_amd.mpb;
if (hdr->ah_processor_rev_id != mc.mc_equiv_cpuid) {
- aprint_debug_dev(dev, "ucode: patch does not"
+ aprint_debug_dev(dev, "ucode: patch does not "
"match this cpu "
"(patch is for cpu id %x, cpu id is %x)\n",
hdr->ah_processor_rev_id, mc.mc_equiv_cpuid);
@@ -196,6 +196,8 @@ cpu_apply_cb(void *arg0, void *arg1)
}
next:
+ if (mc.mc_mpbuf == NULL)
+ break;
mc.mc_buf += mc.mc_mpbuf->mpb_len +
sizeof(mc.mc_mpbuf->mpb_type) +
sizeof(mc.mc_mpbuf->mpb_len);
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Wed May 9 12:04:27 UTC 2012 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Mention import of bzip2-1.0.6, and that zlib-1.2.7 is out. To generate a diff of this commit: cvs rdiff -u -r1.936 -r1.937 src/doc/3RDPARTY cvs rdiff -u -r1.1700 -r1.1701 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.936 src/doc/3RDPARTY:1.937 --- src/doc/3RDPARTY:1.936 Mon May 7 00:35:25 2012 +++ src/doc/3RDPARTY Wed May 9 12:04:27 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.936 2012/05/07 00:35:25 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.937 2012/05/09 12:04:27 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -187,7 +187,7 @@ Notes: See /usr/src/external/bsd/byacc/byacc2netbsd for update instructions. Package: bzip2 -Version: 1.0.5 +Version: 1.0.6 Current Vers: 1.0.6 Maintainer: Julian Seward Archive Site: http://sources.redhat.com/bzip2/ @@ -1220,7 +1220,7 @@ Notes: Package: zlib Version: 1.2.3 -Current Vers: 1.2.6 +Current Vers: 1.2.7 Maintainer: Jean-loup Gailly and Mark Adler Archive Site: http://www.zlib.net/ Home Page: http://www.zlib.net/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1700 src/doc/CHANGES:1.1701 --- src/doc/CHANGES:1.1700 Thu May 3 19:07:13 2012 +++ src/doc/CHANGES Wed May 9 12:04:27 2012 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1700 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1701 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -54,4 +54,5 @@ Changes from NetBSD 6.0 to NetBSD 7.0: kernel: add mpii(4), a driver for LSI Logic Fusion-MPT Message Passing Interface II SAS controllers. [bouyer 20120419] kernel: Add support for 256 CPUs on amd64. [rmind 20120420] - OpenSSH: Import 6.0 [christos 20120501] + OpenSSH: Imported 6.0 [christos 20120501] + bzip2: Imported 1.0.6 [wiz 20120507]
CVS commit: src/distrib/sets/lists/modules
Module Name:src Committed By: martin Date: Wed May 9 08:17:33 UTC 2012 Modified Files: src/distrib/sets/lists/modules: md.evbppc Log Message: Retry previous, but with proper path this time. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/modules/md.evbppc 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/modules/md.evbppc diff -u src/distrib/sets/lists/modules/md.evbppc:1.22 src/distrib/sets/lists/modules/md.evbppc:1.23 --- src/distrib/sets/lists/modules/md.evbppc:1.22 Tue May 8 13:22:36 2012 +++ src/distrib/sets/lists/modules/md.evbppc Wed May 9 08:17:33 2012 @@ -1,4 +1,4 @@ -# $NetBSD: md.evbppc,v 1.22 2012/05/08 13:22:36 martin Exp $ +# $NetBSD: md.evbppc,v 1.23 2012/05/09 08:17:33 martin Exp $ ./stand/powerpc-4xx base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@ base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules base-kernel-modules kmod,compatmodules @@ -70,8 +70,8 @@ ./stand/powerpc-4xx/@OSRELEASE@/modules/gpiosim/gpiosim.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/hfsbase-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/hfs/hfs.kmod base-kernel-modules kmod,compatmodules -./stand/powerpc-4xx/@OSRELEASE@/if_axe base-kernel-modules kmod,compatmodules -./stand/powerpc-4xx/@OSRELEASE@/if_axe/if_axe.kmod base-kernel-modules kmod,compatmodules +./stand/powerpc-4xx/@OSRELEASE@/modules/if_axebase-kernel-modules kmod,compatmodules +./stand/powerpc-4xx/@OSRELEASE@/modules/if_axe/if_axe.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/iicbase-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/iic/iic.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/iscsibase-kernel-modules kmod,compatmodules @@ -172,8 +172,8 @@ ./stand/powerpc-4xx/@OSRELEASE@/modules/union/union.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/usbverbose base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/usbverbose/usbverbose.kmod base-kernel-modules kmod,compatmodules -./stand/powerpc-4xx/@OSRELEASE@/vcoda base-kernel-modules kmod,compatmodules -./stand/powerpc-4xx/@OSRELEASE@/vcoda/vcoda.kmod base-kernel-modules kmod,compatmodules +./stand/powerpc-4xx/@OSRELEASE@/modules/vcodabase-kernel-modules kmod,compatmodules +./stand/powerpc-4xx/@OSRELEASE@/modules/vcoda/vcoda.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/v7fs base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/v7fs/v7fs.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-4xx/@OSRELEASE@/modules/vnd base-kernel-modules kmod,compatmodules @@ -251,8 +251,8 @@ ./stand/powerpc-booke/@OSRELEASE@/modules/gpiosim/gpiosim.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-booke/@OSRELEASE@/modules/hfsbase-kernel-modules kmod,compatmodules ./stand/powerpc-booke/@OSRELEASE@/modules/hfs/hfs.kmod base-kernel-modules kmod,compatmodules -./stand/powerpc-booke/@OSRELEASE@/if_axebase-kernel-modules kmod,compatmodules -./stand/powerpc-booke/@OSRELEASE@/if_axe/if_axe.kmod base-kernel-modules kmod,compatmodules +./stand/powerpc-booke/@OSRELEASE@/modules/if_axe base-kernel-modules kmod,compatmodules +./stand/powerpc-booke/@OSRELEASE@/modules/if_axe/if_axe.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-booke/@OSRELEASE@/modules/iicbase-kernel-modules kmod,compatmodules ./stand/powerpc-booke/@OSRELEASE@/modules/iic/iic.kmod base-kernel-modules kmod,compatmodules ./stand/powerpc-booke/@OSRELEASE@/modules/iscsibase-kernel-modules kmod,compatmodules
CVS commit: src/gnu/usr.bin/gettext/msgfmt
Module Name:src
Committed By: joerg
Date: Wed May 9 07:59:23 UTC 2012
Modified Files:
src/gnu/usr.bin/gettext/msgfmt: Makefile
Log Message:
Format strings don't use all arguments in the non-pluralized case.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/gnu/usr.bin/gettext/msgfmt/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/usr.bin/gettext/msgfmt/Makefile
diff -u src/gnu/usr.bin/gettext/msgfmt/Makefile:1.3 src/gnu/usr.bin/gettext/msgfmt/Makefile:1.4
--- src/gnu/usr.bin/gettext/msgfmt/Makefile:1.3 Fri Apr 29 15:05:01 2005
+++ src/gnu/usr.bin/gettext/msgfmt/Makefile Wed May 9 07:59:23 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/29 15:05:01 christos Exp $
+# $NetBSD: Makefile,v 1.4 2012/05/09 07:59:23 joerg Exp $
PROG= msgfmt
@@ -6,3 +6,5 @@ PROG= msgfmt
.include "${.CURDIR}/../Makefile.inc.prog"
CPPFLAGS+=-I${DIST}/gettext/gettext-runtime/intl
+
+CWARNFLAGS.clang+= -Wno-format-extra-args
CVS commit: src/sys/dev/ic
Module Name:src Committed By: martin Date: Wed May 9 07:52:52 UTC 2012 Modified Files: src/sys/dev/ic: seeq8005.c Log Message: PR port-acorn32/46435: type mismatch, padbuf should be unsigned char. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/sys/dev/ic/seeq8005.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/ic/seeq8005.c diff -u src/sys/dev/ic/seeq8005.c:1.46 src/sys/dev/ic/seeq8005.c:1.47 --- src/sys/dev/ic/seeq8005.c:1.46 Thu Feb 2 19:43:03 2012 +++ src/sys/dev/ic/seeq8005.c Wed May 9 07:52:52 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: seeq8005.c,v 1.46 2012/02/02 19:43:03 tls Exp $ */ +/* $NetBSD: seeq8005.c,v 1.47 2012/05/09 07:52:52 martin Exp $ */ /* * Copyright (c) 2000, 2001 Ben Harris @@ -61,7 +61,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: seeq8005.c,v 1.46 2012/02/02 19:43:03 tls Exp $"); +__KERNEL_RCSID(0, "$NetBSD: seeq8005.c,v 1.47 2012/05/09 07:52:52 martin Exp $"); #include #include @@ -153,7 +153,7 @@ static void ea_mc_reset_8005(struct seeq static int ea_mediachange(struct ifnet *); static void ea_mediastatus(struct ifnet *, struct ifmediareq *); -static char* padbuf = NULL; +static u_char* padbuf = NULL; /*
