From owner-p4-projects@FreeBSD.ORG Sun May 6 13:45:22 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D1601065672; Sun, 6 May 2012 13:45:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D3D8E106566B for ; Sun, 6 May 2012 13:45:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id BB3888FC0C for ; Sun, 6 May 2012 13:45:21 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q46DjLwZ096226 for ; Sun, 6 May 2012 13:45:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q46DjL7W096223 for perforce@freebsd.org; Sun, 6 May 2012 13:45:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 6 May 2012 13:45:21 GMT Message-Id: <201205061345.q46DjL7W096223@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 210729 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 May 2012 13:45:22 -0000 http://p4web.freebsd.org/@@210729?ac=10 Change 210729 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/05/06 13:44:17 Hook up a getty to ttyv0 on FreeBSD/beri. Affected files ... .. //depot/projects/ctsrd/beribsd/src/etc/etc.mips/ttys#2 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/etc/etc.mips/ttys#2 (text+ko) ==== @@ -28,6 +28,17 @@ # If console is marked "insecure", then init will ask for the root password # when going to single-user mode. console none unknown off secure +# +ttyv0 "/usr/libexec/getty Pc" xterm on secure +# Virtual terminals +ttyv1 "/usr/libexec/getty Pc" xterm off secure +ttyv2 "/usr/libexec/getty Pc" xterm off secure +ttyv3 "/usr/libexec/getty Pc" xterm off secure +ttyv4 "/usr/libexec/getty Pc" xterm off secure +ttyv5 "/usr/libexec/getty Pc" xterm off secure +ttyv6 "/usr/libexec/getty Pc" xterm off secure +ttyv7 "/usr/libexec/getty Pc" xterm off secure +ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ttyu0 "/usr/libexec/getty std.115200" dialup on secure From owner-p4-projects@FreeBSD.ORG Sun May 6 13:50:52 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E12071065672; Sun, 6 May 2012 13:50:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A3665106566C for ; Sun, 6 May 2012 13:50:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 50A4C8FC0A for ; Sun, 6 May 2012 13:50:51 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q46Dop9L096917 for ; Sun, 6 May 2012 13:50:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q46DopGZ096912 for perforce@freebsd.org; Sun, 6 May 2012 13:50:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 6 May 2012 13:50:51 GMT Message-Id: <201205061350.q46DopGZ096912@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 210730 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 May 2012 13:50:52 -0000 http://p4web.freebsd.org/@@210730?ac=10 Change 210730 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/05/06 13:49:47 Fix a driver bug in which the character and attribute data were byte order swapped. Define a number of useful constants for working with the MTL display, such as sub-field offsets in the blend register, MTL colour definitions, alpha-blending, etc. Add a softc mutex used to serialise read-modify-write sequences on MTL control registers. Add C functions to separately set sub-fields of the MTL blend register. After the MTL syscons attachment has initialised, set the blend register to just display the text frame buffer. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl.c#3 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl.h#4 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_reg.c#4 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_text.c#4 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl.c#3 (text+ko) ==== @@ -84,6 +84,10 @@ error = terasic_mtl_syscons_attach(sc); if (error == 0) return (0); + terasic_mtl_blend_default_set(sc, TERASIC_MTL_COLOR_BLACK); + terasic_mtl_blend_pixel_set(sc, TERASIC_MTL_ALPHA_TRANSPARENT); + terasic_mtl_blend_textfg_set(sc, TERASIC_MTL_ALPHA_OPAQUE); + terasic_mtl_blend_textbg_set(sc, TERASIC_MTL_ALPHA_OPAQUE); error: terasic_mtl_text_detach(sc); terasic_mtl_pixel_detach(sc); ==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl.h#4 (text+ko) ==== @@ -46,6 +46,13 @@ int mtl_unit; /* + * The MTL driver doesn't require a lot of synchronisation; however, + * the lock is used to protect read-modify-write operations on MTL + * registers. + */ + struct mtx mtl_lock; + + /* * Control register device -- mappable from userspace. */ struct cdev *mtl_reg_cdev; @@ -69,6 +76,13 @@ uint16_t *mtl_text_soft; }; +#define TERASIC_MTL_LOCK(sc) mtx_lock(&(sc)->mtl_lock) +#define TERASIC_MTL_LOCK_ASSERT(sc) mtx_assert(&(sc)->mtl_lock, MA_OWNED) +#define TERASIC_MTL_LOCK_DESTROY(sc) mtx_destroy(&(sc)->mtl_lock) +#define TERASIC_MTL_LOCK_INIT(sc) mtx_init(&(sc)->mtl_lock, \ + "terasic_mtl", NULL, MTX_DEF) +#define TERASIC_MTL_UNLOCK(sc) mtx_unlock(&(sc)->mtl_lock) + /* * Constant properties of the MTL text frame buffer. */ @@ -78,7 +92,7 @@ /* * MTL control register offsets. */ -#define TERASIC_MTL_OFF_FRAMEBLENDING 0 +#define TERASIC_MTL_OFF_BLEND 0 #define TERASIC_MTL_OFF_TEXTCURSOR 4 #define TERASIC_MTL_OFF_TEXTFRAMEBUFADDR 8 #define TERASIC_MTL_OFF_TOUCHPOINT_X1 12 @@ -90,15 +104,51 @@ /* * Constants to help interpret various control registers. */ +#define TERASIC_MTL_BLEND_DEFAULT_MASK 0x0f000000 +#define TERASIC_MTL_BLEND_DEFAULT_SHIFT 24 +#define TERASIC_MTL_BLEND_PIXEL_MASK 0x00ff0000 +#define TERASIC_MTL_BLEND_PIXEL_SHIFT 16 +#define TERASIC_MTL_BLEND_TEXTFG_MASK 0x0000ff00 +#define TERASIC_MTL_BLEND_TEXTFG_SHIFT 8 +#define TERASIC_MTL_BLEND_TEXTBG_MASK 0x000000ff +#define TERASIC_MTL_BLEND_TEXTBG_SHIFT 0 #define TERASIC_MTL_TEXTCURSOR_COL_MASK 0xff00 #define TERASIC_MTL_TEXTCURSOR_COL_SHIFT 8 #define TERASIC_MTL_TEXTCURSOR_ROW_MASK 0xff /* + * Colours used both by VGA-like text rendering, and for the default display + * colour. + */ +#define TERASIC_MTL_COLOR_BLACK 0 +#define TERASIC_MTL_COLOR_DARKBLUE 1 +#define TERASIC_MTL_COLOR_DARKGREEN 2 +#define TERASIC_MTL_COLOR_DARKCYAN 3 +#define TERASIC_MTL_COLOR_DARKRED 4 +#define TERASIC_MTL_COLOR_DARKMAGENTA 5 +#define TERASIC_MTL_COLOR_BROWN 6 +#define TERASIC_MTL_COLOR_LIGHTGREY 7 +#define TERASIC_MTL_COLOR_DARKGREY 8 +#define TERASIC_MTL_COLOR_LIGHTBLUE 9 +#define TERASIC_MTL_COLOR_LIGHTGREEN 10 +#define TERASIC_MTL_COLOR_LIGHTCYAN 11 +#define TERASIC_MTL_COLOR_LIGHTRED 12 +#define TERASIC_MTL_COLOR_LIGHTMAGENTA 13 +#define TERASIC_MTL_COLOR_LIGHTYELLOW 14 +#define TERASIC_MTL_COLOR_WHITE 15 +#define TERASIC_MTL_COLORMASK_BLINK 0x80 + +/* * Constants to help interpret the text frame buffer. */ -#define TERASIC_MTL_TEXTFRAMEBUF_CHAR_SHIFT 8 -#define TERASIC_MTL_TEXTFRAMEBUF_ATTR_SHIFT 0 +#define TERASIC_MTL_TEXTFRAMEBUF_CHAR_SHIFT 0 +#define TERASIC_MTL_TEXTFRAMEBUF_ATTR_SHIFT 8 + +/* + * Alpha-blending constants. + */ +#define TERASIC_MTL_ALPHA_TRANSPARENT 0 +#define TERASIC_MTL_ALPHA_OPAQUE 255 /* * Driver setup routines from the bus attachment/teardown. @@ -122,6 +172,11 @@ * Control register I/O routines. */ void terasic_mtl_reg_blank(struct terasic_mtl_softc *sc); + +void terasic_mtl_reg_blend_get(struct terasic_mtl_softc *sc, + uint32_t *blendp); +void terasic_mtl_reg_blend_set(struct terasic_mtl_softc *sc, + uint32_t blend); void terasic_mtl_reg_textcursor_get(struct terasic_mtl_softc *sc, uint8_t *colp, uint8_t *rowp); void terasic_mtl_reg_textcursor_set(struct terasic_mtl_softc *sc, @@ -132,6 +187,18 @@ uint32_t addr); /* + * Read-modify-write updates of sub-bytes of the blend register. + */ +void terasic_mtl_blend_default_set(struct terasic_mtl_softc *sc, + uint8_t colour); +void terasic_mtl_blend_pixel_set(struct terasic_mtl_softc *sc, + uint8_t alpha); +void terasic_mtl_blend_textfg_set(struct terasic_mtl_softc *sc, + uint8_t alpha); +void terasic_mtl_blend_textbg_set(struct terasic_mtl_softc *sc, + uint8_t alpha); + +/* * Text frame buffer I/O routines. */ void terasic_mtl_text_putc(struct terasic_mtl_softc *sc, u_int x, u_int y, ==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_reg.c#4 (text+ko) ==== @@ -139,6 +139,68 @@ } void +terasic_mtl_reg_blend_get(struct terasic_mtl_softc *sc, uint32_t *blendp) +{ + + *blendp = le32toh(bus_read_4(sc->mtl_reg_res, TERASIC_MTL_OFF_BLEND)); +} + +void +terasic_mtl_reg_blend_set(struct terasic_mtl_softc *sc, uint32_t blend) +{ + + bus_write_4(sc->mtl_reg_res, TERASIC_MTL_OFF_BLEND, htole32(blend)); +} + +void +terasic_mtl_blend_default_set(struct terasic_mtl_softc *sc, uint8_t colour) +{ + uint32_t v; + + TERASIC_MTL_LOCK(sc); + terasic_mtl_reg_blend_get(sc, &v); + v &= ~TERASIC_MTL_BLEND_DEFAULT_MASK; + v |= colour << TERASIC_MTL_BLEND_DEFAULT_SHIFT; + TERASIC_MTL_UNLOCK(sc); +} + +void +terasic_mtl_blend_pixel_set(struct terasic_mtl_softc *sc, uint8_t alpha) +{ + uint32_t v; + + TERASIC_MTL_LOCK(sc); + terasic_mtl_reg_blend_get(sc, &v); + v &= ~TERASIC_MTL_BLEND_PIXEL_MASK; + v |= alpha << TERASIC_MTL_BLEND_PIXEL_SHIFT; + TERASIC_MTL_UNLOCK(sc); +} + +void +terasic_mtl_blend_textfg_set(struct terasic_mtl_softc *sc, uint8_t alpha) +{ + uint32_t v; + + TERASIC_MTL_LOCK(sc); + terasic_mtl_reg_blend_get(sc, &v); + v &= ~TERASIC_MTL_BLEND_TEXTFG_MASK; + v |= alpha << TERASIC_MTL_BLEND_TEXTFG_SHIFT; + TERASIC_MTL_UNLOCK(sc); +} + +void +terasic_mtl_blend_textbg_set(struct terasic_mtl_softc *sc, uint8_t alpha) +{ + uint32_t v; + + TERASIC_MTL_LOCK(sc); + terasic_mtl_reg_blend_get(sc, &v); + v &= ~TERASIC_MTL_BLEND_TEXTBG_MASK; + v |= alpha << TERASIC_MTL_BLEND_TEXTBG_SHIFT; + TERASIC_MTL_UNLOCK(sc); +} + +void terasic_mtl_reg_textcursor_get(struct terasic_mtl_softc *sc, uint8_t *colp, uint8_t *rowp) { ==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_text.c#4 (text+ko) ==== @@ -188,6 +188,7 @@ return (ENXIO); } /* XXXRW: Slight race between make_dev(9) and here. */ + TERASIC_MTL_LOCK_INIT(sc); sc->mtl_text_cdev->si_drv1 = sc; return (0); } @@ -196,6 +197,8 @@ terasic_mtl_text_detach(struct terasic_mtl_softc *sc) { - if (sc->mtl_text_cdev != NULL) + if (sc->mtl_text_cdev != NULL) { destroy_dev(sc->mtl_text_cdev); + TERASIC_MTL_LOCK_DESTROY(sc); + } } From owner-p4-projects@FreeBSD.ORG Sun May 6 17:46:11 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87C191065674; Sun, 6 May 2012 17:46:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 497D71065670 for ; Sun, 6 May 2012 17:46:11 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 18BA88FC12 for ; Sun, 6 May 2012 17:46:11 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q46HkAkt043756 for ; Sun, 6 May 2012 17:46:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q46HkAwB043753 for perforce@freebsd.org; Sun, 6 May 2012 17:46:10 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 6 May 2012 17:46:10 GMT Message-Id: <201205061746.q46HkAwB043753@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 210745 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 May 2012 17:46:11 -0000 http://p4web.freebsd.org/@@210745?ac=10 Change 210745 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/05/06 17:46:02 Fix several nits in the initialisation and writing of the blend register by the MTL driver. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl.c#4 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_reg.c#5 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl.c#4 (text+ko) ==== @@ -82,12 +82,13 @@ * last. */ error = terasic_mtl_syscons_attach(sc); - if (error == 0) - return (0); + if (error) + goto error; terasic_mtl_blend_default_set(sc, TERASIC_MTL_COLOR_BLACK); terasic_mtl_blend_pixel_set(sc, TERASIC_MTL_ALPHA_TRANSPARENT); terasic_mtl_blend_textfg_set(sc, TERASIC_MTL_ALPHA_OPAQUE); terasic_mtl_blend_textbg_set(sc, TERASIC_MTL_ALPHA_OPAQUE); + return (0); error: terasic_mtl_text_detach(sc); terasic_mtl_pixel_detach(sc); ==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_reg.c#5 (text+ko) ==== @@ -161,6 +161,7 @@ terasic_mtl_reg_blend_get(sc, &v); v &= ~TERASIC_MTL_BLEND_DEFAULT_MASK; v |= colour << TERASIC_MTL_BLEND_DEFAULT_SHIFT; + terasic_mtl_reg_blend_set(sc, v); TERASIC_MTL_UNLOCK(sc); } @@ -173,6 +174,7 @@ terasic_mtl_reg_blend_get(sc, &v); v &= ~TERASIC_MTL_BLEND_PIXEL_MASK; v |= alpha << TERASIC_MTL_BLEND_PIXEL_SHIFT; + terasic_mtl_reg_blend_set(sc, v); TERASIC_MTL_UNLOCK(sc); } @@ -185,6 +187,7 @@ terasic_mtl_reg_blend_get(sc, &v); v &= ~TERASIC_MTL_BLEND_TEXTFG_MASK; v |= alpha << TERASIC_MTL_BLEND_TEXTFG_SHIFT; + terasic_mtl_reg_blend_set(sc, v); TERASIC_MTL_UNLOCK(sc); } @@ -197,6 +200,7 @@ terasic_mtl_reg_blend_get(sc, &v); v &= ~TERASIC_MTL_BLEND_TEXTBG_MASK; v |= alpha << TERASIC_MTL_BLEND_TEXTBG_SHIFT; + terasic_mtl_reg_blend_set(sc, v); TERASIC_MTL_UNLOCK(sc); } From owner-p4-projects@FreeBSD.ORG Mon May 7 03:43:20 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69DB61065673; Mon, 7 May 2012 03:43:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1D31E106566C for ; Mon, 7 May 2012 03:43:20 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id C63DB8FC12 for ; Mon, 7 May 2012 03:43:19 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q473hJMG077898 for ; Mon, 7 May 2012 03:43:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q473hJSI077894 for perforce@freebsd.org; Mon, 7 May 2012 03:43:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 7 May 2012 03:43:19 GMT Message-Id: <201205070343.q473hJSI077894@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 210763 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 May 2012 03:43:20 -0000 http://p4web.freebsd.org/@@210763?ac=10 Change 210763 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/05/07 03:42:28 Allow boothowto and bootverbose to be set via kernel options, which is useful on architectures that are unable to rely on a boot loader to pass configuration variables to the kernel. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/conf/NOTES#3 edit .. //depot/projects/ctsrd/beribsd/src/sys/conf/options#3 edit .. //depot/projects/ctsrd/beribsd/src/sys/kern/init_main.c#2 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/conf/NOTES#3 (text+ko) ==== @@ -139,6 +139,12 @@ # options INCLUDE_CONFIG_FILE # Include this file in kernel +# +# Compile-time defaults for various boot parameters +# +options BOOTVERBOSE=1 +options BOOTHOWTO=RB_MULTIPLE + options GEOM_AES # Don't use, use GEOM_BDE options GEOM_BDE # Disk encryption. options GEOM_BSD # BSD disklabels ==== //depot/projects/ctsrd/beribsd/src/sys/conf/options#3 (text+ko) ==== @@ -66,6 +66,8 @@ ADAPTIVE_LOCKMGRS ALQ AUDIT opt_global.h +BOOTHOWTO opt_global.h +BOOTVERBOSE opt_global.h CAPABILITIES opt_capsicum.h CAPABILITY_MODE opt_capsicum.h CODA_COMPAT_5 opt_coda.h ==== //depot/projects/ctsrd/beribsd/src/sys/kern/init_main.c#2 (text+ko) ==== @@ -101,10 +101,17 @@ struct vmspace vmspace0; struct proc *initproc; -int boothowto = 0; /* initialized so that it can be patched */ +#ifndef BOOTHOWTO +#define BOOTHOWTO 0 +#endif +int boothowto = BOOTHOWTO; /* initialized so that it can be patched */ SYSCTL_INT(_debug, OID_AUTO, boothowto, CTLFLAG_RD, &boothowto, 0, "Boot control flags, passed from loader"); -int bootverbose; + +#ifndef BOOTVERBOSE +#define BOOTVERBOSE 0 +#endif +int bootverbose = BOOTVERBOSE; SYSCTL_INT(_debug, OID_AUTO, bootverbose, CTLFLAG_RW, &bootverbose, 0, "Control the output of verbose kernel messages"); From owner-p4-projects@FreeBSD.ORG Mon May 7 13:33:33 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 204C01065672; Mon, 7 May 2012 13:33:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D6EA0106566B for ; Mon, 7 May 2012 13:33:32 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id BF1DB8FC19 for ; Mon, 7 May 2012 13:33:32 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q47DXWxJ097095 for ; Mon, 7 May 2012 13:33:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q47DXWHF097092 for perforce@freebsd.org; Mon, 7 May 2012 13:33:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 7 May 2012 13:33:32 GMT Message-Id: <201205071333.q47DXWHF097092@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 210786 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 May 2012 13:33:33 -0000 http://p4web.freebsd.org/@@210786?ac=10 Change 210786 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/05/07 13:33:13 Check for the RB_SERIAL boot flag and change the relative priority of the gxemul console and Altera JTAG UART in line with their role as "serial consoles" on their respective platforms. This allows them to override video console drivers that might otherwise take precedence, subject to that boot flag. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart.c#3 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/gxemul/cons/gxemul_cons.c#4 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart.c#3 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -297,7 +298,7 @@ { sprintf(cp->cn_name, "ttyu0"); - cp->cn_pri = CN_NORMAL; + cp->cn_pri = (boothowto & RB_SERIAL) ? CN_REMOTE : CN_NORMAL; } static void ==== //depot/projects/ctsrd/beribsd/src/sys/dev/gxemul/cons/gxemul_cons.c#4 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -219,7 +220,7 @@ { sprintf(cp->cn_name, "ttyu0"); - cp->cn_pri = CN_NORMAL; + cp->cn_pri = (boothowto & RB_SERIAL) ? CN_REMOTE : CN_NORMAL; } static void From owner-p4-projects@FreeBSD.ORG Mon May 7 18:50:37 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D56591065688; Mon, 7 May 2012 18:50:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 975031065686 for ; Mon, 7 May 2012 18:50:36 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 7FFFF8FC18 for ; Mon, 7 May 2012 18:50:36 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q47IoaWo059141 for ; Mon, 7 May 2012 18:50:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q47Ioa93059135 for perforce@freebsd.org; Mon, 7 May 2012 18:50:36 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 7 May 2012 18:50:36 GMT Message-Id: <201205071850.q47Ioa93059135@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 210796 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 May 2012 18:50:37 -0000 http://p4web.freebsd.org/@@210796?ac=10 Change 210796 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/05/07 18:50:01 Add snoop device to FreeBSD/BERI kernel configurations so that the "watch -W" command can be used to type on the DE4 MTL video console, which otherwise has no source of keyboard input. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_MDROOT#8 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_SDROOT#8 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_MDROOT#8 (text+ko) ==== @@ -64,3 +64,4 @@ device loop device random device sc +device snp ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_SDROOT#8 (text+ko) ==== @@ -56,3 +56,4 @@ device loop device random device sc +device snp From owner-p4-projects@FreeBSD.ORG Mon May 7 19:21:22 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB2241065672; Mon, 7 May 2012 19:21:21 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ADA8B106566B for ; Mon, 7 May 2012 19:21:21 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 972AA8FC1E for ; Mon, 7 May 2012 19:21:21 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q47JLLw2066993 for ; Mon, 7 May 2012 19:21:21 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q47JLLZ2066990 for perforce@freebsd.org; Mon, 7 May 2012 19:21:21 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 7 May 2012 19:21:21 GMT Message-Id: <201205071921.q47JLLZ2066990@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 210799 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 May 2012 19:21:22 -0000 http://p4web.freebsd.org/@@210799?ac=10 Change 210799 by rene@rene_acer on 2012/05/07 19:21:16 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#140 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#12 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#34 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#64 integrate .. //depot/projects/docproj_nl/www/en/news/status/report-2012-01-2012-03.xml#1 branch .. //depot/projects/docproj_nl/www/en/releng/dst_info.sgml#3 branch .. //depot/projects/docproj_nl/www/share/sgml/press.xml#25 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#140 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -782,7 +782,7 @@ find something like the following in /etc/mail/mailer.conf: -sendmail /usr/libexec/sendmail/sendmail +sendmail /usr/libexec/sendmail/sendmail send-mail /usr/libexec/sendmail/sendmail mailq /usr/libexec/sendmail/sendmail newaliases /usr/libexec/sendmail/sendmail @@ -803,7 +803,7 @@ to be run instead of sendmail, you could change /etc/mail/mailer.conf to read: -sendmail /usr/local/supermailer/bin/sendmail-compat +sendmail /usr/local/supermailer/bin/sendmail-compat send-mail /usr/local/supermailer/bin/sendmail-compat mailq /usr/local/supermailer/bin/mailq-compat newaliases /usr/local/supermailer/bin/newaliases-compat ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#34 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2773,7 +2773,7 @@ - /var/db/dhclient.leases + /var/db/dhclient.leases.interface The DHCP client keeps a database of valid leases in this file, which is written as a log. &man.dhclient.leases.5; gives a slightly longer ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#64 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -805,7 +805,7 @@ origineel geïnstalleerd, bevat /etc/mail/mailer.conf bij benadering het volgende: -sendmail /usr/libexec/sendmail/sendmail +sendmail /usr/libexec/sendmail/sendmail send-mail /usr/libexec/sendmail/sendmail mailq /usr/libexec/sendmail/sendmail newaliases /usr/libexec/sendmail/sendmail @@ -828,7 +828,7 @@ men /etc/mail/mailer.conf als volgt aanpassen: -sendmail /usr/local/supermailer/bin/sendmail-compat +sendmail /usr/local/supermailer/bin/sendmail-compat send-mail /usr/local/supermailer/bin/sendmail-compat mailq /usr/local/supermailer/bin/mailq-compat newaliases /usr/local/supermailer/bin/newaliases-compat ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#55 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.36 2012/02/19 14:10:40 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml - %SRCID% 1.143 + %SRCID% 1.144 --> @@ -2957,7 +2957,7 @@ - /var/db/dhclient.leases + /var/db/dhclient.leases.interface De DHCP-cliënt houdt in dit bestand een database bij van geldige leases, die naar een logboekbestand worden From owner-p4-projects@FreeBSD.ORG Thu May 10 04:20:18 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 25FDB106566B; Thu, 10 May 2012 04:20:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D150A1065672 for ; Thu, 10 May 2012 04:20:17 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id B94A78FC08 for ; Thu, 10 May 2012 04:20:17 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q4A4KHEK047020 for ; Thu, 10 May 2012 04:20:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q4A4KHLT047017 for perforce@freebsd.org; Thu, 10 May 2012 04:20:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 10 May 2012 04:20:17 GMT Message-Id: <201205100420.q4A4KHLT047017@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 210915 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 May 2012 04:20:18 -0000 http://p4web.freebsd.org/@@210915?ac=10 Change 210915 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/05/10 04:19:22 Correct and clarify use of the hardware cursor register for the Terasic MTL. This doesn't actually make the hardware cursor work as there is missing glue somewhere between syscons and the MTL driver. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_reg.c#6 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_reg.c#6 (text+ko) ==== @@ -212,9 +212,9 @@ v = bus_read_4(sc->mtl_reg_res, TERASIC_MTL_OFF_TEXTCURSOR); v = le32toh(v); - *rowp = (v & TERASIC_MTL_TEXTCURSOR_COL_MASK) >> + *colp = (v & TERASIC_MTL_TEXTCURSOR_COL_MASK) >> TERASIC_MTL_TEXTCURSOR_COL_SHIFT; - *colp = (v & TERASIC_MTL_TEXTCURSOR_ROW_MASK); + *rowp = (v & TERASIC_MTL_TEXTCURSOR_ROW_MASK); } void @@ -223,7 +223,7 @@ { uint32_t v; - v = col << TERASIC_MTL_TEXTCURSOR_COL_SHIFT | row; + v = (col << TERASIC_MTL_TEXTCURSOR_COL_SHIFT) | row; v = htole32(v); bus_write_4(sc->mtl_reg_res, TERASIC_MTL_OFF_TEXTCURSOR, v); }