CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Sun Feb 22 14:50:07 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: usbdivar.h
Log Message:
Simplify #ifdef.
USB_DEBUG is defined if either of EHCI_DEBUG or OHCI_DEBUG (or others)
are defined.
To generate a diff of this commit:
cvs rdiff -u -r1.109.2.10 -r1.109.2.11 src/sys/dev/usb/usbdivar.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/usbdivar.h
diff -u src/sys/dev/usb/usbdivar.h:1.109.2.10 src/sys/dev/usb/usbdivar.h:1.109.2.11
--- src/sys/dev/usb/usbdivar.h:1.109.2.10 Fri Dec 19 09:52:35 2014
+++ src/sys/dev/usb/usbdivar.h Sun Feb 22 14:50:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdivar.h,v 1.109.2.10 2014/12/19 09:52:35 skrll Exp $ */
+/* $NetBSD: usbdivar.h,v 1.109.2.11 2015/02/22 14:50:07 skrll Exp $ */
/*
* Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -281,7 +281,7 @@ struct usbd_xfer {
void usbd_init(void);
void usbd_finish(void);
-#if defined(USB_DEBUG) || defined(EHCI_DEBUG) || defined(OHCI_DEBUG)
+#if defined(USB_DEBUG)
void usbd_dump_iface(struct usbd_interface *);
void usbd_dump_device(struct usbd_device *);
void usbd_dump_endpoint(struct usbd_endpoint *);
CVS commit: src/sys/ufs/ffs
Module Name:src
Committed By: maxv
Date: Sun Feb 22 14:12:48 UTC 2015
Modified Files:
src/sys/ufs/ffs: ffs_quota2.c
Log Message:
KNF, and simplify a bit.
No functional change
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/ufs/ffs/ffs_quota2.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/ufs/ffs/ffs_quota2.c
diff -u src/sys/ufs/ffs/ffs_quota2.c:1.4 src/sys/ufs/ffs/ffs_quota2.c:1.5
--- src/sys/ufs/ffs/ffs_quota2.c:1.4 Sun Jun 12 03:36:00 2011
+++ src/sys/ufs/ffs/ffs_quota2.c Sun Feb 22 14:12:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_quota2.c,v 1.4 2011/06/12 03:36:00 rmind Exp $ */
+/* $NetBSD: ffs_quota2.c,v 1.5 2015/02/22 14:12:48 maxv Exp $ */
/*-
* Copyright (c) 2010 Manuel Bouyer
* All rights reserved.
@@ -26,14 +26,13 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ffs_quota2.c,v 1.4 2011/06/12 03:36:00 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: ffs_quota2.c,v 1.5 2015/02/22 14:12:48 maxv Exp $);
#include sys/param.h
#include sys/kernel.h
#include sys/systm.h
#include sys/namei.h
#include sys/file.h
-#include sys/proc.h
#include sys/vnode.h
#include sys/mount.h
#include sys/kauth.h
@@ -44,13 +43,12 @@ __KERNEL_RCSID(0, $NetBSD: ffs_quota2.c
#include ufs/ffs/ffs_extern.h
#include ufs/ffs/fs.h
-
int
ffs_quota2_mount(struct mount *mp)
{
struct ufsmount *ump = VFSTOUFS(mp);
struct fs *fs = ump-um_fs;
- int error = 0;
+ int error;
struct vnode *vp;
struct lwp *l = curlwp;
@@ -61,26 +59,24 @@ ffs_quota2_mount(struct mount *mp)
ump-umq2_bsize = fs-fs_bsize;
ump-umq2_bmask = fs-fs_qbmask;
if (fs-fs_quota_magic != Q2_HEAD_MAGIC) {
- printf(%s: Invalid quota magic number\n,
+ printf(%s: invalid quota magic number\n,
mp-mnt_stat.f_mntonname);
return EINVAL;
}
-if ((fs-fs_quota_flags FS_Q2_DO_TYPE(USRQUOTA))
-fs-fs_quotafile[USRQUOTA] == 0) {
-printf(%s: no user quota inode\n,
+ if ((fs-fs_quota_flags FS_Q2_DO_TYPE(USRQUOTA))
+ fs-fs_quotafile[USRQUOTA] == 0) {
+ printf(%s: no user quota inode\n,
mp-mnt_stat.f_mntonname);
-error = EINVAL;
-}
-if ((fs-fs_quota_flags FS_Q2_DO_TYPE(GRPQUOTA))
-fs-fs_quotafile[GRPQUOTA] == 0) {
-printf(%s: no group quota inode\n,
+ return EINVAL;
+ }
+ if ((fs-fs_quota_flags FS_Q2_DO_TYPE(GRPQUOTA))
+ fs-fs_quotafile[GRPQUOTA] == 0) {
+ printf(%s: no group quota inode\n,
mp-mnt_stat.f_mntonname);
-error = EINVAL;
-}
- if (error)
- return error;
+ return EINVAL;
+ }
-if (fs-fs_quota_flags FS_Q2_DO_TYPE(USRQUOTA)
+ if (fs-fs_quota_flags FS_Q2_DO_TYPE(USRQUOTA)
ump-um_quotas[USRQUOTA] == NULLVP) {
error = VFS_VGET(mp, fs-fs_quotafile[USRQUOTA], vp);
if (error) {
@@ -95,7 +91,7 @@ ffs_quota2_mount(struct mount *mp)
mutex_exit(vp-v_interlock);
VOP_UNLOCK(vp);
}
-if (fs-fs_quota_flags FS_Q2_DO_TYPE(GRPQUOTA)
+ if (fs-fs_quota_flags FS_Q2_DO_TYPE(GRPQUOTA)
ump-um_quotas[GRPQUOTA] == NULLVP) {
error = VFS_VGET(mp, fs-fs_quotafile[GRPQUOTA], vp);
if (error) {
@@ -113,6 +109,7 @@ ffs_quota2_mount(struct mount *mp)
mutex_exit(vp-v_interlock);
VOP_UNLOCK(vp);
}
+
mp-mnt_flag |= MNT_QUOTA;
return 0;
}
CVS commit: src/sys/ufs/ffs
Module Name:src
Committed By: maxv
Date: Sun Feb 22 14:22:34 UTC 2015
Modified Files:
src/sys/ufs/ffs: ffs_vfsops.c
Log Message:
ffs_superblock_validate(): sanitize fs_fragshift, fs_bmask and fs_fmask.
To generate a diff of this commit:
cvs rdiff -u -r1.317 -r1.318 src/sys/ufs/ffs/ffs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ffs/ffs_vfsops.c
diff -u src/sys/ufs/ffs/ffs_vfsops.c:1.317 src/sys/ufs/ffs/ffs_vfsops.c:1.318
--- src/sys/ufs/ffs/ffs_vfsops.c:1.317 Fri Feb 20 17:10:17 2015
+++ src/sys/ufs/ffs/ffs_vfsops.c Sun Feb 22 14:22:34 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_vfsops.c,v 1.317 2015/02/20 17:10:17 maxv Exp $ */
+/* $NetBSD: ffs_vfsops.c,v 1.318 2015/02/22 14:22:34 maxv Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ffs_vfsops.c,v 1.317 2015/02/20 17:10:17 maxv Exp $);
+__KERNEL_RCSID(0, $NetBSD: ffs_vfsops.c,v 1.318 2015/02/22 14:22:34 maxv Exp $);
#if defined(_KERNEL_OPT)
#include opt_ffs.h
@@ -922,7 +922,7 @@ static const int sblock_try[] = SBLOCKSE
static int
ffs_superblock_validate(struct fs *fs)
{
- int32_t i, fs_bshift = 0, fs_fshift = 0, fs_frag;
+ int32_t i, fs_bshift = 0, fs_fshift = 0, fs_fragshift = 0, fs_frag;
/* Check the superblock size */
if (fs-fs_sbsize SBLOCKSIZE || fs-fs_sbsize sizeof(struct fs))
@@ -937,6 +937,8 @@ ffs_superblock_validate(struct fs *fs)
/* Check the size of frag blocks */
if (!powerof2(fs-fs_fsize))
return 0;
+ if (fs-fs_fsize == 0)
+ return 0;
if (fs-fs_size == 0)
return 0;
@@ -959,7 +961,21 @@ ffs_superblock_validate(struct fs *fs)
if (fs-fs_fshift != fs_fshift)
return 0;
- /* Now that the shifts are sanitized, we can use the ffs_ API */
+ /* Compute fs_fragshift and ensure it is consistent */
+ for (i = fs-fs_frag; i 1; i = 1)
+ fs_fragshift++;
+ if (fs-fs_fragshift != fs_fragshift)
+ return 0;
+
+ /* Check the masks */
+ if (fs-fs_bmask != ~(fs-fs_bsize - 1))
+ return 0;
+ if (fs-fs_fmask != ~(fs-fs_fsize - 1))
+ return 0;
+
+ /*
+ * Now that the shifts and masks are sanitized, we can use the ffs_ API.
+ */
/* Check the number of frag blocks */
if ((fs_frag = ffs_numfrags(fs, fs-fs_bsize)) MAXFRAG)
@@ -1205,7 +1221,8 @@ ffs_mountfs(struct vnode *devvp, struct
brelse(bp, 0);
bp = NULL;
- /* First check to see if this is tagged as an Apple UFS filesystem
+ /*
+ * First check to see if this is tagged as an Apple UFS filesystem
* in the disklabel
*/
if (getdiskinfo(devvp, dkw) == 0
@@ -1213,7 +1230,8 @@ ffs_mountfs(struct vnode *devvp, struct
ump-um_flags |= UFS_ISAPPLEUFS;
#ifdef APPLE_UFS
else {
- /* Manually look for an apple ufs label, and if a valid one
+ /*
+ * Manually look for an apple ufs label, and if a valid one
* is found, then treat it like an Apple UFS filesystem anyway
*/
error = bread(devvp,
@@ -1346,12 +1364,14 @@ ffs_mountfs(struct vnode *devvp, struct
fs-fs_contigdirs = space;
space = (char *)space + bsize;
memset(fs-fs_contigdirs, 0, bsize);
- /* Compatibility for old filesystems - XXX */
+
+ /* Compatibility for old filesystems - XXX */
if (fs-fs_avgfilesize = 0)
fs-fs_avgfilesize = AVFILESIZ;
if (fs-fs_avgfpdir = 0)
fs-fs_avgfpdir = AFPDIR;
fs-fs_active = NULL;
+
mp-mnt_data = ump;
mp-mnt_stat.f_fsidx.__fsid_val[0] = (long)dev;
mp-mnt_stat.f_fsidx.__fsid_val[1] = makefstype(MOUNT_FFS);
CVS commit: src/etc/etc.amd64
Module Name:src Committed By: christos Date: Sun Feb 22 14:42:44 UTC 2015 Modified Files: src/etc/etc.amd64: MAKEDEV.conf Log Message: don't make ipty. postinstall removes them. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/etc/etc.amd64/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.amd64/MAKEDEV.conf diff -u src/etc/etc.amd64/MAKEDEV.conf:1.20 src/etc/etc.amd64/MAKEDEV.conf:1.21 --- src/etc/etc.amd64/MAKEDEV.conf:1.20 Sat Sep 22 21:15:17 2012 +++ src/etc/etc.amd64/MAKEDEV.conf Sun Feb 22 09:42:44 2015 @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.20 2012/09/23 01:15:17 chs Exp $ +# $NetBSD: MAKEDEV.conf,v 1.21 2015/02/22 14:42:44 christos Exp $ # As of 2003-04-17, the init case must not create more than 890 entries. all_md) @@ -16,7 +16,6 @@ all_md) makedev ld0 ld1 ld2 ld3 makedev xbd0 xbd1 xbd2 xbd3 xen makedev usbs - makedev ipty makedev local makedev cfs makedev lpa0 lpa1 lpa2
CVS commit: src/sys/ufs/ext2fs
Module Name:src
Committed By: maxv
Date: Sun Feb 22 14:55:23 UTC 2015
Modified Files:
src/sys/ufs/ext2fs: ext2fs_vfsops.c
Log Message:
Merge _sbcompute() and _sbcheck() into _sbfill().
In ext2fs_sbfill(), check more fields of the superblock, to prevent
several kernel panics when mounting/unmounting a disk.
To generate a diff of this commit:
cvs rdiff -u -r1.188 -r1.189 src/sys/ufs/ext2fs/ext2fs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ext2fs/ext2fs_vfsops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.188 src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.189
--- src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.188 Fri Feb 20 17:44:54 2015
+++ src/sys/ufs/ext2fs/ext2fs_vfsops.c Sun Feb 22 14:55:23 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_vfsops.c,v 1.188 2015/02/20 17:44:54 maxv Exp $ */
+/* $NetBSD: ext2fs_vfsops.c,v 1.189 2015/02/22 14:55:23 maxv Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1994
@@ -60,7 +60,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ext2fs_vfsops.c,v 1.188 2015/02/20 17:44:54 maxv Exp $);
+__KERNEL_RCSID(0, $NetBSD: ext2fs_vfsops.c,v 1.189 2015/02/22 14:55:23 maxv Exp $);
#if defined(_KERNEL_OPT)
#include opt_compat_netbsd.h
@@ -104,8 +104,7 @@ __KERNEL_RCSID(0, $NetBSD: ext2fs_vfsop
MODULE(MODULE_CLASS_VFS, ext2fs, ffs);
int ext2fs_sbupdate(struct ufsmount *, int);
-static void ext2fs_sbcompute(struct m_ext2fs *);
-static int ext2fs_sbcheck(struct ext2fs *, int);
+static int ext2fs_sbfill(struct m_ext2fs *, int);
static struct sysctllog *ext2fs_sysctl_log;
@@ -549,10 +548,9 @@ ext2fs_reload(struct mount *mp, kauth_cr
brelse(bp, 0);
- error = ext2fs_sbcheck(fs-e2fs, (mp-mnt_flag MNT_RDONLY) != 0);
+ error = ext2fs_sbfill(fs, (mp-mnt_flag MNT_RDONLY) != 0);
if (error)
return error;
- ext2fs_sbcompute(fs);
/*
* Step 3: re-read summary information from disk.
@@ -649,8 +647,8 @@ ext2fs_mountfs(struct vnode *devvp, stru
brelse(bp, 0);
bp = NULL;
- /* Once swapped, validate the superblock. */
- error = ext2fs_sbcheck(m_fs-e2fs, ronly);
+ /* Once swapped, validate and fill in the superblock. */
+ error = ext2fs_sbfill(m_fs, ronly);
if (error) {
kmem_free(m_fs, sizeof(struct m_ext2fs));
goto out;
@@ -670,9 +668,7 @@ ext2fs_mountfs(struct vnode *devvp, stru
m_fs-e2fs_fmod = 1;
}
- /* Compute dynamic sb infos */
- ext2fs_sbcompute(m_fs);
-
+ /* XXX: should be added in ext2fs_sbfill()? */
m_fs-e2fs_gd = kmem_alloc(m_fs-e2fs_ngdb * m_fs-e2fs_bsize, KM_SLEEP);
for (i = 0; i m_fs-e2fs_ngdb; i++) {
error = bread(devvp,
@@ -1118,30 +1114,19 @@ ext2fs_cgupdate(struct ufsmount *mp, int
return (allerror);
}
-static void
-ext2fs_sbcompute(struct m_ext2fs *fs)
-{
- fs-e2fs_ncg = howmany(fs-e2fs.e2fs_bcount - fs-e2fs.e2fs_first_dblock,
- fs-e2fs.e2fs_bpg);
- fs-e2fs_fsbtodb = fs-e2fs.e2fs_log_bsize + LOG_MINBSIZE - DEV_BSHIFT;
- fs-e2fs_bsize = MINBSIZE fs-e2fs.e2fs_log_bsize;
- fs-e2fs_bshift = LOG_MINBSIZE + fs-e2fs.e2fs_log_bsize;
- fs-e2fs_qbmask = fs-e2fs_bsize - 1;
- fs-e2fs_bmask = ~fs-e2fs_qbmask;
- fs-e2fs_ngdb =
- howmany(fs-e2fs_ncg, fs-e2fs_bsize / sizeof(struct ext2_gd));
- fs-e2fs_ipb = fs-e2fs_bsize / EXT2_DINODE_SIZE(fs);
- fs-e2fs_itpg = fs-e2fs.e2fs_ipg / fs-e2fs_ipb;
-}
-
/*
+ * Fill in the m_fs structure, and validate the fields of the superblock.
* NOTE: here, the superblock is already swapped.
*/
static int
-ext2fs_sbcheck(struct ext2fs *fs, int ronly)
+ext2fs_sbfill(struct m_ext2fs *m_fs, int ronly)
{
uint32_t u32;
+ struct ext2fs *fs = m_fs-e2fs;
+ /*
+ * General sanity checks
+ */
if (fs-e2fs_magic != E2FS_MAGIC)
return EINVAL;
if (fs-e2fs_rev E2FS_REV1) {
@@ -1157,7 +1142,24 @@ ext2fs_sbcheck(struct ext2fs *fs, int ro
printf(ext2fs: zero blocks per group\n);
return EINVAL;
}
+ if (fs-e2fs_ipg == 0) {
+ printf(ext2fs: zero inodes per group\n);
+ return EINVAL;
+ }
+ if (fs-e2fs_first_dblock = fs-e2fs_bcount) {
+ printf(ext2fs: invalid first data block\n);
+ return EINVAL;
+ }
+ if (fs-e2fs_rbcount fs-e2fs_bcount ||
+ fs-e2fs_fbcount fs-e2fs_bcount) {
+ printf(ext2fs: invalid block count\n);
+ return EINVAL;
+ }
+
+ /*
+ * Revision-specific checks
+ */
if (fs-e2fs_rev E2FS_REV0) {
char buf[256];
if (fs-e2fs_first_ino != EXT2_FIRSTINO) {
@@ -1177,10 +1179,47 @@ ext2fs_sbcheck(struct ext2fs *fs, int ro
buf);
return EROFS;
}
- if (fs-e2fs_inode_size == 0) {
+ if (fs-e2fs_inode_size == 0 || !powerof2(fs-e2fs_inode_size)) {
printf(ext2fs: bad inode size\n);
return EINVAL;
}
}
+
+ /*
+ * Compute the fields of the superblock
+ */
+ u32 = fs-e2fs_bcount - fs-e2fs_first_dblock; /* 0 */
+ if (u32 fs-e2fs_bpg) {
+ printf(ext2fs: invalid number of cylinder groups\n);
+ return EINVAL;
+ }
+ m_fs-e2fs_ncg = howmany(u32, fs-e2fs_bpg);
+
+ m_fs-e2fs_fsbtodb = fs-e2fs_log_bsize + LOG_MINBSIZE -
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: riastradh Date: Sun Feb 22 17:38:19 UTC 2015 Modified Files: src/sys/arch/arm/include: Makefile.inc Log Message: Make -mfloat-abi=soft a native kernel only option. Fixes rump build. ok justin@ To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/include/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/include/Makefile.inc diff -u src/sys/arch/arm/include/Makefile.inc:1.1 src/sys/arch/arm/include/Makefile.inc:1.2 --- src/sys/arch/arm/include/Makefile.inc:1.1 Sat Feb 21 12:50:23 2015 +++ src/sys/arch/arm/include/Makefile.inc Sun Feb 22 17:38:19 2015 @@ -1,3 +1,5 @@ -# $NetBSD: Makefile.inc,v 1.1 2015/02/21 12:50:23 joerg Exp $ +# $NetBSD: Makefile.inc,v 1.2 2015/02/22 17:38:19 riastradh Exp $ +.if !defined(RUMPKERNEL) CFLAGS+= -mfloat-abi=soft +.endif
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src Committed By: skrll Date: Sun Feb 22 08:25:02 UTC 2015 Modified Files: src/sys/dev/usb [nick-nhusb]: ohci.c Log Message: KNF To generate a diff of this commit: cvs rdiff -u -r1.254.2.16 -r1.254.2.17 src/sys/dev/usb/ohci.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/ohci.c diff -u src/sys/dev/usb/ohci.c:1.254.2.16 src/sys/dev/usb/ohci.c:1.254.2.17 --- src/sys/dev/usb/ohci.c:1.254.2.16 Sun Feb 1 06:30:29 2015 +++ src/sys/dev/usb/ohci.c Sun Feb 22 08:25:02 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ohci.c,v 1.254.2.16 2015/02/01 06:30:29 skrll Exp $ */ +/* $NetBSD: ohci.c,v 1.254.2.17 2015/02/22 08:25:02 skrll Exp $ */ /* * Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc. @@ -41,17 +41,18 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ohci.c,v 1.254.2.16 2015/02/01 06:30:29 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: ohci.c,v 1.254.2.17 2015/02/22 08:25:02 skrll Exp $); #include sys/param.h -#include sys/systm.h -#include sys/kmem.h -#include sys/kernel.h + +#include sys/cpu.h #include sys/device.h -#include sys/select.h +#include sys/kernel.h +#include sys/kmem.h #include sys/proc.h #include sys/queue.h -#include sys/cpu.h +#include sys/select.h +#include sys/systm.h #include machine/endian.h
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Sun Feb 22 08:59:17 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: ehci.c
Log Message:
Improvie debugging
To generate a diff of this commit:
cvs rdiff -u -r1.234.2.30 -r1.234.2.31 src/sys/dev/usb/ehci.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/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.234.2.30 src/sys/dev/usb/ehci.c:1.234.2.31
--- src/sys/dev/usb/ehci.c:1.234.2.30 Sun Feb 1 08:45:04 2015
+++ src/sys/dev/usb/ehci.c Sun Feb 22 08:59:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.234.2.30 2015/02/01 08:45:04 skrll Exp $ */
+/* $NetBSD: ehci.c,v 1.234.2.31 2015/02/22 08:59:17 skrll Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.234.2.30 2015/02/01 08:45:04 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.234.2.31 2015/02/22 08:59:17 skrll Exp $);
#include ohci.h
#include uhci.h
@@ -1014,7 +1014,9 @@ ehci_idone(struct ehci_xfer *ex)
if (ex-ex_isdone) {
printf(ehci_idone: ex=%p is done!\n, ex);
#ifdef EHCI_DEBUG
+ USBHIST_LOGN(ehcidebug, 5, --- dump start ---, 0, 0, 0, 0);
ehci_dump_exfer(ex);
+ USBHIST_LOGN(ehcidebug, 5, --- dump end ---, 0, 0, 0, 0);
#endif
return;
}
@@ -1029,7 +1031,9 @@ ehci_idone(struct ehci_xfer *ex)
USBHIST_LOG(ehcidebug, xfer=%p, pipe=%p ready, xfer, epipe, 0, 0);
#ifdef EHCI_DEBUG
+ USBHIST_LOGN(ehcidebug, 5, --- dump start ---, 0, 0, 0, 0);
ehci_dump_sqtds(ex-ex_sqtdstart);
+ USBHIST_LOGN(ehcidebug, 5, --- dump end ---, 0, 0, 0, 0);
#endif
/* The transfer is done, compute actual length and status. */
@@ -1195,8 +1199,10 @@ ehci_idone(struct ehci_xfer *ex)
status EHCI_QTD_SPLITXSTATE ? 1 : 0,
status EHCI_QTD_PINGSTATE ? 1 : 0);
+ USBHIST_LOGN(ehcidebug, 5, --- dump start ---, 0, 0, 0, 0);
ehci_dump_sqh(epipe-sqh);
ehci_dump_sqtds(ex-ex_sqtdstart);
+ USBHIST_LOGN(ehcidebug, 5, --- dump end ---, 0, 0, 0, 0);
#endif
/* lowfull speed has an extra error flag */
if (EHCI_QH_GET_EPS(epipe-sqh-qh.qh_endp) !=
@@ -2044,7 +2050,9 @@ ehci_add_qh(ehci_softc_t *sc, ehci_soft_
sizeof(head-qh.qh_link), BUS_DMASYNC_PREWRITE);
#ifdef EHCI_DEBUG
+ USBHIST_LOGN(ehcidebug, 5, --- dump start ---, 0, 0, 0, 0);
ehci_dump_sqh(sqh);
+ USBHIST_LOGN(ehcidebug, 5, --- dump end ---, 0, 0, 0, 0);
#endif
}
@@ -2539,9 +2547,14 @@ ehci_roothub_ctrl(struct usbd_bus *bus,
break;
default:
/* default from usbroothub */
+ USBHIST_LOG(ehcidebug, returning %d (usbroothub default),
+ buflen, 0, 0, 0);
+
return buflen;
}
+ USBHIST_LOG(ehcidebug, returning %d, totlen, 0, 0, 0);
+
return totlen;
}
@@ -3719,9 +3732,10 @@ ehci_device_bulk_start(usbd_xfer_handle
}
#ifdef EHCI_DEBUG
- USBHIST_LOGN(ehcidebug, 5, data(1):, 0, 0, 0, 0);
+ USBHIST_LOGN(ehcidebug, 5, --- dump start ---, 0, 0, 0, 0);
ehci_dump_sqh(sqh);
ehci_dump_sqtds(data);
+ USBHIST_LOGN(ehcidebug, 5, --- dump end ---, 0, 0, 0, 0);
#endif
/* Set up interrupt info. */
@@ -3906,9 +3920,10 @@ ehci_device_intr_start(usbd_xfer_handle
}
#ifdef EHCI_DEBUG
- USBHIST_LOGN(ehcidebug, 5, data(1), 0, 0, 0, 0);
+ USBHIST_LOGN(ehcidebug, 5, --- dump start ---, 0, 0, 0, 0);
ehci_dump_sqh(sqh);
ehci_dump_sqtds(data);
+ USBHIST_LOGN(ehcidebug, 5, --- dump end ---, 0, 0, 0, 0);
#endif
/* Set up interrupt info. */
@@ -4127,7 +4142,7 @@ ehci_device_fs_isoc_start(usbd_xfer_hand
i = epipe-pipe.up_endpoint-ue_edesc-bInterval;
if (i 16 || i == 0) {
/* Spec page 271 says intervals 16 are invalid */
- USBHIST_LOG(ehcidebug, bInterval %d invalid, i, 0, 0, 0);
+ USBHIST_LOG(ehcidebug, bInterval %d invalid, 0, 0, 0, 0);
return USBD_INVAL;
}
CVS commit: src/doc
Module Name:src Committed By: spz Date: Mon Feb 23 07:17:37 UTC 2015 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: note bind now is 9.10.1-P2 To generate a diff of this commit: cvs rdiff -u -r1.1206 -r1.1207 src/doc/3RDPARTY cvs rdiff -u -r1.2046 -r1.2047 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.1206 src/doc/3RDPARTY:1.1207 --- src/doc/3RDPARTY:1.1206 Sat Feb 21 12:05:47 2015 +++ src/doc/3RDPARTY Mon Feb 23 07:17:37 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1206 2015/02/21 12:05:47 tron Exp $ +# $NetBSD: 3RDPARTY,v 1.1207 2015/02/23 07:17:37 spz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -113,8 +113,8 @@ Notes: bc includes dc, both of which are in the NetBSD tree. Package: bind [named and utils] -Version: 9.10.1-P1 -Current Vers: 9.10.1-P1 +Version: 9.10.1-P2 +Current Vers: 9.10.1-P2 Maintainer: Paul Vixie vi...@vix.com Archive Site: ftp://ftp.isc.org/isc/bind9/ Home Page: http://www.isc.org/software/bind/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2046 src/doc/CHANGES:1.2047 --- src/doc/CHANGES:1.2046 Sat Feb 21 12:05:47 2015 +++ src/doc/CHANGES Mon Feb 23 07:17:37 2015 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2046 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2047 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -132,3 +132,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: zoneinfo: Import tzdata2015a. [apb 20150131] libc: Import tzdata2015a. [christos 20150131] postfix(1): Import version 2.11.4. [tron 20150221] + bind: patch to version 9.10.1-P2. [spz 20150221]
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: msaitoh Date: Mon Feb 23 07:20:52 UTC 2015 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.6 Log Message: Ticket 1259. To generate a diff of this commit: cvs rdiff -u -r1.1.2.29 -r1.1.2.30 src/doc/CHANGES-6.1.6 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.1.6 diff -u src/doc/CHANGES-6.1.6:1.1.2.29 src/doc/CHANGES-6.1.6:1.1.2.30 --- src/doc/CHANGES-6.1.6:1.1.2.29 Sat Feb 21 13:15:12 2015 +++ src/doc/CHANGES-6.1.6 Mon Feb 23 07:20:52 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.6,v 1.1.2.29 2015/02/21 13:15:12 martin Exp $ +# $NetBSD: CHANGES-6.1.6,v 1.1.2.30 2015/02/23 07:20:52 msaitoh Exp $ A complete list of changes from the NetBSD 6.1.5 release to the NetBSD 6.1.6 release: @@ -4062,3 +4062,44 @@ sys/netinet/ip_icmp.h1.34 Fix ICMP_STATINC() buffer overflows. [christos, ticket #1258] +external/bsd/bind/dist/CHANGES patch +external/bsd/bind/dist/README patch +external/bsd/bind/dist/srcid patch +external/bsd/bind/dist/version patch +external/bsd/bind/dist/bin/tests/system/ans.pl patch +external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html patch +external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html patch +external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html patch +external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html patch +external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html patch +external/bsd/bind/dist/doc/arm/Bv9ARM.html patch +external/bsd/bind/dist/doc/arm/man.arpaname.html patch +external/bsd/bind/dist/doc/arm/man.ddns-confgen.html patch +external/bsd/bind/dist/doc/arm/man.dig.html patch +external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html patch +external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html patch +external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html patch +external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html patch +external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html patch +external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html patch +external/bsd/bind/dist/doc/arm/man.dnssec-settime.html patch +external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html patch +external/bsd/bind/dist/doc/arm/man.dnssec-verify.html patch +external/bsd/bind/dist/doc/arm/man.genrandom.html patch +external/bsd/bind/dist/doc/arm/man.host.html patch +external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html patch +external/bsd/bind/dist/doc/arm/man.named-checkconf.html patch +external/bsd/bind/dist/doc/arm/man.named-checkzone.html patch +external/bsd/bind/dist/doc/arm/man.named-journalprint.html patch +external/bsd/bind/dist/doc/arm/man.named.html patch +external/bsd/bind/dist/doc/arm/man.nsec3hash.html patch +external/bsd/bind/dist/doc/arm/man.nsupdate.html patch +external/bsd/bind/dist/doc/arm/man.rndc-confgen.html patch +external/bsd/bind/dist/doc/arm/man.rndc.conf.html patch +external/bsd/bind/dist/doc/arm/man.rndc.html patch +external/bsd/bind/dist/lib/dns/apipatch +external/bsd/bind/dist/lib/dns/zone.cpatch + + Security patch for bind from ISC (to 9.9.6-P2). + Only the change to lib/dns/zone.c is security relevant (CVE-2015-1349). + [spz, ticket #1259]
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: msaitoh Date: Mon Feb 23 05:49:10 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket 544. To generate a diff of this commit: cvs rdiff -u -r1.1.2.209 -r1.1.2.210 src/doc/CHANGES-7.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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.209 src/doc/CHANGES-7.0:1.1.2.210 --- src/doc/CHANGES-7.0:1.1.2.209 Sat Feb 21 19:41:21 2015 +++ src/doc/CHANGES-7.0 Mon Feb 23 05:49:09 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.209 2015/02/21 19:41:21 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.210 2015/02/23 05:49:09 msaitoh Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -16028,4 +16028,47 @@ external/mit/xorg/lib/libxcb/libxcb/Make install xcb/xkb.h [jmcneill, ticket #541] +external/bsd/bind/dist/CHANGES 1.14 +external/bsd/bind/dist/README 1.2 +external/bsd/bind/dist/bin/tests/system/ans.pl 1.2 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html 1.2 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html 1.2 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html 1.2 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html 1.2 +external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html 1.2 +external/bsd/bind/dist/doc/arm/Bv9ARM.html 1.2 +external/bsd/bind/dist/doc/arm/man.arpaname.html 1.2 +external/bsd/bind/dist/doc/arm/man.ddns-confgen.html 1.2 +external/bsd/bind/dist/doc/arm/man.delv.html 1.2 +external/bsd/bind/dist/doc/arm/man.dig.html 1.2 +external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html 1.2 +external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html 1.2 +external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html 1.2 +external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html 1.2 +external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html 1.2 +external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html 1.2 +external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html 1.2 +external/bsd/bind/dist/doc/arm/man.dnssec-settime.html 1.2 +external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html 1.2 +external/bsd/bind/dist/doc/arm/man.dnssec-verify.html 1.2 +external/bsd/bind/dist/doc/arm/man.genrandom.html 1.2 +external/bsd/bind/dist/doc/arm/man.host.html 1.2 +external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html 1.2 +external/bsd/bind/dist/doc/arm/man.named-checkconf.html 1.2 +external/bsd/bind/dist/doc/arm/man.named-checkzone.html 1.2 +external/bsd/bind/dist/doc/arm/man.named-journalprint.html 1.2 +external/bsd/bind/dist/doc/arm/man.named-rrchecker.html 1.2 +external/bsd/bind/dist/doc/arm/man.named.html 1.2 +external/bsd/bind/dist/doc/arm/man.nsec3hash.html 1.2 +external/bsd/bind/dist/doc/arm/man.nsupdate.html 1.2 +external/bsd/bind/dist/doc/arm/man.rndc-confgen.html 1.2 +external/bsd/bind/dist/doc/arm/man.rndc.conf.html 1.2 +external/bsd/bind/dist/doc/arm/man.rndc.html 1.2 +external/bsd/bind/dist/lib/dns/api 1.2 +external/bsd/bind/dist/lib/dns/tests/geoip_test.c 1.2 +external/bsd/bind/dist/lib/dns/zone.c 1.13 +external/bsd/bind/dist/srcid 1.8 +external/bsd/bind/dist/version 1.12 + Update bind to 9.10.1-P2. It includes fix of CVE-2015-1349. + [spz, ticket #544]
CVS commit: src/sys/dev
Module Name:src
Committed By: mlelstv
Date: Mon Feb 23 06:54:13 UTC 2015
Modified Files:
src/sys/dev: cons.c
Log Message:
Fall back to nullcons if configured.
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/dev/cons.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/cons.c
diff -u src/sys/dev/cons.c:1.72 src/sys/dev/cons.c:1.73
--- src/sys/dev/cons.c:1.72 Fri Jul 25 08:10:35 2014
+++ src/sys/dev/cons.c Mon Feb 23 06:54:12 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cons.c,v 1.72 2014/07/25 08:10:35 dholland Exp $ */
+/* $NetBSD: cons.c,v 1.73 2015/02/23 06:54:12 mlelstv Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cons.c,v 1.72 2014/07/25 08:10:35 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: cons.c,v 1.73 2015/02/23 06:54:12 mlelstv Exp $);
#include sys/param.h
#include sys/proc.h
@@ -56,6 +56,8 @@ __KERNEL_RCSID(0, $NetBSD: cons.c,v 1.7
#include dev/cons.h
+#include nullcons.h
+
dev_type_open(cnopen);
dev_type_close(cnclose);
dev_type_read(cnread);
@@ -104,6 +106,11 @@ cnopen(dev_t dev, int flag, int mode, st
* open() calls.
*/
cndev = cn_tab-cn_dev;
+#if NNULLCONS 0
+ if (cndev == NODEV) {
+ nullconsattach(0);
+ }
+#else /* NNULLCONS 0 */
if (cndev == NODEV) {
/*
* This is most likely an error in the console attach
@@ -112,6 +119,7 @@ cnopen(dev_t dev, int flag, int mode, st
*/
panic(cnopen: no console device);
}
+#endif /* NNULLCONS 0 */
if (dev == cndev) {
/*
* This causes cnopen() to be called recursively, which
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: msaitoh Date: Mon Feb 23 07:00:57 UTC 2015 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Ticket 1259. To generate a diff of this commit: cvs rdiff -u -r1.1.2.197 -r1.1.2.198 src/doc/CHANGES-6.2 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.2 diff -u src/doc/CHANGES-6.2:1.1.2.197 src/doc/CHANGES-6.2:1.1.2.198 --- src/doc/CHANGES-6.2:1.1.2.197 Sat Feb 21 13:12:01 2015 +++ src/doc/CHANGES-6.2 Mon Feb 23 07:00:57 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.197 2015/02/21 13:12:01 martin Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.198 2015/02/23 07:00:57 msaitoh Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -9622,3 +9622,44 @@ sys/netinet/ip_icmp.h1.34 Fix ICMP_STATINC() buffer overflows. [christos, ticket #1258] +external/bsd/bind/dist/CHANGES patch +external/bsd/bind/dist/README patch +external/bsd/bind/dist/srcid patch +external/bsd/bind/dist/version patch +external/bsd/bind/dist/bin/tests/system/ans.pl patch +external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html patch +external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html patch +external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html patch +external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html patch +external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html patch +external/bsd/bind/dist/doc/arm/Bv9ARM.html patch +external/bsd/bind/dist/doc/arm/man.arpaname.html patch +external/bsd/bind/dist/doc/arm/man.ddns-confgen.html patch +external/bsd/bind/dist/doc/arm/man.dig.html patch +external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html patch +external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html patch +external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html patch +external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html patch +external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html patch +external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html patch +external/bsd/bind/dist/doc/arm/man.dnssec-settime.html patch +external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html patch +external/bsd/bind/dist/doc/arm/man.dnssec-verify.html patch +external/bsd/bind/dist/doc/arm/man.genrandom.html patch +external/bsd/bind/dist/doc/arm/man.host.html patch +external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html patch +external/bsd/bind/dist/doc/arm/man.named-checkconf.html patch +external/bsd/bind/dist/doc/arm/man.named-checkzone.html patch +external/bsd/bind/dist/doc/arm/man.named-journalprint.html patch +external/bsd/bind/dist/doc/arm/man.named.html patch +external/bsd/bind/dist/doc/arm/man.nsec3hash.html patch +external/bsd/bind/dist/doc/arm/man.nsupdate.html patch +external/bsd/bind/dist/doc/arm/man.rndc-confgen.html patch +external/bsd/bind/dist/doc/arm/man.rndc.conf.html patch +external/bsd/bind/dist/doc/arm/man.rndc.html patch +external/bsd/bind/dist/lib/dns/apipatch +external/bsd/bind/dist/lib/dns/zone.cpatch + + Security patch for bind from ISC (to 9.9.6-P2). + Only the change to lib/dns/zone.c is security relevant (CVE-2015-1349). + [spz, ticket #1259]
CVS commit: src
Module Name:src
Committed By: jmcneill
Date: Mon Feb 23 00:09:30 UTC 2015
Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/lib: Makefile
src/share/mk: bsd.x11.mk
Added Files:
src/external/mit/xorg/lib/libgbm: Makefile shlib_version
Log Message:
Build and install Mesa GBM buffer management library (libgbm).
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.158 -r1.159 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.32 -r1.33 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libgbm/Makefile \
src/external/mit/xorg/lib/libgbm/shlib_version
cvs rdiff -u -r1.114 -r1.115 src/share/mk/bsd.x11.mk
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/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.58 src/distrib/sets/lists/xbase/shl.mi:1.59
--- src/distrib/sets/lists/xbase/shl.mi:1.58 Thu Jan 29 22:58:20 2015
+++ src/distrib/sets/lists/xbase/shl.mi Mon Feb 23 00:09:30 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.58 2015/01/29 22:58:20 nat Exp $
+# $NetBSD: shl.mi,v 1.59 2015/02/23 00:09:30 jmcneill Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -324,6 +324,9 @@
./usr/X11R7/lib/libfreetype.so -unknown- xorg
./usr/X11R7/lib/libfreetype.so.17 -unknown- xorg
./usr/X11R7/lib/libfreetype.so.17.2.11 -unknown- xorg
+./usr/X11R7/lib/libgbm.so -unknown- xorg
+./usr/X11R7/lib/libgbm.so.1 -unknown- xorg
+./usr/X11R7/lib/libgbm.so.1.0 -unknown- xorg
./usr/X11R7/lib/libglut.so -unknown- xorg
./usr/X11R7/lib/libglut.so.4 -unknown- xorg
./usr/X11R7/lib/libglut.so.4.0 -unknown- xorg
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.158 src/distrib/sets/lists/xcomp/mi:1.159
--- src/distrib/sets/lists/xcomp/mi:1.158 Sat Feb 21 17:17:16 2015
+++ src/distrib/sets/lists/xcomp/mi Mon Feb 23 00:09:30 2015
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.158 2015/02/21 17:17:16 jmcneill Exp $
+# $NetBSD: mi,v 1.159 2015/02/23 00:09:30 jmcneill Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -5790,6 +5790,7 @@
./usr/X11R7/include/freetype2/tttags.h -unknown- xorg
./usr/X11R7/include/freetype2/ttunpat.h -unknown- xorg
./usr/X11R7/include/ft2build.hxcomp-obsolete obsolete
+./usr/X11R7/include/gbm.h-unknown- xorg
./usr/X11R7/include/libdrm/drm.h -unknown- xorg
./usr/X11R7/include/libdrm/drm_fourcc.h -unknown- xorg
./usr/X11R7/include/libdrm/drm_mode.h -unknown- xorg
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.32 src/external/mit/xorg/lib/Makefile:1.33
--- src/external/mit/xorg/lib/Makefile:1.32 Wed Jan 7 20:42:01 2015
+++ src/external/mit/xorg/lib/Makefile Mon Feb 23 00:09:30 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2015/01/07 20:42:01 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2015/02/23 00:09:30 jmcneill Exp $
# build libraries for xorg
@@ -34,6 +34,7 @@ SUBDIR+=libGLU libGLw libXaw6 libXaw lib
.WAIT \
libXdmGreet \
xcb-util
+SUBDIR+=libgbm
.include bsd.buildinstall.mk
.include bsd.subdir.mk
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.114 src/share/mk/bsd.x11.mk:1.115
--- src/share/mk/bsd.x11.mk:1.114 Tue Dec 30 22:07:21 2014
+++ src/share/mk/bsd.x11.mk Mon Feb 23 00:09:30 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.114 2014/12/30 22:07:21 mrg Exp $
+# $NetBSD: bsd.x11.mk,v 1.115 2015/02/23 00:09:30 jmcneill Exp $
.include bsd.init.mk
@@ -339,6 +339,8 @@ ${_pkg}.pc: ${PKGDIST.${_pkg}}/configure
s,@DRI_DRIVER_DIR@,\\$$\{libdir\}/modules/dri,; \
s,@DRI_PC_REQ_PRIV@,,; \
s,@GLW_LIB@,GLw,; \
+ s,@GBM_PC_REQ_PRIV@,,; \
+ s,@GBM_PC_LIB_PRIV@,,; \
s,@abi_ansic@,0.4,; \
s,@abi_videodrv@,5.0,; \
s,@abi_xinput@,4.0,; \
Added files:
Index: src/external/mit/xorg/lib/libgbm/Makefile
diff -u /dev/null src/external/mit/xorg/lib/libgbm/Makefile:1.1
--- /dev/null Mon Feb 23 00:09:31 2015
+++ src/external/mit/xorg/lib/libgbm/Makefile Mon Feb 23 00:09:30 2015
@@ -0,0 +1,48 @@
+# $NetBSD: Makefile,v 1.1 2015/02/23 00:09:30 jmcneill Exp $
+
+.include bsd.own.mk
+
+LIB= gbm
+
+.PATH: ${X11SRCDIR.MesaLib}/src/gbm/main
+SRCS.main= \
+ backend.c \
+ gbm.c
+
+.PATH: ${X11SRCDIR.MesaLib}/src/gbm/backends/dri
+SRCS.dri= \
+ gbm_dri.c
+
+SRCS= ${SRCS.main} ${SRCS.dri}
+
+CPPFLAGS+= -D_OS_UNIX=1
+CPPFLAGS+= -DHAVE_PTHREAD=1
+CPPFLAGS+= -DDEFAULT_DRIVER_DIR=\${X11USRLIBDIR}/modules/dri\
+CPPFLAGS+= -DMODULEDIR=\${X11USRLIBDIR}/gbm\
+CPPFLAGS+= -I${X11SRCDIR.MesaLib}/include
+CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/loader
+CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/gbm/main
+CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mapi
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
+CFLAGS+=
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: knakahara
Date: Mon Feb 23 04:16:17 UTC 2015
Modified Files:
src/sys/dev/pci: pcireg.h
Log Message:
- add macros to calculate MSI MME and MMC.
- add MSI-X table offset macros.
- fix MSI-X table entry name.
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/dev/pci/pcireg.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/pcireg.h
diff -u src/sys/dev/pci/pcireg.h:1.100 src/sys/dev/pci/pcireg.h:1.101
--- src/sys/dev/pci/pcireg.h:1.100 Mon Nov 24 07:53:43 2014
+++ src/sys/dev/pci/pcireg.h Mon Feb 23 04:16:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pcireg.h,v 1.100 2014/11/24 07:53:43 msaitoh Exp $ */
+/* $NetBSD: pcireg.h,v 1.101 2015/02/23 04:16:17 knakahara Exp $ */
/*
* Copyright (c) 1995, 1996, 1999, 2000
@@ -639,7 +639,9 @@ typedef u_int8_t pci_revision_t;
#define PCI_MSI_CTL_PERVEC_MASK __SHIFTIN(__BIT(8), PCI_MSI_CTL_MASK)
#define PCI_MSI_CTL_64BIT_ADDR __SHIFTIN(__BIT(7), PCI_MSI_CTL_MASK)
#define PCI_MSI_CTL_MME_MASK __SHIFTIN(__BITS(6, 4), PCI_MSI_CTL_MASK)
+#define PCI_MSI_CTL_MME(reg) __SHIFTOUT(reg, PCI_MSI_CTL_MME_MASK)
#define PCI_MSI_CTL_MMC_MASK __SHIFTIN(__BITS(3, 1), PCI_MSI_CTL_MASK)
+#define PCI_MSI_CTL_MMC(reg) __SHIFTOUT(reg, PCI_MSI_CTL_MMC_MASK)
#define PCI_MSI_CTL_MSI_ENABLE __SHIFTIN(__BIT(0), PCI_MSI_CTL_MASK)
/*
@@ -1054,14 +1056,18 @@ typedef u_int8_t pci_revision_t;
#define PCI_MSIX_PBAOFFSET_MASK 0xfff8
#define PCI_MSIX_PBABIR_MASK 0x0007
+#define PCI_MSIX_TABLE_ENTRY_SIZE 16
+#define PCI_MSIX_TABLE_ENTRY_ADDR_LO 0x0
+#define PCI_MSIX_TABLE_ENTRY_ADDR_HI 0x4
+#define PCI_MSIX_TABLE_ENTRY_DATA 0x8
+#define PCI_MSIX_TABLE_ENTRY_VECTCTL 0xc
struct pci_msix_table_entry {
uint32_t pci_msix_addr_lo;
uint32_t pci_msix_addr_hi;
uint32_t pci_msix_value;
- uint32_t pci_msix_vendor_control;
+ uint32_t pci_msix_vector_control;
};
-#define PCI_MSIX_VENDCTL_MASK 0x0001
-
+#define PCI_MSIX_VECTCTL_HWMASK_MASK 0x0001
/*
* Capability ID: 0x12
