CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Sat Jul 9 07:57:53 UTC 2011 Modified Files: src/share/man/man9: bus_dma.9 Log Message: Sort error descriptions. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/share/man/man9/bus_dma.9 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/man9/bus_dma.9 diff -u src/share/man/man9/bus_dma.9:1.56 src/share/man/man9/bus_dma.9:1.57 --- src/share/man/man9/bus_dma.9:1.56 Fri Jul 8 22:38:08 2011 +++ src/share/man/man9/bus_dma.9 Sat Jul 9 07:57:53 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: bus_dma.9,v 1.56 2011/07/08 22:38:08 dyoung Exp $ +.\ $NetBSD: bus_dma.9,v 1.57 2011/07/09 07:57:53 wiz Exp $ .\ .\ Copyright (c) 1996, 1997, 1998, 2001, 2005, 2006 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -330,11 +330,11 @@ Possible error codes include the following: .Pp .Bl -tag -width dmam -compact -.It Er EINVAL -.Fa buflen -is too large for the DMA map. .It Er EFBIG Too many segments. +.It Er EINVAL +.Fa buflen +is too large for the DMA map. .It Er ENOMEM Could not allocate memory for, e.g., a bounce buffer. .El
CVS commit: src/usr.bin/config
Module Name:src
Committed By: matt
Date: Sat Jul 9 08:01:59 UTC 2011
Modified Files:
src/usr.bin/config: main.c
Log Message:
When making the symlink for machine - arch/foo/include
also make foo - arch/foo/include. This allows one to include foo/bar.h
include machine/bar.h which can be handy.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/usr.bin/config/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/config/main.c
diff -u src/usr.bin/config/main.c:1.42 src/usr.bin/config/main.c:1.43
--- src/usr.bin/config/main.c:1.42 Mon Mar 22 14:40:54 2010
+++ src/usr.bin/config/main.c Sat Jul 9 08:01:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.42 2010/03/22 14:40:54 pooka Exp $ */
+/* $NetBSD: main.c,v 1.43 2011/07/09 08:01:58 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -541,6 +541,7 @@
snprintf(buf, sizeof(buf), arch/%s/include, machine);
p = sourcepath(buf);
ret = recreate(p, machine);
+ ret = recreate(p, machine);
free(p);
if (machinearch != NULL) {
CVS commit: src/lib/libc/time
Module Name:src Committed By: plunky Date: Sat Jul 9 09:12:11 UTC 2011 Modified Files: src/lib/libc/time: ctime.3 Log Message: don't indent this bullet list either, it is not required (the text is indented anyway) To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/lib/libc/time/ctime.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/libc/time/ctime.3 diff -u src/lib/libc/time/ctime.3:1.41 src/lib/libc/time/ctime.3:1.42 --- src/lib/libc/time/ctime.3:1.41 Thu Jun 9 12:13:00 2011 +++ src/lib/libc/time/ctime.3 Sat Jul 9 09:12:11 2011 @@ -1,8 +1,8 @@ -.\ $NetBSD: ctime.3,v 1.41 2011/06/09 12:13:00 njoly Exp $ +.\ $NetBSD: ctime.3,v 1.42 2011/07/09 09:12:11 plunky Exp $ .\ .\ XXX: Lincense missing? .\ -.Dd April 12, 2011 +.Dd July 9, 2011 .Dt CTIME 3 .Os .Sh NAME @@ -201,7 +201,7 @@ .Xr time 3 function. The following remarks should be taken into account. -.Bl -bullet -offset indent +.Bl -bullet .It The original values of the .Fa tm_wday
CVS commit: src/sys/dev/dtv
Module Name:src
Committed By: jmcneill
Date: Sat Jul 9 14:46:56 UTC 2011
Added Files:
src/sys/dev/dtv: Makefile dtv_buffer.c dtv_device.c dtv_ioctl.c
dtv_scatter.c dtv_scatter.h dtvif.h dtvio.h dtvio_demux.h
dtvio_frontend.h dtvmodule.h dtvvar.h files.dtv
Log Message:
add digital TV framework which implements a subset of Linux DVB APIs
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/dev/dtv/Makefile src/sys/dev/dtv/dtv_buffer.c \
src/sys/dev/dtv/dtv_device.c src/sys/dev/dtv/dtv_ioctl.c \
src/sys/dev/dtv/dtv_scatter.c src/sys/dev/dtv/dtv_scatter.h \
src/sys/dev/dtv/dtvif.h src/sys/dev/dtv/dtvio.h \
src/sys/dev/dtv/dtvio_demux.h src/sys/dev/dtv/dtvio_frontend.h \
src/sys/dev/dtv/dtvmodule.h src/sys/dev/dtv/dtvvar.h \
src/sys/dev/dtv/files.dtv
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/dev/dtv/Makefile
diff -u /dev/null src/sys/dev/dtv/Makefile:1.1
--- /dev/null Sat Jul 9 14:46:56 2011
+++ src/sys/dev/dtv/Makefile Sat Jul 9 14:46:56 2011
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.1 2011/07/09 14:46:56 jmcneill Exp $
+
+INCSDIR= /usr/include/dev/dtv
+INCS= dtvio.h dtvio_frontend.h dtvio_demux.h
+
+.include bsd.kinc.mk
Index: src/sys/dev/dtv/dtv_buffer.c
diff -u /dev/null src/sys/dev/dtv/dtv_buffer.c:1.1
--- /dev/null Sat Jul 9 14:46:56 2011
+++ src/sys/dev/dtv/dtv_buffer.c Sat Jul 9 14:46:56 2011
@@ -0,0 +1,315 @@
+/* $NetBSD: dtv_buffer.c,v 1.1 2011/07/09 14:46:56 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *must display the following acknowledgement:
+ *This product includes software developed by Jared D. McNeill.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *contributors may be used to endorse or promote products derived
+ *from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: dtv_buffer.c,v 1.1 2011/07/09 14:46:56 jmcneill Exp $);
+
+#include sys/param.h
+#include sys/kernel.h
+#include sys/types.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/vnode.h
+#include sys/poll.h
+#include sys/select.h
+
+#include dev/dtv/dtvvar.h
+
+#define PAGE_ALIGN(a) (((a) + PAGE_SIZE - 1) ~(PAGE_SIZE - 1))
+
+static void
+dtv_buffer_write(struct dtv_softc *sc, const uint8_t *buf, size_t buflen)
+{
+ struct dtv_stream *ds = sc-sc_stream;
+ struct dtv_buffer *db;
+ struct dtv_scatter_io sio;
+ size_t resid = buflen, avail;
+ off_t offset = 0;
+
+ KASSERT(buflen == TS_PKTLEN);
+
+ while (resid 0) {
+ mutex_enter(ds-ds_lock);
+
+ if (SIMPLEQ_EMPTY(ds-ds_ingress)) {
+ aprint_debug_dev(sc-sc_dev,
+ dropping sample (%u)\n, resid);
+ mutex_exit(ds-ds_lock);
+ return;
+ }
+
+ db = SIMPLEQ_FIRST(ds-ds_ingress);
+ avail = min(db-db_length - db-db_bytesused, resid);
+ if (dtv_scatter_io_init(ds-ds_data,
+ db-db_offset + db-db_bytesused, avail, sio)) {
+ dtv_scatter_io_copyin(sio, buf + offset);
+ db-db_bytesused += (avail - sio.sio_resid);
+ offset += (avail - sio.sio_resid);
+ resid -= (avail - sio.sio_resid);
+ }
+
+ if (db-db_bytesused == db-db_length) {
+ SIMPLEQ_REMOVE_HEAD(ds-ds_ingress, db_entries);
+ SIMPLEQ_INSERT_TAIL(ds-ds_egress, db, db_entries);
+ cv_broadcast(ds-ds_sample_cv);
+ selnotify(ds-ds_sel, 0, 0);
+ }
+
+ mutex_exit(ds-ds_lock);
+ }
+}
+
+void
+dtv_submit_payload(device_t self, const struct
CVS commit: src/sys/conf
Module Name:src Committed By: jmcneill Date: Sat Jul 9 14:47:27 UTC 2011 Modified Files: src/sys/conf: majors Log Message: reserve char 200 for dtv To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/conf/majors Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/majors diff -u src/sys/conf/majors:1.55 src/sys/conf/majors:1.56 --- src/sys/conf/majors:1.55 Thu Jan 20 19:10:02 2011 +++ src/sys/conf/majors Sat Jul 9 14:47:27 2011 @@ -1,4 +1,4 @@ -# $NetBSD: majors,v 1.55 2011/01/20 19:10:02 jmcneill Exp $ +# $NetBSD: majors,v 1.56 2011/07/09 14:47:27 jmcneill Exp $ # # Device majors for Machine-Independent drivers. # @@ -45,3 +45,4 @@ device-major rumpblk char 197 block 197 rumpblk device-major npf char 198 npf device-major flash char 199 block 199 flash +device-major dtv char 200dtv
CVS commit: src/sys/conf
Module Name:src Committed By: jmcneill Date: Sat Jul 9 14:48:13 UTC 2011 Modified Files: src/sys/conf: files Log Message: include dtv To generate a diff of this commit: cvs rdiff -u -r1.1018 -r1.1019 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1018 src/sys/conf/files:1.1019 --- src/sys/conf/files:1.1018 Mon Jun 27 11:52:24 2011 +++ src/sys/conf/files Sat Jul 9 14:48:12 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1018 2011/06/27 11:52:24 uch Exp $ +# $NetBSD: files,v 1.1019 2011/07/09 14:48:12 jmcneill Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20100430 @@ -1722,3 +1722,7 @@ # include dev/nand/files.nand +# +# DTV subsystem +# +include dev/dtv/files.dtv
CVS commit: src/etc
Module Name:src
Committed By: jmcneill
Date: Sat Jul 9 14:49:28 UTC 2011
Modified Files:
src/etc: MAKEDEV.tmpl
Log Message:
create /dev/dvb/adapterN/* devices for dtv
To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.139 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.138 src/etc/MAKEDEV.tmpl:1.139
--- src/etc/MAKEDEV.tmpl:1.138 Sat Feb 26 18:07:16 2011
+++ src/etc/MAKEDEV.tmpl Sat Jul 9 14:49:28 2011
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $NetBSD: MAKEDEV.tmpl,v 1.138 2011/02/26 18:07:16 ahoka Exp $
+# $NetBSD: MAKEDEV.tmpl,v 1.139 2011/07/09 14:49:28 jmcneill Exp $
#
# Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -235,6 +235,7 @@
# dpt* DPT/Adaptec EATA RAID management interface
# dpti* DPT/Adaptec I2O RAID management interface
# drm* Direct Rendering Manager interface
+# dtv* Digital TV interface
# fb* PMAX generic framebuffer pseudo-device
# fd file descriptors
# grf* graphics frame buffer device
@@ -745,6 +746,7 @@
makedev putter
makedev drvctl
makedev video
+ makedev dtv
makedev drm0
makedev altmem
makedev zfs
@@ -785,6 +787,10 @@
makedev video0 video1 video2 video3
;;
+dtv)
+ makedev dtv0 dtv1 dtv2 dtv3
+ ;;
+
altmem)
makedev altmem0 altmem1
;;
@@ -1378,6 +1384,15 @@
mkdev video$unit c %video_chr% $unit 666
;;
+dtv*)
+ unit=${i#dtv}
+ makedir dvb 755
+ makedir dvb/adapter$unit 755
+ mkdev dvb/adapter$unit/frontend0 c %dtv_chr% $(($unit + 0)) 666
+ mkdev dvb/adapter$unit/demux0 c %dtv_chr% $(($unit + 16)) 666
+ mkdev dvb/adapter$unit/dvr0 c %dtv_chr% $(($unit + 32)) 666
+ ;;
+
amr*)
unit=${i#amr}
mkdev amr$unit c %amr_chr% $unit
CVS commit: src/sys/compat/linux/arch
Module Name:src
Committed By: christos
Date: Sat Jul 9 14:49:41 UTC 2011
Modified Files:
src/sys/compat/linux/arch/alpha: syscalls.master
src/sys/compat/linux/arch/amd64: syscalls.master
src/sys/compat/linux/arch/arm: syscalls.master
src/sys/compat/linux/arch/i386: syscalls.master
src/sys/compat/linux/arch/m68k: syscalls.master
src/sys/compat/linux/arch/mips: syscalls.master
src/sys/compat/linux/arch/powerpc: syscalls.master
Log Message:
the first argument of {g,s}etitimer() is int not u_int.
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/compat/linux/arch/alpha/syscalls.master
cvs rdiff -u -r1.37 -r1.38 src/sys/compat/linux/arch/amd64/syscalls.master
cvs rdiff -u -r1.46 -r1.47 src/sys/compat/linux/arch/arm/syscalls.master
cvs rdiff -u -r1.105 -r1.106 src/sys/compat/linux/arch/i386/syscalls.master
cvs rdiff -u -r1.71 -r1.72 src/sys/compat/linux/arch/m68k/syscalls.master
cvs rdiff -u -r1.41 -r1.42 src/sys/compat/linux/arch/mips/syscalls.master
cvs rdiff -u -r1.48 -r1.49 src/sys/compat/linux/arch/powerpc/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/arch/alpha/syscalls.master
diff -u src/sys/compat/linux/arch/alpha/syscalls.master:1.74 src/sys/compat/linux/arch/alpha/syscalls.master:1.75
--- src/sys/compat/linux/arch/alpha/syscalls.master:1.74 Mon May 30 13:50:31 2011
+++ src/sys/compat/linux/arch/alpha/syscalls.master Sat Jul 9 10:49:40 2011
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.74 2011/05/30 17:50:31 alnsn Exp $
+ $NetBSD: syscalls.master,v 1.75 2011/07/09 14:49:40 christos Exp $
;
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -183,7 +183,7 @@
80 NOARGS { int|sys||setgroups(int gidsetsize, const gid_t *gidset); }
81 UNIMPL
82 UNIMPL setpgrp
-83 NODEF { int|osf1_sys||setitimer(u_int which, \
+83 NODEF { int|osf1_sys||setitimer(int which, \
struct osf1_itimerval *itv, \
struct osf1_itimerval *oitv); }
84 UNIMPL
Index: src/sys/compat/linux/arch/amd64/syscalls.master
diff -u src/sys/compat/linux/arch/amd64/syscalls.master:1.37 src/sys/compat/linux/arch/amd64/syscalls.master:1.38
--- src/sys/compat/linux/arch/amd64/syscalls.master:1.37 Mon May 30 13:50:31 2011
+++ src/sys/compat/linux/arch/amd64/syscalls.master Sat Jul 9 10:49:40 2011
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.37 2011/05/30 17:50:31 alnsn Exp $
+ $NetBSD: syscalls.master,v 1.38 2011/07/09 14:49:40 christos Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -133,10 +133,10 @@
35 STD { int|linux_sys||nanosleep( \
const struct linux_timespec *rqtp, \
struct linux_timespec *rmtp); }
-36 NOARGS { int|compat_50_sys||getitimer(u_int which, \
+36 NOARGS { int|compat_50_sys||getitimer(int which, \
struct itimerval50 *itv); }
37 STD { int|linux_sys||alarm(unsigned int secs); }
-38 NOARGS { int|compat_50_sys||setitimer(u_int which, \
+38 NOARGS { int|compat_50_sys||setitimer(int which, \
struct itimerval50 *itv, \
struct itimerval50 *oitv); }
39 STD { pid_t|sys||getpid(void); }
@@ -174,7 +174,7 @@
int optname, void *optval, int *optlen); }
56 STD { int|linux_sys||clone(int flags, void *stack, \
void *parent_tidptr, void *child_tidptr, void *tls); }
-57 NOARGS { int|sys||fork(void); }
+57 STD { int|linux_sys||fork(void); }
58 NOARGS { int|sys|14|vfork(void); }
59 NOARGS { int|sys||execve(const char *path, char **argp, \
char **envp); }
Index: src/sys/compat/linux/arch/arm/syscalls.master
diff -u src/sys/compat/linux/arch/arm/syscalls.master:1.46 src/sys/compat/linux/arch/arm/syscalls.master:1.47
--- src/sys/compat/linux/arch/arm/syscalls.master:1.46 Mon May 30 13:50:31 2011
+++ src/sys/compat/linux/arch/arm/syscalls.master Sat Jul 9 10:49:40 2011
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.46 2011/05/30 17:50:31 alnsn Exp $
+ $NetBSD: syscalls.master,v 1.47 2011/07/09 14:49:40 christos Exp $
; Derived from sys/compat/linux/arch/*/syscalls.master
; and from Linux 2.4.12 arch/arm/kernel/calls.S
@@ -194,10 +194,10 @@
101 UNIMPL
102 STD { int|linux_sys||socketcall(int what, void *args); }
103 UNIMPL syslog
-104 NOARGS { int|compat_50_sys||setitimer(u_int which, \
+104 NOARGS { int|compat_50_sys||setitimer(int which, \
struct itimerval50 *itv, \
struct itimerval50 *oitv); }
-105 NOARGS { int|compat_50_sys||getitimer(u_int which, \
+105 NOARGS { int|compat_50_sys||getitimer(int which, \
struct itimerval50 *itv); }
106 STD { int|linux_sys||stat(const char *path, \
struct linux_stat *sp); }
Index: src/sys/compat/linux/arch/i386/syscalls.master
diff -u src/sys/compat/linux/arch/i386/syscalls.master:1.105 src/sys/compat/linux/arch/i386/syscalls.master:1.106
--- src/sys/compat/linux/arch/i386/syscalls.master:1.105 Mon May 30 13:50:31 2011
+++
CVS commit: src/lib/librefuse
Module Name:src Committed By: tron Date: Sat Jul 9 14:50:01 UTC 2011 Modified Files: src/lib/librefuse: refuse.c Log Message: Don't ignore userdata argument in fuse_main_real. This can crash a FUSE file-system that passes a non-NULL argument here. To generate a diff of this commit: cvs rdiff -u -r1.92 -r1.93 src/lib/librefuse/refuse.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/librefuse/refuse.c diff -u src/lib/librefuse/refuse.c:1.92 src/lib/librefuse/refuse.c:1.93 --- src/lib/librefuse/refuse.c:1.92 Thu Mar 5 01:21:57 2009 +++ src/lib/librefuse/refuse.c Sat Jul 9 14:50:00 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: refuse.c,v 1.92 2009/03/05 01:21:57 msaitoh Exp $ */ +/* $NetBSD: refuse.c,v 1.93 2011/07/09 14:50:00 tron Exp $ */ /* * Copyright © 2007 Alistair Crooks. All rights reserved. @@ -31,7 +31,7 @@ #include sys/cdefs.h #if !defined(lint) -__RCSID($NetBSD: refuse.c,v 1.92 2009/03/05 01:21:57 msaitoh Exp $); +__RCSID($NetBSD: refuse.c,v 1.93 2011/07/09 14:50:00 tron Exp $); #endif /* !lint */ #include sys/types.h @@ -1221,8 +1221,8 @@ int multithreaded; int fd; - fuse = fuse_setup(argc, argv, ops, size, mountpoint, multithreaded, - fd); + fuse = fuse_setup_real(argc, argv, ops, size, mountpoint, + multithreaded, fd, userdata); return fuse_loop(fuse); }
CVS commit: src
Module Name:src Committed By: jmcneill Date: Sat Jul 9 14:52:03 UTC 2011 Modified Files: src/distrib/sets/lists/comp: mi src/sys/dev: Makefile Log Message: install dtvio.h, dtvio_demux.h, dtvio_frontend.h To generate a diff of this commit: cvs rdiff -u -r1.1642 -r1.1643 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.30 -r1.31 src/sys/dev/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1642 src/distrib/sets/lists/comp/mi:1.1643 --- src/distrib/sets/lists/comp/mi:1.1642 Fri Jul 8 19:09:02 2011 +++ src/distrib/sets/lists/comp/mi Sat Jul 9 14:52:02 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1642 2011/07/08 19:09:02 dyoung Exp $ +# $NetBSD: mi,v 1.1643 2011/07/09 14:52:02 jmcneill Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -266,6 +266,9 @@ ./usr/include/dev/dec/mcclockvar.h comp-obsolete obsolete ./usr/include/dev/dm/netbsd-dm.h comp-c-include ./usr/include/dev/dmover/dmover_io.h comp-c-include +./usr/include/dev/dtv/dtvio.h comp-c-include +./usr/include/dev/dtv/dtvio_demux.h comp-c-include +./usr/include/dev/dtv/dtvio_frontend.h comp-c-include ./usr/include/dev/eisa/ahbreg.h comp-obsolete obsolete ./usr/include/dev/eisa/eisadevs.h comp-obsolete obsolete ./usr/include/dev/eisa/eisadevs_data.h comp-obsolete obsolete Index: src/sys/dev/Makefile diff -u src/sys/dev/Makefile:1.30 src/sys/dev/Makefile:1.31 --- src/sys/dev/Makefile:1.30 Sat Dec 5 11:34:37 2009 +++ src/sys/dev/Makefile Sat Jul 9 14:52:03 2011 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.30 2009/12/05 11:34:37 haad Exp $ +# $NetBSD: Makefile,v 1.31 2011/07/09 14:52:03 jmcneill Exp $ -SUBDIR= apm ata bluetooth dec dm dmover hpc i2o ic ieee1394 ir isa microcode \ - ofw pci pckbport pcmcia pud putter raidframe sbus scsipi sun \ - tc usb vme wscons +SUBDIR= apm ata bluetooth dec dm dmover dtv hpc i2o ic ieee1394 ir isa \ + microcode ofw pci pckbport pcmcia pud putter raidframe sbus scsipi \ + sun tc usb vme wscons INCSDIR= /usr/include/dev
CVS commit: src/etc/mtree
Module Name:src Committed By: jmcneill Date: Sat Jul 9 14:55:44 UTC 2011 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: add /usr/include/dev/dtv To generate a diff of this commit: cvs rdiff -u -r1.88 -r1.89 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.88 src/etc/mtree/NetBSD.dist.base:1.89 --- src/etc/mtree/NetBSD.dist.base:1.88 Fri Jul 1 02:10:07 2011 +++ src/etc/mtree/NetBSD.dist.base Sat Jul 9 14:55:44 2011 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.88 2011/07/01 02:10:07 mrg Exp $ +# $NetBSD: NetBSD.dist.base,v 1.89 2011/07/09 14:55:44 jmcneill Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -98,6 +98,7 @@ ./usr/include/dev/ata ./usr/include/dev/dec ./usr/include/dev/dmover +./usr/include/dev/dtv ./usr/include/dev/hpc ./usr/include/dev/i2o ./usr/include/dev/ic
CVS commit: src
Module Name:src Committed By: jmcneill Date: Sat Jul 9 14:56:44 UTC 2011 Modified Files: src/distrib/sets/lists/modules: mi src/sys/modules: Makefile Log Message: build dtv module To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.73 -r1.74 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/modules/mi diff -u src/distrib/sets/lists/modules/mi:1.21 src/distrib/sets/lists/modules/mi:1.22 --- src/distrib/sets/lists/modules/mi:1.21 Sat Feb 26 18:07:15 2011 +++ src/distrib/sets/lists/modules/mi Sat Jul 9 14:56:43 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.21 2011/02/26 18:07:15 ahoka Exp $ +# $NetBSD: mi,v 1.22 2011/07/09 14:56:43 jmcneill Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -34,6 +34,8 @@ ./@MODULEDIR@/dm/dm.kmod base-kernel-modules lvm,kmod ./@MODULEDIR@/dtracebase-kernel-modules kmod,dtrace ./@MODULEDIR@/dtrace/dtrace.kmod base-kernel-modules kmod,dtrace +./@MODULEDIR@/dtvbase-kernel-modules kmod +./@MODULEDIR@/dtv/dtv.kmod base-kernel-modules kmod ./@MODULEDIR@/efsbase-kernel-modules kmod ./@MODULEDIR@/efs/efs.kmod base-kernel-modules kmod ./@MODULEDIR@/exec_script base-kernel-modules kmod Index: src/sys/modules/Makefile diff -u src/sys/modules/Makefile:1.73 src/sys/modules/Makefile:1.74 --- src/sys/modules/Makefile:1.73 Wed Jun 15 09:45:59 2011 +++ src/sys/modules/Makefile Sat Jul 9 14:56:43 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.73 2011/06/15 09:45:59 mrg Exp $ +# $NetBSD: Makefile,v 1.74 2011/07/09 14:56:43 jmcneill Exp $ .include bsd.own.mk @@ -15,6 +15,7 @@ SUBDIR+= compat SUBDIR+= compat_ossaudio SUBDIR+= coredump +SUBDIR+= dtv SUBDIR+= efs SUBDIR+= ext2fs SUBDIR+= exec_script
CVS commit: src/sys/modules/dtv
Module Name:src
Committed By: jmcneill
Date: Sat Jul 9 14:53:37 UTC 2011
Added Files:
src/sys/modules/dtv: Makefile dtv.ioconf
Log Message:
module glue for dtv
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/modules/dtv/Makefile \
src/sys/modules/dtv/dtv.ioconf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/modules/dtv/Makefile
diff -u /dev/null src/sys/modules/dtv/Makefile:1.1
--- /dev/null Sat Jul 9 14:53:37 2011
+++ src/sys/modules/dtv/Makefile Sat Jul 9 14:53:37 2011
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.1 2011/07/09 14:53:37 jmcneill Exp $
+
+.include ../Makefile.inc
+
+.PATH: ${S}/dev/dtv
+
+KMOD= dtv
+IOCONF= dtv.ioconf
+SRCS= dtv_buffer.c \
+ dtv_device.c \
+ dtv_ioctl.c \
+ dtv_scatter.c
+
+WARNS= 4
+
+.include bsd.kmodule.mk
Index: src/sys/modules/dtv/dtv.ioconf
diff -u /dev/null src/sys/modules/dtv/dtv.ioconf:1.1
--- /dev/null Sat Jul 9 14:53:37 2011
+++ src/sys/modules/dtv/dtv.ioconf Sat Jul 9 14:53:37 2011
@@ -0,0 +1,9 @@
+# $NetBSD: dtv.ioconf,v 1.1 2011/07/09 14:53:37 jmcneill Exp $
+
+ioconf dtv
+
+include conf/files
+include dev/dtv/files.dtv
+
+pseudo-root dtvbus*
+dtv* at dtvbus?
CVS commit: src/common/lib/libc/arch/m68k/string
Module Name:src Committed By: mrg Date: Sat Jul 9 14:57:29 UTC 2011 Modified Files: src/common/lib/libc/arch/m68k/string: ffs.S Log Message: add a weak alias for __ffssi2 To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/arch/m68k/string/ffs.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/m68k/string/ffs.S diff -u src/common/lib/libc/arch/m68k/string/ffs.S:1.1 src/common/lib/libc/arch/m68k/string/ffs.S:1.2 --- src/common/lib/libc/arch/m68k/string/ffs.S:1.1 Tue Dec 20 19:28:49 2005 +++ src/common/lib/libc/arch/m68k/string/ffs.S Sat Jul 9 14:57:29 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ffs.S,v 1.1 2005/12/20 19:28:49 christos Exp $ */ +/* $NetBSD: ffs.S,v 1.2 2011/07/09 14:57:29 mrg Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -39,12 +39,14 @@ #if 0 RCSID(from: @(#)ffs.s 5.1 (Berkeley) 5/12/90) #else - RCSID($NetBSD: ffs.S,v 1.1 2005/12/20 19:28:49 christos Exp $) + RCSID($NetBSD: ffs.S,v 1.2 2011/07/09 14:57:29 mrg Exp $) #endif #endif /* LIBC_SCCS and not lint */ /* bit = ffs(value) */ +WEAK_ALIAS(__ffssi2,ffs) + #ifndef __mc68010__ ENTRY(ffs)
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: mrg Date: Sat Jul 9 14:57:48 UTC 2011 Modified Files: src/distrib/sets/lists/comp: md.sparc md.sparc64 Log Message: add gcc-4.5/tgmath.h To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.74 src/distrib/sets/lists/comp/md.sparc cvs rdiff -u -r1.106 -r1.107 src/distrib/sets/lists/comp/md.sparc64 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/md.sparc diff -u src/distrib/sets/lists/comp/md.sparc:1.73 src/distrib/sets/lists/comp/md.sparc:1.74 --- src/distrib/sets/lists/comp/md.sparc:1.73 Fri May 20 21:42:48 2011 +++ src/distrib/sets/lists/comp/md.sparc Sat Jul 9 14:57:48 2011 @@ -1,4 +1,5 @@ -# $NetBSD: md.sparc,v 1.73 2011/05/20 21:42:48 nakayama Exp $ +# $NetBSD: md.sparc,v 1.74 2011/07/09 14:57:48 mrg Exp $ +./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45 ./usr/include/ieeefp.hcomp-c-include ./usr/include/sparccomp-c-include ./usr/include/sparc/_G_config.h comp-obsolete obsolete Index: src/distrib/sets/lists/comp/md.sparc64 diff -u src/distrib/sets/lists/comp/md.sparc64:1.106 src/distrib/sets/lists/comp/md.sparc64:1.107 --- src/distrib/sets/lists/comp/md.sparc64:1.106 Sun Jul 3 22:47:25 2011 +++ src/distrib/sets/lists/comp/md.sparc64 Sat Jul 9 14:57:48 2011 @@ -1,4 +1,5 @@ -# $NetBSD: md.sparc64,v 1.106 2011/07/03 22:47:25 mrg Exp $ +# $NetBSD: md.sparc64,v 1.107 2011/07/09 14:57:48 mrg Exp $ +./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45 ./usr/include/ieeefp.hcomp-c-include ./usr/include/sparccomp-c-include ./usr/include/sparc/_G_config.h comp-obsolete obsolete
CVS commit: src/external/gpl3/gcc/dist/gcc
Module Name:src
Committed By: mrg
Date: Sat Jul 9 14:58:34 UTC 2011
Modified Files:
src/external/gpl3/gcc/dist/gcc: config.gcc
Log Message:
take MASK_64BIT out of the default target flags.
how this did not break all sorts of stuff i don't know!
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/dist/gcc/config.gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/config.gcc
diff -u src/external/gpl3/gcc/dist/gcc/config.gcc:1.7 src/external/gpl3/gcc/dist/gcc/config.gcc:1.8
--- src/external/gpl3/gcc/dist/gcc/config.gcc:1.7 Sun Jul 3 13:05:19 2011
+++ src/external/gpl3/gcc/dist/gcc/config.gcc Sat Jul 9 14:58:34 2011
@@ -1762,12 +1762,10 @@
esac
;;
mips64*-*-netbsd*) # NetBSD/mips64, either endian.
- target_cpu_default=MASK_ABICALLS|MASK_64BIT|MASK_FLOAT64|MASK_SOFT_FLOAT_ABI
+ target_cpu_default=MASK_ABICALLS|MASK_FLOAT64|MASK_SOFT_FLOAT_ABI
tm_file=elfos.h ${tm_file} mips/elf.h netbsd.h netbsd-elf.h mips/netbsd.h mips/netbsd64.h
tmake_file=${tmake_file} mips/t-netbsd64
-# tm_defines=${tm_defines} MIPS_ISA_DEFAULT=64
tm_defines=${tm_defines} MIPS_ABI_DEFAULT=ABI_N32
-# tm_defines=${tm_defines} MIPS_CPU_STRING_DEFAULT=\\\mips64\\\
gnu_ld=yes
gas=yes
;;
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jmcneill Date: Sat Jul 9 15:02:03 UTC 2011 Modified Files: src/sys/arch/i386/conf: ALL Log Message: add dtv at dtvbus To generate a diff of this commit: cvs rdiff -u -r1.308 -r1.309 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.308 src/sys/arch/i386/conf/ALL:1.309 --- src/sys/arch/i386/conf/ALL:1.308 Tue Jun 14 13:59:23 2011 +++ src/sys/arch/i386/conf/ALL Sat Jul 9 15:02:03 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.308 2011/06/14 13:59:23 jruoho Exp $ +# $NetBSD: ALL,v 1.309 2011/07/09 15:02:03 jmcneill Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident ALL-$Revision: 1.308 $ +#ident ALL-$Revision: 1.309 $ maxusers 64 # estimated number of users @@ -1487,6 +1487,7 @@ uvideo* at uhub? # USB Video Class capture devices auvitek* at uhub? # Auvitek AU0828 video capture devices video* at videobus? +dtv* at dtvbus? # TV cards
CVS commit: src/sys/arch/mac68k/dev
Module Name:src
Committed By: mrg
Date: Sat Jul 9 15:02:15 UTC 2011
Modified Files:
src/sys/arch/mac68k/dev: mac68k5380.c
Log Message:
avoid inconsistent inline usage to appease gcc 4.5.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/mac68k/dev/mac68k5380.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/mac68k/dev/mac68k5380.c
diff -u src/sys/arch/mac68k/dev/mac68k5380.c:1.44 src/sys/arch/mac68k/dev/mac68k5380.c:1.45
--- src/sys/arch/mac68k/dev/mac68k5380.c:1.44 Sat Dec 24 23:24:00 2005
+++ src/sys/arch/mac68k/dev/mac68k5380.c Sat Jul 9 15:02:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mac68k5380.c,v 1.44 2005/12/24 23:24:00 perry Exp $ */
+/* $NetBSD: mac68k5380.c,v 1.45 2011/07/09 15:02:15 mrg Exp $ */
/*
* Copyright (c) 1995 Allen Briggs
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mac68k5380.c,v 1.44 2005/12/24 23:24:00 perry Exp $);
+__KERNEL_RCSID(0, $NetBSD: mac68k5380.c,v 1.45 2011/07/09 15:02:15 mrg Exp $);
#include sys/param.h
#include sys/systm.h
@@ -138,14 +138,14 @@
static void ncr5380_drq_intr(void *);
static void do_ncr5380_drq_intr(void *);
-static inline void scsi_clr_ipend(void);
-static void scsi_mach_init(struct ncr_softc *);
-static int machine_match(struct device *, struct cfdata *, void *,
- struct cfdriver *);
-static inline int pdma_ready(void);
-static int transfer_pdma(u_char *, u_char *, u_long *);
+static void scsi_clr_ipend(void);
+static void scsi_mach_init(struct ncr_softc *);
+static int machine_match(struct device *, struct cfdata *, void *,
+ struct cfdriver *);
+static int pdma_ready(void);
+static int transfer_pdma(u_char *, u_char *, u_long *);
-static inline void
+static void
scsi_clr_ipend(void)
{
int tmp;
@@ -266,7 +266,7 @@
}
#endif
-static inline int
+static int
pdma_ready(void)
{
#if USE_PDMA
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jmcneill Date: Sat Jul 9 15:02:44 UTC 2011 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: add dtv at dtvbus To generate a diff of this commit: cvs rdiff -u -r1.1035 -r1.1036 src/sys/arch/i386/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/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1035 src/sys/arch/i386/conf/GENERIC:1.1036 --- src/sys/arch/i386/conf/GENERIC:1.1035 Sun Jul 3 10:40:16 2011 +++ src/sys/arch/i386/conf/GENERIC Sat Jul 9 15:02:43 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1035 2011/07/03 10:40:16 bouyer Exp $ +# $NetBSD: GENERIC,v 1.1036 2011/07/09 15:02:43 jmcneill Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.1035 $ +#ident GENERIC-$Revision: 1.1036 $ maxusers 64 # estimated number of users @@ -1423,7 +1423,8 @@ pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam uvideo* at uhub? # USB Video Class capture devices auvitek* at uhub? # Auvitek AU0828 video capture devices -video* at videobus? +video* at videobus? +dtv* at dtvbus? # TV cards
CVS commit: src/sys/arch/sparc/sparc
Module Name:src
Committed By: mrg
Date: Sat Jul 9 15:02:49 UTC 2011
Modified Files:
src/sys/arch/sparc/sparc: db_interface.c
Log Message:
avoid array bounds violation and use fr_fp and fr_pc.
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/sparc/sparc/db_interface.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/sparc/sparc/db_interface.c
diff -u src/sys/arch/sparc/sparc/db_interface.c:1.88 src/sys/arch/sparc/sparc/db_interface.c:1.89
--- src/sys/arch/sparc/sparc/db_interface.c:1.88 Mon Feb 14 03:18:11 2011
+++ src/sys/arch/sparc/sparc/db_interface.c Sat Jul 9 15:02:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.88 2011/02/14 03:18:11 mrg Exp $ */
+/* $NetBSD: db_interface.c,v 1.89 2011/07/09 15:02:49 mrg Exp $ */
/*
* Mach Operating System
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: db_interface.c,v 1.88 2011/02/14 03:18:11 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_interface.c,v 1.89 2011/07/09 15:02:49 mrg Exp $);
#include opt_ddb.h
#include opt_kgdb.h
@@ -165,8 +165,8 @@
{ i3, dbregfr(arg[3]), db_sparc_regop, },
{ i4, dbregfr(arg[4]), db_sparc_regop, },
{ i5, dbregfr(arg[5]), db_sparc_regop, },
- { i6, dbregfr(arg[6]), db_sparc_regop, },
- { i7, dbregfr(arg[7]), db_sparc_regop, },
+ { i6, dbregfr(fp), db_sparc_regop, },
+ { i7, dbregfr(pc), db_sparc_regop, },
};
const struct db_variable * const db_eregs =
db_regs + sizeof(db_regs)/sizeof(db_regs[0]);
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: mrg Date: Sat Jul 9 15:03:35 UTC 2011 Modified Files: src/sys/arch/sparc64/sparc64: autoconf.c Log Message: apply some (uintptr_t) between pointer and int assignments. To generate a diff of this commit: cvs rdiff -u -r1.182 -r1.183 src/sys/arch/sparc64/sparc64/autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/sparc64/autoconf.c diff -u src/sys/arch/sparc64/sparc64/autoconf.c:1.182 src/sys/arch/sparc64/sparc64/autoconf.c:1.183 --- src/sys/arch/sparc64/sparc64/autoconf.c:1.182 Fri Jul 1 18:49:24 2011 +++ src/sys/arch/sparc64/sparc64/autoconf.c Sat Jul 9 15:03:35 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.182 2011/07/01 18:49:24 dyoung Exp $ */ +/* $NetBSD: autoconf.c,v 1.183 2011/07/09 15:03:35 mrg Exp $ */ /* * Copyright (c) 1996 @@ -48,7 +48,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.182 2011/07/01 18:49:24 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.183 2011/07/09 15:03:35 mrg Exp $); #include opt_ddb.h #include opt_kgdb.h @@ -1088,7 +1088,7 @@ gfb_cb.gcc_cookie = (void *)(intptr_t)console_instance; gfb_cb.gcc_set_mapreg = of_set_palette; - cmap_cb = (uint64_t)gfb_cb; + cmap_cb = (uint64_t)(uintptr_t)gfb_cb; prop_dictionary_set_uint64(dict, cmap_callback, cmap_cb); }
CVS commit: src/sys/arch/sun3/conf
Module Name:src
Committed By: mrg
Date: Sat Jul 9 15:04:06 UTC 2011
Modified Files:
src/sys/arch/sun3/conf: Makefile.sun3
Log Message:
fix previous and use a correct make construct
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/sys/arch/sun3/conf/Makefile.sun3
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/sun3/conf/Makefile.sun3
diff -u src/sys/arch/sun3/conf/Makefile.sun3:1.102 src/sys/arch/sun3/conf/Makefile.sun3:1.103
--- src/sys/arch/sun3/conf/Makefile.sun3:1.102 Fri Jul 8 09:34:51 2011
+++ src/sys/arch/sun3/conf/Makefile.sun3 Sat Jul 9 15:04:06 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sun3,v 1.102 2011/07/08 09:34:51 mrg Exp $
+# $NetBSD: Makefile.sun3,v 1.103 2011/07/09 15:04:06 mrg Exp $
# Makefile for NetBSD
#
@@ -33,7 +33,7 @@
##
CPPFLAGS+= -Dsun3
CFLAGS+= ${CMACHFLAGS} -fno-defer-pop
-.if defined(HAVE_GCC) ${HAVE_GCC} == 45
+.if defined(HAVE_GCC) ${HAVE_GCC} != 45
CFLAGS+= -msoft-float
.endif
AFLAGS+= -x assembler-with-cpp
CVS commit: src/sys/arch/x68k/stand/libsa
Module Name:src Committed By: mrg Date: Sat Jul 9 15:04:35 UTC 2011 Modified Files: src/sys/arch/x68k/stand/libsa: sdcd.c Log Message: don't assign sc-sc_partinfo.size to itself. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/x68k/stand/libsa/sdcd.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/stand/libsa/sdcd.c diff -u src/sys/arch/x68k/stand/libsa/sdcd.c:1.9 src/sys/arch/x68k/stand/libsa/sdcd.c:1.10 --- src/sys/arch/x68k/stand/libsa/sdcd.c:1.9 Mon Apr 11 14:00:02 2011 +++ src/sys/arch/x68k/stand/libsa/sdcd.c Sat Jul 9 15:04:35 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: sdcd.c,v 1.9 2011/04/11 14:00:02 tsutsui Exp $ */ +/* $NetBSD: sdcd.c,v 1.10 2011/07/09 15:04:35 mrg Exp $ */ /* * Copyright (c) 2001 MINOURA Makoto. @@ -339,7 +339,7 @@ sc = alloc(sizeof(struct sdcd_softc)); current_npart = 3; sc-sc_part = 0; - sc-sc_partinfo.size = sc-sc_partinfo.size = current_devsize; + sc-sc_partinfo.size = current_devsize; sc-sc_blocksize = current_blklen 9; f-f_devdata = sc; return 0;
CVS commit: src/share/man/man4
Module Name:src Committed By: jmcneill Date: Sat Jul 9 15:06:49 UTC 2011 Modified Files: src/share/man/man4: auvitek.4 Log Message: This driver now supports digital capture, so remove the note in the BUGS section. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/auvitek.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/auvitek.4 diff -u src/share/man/man4/auvitek.4:1.3 src/share/man/man4/auvitek.4:1.4 --- src/share/man/man4/auvitek.4:1.3 Tue Dec 28 04:03:58 2010 +++ src/share/man/man4/auvitek.4 Sat Jul 9 15:06:49 2011 @@ -1,6 +1,6 @@ -.\ $NetBSD: auvitek.4,v 1.3 2010/12/28 04:03:58 jmcneill Exp $ +.\ $NetBSD: auvitek.4,v 1.4 2011/07/09 15:06:49 jmcneill Exp $ .\ -.\ Copyright (c) 2010 Jared D. McNeill jmcne...@invisible.ca +.\ Copyright (c) 2010, 2011 Jared D. McNeill jmcne...@invisible.ca .\ All rights reserved. .\ .\ Redistribution and use in source and binary forms, with or without @@ -24,7 +24,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd December 27, 2010 +.Dd July 9, 2011 .Dt AUVITEK 4 .Os .Sh NAME @@ -32,6 +32,7 @@ .Nd Auvitek AU0828 video capture device driver .Sh SYNOPSIS .Cd auvitek* at uhub? +.Cd dtv* at dtvbus? .Cd video* at videobus? .Cd uaudio* at auvitek? .Cd audio* at uaudio? @@ -78,6 +79,7 @@ package to function properly. .Sh SEE ALSO .Xr audio 4 , +.Xr dtv 4 , .Xr ehci 4 , .Xr uaudio 4 , .Xr video 4 , @@ -87,5 +89,3 @@ .Nm device driver appeared in .Nx 6.0 . -.Sh BUGS -Digital capture is not supported.
CVS commit: src/sys/modules/auvitek
Module Name:src Committed By: jmcneill Date: Sat Jul 9 15:08:54 UTC 2011 Modified Files: src/sys/modules/auvitek: Makefile Log Message: build auvitek_dtv.c too To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/modules/auvitek/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/auvitek/Makefile diff -u src/sys/modules/auvitek/Makefile:1.1 src/sys/modules/auvitek/Makefile:1.2 --- src/sys/modules/auvitek/Makefile:1.1 Mon Dec 27 15:43:41 2010 +++ src/sys/modules/auvitek/Makefile Sat Jul 9 15:08:54 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2010/12/27 15:43:41 jmcneill Exp $ +# $NetBSD: Makefile,v 1.2 2011/07/09 15:08:54 jmcneill Exp $ .include ../Makefile.inc @@ -6,7 +6,12 @@ KMOD= auvitek IOCONF= auvitek.ioconf -SRCS= auvitek.c auvitek_audio.c auvitek_board.c auvitek_i2c.c auvitek_video.c +SRCS= auvitek.c \ + auvitek_audio.c \ + auvitek_board.c \ + auvitek_dtv.c \ + auvitek_i2c.c \ + auvitek_video.c WARNS= 4
CVS commit: src/sys/arch/cobalt/stand/boot
Module Name:src
Committed By: matt
Date: Sat Jul 9 15:50:38 UTC 2011
Modified Files:
src/sys/arch/cobalt/stand/boot: Makefile
Log Message:
Use TOOL_GZIP
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/cobalt/stand/boot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/cobalt/stand/boot/Makefile
diff -u src/sys/arch/cobalt/stand/boot/Makefile:1.23 src/sys/arch/cobalt/stand/boot/Makefile:1.24
--- src/sys/arch/cobalt/stand/boot/Makefile:1.23 Sun Feb 20 07:54:11 2011
+++ src/sys/arch/cobalt/stand/boot/Makefile Sat Jul 9 15:50:38 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2011/02/20 07:54:11 matt Exp $
+# $NetBSD: Makefile,v 1.24 2011/07/09 15:50:38 matt Exp $
NOMAN= # defined
@@ -109,7 +109,7 @@
${PROG}: ${LDSCRIPT} ${OBJS} ${LIBS}
${LD} ${LINKFORMAT} -Map ${PROG}.map -N -x -Ttext ${LOAD_ADDRESS} \
-T ${LDSCRIPT} -e start -o ${PROG} ${OBJS} ${LIBS}
- gzip -c9 ${PROG} ${PROG}.gz
+ ${TOOL_GZIP} -c9 ${PROG} ${PROG}.gz
@${SIZE} ${PROG}
CLEANFILES+= ${PROG}.map ${PROG}.elf ${PROG}.gz
CVS commit: src/doc
Module Name:src Committed By: jmcneill Date: Sat Jul 9 15:53:38 UTC 2011 Modified Files: src/doc: CHANGES Log Message: dtv(4): Add digital TV framework. auvitek(4): Add digital capture support. To generate a diff of this commit: cvs rdiff -u -r1.1575 -r1.1576 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/CHANGES diff -u src/doc/CHANGES:1.1575 src/doc/CHANGES:1.1576 --- src/doc/CHANGES:1.1575 Thu Jul 7 05:09:11 2011 +++ src/doc/CHANGES Sat Jul 9 15:53:38 2011 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1575 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1576 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -1059,3 +1059,5 @@ less(1): Import version 444. [tron 20110703] mips: Rework Atheros MIPS-based SoC support. Add initial support for AR71xx (24K) and AR9344 (74K) SoCs. + dtv(4): Add digital TV framework. [jmcneill 20110709] + auvitek(4): Add digital capture support. [jmcneill 20110709]
CVS commit: src/sys/arch/mips/pci
Module Name:src
Committed By: matt
Date: Sat Jul 9 15:57:40 UTC 2011
Added Files:
src/sys/arch/mips/pci: pciide_machdep.c
Log Message:
Add a common version of this for those port which use the generic mips
machine/pci_machdep.h
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/mips/pci/pciide_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/arch/mips/pci/pciide_machdep.c
diff -u /dev/null src/sys/arch/mips/pci/pciide_machdep.c:1.1
--- /dev/null Sat Jul 9 15:57:40 2011
+++ src/sys/arch/mips/pci/pciide_machdep.c Sat Jul 9 15:57:39 2011
@@ -0,0 +1,64 @@
+/* $NetBSD: pciide_machdep.c,v 1.1 2011/07/09 15:57:39 matt Exp $ */
+
+/*
+ * Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *must display the following acknowledgement:
+ * This product includes software developed by Christopher G. Demetriou
+ * for the NetBSD Project.
+ * 4. The name of the author may not be used to endorse or promote products
+ *derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * PCI IDE controller driver (malta machine-dependent portion).
+ *
+ * Author: Christopher G. Demetriou, March 2, 1998 (derived from NetBSD
+ * sys/dev/pci/ppb.c, revision 1.16).
+ *
+ * See PCI IDE Controller Specification, Revision 1.0 3/4/94 from the
+ * PCI SIG.
+ */
+
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: pciide_machdep.c,v 1.1 2011/07/09 15:57:39 matt Exp $);
+
+#include sys/param.h
+#include sys/device.h
+
+#include dev/pci/pcireg.h
+#include dev/pci/pcivar.h
+#include dev/pci/pciidereg.h
+#include dev/pci/pciidevar.h
+
+void *
+pciide_machdep_compat_intr_establish(device_t dev,
+const struct pci_attach_args *pa, int chan, int (*func)(void *), void *arg)
+{
+ pci_chipset_tag_t pc = pa-pa_pc;
+
+ if (pc-pc_pciide_compat_intr_establish == NULL)
+ return (NULL);
+ return (mips_pciide_compat_intr_establish(pc, dev, pa, chan,
+ func, arg));
+}
CVS commit: src/sys/dev/pci/hdaudio
Module Name:src
Committed By: riastradh
Date: Sat Jul 9 16:01:31 UTC 2011
Modified Files:
src/sys/dev/pci/hdaudio: hdaudio.c
Log Message:
Release mutex before unmapping DMA memory.
Fixes a LOCKDEBUG panic triggered by `hdaudioctl set'.
ok jmcneill
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/hdaudio/hdaudio.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/pci/hdaudio/hdaudio.c
diff -u src/sys/dev/pci/hdaudio/hdaudio.c:1.11 src/sys/dev/pci/hdaudio/hdaudio.c:1.12
--- src/sys/dev/pci/hdaudio/hdaudio.c:1.11 Sun Feb 13 17:49:12 2011
+++ src/sys/dev/pci/hdaudio/hdaudio.c Sat Jul 9 16:01:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudio.c,v 1.11 2011/02/13 17:49:12 jmcneill Exp $ */
+/* $NetBSD: hdaudio.c,v 1.12 2011/07/09 16:01:31 riastradh Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd supp...@precedence.co.uk
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hdaudio.c,v 1.11 2011/02/13 17:49:12 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: hdaudio.c,v 1.12 2011/07/09 16:01:31 riastradh Exp $);
#include sys/types.h
#include sys/param.h
@@ -1034,6 +1034,7 @@
hdaudio_stream_disestablish(struct hdaudio_stream *st)
{
struct hdaudio_softc *sc = st-st_host;
+ struct hdaudio_dma dma;
KASSERT(sc-sc_stream_mask (1 st-st_shift));
@@ -1041,8 +1042,12 @@
sc-sc_stream_mask = ~(1 st-st_shift);
st-st_intr = NULL;
st-st_cookie = NULL;
- hdaudio_dma_free(sc, st-st_bdl);
+ dma = st-st_bdl;
+ st-st_bdl.dma_valid = false;
mutex_exit(sc-sc_stream_mtx);
+
+ /* Can't bus_dmamem_unmap while holding a mutex. */
+ hdaudio_dma_free(sc, dma);
}
/*
CVS commit: src/sys/arch
Module Name:src Committed By: matt Date: Sat Jul 9 16:03:01 UTC 2011 Modified Files: src/sys/arch/algor/algor: algor_p4032_bus_io.c algor_p4032_bus_locio.c algor_p4032_intr.c algor_p5064_bus_io.c algor_p5064_bus_mem.c algor_p5064_intr.c algor_p6032_bus_io.c algor_p6032_bus_mem.c algor_p6032_intr.c autoconf.c led.c machdep.c src/sys/arch/algor/conf: files.algor std.algor src/sys/arch/algor/dev: bonito_mainbus.c com_mainbus.c lpt_mainbus.c mainbus.c mcclock_mainbus.c vtpbc_mainbus.c src/sys/arch/algor/include: autoconf.h intr.h src/sys/arch/algor/pci: pcib.c src/sys/arch/evbmips/conf: files.malta src/sys/arch/evbmips/include: intr.h vmparam.h Added Files: src/sys/arch/algor/algor: algor_intr.c src/sys/arch/evbmips/conf: P4032 P5064 P5064-64 P6032 files.algor std.algor src/sys/arch/evbmips/include: pmon.h Removed Files: src/sys/arch/algor/algor: disksubr.c interrupt.c src/sys/arch/algor/pci: pciide_machdep.c src/sys/arch/evbmips/malta/pci: pciide_machdep.c Log Message: Allow algor kernels to be built under either algor/algor64 or evbmips-el/evbmips64-el. Note that MAXMAPARITITONS and majors numbers differ between the two ports which is why two kernels are still needed. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/algor/algor/algor_intr.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/algor/algor/algor_p4032_bus_io.c \ src/sys/arch/algor/algor/algor_p5064_bus_io.c \ src/sys/arch/algor/algor/led.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/algor/algor/algor_p4032_bus_locio.c \ src/sys/arch/algor/algor/algor_p5064_bus_mem.c \ src/sys/arch/algor/algor/algor_p6032_bus_io.c \ src/sys/arch/algor/algor/algor_p6032_bus_mem.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/algor/algor/algor_p4032_intr.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/algor/algor/algor_p5064_intr.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/algor/algor/algor_p6032_intr.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/algor/algor/autoconf.c cvs rdiff -u -r1.17 -r0 src/sys/arch/algor/algor/disksubr.c cvs rdiff -u -r1.16 -r0 src/sys/arch/algor/algor/interrupt.c cvs rdiff -u -r1.50 -r1.51 src/sys/arch/algor/algor/machdep.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/algor/conf/files.algor cvs rdiff -u -r1.8 -r1.9 src/sys/arch/algor/conf/std.algor cvs rdiff -u -r1.13 -r1.14 src/sys/arch/algor/dev/bonito_mainbus.c \ src/sys/arch/algor/dev/com_mainbus.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/algor/dev/lpt_mainbus.c \ src/sys/arch/algor/dev/mcclock_mainbus.c cvs rdiff -u -r1.24 -r1.25 src/sys/arch/algor/dev/mainbus.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/algor/dev/vtpbc_mainbus.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/algor/include/autoconf.h cvs rdiff -u -r1.14 -r1.15 src/sys/arch/algor/include/intr.h cvs rdiff -u -r1.23 -r1.24 src/sys/arch/algor/pci/pcib.c cvs rdiff -u -r1.5 -r0 src/sys/arch/algor/pci/pciide_machdep.c cvs rdiff -u -r0 -r1.1 src/sys/arch/evbmips/conf/P4032 \ src/sys/arch/evbmips/conf/P5064 src/sys/arch/evbmips/conf/P5064-64 \ src/sys/arch/evbmips/conf/P6032 src/sys/arch/evbmips/conf/files.algor \ src/sys/arch/evbmips/conf/std.algor cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbmips/conf/files.malta cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbmips/include/intr.h cvs rdiff -u -r0 -r1.1 src/sys/arch/evbmips/include/pmon.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/include/vmparam.h cvs rdiff -u -r1.5 -r0 src/sys/arch/evbmips/malta/pci/pciide_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/algor/algor/algor_p4032_bus_io.c diff -u src/sys/arch/algor/algor/algor_p4032_bus_io.c:1.6 src/sys/arch/algor/algor/algor_p4032_bus_io.c:1.7 --- src/sys/arch/algor/algor/algor_p4032_bus_io.c:1.6 Fri Jul 8 18:48:55 2011 +++ src/sys/arch/algor/algor/algor_p4032_bus_io.c Sat Jul 9 16:03:00 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: algor_p4032_bus_io.c,v 1.6 2011/07/08 18:48:55 matt Exp $ */ +/* $NetBSD: algor_p4032_bus_io.c,v 1.7 2011/07/09 16:03:00 matt Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: algor_p4032_bus_io.c,v 1.6 2011/07/08 18:48:55 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: algor_p4032_bus_io.c,v 1.7 2011/07/09 16:03:00 matt Exp $); #include sys/param.h #include sys/systm.h @@ -44,7 +44,7 @@ #include uvm/uvm_extern.h -#include machine/locore.h +#include mips/locore.h #include algor/algor/algor_p4032reg.h #include algor/algor/algor_p4032var.h Index: src/sys/arch/algor/algor/algor_p5064_bus_io.c diff -u src/sys/arch/algor/algor/algor_p5064_bus_io.c:1.6 src/sys/arch/algor/algor/algor_p5064_bus_io.c:1.7 --- src/sys/arch/algor/algor/algor_p5064_bus_io.c:1.6 Fri Jul 8 18:48:55 2011 +++
CVS commit: src/lib/libedit
Module Name:src Committed By: tron Date: Sat Jul 9 16:04:34 UTC 2011 Modified Files: src/lib/libedit: read.c Log Message: Try to fix build of port where char is unsigned. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/lib/libedit/read.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libedit/read.c diff -u src/lib/libedit/read.c:1.59 src/lib/libedit/read.c:1.60 --- src/lib/libedit/read.c:1.59 Fri Jul 8 15:54:56 2011 +++ src/lib/libedit/read.c Sat Jul 9 16:04:34 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: read.c,v 1.59 2011/07/08 15:54:56 christos Exp $ */ +/* $NetBSD: read.c,v 1.60 2011/07/09 16:04:34 tron Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = @(#)read.c 8.1 (Berkeley) 6/4/93; #else -__RCSID($NetBSD: read.c,v 1.59 2011/07/08 15:54:56 christos Exp $); +__RCSID($NetBSD: read.c,v 1.60 2011/07/09 16:04:34 tron Exp $); #endif #endif /* not lint not SCCSID */ @@ -352,7 +352,7 @@ } goto again; } - } else if (*cbuf = 0 || /* ASCII */ + } else if ((signed char)cbuf[0] = 0 || /* ASCII */ /* we don't support other multibyte charsets */ ++cbp != 1 || /* Try non-ASCII characters in a 8-bit character set */
CVS commit: src/sys/arch/cobalt
Module Name:src Committed By: matt Date: Sat Jul 9 16:09:03 UTC 2011 Modified Files: src/sys/arch/cobalt/cobalt: autoconf.c bus.c machdep.c src/sys/arch/cobalt/dev: com_mainbus.c gt.c src/sys/arch/cobalt/pci: pci_machdep.c pcib.c pciide_machdep.c Log Message: Cleanup kernel files to use sys variants for bus.h, cpu.h, and intr.h Use mips/.. for db_machdep.h and psl.h To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/arch/cobalt/cobalt/autoconf.c cvs rdiff -u -r1.40 -r1.41 src/sys/arch/cobalt/cobalt/bus.c cvs rdiff -u -r1.111 -r1.112 src/sys/arch/cobalt/cobalt/machdep.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/cobalt/dev/com_mainbus.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/cobalt/dev/gt.c cvs rdiff -u -r1.31 -r1.32 src/sys/arch/cobalt/pci/pci_machdep.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/cobalt/pci/pcib.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/cobalt/pci/pciide_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/cobalt/cobalt/autoconf.c diff -u src/sys/arch/cobalt/cobalt/autoconf.c:1.28 src/sys/arch/cobalt/cobalt/autoconf.c:1.29 --- src/sys/arch/cobalt/cobalt/autoconf.c:1.28 Sat Mar 22 18:32:20 2008 +++ src/sys/arch/cobalt/cobalt/autoconf.c Sat Jul 9 16:09:01 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.28 2008/03/22 18:32:20 tsutsui Exp $ */ +/* $NetBSD: autoconf.c,v 1.29 2011/07/09 16:09:01 matt Exp $ */ /* * Copyright (c) 2000 Soren S. Jorvang. All rights reserved. @@ -26,16 +26,15 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.28 2008/03/22 18:32:20 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.29 2011/07/09 16:09:01 matt Exp $); #include sys/param.h -#include sys/systm.h #include sys/buf.h +#include sys/cpu.h #include sys/conf.h #include sys/device.h - -#include machine/cpu.h -#include machine/intr.h +#include sys/intr.h +#include sys/systm.h #include dev/pci/pcivar.h #include dev/ata/atavar.h Index: src/sys/arch/cobalt/cobalt/bus.c diff -u src/sys/arch/cobalt/cobalt/bus.c:1.40 src/sys/arch/cobalt/cobalt/bus.c:1.41 --- src/sys/arch/cobalt/cobalt/bus.c:1.40 Tue May 3 09:15:20 2011 +++ src/sys/arch/cobalt/cobalt/bus.c Sat Jul 9 16:09:01 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bus.c,v 1.40 2011/05/03 09:15:20 tsutsui Exp $ */ +/* $NetBSD: bus.c,v 1.41 2011/07/09 16:09:01 matt Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -31,9 +31,12 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bus.c,v 1.40 2011/05/03 09:15:20 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: bus.c,v 1.41 2011/07/09 16:09:01 matt Exp $); + +#define _COBALT_BUS_DMA_PRIVATE #include sys/param.h +#include sys/bus.h #include sys/systm.h #include sys/kernel.h #include sys/device.h @@ -41,9 +44,6 @@ #include sys/proc.h #include sys/mbuf.h -#define _COBALT_BUS_DMA_PRIVATE -#include machine/bus.h - #include common/bus_dma/bus_dmamem_common.h #include uvm/uvm_extern.h Index: src/sys/arch/cobalt/cobalt/machdep.c diff -u src/sys/arch/cobalt/cobalt/machdep.c:1.111 src/sys/arch/cobalt/cobalt/machdep.c:1.112 --- src/sys/arch/cobalt/cobalt/machdep.c:1.111 Sun Feb 20 15:47:28 2011 +++ src/sys/arch/cobalt/cobalt/machdep.c Sat Jul 9 16:09:01 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.111 2011/02/20 15:47:28 tsutsui Exp $ */ +/* $NetBSD: machdep.c,v 1.112 2011/07/09 16:09:01 matt Exp $ */ /*- * Copyright (c) 2006 Izumi Tsutsui. All rights reserved. @@ -50,7 +50,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.111 2011/02/20 15:47:28 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.112 2011/07/09 16:09:01 matt Exp $); #include opt_ddb.h #include opt_kgdb.h @@ -72,9 +72,9 @@ #include uvm/uvm_extern.h #include machine/bootinfo.h -#include machine/psl.h #include mips/locore.h +#include mips/psl.h #include dev/cons.h @@ -87,7 +87,7 @@ #include ksyms.h #if NKSYMS || defined(DDB) || defined(MODULAR) -#include machine/db_machdep.h +#include mips/db_machdep.h #include ddb/db_extern.h #define ELFSIZE DB_ELFSIZE #include sys/exec_elf.h Index: src/sys/arch/cobalt/dev/com_mainbus.c diff -u src/sys/arch/cobalt/dev/com_mainbus.c:1.18 src/sys/arch/cobalt/dev/com_mainbus.c:1.19 --- src/sys/arch/cobalt/dev/com_mainbus.c:1.18 Fri Jul 1 20:36:42 2011 +++ src/sys/arch/cobalt/dev/com_mainbus.c Sat Jul 9 16:09:01 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: com_mainbus.c,v 1.18 2011/07/01 20:36:42 dyoung Exp $ */ +/* $NetBSD: com_mainbus.c,v 1.19 2011/07/09 16:09:01 matt Exp $ */ /* * Copyright (c) 2000 Soren S. Jorvang. All rights reserved. @@ -26,16 +26,16 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: com_mainbus.c,v 1.18 2011/07/01 20:36:42 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: com_mainbus.c,v 1.19 2011/07/09 16:09:01 matt Exp $); #include sys/param.h -#include sys/systm.h +#include sys/bus.h #include
CVS commit: src/sys/arch
Module Name:src Committed By: matt Date: Sat Jul 9 16:58:05 UTC 2011 Modified Files: src/sys/arch/algor/include: db_machdep.h src/sys/arch/arc/include: db_machdep.h src/sys/arch/cobalt/include: db_machdep.h src/sys/arch/emips/include: db_machdep.h src/sys/arch/evbmips/include: db_machdep.h src/sys/arch/ews4800mips/include: db_machdep.h src/sys/arch/hpcmips/include: db_machdep.h src/sys/arch/mips/include: db_machdep.h src/sys/arch/mipsco/include: db_machdep.h src/sys/arch/newsmips/include: db_machdep.h src/sys/arch/sbmips/include: db_machdep.h src/sys/arch/sgimips/include: db_machdep.h Log Message: Default to DB_ELF_SYMBOLS and DB_ELFSIZE 32 To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/algor/include/db_machdep.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arc/include/db_machdep.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/cobalt/include/db_machdep.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/emips/include/db_machdep.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/include/db_machdep.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ews4800mips/include/db_machdep.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hpcmips/include/db_machdep.h cvs rdiff -u -r1.27 -r1.28 src/sys/arch/mips/include/db_machdep.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mipsco/include/db_machdep.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/newsmips/include/db_machdep.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sbmips/include/db_machdep.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sgimips/include/db_machdep.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/algor/include/db_machdep.h diff -u src/sys/arch/algor/include/db_machdep.h:1.1 src/sys/arch/algor/include/db_machdep.h:1.2 --- src/sys/arch/algor/include/db_machdep.h:1.1 Mon May 28 16:22:18 2001 +++ src/sys/arch/algor/include/db_machdep.h Sat Jul 9 16:58:04 2011 @@ -1,11 +1,3 @@ -/* $NetBSD: db_machdep.h,v 1.1 2001/05/28 16:22:18 thorpej Exp $ */ - -#ifndef _ALGOR_DB_MACHDEP_H_ -#define _ALGOR_DB_MACHDEP_H_ - -#define DB_ELF_SYMBOLS -#define DB_ELFSIZE 32 +/* $NetBSD: db_machdep.h,v 1.2 2011/07/09 16:58:04 matt Exp $ */ #include mips/db_machdep.h - -#endif /* !_ALGOR_DB_MACHDEP_H_ */ Index: src/sys/arch/arc/include/db_machdep.h diff -u src/sys/arch/arc/include/db_machdep.h:1.4 src/sys/arch/arc/include/db_machdep.h:1.5 --- src/sys/arch/arc/include/db_machdep.h:1.4 Tue Sep 4 07:43:29 2001 +++ src/sys/arch/arc/include/db_machdep.h Sat Jul 9 16:58:04 2011 @@ -1,11 +1,3 @@ -/* $NetBSD: db_machdep.h,v 1.4 2001/09/04 07:43:29 simonb Exp $ */ - -#ifndef _ARC_DB_MACHDEP_H_ -#define _ARC_DB_MACHDEP_H_ - -#define DB_ELF_SYMBOLS -#define DB_ELFSIZE 32 +/* $NetBSD: db_machdep.h,v 1.5 2011/07/09 16:58:04 matt Exp $ */ #include mips/db_machdep.h - -#endif /* !_ARC_DB_MACHDEP_H_ */ Index: src/sys/arch/cobalt/include/db_machdep.h diff -u src/sys/arch/cobalt/include/db_machdep.h:1.2 src/sys/arch/cobalt/include/db_machdep.h:1.3 --- src/sys/arch/cobalt/include/db_machdep.h:1.2 Tue Sep 4 07:43:29 2001 +++ src/sys/arch/cobalt/include/db_machdep.h Sat Jul 9 16:58:04 2011 @@ -1,11 +1,3 @@ -/* $NetBSD: db_machdep.h,v 1.2 2001/09/04 07:43:29 simonb Exp $ */ - -#ifndef _COBALT_DB_MACHDEP_H_ -#define _COBALT_DB_MACHDEP_H_ - -#define DB_ELF_SYMBOLS -#define DB_ELFSIZE 32 +/* $NetBSD: db_machdep.h,v 1.3 2011/07/09 16:58:04 matt Exp $ */ #include mips/db_machdep.h - -#endif /* !_COBALT_DB_MACHDEP_H_ */ Index: src/sys/arch/emips/include/db_machdep.h diff -u src/sys/arch/emips/include/db_machdep.h:1.1 src/sys/arch/emips/include/db_machdep.h:1.2 --- src/sys/arch/emips/include/db_machdep.h:1.1 Wed Jan 26 01:18:51 2011 +++ src/sys/arch/emips/include/db_machdep.h Sat Jul 9 16:58:04 2011 @@ -1,11 +1,3 @@ -/* $NetBSD: db_machdep.h,v 1.1 2011/01/26 01:18:51 pooka Exp $ */ - -#ifndef _EMIPS_DB_MACHDEP_H_ -#define _EMIPS_DB_MACHDEP_H_ - -#define DB_ELF_SYMBOLS -#define DB_ELFSIZE 32 +/* $NetBSD: db_machdep.h,v 1.2 2011/07/09 16:58:04 matt Exp $ */ #include mips/db_machdep.h - -#endif /* !_EMIPS_DB_MACHDEP_H_ */ Index: src/sys/arch/evbmips/include/db_machdep.h diff -u src/sys/arch/evbmips/include/db_machdep.h:1.1 src/sys/arch/evbmips/include/db_machdep.h:1.2 --- src/sys/arch/evbmips/include/db_machdep.h:1.1 Thu Mar 7 14:43:59 2002 +++ src/sys/arch/evbmips/include/db_machdep.h Sat Jul 9 16:58:04 2011 @@ -1,12 +1,3 @@ -/* $NetBSD: db_machdep.h,v 1.1 2002/03/07 14:43:59 simonb Exp $ */ - -#ifndef _EBVMIPS_DB_MACHDEP_H_ -#define _EBVMIPS_DB_MACHDEP_H_ - -/* XXX: Common for all evbmips or not? */ -#define DB_ELF_SYMBOLS -#define DB_ELFSIZE 32 +/* $NetBSD: db_machdep.h,v 1.2 2011/07/09 16:58:04 matt Exp $ */ #include mips/db_machdep.h - -#endif /* !_EBVMIPS_DB_MACHDEP_H_ */ Index: src/sys/arch/ews4800mips/include/db_machdep.h diff -u src/sys/arch/ews4800mips/include/db_machdep.h:1.1
CVS commit: src/sys/arch/sbmips/sbmips
Module Name:src Committed By: matt Date: Sat Jul 9 16:59:40 UTC 2011 Modified Files: src/sys/arch/sbmips/sbmips: cpu.c machdep.c rtc.c sb1250_icu.c systemsw.c Log Message: cleanup machine includes To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sbmips/sbmips/cpu.c cvs rdiff -u -r1.49 -r1.50 src/sys/arch/sbmips/sbmips/machdep.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sbmips/sbmips/rtc.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sbmips/sbmips/sb1250_icu.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sbmips/sbmips/systemsw.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/sbmips/sbmips/cpu.c diff -u src/sys/arch/sbmips/sbmips/cpu.c:1.20 src/sys/arch/sbmips/sbmips/cpu.c:1.21 --- src/sys/arch/sbmips/sbmips/cpu.c:1.20 Sun Feb 20 07:47:38 2011 +++ src/sys/arch/sbmips/sbmips/cpu.c Sat Jul 9 16:59:40 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.20 2011/02/20 07:47:38 matt Exp $ */ +/* $NetBSD: cpu.c,v 1.21 2011/07/09 16:59:40 matt Exp $ */ /* * Copyright 2000, 2001 @@ -33,21 +33,20 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.20 2011/02/20 07:47:38 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.21 2011/07/09 16:59:40 matt Exp $); #include opt_multiprocessor.h #include sys/param.h +#include sys/cpu.h #include sys/device.h #include sys/kernel.h #include sys/systm.h -#include sys/cpu.h #include mips/locore.h #include mips/cache.h -#include machine/cpu.h -#include machine/cpuvar.h +#include sbmips/cpuvar.h #include mips/sibyte/include/zbbusvar.h #include mips/sibyte/include/sb1250_regs.h Index: src/sys/arch/sbmips/sbmips/machdep.c diff -u src/sys/arch/sbmips/sbmips/machdep.c:1.49 src/sys/arch/sbmips/sbmips/machdep.c:1.50 --- src/sys/arch/sbmips/sbmips/machdep.c:1.49 Sun Feb 20 07:47:38 2011 +++ src/sys/arch/sbmips/sbmips/machdep.c Sat Jul 9 16:59:40 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.49 2011/02/20 07:47:38 matt Exp $ */ +/* $NetBSD: machdep.c,v 1.50 2011/07/09 16:59:40 matt Exp $ */ /* * Copyright 2000, 2001 @@ -58,54 +58,55 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.49 2011/02/20 07:47:38 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.50 2011/07/09 16:59:40 matt Exp $); #include opt_ddb.h #include opt_execfmt.h #include opt_modular.h #include sys/param.h -#include sys/systm.h -#include sys/kernel.h -#include sys/proc.h #include sys/buf.h -#include sys/reboot.h #include sys/conf.h +#include sys/cpu.h +#include sys/device.h +#include sys/exec.h #include sys/file.h +#include sys/intr.h +#include sys/kcore.h +#include sys/kernel.h +#include sys/ksyms.h #include sys/malloc.h #include sys/mbuf.h -#include sys/msgbuf.h -#include sys/device.h -#include sys/exec.h #include sys/mount.h +#include sys/msgbuf.h +#include sys/proc.h +#include sys/reboot.h #include sys/syscallargs.h -#include sys/kcore.h -#include sys/ksyms.h +#include sys/systm.h #include uvm/uvm_extern.h -#include machine/cpu.h -#include machine/reg.h -#include machine/psl.h -#include machine/pte.h -#include machine/autoconf.h -#include machine/intr.h -#include machine/swarm.h #include mips/locore.h +#include mips/psl.h +#include mips/pte.h +#include mips/reg.h #include mips/cfe/cfe_api.h +#include sbmips/autoconf.h +#include sbmips/swarm.h + #if 0 /* XXXCGD */ -#include machine/nvram.h +#include sbmips/nvram.h #endif /* XXXCGD */ -#include machine/leds.h +#include sbmips/leds.h #include mips/sibyte/dev/sbbuswatchvar.h #include ksyms.h #if NKSYMS || defined(DDB) || defined(MODULAR) -#include machine/db_machdep.h +#include mips/db_machdep.h #include ddb/db_access.h #include ddb/db_sym.h #include ddb/db_extern.h Index: src/sys/arch/sbmips/sbmips/rtc.c diff -u src/sys/arch/sbmips/sbmips/rtc.c:1.18 src/sys/arch/sbmips/sbmips/rtc.c:1.19 --- src/sys/arch/sbmips/sbmips/rtc.c:1.18 Sun Feb 20 07:47:38 2011 +++ src/sys/arch/sbmips/sbmips/rtc.c Sat Jul 9 16:59:40 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: rtc.c,v 1.18 2011/02/20 07:47:38 matt Exp $ */ +/* $NetBSD: rtc.c,v 1.19 2011/07/09 16:59:40 matt Exp $ */ /* * Copyright 2002 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rtc.c,v 1.18 2011/02/20 07:47:38 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: rtc.c,v 1.19 2011/07/09 16:59:40 matt Exp $); #include sys/param.h #include sys/device.h @@ -46,8 +46,8 @@ #include dev/clock_subr.h -#include machine/swarm.h -#include machine/systemsw.h +#include sbmips/swarm.h +#include sbmips/systemsw.h #include mips/locore.h #include mips/sibyte/dev/sbsmbusvar.h Index: src/sys/arch/sbmips/sbmips/sb1250_icu.c diff -u src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.12 src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.13 --- src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.12 Sun Feb 20 07:47:38 2011 +++ src/sys/arch/sbmips/sbmips/sb1250_icu.c
CVS commit: src/sys/arch/algor/conf
Module Name:src Committed By: dyoung Date: Sat Jul 9 17:13:32 UTC 2011 Modified Files: src/sys/arch/algor/conf: P4032 P5064 P6032 Log Message: Increase SYMTAB_SPACE, again. Why it should be necessary over and over, I do not know. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/arch/algor/conf/P4032 cvs rdiff -u -r1.66 -r1.67 src/sys/arch/algor/conf/P5064 cvs rdiff -u -r1.59 -r1.60 src/sys/arch/algor/conf/P6032 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/algor/conf/P4032 diff -u src/sys/arch/algor/conf/P4032:1.57 src/sys/arch/algor/conf/P4032:1.58 --- src/sys/arch/algor/conf/P4032:1.57 Thu Jun 30 20:09:17 2011 +++ src/sys/arch/algor/conf/P4032 Sat Jul 9 17:13:32 2011 @@ -1,4 +1,4 @@ -# $NetBSD: P4032,v 1.57 2011/06/30 20:09:17 wiz Exp $ +# $NetBSD: P4032,v 1.58 2011/07/09 17:13:32 dyoung Exp $ # # Algorithmics P-4032 kernel. # @@ -7,7 +7,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident P4032-$Revision: 1.57 $ +#ident P4032-$Revision: 1.58 $ maxusers 32 @@ -30,7 +30,7 @@ options DDB # kernel debugger makeoptions DEBUG=-g #makeoptions DEBUGLIST=pattern1 pattern2 ... -options SYMTAB_SPACE=40 +options SYMTAB_SPACE=402000 # File systems file-system FFS # Fast file system Index: src/sys/arch/algor/conf/P5064 diff -u src/sys/arch/algor/conf/P5064:1.66 src/sys/arch/algor/conf/P5064:1.67 --- src/sys/arch/algor/conf/P5064:1.66 Fri Jul 1 22:10:31 2011 +++ src/sys/arch/algor/conf/P5064 Sat Jul 9 17:13:32 2011 @@ -1,4 +1,4 @@ -# $NetBSD: P5064,v 1.66 2011/07/01 22:10:31 dyoung Exp $ +# $NetBSD: P5064,v 1.67 2011/07/09 17:13:32 dyoung Exp $ # # Algorithmics P-5064 kernel. # @@ -7,7 +7,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident P5064-$Revision: 1.66 $ +#ident P5064-$Revision: 1.67 $ maxusers 32 @@ -25,7 +25,7 @@ options DDB # kernel debugger makeoptions DEBUG=-g #makeoptions DEBUGLIST=pattern1 pattern2 ... -options SYMTAB_SPACE=462000 +options SYMTAB_SPACE=464000 # File systems file-system FFS # Fast file system Index: src/sys/arch/algor/conf/P6032 diff -u src/sys/arch/algor/conf/P6032:1.59 src/sys/arch/algor/conf/P6032:1.60 --- src/sys/arch/algor/conf/P6032:1.59 Fri Jul 1 22:28:07 2011 +++ src/sys/arch/algor/conf/P6032 Sat Jul 9 17:13:32 2011 @@ -1,4 +1,4 @@ -# $NetBSD: P6032,v 1.59 2011/07/01 22:28:07 dyoung Exp $ +# $NetBSD: P6032,v 1.60 2011/07/09 17:13:32 dyoung Exp $ # # Algorithmics P-6032 kernel. # @@ -7,7 +7,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident P6032-$Revision: 1.59 $ +#ident P6032-$Revision: 1.60 $ maxusers 32 @@ -25,7 +25,7 @@ options DDB # kernel debugger makeoptions DEBUG=-g #makeoptions DEBUGLIST=pattern1 pattern2 ... -options SYMTAB_SPACE=421000 +options SYMTAB_SPACE=424000 # File systems file-system FFS # Fast file system
CVS commit: src
Module Name:src Committed By: dyoung Date: Sat Jul 9 17:15:47 UTC 2011 Modified Files: src/distrib/sets/lists/comp: md.sparc md.sparc64 src/sys/arch/sparc64/include: Makefile Log Message: Don't install sparc64/bus.h any more. To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/distrib/sets/lists/comp/md.sparc cvs rdiff -u -r1.107 -r1.108 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sparc64/include/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/md.sparc diff -u src/distrib/sets/lists/comp/md.sparc:1.74 src/distrib/sets/lists/comp/md.sparc:1.75 --- src/distrib/sets/lists/comp/md.sparc:1.74 Sat Jul 9 14:57:48 2011 +++ src/distrib/sets/lists/comp/md.sparc Sat Jul 9 17:15:47 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc,v 1.74 2011/07/09 14:57:48 mrg Exp $ +# $NetBSD: md.sparc,v 1.75 2011/07/09 17:15:47 dyoung Exp $ ./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45 ./usr/include/ieeefp.hcomp-c-include ./usr/include/sparccomp-c-include @@ -73,7 +73,7 @@ ./usr/include/sparc64/autoconf.h comp-c-include ./usr/include/sparc64/bsd_openprom.h comp-c-include ./usr/include/sparc64/bswap.h comp-c-include -./usr/include/sparc64/bus.h comp-c-include +./usr/include/sparc64/bus.h comp-obsolete obsolete ./usr/include/sparc64/cdefs.h comp-c-include ./usr/include/sparc64/cgtworeg.h comp-c-include ./usr/include/sparc64/conf.h comp-obsolete obsolete Index: src/distrib/sets/lists/comp/md.sparc64 diff -u src/distrib/sets/lists/comp/md.sparc64:1.107 src/distrib/sets/lists/comp/md.sparc64:1.108 --- src/distrib/sets/lists/comp/md.sparc64:1.107 Sat Jul 9 14:57:48 2011 +++ src/distrib/sets/lists/comp/md.sparc64 Sat Jul 9 17:15:47 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.107 2011/07/09 14:57:48 mrg Exp $ +# $NetBSD: md.sparc64,v 1.108 2011/07/09 17:15:47 dyoung Exp $ ./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45 ./usr/include/ieeefp.hcomp-c-include ./usr/include/sparccomp-c-include @@ -73,7 +73,7 @@ ./usr/include/sparc64/autoconf.h comp-c-include ./usr/include/sparc64/bsd_openprom.h comp-c-include ./usr/include/sparc64/bswap.h comp-c-include -./usr/include/sparc64/bus.h comp-c-include +./usr/include/sparc64/bus.h comp-obsolete obsolete ./usr/include/sparc64/cdefs.h comp-c-include ./usr/include/sparc64/cgtworeg.h comp-c-include ./usr/include/sparc64/conf.h comp-obsolete obsolete Index: src/sys/arch/sparc64/include/Makefile diff -u src/sys/arch/sparc64/include/Makefile:1.26 src/sys/arch/sparc64/include/Makefile:1.27 --- src/sys/arch/sparc64/include/Makefile:1.26 Wed Apr 13 03:24:28 2011 +++ src/sys/arch/sparc64/include/Makefile Sat Jul 9 17:15:46 2011 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.26 2011/04/13 03:24:28 mrg Exp $ +# $NetBSD: Makefile,v 1.27 2011/07/09 17:15:46 dyoung Exp $ INCSDIR= /usr/include/sparc64 INCS= ansi.h aout_machdep.h asm.h autoconf.h \ - bswap.h bsd_openprom.h bus.h \ + bswap.h bsd_openprom.h \ cdefs.h cgtworeg.h cpu.h ctlreg.h \ disklabel.h \ eeprom.h elf_machdep.h endian.h endian_machdep.h \
CVS commit: src/lib/librefuse
Module Name:src Committed By: tron Date: Sat Jul 9 17:16:46 UTC 2011 Modified Files: src/lib/librefuse: refuse.c Log Message: Call the FUSE init operation before we try to access the file-system. This prevents a crash in fuse_ext2 which I previously worked around with a patch. To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 src/lib/librefuse/refuse.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/librefuse/refuse.c diff -u src/lib/librefuse/refuse.c:1.93 src/lib/librefuse/refuse.c:1.94 --- src/lib/librefuse/refuse.c:1.93 Sat Jul 9 14:50:00 2011 +++ src/lib/librefuse/refuse.c Sat Jul 9 17:16:46 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: refuse.c,v 1.93 2011/07/09 14:50:00 tron Exp $ */ +/* $NetBSD: refuse.c,v 1.94 2011/07/09 17:16:46 tron Exp $ */ /* * Copyright © 2007 Alistair Crooks. All rights reserved. @@ -31,7 +31,7 @@ #include sys/cdefs.h #if !defined(lint) -__RCSID($NetBSD: refuse.c,v 1.93 2011/07/09 14:50:00 tron Exp $); +__RCSID($NetBSD: refuse.c,v 1.94 2011/07/09 17:16:46 tron Exp $); #endif /* !lint */ #include sys/types.h @@ -1298,6 +1298,9 @@ fuse-fc = fc; + if (fuse-op.init != NULL) + fusectx-private_data = fuse-op.init(NULL); /* XXX */ + /* initialise the puffs operations structure */ PUFFSOP_INIT(pops); @@ -1361,9 +1364,6 @@ puffs_stat2vattr(pn_root-pn_va, st); assert(pn_root-pn_va.va_type == VDIR); - if (fuse-op.init) - fusectx-private_data = fuse-op.init(NULL); /* XXX */ - puffs_set_prepost(pu, set_fuse_context_pid, NULL); puffs_zerostatvfs(svfsb);
CVS commit: src
Module Name:src Committed By: dyoung Date: Sat Jul 9 17:19:22 UTC 2011 Modified Files: src/distrib/sets/lists/comp: md.alpha src/sys/arch/alpha/include: Makefile Log Message: Don't install alpha/bus.h any more. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/distrib/sets/lists/comp/md.alpha cvs rdiff -u -r1.29 -r1.30 src/sys/arch/alpha/include/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/md.alpha diff -u src/distrib/sets/lists/comp/md.alpha:1.57 src/distrib/sets/lists/comp/md.alpha:1.58 --- src/distrib/sets/lists/comp/md.alpha:1.57 Tue May 11 06:20:00 2010 +++ src/distrib/sets/lists/comp/md.alpha Sat Jul 9 17:19:21 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.alpha,v 1.57 2010/05/11 06:20:00 lukem Exp $ +# $NetBSD: md.alpha,v 1.58 2011/07/09 17:19:21 dyoung Exp $ ./usr/include/alphacomp-c-include ./usr/include/alpha/_G_config.h comp-obsolete obsolete ./usr/include/alpha/alpha_cpu.h comp-c-include @@ -8,7 +8,7 @@ ./usr/include/alpha/atomic.h comp-obsolete obsolete ./usr/include/alpha/autoconf.h comp-c-include ./usr/include/alpha/bswap.h comp-c-include -./usr/include/alpha/bus.h comp-c-include +./usr/include/alpha/bus.h comp-c-include obsolete ./usr/include/alpha/bwx.h comp-c-include ./usr/include/alpha/cdefs.h comp-c-include ./usr/include/alpha/cfbreg.h comp-c-include Index: src/sys/arch/alpha/include/Makefile diff -u src/sys/arch/alpha/include/Makefile:1.29 src/sys/arch/alpha/include/Makefile:1.30 --- src/sys/arch/alpha/include/Makefile:1.29 Mon Mar 10 14:01:35 2008 +++ src/sys/arch/alpha/include/Makefile Sat Jul 9 17:19:22 2011 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.29 2008/03/10 14:01:35 ad Exp $ +# $NetBSD: Makefile,v 1.30 2011/07/09 17:19:22 dyoung Exp $ INCSDIR= /usr/include/alpha INCS= alpha_cpu.h ansi.h aout_machdep.h asm.h autoconf.h \ - bswap.h bus.h bwx.h \ + bswap.h bwx.h \ cdefs.h cfbreg.h cpu.h cpuconf.h \ disklabel.h \ ecoff_machdep.h elf_machdep.h endian.h endian_machdep.h \
CVS commit: src/sys/arch/algor/include
Module Name:src
Committed By: dyoung
Date: Sat Jul 9 17:22:08 UTC 2011
Modified Files:
src/sys/arch/algor/include: bus_defs.h bus_funcs.h
Log Message:
Use the definitions in mips/bus_{dma,space}_{defs,funcs}.h.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/algor/include/bus_defs.h \
src/sys/arch/algor/include/bus_funcs.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/algor/include/bus_defs.h
diff -u src/sys/arch/algor/include/bus_defs.h:1.1 src/sys/arch/algor/include/bus_defs.h:1.2
--- src/sys/arch/algor/include/bus_defs.h:1.1 Fri Jul 1 17:09:58 2011
+++ src/sys/arch/algor/include/bus_defs.h Sat Jul 9 17:22:08 2011
@@ -1,392 +1,10 @@
-/* $NetBSD: bus_defs.h,v 1.1 2011/07/01 17:09:58 dyoung Exp $ */
-
-/*-
- * Copyright (c) 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *notice, this list of conditions and the following disclaimer in the
- *documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Copyright (c) 1996 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Author: Chris G. Demetriou
- *
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS AS IS
- * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- * Software Distribution Coordinator or software.distribut...@cs.cmu.edu
- * School of Computer Science
- * Carnegie Mellon University
- * Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- */
+/* $NetBSD: bus_defs.h,v 1.2 2011/07/09 17:22:08 dyoung Exp $ */
#ifndef _ALGOR_BUS_DEFS_H_
#define _ALGOR_BUS_DEFS_H_
+#define _MIPS_NEED_BUS_DMA_BOUNCE
-#include sys/types.h
-
-#ifdef _KERNEL
-/*
- * Addresses (in bus space).
- */
-typedef u_long bus_addr_t;
-typedef u_long bus_size_t;
-
-/*
- * Turn on BUS_SPACE_DEBUG if the global DEBUG option is enabled.
- */
-#if defined(DEBUG) !defined(BUS_SPACE_DEBUG)
-#define BUS_SPACE_DEBUG
-#endif
-
-#ifdef BUS_SPACE_DEBUG
-#include sys/systm.h /* for printf() prototype */
-/*
- * Macros for checking the aligned-ness of pointers passed to bus
- * space ops. Strict alignment is required by the MIPS architecture,
- * and a trap will occur if unaligned access is performed. These
- * may aid in the debugging of a broken device driver by displaying
- * useful information about the problem.
- */
-#define __BUS_SPACE_ALIGNED_ADDRESS(p, t)\
- u_long)(p)) (sizeof(t)-1)) == 0)
-
-#define __BUS_SPACE_ADDRESS_SANITY(p, t, d)\
-({ \
- if (__BUS_SPACE_ALIGNED_ADDRESS((p), t) == 0) { \
- printf(%s 0x%lx not aligned to %zu bytes %s:%d\n, \
- d, (u_long)(p), sizeof(t), __FILE__, __LINE__); \
- }\
- (void) 0; \
-})
-
-#define BUS_SPACE_ALIGNED_POINTER(p, t) __BUS_SPACE_ALIGNED_ADDRESS(p, t)
-#else
-#define __BUS_SPACE_ADDRESS_SANITY(p, t, d) (void) 0
-#define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t)
-#endif /* BUS_SPACE_DEBUG */
-#endif /*
CVS commit: src/sys/arch/pmax
Module Name:src Committed By: matt Date: Sat Jul 9 17:32:31 UTC 2011 Modified Files: src/sys/arch/pmax/ibus: dz_ibus.c ibus.c ibus_3max.c ibus_pmax.c ibusvar.h pm.c sii.c sii_ds.c src/sys/arch/pmax/include: locore.h src/sys/arch/pmax/pmax: autoconf.c bus_dma.c bus_space.c clock.c cpu.c dec_3100.c dec_3max.c dec_3maxplus.c dec_3min.c dec_5100.c dec_maxine.c interrupt.c machdep.c mainbus.c memc_3max.c promcall.c sysconf.c src/sys/arch/pmax/tc: asc_ioasic.c dtkbd.c dtms.c ioasic.c tcbus.c Log Message: Cleanu machine/* includes To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/pmax/ibus/dz_ibus.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/pmax/ibus/ibus.c \ src/sys/arch/pmax/ibus/ibusvar.h cvs rdiff -u -r1.14 -r1.15 src/sys/arch/pmax/ibus/ibus_3max.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/pmax/ibus/ibus_pmax.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/pmax/ibus/pm.c \ src/sys/arch/pmax/ibus/sii.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/pmax/ibus/sii_ds.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/pmax/include/locore.h cvs rdiff -u -r1.77 -r1.78 src/sys/arch/pmax/pmax/autoconf.c cvs rdiff -u -r1.55 -r1.56 src/sys/arch/pmax/pmax/bus_dma.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/pmax/pmax/bus_space.c cvs rdiff -u -r1.39 -r1.40 src/sys/arch/pmax/pmax/clock.c cvs rdiff -u -r1.30 -r1.31 src/sys/arch/pmax/pmax/cpu.c cvs rdiff -u -r1.51 -r1.52 src/sys/arch/pmax/pmax/dec_3100.c cvs rdiff -u -r1.53 -r1.54 src/sys/arch/pmax/pmax/dec_3max.c cvs rdiff -u -r1.67 -r1.68 src/sys/arch/pmax/pmax/dec_3maxplus.c cvs rdiff -u -r1.70 -r1.71 src/sys/arch/pmax/pmax/dec_3min.c cvs rdiff -u -r1.45 -r1.46 src/sys/arch/pmax/pmax/dec_5100.c cvs rdiff -u -r1.62 -r1.63 src/sys/arch/pmax/pmax/dec_maxine.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/pmax/pmax/interrupt.c cvs rdiff -u -r1.243 -r1.244 src/sys/arch/pmax/pmax/machdep.c cvs rdiff -u -r1.41 -r1.42 src/sys/arch/pmax/pmax/mainbus.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/pmax/pmax/memc_3max.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/pmax/pmax/promcall.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/pmax/pmax/sysconf.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/pmax/tc/asc_ioasic.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/pmax/tc/dtkbd.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/pmax/tc/dtms.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/pmax/tc/ioasic.c cvs rdiff -u -r1.27 -r1.28 src/sys/arch/pmax/tc/tcbus.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/pmax/ibus/dz_ibus.c diff -u src/sys/arch/pmax/ibus/dz_ibus.c:1.10 src/sys/arch/pmax/ibus/dz_ibus.c:1.11 --- src/sys/arch/pmax/ibus/dz_ibus.c:1.10 Sun Feb 20 07:50:24 2011 +++ src/sys/arch/pmax/ibus/dz_ibus.c Sat Jul 9 17:32:29 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dz_ibus.c,v 1.10 2011/02/20 07:50:24 matt Exp $ */ +/* $NetBSD: dz_ibus.c,v 1.11 2011/07/09 17:32:29 matt Exp $ */ /*- * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc. @@ -61,22 +61,21 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: dz_ibus.c,v 1.10 2011/02/20 07:50:24 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: dz_ibus.c,v 1.11 2011/07/09 17:32:29 matt Exp $); #include dzkbd.h #include dzms.h #include sys/param.h -#include sys/proc.h -#include sys/systm.h -#include sys/ioctl.h -#include sys/tty.h -#include sys/file.h +#include sys/bus.h #include sys/conf.h #include sys/device.h +#include sys/file.h +#include sys/ioctl.h +#include sys/proc.h #include sys/reboot.h - -#include machine/bus.h +#include sys/systm.h +#include sys/tty.h #include dev/cons.h Index: src/sys/arch/pmax/ibus/ibus.c diff -u src/sys/arch/pmax/ibus/ibus.c:1.19 src/sys/arch/pmax/ibus/ibus.c:1.20 --- src/sys/arch/pmax/ibus/ibus.c:1.19 Sun Feb 20 07:50:24 2011 +++ src/sys/arch/pmax/ibus/ibus.c Sat Jul 9 17:32:29 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ibus.c,v 1.19 2011/02/20 07:50:24 matt Exp $ */ +/* $NetBSD: ibus.c,v 1.20 2011/07/09 17:32:29 matt Exp $ */ /* * Copyright (c) 1998 Jonathan Stone. All rights reserved. @@ -31,13 +31,13 @@ */ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: ibus.c,v 1.19 2011/02/20 07:50:24 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: ibus.c,v 1.20 2011/07/09 17:32:29 matt Exp $); #include sys/param.h -#include sys/systm.h #include sys/device.h +#include sys/systm.h -#include machine/sysconf.h +#include pmax/sysconf.h #include pmax/ibus/ibusvar.h #include locators.h Index: src/sys/arch/pmax/ibus/ibusvar.h diff -u src/sys/arch/pmax/ibus/ibusvar.h:1.19 src/sys/arch/pmax/ibus/ibusvar.h:1.20 --- src/sys/arch/pmax/ibus/ibusvar.h:1.19 Sun Feb 20 07:50:24 2011 +++ src/sys/arch/pmax/ibus/ibusvar.h Sat Jul 9 17:32:29 2011 @@ -1,9 +1,9 @@ -/* $NetBSD: ibusvar.h,v 1.19 2011/02/20 07:50:24 matt Exp $ */ +/* $NetBSD: ibusvar.h,v 1.20 2011/07/09 17:32:29 matt Exp $ */ #ifndef _PMAX_IBUS_IBUSVAR_H_ #define
CVS commit: src/sys/dev/dtv
Module Name:src
Committed By: jmcneill
Date: Sat Jul 9 17:55:20 UTC 2011
Modified Files:
src/sys/dev/dtv: dtv_buffer.c dtv_device.c dtv_ioctl.c dtvvar.h
Log Message:
don't kmem_alloc with IPL_VM mutex locked, spotted by rmind
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/dtv/dtv_buffer.c \
src/sys/dev/dtv/dtv_device.c src/sys/dev/dtv/dtv_ioctl.c \
src/sys/dev/dtv/dtvvar.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/dtv/dtv_buffer.c
diff -u src/sys/dev/dtv/dtv_buffer.c:1.1 src/sys/dev/dtv/dtv_buffer.c:1.2
--- src/sys/dev/dtv/dtv_buffer.c:1.1 Sat Jul 9 14:46:56 2011
+++ src/sys/dev/dtv/dtv_buffer.c Sat Jul 9 17:55:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dtv_buffer.c,v 1.1 2011/07/09 14:46:56 jmcneill Exp $ */
+/* $NetBSD: dtv_buffer.c,v 1.2 2011/07/09 17:55:20 jmcneill Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dtv_buffer.c,v 1.1 2011/07/09 14:46:56 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: dtv_buffer.c,v 1.2 2011/07/09 17:55:20 jmcneill Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -120,7 +120,7 @@
kmem_free(db, sizeof(*db));
}
-static int
+int
dtv_buffer_realloc(struct dtv_softc *sc, size_t bufsize)
{
struct dtv_stream *ds = sc-sc_stream;
@@ -196,23 +196,14 @@
}
int
-dtv_buffer_setup(struct dtv_softc *sc, size_t bufsize)
+dtv_buffer_setup(struct dtv_softc *sc)
{
struct dtv_stream *ds = sc-sc_stream;
unsigned int i;
- int error;
mutex_enter(ds-ds_lock);
-
- error = dtv_buffer_realloc(sc, PAGE_ALIGN(bufsize));
- if (error) {
- mutex_exit(ds-ds_lock);
- return error;
- }
-
for (i = 0; i ds-ds_nbufs; i++)
dtv_stream_enqueue(ds, ds-ds_buf[i]);
-
mutex_exit(ds-ds_lock);
return 0;
@@ -224,13 +215,10 @@
struct dtv_stream *ds = sc-sc_stream;
mutex_enter(ds-ds_lock);
-
while (SIMPLEQ_FIRST(ds-ds_ingress))
SIMPLEQ_REMOVE_HEAD(ds-ds_ingress, db_entries);
while (SIMPLEQ_FIRST(ds-ds_egress))
SIMPLEQ_REMOVE_HEAD(ds-ds_egress, db_entries);
- dtv_buffer_realloc(sc, 0);
-
mutex_exit(ds-ds_lock);
return 0;
Index: src/sys/dev/dtv/dtv_device.c
diff -u src/sys/dev/dtv/dtv_device.c:1.1 src/sys/dev/dtv/dtv_device.c:1.2
--- src/sys/dev/dtv/dtv_device.c:1.1 Sat Jul 9 14:46:56 2011
+++ src/sys/dev/dtv/dtv_device.c Sat Jul 9 17:55:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dtv_device.c,v 1.1 2011/07/09 14:46:56 jmcneill Exp $ */
+/* $NetBSD: dtv_device.c,v 1.2 2011/07/09 17:55:20 jmcneill Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dtv_device.c,v 1.1 2011/07/09 14:46:56 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: dtv_device.c,v 1.2 2011/07/09 17:55:20 jmcneill Exp $);
#include sys/types.h
#include sys/conf.h
@@ -102,6 +102,11 @@
cv_init(ds-ds_sample_cv, dtv);
selinit(ds-ds_sel);
dtv_scatter_buf_init(ds-ds_data);
+ if (dtv_buffer_realloc(sc, DTV_DEFAULT_BUFSIZE) != 0) {
+ aprint_error(: no memory\n);
+ sc-sc_dying = true;
+ return;
+ }
dtv_device_get_devinfo(sc, info);
@@ -133,6 +138,7 @@
cv_destroy(ds-ds_sample_cv);
mutex_destroy(ds-ds_lock);
seldestroy(ds-ds_sel);
+ dtv_buffer_realloc(sc, 0);
dtv_scatter_buf_destroy(ds-ds_data);
return 0;
Index: src/sys/dev/dtv/dtv_ioctl.c
diff -u src/sys/dev/dtv/dtv_ioctl.c:1.1 src/sys/dev/dtv/dtv_ioctl.c:1.2
--- src/sys/dev/dtv/dtv_ioctl.c:1.1 Sat Jul 9 14:46:56 2011
+++ src/sys/dev/dtv/dtv_ioctl.c Sat Jul 9 17:55:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dtv_ioctl.c,v 1.1 2011/07/09 14:46:56 jmcneill Exp $ */
+/* $NetBSD: dtv_ioctl.c,v 1.2 2011/07/09 17:55:20 jmcneill Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dtv_ioctl.c,v 1.1 2011/07/09 14:46:56 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: dtv_ioctl.c,v 1.2 2011/07/09 17:55:20 jmcneill Exp $);
#include sys/param.h
#include sys/types.h
@@ -75,26 +75,17 @@
{
struct dmx_pes_filter_params *pesfilt;
uint16_t pid;
- size_t bufsize;
int error;
switch (cmd) {
case DMX_START:
- if (sc-sc_bufsize_chg) {
- if ((error = dtv_buffer_setup(sc, sc-sc_bufsize)) != 0)
-return error;
- sc-sc_bufsize_chg = false;
- }
+ error = dtv_buffer_setup(sc);
+ if (error)
+ return error;
return dtv_device_start_transfer(sc);
case DMX_STOP:
return dtv_device_stop_transfer(sc);
case DMX_SET_BUFFER_SIZE:
- bufsize = *(uintptr_t *)data;
- if (bufsize = DTV_DEFAULT_BUFSIZE
- sc-sc_bufsize != bufsize) {
- sc-sc_bufsize = bufsize;
- sc-sc_bufsize_chg = true;
- }
return 0;
case DMX_SET_PES_FILTER:
pesfilt = data;
Index: src/sys/dev/dtv/dtvvar.h
diff -u src/sys/dev/dtv/dtvvar.h:1.1 src/sys/dev/dtv/dtvvar.h:1.2
---
CVS commit: src/sys/dev/dtv
Module Name:src
Committed By: jmcneill
Date: Sat Jul 9 19:24:11 UTC 2011
Modified Files:
src/sys/dev/dtv: dtv_device.c
Removed Files:
src/sys/dev/dtv: dtvmodule.h
Log Message:
allow this to be compiled into the kernel
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/dtv/dtv_device.c
cvs rdiff -u -r1.1 -r0 src/sys/dev/dtv/dtvmodule.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/dtv/dtv_device.c
diff -u src/sys/dev/dtv/dtv_device.c:1.2 src/sys/dev/dtv/dtv_device.c:1.3
--- src/sys/dev/dtv/dtv_device.c:1.2 Sat Jul 9 17:55:20 2011
+++ src/sys/dev/dtv/dtv_device.c Sat Jul 9 19:24:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dtv_device.c,v 1.2 2011/07/09 17:55:20 jmcneill Exp $ */
+/* $NetBSD: dtv_device.c,v 1.3 2011/07/09 19:24:10 jmcneill Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dtv_device.c,v 1.2 2011/07/09 17:55:20 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: dtv_device.c,v 1.3 2011/07/09 19:24:10 jmcneill Exp $);
#include sys/types.h
#include sys/conf.h
@@ -44,7 +44,6 @@
#include sys/select.h
#include dev/dtv/dtvvar.h
-#include dev/dtv/dtvmodule.h
MODULE(MODULE_CLASS_DRIVER, dtv, NULL);
@@ -75,6 +74,8 @@
NULL
);
+extern struct cfdriver dtv_cd;
+
static int
dtv_match(device_t parent, cfdata_t cfdata, void *aa)
{
@@ -144,13 +145,20 @@
return 0;
}
+#ifdef _MODULE
+#include ioconf.c
+#endif
+
static int
dtv_modcmd(modcmd_t cmd, void *arg)
{
+#ifdef _MODULE
int error, bmaj = -1, cmaj = -1;
+#endif
switch (cmd) {
case MODULE_CMD_INIT:
+#ifdef _MODULE
error = config_init_component(cfdriver_ioconf_dtv,
cfattach_ioconf_dtv, cfdata_ioconf_dtv);
if (error)
@@ -160,10 +168,17 @@
config_fini_component(cfdriver_ioconf_dtv,
cfattach_ioconf_dtv, cfdata_ioconf_dtv);
return error;
+#else
+ return 0;
+#endif
case MODULE_CMD_FINI:
+#ifdef _MODULE
devsw_detach(NULL, dtv_cdevsw);
return config_fini_component(cfdriver_ioconf_dtv,
cfattach_ioconf_dtv, cfdata_ioconf_dtv);
+#else
+ return 0;
+#endif
default:
return ENOTTY;
}
CVS commit: src/etc
Module Name:src Committed By: christos Date: Sat Jul 9 19:24:13 UTC 2011 Modified Files: src/etc: ntp.conf Log Message: default mdnstries to 0; most people don't use mdns, so this prevents spurious warnings. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/etc/ntp.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/ntp.conf diff -u src/etc/ntp.conf:1.9 src/etc/ntp.conf:1.10 --- src/etc/ntp.conf:1.9 Sat Feb 10 14:36:56 2007 +++ src/etc/ntp.conf Sat Jul 9 15:24:13 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ntp.conf,v 1.9 2007/02/10 19:36:56 reed Exp $ +# $NetBSD: ntp.conf,v 1.10 2011/07/09 19:24:13 christos Exp $ # # NetBSD default Network Time Protocol (NTP) configuration file for ntpd @@ -28,6 +28,10 @@ tos minsane 2 +# Set the number of tries to register with mdns. 0 means never +# +mdnstries 0 + # Hereafter should be server or peer statements to configure other # hosts to exchange NTP packets with. Peers should be selected in such # a way that the network path to them is symmetric (that is, the series
CVS commit: src/sys/dev/dtv
Module Name:src
Committed By: jmcneill
Date: Sat Jul 9 21:08:41 UTC 2011
Modified Files:
src/sys/dev/dtv: dtv_buffer.c
Log Message:
use %zu to print size_t
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/dtv/dtv_buffer.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/dtv/dtv_buffer.c
diff -u src/sys/dev/dtv/dtv_buffer.c:1.2 src/sys/dev/dtv/dtv_buffer.c:1.3
--- src/sys/dev/dtv/dtv_buffer.c:1.2 Sat Jul 9 17:55:20 2011
+++ src/sys/dev/dtv/dtv_buffer.c Sat Jul 9 21:08:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dtv_buffer.c,v 1.2 2011/07/09 17:55:20 jmcneill Exp $ */
+/* $NetBSD: dtv_buffer.c,v 1.3 2011/07/09 21:08:40 jmcneill Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dtv_buffer.c,v 1.2 2011/07/09 17:55:20 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: dtv_buffer.c,v 1.3 2011/07/09 21:08:40 jmcneill Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -64,7 +64,7 @@
if (SIMPLEQ_EMPTY(ds-ds_ingress)) {
aprint_debug_dev(sc-sc_dev,
- dropping sample (%u)\n, resid);
+ dropping sample (%zu)\n, resid);
mutex_exit(ds-ds_lock);
return;
}
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: tron Date: Sat Jul 9 21:24:30 UTC 2011 Modified Files: src/distrib/sets/lists/base: mi Log Message: Add entry for directory ./usr/include/dev/dtv. To generate a diff of this commit: cvs rdiff -u -r1.943 -r1.944 src/distrib/sets/lists/base/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.943 src/distrib/sets/lists/base/mi:1.944 --- src/distrib/sets/lists/base/mi:1.943 Fri Jul 1 22:23:19 2011 +++ src/distrib/sets/lists/base/mi Sat Jul 9 21:24:29 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.943 2011/07/01 22:23:19 mrg Exp $ +# $NetBSD: mi,v 1.944 2011/07/09 21:24:29 tron Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -759,6 +759,7 @@ ./usr/include/dev/decbase-c-usr ./usr/include/dev/dm base-c-usr ./usr/include/dev/dmover base-c-usr +./usr/include/dev/dtvbase-c-usr ./usr/include/dev/eisabase-obsolete obsolete ./usr/include/dev/hpcbase-c-usr ./usr/include/dev/i2cbase-obsolete obsolete
CVS commit: src/sys/arch/evbmips/conf
Module Name:src
Committed By: matt
Date: Sat Jul 9 21:45:45 UTC 2011
Modified Files:
src/sys/arch/evbmips/conf: Makefile.evbmips.inc
Log Message:
Pull in matt-nb5-mips64.
Add common clauses to make SREC, BINARY, UBOOT images.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/conf/Makefile.evbmips.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/evbmips/conf/Makefile.evbmips.inc
diff -u src/sys/arch/evbmips/conf/Makefile.evbmips.inc:1.2 src/sys/arch/evbmips/conf/Makefile.evbmips.inc:1.3
--- src/sys/arch/evbmips/conf/Makefile.evbmips.inc:1.2 Thu Nov 24 12:54:29 2005
+++ src/sys/arch/evbmips/conf/Makefile.evbmips.inc Sat Jul 9 21:45:45 2011
@@ -1,6 +1,39 @@
-# $NetBSD: Makefile.evbmips.inc,v 1.2 2005/11/24 12:54:29 dbj Exp $
+# Makefile.evbmips.inc,v 1.2 2005/11/24 12:54:29 dbj Exp
-SYSTEM_LD_TAIL_EXTRA=; \
+RAMDISKDIR!= cd ${NETBSDSRCDIR}/distrib/${THISMIPS:T}/instkernel/ramdisk ${PRINTOBJDIR}
+
+.if defined(NEED_MDSETIMAGE) ${NEED_MDSETIMAGE} != no \
+ exists(${RAMDISKDIR}/ramdisk.fs)
+SYSTEM_LD_TAIL_EXTRA+=; \
+ echo ${TOOL_MDSETIMAGE} -s $@ ${RAMDISKDIR}/ramdisk.fs; \
+ ${TOOL_MDSETIMAGE} -s $@ ${RAMDISKDIR}/ramdisk.fs
+.endif
+
+.if defined(NEED_SREC) ${NEED_SREC} != no
+SYSTEM_LD_TAIL_EXTRA+=; \
echo ${STRIP} -O srec -o $@.srec $@; \
${STRIP} -O srec -o $@.srec $@
EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.srec@}
+.endif
+
+.if defined(NEED_BINARY) ${NEED_BINARY} != no
+SYSTEM_LD_TAIL_EXTRA+=; \
+ echo ${OBJCOPY} -S -O binary $@ $@.bin; \
+ ${OBJCOPY} -S -O binary $@ $@.bin
+
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}
+
+.if defined(NEED_UBOOTIMAGE) ${NEED_UBOOTIMAGE} != no
+_OSRELEASE!= ${HOST_SH} $S/conf/osrelease.sh
+MKUBOOTIMAGEARGS= -A mips -T kernel -C none
+MKUBOOTIMAGEARGS+= -a ${TEXTADDR:C/$//} -e $(TEXTADDR)
+MKUBOOTIMAGEARGS+= -n $(MACHINE) ${_OSRELEASE} ($(KERNEL_BUILD:T))
+
+SYSTEM_LD_TAIL_EXTRA+=; \
+ echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin $@.ub; \
+ ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin $@.ub; \
+
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}
+.endif
+.endif
+
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: matt Date: Sat Jul 9 21:46:19 UTC 2011 Modified Files: src/sys/arch/evbmips/conf: DB120 Log Message: Add NEED_MDSETIMAGE, NEED_BINARY, NEED_UBOOTIMAGE To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/conf/DB120 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/DB120 diff -u src/sys/arch/evbmips/conf/DB120:1.1 src/sys/arch/evbmips/conf/DB120:1.2 --- src/sys/arch/evbmips/conf/DB120:1.1 Thu Jul 7 05:06:44 2011 +++ src/sys/arch/evbmips/conf/DB120 Sat Jul 9 21:46:19 2011 @@ -1,4 +1,4 @@ -# $NetBSD: DB120,v 1.1 2011/07/07 05:06:44 matt Exp $ +# $NetBSD: DB120,v 1.2 2011/07/09 21:46:19 matt Exp $ # # Qualcomm Atheros AR9344 DB120 evaluation board. # @@ -7,7 +7,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident DB120-$Revision: 1.1 $ +#ident DB120-$Revision: 1.2 $ maxusers 32 @@ -15,6 +15,9 @@ options MIPS32R2 makeoptions CPUFLAGS+=-mips32r2 +makeoptions NEED_MDSETIMAGE=yes +makeoptions NEED_BINARY=yes +makeoptions NEED_UBOOTIMAGE=yes options NOFPU # No FPU options FPEMUL # emulate FPU insn options WISOC_AR9344 # WiSoC select
CVS commit: src/sys/dev
Module Name:src
Committed By: christos
Date: Sat Jul 9 23:18:05 UTC 2011
Modified Files:
src/sys/dev/cardbus: if_tlp_cardbus.c
src/sys/dev/ic: tulip.c tulipvar.h
src/sys/dev/pci: if_tlp_pci.c
Log Message:
- add a routine to get the name of the card.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/dev/cardbus/if_tlp_cardbus.c
cvs rdiff -u -r1.176 -r1.177 src/sys/dev/ic/tulip.c
cvs rdiff -u -r1.64 -r1.65 src/sys/dev/ic/tulipvar.h
cvs rdiff -u -r1.116 -r1.117 src/sys/dev/pci/if_tlp_pci.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/cardbus/if_tlp_cardbus.c
diff -u src/sys/dev/cardbus/if_tlp_cardbus.c:1.67 src/sys/dev/cardbus/if_tlp_cardbus.c:1.68
--- src/sys/dev/cardbus/if_tlp_cardbus.c:1.67 Tue Mar 9 19:21:10 2010
+++ src/sys/dev/cardbus/if_tlp_cardbus.c Sat Jul 9 19:18:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tlp_cardbus.c,v 1.67 2010/03/10 00:21:10 dyoung Exp $ */
+/* $NetBSD: if_tlp_cardbus.c,v 1.68 2011/07/09 23:18:05 christos Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_tlp_cardbus.c,v 1.67 2010/03/10 00:21:10 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_tlp_cardbus.c,v 1.68 2011/07/09 23:18:05 christos Exp $);
#include opt_inet.h
@@ -187,8 +187,7 @@
{
const struct tulip_cardbus_product *tcp;
- for (tcp = tlp_cardbus_products;
- tlp_chip_names[tcp-tcp_chip] != NULL;
+ for (tcp = tlp_cardbus_products; tcp-tcp_chip != TULIP_CHIP_INVALID;
tcp++) {
if (PCI_VENDOR(ca-ca_id) == tcp-tcp_vendor
PCI_PRODUCT(ca-ca_id) == tcp-tcp_product)
@@ -297,7 +296,7 @@
}
printf(: %s Ethernet, pass %d.%d\n,
- tlp_chip_names[sc-sc_chip],
+ tlp_chip_name(sc-sc_chip),
(sc-sc_rev 4) 0xf, sc-sc_rev 0xf);
/*
Index: src/sys/dev/ic/tulip.c
diff -u src/sys/dev/ic/tulip.c:1.176 src/sys/dev/ic/tulip.c:1.177
--- src/sys/dev/ic/tulip.c:1.176 Sat Nov 13 08:52:02 2010
+++ src/sys/dev/ic/tulip.c Sat Jul 9 19:18:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tulip.c,v 1.176 2010/11/13 13:52:02 uebayasi Exp $ */
+/* $NetBSD: tulip.c,v 1.177 2011/07/09 23:18:05 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tulip.c,v 1.176 2010/11/13 13:52:02 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: tulip.c,v 1.177 2011/07/09 23:18:05 christos Exp $);
#include sys/param.h
@@ -69,7 +69,7 @@
#include dev/ic/tulipreg.h
#include dev/ic/tulipvar.h
-const char * const tlp_chip_names[] = TULIP_CHIP_NAMES;
+static const char * const tlp_chip_names[] = TULIP_CHIP_NAMES;
static const struct tulip_txthresh_tab tlp_10_txthresh_tab[] =
TLP_TXTHRESH_TAB_10;
@@ -6197,3 +6197,13 @@
ifmedia_set(sc-sc_mii.mii_media, IFM_ETHER|IFM_AUTO);
}
}
+
+const char *
+tlp_chip_name(tulip_chip_t t) {
+ if ((int)t 0 || (int)t = __arraycount(tlp_chip_names)) {
+ static char buf[256];
+ (void)snprintf(buf, sizeof(buf), [unknown 0x%x], t);
+ return buf;
+ }
+ return tlp_chip_names[t];
+}
Index: src/sys/dev/ic/tulipvar.h
diff -u src/sys/dev/ic/tulipvar.h:1.64 src/sys/dev/ic/tulipvar.h:1.65
--- src/sys/dev/ic/tulipvar.h:1.64 Fri Apr 17 11:22:35 2009
+++ src/sys/dev/ic/tulipvar.h Sat Jul 9 19:18:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tulipvar.h,v 1.64 2009/04/17 15:22:35 cegger Exp $ */
+/* $NetBSD: tulipvar.h,v 1.65 2011/07/09 23:18:05 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -571,8 +571,6 @@
#define TULIP_SP_FIELD(x, f) TULIP_SP_FIELD_C((x)[f * 2], (x)[f * 2 + 1])
#ifdef _KERNEL
-extern const char * const tlp_chip_names[];
-
extern const struct tulip_mediasw tlp_21040_mediasw;
extern const struct tulip_mediasw tlp_21040_tp_mediasw;
extern const struct tulip_mediasw tlp_21040_auibnc_mediasw;
@@ -604,6 +602,7 @@
void tlp_21140_gpio_get(struct tulip_softc *sc, struct ifmediareq *ifmr);
int tlp_21140_gpio_set(struct tulip_softc *sc);
+const char *tlp_chip_name(tulip_chip_t);
#endif /* _KERNEL */
Index: src/sys/dev/pci/if_tlp_pci.c
diff -u src/sys/dev/pci/if_tlp_pci.c:1.116 src/sys/dev/pci/if_tlp_pci.c:1.117
--- src/sys/dev/pci/if_tlp_pci.c:1.116 Thu Jan 21 11:14:39 2010
+++ src/sys/dev/pci/if_tlp_pci.c Sat Jul 9 19:18:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tlp_pci.c,v 1.116 2010/01/21 16:14:39 martin Exp $ */
+/* $NetBSD: if_tlp_pci.c,v 1.117 2011/07/09 23:18:05 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_tlp_pci.c,v 1.116 2010/01/21 16:14:39 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_tlp_pci.c,v 1.117 2011/07/09 23:18:05 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -270,9 +270,8 @@
CVS commit: src/sys/compat/linux/arch/amd64
Module Name:src
Committed By: christos
Date: Sat Jul 9 23:46:32 UTC 2011
Modified Files:
src/sys/compat/linux/arch/amd64: syscalls.master
Log Message:
revert accidental commit from unrelated change. no custom linux fork.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/compat/linux/arch/amd64/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/arch/amd64/syscalls.master
diff -u src/sys/compat/linux/arch/amd64/syscalls.master:1.38 src/sys/compat/linux/arch/amd64/syscalls.master:1.39
--- src/sys/compat/linux/arch/amd64/syscalls.master:1.38 Sat Jul 9 10:49:40 2011
+++ src/sys/compat/linux/arch/amd64/syscalls.master Sat Jul 9 19:46:32 2011
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.38 2011/07/09 14:49:40 christos Exp $
+ $NetBSD: syscalls.master,v 1.39 2011/07/09 23:46:32 christos Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -174,7 +174,7 @@
int optname, void *optval, int *optlen); }
56 STD { int|linux_sys||clone(int flags, void *stack, \
void *parent_tidptr, void *child_tidptr, void *tls); }
-57 STD { int|linux_sys||fork(void); }
+57 NOARGS { int|sys||fork(void); }
58 NOARGS { int|sys|14|vfork(void); }
59 NOARGS { int|sys||execve(const char *path, char **argp, \
char **envp); }
CVS commit: src/lib/libedit
Module Name:src Committed By: christos Date: Sat Jul 9 23:54:40 UTC 2011 Modified Files: src/lib/libedit: read.c Log Message: make obvious what we are trying to do... To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/lib/libedit/read.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libedit/read.c diff -u src/lib/libedit/read.c:1.60 src/lib/libedit/read.c:1.61 --- src/lib/libedit/read.c:1.60 Sat Jul 9 12:04:34 2011 +++ src/lib/libedit/read.c Sat Jul 9 19:54:39 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: read.c,v 1.60 2011/07/09 16:04:34 tron Exp $ */ +/* $NetBSD: read.c,v 1.61 2011/07/09 23:54:39 christos Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = @(#)read.c 8.1 (Berkeley) 6/4/93; #else -__RCSID($NetBSD: read.c,v 1.60 2011/07/09 16:04:34 tron Exp $); +__RCSID($NetBSD: read.c,v 1.61 2011/07/09 23:54:39 christos Exp $); #endif #endif /* not lint not SCCSID */ @@ -352,7 +352,7 @@ } goto again; } - } else if ((signed char)cbuf[0] = 0 || /* ASCII */ + } else if (isascii((unsigned char)cbuf[0]) || /* we don't support other multibyte charsets */ ++cbp != 1 || /* Try non-ASCII characters in a 8-bit character set */
CVS commit: src/sys/arch/evbmips/include
Module Name:src
Committed By: matt
Date: Sun Jul 10 00:00:13 UTC 2011
Added Files:
src/sys/arch/evbmips/include: uboot.h
Log Message:
Add uboot.h which contains global_data and board_data structures.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbmips/include/uboot.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/arch/evbmips/include/uboot.h
diff -u /dev/null src/sys/arch/evbmips/include/uboot.h:1.1
--- /dev/null Sun Jul 10 00:00:13 2011
+++ src/sys/arch/evbmips/include/uboot.h Sun Jul 10 00:00:13 2011
@@ -0,0 +1,58 @@
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _EVBMIPS_UBOOT_H_
+#define _EVBMIPS_UBOOT_H_
+
+struct uboot_global_data {
+struct uboot_board_data *gd_bd;
+uint32_t gd_flags;
+uint32_t gd_baudrate;
+uint32_t gd_have_console;
+uint32_t gd_memsize;
+uint32_t gd_reloc_off;
+uint32_t gd_env_addr;
+uint32_t gd_env_valid;
+void **gd_jump_table;
+};
+
+struct uboot_board_data {
+ uint32_t bd_baudrate;
+ uint32_t bd_ipaddr;
+ uint8_t bd_etheraddr[6];
+ uint32_t bd_arch_number;
+ uint32_t bd_boot_params;
+ uint32_t bd_memstart;
+ uint32_t bd_memsize;
+ uint32_t bd_flashstart;
+ uint32_t bd_flashsize;
+ uint32_t bd_flashoffset;
+};
+
+#endif /* _EVBMIPS_UBOOT_H_ */
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: matt Date: Sun Jul 10 00:03:12 UTC 2011 Modified Files: src/sys/arch/evbmips/conf: DB120 Log Message: Increase allowed COM_TOLERANCE to 5% To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/conf/DB120 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/DB120 diff -u src/sys/arch/evbmips/conf/DB120:1.2 src/sys/arch/evbmips/conf/DB120:1.3 --- src/sys/arch/evbmips/conf/DB120:1.2 Sat Jul 9 21:46:19 2011 +++ src/sys/arch/evbmips/conf/DB120 Sun Jul 10 00:03:12 2011 @@ -1,4 +1,4 @@ -# $NetBSD: DB120,v 1.2 2011/07/09 21:46:19 matt Exp $ +# $NetBSD: DB120,v 1.3 2011/07/10 00:03:12 matt Exp $ # # Qualcomm Atheros AR9344 DB120 evaluation board. # @@ -7,7 +7,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident DB120-$Revision: 1.2 $ +#ident DB120-$Revision: 1.3 $ maxusers 32 @@ -18,9 +18,10 @@ makeoptions NEED_MDSETIMAGE=yes makeoptions NEED_BINARY=yes makeoptions NEED_UBOOTIMAGE=yes -options NOFPU # No FPU -options FPEMUL # emulate FPU insn -options WISOC_AR9344 # WiSoC select +options NOFPU# No FPU +options FPEMUL# emulate FPU insn +options WISOC_AR9344 # WiSoC select +options COM_16650,COM_TOLERANCE=50 # +/- 5% # Options for necessary to use MD #options MEMORY_DISK_HOOKS
CVS commit: src/sys/arch/evbmips
Module Name:src Committed By: matt Date: Sun Jul 10 00:03:53 UTC 2011 Modified Files: src/sys/arch/evbmips/adm5120: machdep.c src/sys/arch/evbmips/alchemy: dbau1500.c dbau1550.c genericbd.c mach_intr.c machdep.c mtx-1.c omsal400.c src/sys/arch/evbmips/atheros: mach_intr.c machdep.c wdog.c src/sys/arch/evbmips/evbmips: interrupt.c src/sys/arch/evbmips/gdium: gdium_bus_io.c gdium_bus_mem.c gdium_dma.c gdium_genfb.c gdium_intr.c machdep.c src/sys/arch/evbmips/isa: isadma_bounce.c src/sys/arch/evbmips/malta: machdep.c Log Message: CLeanup machine includes To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbmips/adm5120/machdep.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbmips/alchemy/dbau1500.c \ src/sys/arch/evbmips/alchemy/mtx-1.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbmips/alchemy/dbau1550.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/alchemy/genericbd.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbmips/alchemy/mach_intr.c cvs rdiff -u -r1.50 -r1.51 src/sys/arch/evbmips/alchemy/machdep.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbmips/alchemy/omsal400.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbmips/atheros/mach_intr.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbmips/atheros/machdep.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbmips/atheros/wdog.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbmips/evbmips/interrupt.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/gdium/gdium_bus_io.c \ src/sys/arch/evbmips/gdium/gdium_bus_mem.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbmips/gdium/gdium_dma.c \ src/sys/arch/evbmips/gdium/gdium_intr.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbmips/gdium/gdium_genfb.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbmips/gdium/machdep.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbmips/isa/isadma_bounce.c cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbmips/malta/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/evbmips/adm5120/machdep.c diff -u src/sys/arch/evbmips/adm5120/machdep.c:1.20 src/sys/arch/evbmips/adm5120/machdep.c:1.21 --- src/sys/arch/evbmips/adm5120/machdep.c:1.20 Sun Feb 20 07:48:33 2011 +++ src/sys/arch/evbmips/adm5120/machdep.c Sun Jul 10 00:03:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.20 2011/02/20 07:48:33 matt Exp $ */ +/* $NetBSD: machdep.c,v 1.21 2011/07/10 00:03:52 matt Exp $ */ /*- * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko. @@ -70,7 +70,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.20 2011/02/20 07:48:33 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.21 2011/07/10 00:03:52 matt Exp $); #include opt_ddb.h #include opt_kgdb.h @@ -83,16 +83,16 @@ #include pci.h #include sys/param.h -#include sys/systm.h -#include sys/kernel.h +#include sys/boot_flag.h #include sys/buf.h -#include sys/reboot.h -#include sys/mount.h +#include sys/device.h #include sys/kcore.h -#include sys/boot_flag.h -#include sys/termios.h +#include sys/kernel.h #include sys/ksyms.h -#include sys/device.h +#include sys/mount.h +#include sys/reboot.h +#include sys/systm.h +#include sys/termios.h #include net/if.h #include net/if_ether.h @@ -104,7 +104,7 @@ #include ksyms.h #if NKSYMS || defined(DDB) || defined(MODULAR) -#include machine/db_machdep.h +#include mips/db_machdep.h #include ddb/db_extern.h #endif Index: src/sys/arch/evbmips/alchemy/dbau1500.c diff -u src/sys/arch/evbmips/alchemy/dbau1500.c:1.6 src/sys/arch/evbmips/alchemy/dbau1500.c:1.7 --- src/sys/arch/evbmips/alchemy/dbau1500.c:1.6 Fri Jul 1 18:44:45 2011 +++ src/sys/arch/evbmips/alchemy/dbau1500.c Sun Jul 10 00:03:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dbau1500.c,v 1.6 2011/07/01 18:44:45 dyoung Exp $ */ +/* $NetBSD: dbau1500.c,v 1.7 2011/07/10 00:03:52 matt Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -32,11 +32,13 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: dbau1500.c,v 1.6 2011/07/01 18:44:45 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: dbau1500.c,v 1.7 2011/07/10 00:03:52 matt Exp $); #include sys/param.h #include sys/bus.h -#include machine/locore.h + +#include mips/locore.h + #include evbmips/alchemy/obiovar.h #include evbmips/alchemy/board.h #include evbmips/alchemy/dbau1500reg.h Index: src/sys/arch/evbmips/alchemy/mtx-1.c diff -u src/sys/arch/evbmips/alchemy/mtx-1.c:1.6 src/sys/arch/evbmips/alchemy/mtx-1.c:1.7 --- src/sys/arch/evbmips/alchemy/mtx-1.c:1.6 Fri Jul 1 18:44:45 2011 +++ src/sys/arch/evbmips/alchemy/mtx-1.c Sun Jul 10 00:03:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mtx-1.c,v 1.6 2011/07/01 18:44:45 dyoung Exp $ */ +/* $NetBSD: mtx-1.c,v 1.7 2011/07/10 00:03:52 matt Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -32,11 +32,13 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mtx-1.c,v 1.6 2011/07/01 18:44:45 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD:
CVS commit: src/sys/dev
Module Name:src
Committed By: jmcneill
Date: Sun Jul 10 00:47:34 UTC 2011
Modified Files:
src/sys/dev/i2c: au8522.c au8522mod.h au8522mod_8vsb.h
au8522mod_qam256.h au8522mod_qam64.h au8522reg.h au8522var.h
src/sys/dev/usb: auvitek_dtv.c
Log Message:
add snr reporting
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/i2c/au8522.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/i2c/au8522mod.h \
src/sys/dev/i2c/au8522mod_8vsb.h src/sys/dev/i2c/au8522mod_qam256.h \
src/sys/dev/i2c/au8522mod_qam64.h src/sys/dev/i2c/au8522reg.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/i2c/au8522var.h
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/usb/auvitek_dtv.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/i2c/au8522.c
diff -u src/sys/dev/i2c/au8522.c:1.4 src/sys/dev/i2c/au8522.c:1.5
--- src/sys/dev/i2c/au8522.c:1.4 Sat Jul 9 15:00:43 2011
+++ src/sys/dev/i2c/au8522.c Sun Jul 10 00:47:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: au8522.c,v 1.4 2011/07/09 15:00:43 jmcneill Exp $ */
+/* $NetBSD: au8522.c,v 1.5 2011/07/10 00:47:34 jmcneill Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill jmcne...@invisible.ca
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: au8522.c,v 1.4 2011/07/09 15:00:43 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: au8522.c,v 1.5 2011/07/10 00:47:34 jmcneill Exp $);
#include sys/param.h
#include sys/systm.h
@@ -345,9 +345,6 @@
fe_status_t status = 0;
uint8_t val;
- //printf(%s: current_modulation = %d\n, __func__,
- //au-current_modulation);
-
switch (au-current_modulation) {
case VSB_8:
if (au8522_read_1(au, 0x4088, val))
@@ -379,10 +376,49 @@
status |= FE_HAS_LOCK;
}
- //printf(%s: status = 0x%x\n, __func__, status);
return status;
}
+uint16_t
+au8522_get_snr(struct au8522 *au)
+{
+ const struct au8522_snr_table *snrtab = NULL;
+ uint16_t snrreg;
+ uint8_t val;
+ size_t snrtablen;
+ unsigned int n;
+
+ switch (au-current_modulation) {
+ case VSB_8:
+ snrtab = au8522_snr_8vsb;
+ snrtablen = __arraycount(au8522_snr_8vsb);
+ snrreg = AU8522_REG_SNR_VSB;
+ break;
+ case QAM_64:
+ snrtab = au8522_snr_qam64;
+ snrtablen = __arraycount(au8522_snr_qam64);
+ snrreg = AU8522_REG_SNR_QAM;
+ break;
+ case QAM_256:
+ snrtab = au8522_snr_qam256;
+ snrtablen = __arraycount(au8522_snr_qam256);
+ snrreg = AU8522_REG_SNR_QAM;
+ break;
+ default:
+ return 0;
+ }
+
+ if (au8522_read_1(au, snrreg, val))
+ return 0;
+
+ for (n = 0; n snrtablen; n++) {
+ if (val snrtab[n].val)
+ return snrtab[n].snr;
+ }
+
+ return 0;
+}
+
MODULE(MODULE_CLASS_DRIVER, au8522, NULL);
static int
Index: src/sys/dev/i2c/au8522mod.h
diff -u src/sys/dev/i2c/au8522mod.h:1.1 src/sys/dev/i2c/au8522mod.h:1.2
--- src/sys/dev/i2c/au8522mod.h:1.1 Sat Jul 9 15:00:43 2011
+++ src/sys/dev/i2c/au8522mod.h Sun Jul 10 00:47:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: au8522mod.h,v 1.1 2011/07/09 15:00:43 jmcneill Exp $ */
+/* $NetBSD: au8522mod.h,v 1.2 2011/07/10 00:47:34 jmcneill Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca
@@ -34,6 +34,11 @@
uint8_t val;
};
+struct au8522_snr_table {
+ uint16_t val;
+ uint16_t snr;
+};
+
#include dev/i2c/au8522mod_8vsb.h
#include dev/i2c/au8522mod_qam64.h
#include dev/i2c/au8522mod_qam256.h
Index: src/sys/dev/i2c/au8522mod_8vsb.h
diff -u src/sys/dev/i2c/au8522mod_8vsb.h:1.1 src/sys/dev/i2c/au8522mod_8vsb.h:1.2
--- src/sys/dev/i2c/au8522mod_8vsb.h:1.1 Sat Jul 9 15:00:43 2011
+++ src/sys/dev/i2c/au8522mod_8vsb.h Sun Jul 10 00:47:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: au8522mod_8vsb.h,v 1.1 2011/07/09 15:00:43 jmcneill Exp $ */
+/* $NetBSD: au8522mod_8vsb.h,v 1.2 2011/07/10 00:47:34 jmcneill Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca
@@ -55,3 +55,36 @@
{ 0x80a4, 0xe8 },
{ 0x8231, 0x13 },
};
+
+static const struct au8522_snr_table au8522_snr_8vsb[] = {
+ { 0, 270 },
+ { 2, 250 },
+ { 3, 240 },
+ { 5, 230 },
+ { 7, 220 },
+ { 9, 210 },
+ { 12, 200 },
+ { 13, 195 },
+ { 15, 190 },
+ { 17, 185 },
+ { 19, 180 },
+ { 21, 175 },
+ { 24, 170 },
+ { 27, 165 },
+ { 31, 160 },
+ { 32, 158 },
+ { 33, 156 },
+ { 36, 152 },
+ { 37, 150 },
+ { 39, 148 },
+ { 40, 146 },
+ { 41, 144 },
+ { 43, 142 },
+ { 44, 140 },
+ { 48, 135 },
+ { 50, 130 },
+ { 43, 142 },
+ { 53, 125 },
+ { 56, 120 },
+ { 256, 115 },
+};
Index: src/sys/dev/i2c/au8522mod_qam256.h
diff -u src/sys/dev/i2c/au8522mod_qam256.h:1.1 src/sys/dev/i2c/au8522mod_qam256.h:1.2
--- src/sys/dev/i2c/au8522mod_qam256.h:1.1 Sat Jul 9 15:00:43 2011
+++ src/sys/dev/i2c/au8522mod_qam256.h Sun Jul 10 00:47:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: au8522mod_qam256.h,v 1.1 2011/07/09 15:00:43 jmcneill Exp $ */
+/* $NetBSD: au8522mod_qam256.h,v 1.2 2011/07/10 00:47:34 jmcneill Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca
@@ -100,3 +100,70 @@
{ 0x80a7, 0x40 },
{
CVS commit: src/sys/dev/usb
Module Name:src Committed By: jmcneill Date: Sun Jul 10 02:25:53 UTC 2011 Modified Files: src/sys/dev/usb: files.usb Log Message: add auvitek_dtv.c To generate a diff of this commit: cvs rdiff -u -r1.106 -r1.107 src/sys/dev/usb/files.usb 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/files.usb diff -u src/sys/dev/usb/files.usb:1.106 src/sys/dev/usb/files.usb:1.107 --- src/sys/dev/usb/files.usb:1.106 Thu Jun 9 19:08:31 2011 +++ src/sys/dev/usb/files.usb Sun Jul 10 02:25:52 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files.usb,v 1.106 2011/06/09 19:08:31 matt Exp $ +# $NetBSD: files.usb,v 1.107 2011/07/10 02:25:52 jmcneill Exp $ # # Config file and device description for machine-independent USB code. # Included by ports that need it. Ports that use it must provide @@ -149,11 +149,12 @@ file dev/usb/uvideo.c uvideo # Auvitek AU0828 -device auvitek: videobus, i2cexec, usbifif, au8522, xc5k +device auvitek: videobus, dtvbus, i2cexec, usbifif, au8522, xc5k attach auvitek at usbdevif file dev/usb/auvitek.c auvitek file dev/usb/auvitek_audio.c auvitek file dev/usb/auvitek_board.c auvitek +file dev/usb/auvitek_dtv.c auvitek file dev/usb/auvitek_i2c.c auvitek file dev/usb/auvitek_video.c auvitek
CVS commit: src/external/gpl3/gcc/lib/libgcc
Module Name:src
Committed By: mrg
Date: Sun Jul 10 02:39:57 UTC 2011
Modified Files:
src/external/gpl3/gcc/lib/libgcc/libgcc: Makefile
src/external/gpl3/gcc/lib/libgcc/libgcc_s: Makefile
Log Message:
add a hack for emips libgcc (32 bit mips with softfloat.)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/libgcc/libgcc_s/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/gpl3/gcc/lib/libgcc/libgcc/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.2 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.3
--- src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.2 Sun Jul 3 08:35:42 2011
+++ src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile Sun Jul 10 02:39:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/07/03 08:35:42 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2011/07/10 02:39:57 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -13,8 +13,14 @@
.if !defined(MKNATIVE_LIBGCC_NEW)
+# XXX handle this better?
+.if ${MACHINE} == emips
+G_LIB2ADD_HACK+= ${GNUHOSTDIST}/gcc/config/floatunsidf.c \
+ ${GNUHOSTDIST}/gcc/config/floatunsisf.c
+.endif
+
SRCS+= ${LIB2FUNCS} ${LIB2FUNCS_ST} ${LIB2DIVMOD} \
- ${G_LIB2ADD:T:S/.asm/.S/} ${G_LIB2ADD_ST} ${LIB1ASMFUNCS}
+ ${G_LIB2ADD_HACK:T:S/.asm/.S/} ${G_LIB2ADD:T:S/.asm/.S/} ${G_LIB2ADD_ST} ${LIB1ASMFUNCS}
.if ${MKPIC} == no
SRCS+= ${LIB2_EH}
.endif
Index: src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile:1.1 src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile:1.2
--- src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile:1.1 Tue Jun 21 06:02:26 2011
+++ src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile Sun Jul 10 02:39:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/06/21 06:02:26 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2011/07/10 02:39:57 mrg Exp $
USE_SHLIBDIR= yes
REQUIRETOOLS= yes
@@ -23,6 +23,12 @@
.if !defined(MKNATIVE_LIBGCC_NEW)
+# XXX handle this better?
+.if ${MACHINE_CPU} == mips !(${MKSOFTFLOAT} != no)
+G_LIB2ADD+= ${GNUHOSTDIST}/gcc/config/floatunsidf.c \
+ ${GNUHOSTDIST}/gcc/config/floatunsisf.c
+.endif
+
SRCS+= ${LIB2FUNCS} ${LIB2DIVMOD} ${LIB2_EH} \
${G_LIB2ADD:T:S/.asm/.S/} ${LIB1ASMFUNCS}
CVS commit: src/external/lgpl3/gmp/lib/libgmp/arch
Module Name:src
Committed By: mrg
Date: Sun Jul 10 02:41:50 UTC 2011
Modified Files:
src/external/lgpl3/gmp/lib/libgmp/arch/arm: Makefile.inc
src/external/lgpl3/gmp/lib/libgmp/arch/armeb: Makefile.inc
Log Message:
make these look more like the sparc/powerpc ones.
XXX: a big chunk of these Makefile.inc's should promoted to the
XXX: main Makefile.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/lgpl3/gmp/lib/libgmp/arch/arm/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 \
src/external/lgpl3/gmp/lib/libgmp/arch/armeb/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/external/lgpl3/gmp/lib/libgmp/arch/arm/Makefile.inc
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/arm/Makefile.inc:1.2 src/external/lgpl3/gmp/lib/libgmp/arch/arm/Makefile.inc:1.3
--- src/external/lgpl3/gmp/lib/libgmp/arch/arm/Makefile.inc:1.2 Sun Jul 3 06:43:16 2011
+++ src/external/lgpl3/gmp/lib/libgmp/arch/arm/Makefile.inc Sun Jul 10 02:41:50 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2011/07/03 06:43:16 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.3 2011/07/10 02:41:50 mrg Exp $
SRCS+= \
random.c \
@@ -170,9 +170,15 @@
${.OBJDIR}/config.m4: ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4
cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.TARGET}
+BUILD_S_INCS= -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn
+
+M4FLAGS= -DPIC
+COPTS+= -fPIC
.for _build _src in ${ASM_SRCS_LIST}
${_build:R}.s: Makefile dummy ${.OBJDIR}/config.m4
- ${TOOL_M4} -DCONFIG_TOP_SRCDIR=${DIST} -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn -DOPERATION_${.TARGET:R} ${DIST}/${_src} ${.TARGET}
+ ${TOOL_M4} -DCONFIG_TOP_SRCDIR=${DIST} ${BUILD_S_INCS} \
+ ${M4FLAGS} ${M4FLAGS.${.TARGET:R}} \
+ -DOPERATION_${.TARGET:R} ${DIST}/${_src} ${.TARGET}
SRCS+= ${_build:R}.s
CLEANFILES+= ${_build:R}.s
Index: src/external/lgpl3/gmp/lib/libgmp/arch/armeb/Makefile.inc
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/armeb/Makefile.inc:1.2 src/external/lgpl3/gmp/lib/libgmp/arch/armeb/Makefile.inc:1.3
--- src/external/lgpl3/gmp/lib/libgmp/arch/armeb/Makefile.inc:1.2 Sun Jul 3 06:43:16 2011
+++ src/external/lgpl3/gmp/lib/libgmp/arch/armeb/Makefile.inc Sun Jul 10 02:41:50 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2011/07/03 06:43:16 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.3 2011/07/10 02:41:50 mrg Exp $
SRCS+= \
random.c \
@@ -170,9 +170,15 @@
${.OBJDIR}/config.m4: ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4
cp ${.CURDIR}/arch/${MACHINE_ARCH}/config.m4 ${.TARGET}
+BUILD_S_INCS= -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn
+
+M4FLAGS= -DPIC
+COPTS+= -fPIC
.for _build _src in ${ASM_SRCS_LIST}
${_build:R}.s: Makefile dummy ${.OBJDIR}/config.m4
- ${TOOL_M4} -DCONFIG_TOP_SRCDIR=${DIST} -I${.CURDIR} -I${.OBJDIR}/dummy -I${DIST}/ -I${DIST}/mpn -DOPERATION_${.TARGET:R} ${DIST}/${_src} ${.TARGET}
+ ${TOOL_M4} -DCONFIG_TOP_SRCDIR=${DIST} ${BUILD_S_INCS} \
+ ${M4FLAGS} ${M4FLAGS.${.TARGET:R}} \
+ -DOPERATION_${.TARGET:R} ${DIST}/${_src} ${.TARGET}
SRCS+= ${_build:R}.s
CLEANFILES+= ${_build:R}.s
CVS commit: src
Module Name:src
Committed By: mrg
Date: Sun Jul 10 03:05:34 UTC 2011
Modified Files:
src/compat/mips64/64: bsd.64.mk
src/compat/mips64/o32: bsd.o32.mk
src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb: Makefile.inc
gmp-mparam.h gmp.h
src/external/lgpl3/gmp/lib/libgmp/arch/mips64el: Makefile.inc
gmp-mparam.h gmp.h
Log Message:
make mips64 builds of gmp and mpfr work including compat libs.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/compat/mips64/64/bsd.64.mk
cvs rdiff -u -r1.6 -r1.7 src/compat/mips64/o32/bsd.o32.mk
cvs rdiff -u -r1.1 -r1.2 \
src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/Makefile.inc \
src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp-mparam.h \
src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/Makefile.inc \
src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp-mparam.h \
src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/gmp.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/mips64/64/bsd.64.mk
diff -u src/compat/mips64/64/bsd.64.mk:1.6 src/compat/mips64/64/bsd.64.mk:1.7
--- src/compat/mips64/64/bsd.64.mk:1.6 Mon Jul 4 12:00:49 2011
+++ src/compat/mips64/64/bsd.64.mk Sun Jul 10 03:05:33 2011
@@ -1,10 +1,11 @@
-# $NetBSD: bsd.64.mk,v 1.6 2011/07/04 12:00:49 mrg Exp $
+# $NetBSD: bsd.64.mk,v 1.7 2011/07/10 03:05:33 mrg Exp $
.if ${MACHINE_ARCH} == mips64eb
LD+= -m elf64btsmip
.else
LD+= -m elf64ltsmip
.endif
+LIBGMP_MACHINE_ARCH= ${MACHINE_ARCH}
MLIBDIR= 64
COPTS+= -mabi=64
@@ -13,7 +14,4 @@
LDFLAGS+= -mabi=64
MKDEPFLAGS+= -mabi=64
-LIBMPFR_MACHINE_ARCH= mipseb
-LIBGMP_MACHINE_ARCH= mipseb
-
.include ${.PARSEDIR}/../../Makefile.compat
Index: src/compat/mips64/o32/bsd.o32.mk
diff -u src/compat/mips64/o32/bsd.o32.mk:1.6 src/compat/mips64/o32/bsd.o32.mk:1.7
--- src/compat/mips64/o32/bsd.o32.mk:1.6 Mon Jul 4 12:00:49 2011
+++ src/compat/mips64/o32/bsd.o32.mk Sun Jul 10 03:05:33 2011
@@ -1,10 +1,11 @@
-# $NetBSD: bsd.o32.mk,v 1.6 2011/07/04 12:00:49 mrg Exp $
+# $NetBSD: bsd.o32.mk,v 1.7 2011/07/10 03:05:33 mrg Exp $
.if ${MACHINE_ARCH} == mips64eb
LD+= -m elf32btsmip
.else
LD+= -m elf32ltsmip
.endif
+LIBGMP_MACHINE_ARCH= ${MACHINE_ARCH}
MLIBDIR= o32
COPTS+= -mabi=32 -march=mips3
@@ -13,7 +14,4 @@
LDFLAGS+= -mabi=32 -march=mips3
MKDEPFLAGS+= -mabi=32 -march=mips3
-LIBMPFR_MACHINE_ARCH= mipsel
-LIBGMP_MACHINE_ARCH= mipsel
-
.include ${.PARSEDIR}/../../Makefile.compat
Index: src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/Makefile.inc
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/Makefile.inc:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/Makefile.inc:1.2
--- src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/Makefile.inc:1.1 Sun Jul 3 13:43:23 2011
+++ src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/Makefile.inc Sun Jul 10 03:05:33 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2011/07/03 13:43:23 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.2 2011/07/10 03:05:33 mrg Exp $
SRCS+= \
random.c \
@@ -156,12 +156,14 @@
gen-trialdivtab: gen-trialdivtab.c
${HOST_CC} -o ${.OBJDIR}/gen-trialdivtab ${.ALLSRC} -lm
-# XXX
-# XXX is this right?
+.if (defined(CPUFLAGS) !empty(CPUFLAGS:M-mabi=64))
GMP_LIMB_BITS=64
+.else
+GMP_LIMB_BITS=32
+.endif
trialdiv.c: trialdivtab.h
-trialdivtab.h: gen-trialdivtab
+trialdivtab.h: gen-trialdivtab Makefile
${.OBJDIR}/gen-trialdivtab $(GMP_LIMB_BITS) 8000 ${.OBJDIR}/trialdivtab.h
CLEANFILES+= trialdivtab.h
Index: src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp-mparam.h
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp-mparam.h:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp-mparam.h:1.2
--- src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp-mparam.h:1.1 Sun Jul 3 13:43:23 2011
+++ src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp-mparam.h Sun Jul 10 03:05:33 2011
@@ -19,8 +19,13 @@
with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */
+#ifdef _ABI64
#define GMP_LIMB_BITS 64
#define BYTES_PER_MP_LIMB 8
+#else
+#define GMP_LIMB_BITS 32
+#define BYTES_PER_MP_LIMB 4
+#endif
/* Generated by tuneup.c, 2004-02-10, gcc 3.2 MIPSpro C 7.2.1 (R1x000) */
Index: src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp.h
diff -u src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp.h:1.1 src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp.h:1.2
--- src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp.h:1.1 Sun Jul 3 13:43:23 2011
+++ src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/gmp.h Sun Jul 10 03:05:33 2011
@@ -30,7 +30,11 @@
#if ! defined (__GMP_WITHIN_CONFIGURE)
#define __GMP_HAVE_HOST_CPU_FAMILY_power 0
#define __GMP_HAVE_HOST_CPU_FAMILY_powerpc 0
+#ifdef _ABI64
#define GMP_LIMB_BITS 64
+#else
+#define GMP_LIMB_BITS 32
CVS commit: src/share/mk
Module Name:src
Committed By: tsutsui
Date: Sun Jul 10 04:36:13 UTC 2011
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Add OBJCOPY_ELF2AOUT_FLAGS for some arm ports to create a.out binaries
using objcopy(1) for old firmware, shared among src/distrib and
src/sys/arch/${MACHIHNE}/conf/Makefile.${MACHINE}.inc.
Discussed with mrg@ and matt@ on source-changes-d@.
To generate a diff of this commit:
cvs rdiff -u -r1.673 -r1.674 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.673 src/share/mk/bsd.own.mk:1.674
--- src/share/mk/bsd.own.mk:1.673 Sat Jul 2 20:21:16 2011
+++ src/share/mk/bsd.own.mk Sun Jul 10 04:36:13 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.673 2011/07/02 20:21:16 matt Exp $
+# $NetBSD: bsd.own.mk,v 1.674 2011/07/10 04:36:13 tsutsui Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -436,6 +436,27 @@
FC= ${TOOL_FC.${ACTIVE_FC}}
OBJC= ${TOOL_OBJC.${ACTIVE_OBJC}}
+# OBJCOPY flags to create a.out binaries for old firmware
+# shared among src/distrib and ${MACHINE}/conf/Makefile.${MACHINE}.inc
+.if ${MACHINE_CPU} == arm
+OBJCOPY_ELF2AOUT_FLAGS?= \
+ -O a.out-arm-netbsd \
+ -R .ident \
+ -R .ARM.attributes \
+ -R .arm.atpcs \
+ -R .comment \
+ -R .debug_abbrev \
+ -R .debug_info \
+ -R .debug_line \
+ -R .debug_frame \
+ -R .debug_loc \
+ -R .debug_pubnames \
+ -R .debug_aranges \
+ -R .debug_str \
+ -R .debug_pubtypes \
+ -R .note.netbsd.ident
+.endif
+
#
# Targets to check if DESTDIR or RELEASEDIR is provided
#
CVS commit: src
Module Name:src
Committed By: tsutsui
Date: Sun Jul 10 04:37:56 UTC 2011
Modified Files:
src/distrib/cats/instkernel: Makefile
src/distrib/shark/instkernel/instkernel: Makefile
src/sys/arch/cats/conf: Makefile.cats.inc
src/sys/arch/shark/conf: Makefile.shark.inc
Log Message:
Use common ${OBJCOPY_ELF2AOUT_FLAGS}.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/distrib/cats/instkernel/Makefile
cvs rdiff -u -r1.22 -r1.23 src/distrib/shark/instkernel/instkernel/Makefile
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/cats/conf/Makefile.cats.inc
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/shark/conf/Makefile.shark.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/cats/instkernel/Makefile
diff -u src/distrib/cats/instkernel/Makefile:1.20 src/distrib/cats/instkernel/Makefile:1.21
--- src/distrib/cats/instkernel/Makefile:1.20 Sat Jul 2 17:37:28 2011
+++ src/distrib/cats/instkernel/Makefile Sun Jul 10 04:37:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2011/07/02 17:37:28 tsutsui Exp $
+# $NetBSD: Makefile,v 1.21 2011/07/10 04:37:56 tsutsui Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -12,16 +12,8 @@
MDSET_NOSTRIP= # defined
-REMOVE_SECTIONS= \
- -R .ident -R .arm.atpcs -R .comment -R .note.netbsd.ident \
- -R .debug_abbrev -R .debug_info -R .debug_line -R .debug_str \
- -R .debug_frame -R .debug_loc -R .debug_pubnames \
- -R .debug_aranges -R .debug_pubtypes -R .ARM.attributes
-
MDSET_POST.netbsd-INSTALL.aout= \
-${OBJCOPY} -O a.out-arm-netbsd \
- ${REMOVE_SECTIONS} \
- ${.TARGET} ${.TARGET}.tmp ;\
+${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} ${.TARGET} ${.TARGET}.tmp ;\
mv ${.TARGET}.tmp ${.TARGET}
.include ${DISTRIBDIR}/common/Makefile.mdset
Index: src/distrib/shark/instkernel/instkernel/Makefile
diff -u src/distrib/shark/instkernel/instkernel/Makefile:1.22 src/distrib/shark/instkernel/instkernel/Makefile:1.23
--- src/distrib/shark/instkernel/instkernel/Makefile:1.22 Sat Jul 2 17:37:28 2011
+++ src/distrib/shark/instkernel/instkernel/Makefile Sun Jul 10 04:37:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2011/07/02 17:37:28 tsutsui Exp $
+# $NetBSD: Makefile,v 1.23 2011/07/10 04:37:56 tsutsui Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -11,16 +11,8 @@
MDSET_SUFFIXES.-= aout create-aout
-REMOVE_SECTIONS= \
- -R .ident -R .arm.atpcs -R .comment -R .note.netbsd.ident \
- -R .debug_abbrev -R .debug_info -R .debug_line -R .debug_str \
- -R .debug_frame -R .debug_loc -R .debug_pubnames \
- -R .debug_aranges -R .debug_pubtypes -R .ARM.attributes
-
create-aout= \
- ${OBJCOPY} -O a.out-arm-netbsd \
- ${REMOVE_SECTIONS} \
- ${.TARGET:R} ${.TARGET}
+ ${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} ${.TARGET:R} ${.TARGET}
release:: check_RELEASEDIR .WAIT netbsd-INSTALL.aout.gz
${RELEASE_INSTALL} netbsd-INSTALL.aout.gz \
Index: src/sys/arch/cats/conf/Makefile.cats.inc
diff -u src/sys/arch/cats/conf/Makefile.cats.inc:1.24 src/sys/arch/cats/conf/Makefile.cats.inc:1.25
--- src/sys/arch/cats/conf/Makefile.cats.inc:1.24 Sat Jul 2 17:37:28 2011
+++ src/sys/arch/cats/conf/Makefile.cats.inc Sun Jul 10 04:37:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cats.inc,v 1.24 2011/07/02 17:37:28 tsutsui Exp $
+# $NetBSD: Makefile.cats.inc,v 1.25 2011/07/10 04:37:56 tsutsui Exp $
MACHINE_ARCH= arm
CPPFLAGS+= -D${MACHINE}
@@ -19,18 +19,7 @@
${SYSTEM_OBJ} ; \
cat ${ARM}/conf/kern.ldscript.tail ) ldscript
-REMOVE_SECTIONS= \
- -R .ident -R .arm.atpcs -R .comment -R .note.netbsd.ident \
- -R .debug_abbrev -R .debug_info -R .debug_line -R .debug_str \
- -R .debug_frame -R .debug_loc -R .debug_pubnames \
- -R .debug_aranges -R .debug_pubtypes -R .ARM.attributes
-
SYSTEM_LD_TAIL_EXTRA+=; \
- echo \
- ${OBJCOPY} -O a.out-arm-netbsd \
- ${REMOVE_SECTIONS} \
- $@ $@.aout; \
- ${OBJCOPY} -O a.out-arm-netbsd \
- ${REMOVE_SECTIONS} \
- $@ $@.aout
+ echo ${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} $@ $@.aout; \
+ ${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} $@ $@.aout
.endif
Index: src/sys/arch/shark/conf/Makefile.shark.inc
diff -u src/sys/arch/shark/conf/Makefile.shark.inc:1.15 src/sys/arch/shark/conf/Makefile.shark.inc:1.16
--- src/sys/arch/shark/conf/Makefile.shark.inc:1.15 Sat Jul 2 17:33:10 2011
+++ src/sys/arch/shark/conf/Makefile.shark.inc Sun Jul 10 04:37:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.shark.inc,v 1.15 2011/07/02 17:33:10 tsutsui Exp $
+# $NetBSD: Makefile.shark.inc,v 1.16 2011/07/10 04:37:56 tsutsui Exp $
MACHINE_ARCH= arm
CPPFLAGS+= -D${MACHINE}
@@ -15,19 +15,8 @@
${SYSTEM_OBJ} ; \
cat ${ARM}/conf/kern.ldscript.tail ) ldscript
-REMOVE_SECTIONS= \
- -R .ident -R .arm.atpcs -R .comment -R .note.netbsd.ident \
- -R .debug_abbrev -R .debug_info -R .debug_line -R .debug_str \
- -R .debug_frame -R .debug_loc -R .debug_pubnames \
CVS commit: src/sys/arch
Module Name:src Committed By: matt Date: Sun Jul 10 04:49:37 UTC 2011 Modified Files: src/sys/arch/hppa/include: ieee.h src/sys/arch/sparc/include: ieee.h Log Message: Add defines for extu_frac[ln]m To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hppa/include/ieee.h cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sparc/include/ieee.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/hppa/include/ieee.h diff -u src/sys/arch/hppa/include/ieee.h:1.11 src/sys/arch/hppa/include/ieee.h:1.12 --- src/sys/arch/hppa/include/ieee.h:1.11 Mon Sep 20 16:13:35 2010 +++ src/sys/arch/hppa/include/ieee.h Sun Jul 10 04:49:37 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ieee.h,v 1.11 2010/09/20 16:13:35 christos Exp $ */ +/* $NetBSD: ieee.h,v 1.12 2011/07/10 04:49:37 matt Exp $ */ /* $OpenBSD: ieee.h,v 1.1 1999/04/20 19:44:04 mickey Exp $ */ @@ -109,6 +109,8 @@ #define extu_exp extu_ext.ext_exp #define extu_sign extu_ext.ext_sign #define extu_fracl extu_ext.ext_fracl +#define extu_fraclm extu_ext.ext_fraclm +#define extu_frachm extu_ext.ext_frachm #define extu_frach extu_ext.ext_frach #define LDBL_NBIT 0x8000 Index: src/sys/arch/sparc/include/ieee.h diff -u src/sys/arch/sparc/include/ieee.h:1.13 src/sys/arch/sparc/include/ieee.h:1.14 --- src/sys/arch/sparc/include/ieee.h:1.13 Mon Sep 20 16:13:35 2010 +++ src/sys/arch/sparc/include/ieee.h Sun Jul 10 04:49:37 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ieee.h,v 1.13 2010/09/20 16:13:35 christos Exp $ */ +/* $NetBSD: ieee.h,v 1.14 2011/07/10 04:49:37 matt Exp $ */ /* * Copyright (c) 1992, 1993 @@ -114,6 +114,8 @@ #define extu_exp extu_ext.ext_exp #define extu_sign extu_ext.ext_sign #define extu_fracl extu_ext.ext_fracl +#define extu_fraclm extu_ext.ext_fraclm +#define extu_frachm extu_ext.ext_frachm #define extu_frach extu_ext.ext_frach #define LDBL_NBIT 0x8000
CVS commit: src/lib/libc
Module Name:src
Committed By: matt
Date: Sun Jul 10 04:52:23 UTC 2011
Modified Files:
src/lib/libc/arch/sparc64: Makefile.inc
src/lib/libc/softfloat/bits64: softfloat.c
Log Message:
Fix so that float128_to_uint64_round_to_zero is defined for sparc64.
(isn't tha a namespace violation?)
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/arch/sparc64/Makefile.inc
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/softfloat/bits64/softfloat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/sparc64/Makefile.inc
diff -u src/lib/libc/arch/sparc64/Makefile.inc:1.16 src/lib/libc/arch/sparc64/Makefile.inc:1.17
--- src/lib/libc/arch/sparc64/Makefile.inc:1.16 Wed Jun 22 05:23:53 2011
+++ src/lib/libc/arch/sparc64/Makefile.inc Sun Jul 10 04:52:23 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.16 2011/06/22 05:23:53 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.17 2011/07/10 04:52:23 matt Exp $
SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
@@ -8,6 +8,7 @@
.PATH: ${ARCHDIR}/softfloat
SRCS+= qp.c
CPPFLAGS+= -DSOFTFLOATSPARC64_FOR_GCC -DEXCEPTIONS_WITH_SOFTFLOAT
+CPPFLAGS+= -DSOFTFLOAT_NEED_FIXUNS
.if ${MKSOFTFLOAT} != no
.include softfloat/Makefile.inc
.else
Index: src/lib/libc/softfloat/bits64/softfloat.c
diff -u src/lib/libc/softfloat/bits64/softfloat.c:1.7 src/lib/libc/softfloat/bits64/softfloat.c:1.8
--- src/lib/libc/softfloat/bits64/softfloat.c:1.7 Sat Jul 9 02:28:31 2011
+++ src/lib/libc/softfloat/bits64/softfloat.c Sun Jul 10 04:52:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: softfloat.c,v 1.7 2011/07/09 02:28:31 matt Exp $ */
+/* $NetBSD: softfloat.c,v 1.8 2011/07/10 04:52:23 matt Exp $ */
/*
* This version hacked for use with gcc -msoft-float by bjh21.
@@ -46,7 +46,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: softfloat.c,v 1.7 2011/07/09 02:28:31 matt Exp $);
+__RCSID($NetBSD: softfloat.c,v 1.8 2011/07/10 04:52:23 matt Exp $);
#endif /* LIBC_SCCS and not lint */
#ifdef SOFTFLOAT_FOR_GCC
@@ -4482,7 +4482,8 @@
}
-#if defined(SOFTFLOAT_FOR_GCC) defined(SOFTFLOAT_NEED_FIXUNS)
+#if (defined(SOFTFLOATSPARC64_FOR_GCC) || defined(SOFTFLOAT_FOR_GCC)) \
+ defined(SOFTFLOAT_NEED_FIXUNS)
/*
* just like above - but do not care for overflow of signed results
*/
@@ -4532,7 +4533,7 @@
return z;
}
-#endif /* defined(SOFTFLOAT_FOR_GCC) defined(SOFTFLOAT_NEED_FIXUNS) */
+#endif /* (SOFTFLOATSPARC64_FOR_GCC || SOFTFLOAT_FOR_GCC) SOFTFLOAT_NEED_FIXUNS */
/*
---
CVS commit: src/usr.bin/elf2aout
Module Name:src
Committed By: tsutsui
Date: Sun Jul 10 04:56:32 UTC 2011
Modified Files:
src/usr.bin/elf2aout: elf2aout.c
Log Message:
Set a_midmag MAGIC in a.out header properly for more possible a.out ports
in the past per ex.e_machine in ELF header.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/elf2aout/elf2aout.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/elf2aout/elf2aout.c
diff -u src/usr.bin/elf2aout/elf2aout.c:1.13 src/usr.bin/elf2aout/elf2aout.c:1.14
--- src/usr.bin/elf2aout/elf2aout.c:1.13 Tue Jun 28 13:15:24 2011
+++ src/usr.bin/elf2aout/elf2aout.c Sun Jul 10 04:56:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: elf2aout.c,v 1.13 2011/06/28 13:15:24 tsutsui Exp $ */
+/* $NetBSD: elf2aout.c,v 1.14 2011/07/10 04:56:31 tsutsui Exp $ */
/*
* Copyright (c) 1995
@@ -75,6 +75,7 @@
struct exec aex;
int infile, outfile;
unsigned long cur_vma = ULONG_MAX;
+ unsigned long mid;
int symflag = 0;
strtabix = symtabix = 0;
@@ -209,10 +210,36 @@
text.len = data.vaddr - text.vaddr;
/* We now have enough information to cons up an a.out header... */
- aex.a_midmag = htonl((symflag 26) | (MID_PMAX 16) | OMAGIC);
- if (ex.e_machine == EM_PPC)
- aex.a_midmag = htonl((symflag 26) | (MID_POWERPC 16)
- | OMAGIC);
+ switch (ex.e_machine) {
+ case EM_SPARC:
+ mid = MID_SPARC;
+ break;
+ case EM_386:
+ mid = MID_PC386;
+ break;
+ case EM_68K:
+ mid = MID_M68K;
+ break;
+ case EM_MIPS:
+ if (ex.e_ident[EI_DATA] == ELFDATA2LSB)
+ mid = MID_PMAX;
+ else
+ mid = MID_MIPS;
+ break;
+ case EM_PPC:
+ mid = MID_POWERPC;
+ break;
+ case EM_ARM:
+ mid = MID_ARM6;
+ break;
+ case EM_VAX:
+ mid = MID_VAX;
+ break;
+ case EM_NONE:
+ default:
+ mid = MID_ZERO;
+ }
+ aex.a_midmag = htonl((symflag 26) | (mid 16) | OMAGIC);
aex.a_text = text.len;
aex.a_data = data.len;
CVS commit: src/usr.bin/elf2aout
Module Name:src
Committed By: tsutsui
Date: Sun Jul 10 05:07:48 UTC 2011
Modified Files:
src/usr.bin/elf2aout: elf2aout.c
Log Message:
Make this cross-tool ready. Mostly taken from elf2ecoff(1).
XXX: assume no LP64 a.out binaries
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/elf2aout/elf2aout.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/elf2aout/elf2aout.c
diff -u src/usr.bin/elf2aout/elf2aout.c:1.14 src/usr.bin/elf2aout/elf2aout.c:1.15
--- src/usr.bin/elf2aout/elf2aout.c:1.14 Sun Jul 10 04:56:31 2011
+++ src/usr.bin/elf2aout/elf2aout.c Sun Jul 10 05:07:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: elf2aout.c,v 1.14 2011/07/10 04:56:31 tsutsui Exp $ */
+/* $NetBSD: elf2aout.c,v 1.15 2011/07/10 05:07:48 tsutsui Exp $ */
/*
* Copyright (c) 1995
@@ -34,6 +34,14 @@
The minimal symbol table is copied, but the debugging symbols and
other informational sections are not. */
+#if HAVE_NBTOOL_CONFIG_H
+#include nbtool_config.h
+#endif
+
+#ifndef TARGET_BYTE_ORDER
+#define TARGET_BYTE_ORDER BYTE_ORDER
+#endif
+
#include sys/types.h
#include sys/exec_aout.h
#include sys/exec_elf.h
@@ -50,8 +58,9 @@
struct sect {
- unsigned long vaddr;
- unsigned long len;
+ /* should be unsigned long, but assume no a.out binaries on LP64 */
+ uint32_t vaddr;
+ uint32_t len;
};
void combine(struct sect *, struct sect *, int);
@@ -60,6 +69,10 @@
void copy(int, int, off_t, off_t);
void translate_syms(int, int, off_t, off_t, off_t, off_t);
+#if TARGET_BYTE_ORDER != BYTE_ORDER
+void bswap32_region(int32_t* , int);
+#endif
+
int*symTypeTable;
int
@@ -74,8 +87,8 @@
struct sect text, data, bss;
struct exec aex;
int infile, outfile;
- unsigned long cur_vma = ULONG_MAX;
- unsigned long mid;
+ uint32_t cur_vma = UINT32_MAX;
+ uint32_t mid;
int symflag = 0;
strtabix = symtabix = 0;
@@ -107,12 +120,33 @@
argv[1], i ? strerror(errno) : End of file reached);
exit(1);
}
+#if TARGET_BYTE_ORDER != BYTE_ORDER
+ ex.e_type = bswap16(ex.e_type);
+ ex.e_machine = bswap16(ex.e_machine);
+ ex.e_version = bswap32(ex.e_version);
+ ex.e_entry = bswap32(ex.e_entry);
+ ex.e_phoff = bswap32(ex.e_phoff);
+ ex.e_shoff = bswap32(ex.e_shoff);
+ ex.e_flags = bswap32(ex.e_flags);
+ ex.e_ehsize = bswap16(ex.e_ehsize);
+ ex.e_phentsize = bswap16(ex.e_phentsize);
+ ex.e_phnum = bswap16(ex.e_phnum);
+ ex.e_shentsize = bswap16(ex.e_shentsize);
+ ex.e_shnum = bswap16(ex.e_shnum);
+ ex.e_shstrndx = bswap16(ex.e_shstrndx);
+#endif
/* Read the program headers... */
ph = (Elf32_Phdr *) saveRead(infile, ex.e_phoff,
ex.e_phnum * sizeof(Elf32_Phdr), ph);
+#if TARGET_BYTE_ORDER != BYTE_ORDER
+ bswap32_region((int32_t*)ph, sizeof(Elf32_Phdr) * ex.e_phnum);
+#endif
/* Read the section headers... */
sh = (Elf32_Shdr *) saveRead(infile, ex.e_shoff,
ex.e_shnum * sizeof(Elf32_Shdr), sh);
+#if TARGET_BYTE_ORDER != BYTE_ORDER
+ bswap32_region((int32_t*)sh, sizeof(Elf32_Shdr) * ex.e_shnum);
+#endif
/* Read in the section string table. */
shstrtab = saveRead(infile, sh[ex.e_shstrndx].sh_offset,
sh[ex.e_shstrndx].sh_size, shstrtab);
@@ -250,6 +284,15 @@
? sh[symtabix].sh_size / sizeof(Elf32_Sym) : 0));
aex.a_trsize = 0;
aex.a_drsize = 0;
+#if TARGET_BYTE_ORDER != BYTE_ORDER
+ aex.a_text = bswap32(aex.a_text);
+ aex.a_data = bswap32(aex.a_data);
+ aex.a_bss = bswap32(aex.a_bss);
+ aex.a_entry = bswap32(aex.a_entry);
+ aex.a_syms = bswap32(aex.a_syms);
+ aex.a_trsize = bswap32(aex.a_trsize);
+ aex.a_drsize = bswap32(aex.a_drsize);
+#endif
/* Make the output file... */
if ((outfile = open(argv[2], O_WRONLY | O_CREAT, 0777)) 0) {
@@ -274,7 +317,7 @@
* that the section can be loaded before copying. */
if (ph[i].p_type == PT_LOAD ph[i].p_filesz) {
if (cur_vma != ph[i].p_vaddr) {
-unsigned long gap = ph[i].p_vaddr - cur_vma;
+uint32_t gap = ph[i].p_vaddr - cur_vma;
charobuf[1024];
if (gap 65536)
errx(1,
@@ -323,7 +366,7 @@
int i, remaining, cur;
char *oldstrings;
char *newstrings, *nsp;
- int newstringsize;
+ int newstringsize, stringsizebuf;
/* Zero the unused fields in the output buffer.. */
memset(outbuf, 0, sizeof outbuf);
@@ -359,7 +402,7 @@
cur = SYMS_PER_PASS;
remaining -= cur;
if ((i = read(in, inbuf, cur * sizeof(Elf32_Sym)))
- != cur * (long)sizeof(Elf32_Sym)) {
+ != cur * (ssize_t)sizeof(Elf32_Sym)) {
if (i 0)
perror(translate_syms);
else
@@ -370,6 +413,12 @@
for (i = 0; i cur; i++) {
int binding, type;
+#if TARGET_BYTE_ORDER != BYTE_ORDER
+ inbuf[i].st_name = bswap32(inbuf[i].st_name);
+ inbuf[i].st_value = bswap32(inbuf[i].st_value);
+ inbuf[i].st_size = bswap32(inbuf[i].st_size);
+ inbuf[i].st_shndx = bswap16(inbuf[i].st_shndx);
+#endif
/* Copy the symbol into the new table, but prepend an
