CVS commit: src/distrib/sets/lists/xserver
Module Name:src Committed By: mrg Date: Wed Aug 26 09:01:16 UTC 2009 Modified Files: src/distrib/sets/lists/xserver: md.shark Log Message: minor updates for xorg To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/xserver/md.shark Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xserver/md.shark diff -u src/distrib/sets/lists/xserver/md.shark:1.29 src/distrib/sets/lists/xserver/md.shark:1.30 --- src/distrib/sets/lists/xserver/md.shark:1.29 Sun Aug 23 09:05:45 2009 +++ src/distrib/sets/lists/xserver/md.shark Wed Aug 26 09:01:15 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.shark,v 1.29 2009/08/23 09:05:45 mrg Exp $ +# $NetBSD: md.shark,v 1.30 2009/08/26 09:01:15 mrg Exp $ ./usr/X11R6/bin/X -unknown- x11 ./usr/X11R6/bin/XFree86 -unknown- x11 ./usr/X11R6/bin/gtf -unknown- x11 @@ -245,7 +245,7 @@ ./usr/X11R7/bin/Xorg -unknown- xorg ./usr/X11R7/bin/cvt -unknown- xorg ./usr/X11R7/bin/gtf -unknown- xorg -./usr/X11R7/bin/xorgconfig-unknown- xorg +./usr/X11R7/bin/xorgconfig-unknown- obsolete ./usr/X11R7/lib/X11/Cards-unknown- obsolete ./usr/X11R7/lib/X11/doc/README.DRI -unknown- xorg ./usr/X11R7/lib/X11/doc/README.fonts -unknown- obsolete @@ -343,11 +343,11 @@ ./usr/X11R7/lib/modules/libi2c.so.0 -unknown- xorg ./usr/X11R7/lib/modules/libi2c_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/libi2c_pic.a -unknown- xorg -./usr/X11R7/lib/modules/libint10.a -unknown- xorg -./usr/X11R7/lib/modules/libint10.so -unknown- xorg -./usr/X11R7/lib/modules/libint10.so.0 -unknown- xorg -./usr/X11R7/lib/modules/libint10_g.a -unknown- debuglib,xorg -./usr/X11R7/lib/modules/libint10_pic.a -unknown- xorg +./usr/X11R7/lib/modules/libint10.a -unknown- obsolete +./usr/X11R7/lib/modules/libint10.so -unknown- obsolete +./usr/X11R7/lib/modules/libint10.so.0 -unknown- obsolete +./usr/X11R7/lib/modules/libint10_g.a -unknown- obsolete +./usr/X11R7/lib/modules/libint10_pic.a -unknown- obsolete ./usr/X11R7/lib/modules/libpcidata.a -unknown- obsolete ./usr/X11R7/lib/modules/libpcidata.so -unknown- obsolete ./usr/X11R7/lib/modules/libpcidata.so.0 -unknown- obsolete @@ -402,7 +402,7 @@ ./usr/X11R7/man/cat1/Xorg.0-unknown- .cat,xorg ./usr/X11R7/man/cat1/cvt.0-unknown- .cat,xorg ./usr/X11R7/man/cat1/gtf.0-unknown- .cat,xorg -./usr/X11R7/man/cat1/xorgconfig.0 -unknown- .cat,xorg +./usr/X11R7/man/cat1/xorgconfig.0 -unknown- obsolete ./usr/X11R7/man/cat4/chips.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/exa.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/kbd.0-unknown- .cat,xorg @@ -413,7 +413,7 @@ ./usr/X11R7/man/html1/Xorg.html-unknown- html,xorg ./usr/X11R7/man/html1/cvt.html-unknown- html,xorg ./usr/X11R7/man/html1/gtf.html-unknown- html,xorg -./usr/X11R7/man/html1/xorgconfig.html -unknown- html,xorg +./usr/X11R7/man/html1/xorgconfig.html -unknown- obsolete ./usr/X11R7/man/html4/chips.html -unknown- html,xorg ./usr/X11R7/man/html4/exa.html-unknown- html,xorg ./usr/X11R7/man/html4/kbd.html-unknown- html,xorg @@ -424,7 +424,7 @@ ./usr/X11R7/man/man1/Xorg.1-unknown- .man,xorg ./usr/X11R7/man/man1/cvt.1-unknown- .man,xorg ./usr/X11R7/man/man1/gtf.1-unknown- .man,xorg -./usr/X11R7/man/man1/xorgconfig.1 -unknown- .man,xorg +./usr/X11R7/man/man1/xorgconfig.1 -unknown- obsolete ./usr/X11R7/man/man4/chips.4-unknown- .man,xorg ./usr/X11R7/man/man4/exa.4-unknown- .man,xorg ./usr/X11R7/man/man4/kbd.4-unknown- .man,xorg
CVS commit: src/distrib/sets/lists/xcomp
Module Name:src Committed By: njoly Date: Wed Aug 26 09:49:29 UTC 2009 Modified Files: src/distrib/sets/lists/xcomp: mi Log Message: +bdftruncate.debug To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 src/distrib/sets/lists/xcomp/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/xcomp/mi diff -u src/distrib/sets/lists/xcomp/mi:1.98 src/distrib/sets/lists/xcomp/mi:1.99 --- src/distrib/sets/lists/xcomp/mi:1.98 Sun Jul 5 21:30:30 2009 +++ src/distrib/sets/lists/xcomp/mi Wed Aug 26 09:49:29 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.98 2009/07/05 21:30:30 mrg Exp $ +# $NetBSD: mi,v 1.99 2009/08/26 09:49:29 njoly Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -9103,6 +9103,7 @@ ./usr/libdata/debug/usr/X11R7/bin/appres.debug -unknown- debug,xorg ./usr/libdata/debug/usr/X11R7/bin/atobm.debug -unknown- debug,xorg ./usr/libdata/debug/usr/X11R7/bin/bdftopcf.debug -unknown- debug,xorg +./usr/libdata/debug/usr/X11R7/bin/bdftruncate.debug -unknown- debug,xorg ./usr/libdata/debug/usr/X11R7/bin/beforelight.debug -unknown- debug,xorg ./usr/libdata/debug/usr/X11R7/bin/bitmap.debug -unknown- debug,xorg ./usr/libdata/debug/usr/X11R7/bin/bmtoa.debug -unknown- debug,xorg
CVS commit: src/etc/root
Module Name:src
Committed By: tsutsui
Date: Wed Aug 26 11:15:25 UTC 2009
Modified Files:
src/etc/root: dot.cshrc dot.profile
Log Message:
netbsd.org -> NetBSD.org for URLs.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/etc/root/dot.cshrc
cvs rdiff -u -r1.22 -r1.23 src/etc/root/dot.profile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/root/dot.cshrc
diff -u src/etc/root/dot.cshrc:1.20 src/etc/root/dot.cshrc:1.21
--- src/etc/root/dot.cshrc:1.20 Sun Feb 15 01:31:43 2009
+++ src/etc/root/dot.cshrc Wed Aug 26 11:15:25 2009
@@ -1,4 +1,4 @@
-# $NetBSD: dot.cshrc,v 1.20 2009/02/15 01:31:43 erh Exp $
+# $NetBSD: dot.cshrc,v 1.21 2009/08/26 11:15:25 tsutsui Exp $
alias h history
alias j jobs -l
@@ -22,8 +22,8 @@
# Uncomment the following line(s) to install binary packages
# from ftp.NetBSD.org via pkg_add.
-#setenv PKG_PATH ftp://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/`uname -m`/5.99/All
-#setenv PKG_PATH "${PKG_PATH};ftp://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/`uname -m`/5.0/All"
+#setenv PKG_PATH ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/`uname -m`/5.99/All
+#setenv PKG_PATH "${PKG_PATH};ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/`uname -m`/5.0/All"
set history=1000
set path=(/sbin /usr/sbin /bin /usr/bin /usr/pkg/sbin /usr/pkg/bin /usr/X11R7/bin /usr/X11R6/bin /usr/local/sbin /usr/local/bin)
Index: src/etc/root/dot.profile
diff -u src/etc/root/dot.profile:1.22 src/etc/root/dot.profile:1.23
--- src/etc/root/dot.profile:1.22 Fri May 15 23:57:50 2009
+++ src/etc/root/dot.profile Wed Aug 26 11:15:25 2009
@@ -1,12 +1,12 @@
-# $NetBSD: dot.profile,v 1.22 2009/05/15 23:57:50 ad Exp $
+# $NetBSD: dot.profile,v 1.23 2009/08/26 11:15:25 tsutsui Exp $
export PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/pkg/sbin:/usr/pkg/bin
export PATH=${PATH}:/usr/X11R7/bin:/usr/X11R6/bin:/usr/local/sbin:/usr/local/bin
# Uncomment the following line(s) to install binary packages
# from ftp.NetBSD.org via pkg_add.
-#export PKG_PATH=ftp://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/$(uname -m)/5.99/All
-#export PKG_PATH="${PKG_PATH};ftp://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/$(uname -m)/5.0/All"
+#export PKG_PATH=ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$(uname -m)/5.99/All
+#export PKG_PATH="${PKG_PATH};ftp://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$(uname -m)/5.0/All"
export BLOCKSIZE=1k
CVS commit: [matt-nb5-mips64] src/gnu/dist/binutils/gas
Module Name:src Committed By: matt Date: Wed Aug 26 12:33:54 UTC 2009 Modified Files: src/gnu/dist/binutils/gas [matt-nb5-mips64]: write.c Log Message: Rework previous fix. Instead of always allowing references against merge string sections, only allow references against a merge section if said reference is contained with the merge section. To generate a diff of this commit: cvs rdiff -u -r1.1.1.3.32.1 -r1.1.1.3.32.2 src/gnu/dist/binutils/gas/write.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/dist/binutils/gas/write.c diff -u src/gnu/dist/binutils/gas/write.c:1.1.1.3.32.1 src/gnu/dist/binutils/gas/write.c:1.1.1.3.32.2 --- src/gnu/dist/binutils/gas/write.c:1.1.1.3.32.1 Tue Aug 25 23:29:40 2009 +++ src/gnu/dist/binutils/gas/write.c Wed Aug 26 12:33:54 2009 @@ -847,11 +847,13 @@ continue; } - /* Never adjust a reloc against local symbol in a non-string merge - section with non-zero addend. */ + /* Never adjust a reloc against local symbol in a merge section with + a non-zero addend if the addend would place the relocation outside + the section's limits. */ if ((symsec->flags & SEC_MERGE) != 0 - && (symsec->flags & SEC_STRINGS) == 0 - && (fixp->fx_offset != 0 || fixp->fx_subsy != NULL)) + && (S_GET_VALUE(sym) + fixp->fx_offset >= bfd_get_section_size(symsec) + || S_GET_VALUE(sym) + fixp->fx_offset < 0 + || fixp->fx_subsy != NULL)) continue; /* Never adjust a reloc against TLS local symbol. */
CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/hpc
Module Name:xsrc
Committed By: jun
Date: Wed Aug 26 12:54:11 UTC 2009
Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/hpc: hpcMouse.c
Log Message:
Fix #41619,current-Xhpc crash with wsmouse.
set WSMOUSEIO_SETVERSION if needed.
tested on NetBSD/hpcmips current.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/hpc/hpcMouse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/hpc/hpcMouse.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/hpc/hpcMouse.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/hpc/hpcMouse.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/hpc/hpcMouse.c:1.1 Sat Jan 3 01:09:19 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/hpc/hpcMouse.c Wed Aug 26 12:54:10 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcMouse.c,v 1.1 2004/01/03 01:09:19 takemura Exp $ */
+/* $NetBSD: hpcMouse.c,v 1.2 2009/08/26 12:54:10 jun Exp $ */
/* $XConsortium: sunMouse.c,v 5.21 94/04/17 20:29:47 kaleb Exp $ */
/*-
* Copyright (c) 1987 by the Regents of the University of California
@@ -149,6 +149,16 @@
hpcPtrPriv.bedev->bedev = &hpcPtrPriv;
}
+#ifdef WSMOUSEIO_SETVERSION
+ {
+ int version = WSMOUSE_EVENT_VERSION;
+ if (ioctl(hpcPtrPriv.fd, WSMOUSEIO_SETVERSION, &version) == -1) {
+ hpcError ("hpcMouseProc ioctl WSMOUSEIO_SETVERSION");
+ return !Success;
+ }
+ }
+#endif
+
hpcPtrPriv.bemask = 0;
hpcPtrPriv.brmask = 0;
hpcPtrPriv.ebdown = 0;
CVS commit: src/sys/arch/i386/stand/lib
Module Name:src
Committed By: jmcneill
Date: Wed Aug 26 13:28:48 UTC 2009
Modified Files:
src/sys/arch/i386/stand/lib: pcio.c
Log Message:
int 15h/AH=86h (WAIT) doesn't work properly on all hardware and emulators, so
for the countdown use the more coarsely grained sleep implementation based
on int 1ah/AH=00h (GET SYSTEM TIME).
ok ad@
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/i386/stand/lib/pcio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/lib/pcio.c
diff -u src/sys/arch/i386/stand/lib/pcio.c:1.26 src/sys/arch/i386/stand/lib/pcio.c:1.27
--- src/sys/arch/i386/stand/lib/pcio.c:1.26 Mon Jun 29 09:23:16 2009
+++ src/sys/arch/i386/stand/lib/pcio.c Wed Aug 26 13:28:48 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pcio.c,v 1.26 2009/06/29 09:23:16 mbalmer Exp $ */
+/* $NetBSD: pcio.c,v 1.27 2009/08/26 13:28:48 jmcneill Exp $ */
/*
* Copyright (c) 1996, 1997
@@ -71,6 +71,20 @@
#define POLL_FREQ 10
+static void
+wait(int us)
+{
+ int prev = biosgetsystime();
+ int tgt = prev + (20 * us) / 100;
+ int new;
+
+ while ((new = biosgetsystime()) < tgt) {
+ if (new < prev) /* XXX timer wrapped */
+ break;
+ prev = new;
+ }
+}
+
#ifdef SUPPORT_SERIAL
static int
getcomaddr(int idx)
@@ -346,7 +360,7 @@
goto out;
}
if (i--)
- delay(100 / POLL_FREQ);
+ wait(100 / POLL_FREQ);
else
break;
}
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src Committed By: matt Date: Wed Aug 26 14:29:11 UTC 2009 Modified Files: src/sys/arch/mips/mips [matt-nb5-mips64]: fp.S Log Message: Add dmtc1 and dmfc1 emulations. XXX NewABI support is going to cause much greif here. To generate a diff of this commit: cvs rdiff -u -r1.33.38.3 -r1.33.38.4 src/sys/arch/mips/mips/fp.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/mips/fp.S diff -u src/sys/arch/mips/mips/fp.S:1.33.38.3 src/sys/arch/mips/mips/fp.S:1.33.38.4 --- src/sys/arch/mips/mips/fp.S:1.33.38.3 Wed Aug 26 03:46:39 2009 +++ src/sys/arch/mips/mips/fp.S Wed Aug 26 14:29:11 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: fp.S,v 1.33.38.3 2009/08/26 03:46:39 matt Exp $ */ +/* $NetBSD: fp.S,v 1.33.38.4 2009/08/26 14:29:11 matt Exp $ */ /* * Copyright (c) 1992, 1993 @@ -74,18 +74,24 @@ #define COND_SIGNAL 0x8 #if defined(__mips_o32) || defined(__mips_o64) -#define FPX_L INT_L -#define FPX_S INT_S -#define FPX_SCALESHIFT INT_SCALESHIFT +#define FPX_L INT_L +#define FPX_S INT_S +#define FPX_SCALESHIFT INT_SCALESHIFT #else -#define FPX_L LONG_L -#define FPX_S LONG_S -#define FPX_SCALESHIFT LONG_SCALESHIFT +#define FPX_L LONG_L +#define FPX_S LONG_S +#define FPX_SCALESHIFT LONG_SCALESHIFT +#define DFPX_L REG_L +#define DFPX_S REG_S +#define DFPX_SCALESHIFT REG_SCALESHIFT +#define SZDFREG SZREG +#define DFPX_REGMASK (0x1F << DFPX_SCALESHIFT) +#define DFPX_REGEVENMASK (0x1E << DFPX_SCALESHIFT) #endif -#define SZFREG (1 << FPX_SCALESHIFT) -#define FPX_REGMASK (0x1F << FPX_SCALESHIFT) -#define FPX_REGEVENMASK (0x1E << FPX_SCALESHIFT) -#define REG_REGMASK (0x1F << REG_SCALESHIFT) +#define SZFREG (1 << FPX_SCALESHIFT) +#define FPX_REGMASK (0x1F << FPX_SCALESHIFT) +#define FPX_REGEVENMASK (0x1E << FPX_SCALESHIFT) +#define REG_REGMASK (0x1F << REG_SCALESHIFT) /* insns are reordered in the way as MIPS architecture imposes */ .set reorder @@ -172,10 +178,15 @@ #ifndef SOFTFLOAT #define mfromc1 ill +#define dmfromc1 ill #define cfromc1 ill #define mtoc1 ill +#define dmtoc1 ill #define ctoc1 ill #define branchc1 ill +#elif !defined(MIPS3_PLUS) +#define dmfromc1 ill +#define dmtoc1 ill #endif #define branchc1any2 ill #define branchc1any4 ill @@ -265,11 +276,11 @@ .rdata fmt_tbl: PTR_WORD mfromc1 # sub 0 mfc1 - PTR_WORD ill # sub 1 dmfc1 + PTR_WORD dmfromc1 # sub 1 dmfc1 PTR_WORD cfromc1 # sub 2 cfc1 PTR_WORD ill # sub 3 mfhc1 PTR_WORD mtoc1 # sub 4 mtc1 - PTR_WORD ill # sub 5 dmtc1 + PTR_WORD dmtoc1 # sub 5 dmtc1 PTR_WORD ctoc1 # sub 6 ctc1 PTR_WORD ill # sub 7 mthc1 PTR_WORD branchc1 # sub 8 bc1 @@ -650,14 +661,32 @@ b done -#if defined(MIPS3_PLUS) && 0 +mtoc1: + REG_PROLOGUE + REG_S zero, FRAME_RZERO(a1) # ensure zero has value 0 + srl t0, a0, 16-REG_SCALESHIFT + andi t0, t0, REG_REGMASK + PTR_ADDU v0, a1, t0 + REG_L v0, FRAME_RZERO(v0) + REG_EPILOGUE + + srl t1, a0, 11-FPX_SCALESHIFT + PTR_L t0, L_ADDR(MIPS_CURLWP) # get pcb of current process + andi t1, t1, FPX_REGMASK + PTR_ADDU t0, t0, t1 + + FPX_S v0, U_PCB_FPREGS+FRAME_FP0(t0) + + b done + +#if defined(MIPS3_PLUS) && defined(SOFTFLOAT) dmfromc1: - srl t1, a0, 11-FPX_SCALESHIFT # fs is in bits 15:11 + srl t1, a0, 11-DFPX_SCALESHIFT # fs is in bits 15:11 PTR_L t0, L_ADDR(MIPS_CURLWP) # get pcb of current process - andi t1, t1, FPX_REGMASK + andi t1, t1, DFPX_REGMASK PTR_ADDU t0, t0, t1 - FPX_L v0, U_PCB_FPREGS+FRAME_FP0(t0) + DFPX_L v0, U_PCB_FPREGS+FRAME_FP0(t0) srl t0, a0, 16-REG_SCALESHIFT andi t0, t0, REG_REGMASK @@ -668,9 +697,8 @@ REG_EPILOGUE b done -#endif /* MIPS3_PLUS */ -mtoc1: +dmtoc1: REG_PROLOGUE REG_S zero, FRAME_RZERO(a1) # ensure zero has value 0 srl t0, a0, 16-REG_SCALESHIFT @@ -679,14 +707,15 @@ REG_L v0, FRAME_RZERO(v0) REG_EPILOGUE - srl t1, a0, 11-FPX_SCALESHIFT + srl t1, a0, 11-DFPX_SCALESHIFT PTR_L t0, L_ADDR(MIPS_CURLWP) # get pcb of current process - andi t1, t1, FPX_REGMASK + andi t1, t1, DFPX_REGMASK PTR_ADDU t0, t0, t1 - FPX_S v0, U_PCB_FPREGS+FRAME_FP0(t0) + DFPX_S v0, U_PCB_FPREGS+FRAME_FP0(t0) b done +#endif /* MIPS3_PLUS && SOFTFLOAT */ cfromc1: srl t1, a0, 11
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src
Committed By: matt
Date: Wed Aug 26 14:32:53 UTC 2009
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: mips_fputrap.c
Log Message:
If you are going to print the instruction, print the PC of the instruction too!
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.66.1 src/sys/arch/mips/mips/mips_fputrap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/mips_fputrap.c
diff -u src/sys/arch/mips/mips/mips_fputrap.c:1.5 src/sys/arch/mips/mips/mips_fputrap.c:1.5.66.1
--- src/sys/arch/mips/mips/mips_fputrap.c:1.5 Tue Dec 26 23:26:13 2006
+++ src/sys/arch/mips/mips/mips_fputrap.c Wed Aug 26 14:32:53 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_fputrap.c,v 1.5 2006/12/26 23:26:13 martin Exp $ */
+/* $NetBSD: mips_fputrap.c,v 1.5.66.1 2009/08/26 14:32:53 matt Exp $ */
/*
* Copyright (c) 2004
@@ -32,6 +32,7 @@
#include
#include
#include
+#include
#ifndef SOFTFLOAT
void mips_fpuexcept(struct lwp *, unsigned int);
@@ -95,7 +96,8 @@
ksiginfo_t ksi;
#if DEBUG
- printf("emul_trapsignal(%x,%x)\n", sig, code);
+ printf("emul_trapsignal(%x,%x,%#"PRIxREGISTER")\n",
+ sig, code, l->l_md.md_regs->f_regs[_R_PC]);
#endif
KSI_INIT_TRAP(&ksi);
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips
Module Name:src
Committed By: matt
Date: Wed Aug 26 14:33:59 UTC 2009
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: mips_fputrap.c
Log Message:
s/emul_/fpemul_/indicate this was a fpemul trap.
To generate a diff of this commit:
cvs rdiff -u -r1.5.66.1 -r1.5.66.2 src/sys/arch/mips/mips/mips_fputrap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/mips_fputrap.c
diff -u src/sys/arch/mips/mips/mips_fputrap.c:1.5.66.1 src/sys/arch/mips/mips/mips_fputrap.c:1.5.66.2
--- src/sys/arch/mips/mips/mips_fputrap.c:1.5.66.1 Wed Aug 26 14:32:53 2009
+++ src/sys/arch/mips/mips/mips_fputrap.c Wed Aug 26 14:33:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_fputrap.c,v 1.5.66.1 2009/08/26 14:32:53 matt Exp $ */
+/* $NetBSD: mips_fputrap.c,v 1.5.66.2 2009/08/26 14:33:59 matt Exp $ */
/*
* Copyright (c) 2004
@@ -96,7 +96,7 @@
ksiginfo_t ksi;
#if DEBUG
- printf("emul_trapsignal(%x,%x,%#"PRIxREGISTER")\n",
+ printf("fpemul_trapsignal(%x,%x,%#"PRIxREGISTER")\n",
sig, code, l->l_md.md_regs->f_regs[_R_PC]);
#endif
CVS commit: [matt-nb5-mips64] src/lib/csu/mips
Module Name:src Committed By: matt Date: Wed Aug 26 14:35:38 UTC 2009 Modified Files: src/lib/csu/mips [matt-nb5-mips64]: dot_init.h Log Message: .cpreturn was doing the wrong thing. Do the restore of GP explicitly To generate a diff of this commit: cvs rdiff -u -r1.9.10.2 -r1.9.10.3 src/lib/csu/mips/dot_init.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/csu/mips/dot_init.h diff -u src/lib/csu/mips/dot_init.h:1.9.10.2 src/lib/csu/mips/dot_init.h:1.9.10.3 --- src/lib/csu/mips/dot_init.h:1.9.10.2 Tue Aug 18 06:38:17 2009 +++ src/lib/csu/mips/dot_init.h Wed Aug 26 14:35:38 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: dot_init.h,v 1.9.10.2 2009/08/18 06:38:17 matt Exp $ */ +/* $NetBSD: dot_init.h,v 1.9.10.3 2009/08/26 14:35:38 matt Exp $ */ /*- * Copyright (c) 2001 Ross Harvey @@ -59,7 +59,7 @@ #define sREG_L "ld" #define sREG_S "sd" #if defined(__mips_n32) || defined(__mips_n64) -#define MD_GPRESTORE ".cpreturn" "\n\t" +#define MD_GPRESTORE "ld $gp,8($sp)" "\n\t" #define sRAOFF "24" #define sFRAMESZ "32" #elif defined(__mips_o64)
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: bouyer
Date: Wed Aug 26 21:41:05 UTC 2009
Modified Files:
src/sys/dev/ic: mfi.c
Log Message:
mfi.c still uses the spl() synchronisation scheme and so needs the kernel lock.
The sysmon subsystem is marked MPSAFE and so runs without the kernel lock.
So get the kernel lock in mfi_sensor_refresh() before calling
mfi_ioctl_vol().
This fixes command list corruption seen on heavy I/O load on the mfi
driver(4).
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/ic/mfi.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/mfi.c
diff -u src/sys/dev/ic/mfi.c:1.27 src/sys/dev/ic/mfi.c:1.28
--- src/sys/dev/ic/mfi.c:1.27 Thu Jul 16 18:58:38 2009
+++ src/sys/dev/ic/mfi.c Wed Aug 26 21:41:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mfi.c,v 1.27 2009/07/16 18:58:38 dyoung Exp $ */
+/* $NetBSD: mfi.c,v 1.28 2009/08/26 21:41:05 bouyer Exp $ */
/* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */
/*
* Copyright (c) 2006 Marco Peereboom
@@ -17,7 +17,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.27 2009/07/16 18:58:38 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.28 2009/08/26 21:41:05 bouyer Exp $");
#include "bio.h"
@@ -2032,18 +2032,21 @@
struct mfi_softc *sc = sme->sme_cookie;
struct bioc_vol bv;
int s;
+ int error;
if (edata->sensor >= sc->sc_ld_cnt)
return;
memset(&bv, 0, sizeof(bv));
bv.bv_volid = edata->sensor;
+ KERNEL_LOCK(1, curlwp);
s = splbio();
- if (mfi_ioctl_vol(sc, &bv)) {
- splx(s);
- return;
+ error = mfi_ioctl_vol(sc, &bv);
}
splx(s);
+ KERNEL_UNLOCK_ONE(curlwp);
+ if (error)
+ return;
switch(bv.bv_status) {
case BIOC_SVOFFLINE:
CVS commit: xsrc/external/mit/xf86-video-suntcx/dist/src
Module Name:xsrc
Committed By: macallan
Date: Wed Aug 26 22:24:34 UTC 2009
Modified Files:
xsrc/external/mit/xf86-video-suntcx/dist/src: tcx.h tcx_driver.c
Added Files:
xsrc/external/mit/xf86-video-suntcx/dist/src: tcx_accel.c
Log Message:
add acceleration support, make hardware cursor work, etc.
the acceleration code will not work on 8 bit TCX yet.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h \
xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_driver.c
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h
diff -u xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h:1.1 xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h:1.2
--- xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h:1.1 Thu Aug 13 03:38:25 2009
+++ xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h Wed Aug 26 22:24:34 2009
@@ -31,12 +31,15 @@
#include
#include "gcstruct.h"
#include "xf86sbusBus.h"
+#include "exa.h"
#include "tcx_regs.h"
/* Various offsets in virtual (ie. mmap()) spaces Linux and Solaris support. */
#define TCX_RAM8_VOFF 0x
#define TCX_RAM24_VOFF 0x0100
#define TCX_CPLANE_VOFF 0x2800
+#define TCX_RSTIP_VOFF 0x3000
+#define TCX_RBLIT_VOFF 0x3800
#define TCX_TEC_VOFF 0x7000
#define TCX_BTREGS_VOFF 0x70002000
#define TCX_THC_VOFF 0x70004000
@@ -53,15 +56,21 @@
sbusDevicePtr psdp;
CloseScreenProcPtr CloseScreen;
Bool HWCursor;
+ uint64_t *rblit;
+ uint64_t *rstip;
xf86CursorInfoPtr CursorInfoRec;
unsigned int CursorXY;
int CursorBg, CursorFg;
- Bool CursorEnabled;
+ Bool CursorEnabled, NoAccel;
unsigned char CursorShiftX, CursorShiftY;
unsigned char *CursorData;
OptionInfoPtr Options;
+ ExaDriverPtr pExa;
+ int xdir, ydir, srcoff, srcpitch, fg;
} TcxRec, *TcxPtr;
+Bool TcxInitAccel(ScreenPtr);
+
#define TCX_CPLANE_MODE 0x0300
#define GET_TCX_FROM_SCRN(p)((TcxPtr)((p)->driverPrivate))
Index: xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_driver.c
diff -u xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_driver.c:1.1 xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_driver.c:1.2
--- xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_driver.c:1.1 Thu Aug 13 03:38:25 2009
+++ xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_driver.c Wed Aug 26 22:24:34 2009
@@ -25,7 +25,12 @@
#include "config.h"
#endif
+#include
+#include
+#include
#include
+#include
+#include
#include "xf86.h"
#include "xf86_OSproc.h"
@@ -88,12 +93,14 @@
typedef enum {
OPTION_SW_CURSOR,
-OPTION_HW_CURSOR
+OPTION_HW_CURSOR,
+OPTION_NOACCEL
} TCXOpts;
static const OptionInfoRec TCXOptions[] = {
{ OPTION_SW_CURSOR, "SWcursor", OPTV_BOOLEAN, {0}, FALSE },
-{ OPTION_HW_CURSOR, "HWcursor", OPTV_BOOLEAN, {0}, FALSE },
+{ OPTION_HW_CURSOR, "HWcursor", OPTV_BOOLEAN, {0}, TRUE },
+{ OPTION_NOACCEL, "NoAccel", OPTV_BOOLEAN, {0}, FALSE },
{ -1, NULL, OPTV_NONE, {0}, FALSE }
};
@@ -341,6 +348,12 @@
sparcPromClose();
}
+/* all S24 support a hardware cursor */
+if (!lowDepth)
+ hwCursor = 1;
+
+ xf86Msg(X_ERROR, "hw-cursor: %d\n", hwCursor);
+
/*
deal with depth
*/
@@ -355,6 +368,7 @@
/* OK */
break;
case 32:
+ case 24:
/* unless lowDepth OK */
if (lowDepth) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -383,7 +397,7 @@
* xf86SetWeight references it.
*/
if (pScrn->depth > 8) {
- rgb weight = {10, 11, 11};
+ rgb weight = {0, 0, 0};
rgb mask = {0xff, 0xff00, 0xff};
if (!xf86SetWeight(pScrn, weight, mask)) {
@@ -429,7 +443,13 @@
pTcx->HWCursor = FALSE;
}
}
-
+
+pTcx->NoAccel = FALSE;
+if (xf86ReturnOptValBool(pTcx->Options, OPTION_NOACCEL, FALSE)) {
+ pTcx->NoAccel = TRUE;
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Acceleration disabled\n");
+}
+
xf86DrvMsg(pScrn->scrnIndex, from, "Using %s cursor\n",
pTcx->HWCursor ? "HW" : "SW");
@@ -488,15 +508,12 @@
/* Map the TCX memory */
if (pScrn->depth == 8)
pTcx->fb =
- xf86MapSbusMem (pTcx->psdp, TCX_RAM8_VOFF,
- (pTcx->psdp->width * pTcx->psdp->height));
+ xf86MapSbusMem (pTcx->psdp, TCX_RAM8_VOFF, 1024 * 1024);
else {
pTcx->fb =
- xf86MapSbusMem (pTcx->psdp, TCX_RAM24_VOFF,
- (pTcx->psdp->width * pTcx->psdp->height * 4));
+ xf86MapSbusMem (pTcx->psdp, TCX_RAM24_VOFF, 1024 * 1024 * 4);
pTcx->cplane =
- xf86MapSbusMem (pTcx->psdp, TCX_CPLANE_VOFF,
- (pTcx->psdp->width * pTcx->psdp->height * 4));
+ xf86MapSbusMem (pTcx->psdp, TCX_CPLANE_VOFF, 1024 * 1024 * 4);
if (! pTcx->cplane)
return FALSE;
}
@@
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: macallan
Date: Wed Aug 26 22:30:46 UTC 2009
Added Files:
src/external/mit/xorg/server/drivers/xf86-video-pnozz: Makefile
src/external/mit/xorg/server/drivers/xf86-video-suntcx: Makefile
Log Message:
reachover for pnozz and suntcx
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/drivers/xf86-video-pnozz/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/drivers/xf86-video-suntcx/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/mit/xorg/server/drivers/xf86-video-pnozz/Makefile
diff -u /dev/null src/external/mit/xorg/server/drivers/xf86-video-pnozz/Makefile:1.1
--- /dev/null Wed Aug 26 22:30:46 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-pnozz/Makefile Wed Aug 26 22:30:46 2009
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2009/08/26 22:30:46 macallan Exp $
+
+DRIVER= xf86-video-pnozz
+DRIVER_NAME= pnozz_drv
+
+SRCS= pnozz_driver.c pnozz_cursor.c pnozz_accel.c
+
+CPPFLAGS+= ${X11FLAGS.DRI}
+
+MAN= pnozz.4
+
+.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-suntcx/Makefile
diff -u /dev/null src/external/mit/xorg/server/drivers/xf86-video-suntcx/Makefile:1.1
--- /dev/null Wed Aug 26 22:30:46 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-suntcx/Makefile Wed Aug 26 22:30:46 2009
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2009/08/26 22:30:46 macallan Exp $
+
+DRIVER= xf86-video-suntcx
+DRIVER_NAME= suntcx_drv
+
+SRCS= tcx_driver.c tcx_cursor.c tcx_accel.c
+
+CPPFLAGS+= ${X11FLAGS.DRI}
+
+MAN= suntcx.4
+
+.include "../Makefile.xf86-driver"
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: macallan
Date: Wed Aug 26 22:33:38 UTC 2009
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
Log Message:
build pnozz and suntcx drivers on sparc
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/external/mit/xorg/server/drivers/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.29 src/external/mit/xorg/server/drivers/Makefile:1.30
--- src/external/mit/xorg/server/drivers/Makefile:1.29 Tue Jun 23 04:39:52 2009
+++ src/external/mit/xorg/server/drivers/Makefile Wed Aug 26 22:33:38 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2009/06/23 04:39:52 mrg Exp $
+# $NetBSD: Makefile,v 1.30 2009/08/26 22:33:38 macallan Exp $
SUBDIR= \
xf86-input-keyboard \
@@ -41,6 +41,11 @@
xf86-video-suncg6 \
xf86-video-sunffb \
xf86-video-wsfb
+.if ${MACHINE} == "sparc"
+SUBDIR+= \
+ xf86-video-pnozz \
+ xf86-video-suntcx
+.endif
.elif ${MACHINE} == "shark"
SUBDIR+= \
xf86-video-chips \
CVS commit: src/sys/kern
Module Name:src Committed By: bouyer Date: Wed Aug 26 22:34:47 UTC 2009 Modified Files: src/sys/kern: uipc_usrreq.c Log Message: In uipc_usrreq(PRU_ACCEPT), grab the unp_streamlock before unp_setpeerlocks(). This fixes a race where, for a short period of time, so->so_lock and so2->so_lock are not sync. This makes solocked2() and solocked() unreliable and cause DIAGNOSTIC kernel panics. This also fixes a possible panic in unp_setaddr() which expects the socket locked. Should fix kern/38968, fix proposed in http://mail-index.netbsd.org/tech-kern/2009/08/17/msg005863.html To generate a diff of this commit: cvs rdiff -u -r1.126 -r1.127 src/sys/kern/uipc_usrreq.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/uipc_usrreq.c diff -u src/sys/kern/uipc_usrreq.c:1.126 src/sys/kern/uipc_usrreq.c:1.127 --- src/sys/kern/uipc_usrreq.c:1.126 Sun May 24 21:41:26 2009 +++ src/sys/kern/uipc_usrreq.c Wed Aug 26 22:34:47 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_usrreq.c,v 1.126 2009/05/24 21:41:26 ad Exp $ */ +/* $NetBSD: uipc_usrreq.c,v 1.127 2009/08/26 22:34:47 bouyer Exp $ */ /*- * Copyright (c) 1998, 2000, 2004, 2008, 2009 The NetBSD Foundation, Inc. @@ -96,7 +96,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.126 2009/05/24 21:41:26 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.127 2009/08/26 22:34:47 bouyer Exp $"); #include #include @@ -252,6 +252,11 @@ unp->unp_streamlock = NULL; mutex_obj_hold(lock); membar_exit(); + /* + * possible race if lock is not held - see comment in + * uipc_usrreq(PRU_ACCEPT). + */ + KASSERT(mutex_owned(lock)); solockreset(so, lock); solockreset(so2, lock); } @@ -328,6 +333,7 @@ struct unpcb *unp; bool ext; + KASSERT(solocked(so)); unp = sotounpcb(so); ext = false; @@ -444,7 +450,17 @@ * If the connection is fully established, break the * association with uipc_lock and give the connected * pair a seperate lock to share. + * There is a race here: sotounpcb(so2)->unp_streamlock + * is not locked, so when changing so2->so_lock + * another thread can grab it while so->so_lock is still + * pointing to the (locked) uipc_lock. + * this should be harmless, exept that this makes + * solocked2() and solocked() unreliable. + * Another problem is that unp_setaddr() expects the + * the socket locked. Grabing sotounpcb(so2)->unp_streamlock + * fixes both issues. */ + mutex_enter(sotounpcb(so2)->unp_streamlock); unp_setpeerlocks(so2, so); /* * Only now return peer's address, as we may need to @@ -455,6 +471,8 @@ * error == 0 and sun_noname as the peer address. */ unp_setaddr(so, nam, true); + /* so_lock now points to unp_streamlock */ + mutex_exit(so2->so_lock); break; case PRU_SHUTDOWN:
CVS commit: src/sys/dev/sun
Module Name:src Committed By: macallan Date: Wed Aug 26 22:34:50 UTC 2009 Modified Files: src/sys/dev/sun: fbio.h Log Message: apparently the official name for the S24 is FBTYPE_TCXCOLOR To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/dev/sun/fbio.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/sun/fbio.h diff -u src/sys/dev/sun/fbio.h:1.10 src/sys/dev/sun/fbio.h:1.11 --- src/sys/dev/sun/fbio.h:1.10 Sat Aug 15 11:33:49 2009 +++ src/sys/dev/sun/fbio.h Wed Aug 26 22:34:50 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: fbio.h,v 1.10 2009/08/15 11:33:49 macallan Exp $ */ +/* $NetBSD: fbio.h,v 1.11 2009/08/26 22:34:50 macallan Exp $ */ /* * Copyright (c) 1992 Regents of the University of California. @@ -73,7 +73,7 @@ #define FBTYPE_CREATOR 22 /* ffb creator or elite */ #define FBTYPE_GENERIC_PCI 23 /* machfb, ofb and so on */ #define FBTYPE_AG10E 24 /* Fujitsu AG-10e */ -#define FBTYPE_SUNTCX 25 /* Sun TCX, S24 */ +#define FBTYPE_TCXCOLOR 25 /* Sun TCX, S24 */ #define FBTYPE_LASTPLUSONE 26 /* max number of fbs (change as add) */
CVS commit: src/sys/dev/sbus
Module Name:src
Committed By: macallan
Date: Wed Aug 26 22:36:07 UTC 2009
Modified Files:
src/sys/dev/sbus: tcx.c
Log Message:
adjust some mmap ranges so X can work, also use FBTYPE_TCXCOLOR
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/sbus/tcx.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/tcx.c
diff -u src/sys/dev/sbus/tcx.c:1.39 src/sys/dev/sbus/tcx.c:1.40
--- src/sys/dev/sbus/tcx.c:1.39 Thu Aug 20 02:29:16 2009
+++ src/sys/dev/sbus/tcx.c Wed Aug 26 22:36:07 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: tcx.c,v 1.39 2009/08/20 02:29:16 macallan Exp $ */
+/* $NetBSD: tcx.c,v 1.40 2009/08/26 22:36:07 macallan Exp $ */
/*
* Copyright (c) 1996, 1998, 2009 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.39 2009/08/20 02:29:16 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.40 2009/08/26 22:36:07 macallan Exp $");
/*
* define for cg8 emulation on S24 (24-bit version of tcx) for the SS5;
@@ -273,11 +273,11 @@
fb->fb_type.fb_cmsize = 256;
fb->fb_type.fb_size = ramsize;
- printf(": %s, %d x %d", OBPNAME,
+ printf("%s: %s, %d x %d", device_xname(self), OBPNAME,
fb->fb_type.fb_width,
fb->fb_type.fb_height);
- fb->fb_type.fb_type = FBTYPE_SUNTCX;
+ fb->fb_type.fb_type = FBTYPE_TCXCOLOR;
if (sa->sa_nreg != TCX_NREG) {
@@ -619,7 +619,7 @@
{ TCX_USER_RBLIT, 1, TCX_REG_RBLIT },
{ TCX_USER_TEC, 1, TCX_REG_TEC },
{ TCX_USER_BTREGS, 8192 /* XXX */, TCX_REG_CMAP },
- { TCX_USER_THC, 0x1000, TCX_REG_THC },
+ { TCX_USER_THC, 0x2000, TCX_REG_THC },
{ TCX_USER_DHC, 1, TCX_REG_DHC },
{ TCX_USER_ALT, 1, TCX_REG_ALT },
{ TCX_USER_ROM, 65536, TCX_REG_ROM },
@@ -645,8 +645,10 @@
for (; mo < mo_end; mo++) {
if ((u_int)off < mo->mo_uaddr)
continue;
+
u = off - mo->mo_uaddr;
sz = mo->mo_size;
+
if (sz == 0) {
sz = sc->sc_fb.fb_type.fb_size;
/*
@@ -664,6 +666,9 @@
sz *= 4;
}
}
+ if (sz == 1)
+ sz = rr[mo->mo_bank].oa_size;
+
if (u < sz) {
return (bus_space_mmap(sc->sc_bustag,
BUS_ADDR(rr[mo->mo_bank].oa_space,
CVS commit: src/distrib/sets/lists/xserver
Module Name:src Committed By: macallan Date: Wed Aug 26 22:38:22 UTC 2009 Modified Files: src/distrib/sets/lists/xserver: md.sparc Log Message: add pnozz and suntcx drivers To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/distrib/sets/lists/xserver/md.sparc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xserver/md.sparc diff -u src/distrib/sets/lists/xserver/md.sparc:1.38 src/distrib/sets/lists/xserver/md.sparc:1.39 --- src/distrib/sets/lists/xserver/md.sparc:1.38 Sun Aug 23 09:05:45 2009 +++ src/distrib/sets/lists/xserver/md.sparc Wed Aug 26 22:38:22 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc,v 1.38 2009/08/23 09:05:45 mrg Exp $ +# $NetBSD: md.sparc,v 1.39 2009/08/26 22:38:22 macallan Exp $ ./usr/X11R6/bin/X -unknown- x11 ./usr/X11R6/bin/XFree86 -unknown- x11 ./usr/X11R6/bin/Xsun -unknown- x11 @@ -316,6 +316,8 @@ ./usr/X11R7/lib/modules/drivers/mga_drv.so.1 -unknown- xorg ./usr/X11R7/lib/modules/drivers/mouse_drv.so -unknown- xorg ./usr/X11R7/lib/modules/drivers/mouse_drv.so.1 -unknown- xorg +./usr/X11R7/lib/modules/drivers/pnozz_drv.so -unknown- xorg +./usr/X11R7/lib/modules/drivers/pnozz_drv.so.0 -unknown- xorg ./usr/X11R7/lib/modules/drivers/r128_drv.so -unknown- xorg ./usr/X11R7/lib/modules/drivers/r128_drv.so.6 -unknown- xorg ./usr/X11R7/lib/modules/drivers/radeon_drv.so -unknown- xorg @@ -324,6 +326,8 @@ ./usr/X11R7/lib/modules/drivers/suncg6_drv.so.1 -unknown- xorg ./usr/X11R7/lib/modules/drivers/sunffb_drv.so -unknown- xorg ./usr/X11R7/lib/modules/drivers/sunffb_drv.so.1 -unknown- xorg +./usr/X11R7/lib/modules/drivers/suntcx_drv.so -unknown- xorg +./usr/X11R7/lib/modules/drivers/suntcx_drv.so.1 -unknown- xorg ./usr/X11R7/lib/modules/drivers/void_drv.so -unknown- xorg ./usr/X11R7/lib/modules/drivers/void_drv.so.1 -unknown- xorg ./usr/X11R7/lib/modules/drivers/wsfb_drv.so -unknown- xorg @@ -475,10 +479,12 @@ ./usr/X11R7/man/cat4/kbd.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/mga.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/mousedrv.0-unknown- .cat,xorg +./usr/X11R7/man/cat4/pnozz.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/r128.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/radeon.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/suncg6.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/sunffb.0-unknown- .cat,xorg +./usr/X11R7/man/cat4/suntcx.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/void.0-unknown- .cat,xorg ./usr/X11R7/man/cat4/wsfb.0-unknown- .cat,xorg ./usr/X11R7/man/cat5/xorg.conf.0 -unknown- .cat,xorg @@ -496,10 +502,12 @@ ./usr/X11R7/man/html4/kbd.html-unknown- html,xorg ./usr/X11R7/man/html4/mga.html-unknown- html,xorg ./usr/X11R7/man/html4/mousedrv.html -unknown- html,xorg +./usr/X11R7/man/html4/pnozz.html -unknown- html,xorg ./usr/X11R7/man/html4/r128.html-unknown- html,xorg ./usr/X11R7/man/html4/radeon.html -unknown- html,xorg ./usr/X11R7/man/html4/suncg6.html -unknown- html,xorg ./usr/X11R7/man/html4/sunffb.html -unknown- html,xorg +./usr/X11R7/man/html4/suntcx.html -unknown- html,xorg ./usr/X11R7/man/html4/void.html-unknown- html,xorg ./usr/X11R7/man/html4/wsfb.html-unknown- html,xorg ./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg @@ -517,10 +525,12 @@ ./usr/X11R7/man/man4/kbd.4-unknown- .man,xorg ./usr/X11R7/man/man4/mga.4-unknown- .man,xorg ./usr/X11R7/man/man4/mousedrv.4-unknown- .man,xorg +./usr/X11R7/man/man4/pnozz.4-unknown- .man,xorg ./usr/X11R7/man/man4/r128.4-unknown- .man,xorg ./usr/X11R7/man/man4/radeon.4-unknown- .man,xorg ./usr/X11R7/man/man4/suncg6.4-unknown- .man,xorg ./usr/X11R7/man/man4/sunffb.4-unknown- .man,xorg +./usr/X11R7/man/man4/suntcx.4-unknown- .man,xorg ./usr/X11R7/man/man4/void.4-unknown- .man,xorg ./usr/X11R7/man/man4/wsfb.4-unknown- .man,xorg ./usr/X11R7/man/man5/xorg.conf.5 -unknown- .man,xorg
CVS commit: src/sys/arch/i386/i386
Module Name:src
Committed By: bouyer
Date: Wed Aug 26 23:17:03 UTC 2009
Modified Files:
src/sys/arch/i386/i386: db_trace.c
Log Message:
Do not try to get the faulting instruction if eip is 0.
This makes 'trace' work when the kernel paniced because it jumped to
a NULL function pointer.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/i386/i386/db_trace.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/i386/db_trace.c
diff -u src/sys/arch/i386/i386/db_trace.c:1.61 src/sys/arch/i386/i386/db_trace.c:1.62
--- src/sys/arch/i386/i386/db_trace.c:1.61 Sat Mar 7 22:02:16 2009
+++ src/sys/arch/i386/i386/db_trace.c Wed Aug 26 23:17:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.61 2009/03/07 22:02:16 ad Exp $ */
+/* $NetBSD: db_trace.c,v 1.62 2009/08/26 23:17:03 bouyer Exp $ */
/*
* Mach Operating System
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.61 2009/03/07 22:02:16 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.62 2009/08/26 23:17:03 bouyer Exp $");
#include
#include
@@ -501,7 +501,7 @@
sym = db_frame_info(frame, callpc, &name, &offset, &is_trap,
&narg);
- if (lastframe == 0 && sym == (db_sym_t)0) {
+ if (lastframe == 0 && sym == (db_sym_t)0 && callpc != 0) {
/* Symbol not found, peek at code */
int instr = db_get_value(callpc, 4, false);
CVS commit: src/usr.bin/make
Module Name:src
Committed By: sjg
Date: Wed Aug 26 23:17:11 UTC 2009
Modified Files:
src/usr.bin/make: main.c make.1
Log Message:
Add -C directory, same as gmake and freebsd make.
To generate a diff of this commit:
cvs rdiff -u -r1.170 -r1.171 src/usr.bin/make/main.c
cvs rdiff -u -r1.158 -r1.159 src/usr.bin/make/make.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.170 src/usr.bin/make/main.c:1.171
--- src/usr.bin/make/main.c:1.170 Tue Mar 24 13:53:21 2009
+++ src/usr.bin/make/main.c Wed Aug 26 23:17:11 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.170 2009/03/24 13:53:21 perry Exp $ */
+/* $NetBSD: main.c,v 1.171 2009/08/26 23:17:11 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.170 2009/03/24 13:53:21 perry Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.171 2009/08/26 23:17:11 sjg Exp $";
#else
#include
#ifndef lint
@@ -81,7 +81,7 @@
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: main.c,v 1.170 2009/03/24 13:53:21 perry Exp $");
+__RCSID("$NetBSD: main.c,v 1.171 2009/08/26 23:17:11 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -333,7 +333,7 @@
Boolean inOption, dashDash = FALSE;
char found_path[MAXPATHLEN + 1]; /* for searching for sys.mk */
-#define OPTFLAGS "BD:I:J:NST:V:WXd:ef:ij:km:nqrst"
+#define OPTFLAGS "BC:D:I:J:NST:V:WXd:ef:ij:km:nqrst"
/* Can't actually use getopt(3) because rescanning is not portable */
getopt_def = OPTFLAGS;
@@ -384,6 +384,15 @@
compatMake = TRUE;
Var_Append(MAKEFLAGS, "-B", VAR_GLOBAL);
break;
+ case 'C':
+ if (chdir(argvalue) == -1) {
+(void)fprintf(stderr,
+ "%s: chdir %s: %s\n",
+ progname, argvalue,
+ strerror(errno));
+exit(1);
+ }
+ break;
case 'D':
if (argvalue == NULL || argvalue[0] == 0) goto noarg;
Var_Set(argvalue, "1", VAR_GLOBAL, 0);
@@ -1773,7 +1782,8 @@
usage(void)
{
(void)fprintf(stderr,
-"usage: %s [-BeikNnqrstWX] [-D variable] [-d flags] [-f makefile]\n\
+"usage: %s [-BeikNnqrstWX] \n\
+[-C directory] [-D variable] [-d flags] [-f makefile]\n\
[-I directory] [-J private] [-j max_jobs] [-m directory] [-T file]\n\
[-V variable] [variable=value] [target ...]\n", progname);
exit(2);
Index: src/usr.bin/make/make.1
diff -u src/usr.bin/make/make.1:1.158 src/usr.bin/make/make.1:1.159
--- src/usr.bin/make/make.1:1.158 Mon Jun 1 23:28:39 2009
+++ src/usr.bin/make/make.1 Wed Aug 26 23:17:11 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: make.1,v 1.158 2009/06/01 23:28:39 sjg Exp $
+.\" $NetBSD: make.1,v 1.159 2009/08/26 23:17:11 sjg Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -39,6 +39,9 @@
.Nm
.Op Fl BeikNnqrstWX
.Bk -words
+.Op Fl C Ar directory
+.Ek
+.Bk -words
.Op Fl D Ar variable
.Ek
.Bk -words
@@ -104,6 +107,16 @@
.It Fl B
Try to be backwards compatible by executing a single shell per command and
by executing the commands to make the sources of a dependency line in sequence.
+.It Fl C Ar directory
+Change to
+.Ar directory
+before reading the makefiles or doing anything else.
+If multiple
+.Fl C
+options are specified, each is interpreted relative to the previous one:
+.Fl C Pa / Fl C Pa etc
+is equivalent to
+.Fl C Pa /etc .
.It Fl D Ar variable
Define
.Ar variable
CVS commit: src/usr.bin/make
Module Name:src Committed By: sjg Date: Wed Aug 26 23:18:58 UTC 2009 Modified Files: src/usr.bin/make: make.1 Log Message: Bump date To generate a diff of this commit: cvs rdiff -u -r1.159 -r1.160 src/usr.bin/make/make.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/make.1 diff -u src/usr.bin/make/make.1:1.159 src/usr.bin/make/make.1:1.160 --- src/usr.bin/make/make.1:1.159 Wed Aug 26 23:17:11 2009 +++ src/usr.bin/make/make.1 Wed Aug 26 23:18:57 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.159 2009/08/26 23:17:11 sjg Exp $ +.\" $NetBSD: make.1,v 1.160 2009/08/26 23:18:57 sjg Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)make.1 8.4 (Berkeley) 3/19/94 .\" -.Dd June 1, 2009 +.Dd August 26, 2009 .Dt MAKE 1 .Os .Sh NAME
CVS commit: src/games/wump
Module Name:src
Committed By: dholland
Date: Thu Aug 27 00:19:52 UTC 2009
Modified Files:
src/games/wump: wump.c
Log Message:
remove unnecessary cast
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/games/wump/wump.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/wump/wump.c
diff -u src/games/wump/wump.c:1.24 src/games/wump/wump.c:1.25
--- src/games/wump/wump.c:1.24 Wed Aug 12 09:00:10 2009
+++ src/games/wump/wump.c Thu Aug 27 00:19:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: wump.c,v 1.24 2009/08/12 09:00:10 dholland Exp $ */
+/* $NetBSD: wump.c,v 1.25 2009/08/27 00:19:52 dholland Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -43,7 +43,7 @@
#if 0
static char sccsid[] = "@(#)wump.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: wump.c,v 1.24 2009/08/12 09:00:10 dholland Exp $");
+__RCSID("$NetBSD: wump.c,v 1.25 2009/08/27 00:19:52 dholland Exp $");
#endif
#endif /* not lint */
@@ -596,7 +596,7 @@
* make it easier on the intrepid adventurer.
*/
for (i = 1; i <= room_num; ++i)
- qsort(cave[i].tunnel, (u_int)link_num,
+ qsort(cave[i].tunnel, link_num,
sizeof(cave[i].tunnel[0]), int_compare);
#ifdef DEBUG
CVS commit: src/games/arithmetic
Module Name:src
Committed By: dholland
Date: Thu Aug 27 00:21:45 UTC 2009
Modified Files:
src/games/arithmetic: arithmetic.c
Log Message:
remove unnecessary casts
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/games/arithmetic/arithmetic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/arithmetic/arithmetic.c
diff -u src/games/arithmetic/arithmetic.c:1.24 src/games/arithmetic/arithmetic.c:1.25
--- src/games/arithmetic/arithmetic.c:1.24 Wed Aug 12 04:30:21 2009
+++ src/games/arithmetic/arithmetic.c Thu Aug 27 00:21:45 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: arithmetic.c,v 1.24 2009/08/12 04:30:21 dholland Exp $ */
+/* $NetBSD: arithmetic.c,v 1.25 2009/08/27 00:21:45 dholland Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)arithmetic.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: arithmetic.c,v 1.24 2009/08/12 04:30:21 dholland Exp $");
+__RCSID("$NetBSD: arithmetic.c,v 1.25 2009/08/27 00:21:45 dholland Exp $");
#endif
#endif /* not lint */
@@ -309,7 +309,7 @@
struct penalty *p;
op = opnum(op);
- if ((p = (struct penalty *)malloc((u_int)sizeof(*p))) == NULL)
+ if ((p = malloc(sizeof(*p))) == NULL)
return;
p->next = penlist[op][operand];
penlist[op][operand] = p;
CVS commit: src/games/dm
Module Name:src
Committed By: dholland
Date: Thu Aug 27 00:22:29 UTC 2009
Modified Files:
src/games/dm: dm.c
Log Message:
remove unnecessary cast
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/games/dm/dm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/dm/dm.c
diff -u src/games/dm/dm.c:1.28 src/games/dm/dm.c:1.29
--- src/games/dm/dm.c:1.28 Wed Aug 12 05:51:59 2009
+++ src/games/dm/dm.c Thu Aug 27 00:22:28 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dm.c,v 1.28 2009/08/12 05:51:59 dholland Exp $ */
+/* $NetBSD: dm.c,v 1.29 2009/08/27 00:22:28 dholland Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)dm.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: dm.c,v 1.28 2009/08/12 05:51:59 dholland Exp $");
+__RCSID("$NetBSD: dm.c,v 1.29 2009/08/27 00:22:28 dholland Exp $");
#endif
#endif /* not lint */
@@ -314,7 +314,7 @@
(void)fclose(lp);
return;
}
- sleep((u_int)1);
+ sleep(1);
}
if (pw = getpwuid(uid = getuid()))
fputs(pw->pw_name, lp);
CVS commit: src/games/quiz
Module Name:src
Committed By: dholland
Date: Thu Aug 27 00:24:11 UTC 2009
Modified Files:
src/games/quiz: quiz.c
Log Message:
Use standard C: 'unsigned', not 'u_int'
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/games/quiz/quiz.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/quiz/quiz.c
diff -u src/games/quiz/quiz.c:1.24 src/games/quiz/quiz.c:1.25
--- src/games/quiz/quiz.c:1.24 Wed Aug 12 08:26:49 2009
+++ src/games/quiz/quiz.c Thu Aug 27 00:24:11 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: quiz.c,v 1.24 2009/08/12 08:26:49 dholland Exp $ */
+/* $NetBSD: quiz.c,v 1.25 2009/08/27 00:24:11 dholland Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -43,7 +43,7 @@
#if 0
static char sccsid[] = "@(#)quiz.c 8.3 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: quiz.c,v 1.24 2009/08/12 08:26:49 dholland Exp $");
+__RCSID("$NetBSD: quiz.c,v 1.25 2009/08/27 00:24:11 dholland Exp $");
#endif
#endif /* not lint */
@@ -62,7 +62,7 @@
static QE qlist;
static int catone, cattwo, tflag;
-static u_int qsize;
+static unsigned qsize;
int main(int, char *[]);
static char *appdstr(char *, const char *, size_t);
@@ -71,7 +71,7 @@
static void get_file(const char *);
static const char *next_cat(const char *);
static void quiz(void);
-static void score(u_int, u_int, u_int);
+static void score(unsigned, unsigned, unsigned);
static void show_index(void);
static void usage(void) __dead;
@@ -230,7 +230,7 @@
QE *qp;
int i;
size_t len;
- u_int guesses, rights, wrongs;
+ unsigned guesses, rights, wrongs;
int next;
char *answer, *t, question[LINE_SZ];
const char *s;
@@ -360,7 +360,7 @@
static void
score(r, w, g)
- u_int r, w, g;
+ unsigned r, w, g;
{
(void)printf("Rights %d, wrongs %d,", r, w);
if (g)
CVS commit: src/games/quiz
Module Name:src
Committed By: dholland
Date: Thu Aug 27 00:31:12 UTC 2009
Modified Files:
src/games/quiz: quiz.c rxp.c
Log Message:
ANSIfy function definitions
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/games/quiz/quiz.c
cvs rdiff -u -r1.12 -r1.13 src/games/quiz/rxp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/quiz/quiz.c
diff -u src/games/quiz/quiz.c:1.25 src/games/quiz/quiz.c:1.26
--- src/games/quiz/quiz.c:1.25 Thu Aug 27 00:24:11 2009
+++ src/games/quiz/quiz.c Thu Aug 27 00:31:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: quiz.c,v 1.25 2009/08/27 00:24:11 dholland Exp $ */
+/* $NetBSD: quiz.c,v 1.26 2009/08/27 00:31:12 dholland Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -43,7 +43,7 @@
#if 0
static char sccsid[] = "@(#)quiz.c 8.3 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: quiz.c,v 1.25 2009/08/27 00:24:11 dholland Exp $");
+__RCSID("$NetBSD: quiz.c,v 1.26 2009/08/27 00:31:12 dholland Exp $");
#endif
#endif /* not lint */
@@ -64,7 +64,6 @@
static int catone, cattwo, tflag;
static unsigned qsize;
-int main(int, char *[]);
static char *appdstr(char *, const char *, size_t);
static void downcase(char *);
static void get_cats(char *, char *);
@@ -76,9 +75,7 @@
static void usage(void) __dead;
int
-main(argc, argv)
- int argc;
- char *argv[];
+main(int argc, char *argv[])
{
int ch;
const char *indexfile;
@@ -119,8 +116,7 @@
}
static void
-get_file(file)
- const char *file;
+get_file(const char *file)
{
FILE *fp;
QE *qp;
@@ -159,7 +155,7 @@
}
static void
-show_index()
+show_index(void)
{
QE *qp;
const char *p, *s;
@@ -192,8 +188,7 @@
}
static void
-get_cats(cat1, cat2)
- char *cat1, *cat2;
+get_cats(char *cat1, char *cat2)
{
QE *qp;
int i;
@@ -225,7 +220,7 @@
}
static void
-quiz()
+quiz(void)
{
QE *qp;
int i;
@@ -308,8 +303,7 @@
}
static const char *
-next_cat(s)
- const char * s;
+next_cat(const char *s)
{
int esc;
@@ -332,10 +326,7 @@
}
static char *
-appdstr(s, tp, len)
- char *s;
- const char *tp;
- size_t len;
+appdstr(char *s, const char *tp, size_t len)
{
char *mp;
const char *sp;
@@ -359,8 +350,7 @@
}
static void
-score(r, w, g)
- unsigned r, w, g;
+score(unsigned r, unsigned w, unsigned g)
{
(void)printf("Rights %d, wrongs %d,", r, w);
if (g)
@@ -369,8 +359,7 @@
}
static void
-downcase(p)
- char *p;
+downcase(char *p)
{
int ch;
@@ -380,7 +369,7 @@
}
static void
-usage()
+usage(void)
{
(void)fprintf(stderr, "quiz [-t] [-i file] category1 category2\n");
exit(1);
Index: src/games/quiz/rxp.c
diff -u src/games/quiz/rxp.c:1.12 src/games/quiz/rxp.c:1.13
--- src/games/quiz/rxp.c:1.12 Tue Jan 27 20:30:30 2004
+++ src/games/quiz/rxp.c Thu Aug 27 00:31:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rxp.c,v 1.12 2004/01/27 20:30:30 jsm Exp $ */
+/* $NetBSD: rxp.c,v 1.13 2009/08/27 00:31:12 dholland Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)rxp.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: rxp.c,v 1.12 2004/01/27 20:30:30 jsm Exp $");
+__RCSID("$NetBSD: rxp.c,v 1.13 2009/08/27 00:31:12 dholland Exp $");
#endif
#endif /* not lint */
@@ -87,16 +87,13 @@
static int rxp__match(const char *, int, Rxp_t *, Rxp_t *, const char *);
int
-rxp_compile(s)
- const char * s;
+rxp_compile(const char *s)
{
return (rxp__compile(s, TRUE));
}
static int
-rxp__compile(s, first)
- const char *s;
- int first;
+rxp__compile(const char *s, int first)
{
static Rxp_t *rp;
static const char *sp;
@@ -192,19 +189,17 @@
* match string against compiled regular expression
*/
int
-rxp_match(s)
- const char * s;
+rxp_match(const char *s)
{
return (rxp__match(s, TRUE, NULL, NULL, NULL));
}
static int
-rxp__match(s, first, j_succ, j_fail, sp_fail)
- const char *s;
- int first;
- Rxp_t *j_succ; /* jump here on successful alt match */
- Rxp_t *j_fail; /* jump here on failed match */
- const char *sp_fail; /* reset sp to here on failed match */
+rxp__match(const char *s,
+ int first,
+ Rxp_t *j_succ, /* jump here on successful alt match */
+ Rxp_t *j_fail, /* jump here on failed match */
+ const char *sp_fail) /* reset sp to here on failed match */
{
static Rxp_t *rp;
static const char *sp;
@@ -262,14 +257,13 @@
* Reverse engineer the regular expression, by picking first of all alternates.
*/
char *
-rxp_expand()
+rxp_expand(void)
{
return (rxp__expand(TRUE));
}
static char *
-rxp__expand(first)
- int first;
+rxp__expand(int first)
{
static char buf[RXP_LINE_SZ/2];
static Rxp_t *rp;
CVS commit: src/games/hunt
Module Name:src
Committed By: dholland
Date: Thu Aug 27 00:36:33 UTC 2009
Modified Files:
src/games/hunt/hunt: playit.c
src/games/hunt/huntd: answer.c faketalk.c
Log Message:
u_int32_t -> uint32_t
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/games/hunt/hunt/playit.c
cvs rdiff -u -r1.15 -r1.16 src/games/hunt/huntd/answer.c
cvs rdiff -u -r1.17 -r1.18 src/games/hunt/huntd/faketalk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/hunt/hunt/playit.c
diff -u src/games/hunt/hunt/playit.c:1.15 src/games/hunt/hunt/playit.c:1.16
--- src/games/hunt/hunt/playit.c:1.15 Wed Aug 12 07:42:11 2009
+++ src/games/hunt/hunt/playit.c Thu Aug 27 00:36:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: playit.c,v 1.15 2009/08/12 07:42:11 dholland Exp $ */
+/* $NetBSD: playit.c,v 1.16 2009/08/27 00:36:32 dholland Exp $ */
/*
* Copyright (c) 1983-2003, Regents of the University of California.
* All rights reserved.
@@ -32,7 +32,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: playit.c,v 1.15 2009/08/12 07:42:11 dholland Exp $");
+__RCSID("$NetBSD: playit.c,v 1.16 2009/08/27 00:36:32 dholland Exp $");
#endif /* not lint */
#include
@@ -89,13 +89,13 @@
{
int ch;
int y, x;
- u_int32_t version;
+ uint32_t version;
if (read(Socket, &version, LONGLEN) != LONGLEN) {
bad_con();
/* NOTREACHED */
}
- if (ntohl(version) != (u_int32_t)HUNT_VERSION) {
+ if (ntohl(version) != (uint32_t)HUNT_VERSION) {
bad_ver();
/* NOTREACHED */
}
@@ -430,13 +430,13 @@
void
do_message(void)
{
- u_int32_t version;
+ uint32_t version;
if (read(Socket, &version, LONGLEN) != LONGLEN) {
bad_con();
/* NOTREACHED */
}
- if (ntohl(version) != (u_int32_t)HUNT_VERSION) {
+ if (ntohl(version) != (uint32_t)HUNT_VERSION) {
bad_ver();
/* NOTREACHED */
}
Index: src/games/hunt/huntd/answer.c
diff -u src/games/hunt/huntd/answer.c:1.15 src/games/hunt/huntd/answer.c:1.16
--- src/games/hunt/huntd/answer.c:1.15 Wed Aug 12 07:42:11 2009
+++ src/games/hunt/huntd/answer.c Thu Aug 27 00:36:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: answer.c,v 1.15 2009/08/12 07:42:11 dholland Exp $ */
+/* $NetBSD: answer.c,v 1.16 2009/08/27 00:36:32 dholland Exp $ */
/*
* Copyright (c) 1983-2003, Regents of the University of California.
* All rights reserved.
@@ -32,7 +32,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: answer.c,v 1.15 2009/08/12 07:42:11 dholland Exp $");
+__RCSID("$NetBSD: answer.c,v 1.16 2009/08/27 00:36:32 dholland Exp $");
#endif /* not lint */
#include
@@ -65,7 +65,7 @@
static SOCKET sockstruct;
char *cp1, *cp2;
int flags;
- u_int32_t version;
+ uint32_t version;
int i;
#ifdef INTERNET
@@ -93,7 +93,7 @@
if (machine == 0)
machine = gethostid();
#endif
- version = htonl((u_int32_t) HUNT_VERSION);
+ version = htonl((uint32_t) HUNT_VERSION);
(void) write(newsock, &version, LONGLEN);
(void) read(newsock, &uid, LONGLEN);
uid = ntohl(uid);
Index: src/games/hunt/huntd/faketalk.c
diff -u src/games/hunt/huntd/faketalk.c:1.17 src/games/hunt/huntd/faketalk.c:1.18
--- src/games/hunt/huntd/faketalk.c:1.17 Sat Jul 4 07:51:35 2009
+++ src/games/hunt/huntd/faketalk.c Thu Aug 27 00:36:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: faketalk.c,v 1.17 2009/07/04 07:51:35 dholland Exp $ */
+/* $NetBSD: faketalk.c,v 1.18 2009/08/27 00:36:33 dholland Exp $ */
/*
* Copyright (c) 1983-2003, Regents of the University of California.
* All rights reserved.
@@ -32,7 +32,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: faketalk.c,v 1.17 2009/07/04 07:51:35 dholland Exp $");
+__RCSID("$NetBSD: faketalk.c,v 1.18 2009/08/27 00:36:33 dholland Exp $");
#endif /* not lint */
#include "bsd.h"
@@ -220,7 +220,7 @@
msg.ctl_addr = ctl_addr;
msg.ctl_addr.sin_family = htons(msg.ctl_addr.sin_family);
#endif
- msg.id_num = (int) htonl((u_int32_t) -1); /* an impossible id_num */
+ msg.id_num = (int) htonl((uint32_t) -1); /* an impossible id_num */
ctl_transact(his_machine_addr, msg, ANNOUNCE, &response);
if (response.answer != SUCCESS)
return;
CVS commit: src/games/fortune/fortune
Module Name:src
Committed By: dholland
Date: Thu Aug 27 00:40:44 UTC 2009
Modified Files:
src/games/fortune/fortune: fortune.c
Log Message:
remove unnecessary casts
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/games/fortune/fortune/fortune.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/fortune/fortune/fortune.c
diff -u src/games/fortune/fortune/fortune.c:1.52 src/games/fortune/fortune/fortune.c:1.53
--- src/games/fortune/fortune/fortune.c:1.52 Wed Aug 12 06:06:28 2009
+++ src/games/fortune/fortune/fortune.c Thu Aug 27 00:40:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fortune.c,v 1.52 2009/08/12 06:06:28 dholland Exp $ */
+/* $NetBSD: fortune.c,v 1.53 2009/08/27 00:40:44 dholland Exp $ */
/*-
* Copyright (c) 1986, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)fortune.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: fortune.c,v 1.52 2009/08/12 06:06:28 dholland Exp $");
+__RCSID("$NetBSD: fortune.c,v 1.53 2009/08/27 00:40:44 dholland Exp $");
#endif
#endif /* not lint */
@@ -514,7 +514,7 @@
tpath = NULL;
}
else {
- tpath = do_malloc((unsigned int) (strlen(dir) + strlen(file) + 2));
+ tpath = do_malloc(strlen(dir) + strlen(file) + 2);
(void) strcat(strcat(strcpy(tpath, dir), "/"), file);
path = tpath;
}
@@ -644,7 +644,7 @@
{
FILEDESC *fp;
- fp = (FILEDESC *) do_malloc(sizeof *fp);
+ fp = do_malloc(sizeof *fp);
fp->datfd = -1;
fp->pos = POS_UNKNOWN;
fp->inf = NULL;
@@ -1319,7 +1319,7 @@
Fort_len = maxlen_in_list(File_list);
DPRINTF(2, (stderr, "Maximum length is %d\n", Fort_len));
/* extra length, "%\n" is appended */
- Fortbuf = do_malloc((unsigned int) Fort_len + 10);
+ Fortbuf = do_malloc(Fort_len + 10);
Found_one = FALSE;
matches_in_list(File_list);
CVS commit: src/games/fortune/fortune
Module Name:src
Committed By: dholland
Date: Thu Aug 27 00:42:11 UTC 2009
Modified Files:
src/games/fortune/fortune: fortune.c
Log Message:
Use correct type for malloc sizes (size_t, not unsigned)
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/games/fortune/fortune/fortune.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/fortune/fortune/fortune.c
diff -u src/games/fortune/fortune/fortune.c:1.53 src/games/fortune/fortune/fortune.c:1.54
--- src/games/fortune/fortune/fortune.c:1.53 Thu Aug 27 00:40:44 2009
+++ src/games/fortune/fortune/fortune.c Thu Aug 27 00:42:11 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fortune.c,v 1.53 2009/08/27 00:40:44 dholland Exp $ */
+/* $NetBSD: fortune.c,v 1.54 2009/08/27 00:42:11 dholland Exp $ */
/*-
* Copyright (c) 1986, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)fortune.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: fortune.c,v 1.53 2009/08/27 00:40:44 dholland Exp $");
+__RCSID("$NetBSD: fortune.c,v 1.54 2009/08/27 00:42:11 dholland Exp $");
#endif
#endif /* not lint */
@@ -130,11 +130,11 @@
static int add_file(int,
const char *, const char *, FILEDESC **, FILEDESC **, FILEDESC *);
static void all_forts(FILEDESC *, const char *);
-static char *copy(const char *, u_int);
+static char *copy(const char *, size_t);
static void rot13(char *line, int len);
static void display(FILEDESC *);
static void do_free(void *);
-static void *do_malloc(u_int);
+static void *do_malloc(size_t);
static int form_file_list(char **, int);
static int fortlen(void);
static void get_fort(void);
@@ -879,7 +879,7 @@
static char *
copy(str, len)
const char *str;
- unsigned int len;
+ size_t len;
{
char *new, *sp;
@@ -896,8 +896,7 @@
* Do a malloc, checking for NULL return.
*/
static void *
-do_malloc(size)
- unsigned int size;
+do_malloc(size_t size)
{
void *new;
CVS commit: src/games/fortune/fortune
Module Name:src
Committed By: dholland
Date: Thu Aug 27 00:43:31 UTC 2009
Modified Files:
src/games/fortune/fortune: fortune.c
Log Message:
remove more unnecessary casts
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/games/fortune/fortune/fortune.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/fortune/fortune/fortune.c
diff -u src/games/fortune/fortune/fortune.c:1.54 src/games/fortune/fortune/fortune.c:1.55
--- src/games/fortune/fortune/fortune.c:1.54 Thu Aug 27 00:42:11 2009
+++ src/games/fortune/fortune/fortune.c Thu Aug 27 00:43:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fortune.c,v 1.54 2009/08/27 00:42:11 dholland Exp $ */
+/* $NetBSD: fortune.c,v 1.55 2009/08/27 00:43:31 dholland Exp $ */
/*-
* Copyright (c) 1986, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)fortune.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: fortune.c,v 1.54 2009/08/27 00:42:11 dholland Exp $");
+__RCSID("$NetBSD: fortune.c,v 1.55 2009/08/27 00:43:31 dholland Exp $");
#endif
#endif /* not lint */
@@ -670,7 +670,7 @@
{
char *new;
- new = copy(file, (unsigned int) (strlen(file) + 2));
+ new = copy(file, strlen(file) + 2);
return strcat(new, "-o");
}
@@ -851,7 +851,7 @@
}
}
- datfile = copy(file, (unsigned int) (strlen(file) + 4)); /* +4 for ".dat" */
+ datfile = copy(file, strlen(file) + 4); /* +4 for ".dat" */
strcat(datfile, ".dat");
if (access(datfile, R_OK) < 0) {
free(datfile);
@@ -864,7 +864,7 @@
free(datfile);
#ifdef OK_TO_WRITE_DISK
if (posp != NULL) {
- *posp = copy(file, (unsigned int) (strlen(file) + 4)); /* +4 for ".dat" */
+ *posp = copy(file, strlen(file) + 4); /* +4 for ".dat" */
(void) strcat(*posp, ".pos");
}
#endif /* OK_TO_WRITE_DISK */
CVS commit: src/games/fortune/fortune
Module Name:src
Committed By: dholland
Date: Thu Aug 27 01:19:38 UTC 2009
Modified Files:
src/games/fortune/fortune: fortune.c
Log Message:
Sprinkle some size_t in places where it's better than int.
(Reduces casts.)
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/games/fortune/fortune/fortune.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/fortune/fortune/fortune.c
diff -u src/games/fortune/fortune/fortune.c:1.55 src/games/fortune/fortune/fortune.c:1.56
--- src/games/fortune/fortune/fortune.c:1.55 Thu Aug 27 00:43:31 2009
+++ src/games/fortune/fortune/fortune.c Thu Aug 27 01:19:38 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fortune.c,v 1.55 2009/08/27 00:43:31 dholland Exp $ */
+/* $NetBSD: fortune.c,v 1.56 2009/08/27 01:19:38 dholland Exp $ */
/*-
* Copyright (c) 1986, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)fortune.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: fortune.c,v 1.55 2009/08/27 00:43:31 dholland Exp $");
+__RCSID("$NetBSD: fortune.c,v 1.56 2009/08/27 01:19:38 dholland Exp $");
#endif
#endif /* not lint */
@@ -116,7 +116,7 @@
static char *Fortbuf = NULL; /* fortune buffer for -m */
-static int Fort_len = 0;
+static size_t Fort_len = 0;
static off_t Seekpts[2]; /* seek pointers to fortunes */
@@ -136,7 +136,7 @@
static void do_free(void *);
static void *do_malloc(size_t);
static int form_file_list(char **, int);
-static int fortlen(void);
+static size_t fortlen(void);
static void get_fort(void);
static void get_pos(FILEDESC *);
static void get_tbl(FILEDESC *);
@@ -164,7 +164,7 @@
static char *conv_pat(char *);
static int find_matches(void);
static void matches_in_list(FILEDESC *);
-static int maxlen_in_list(FILEDESC *);
+static size_t maxlen_in_list(FILEDESC *);
#endif
#ifndef NO_REGEX
@@ -265,7 +265,7 @@
if (Wait) {
if (Fort_len == 0)
(void) fortlen();
- sleep((unsigned int) max(Fort_len / CPERS, MINW));
+ sleep(max(Fort_len / CPERS, MINW));
}
return(0);
}
@@ -308,10 +308,10 @@
* fortlen:
* Return the length of the fortune.
*/
-static int
+static size_t
fortlen()
{
- int nchar;
+ size_t nchar;
char line[BUFSIZ];
if (!(Fortfile->tbl.str_flags & (STR_RANDOM | STR_ORDERED)))
@@ -1330,12 +1330,12 @@
* maxlen_in_list
* Return the maximum fortune len in the file list.
*/
-static int
+static size_t
maxlen_in_list(list)
FILEDESC *list;
{
FILEDESC *fp;
- int len, maxlen;
+ size_t len, maxlen;
maxlen = 0;
for (fp = list; fp != NULL; fp = fp->next) {
@@ -1345,7 +1345,7 @@
}
else {
get_tbl(fp);
- if (fp->tbl.str_longlen > (u_int32_t)maxlen)
+ if (fp->tbl.str_longlen > maxlen)
maxlen = fp->tbl.str_longlen;
}
}
CVS commit: src/games/fortune/fortune
Module Name:src
Committed By: dholland
Date: Thu Aug 27 01:40:27 UTC 2009
Modified Files:
src/games/fortune/fortune: fortune.c
Log Message:
ANSIfy function definitions.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/games/fortune/fortune/fortune.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/fortune/fortune/fortune.c
diff -u src/games/fortune/fortune/fortune.c:1.56 src/games/fortune/fortune/fortune.c:1.57
--- src/games/fortune/fortune/fortune.c:1.56 Thu Aug 27 01:19:38 2009
+++ src/games/fortune/fortune/fortune.c Thu Aug 27 01:40:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fortune.c,v 1.56 2009/08/27 01:19:38 dholland Exp $ */
+/* $NetBSD: fortune.c,v 1.57 2009/08/27 01:40:27 dholland Exp $ */
/*-
* Copyright (c) 1986, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)fortune.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: fortune.c,v 1.56 2009/08/27 01:19:38 dholland Exp $");
+__RCSID("$NetBSD: fortune.c,v 1.57 2009/08/27 01:40:27 dholland Exp $");
#endif
#endif /* not lint */
@@ -214,9 +214,7 @@
#endif
int
-main(ac, av)
- int ac;
- char *av[];
+main(int ac, char *av[])
{
struct timeval tv;
#ifdef OK_TO_WRITE_DISK
@@ -271,9 +269,7 @@
}
static void
-rot13(line, len)
- char *line;
- int len;
+rot13(char *line, int len)
{
char *p, ch;
@@ -288,8 +284,7 @@
}
static void
-display(fp)
- FILEDESC *fp;
+display(FILEDESC *fp)
{
char line[BUFSIZ];
@@ -309,7 +304,7 @@
* Return the length of the fortune.
*/
static size_t
-fortlen()
+fortlen(void)
{
size_t nchar;
char line[BUFSIZ];
@@ -332,9 +327,7 @@
* This routine evaluates the arguments on the command line
*/
static void
-getargs(argc, argv)
- int argc;
- char **argv;
+getargs(int argc, char **argv)
{
int ignore_case;
# ifndef NO_REGEX
@@ -435,9 +428,7 @@
* Form the file list from the file specifications.
*/
static int
-form_file_list(files, file_cnt)
- char **files;
- int file_cnt;
+form_file_list(char **files, int file_cnt)
{
int i, percent;
const char *sp;
@@ -496,12 +487,8 @@
* Add a file to the file list.
*/
static int
-add_file(percent, file, dir, head, tail, parent)
- int percent;
- const char *file;
- const char *dir;
- FILEDESC **head, **tail;
- FILEDESC *parent;
+add_file(int percent, const char *file, const char *dir,
+ FILEDESC **head, FILEDESC **tail, FILEDESC *parent)
{
FILEDESC *fp;
int fd;
@@ -640,7 +627,7 @@
* Return a pointer to an initialized new FILEDESC.
*/
static FILEDESC *
-new_fp()
+new_fp(void)
{
FILEDESC *fp;
@@ -665,8 +652,7 @@
* Return a pointer to the offensive version of a file of this name.
*/
static char *
-off_name(file)
- const char *file;
+off_name(const char *file)
{
char *new;
@@ -679,8 +665,7 @@
* Is the file an offensive-style name?
*/
static int
-is_off_name(file)
- const char *file;
+is_off_name(const char *file)
{
int len;
@@ -694,9 +679,7 @@
* there are two children to be a parent of.
*/
static void
-all_forts(fp, offensive)
- FILEDESC *fp;
- const char *offensive;
+all_forts(FILEDESC *fp, const char *offensive)
{
char *sp;
FILEDESC *scene, *obscene;
@@ -746,8 +729,7 @@
* Add the contents of an entire directory.
*/
static int
-add_dir(fp)
- FILEDESC *fp;
+add_dir(FILEDESC *fp)
{
DIR *dir;
struct dirent *dirent;
@@ -784,8 +766,7 @@
* Return TRUE if the file is a directory, FALSE otherwise.
*/
static int
-is_dir(file)
- const char *file;
+is_dir(const char *file)
{
struct stat sbuf;
@@ -803,14 +784,7 @@
*/
/* ARGSUSED */
static int
-is_fortfile(file, datp, posp, check_for_offend)
- const char *file;
- char **datp, **posp
-# ifndef OK_TO_WRITE_DISK
- __unused
-# endif
- ;
- int check_for_offend;
+is_fortfile(const char *file, char **datp, char **posp, int check_for_offend)
{
int i;
const char *sp;
@@ -867,6 +841,10 @@
*posp = copy(file, strlen(file) + 4); /* +4 for ".dat" */
(void) strcat(*posp, ".pos");
}
+#else
+ if (posp != NULL) {
+ /* *posp = NULL; -- not quite yet */
+ }
#endif /* OK_TO_WRITE_DISK */
DPRINTF(2, (stderr, "TRUE\n"));
return TRUE;
@@ -877,9 +855,7 @@
* Return a malloc()'ed copy of the string
*/
static char *
-copy(str, len)
- const char *str;
- size_t len;
+copy(const char *str, size_t len)
{
char *new, *sp;
@@ -910,8 +886,7 @@
* Free malloc'ed space, if any.
*/
static void
-do_free(ptr)
- void *ptr;
+do_free(void *ptr)
{
if (ptr != NULL)
free(ptr);
@@ -922,7 +897,7 @@
* Initialize the fortune probabilities.
*/
static void
-init_prob()
+init_prob(void)
{
FILEDESC *fp, *last;
int percent, num_noprob, frac;
@@ -985,7 +960,7 @@
* Get the fortune data file's seek pointer for the next fortune.
*/
static void
-get_fort()
+get_fort(void)
{
FILEDESC *fp;
int choice;
@@ -1048,8 +1023,7 @@
* Pick a child from a chosen parent.
*/
static FILEDESC *
-pick_ch
CVS commit: src/games/fortune/fortune
Module Name:src
Committed By: dholland
Date: Thu Aug 27 01:42:08 UTC 2009
Modified Files:
src/games/fortune/fortune: fortune.c
Log Message:
Prevent nasal demons in a case I spotted while preparing the previous.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/games/fortune/fortune/fortune.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/fortune/fortune/fortune.c
diff -u src/games/fortune/fortune/fortune.c:1.57 src/games/fortune/fortune/fortune.c:1.58
--- src/games/fortune/fortune/fortune.c:1.57 Thu Aug 27 01:40:27 2009
+++ src/games/fortune/fortune/fortune.c Thu Aug 27 01:42:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fortune.c,v 1.57 2009/08/27 01:40:27 dholland Exp $ */
+/* $NetBSD: fortune.c,v 1.58 2009/08/27 01:42:08 dholland Exp $ */
/*-
* Copyright (c) 1986, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)fortune.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: fortune.c,v 1.57 2009/08/27 01:40:27 dholland Exp $");
+__RCSID("$NetBSD: fortune.c,v 1.58 2009/08/27 01:42:08 dholland Exp $");
#endif
#endif /* not lint */
@@ -843,7 +843,7 @@
}
#else
if (posp != NULL) {
- /* *posp = NULL; -- not quite yet */
+ *posp = NULL;
}
#endif /* OK_TO_WRITE_DISK */
DPRINTF(2, (stderr, "TRUE\n"));
CVS commit: src/games/fortune/fortune
Module Name:src
Committed By: dholland
Date: Thu Aug 27 02:03:22 UTC 2009
Modified Files:
src/games/fortune/fortune: fortune.c
Log Message:
Whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/games/fortune/fortune/fortune.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/fortune/fortune/fortune.c
diff -u src/games/fortune/fortune/fortune.c:1.58 src/games/fortune/fortune/fortune.c:1.59
--- src/games/fortune/fortune/fortune.c:1.58 Thu Aug 27 01:42:08 2009
+++ src/games/fortune/fortune/fortune.c Thu Aug 27 02:03:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fortune.c,v 1.58 2009/08/27 01:42:08 dholland Exp $ */
+/* $NetBSD: fortune.c,v 1.59 2009/08/27 02:03:22 dholland Exp $ */
/*-
* Copyright (c) 1986, 1993
@@ -42,46 +42,46 @@
#if 0
static char sccsid[] = "@(#)fortune.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: fortune.c,v 1.58 2009/08/27 01:42:08 dholland Exp $");
+__RCSID("$NetBSD: fortune.c,v 1.59 2009/08/27 02:03:22 dholland Exp $");
#endif
#endif /* not lint */
-# include
-# include
-# include
-# include
-
-# include
-# include
-# include
-# include
-# include
-# include
-# include
-# include
-# include
-# include
-# include "strfile.h"
-# include "pathnames.h"
-
-# define TRUE 1
-# define FALSE 0
-# define bool short
-
-# define MINW 6 /* minimum wait if desired */
-# define CPERS 20 /* # of chars for each sec */
-# define SLEN 160 /* # of chars in short fortune */
-
-# define POS_UNKNOWN ((off_t) -1) /* pos for file unknown */
-# define NO_PROB (-1) /* no prob specified for file */
-
-# ifdef DEBUG
-# define DPRINTF(l,x) if (Debug >= l) fprintf x; else
-# undef NDEBUG
-# else
-# define DPRINTF(l,x)
-# define NDEBUG 1
-# endif
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include "strfile.h"
+#include "pathnames.h"
+
+#define TRUE 1
+#define FALSE 0
+#define bool short
+
+#define MINW 6 /* minimum wait if desired */
+#define CPERS 20 /* # of chars for each sec */
+#define SLEN 160 /* # of chars in short fortune */
+
+#define POS_UNKNOWN ((off_t) -1) /* pos for file unknown */
+#define NO_PROB (-1) /* no prob specified for file */
+
+#ifdef DEBUG
+#define DPRINTF(l,x) if (Debug >= l) fprintf x; else
+#undef NDEBUG
+#else
+#define DPRINTF(l,x)
+#define NDEBUG 1
+#endif
typedef struct fd {
int percent;
@@ -160,7 +160,7 @@
int main(int, char *[]);
-#ifndef NO_REGEX
+#ifndef NO_REGEX
static char *conv_pat(char *);
static int find_matches(void);
static void matches_in_list(FILEDESC *);
@@ -217,9 +217,9 @@
main(int ac, char *av[])
{
struct timeval tv;
-#ifdef OK_TO_WRITE_DISK
- int fd;
-#endif /* OK_TO_WRITE_DISK */
+#ifdef OK_TO_WRITE_DISK
+ int fd;
+#endif /* OK_TO_WRITE_DISK */
getargs(ac, av);
@@ -242,24 +242,24 @@
display(Fortfile);
-#ifdef OK_TO_WRITE_DISK
+#ifdef OK_TO_WRITE_DISK
if ((fd = creat(Fortfile->posfile, 0666)) < 0)
err(1, "Can't create `%s'", Fortfile->posfile);
-#ifdef LOCK_EX
+#ifdef LOCK_EX
/*
* if we can, we exclusive lock, but since it isn't very
* important, we just punt if we don't have easy locking
* available.
*/
(void) flock(fd, LOCK_EX);
-#endif /* LOCK_EX */
+#endif /* LOCK_EX */
write(fd, (char *) &Fortfile->pos, sizeof Fortfile->pos);
if (!Fortfile->was_pos_file)
(void) chmod(Fortfile->path, 0666);
-#ifdef LOCK_EX
+#ifdef LOCK_EX
(void) flock(fd, LOCK_UN);
-#endif /* LOCK_EX */
-#endif /* OK_TO_WRITE_DISK */
+#endif /* LOCK_EX */
+#endif /* OK_TO_WRITE_DISK */
if (Wait) {
if (Fort_len == 0)
(void) fortlen();
@@ -271,7 +271,7 @@
static void
rot13(char *line, int len)
{
- char *p, ch;
+ char *p, ch;
if (len == 0)
len = strlen(line);
@@ -286,7 +286,7 @@
static void
display(FILEDESC *fp)
{
- char line[BUFSIZ];
+ char line[BUFSIZ];
open_fp(fp);
(void) fseek(fp->inf, (long)Seekpts[0], SEEK_SET);
@@ -306,8 +306,8 @@
static size_t
fortlen(void)
{
- size_t nchar;
- char line[BUFSIZ];
+ size_t nchar;
+ char line[BUFSIZ];
if (!(Fortfile->tbl.str_flags & (STR_RANDOM | STR_ORDERED)))
nchar = Seekpts[1] - Seekpts[0];
@@ -329,15 +329,15 @@
static void
getargs(int argc, char **argv)
{
- int ignore_case;
-# ifndef NO_REGEX
- char *pat = NULL;
-# endif /* NO_REGEX */
+ int ignore_case;
+#ifndef NO_REGEX
+ char *pat = NULL;
+#endif /* NO_REGEX */
int ch;
ignore_case = FALSE;
-# ifdef DEBUG
+#ifdef DEBUG
while ((ch = getopt(argc, argv, "aDefilm:osw")) != -1)
#else
while ((ch = getopt(argc, argv, "aefilm:osw")) != -1)
@@ -346,11 +346,11 @@
case 'a': /* any fortune */
All_forts++;
break;
-# ifdef DEBUG
+#ifdef DEBUG
case 'D':
Debug++;
break;
-# endif /* DEBUG */
+#endif /* DEBUG */
case 'e':
Equal_probs++; /* scatter un-allocted prob equally */
break;
@@ -37
CVS commit: src/games/fortune/fortune
Module Name:src
Committed By: dholland
Date: Thu Aug 27 02:21:36 UTC 2009
Modified Files:
src/games/fortune/fortune: fortune.c
Log Message:
Prune conditional compilation for using obsolete regexp libraries.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/games/fortune/fortune/fortune.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/fortune/fortune/fortune.c
diff -u src/games/fortune/fortune/fortune.c:1.59 src/games/fortune/fortune/fortune.c:1.60
--- src/games/fortune/fortune/fortune.c:1.59 Thu Aug 27 02:03:22 2009
+++ src/games/fortune/fortune/fortune.c Thu Aug 27 02:21:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fortune.c,v 1.59 2009/08/27 02:03:22 dholland Exp $ */
+/* $NetBSD: fortune.c,v 1.60 2009/08/27 02:21:36 dholland Exp $ */
/*-
* Copyright (c) 1986, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)fortune.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: fortune.c,v 1.59 2009/08/27 02:03:22 dholland Exp $");
+__RCSID("$NetBSD: fortune.c,v 1.60 2009/08/27 02:21:36 dholland Exp $");
#endif
#endif /* not lint */
@@ -61,6 +61,11 @@
#include
#include
#include
+
+#ifndef NO_REGEX
+#include
+#endif
+
#include "strfile.h"
#include "pathnames.h"
@@ -107,9 +112,16 @@
static bool Offend = FALSE; /* offensive fortunes only */
static bool All_forts = FALSE; /* any fortune allowed */
static bool Equal_probs = FALSE; /* scatter un-allocted prob equally */
+
#ifndef NO_REGEX
static bool Match = FALSE; /* dump fortunes matching a pattern */
+static regex_t *Re_pat = NULL;
+static regex_t *Re_pat13 = NULL;
+static regex_t *Re_use = NULL;
+static int Re_code;
+static char Re_error[1024];
#endif
+
#ifdef DEBUG
static bool Debug = FALSE; /* print debug messages */
#endif
@@ -161,52 +173,22 @@
int main(int, char *[]);
#ifndef NO_REGEX
+
static char *conv_pat(char *);
static int find_matches(void);
static void matches_in_list(FILEDESC *);
static size_t maxlen_in_list(FILEDESC *);
-#endif
-#ifndef NO_REGEX
-# if HAVE_REGCMP
-# define RE_INIT(re)
-# define RE_COMP(re, p) ((re) = regcmp((p), NULL))
-# define RE_ERROR(re) "Invalid pattern"
-# define RE_OK(re) ((re) != NULL)
-# define RE_EXEC(re, p) regex((re), (p))
-# define RE_FREE(re)
-
-char *Re_pat, *Re_pat13, *Re_use;
-char *regcmp(), *regex();
-
-# elif HAVE_RE_COMP
-char *Re_pat, *Re_pat13, *Re_use;
-char *Re_error;
-
-# define RE_INIT(re)
-# define RE_COMP(re, p) (Re_error = re_comp(p))
-# define RE_ERROR(re) Re_error
-# define RE_OK(re) (Re_error == NULL)
-# define RE_EXEC(re, p) re_exec(p)
-# define RE_FREE(re)
-# elif HAVE_REGCOMP
-# include
-static regex_t *Re_pat = NULL, *Re_pat13 = NULL, *Re_use = NULL;
-static int Re_code;
-static char Re_error[1024];
-# define RE_INIT(re) if ((re) == NULL && \
-((re) = calloc(sizeof(*(re)), 1)) \
-== NULL) err(1, NULL)
-# define RE_COMP(re, p) (Re_code = regcomp((re), (p), REG_EXTENDED))
-# define RE_OK(re) (Re_code == 0)
-# define RE_EXEC(re, p) (!regexec((re), (p), 0, NULL, 0))
-# define RE_ERROR(re) (regerror(Re_code, (re), Re_error, \
-sizeof(Re_error)), Re_error)
-# define RE_FREE(re) if ((re) != NULL) do { regfree((re)); \
+#define RE_INIT(re) if ((re) == NULL && \
+ ((re) = calloc(sizeof(*(re)), 1)) \
+ == NULL) err(1, NULL)
+#define RE_COMP(re, p) (Re_code = regcomp((re), (p), REG_EXTENDED))
+#define RE_OK(re) (Re_code == 0)
+#define RE_EXEC(re, p) (!regexec((re), (p), 0, NULL, 0))
+#define RE_ERROR(re) (regerror(Re_code, (re), Re_error, \
+ sizeof(Re_error)), Re_error)
+#define RE_FREE(re) if ((re) != NULL) do { regfree((re)); \
(re) = NULL; } while (0)
-# else
- #error "Need to define HAVE_REGCMP, HAVE_RE_COMP, or HAVE_REGCOMP"
-# endif
#endif
#ifndef NAMLEN
CVS commit: xsrc/external/mit/xf86-video-suntcx/dist/src
Module Name:xsrc
Committed By: macallan
Date: Thu Aug 27 02:41:53 UTC 2009
Modified Files:
xsrc/external/mit/xf86-video-suntcx/dist/src: tcx.h tcx_accel.c
tcx_driver.c
Log Message:
Support acceleration on 8bit TCX. This is untested for lack of hardware.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h \
xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_driver.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h
diff -u xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h:1.2 xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h:1.3
--- xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h:1.2 Wed Aug 26 22:24:34 2009
+++ xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h Thu Aug 27 02:41:53 2009
@@ -66,7 +66,7 @@
unsigned char *CursorData;
OptionInfoPtr Options;
ExaDriverPtr pExa;
- int xdir, ydir, srcoff, srcpitch, fg;
+ int xdir, ydir, srcoff, srcpitch, fg, pitchshift;
} TcxRec, *TcxPtr;
Bool TcxInitAccel(ScreenPtr);
Index: xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_driver.c
diff -u xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_driver.c:1.2 xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_driver.c:1.3
--- xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_driver.c:1.2 Wed Aug 26 22:24:34 2009
+++ xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_driver.c Thu Aug 27 02:41:53 2009
@@ -506,14 +506,16 @@
pTcx = GET_TCX_FROM_SCRN(pScrn);
/* Map the TCX memory */
-if (pScrn->depth == 8)
+if (pScrn->depth == 8) {
pTcx->fb =
xf86MapSbusMem (pTcx->psdp, TCX_RAM8_VOFF, 1024 * 1024);
-else {
+ pTcx->pitchshift = 0;
+} else {
pTcx->fb =
xf86MapSbusMem (pTcx->psdp, TCX_RAM24_VOFF, 1024 * 1024 * 4);
pTcx->cplane =
xf86MapSbusMem (pTcx->psdp, TCX_CPLANE_VOFF, 1024 * 1024 * 4);
+ pTcx->pitchshift = 2;
if (! pTcx->cplane)
return FALSE;
}
Index: xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c
diff -u xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c:1.1 xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c:1.2
--- xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c:1.1 Wed Aug 26 22:24:34 2009
+++ xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c Thu Aug 27 02:41:53 2009
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-/* $NetBSD: tcx_accel.c,v 1.1 2009/08/26 22:24:34 macallan Exp $ */
+/* $NetBSD: tcx_accel.c,v 1.2 2009/08/27 02:41:53 macallan Exp $ */
#include
@@ -75,8 +75,8 @@
pTcx->xdir = xdir;
pTcx->ydir = ydir;
-pTcx->srcoff = exaGetPixmapOffset(pSrcPixmap) >> 2;
-pTcx->srcpitch = exaGetPixmapPitch(pSrcPixmap) >> 2;
+pTcx->srcoff = exaGetPixmapOffset(pSrcPixmap) >> pTcx->pitchshift;
+pTcx->srcpitch = exaGetPixmapPitch(pSrcPixmap) >> pTcx->pitchshift;
LEAVE;
return TRUE;
}
@@ -105,8 +105,8 @@
lcmd = 0x3000LL | (leftover - 1) << 24;
-doff = exaGetPixmapOffset(pDstPixmap) >> 2;
-dpitch = exaGetPixmapPitch(pDstPixmap) >> 2;
+doff = exaGetPixmapOffset(pDstPixmap) >> pTcx->pitchshift;
+dpitch = exaGetPixmapPitch(pDstPixmap) >> pTcx->pitchshift;
src = srcX + srcY * pTcx->srcpitch + pTcx->srcoff;
dst = dstX + dstY * dpitch + doff;
@@ -187,7 +187,7 @@
return FALSE;
if (exaGetPixmapOffset(pPixmap) != 0)
return FALSE;
-pTcx->fg = (fg & 0x00ff) | 0x3300;
+pTcx->fg = (fg & 0x00ff) | pTcx->pitchshift ? 0x3300 : 0x3000;
#ifdef DEBUG
xf86Msg(X_ERROR, "fg: %08x\n", fg);
#endif
@@ -209,7 +209,7 @@
uint64_t cmd, rcmd, lcmd, tmpl;
uint32_t pmask;
-dpitch = exaGetPixmapPitch(pPixmap) >> 2;
+dpitch = exaGetPixmapPitch(pPixmap) >> pTcx->pitchshift;
dst = x1 + y1 * dpitch;
tmpl = ((uint64_t)pTcx->fg) << 32;
@@ -331,6 +331,12 @@
pExa->exa_major = EXA_VERSION_MAJOR;
pExa->exa_minor = EXA_VERSION_MINOR;
+/*
+ * The S24 can display both 8 and 24bit data at the same time, and in
+ * 24bit we can choose between gamma corrected ad direct. No idea how that
+ * would map to EXA - we'd have to pick the right framebuffer to draw into
+ * and Solid() would need to know what kind of pixels to write
+ */
pExa->memoryBase = pTcx->fb;
if (pScrn->depth == 8) {
pExa->memorySize = 1024 * 1024;
CVS commit: src/games/fortune/fortune
Module Name:src
Committed By: dholland
Date: Thu Aug 27 03:04:58 UTC 2009
Modified Files:
src/games/fortune/fortune: fortune.c
Log Message:
Tidy up regexp handling further.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/games/fortune/fortune/fortune.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/fortune/fortune/fortune.c
diff -u src/games/fortune/fortune/fortune.c:1.60 src/games/fortune/fortune/fortune.c:1.61
--- src/games/fortune/fortune/fortune.c:1.60 Thu Aug 27 02:21:36 2009
+++ src/games/fortune/fortune/fortune.c Thu Aug 27 03:04:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fortune.c,v 1.60 2009/08/27 02:21:36 dholland Exp $ */
+/* $NetBSD: fortune.c,v 1.61 2009/08/27 03:04:58 dholland Exp $ */
/*-
* Copyright (c) 1986, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)fortune.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: fortune.c,v 1.60 2009/08/27 02:21:36 dholland Exp $");
+__RCSID("$NetBSD: fortune.c,v 1.61 2009/08/27 03:04:58 dholland Exp $");
#endif
#endif /* not lint */
@@ -114,12 +114,15 @@
static bool Equal_probs = FALSE; /* scatter un-allocted prob equally */
#ifndef NO_REGEX
+struct re {
+ bool valid;
+ regex_t regex;
+};
+
static bool Match = FALSE; /* dump fortunes matching a pattern */
-static regex_t *Re_pat = NULL;
-static regex_t *Re_pat13 = NULL;
-static regex_t *Re_use = NULL;
-static int Re_code;
-static char Re_error[1024];
+struct re Re_pat;
+struct re Re_pat13;
+static struct re *Re_use = NULL;
#endif
#ifdef DEBUG
@@ -173,22 +176,12 @@
int main(int, char *[]);
#ifndef NO_REGEX
-
+static void re_setup(struct re *rx, const char *pattern);
+static void re_cleanup(struct re *rx);
static char *conv_pat(char *);
static int find_matches(void);
static void matches_in_list(FILEDESC *);
static size_t maxlen_in_list(FILEDESC *);
-
-#define RE_INIT(re) if ((re) == NULL && \
- ((re) = calloc(sizeof(*(re)), 1)) \
- == NULL) err(1, NULL)
-#define RE_COMP(re, p) (Re_code = regcomp((re), (p), REG_EXTENDED))
-#define RE_OK(re) (Re_code == 0)
-#define RE_EXEC(re, p) (!regexec((re), (p), 0, NULL, 0))
-#define RE_ERROR(re) (regerror(Re_code, (re), Re_error, \
- sizeof(Re_error)), Re_error)
-#define RE_FREE(re) if ((re) != NULL) do { regfree((re)); \
-(re) = NULL; } while (0)
#endif
#ifndef NAMLEN
@@ -388,19 +381,9 @@
if (pat != NULL) {
if (ignore_case)
pat = conv_pat(pat);
- RE_INIT(Re_pat);
- RE_COMP(Re_pat, pat);
- if (!RE_OK(Re_pat)) {
- warnx("%s: `%s'", RE_ERROR(Re_pat), pat);
- RE_FREE(Re_pat);
- }
+ re_setup(&Re_pat, pat);
rot13(pat, 0);
- RE_INIT(Re_pat13);
- RE_COMP(Re_pat13, pat);
- if (!RE_OK(Re_pat13)) {
- warnx("%s: `%s'", RE_ERROR(Re_pat13), pat);
- RE_FREE(Re_pat13);
- }
+ re_setup(&Re_pat13, pat);
}
#endif /* NO_REGEX */
}
@@ -1215,6 +1198,48 @@
}
#ifndef NO_REGEX
+
+/*
+ * re_setup:
+ * Initialize regular expression pattern.
+ */
+static void
+re_setup(struct re *rx, const char *pattern)
+{
+ int code;
+ char errbuf[1024];
+
+ assert(!rx->valid);
+ code = regcomp(&rx->regex, pattern, REG_EXTENDED);
+
+ if (code != 0) {
+ regerror(code, &rx->regex, errbuf, sizeof(errbuf));
+ warnx("%s: `%s'", errbuf, pattern);
+ regfree(&rx->regex);
+ rx->valid = FALSE;
+ }
+ rx->valid = TRUE;
+}
+
+/*
+ * re_cleanup:
+ * Undo re_setup.
+ */
+static void
+re_cleanup(struct re *rx)
+{
+ if (rx->valid) {
+ regfree(&rx->regex);
+ rx->valid = FALSE;
+ }
+}
+
+static bool
+re_match(struct re *rx, const char *string)
+{
+ return regexec(&rx->regex, string, 0, NULL, 0) == 0;
+}
+
/*
* conv_pat:
* Convert the pattern to an ignore-case equivalent.
@@ -1309,7 +1334,7 @@
FILEDESC *fp;
int in_file;
- if (!RE_OK(Re_pat) || !RE_OK(Re_pat13))
+ if (!Re_pat.valid || !Re_pat13.valid)
return;
for (fp = list; fp != NULL; fp = fp->next) {
@@ -1327,10 +1352,10 @@
else {
*sp = '\0';
if (fp->tbl.str_flags & STR_ROTATED)
- Re_use = Re_pat13;
+ Re_use = &Re_pat13;
else
- Re_use = Re_pat;
-if (RE_EXEC(Re_use, Fortbuf)) {
+ Re_use = &Re_pat;
+if (re_match(Re_use, Fortbuf)) {
printf("%c%c", fp->tbl.str_delim,
fp->tbl.str_delim);
if (!in_file) {
@@ -1346,8 +1371,8 @@
sp = Fortbuf;
}
}
- RE_FREE(Re_pat);
- RE_FREE(Re_pat13);
+ re_cleanup(&Re_pat);
+ re_cleanup(&Re_pat13);
}
#endif /* NO_REGEX */
CVS commit: src/games/fortune/fortune
Module Name:src
Committed By: dholland
Date: Thu Aug 27 03:09:17 UTC 2009
Modified Files:
src/games/fortune/fortune: fortune.c
Log Message:
Instead of trying to cons up a regexp that ignores case, use REG_ICASE.
This makes fortune -im work; it's been broken since whenever.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/games/fortune/fortune/fortune.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/fortune/fortune/fortune.c
diff -u src/games/fortune/fortune/fortune.c:1.61 src/games/fortune/fortune/fortune.c:1.62
--- src/games/fortune/fortune/fortune.c:1.61 Thu Aug 27 03:04:58 2009
+++ src/games/fortune/fortune/fortune.c Thu Aug 27 03:09:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fortune.c,v 1.61 2009/08/27 03:04:58 dholland Exp $ */
+/* $NetBSD: fortune.c,v 1.62 2009/08/27 03:09:17 dholland Exp $ */
/*-
* Copyright (c) 1986, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)fortune.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: fortune.c,v 1.61 2009/08/27 03:04:58 dholland Exp $");
+__RCSID("$NetBSD: fortune.c,v 1.62 2009/08/27 03:09:17 dholland Exp $");
#endif
#endif /* not lint */
@@ -176,9 +176,8 @@
int main(int, char *[]);
#ifndef NO_REGEX
-static void re_setup(struct re *rx, const char *pattern);
+static void re_setup(struct re *rx, const char *pattern, bool ignore_case);
static void re_cleanup(struct re *rx);
-static char *conv_pat(char *);
static int find_matches(void);
static void matches_in_list(FILEDESC *);
static size_t maxlen_in_list(FILEDESC *);
@@ -379,11 +378,9 @@
#ifndef NO_REGEX
if (pat != NULL) {
- if (ignore_case)
- pat = conv_pat(pat);
- re_setup(&Re_pat, pat);
+ re_setup(&Re_pat, pat, ignore_case);
rot13(pat, 0);
- re_setup(&Re_pat13, pat);
+ re_setup(&Re_pat13, pat, ignore_case);
}
#endif /* NO_REGEX */
}
@@ -1204,13 +1201,18 @@
* Initialize regular expression pattern.
*/
static void
-re_setup(struct re *rx, const char *pattern)
+re_setup(struct re *rx, const char *pattern, bool ignore_case)
{
- int code;
+ int code, flags;
char errbuf[1024];
assert(!rx->valid);
- code = regcomp(&rx->regex, pattern, REG_EXTENDED);
+
+ flags = REG_EXTENDED | REG_NOSUB;
+ if (ignore_case) {
+ flags |= REG_ICASE;
+ }
+ code = regcomp(&rx->regex, pattern, flags);
if (code != 0) {
regerror(code, &rx->regex, errbuf, sizeof(errbuf));
@@ -1241,46 +1243,6 @@
}
/*
- * conv_pat:
- * Convert the pattern to an ignore-case equivalent.
- */
-static char *
-conv_pat(char *orig)
-{
- char *sp;
- unsigned int cnt;
- char *new;
-
- cnt = 1; /* allow for '\0' */
- for (sp = orig; *sp != '\0'; sp++)
- if (isalpha((unsigned char)*sp))
- cnt += 4;
- else
- cnt++;
- if ((new = malloc(cnt)) == NULL)
- err(1, NULL);
-
- for (sp = new; *orig != '\0'; orig++) {
- if (islower((unsigned char)*orig)) {
- *sp++ = '[';
- *sp++ = *orig;
- *sp++ = toupper((unsigned char)*orig);
- *sp++ = ']';
- }
- else if (isupper((unsigned char)*orig)) {
- *sp++ = '[';
- *sp++ = *orig;
- *sp++ = tolower((unsigned char)*orig);
- *sp++ = ']';
- }
- else
- *sp++ = *orig;
- }
- *sp = '\0';
- return new;
-}
-
-/*
* find_matches:
* Find all the fortunes which match the pattern we've been given.
*/
CVS commit: src/games/fortune/fortune
Module Name:src
Committed By: dholland
Date: Thu Aug 27 03:12:16 UTC 2009
Modified Files:
src/games/fortune/fortune: Makefile
Log Message:
Don't need -DHAVE_REGCOMP any more
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/games/fortune/fortune/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/fortune/fortune/Makefile
diff -u src/games/fortune/fortune/Makefile:1.11 src/games/fortune/fortune/Makefile:1.12
--- src/games/fortune/fortune/Makefile:1.11 Wed Feb 4 10:16:19 1998
+++ src/games/fortune/fortune/Makefile Thu Aug 27 03:12:16 2009
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 1998/02/04 10:16:19 christos Exp $
+# $NetBSD: Makefile,v 1.12 2009/08/27 03:12:16 dholland Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
PROG= fortune
MAN= fortune.6
-CPPFLAGS+= -I${.CURDIR}/../strfile -DHAVE_REGCOMP
+CPPFLAGS+= -I${.CURDIR}/../strfile
.include "../../Makefile.inc"
.include
CVS commit: xsrc/external/mit/xf86-video-suntcx/dist/src
Module Name:xsrc
Committed By: macallan
Date: Thu Aug 27 04:12:37 UTC 2009
Modified Files:
xsrc/external/mit/xf86-video-suntcx/dist/src: tcx_accel.c
Log Message:
fix typo
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c
diff -u xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c:1.2 xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c:1.3
--- xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c:1.2 Thu Aug 27 02:41:53 2009
+++ xsrc/external/mit/xf86-video-suntcx/dist/src/tcx_accel.c Thu Aug 27 04:12:37 2009
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-/* $NetBSD: tcx_accel.c,v 1.2 2009/08/27 02:41:53 macallan Exp $ */
+/* $NetBSD: tcx_accel.c,v 1.3 2009/08/27 04:12:37 macallan Exp $ */
#include
@@ -187,7 +187,11 @@
return FALSE;
if (exaGetPixmapOffset(pPixmap) != 0)
return FALSE;
-pTcx->fg = (fg & 0x00ff) | pTcx->pitchshift ? 0x3300 : 0x3000;
+pTcx->fg = (fg & 0x00ff);
+if (pTcx->pitchshift == 0) {
+ pTcx->fg |= 0x3000;
+} else
+ pTcx->fg |= 0x3300;
#ifdef DEBUG
xf86Msg(X_ERROR, "fg: %08x\n", fg);
#endif
CVS commit: src/doc
Module Name:src Committed By: macallan Date: Thu Aug 27 04:17:50 UTC 2009 Modified Files: src/doc: CHANGES Log Message: mention suntcx To generate a diff of this commit: cvs rdiff -u -r1.1279 -r1.1280 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1279 src/doc/CHANGES:1.1280 --- src/doc/CHANGES:1.1279 Mon Aug 24 02:21:26 2009 +++ src/doc/CHANGES Thu Aug 27 04:17:50 2009 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1279 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1280 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -374,3 +374,5 @@ [jmcneill 20090818] amd64, i386: Suspend and resume is now supported when using the genfb(4) display driver. [jmcneill 20090823] + suntcx(4): imported the xf86-video-suntcx driver and added hardware + acceleration [macallan 20090827]
CVS commit: src/usr.bin/calendar
Module Name:src Committed By: dholland Date: Thu Aug 27 04:18:30 UTC 2009 Modified Files: src/usr.bin/calendar: calendar.1 Log Message: Make documentation of -f flag match the implementation. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/usr.bin/calendar/calendar.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/calendar/calendar.1 diff -u src/usr.bin/calendar/calendar.1:1.22 src/usr.bin/calendar/calendar.1:1.23 --- src/usr.bin/calendar/calendar.1:1.22 Fri Mar 7 19:22:22 2008 +++ src/usr.bin/calendar/calendar.1 Thu Aug 27 04:18:29 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: calendar.1,v 1.22 2008/03/07 19:22:22 christos Exp $ +.\" $NetBSD: calendar.1,v 1.23 2009/08/27 04:18:29 dholland Exp $ .\" .\" Copyright (c) 1989, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)calendar.1 8.1 (Berkeley) 6/29/93 .\" -.Dd December 6, 2004 +.Dd August 27, 2009 .Dt CALENDAR 1 .Os .Sh NAME @@ -74,10 +74,11 @@ .El and the first which is found is used. The filename may be absolute. -If not absolute, it is taken relative to the current directory or the +If not absolute, it is taken relative to the directory specified by the .Ev CALENDAR_DIR -environment variable. +environment variable, if set; otherwise, it is taken relative to the +user's home directory. Or, if the .Fl a flag is given, a non-absolute filename is taken relative to each user's
CVS commit: xsrc/external/mit/xf86-video-tdfx/dist/src
Module Name:xsrc Committed By: mrg Date: Thu Aug 27 04:21:06 UTC 2009 Modified Files: xsrc/external/mit/xf86-video-tdfx/dist/src: tdfx_dri.c Log Message: add a (pointer) cast. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c diff -u xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c:1.1.1.2 xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c:1.2 --- xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c:1.1.1.2 Wed Jun 10 00:48:46 2009 +++ xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c Thu Aug 27 04:21:06 2009 @@ -360,7 +360,7 @@ pDRIInfo->ddxDriverMajorVersion = TDFX_MAJOR_VERSION; pDRIInfo->ddxDriverMinorVersion = TDFX_MINOR_VERSION; pDRIInfo->ddxDriverPatchVersion = TDFX_PATCHLEVEL; - pDRIInfo->frameBufferPhysicalAddress = pTDFX->LinearAddr[0]; + pDRIInfo->frameBufferPhysicalAddress = (pointer) pTDFX->LinearAddr[0]; pDRIInfo->frameBufferSize = pTDFX->FbMapSize; pDRIInfo->frameBufferStride = pTDFX->stride; pDRIInfo->ddxDrawableTableEntry = TDFX_MAX_DRAWABLES;
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-tdfx
Module Name:src
Committed By: mrg
Date: Thu Aug 27 04:33:18 UTC 2009
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-tdfx: Makefile
Log Message:
build tdfx_dri.c. fixes PR#41922.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:1.4 src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:1.5
--- src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:1.4 Fri Jun 12 01:59:04 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile Thu Aug 27 04:33:18 2009
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2009/06/12 01:59:04 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2009/08/27 04:33:18 mrg Exp $
DRIVER= xf86-video-tdfx
DRIVER_NAME= tdfx_drv
SRCS= tdfx_accel.c tdfx_dga.c tdfx_driver.c tdfx_hwcurs.c
SRCS+= tdfx_io.c tdfx_priv.c tdfx_sli.c tdfx_video.c
+SRCS+= tdfx_dri.c
MAN= tdfx.4
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos
Module Name:src
Committed By: mrg
Date: Thu Aug 27 04:34:13 UTC 2009
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
Log Message:
bsdResource.c is now called stdResource.c.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.17 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.18
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.17 Tue Jul 7 07:58:46 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Thu Aug 27 04:34:13 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/07/07 07:58:46 mrg Exp $
+# $NetBSD: Makefile,v 1.18 2009/08/27 04:34:13 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -33,14 +33,14 @@
.endif
.if ${MACHINE} == "macppc"
-SRCS.bsd+= ppc_video.c bsdResource.c pm_noop.c lnx_agp.c
+SRCS.bsd+= ppc_video.c stdResource.c pm_noop.c lnx_agp.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
.endfor
.endif
.if ${MACHINE_ARCH} == "alpha"
-SRCS.bsd+= alpha_video.c bsd_ev56.c bsdResource.c pm_noop.c agp_noop.c
+SRCS.bsd+= alpha_video.c bsd_ev56.c stdResource.c pm_noop.c agp_noop.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC -DUSE_ALPHA_PIO
.endfor
@@ -55,7 +55,7 @@
.endif
.if ${MACHINE} == "sgimips"
-SRCS.bsd+= ppc_video.c bsdResource.c pm_noop.c agp_noop.c
+SRCS.bsd+= ppc_video.c stdResource.c pm_noop.c agp_noop.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
.endfor
@@ -64,7 +64,7 @@
.if ${MACHINE} == "cats" || \
${MACHINE} == "shark" || \
${MACHINE} == "netwinder"
-SRCS.bsd+= ppc_video.c bsdResource.c pm_noop.c agp_noop.c
+SRCS.bsd+= ppc_video.c stdResource.c pm_noop.c agp_noop.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}=-DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
.endfor
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86
Module Name:src
Committed By: mrg
Date: Thu Aug 27 04:34:52 UTC 2009
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86: Makefile
Log Message:
build int10 on macppc -- "nv" driver depends on it.
xorg 1.6.3 works on my old powermac G4 with nv now.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.28 src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.29
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile:1.28 Thu Jun 18 02:46:10 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile Thu Aug 27 04:34:52 2009
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.28 2009/06/18 02:46:10 mrg Exp $
+# $NetBSD: Makefile,v 1.29 2009/08/27 04:34:52 mrg Exp $
SUBDIR= common init ddc dixmods doc dri dri2 dummy i2c loader \
xf86modes exa \
xorgos ramdac shadowfb vbe vgahw \
x86emu xaa xf86config xf8_16bpp
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "powerpc"
SUBDIR+= int10
.endif
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Thu Aug 27 04:35:58 UTC 2009
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
Log Message:
disable imstt driver. it needs xorg 1.6 help.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/external/mit/xorg/server/drivers/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.30 src/external/mit/xorg/server/drivers/Makefile:1.31
--- src/external/mit/xorg/server/drivers/Makefile:1.30 Wed Aug 26 22:33:38 2009
+++ src/external/mit/xorg/server/drivers/Makefile Thu Aug 27 04:35:57 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2009/08/26 22:33:38 macallan Exp $
+# $NetBSD: Makefile,v 1.31 2009/08/27 04:35:57 mrg Exp $
SUBDIR= \
xf86-input-keyboard \
@@ -18,7 +18,6 @@
SUBDIR+= \
xf86-video-ati \
xf86-video-chips \
- xf86-video-imstt \
xf86-video-mach64 \
xf86-video-mga \
xf86-video-nv \
@@ -26,6 +25,7 @@
xf86-video-r128 \
xf86-video-tdfx \
xf86-video-wsfb
+# xf86-video-imstt
.elif ${MACHINE} == "netwinder"
SUBDIR+= \
xf86-video-wsfb
@@ -68,7 +68,6 @@
xf86-video-glint \
xf86-video-i128 \
xf86-video-i740 \
- xf86-video-imstt \
xf86-video-mach64 \
xf86-video-mga \
xf86-video-nv \
@@ -85,6 +84,7 @@
xf86-video-trident \
xf86-video-tseng \
xf86-video-wsfb
+# xf86-video-imstt
.elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
SUBDIR+= \
xf86-video-apm \
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src
Committed By: mrg
Date: Thu Aug 27 04:36:14 UTC 2009
Modified Files:
src/external/mit/xorg/lib/dri: dri.mk
Log Message:
fix the SRCS list for swrast.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/dri/dri.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/dri/dri.mk
diff -u src/external/mit/xorg/lib/dri/dri.mk:1.6 src/external/mit/xorg/lib/dri/dri.mk:1.7
--- src/external/mit/xorg/lib/dri/dri.mk:1.6 Tue Jun 16 00:26:11 2009
+++ src/external/mit/xorg/lib/dri/dri.mk Thu Aug 27 04:36:13 2009
@@ -1,4 +1,4 @@
-# $NetBSD: dri.mk,v 1.6 2009/06/16 00:26:11 mrg Exp $
+# $NetBSD: dri.mk,v 1.7 2009/08/27 04:36:13 mrg Exp $
# XXX DRI_LIB_DEPS
@@ -29,11 +29,12 @@
# Common sources
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/common \
${X11SRCDIR.MesaLib}/src/mesa/drivers/common
-.if (${MODULE} != "swrast")
-SRCS+= dri_util.c
+.if (${MODULE} == "swrast")
+SRCS+= driverfuncs.c utils.c
+.else
+SRCS+= dri_util.c drirenderbuffer.c driverfuncs.c texmem.c
+SRCS+= utils.c vblank.c xmlconfig.c
.endif
-SRCS+= drirenderbuffer.c driverfuncs.c texmem.c utils.c vblank.c \
- xmlconfig.c
.include
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src
Committed By: mrg
Date: Thu Aug 27 04:36:40 UTC 2009
Modified Files:
src/external/mit/xorg/lib/dri: Makefile
Log Message:
build libmesa and swrast on all platforms.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/lib/dri/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/dri/Makefile
diff -u src/external/mit/xorg/lib/dri/Makefile:1.12 src/external/mit/xorg/lib/dri/Makefile:1.13
--- src/external/mit/xorg/lib/dri/Makefile:1.12 Tue Jun 16 00:26:11 2009
+++ src/external/mit/xorg/lib/dri/Makefile Thu Aug 27 04:36:40 2009
@@ -1,22 +1,18 @@
-# $NetBSD: Makefile,v 1.12 2009/06/16 00:26:11 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2009/08/27 04:36:40 mrg Exp $
-.if ${MACHINE_ARCH} == "alpha"
SUBDIR= libmesa .WAIT
+
+.if ${MACHINE_ARCH} == "alpha"
SUBDIR+= mach64 mga r128 r200 r300 radeon s3v savage sis tdfx trident
.elif ${MACHINE} == "macppc"
-SUBDIR= libmesa .WAIT
SUBDIR+= mach64 mga r128 r200 r300 radeon tdfx
.elif ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "sparc"
-SUBDIR= libmesa .WAIT
SUBDIR+= mach64 mga r128 r200 r300 radeon
.elif ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-SUBDIR= libmesa .WAIT
SUBDIR+= i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
savage sis tdfx trident unichrome
.endif
-.if !empty(SUBDIR)
SUBDIR+= swrast
-.endif
.include
CVS commit: xsrc/external/mit/libX11/dist/nls/en_US.UTF-8
Module Name:xsrc Committed By: mrg Date: Thu Aug 27 04:42:36 UTC 2009 Modified Files: xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: XI18N_OBJS Log Message: fix a couple of defaults that make emacs and a few other things work. as reported on tech-x11. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/XI18N_OBJS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/XI18N_OBJS diff -u xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/XI18N_OBJS:1.1.1.1 xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/XI18N_OBJS:1.2 --- xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/XI18N_OBJS:1.1.1.1 Wed Jul 30 02:43:01 2008 +++ xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/XI18N_OBJS Thu Aug 27 04:42:36 2009 @@ -3,6 +3,5 @@ # XI18N objects table for euro locales # XLC common/xlcUTF8Load _XlcUtf8Loader # XLC_open -XOM common/xomLTRTTB _XomGenericOpenOM # XOM_open -XIM common/xiiimp _SwitchOpenIM # XIM_open -XIM common/xiiimp _XimpLocalOpenIM # XIM_open +XOM common/xomGeneric _XomGenericOpenOM # XOM_open +XIM common/ximcp _XimOpenIM # XIM_open
CVS commit: src/distrib/sets/lists/xserver
Module Name:src Committed By: mrg Date: Thu Aug 27 04:59:15 UTC 2009 Modified Files: src/distrib/sets/lists/xserver: md.alpha md.amd64 md.i386 md.macppc md.sparc md.sparc64 mi Log Message: - build mesa_dri and swrast on all platforms - kill imstt - re-add int10 on macppc To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/xserver/md.alpha cvs rdiff -u -r1.51 -r1.52 src/distrib/sets/lists/xserver/md.amd64 cvs rdiff -u -r1.68 -r1.69 src/distrib/sets/lists/xserver/md.i386 cvs rdiff -u -r1.50 -r1.51 src/distrib/sets/lists/xserver/md.macppc cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/xserver/md.sparc cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/lists/xserver/md.sparc64 cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/xserver/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/xserver/md.alpha diff -u src/distrib/sets/lists/xserver/md.alpha:1.22 src/distrib/sets/lists/xserver/md.alpha:1.23 --- src/distrib/sets/lists/xserver/md.alpha:1.22 Sun Aug 23 09:05:45 2009 +++ src/distrib/sets/lists/xserver/md.alpha Thu Aug 27 04:59:15 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.alpha,v 1.22 2009/08/23 09:05:45 mrg Exp $ +# $NetBSD: md.alpha,v 1.23 2009/08/27 04:59:15 mrg Exp $ ./usr/X11R6/bin/X -unknown- x11 ./usr/X11R6/bin/XalphaNetBSD-unknown- x11 ./usr/X11R6/bin/XdecNetBSD-unknown- x11 @@ -15,8 +15,6 @@ ./usr/X11R7/lib/X11/doc/README.rapidaccess -unknown- xorg ./usr/X11R7/lib/modules/dri/mach64_dri.so -unknown- xorg ./usr/X11R7/lib/modules/dri/mach64_dri.so.0 -unknown- xorg -./usr/X11R7/lib/modules/dri/mesa_dri.so -unknown- xorg -./usr/X11R7/lib/modules/dri/mesa_dri.so.0 -unknown- xorg ./usr/X11R7/lib/modules/dri/mga_dri.so -unknown- xorg ./usr/X11R7/lib/modules/dri/mga_dri.so.0 -unknown- xorg ./usr/X11R7/lib/modules/dri/r128_dri.so -unknown- xorg @@ -33,8 +31,6 @@ ./usr/X11R7/lib/modules/dri/savage_dri.so.0 -unknown- xorg ./usr/X11R7/lib/modules/dri/sis_dri.so -unknown- xorg ./usr/X11R7/lib/modules/dri/sis_dri.so.0 -unknown- xorg -./usr/X11R7/lib/modules/dri/swrast_dri.so -unknown- xorg -./usr/X11R7/lib/modules/dri/swrast_dri.so.0 -unknown- xorg ./usr/X11R7/lib/modules/dri/tdfx_dri.so -unknown- xorg ./usr/X11R7/lib/modules/dri/tdfx_dri.so.0 -unknown- xorg ./usr/X11R7/lib/modules/dri/trident_dri.so -unknown- xorg @@ -61,8 +57,8 @@ ./usr/X11R7/lib/modules/drivers/i128_drv.so.1 -unknown- xorg ./usr/X11R7/lib/modules/drivers/i740_drv.so -unknown- xorg ./usr/X11R7/lib/modules/drivers/i740_drv.so.1 -unknown- xorg -./usr/X11R7/lib/modules/drivers/imstt_drv.so -unknown- xorg -./usr/X11R7/lib/modules/drivers/imstt_drv.so.1 -unknown- xorg +./usr/X11R7/lib/modules/drivers/imstt_drv.so -unknown- obsolete +./usr/X11R7/lib/modules/drivers/imstt_drv.so.1 -unknown- obsolete ./usr/X11R7/lib/modules/drivers/kbd_drv.so -unknown- xorg ./usr/X11R7/lib/modules/drivers/kbd_drv.so.1 -unknown- xorg ./usr/X11R7/lib/modules/drivers/mach64_drv.so -unknown- xorg @@ -172,10 +168,10 @@ ./usr/X11R7/lib/modules/libi2c.so -unknown- xorg ./usr/X11R7/lib/modules/libi2c.so.0 -unknown- xorg ./usr/X11R7/lib/modules/libi2c_pic.a -unknown- xorg -./usr/X11R7/lib/modules/libint10.a -unknown- xorg -./usr/X11R7/lib/modules/libint10.so -unknown- xorg -./usr/X11R7/lib/modules/libint10.so.0 -unknown- xorg -./usr/X11R7/lib/modules/libint10_pic.a -unknown- xorg +./usr/X11R7/lib/modules/libint10.a -unknown- obsolete +./usr/X11R7/lib/modules/libint10.so -unknown- obsolete +./usr/X11R7/lib/modules/libint10.so.0 -unknown- obsolete +./usr/X11R7/lib/modules/libint10_pic.a -unknown- obsolete ./usr/X11R7/lib/modules/libpcidata.a -unknown- obsolete ./usr/X11R7/lib/modules/libpcidata.so -unknown- obsolete ./usr/X11R7/lib/modules/libpcidata.so.0 -unknown- obsolete @@ -308,7 +304,7 @@ ./usr/X11R7/man/html4/glint.html -unknown- html,xorg ./usr/X11R7/man/html4/i128.html-unknown- html,xorg ./usr/X11R7/man/html4/i740.html-unknown- html,xorg -./usr/X11R7/man/html4/imstt.html -unknown- html,xorg +./usr/X11R7/man/html4/imstt.html -unknown- obsolete ./usr/X11R7/man/html4/kbd.html-unknown- html,xorg ./usr/X11R7/man/html4/mga.html-unknown- html,xorg ./usr/X11R7/man/html4/mousedrv.html -unknown- html,xorg @@ -363,7 +359,7 @@ ./usr/X11R7/man/man4/glint.4-unknown- .man,xorg ./usr/X11R7/man/man4/i128.4-unknown- .man,xorg ./usr/X11R7/man/man4/i740.4-unknown- .man,xorg -./usr/X11R7/man/man4/imstt.4-unknown- .man,xorg +./usr/X11R7/man/man4/imstt.4-unknown- obsolete ./usr/X11R7/man/man4/kbd.4-unknown- .man,xorg ./usr/X11R7/man/man4/mga.4-unknown- .man,xorg ./usr/X11R7/man/man4/mousedrv.4-unknown- .man,xorg Index: src/distrib/sets/lists/xserver/md.amd64 diff -u src/distrib/sets/lists/xserver/md.amd64:1.51 src/distrib/sets/lists/xserver/md.amd64:1.52 --- s
