CVS commit: src/sys/dev/hpc
Module Name:src
Committed By: tsutsui
Date: Sat May 15 06:01:13 UTC 2010
Modified Files:
src/sys/dev/hpc: hpcfb.c
Log Message:
Set RI_NO_AUTO in ri-ri_flg if hpcfb_init() is invoked from cnattach.
Fixes silent hang on hpcsh and hpcmips.
XXX: all other rasops based console devices need to set this flag??
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/hpc/hpcfb.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/hpc/hpcfb.c
diff -u src/sys/dev/hpc/hpcfb.c:1.53 src/sys/dev/hpc/hpcfb.c:1.54
--- src/sys/dev/hpc/hpcfb.c:1.53 Wed Feb 24 22:37:57 2010
+++ src/sys/dev/hpc/hpcfb.c Sat May 15 06:01:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcfb.c,v 1.53 2010/02/24 22:37:57 dyoung Exp $ */
+/* $NetBSD: hpcfb.c,v 1.54 2010/05/15 06:01:12 tsutsui Exp $ */
/*-
* Copyright (c) 1999
@@ -43,7 +43,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hpcfb.c,v 1.53 2010/02/24 22:37:57 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: hpcfb.c,v 1.54 2010/05/15 06:01:12 tsutsui Exp $);
#ifdef _KERNEL_OPT
#include opt_hpcfb.h
@@ -451,6 +451,9 @@
#else
ri-ri_flg = RI_CURSOR;
#endif
+ if (dc == hpcfb_console_dc)
+ ri-ri_flg |= RI_NO_AUTO;
+
switch (ri-ri_depth) {
case 8:
if (32 = fbconf-hf_pack_width
CVS commit: [matt-nb5-mips64] src/sys/arch
Module Name:src
Committed By: matt
Date: Sat May 15 06:22:38 UTC 2010
Modified Files:
src/sys/arch/mips/sibyte/dev [matt-nb5-mips64]: sbwdog.c
src/sys/arch/sbmips/sbmips [matt-nb5-mips64]: sb1250_icu.c
Log Message:
Make the sibyte watchdog establish an interrupt, and if taken, drop into DDB.
Make sure these interrupt are not blocked by IPL_HIGH.
To generate a diff of this commit:
cvs rdiff -u -r1.7.94.1 -r1.7.94.2 src/sys/arch/mips/sibyte/dev/sbwdog.c
cvs rdiff -u -r1.9.36.12 -r1.9.36.13 src/sys/arch/sbmips/sbmips/sb1250_icu.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/sibyte/dev/sbwdog.c
diff -u src/sys/arch/mips/sibyte/dev/sbwdog.c:1.7.94.1 src/sys/arch/mips/sibyte/dev/sbwdog.c:1.7.94.2
--- src/sys/arch/mips/sibyte/dev/sbwdog.c:1.7.94.1 Mon Nov 23 18:28:47 2009
+++ src/sys/arch/mips/sibyte/dev/sbwdog.c Sat May 15 06:22:38 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sbwdog.c,v 1.7.94.1 2009/11/23 18:28:47 matt Exp $ */
+/* $NetBSD: sbwdog.c,v 1.7.94.2 2010/05/15 06:22:38 matt Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -40,8 +40,9 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sbwdog.c,v 1.7.94.1 2009/11/23 18:28:47 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: sbwdog.c,v 1.7.94.2 2010/05/15 06:22:38 matt Exp $);
+#include locators.h
#include sys/param.h
#include sys/systm.h
#include sys/device.h
@@ -58,7 +59,7 @@
#define SBWDOG_DEFAULT_PERIOD 5 /* Default to 5 seconds. */
struct sbwdog_softc {
- struct device sc_dev;
+ device_t sc_dev;
struct sysmon_wdog sc_smw;
u_long sc_addr;
int sc_wdog_armed;
@@ -69,8 +70,9 @@
static void sbwdog_attach(struct device *, struct device *, void *);
static int sbwdog_tickle(struct sysmon_wdog *);
static int sbwdog_setmode(struct sysmon_wdog *);
+static void sbwdog_intr(void *, uint32_t, vaddr_t);
-CFATTACH_DECL(sbwdog, sizeof(struct sbwdog_softc),
+CFATTACH_DECL_NEW(sbwdog, sizeof(struct sbwdog_softc),
sbwdog_match, sbwdog_attach, NULL, NULL);
#define READ_REG(rp) (mips3_ld((volatile uint64_t *)(rp)))
@@ -90,23 +92,27 @@
static void
sbwdog_attach(struct device *parent, struct device *self, void *aux)
{
- struct sbwdog_softc *sc = (void *)self;
+ struct sbwdog_softc *sc = device_private(self);
struct sbscd_attach_args *sa = aux;
+ sc-sc_dev = self;
sc-sc_wdog_period = SBWDOG_DEFAULT_PERIOD;
sc-sc_addr = MIPS_PHYS_TO_KSEG1(sa-sa_base + sa-sa_locs.sa_offset);
- printf(: %d second period\n, sc-sc_wdog_period);
+ aprint_normal(: %d second period\n, sc-sc_wdog_period);
- sc-sc_smw.smw_name = sc-sc_dev.dv_xname;
+ sc-sc_smw.smw_name = device_xname(sc-sc_dev);
sc-sc_smw.smw_cookie = sc;
sc-sc_smw.smw_setmode = sbwdog_setmode;
sc-sc_smw.smw_tickle = sbwdog_tickle;
sc-sc_smw.smw_period = sc-sc_wdog_period;
if (sysmon_wdog_register(sc-sc_smw) != 0)
- printf(%s: unable to register with sysmon\n,
- sc-sc_dev.dv_xname);
+ aprint_error_dev(self, unable to register with sysmon\n);
+
+ if (sa-sa_locs.sa_intr[0] != SBOBIOCF_INTR_DEFAULT)
+ cpu_intr_establish(sa-sa_locs.sa_intr[0], IPL_HIGH,
+ sbwdog_intr, sc);
}
static int
@@ -118,6 +124,20 @@
return (0);
}
+static void
+sbwdog_intr(void *v, uint32_t cause, vaddr_t pc)
+{
+ struct sbwdog_softc *sc = v;
+
+ WRITE_REG(sc-sc_addr + R_SCD_WDOG_CFG, M_SCD_WDOG_ENABLE);
+ WRITE_REG(sc-sc_addr + R_SCD_WDOG_CFG, 0);
+ cpu_Debugger();
+ WRITE_REG(sc-sc_addr + R_SCD_WDOG_INIT,
+ sc-sc_wdog_period * V_SCD_WDOG_FREQ);
+ WRITE_REG(sc-sc_addr + R_SCD_WDOG_CFG, M_SCD_WDOG_ENABLE);
+}
+
+
static int
sbwdog_setmode(struct sysmon_wdog *smw)
{
Index: src/sys/arch/sbmips/sbmips/sb1250_icu.c
diff -u src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.9.36.12 src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.9.36.13
--- src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.9.36.12 Wed May 12 19:11:33 2010
+++ src/sys/arch/sbmips/sbmips/sb1250_icu.c Sat May 15 06:22:38 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sb1250_icu.c,v 1.9.36.12 2010/05/12 19:11:33 matt Exp $ */
+/* $NetBSD: sb1250_icu.c,v 1.9.36.13 2010/05/15 06:22:38 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sb1250_icu.c,v 1.9.36.12 2010/05/12 19:11:33 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: sb1250_icu.c,v 1.9.36.13 2010/05/15 06:22:38 matt Exp $);
#define __INTR_PRIVATE
@@ -62,13 +62,15 @@
[IPL_SOFTNET] = MIPS_SOFT_INT_MASK,
[IPL_SOFTSERIAL] = MIPS_SOFT_INT_MASK,
[IPL_VM] = MIPS_SOFT_INT_MASK | MIPS_INT_MASK_0,
-#if IPL_SCHED == IPL_HIGH
- [IPL_SCHED] = MIPS_INT_MASK,
-#else
+#if IPL_SCHED IPL_HIGH
[IPL_SCHED] = MIPS_SOFT_INT_MASK | MIPS_INT_MASK_0
| MIPS_INT_MASK_1 | MIPS_INT_MASK_5,
#endif
+ [IPL_HIGH] = MIPS_SOFT_INT_MASK | MIPS_INT_MASK_0
+ | MIPS_INT_MASK_1 | MIPS_INT_MASK_5,
+#if 0
[IPL_HIGH] = MIPS_INT_MASK,
+#endif
},
};
@@ -218,8 +220,10 @@
CVS commit: src/distrib/x68k/floppies/ramdisk
Module Name:src Committed By: isaki Date: Sat May 15 06:36:12 UTC 2010 Modified Files: src/distrib/x68k/floppies/ramdisk: dot.profile Log Message: TERM=x68k - vt220. sysinst works again. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/distrib/x68k/floppies/ramdisk/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/distrib/x68k/floppies/ramdisk/dot.profile diff -u src/distrib/x68k/floppies/ramdisk/dot.profile:1.14 src/distrib/x68k/floppies/ramdisk/dot.profile:1.15 --- src/distrib/x68k/floppies/ramdisk/dot.profile:1.14 Sat Jul 26 17:07:44 2003 +++ src/distrib/x68k/floppies/ramdisk/dot.profile Sat May 15 06:36:12 2010 @@ -1,4 +1,4 @@ -# $NetBSD: dot.profile,v 1.14 2003/07/26 17:07:44 salo Exp $ +# $NetBSD: dot.profile,v 1.15 2010/05/15 06:36:12 isaki Exp $ # # Copyright (c) 1997 Perry E. Metzger # Copyright (c) 1994 Christopher G. Demetriou @@ -35,7 +35,7 @@ PATH=/sbin:/bin:/usr/bin:/usr/sbin:/ export PATH -TERM=x68k +TERM=vt220 export TERM HOME=/ export HOME
CVS commit: src/sys/arch/ews4800mips/sbd
Module Name:src Committed By: tsutsui Date: Sat May 15 06:39:06 UTC 2010 Modified Files: src/sys/arch/ews4800mips/sbd: fb_sbdio.c Log Message: Set RI_NO_AUTO in cnattach function. Untested. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/ews4800mips/sbd/fb_sbdio.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/ews4800mips/sbd/fb_sbdio.c diff -u src/sys/arch/ews4800mips/sbd/fb_sbdio.c:1.8 src/sys/arch/ews4800mips/sbd/fb_sbdio.c:1.9 --- src/sys/arch/ews4800mips/sbd/fb_sbdio.c:1.8 Sat Nov 7 07:27:43 2009 +++ src/sys/arch/ews4800mips/sbd/fb_sbdio.c Sat May 15 06:39:06 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: fb_sbdio.c,v 1.8 2009/11/07 07:27:43 cegger Exp $ */ +/* $NetBSD: fb_sbdio.c,v 1.9 2010/05/15 06:39:06 tsutsui Exp $ */ /*- * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ #define WIRED_FB_TLB #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: fb_sbdio.c,v 1.8 2009/11/07 07:27:43 cegger Exp $); +__KERNEL_RCSID(0, $NetBSD: fb_sbdio.c,v 1.9 2010/05/15 06:39:06 tsutsui Exp $); #include sys/param.h #include sys/systm.h @@ -258,6 +258,7 @@ ga-flags = flags; fb_pmap_enter((paddr_t)mem, (paddr_t)reg, memva, regva); ri-ri_bits = (void *)memva; + ri-ri_flg = RI_NO_AUTO; ga-reg_addr = regva; fb_common_init(ri, ga);
CVS commit: src/sys/arch/dreamcast/dev
Module Name:src Committed By: tsutsui Date: Sat May 15 06:48:23 UTC 2010 Modified Files: src/sys/arch/dreamcast/dev: pvr.c Log Message: Set RI_NO_AUTO in ri_flg if pvr_getdevconfig() is invoked from cninit. Tested on gxemul. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/arch/dreamcast/dev/pvr.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/dreamcast/dev/pvr.c diff -u src/sys/arch/dreamcast/dev/pvr.c:1.25 src/sys/arch/dreamcast/dev/pvr.c:1.26 --- src/sys/arch/dreamcast/dev/pvr.c:1.25 Mon May 26 10:31:22 2008 +++ src/sys/arch/dreamcast/dev/pvr.c Sat May 15 06:48:22 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pvr.c,v 1.25 2008/05/26 10:31:22 nisimura Exp $ */ +/* $NetBSD: pvr.c,v 1.26 2010/05/15 06:48:22 tsutsui Exp $ */ /*- * Copyright (c) 2001 Marcus Comstedt. @@ -35,7 +35,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: pvr.c,v 1.25 2008/05/26 10:31:22 nisimura Exp $); +__KERNEL_RCSID(0, $NetBSD: pvr.c,v 1.26 2010/05/15 06:48:22 tsutsui Exp $); #include sys/param.h #include sys/systm.h @@ -238,6 +238,8 @@ pvrinit(dc); dc-rinfo.ri_flg = 0; + if (dc == pvr_console_dc) + dc-rinfo.ri_flg |= RI_NO_AUTO; dc-rinfo.ri_depth = dc-dc_depth; dc-rinfo.ri_bits = (void *) dc-dc_videobase; dc-rinfo.ri_width = dc-dc_wid;
CVS commit: src/libexec/httpd
Module Name:src
Committed By: mrg
Date: Sat May 15 06:48:27 UTC 2010
Modified Files:
src/libexec/httpd: CHANGES bozohttpd.8 bozohttpd.c ssl-bozo.c
Log Message:
merge bozohttpd 20100512
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/libexec/httpd/CHANGES
cvs rdiff -u -r1.18 -r1.19 src/libexec/httpd/bozohttpd.8 \
src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.7 -r1.8 src/libexec/httpd/ssl-bozo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/CHANGES
diff -u src/libexec/httpd/CHANGES:1.6 src/libexec/httpd/CHANGES:1.7
--- src/libexec/httpd/CHANGES:1.6 Mon May 10 03:37:45 2010
+++ src/libexec/httpd/CHANGES Sat May 15 06:48:27 2010
@@ -1,4 +1,8 @@
-$eterna: CHANGES,v 1.70 2010/05/10 02:24:30 mrg Exp $
+$eterna: CHANGES,v 1.71 2010/05/13 04:19:04 mrg Exp $
+
+changes since bozohttpd 20100509:
+ o fix some compile issues
+ o fix SSL mode. from rtr.
changes since bozohttpd 20090522:
o major rework and clean up of internal interfaces. move the main
Index: src/libexec/httpd/bozohttpd.8
diff -u src/libexec/httpd/bozohttpd.8:1.18 src/libexec/httpd/bozohttpd.8:1.19
--- src/libexec/httpd/bozohttpd.8:1.18 Mon May 10 14:53:17 2010
+++ src/libexec/httpd/bozohttpd.8 Sat May 15 06:48:27 2010
@@ -1,6 +1,6 @@
-.\ $NetBSD: bozohttpd.8,v 1.18 2010/05/10 14:53:17 mrg Exp $
+.\ $NetBSD: bozohttpd.8,v 1.19 2010/05/15 06:48:27 mrg Exp $
.\
-.\ $eterna: bozohttpd.8,v 1.94 2010/05/10 14:49:19 mrg Exp $
+.\ $eterna: bozohttpd.8,v 1.95 2010/05/13 04:17:58 mrg Exp $
.\
.\ Copyright (c) 1997-2010 Matthew R. Green
.\ All rights reserved.
@@ -459,7 +459,7 @@
and regular code audits.
This manual documents
.Nm
-version 20100510.
+version 20100512.
.Sh AUTHORS
.Nm
was written by Matthew R. Green
Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.18 src/libexec/httpd/bozohttpd.c:1.19
--- src/libexec/httpd/bozohttpd.c:1.18 Mon May 10 14:53:17 2010
+++ src/libexec/httpd/bozohttpd.c Sat May 15 06:48:27 2010
@@ -1,6 +1,6 @@
-/* $NetBSD: bozohttpd.c,v 1.18 2010/05/10 14:53:17 mrg Exp $ */
+/* $NetBSD: bozohttpd.c,v 1.19 2010/05/15 06:48:27 mrg Exp $ */
-/* $eterna: bozohttpd.c,v 1.168 2010/05/10 14:49:19 mrg Exp $ */
+/* $eterna: bozohttpd.c,v 1.169 2010/05/13 04:17:58 mrg Exp $ */
/*
* Copyright (c) 1997-2010 Matthew R. Green
@@ -109,7 +109,7 @@
#define INDEX_HTML index.html
#endif
#ifndef SERVER_SOFTWARE
-#define SERVER_SOFTWARE bozohttpd/20100510
+#define SERVER_SOFTWARE bozohttpd/20100512
#endif
#ifndef DIRECT_ACCESS_FILE
#define DIRECT_ACCESS_FILE .bzdirect
Index: src/libexec/httpd/ssl-bozo.c
diff -u src/libexec/httpd/ssl-bozo.c:1.7 src/libexec/httpd/ssl-bozo.c:1.8
--- src/libexec/httpd/ssl-bozo.c:1.7 Mon May 10 03:37:45 2010
+++ src/libexec/httpd/ssl-bozo.c Sat May 15 06:48:27 2010
@@ -1,6 +1,6 @@
-/* $NetBSD: ssl-bozo.c,v 1.7 2010/05/10 03:37:45 mrg Exp $ */
+/* $NetBSD: ssl-bozo.c,v 1.8 2010/05/15 06:48:27 mrg Exp $ */
-/* $eterna: ssl-bozo.c,v 1.11 2010/05/10 02:51:28 mrg Exp $ */
+/* $eterna: ssl-bozo.c,v 1.13 2010/05/12 12:24:58 rtr Exp $ */
/*
* Copyright (c) 1997-2010 Matthew R. Green
@@ -34,6 +34,7 @@
#include stdarg.h
#include stdio.h
+#include syslog.h
#include unistd.h
#include bozohttpd.h
@@ -56,20 +57,56 @@
char *privatekey_file;
} sslinfo_t;
+/*
+ * bozo_ssl_err
+ *
+ * bozo_ssl_err works just like bozo_err except in addition to printing
+ * the error provided by the caller at the point of error it pops and
+ * prints all errors from the SSL error queue.
+ */
+static void
+bozo_ssl_err(bozohttpd_t *httpd, int code, const char *fmt, ...)
+{
+va_list ap;
+
+va_start(ap, fmt);
+if (httpd-logstderr || isatty(STDERR_FILENO)) {
+vfprintf(stderr, fmt, ap);
+fputs(\n, stderr);
+} else
+vsyslog(LOG_ERR, fmt, ap);
+va_end(ap);
+
+ unsigned int sslcode = ERR_get_error();
+ do {
+ const char *sslfmt = SSL Error: %s:%s:%s;
+
+ if (httpd-logstderr || isatty(STDERR_FILENO)) {
+ fprintf(stderr, sslfmt,
+ ERR_lib_error_string(sslcode),
+ ERR_func_error_string(sslcode),
+ ERR_reason_error_string(sslcode));
+ } else {
+ syslog(LOG_ERR, sslfmt,
+ ERR_lib_error_string(sslcode),
+ ERR_func_error_string(sslcode),
+ ERR_reason_error_string(sslcode));
+ }
+ } while (0 != (sslcode = ERR_get_error()));
+ exit(code);
+}
+
static int
-bozo_ssl_printf(bozohttpd_t *httpd, const char * fmt, ...)
+bozo_ssl_printf(bozohttpd_t *httpd, const char * fmt, va_list ap)
{
sslinfo_t *sslinfo;
- va_list ap;
char *buf;
int nbytes;
sslinfo = httpd-sslinfo;
/* XXX we need more elegant/proper handling of SSL_write return */
- va_start(ap, fmt);
if ((nbytes = vasprintf(buf, fmt, ap)) != -1)
SSL_write(sslinfo-bozossl, buf, nbytes);
- va_end(ap);
free(buf);
@@ -135,17 +172,26 @@
CVS commit: src/sys/dev/tc
Module Name:src Committed By: tsutsui Date: Sat May 15 07:01:38 UTC 2010 Modified Files: src/sys/dev/tc: cfb.c mfb.c sfb.c sfbplus.c tfb.c xcfb.c Log Message: Set RI_NO_AUTO in ri_flg if *fb_common_init() is invoked from cnattach. Untested. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/dev/tc/cfb.c src/sys/dev/tc/tfb.c cvs rdiff -u -r1.54 -r1.55 src/sys/dev/tc/mfb.c cvs rdiff -u -r1.80 -r1.81 src/sys/dev/tc/sfb.c cvs rdiff -u -r1.33 -r1.34 src/sys/dev/tc/sfbplus.c cvs rdiff -u -r1.51 -r1.52 src/sys/dev/tc/xcfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/tc/cfb.c diff -u src/sys/dev/tc/cfb.c:1.57 src/sys/dev/tc/cfb.c:1.58 --- src/sys/dev/tc/cfb.c:1.57 Sat Aug 22 17:38:06 2009 +++ src/sys/dev/tc/cfb.c Sat May 15 07:01:37 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: cfb.c,v 1.57 2009/08/22 17:38:06 tsutsui Exp $ */ +/* $NetBSD: cfb.c,v 1.58 2010/05/15 07:01:37 tsutsui Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cfb.c,v 1.57 2009/08/22 17:38:06 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: cfb.c,v 1.58 2010/05/15 07:01:37 tsutsui Exp $); #include sys/param.h #include sys/systm.h @@ -319,6 +319,8 @@ cfbhwinit(base); ri-ri_flg = RI_CENTER; + if (ri == cfb_console_ri) + ri-ri_flg |= RI_NO_AUTO; ri-ri_depth = 8; ri-ri_width = 1024; ri-ri_height = 864; Index: src/sys/dev/tc/tfb.c diff -u src/sys/dev/tc/tfb.c:1.57 src/sys/dev/tc/tfb.c:1.58 --- src/sys/dev/tc/tfb.c:1.57 Sat Aug 22 17:38:06 2009 +++ src/sys/dev/tc/tfb.c Sat May 15 07:01:37 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: tfb.c,v 1.57 2009/08/22 17:38:06 tsutsui Exp $ */ +/* $NetBSD: tfb.c,v 1.58 2010/05/15 07:01:37 tsutsui Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tfb.c,v 1.57 2009/08/22 17:38:06 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: tfb.c,v 1.58 2010/05/15 07:01:37 tsutsui Exp $); #include sys/param.h #include sys/systm.h @@ -337,6 +337,8 @@ tfbhwinit(base); ri-ri_flg = RI_CENTER; + if (ri == tfb_console_ri) + ri-ri_flg |= RI_NO_AUTO; ri-ri_depth = 8; ri-ri_width = 1280; ri-ri_height = 1024; Index: src/sys/dev/tc/mfb.c diff -u src/sys/dev/tc/mfb.c:1.54 src/sys/dev/tc/mfb.c:1.55 --- src/sys/dev/tc/mfb.c:1.54 Sat Aug 22 17:38:06 2009 +++ src/sys/dev/tc/mfb.c Sat May 15 07:01:37 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: mfb.c,v 1.54 2009/08/22 17:38:06 tsutsui Exp $ */ +/* $NetBSD: mfb.c,v 1.55 2010/05/15 07:01:37 tsutsui Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mfb.c,v 1.54 2009/08/22 17:38:06 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: mfb.c,v 1.55 2010/05/15 07:01:37 tsutsui Exp $); #include sys/param.h #include sys/systm.h @@ -283,6 +283,8 @@ mfbhwinit(base); ri-ri_flg = RI_CENTER | RI_FORCEMONO; + if (ri == mfb_console_ri) + ri-ri_flg |= RI_NO_AUTO; ri-ri_depth = 8; /* !! watch out !! */ ri-ri_width = 1280; ri-ri_height = 1024; Index: src/sys/dev/tc/sfb.c diff -u src/sys/dev/tc/sfb.c:1.80 src/sys/dev/tc/sfb.c:1.81 --- src/sys/dev/tc/sfb.c:1.80 Sat Aug 22 17:38:06 2009 +++ src/sys/dev/tc/sfb.c Sat May 15 07:01:37 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: sfb.c,v 1.80 2009/08/22 17:38:06 tsutsui Exp $ */ +/* $NetBSD: sfb.c,v 1.81 2010/05/15 07:01:37 tsutsui Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: sfb.c,v 1.80 2009/08/22 17:38:06 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: sfb.c,v 1.81 2010/05/15 07:01:37 tsutsui Exp $); #include sys/param.h #include sys/systm.h @@ -345,6 +345,8 @@ sfbhwinit(base); ri-ri_flg = RI_CENTER; + if (ri == sfb_console_ri) + ri-ri_flg |= RI_NO_AUTO; ri-ri_depth = 8; ri-ri_width = (hsetup 0x1ff) 2; ri-ri_height = (vsetup 0x7ff); Index: src/sys/dev/tc/sfbplus.c diff -u src/sys/dev/tc/sfbplus.c:1.33 src/sys/dev/tc/sfbplus.c:1.34 --- src/sys/dev/tc/sfbplus.c:1.33 Sat Aug 22 17:38:06 2009 +++ src/sys/dev/tc/sfbplus.c Sat May 15 07:01:37 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: sfbplus.c,v 1.33 2009/08/22 17:38:06 tsutsui Exp $ */ +/* $NetBSD: sfbplus.c,v 1.34 2010/05/15 07:01:37 tsutsui Exp $ */ /*- * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: sfbplus.c,v 1.33 2009/08/22 17:38:06 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: sfbplus.c,v 1.34 2010/05/15 07:01:37 tsutsui Exp $); #include sys/param.h #include sys/systm.h @@ -369,6 +369,8 @@ } ri-ri_flg = RI_CENTER; + if (ri == sfbp_console_ri) + ri-ri_flg |= RI_NO_AUTO; ri-ri_flg = 0; /* XXX 32bpp RI_CENTER fails XXX */ ri-ri_depth = depth; ri-ri_width = (hsetup 0x1ff)
CVS commit: src/sys/arch/evbppc/explora/dev
Module Name:src
Committed By: tsutsui
Date: Sat May 15 07:38:24 UTC 2010
Modified Files:
src/sys/arch/evbppc/explora/dev: fb_elb.c
Log Message:
Set RI_NO_AUTO in ri_flg if fb_init() is invoked from cnattach.
Tested on Explora451.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/explora/dev/fb_elb.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/evbppc/explora/dev/fb_elb.c
diff -u src/sys/arch/evbppc/explora/dev/fb_elb.c:1.9 src/sys/arch/evbppc/explora/dev/fb_elb.c:1.10
--- src/sys/arch/evbppc/explora/dev/fb_elb.c:1.9 Mon Apr 28 20:23:17 2008
+++ src/sys/arch/evbppc/explora/dev/fb_elb.c Sat May 15 07:38:24 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fb_elb.c,v 1.9 2008/04/28 20:23:17 martin Exp $ */
+/* $NetBSD: fb_elb.c,v 1.10 2010/05/15 07:38:24 tsutsui Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fb_elb.c,v 1.9 2008/04/28 20:23:17 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: fb_elb.c,v 1.10 2010/05/15 07:38:24 tsutsui Exp $);
#include sys/param.h
#include sys/conf.h
@@ -176,6 +176,8 @@
ri-ri_stride = ri-ri_width;
ri-ri_bits = fb-fb_vram;
ri-ri_flg = RI_CENTER;
+ if (ri == console_dev.fb_ri)
+ ri-ri_flg |= RI_NO_AUTO;
rasops_init(ri, 500, 500);
} else {
CVS commit: src/sys
Module Name:src
Committed By: tsutsui
Date: Sat May 15 08:53:27 UTC 2010
Modified Files:
src/sys/arch/dreamcast/dev: pvr.c
src/sys/arch/evbppc/explora/dev: fb_elb.c
src/sys/arch/ews4800mips/sbd: fb_sbdio.c
src/sys/dev/hpc: hpcfb.c
src/sys/dev/pci: tga.c
src/sys/dev/tc: cfb.c mfb.c sfb.c sfbplus.c tfb.c xcfb.c
Log Message:
Clear RI_NO_AUTO in actual attach functions during autoconf(9)
for console devices that set the flag during consinit().
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/dreamcast/dev/pvr.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/explora/dev/fb_elb.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/ews4800mips/sbd/fb_sbdio.c
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/hpc/hpcfb.c
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/pci/tga.c
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/tc/cfb.c src/sys/dev/tc/tfb.c
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/tc/mfb.c
cvs rdiff -u -r1.81 -r1.82 src/sys/dev/tc/sfb.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/tc/sfbplus.c
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/tc/xcfb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/dreamcast/dev/pvr.c
diff -u src/sys/arch/dreamcast/dev/pvr.c:1.26 src/sys/arch/dreamcast/dev/pvr.c:1.27
--- src/sys/arch/dreamcast/dev/pvr.c:1.26 Sat May 15 06:48:22 2010
+++ src/sys/arch/dreamcast/dev/pvr.c Sat May 15 08:53:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pvr.c,v 1.26 2010/05/15 06:48:22 tsutsui Exp $ */
+/* $NetBSD: pvr.c,v 1.27 2010/05/15 08:53:27 tsutsui Exp $ */
/*-
* Copyright (c) 2001 Marcus Comstedt.
@@ -35,7 +35,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: pvr.c,v 1.26 2010/05/15 06:48:22 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: pvr.c,v 1.27 2010/05/15 08:53:27 tsutsui Exp $);
#include sys/param.h
#include sys/systm.h
@@ -289,6 +289,7 @@
console = pvr_is_console;
if (console) {
sc-sc_dc = pvr_console_dc;
+ sc-sc_dc-rinfo.ri_flg = ~RI_NO_AUTO;
sc-nscreens = 1;
} else {
sc-sc_dc = malloc(sizeof(struct fb_devconfig), M_DEVBUF,
Index: src/sys/arch/evbppc/explora/dev/fb_elb.c
diff -u src/sys/arch/evbppc/explora/dev/fb_elb.c:1.10 src/sys/arch/evbppc/explora/dev/fb_elb.c:1.11
--- src/sys/arch/evbppc/explora/dev/fb_elb.c:1.10 Sat May 15 07:38:24 2010
+++ src/sys/arch/evbppc/explora/dev/fb_elb.c Sat May 15 08:53:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fb_elb.c,v 1.10 2010/05/15 07:38:24 tsutsui Exp $ */
+/* $NetBSD: fb_elb.c,v 1.11 2010/05/15 08:53:26 tsutsui Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fb_elb.c,v 1.10 2010/05/15 07:38:24 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: fb_elb.c,v 1.11 2010/05/15 08:53:26 tsutsui Exp $);
#include sys/param.h
#include sys/conf.h
@@ -139,6 +139,7 @@
if (is_console) {
sc-sc_fb = console_dev;
+ sc-sc_fb-fb_ri.ri_flg = ~RI_NO_AUTO;
} else {
sc-sc_fb = malloc(sizeof(struct fb_dev), M_DEVBUF, M_WAITOK);
memset(sc-sc_fb, 0, sizeof(struct fb_dev));
Index: src/sys/arch/ews4800mips/sbd/fb_sbdio.c
diff -u src/sys/arch/ews4800mips/sbd/fb_sbdio.c:1.9 src/sys/arch/ews4800mips/sbd/fb_sbdio.c:1.10
--- src/sys/arch/ews4800mips/sbd/fb_sbdio.c:1.9 Sat May 15 06:39:06 2010
+++ src/sys/arch/ews4800mips/sbd/fb_sbdio.c Sat May 15 08:53:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fb_sbdio.c,v 1.9 2010/05/15 06:39:06 tsutsui Exp $ */
+/* $NetBSD: fb_sbdio.c,v 1.10 2010/05/15 08:53:27 tsutsui Exp $ */
/*-
* Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#define WIRED_FB_TLB
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fb_sbdio.c,v 1.9 2010/05/15 06:39:06 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: fb_sbdio.c,v 1.10 2010/05/15 08:53:27 tsutsui Exp $);
#include sys/param.h
#include sys/systm.h
@@ -141,6 +141,7 @@
if (console) {
/* already initialized in fb_cnattach() */
sc-sc_ri = ri = fb_console_ri;
+ ri-ri_flg = ~RI_NO_AUTO;
sc-sc_ga = fb_console_ga;
sc-sc_nscreens = 1;
} else {
Index: src/sys/dev/hpc/hpcfb.c
diff -u src/sys/dev/hpc/hpcfb.c:1.54 src/sys/dev/hpc/hpcfb.c:1.55
--- src/sys/dev/hpc/hpcfb.c:1.54 Sat May 15 06:01:12 2010
+++ src/sys/dev/hpc/hpcfb.c Sat May 15 08:53:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcfb.c,v 1.54 2010/05/15 06:01:12 tsutsui Exp $ */
+/* $NetBSD: hpcfb.c,v 1.55 2010/05/15 08:53:27 tsutsui Exp $ */
/*-
* Copyright (c) 1999
@@ -43,7 +43,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hpcfb.c,v 1.54 2010/05/15 06:01:12 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: hpcfb.c,v 1.55 2010/05/15 08:53:27 tsutsui Exp $);
#ifdef _KERNEL_OPT
#include opt_hpcfb.h
@@ -305,6 +305,7 @@
if (hpcfbconsole) {
sc-sc_dc = hpcfb_console_dc;
+ sc-sc_dc-dc_rinfo.ri_flg = ~RI_NO_AUTO;
hpcfb_console_dc.dc_sc = sc;
printf(: %dx%d pixels, %d colors, %dx%d chars,
CVS commit: xsrc/external/mit/xkeyboard-config/dist
Module Name:xsrc
Committed By: nonaka
Date: Sat May 15 15:33:30 UTC 2010
Modified Files:
xsrc/external/mit/xkeyboard-config/dist/rules: base
xsrc/external/mit/xkeyboard-config/dist/symbols: symbols.dir
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr: Makefile.am
Added Files:
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr: ws003sh
ws007sh
Log Message:
Added keyboard config files for Sharp WS003SH/WS007SH.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xkeyboard-config/dist/rules/base
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir
cvs rdiff -u -r1.1 -r1.2 \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.am
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws003sh \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws007sh
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/xkeyboard-config/dist/rules/base
diff -u xsrc/external/mit/xkeyboard-config/dist/rules/base:1.2 xsrc/external/mit/xkeyboard-config/dist/rules/base:1.3
--- xsrc/external/mit/xkeyboard-config/dist/rules/base:1.2 Sun Dec 13 04:54:51 2009
+++ xsrc/external/mit/xkeyboard-config/dist/rules/base Sat May 15 15:33:30 2010
@@ -307,6 +307,8 @@
olpc * = olpc+%l%(v)
thinkpad br = pc+br(thinkpad)
sl-c3x00 * = pc+sharp_vndr/sl-c3x00(basic)
+ ws003sh * = pc+sharp_vndr/ws003sh(basic)
+ ws007sh * = pc+sharp_vndr/ws007sh(basic)
* $nonlatin = pc+us+%l%(v):2
* * = pc+%l%(v)
Index: xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir:1.2 xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir:1.3
--- xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir:1.2 Sun Dec 13 04:54:51 2009
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir Sat May 15 15:33:30 2010
@@ -849,3 +849,5 @@
--p- a--- gh(hausa)
--p- a--- gh(generic)
-dp- a--- sharp_vndr/sl-c3x00(basic)
+-dp- a--- sharp_vndr/ws003sh(basic)
+-dp- a--- sharp_vndr/ws007sh(basic)
Index: xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.am
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.am:1.1 xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.am:1.2
--- xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.am:1.1 Sun Dec 13 04:54:51 2009
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.am Sat May 15 15:33:30 2010
@@ -1,4 +1,6 @@
symbolsdir = $(xkb_base)/symbols/sharp_vndr
dist_symbols_DATA = \
-sl-c3x00
+sl-c3x00 \
+ws003sh \
+ws007sh
Added files:
Index: xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws003sh
diff -u /dev/null xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws003sh:1.1
--- /dev/null Sat May 15 15:33:30 2010
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/ws003sh Sat May 15 15:33:30 2010
@@ -0,0 +1,73 @@
+// $NetBSD: ws003sh,v 1.1 2010/05/15 15:33:30 nonaka Exp $
+
+partial default alphanumeric_keys
+xkb_symbols basic {
+ name[Group1]= Sharp WS003SH;
+
+ // Upper row
+ key AE01 { [ 1, exclam ] };
+ key AE02 { [ 2, quotedbl ] };
+ key AE03 { [ 3, numbersign ] };
+ key AE04 { [ 4, dollar ] };
+ key AE05 { [ 5, percent ] };
+ key AE06 { [ 6, ampersand ] };
+ key AE07 { [ 7, quoteright, quoteleft ] };
+ key AE08 { [ 8, parenleft, braceleft ] };
+ key AE09 { [ 9, parenright, braceright ] };
+ key AE10 { [ 0 ] };
+ key AE11 { [ minus, equal, backslash ] };
+ key BKSP { [ BackSpace, BackSpace, Delete ] };
+
+ key AD01 { [ q, Q ] };
+ key AD02 { [ w, W, asciicircum ] };
+ key AD03 { [ e, E, asciitilde ] };
+ key AD04 { [ r, R, bar ] };
+ key AD05 { [ t, T ] };
+ key AD06 { [ y, Y ] };
+ key AD07 { [ u, U, bracketleft ] };
+ key AD08 { [ i, I, bracketright ] };
+ key AD09 { [ o, O, underscore ] };
+ key AD10 { [ p, P, at ] };
+
+ key TAB { [ Tab, Tab, Escape ] };
+
+ key AC01 { [ a, A ] };
+ key AC02 { [ s, S ] };
+ key AC03 { [ d, D ] };
+ key AC04 { [ f, F ] };
+ key AC05 { [ g, G ] };
+ key AC06 { [ h, H ] };
+ key AC07 { [ j, J ] };
+ key AC08 { [ k, K, plus ] };
+ key AC09 { [ l, L, asterisk ] };
+
+ key LFSH { [ Shift_L ] };
+ key AB01 { [ z, Z ] };
+ key AB02 { [ x, X ] };
+ key AB03 { [ c, C ] };
+ key AB04 { [ v, V ] };
+ key AB05 { [ b, B ] };
+ key AB06 { [ n, N ] };
+ key AB07 { [ m, M ] };
+ key AB08 { [ comma, semicolon, less ] };
+ key AB09 { [ period, colon, greater ] };
+ key AB10 { [ slash, question ] };
+ key RTSH { [ Shift_R ] };
+ key RTRN { [ Return ] };
+
+ key RALT { [ ISO_Level3_Shift ] };
+
+ key LCTL { [ Control_L ] };
+ key SPCE { [ space ] };
+ // End alphanumeric section
+
+ // keypad
+ key UP { [ Up, Up, Prior
CVS commit: src/sys/arch/pmax/ibus
Module Name:src
Committed By: tsutsui
Date: Sat May 15 20:31:10 UTC 2010
Modified Files:
src/sys/arch/pmax/ibus: pm.c
Log Message:
Set RI_NO_AUTO in ri_flg if init function is invoked from cnattach.
Untested. (3100 support seems somewhat broken, per gxemul output)
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/pmax/ibus/pm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/pmax/ibus/pm.c
diff -u src/sys/arch/pmax/ibus/pm.c:1.7 src/sys/arch/pmax/ibus/pm.c:1.8
--- src/sys/arch/pmax/ibus/pm.c:1.7 Mon May 26 10:31:22 2008
+++ src/sys/arch/pmax/ibus/pm.c Sat May 15 20:31:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pm.c,v 1.7 2008/05/26 10:31:22 nisimura Exp $ */
+/* $NetBSD: pm.c,v 1.8 2010/05/15 20:31:10 tsutsui Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pm.c,v 1.7 2008/05/26 10:31:22 nisimura Exp $);
+__KERNEL_RCSID(0, $NetBSD: pm.c,v 1.8 2010/05/15 20:31:10 tsutsui Exp $);
#include sys/param.h
#include sys/systm.h
@@ -171,9 +171,10 @@
ri = pm_ri;
console = (ri-ri_bits != NULL);
- if (console)
+ if (console) {
sc-sc_nscreens = 1;
- else
+ ri-ri_flg = ~RI_NO_AUTO;
+ } else
pm_common_init();
printf(: %dx%d, %dbpp\n, ri-ri_width, ri-ri_height, ri-ri_depth);
@@ -243,6 +244,8 @@
ri = pm_ri;
ri-ri_flg = RI_CENTER;
+ if (ri-ri_bits == NULL)
+ ri-ri_flg |= RI_NO_AUTO;
ri-ri_depth = ((kn01csr KN01_CSR_MONO) != 0 ? 1 : 8);
ri-ri_width = 1024;
ri-ri_height = 864;
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jakllsch
Date: Sat May 15 20:45:43 UTC 2010
Modified Files:
src/sys/dev/usb: usb.h
Log Message:
Add Debug Descriptor structures and constants,
as well as symbolic identifiers for USB packet IDs.
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/dev/usb/usb.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usb.h
diff -u src/sys/dev/usb/usb.h:1.84 src/sys/dev/usb/usb.h:1.85
--- src/sys/dev/usb/usb.h:1.84 Sat Mar 6 21:07:47 2010
+++ src/sys/dev/usb/usb.h Sat May 15 20:45:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.h,v 1.84 2010/03/06 21:07:47 plunky Exp $ */
+/* $NetBSD: usb.h,v 1.85 2010/05/15 20:45:43 jakllsch Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb.h,v 1.14 1999/11/17 22:33:46 n_hibma Exp $ */
/*
@@ -197,6 +197,7 @@
#define UDESC_OTHER_SPEED_CONFIGURATION 0x07
#define UDESC_INTERFACE_POWER 0x08
#define UDESC_OTG 0x09
+#define UDESC_DEBUG 0x0a
#define UDESC_CS_DEVICE 0x21 /* class specific */
#define UDESC_CS_CONFIG 0x22
#define UDESC_CS_STRING 0x23
@@ -395,6 +396,13 @@
#define UOTG_A_ALT_HNP_SUPPORT 5
typedef struct {
+ uByte bLength;
+ uByte bDescriptorType;
+ uByte bDebugInEndpoint;
+ uByte bDebugOutEndpoint;
+} UPACKED usb_debug_descriptor_t;
+
+typedef struct {
uWord wStatus;
/* Device status flags */
#define UDS_SELF_POWERED 0x0001
@@ -577,6 +585,27 @@
#define USB_UNCONFIG_NO 0
#define USB_UNCONFIG_INDEX (-1)
+
+/* Packet IDs */
+#define UPID_RESERVED 0xf0
+#define UPID_OUT 0xe1
+#define UPID_ACK 0xd2
+#define UPID_DATA0 0xc3
+#define UPID_PING 0xb4
+#define UPID_SOF 0xa5
+#define UPID_NYET 0x96
+#define UPID_DATA2 0x87
+#define UPID_SPLIT 0x78
+#define UPID_IN 0x69
+#define UPID_NAK 0x5a
+#define UPID_DATA1 0x4b
+#define UPID_ERR 0x3c
+#define UPID_PREAMBLE 0x3c
+#define UPID_SETUP 0x2d
+#define UPID_STALL 0x1e
+#define UPID_MDATA 0x0f
+
+
/*** ioctl() related stuff ***/
struct usb_ctl_request {
CVS commit: src/games/factor
Module Name:src
Committed By: joerg
Date: Sat May 15 21:22:39 UTC 2010
Modified Files:
src/games/factor: factor.6 factor.c
Log Message:
Follow the Fundamental Theory of Algebra. Disallow factorising of
numbers less than 2 as it is not
- naturally unique (negative numbers)
- finite (0)
- non-empty (1)
Discussed with the kristaps and wiz
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/games/factor/factor.6
cvs rdiff -u -r1.23 -r1.24 src/games/factor/factor.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/factor/factor.6
diff -u src/games/factor/factor.6:1.11 src/games/factor/factor.6:1.12
--- src/games/factor/factor.6:1.11 Thu Apr 22 06:57:13 2010
+++ src/games/factor/factor.6 Sat May 15 21:22:39 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: factor.6,v 1.11 2010/04/22 06:57:13 wiz Exp $
+.\ $NetBSD: factor.6,v 1.12 2010/05/15 21:22:39 joerg Exp $
.\
.\ Copyright (c) 1989, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -37,7 +37,7 @@
.\
.\ chongo for a good prime call: 391581 * 2^216193 - 1 /\oo/\
.\
-.Dd April 22, 2010
+.Dd May 15, 2010
.Dt FACTOR 6
.Os
.Sh NAME
@@ -49,7 +49,7 @@
.Sh DESCRIPTION
The
.Nm
-utility factors positive integers.
+utility factors integers larger than 1.
When a number is factored, it is printed, followed by a
.Dq \: ,
and the list of
@@ -68,8 +68,8 @@
.Nm
reads numbers, one per line, from standard input, until end of file or error.
Leading white-space and empty lines are ignored.
-Numbers may be preceded by a single \- or +, although negative numbers
-are rejected.
+Numbers may be preceded by a single +.
+Integer less than 2 are rejected.
Numbers are terminated by a non-digit character (such as a newline).
After a number is read, it is factored.
Input lines must not be longer than
Index: src/games/factor/factor.c
diff -u src/games/factor/factor.c:1.23 src/games/factor/factor.c:1.24
--- src/games/factor/factor.c:1.23 Thu May 13 17:52:11 2010
+++ src/games/factor/factor.c Sat May 15 21:22:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: factor.c,v 1.23 2010/05/13 17:52:11 tnozaki Exp $ */
+/* $NetBSD: factor.c,v 1.24 2010/05/15 21:22:39 joerg Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = @(#)factor.c 8.4 (Berkeley) 5/4/95;
#else
-__RCSID($NetBSD: factor.c,v 1.23 2010/05/13 17:52:11 tnozaki Exp $);
+__RCSID($NetBSD: factor.c,v 1.24 2010/05/15 21:22:39 joerg Exp $);
#endif
#endif /* not lint */
@@ -177,7 +177,7 @@
else
for (; *argv != NULL; ++argv) {
if (argv[0][0] == '-')
-errx(1, negative numbers aren't permitted.);
+errx(1, numbers = 1 aren't permitted.);
if (BN_dec2bn(val, argv[0]) == 0)
errx(1, %s: illegal numeric format., argv[0]);
pr_fact(val);
@@ -204,12 +204,8 @@
const ubig *fact; /* The factor found. */
/* Firewall - catch 0 and 1. */
- if (BN_is_zero(val)) /* Historical practice; 0 just exits. */
- exit(0);
- if (BN_is_one(val)) {
- printf(1: 1\n);
- return;
- }
+ if (BN_is_zero(val) || BN_is_one(val))
+ errx(1, numbers = 1 aren't permitted.);
/* Factor value. */
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/include
Module Name:src
Committed By: matt
Date: Sat May 15 23:11:38 UTC 2010
Modified Files:
src/sys/arch/mips/include [matt-nb5-mips64]: intr.h
Log Message:
Make sure we have a spare cell at the sr_map to make splintr will stop.
To generate a diff of this commit:
cvs rdiff -u -r1.3.96.10 -r1.3.96.11 src/sys/arch/mips/include/intr.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/include/intr.h
diff -u src/sys/arch/mips/include/intr.h:1.3.96.10 src/sys/arch/mips/include/intr.h:1.3.96.11
--- src/sys/arch/mips/include/intr.h:1.3.96.10 Wed Mar 24 19:23:02 2010
+++ src/sys/arch/mips/include/intr.h Sat May 15 23:11:38 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.3.96.10 2010/03/24 19:23:02 cliff Exp $ */
+/* $NetBSD: intr.h,v 1.3.96.11 2010/05/15 23:11:38 matt Exp $ */
/*-
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -83,7 +83,7 @@
};
struct ipl_sr_map {
- uint32_t sr_bits[_IPL_N];
+ uint32_t sr_bits[_IPL_N+1];
};
#else
struct splsw;
CVS commit: src/share/man/man9
Module Name:src Committed By: jruoho Date: Sun May 16 05:18:35 UTC 2010 Modified Files: src/share/man/man9: kmem.9 sysctl.9 xcall.9 Log Message: IMPLEMENTATION NOTES back to NOTES. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/share/man/man9/kmem.9 cvs rdiff -u -r1.16 -r1.17 src/share/man/man9/sysctl.9 cvs rdiff -u -r1.5 -r1.6 src/share/man/man9/xcall.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/kmem.9 diff -u src/share/man/man9/kmem.9:1.9 src/share/man/man9/kmem.9:1.10 --- src/share/man/man9/kmem.9:1.9 Fri May 14 18:52:46 2010 +++ src/share/man/man9/kmem.9 Sun May 16 05:18:35 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: kmem.9,v 1.9 2010/05/14 18:52:46 jruoho Exp $ +.\ $NetBSD: kmem.9,v 1.10 2010/05/16 05:18:35 jruoho Exp $ .\ .\ Copyright (c)2006 YAMAMOTO Takashi, .\ All rights reserved. @@ -25,7 +25,7 @@ .\ SUCH DAMAGE. .\ .\ -.Dd May 14, 2010 +.Dd May 16, 2010 .Dt KMEM 9 .Os .\ @@ -136,7 +136,7 @@ .Dv NULL is illegal. .\ -.Sh IMPLEMENTATION NOTES +.Sh NOTES Making .Dv KM_SLEEP allocations while holding mutexes or reader/writer locks is discouraged, as the Index: src/share/man/man9/sysctl.9 diff -u src/share/man/man9/sysctl.9:1.16 src/share/man/man9/sysctl.9:1.17 --- src/share/man/man9/sysctl.9:1.16 Fri May 14 18:52:46 2010 +++ src/share/man/man9/sysctl.9 Sun May 16 05:18:35 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: sysctl.9,v 1.16 2010/05/14 18:52:46 jruoho Exp $ +.\ $NetBSD: sysctl.9,v 1.17 2010/05/16 05:18:35 jruoho Exp $ .\ .\ Copyright (c) 2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd May 14, 2010 +.Dd May 16, 2010 .Dt SYSCTL 9 .Os .Sh NAME @@ -613,7 +613,7 @@ .Fa oldp are interpreted as kernel addresses, and access is performed as for the superuser. -.Sh IMPLEMENTATION NOTES +.Sh NOTES It is expected that nodes will be added to (or removed from) the tree during the following stages of a machine's lifetime: .Pp Index: src/share/man/man9/xcall.9 diff -u src/share/man/man9/xcall.9:1.5 src/share/man/man9/xcall.9:1.6 --- src/share/man/man9/xcall.9:1.5 Fri May 14 18:52:46 2010 +++ src/share/man/man9/xcall.9 Sun May 16 05:18:35 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: xcall.9,v 1.5 2010/05/14 18:52:46 jruoho Exp $ +.\ $NetBSD: xcall.9,v 1.6 2010/05/16 05:18:35 jruoho Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd May 14, 2010 +.Dd May 16, 2010 .Dt XCALL 9 .Os .Sh NAME @@ -81,7 +81,7 @@ not interrupting other code running on the CPU, and so has exclusive access to the CPU. Keep in mind that unless disabled, it may cause a kernel preemption. -.Sh IMPLEMENTATION NOTES +.Sh NOTES Functions being called should be relatively lightweight. They may block on locks, but carefully and minimally, to not interfere with other cross calls in the system.
