CVS commit: src/share/man/man4/man4.amiga
Module Name:src Committed By: wiz Date: Wed Jan 11 10:15:36 UTC 2012 Modified Files: src/share/man/man4/man4.amiga: p5membar.4 p5pb.4 Log Message: Remove trailing whitespace. New sentence, new line. Use more markup. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/man4.amiga/p5membar.4 cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/man4.amiga/p5pb.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/man4.amiga/p5membar.4 diff -u src/share/man/man4/man4.amiga/p5membar.4:1.1 src/share/man/man4/man4.amiga/p5membar.4:1.2 --- src/share/man/man4/man4.amiga/p5membar.4:1.1 Tue Jan 10 20:41:45 2012 +++ src/share/man/man4/man4.amiga/p5membar.4 Wed Jan 11 10:15:36 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: p5membar.4,v 1.1 2012/01/10 20:41:45 rkujawa Exp $ +.\ $NetBSD: p5membar.4,v 1.2 2012/01/11 10:15:36 wiz Exp $ .\ .\ Copyright (c) 2012 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -38,7 +38,7 @@ .Sh DESCRIPTION The .Nm -driver provides support for automatically configured Phase5 PCI bridge +driver provides support for automatically configured Phase5 PCI bridge resources. It is needed for proper operation of the .Xr p5pb 4 Index: src/share/man/man4/man4.amiga/p5pb.4 diff -u src/share/man/man4/man4.amiga/p5pb.4:1.5 src/share/man/man4/man4.amiga/p5pb.4:1.6 --- src/share/man/man4/man4.amiga/p5pb.4:1.5 Tue Jan 10 20:41:45 2012 +++ src/share/man/man4/man4.amiga/p5pb.4 Wed Jan 11 10:15:36 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: p5pb.4,v 1.5 2012/01/10 20:41:45 rkujawa Exp $ +.\ $NetBSD: p5pb.4,v 1.6 2012/01/11 10:15:36 wiz Exp $ .\ .\ Copyright (c) 2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -44,20 +44,26 @@ The .Nm driver provides support for the PCI bus present on various devices equipped with -the Phase5 PCI bridge. +the Phase5 PCI bridge. .Pp -Processor boards running firmware revision older than 44.69 need a kernel -configured with P5PB_OLD_FIRMWARE option. +Processor boards running firmware revision older than 44.69 need a kernel +configured with the +.Dv P5PB_OLD_FIRMWARE +option. .Pp The -.Nm -driver provides necessary support for CyberVisionPPC and BlizzardVisionPPC, -allowing attachment of +.Nm +driver provides necessary support for CyberVisionPPC and BlizzardVisionPPC, +allowing attachment of .Xr genfb 4 -driver. -Owners of these cards should enable the P5PB_GENFB option. -.Pp -Additional, excessive debugging output is enabled by P5PB_DEBUG option. +driver. +Owners of these cards should enable the +.Dv P5PB_GENFB +option. +.Pp +Additional, excessive debugging output is enabled by the +.Dv P5PB_DEBUG +option. .Sh HARDWARE The .Nm @@ -87,17 +93,21 @@ driver was written by .An Radoslaw Kujawa Aq radoslaw.kuj...@gmail.com . .Sh CAVEATS The -.Nx developers don't have access to G-REX hardware or documentation. -Support for this device is based on best wishes. +.Nx +developers don't have access to G-REX hardware or documentation. +Support for this device is based on best wishes. .Pp -Support for +Support for .Xr genfb 4 framebuffer on CVPPC/BVPPC needs more testing. .Sh BUGS -Current version of this driver depends on PCI bus setup and enumeration -done by the firmware. +The current version of this driver depends on PCI bus setup and +enumeration done by the firmware. .Pp -DMA to host memory is not supported. This is a driver limitation. +DMA to host memory is not supported. +This is a driver limitation. .Pp -The P5PB_OLD_FIRMWARE option should only be enabled if PCI hardware is -present. Otherwise kernel panic might occur due to bus error. +The +.Dv P5PB_OLD_FIRMWARE +option should only be enabled if PCI hardware is present. +Otherwise a kernel panic might occur due to bus error.
CVS commit: src/sys/arch/usermode
Module Name:src
Committed By: reinoud
Date: Wed Jan 11 12:37:50 UTC 2012
Modified Files:
src/sys/arch/usermode/include: thunk.h
src/sys/arch/usermode/usermode: thunk.c
Log Message:
Add thunk_close()
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/usermode/include/thunk.h
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/usermode/usermode/thunk.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/usermode/include/thunk.h
diff -u src/sys/arch/usermode/include/thunk.h:1.58 src/sys/arch/usermode/include/thunk.h:1.59
--- src/sys/arch/usermode/include/thunk.h:1.58 Tue Jan 10 12:04:56 2012
+++ src/sys/arch/usermode/include/thunk.h Wed Jan 11 12:37:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: thunk.h,v 1.58 2012/01/10 12:04:56 reinoud Exp $ */
+/* $NetBSD: thunk.h,v 1.59 2012/01/11 12:37:50 reinoud Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca
@@ -115,6 +115,7 @@ void thunk_putchar(int);
int thunk_execv(const char *, char * const []);
int thunk_open(const char *, int, mode_t);
+int thunk_close(int);
int thunk_fstat_getsize(int, off_t *, ssize_t *);
ssize_t thunk_pread(int, void *, size_t, off_t);
ssize_t thunk_pwrite(int, const void *, size_t, off_t);
Index: src/sys/arch/usermode/usermode/thunk.c
diff -u src/sys/arch/usermode/usermode/thunk.c:1.76 src/sys/arch/usermode/usermode/thunk.c:1.77
--- src/sys/arch/usermode/usermode/thunk.c:1.76 Tue Jan 10 12:04:56 2012
+++ src/sys/arch/usermode/usermode/thunk.c Wed Jan 11 12:37:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: thunk.c,v 1.76 2012/01/10 12:04:56 reinoud Exp $ */
+/* $NetBSD: thunk.c,v 1.77 2012/01/11 12:37:50 reinoud Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#ifdef __NetBSD__
-__RCSID($NetBSD: thunk.c,v 1.76 2012/01/10 12:04:56 reinoud Exp $);
+__RCSID($NetBSD: thunk.c,v 1.77 2012/01/11 12:37:50 reinoud Exp $);
#endif
#include sys/types.h
@@ -482,6 +482,12 @@ thunk_open(const char *path, int flags,
}
int
+thunk_close(int fd)
+{
+ return close(fd);
+}
+
+int
thunk_fstat_getsize(int fd, off_t *size, ssize_t *blksize)
{
struct stat st;
CVS commit: src/sys/arch/usermode/usermode
Module Name:src
Committed By: reinoud
Date: Wed Jan 11 12:40:26 UTC 2012
Modified Files:
src/sys/arch/usermode/usermode: trap.c
Log Message:
Cleanup trap.c and add a stop_all_signal_handlers(void) i: bluntly stopping
all known usages of signal handlers, to be used in shutdown.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/usermode/usermode/trap.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/usermode/usermode/trap.c
diff -u src/sys/arch/usermode/usermode/trap.c:1.54 src/sys/arch/usermode/usermode/trap.c:1.55
--- src/sys/arch/usermode/usermode/trap.c:1.54 Sat Jan 7 19:45:14 2012
+++ src/sys/arch/usermode/usermode/trap.c Wed Jan 11 12:40:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.54 2012/01/07 19:45:14 reinoud Exp $ */
+/* $NetBSD: trap.c,v 1.55 2012/01/11 12:40:26 reinoud Exp $ */
/*-
* Copyright (c) 2011 Reinoud Zandijk rein...@netbsd.org
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.54 2012/01/07 19:45:14 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.55 2012/01/11 12:40:26 reinoud Exp $);
#include sys/types.h
#include sys/param.h
@@ -46,13 +46,10 @@ __KERNEL_RCSID(0, $NetBSD: trap.c,v 1.5
#include machine/thunk.h
-//#include machine/ctlreg.h
-//#include machine/trap.h
-//#include machine/instr.h
-//#include machine/userret.h
-
/* forwards and externals */
void setup_signal_handlers(void);
+void stop_all_signal_handlers(void);
+
static void mem_access_handler(int sig, siginfo_t *info, void *ctx);
static void illegal_instruction_handler(int sig, siginfo_t *info, void *ctx);
extern int errno;
@@ -61,11 +58,14 @@ bool pmap_fault(pmap_t pmap, vaddr_t va,
static stack_t sigstk;
+
void
startlwp(void *arg)
{
+ /* nothing here */
}
+
void
setup_signal_handlers(void)
{
@@ -102,6 +102,17 @@ setup_signal_handlers(void)
}
+void
+stop_all_signal_handlers(void)
+{
+ thunk_sigblock(SIGALRM);
+ thunk_sigblock(SIGIO);
+ thunk_sigblock(SIGILL);
+ thunk_sigblock(SIGSEGV);
+ thunk_sigblock(SIGBUS);
+}
+
+
static void
mem_access_handler(int sig, siginfo_t *info, void *ctx)
{
@@ -116,15 +127,6 @@ mem_access_handler(int sig, siginfo_t *i
panic(received signal %d with no info,
info-si_signo);
-//printf(sigsegv\n);
-#if 0
- va = (vaddr_t) info-si_addr;
- thunk_printf_debug(mem trap lwp = %p pid = %d lid = %d, va = %p\n,
- curlwp,
- curlwp-l_proc-p_pid,
- curlwp-l_lid,
- (void *) va);
-#endif
#if 0
thunk_printf_debug(SIGSEGV or SIGBUS!\n);
thunk_printf_debug(\tsi_signo = %d\n, info-si_signo);
@@ -154,26 +156,15 @@ mem_access_handler(int sig, siginfo_t *i
/* get PC address of faulted memory instruction */
pc = md_get_pc(ctx);
-#if 0 /* disabled for now, these checks need to move */
-#ifdef DIAGNOSTIC
- /* sanity */
- if ((va VM_MIN_ADDRESS) || (va = VM_MAX_KERNEL_ADDRESS))
- panic(peeing outside the box! (va=%p), (void *)va);
-
- /* extra debug for now - should issue signal */
- if (va == 0)
- panic(NULL deref\n);
-#endif
+#if 0
+ thunk_printf(memaccess error : pc = %p, va = %p\n,
+ (void *) pc, (void *) va);
#endif
-// thunk_printf(memaccess error : pc = %p, va = %p\n,
-// (void *) pc, (void *) va);
-
/* copy this state to return to */
memcpy(pcb-pcb_trapret_ucp, uct, sizeof(ucontext_t));
/* remember our parameters */
-// assert((void *) pcb-pcb_fault_addr == NULL);
pcb-pcb_fault_addr = va;
pcb-pcb_fault_pc = pc;
@@ -191,21 +182,6 @@ illegal_instruction_handler(int sig, sig
assert(info-si_signo == SIGILL);
#if 0
- sigset_t ss;
- thunk_sigemptyset(ss);
- thunk_sigaddset(ss, SIGALRM);
- thunk_sigaddset(ss, SIGILL);
- thunk_sigprocmask(SIG_UNBLOCK, ss, NULL);
-#endif
-
-#if 0
- printf(\nillegal instruction trap lwp = %p pid = %d lid = %d, va = %p\n,
- curlwp,
- curlwp-l_proc-p_pid,
- curlwp-l_lid,
- (void *) info-si_addr);
-#endif
-#if 0
thunk_printf(SIGILL!\n);
thunk_printf(\tsi_signo = %d\n, info-si_signo);
thunk_printf(\tsi_errno = %d\n, info-si_errno);
@@ -284,8 +260,10 @@ pagefault(void)
if (from_kernel (va = VM_MIN_KERNEL_ADDRESS))
vm_map = kernel_map;
-// thunk_printf_debug(pagefault : pc %p, va %p\n,
-// (void *) pc, (void *) va);
+#if 0
+ thunk_printf_debug(pagefault : pc %p, va %p\n,
+ (void *) pc, (void *) va);
+#endif
/* can pmap handle it? on its own? (r/m) */
onfault = pcb-pcb_onfault;
@@ -312,6 +290,7 @@ pagefault(void)
if (!onfault)
panic(kernel fault);
panic(%s: can't call onfault yet\n, __func__);
+ /* XXX implement me ? */
/* jump to given onfault */
// tf = kernel_tf;
// memset(tf, 0, sizeof(struct trapframe));
CVS commit: src/sys
Module Name:src
Committed By: drochner
Date: Wed Jan 11 14:37:45 UTC 2012
Modified Files:
src/sys/dist/pf/net: pfvar.h
src/sys/netipsec: keydb.h
Log Message:
protect union sockaddr_union from being defined twice by a CPP symbol
(copied from FreeBSD), allows coexistence of (FAST_)IPSEC and pf
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dist/pf/net/pfvar.h
cvs rdiff -u -r1.10 -r1.11 src/sys/netipsec/keydb.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/dist/pf/net/pfvar.h
diff -u src/sys/dist/pf/net/pfvar.h:1.19 src/sys/dist/pf/net/pfvar.h:1.20
--- src/sys/dist/pf/net/pfvar.h:1.19 Fri May 7 17:41:57 2010
+++ src/sys/dist/pf/net/pfvar.h Wed Jan 11 14:37:45 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pfvar.h,v 1.19 2010/05/07 17:41:57 degroote Exp $ */
+/* $NetBSD: pfvar.h,v 1.20 2012/01/11 14:37:45 drochner Exp $ */
/* $OpenBSD: pfvar.h,v 1.254 2007/07/13 09:17:48 markus Exp $ */
/*
@@ -55,14 +55,6 @@
#include net/pf_mtag.h
#endif /* __NetBSD__ _KERNEL */
-#ifdef __NetBSD__
-union sockaddr_union {
- struct sockaddr sa;
- struct sockaddr_in sin;
- struct sockaddr_in6 sin6;
-};
-#endif /* __NetBSD__ */
-
struct ip;
struct ip6_hdr;
@@ -984,6 +976,15 @@ struct pfr_tstats {
#define pfrts_name pfrts_t.pfrt_name
#define pfrts_flags pfrts_t.pfrt_flags
+#ifndef _SOCKADDR_UNION_DEFINED
+#define _SOCKADDR_UNION_DEFINED
+union sockaddr_union {
+ struct sockaddr sa;
+ struct sockaddr_in sin;
+ struct sockaddr_in6 sin6;
+};
+#endif /* _SOCKADDR_UNION_DEFINED */
+
SLIST_HEAD(pfr_kentryworkq, pfr_kentry);
struct pfr_kentry {
struct radix_node pfrke_node[2];
Index: src/sys/netipsec/keydb.h
diff -u src/sys/netipsec/keydb.h:1.10 src/sys/netipsec/keydb.h:1.11
--- src/sys/netipsec/keydb.h:1.10 Mon May 23 15:17:25 2011
+++ src/sys/netipsec/keydb.h Wed Jan 11 14:37:45 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: keydb.h,v 1.10 2011/05/23 15:17:25 drochner Exp $ */
+/* $NetBSD: keydb.h,v 1.11 2012/01/11 14:37:45 drochner Exp $ */
/* $FreeBSD: src/sys/netipsec/keydb.h,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
/* $KAME: keydb.h,v 1.14 2000/08/02 17:58:26 sakane Exp $ */
@@ -42,6 +42,8 @@
#include net/route.h
#include netinet/in.h
+#ifndef _SOCKADDR_UNION_DEFINED
+#define _SOCKADDR_UNION_DEFINED
/*
* The union of all possible address formats we handle.
*/
@@ -50,6 +52,7 @@ union sockaddr_union {
struct sockaddr_in sin;
struct sockaddr_in6 sin6;
};
+#endif /* _SOCKADDR_UNION_DEFINED */
/* Security Assocciation Index */
/* NOTE: Ensure to be same address family */
CVS commit: src/sys
Module Name:src
Committed By: drochner
Date: Wed Jan 11 14:39:08 UTC 2012
Modified Files:
src/sys/netinet: tcp_input.c
src/sys/netipsec: xform_tcp.c
Log Message:
fix build in the (FAST_)IPSEC TCP_SIGNATURE case
To generate a diff of this commit:
cvs rdiff -u -r1.320 -r1.321 src/sys/netinet/tcp_input.c
cvs rdiff -u -r1.7 -r1.8 src/sys/netipsec/xform_tcp.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/netinet/tcp_input.c
diff -u src/sys/netinet/tcp_input.c:1.320 src/sys/netinet/tcp_input.c:1.321
--- src/sys/netinet/tcp_input.c:1.320 Sat Dec 31 20:41:59 2011
+++ src/sys/netinet/tcp_input.c Wed Jan 11 14:39:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_input.c,v 1.320 2011/12/31 20:41:59 christos Exp $ */
+/* $NetBSD: tcp_input.c,v 1.321 2012/01/11 14:39:08 drochner Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -148,7 +148,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tcp_input.c,v 1.320 2011/12/31 20:41:59 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: tcp_input.c,v 1.321 2012/01/11 14:39:08 drochner Exp $);
#include opt_inet.h
#include opt_ipsec.h
@@ -3176,7 +3176,7 @@ tcp_signature_getsav(struct mbuf *m, str
/*
* Look up an SADB entry which matches the address of the peer.
*/
- sav = KEY_ALLOCSA(dst, IPPROTO_TCP, htonl(TCP_SIG_SPI));
+ sav = KEY_ALLOCSA(dst, IPPROTO_TCP, htonl(TCP_SIG_SPI), 0, 0);
#else
if (ip)
sav = key_allocsa(AF_INET, (void *)ip-ip_src,
Index: src/sys/netipsec/xform_tcp.c
diff -u src/sys/netipsec/xform_tcp.c:1.7 src/sys/netipsec/xform_tcp.c:1.8
--- src/sys/netipsec/xform_tcp.c:1.7 Fri Feb 18 20:40:58 2011
+++ src/sys/netipsec/xform_tcp.c Wed Jan 11 14:39:08 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: xform_tcp.c,v 1.7 2011/02/18 20:40:58 drochner Exp $ */
+/* $NetBSD: xform_tcp.c,v 1.8 2012/01/11 14:39:08 drochner Exp $ */
/* $FreeBSD: sys/netipsec/xform_tcp.c,v 1.1.2.1 2004/02/14 22:24:09 bms Exp $ */
/*
@@ -31,7 +31,7 @@
/* TCP MD5 Signature Option (RFC2385) */
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xform_tcp.c,v 1.7 2011/02/18 20:40:58 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: xform_tcp.c,v 1.8 2012/01/11 14:39:08 drochner Exp $);
#include opt_inet.h
@@ -160,7 +160,8 @@ tcpsignature_output(struct mbuf *m, stru
static struct xformsw tcpsignature_xformsw = {
XF_TCPSIGNATURE, XFT_AUTH, TCPMD5,
tcpsignature_init, tcpsignature_zeroize,
- tcpsignature_input, tcpsignature_output
+ tcpsignature_input, tcpsignature_output,
+ NULL
};
INITFN void
CVS commit: src/sys/dev
Module Name:src
Committed By: macallan
Date: Wed Jan 11 15:52:32 UTC 2012
Modified Files:
src/sys/dev/rasops: files.rasops rasops.c rasops.h
src/sys/dev/wsfont: wsfont.c wsfont.h
Log Message:
make rasops_init()'s font selection code a bit less boneheaded by:
- actually trying to pick a font which gets as close as possible to the
requested terminal size
- accepting 0,0 as 'use system default' which can be changed by
options RASOPS_DEFAULT_WIDTH=100
options RASOPS_DEFAULT_HEIGHT=30
default is 80x25
- putting alpha and bitmap fonts in the same list and making wsfont_find()
aware of wether we support alpha fonts or not
- if supported, prefer alpha fonts over otherwise equally suitable bitmap
fonts
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/rasops/files.rasops
cvs rdiff -u -r1.69 -r1.70 src/sys/dev/rasops/rasops.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/rasops/rasops.h
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/wsfont/wsfont.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/wsfont/wsfont.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/rasops/files.rasops
diff -u src/sys/dev/rasops/files.rasops:1.12 src/sys/dev/rasops/files.rasops:1.13
--- src/sys/dev/rasops/files.rasops:1.12 Fri Feb 2 02:10:24 2007
+++ src/sys/dev/rasops/files.rasops Wed Jan 11 15:52:32 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.rasops,v 1.12 2007/02/02 02:10:24 ober Exp $
+# $NetBSD: files.rasops,v 1.13 2012/01/11 15:52:32 macallan Exp $
# Note: `rasops_glue' is only here to force the header file's name
# hence it must be mentioned first (shudder...)
@@ -18,3 +18,5 @@ file dev/rasops/rasops24.c ((rasterconso
file dev/rasops/rasops32.c ((rasterconsole | wsdisplay) rasops32)
defflag opt_rasops.h RASOPS_CLIPPING RASOPS_SMALL
+defparam opt_rasops.h RASOPS_DEFAULT_WIDTH = 80
+defparam opt_rasops.h RASOPS_DEFAULT_HEIGHT = 25
Index: src/sys/dev/rasops/rasops.c
diff -u src/sys/dev/rasops/rasops.c:1.69 src/sys/dev/rasops/rasops.c:1.70
--- src/sys/dev/rasops/rasops.c:1.69 Wed Jan 4 20:17:05 2012
+++ src/sys/dev/rasops/rasops.c Wed Jan 11 15:52:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops.c,v 1.69 2012/01/04 20:17:05 macallan Exp $ */
+/* $NetBSD: rasops.c,v 1.70 2012/01/11 15:52:32 macallan Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rasops.c,v 1.69 2012/01/04 20:17:05 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: rasops.c,v 1.70 2012/01/11 15:52:32 macallan Exp $);
#include opt_rasops.h
#include rasops_glue.h
@@ -53,6 +53,20 @@ __KERNEL_RCSID(0, $NetBSD: rasops.c,v 1
#include errno.h
#endif
+#ifdef RASOPS_DEBUG
+#define DPRINTF aprint_error
+#else
+#define DPRINTF while (0) printf
+#endif
+
+struct rasops_matchdata {
+ struct rasops_info *ri;
+ int wantcols, wantrows;
+ int bestscore;
+ struct wsdisplay_font *pick;
+ int ident;
+};
+
/* ANSI colormap (R,G,B). Upper 8 are high-intensity */
const u_char rasops_cmap[256*3] = {
0x00, 0x00, 0x00, /* black */
@@ -167,6 +181,57 @@ void rasops_make_box_chars_alpha(struct
extern int cold;
/*
+ * Rate a font based on how many character cells we would get out of it in the
+ * current video mode. Lower is better.
+ */
+static void
+rasops_matches(struct wsdisplay_font *font, void *cookie, int ident)
+{
+ struct rasops_matchdata *md = cookie;
+ struct rasops_info *ri = md-ri;
+ int cols, score = 1;
+
+ /* first weed out fonts the caller doesn't claim support for */
+ if (FONT_IS_ALPHA(font)) {
+ /*
+ * If we end up with a bitmap font and an alpha font with
+ * otherwise identical scores, prefer alpha
+ */
+ score = 0;
+ if ((ri-ri_flg RI_ENABLE_ALPHA) == 0)
+ return;
+ }
+ cols = ri-ri_width / font-fontwidth;
+ /*
+ * if the font is too small to allow 80 columns give those closer to
+ * 80 a better score but with a huge penalty compared to fonts that
+ * give us 80 columns or more
+ */
+ if (cols md-wantcols) {
+ score += 10 + 2 * (md-wantcols - cols);
+ } else
+ score += 2 * cols;
+ DPRINTF(%s: %d\n, font-name, score);
+ if (score md-bestscore) {
+ md-bestscore = score;
+ md-pick = font;
+ md-ident = ident;
+ }
+}
+
+static int
+rasops_find(struct rasops_info *ri, int wantrows, int wantcols)
+{
+ struct rasops_matchdata md =
+ { ri, wantcols, wantrows, 100, NULL, 0};
+
+ wsfont_walk(rasops_matches, md);
+ if (md.pick == NULL)
+ return -1;
+ return (wsfont_make_cookie(md.ident, WSDISPLAY_FONTORDER_L2R,
+ WSDISPLAY_FONTORDER_L2R));
+}
+/*
* Initialize a 'rasops_info' descriptor.
*/
int
@@ -181,22 +246,21 @@ rasops_init(struct rasops_info *ri, int
wsfont_init();
- if (ri-ri_flg RI_ENABLE_ALPHA) {
- /* try finding an AA font first */
- cookie = wsfont_find_aa(NULL, 0, 0, 0, WSDISPLAY_FONTORDER_L2R,
- WSDISPLAY_FONTORDER_L2R);
- }
- if (cookie == -1)
CVS commit: src/sys/arch/sparc64/dev
Module Name:src Committed By: macallan Date: Wed Jan 11 15:53:32 UTC 2012 Modified Files: src/sys/arch/sparc64/dev: ffb.c gfb.c Log Message: use rasops_init(0, 0) To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/arch/sparc64/dev/ffb.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sparc64/dev/gfb.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/dev/ffb.c diff -u src/sys/arch/sparc64/dev/ffb.c:1.49 src/sys/arch/sparc64/dev/ffb.c:1.50 --- src/sys/arch/sparc64/dev/ffb.c:1.49 Thu Dec 22 05:08:05 2011 +++ src/sys/arch/sparc64/dev/ffb.c Wed Jan 11 15:53:32 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: ffb.c,v 1.49 2011/12/22 05:08:05 macallan Exp $ */ +/* $NetBSD: ffb.c,v 1.50 2012/01/11 15:53:32 macallan Exp $ */ /* $OpenBSD: creator.c,v 1.20 2002/07/30 19:48:15 jason Exp $ */ /* @@ -33,7 +33,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ffb.c,v 1.49 2011/12/22 05:08:05 macallan Exp $); +__KERNEL_RCSID(0, $NetBSD: ffb.c,v 1.50 2012/01/11 15:53:32 macallan Exp $); #include sys/types.h #include sys/param.h @@ -1188,7 +1188,7 @@ ffb_init_screen(void *cookie, struct vco #endif DPRINTF((ffb_init_screen: addr: %08lx\n,(ulong)ri-ri_bits)); - rasops_init(ri, sc-sc_height/8, sc-sc_width/8); + rasops_init(ri, 0, 0); ri-ri_caps = WSSCREEN_WSCOLORS; rasops_reconfig(ri, sc-sc_height / ri-ri_font-fontheight, sc-sc_width / ri-ri_font-fontwidth); Index: src/sys/arch/sparc64/dev/gfb.c diff -u src/sys/arch/sparc64/dev/gfb.c:1.4 src/sys/arch/sparc64/dev/gfb.c:1.5 --- src/sys/arch/sparc64/dev/gfb.c:1.4 Fri Jul 1 18:48:36 2011 +++ src/sys/arch/sparc64/dev/gfb.c Wed Jan 11 15:53:32 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: gfb.c,v 1.4 2011/07/01 18:48:36 dyoung Exp $ */ +/* $NetBSD: gfb.c,v 1.5 2012/01/11 15:53:32 macallan Exp $ */ /* * Copyright (c) 2009 Michael Lorenz @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: gfb.c,v 1.4 2011/07/01 18:48:36 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: gfb.c,v 1.5 2012/01/11 15:53:32 macallan Exp $); #include sys/param.h #include sys/systm.h @@ -357,7 +357,7 @@ gfb_init_screen(void *cookie, struct vco ri-ri_flg |= RI_CLEAR; } - rasops_init(ri, sc-sc_height / 8, sc-sc_width / 8); + rasops_init(ri, 0, 0); ri-ri_caps = WSSCREEN_WSCOLORS; rasops_reconfig(ri, sc-sc_height / ri-ri_font-fontheight,
CVS commit: src/sys/arch/sparc/dev
Module Name:src Committed By: macallan Date: Wed Jan 11 15:54:44 UTC 2012 Modified Files: src/sys/arch/sparc/dev: cgfourteen.c Log Message: use rasops_init(0, 0) To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/sys/arch/sparc/dev/cgfourteen.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/dev/cgfourteen.c diff -u src/sys/arch/sparc/dev/cgfourteen.c:1.66 src/sys/arch/sparc/dev/cgfourteen.c:1.67 --- src/sys/arch/sparc/dev/cgfourteen.c:1.66 Wed Apr 13 23:31:25 2011 +++ src/sys/arch/sparc/dev/cgfourteen.c Wed Jan 11 15:54:44 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: cgfourteen.c,v 1.66 2011/04/13 23:31:25 macallan Exp $ */ +/* $NetBSD: cgfourteen.c,v 1.67 2012/01/11 15:54:44 macallan Exp $ */ /* * Copyright (c) 1996 @@ -1020,8 +1020,7 @@ cg14_init_screen(void *cookie, struct vc ri-ri_flg |= RI_CLEAR; } - rasops_init(ri, sc-sc_fb.fb_type.fb_height / 8, - sc-sc_fb.fb_type.fb_width / 8); + rasops_init(ri, 0, 0); ri-ri_caps = WSSCREEN_WSCOLORS; rasops_reconfig(ri,
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: macallan
Date: Wed Jan 11 16:02:30 UTC 2012
Modified Files:
src/sys/dev/pci: machfb.c pm2fb.c r128fb.c radeonfb.c voodoofb.c wcfb.c
Log Message:
use rasops_init(0, 0)
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sys/dev/pci/machfb.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pci/pm2fb.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/pci/r128fb.c
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/pci/radeonfb.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/pci/voodoofb.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/wcfb.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/machfb.c
diff -u src/sys/dev/pci/machfb.c:1.71 src/sys/dev/pci/machfb.c:1.72
--- src/sys/dev/pci/machfb.c:1.71 Thu Aug 4 00:57:33 2011
+++ src/sys/dev/pci/machfb.c Wed Jan 11 16:02:29 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machfb.c,v 1.71 2011/08/04 00:57:33 jakllsch Exp $ */
+/* $NetBSD: machfb.c,v 1.72 2012/01/11 16:02:29 macallan Exp $ */
/*
* Copyright (c) 2002 Bang Jun-Young
@@ -34,7 +34,7 @@
#include sys/cdefs.h
__KERNEL_RCSID(0,
- $NetBSD: machfb.c,v 1.71 2011/08/04 00:57:33 jakllsch Exp $);
+ $NetBSD: machfb.c,v 1.72 2012/01/11 16:02:29 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -825,8 +825,7 @@ mach64_init_screen(void *cookie, struct
}
}
- rasops_init(ri, sc-sc_my_mode-vdisplay / 8,
- sc-sc_my_mode-hdisplay / 8);
+ rasops_init(ri, 0, 0);
ri-ri_caps = WSSCREEN_WSCOLORS;
rasops_reconfig(ri, sc-sc_my_mode-vdisplay / ri-ri_font-fontheight,
sc-sc_my_mode-hdisplay / ri-ri_font-fontwidth);
Index: src/sys/dev/pci/pm2fb.c
diff -u src/sys/dev/pci/pm2fb.c:1.10 src/sys/dev/pci/pm2fb.c:1.11
--- src/sys/dev/pci/pm2fb.c:1.10 Thu Nov 24 05:57:17 2011
+++ src/sys/dev/pci/pm2fb.c Wed Jan 11 16:02:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pm2fb.c,v 1.10 2011/11/24 05:57:17 macallan Exp $ */
+/* $NetBSD: pm2fb.c,v 1.11 2012/01/11 16:02:30 macallan Exp $ */
/*
* Copyright (c) 2009 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pm2fb.c,v 1.10 2011/11/24 05:57:17 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: pm2fb.c,v 1.11 2012/01/11 16:02:30 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -304,8 +304,7 @@ pm2fb_attach(device_t parent, device_t s
ri = sc-sc_console_screen.scr_ri;
j = 0;
- for (i = 0; i (1 sc-sc_depth); i++) {
-
+ for (i = 0; i 256; i++) {
sc-sc_cmap_red[i] = rasops_cmap[j];
sc-sc_cmap_green[i] = rasops_cmap[j + 1];
sc-sc_cmap_blue[i] = rasops_cmap[j + 2];
@@ -477,7 +476,7 @@ pm2fb_init_screen(void *cookie, struct v
ri-ri_stride = sc-sc_stride;
ri-ri_flg = RI_CENTER;
- rasops_init(ri, sc-sc_height / 8, sc-sc_width / 8);
+ rasops_init(ri, 0, 0);
ri-ri_caps = WSSCREEN_WSCOLORS;
rasops_reconfig(ri, sc-sc_height / ri-ri_font-fontheight,
Index: src/sys/dev/pci/r128fb.c
diff -u src/sys/dev/pci/r128fb.c:1.26 src/sys/dev/pci/r128fb.c:1.27
--- src/sys/dev/pci/r128fb.c:1.26 Wed Jan 4 15:56:18 2012
+++ src/sys/dev/pci/r128fb.c Wed Jan 11 16:02:29 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: r128fb.c,v 1.26 2012/01/04 15:56:18 macallan Exp $ */
+/* $NetBSD: r128fb.c,v 1.27 2012/01/11 16:02:29 macallan Exp $ */
/*
* Copyright (c) 2007 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: r128fb.c,v 1.26 2012/01/04 15:56:18 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: r128fb.c,v 1.27 2012/01/11 16:02:29 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -534,7 +534,7 @@ r128fb_init_screen(void *cookie, struct
if (sc-sc_depth == 8)
ri-ri_flg |= RI_8BIT_IS_RGB | RI_ENABLE_ALPHA;
- rasops_init(ri, sc-sc_height / 8, sc-sc_width / 8);
+ rasops_init(ri, 0, 0);
ri-ri_caps = WSSCREEN_WSCOLORS;
#ifdef VCONS_DRAW_INTR
scr-scr_flags |= VCONS_DONT_READ;
Index: src/sys/dev/pci/radeonfb.c
diff -u src/sys/dev/pci/radeonfb.c:1.51 src/sys/dev/pci/radeonfb.c:1.52
--- src/sys/dev/pci/radeonfb.c:1.51 Thu Jan 5 21:40:03 2012
+++ src/sys/dev/pci/radeonfb.c Wed Jan 11 16:02:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: radeonfb.c,v 1.51 2012/01/05 21:40:03 macallan Exp $ */
+/* $NetBSD: radeonfb.c,v 1.52 2012/01/11 16:02:30 macallan Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: radeonfb.c,v 1.51 2012/01/05 21:40:03 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: radeonfb.c,v 1.52 2012/01/11 16:02:30 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -2192,7 +2192,7 @@ radeonfb_init_screen(void *cookie, struc
*/
/* initialize and look for an initial font */
- rasops_init(ri, dp-rd_virty/8, dp-rd_virtx/8);
+ rasops_init(ri, 0, 0);
ri-ri_caps = WSSCREEN_WSCOLORS;
rasops_reconfig(ri, dp-rd_virty / ri-ri_font-fontheight,
Index: src/sys/dev/pci/voodoofb.c
diff -u src/sys/dev/pci/voodoofb.c:1.28 src/sys/dev/pci/voodoofb.c:1.29
---
CVS commit: src/sys/dev/pci/voyager
Module Name:src
Committed By: macallan
Date: Wed Jan 11 16:07:29 UTC 2012
Modified Files:
src/sys/dev/pci/voyager: voyagerfb.c
Log Message:
use rasops_init(0,0), WSFONT_GLYPH(), FONT_IS_ALPHA()
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/pci/voyager/voyagerfb.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/voyager/voyagerfb.c
diff -u src/sys/dev/pci/voyager/voyagerfb.c:1.15 src/sys/dev/pci/voyager/voyagerfb.c:1.16
--- src/sys/dev/pci/voyager/voyagerfb.c:1.15 Wed Dec 28 18:23:01 2011
+++ src/sys/dev/pci/voyager/voyagerfb.c Wed Jan 11 16:07:29 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: voyagerfb.c,v 1.15 2011/12/28 18:23:01 macallan Exp $ */
+/* $NetBSD: voyagerfb.c,v 1.16 2012/01/11 16:07:29 macallan Exp $ */
/*
* Copyright (c) 2009, 2011 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: voyagerfb.c,v 1.15 2011/12/28 18:23:01 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: voyagerfb.c,v 1.16 2012/01/11 16:07:29 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -537,7 +537,7 @@ voyagerfb_init_screen(void *cookie, stru
ri-ri_flg |= RI_ENABLE_ALPHA;
#endif
- rasops_init(ri, sc-sc_height / 8, sc-sc_width / 8);
+ rasops_init(ri, 0, 0);
ri-ri_caps = WSSCREEN_WSCOLORS;
rasops_reconfig(ri, sc-sc_height / ri-ri_font-fontheight,
@@ -838,7 +838,7 @@ voyagerfb_putchar(void *cookie, int row,
struct vcons_screen *scr = ri-ri_hw;
struct voyagerfb_softc *sc = scr-scr_cookie;
uint32_t cmd;
- int fg, bg, uc;
+ int fg, bg;
uint8_t *data;
int x, y, wi, he;
@@ -859,9 +859,8 @@ voyagerfb_putchar(void *cookie, int row,
voyagerfb_rectfill(sc, x, y, wi, he, bg);
return;
}
- uc = c - font-firstchar;
- data = (uint8_t *)font-data + uc * ri-ri_fontscale;
- if (font-stride font-fontwidth) {
+ data = WSFONT_GLYPH(c, font);
+ if (!FONT_IS_ALPHA(font)) {
/* this is a mono font */
cmd = ROP_COPY |
SM502_CTRL_USE_ROP2 |
CVS commit: src/sys/dev/sbus
Module Name:src Committed By: macallan Date: Wed Jan 11 16:08:57 UTC 2012 Modified Files: src/sys/dev/sbus: agten.c cgtwelve.c p9100.c tcx.c zx.c Log Message: use rasops_init(0, 0) To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/dev/sbus/agten.c cvs rdiff -u -r1.4 -r1.5 src/sys/dev/sbus/cgtwelve.c cvs rdiff -u -r1.55 -r1.56 src/sys/dev/sbus/p9100.c cvs rdiff -u -r1.43 -r1.44 src/sys/dev/sbus/tcx.c cvs rdiff -u -r1.38 -r1.39 src/sys/dev/sbus/zx.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/sbus/agten.c diff -u src/sys/dev/sbus/agten.c:1.27 src/sys/dev/sbus/agten.c:1.28 --- src/sys/dev/sbus/agten.c:1.27 Mon Nov 15 05:59:57 2010 +++ src/sys/dev/sbus/agten.c Wed Jan 11 16:08:57 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: agten.c,v 1.27 2010/11/15 05:59:57 uebayasi Exp $ */ +/* $NetBSD: agten.c,v 1.28 2012/01/11 16:08:57 macallan Exp $ */ /*- * Copyright (c) 2007 Michael Lorenz @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: agten.c,v 1.27 2010/11/15 05:59:57 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: agten.c,v 1.28 2012/01/11 16:08:57 macallan Exp $); /* * a driver for the Fujitsu AG-10e SBus framebuffer @@ -469,7 +469,7 @@ agten_init_screen(void *cookie, struct v ri-ri_flg |= RI_CLEAR; } - rasops_init(ri, sc-sc_height / 8, sc-sc_width / 8); + rasops_init(ri, 0, 0); ri-ri_caps = WSSCREEN_WSCOLORS; rasops_reconfig(ri, sc-sc_height / ri-ri_font-fontheight, Index: src/sys/dev/sbus/cgtwelve.c diff -u src/sys/dev/sbus/cgtwelve.c:1.4 src/sys/dev/sbus/cgtwelve.c:1.5 --- src/sys/dev/sbus/cgtwelve.c:1.4 Wed Aug 18 21:11:50 2010 +++ src/sys/dev/sbus/cgtwelve.c Wed Jan 11 16:08:57 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: cgtwelve.c,v 1.4 2010/08/18 21:11:50 macallan Exp $ */ +/* $NetBSD: cgtwelve.c,v 1.5 2012/01/11 16:08:57 macallan Exp $ */ /*- * Copyright (c) 2010 Michael Lorenz @@ -29,7 +29,7 @@ /* a console driver for the Sun CG12 / Matrox SG3 graphics board */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cgtwelve.c,v 1.4 2010/08/18 21:11:50 macallan Exp $); +__KERNEL_RCSID(0, $NetBSD: cgtwelve.c,v 1.5 2012/01/11 16:08:57 macallan Exp $); #include sys/param.h #include sys/systm.h @@ -486,7 +486,7 @@ cgtwelve_init_screen(void *cookie, struc ri-ri_bits = sc-sc_shadow; } - rasops_init(ri, ri-ri_height / 8, ri-ri_width / 8); + rasops_init(ri, 0, 0); #ifdef CG12_COLOR ri-ri_caps = WSSCREEN_REVERSE | WSSCREEN_WSCOLORS; #else Index: src/sys/dev/sbus/p9100.c diff -u src/sys/dev/sbus/p9100.c:1.55 src/sys/dev/sbus/p9100.c:1.56 --- src/sys/dev/sbus/p9100.c:1.55 Tue May 4 05:10:25 2010 +++ src/sys/dev/sbus/p9100.c Wed Jan 11 16:08:57 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: p9100.c,v 1.55 2010/05/04 05:10:25 macallan Exp $ */ +/* $NetBSD: p9100.c,v 1.56 2012/01/11 16:08:57 macallan Exp $ */ /*- * Copyright (c) 1998, 2005, 2006 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: p9100.c,v 1.55 2010/05/04 05:10:25 macallan Exp $); +__KERNEL_RCSID(0, $NetBSD: p9100.c,v 1.56 2012/01/11 16:08:57 macallan Exp $); #include sys/param.h #include sys/systm.h @@ -1231,7 +1231,7 @@ p9100_init_screen(void *cookie, struct v DPRINTF(addr: %08lx\n,(ulong)ri-ri_bits); #endif - rasops_init(ri, sc-sc_height/8, sc-sc_width/8); + rasops_init(ri, 0, 0); ri-ri_caps = WSSCREEN_WSCOLORS; rasops_reconfig(ri, sc-sc_height / ri-ri_font-fontheight, sc-sc_width / ri-ri_font-fontwidth); Index: src/sys/dev/sbus/tcx.c diff -u src/sys/dev/sbus/tcx.c:1.43 src/sys/dev/sbus/tcx.c:1.44 --- src/sys/dev/sbus/tcx.c:1.43 Tue May 4 05:10:25 2010 +++ src/sys/dev/sbus/tcx.c Wed Jan 11 16:08:57 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: tcx.c,v 1.43 2010/05/04 05:10:25 macallan Exp $ */ +/* $NetBSD: tcx.c,v 1.44 2012/01/11 16:08:57 macallan Exp $ */ /* * Copyright (c) 1996, 1998, 2009 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tcx.c,v 1.43 2010/05/04 05:10:25 macallan Exp $); +__KERNEL_RCSID(0, $NetBSD: tcx.c,v 1.44 2012/01/11 16:08:57 macallan Exp $); /* * define for cg8 emulation on S24 (24-bit version of tcx) for the SS5; @@ -821,7 +821,7 @@ tcx_init_screen(void *cookie, struct vco ri-ri_bits = sc-sc_fbaddr; - rasops_init(ri, ri-ri_height/8, ri-ri_width/8); + rasops_init(ri, 0, 0); ri-ri_caps = WSSCREEN_WSCOLORS; rasops_reconfig(ri, ri-ri_height / ri-ri_font-fontheight, ri-ri_width / ri-ri_font-fontwidth); Index: src/sys/dev/sbus/zx.c diff -u src/sys/dev/sbus/zx.c:1.38 src/sys/dev/sbus/zx.c:1.39 --- src/sys/dev/sbus/zx.c:1.38 Thu Dec 9 04:35:36 2010 +++ src/sys/dev/sbus/zx.c Wed Jan 11 16:08:57 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: zx.c,v 1.38 2010/12/09 04:35:36 uebayasi Exp $ */ +/* $NetBSD: zx.c,v 1.39 2012/01/11 16:08:57 macallan Exp $ */ /* * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -45,7
CVS commit: src/sys/dev/sun
Module Name:src Committed By: macallan Date: Wed Jan 11 16:10:14 UTC 2012 Modified Files: src/sys/dev/sun: bwtwo.c cgsix.c cgthree.c Log Message: use rasops_init(0,0) To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/dev/sun/bwtwo.c cvs rdiff -u -r1.50 -r1.51 src/sys/dev/sun/cgsix.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/sun/cgthree.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/sun/bwtwo.c diff -u src/sys/dev/sun/bwtwo.c:1.29 src/sys/dev/sun/bwtwo.c:1.30 --- src/sys/dev/sun/bwtwo.c:1.29 Mon May 10 14:33:21 2010 +++ src/sys/dev/sun/bwtwo.c Wed Jan 11 16:10:13 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: bwtwo.c,v 1.29 2010/05/10 14:33:21 tsutsui Exp $ */ +/* $NetBSD: bwtwo.c,v 1.30 2012/01/11 16:10:13 macallan Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -79,7 +79,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bwtwo.c,v 1.29 2010/05/10 14:33:21 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: bwtwo.c,v 1.30 2012/01/11 16:10:13 macallan Exp $); #include sys/param.h #include sys/systm.h @@ -453,7 +453,7 @@ bwtwo_init_screen(void *cookie, struct v memset(sc-sc_fb.fb_pixels, (*defattr 16) 0xff, sc-sc_stride * sc-sc_height); - rasops_init(ri, sc-sc_height/8, sc-sc_width/8); + rasops_init(ri, 0, 0); ri-ri_caps = 0; rasops_reconfig(ri, sc-sc_height / ri-ri_font-fontheight, sc-sc_width / ri-ri_font-fontwidth); Index: src/sys/dev/sun/cgsix.c diff -u src/sys/dev/sun/cgsix.c:1.50 src/sys/dev/sun/cgsix.c:1.51 --- src/sys/dev/sun/cgsix.c:1.50 Tue Nov 23 22:14:27 2010 +++ src/sys/dev/sun/cgsix.c Wed Jan 11 16:10:13 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: cgsix.c,v 1.50 2010/11/23 22:14:27 mrg Exp $ */ +/* $NetBSD: cgsix.c,v 1.51 2012/01/11 16:10:13 macallan Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -78,7 +78,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cgsix.c,v 1.50 2010/11/23 22:14:27 mrg Exp $); +__KERNEL_RCSID(0, $NetBSD: cgsix.c,v 1.51 2012/01/11 16:10:13 macallan Exp $); #include sys/param.h #include sys/systm.h @@ -1250,7 +1250,7 @@ cgsix_init_screen(void *cookie, struct v if (sc-sc_fhcrev 2) memset(sc-sc_fb.fb_pixels, (*defattr 16) 0xff, sc-sc_stride * sc-sc_height); - rasops_init(ri, sc-sc_height/8, sc-sc_width/8); + rasops_init(ri, 0, 0); ri-ri_caps = WSSCREEN_WSCOLORS | WSSCREEN_REVERSE; rasops_reconfig(ri, sc-sc_height / ri-ri_font-fontheight, sc-sc_width / ri-ri_font-fontwidth); Index: src/sys/dev/sun/cgthree.c diff -u src/sys/dev/sun/cgthree.c:1.28 src/sys/dev/sun/cgthree.c:1.29 --- src/sys/dev/sun/cgthree.c:1.28 Tue Sep 14 19:36:13 2010 +++ src/sys/dev/sun/cgthree.c Wed Jan 11 16:10:14 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: cgthree.c,v 1.28 2010/09/14 19:36:13 macallan Exp $ */ +/* $NetBSD: cgthree.c,v 1.29 2012/01/11 16:10:14 macallan Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cgthree.c,v 1.28 2010/09/14 19:36:13 macallan Exp $); +__KERNEL_RCSID(0, $NetBSD: cgthree.c,v 1.29 2012/01/11 16:10:14 macallan Exp $); #include sys/param.h #include sys/systm.h @@ -557,7 +557,7 @@ cgthree_init_screen(void *cookie, struct ri-ri_bits = sc-sc_fb.fb_pixels; - rasops_init(ri, sc-sc_height/8, sc-sc_width/8); + rasops_init(ri, 0, 0); ri-ri_caps = WSSCREEN_WSCOLORS | WSSCREEN_REVERSE; rasops_reconfig(ri, sc-sc_height / ri-ri_font-fontheight, sc-sc_width / ri-ri_font-fontwidth);
CVS commit: src/sys/dev/ic
Module Name:src Committed By: macallan Date: Wed Jan 11 16:12:38 UTC 2012 Modified Files: src/sys/dev/ic: ct65550.c igsfb.c Log Message: use rasops_init(0, 0) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/ic/ct65550.c cvs rdiff -u -r1.50 -r1.51 src/sys/dev/ic/igsfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/ct65550.c diff -u src/sys/dev/ic/ct65550.c:1.2 src/sys/dev/ic/ct65550.c:1.3 --- src/sys/dev/ic/ct65550.c:1.2 Wed Mar 23 04:02:43 2011 +++ src/sys/dev/ic/ct65550.c Wed Jan 11 16:12:38 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: ct65550.c,v 1.2 2011/03/23 04:02:43 macallan Exp $ */ +/* $NetBSD: ct65550.c,v 1.3 2012/01/11 16:12:38 macallan Exp $ */ /* * Copyright (c) 2006 Michael Lorenz @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ct65550.c,v 1.2 2011/03/23 04:02:43 macallan Exp $); +__KERNEL_RCSID(0, $NetBSD: ct65550.c,v 1.3 2012/01/11 16:12:38 macallan Exp $); #include sys/param.h #include sys/systm.h @@ -821,7 +821,7 @@ chipsfb_init_screen(void *cookie, struct ri-ri_flg |= RI_CLEAR; } - rasops_init(ri, sc-height/8, sc-width/8); + rasops_init(ri, 0, 0); ri-ri_caps = WSSCREEN_WSCOLORS; rasops_reconfig(ri, sc-height / ri-ri_font-fontheight, Index: src/sys/dev/ic/igsfb.c diff -u src/sys/dev/ic/igsfb.c:1.50 src/sys/dev/ic/igsfb.c:1.51 --- src/sys/dev/ic/igsfb.c:1.50 Tue Jul 26 08:59:37 2011 +++ src/sys/dev/ic/igsfb.c Wed Jan 11 16:12:38 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: igsfb.c,v 1.50 2011/07/26 08:59:37 mrg Exp $ */ +/* $NetBSD: igsfb.c,v 1.51 2012/01/11 16:12:38 macallan Exp $ */ /* * Copyright (c) 2002, 2003 Valeriy E. Ushakov @@ -31,7 +31,7 @@ * Integraphics Systems IGA 168x and CyberPro series. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: igsfb.c,v 1.50 2011/07/26 08:59:37 mrg Exp $); +__KERNEL_RCSID(0, $NetBSD: igsfb.c,v 1.51 2012/01/11 16:12:38 macallan Exp $); #include sys/param.h #include sys/systm.h @@ -455,7 +455,7 @@ igsfb_init_wsdisplay(void *cookie, struc /* XXX: TODO: compute term size based on font dimensions? */ - rasops_init(ri, 34, 80); + rasops_init(ri, 0, 0); rasops_reconfig(ri, ri-ri_height / ri-ri_font-fontheight, ri-ri_width / ri-ri_font-fontwidth);
CVS commit: src/sys/dev/wsfb
Module Name:src Committed By: macallan Date: Wed Jan 11 16:13:12 UTC 2012 Modified Files: src/sys/dev/wsfb: genfb.c Log Message: use rasops_init(0, 0) To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/dev/wsfb/genfb.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/wsfb/genfb.c diff -u src/sys/dev/wsfb/genfb.c:1.45 src/sys/dev/wsfb/genfb.c:1.46 --- src/sys/dev/wsfb/genfb.c:1.45 Wed Jan 4 20:18:28 2012 +++ src/sys/dev/wsfb/genfb.c Wed Jan 11 16:13:11 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: genfb.c,v 1.45 2012/01/04 20:18:28 macallan Exp $ */ +/* $NetBSD: genfb.c,v 1.46 2012/01/11 16:13:11 macallan Exp $ */ /*- * Copyright (c) 2007 Michael Lorenz @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: genfb.c,v 1.45 2012/01/04 20:18:28 macallan Exp $); +__KERNEL_RCSID(0, $NetBSD: genfb.c,v 1.46 2012/01/11 16:13:11 macallan Exp $); #include sys/param.h #include sys/systm.h @@ -514,7 +514,7 @@ genfb_init_screen(void *cookie, struct v ri-ri_flg |= RI_ENABLE_ALPHA | RI_8BIT_IS_RGB; - rasops_init(ri, sc-sc_height / 8, sc-sc_width / 8); + rasops_init(ri, 0, 0); ri-ri_caps = WSSCREEN_WSCOLORS; rasops_reconfig(ri, sc-sc_height / ri-ri_font-fontheight,
CVS commit: src/sys/arch/sgimips
Module Name:src
Committed By: macallan
Date: Wed Jan 11 16:18:30 UTC 2012
Modified Files:
src/sys/arch/sgimips/dev: crmfb.c
src/sys/arch/sgimips/gio: newport.c
Log Message:
use rasops_init(0,0)
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/sgimips/dev/crmfb.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sgimips/gio/newport.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/sgimips/dev/crmfb.c
diff -u src/sys/arch/sgimips/dev/crmfb.c:1.35 src/sys/arch/sgimips/dev/crmfb.c:1.36
--- src/sys/arch/sgimips/dev/crmfb.c:1.35 Fri Jul 1 18:53:46 2011
+++ src/sys/arch/sgimips/dev/crmfb.c Wed Jan 11 16:18:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: crmfb.c,v 1.35 2011/07/01 18:53:46 dyoung Exp $ */
+/* $NetBSD: crmfb.c,v 1.36 2012/01/11 16:18:30 macallan Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: crmfb.c,v 1.35 2011/07/01 18:53:46 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: crmfb.c,v 1.36 2012/01/11 16:18:30 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -590,7 +590,7 @@ crmfb_init_screen(void *c, struct vcons_
if (existing)
ri-ri_flg |= RI_CLEAR;
- rasops_init(ri, ri-ri_height / 16, ri-ri_width / 8);
+ rasops_init(ri, 0, 0);
ri-ri_caps = WSSCREEN_WSCOLORS;
rasops_reconfig(ri, ri-ri_height / ri-ri_font-fontheight,
ri-ri_width / ri-ri_font-fontwidth);
Index: src/sys/arch/sgimips/gio/newport.c
diff -u src/sys/arch/sgimips/gio/newport.c:1.15 src/sys/arch/sgimips/gio/newport.c:1.16
--- src/sys/arch/sgimips/gio/newport.c:1.15 Tue May 12 23:51:25 2009
+++ src/sys/arch/sgimips/gio/newport.c Wed Jan 11 16:18:30 2012
@@ -1,7 +1,8 @@
-/* $NetBSD: newport.c,v 1.15 2009/05/12 23:51:25 macallan Exp $ */
+/* $NetBSD: newport.c,v 1.16 2012/01/11 16:18:30 macallan Exp $ */
/*
* Copyright (c) 2003 Ilpo Ruotsalainen
+ * 2009 Michael Lorenz
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -30,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: newport.c,v 1.15 2009/05/12 23:51:25 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: newport.c,v 1.16 2012/01/11 16:18:30 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -171,7 +172,8 @@ rex3_read(struct newport_devconfig *dc,
static void
rex3_wait_gfifo(struct newport_devconfig *dc)
{
- while (rex3_read(dc, REX3_REG_STATUS) REX3_STATUS_GFXBUSY)
+ while (rex3_read(dc, REX3_REG_STATUS)
+ (REX3_STATUS_GFXBUSY | REX3_STATUS_PIPELEVEL_MASK))
;
}
@@ -589,6 +591,7 @@ newport_attach(device_t parent, device_t
newport_console_screen.scr_ri.ri_ops;
memcpy(newport_textops, newport_console_screen.scr_ri.ri_ops,
sizeof(struct wsdisplay_emulops));
+ vcons_replay_msgbuf(newport_console_screen);
}
wa.scrdata = newport_screenlist;
wa.accessops = newport_accessops;
@@ -651,7 +654,7 @@ newport_init_screen(void *cookie, struct
/*ri-ri_bits = (char *)sc-sc_fb.fb_pixels;*/
- rasops_init(ri, dc-dc_yres / 8, dc-dc_xres / 8);
+ rasops_init(ri, 0, 0);
ri-ri_caps = WSSCREEN_WSCOLORS;
rasops_reconfig(ri, dc-dc_yres / ri-ri_font-fontheight,
@@ -777,6 +780,7 @@ newport_putchar(void *c, int row, int co
bitmap += font-stride;
}
+ rex3_wait_gfifo(dc);
}
static void
@@ -905,6 +909,12 @@ newport_ioctl(void *v, void *vs, u_long
rex3_wait_gfifo(dc);
newport_setup_hw(dc);
vcons_redraw_screen(vd-active);
+ } else {
+xmap9_write_mode(dc, 0,
+ XMAP9_MODE_GAMMA_BYPASS |
+XMAP9_CONFIG_RGBMAP_2 |
+ XMAP9_MODE_PIXSIZE_24BPP);
+xmap9_write(dc, XMAP9_DCBCRS_MODE_SELECT, 0);
}
}
return 0;
@@ -924,5 +934,5 @@ newport_mmap(void *v, void *vs, off_t of
if ( offset = 0xf)
return -1;
- return mips_btop(dc-dc_addr + offset);
+ return bus_space_mmap(dc-dc_st, dc-dc_sh, offset, prot, 0);
}
CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: macallan Date: Wed Jan 11 16:29:32 UTC 2012 Modified Files: src/sys/arch/macppc/conf: INSTALL Log Message: include a big and a small font now that rasops should pick the one more appropriate for whatever video mode we're in To generate a diff of this commit: cvs rdiff -u -r1.113 -r1.114 src/sys/arch/macppc/conf/INSTALL 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/macppc/conf/INSTALL diff -u src/sys/arch/macppc/conf/INSTALL:1.113 src/sys/arch/macppc/conf/INSTALL:1.114 --- src/sys/arch/macppc/conf/INSTALL:1.113 Sun Dec 18 05:49:29 2011 +++ src/sys/arch/macppc/conf/INSTALL Wed Jan 11 16:29:32 2012 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.113 2011/12/18 05:49:29 dholland Exp $ +# $NetBSD: INSTALL,v 1.114 2012/01/11 16:29:32 macallan Exp $ # # config file for INSTALL FLOPPY # @@ -55,7 +55,8 @@ options INET6 # IPV6 options NFS_BOOT_DHCP # Support DHCP NFS root options WSEMUL_VT100 # VT100 / VT220 emulation -options FONT_SONY8x16 +options FONT_GALLANT12x22 # big, Sun-like font +options FONT_QVSS8x15 # a smaller font for lower resolutions # Kernel root file system and dump configuration. config netbsd root on ? type ?
CVS commit: src/sys/arch/amiga
Module Name:src Committed By: rkujawa Date: Wed Jan 11 17:04:29 UTC 2012 Modified Files: src/sys/arch/amiga/conf: DRACO GENERIC GENERIC.in INSTALL files.amiga src/sys/arch/amiga/pci: p5pbreg.h Added Files: src/sys/arch/amiga/pci: cv3dpb.c cv3dpbreg.h cv3dpbvar.h Log Message: Add cv3dpb, a driver for CyberVision64/3D PCI bridge, which was split from p5pb. To generate a diff of this commit: cvs rdiff -u -r1.149 -r1.150 src/sys/arch/amiga/conf/DRACO cvs rdiff -u -r1.279 -r1.280 src/sys/arch/amiga/conf/GENERIC cvs rdiff -u -r1.91 -r1.92 src/sys/arch/amiga/conf/GENERIC.in cvs rdiff -u -r1.101 -r1.102 src/sys/arch/amiga/conf/INSTALL cvs rdiff -u -r1.151 -r1.152 src/sys/arch/amiga/conf/files.amiga cvs rdiff -u -r0 -r1.1 src/sys/arch/amiga/pci/cv3dpb.c \ src/sys/arch/amiga/pci/cv3dpbreg.h src/sys/arch/amiga/pci/cv3dpbvar.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/amiga/pci/p5pbreg.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/amiga/conf/DRACO diff -u src/sys/arch/amiga/conf/DRACO:1.149 src/sys/arch/amiga/conf/DRACO:1.150 --- src/sys/arch/amiga/conf/DRACO:1.149 Tue Jan 10 20:29:49 2012 +++ src/sys/arch/amiga/conf/DRACO Wed Jan 11 17:04:29 2012 @@ -1,9 +1,9 @@ -# $NetBSD: DRACO,v 1.149 2012/01/10 20:29:49 rkujawa Exp $ +# $NetBSD: DRACO,v 1.150 2012/01/11 17:04:29 rkujawa Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. # -# Created from: # NetBSD: GENERIC.in,v 1.90 2011/12/26 13:07:24 mlelstv Exp $ +# Created from: # NetBSD: GENERIC.in,v 1.91 2012/01/10 20:29:50 rkujawa Exp $ # ## # GENERIC machine description file @@ -29,7 +29,7 @@ include arch/amiga/conf/std.amiga options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.149 $ +#ident GENERIC-$Revision: 1.150 $ maxusers 8 Index: src/sys/arch/amiga/conf/GENERIC diff -u src/sys/arch/amiga/conf/GENERIC:1.279 src/sys/arch/amiga/conf/GENERIC:1.280 --- src/sys/arch/amiga/conf/GENERIC:1.279 Tue Jan 10 20:29:49 2012 +++ src/sys/arch/amiga/conf/GENERIC Wed Jan 11 17:04:29 2012 @@ -1,9 +1,9 @@ -# $NetBSD: GENERIC,v 1.279 2012/01/10 20:29:49 rkujawa Exp $ +# $NetBSD: GENERIC,v 1.280 2012/01/11 17:04:29 rkujawa Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. # -# Created from: # NetBSD: GENERIC.in,v 1.90 2011/12/26 13:07:24 mlelstv Exp $ +# Created from: # NetBSD: GENERIC.in,v 1.91 2012/01/10 20:29:50 rkujawa Exp $ # ## # GENERIC machine description file @@ -29,7 +29,7 @@ include arch/amiga/conf/std.amiga options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.279 $ +#ident GENERIC-$Revision: 1.280 $ maxusers 8 @@ -482,6 +482,8 @@ pci* at p5pb0 mppb* at zbus0 # Matay Prometheus Zorro-PCI bridge pci*at mppb? +#cv3dpb* at zbus0 # CyberVision 64/3D PCI bridge + #genfb* at pci? # generic fb, CVPPC/BVPPC only ne* at pci? # NE2000 Ethernet Index: src/sys/arch/amiga/conf/GENERIC.in diff -u src/sys/arch/amiga/conf/GENERIC.in:1.91 src/sys/arch/amiga/conf/GENERIC.in:1.92 --- src/sys/arch/amiga/conf/GENERIC.in:1.91 Tue Jan 10 20:29:50 2012 +++ src/sys/arch/amiga/conf/GENERIC.in Wed Jan 11 17:04:29 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC.in,v 1.91 2012/01/10 20:29:50 rkujawa Exp $ +# $NetBSD: GENERIC.in,v 1.92 2012/01/11 17:04:29 rkujawa Exp $ # ## # GENERIC machine description file @@ -52,7 +52,7 @@ include arch/amiga/conf/std.amiga options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.91 $ +#ident GENERIC-$Revision: 1.92 $ m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl makeoptions COPTS=-Os @@ -569,6 +569,8 @@ pci* at p5pb0 mppb* at zbus0 # Matay Prometheus Zorro-PCI bridge pci*at mppb? +#cv3dpb* at zbus0 # CyberVision 64/3D PCI bridge + #genfb* at pci? # generic fb, CVPPC/BVPPC only ne* at pci? # NE2000 Ethernet Index: src/sys/arch/amiga/conf/INSTALL diff -u src/sys/arch/amiga/conf/INSTALL:1.101 src/sys/arch/amiga/conf/INSTALL:1.102 --- src/sys/arch/amiga/conf/INSTALL:1.101 Tue Jan 10 20:29:50 2012 +++ src/sys/arch/amiga/conf/INSTALL Wed Jan 11 17:04:29 2012 @@ -1,9 +1,9 @@ -# $NetBSD: INSTALL,v 1.101 2012/01/10 20:29:50 rkujawa Exp $ +# $NetBSD: INSTALL,v 1.102 2012/01/11 17:04:29 rkujawa Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. # -# Created from: # NetBSD: GENERIC.in,v 1.90 2011/12/26 13:07:24 mlelstv Exp $ +# Created from: # NetBSD: GENERIC.in,v 1.91 2012/01/10 20:29:50 rkujawa Exp $ # ## # GENERIC machine description file @@ -29,7 +29,7 @@ include arch/amiga/conf/std.amiga options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.101 $
CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: macallan Date: Wed Jan 11 17:16:36 UTC 2012 Modified Files: src/sys/arch/macppc/conf: GENERIC Log Message: include a small font To generate a diff of this commit: cvs rdiff -u -r1.295 -r1.296 src/sys/arch/macppc/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/macppc/conf/GENERIC diff -u src/sys/arch/macppc/conf/GENERIC:1.295 src/sys/arch/macppc/conf/GENERIC:1.296 --- src/sys/arch/macppc/conf/GENERIC:1.295 Sun Dec 18 05:49:29 2011 +++ src/sys/arch/macppc/conf/GENERIC Wed Jan 11 17:16:35 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.295 2011/12/18 05:49:29 dholland Exp $ +# $NetBSD: GENERIC,v 1.296 2012/01/11 17:16:35 macallan Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/macppc/conf/std.macppc options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.295 $ +#ident GENERIC-$Revision: 1.296 $ maxusers 32 @@ -173,6 +173,7 @@ options WS_KERNEL_BG=WSCOL_LIGHT_WHITE #options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes options FONT_GALLANT12x22 +options FONT_QVSS8x15 # a smaller font for lower resolutions # Optional Mac keyboard tweaks
CVS commit: src/sys/arch/sparc/conf
Module Name:src Committed By: macallan Date: Wed Jan 11 17:18:51 UTC 2012 Modified Files: src/sys/arch/sparc/conf: GENERIC Log Message: include a small font To generate a diff of this commit: cvs rdiff -u -r1.229 -r1.230 src/sys/arch/sparc/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/sparc/conf/GENERIC diff -u src/sys/arch/sparc/conf/GENERIC:1.229 src/sys/arch/sparc/conf/GENERIC:1.230 --- src/sys/arch/sparc/conf/GENERIC:1.229 Sun Dec 18 05:49:32 2011 +++ src/sys/arch/sparc/conf/GENERIC Wed Jan 11 17:18:51 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.229 2011/12/18 05:49:32 dholland Exp $ +# $NetBSD: GENERIC,v 1.230 2012/01/11 17:18:51 macallan Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/sparc/conf/std.sparc options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.229 $ +#ident GENERIC-$Revision: 1.230 $ maxusers 32 @@ -67,7 +67,7 @@ options WSDISPLAY_SCROLLSUPPORT # generic options vlid for both wscons and RASTERCONSOLE options FONT_GALLANT12x22 # the console font -#options FONT_BOLD8x16 # a somewhat smaller font +options FONT_BOLD8x16 # a somewhat smaller font System options that are the same for all ports
CVS commit: src/share/man/man4/man4.amiga
Module Name:src Committed By: rkujawa Date: Wed Jan 11 17:25:19 UTC 2012 Modified Files: src/share/man/man4/man4.amiga: Makefile Added Files: src/share/man/man4/man4.amiga: cv3dpb.4 Log Message: Add man page for cv3dpb driver. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/share/man/man4/man4.amiga/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/man4.amiga/cv3dpb.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/man4.amiga/Makefile diff -u src/share/man/man4/man4.amiga/Makefile:1.22 src/share/man/man4/man4.amiga/Makefile:1.23 --- src/share/man/man4/man4.amiga/Makefile:1.22 Tue Jan 10 20:41:45 2012 +++ src/share/man/man4/man4.amiga/Makefile Wed Jan 11 17:25:19 2012 @@ -1,8 +1,8 @@ # from: @(#)Makefile 8.2 (Berkeley) 2/16/94 -# $NetBSD: Makefile,v 1.22 2012/01/10 20:41:45 rkujawa Exp $ +# $NetBSD: Makefile,v 1.23 2012/01/11 17:25:19 rkujawa Exp $ MAN= afsc.4 ahsc.4 amidisplaycc.4 atzsc.4 autoconf.4 console.4 bah.4 \ - bppcsc.4 ed.4 efa.4 es.4 fdc.4 grf.4 \ + bppcsc.4 cv3dpb.4 ed.4 efa.4 es.4 fdc.4 grf.4 \ grfcl.4 grfcv.4 grfcv3d.4 grfet.4 grfrh.4 grfrt.4 grful.4 \ gtsc.4 intro.4 ite.4 mem.4 mfcs.4 mgnsc.4 mppb.4 p5membar.4 p5pb.4 \ qn.4 ser.4 wesc.4 zssc.4 Added files: Index: src/share/man/man4/man4.amiga/cv3dpb.4 diff -u /dev/null src/share/man/man4/man4.amiga/cv3dpb.4:1.1 --- /dev/null Wed Jan 11 17:25:19 2012 +++ src/share/man/man4/man4.amiga/cv3dpb.4 Wed Jan 11 17:25:19 2012 @@ -0,0 +1,69 @@ +.\ $NetBSD: cv3dpb.4,v 1.1 2012/01/11 17:25:19 rkujawa Exp $ +.\ +.\ Copyright (c) 2011 The NetBSD Foundation, Inc. +.\ All rights reserved. +.\ +.\ This code is derived from software contributed to The NetBSD Foundation +.\ by Radoslaw Kujawa. +.\ +.\ 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. +.\ +.Dd January 11, 2012 +.Dt CV3DPB 4 amiga +.Os +.Sh NAME +.Nm cv3dpb +.Nd Phase5 CyberVision 64/3D PCI bridge driver +.Sh SYNOPSIS +.Cd cv3dpb* at zbus0 +.Cd pci* at cv3dpb? +.Sh DESCRIPTION +The +.Nm +driver provides support for the PCI bus present on CyberVision 64/3D graphics +card. +It allows using S3 ViRGE present on this card, as an usual PCI device. +.Sh HARDWARE +The +.Nm +driver supports the following hardware: +.Bl -tag -offset indent +.It Phase5 CyberVision 64/3D graphics card. +.It DCE Computer CyberVision 64/3D Mk-II graphics card. +.El +.Sh SEE ALSO +.Xr grfcv3d 4 , +.Xr p5pb 4 , +.Xr pci 4 +.Sh HISTORY +The +.Nm +device first appeared in +.Nx 6.0 . +.Sh AUTHORS +.An -nosplit +The +.Nm +driver was written by +.An Radoslaw Kujawa Aq radoslaw.kuj...@gmail.com . +.Sh CAVEATS +Machine-independent driver for the S3 ViRGE does not exist yet.
CVS commit: src/sys/dev/bluetooth
Module Name:src
Committed By: plunky
Date: Wed Jan 11 17:27:45 UTC 2012
Modified Files:
src/sys/dev/bluetooth: bthidev.c btkbd.c
Log Message:
offset processing of input reports to a kernel thread, to avoid
locking issues when a child device needs to call back into the
Bluetooth stack (eg when caps-lock is pressed, and wskbd wants
to change a LED)
(as discussed with Radoslaw Kujawa)
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/bluetooth/bthidev.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/bluetooth/btkbd.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/bluetooth/bthidev.c
diff -u src/sys/dev/bluetooth/bthidev.c:1.20 src/sys/dev/bluetooth/bthidev.c:1.21
--- src/sys/dev/bluetooth/bthidev.c:1.20 Sat Dec 31 01:16:09 2011
+++ src/sys/dev/bluetooth/bthidev.c Wed Jan 11 17:27:45 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bthidev.c,v 1.20 2011/12/31 01:16:09 rkujawa Exp $ */
+/* $NetBSD: bthidev.c,v 1.21 2012/01/11 17:27:45 plunky Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,16 +32,19 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bthidev.c,v 1.20 2011/12/31 01:16:09 rkujawa Exp $);
+__KERNEL_RCSID(0, $NetBSD: bthidev.c,v 1.21 2012/01/11 17:27:45 plunky Exp $);
#include sys/param.h
+#include sys/condvar.h
#include sys/conf.h
#include sys/device.h
#include sys/fcntl.h
#include sys/kernel.h
+#include sys/kthread.h
#include sys/queue.h
#include sys/malloc.h
#include sys/mbuf.h
+#include sys/mutex.h
#include sys/proc.h
#include sys/socketvar.h
#include sys/systm.h
@@ -83,6 +86,12 @@ struct bthidev_softc {
struct l2cap_channel *sc_int; /* interrupt channel */
struct l2cap_channel *sc_int_l; /* interrupt listen */
+ MBUFQ_HEAD() sc_inq; /* input queue */
+ kmutex_t sc_lock; /* input queue lock */
+ kcondvar_t sc_cv; /* input queue trigger */
+ lwp_t *sc_lwp; /* input queue processor */
+ int sc_detach;
+
LIST_HEAD(,bthidev) sc_list; /* child list */
callout_t sc_reconnect;
@@ -107,6 +116,8 @@ static int bthidev_listen(struct bthide
static int bthidev_connect(struct bthidev_softc *);
static int bthidev_output(struct bthidev *, uint8_t *, int);
static void bthidev_null(struct bthidev *, uint8_t *, int);
+static void bthidev_process(void *);
+static void bthidev_process_one(struct bthidev_softc *, struct mbuf *);
/* autoconf(9) glue */
static int bthidev_match(device_t, cfdata_t, void *);
@@ -188,6 +199,7 @@ bthidev_attach(device_t parent, device_t
*/
sc-sc_dev = self;
LIST_INIT(sc-sc_list);
+ MBUFQ_INIT(sc-sc_inq);
callout_init(sc-sc_reconnect, 0);
callout_setfunc(sc-sc_reconnect, bthidev_timeout, sc);
sc-sc_state = BTHID_CLOSED;
@@ -196,6 +208,8 @@ bthidev_attach(device_t parent, device_t
sc-sc_intpsm = L2CAP_PSM_HID_INTR;
sockopt_init(sc-sc_mode, BTPROTO_L2CAP, SO_L2CAP_LM, 0);
+ mutex_init(sc-sc_lock, MUTEX_DEFAULT, IPL_NONE);
+ cv_init(sc-sc_cv, device_xname(self));
/*
* extract config from proplist
@@ -280,6 +294,12 @@ bthidev_attach(device_t parent, device_t
aprint_normal(\n);
+ if (kthread_create(PRI_NONE, KTHREAD_MUSTJOIN, NULL, bthidev_process,
+ sc, sc-sc_lwp, %s, device_xname(self)) != 0) {
+ aprint_error_dev(self, failed to create input thread\n);
+ return;
+ }
+
for (rep = 0 ; rep = maxid ; rep++) {
if (hid_report_size(desc, dlen, hid_feature, rep) == 0
hid_report_size(desc, dlen, hid_input, rep) == 0
@@ -362,12 +382,25 @@ bthidev_detach(device_t self, int flags)
mutex_exit(bt_lock);
+ /* kill off the input processor */
+ if (sc-sc_lwp != NULL) {
+ mutex_enter(sc-sc_lock);
+ sc-sc_detach = 1;
+ cv_signal(sc-sc_cv);
+ mutex_exit(sc-sc_lock);
+ kthread_join(sc-sc_lwp);
+ sc-sc_lwp = NULL;
+ }
+
/* detach children */
while ((hidev = LIST_FIRST(sc-sc_list)) != NULL) {
LIST_REMOVE(hidev, sc_next);
config_detach(hidev-sc_dev, flags);
}
+ MBUFQ_DRAIN(sc-sc_inq);
+ cv_destroy(sc-sc_cv);
+ mutex_destroy(sc-sc_lock);
sockopt_destroy(sc-sc_mode);
return 0;
@@ -545,6 +578,123 @@ bthidev_connect(struct bthidev_softc *sc
return 0;
}
+/*
+ * The LWP which processes input reports, forwarding to child devices.
+ * We are always either processing input reports, holding the lock, or
+ * waiting for a signal on condvar.
+ */
+static void
+bthidev_process(void *arg)
+{
+ struct bthidev_softc *sc = arg;
+ struct mbuf *m;
+
+ mutex_enter(sc-sc_lock);
+ while (sc-sc_detach == 0) {
+ MBUFQ_DEQUEUE(sc-sc_inq, m);
+ if (m == NULL) {
+ cv_wait(sc-sc_cv, sc-sc_lock);
+ continue;
+ }
+
+ mutex_exit(sc-sc_lock);
+ bthidev_process_one(sc, m);
+ m_freem(m);
+ mutex_enter(sc-sc_lock);
+ }
+ mutex_exit(sc-sc_lock);
+ kthread_exit(0);
+}
+
+static void
+bthidev_process_one(struct bthidev_softc *sc, struct mbuf *m)
+{
+ struct bthidev *hidev;
+ uint8_t *data;
+ int len;
+
+ if (sc-sc_state != BTHID_OPEN)
+ return;
+
+ if
CVS commit: src/distrib/sets/lists/man
Module Name:src Committed By: rkujawa Date: Wed Jan 11 17:28:53 UTC 2012 Modified Files: src/distrib/sets/lists/man: mi Log Message: Add cv3dpb(4) page to set list To generate a diff of this commit: cvs rdiff -u -r1.1367 -r1.1368 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1367 src/distrib/sets/lists/man/mi:1.1368 --- src/distrib/sets/lists/man/mi:1.1367 Tue Jan 10 20:47:01 2012 +++ src/distrib/sets/lists/man/mi Wed Jan 11 17:28:52 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1367 2012/01/10 20:47:01 rkujawa Exp $ +# $NetBSD: mi,v 1.1368 2012/01/11 17:28:52 rkujawa Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -730,6 +730,7 @@ ./usr/share/man/cat4/amiga/bah.0 man-sys-catman .cat ./usr/share/man/cat4/amiga/bppcsc.0 man-sys-catman .cat ./usr/share/man/cat4/amiga/console.0 man-sys-catman .cat +./usr/share/man/cat4/amiga/cv3dpb.0 man-sys-catman .cat ./usr/share/man/cat4/amiga/ed.0 man-sys-catman .cat ./usr/share/man/cat4/amiga/efa.0 man-sys-catman .cat ./usr/share/man/cat4/amiga/es.0 man-sys-catman .cat @@ -3626,6 +3627,7 @@ ./usr/share/man/html4/amiga/bah.html man-sys-htmlman html ./usr/share/man/html4/amiga/bppcsc.html man-sys-htmlman html ./usr/share/man/html4/amiga/console.html man-sys-htmlman html +./usr/share/man/html4/amiga/cv3dpb.html man-sys-htmlman html ./usr/share/man/html4/amiga/ed.html man-sys-htmlman html ./usr/share/man/html4/amiga/efa.html man-sys-htmlman html ./usr/share/man/html4/amiga/es.html man-sys-htmlman html @@ -6219,6 +6221,7 @@ ./usr/share/man/man4/amiga/bah.4 man-sys-man .man ./usr/share/man/man4/amiga/bppcsc.4 man-sys-man .man ./usr/share/man/man4/amiga/console.4 man-sys-man .man +./usr/share/man/man4/amiga/cv3dpb.4 man-sys-man .man ./usr/share/man/man4/amiga/ed.4 man-sys-man .man ./usr/share/man/man4/amiga/efa.4 man-sys-man .man ./usr/share/man/man4/amiga/es.4 man-sys-man .man
CVS commit: src/share/man/man4/man4.amiga
Module Name:src Committed By: wiz Date: Wed Jan 11 19:44:56 UTC 2012 Modified Files: src/share/man/man4/man4.amiga: cv3dpb.4 Log Message: Remove trailing whitespace; wording. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/man4.amiga/cv3dpb.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/man4.amiga/cv3dpb.4 diff -u src/share/man/man4/man4.amiga/cv3dpb.4:1.1 src/share/man/man4/man4.amiga/cv3dpb.4:1.2 --- src/share/man/man4/man4.amiga/cv3dpb.4:1.1 Wed Jan 11 17:25:19 2012 +++ src/share/man/man4/man4.amiga/cv3dpb.4 Wed Jan 11 19:44:56 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: cv3dpb.4,v 1.1 2012/01/11 17:25:19 rkujawa Exp $ +.\ $NetBSD: cv3dpb.4,v 1.2 2012/01/11 19:44:56 wiz Exp $ .\ .\ Copyright (c) 2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -31,7 +31,7 @@ .Dt CV3DPB 4 amiga .Os .Sh NAME -.Nm cv3dpb +.Nm cv3dpb .Nd Phase5 CyberVision 64/3D PCI bridge driver .Sh SYNOPSIS .Cd cv3dpb* at zbus0 @@ -41,14 +41,14 @@ The .Nm driver provides support for the PCI bus present on CyberVision 64/3D graphics card. -It allows using S3 ViRGE present on this card, as an usual PCI device. +It allows using the S3 ViRGE present on this card as a usual PCI device. .Sh HARDWARE The .Nm driver supports the following hardware: .Bl -tag -offset indent -.It Phase5 CyberVision 64/3D graphics card. -.It DCE Computer CyberVision 64/3D Mk-II graphics card. +.It Phase5 CyberVision 64/3D graphics card +.It DCE Computer CyberVision 64/3D Mk-II graphics card .El .Sh SEE ALSO .Xr grfcv3d 4 ,
CVS commit: src/external/bsd/pcc/dist
Module Name:src Committed By: plunky Date: Wed Jan 11 20:33:46 UTC 2012 Update of /cvsroot/src/external/bsd/pcc/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3161 Log Message: Update to pcc-20120105 The full changelog is at http://pcc.ludd.ltu.se/fisheye/changelog/~date=2012-01-05T06%3A00%3A00/pcc notable improvements since 2011-09-01 - the previous version failed to compile an i386 kernel, this works (and the kernel boots though I would consider it experimental) - MacOS X fixes - misc documentation improvements - improved regression tests - some work has been done towards supporting C++ Status: Vendor Tag: ragge Release Tags: pcc-20120105 U src/external/bsd/pcc/dist/pcc/DATESTAMP U src/external/bsd/pcc/dist/pcc/Makefile.in U src/external/bsd/pcc/dist/pcc/config.guess U src/external/bsd/pcc/dist/pcc/config.h.in U src/external/bsd/pcc/dist/pcc/config.sub U src/external/bsd/pcc/dist/pcc/configure C src/external/bsd/pcc/dist/pcc/configure.ac U src/external/bsd/pcc/dist/pcc/install-sh U src/external/bsd/pcc/dist/pcc/arch/amd64/local.c U src/external/bsd/pcc/dist/pcc/arch/amd64/code.c U src/external/bsd/pcc/dist/pcc/arch/amd64/local2.c U src/external/bsd/pcc/dist/pcc/arch/amd64/macdefs.h U src/external/bsd/pcc/dist/pcc/arch/amd64/order.c U src/external/bsd/pcc/dist/pcc/arch/amd64/table.c U src/external/bsd/pcc/dist/pcc/arch/arm/local.c U src/external/bsd/pcc/dist/pcc/arch/arm/code.c U src/external/bsd/pcc/dist/pcc/arch/arm/local2.c U src/external/bsd/pcc/dist/pcc/arch/arm/macdefs.h U src/external/bsd/pcc/dist/pcc/arch/arm/order.c U src/external/bsd/pcc/dist/pcc/arch/arm/table.c U src/external/bsd/pcc/dist/pcc/arch/hppa/local.c U src/external/bsd/pcc/dist/pcc/arch/hppa/code.c U src/external/bsd/pcc/dist/pcc/arch/hppa/local2.c U src/external/bsd/pcc/dist/pcc/arch/hppa/macdefs.h U src/external/bsd/pcc/dist/pcc/arch/hppa/order.c U src/external/bsd/pcc/dist/pcc/arch/hppa/table.c U src/external/bsd/pcc/dist/pcc/arch/i386/flocal.c U src/external/bsd/pcc/dist/pcc/arch/i386/code.c U src/external/bsd/pcc/dist/pcc/arch/i386/local.c U src/external/bsd/pcc/dist/pcc/arch/i386/local2.c U src/external/bsd/pcc/dist/pcc/arch/i386/macdefs.h U src/external/bsd/pcc/dist/pcc/arch/i386/order.c U src/external/bsd/pcc/dist/pcc/arch/i386/table.c U src/external/bsd/pcc/dist/pcc/arch/m16c/local.c U src/external/bsd/pcc/dist/pcc/arch/m16c/TODO U src/external/bsd/pcc/dist/pcc/arch/m16c/code.c U src/external/bsd/pcc/dist/pcc/arch/m16c/local2.c U src/external/bsd/pcc/dist/pcc/arch/m16c/macdefs.h U src/external/bsd/pcc/dist/pcc/arch/m16c/order.c U src/external/bsd/pcc/dist/pcc/arch/m16c/table.c U src/external/bsd/pcc/dist/pcc/arch/mips/local.c U src/external/bsd/pcc/dist/pcc/arch/mips/TODO U src/external/bsd/pcc/dist/pcc/arch/mips/code.c U src/external/bsd/pcc/dist/pcc/arch/mips/local2.c U src/external/bsd/pcc/dist/pcc/arch/mips/macdefs.h U src/external/bsd/pcc/dist/pcc/arch/mips/order.c U src/external/bsd/pcc/dist/pcc/arch/mips/table.c U src/external/bsd/pcc/dist/pcc/arch/nova/local.c U src/external/bsd/pcc/dist/pcc/arch/nova/README U src/external/bsd/pcc/dist/pcc/arch/nova/code.c U src/external/bsd/pcc/dist/pcc/arch/nova/local2.c U src/external/bsd/pcc/dist/pcc/arch/nova/macdefs.h U src/external/bsd/pcc/dist/pcc/arch/nova/order.c U src/external/bsd/pcc/dist/pcc/arch/nova/table.c U src/external/bsd/pcc/dist/pcc/arch/pdp10/local.c U src/external/bsd/pcc/dist/pcc/arch/pdp10/README U src/external/bsd/pcc/dist/pcc/arch/pdp10/code.c U src/external/bsd/pcc/dist/pcc/arch/pdp10/local2.c U src/external/bsd/pcc/dist/pcc/arch/pdp10/macdefs.h U src/external/bsd/pcc/dist/pcc/arch/pdp10/order.c U src/external/bsd/pcc/dist/pcc/arch/pdp10/table.c U src/external/bsd/pcc/dist/pcc/arch/pdp11/local.c U src/external/bsd/pcc/dist/pcc/arch/pdp11/code.c U src/external/bsd/pcc/dist/pcc/arch/pdp11/local2.c U src/external/bsd/pcc/dist/pcc/arch/pdp11/macdefs.h U src/external/bsd/pcc/dist/pcc/arch/pdp11/order.c U src/external/bsd/pcc/dist/pcc/arch/pdp11/table.c U src/external/bsd/pcc/dist/pcc/arch/powerpc/local.c U src/external/bsd/pcc/dist/pcc/arch/powerpc/README U src/external/bsd/pcc/dist/pcc/arch/powerpc/code.c U src/external/bsd/pcc/dist/pcc/arch/powerpc/local2.c U src/external/bsd/pcc/dist/pcc/arch/powerpc/macdefs.h U src/external/bsd/pcc/dist/pcc/arch/powerpc/order.c U src/external/bsd/pcc/dist/pcc/arch/powerpc/table.c U src/external/bsd/pcc/dist/pcc/arch/sparc64/local.c U src/external/bsd/pcc/dist/pcc/arch/sparc64/code.c U src/external/bsd/pcc/dist/pcc/arch/sparc64/local2.c U src/external/bsd/pcc/dist/pcc/arch/sparc64/macdefs.h U src/external/bsd/pcc/dist/pcc/arch/sparc64/order.c U src/external/bsd/pcc/dist/pcc/arch/sparc64/table.c U src/external/bsd/pcc/dist/pcc/arch/vax/local.c U src/external/bsd/pcc/dist/pcc/arch/vax/code.c U src/external/bsd/pcc/dist/pcc/arch/vax/local2.c U src/external/bsd/pcc/dist/pcc/arch/vax/macdefs.h U src/external/bsd/pcc/dist/pcc/arch/vax/order.c U
CVS commit: src/external/bsd/pcc
Module Name:src
Committed By: plunky
Date: Wed Jan 11 20:36:26 UTC 2012
Modified Files:
src/external/bsd/pcc: Makefile.inc
src/external/bsd/pcc/include: config.h
Log Message:
update for pcc-20120105
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/pcc/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pcc/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/pcc/Makefile.inc
diff -u src/external/bsd/pcc/Makefile.inc:1.15 src/external/bsd/pcc/Makefile.inc:1.16
--- src/external/bsd/pcc/Makefile.inc:1.15 Thu Sep 1 13:00:14 2011
+++ src/external/bsd/pcc/Makefile.inc Wed Jan 11 20:36:26 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.15 2011/09/01 13:00:14 plunky Exp $
+# $NetBSD: Makefile.inc,v 1.16 2012/01/11 20:36:26 plunky Exp $
PCC_DIR:=${.PARSEDIR}
PCC_DIST=${PCC_DIR}/dist/pcc
@@ -6,7 +6,7 @@ PCC_LIBS=${PCC_DIR}/dist/pcc-libs
# (these strings will be updated by the prepare-import.sh script)
PCC_VERSION=1.1.0.DEVEL
-PCC_DATESTAMP=20110901
+PCC_DATESTAMP=20120105
TARGOS = netbsd
Index: src/external/bsd/pcc/include/config.h
diff -u src/external/bsd/pcc/include/config.h:1.4 src/external/bsd/pcc/include/config.h:1.5
--- src/external/bsd/pcc/include/config.h:1.4 Thu Sep 1 13:00:14 2011
+++ src/external/bsd/pcc/include/config.h Wed Jan 11 20:36:26 2012
@@ -161,7 +161,7 @@
#define TLS 1
/* Version string */
-/* #define VERSSTR pcc 1.1.0.DEVEL 20110901 for i386-unknown-netbsdelf5.99.55 */
+/* #define VERSSTR pcc 1.1.0.DEVEL 20120105 for i386-unknown-netbsdelf5.99.56 */
/* Size of wide-character type in chars */
#define WCHAR_SIZE 4
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: macallan
Date: Wed Jan 11 20:41:28 UTC 2012
Modified Files:
src/sys/dev/ic: igsfb.c vga.c vga_raster.c
Log Message:
wsfont_matches() and wsfont_find() take an extra parameter now
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/ic/igsfb.c
cvs rdiff -u -r1.107 -r1.108 src/sys/dev/ic/vga.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/ic/vga_raster.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/igsfb.c
diff -u src/sys/dev/ic/igsfb.c:1.51 src/sys/dev/ic/igsfb.c:1.52
--- src/sys/dev/ic/igsfb.c:1.51 Wed Jan 11 16:12:38 2012
+++ src/sys/dev/ic/igsfb.c Wed Jan 11 20:41:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: igsfb.c,v 1.51 2012/01/11 16:12:38 macallan Exp $ */
+/* $NetBSD: igsfb.c,v 1.52 2012/01/11 20:41:28 macallan Exp $ */
/*
* Copyright (c) 2002, 2003 Valeriy E. Ushakov
@@ -31,7 +31,7 @@
* Integraphics Systems IGA 168x and CyberPro series.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: igsfb.c,v 1.51 2012/01/11 16:12:38 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: igsfb.c,v 1.52 2012/01/11 20:41:28 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -432,14 +432,15 @@ igsfb_init_wsdisplay(void *cookie, struc
/* prefer gallant that is identical to the one the prom uses */
wsfcookie = wsfont_find(Gallant, 12, 22, 0,
WSDISPLAY_FONTORDER_L2R,
-WSDISPLAY_FONTORDER_L2R);
+WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
if (wsfcookie = 0) {
#ifdef DIAGNOSTIC
printf(unable to find font Gallant 12x22\n);
#endif
wsfcookie = wsfont_find(NULL, 0, 0, 0, /* any font at all? */
WSDISPLAY_FONTORDER_L2R,
- WSDISPLAY_FONTORDER_L2R);
+ WSDISPLAY_FONTORDER_L2R,
+ WSFONT_FIND_BITMAP);
}
if (wsfcookie = 0) {
Index: src/sys/dev/ic/vga.c
diff -u src/sys/dev/ic/vga.c:1.107 src/sys/dev/ic/vga.c:1.108
--- src/sys/dev/ic/vga.c:1.107 Wed Jun 8 10:25:21 2011
+++ src/sys/dev/ic/vga.c Wed Jan 11 20:41:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vga.c,v 1.107 2011/06/08 10:25:21 drochner Exp $ */
+/* $NetBSD: vga.c,v 1.108 2012/01/11 20:41:28 macallan Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vga.c,v 1.107 2011/06/08 10:25:21 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: vga.c,v 1.108 2012/01/11 20:41:28 macallan Exp $);
/* for WSCONS_SUPPORT_PCVTFONTS */
#include opt_wsdisplay_compat.h
@@ -325,7 +325,7 @@ egavga_getfont(struct vga_config *vc, st
TAILQ_FOREACH(f, vc-vc_fontlist, next) {
if (wsfont_matches(f-wsfont, name,
- 8, scr-pcs.type-fontheight, 0)
+ 8, scr-pcs.type-fontheight, 0, WSFONT_FIND_BITMAP)
(!primary || vga_valid_primary_font(f))) {
#ifdef VGAFONTDEBUG
if (scr != vga_console_screen || vga_console_attached)
@@ -337,7 +337,7 @@ egavga_getfont(struct vga_config *vc, st
}
cookie = wsfont_find(name, 8, scr-pcs.type-fontheight, 0,
- WSDISPLAY_FONTORDER_L2R, 0);
+ WSDISPLAY_FONTORDER_L2R, 0, WSFONT_FIND_BITMAP);
/* XXX obey primary */
if (cookie == -1) {
#ifdef VGAFONTDEBUG
@@ -570,7 +570,7 @@ vga_init(struct vga_config *vc, bus_spac
int cookie;
cookie = wsfont_find(NULL, 8, 16, 0,
- WSDISPLAY_FONTORDER_L2R, 0);
+ WSDISPLAY_FONTORDER_L2R, 0, WSFONT_FIND_BITMAP);
if (cookie == -1 || wsfont_lock(cookie, wf))
panic(vga_init: can't load console font);
vga_loadchars(vc-hdl, 0, wf-firstchar, wf-numchars,
Index: src/sys/dev/ic/vga_raster.c
diff -u src/sys/dev/ic/vga_raster.c:1.34 src/sys/dev/ic/vga_raster.c:1.35
--- src/sys/dev/ic/vga_raster.c:1.34 Wed Mar 24 19:33:51 2010
+++ src/sys/dev/ic/vga_raster.c Wed Jan 11 20:41:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_raster.c,v 1.34 2010/03/24 19:33:51 tnn Exp $ */
+/* $NetBSD: vga_raster.c,v 1.35 2012/01/11 20:41:28 macallan Exp $ */
/*
* Copyright (c) 2001, 2002 Bang Jun-Young
@@ -56,7 +56,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vga_raster.c,v 1.34 2010/03/24 19:33:51 tnn Exp $);
+__KERNEL_RCSID(0, $NetBSD: vga_raster.c,v 1.35 2012/01/11 20:41:28 macallan Exp $);
#include opt_wsmsgattrs.h /* for WSDISPLAY_CUSTOM_OUTPUT */
@@ -424,10 +424,11 @@ vga_raster_init(struct vga_config *vc, b
/* prefer 8x16 pixel font */
cookie = wsfont_find(NULL, 8, 16, 0, WSDISPLAY_FONTORDER_L2R,
- 0);
+ 0, WSFONT_FIND_BITMAP);
if (cookie == -1)
cookie = wsfont_find(NULL, 0, 0, 0,
- WSDISPLAY_FONTORDER_L2R, WSDISPLAY_FONTORDER_L2R);
+ WSDISPLAY_FONTORDER_L2R, WSDISPLAY_FONTORDER_L2R,
+ WSFONT_FIND_BITMAP);
if (cookie == -1 || wsfont_lock(cookie, wf))
panic(vga_raster_init: can't load console font);
vf-font = wf;
@@ -836,7 +837,8 @@ vga_raster_setup_font(struct vga_config
int cookie;
LIST_FOREACH(vf, vc-vc_fontlist, next) {
- if (wsfont_matches(vf-font, 0, 0, scr-type-fontheight, 0)) {
+ if
CVS commit: src/external/bsd/pcc/dist/pcc
Module Name:src Committed By: plunky Date: Wed Jan 11 20:46:48 UTC 2012 Modified Files: src/external/bsd/pcc/dist/pcc: configure.ac src/external/bsd/pcc/dist/pcc/cc: Makefile.in src/external/bsd/pcc/dist/pcc/cc/cc: cc.1 src/external/bsd/pcc/dist/pcc/cc/ccom: ccom.1 scan.l src/external/bsd/pcc/dist/pcc/mip: common.c Log Message: resolve merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pcc/dist/pcc/configure.ac cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pcc/dist/pcc/cc/Makefile.in cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pcc/dist/pcc/cc/cc/cc.1 cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pcc/dist/pcc/cc/ccom/ccom.1 cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pcc/dist/pcc/cc/ccom/scan.l cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pcc/dist/pcc/mip/common.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/pcc/dist/pcc/configure.ac diff -u src/external/bsd/pcc/dist/pcc/configure.ac:1.3 src/external/bsd/pcc/dist/pcc/configure.ac:1.4 --- src/external/bsd/pcc/dist/pcc/configure.ac:1.3 Thu Sep 1 12:55:29 2011 +++ src/external/bsd/pcc/dist/pcc/configure.ac Wed Jan 11 20:46:47 2012 @@ -70,6 +70,7 @@ case $target_os in abi=elf stabs=yes case $target_os in + *10.*) targosver=10 ;; *9.*) targosver=9 ;; *8.*) targosver=8 ;; *7.*) targosver=7 ;; @@ -500,6 +501,7 @@ AC_CONFIG_FILES([Makefile cc/cc/Makefile cc/cpp/Makefile cc/ccom/Makefile + cc/cxxcom/Makefile cc/driver/Makefile f77/Makefile f77/f77/Makefile Index: src/external/bsd/pcc/dist/pcc/cc/Makefile.in diff -u src/external/bsd/pcc/dist/pcc/cc/Makefile.in:1.4 src/external/bsd/pcc/dist/pcc/cc/Makefile.in:1.5 --- src/external/bsd/pcc/dist/pcc/cc/Makefile.in:1.4 Thu Sep 1 12:55:29 2011 +++ src/external/bsd/pcc/dist/pcc/cc/Makefile.in Wed Jan 11 20:46:47 2012 @@ -1,12 +1,12 @@ -# Id: Makefile.in,v 1.8 2011/06/07 13:56:05 plunky Exp -# $NetBSD: Makefile.in,v 1.4 2011/09/01 12:55:29 plunky Exp $ +# Id: Makefile.in,v 1.9 2012/01/01 16:27:25 ragge Exp +# $NetBSD: Makefile.in,v 1.5 2012/01/11 20:46:47 plunky Exp $ # # Makefile.in for top-level of pcc. # @SET_MAKE@ -ALL_SUBDIRS= cc cpp ccom +ALL_SUBDIRS= cc cpp ccom cxxcom DIST_SUBDIRS= $(ALL_SUBDIRS) driver all install clean: Index: src/external/bsd/pcc/dist/pcc/cc/cc/cc.1 diff -u src/external/bsd/pcc/dist/pcc/cc/cc/cc.1:1.4 src/external/bsd/pcc/dist/pcc/cc/cc/cc.1:1.5 --- src/external/bsd/pcc/dist/pcc/cc/cc/cc.1:1.4 Thu Sep 1 12:55:29 2011 +++ src/external/bsd/pcc/dist/pcc/cc/cc/cc.1 Wed Jan 11 20:46:47 2012 @@ -1,5 +1,5 @@ -.\ Id: cc.1,v 1.33 2011/08/28 11:57:45 plunky Exp -.\ $NetBSD: cc.1,v 1.4 2011/09/01 12:55:29 plunky Exp $ +.\ Id: cc.1,v 1.36 2011/11/11 09:13:14 plunky Exp +.\ $NetBSD: cc.1,v 1.5 2012/01/11 20:46:47 plunky Exp $ .\ .\ Copyright (c) 2007 Jeremy C. Reed r...@reedmedia.net .\ @@ -16,7 +16,7 @@ .\ ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF .\ THIS SOFTWARE. .\ -.Dd September 14, 2007 +.Dd November 11, 2011 .Dt CC 1 .Os .Sh NAME @@ -27,8 +27,7 @@ .Op Fl cEgkLMPStvX .Op Fl B Ns Ar prefix .Op Fl D Ar macro Ns Oo = Ns Ar value Oc -.Op Fl fPIC -.Op Fl fpic +.Op Fl f Ns Ar feature .Op Fl I Ar path .Op Fl include Ar file .Op Fl isystem Ar path @@ -44,7 +43,10 @@ .Op Fl shared .Op Fl static .Op Fl U Ar macro -.Op Fl Wl Ar flags +.Op Fl Wa Ns , Ns Ar options +.Op Fl Wc Ns , Ns Ar options +.Op Fl Wl Ns , Ns Ar options +.Op Fl Wp Ns , Ns Ar options .Op Fl x Ar language .Op Ar .Sh DESCRIPTION @@ -141,6 +143,8 @@ Do not compile, assemble, or link. Output is sent to standard output unless the .Fl o option is used. +.It Fl ffreestanding +Assume a freestanding environment. .It Fl fPIC Generate PIC code. .\ TODO: document about avoiding machine-specific maximum size? @@ -281,9 +285,14 @@ preprocessor to remove the initial macro Outputs the version of .Nm and shows what commands will be run with their command line arguments. -.It Fl Wl Ar flags -Options for the linker. -.\ what is ignored? llist? +.It Fl Wa Ns , Ns Ar options +Comma separated list of options for the assembler. +.It Fl Wc Ns , Ns Ar options +Comma separated list of options for the compiler. +.It Fl Wl Ns , Ns Ar options +Comma separated list of options for the linker. +.It Fl Wp Ns , Ns Ar options +Comma separated list of options for the preprocessor. .It Fl X Don't remove temporary files on exit. .It Fl x Ar language Index: src/external/bsd/pcc/dist/pcc/cc/ccom/ccom.1 diff -u src/external/bsd/pcc/dist/pcc/cc/ccom/ccom.1:1.4 src/external/bsd/pcc/dist/pcc/cc/ccom/ccom.1:1.5 --- src/external/bsd/pcc/dist/pcc/cc/ccom/ccom.1:1.4 Thu Sep 1 12:55:29 2011 +++ src/external/bsd/pcc/dist/pcc/cc/ccom/ccom.1 Wed Jan 11 20:46:48 2012 @@ -1,7 +1,8 @@ -.\ Id: ccom.1,v 1.23 2011/08/31 18:02:24 plunky Exp -.\ $NetBSD: ccom.1,v 1.4 2011/09/01
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: macallan
Date: Wed Jan 11 20:50:00 UTC 2012
Modified Files:
src/sys/dev/pci: tga.c
Log Message:
add extra parameter for wsfont_find()
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/pci/tga.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/tga.c
diff -u src/sys/dev/pci/tga.c:1.82 src/sys/dev/pci/tga.c:1.83
--- src/sys/dev/pci/tga.c:1.82 Tue Jan 25 07:17:07 2011
+++ src/sys/dev/pci/tga.c Wed Jan 11 20:50:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: tga.c,v 1.82 2011/01/25 07:17:07 mrg Exp $ */
+/* $NetBSD: tga.c,v 1.83 2012/01/11 20:50:00 macallan Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tga.c,v 1.82 2011/01/25 07:17:07 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: tga.c,v 1.83 2012/01/11 20:50:00 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -346,10 +346,10 @@ tga_init(bus_space_tag_t memt, pci_chips
wsfont_init();
/* prefer 8 pixel wide font */
cookie = wsfont_find(NULL, 8, 0, 0, WSDISPLAY_FONTORDER_R2L,
- WSDISPLAY_FONTORDER_L2R);
+ WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
if (cookie = 0)
cookie = wsfont_find(NULL, 0, 0, 0, WSDISPLAY_FONTORDER_R2L,
- WSDISPLAY_FONTORDER_L2R);
+ WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
if (cookie = 0) {
printf(tga: no appropriate fonts.\n);
return;
CVS commit: src/sys/dev/tc
Module Name:src
Committed By: macallan
Date: Wed Jan 11 21:12:37 UTC 2012
Modified Files:
src/sys/dev/tc: cfb.c mfb.c sfb.c sfbplus.c stic.c tfb.c xcfb.c
Log Message:
adjust wsfont_find()
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/tc/cfb.c src/sys/dev/tc/tfb.c
cvs rdiff -u -r1.57 -r1.58 src/sys/dev/tc/mfb.c
cvs rdiff -u -r1.83 -r1.84 src/sys/dev/tc/sfb.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/tc/sfbplus.c
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/tc/stic.c
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/tc/xcfb.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/tc/cfb.c
diff -u src/sys/dev/tc/cfb.c:1.60 src/sys/dev/tc/cfb.c:1.61
--- src/sys/dev/tc/cfb.c:1.60 Sat Nov 13 13:52:12 2010
+++ src/sys/dev/tc/cfb.c Wed Jan 11 21:12:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cfb.c,v 1.60 2010/11/13 13:52:12 uebayasi Exp $ */
+/* $NetBSD: cfb.c,v 1.61 2012/01/11 21:12:36 macallan Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cfb.c,v 1.60 2010/11/13 13:52:12 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: cfb.c,v 1.61 2012/01/11 21:12:36 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -332,10 +332,10 @@ cfb_common_init(struct rasops_info *ri)
wsfont_init();
/* prefer 12 pixel wide font */
cookie = wsfont_find(NULL, 12, 0, 0, WSDISPLAY_FONTORDER_L2R,
- WSDISPLAY_FONTORDER_L2R);
+ WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
if (cookie = 0)
cookie = wsfont_find(NULL, 0, 0, 0, WSDISPLAY_FONTORDER_L2R,
- WSDISPLAY_FONTORDER_L2R);
+ WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
if (cookie = 0) {
printf(cfb: font table is empty\n);
return;
Index: src/sys/dev/tc/tfb.c
diff -u src/sys/dev/tc/tfb.c:1.60 src/sys/dev/tc/tfb.c:1.61
--- src/sys/dev/tc/tfb.c:1.60 Sat Nov 13 13:52:12 2010
+++ src/sys/dev/tc/tfb.c Wed Jan 11 21:12:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: tfb.c,v 1.60 2010/11/13 13:52:12 uebayasi Exp $ */
+/* $NetBSD: tfb.c,v 1.61 2012/01/11 21:12:36 macallan Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tfb.c,v 1.60 2010/11/13 13:52:12 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: tfb.c,v 1.61 2012/01/11 21:12:36 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -350,10 +350,10 @@ tfb_common_init(struct rasops_info *ri)
wsfont_init();
/* prefer 12 pixel wide font */
cookie = wsfont_find(NULL, 12, 0, 0, WSDISPLAY_FONTORDER_L2R,
- WSDISPLAY_FONTORDER_L2R);
+ WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
if (cookie = 0)
cookie = wsfont_find(NULL, 0, 0, 0, WSDISPLAY_FONTORDER_L2R,
- WSDISPLAY_FONTORDER_L2R);
+ WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
if (cookie = 0) {
printf(tfb: font table is empty\n);
return;
Index: src/sys/dev/tc/mfb.c
diff -u src/sys/dev/tc/mfb.c:1.57 src/sys/dev/tc/mfb.c:1.58
--- src/sys/dev/tc/mfb.c:1.57 Sat Nov 13 13:52:12 2010
+++ src/sys/dev/tc/mfb.c Wed Jan 11 21:12:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mfb.c,v 1.57 2010/11/13 13:52:12 uebayasi Exp $ */
+/* $NetBSD: mfb.c,v 1.58 2012/01/11 21:12:36 macallan Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mfb.c,v 1.57 2010/11/13 13:52:12 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: mfb.c,v 1.58 2012/01/11 21:12:36 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -296,10 +296,10 @@ mfb_common_init(struct rasops_info *ri)
wsfont_init();
/* prefer 12 pixel wide font */
cookie = wsfont_find(NULL, 12, 0, 0, WSDISPLAY_FONTORDER_L2R,
- WSDISPLAY_FONTORDER_L2R);
+ WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
if (cookie = 0)
cookie = wsfont_find(NULL, 0, 0, 0, WSDISPLAY_FONTORDER_L2R,
- WSDISPLAY_FONTORDER_L2R);
+ WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
if (cookie = 0) {
printf(mfb: font table is empty\n);
return;
Index: src/sys/dev/tc/sfb.c
diff -u src/sys/dev/tc/sfb.c:1.83 src/sys/dev/tc/sfb.c:1.84
--- src/sys/dev/tc/sfb.c:1.83 Sat Nov 13 13:52:12 2010
+++ src/sys/dev/tc/sfb.c Wed Jan 11 21:12:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: sfb.c,v 1.83 2010/11/13 13:52:12 uebayasi Exp $ */
+/* $NetBSD: sfb.c,v 1.84 2012/01/11 21:12:36 macallan Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sfb.c,v 1.83 2010/11/13 13:52:12 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: sfb.c,v 1.84 2012/01/11 21:12:36 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -358,10 +358,10 @@ sfb_common_init(struct rasops_info *ri)
wsfont_init();
/* prefer 12 pixel wide font */
cookie = wsfont_find(NULL, 12, 0, 0, WSDISPLAY_FONTORDER_R2L,
-
CVS commit: src/sys/arch/sgimips/gio
Module Name:src Committed By: macallan Date: Wed Jan 11 21:23:07 UTC 2012 Modified Files: src/sys/arch/sgimips/gio: newportreg.h Log Message: add some register definitions To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sgimips/gio/newportreg.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/sgimips/gio/newportreg.h diff -u src/sys/arch/sgimips/gio/newportreg.h:1.5 src/sys/arch/sgimips/gio/newportreg.h:1.6 --- src/sys/arch/sgimips/gio/newportreg.h:1.5 Sun Feb 20 07:59:50 2011 +++ src/sys/arch/sgimips/gio/newportreg.h Wed Jan 11 21:23:07 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: newportreg.h,v 1.5 2011/02/20 07:59:50 matt Exp $ */ +/* $NetBSD: newportreg.h,v 1.6 2012/01/11 21:23:07 macallan Exp $ */ /* * Copyright (c) 2003 Ilpo Ruotsalainen @@ -194,6 +194,7 @@ #define REX3_REG_STATUS 0x1338 #define REX3_STATUS_GFXBUSY 0x0008 +#define REX3_STATUS_PIPELEVEL_MASK 0x1f80 /* VC2 */ @@ -261,6 +262,7 @@ #define XMAP9_DCBCRS_MODE_SETUP 5 #define XMAP9_MODE_GAMMA_BYPASS 0x04 #define XMAP9_MODE_PIXSIZE_8BPP 0x000400 +#define XMAP9_MODE_PIXSIZE_24BPP 0x000c00 #define XMAP9_DCBCRS_MODE_SELECT 7 /* DCB addresses */
CVS commit: src/sys/arch/sgimips/gio
Module Name:src Committed By: macallan Date: Wed Jan 11 21:23:38 UTC 2012 Modified Files: src/sys/arch/sgimips/gio: grtwo.c light.c newport.c Log Message: adjust for wsfont_find() change To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sgimips/gio/grtwo.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sgimips/gio/light.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sgimips/gio/newport.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/sgimips/gio/grtwo.c diff -u src/sys/arch/sgimips/gio/grtwo.c:1.11 src/sys/arch/sgimips/gio/grtwo.c:1.12 --- src/sys/arch/sgimips/gio/grtwo.c:1.11 Sun Nov 22 19:09:15 2009 +++ src/sys/arch/sgimips/gio/grtwo.c Wed Jan 11 21:23:38 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: grtwo.c,v 1.11 2009/11/22 19:09:15 mbalmer Exp $ */ +/* $NetBSD: grtwo.c,v 1.12 2012/01/11 21:23:38 macallan Exp $ */ /* * Copyright (c) 2004 Christopher SEKIYA @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: grtwo.c,v 1.11 2009/11/22 19:09:15 mbalmer Exp $); +__KERNEL_RCSID(0, $NetBSD: grtwo.c,v 1.12 2012/01/11 21:23:38 macallan Exp $); #include sys/param.h #include sys/systm.h @@ -476,7 +476,7 @@ grtwo_attach_common(struct grtwo_devconf wsfont_init(); dc-dc_font = wsfont_find(NULL, 8, 16, 0, WSDISPLAY_FONTORDER_L2R, - WSDISPLAY_FONTORDER_L2R); + WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP); if (dc-dc_font 0) panic(grtwo_attach_common: no suitable fonts); Index: src/sys/arch/sgimips/gio/light.c diff -u src/sys/arch/sgimips/gio/light.c:1.5 src/sys/arch/sgimips/gio/light.c:1.6 --- src/sys/arch/sgimips/gio/light.c:1.5 Sun Mar 4 06:00:39 2007 +++ src/sys/arch/sgimips/gio/light.c Wed Jan 11 21:23:38 2012 @@ -1,4 +1,4 @@ -/* $Id: light.c,v 1.5 2007/03/04 06:00:39 christos Exp $ */ +/* $Id: light.c,v 1.6 2012/01/11 21:23:38 macallan Exp $ */ /* * Copyright (c) 2006 Stephen M. Rumble @@ -43,7 +43,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: light.c,v 1.5 2007/03/04 06:00:39 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: light.c,v 1.6 2012/01/11 21:23:38 macallan Exp $); #include sys/param.h #include sys/systm.h @@ -297,7 +297,7 @@ light_attach_common(struct light_devconf wsfont_init(); dc-dc_font = wsfont_find(NULL, 8, 16, 0, WSDISPLAY_FONTORDER_L2R, - WSDISPLAY_FONTORDER_L2R); + WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP); if (dc-dc_font 0) panic(light_attach_common: no suitable fonts); Index: src/sys/arch/sgimips/gio/newport.c diff -u src/sys/arch/sgimips/gio/newport.c:1.16 src/sys/arch/sgimips/gio/newport.c:1.17 --- src/sys/arch/sgimips/gio/newport.c:1.16 Wed Jan 11 16:18:30 2012 +++ src/sys/arch/sgimips/gio/newport.c Wed Jan 11 21:23:38 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: newport.c,v 1.16 2012/01/11 16:18:30 macallan Exp $ */ +/* $NetBSD: newport.c,v 1.17 2012/01/11 21:23:38 macallan Exp $ */ /* * Copyright (c) 2003 Ilpo Ruotsalainen @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: newport.c,v 1.16 2012/01/11 16:18:30 macallan Exp $); +__KERNEL_RCSID(0, $NetBSD: newport.c,v 1.17 2012/01/11 21:23:38 macallan Exp $); #include sys/param.h #include sys/systm.h @@ -536,7 +536,7 @@ newport_attach_common(struct newport_dev wsfont_init(); dc-dc_font = wsfont_find(NULL, 8, 16, 0, WSDISPLAY_FONTORDER_L2R, - WSDISPLAY_FONTORDER_L2R); + WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP); if (dc-dc_font 0) panic(newport_attach_common: no suitable fonts);
CVS commit: src/sys/arch/vax/vsa
Module Name:src
Committed By: macallan
Date: Wed Jan 11 21:26:13 UTC 2012
Modified Files:
src/sys/arch/vax/vsa: smg.c spx.c
Log Message:
adjust for wsfont_find() change
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/vax/vsa/smg.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/vax/vsa/spx.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/vax/vsa/smg.c
diff -u src/sys/arch/vax/vsa/smg.c:1.54 src/sys/arch/vax/vsa/smg.c:1.55
--- src/sys/arch/vax/vsa/smg.c:1.54 Tue Dec 14 23:31:16 2010
+++ src/sys/arch/vax/vsa/smg.c Wed Jan 11 21:26:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: smg.c,v 1.54 2010/12/14 23:31:16 matt Exp $ */
+/* $NetBSD: smg.c,v 1.55 2012/01/11 21:26:13 macallan Exp $ */
/*
* Copyright (c) 1998 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: smg.c,v 1.54 2010/12/14 23:31:16 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: smg.c,v 1.55 2012/01/11 21:26:13 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -247,8 +247,8 @@ smg_attach(device_t parent, device_t sel
callout_reset(smg_cursor_ch, hz / 2, smg_crsr_blink, NULL);
curcmd = CUR_CMD_HSHI;
WRITECUR(CUR_CMD, curcmd);
- if ((fcookie = wsfont_find(NULL, 8, 15, 0,
- WSDISPLAY_FONTORDER_R2L, WSDISPLAY_FONTORDER_L2R)) 0) {
+ if ((fcookie = wsfont_find(NULL, 8, 15, 0, WSDISPLAY_FONTORDER_R2L,
+ WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP)) 0) {
aprint_error_dev(self, could not find 8x15 font\n);
return;
}
@@ -595,8 +595,8 @@ smgcninit(struct consdev *cndev)
curscr = smg_conscreen;
wsdisplay_cnattach(smg_stdscreen, smg_conscreen, 0, 0, 0);
cn_tab-cn_pri = CN_INTERNAL;
- if ((fcookie = wsfont_find(NULL, 8, 15, 0,
- WSDISPLAY_FONTORDER_R2L, WSDISPLAY_FONTORDER_L2R)) 0)
+ if ((fcookie = wsfont_find(NULL, 8, 15, 0, WSDISPLAY_FONTORDER_R2L,
+ WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP)) 0)
{
printf(smg: could not find 8x15 font\n);
return;
Index: src/sys/arch/vax/vsa/spx.c
diff -u src/sys/arch/vax/vsa/spx.c:1.4 src/sys/arch/vax/vsa/spx.c:1.5
--- src/sys/arch/vax/vsa/spx.c:1.4 Tue Dec 14 23:31:16 2010
+++ src/sys/arch/vax/vsa/spx.c Wed Jan 11 21:26:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: spx.c,v 1.4 2010/12/14 23:31:16 matt Exp $ */
+/* $NetBSD: spx.c,v 1.5 2012/01/11 21:26:13 macallan Exp $ */
/*
* SPX/LCSPX/SPXg/SPXgt accelerated framebuffer driver for NetBSD/VAX
* Copyright (c) 2005 Blaz Antonic
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: spx.c,v 1.4 2010/12/14 23:31:16 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: spx.c,v 1.5 2012/01/11 21:26:13 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1477,16 +1477,19 @@ spx_init_common(device_t self, struct vs
wsfont_init();
cookie = wsfont_find(NULL, 12, 21, 0, WSDISPLAY_FONTORDER_R2L,
- WSDISPLAY_FONTORDER_L2R);
+ WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
if (cookie == -1)
- cookie = wsfont_find(NULL, 16, 0, 0, WSDISPLAY_FONTORDER_R2L, 0);
+ cookie = wsfont_find(NULL, 16, 0, 0, WSDISPLAY_FONTORDER_R2L, 0,
+ WSFONT_FIND_BITMAP);
if (cookie == -1)
- cookie = wsfont_find(NULL, 12, 0, 0, WSDISPLAY_FONTORDER_R2L, 0);
+ cookie = wsfont_find(NULL, 12, 0, 0, WSDISPLAY_FONTORDER_R2L, 0,
+ WSFONT_FIND_BITMAP);
if (cookie == -1)
- cookie = wsfont_find(NULL, 8, 0, 0, WSDISPLAY_FONTORDER_R2L, 0);
+ cookie = wsfont_find(NULL, 8, 0, 0, WSDISPLAY_FONTORDER_R2L, 0,
+ WSFONT_FIND_BITMAP);
if (cookie == -1)
cookie = wsfont_find(NULL, 0, 0, 0, WSDISPLAY_FONTORDER_R2L,
- WSDISPLAY_FONTORDER_L2R);
+ WSDISPLAY_FONTORDER_L2R, WSFONT_FIND_BITMAP);
if (cookie == -1 || wsfont_lock(cookie, wf))
panic(spx_common_init: unable to load console font);
CVS commit: src
Module Name:src Committed By: joerg Date: Wed Jan 11 23:24:49 UTC 2012 Modified Files: src/distrib/sets/lists/comp: md.amd64 md.i386 src/external/bsd/llvm: Makefile.inc src/external/bsd/llvm/bin/tblgen: Makefile src/external/bsd/llvm/config/llvm/Config: config.h llvm-config.h src/external/bsd/llvm/include: Makefile src/external/bsd/llvm/lib/libLLVMARMCodeGen: Makefile src/external/bsd/llvm/lib/libLLVMARMMCTargetDesc: Makefile src/external/bsd/llvm/lib/libLLVMCodeGen: Makefile src/external/bsd/llvm/lib/libLLVMJIT: Makefile src/external/bsd/llvm/lib/libLLVMMC: Makefile src/external/bsd/llvm/lib/libLLVMMCJIT: Makefile src/external/bsd/llvm/lib/libLLVMMipsCodeGen: Makefile src/external/bsd/llvm/lib/libLLVMMipsMCTargetDesc: Makefile src/external/bsd/llvm/lib/libLLVMPowerPCCodeGen: Makefile src/external/bsd/llvm/lib/libLLVMPowerPCMCTargetDesc: Makefile src/external/bsd/llvm/lib/libLLVMSparcCodeGen: Makefile src/external/bsd/llvm/lib/libLLVMSupport: Makefile src/external/bsd/llvm/lib/libLLVMTableGen: Makefile src/external/bsd/llvm/lib/libLLVMTarget: Makefile src/external/bsd/llvm/lib/libLLVMX86CodeGen: Makefile src/external/bsd/llvm/lib/libLLVMX86MCTargetDesc: Makefile src/external/bsd/llvm/lib/libclangAnalysis: Makefile src/external/bsd/llvm/lib/libclangFrontend: Makefile src/external/bsd/llvm/lib/libclangLex: Makefile src/external/bsd/llvm/lib/libclangSema: Makefile src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers: Makefile src/external/bsd/llvm/lib/libclangStaticAnalyzerCore: Makefile Log Message: Update LLVM/Clang snapshot to r147888. Most importantly, this fixes a number of ABI issues for i386 and provides the correct __FLT_EVAL_METHOD__ when using i387. To generate a diff of this commit: cvs rdiff -u -r1.148 -r1.149 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.123 -r1.124 src/distrib/sets/lists/comp/md.i386 cvs rdiff -u -r1.27 -r1.28 src/external/bsd/llvm/Makefile.inc cvs rdiff -u -r1.9 -r1.10 src/external/bsd/llvm/bin/tblgen/Makefile cvs rdiff -u -r1.5 -r1.6 src/external/bsd/llvm/config/llvm/Config/config.h cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/llvm/config/llvm/Config/llvm-config.h cvs rdiff -u -r1.5 -r1.6 src/external/bsd/llvm/include/Makefile cvs rdiff -u -r1.8 -r1.9 src/external/bsd/llvm/lib/libLLVMARMCodeGen/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/llvm/lib/libLLVMARMMCTargetDesc/Makefile cvs rdiff -u -r1.12 -r1.13 src/external/bsd/llvm/lib/libLLVMCodeGen/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/bsd/llvm/lib/libLLVMJIT/Makefile cvs rdiff -u -r1.8 -r1.9 src/external/bsd/llvm/lib/libLLVMMC/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/bsd/llvm/lib/libLLVMMCJIT/Makefile cvs rdiff -u -r1.6 -r1.7 \ src/external/bsd/llvm/lib/libLLVMMipsCodeGen/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/llvm/lib/libLLVMMipsMCTargetDesc/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/llvm/lib/libLLVMPowerPCCodeGen/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/llvm/lib/libLLVMPowerPCMCTargetDesc/Makefile cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/llvm/lib/libLLVMSparcCodeGen/Makefile cvs rdiff -u -r1.7 -r1.8 src/external/bsd/llvm/lib/libLLVMSupport/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/lib/libLLVMTableGen/Makefile cvs rdiff -u -r1.6 -r1.7 src/external/bsd/llvm/lib/libLLVMTarget/Makefile cvs rdiff -u -r1.6 -r1.7 src/external/bsd/llvm/lib/libLLVMX86CodeGen/Makefile cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/llvm/lib/libLLVMX86MCTargetDesc/Makefile cvs rdiff -u -r1.6 -r1.7 src/external/bsd/llvm/lib/libclangAnalysis/Makefile cvs rdiff -u -r1.9 -r1.10 src/external/bsd/llvm/lib/libclangFrontend/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/bsd/llvm/lib/libclangLex/Makefile cvs rdiff -u -r1.6 -r1.7 src/external/bsd/llvm/lib/libclangSema/Makefile cvs rdiff -u -r1.10 -r1.11 \ src/external/bsd/llvm/lib/libclangStaticAnalyzerCheckers/Makefile cvs rdiff -u -r1.7 -r1.8 \ src/external/bsd/llvm/lib/libclangStaticAnalyzerCore/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.amd64 diff -u src/distrib/sets/lists/comp/md.amd64:1.148 src/distrib/sets/lists/comp/md.amd64:1.149 --- src/distrib/sets/lists/comp/md.amd64:1.148 Mon Jan 9 15:24:37 2012 +++ src/distrib/sets/lists/comp/md.amd64 Wed Jan 11 23:24:46 2012 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.148 2012/01/09 15:24:37 dholland Exp $ +# $NetBSD: md.amd64,v 1.149 2012/01/11 23:24:46 joerg Exp $ ./usr/include/amd64comp-c-include ./usr/include/amd64/ansi.h comp-c-include ./usr/include/amd64/aout_machdep.h comp-c-include @@ -68,14 +68,23 @@ ./usr/include/amd64/vmparam.h comp-c-include
