CVS commit: src/usr.sbin/installboot
Module Name:src Committed By: ast Date: Sat Feb 11 07:27:25 UTC 2012 Modified Files: src/usr.sbin/installboot: installboot.8 Log Message: Use "NetBSD 6.0" and not "NetBSD 6" and sound less like a broken record. Add note where the actual example is because that's where it's expected. Part of earlier commit ok-ed by releng@ To generate a diff of this commit: cvs rdiff -u -r1.83 -r1.84 src/usr.sbin/installboot/installboot.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/installboot/installboot.8 diff -u src/usr.sbin/installboot/installboot.8:1.83 src/usr.sbin/installboot/installboot.8:1.84 --- src/usr.sbin/installboot/installboot.8:1.83 Fri Feb 10 16:25:47 2012 +++ src/usr.sbin/installboot/installboot.8 Sat Feb 11 07:27:25 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: installboot.8,v 1.83 2012/02/10 16:25:47 wiz Exp $ +.\" $NetBSD: installboot.8,v 1.84 2012/02/11 07:27:25 ast Exp $ .\" .\" Copyright (c) 2002-2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 9, 2012 +.Dd February 11, 2012 .Dt INSTALLBOOT 8 .Os .Sh NAME @@ -460,9 +460,8 @@ Primary bootstrap for file systems (the .Ql traditional -.Nx file system prior to -.Nx 6 ) . +.Nx 6.0 ) . Use .Xr dumpfs 8 to confirm the file system format is @@ -472,7 +471,7 @@ to confirm the file system format is Primary bootstrap for .Sy FFSv2 file systems (the default file system for some platforms as of -.Nx 6 ) . +.Nx 6.0 ) . Use .Xr dumpfs 8 to confirm the file system format is @@ -634,7 +633,16 @@ setting the timeout to five seconds, aft bootstrap: .Dl Ic cp /usr/mdec/boot /boot .Dl Ic installboot -v -o timeout=5 /dev/rwd0a /usr/mdec/bootxx_ffsv2 -. +.Bd -ragged -offset indent-two -compact +.Em Note : +Pre +.Nx 6.0 +systems used +.Sy FFSv1 +file systems on these platforms; double check with +.Xr dumpfs 8 +to be sure to use the correct secondary bootstrap. +.Ed .Pp Create a bootable CD-ROM with an ISO 9660 file system for an i386 system with a serial console:
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: plunky
Date: Sat Feb 11 05:28:30 UTC 2012
Modified Files:
src/sys/dev/usb: umidi_quirks.c
Log Message:
add Roland UM-ONE (essentially, same as Roland UM-1)
from PR/45908 by Tom Ivar Helbekkmo
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/usb/umidi_quirks.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/usb/umidi_quirks.c
diff -u src/sys/dev/usb/umidi_quirks.c:1.16 src/sys/dev/usb/umidi_quirks.c:1.17
--- src/sys/dev/usb/umidi_quirks.c:1.16 Tue Jul 8 11:34:43 2008
+++ src/sys/dev/usb/umidi_quirks.c Sat Feb 11 05:28:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: umidi_quirks.c,v 1.16 2008/07/08 11:34:43 gmcgarry Exp $ */
+/* $NetBSD: umidi_quirks.c,v 1.17 2012/02/11 05:28:30 plunky Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: umidi_quirks.c,v 1.16 2008/07/08 11:34:43 gmcgarry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi_quirks.c,v 1.17 2012/02/11 05:28:30 plunky Exp $");
#include
#include
@@ -515,6 +515,22 @@ UMQ_DEF(ROLAND, ROLAND_SONICCELL, 2) = {
};
/*
+ * ROLAND UM-ONE
+ */
+UMQ_FIXED_EP_DATA_DEF(ROLAND, ROLAND_UMONE, ANYIFACE, 1, 1) = {
+ /* out */
+ { 0, 1 },
+ /* in */
+ { 1, 1 }
+};
+UMQ_FIXED_EP_DEF(ROLAND, ROLAND_UMONE, ANYIFACE, 1, 1);
+
+UMQ_DEF(ROLAND, ROLAND_UMONE, ANYIFACE) = {
+ UMQ_FIXED_EP_REG(ROLAND, ROLAND_UMONE, ANYIFACE),
+ UMQ_TERMINATOR
+};
+
+/*
* Midiman Midisport 2x4. This has 2 physical MIDI IN jacks that are read
* on endpoint 0x81 (descriptor index 0). It has 4 physical MIDI OUT jacks
* that can be written on endpoints 2 or 4 (at descriptor index 2 or 4,
@@ -587,6 +603,7 @@ static struct umidi_quirk umidi_quirklis
UMQ_REG(ROLAND, ROLAND_UA25, 2),
UMQ_REG(ROLAND, ROLAND_UA4FX, 2),
UMQ_REG(ROLAND, ROLAND_SONICCELL, 2),
+ UMQ_REG(ROLAND, ROLAND_UMONE, ANYIFACE),
UMQ_REG(MIDIMAN, MIDIMAN_MIDISPORT2X4, ANYIFACE),
{ .vendor = 0 },
};
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: plunky
Date: Sat Feb 11 05:27:55 UTC 2012
Modified Files:
src/sys/dev/usb: uftdi.c
Log Message:
add Telldus Tellstick and Tellstick Duo
from PR/45908 by Tom Ivar Helbekkmo
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/usb/uftdi.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/usb/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.50 src/sys/dev/usb/uftdi.c:1.51
--- src/sys/dev/usb/uftdi.c:1.50 Fri Dec 23 00:51:45 2011
+++ src/sys/dev/usb/uftdi.c Sat Feb 11 05:27:55 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uftdi.c,v 1.50 2011/12/23 00:51:45 jakllsch Exp $ */
+/* $NetBSD: uftdi.c,v 1.51 2012/02/11 05:27:55 plunky Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.50 2011/12/23 00:51:45 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.51 2012/02/11 05:27:55 plunky Exp $");
#include
#include
@@ -153,6 +153,8 @@ static const struct usb_devno uftdi_devs
{ USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_SEAPORT4P3 },
{ USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_SEAPORT4P4 },
{ USB_VENDOR_SIIG2, USB_PRODUCT_SIIG2_US2308 },
+ { USB_VENDOR_MISC, USB_PRODUCT_MISC_TELLSTICK },
+ { USB_VENDOR_MISC, USB_PRODUCT_MISC_TELLSTICK_DUO },
};
#define uftdi_lookup(v, p) usb_lookup(uftdi_devs, v, p)
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: plunky
Date: Sat Feb 11 05:27:23 UTC 2012
Modified Files:
src/sys/dev/usb: usb_quirks.c
Log Message:
USB_VENDOR_METAGEEK changed to USB_VENDOR_MISC as the Vendor-ID
is used by more than one manufacturer
from PR/45908 by Tom Ivar Helbekkmo
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/usb/usb_quirks.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/usb/usb_quirks.c
diff -u src/sys/dev/usb/usb_quirks.c:1.73 src/sys/dev/usb/usb_quirks.c:1.74
--- src/sys/dev/usb/usb_quirks.c:1.73 Fri Dec 23 00:51:48 2011
+++ src/sys/dev/usb/usb_quirks.c Sat Feb 11 05:27:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_quirks.c,v 1.73 2011/12/23 00:51:48 jakllsch Exp $ */
+/* $NetBSD: usb_quirks.c,v 1.74 2012/02/11 05:27:23 plunky Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.73 2011/12/23 00:51:48 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.74 2012/02/11 05:27:23 plunky Exp $");
#include
#include
@@ -63,7 +63,7 @@ Static const struct usbd_quirk_entry {
ANY, { UQ_HID_IGNORE }},
{ USB_VENDOR_TRIPPLITE2, USB_PRODUCT_TRIPPLITE2_UPS,
ANY, { UQ_HID_IGNORE }},
- { USB_VENDOR_METAGEEK, USB_PRODUCT_METAGEEK_WISPY_24X, ANY, { UQ_HID_IGNORE }},
+ { USB_VENDOR_MISC, USB_PRODUCT_MISC_WISPY_24X, ANY, { UQ_HID_IGNORE }},
{ USB_VENDOR_KYE, USB_PRODUCT_KYE_NICHE, 0x100, { UQ_NO_SET_PROTO}},
{ USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT4,
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: plunky
Date: Sat Feb 11 05:27:00 UTC 2012
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.599 -r1.600 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.600 -r1.601 src/sys/dev/usb/usbdevs_data.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/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.599 src/sys/dev/usb/usbdevs.h:1.600
--- src/sys/dev/usb/usbdevs.h:1.599 Sat Jan 21 12:53:04 2012
+++ src/sys/dev/usb/usbdevs.h Sat Feb 11 05:27:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdevs.h,v 1.599 2012/01/21 12:53:04 skrll Exp $ */
+/* $NetBSD: usbdevs.h,v 1.600 2012/02/11 05:27:00 plunky Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -511,7 +511,7 @@
#define USB_VENDOR_SENAO 0x1740 /* Senao */
#define USB_VENDOR_ASUSTEK2 0x1761 /* ASUSTeK Computer */
#define USB_VENDOR_SWEEX2 0x177f /* Sweex */
-#define USB_VENDOR_METAGEEK 0x1781 /* MetaGeek */
+#define USB_VENDOR_MISC 0x1781 /* Misc Vendors */
#define USB_VENDOR_DISPLAYLINK 0x17e9 /* DisplayLink */
#define USB_VENDOR_E3C 0x18b4 /* E3C Technologies */
#define USB_VENDOR_AMIT 0x18c5 /* AMIT */
@@ -1865,9 +1865,6 @@
/* Merlin products */
#define USB_PRODUCT_MERLIN_V620 0x1110 /* Merlin V620 */
-/* MetaGeek products */
-#define USB_PRODUCT_METAGEEK_WISPY_24X 0x083f /* Wi-Spy 2.4x */
-
/* Metricom products */
#define USB_PRODUCT_METRICOM_RICOCHET_GS 0x0001 /* Ricochet GS */
@@ -1951,6 +1948,11 @@
#define USB_PRODUCT_MINOLTA_DIMAGEA1 0x401a /* Dimage A1 */
#define USB_PRODUCT_MINOLTA_XT 0x4015 /* Dimage Xt */
+/* Misc Vendors (sharing a Vendor ID) */
+#define USB_PRODUCT_MISC_WISPY_24X 0x083f /* MetaGeek Wi-Spy 2.4x */
+#define USB_PRODUCT_MISC_TELLSTICK 0x0c30 /* Telldus Tellstick */
+#define USB_PRODUCT_MISC_TELLSTICK_DUO 0x0c31 /* Telldus Tellstick Duo */
+
/* Mitsumi products */
#define USB_PRODUCT_MITSUMI_CDRRW 0x /* CD-R/RW Drive */
#define USB_PRODUCT_MITSUMI_MOUSE 0x6407 /* Mouse */
@@ -2421,6 +2423,7 @@
#define USB_PRODUCT_ROLAND_UM3 0x009A /* EDIROL UM-3 */
#define USB_PRODUCT_ROLAND_UA4FX 0x00A3 /* EDIROL UA-4FX */
#define USB_PRODUCT_ROLAND_SONICCELL 0x00C2 /* SonicCell */
+#define USB_PRODUCT_ROLAND_UMONE 0x012a /* UM-ONE MIDI I/F */
/* Sagem products */
#define USB_PRODUCT_SAGEM_XG760A 0x004a /* XG-760A */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.600 src/sys/dev/usb/usbdevs_data.h:1.601
--- src/sys/dev/usb/usbdevs_data.h:1.600 Sat Jan 21 12:53:04 2012
+++ src/sys/dev/usb/usbdevs_data.h Sat Feb 11 05:27:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdevs_data.h,v 1.600 2012/01/21 12:53:04 skrll Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.601 2012/02/11 05:27:00 plunky Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -1823,8 +1823,8 @@ const struct usb_vendor usb_vendors[] =
"Sweex",
},
{
- USB_VENDOR_METAGEEK,
- "MetaGeek",
+ USB_VENDOR_MISC,
+ "Misc Vendors",
},
{
USB_VENDOR_DISPLAYLINK,
@@ -5659,10 +5659,6 @@ const struct usb_product usb_products[]
"Merlin V620",
},
{
- USB_VENDOR_METAGEEK, USB_PRODUCT_METAGEEK_WISPY_24X,
- "Wi-Spy 2.4x",
- },
- {
USB_VENDOR_METRICOM, USB_PRODUCT_METRICOM_RICOCHET_GS,
"Ricochet GS",
},
@@ -5899,6 +5895,18 @@ const struct usb_product usb_products[]
"Dimage Xt",
},
{
+ USB_VENDOR_MISC, USB_PRODUCT_MISC_WISPY_24X,
+ "MetaGeek Wi-Spy 2.4x",
+ },
+ {
+ USB_VENDOR_MISC, USB_PRODUCT_MISC_TELLSTICK,
+ "Telldus Tellstick",
+ },
+ {
+ USB_VENDOR_MISC, USB_PRODUCT_MISC_TELLSTICK_DUO,
+ "Telldus Tellstick Duo",
+ },
+ {
USB_VENDOR_MITSUMI, USB_PRODUCT_MITSUMI_CDRRW,
"CD-R/RW Drive",
},
@@ -7275,6 +7283,10 @@ const struct usb_product usb_products[]
"SonicCell",
},
{
+ USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UMONE,
+ "UM-ONE MIDI I/F",
+ },
+ {
USB_VENDOR_SAGEM, USB_PRODUCT_SAGEM_XG760A,
"XG-760A",
},
@@ -8803,4 +8815,4 @@ const struct usb_product usb_products[]
"Prestige",
},
};
-const int usb_nproducts = 1690;
+const int usb_nproducts = 1693;
CVS commit: src/sys/dev/usb
Module Name:src Committed By: plunky Date: Sat Feb 11 05:26:31 UTC 2012 Modified Files: src/sys/dev/usb: usbdevs Log Message: the ID 0x1781 is used by more than one vendor, so change it from MetaGeek to "Misc Vendors" add Telldus Tellstick and Tellstick Duo (under Misc Vendors) add Roland UM-ONE MIDI interface from PR/45908 by Tom Ivar Helbekkmo To generate a diff of this commit: cvs rdiff -u -r1.606 -r1.607 src/sys/dev/usb/usbdevs 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/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.606 src/sys/dev/usb/usbdevs:1.607 --- src/sys/dev/usb/usbdevs:1.606 Sat Jan 21 12:50:28 2012 +++ src/sys/dev/usb/usbdevs Sat Feb 11 05:26:31 2012 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.606 2012/01/21 12:50:28 skrll Exp $ +$NetBSD: usbdevs,v 1.607 2012/02/11 05:26:31 plunky Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -504,7 +504,7 @@ vendor LINKSYS4 0x1737 Linksys vendor SENAO 0x1740 Senao vendor ASUSTEK2 0x1761 ASUSTeK Computer vendor SWEEX2 0x177f Sweex -vendor METAGEEK 0x1781 MetaGeek +vendor MISC 0x1781 Misc Vendors vendor DISPLAYLINK 0x17e9 DisplayLink vendor E3C 0x18b4 E3C Technologies vendor AMIT 0x18c5 AMIT @@ -1858,9 +1858,6 @@ product MELCO WLIUCGN 0x015d WLI-UC-GN /* Merlin products */ product MERLIN V620 0x1110 Merlin V620 -/* MetaGeek products */ -product METAGEEK WISPY_24X 0x083f Wi-Spy 2.4x - /* Metricom products */ product METRICOM RICOCHET_GS 0x0001 Ricochet GS @@ -1944,6 +1941,11 @@ product MINOLTA 5400 0x400e Dimage 5400 product MINOLTA DIMAGEA1 0x401a Dimage A1 product MINOLTA XT 0x4015 Dimage Xt +/* Misc Vendors (sharing a Vendor ID) */ +product MISC WISPY_24X 0x083f MetaGeek Wi-Spy 2.4x +product MISC TELLSTICK 0x0c30 Telldus Tellstick +product MISC TELLSTICK_DUO 0x0c31 Telldus Tellstick Duo + /* Mitsumi products */ product MITSUMI CDRRW 0x CD-R/RW Drive product MITSUMI MOUSE 0x6407 Mouse @@ -2414,6 +2416,7 @@ product ROLAND UA1EX 0x0096 EDIROL UA-1 product ROLAND UM3 0x009A EDIROL UM-3 product ROLAND UA4FX 0x00A3 EDIROL UA-4FX product ROLAND SONICCELL 0x00C2 SonicCell +product ROLAND UMONE 0x012a UM-ONE MIDI I/F /* Sagem products */ product SAGEM XG760A 0x004a XG-760A
CVS commit: src/share/man/man4
Module Name:src Committed By: riz Date: Fri Feb 10 23:47:49 UTC 2012 Modified Files: src/share/man/man4: aps.4 itesio.4 Log Message: Make English usage consistent with other manpages. From Snader_LB. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/aps.4 cvs rdiff -u -r1.8 -r1.9 src/share/man/man4/itesio.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/aps.4 diff -u src/share/man/man4/aps.4:1.5 src/share/man/man4/aps.4:1.6 --- src/share/man/man4/aps.4:1.5 Wed Jul 13 11:03:07 2011 +++ src/share/man/man4/aps.4 Fri Feb 10 23:47:49 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: aps.4,v 1.5 2011/07/13 11:03:07 jruoho Exp $ +.\" $NetBSD: aps.4,v 1.6 2012/02/10 23:47:49 riz Exp $ .\" $OpenBSD: aps.4,v 1.7 2007/05/31 19:19:49 jmc Exp $ .\" .\" Copyright (c) 2005 Jonathan Gray @@ -53,7 +53,7 @@ The .Nm driver first appeared in .Ox 3.8 -and then was ported to +and was then ported to .Nx 5.0. .Sh AUTHORS Index: src/share/man/man4/itesio.4 diff -u src/share/man/man4/itesio.4:1.8 src/share/man/man4/itesio.4:1.9 --- src/share/man/man4/itesio.4:1.8 Mon May 18 12:09:31 2009 +++ src/share/man/man4/itesio.4 Fri Feb 10 23:47:49 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: itesio.4,v 1.8 2009/05/18 12:09:31 wiz Exp $ +.\" $NetBSD: itesio.4,v 1.9 2012/02/10 23:47:49 riz Exp $ .\" $OpenBSD: it.4,v 1.7 2006/03/29 14:10:51 jsg Exp $ .\" .\" Copyright (c) 2006-2007 Juan Romero Pardines @@ -80,7 +80,7 @@ The .Nm driver first appeared in .Ox 3.4 -and then it was ported to +and was then ported to .Nx 4.0 . .Sh AUTHORS .An -nosplit
CVS commit: src/doc
Module Name:src Committed By: riz Date: Fri Feb 10 23:46:26 UTC 2012 Modified Files: src/doc: 3RDPARTY Log Message: - mention GNU grep-2.10 as being the current upstream version; - clarify / correct license information of GNU grep and GNU texinfo. >From Snader_LB To generate a diff of this commit: cvs rdiff -u -r1.908 -r1.909 src/doc/3RDPARTY 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.908 src/doc/3RDPARTY:1.909 --- src/doc/3RDPARTY:1.908 Mon Feb 6 15:58:56 2012 +++ src/doc/3RDPARTY Fri Feb 10 23:46:25 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.908 2012/02/06 15:58:56 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.909 2012/02/10 23:46:25 riz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -398,13 +398,13 @@ Notes: Package: grep Version: 2.5.1 -Current Vers: 2.7 +Current Vers: 2.10 Maintainer: FSF Archive Site: ftp://ftp.gnu.org/gnu/grep/ Home Page: http://www.gnu.org/software/grep/ Mailing List: bug-gnu-ut...@gnu.org Responsible: simonb -License: GPLv2 (2.5.1), GPLv3 (2.5.3) +License: GPLv2+ (2.5.1), GPLv3+ (2.5.3 and later) Notes: Use src/gnu/dist/grep/grep2netbsd for preparing the source tree for the import. @@ -1059,7 +1059,7 @@ Archive Site: ftp://ftp.gnu.org/gnu/texi Home Page: http://www.gnu.org/software/texinfo/ Mailing List: bug-texi...@gnu.org Responsible: -License: GPLv2 (4.8; 4.9 and higher is GPLv3) +License: GPLv2+ (4.8), GPLv3+ (4.9 and later) Notes: Use src/gnu/dist/texinfo/texinfo2netbsd for preparing the source tree for the import.
CVS commit: src/sys/arch/sandpoint/conf
Module Name:src Committed By: phx Date: Fri Feb 10 21:09:20 UTC 2012 Modified Files: src/sys/arch/sandpoint/conf: GENERIC Log Message: Enable support for USB CD/DVD drives. OK releng@. To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/sys/arch/sandpoint/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/sandpoint/conf/GENERIC diff -u src/sys/arch/sandpoint/conf/GENERIC:1.68 src/sys/arch/sandpoint/conf/GENERIC:1.69 --- src/sys/arch/sandpoint/conf/GENERIC:1.68 Mon Jan 23 14:13:51 2012 +++ src/sys/arch/sandpoint/conf/GENERIC Fri Feb 10 21:09:19 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.68 2012/01/23 14:13:51 phx Exp $ +# $NetBSD: GENERIC,v 1.69 2012/02/10 21:09:19 phx Exp $ # # machine description file for GENERIC NAS # @@ -22,7 +22,7 @@ include "arch/sandpoint/conf/std.sandpo options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.68 $" +#ident "GENERIC-$Revision: 1.69 $" maxusers 32 @@ -97,7 +97,7 @@ file-system EXT2FS # second extended f file-system MFS # memory file system file-system NFS # Network File System client #file-system NTFS # Windows/NT file system (experimental) -#file-system CD9660 # ISO 9660 + Rock Ridge file system +file-system CD9660 # ISO 9660 + Rock Ridge file system file-system MSDOSFS # MS-DOS file system file-system FDESC # /dev/fd file-system KERNFS # /kern @@ -262,6 +262,7 @@ wd* at umass? scsibus* at umass? sd* at scsibus? target ? lun ? # SCSI disk drives +cd* at scsibus? target ? lun ? # SCSI CD-ROM drives # # Pseudo-Devices
CVS commit: src/etc
Module Name:src
Committed By: nakayama
Date: Fri Feb 10 20:54:11 UTC 2012
Modified Files:
src/etc: MAKEDEV.tmpl
Log Message:
Remove "spif[0-9]*" case from ports other than sparc{,64} by using
%stty_chr% and %sbpp_chr%.
Fix "MAKEDEV: bpp: unknown device" error on sparc{,64}, which is
observed in PR toolchain/45620 but not the fix.
Approved by releng.
To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/etc/MAKEDEV.tmpl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/MAKEDEV.tmpl
diff -u src/etc/MAKEDEV.tmpl:1.150 src/etc/MAKEDEV.tmpl:1.151
--- src/etc/MAKEDEV.tmpl:1.150 Sun Jan 22 06:44:29 2012
+++ src/etc/MAKEDEV.tmpl Fri Feb 10 20:54:11 2012
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $NetBSD: MAKEDEV.tmpl,v 1.150 2012/01/22 06:44:29 christos Exp $
+# $NetBSD: MAKEDEV.tmpl,v 1.151 2012/02/10 20:54:11 nakayama Exp $
#
# Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1996,13 +1996,13 @@ spif[0-9]*)
break
fi
for j in 0 1 2 3 4 5 6 7; do
- mkdev ttyS$unit$j c 102 $(($unit * 64 + $j)) "" "" $u_uucp
+ mkdev ttyS$unit$j c %stty_chr% $(($unit * 64 + $j)) "" "" $u_uucp
done
- mkdev bppS${unit}0 c 103 $(($unit * 64 + 0))
- mkdev bppS${unit}1 c 103 $(($unit * 64 + 1))
+ mkdev bppS${unit}0 c %sbpp_chr% $(($unit * 64 + 0))
+ mkdev bppS${unit}1 c %sbpp_chr% $(($unit * 64 + 1))
;;
-bpp[0-9]*)
+bpp|bpp[0-9]*)
unit=${i#bpp}
mkdev bpp$unit c %bpp_chr% $(($unit + 0))
;;
CVS commit: src/sys
Module Name:src Committed By: para Date: Fri Feb 10 17:35:50 UTC 2012 Modified Files: src/sys/arch/alpha/include: param.h src/sys/arch/amiga/include: param.h src/sys/arch/atari/include: param.h src/sys/arch/cesfic/include: param.h src/sys/arch/hp300/include: param.h src/sys/arch/hppa/include: param.h src/sys/arch/i386/include: param.h src/sys/arch/ia64/include: param.h src/sys/arch/luna68k/include: param.h src/sys/arch/mac68k/include: param.h src/sys/arch/macppc/include: param.h src/sys/arch/mvme68k/include: param.h src/sys/arch/news68k/include: param.h src/sys/arch/next68k/include: param.h src/sys/arch/sh3/include: param.h src/sys/arch/sparc/include: param.h src/sys/arch/sun2/include: param.h src/sys/arch/sun3/include: param.h src/sys/arch/x68k/include: param.h src/sys/kern: subr_vmem.c uipc_mbuf.c src/sys/uvm: uvm_km.c Log Message: proper sizing of kmem_arena on different ports PR port-i386/45946: Kernel locks up in VMEM system To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/arch/alpha/include/param.h cvs rdiff -u -r1.48 -r1.49 src/sys/arch/amiga/include/param.h cvs rdiff -u -r1.34 -r1.35 src/sys/arch/atari/include/param.h cvs rdiff -u -r1.11 -r1.12 src/sys/arch/cesfic/include/param.h cvs rdiff -u -r1.52 -r1.53 src/sys/arch/hp300/include/param.h cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hppa/include/param.h cvs rdiff -u -r1.75 -r1.76 src/sys/arch/i386/include/param.h cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/include/param.h cvs rdiff -u -r1.12 -r1.13 src/sys/arch/luna68k/include/param.h cvs rdiff -u -r1.44 -r1.45 src/sys/arch/mac68k/include/param.h cvs rdiff -u -r1.18 -r1.19 src/sys/arch/macppc/include/param.h cvs rdiff -u -r1.32 -r1.33 src/sys/arch/mvme68k/include/param.h cvs rdiff -u -r1.16 -r1.17 src/sys/arch/news68k/include/param.h cvs rdiff -u -r1.11 -r1.12 src/sys/arch/next68k/include/param.h cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sh3/include/param.h cvs rdiff -u -r1.69 -r1.70 src/sys/arch/sparc/include/param.h cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sun2/include/param.h cvs rdiff -u -r1.59 -r1.60 src/sys/arch/sun3/include/param.h cvs rdiff -u -r1.27 -r1.28 src/sys/arch/x68k/include/param.h cvs rdiff -u -r1.71 -r1.72 src/sys/kern/subr_vmem.c cvs rdiff -u -r1.144 -r1.145 src/sys/kern/uipc_mbuf.c cvs rdiff -u -r1.119 -r1.120 src/sys/uvm/uvm_km.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/alpha/include/param.h diff -u src/sys/arch/alpha/include/param.h:1.40 src/sys/arch/alpha/include/param.h:1.41 --- src/sys/arch/alpha/include/param.h:1.40 Tue Jan 24 20:03:36 2012 +++ src/sys/arch/alpha/include/param.h Fri Feb 10 17:35:50 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.40 2012/01/24 20:03:36 christos Exp $ */ +/* $NetBSD: param.h,v 1.41 2012/02/10 17:35:50 para Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -92,9 +92,10 @@ /* * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized * logical pages. + * No enforced maximum on alpha */ -#define NKMEMPAGES_MIN_DEFAULT ((8 * 1024 * 1024) >> PAGE_SHIFT) -#define NKMEMPAGES_MAX_DEFAULT ((128 * 1024 * 1024) >> PAGE_SHIFT) +#define NKMEMPAGES_MIN_DEFAULT ((16 * 1024 * 1024) >> PAGE_SHIFT) +#define NKMEMPAGES_MAX_UNLIMITED 1 /* * Mach derived conversion macros Index: src/sys/arch/amiga/include/param.h diff -u src/sys/arch/amiga/include/param.h:1.48 src/sys/arch/amiga/include/param.h:1.49 --- src/sys/arch/amiga/include/param.h:1.48 Tue Feb 8 20:20:08 2011 +++ src/sys/arch/amiga/include/param.h Fri Feb 10 17:35:49 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.48 2011/02/08 20:20:08 rmind Exp $ */ +/* $NetBSD: param.h,v 1.49 2012/02/10 17:35:49 para Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -60,7 +60,7 @@ * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized * logical pages. */ -#define NKMEMPAGES_MIN_DEFAULT ((3 * 1024 * 1024) >> PAGE_SHIFT) +#define NKMEMPAGES_MIN_DEFAULT ((8 * 1024 * 1024) >> PAGE_SHIFT) #define NKMEMPAGES_MAX_DEFAULT ((128 * 1024 * 1024) >> PAGE_SHIFT) #ifdef _KERNEL Index: src/sys/arch/atari/include/param.h diff -u src/sys/arch/atari/include/param.h:1.34 src/sys/arch/atari/include/param.h:1.35 --- src/sys/arch/atari/include/param.h:1.34 Tue Feb 8 20:20:10 2011 +++ src/sys/arch/atari/include/param.h Fri Feb 10 17:35:49 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.34 2011/02/08 20:20:10 rmind Exp $ */ +/* $NetBSD: param.h,v 1.35 2012/02/10 17:35:49 para Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -60,8 +60,8 @@ * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized * logical pages. */ -#define NKMEMPAGES_MIN_DEFAULT ((3 * 1024 * 1024) >> PAGE_SHIFT) -#define NKMEMPAGES_MAX_DEFAULT ((3 * 1024 * 102
CVS commit: src/usr.sbin/makemandb
Module Name:src Committed By: njoly Date: Fri Feb 10 16:57:44 UTC 2012 Modified Files: src/usr.sbin/makemandb: apropos.1 Log Message: Fix makemandb section. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/makemandb/apropos.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/makemandb/apropos.1 diff -u src/usr.sbin/makemandb/apropos.1:1.1 src/usr.sbin/makemandb/apropos.1:1.2 --- src/usr.sbin/makemandb/apropos.1:1.1 Tue Feb 7 19:13:32 2012 +++ src/usr.sbin/makemandb/apropos.1 Fri Feb 10 16:57:44 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: apropos.1,v 1.1 2012/02/07 19:13:32 joerg Exp $ +.\" $NetBSD: apropos.1,v 1.2 2012/02/10 16:57:44 njoly Exp $ .\" .\" Copyright (c) 2011 Abhinav Upadhyay .\" All rights reserved. @@ -47,7 +47,7 @@ The utility performs a full text search over the complete content of all man pages. It uses the FTS engine of Sqlite to perform the search. The database is created with the help of -.Xr makemandb 1 +.Xr makemandb 8 utility. .Pp This implementation of the @@ -101,7 +101,7 @@ By default pages for all architectures a The Sqlite FTS database which contains an index of the manual pages. .El .Sh SEE ALSO -.Xr makemandb 1 , -.Xr man 1 +.Xr man 1 , +.Xr makemandb 8 .Sh AUTHORS .An Abhinav Upadhyay
CVS commit: src/usr.sbin/installboot
Module Name:src Committed By: wiz Date: Fri Feb 10 16:25:47 UTC 2012 Modified Files: src/usr.sbin/installboot: installboot.8 Log Message: Remove trailing whitespace. Put macro arguments on same line. To generate a diff of this commit: cvs rdiff -u -r1.82 -r1.83 src/usr.sbin/installboot/installboot.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/installboot/installboot.8 diff -u src/usr.sbin/installboot/installboot.8:1.82 src/usr.sbin/installboot/installboot.8:1.83 --- src/usr.sbin/installboot/installboot.8:1.82 Thu Feb 9 18:35:44 2012 +++ src/usr.sbin/installboot/installboot.8 Fri Feb 10 16:25:47 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: installboot.8,v 1.82 2012/02/09 18:35:44 ast Exp $ +.\" $NetBSD: installboot.8,v 1.83 2012/02/10 16:25:47 wiz Exp $ .\" .\" Copyright (c) 2002-2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -458,12 +458,11 @@ to get the media and filesytem propertie Primary bootstrap for .Sy FFSv1 file systems -(the +(the .Ql traditional .Nx file system prior to -.Nx -6). +.Nx 6 ) . Use .Xr dumpfs 8 to confirm the file system format is @@ -473,8 +472,7 @@ to confirm the file system format is Primary bootstrap for .Sy FFSv2 file systems (the default file system for some platforms as of -.Nx -6). +.Nx 6 ) . Use .Xr dumpfs 8 to confirm the file system format is
CVS commit: src/lib/libukfs
Module Name:src Committed By: njoly Date: Fri Feb 10 15:21:53 UTC 2012 Modified Files: src/lib/libukfs: ukfs.3 Log Message: Add missing Fa macro argument. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/lib/libukfs/ukfs.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libukfs/ukfs.3 diff -u src/lib/libukfs/ukfs.3:1.10 src/lib/libukfs/ukfs.3:1.11 --- src/lib/libukfs/ukfs.3:1.10 Sun Nov 22 18:14:49 2009 +++ src/lib/libukfs/ukfs.3 Fri Feb 10 15:21:53 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: ukfs.3,v 1.10 2009/11/22 18:14:49 pooka Exp $ +.\" $NetBSD: ukfs.3,v 1.11 2012/02/10 15:21:53 njoly Exp $ .\" .\" Copyright (c) 2008 Antti Kantee. All rights reserved. .\" @@ -292,7 +292,7 @@ in the sense that it affects the interpr If succesful, all relative pathnames will be resolved starting from the current directory. Currently the call affects all accesses to that particular -.Fa , +.Fa ukfs , but it might be later changed to be thread private. .Sh UTILITIES .Bl -ohang
CVS commit: src/sys/arch/sandpoint/sandpoint
Module Name:src Committed By: phx Date: Fri Feb 10 12:02:33 UTC 2012 Modified Files: src/sys/arch/sandpoint/sandpoint: machdep.c Log Message: oea_batinit() demands a minimum block size of 8M now. OK by releng@. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/sys/arch/sandpoint/sandpoint/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/sandpoint/sandpoint/machdep.c diff -u src/sys/arch/sandpoint/sandpoint/machdep.c:1.61 src/sys/arch/sandpoint/sandpoint/machdep.c:1.62 --- src/sys/arch/sandpoint/sandpoint/machdep.c:1.61 Sat Jan 14 19:39:25 2012 +++ src/sys/arch/sandpoint/sandpoint/machdep.c Fri Feb 10 12:02:33 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.61 2012/01/14 19:39:25 phx Exp $ */ +/* $NetBSD: machdep.c,v 1.62 2012/02/10 12:02:33 phx Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.61 2012/01/14 19:39:25 phx Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.62 2012/02/10 12:02:33 phx Exp $"); #include "opt_compat_netbsd.h" #include "opt_ddb.h" @@ -173,7 +173,7 @@ initppc(u_int startkernel, u_int endkern oea_batinit( 0x8000, BAT_BL_256M, /* SANDPOINT_BUS_SPACE_MEM */ 0xfc00, BAT_BL_64M, /* _EUMB|_IO */ - 0x7000, BAT_BL_128K, /* only for NH230 board control */ + 0x7000, BAT_BL_8M, /* only for NH230 board control */ 0); /* Install vectors and interrupt handler */
CVS commit: src
Module Name:src
Committed By: tsutsui
Date: Fri Feb 10 11:25:43 UTC 2012
Modified Files:
src/distrib/sets/lists/xserver: md.zaurus
src/external/mit/xorg/etc/etc.zaurus: Makefile.inc
src/sys/arch/zaurus/dev: w100lcd.c
Added Files:
src/external/mit/xorg/etc/etc.zaurus: xorg.conf.C3x00 xorg.conf.C7x0
Removed Files:
src/external/mit/xorg/etc/etc.zaurus: xorg.conf.sample
Log Message:
More SL-C7x0/860 support for Xorg server usage:
- pull touchpanel adjustment ioctls to w100lcd.c for SL-C7x0/860
from zlcd.c for SL-C1000/3x00
- add sample xorg.conf for C7x0/860 (which have hardware screen rotation)
- rename old xorg.conf.sample for C1000/C3x00 to xorg.conf.C3x00
- adjust md set list
Ok releng@ nonaka@
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/xserver/md.zaurus
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/etc/etc.zaurus/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/etc/etc.zaurus/xorg.conf.C3x00 \
src/external/mit/xorg/etc/etc.zaurus/xorg.conf.C7x0
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/etc/etc.zaurus/xorg.conf.sample
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/zaurus/dev/w100lcd.c
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/xserver/md.zaurus
diff -u src/distrib/sets/lists/xserver/md.zaurus:1.8 src/distrib/sets/lists/xserver/md.zaurus:1.9
--- src/distrib/sets/lists/xserver/md.zaurus:1.8 Wed Aug 3 01:43:26 2011
+++ src/distrib/sets/lists/xserver/md.zaurus Fri Feb 10 11:25:42 2012
@@ -1,5 +1,7 @@
-# $NetBSD: md.zaurus,v 1.8 2011/08/03 01:43:26 mrg Exp $
-./etc/X11/xorg.conf.sample-unknown- xorg
+# $NetBSD: md.zaurus,v 1.9 2012/02/10 11:25:42 tsutsui Exp $
+./etc/X11/xorg.conf.sample-unknown- obsolete
+./etc/X11/xorg.conf.C3x00-unknown- xorg
+./etc/X11/xorg.conf.C7x0-unknown- xorg
./usr/X11R7/bin/X -unknown- xorg
./usr/X11R7/bin/Xorg -unknown- xorg
./usr/X11R7/bin/cvt -unknown- xorg
Index: src/external/mit/xorg/etc/etc.zaurus/Makefile.inc
diff -u src/external/mit/xorg/etc/etc.zaurus/Makefile.inc:1.2 src/external/mit/xorg/etc/etc.zaurus/Makefile.inc:1.3
--- src/external/mit/xorg/etc/etc.zaurus/Makefile.inc:1.2 Sun May 22 16:08:48 2011
+++ src/external/mit/xorg/etc/etc.zaurus/Makefile.inc Fri Feb 10 11:25:43 2012
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.inc,v 1.2 2011/05/22 16:08:48 christos Exp $
+# $NetBSD: Makefile.inc,v 1.3 2012/02/10 11:25:43 tsutsui Exp $
-XORGCONF_FILES= etc.${MACHINE}/xorg.conf.sample
+XORGCONF_FILES= etc.${MACHINE}/xorg.conf.C3x00 etc.${MACHINE}/xorg.conf.C7x0
Index: src/sys/arch/zaurus/dev/w100lcd.c
diff -u src/sys/arch/zaurus/dev/w100lcd.c:1.1 src/sys/arch/zaurus/dev/w100lcd.c:1.2
--- src/sys/arch/zaurus/dev/w100lcd.c:1.1 Sun Jan 29 10:12:42 2012
+++ src/sys/arch/zaurus/dev/w100lcd.c Fri Feb 10 11:25:42 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: w100lcd.c,v 1.1 2012/01/29 10:12:42 tsutsui Exp $ */
+/* $NetBSD: w100lcd.c,v 1.2 2012/02/10 11:25:42 tsutsui Exp $ */
/*
* Copyright (c) 2002, 2003 Genetec Corporation. All rights reserved.
* Written by Hiroyuki Bessho for Genetec Corporation.
@@ -39,7 +39,7 @@
* LCD on/off switch and backlight brightness are done in lcdctl.c.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: w100lcd.c,v 1.1 2012/01/29 10:12:42 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: w100lcd.c,v 1.2 2012/02/10 11:25:42 tsutsui Exp $");
#include
#include
@@ -51,6 +51,8 @@ __KERNEL_RCSID(0, "$NetBSD: w100lcd.c,v
#include
#include
+#include
+
#include
#include
@@ -188,6 +190,9 @@ static int
w100lcd_ioctl(void *v, void *vs, u_long cmd, void *data, int flag,
struct lwp *l)
{
+ struct w100_softc *sc = (struct w100_softc *)v;
+ struct hpcfb_fbconf *fbconf;
+ struct hpcfb_dspconf *dspconf;
int res = EINVAL;
switch (cmd) {
@@ -197,6 +202,112 @@ w100lcd_ioctl(void *v, void *vs, u_long
res = lcdctl_param(cmd, (struct wsdisplay_param *)data);
break;
#endif
+ case HPCFBIO_GCONF:
+ fbconf = (struct hpcfb_fbconf *)data;
+ if (fbconf->hf_conf_index != 0 &&
+ fbconf->hf_conf_index != HPCFB_CURRENT_CONFIG) {
+ break;
+ }
+
+ fbconf->hf_conf_index = 0;
+ fbconf->hf_nconfs = 1;
+ fbconf->hf_class = HPCFB_CLASS_RGBCOLOR;
+ strlcpy(fbconf->hf_name, "Sharp Zaurus frame buffer",
+ sizeof(fbconf->hf_name));
+ strlcpy(fbconf->hf_conf_name, "default",
+ sizeof(fbconf->hf_conf_name));
+ fbconf->hf_width = sc->display_width;
+ fbconf->hf_height = sc->display_height;
+ fbconf->hf_baseaddr = (u_long)sc->active->buf_va;
+ fbconf->hf_offset = 0;
+ fbconf->hf_bytes_per_line = sc->display_width *
+ sc->active->depth / 8;
+ fbconf->hf_nplanes = 1;
+ fbconf->hf_bytes_per_plane = sc->display_width *
+ sc->display_height * sc->active->depth / 8;
+ fbconf->hf_pack_width = sc->active->depth;
+ fbconf->hf_pixels_per_pack = 1;
+ fbconf->hf_pixel_width = sc->active->depth;
+
CVS commit: src/sys/arch/arm/s3c2xx0
Module Name:src
Committed By: nisimura
Date: Fri Feb 10 09:17:49 UTC 2012
Modified Files:
src/sys/arch/arm/s3c2xx0: s3c24x0_clk.c
Log Message:
- use a correct bit mask to pick SRCPND register indication.
- reading timer#4 possibly returns value '0'. Having the
'0' and a timer reload interrupt results in a too large
number, meaning the next get_timecounter() call will
return a smaller one than the previous, effectively kill
things. Handle this case.
ping(8) now shows better precisions. Fixes from Paul Fleischer.
Ok by releng.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/s3c2xx0/s3c24x0_clk.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/s3c2xx0/s3c24x0_clk.c
diff -u src/sys/arch/arm/s3c2xx0/s3c24x0_clk.c:1.13 src/sys/arch/arm/s3c2xx0/s3c24x0_clk.c:1.14
--- src/sys/arch/arm/s3c2xx0/s3c24x0_clk.c:1.13 Tue Feb 7 09:06:05 2012
+++ src/sys/arch/arm/s3c2xx0/s3c24x0_clk.c Fri Feb 10 09:17:49 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c24x0_clk.c,v 1.13 2012/02/07 09:06:05 nisimura Exp $ */
+/* $NetBSD: s3c24x0_clk.c,v 1.14 2012/02/10 09:17:49 nisimura Exp $ */
/*
* Copyright (c) 2003 Genetec corporation. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: s3c24x0_clk.c,v 1.13 2012/02/07 09:06:05 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c24x0_clk.c,v 1.14 2012/02/10 09:17:49 nisimura Exp $");
#include
#include
@@ -53,9 +53,9 @@ __KERNEL_RCSID(0, "$NetBSD: s3c24x0_clk.
#define TIMER_FREQUENCY(pclk) ((pclk)/16) /* divider=1/16 */
-static unsigned int timer4_reload_value;
-static unsigned int timer4_prescaler;
-static unsigned int timer4_mseccount;
+static uint32_t timer4_reload_value;
+static uint32_t timer4_prescaler;
+static uint32_t timer4_mseccount;
#define usec_to_counter(t) \
((timer4_mseccount*(t))/1000)
@@ -68,7 +68,7 @@ static u_int s3c24x0_get_timecount(struc
static struct timecounter s3c24x0_timecounter = {
s3c24x0_get_timecount, /* get_timecount */
0, /* no poll_pps */
- 0xfff, /* counter_mask */
+ 0x, /* counter_mask */
0, /* frequency */
"s3c24x0", /* name */
100, /* quality */
@@ -83,21 +83,22 @@ s3c24x0_get_timecount(struct timecounter
{
struct s3c24x0_softc *sc = (struct s3c24x0_softc *) s3c2xx0_softc;
int save, int_pend0, int_pend1, count;
+ int int_pend;
save = disable_interrupts(I32_bit);
again:
- int_pend0 = S3C24X0_INT_TIMER4 &
- bus_space_read_4(sc->sc_sx.sc_iot, sc->sc_sx.sc_intctl_ioh,
+ int_pend = bus_space_read_4(sc->sc_sx.sc_iot, sc->sc_sx.sc_intctl_ioh,
INTCTL_SRCPND);
+ int_pend0 = (1sc_timer_ioh,
TIMER_TCNTO(4));
for (;;) {
- int_pend1 = S3C24X0_INT_TIMER4 &
- bus_space_read_4(sc->sc_sx.sc_iot, sc->sc_sx.sc_intctl_ioh,
- INTCTL_SRCPND);
+ int_pend1 = bus_space_read_4(sc->sc_sx.sc_iot,
+ sc->sc_sx.sc_intctl_ioh, INTCTL_SRCPND);
+ int_pend1 &= (1< 0) {
count -= timer4_reload_value;
}
- //printf("delta: %u\n", (s3c24x0_base - count));
return s3c24x0_base - count;
}
@@ -250,7 +250,7 @@ cpu_initclocks(void)
calc_time_constant(h);
timer4_prescaler = prescaler;
- timer4_reload_value = TIMER_FREQUENCY(pclk) / hz / prescaler;
+ timer4_reload_value = (TIMER_FREQUENCY(pclk) / hz / prescaler) - 1;
timer4_mseccount = TIMER_FREQUENCY(pclk)/timer4_prescaler/1000 ;
bus_space_write_4(iot, ioh, TIMER_TCNTB(4),
CVS commit: [matt-nb5-mips64] src/sys/arch/evbmips/conf
Module Name:src Committed By: matt Date: Fri Feb 10 08:54:19 UTC 2012 Modified Files: src/sys/arch/evbmips/conf [matt-nb5-mips64]: XLPEVB Log Message: Bump SYMTAB_SPACE. To generate a diff of this commit: cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/sys/arch/evbmips/conf/XLPEVB Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbmips/conf/XLPEVB diff -u src/sys/arch/evbmips/conf/XLPEVB:1.1.2.6 src/sys/arch/evbmips/conf/XLPEVB:1.1.2.7 --- src/sys/arch/evbmips/conf/XLPEVB:1.1.2.6 Thu Jan 19 17:42:26 2012 +++ src/sys/arch/evbmips/conf/XLPEVB Fri Feb 10 08:54:18 2012 @@ -1,8 +1,8 @@ -# $NetBSD: XLPEVB,v 1.1.2.6 2012/01/19 17:42:26 matt Exp $ +# $NetBSD: XLPEVB,v 1.1.2.7 2012/02/10 08:54:18 matt Exp $ include "arch/evbmips/conf/std.rmixlp" -#ident "XLSATX-$Revision: 1.1.2.6 $" +#ident "XLSATX-$Revision: 1.1.2.7 $" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary @@ -41,7 +41,7 @@ options USERCONF # userconf(4) support options DDB # kernel dynamic debugger options DDB_HISTORY_SIZE=100 # enable history editing in DDB makeoptions DEBUG="-g" # compile full symbol table -options SYMTAB_SPACE=50 # size for embedded symbol table +options SYMTAB_SPACE=51 # size for embedded symbol table #options DDB_COMMANDONENTER="trace;show registers" options DB_MAX_LINE=-1
CVS commit: [matt-nb5-mips64] src/gnu
Module Name:src
Committed By: matt
Date: Fri Feb 10 08:52:58 UTC 2012
Modified Files:
src/gnu/dist/gdb6/gdb [matt-nb5-mips64]: mips-tdep.h mipsnbsd-nat.c
src/gnu/dist/gdb6/gdb/config/mips [matt-nb5-mips64]: nbsd.mh
src/gnu/usr.bin/gdb6/arch/mips64eb [matt-nb5-mips64]: defs.mk
src/gnu/usr.bin/gdb6/arch/mips64el [matt-nb5-mips64]: defs.mk
src/gnu/usr.bin/gdb6/arch/mipseb [matt-nb5-mips64]: defs.mk
src/gnu/usr.bin/gdb6/arch/mipsel [matt-nb5-mips64]: defs.mk
Log Message:
Add target kvm support for mips
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.32.1 src/gnu/dist/gdb6/gdb/mips-tdep.h
cvs rdiff -u -r1.2 -r1.2.24.1 src/gnu/dist/gdb6/gdb/mipsnbsd-nat.c
cvs rdiff -u -r1.2 -r1.2.24.1 src/gnu/dist/gdb6/gdb/config/mips/nbsd.mh
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/gnu/usr.bin/gdb6/arch/mips64eb/defs.mk
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/gnu/usr.bin/gdb6/arch/mips64el/defs.mk
cvs rdiff -u -r1.4 -r1.4.24.1 src/gnu/usr.bin/gdb6/arch/mipseb/defs.mk
cvs rdiff -u -r1.2 -r1.2.28.1 src/gnu/usr.bin/gdb6/arch/mipsel/defs.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/dist/gdb6/gdb/mips-tdep.h
diff -u src/gnu/dist/gdb6/gdb/mips-tdep.h:1.1.1.2 src/gnu/dist/gdb6/gdb/mips-tdep.h:1.1.1.2.32.1
--- src/gnu/dist/gdb6/gdb/mips-tdep.h:1.1.1.2 Sun Jul 2 20:14:39 2006
+++ src/gnu/dist/gdb6/gdb/mips-tdep.h Fri Feb 10 08:52:57 2012
@@ -74,8 +74,19 @@ enum
MIPS_AT_REGNUM = 1,
MIPS_V0_REGNUM = 2, /* Function integer return value. */
MIPS_A0_REGNUM = 4, /* Loc of first arg during a subr call */
+ MIPS_S0_REGNUM = 16,
+ MIPS_S1_REGNUM = 17,
+ MIPS_S2_REGNUM = 18,
+ MIPS_S3_REGNUM = 19,
+ MIPS_S4_REGNUM = 20,
+ MIPS_S5_REGNUM = 21,
+ MIPS_S6_REGNUM = 22,
+ MIPS_S7_REGNUM = 23,
+ MIPS_T8_REGNUM = 24,
MIPS_T9_REGNUM = 25, /* Contains address of callee in PIC. */
+ MIPS_GP_REGNUM = 28,
MIPS_SP_REGNUM = 29,
+ MIPS_S8_REGNUM = 30,
MIPS_RA_REGNUM = 31,
MIPS_PS_REGNUM = 32, /* Contains processor status. */
MIPS_EMBED_LO_REGNUM = 33,
Index: src/gnu/dist/gdb6/gdb/mipsnbsd-nat.c
diff -u src/gnu/dist/gdb6/gdb/mipsnbsd-nat.c:1.2 src/gnu/dist/gdb6/gdb/mipsnbsd-nat.c:1.2.24.1
--- src/gnu/dist/gdb6/gdb/mipsnbsd-nat.c:1.2 Wed Dec 6 18:25:29 2006
+++ src/gnu/dist/gdb6/gdb/mipsnbsd-nat.c Fri Feb 10 08:52:57 2012
@@ -32,6 +32,9 @@
#include "mips-tdep.h"
#include "mipsnbsd-tdep.h"
#include "inf-ptrace.h"
+#include "bsd-kvm.h"
+
+#include "machine/pcb.h"
/* Determine if PT_GETREGS fetches this register. */
static int
@@ -104,6 +107,43 @@ mipsnbsd_store_inferior_registers (int r
perror_with_name (_("Couldn't write floating point status"));
}
}
+
+static int mipsnbsd_supply_pcb (struct regcache *, struct pcb *);
+
+static int
+mipsnbsd_supply_pcb (struct regcache *regcache, struct pcb *pcb)
+{
+ struct label_t sf;
+
+ sf = pcb->pcb_context;
+
+ /* really should test for n{32,64} abi for this register
+ unless this is purely the "n" ABI */
+
+ regcache_raw_supply (regcache, MIPS_S0_REGNUM, &sf.val[_L_S0]);
+ regcache_raw_supply (regcache, MIPS_S1_REGNUM, &sf.val[_L_S1]);
+ regcache_raw_supply (regcache, MIPS_S2_REGNUM, &sf.val[_L_S2]);
+ regcache_raw_supply (regcache, MIPS_S3_REGNUM, &sf.val[_L_S3]);
+ regcache_raw_supply (regcache, MIPS_S4_REGNUM, &sf.val[_L_S4]);
+ regcache_raw_supply (regcache, MIPS_S5_REGNUM, &sf.val[_L_S5]);
+ regcache_raw_supply (regcache, MIPS_S6_REGNUM, &sf.val[_L_S6]);
+ regcache_raw_supply (regcache, MIPS_S7_REGNUM, &sf.val[_L_S7]);
+
+ regcache_raw_supply (regcache, MIPS_S8_REGNUM, &sf.val[_L_S8]);
+
+ regcache_raw_supply (regcache, MIPS_T8_REGNUM, &sf.val[_L_T8]);
+
+ regcache_raw_supply (regcache, MIPS_GP_REGNUM, &sf.val[_L_GP]);
+
+ regcache_raw_supply (regcache, MIPS_SP_REGNUM, &sf.val[_L_SP]);
+ regcache_raw_supply (regcache, MIPS_RA_REGNUM, &sf.val[_L_RA]);
+ regcache_raw_supply (regcache, MIPS_PS_REGNUM, &sf.val[_L_SR]);
+
+ /* provide the return address of the savectx as the current pc */
+ regcache_raw_supply (regcache, MIPS_EMBED_PC_REGNUM, &sf.val[_L_RA]);
+
+ return 0;
+}
/* Provide a prototype to silence -Wmissing-prototypes. */
@@ -120,4 +160,7 @@ _initialize_mipsnbsd_nat (void)
t->to_pid_to_exec_file = nbsd_pid_to_exec_file;
add_target (t);
+
+ /* Support debugging kernel virtual memory images. */
+ bsd_kvm_add_target (mipsnbsd_supply_pcb);
}
Index: src/gnu/dist/gdb6/gdb/config/mips/nbsd.mh
diff -u src/gnu/dist/gdb6/gdb/config/mips/nbsd.mh:1.2 src/gnu/dist/gdb6/gdb/config/mips/nbsd.mh:1.2.24.1
--- src/gnu/dist/gdb6/gdb/config/mips/nbsd.mh:1.2 Wed Dec 6 18:25:29 2006
+++ src/gnu/dist/gdb6/gdb/config/mips/nbsd.mh Fri Feb 10 08:52:57 2012
@@ -1,2 +1,3 @@
# Host: NetBSD/mips
-NATDEPFILES= fork-child.o inf-ptrace.o nbsd-nat.o mipsnbsd-nat.o
+NATDEPFILES= fork-child.o inf-ptrace.o nbsd-nat.o mipsnbsd-nat.o bsd-kvm.o
+LOADLIBS= -lkvm
Ind
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src
Committed By: matt
Date: Fri Feb 10 08:15:58 UTC 2012
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: pmap.c
Log Message:
Fix typo.
To generate a diff of this commit:
cvs rdiff -u -r1.179.16.38 -r1.179.16.39 src/sys/arch/mips/mips/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/mips/mips/pmap.c
diff -u src/sys/arch/mips/mips/pmap.c:1.179.16.38 src/sys/arch/mips/mips/pmap.c:1.179.16.39
--- src/sys/arch/mips/mips/pmap.c:1.179.16.38 Fri Feb 10 07:19:44 2012
+++ src/sys/arch/mips/mips/pmap.c Fri Feb 10 08:15:58 2012
@@ -1840,7 +1840,7 @@ pmap_extract(pmap_t pmap, vaddr_t va, pa
}
#elif defined(ENABLE_MIPS_KSEGX)
if (VM_KSEGX_ADDRESS <= va
- && va < VM_KSEGX_ADDRESS + VM_KSEGX_SIZE)
+ && va < VM_KSEGX_ADDRESS + VM_KSEGX_SIZE) {
pa = mips_ksegx_start + va - VM_KSEGX_ADDRESS;
goto done;
}
