CVS commit: src/sys/arch/i386/pnpbios
Module Name:src
Committed By: cegger
Date: Tue Oct 20 10:34:21 UTC 2009
Modified Files:
src/sys/arch/i386/pnpbios: ess_pnpbios.c
Log Message:
Use aprint_* when attaching. While here, unwrap some lines.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/i386/pnpbios/ess_pnpbios.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/i386/pnpbios/ess_pnpbios.c
diff -u src/sys/arch/i386/pnpbios/ess_pnpbios.c:1.19 src/sys/arch/i386/pnpbios/ess_pnpbios.c:1.20
--- src/sys/arch/i386/pnpbios/ess_pnpbios.c:1.19 Tue Jun 23 15:00:18 2009
+++ src/sys/arch/i386/pnpbios/ess_pnpbios.c Tue Oct 20 10:34:21 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ess_pnpbios.c,v 1.19 2009/06/23 15:00:18 christos Exp $ */
+/* $NetBSD: ess_pnpbios.c,v 1.20 2009/10/20 10:34:21 cegger Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ess_pnpbios.c,v 1.19 2009/06/23 15:00:18 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: ess_pnpbios.c,v 1.20 2009/10/20 10:34:21 cegger Exp $);
#include sys/param.h
#include sys/systm.h
@@ -62,8 +62,7 @@
ess_pnpbios_match, ess_pnpbios_attach, NULL, NULL);
int
-ess_pnpbios_match(device_t parent, cfdata_t match,
-void *aux)
+ess_pnpbios_match(device_t parent, cfdata_t match, void *aux)
{
struct pnpbiosdev_attach_args *aa = aux;
@@ -83,14 +82,13 @@
}
void
-ess_pnpbios_attach(device_t parent, device_t self,
-void *aux)
+ess_pnpbios_attach(device_t parent, device_t self, void *aux)
{
struct ess_softc *sc = device_private(self);
struct pnpbiosdev_attach_args *aa = aux;
if (pnpbios_io_map(aa-pbt, aa-resc, 0, sc-sc_iot, sc-sc_ioh)) {
- printf(: can't map i/o space\n);
+ aprint_error(: can't map i/o space\n);
return;
}
@@ -104,7 +102,7 @@
if (pnpbios_getirqnum(aa-pbt, aa-resc, 0, sc-sc_audio1.irq,
NULL)) {
- printf(: can't get IRQ\n);
+ aprint_error(: can't get IRQ\n);
return;
}
@@ -113,20 +111,21 @@
sc-sc_audio2.irq = -1;
if (pnpbios_getdmachan(aa-pbt, aa-resc, 0, sc-sc_audio1.drq)) {
- printf(: can't get DMA channel\n);
+ aprint_error(: can't get DMA channel\n);
return;
}
if (pnpbios_getdmachan(aa-pbt, aa-resc, 1, sc-sc_audio2.drq))
sc-sc_audio2.drq = -1;
- printf(\n);
+ aprint_naive(\n);
+ aprint_normal(\n);
pnpbios_print_devres(self, aa);
- printf(%s, device_xname(self));
+ aprint_normal_dev(self, );
if (!essmatch(sc)) {
- aprint_error_dev(sc-sc_dev, essmatch failed\n);
+ aprint_error_dev(self, essmatch failed\n);
pnpbios_io_unmap(aa-pbt, aa-resc, 0, sc-sc_iot, sc-sc_ioh);
return;
}
CVS commit: src/sys/rump/librump
Module Name:src
Committed By: pooka
Date: Tue Oct 20 10:42:41 UTC 2009
Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern rump.c
src/sys/rump/librump/rumpvfs: Makefile.rumpvfs
Log Message:
Actually, put uvm_readahead into rumpkern, since while it's
technically vfs stuff, sys_descrip depends on it and readahead
itself uses only the pager interface.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.127 -r1.128 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.17 -r1.18 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.54 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.55
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.54 Mon Oct 19 22:07:29 2009
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Tue Oct 20 10:42:41 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.54 2009/10/19 22:07:29 christos Exp $
+# $NetBSD: Makefile.rumpkern,v 1.55 2009/10/20 10:42:41 pooka Exp $
#
.include ${RUMPTOP}/Makefile.rump
@@ -7,6 +7,7 @@
.PATH: ${RUMPTOP}/librump/rumpkern\
${RUMPTOP}/../kern \
+ ${RUMPTOP}/../uvm \
${RUMPTOP}/../conf \
${RUMPTOP}/../dev \
${RUMPTOP}/../secmodel/suser
@@ -42,6 +43,9 @@
subr_log.c subr_once.c subr_prf.c subr_specificdata.c \
subr_time.c subr_workqueue.c
+# sys/uvm
+SRCS+= uvm_readahead.c
+
# 4.4BSD secmodel. selection is hardcoded for now
SRCS+= secmodel_suser.c
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.127 src/sys/rump/librump/rumpkern/rump.c:1.128
--- src/sys/rump/librump/rumpkern/rump.c:1.127 Mon Oct 19 22:35:11 2009
+++ src/sys/rump/librump/rumpkern/rump.c Tue Oct 20 10:42:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.127 2009/10/19 22:35:11 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.128 2009/10/20 10:42:41 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.127 2009/10/19 22:35:11 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.128 2009/10/20 10:42:41 pooka Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -125,7 +125,6 @@
__weak_alias(biodone,rump__unavailable);
__weak_alias(sopoll,rump__unavailable);
-__weak_alias(uvm_readahead,rump__unavailable);
void rump__unavailable_vfs_panic(void);
void rump__unavailable_vfs_panic() {panic(vfs component not available);}
Index: src/sys/rump/librump/rumpvfs/Makefile.rumpvfs
diff -u src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.17 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.18
--- src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.17 Wed Oct 14 17:29:20 2009
+++ src/sys/rump/librump/rumpvfs/Makefile.rumpvfs Tue Oct 20 10:42:41 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpvfs,v 1.17 2009/10/14 17:29:20 pooka Exp $
+# $NetBSD: Makefile.rumpvfs,v 1.18 2009/10/20 10:42:41 pooka Exp $
#
.include ${RUMPTOP}/Makefile.rump
@@ -30,7 +30,7 @@
vfs_syscalls.c vfs_vnops.c vfs_wapbl.c vfs_xattr.c
# sys/uvm
-SRCS+= uvm_readahead.c uvm_vnode.c
+SRCS+= uvm_vnode.c
# sys/miscfs/syncfs
SRCS+= sync_subr.c sync_vnops.c
CVS commit: src/sys/rump/net/lib/libsockin
Module Name:src
Committed By: tron
Date: Tue Oct 20 12:17:44 UTC 2009
Modified Files:
src/sys/rump/net/lib/libsockin: sockin.c
Log Message:
Only allocate a struct iovec array from the healp if a reasonably sized
stack array isn't large enough.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/rump/net/lib/libsockin/sockin.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/rump/net/lib/libsockin/sockin.c
diff -u src/sys/rump/net/lib/libsockin/sockin.c:1.19 src/sys/rump/net/lib/libsockin/sockin.c:1.20
--- src/sys/rump/net/lib/libsockin/sockin.c:1.19 Sun Oct 18 22:55:56 2009
+++ src/sys/rump/net/lib/libsockin/sockin.c Tue Oct 20 12:17:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sockin.c,v 1.19 2009/10/18 22:55:56 tron Exp $ */
+/* $NetBSD: sockin.c,v 1.20 2009/10/20 12:17:44 tron Exp $ */
/*
* Copyright (c) 2008, 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sockin.c,v 1.19 2009/10/18 22:55:56 tron Exp $);
+__KERNEL_RCSID(0, $NetBSD: sockin.c,v 1.20 2009/10/20 12:17:44 tron Exp $);
#include sys/param.h
#include sys/condvar.h
@@ -408,7 +408,7 @@
struct sockaddr *saddr;
struct msghdr mhdr;
size_t iov_max, i;
- struct iovec *iov;
+ struct iovec iov_buf[32], *iov;
struct mbuf *m2;
size_t tot;
int s;
@@ -419,10 +419,13 @@
for (m2 = m; m2 != NULL; m2 = m2-m_next) {
iov_max++;
}
- if (iov_max == 0)
- iov_max = 1;
- iov = kmem_alloc(sizeof(struct iovec) * iov_max, KM_SLEEP);
+ if (iov_max = __arraycount(iov_buf)) {
+ iov = iov_buf;
+ } else {
+ iov = kmem_alloc(sizeof(struct iovec) * iov_max,
+ KM_SLEEP);
+ }
tot = 0;
for (i = 0, m2 = m; m2 != NULL; m2 = m2-m_next, i++) {
@@ -442,7 +445,8 @@
rumpuser_net_sendmsg(s, mhdr, 0, error);
- kmem_free(iov, sizeof(struct iovec) * iov_max);
+ if (iov != iov_buf)
+ kmem_free(iov, sizeof(struct iovec) * iov_max);
m_freem(m);
m_freem(control);
CVS commit: src/sys/arch/i386/stand/lib
Module Name:src
Committed By: jmcneill
Date: Tue Oct 20 14:47:33 UTC 2009
Modified Files:
src/sys/arch/i386/stand/lib: vbe.c
Log Message:
trim some fat
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/i386/stand/lib/vbe.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/i386/stand/lib/vbe.c
diff -u src/sys/arch/i386/stand/lib/vbe.c:1.4 src/sys/arch/i386/stand/lib/vbe.c:1.5
--- src/sys/arch/i386/stand/lib/vbe.c:1.4 Mon Sep 14 11:56:27 2009
+++ src/sys/arch/i386/stand/lib/vbe.c Tue Oct 20 14:47:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vbe.c,v 1.4 2009/09/14 11:56:27 jmcneill Exp $ */
+/* $NetBSD: vbe.c,v 1.5 2009/10/20 14:47:33 jmcneill Exp $ */
/*-
* Copyright (c) 2009 Jared D. McNeill jmcne...@invisible.ca
@@ -38,25 +38,11 @@
extern const uint8_t rasops_cmap[];
-static int vbeverbose = 1;
-
static struct _vbestate {
int available;
int modenum;
} vbestate;
-static void
-vbe_dump(struct vbeinfoblock *vbe)
-{
- int mem = (int)vbe-TotalMemory * 64;
-
- if (!vbeverbose)
- return;
-
- printf( VESA VBE Version %d.%d %d k\n,
- vbe-VbeVersion 8, vbe-VbeVersion 0xff, mem);
-}
-
static int
vbe_mode_is_supported(struct modeinfoblock *mi)
{
@@ -74,6 +60,16 @@
return 1;
}
+static bool
+vbe_check(void)
+{
+ if (!vbestate.available) {
+ printf(VBE not available\n);
+ return false;
+ }
+ return true;
+}
+
void
vbe_init(void)
{
@@ -83,14 +79,9 @@
memcpy(vbe.VbeSignature, VBE2, 4);
if (biosvbe_info(vbe) != 0x004f)
return;
- if (memcmp(vbe.VbeSignature, VESA, 4) != 0) {
- printf(VESA VBE: bad signature %c%c%c%c\n,
- vbe.VbeSignature[0], vbe.VbeSignature[1],
- vbe.VbeSignature[2], vbe.VbeSignature[3]);
+ if (memcmp(vbe.VbeSignature, VESA, 4) != 0)
return;
- }
- vbe_dump(vbe);
vbestate.available = 1;
vbestate.modenum = 0;
}
@@ -107,10 +98,8 @@
struct paletteentry pe;
int ret;
- if (!vbestate.available) {
- printf(VESA BIOS extensions not available\n);
+ if (!vbe_check())
return 1;
- }
pe.Blue = cmap[2] 2;
pe.Green = cmap[1] 2;
@@ -129,25 +118,23 @@
struct btinfo_framebuffer fb;
int ret, i;
- if (!vbestate.available) {
- printf(VESA BIOS extensions not available\n);
+ if (!vbe_check())
return 1;
- }
ret = biosvbe_get_mode_info(modenum, mi);
if (ret != 0x004f) {
- printf(VESA VBE mode 0x%x is invalid.\n, modenum);
+ printf(mode 0x%x invalid\n, modenum);
return 1;
}
if (!vbe_mode_is_supported(mi)) {
- printf(VESA VBE mode 0x%x is not supported.\n, modenum);
+ printf(mode 0x%x not supported\n, modenum);
return 1;
}
ret = biosvbe_set_mode(modenum);
if (ret != 0x004f) {
- printf(VESA VBE mode 0x%x could not be set.\n, modenum);
+ printf(mode 0x%x could not be set\n, modenum);
return 1;
}
@@ -183,7 +170,7 @@
if (vbestate.modenum 0) {
ret = vbe_set_mode(vbestate.modenum);
if (ret) {
- printf(WARNING: failed to set VESA VBE mode 0x%x\n,
+ printf(WARNING: failed to set VBE mode 0x%x\n,
vbestate.modenum);
delay(500);
}
@@ -266,7 +253,6 @@
return mode;
}
- printf(VESA VBE BIOS does not support %s\n, str);
return 0;
}
@@ -286,10 +272,8 @@
uint16_t mode;
int nmodes = 0, safety = 0;
- if (!vbestate.available) {
- printf(VESA BIOS extensions not available\n);
+ if (!vbe_check())
return;
- }
printf(Modes: );
memset(vbe, 0, sizeof(vbe));
@@ -306,7 +290,7 @@
safety++;
farptr += 2;
if (safety == 100) {
- printf([garbage] );
+ printf([?] );
break;
}
if (biosvbe_get_mode_info(mode, mi) != 0x004f)
@@ -335,10 +319,8 @@
char arg[20];
int modenum;
- if (!vbe_available()) {
- printf(VESA VBE not available\n);
+ if (!vbe_check())
return;
- }
strlcpy(arg, cmd, sizeof(arg));
@@ -370,6 +352,6 @@
return;
}
- printf(invalid flag, must be 'enabled', 'disabled',
- a display mode, or a valid VESA VBE mode number.\n);
+ printf(invalid flag, must be 'on', 'off',
+ a display mode, or a VBE mode number\n);
}
CVS commit: src/sys/arch/i386/stand/lib
Module Name:src
Committed By: jmcneill
Date: Tue Oct 20 14:49:03 UTC 2009
Modified Files:
src/sys/arch/i386/stand/lib: biosdisk.c
Log Message:
trim some fat, don't scan disklabels on non-HD disks
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/i386/stand/lib/biosdisk.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/i386/stand/lib/biosdisk.c
diff -u src/sys/arch/i386/stand/lib/biosdisk.c:1.29 src/sys/arch/i386/stand/lib/biosdisk.c:1.30
--- src/sys/arch/i386/stand/lib/biosdisk.c:1.29 Sun Sep 13 22:45:27 2009
+++ src/sys/arch/i386/stand/lib/biosdisk.c Tue Oct 20 14:49:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: biosdisk.c,v 1.29 2009/09/13 22:45:27 jmcneill Exp $ */
+/* $NetBSD: biosdisk.c,v 1.30 2009/10/20 14:49:03 jmcneill Exp $ */
/*
* Copyright (c) 1996, 1998
@@ -319,17 +319,17 @@
d.ll.dev = 0x80 + i; /* hd/cd */
if (set_geometry(d.ll, ed))
continue;
+ printf(disk );
switch (d.ll.type) {
case BIOSDISK_TYPE_CD:
- printf(disk cd0\n);
- printf( cd0a(unknown)\n);
+ printf(cd0\n cd0a\n);
break;
case BIOSDISK_TYPE_FD:
- printf(disk fd%d\n, d.ll.dev 0x7f);
- printf( fd%da(unknown)\n, d.ll.dev 0x7f);
+ printf(fd%d\n, d.ll.dev 0x7f);
+ printf( fd%da\n, d.ll.dev 0x7f);
break;
case BIOSDISK_TYPE_HD:
- printf(disk hd%d, d.ll.dev 0x7f);
+ printf(hd%d, d.ll.dev 0x7f);
if (d.ll.flags BIOSDISK_INT13EXT) {
printf( size );
size = ed.totsec * ed.sbytes;
@@ -344,6 +344,8 @@
break;
}
#ifndef NO_DISKLABEL
+ if (d.ll.type != BIOSDISK_TYPE_HD)
+ continue;
if (read_label(d) == -1)
break;
lp = (struct disklabel *)(d.buf + LABELOFFSET);
CVS commit: src/dist/nvi/cl
Module Name:src
Committed By: tnn
Date: Tue Oct 20 16:17:07 UTC 2009
Modified Files:
src/dist/nvi/cl: cl_main.c
Log Message:
Print a warning if TERM is not set and stdin is a tty. PR bin/42144.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/dist/nvi/cl/cl_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/dist/nvi/cl/cl_main.c
diff -u src/dist/nvi/cl/cl_main.c:1.2 src/dist/nvi/cl/cl_main.c:1.3
--- src/dist/nvi/cl/cl_main.c:1.2 Fri Dec 5 22:51:42 2008
+++ src/dist/nvi/cl/cl_main.c Tue Oct 20 16:17:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cl_main.c,v 1.2 2008/12/05 22:51:42 christos Exp $ */
+/* $NetBSD: cl_main.c,v 1.3 2009/10/20 16:17:07 tnn Exp $ */
/*-
* Copyright (c) 1993, 1994
@@ -98,8 +98,12 @@
* We have to know what terminal it is from the start, since we may
* have to use termcap/terminfo to find out how big the screen is.
*/
- if ((ttype = getenv(TERM)) == NULL)
+ if ((ttype = getenv(TERM)) == NULL) {
+ if (isatty(STDIN_FILENO))
+ fprintf(stderr, %s: warning: TERM is not set\n,
+ gp-progname);
ttype = unknown;
+ }
term_init(gp-progname, ttype);
/* Add the terminal type to the global structure. */
CVS commit: src/sys/kern
Module Name:src
Committed By: jym
Date: Tue Oct 20 17:24:22 UTC 2009
Modified Files:
src/sys/kern: subr_pool.c
Log Message:
Fix a bug where on MP systems, pool_cache_invalidate(9) could be called
early during boot, just after CPUs are attached but before they are marked
as running.
This will result in a list of CPUs without the SPCF_RUNNING flag set, and
will trigger the 'KASSERT(xc_tailp xc_headp)' in xc_lowpri() as no cross
call is issued.
Bug reported and patch tested by t...@.
See also http://mail-index.netbsd.org/tech-kern/2009/10/19/msg006293.html
To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/sys/kern/subr_pool.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/kern/subr_pool.c
diff -u src/sys/kern/subr_pool.c:1.176 src/sys/kern/subr_pool.c:1.177
--- src/sys/kern/subr_pool.c:1.176 Thu Oct 15 20:50:12 2009
+++ src/sys/kern/subr_pool.c Tue Oct 20 17:24:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_pool.c,v 1.176 2009/10/15 20:50:12 thorpej Exp $ */
+/* $NetBSD: subr_pool.c,v 1.177 2009/10/20 17:24:22 jym Exp $ */
/*-
* Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: subr_pool.c,v 1.176 2009/10/15 20:50:12 thorpej Exp $);
+__KERNEL_RCSID(0, $NetBSD: subr_pool.c,v 1.177 2009/10/20 17:24:22 jym Exp $);
#include opt_ddb.h
#include opt_pool.h
@@ -2300,7 +2300,7 @@
pcg_t *full, *empty, *part;
uint64_t where;
- if (ncpu 2) {
+ if (ncpu 2 || !mp_online) {
/*
* We might be called early enough in the boot process
* for the CPU data structures to not be fully initialized.
CVS commit: src/sys/arch/i386/pci
Module Name:src Committed By: kardel Date: Tue Oct 20 17:29:06 UTC 2009 Modified Files: src/sys/arch/i386/pci: geodevar.h Log Message: update copyright to 2 clause version of the NetBSD Foundation To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/i386/pci/geodevar.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/i386/pci/geodevar.h diff -u src/sys/arch/i386/pci/geodevar.h:1.3 src/sys/arch/i386/pci/geodevar.h:1.4 --- src/sys/arch/i386/pci/geodevar.h:1.3 Mon May 5 11:49:40 2008 +++ src/sys/arch/i386/pci/geodevar.h Tue Oct 20 17:29:06 2009 @@ -1,9 +1,8 @@ -/* $NetBSD: geodevar.h,v 1.3 2008/05/05 11:49:40 xtraeme Exp $ */ +/* $NetBSD: geodevar.h,v 1.4 2009/10/20 17:29:06 kardel Exp $ */ /*- - * Copyright (c) 2006 Frank Kardel All rights reserved. - * - * This code was written by Frank Kardel + * Copyright (c) 2006 The NetBSD Foundation, Inc. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -13,27 +12,21 @@ * 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 David Young. - * 4. The name of David Young may not be used to endorse or promote - *products derived from this software without specific prior - *written permission. * - * THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``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 DAVID - * YOUNG 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. + * 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. */ + /* * Register definitions for the AMD Geode SC1100. */
CVS commit: src/sys/dev/if_ndis
Module Name:src
Committed By: christos
Date: Tue Oct 20 19:04:59 UTC 2009
Modified Files:
src/sys/dev/if_ndis: if_ndis.c if_ndis_pci.c
Log Message:
make this compile again.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/if_ndis/if_ndis.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/if_ndis/if_ndis_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/if_ndis/if_ndis.c
diff -u src/sys/dev/if_ndis/if_ndis.c:1.28 src/sys/dev/if_ndis/if_ndis.c:1.29
--- src/sys/dev/if_ndis/if_ndis.c:1.28 Sun Aug 2 16:22:34 2009
+++ src/sys/dev/if_ndis/if_ndis.c Tue Oct 20 15:04:59 2009
@@ -35,7 +35,7 @@
__FBSDID($FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.69.2.6 2005/03/31 04:24:36 wpaul Exp $);
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, $NetBSD: if_ndis.c,v 1.28 2009/08/02 20:22:34 dsl Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_ndis.c,v 1.29 2009/10/20 19:04:59 christos Exp $);
#endif
@@ -94,13 +94,12 @@
#include ndis_driver_data.h
-void ndis_attach (void *);
-int ndis_detach (device_t, int);
-int ndis_suspend (device_t);
-int ndis_resume (device_t);
-void ndis_shutdown (device_t);
+void ndis_attach(void *);
+int ndis_detach(device_t, int);
+int ndis_suspend(device_t);
+int ndis_resume(device_t);
+void ndis_shutdown(device_t);
-int ndisdrv_modevent (struct lkm_table *lkmtp, int cmd);
/* I moved these to if_ndisvar.h */
/*
@@ -143,8 +142,13 @@
static void ndis_setmulti (struct ndis_softc *);
static void ndis_map_sclist (void *, bus_dma_segment_t *,
int, bus_size_t, int);
+
+#ifdef _MODULE
+
static int ndisdrv_loaded = 0;
+int ndisdrv_modevent(module_t, int);
+MODULE(MODULE_CLASS_DRIVER, ndisdrv_modevent, NULL);
/*
* This routine should call windrv_load() once for each driver
* image. This will do the relocation and dynalinking for the
@@ -152,9 +156,7 @@
* saved in our driver database.
*/
int
-ndisdrv_modevent(mod, cmd)
- module_t mod;
- int cmd;
+ndisdrv_modevent(module_t mod, int cmd)
{
int error = 0;
@@ -162,7 +164,7 @@
printf(in ndisdrv_modevent\n);
#endif
switch (cmd) {
- case MOD_LOAD:
+ case MODULE_CMD_INIT:
ndisdrv_loaded++;
if (ndisdrv_loaded 1)
break;
@@ -173,7 +175,7 @@
windrv_wrap((funcptr)ndis_linksts_done,
ndis_linksts_done_wrap);
break;
- case MOD_UNLOAD:
+ case MODULE_CMD_FINI:
ndisdrv_loaded--;
if (ndisdrv_loaded 0)
break;
@@ -183,16 +185,17 @@
windrv_unwrap(ndis_linksts_wrap);
windrv_unwrap(ndis_linksts_done_wrap);
break;
-/* TODO: Do we need a LKM_E_STAT for NetBSD? */
+ case MODULE_CMD_STAT:
+ error = ENOTTY;
+ break;
default:
error = EINVAL;
break;
}
- return (error);
+ return error;
}
-#ifdef NDIS_LKM
int if_ndis_lkmentry(struct lkm_table *lkmtp, int cmd, int ver);
CFDRIVER_DECL(ndis, DV_DULL, NULL);
@@ -229,7 +232,7 @@
DISPATCH(lkmtp, cmd, ver, lkm_nofunc, lkm_nofunc, lkm_nofunc);
}
-#endif /* NIDS_LKM */
+#endif /* _MODULE */
/*
* Program the 64-bit multicast hash filter.
@@ -889,7 +892,6 @@
#endif
sc = device_get_softc(dev);
- KASSERT(mtx_initialized(sc-ndis_mtx));
NDIS_LOCK(sc);
@@ -944,9 +946,6 @@
* TODO: Unmap dma for NetBSD
*/
-
- mtx_destroy(sc-ndis_mtx);
-
return(0);
}
Index: src/sys/dev/if_ndis/if_ndis_pci.c
diff -u src/sys/dev/if_ndis/if_ndis_pci.c:1.16 src/sys/dev/if_ndis/if_ndis_pci.c:1.17
--- src/sys/dev/if_ndis/if_ndis_pci.c:1.16 Sun Aug 2 16:22:34 2009
+++ src/sys/dev/if_ndis/if_ndis_pci.c Tue Oct 20 15:04:59 2009
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_ndis_pci.c,v 1.16 2009/08/02 20:22:34 dsl Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_ndis_pci.c,v 1.17 2009/10/20 19:04:59 christos Exp $);
#ifdef __FreeBSD__
__FBSDID($FreeBSD: src/sys/dev/if_ndis/if_ndis_pci.c,v 1.8.2.3 2005/03/31 04:24:36 wpaul Exp $);
#endif
@@ -67,7 +67,7 @@
#include ndis_driver_data.h
-#ifndef NDIS_LKM
+#ifndef _MODULE
#include compat/ndis/hal_var.h
#endif
@@ -101,7 +101,7 @@
extern unsigned char drv_data[];
-#ifndef NDIS_LKM
+#ifndef _MODULE
//static funcptr ndis_txeof_wrap;
//static funcptr ndis_rxeof_wrap;
//static funcptr ndis_linksts_wrap;
@@ -123,8 +123,7 @@
-extern int
-ndis_lkm_handle(struct lkm_table *lkmtp, int cmd);
+#ifdef _MODULE
extern int
ndisdrv_modevent(module_t mod, int cmd);
@@ -143,6 +142,7 @@
{
ndisdrv_modevent(NULL, MOD_LOAD);
}
+#endif
/*static*/ int
ndis_probe_pci(device_t parent, cfdata_t match, void *aux)
@@ -165,12 +165,10 @@
t-ndis_vid, t-ndis_did);
#endif
if((vendor == t-ndis_vid) (product == t-ndis_did)) {
-#ifndef NDIS_LKM
- ndis_lkm_handle(NULL, LKM_E_LOAD);
- //kthread_create(load_ndisapi, NULL);
-#endif /* NDIS_LKM */
+#ifdef _MODULE
ndisdrv_modevent(NULL, MOD_LOAD);
//kthread_create(load_ndisdrv, NULL);
+#endif /* _MODULE */
drv = windrv_lookup(0, PCI Bus);
CVS commit: src/sys/fs/smbfs
Module Name:src
Committed By: tron
Date: Tue Oct 20 20:55:01 UTC 2009
Modified Files:
src/sys/fs/smbfs: smbfs_smb.c smbfs_subr.h
Log Message:
Add support for 64 bit file offsets to smbfs_smb_setfsize(), largely
based on code taken from FreeBSD.
This stops truncation of files larger than 4GB by VOP_SETATTR() which e.g.
happened when copying large files rump_smbfs. Kudos to Antti Kantee
for diagnosing the problem in smbfs_smb_setfsize().
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/fs/smbfs/smbfs_smb.c
cvs rdiff -u -r1.19 -r1.20 src/sys/fs/smbfs/smbfs_subr.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/fs/smbfs/smbfs_smb.c
diff -u src/sys/fs/smbfs/smbfs_smb.c:1.40 src/sys/fs/smbfs/smbfs_smb.c:1.41
--- src/sys/fs/smbfs/smbfs_smb.c:1.40 Sat Apr 18 14:58:04 2009
+++ src/sys/fs/smbfs/smbfs_smb.c Tue Oct 20 20:55:01 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: smbfs_smb.c,v 1.40 2009/04/18 14:58:04 tsutsui Exp $ */
+/* $NetBSD: smbfs_smb.c,v 1.41 2009/10/20 20:55:01 tron Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: smbfs_smb.c,v 1.40 2009/04/18 14:58:04 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: smbfs_smb.c,v 1.41 2009/10/20 20:55:01 tron Exp $);
#include sys/param.h
#include sys/systm.h
@@ -265,14 +265,50 @@
return 0;
}
+static int
+smbfs_smb_seteof(struct smbnode *np, int64_t newsize, struct smb_cred *scred)
+{
+ struct smb_t2rq *t2p;
+ struct smb_share *ssp = np-n_mount-sm_share;
+ struct mbchain *mbp;
+ int error;
+
+ error = smb_t2_alloc(SSTOCP(ssp), SMB_TRANS2_SET_FILE_INFORMATION,
+ scred, t2p);
+ if (error)
+ return error;
+ mbp = t2p-t2_tparam;
+ mb_init(mbp);
+ mb_put_mem(mbp, (void *)np-n_fid, 2, MB_MSYSTEM);
+ mb_put_uint16le(mbp, SMB_SET_FILE_END_OF_FILE_INFO);
+ mb_put_uint32le(mbp, 0);
+ mbp = t2p-t2_tdata;
+ mb_init(mbp);
+ mb_put_int64le(mbp, newsize);
+ mb_put_uint32le(mbp, 0); /* padding */
+ mb_put_uint16le(mbp, 0);
+ t2p-t2_maxpcount = 2;
+ t2p-t2_maxdcount = 0;
+ error = smb_t2_request(t2p);
+ smb_t2_done(t2p);
+ return error;
+}
+
int
-smbfs_smb_setfsize(struct smbnode *np, int newsize, struct smb_cred *scred)
+smbfs_smb_setfsize(struct smbnode *np, u_quad_t newsize,
+ struct smb_cred *scred)
{
struct smb_share *ssp = np-n_mount-sm_share;
struct smb_rq *rqp;
struct mbchain *mbp;
int error;
+ if (newsize = (1LL 32)) {
+ if (!(SMB_CAPS(SSTOVC(ssp)) SMB_CAP_LARGE_FILES))
+ return EFBIG;
+ return smbfs_smb_seteof(np, (int64_t)newsize, scred);
+ }
+
error = smb_rq_alloc(SSTOCP(ssp), SMB_COM_WRITE, scred, rqp);
if (error)
return error;
Index: src/sys/fs/smbfs/smbfs_subr.h
diff -u src/sys/fs/smbfs/smbfs_subr.h:1.19 src/sys/fs/smbfs/smbfs_subr.h:1.20
--- src/sys/fs/smbfs/smbfs_subr.h:1.19 Sat Jun 28 01:34:05 2008
+++ src/sys/fs/smbfs/smbfs_subr.h Tue Oct 20 20:55:01 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: smbfs_subr.h,v 1.19 2008/06/28 01:34:05 rumble Exp $ */
+/* $NetBSD: smbfs_subr.h,v 1.20 2009/10/20 20:55:01 tron Exp $ */
/*
* Copyright (c) 2000-2001, Boris Popov
@@ -135,7 +135,8 @@
off_t start, off_t end, struct smb_cred *scred);
int smbfs_smb_statvfs(struct smb_share *ssp, struct statvfs *sbp,
struct smb_cred *scred);
-int smbfs_smb_setfsize(struct smbnode *np, int newsize, struct smb_cred *scred);
+int smbfs_smb_setfsize(struct smbnode *np, u_quad_t newsize,
+ struct smb_cred *scred);
int smbfs_smb_setpattr(struct smbnode *np, u_int16_t attr,
struct timespec *mtime, struct smb_cred *scred);
CVS commit: src/tests/util/sh
Module Name:src
Committed By: jmmv
Date: Tue Oct 20 21:58:35 UTC 2009
Modified Files:
src/tests/util/sh: Makefile t_expand.sh
Added Files:
src/tests/util/sh: t_exit.sh t_wait.sh
Removed Files:
src/tests/util/sh: t_exitstatus.sh
Log Message:
Migrate three sh test cases from regress to tests.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/util/sh/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/util/sh/t_exit.sh \
src/tests/util/sh/t_wait.sh
cvs rdiff -u -r1.2 -r0 src/tests/util/sh/t_exitstatus.sh
cvs rdiff -u -r1.3 -r1.4 src/tests/util/sh/t_expand.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/sh/Makefile
diff -u src/tests/util/sh/Makefile:1.2 src/tests/util/sh/Makefile:1.3
--- src/tests/util/sh/Makefile:1.2 Wed Nov 21 15:39:35 2007
+++ src/tests/util/sh/Makefile Tue Oct 20 21:58:35 2009
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2007/11/21 15:39:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2009/10/20 21:58:35 jmmv Exp $
.include bsd.own.mk
TESTSDIR= ${TESTSBASE}/util/sh
TESTS_SH= t_compexit
-TESTS_SH+= t_exitstatus
+TESTS_SH+= t_exit
TESTS_SH+= t_expand
TESTS_SH+= t_fsplit
TESTS_SH+= t_here
TESTS_SH+= t_set_e
TESTS_SH+= t_varquote
+TESTS_SH+= t_wait
.include bsd.test.mk
Index: src/tests/util/sh/t_expand.sh
diff -u src/tests/util/sh/t_expand.sh:1.3 src/tests/util/sh/t_expand.sh:1.4
--- src/tests/util/sh/t_expand.sh:1.3 Wed Oct 14 13:02:03 2009
+++ src/tests/util/sh/t_expand.sh Tue Oct 20 21:58:35 2009
@@ -1,4 +1,4 @@
-# $NetBSD: t_expand.sh,v 1.3 2009/10/14 13:02:03 jmmv Exp $
+# $NetBSD: t_expand.sh,v 1.4 2009/10/20 21:58:35 jmmv Exp $
#
# Copyright (c) 2007, 2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -94,6 +94,17 @@
atf_check_equal '$stripped' '${line%%/\**}'
}
+atf_test_case varpattern_backslashes
+varpattern_backslashes_head() {
+ atf_set descr Tests that protecting wildcards with backslashes \
+ works in variable patterns.
+}
+varpattern_backslashes_body() {
+ line='/foo/bar/*/baz'
+ stripped='/foo/bar/'
+ atf_check_equal $stripped ${line%%\**}
+}
+
atf_test_case arithmetic
arithmetic_head() {
atf_set descr POSIX requires shell arithmetic to use signed \
@@ -111,5 +122,6 @@
atf_add_test_case dollar_at
atf_add_test_case dollar_at_with_text
atf_add_test_case strip
+ atf_add_test_case varpattern_backslashes
atf_add_test_case arithmetic
}
Added files:
Index: src/tests/util/sh/t_exit.sh
diff -u /dev/null src/tests/util/sh/t_exit.sh:1.1
--- /dev/null Tue Oct 20 21:58:35 2009
+++ src/tests/util/sh/t_exit.sh Tue Oct 20 21:58:35 2009
@@ -0,0 +1,69 @@
+# $NetBSD: t_exit.sh,v 1.1 2009/10/20 21:58:35 jmmv Exp $
+#
+# Copyright (c) 2007 The NetBSD Foundation, Inc.
+# 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.
+#
+# 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.
+#
+
+crud() {
+ test yes = no
+
+ cat EOF
+$?
+EOF
+}
+
+atf_test_case function
+function_head() {
+ atf_set descr Tests that \$? is correctly updated inside \
+ a function
+}
+function_body() {
+ foo=`crud`
+ atf_check_equal 'x$foo' 'x1'
+}
+
+atf_test_case readout
+readout_head() {
+ atf_set descr Tests that \$? is correctly updated in a \
+ compound expression
+}
+readout_body() {
+ atf_check_equal '$( true ! true | false; echo $? )' '0'
+}
+
+atf_test_case trap_subshell
+trap_subshell_head() {
+ atf_set descr Tests that the trap statement in a subshell \
+ works when the subshell exits
+}
+trap_subshell_body() {
+ atf_check -s eq:0 -o inline:'exiting\n' -x \
+ '( trap echo exiting EXIT; /usr/bin/true )'
+}
+
+atf_init_test_cases() {
+ atf_add_test_case function
+
CVS commit: src/sys/rump/net/lib/libshmif
Module Name:src
Committed By: pooka
Date: Tue Oct 20 23:21:54 UTC 2009
Modified Files:
src/sys/rump/net/lib/libshmif: if_shmem.c
Log Message:
printf - rumpuser_dprintf
(can't use printf while holding spinlock)
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/rump/net/lib/libshmif/if_shmem.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/rump/net/lib/libshmif/if_shmem.c
diff -u src/sys/rump/net/lib/libshmif/if_shmem.c:1.7 src/sys/rump/net/lib/libshmif/if_shmem.c:1.8
--- src/sys/rump/net/lib/libshmif/if_shmem.c:1.7 Tue May 26 19:03:05 2009
+++ src/sys/rump/net/lib/libshmif/if_shmem.c Tue Oct 20 23:21:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_shmem.c,v 1.7 2009/05/26 19:03:05 pooka Exp $ */
+/* $NetBSD: if_shmem.c,v 1.8 2009/10/20 23:21:53 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_shmem.c,v 1.7 2009/05/26 19:03:05 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_shmem.c,v 1.8 2009/10/20 23:21:53 pooka Exp $);
#include sys/param.h
#include sys/fcntl.h
@@ -49,7 +49,7 @@
#include rump_private.h
#if 0
-#define DPRINTF(x) printf x
+#define DPRINTF(x) rumpuser_dprintf x
#else
#define DPRINTF(x)
#endif
@@ -346,7 +346,7 @@
|| (busgen sc-sc_prevgen+1)) {
nextpkt = lastpkt;
sc-sc_prevgen = busgen;
- printf(DROPPING\n);
+ rumpuser_dprintf(DROPPING\n);
} else {
nextpkt = sc-sc_nextpacket;
}
CVS commit: src/sys/rump/librump/rumpnet
Module Name:src Committed By: pooka Date: Tue Oct 20 23:28:50 UTC 2009 Modified Files: src/sys/rump/librump/rumpnet: rumpnet.ifspec Log Message: add shmif_create To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/rump/librump/rumpnet/rumpnet.ifspec Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/librump/rumpnet/rumpnet.ifspec diff -u src/sys/rump/librump/rumpnet/rumpnet.ifspec:1.1 src/sys/rump/librump/rumpnet/rumpnet.ifspec:1.2 --- src/sys/rump/librump/rumpnet/rumpnet.ifspec:1.1 Wed Oct 14 17:17:00 2009 +++ src/sys/rump/librump/rumpnet/rumpnet.ifspec Tue Oct 20 23:28:50 2009 @@ -1,11 +1,12 @@ -; $NetBSD: rumpnet.ifspec,v 1.1 2009/10/14 17:17:00 pooka Exp $ +; $NetBSD: rumpnet.ifspec,v 1.2 2009/10/20 23:28:50 pooka Exp $ NAME|net PUBHDR|include/rump/rumpnet_if_pub.h PRIVHDR|librump/rumpnet/rumpnet_if_priv.h WRAPPERS|librump/rumpnet/rumpnet_if_wrappers.c -; type | name | args | attrs +; type | name | args | attrs ; -int |virtif_create |int |WEAK +int |virtif_create |int |WEAK +int |shmif_create |const char *, int * |WEAK
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Tue Oct 20 23:29:40 UTC 2009
Modified Files:
src/sys/rump/include/rump: rumpnet_if_pub.h
src/sys/rump/librump/rumpnet: rumpnet_if_priv.h rumpnet_if_wrappers.c
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/include/rump/rumpnet_if_pub.h
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/librump/rumpnet/rumpnet_if_priv.h \
src/sys/rump/librump/rumpnet/rumpnet_if_wrappers.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/rump/include/rump/rumpnet_if_pub.h
diff -u src/sys/rump/include/rump/rumpnet_if_pub.h:1.3 src/sys/rump/include/rump/rumpnet_if_pub.h:1.4
--- src/sys/rump/include/rump/rumpnet_if_pub.h:1.3 Thu Oct 15 00:31:25 2009
+++ src/sys/rump/include/rump/rumpnet_if_pub.h Tue Oct 20 23:29:39 2009
@@ -1,9 +1,10 @@
-/* $NetBSD: rumpnet_if_pub.h,v 1.3 2009/10/15 00:31:25 pooka Exp $ */
+/* $NetBSD: rumpnet_if_pub.h,v 1.4 2009/10/20 23:29:39 pooka Exp $ */
/*
* Automatically generated. DO NOT EDIT.
- * from: NetBSD: rumpnet.ifspec,v 1.1 2009/10/14 17:17:00 pooka Exp
+ * from: NetBSD: rumpnet.ifspec,v 1.2 2009/10/20 23:28:50 pooka Exp
* by: NetBSD: makerumpif.sh,v 1.4 2009/10/15 00:29:19 pooka Exp
*/
int rump_pub_virtif_create(int);
+int rump_pub_shmif_create(const char *, int *);
Index: src/sys/rump/librump/rumpnet/rumpnet_if_priv.h
diff -u src/sys/rump/librump/rumpnet/rumpnet_if_priv.h:1.3 src/sys/rump/librump/rumpnet/rumpnet_if_priv.h:1.4
--- src/sys/rump/librump/rumpnet/rumpnet_if_priv.h:1.3 Thu Oct 15 00:31:25 2009
+++ src/sys/rump/librump/rumpnet/rumpnet_if_priv.h Tue Oct 20 23:29:39 2009
@@ -1,9 +1,10 @@
-/* $NetBSD: rumpnet_if_priv.h,v 1.3 2009/10/15 00:31:25 pooka Exp $ */
+/* $NetBSD: rumpnet_if_priv.h,v 1.4 2009/10/20 23:29:39 pooka Exp $ */
/*
* Automatically generated. DO NOT EDIT.
- * from: NetBSD: rumpnet.ifspec,v 1.1 2009/10/14 17:17:00 pooka Exp
+ * from: NetBSD: rumpnet.ifspec,v 1.2 2009/10/20 23:28:50 pooka Exp
* by: NetBSD: makerumpif.sh,v 1.4 2009/10/15 00:29:19 pooka Exp
*/
int rump_virtif_create(int);
+int rump_shmif_create(const char *, int *);
Index: src/sys/rump/librump/rumpnet/rumpnet_if_wrappers.c
diff -u src/sys/rump/librump/rumpnet/rumpnet_if_wrappers.c:1.3 src/sys/rump/librump/rumpnet/rumpnet_if_wrappers.c:1.4
--- src/sys/rump/librump/rumpnet/rumpnet_if_wrappers.c:1.3 Thu Oct 15 00:31:25 2009
+++ src/sys/rump/librump/rumpnet/rumpnet_if_wrappers.c Tue Oct 20 23:29:39 2009
@@ -1,8 +1,8 @@
-/* $NetBSD: rumpnet_if_wrappers.c,v 1.3 2009/10/15 00:31:25 pooka Exp $ */
+/* $NetBSD: rumpnet_if_wrappers.c,v 1.4 2009/10/20 23:29:39 pooka Exp $ */
/*
* Automatically generated. DO NOT EDIT.
- * from: NetBSD: rumpnet.ifspec,v 1.1 2009/10/14 17:17:00 pooka Exp
+ * from: NetBSD: rumpnet.ifspec,v 1.2 2009/10/20 23:28:50 pooka Exp
* by: NetBSD: makerumpif.sh,v 1.4 2009/10/15 00:29:19 pooka Exp
*/
@@ -35,3 +35,16 @@
return rv;
}
__weak_alias(rump_virtif_create,rump_net_unavailable);
+
+int
+rump_pub_shmif_create(const char *arg1, int *arg2)
+{
+ int rv;
+
+ rump_schedule();
+ rv = rump_shmif_create(arg1, arg2);
+ rump_unschedule();
+
+ return rv;
+}
+__weak_alias(rump_shmif_create,rump_net_unavailable);
CVS commit: src/sys/rump/net/lib/libshmif
Module Name:src
Committed By: pooka
Date: Tue Oct 20 23:29:57 UTC 2009
Modified Files:
src/sys/rump/net/lib/libshmif: if_shmem.c
Log Message:
use autogenerated prototype
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/net/lib/libshmif/if_shmem.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/rump/net/lib/libshmif/if_shmem.c
diff -u src/sys/rump/net/lib/libshmif/if_shmem.c:1.8 src/sys/rump/net/lib/libshmif/if_shmem.c:1.9
--- src/sys/rump/net/lib/libshmif/if_shmem.c:1.8 Tue Oct 20 23:21:53 2009
+++ src/sys/rump/net/lib/libshmif/if_shmem.c Tue Oct 20 23:29:57 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_shmem.c,v 1.8 2009/10/20 23:21:53 pooka Exp $ */
+/* $NetBSD: if_shmem.c,v 1.9 2009/10/20 23:29:57 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_shmem.c,v 1.8 2009/10/20 23:21:53 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_shmem.c,v 1.9 2009/10/20 23:29:57 pooka Exp $);
#include sys/param.h
#include sys/fcntl.h
@@ -47,6 +47,7 @@
#include rump/rumpuser.h
#include rump_private.h
+#include rump_net_private.h
#if 0
#define DPRINTF(x) rumpuser_dprintf x
@@ -179,8 +180,6 @@
return advance(oldoff, 4 + oldlen);
}
-int rump_shmif_create(const char *, int *); /* XXX */
-
int
rump_shmif_create(const char *path, int *ifnum)
{
CVS commit: src/usr.sbin
Module Name:src Committed By: snj Date: Wed Oct 21 00:01:57 UTC 2009 Modified Files: src/usr.sbin/rpc.yppasswdd: yppasswdd_xdr.c src/usr.sbin/sup/source: read_line.c src/usr.sbin/ypserv/yppush: yppush_svc.c Log Message: Remove 3rd and 4th clauses. Approved by Mats O Jansson (copyright holder). To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/rpc.yppasswdd/yppasswdd_xdr.c cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sup/source/read_line.c cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/ypserv/yppush/yppush_svc.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.sbin/rpc.yppasswdd/yppasswdd_xdr.c diff -u src/usr.sbin/rpc.yppasswdd/yppasswdd_xdr.c:1.2 src/usr.sbin/rpc.yppasswdd/yppasswdd_xdr.c:1.3 --- src/usr.sbin/rpc.yppasswdd/yppasswdd_xdr.c:1.2 Thu Aug 3 08:22:34 2000 +++ src/usr.sbin/rpc.yppasswdd/yppasswdd_xdr.c Wed Oct 21 00:01:56 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: yppasswdd_xdr.c,v 1.2 2000/08/03 08:22:34 ad Exp $ */ +/* $NetBSD: yppasswdd_xdr.c,v 1.3 2009/10/21 00:01:56 snj Exp $ */ /* * Copyright (c) 1994 Mats O Jansson m...@stacken.kth.se @@ -12,11 +12,6 @@ * 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 Mats O Jansson - * 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 @@ -33,7 +28,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: yppasswdd_xdr.c,v 1.2 2000/08/03 08:22:34 ad Exp $); +__RCSID($NetBSD: yppasswdd_xdr.c,v 1.3 2009/10/21 00:01:56 snj Exp $); #endif /* not lint */ #include rpc/rpc.h Index: src/usr.sbin/sup/source/read_line.c diff -u src/usr.sbin/sup/source/read_line.c:1.8 src/usr.sbin/sup/source/read_line.c:1.9 --- src/usr.sbin/sup/source/read_line.c:1.8 Thu Oct 16 06:26:06 2003 +++ src/usr.sbin/sup/source/read_line.c Wed Oct 21 00:01:57 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: read_line.c,v 1.8 2003/10/16 06:26:06 itojun Exp $ */ +/* $NetBSD: read_line.c,v 1.9 2009/10/21 00:01:57 snj Exp $ */ /* * Copyright (c) 1994 Mats O Jansson m...@stacken.kth.se @@ -12,11 +12,6 @@ * 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 Mats O Jansson - * 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 @@ -33,7 +28,7 @@ #include sys/cdefs.h #if defined(lint) defined(__RCSID) -__RCSID($NetBSD: read_line.c,v 1.8 2003/10/16 06:26:06 itojun Exp $); +__RCSID($NetBSD: read_line.c,v 1.9 2009/10/21 00:01:57 snj Exp $); #endif #include sys/param.h Index: src/usr.sbin/ypserv/yppush/yppush_svc.c diff -u src/usr.sbin/ypserv/yppush/yppush_svc.c:1.8 src/usr.sbin/ypserv/yppush/yppush_svc.c:1.9 --- src/usr.sbin/ypserv/yppush/yppush_svc.c:1.8 Sun Apr 19 06:06:40 2009 +++ src/usr.sbin/ypserv/yppush/yppush_svc.c Wed Oct 21 00:01:57 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: yppush_svc.c,v 1.8 2009/04/19 06:06:40 lukem Exp $ */ +/* $NetBSD: yppush_svc.c,v 1.9 2009/10/21 00:01:57 snj Exp $ */ /* * Copyright (c) 1996 Mats O Jansson m...@stacken.kth.se @@ -12,11 +12,6 @@ * 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 Mats O Jansson - * 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 @@ -33,7 +28,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: yppush_svc.c,v 1.8 2009/04/19 06:06:40 lukem
CVS commit: src/distrib/notes/common
Module Name:src Committed By: snj Date: Wed Oct 21 00:03:42 UTC 2009 Modified Files: src/distrib/notes/common: legal.common Log Message: Mats O Jansson's ad clause is no more. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/distrib/notes/common/legal.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/legal.common diff -u src/distrib/notes/common/legal.common:1.61 src/distrib/notes/common/legal.common:1.62 --- src/distrib/notes/common/legal.common:1.61 Tue Oct 20 00:32:11 2009 +++ src/distrib/notes/common/legal.common Wed Oct 21 00:03:42 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: legal.common,v 1.61 2009/10/20 00:32:11 snj Exp $ +.\ $NetBSD: legal.common,v 1.62 2009/10/21 00:03:42 snj Exp $ .\ .\ Copyright (c) 1999-2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -358,8 +358,6 @@ .It This product includes software developed by Masaru Oki. .It -This product includes software developed by Mats O Jansson. -.It This product includes software developed by Matt DeBergalis .It This product includes software developed by Matthew Fredette.
CVS commit: src
Module Name:src Committed By: snj Date: Wed Oct 21 00:30:43 UTC 2009 Modified Files: src/share/man/man4: kse.4 stpcide.4 src/sys/arch/arm/iomd: vidcvideo.c Log Message: Remove 3rd and 4th clauses. OK'd by Tohru Nishimura and Reinoud Zandijk (copyright holders). To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/share/man/man4/kse.4 cvs rdiff -u -r1.7 -r1.8 src/share/man/man4/stpcide.4 cvs rdiff -u -r1.37 -r1.38 src/sys/arch/arm/iomd/vidcvideo.c 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/kse.4 diff -u src/share/man/man4/kse.4:1.8 src/share/man/man4/kse.4:1.9 --- src/share/man/man4/kse.4:1.8 Wed May 27 19:23:59 2009 +++ src/share/man/man4/kse.4 Wed Oct 21 00:30:43 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: kse.4,v 1.8 2009/05/27 19:23:59 snj Exp $ +.\ $NetBSD: kse.4,v 1.9 2009/10/21 00:30:43 snj Exp $ .\ .\ Copyright (c) 2006 Tohru Nishimura. .\ @@ -10,11 +10,6 @@ .\ 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 Tohru Nishimura. -.\ 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 Index: src/share/man/man4/stpcide.4 diff -u src/share/man/man4/stpcide.4:1.7 src/share/man/man4/stpcide.4:1.8 --- src/share/man/man4/stpcide.4:1.7 Sat Aug 21 21:46:54 2004 +++ src/share/man/man4/stpcide.4 Wed Oct 21 00:30:43 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: stpcide.4,v 1.7 2004/08/21 21:46:54 nisimura Exp $ +.\ $NetBSD: stpcide.4,v 1.8 2009/10/21 00:30:43 snj Exp $ .\ .\ Copyright (c) 2003 Tohru Nishimura. .\ @@ -10,11 +10,6 @@ .\ 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 Tohru Nishimura. -.\ 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 Index: src/sys/arch/arm/iomd/vidcvideo.c diff -u src/sys/arch/arm/iomd/vidcvideo.c:1.37 src/sys/arch/arm/iomd/vidcvideo.c:1.38 --- src/sys/arch/arm/iomd/vidcvideo.c:1.37 Wed Mar 18 16:00:09 2009 +++ src/sys/arch/arm/iomd/vidcvideo.c Wed Oct 21 00:30:43 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: vidcvideo.c,v 1.37 2009/03/18 16:00:09 cegger Exp $ */ +/* $NetBSD: vidcvideo.c,v 1.38 2009/10/21 00:30:43 snj Exp $ */ /* * Copyright (c) 2001 Reinoud Zandijk @@ -12,12 +12,6 @@ * 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 Tohru Nishimura - * and Reinoud Zandijk 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 @@ -36,7 +30,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: vidcvideo.c,v 1.37 2009/03/18 16:00:09 cegger Exp $); +__KERNEL_RCSID(0, $NetBSD: vidcvideo.c,v 1.38 2009/10/21 00:30:43 snj Exp $); #include sys/param.h #include sys/systm.h
CVS commit: src/distrib/notes/common
Module Name:src Committed By: snj Date: Wed Oct 21 00:35:35 UTC 2009 Modified Files: src/distrib/notes/common: legal.common Log Message: nisimura and reinoud's ad clauses are no more. To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/distrib/notes/common/legal.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/legal.common diff -u src/distrib/notes/common/legal.common:1.62 src/distrib/notes/common/legal.common:1.63 --- src/distrib/notes/common/legal.common:1.62 Wed Oct 21 00:03:42 2009 +++ src/distrib/notes/common/legal.common Wed Oct 21 00:35:35 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: legal.common,v 1.62 2009/10/21 00:03:42 snj Exp $ +.\ $NetBSD: legal.common,v 1.63 2009/10/21 00:35:35 snj Exp $ .\ .\ Copyright (c) 1999-2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -452,15 +452,6 @@ .It This product includes software developed by Todd C. Miller. .It -This product includes software developed by Tohru Nishimura -and Reinoud Zandijk for the NetBSD Project. -.It -This product includes software developed by Tohru Nishimura -for the NetBSD Project. -.It -This product includes software developed by Tohru Nishimura. -for the NetBSD Project. -.It This product includes software developed by TooLs GmbH. .It This product includes software developed by Trimble Navigation, Ltd.
CVS commit: src/distrib/amd64/cdroms/bootcd-com
Module Name:src
Committed By: yamt
Date: Wed Oct 21 02:31:45 UTC 2009
Modified Files:
src/distrib/amd64/cdroms/bootcd-com: Makefile
Log Message:
fix a typo in a comment
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/cdroms/bootcd-com/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/amd64/cdroms/bootcd-com/Makefile
diff -u src/distrib/amd64/cdroms/bootcd-com/Makefile:1.3 src/distrib/amd64/cdroms/bootcd-com/Makefile:1.4
--- src/distrib/amd64/cdroms/bootcd-com/Makefile:1.3 Wed Oct 22 11:59:24 2008
+++ src/distrib/amd64/cdroms/bootcd-com/Makefile Wed Oct 21 02:31:44 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/10/22 11:59:24 tsutsui Exp $
+# $NetBSD: Makefile,v 1.4 2009/10/21 02:31:44 yamt Exp $
#
.include ${.CURDIR}/../Makefile.cdrom
@@ -7,7 +7,7 @@
CDKERNELS= netbsd-INSTALL.gz netbsd # from ../instkernel
CDBOOTOPTIONS= -o console=com0
-CDBUILDEXTRA+= boot.cfg # Add boot..cfg file
+CDBUILDEXTRA+= boot.cfg # Add boot.cfg file
CLEANFILES+= boot.cfg
prepare_md_post:
CVS commit: xsrc/external/mit/xf86-video-crime/dist/src
Module Name:xsrc
Committed By: macallan
Date: Wed Oct 21 03:28:40 UTC 2009
Modified Files:
xsrc/external/mit/xf86-video-crime/dist/src: crime_accel.c
Log Message:
Implement a private Glyphs() method which avoids the use of scratch pixmaps.
With this rendering of anti-aliased text is much faster than before ( which
doesn't really mean much. More like 'less abysmal' ). Still nowhere near
the performance with Xorg 1.4.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/xf86-video-crime/dist/src/crime_accel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-crime/dist/src/crime_accel.c
diff -u xsrc/external/mit/xf86-video-crime/dist/src/crime_accel.c:1.12 xsrc/external/mit/xf86-video-crime/dist/src/crime_accel.c:1.13
--- xsrc/external/mit/xf86-video-crime/dist/src/crime_accel.c:1.12 Tue Oct 6 06:25:47 2009
+++ xsrc/external/mit/xf86-video-crime/dist/src/crime_accel.c Wed Oct 21 03:28:40 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: crime_accel.c,v 1.12 2009/10/06 06:25:47 macallan Exp $ */
+/* $NetBSD: crime_accel.c,v 1.13 2009/10/21 03:28:40 macallan Exp $ */
/*
* Copyright (c) 2008 Michael Lorenz
* All rights reserved.
@@ -35,12 +35,12 @@
#include picturestr.h
#include xaalocal.h
#include xaa.h
+#include mipict.h
uint32_t regcache[0x1000];
#define CRIMEREG(p) (volatile uint32_t *)(fPtr-engine + p)
-/*#define WBFLUSH { volatile uint32_t boo = *CRIMEREG(0x4000); }*/
-#define WBFLUSH __asm__ (nop; sync;)
+#define WBFLUSH __asm(sync)
#if 0
#define WRITE4(r, v) {if (regcache[r 2] != v) { \
*CRIMEREG(r) = v; \
@@ -60,8 +60,8 @@
}
#else
#define SYNC do {} while ((*CRIMEREG(0x4000) CRIME_DE_IDLE) == 0)
-#define SYNCMTE do {} while ((*CRIMEREG(0x4000) CRIME_DE_MTE_IDLE) == 0)
#endif
+#define SYNCMTE do {} while ((*CRIMEREG(0x4000) CRIME_DE_MTE_IDLE) == 0)
#define MAKE_ROOM(x) do {} while ((16 - \
CRIME_PIPE_LEVEL(*CRIMEREG(0x4000))) x);
@@ -75,7 +75,7 @@
CrimeSync(ScrnInfoPtr pScrn)
{
CrimePtr fPtr = CRIMEPTR(pScrn);
-#ifdef CRIME_DEBUG_LOUD
+#if defined(CRIME_DEBUG_LOUD) (CRIME_DEBUG_MASK CRIME_DEBUG_SYNC)
volatile uint32_t *status = CRIMEREG(CRIME_DE_STATUS);
xf86Msg(X_ERROR, %s: %08x\n, __func__, *status);
@@ -149,11 +149,11 @@
uint32_t rxa, rya, rxe, rye, rxs, rys, rxd, ryd, rxde, ryde;
LOG(CRIME_DEBUG_BITBLT);
-#ifdef CRIME_DEBUG_LOUD
+#if defined(CRIME_DEBUG_LOUD) (CRIME_DEBUG_MASK CRIME_DEBUG_BITBLT)
xf86Msg(X_ERROR, %s: %d, %d; %d x %d - %d %d\n, __func__,
xSrc, ySrc, w, h, xDst, yDst);
#endif
- if ((fPtr-use_mte) (w 64) /*((w 3) == 0) */
+ if ((fPtr-use_mte) (w 64) (abs(ySrc - yDst) 4)
((xSrc 15) == (xDst 15))) {
if (fPtr-ydir == -1) {
/* bottom to top */
@@ -178,9 +178,6 @@
WRITE4(CRIME_MTE_DST0, (rxd 16) | ryd);
WRITE4ST(CRIME_MTE_DST1, (rxde 16) | ryde);
-#ifdef CRIME_DEBUG_LOUD
- xf86Msg(X_ERROR, reg: %08x %08x\n, oreg, reg);
-#endif
} else {
if (fPtr-xdir == -1) {
prim |= DE_PRIM_RL;
@@ -397,7 +394,7 @@
CrimePtr fPtr = CRIMEPTR(pScrn);
LOG(CRIME_DEBUG_IMAGEWRITE);
-#ifdef CRIME_DEBUG_LOUD
+#if defined(CRIME_DEBUG_LOUD) (CRIME_DEBUG_MASK CRIME_DEBUG_IMAGEWRITE)
if ((bpp == 24) || (depth == 24))
xf86Msg(X_ERROR, %s: %d %d \n, __func__, bpp, depth);
#endif
@@ -426,7 +423,7 @@
LOG(CRIME_DEBUG_IMAGEWRITE);
-#ifdef CRIME_DEBUG_LOUD
+#if defined(CRIME_DEBUG_LOUD) (CRIME_DEBUG_MASK CRIME_DEBUG_IMAGEWRITE)
xf86Msg(X_ERROR, %s: %d %d %d %d\n, __func__, x, y, w, h);
#endif
@@ -728,6 +725,7 @@
xf86Msg(X_ERROR, ARGB mask %08x %d\n, (uint32_t)alphaPtr,
alphaPitch);
}
+ xf86Msg(X_ERROR, %s: %x %x %x\n, __func__, red, green, blue);
#endif
MAKE_ROOM(7);
WRITE4(CRIME_DE_MODE_DST, DE_MODE_TLB_A | DE_MODE_BUFDEPTH_32 |
@@ -835,7 +833,7 @@
int bufnum = 0;
LOG(CRIME_DEBUG_XRENDER);
-#ifdef CRIME_DEBUG_LOUD
+#ifdef CRIME_DEBUG_LOUD_
xf86Msg(X_ERROR, %d %d %d %d %d %d\n,srcx, srcy, dstx, dsty, width,
height);
#endif
@@ -845,7 +843,7 @@
sptr = (uint32_t *)aptr;
for (j = 0; j width; j++) {
*dptr = (*sptr 24) | fPtr-alpha_color;
-#ifdef CRIME_DEBUG_LOUD
+#ifdef CRIME_DEBUG_LOUD_
xf86Msg(X_ERROR, %08x %08x\n, *sptr, *dptr);
#endif
sptr++;
@@ -1098,7 +1096,7 @@
}
#ifdef CRIME_DEBUG_LOUD
- xf86Msg(X_ERROR, ARGB %08x %d\n, (uint32_t)aptr, fPtr-uw);
+ xf86Msg(X_ERROR, ARGB %08x %d\n, (uint32_t)asptr, fPtr-uw);
#endif
lcnt = fPtr-uh - srcy;
for (i = 0; i height; i++) {
@@ -1204,7 +1202,7 @@
}
#ifdef CRIME_DEBUG_LOUD
- xf86Msg(X_ERROR, ARGB %08x %d\n, (uint32_t)aptr, fPtr-uw);
+ xf86Msg(X_ERROR, ARGB %08x %d\n, (uint32_t)asptr, fPtr-uw);
#endif
lcnt = fPtr-uh;
for (i = 0; i height; i++) {
@@ -1317,12 +1315,13 @@
if(pMask) {
CARD16 red, green, blue, alpha;
CARD32 pixel =
- *((CARD32*)(((PixmapPtr)(pSrc-pDrawable))-devPrivate.ptr));
+
CVS commit: src/distrib/notes/common
Module Name:src Committed By: snj Date: Wed Oct 21 05:42:11 UTC 2009 Modified Files: src/distrib/notes/common: legal.common Log Message: reed@ no longer has any ad clauses in the tree. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/distrib/notes/common/legal.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/legal.common diff -u src/distrib/notes/common/legal.common:1.63 src/distrib/notes/common/legal.common:1.64 --- src/distrib/notes/common/legal.common:1.63 Wed Oct 21 00:35:35 2009 +++ src/distrib/notes/common/legal.common Wed Oct 21 05:42:11 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: legal.common,v 1.63 2009/10/21 00:35:35 snj Exp $ +.\ $NetBSD: legal.common,v 1.64 2009/10/21 05:42:11 snj Exp $ .\ .\ Copyright (c) 1999-2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -286,9 +286,6 @@ This product includes software developed by Jason R. Thorpe for And Communications, http://www.and.com/ .It -This product includes software developed by Jeremy C. Reed -for the NetBSD project. -.It This product includes software developed by Joachim Koenig-Baltes. .It This product includes software developed by Jochen Pohl for
CVS commit: src/distrib/notes/common
Module Name:src Committed By: snj Date: Wed Oct 21 05:45:35 UTC 2009 Modified Files: src/distrib/notes/common: legal.common Log Message: Remove one of christos' ad clauses. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/distrib/notes/common/legal.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/legal.common diff -u src/distrib/notes/common/legal.common:1.64 src/distrib/notes/common/legal.common:1.65 --- src/distrib/notes/common/legal.common:1.64 Wed Oct 21 05:42:11 2009 +++ src/distrib/notes/common/legal.common Wed Oct 21 05:45:35 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: legal.common,v 1.64 2009/10/21 05:42:11 snj Exp $ +.\ $NetBSD: legal.common,v 1.65 2009/10/21 05:45:35 snj Exp $ .\ .\ Copyright (c) 1999-2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -538,9 +538,6 @@ by Christopher G. Demetriou. .It This product includes software developed for the NetBSD Project -by Christos Zoulas -.It -This product includes software developed for the NetBSD Project by Emmanuel Dreyfus. .It This product includes software developed for the NetBSD Project
