From owner-p4-projects@FreeBSD.ORG Sun Jun 10 02:28:24 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 089941065675; Sun, 10 Jun 2012 02:28:24 +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 BF5BF1065672 for ; Sun, 10 Jun 2012 02:28:23 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id A8A7B8FC16 for ; Sun, 10 Jun 2012 02:28:23 +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 q5A2SNop019778 for ; Sun, 10 Jun 2012 02:28:23 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q5A2SNZG019775 for perforce@freebsd.org; Sun, 10 Jun 2012 02:28:23 GMT (envelope-from jhb@freebsd.org) Date: Sun, 10 Jun 2012 02:28:23 GMT Message-Id: <201206100228.q5A2SNZG019775@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 212551 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, 10 Jun 2012 02:28:24 -0000 http://p4web.freebsd.org/@@212551?ac=10 Change 212551 by jhb@jhb_fiver on 2012/06/10 02:27:40 Fix locking bogon. Affected files ... .. //depot/projects/fadvise/sys/kern/vfs_subr.c#11 edit Differences ... ==== //depot/projects/fadvise/sys/kern/vfs_subr.c#11 (text+ko) ==== @@ -1352,12 +1352,12 @@ error = BUF_TIMELOCK(bp, LK_EXCLUSIVE | LK_SLEEPFAIL | LK_INTERLOCK, BO_MTX(bo), "detachbuf", slpflag, slptimeo); - if (error != ENOLCK) - return (error); - if (error == EAGAIN) { + if (error == ENOLCK) { BO_LOCK(bo); goto restart; } + if (error) + return (error); KASSERT(bp->b_bufobj == bo, ("bp %p wrong b_bufobj %p should be %p", bp, bp->b_bufobj, bo)); From owner-p4-projects@FreeBSD.ORG Sun Jun 10 12:09:46 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE88B1065672; Sun, 10 Jun 2012 12:09:45 +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 70D9A106566B for ; Sun, 10 Jun 2012 12:09:45 +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 577A08FC15 for ; Sun, 10 Jun 2012 12:09:45 +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 q5AC9jNj037927 for ; Sun, 10 Jun 2012 12:09:45 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 q5AC9j2F037924 for perforce@freebsd.org; Sun, 10 Jun 2012 12:09:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 10 Jun 2012 12:09:45 GMT Message-Id: <201206101209.q5AC9j2F037924@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 212573 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, 10 Jun 2012 12:09:46 -0000 http://p4web.freebsd.org/@@212573?ac=10 Change 212573 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/06/10 12:09:24 Add support for interrupt-driven operation to the Altera JTAG UART device driver. Support for pure polled-mode operation is retained -- if an IRQ is not available (i.e., not defined in device.hints) then that mode will be used instead, but interrupt-driven operation will be preferred. Interrupts are used only in the receive path, currently; transmit-side queueing and interrupt acknowledgement is not yet supported, so all writes continue to be synchronous from the TTY output handler. This may be worth fixing. Configure an IRQ for the first of three JTAG UARTs in the BERI DE-4 configuration -- the other two don't have IRQs configured, but continue to work fine in polled mode. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart.h#3 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c#2 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c#3 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4.hints#6 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart.h#3 (text+ko) ==== @@ -38,6 +38,9 @@ /* * Hardware resources. */ + struct resource *ajus_irq_res; + int ajus_irq_rid; + void *ajus_irq_cookie; struct resource *ajus_mem_res; int ajus_mem_rid; @@ -50,6 +53,7 @@ /* * Driver resources. */ + u_int ajus_flags; struct mtx *ajus_lockp; struct mtx ajus_lock; struct callout ajus_callout; @@ -67,6 +71,11 @@ #define AJU_TTYNAME "ttyu" /* + * Flag values for ajus_flags. + */ +#define ALTERA_JTAG_UART_FLAG_CONSOLE 0x00000001 /* Is console. */ + +/* * Because tty-level use of the I/O ports completes with low-level console * use, spinlocks must be employed here. */ @@ -173,7 +182,7 @@ /* * Driver attachment functions for Nexus. */ -void altera_jtag_uart_attach(struct altera_jtag_uart_softc *sc); +int altera_jtag_uart_attach(struct altera_jtag_uart_softc *sc); void altera_jtag_uart_detach(struct altera_jtag_uart_softc *sc); #endif /* _DEV_ALTERA_JTAG_UART_H_ */ ==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c#2 (text+ko) ==== @@ -69,7 +69,9 @@ altera_jtag_uart_nexus_attach(device_t dev) { struct altera_jtag_uart_softc *sc; + int error; + error = 0; sc = device_get_softc(dev); sc->ajus_dev = dev; sc->ajus_unit = device_get_unit(dev); @@ -78,10 +80,31 @@ &sc->ajus_mem_rid, RF_ACTIVE); if (sc->ajus_mem_res == NULL) { device_printf(dev, "couldn't map memory\n"); - return (ENXIO); + error = ENXIO; + goto out; + } + + /* + * Interrupt support is optional -- if we can't allocate an IRQ, then + * we fall back on polling. + */ + sc->ajus_irq_rid = 0; + sc->ajus_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, + &sc->ajus_irq_rid, RF_ACTIVE | RF_SHAREABLE); + if (sc->ajus_irq_res == NULL) + device_printf(dev, + "IRQ unavailable; selecting polled operation\n"); + error = altera_jtag_uart_attach(sc); +out: + if (error) { + if (sc->ajus_irq_res != NULL) + bus_release_resource(dev, SYS_RES_IRQ, + sc->ajus_irq_rid, sc->ajus_irq_res); + if (sc->ajus_mem_res != NULL) + bus_release_resource(dev, SYS_RES_MEMORY, + sc->ajus_mem_rid, sc->ajus_mem_res); } - altera_jtag_uart_attach(sc); - return (0); + return (error); } static int @@ -93,7 +116,9 @@ KASSERT(sc->ajus_mem_res != NULL, ("%s: resources not allocated", __func__)); - altera_jtag_uart_detach(sc); + altera_jtag_uart_detach(sc); + bus_release_resource(dev, SYS_RES_IRQ, sc->ajus_irq_rid, + sc->ajus_irq_res); bus_release_resource(dev, SYS_RES_MEMORY, sc->ajus_mem_rid, sc->ajus_mem_res); return (0); ==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c#3 (text+ko) ==== @@ -94,6 +94,14 @@ ALTERA_JTAG_UART_CONTROL_OFF))); } +static inline void +aju_control_write(struct altera_jtag_uart_softc *sc, uint32_t v) +{ + + bus_write_4(sc->ajus_mem_res, ALTERA_JTAG_UART_CONTROL_OFF, + htole32(v)); +} + /* * Slightly higher-level routines aware of buffering and flow control. */ @@ -154,6 +162,8 @@ /* * XXXRW: Would be nice not to do blocking writes to the UART here, * rescheduling on our timer tick if work remains to be done. + * + * XXXRW: Possibly, if full, defer to interrupt context. */ sc = tty_softc(tp); for (;;) { @@ -166,14 +176,17 @@ } } +/* + * The actual work of checking for, and handling, available reads. This is + * used in both polled and interrupt-driven modes, as JTAG UARTs may be hooked + * up with, or without, IRQs allocated. + */ static void -aju_timeout(void *v) +aju_handle_input(struct altera_jtag_uart_softc *sc) { - struct altera_jtag_uart_softc *sc; struct tty *tp; int c; - sc = v; tp = sc->ajus_ttyp; tty_lock(tp); AJU_LOCK(sc); @@ -189,36 +202,119 @@ AJU_UNLOCK(sc); ttydisc_rint_done(tp); tty_unlock(tp); +} + +static void +aju_timeout(void *v) +{ + struct altera_jtag_uart_softc *sc = v; + + aju_handle_input(sc); callout_reset(&sc->ajus_callout, aju_pollinterval, aju_timeout, sc); } -void +static void +aju_intr(void *v) +{ + struct altera_jtag_uart_softc *sc = v; + + /* + * XXXRW: Just receive in the interrupt path for now; possibly we + * should check the control flags. + */ + aju_handle_input(sc); +} + +static void +aju_intr_enable(struct altera_jtag_uart_softc *sc) +{ + uint32_t v; + + AJU_LOCK_ASSERT(sc); + + v = aju_control_read(sc); + v |= ALTERA_JTAG_UART_CONTROL_RE; + v &= ~ALTERA_JTAG_UART_CONTROL_WE; + aju_control_write(sc, v); +} + +static void +aju_intr_disable(struct altera_jtag_uart_softc *sc) +{ + uint32_t v; + + AJU_LOCK_ASSERT(sc); + + v = aju_control_read(sc); + v &= ~(ALTERA_JTAG_UART_CONTROL_RE | ALTERA_JTAG_UART_CONTROL_WE); + aju_control_write(sc, v); +} + +int altera_jtag_uart_attach(struct altera_jtag_uart_softc *sc) { struct tty *tp; + int error; - tp = sc->ajus_ttyp = tty_alloc(&aju_ttydevsw, sc); + AJU_LOCK_INIT(sc); /* * XXXRW: Currently, we detect the console solely based on it using a * reserved address, and borrow console-level locks and buffer if so. * Is there a better way? */ - AJU_LOCK_INIT(sc); if (rman_get_start(sc->ajus_mem_res) == BERI_UART_BASE) { - tty_init_console(tp, 0); sc->ajus_lockp = &aju_cons_lock; sc->ajus_buffer_validp = &aju_cons_buffer_valid; sc->ajus_buffer_datap = &aju_cons_buffer_data; - aju_cons_sc = sc; + sc->ajus_flags |= ALTERA_JTAG_UART_FLAG_CONSOLE; } else { sc->ajus_lockp = &sc->ajus_lock; sc->ajus_buffer_validp = &sc->ajus_buffer_valid; sc->ajus_buffer_datap = &sc->ajus_buffer_data; } + + /* + * Disable interrupts regardless of whether or not we plan to use + * them. We will register an interrupt handler now if they will be + * used, but not re-enable intil later once the remainder of the tty + * layer is properly initialised, as we're not ready for input yet. + */ + AJU_LOCK(sc); + aju_intr_disable(sc); + AJU_UNLOCK(sc); + if (sc->ajus_irq_res != NULL) { + error = bus_setup_intr(sc->ajus_dev, sc->ajus_irq_res, + INTR_ENTROPY | INTR_TYPE_TTY | INTR_MPSAFE, NULL, + aju_intr, sc, &sc->ajus_irq_cookie); + if (error) { + device_printf(sc->ajus_dev, + "could not activate interrupt\n"); + AJU_LOCK_DESTROY(sc); + return (error); + } + } + tp = sc->ajus_ttyp = tty_alloc(&aju_ttydevsw, sc); + if (sc->ajus_flags & ALTERA_JTAG_UART_FLAG_CONSOLE) { + aju_cons_sc = sc; + tty_init_console(tp, 0); + } tty_makedev(tp, NULL, "%s%d", AJU_TTYNAME, sc->ajus_unit); - callout_init(&sc->ajus_callout, CALLOUT_MPSAFE); - callout_reset(&sc->ajus_callout, aju_pollinterval, aju_timeout, sc); + + /* + * If we will be using interrupts, enable them now; otherwise, start + * polling. From this point onwards, input can arrive. + */ + if (sc->ajus_irq_res != NULL) { + AJU_LOCK(sc); + aju_intr_enable(sc); + AJU_UNLOCK(sc); + } else { + callout_init(&sc->ajus_callout, CALLOUT_MPSAFE); + callout_reset(&sc->ajus_callout, aju_pollinterval, + aju_timeout, sc); + } + return (0); } void @@ -226,9 +322,20 @@ { struct tty *tp = sc->ajus_ttyp; - if (sc == aju_cons_sc) + /* + * If we're using interrupts, disable and release the interrupt + * handler now. Otherwise drain the polling timeout. + */ + if (sc->ajus_irq_res != NULL) { + AJU_LOCK(sc); + aju_intr_disable(sc); + AJU_UNLOCK(sc); + bus_teardown_intr(sc->ajus_dev, sc->ajus_irq_res, + sc->ajus_irq_cookie); + } else + callout_drain(&sc->ajus_callout); + if (sc->ajus_flags & ALTERA_JTAG_UART_FLAG_CONSOLE) aju_cons_sc = NULL; - callout_drain(&sc->ajus_callout); tty_lock(tp); tty_rel_gone(tp); AJU_LOCK_DESTROY(sc); ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4.hints#6 (text+ko) ==== @@ -7,6 +7,7 @@ hint.altera_jtag_uart.0.at="nexus0" hint.altera_jtag_uart.0.maddr=0x7f000000 hint.altera_jtag_uart.0.msize=0x40 +hint.altera_jtag_uart.0.irq=0 hint.altera_jtag_uart.1.at="nexus0" hint.altera_jtag_uart.1.maddr=0x7f001000 From owner-p4-projects@FreeBSD.ORG Sun Jun 10 17:32:20 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A13461065679; Sun, 10 Jun 2012 17:32:20 +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 5A3FF1065670 for ; Sun, 10 Jun 2012 17:32: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 42BDC8FC1B for ; Sun, 10 Jun 2012 17:32:20 +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 q5AHWK2w004230 for ; Sun, 10 Jun 2012 17:32:20 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 q5AHWJqG004227 for perforce@freebsd.org; Sun, 10 Jun 2012 17:32:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 10 Jun 2012 17:32:19 GMT Message-Id: <201206101732.q5AHWJqG004227@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 212585 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, 10 Jun 2012 17:32:21 -0000 http://p4web.freebsd.org/@@212585?ac=10 Change 212585 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/06/10 17:31:47 Continue refining the Altera JTAG UART driver by replacing pure blocking writes with a test-for writability to avoid the writing thread hanging if the FIFO is full. Use interrupts, or if they are unavailable, polling, to wait for space to become available, instead. More generally, tidy up event handling and try to combing interrupt-driven and polling paths as much as possible (but no more). The low-level console still uses blocking writes, which can lead to boot-time stalls if the JTAG able is not connected. However, TTY output should now never lead to a kernel stall, just stalling of the user process trying to write to the TTY. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c#4 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c#4 (text+ko) ==== @@ -131,49 +131,66 @@ return (0); } +static char +aju_read(struct altera_jtag_uart_softc *sc) +{ + + AJU_LOCK_ASSERT(sc); + + while (!aju_readable(sc)); + *sc->ajus_buffer_validp = 0; + return (*sc->ajus_buffer_datap); +} + +/* + * Routines for enabling and disabling interrupts for read and write. + */ static void -aju_write(struct altera_jtag_uart_softc *sc, char ch) +aju_intr_readable_enable(struct altera_jtag_uart_softc *sc) +{ + uint32_t v; + + AJU_LOCK_ASSERT(sc); + + v = aju_control_read(sc); + v |= ALTERA_JTAG_UART_CONTROL_RE; + aju_control_write(sc, v); +} + +static void +aju_intr_writable_enable(struct altera_jtag_uart_softc *sc) { + uint32_t v; AJU_LOCK_ASSERT(sc); - while (!aju_writable(sc)); - aju_data_write(sc, ch); + v = aju_control_read(sc); + v |= ALTERA_JTAG_UART_CONTROL_WE; + aju_control_write(sc, v); } -static char -aju_read(struct altera_jtag_uart_softc *sc) +static void +aju_intr_writable_disable(struct altera_jtag_uart_softc *sc) { + uint32_t v; AJU_LOCK_ASSERT(sc); - while (!aju_readable(sc)); - *sc->ajus_buffer_validp = 0; - return (*sc->ajus_buffer_datap); + v = aju_control_read(sc); + v &= ~ALTERA_JTAG_UART_CONTROL_WE; + aju_control_write(sc, v); } static void -aju_outwakeup(struct tty *tp) +aju_intr_disable(struct altera_jtag_uart_softc *sc) { - struct altera_jtag_uart_softc *sc; - int len; - u_char ch; + uint32_t v; + + AJU_LOCK_ASSERT(sc); - /* - * XXXRW: Would be nice not to do blocking writes to the UART here, - * rescheduling on our timer tick if work remains to be done. - * - * XXXRW: Possibly, if full, defer to interrupt context. - */ - sc = tty_softc(tp); - for (;;) { - len = ttydisc_getc(tp, &ch, sizeof(ch)); - if (len == 0) - break; - AJU_LOCK(sc); - aju_write(sc, ch); - AJU_UNLOCK(sc); - } + v = aju_control_read(sc); + v &= ~(ALTERA_JTAG_UART_CONTROL_RE | ALTERA_JTAG_UART_CONTROL_WE); + aju_control_write(sc, v); } /* @@ -182,14 +199,13 @@ * up with, or without, IRQs allocated. */ static void -aju_handle_input(struct altera_jtag_uart_softc *sc) +aju_handle_input(struct altera_jtag_uart_softc *sc, struct tty *tp) { - struct tty *tp; int c; - tp = sc->ajus_ttyp; - tty_lock(tp); - AJU_LOCK(sc); + tty_lock_assert(tp, MA_OWNED); + AJU_LOCK_ASSERT(sc); + while (aju_readable(sc)) { c = aju_read(sc); AJU_UNLOCK(sc); @@ -201,53 +217,102 @@ } AJU_UNLOCK(sc); ttydisc_rint_done(tp); - tty_unlock(tp); + AJU_LOCK(sc); } +/* + * Send output to the UART until either there's none left to send, or we run + * out of room and need to await an interrupt so that we can start sending + * again. + * + * XXXRW: It would be nice to query WSPACE at the beginning and write to the + * FIFO in bugger chunks. + */ static void -aju_timeout(void *v) +aju_handle_output(struct altera_jtag_uart_softc *sc, struct tty *tp) { - struct altera_jtag_uart_softc *sc = v; + uint8_t ch; + + tty_lock_assert(tp, MA_OWNED); + AJU_LOCK_ASSERT(sc); - aju_handle_input(sc); - callout_reset(&sc->ajus_callout, aju_pollinterval, aju_timeout, sc); + AJU_UNLOCK(sc); + while (ttydisc_getc_poll(tp) != 0) { + AJU_LOCK(sc); + if (aju_writable(sc)) { + AJU_UNLOCK(sc); + if (ttydisc_getc(tp, &ch, sizeof(ch)) != sizeof(ch)) + panic("%s: ttydisc_getc", __func__); + AJU_LOCK(sc); + aju_data_write(sc, ch); + } else { + aju_intr_writable_enable(sc); + return; + } + AJU_UNLOCK(sc); + } + AJU_LOCK(sc); + aju_intr_writable_disable(sc); } static void -aju_intr(void *v) +aju_outwakeup(struct tty *tp) { - struct altera_jtag_uart_softc *sc = v; + struct altera_jtag_uart_softc *sc = tty_softc(tp); + + tty_lock_assert(tp, MA_OWNED); - /* - * XXXRW: Just receive in the interrupt path for now; possibly we - * should check the control flags. - */ - aju_handle_input(sc); + AJU_LOCK(sc); + aju_handle_output(sc, tp); + AJU_UNLOCK(sc); } static void -aju_intr_enable(struct altera_jtag_uart_softc *sc) +aju_timeout(void *arg) { - uint32_t v; + struct altera_jtag_uart_softc *sc = arg; + struct tty *tp = sc->ajus_ttyp; + + tty_lock(tp); + AJU_LOCK(sc); - AJU_LOCK_ASSERT(sc); + /* + * It would be convenient if we could share code with aju_intr() here + * by testing the control register for ALTERA_JTAG_UART_CONTROL_RI and + * ALTERA_JTAG_UART_CONTROL_WI. Unfortunately, it's not clear that + * this is supported, so do all the work to poll for both input and + * output. + */ + aju_handle_input(sc, tp); + aju_handle_output(sc, tp); - v = aju_control_read(sc); - v |= ALTERA_JTAG_UART_CONTROL_RE; - v &= ~ALTERA_JTAG_UART_CONTROL_WE; - aju_control_write(sc, v); + /* + * Reschedule next poll attempt. There's some argument that we should + * do adaptive polling based on the expectation of I/O: is something + * pending in the output buffer, or have we recently had input, but we + * don't. + */ + callout_reset(&sc->ajus_callout, aju_pollinterval, aju_timeout, sc); + AJU_UNLOCK(sc); + tty_unlock(tp); } static void -aju_intr_disable(struct altera_jtag_uart_softc *sc) +aju_intr(void *arg) { + struct altera_jtag_uart_softc *sc = arg; + struct tty *tp = sc->ajus_ttyp; uint32_t v; - AJU_LOCK_ASSERT(sc); - + tty_lock(tp); + AJU_LOCK(sc); v = aju_control_read(sc); - v &= ~(ALTERA_JTAG_UART_CONTROL_RE | ALTERA_JTAG_UART_CONTROL_WE); - aju_control_write(sc, v); + if (v & ALTERA_JTAG_UART_CONTROL_RI) + aju_handle_input(sc, tp); + if (v & ALTERA_JTAG_UART_CONTROL_WI) + aju_handle_output(sc, tp); + AJU_UNLOCK(sc); + tty_unlock(tp); } int @@ -307,7 +372,7 @@ */ if (sc->ajus_irq_res != NULL) { AJU_LOCK(sc); - aju_intr_enable(sc); + aju_intr_readable_enable(sc); AJU_UNLOCK(sc); } else { callout_init(&sc->ajus_callout, CALLOUT_MPSAFE); From owner-p4-projects@FreeBSD.ORG Sun Jun 10 21:48:53 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E8391065677; Sun, 10 Jun 2012 21:48:53 +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 C35D41065670 for ; Sun, 10 Jun 2012 21:48:52 +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 ABAF08FC0C for ; Sun, 10 Jun 2012 21:48:52 +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 q5ALmqdD054726 for ; Sun, 10 Jun 2012 21:48:52 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 q5ALmq8D054723 for perforce@freebsd.org; Sun, 10 Jun 2012 21:48:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 10 Jun 2012 21:48:52 GMT Message-Id: <201206102148.q5ALmq8D054723@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 212597 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, 10 Jun 2012 21:48:53 -0000 http://p4web.freebsd.org/@@212597?ac=10 Change 212597 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/06/10 21:48:18 Limit alternative break-to-debugger handling to JTAG UARTs implementing the system console. Unfortunately, this still doesn't seem to work as, at some point in the complex input path to the UART, the origial CR has been translated into an LF -- possibly in nios2-terminal. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c#5 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c#5 (text+ko) ==== @@ -210,7 +210,8 @@ c = aju_read(sc); AJU_UNLOCK(sc); #ifdef KDB - kdb_alt_break(c, &sc->ajus_alt_break_state); + if (sc->ajus_flags & ALTERA_JTAG_UART_FLAG_CONSOLE) + kdb_alt_break(c, &sc->ajus_alt_break_state); #endif ttydisc_rint(tp, c, 0); AJU_LOCK(sc); From owner-p4-projects@FreeBSD.ORG Mon Jun 11 16:27:02 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C99F0106566C; Mon, 11 Jun 2012 16:27:02 +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 8C3EF106564A for ; Mon, 11 Jun 2012 16:27:02 +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 747A78FC1F for ; Mon, 11 Jun 2012 16:27:02 +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 q5BGR2Xv092381 for ; Mon, 11 Jun 2012 16:27:02 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 q5BGR2M9092378 for perforce@freebsd.org; Mon, 11 Jun 2012 16:27:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 11 Jun 2012 16:27:02 GMT Message-Id: <201206111627.q5BGR2M9092378@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 212634 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, 11 Jun 2012 16:27:03 -0000 http://p4web.freebsd.org/@@212634?ac=10 Change 212634 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/06/11 16:26:00 Despite input translation issues likely caused by nios2-terminal, enable alternative break-to-debugger in BERI kernels. It should be possibly to disable CR/NL conversion using stty before running nios2-terminal to use the feature. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_MDROOT#3 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_SDROOT#4 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_MDROOT#3 (text+ko) ==== @@ -28,6 +28,7 @@ options DDB options KDB +options ALT_BREAK_TO_DEBUGGER options SCHED_ULE ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_SDROOT#4 (text+ko) ==== @@ -27,6 +27,7 @@ options DDB options KDB +options ALT_BREAK_TO_DEBUGGER options SCHED_ULE From owner-p4-projects@FreeBSD.ORG Mon Jun 11 19:14:54 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FD0F10657D2; Mon, 11 Jun 2012 19:14:54 +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 11C10106576F for ; Mon, 11 Jun 2012 19:14:54 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id EF0B58FC12 for ; Mon, 11 Jun 2012 19:14:53 +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 q5BJErgT026289 for ; Mon, 11 Jun 2012 19:14:53 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q5BJEr5s026286 for perforce@freebsd.org; Mon, 11 Jun 2012 19:14:53 GMT (envelope-from brooks@freebsd.org) Date: Mon, 11 Jun 2012 19:14:53 GMT Message-Id: <201206111914.q5BJEr5s026286@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 212644 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, 11 Jun 2012 19:14:54 -0000 http://p4web.freebsd.org/@@212644?ac=10 Change 212644 by brooks@brooks_ecr_current on 2012/06/11 19:14:00 Fix a format error in a diagnostic message when writing fails. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/dev/isf/isf.c#10 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/dev/isf/isf.c#10 (text+ko) ==== @@ -565,7 +565,7 @@ ((uint16_t *)bp->bio_data)[i]) != ((uint16_t *)bp->bio_data)[i]) { device_printf(sc->isf_dev, "write" - " requires erase at 0x08%jx\n", + " requires erase at 0x%08jx\n", bp->bio_pblkno * ss); error = EIO; break; From owner-p4-projects@FreeBSD.ORG Tue Jun 12 21:54:18 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 630A2106566C; Tue, 12 Jun 2012 21:54:17 +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 182FD106564A for ; Tue, 12 Jun 2012 21:54:17 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id F39E78FC14 for ; Tue, 12 Jun 2012 21:54:16 +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 q5CLsG0E052464 for ; Tue, 12 Jun 2012 21:54:16 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q5CLsGe2052461 for perforce@freebsd.org; Tue, 12 Jun 2012 21:54:16 GMT (envelope-from brooks@freebsd.org) Date: Tue, 12 Jun 2012 21:54:16 GMT Message-Id: <201206122154.q5CLsGe2052461@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 212718 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: Tue, 12 Jun 2012 21:54:18 -0000 http://p4web.freebsd.org/@@212718?ac=10 Change 212718 by brooks@brooks_ecr_current on 2012/06/12 21:54:00 Add a ctsrd directory to the tree. Its contents can be (cross-)built and installed with buildworld/installworld by setting LOCAL_DIRS=ctsrd on the command line or in /etc/src.conf. This initial commit includes libvuln_png (and old and vulnerable version of libpng), pictview, and flashit. flashit is a shell script to validate and write data to the isf(4) flash devices found on the DE4. Affected files ... .. //depot/projects/ctsrd/beribsd/src/ctsrd/Makefile#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/Makefile.inc#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/flashit/Makefile#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/flashit/flashit.sh#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/ANNOUNCE#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/CHANGES#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/INSTALL#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/KNOWNBUG#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/LICENSE#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/Makefile#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/README#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/TODO#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/Y2KINFO#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/configure#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/LICENSE#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/Makefile.sgi#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/Makefile.unx#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/Makefile.w32#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/README#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/makevms.com#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/readpng.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/readpng.h#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/readpng.o#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/readpng2.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/readpng2.h#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/rpng-win.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/rpng-x.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/rpng-x.o#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/rpng2-win.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/rpng2-x.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/toucan.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/wpng.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/writepng.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/writepng.h#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/msvctest/README.txt#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/msvctest/msvctest.dsp#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/msvctest/msvctest.dsw#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngminus/README#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngminus/makefile.std#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngminus/makefile.tc3#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngminus/makevms.com#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngminus/png2pnm.bat#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngminus/png2pnm.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngminus/png2pnm.sh#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngminus/pngminus.bat#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngminus/pngminus.sh#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngminus/pnm2png.bat#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngminus/pnm2png.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngminus/pnm2png.sh#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/README#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn0g01.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn0g02.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn0g04.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn0g08.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn0g16.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn2c08.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn2c16.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn3p01.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn3p02.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn3p04.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn3p08.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn4a08.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn4a16.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn6a08.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn6a16.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/visupng/PngFile.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/visupng/PngFile.h#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/visupng/README.txt#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/visupng/VisualPng.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/visupng/VisualPng.dsp#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/visupng/VisualPng.dsw#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/visupng/VisualPng.ico#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/visupng/VisualPng.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/visupng/VisualPng.rc#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/visupng/cexcept.h#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/visupng/resource.h#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/example.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/libpng.3#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/libpng.txt#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/libpngpf.3#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/makefile.gcc#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/png.5#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/png.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/png.h#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngasmrd.h#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngbar.jpg#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngbar.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngconf.h#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngerror.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pnggccrd.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngget.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngmem.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngnow.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngpread.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngread.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngrio.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngrtran.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngrutil.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngset.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngtest.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngtest.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngtrans.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngvcrd.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngwio.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngwrite.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngwtran.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngwutil.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/beos/x86-shared.proj#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/beos/x86-shared.txt#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/beos/x86-static.proj#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/beos/x86-static.txt#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/borland/libpng.bpf#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/borland/libpng.bpg#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/borland/libpng.bpr#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/borland/libpng.cpp#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/borland/libpng.readme.txt#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/borland/libpngstat.bpf#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/borland/libpngstat.bpr#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/borland/zlib+libpng.bpg#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/borland/zlib.bpf#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/borland/zlib.bpg#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/borland/zlib.bpr#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/borland/zlib.cpp#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/borland/zlibstat.bpf#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/borland/zlibstat.bpr#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/msvc/README.txt#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/msvc/libpng.dsp#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/msvc/libpng.dsw#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/msvc/png.rc#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/msvc/png32ms.def#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/msvc/zlib.def#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/msvc/zlib.dsp#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/netware.txt#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/wince.txt#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/SCOPTIONS.ppc#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/descrip.mms#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/libpng-config-body.in#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/libpng-config-head.in#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/libpng.icc#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/libpng.pc.in#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.32sunu#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.64sunu#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.acorn#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.aix#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.amiga#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.atari#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.bc32#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.bd32#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.beos#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.bor#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.cygwin#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.darwin#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.dec#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.dj2#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.freebsd#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.gcc#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.gcmmx#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.hpgcc#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.hpux#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.ibmc#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.intel#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.knr#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.linux#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.macosx#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.mips#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.msc#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.ne12bsd#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.netbsd#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.openbsd#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.os2#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.sco#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.sggcc#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.sgi#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.so9#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.solaris#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.std#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.sunos#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.tc3#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.vcawin32#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.vcwin32#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.watcom#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makevms.com#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/pngdef.pas#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/pngos2.def#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/smakefile.ppc#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/Makefile#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/img/Canon-5DII-3816.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/img/Canon-5DII-4717.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/img/Canon-5DII-5487.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/img/CatSword.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/img/Makefile#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/img/Quill.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/img/Terminal.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/img/busy0.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/img/busy0.svg#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/img/busy1.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/img/busy1.svg#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/img/keyboardA.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/img/keyboardA.svg#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/img/keyboardC.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/img/keyboardC.svg#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/img/keyboardN.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/img/keyboardN.svg#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/img/keyboardS.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/img/keyboardS.svg#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/pictview.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jun 13 19:54:17 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EA211065672; Wed, 13 Jun 2012 19:54:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EE3DB106566B for ; Wed, 13 Jun 2012 19:54:16 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [69.147.83.45]) by mx1.freebsd.org (Postfix) with ESMTP id CEDD48FC0C for ; Wed, 13 Jun 2012 19:54:16 +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 q5DJsGww022969 for ; Wed, 13 Jun 2012 19:54:16 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q5DJsGh7022966 for perforce@freebsd.org; Wed, 13 Jun 2012 19:54:16 GMT (envelope-from brooks@freebsd.org) Date: Wed, 13 Jun 2012 19:54:16 GMT Message-Id: <201206131954.q5DJsGh7022966@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 212771 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: Wed, 13 Jun 2012 19:54:17 -0000 http://p4web.freebsd.org/@@212771?ac=10 Change 212771 by brooks@brooks_ecr_current on 2012/06/13 19:53:39 Checkpoint simple support for running pictview directly from init via and entry in /etc/ttys. The code is incomplete in that it does not allocate a pty and thus lacks things like ECHO support which makes typing in the swapped /bin/sh quite difficult. I don't need that for the demo so I'm not going to spend further time on it. The original behavior suitable for use with a manual invocation and watch should be preserved. Affected files ... .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/pictview.c#2 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/pictview.c#2 (text+ko) ==== @@ -28,10 +28,12 @@ * SUCH DAMAGE. */ +#include +#include #include #include -#include -#include +#include +#include #include #include #include @@ -62,6 +64,9 @@ // number of lines in the line pattern static const int num_lines_pattern = 600; +// send keyboard output to stdout by default +static int kbdfd = 0; + /***************************************************************************** * hack around endian issue @@ -702,8 +707,9 @@ } if(ic < 0x80) { // printf("key = \"%c\" = 0x%02x\n", c, ic); - putchar(c); - fflush(stdout); + /* XXX: should handle full buffers */ + if (write(kbdfd, &c, 1) == -1) + err(1, "write"); // cancel shift and ctrl modes after character sent if((keymode==1) || (keymode==3)) keymode=0; @@ -1012,6 +1018,10 @@ int main(int argc, char *argv[]) { + int ofd, pipefds[2]; + pid_t pid; + char *devpath; + // initialise framebuffers and mtl control for mmap access fb_init(); fb_text_cursor(255, 255); @@ -1023,6 +1033,40 @@ // pen_drawing(); // line_pattern(); + if (argc > 2) + errx(1, "usage: pictview [tty]"); + if (argc == 2) { + if (pipe(pipefds) == -1) + err(1, "pipe()"); + pid = fork(); + if (pid < 0) + return (pid); + else if (pid > 0) { + /* XXX: should probably wait a bit and see if the child fails quickly */ + kbdfd=pipefds[0]; + } else { + if (dup2(pipefds[1], 0) == -1) + err(1, "dup2(%d, 0)", pipefds[1]); + if (argv[1][0] != '/') + asprintf(&devpath, "/dev/%s", argv[1]); + else + devpath = argv[1]; + ofd = open(devpath, O_WRONLY); + if (ofd < 0) + err(1, "open(%s)", argv[1]); + if (dup2(ofd, 1) == -1) { + syslog(LOG_ALERT, "redir: dup2(%d, 1) failed with %d", ofd, errno); + exit(1); + } + if (dup2(ofd, 2) == -1) { + syslog(LOG_ALERT, "redir: dup2(%d, 2) failed with %d", ofd, errno); + exit(1); + } + execl("/bin/sh", "sh", "-i", NULL); + err(1, "execl()"); + } + } + pictview(); close(ctrlfd); From owner-p4-projects@FreeBSD.ORG Wed Jun 13 20:19:19 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E00E81065678; Wed, 13 Jun 2012 20:19:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8076A1065673 for ; Wed, 13 Jun 2012 20:19:18 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [69.147.83.45]) by mx1.freebsd.org (Postfix) with ESMTP id C239E8FC26 for ; Wed, 13 Jun 2012 20:19: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 q5DKJH5l027596 for ; Wed, 13 Jun 2012 20:19:17 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q5DKJHb1027593 for perforce@freebsd.org; Wed, 13 Jun 2012 20:19:17 GMT (envelope-from jhb@freebsd.org) Date: Wed, 13 Jun 2012 20:19:17 GMT Message-Id: <201206132019.q5DKJHb1027593@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 212772 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: Wed, 13 Jun 2012 20:19:19 -0000 http://p4web.freebsd.org/@@212772?ac=10 Change 212772 by jhb@jhb_jhbbsd on 2012/06/13 20:18:42 I do, in fact, need to set B_RELBUF to unwire the pages in the buffer. Affected files ... .. //depot/projects/fadvise/sys/kern/vfs_subr.c#12 edit Differences ... ==== //depot/projects/fadvise/sys/kern/vfs_subr.c#12 (text+ko) ==== @@ -1366,6 +1366,7 @@ BO_LOCK(bo); bremfree(bp); BO_UNLOCK(bo); + bp->b_flags |= B_RELBUF; bp->b_flags &= ~B_ASYNC; brelse(bp); BO_LOCK(bo); From owner-p4-projects@FreeBSD.ORG Wed Jun 13 21:30:36 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 34BAD1065673; Wed, 13 Jun 2012 21:30: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 DDB141065670 for ; Wed, 13 Jun 2012 21:30:35 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [69.147.83.45]) by mx1.freebsd.org (Postfix) with ESMTP id C78D68FC1A for ; Wed, 13 Jun 2012 21:30:35 +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 q5DLUZkG042368 for ; Wed, 13 Jun 2012 21:30:35 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q5DLUZ0u042364 for perforce@freebsd.org; Wed, 13 Jun 2012 21:30:35 GMT (envelope-from brooks@freebsd.org) Date: Wed, 13 Jun 2012 21:30:35 GMT Message-Id: <201206132130.q5DLUZ0u042364@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 212780 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: Wed, 13 Jun 2012 21:30:37 -0000 http://p4web.freebsd.org/@@212780?ac=10 Change 212780 by brooks@brooks_ecr_current on 2012/06/13 21:29:51 Update the geom_map hints to match flash layout changes in the CTSRD subversion repository. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4.hints#7 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4.hints#7 (text+ko) ==== @@ -81,21 +81,17 @@ # Hardwired location of bitfile hint.map.1.at="isf0" hint.map.1.start=0x00020000 -hint.map.1.end=0x01000000 -# Actual value from DE4 Getting Started Guide -#hint.map.1.end=0x01820000 +hint.map.1.end=0x01820000 hint.map.1.name="fpga" # Kernel on first chip hint.map.2.at="isf0" -hint.map.2.start=0x01000000 -# Actual value from DE4 Getting Started Guide -#hint.map.2.start=0x01820000 +hint.map.2.start=0x01820000 hint.map.2.end=0x02000000 -hint.map.2.name="kernel" +hint.map.2.name="reserved" # The second chip hint.map.3.at="isf1" hint.map.3.start=0x00000000 hint.map.3.end=0x02000000 -hint.map.3.name="root" +hint.map.3.name="kernel" From owner-p4-projects@FreeBSD.ORG Wed Jun 13 22:08:06 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E24A1065674; Wed, 13 Jun 2012 22:08:05 +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 E82C6106566C for ; Wed, 13 Jun 2012 22:08:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [69.147.83.45]) by mx1.freebsd.org (Postfix) with ESMTP id C88228FC1B for ; Wed, 13 Jun 2012 22:08:04 +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 q5DM84bm049737 for ; Wed, 13 Jun 2012 22:08:04 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 q5DM84n0049734 for perforce@freebsd.org; Wed, 13 Jun 2012 22:08:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 13 Jun 2012 22:08:04 GMT Message-Id: <201206132208.q5DM84n0049734@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 212787 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: Wed, 13 Jun 2012 22:08:06 -0000 http://p4web.freebsd.org/@@212787?ac=10 Change 212787 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/06/13 22:07:11 Add a Terasic tPad hints file for BERI -- essentially, the DE-4 configuration sans certain DE-4-specific devices. We'll want to add further devices here in the future, largely supported by avgen(4) rather than device-specific device drivers (e.g., the tPad touch screen). Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_TPAD.hints#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jun 13 22:50:03 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82E2D1065672; Wed, 13 Jun 2012 22:50:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 35476106566B for ; Wed, 13 Jun 2012 22:50:02 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [69.147.83.45]) by mx1.freebsd.org (Postfix) with ESMTP id 1A5838FC08 for ; Wed, 13 Jun 2012 22:50:02 +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 q5DMo1RH057918 for ; Wed, 13 Jun 2012 22:50:01 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 q5DMo1rp057915 for perforce@freebsd.org; Wed, 13 Jun 2012 22:50:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 13 Jun 2012 22:50:01 GMT Message-Id: <201206132250.q5DMo1rp057915@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 212790 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: Wed, 13 Jun 2012 22:50:03 -0000 http://p4web.freebsd.org/@@212790?ac=10 Change 212790 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/06/13 22:49:43 Add speculative avgen(4) entries for the tPad frame buffer and touch screen based on the November 2011 BERI tPad configuration. However, include a note that placement of the devices in DRAM may be non-ideal and require revisiting now that we are using a real operating system but without a way to pass it memory topology (and especially discontinuity) information. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_TPAD.hints#2 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_TPAD.hints#2 (text+ko) ==== @@ -18,6 +18,32 @@ hint.altera_jtag_uart.2.msize=0x40 # +# Expose the tPad touchscreen device via an Avalon "generic" device. Observe +# that this is a portion of DRAM, so some care may be required in how memory +# is exposed to FreeBSD to avoid use of that DRAM for both the touch screen +# and FreeBSD use. +# +# Two separate devices are used here because alignment/width requirements for +# I/O differ: the frame buffer accepts 16-bit I/O, and the touch input device +# requires 32-bit I/O. +# +hint.altera_avgen.0.at="nexus0" +hint.altera_avgen.0.maddr=0x04000000 +hint.altera_avgen.0.msize=0x01000000 +hint.altera_avgen.0.width=2 +hint.altera_avgen.0.fileio="rw" +hint.altera_avgen.0.mmapio="rw" +hint.altera_avgen.0.devname="display" + +hint.altera_avgen.1.at="nexus0" +hint.altera_avgen.1.maddr=0x05000000 +hint.altera_avgen.1.msize=0x00000020 +hint.altera_avgen.1.width=4 +hint.altera_avgen.1.fileio="rw" +hint.altera_avgen.1.mmapio="rw" +hint.altera_avgen.1.devname="touch" + +# # On-board DE4 and tPad SD Card IP core # hint.altera_sdcardc.0.at="nexus0" From owner-p4-projects@FreeBSD.ORG Thu Jun 14 18:40:35 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CAC431065679; Thu, 14 Jun 2012 18:40:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8CB941065676 for ; Thu, 14 Jun 2012 18:40:34 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [69.147.83.45]) by mx1.freebsd.org (Postfix) with ESMTP id 75AA28FC1D for ; Thu, 14 Jun 2012 18:40:34 +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 q5EIeYCV099513 for ; Thu, 14 Jun 2012 18:40:34 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q5EIeYtj099505 for perforce@freebsd.org; Thu, 14 Jun 2012 18:40:34 GMT (envelope-from brooks@freebsd.org) Date: Thu, 14 Jun 2012 18:40:34 GMT Message-Id: <201206141840.q5EIeYtj099505@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 212854 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, 14 Jun 2012 18:40:35 -0000 http://p4web.freebsd.org/@@212854?ac=10 Change 212854 by brooks@brooks_ecr_current on 2012/06/14 18:40:19 Add a LOCAL_LIB_DIRS variable to complement the existing LOCAL_DIRS and LOCAL_TOOL_DIRS variables. Directories in LOCAL_LIB_DIRS are built at the end of the _generic_libs target. Reviewed by: imp MFP4 after: 1 day Affected files ... .. //depot/projects/ctsrd/beribsd/src/Makefile.inc1#3 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/Makefile.inc1#3 (text+ko) ==== @@ -15,6 +15,7 @@ # -DNO_WWWUPDATE do not update www in ${MAKE} update # -DNO_CTF do not run the DTrace CTF conversion tools on built objects # LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list +# LOCAL_LIB_DIRS="list of dirs" to add additional dirs to libraries # LOCAL_TOOL_DIRS="list of dirs" to add additional dirs to the build-tools # list # TARGET="machine" to crossbuild world for a different machine type @@ -1269,6 +1270,11 @@ .endif _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib} +.for _DIR in ${LOCAL_LIB_DIRS} +.if exists(${.CURDIR}/${_DIR}/Makefile) +_generic_libs+= ${_DIR} +.endif +.endfor lib/libopie__L lib/libtacplus__L: lib/libmd__L From owner-p4-projects@FreeBSD.ORG Thu Jun 14 18:47:11 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D447D1065672; Thu, 14 Jun 2012 18:47:10 +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 96308106564A for ; Thu, 14 Jun 2012 18:47:10 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [69.147.83.45]) by mx1.freebsd.org (Postfix) with ESMTP id 7DA0E8FC18 for ; Thu, 14 Jun 2012 18:47:10 +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 q5EIlABC001644 for ; Thu, 14 Jun 2012 18:47:10 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q5EIlAo9001641 for perforce@freebsd.org; Thu, 14 Jun 2012 18:47:10 GMT (envelope-from brooks@freebsd.org) Date: Thu, 14 Jun 2012 18:47:10 GMT Message-Id: <201206141847.q5EIlAo9001641@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 212855 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, 14 Jun 2012 18:47:11 -0000 http://p4web.freebsd.org/@@212855?ac=10 Change 212855 by brooks@brooks_ecr_current on 2012/06/14 18:47:00 Create a ctsrd-lib directory and move libvuln_png into it. Adjust pictview/Makefile to deal with this state of affairs remove some ugly hacks in the process. Note: If you specify LOCAL_DIRS=ctsrd, you must also specify LOCAL_LIB_DIRS=ctsrd-lib or ctsrd/pictview (and soon others) will fail to build in a cross environment. Affected files ... .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/Makefile#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/Makefile.inc#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/ANNOUNCE#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/CHANGES#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/INSTALL#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/KNOWNBUG#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/LICENSE#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/Makefile#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/README#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/TODO#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/Y2KINFO#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/configure#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/LICENSE#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/Makefile.sgi#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/Makefile.unx#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/Makefile.w32#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/README#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/makevms.com#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/readpng.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/readpng.h#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/readpng.o#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/readpng2.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/readpng2.h#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/rpng-win.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/rpng-x.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/rpng-x.o#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/rpng2-win.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/rpng2-x.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/toucan.png#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/wpng.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/writepng.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/writepng.h#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/msvctest/README.txt#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/msvctest/msvctest.dsp#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/msvctest/msvctest.dsw#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/README#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/makefile.std#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/makefile.tc3#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/makevms.com#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/png2pnm.bat#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/png2pnm.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/png2pnm.sh#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/pngminus.bat#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/pngminus.sh#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/pnm2png.bat#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/pnm2png.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/pnm2png.sh#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/README#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn0g01.png#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn0g02.png#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn0g04.png#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn0g08.png#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn0g16.png#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn2c08.png#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn2c16.png#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn3p01.png#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn3p02.png#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn3p04.png#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn3p08.png#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn4a08.png#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn4a16.png#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn6a08.png#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn6a16.png#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/PngFile.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/PngFile.h#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/README.txt#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/VisualPng.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/VisualPng.dsp#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/VisualPng.dsw#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/VisualPng.ico#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/VisualPng.png#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/VisualPng.rc#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/cexcept.h#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/resource.h#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/example.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/libpng.3#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/libpng.txt#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/libpngpf.3#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/makefile.gcc#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/png.5#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/png.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/png.h#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/pngasmrd.h#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/pngbar.jpg#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/pngbar.png#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/pngconf.h#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/pngerror.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/pnggccrd.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/pngget.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/pngmem.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/pngnow.png#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/pngpread.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/pngread.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/pngrio.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/pngrtran.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/pngrutil.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/pngset.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/pngtest.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/pngtest.png#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/pngtrans.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/pngvcrd.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/pngwio.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/pngwrite.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/pngwtran.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/pngwutil.c#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/projects/beos/x86-shared.proj#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/projects/beos/x86-shared.txt#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/projects/beos/x86-static.proj#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/projects/beos/x86-static.txt#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/projects/borland/libpng.bpf#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/projects/borland/libpng.bpg#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/projects/borland/libpng.bpr#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/projects/borland/libpng.cpp#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/projects/borland/libpng.readme.txt#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/projects/borland/libpngstat.bpf#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/projects/borland/libpngstat.bpr#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/projects/borland/zlib+libpng.bpg#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/projects/borland/zlib.bpf#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/projects/borland/zlib.bpg#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/projects/borland/zlib.bpr#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/projects/borland/zlib.cpp#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/projects/borland/zlibstat.bpf#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/projects/borland/zlibstat.bpr#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/projects/msvc/README.txt#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/projects/msvc/libpng.dsp#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/projects/msvc/libpng.dsw#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/projects/msvc/png.rc#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/projects/msvc/png32ms.def#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/projects/msvc/zlib.def#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/projects/msvc/zlib.dsp#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/projects/netware.txt#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/projects/wince.txt#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/SCOPTIONS.ppc#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/descrip.mms#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/libpng-config-body.in#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/libpng-config-head.in#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/libpng.icc#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/libpng.pc.in#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.32sunu#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.64sunu#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.acorn#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.aix#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.amiga#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.atari#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.bc32#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.bd32#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.beos#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.bor#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.cygwin#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.darwin#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.dec#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.dj2#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.freebsd#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.gcc#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.gcmmx#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.hpgcc#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.hpux#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.ibmc#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.intel#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.knr#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.linux#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.macosx#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.mips#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.msc#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.ne12bsd#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.netbsd#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.openbsd#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.os2#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.sco#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.sggcc#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.sgi#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.so9#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.solaris#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.std#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.sunos#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.tc3#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.vcawin32#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.vcwin32#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.watcom#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/makevms.com#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/pngdef.pas#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/pngos2.def#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libvuln_png/scripts/smakefile.ppc#1 branch .. //depot/projects/ctsrd/beribsd/src/ctsrd/Makefile#2 edit .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/ANNOUNCE#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/CHANGES#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/INSTALL#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/KNOWNBUG#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/LICENSE#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/Makefile#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/README#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/TODO#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/Y2KINFO#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/configure#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/LICENSE#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/Makefile.sgi#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/Makefile.unx#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/Makefile.w32#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/README#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/makevms.com#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/readpng.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/readpng.h#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/readpng.o#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/readpng2.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/readpng2.h#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/rpng-win.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/rpng-x.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/rpng-x.o#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/rpng2-win.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/rpng2-x.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/toucan.png#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/wpng.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/writepng.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/gregbook/writepng.h#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/msvctest/README.txt#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/msvctest/msvctest.dsp#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/msvctest/msvctest.dsw#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngminus/README#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngminus/makefile.std#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngminus/makefile.tc3#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngminus/makevms.com#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngminus/png2pnm.bat#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngminus/png2pnm.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngminus/png2pnm.sh#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngminus/pngminus.bat#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngminus/pngminus.sh#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngminus/pnm2png.bat#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngminus/pnm2png.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngminus/pnm2png.sh#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/README#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn0g01.png#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn0g02.png#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn0g04.png#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn0g08.png#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn0g16.png#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn2c08.png#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn2c16.png#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn3p01.png#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn3p02.png#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn3p04.png#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn3p08.png#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn4a08.png#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn4a16.png#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn6a08.png#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/pngsuite/basn6a16.png#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/visupng/PngFile.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/visupng/PngFile.h#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/visupng/README.txt#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/visupng/VisualPng.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/visupng/VisualPng.dsp#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/visupng/VisualPng.dsw#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/visupng/VisualPng.ico#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/visupng/VisualPng.png#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/visupng/VisualPng.rc#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/visupng/cexcept.h#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/contrib/visupng/resource.h#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/example.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/libpng.3#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/libpng.txt#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/libpngpf.3#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/makefile.gcc#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/png.5#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/png.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/png.h#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngasmrd.h#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngbar.jpg#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngbar.png#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngconf.h#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngerror.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pnggccrd.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngget.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngmem.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngnow.png#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngpread.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngread.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngrio.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngrtran.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngrutil.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngset.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngtest.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngtest.png#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngtrans.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngvcrd.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngwio.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngwrite.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngwtran.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/pngwutil.c#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/beos/x86-shared.proj#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/beos/x86-shared.txt#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/beos/x86-static.proj#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/beos/x86-static.txt#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/borland/libpng.bpf#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/borland/libpng.bpg#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/borland/libpng.bpr#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/borland/libpng.cpp#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/borland/libpng.readme.txt#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/borland/libpngstat.bpf#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/borland/libpngstat.bpr#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/borland/zlib+libpng.bpg#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/borland/zlib.bpf#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/borland/zlib.bpg#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/borland/zlib.bpr#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/borland/zlib.cpp#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/borland/zlibstat.bpf#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/borland/zlibstat.bpr#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/msvc/README.txt#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/msvc/libpng.dsp#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/msvc/libpng.dsw#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/msvc/png.rc#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/msvc/png32ms.def#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/msvc/zlib.def#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/msvc/zlib.dsp#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/netware.txt#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/projects/wince.txt#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/SCOPTIONS.ppc#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/descrip.mms#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/libpng-config-body.in#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/libpng-config-head.in#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/libpng.icc#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/libpng.pc.in#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.32sunu#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.64sunu#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.acorn#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.aix#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.amiga#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.atari#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.bc32#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.bd32#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.beos#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.bor#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.cygwin#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.darwin#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.dec#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.dj2#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.freebsd#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.gcc#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.gcmmx#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.hpgcc#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.hpux#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.ibmc#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.intel#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.knr#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.linux#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.macosx#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.mips#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.msc#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.ne12bsd#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.netbsd#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.openbsd#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.os2#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.sco#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.sggcc#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.sgi#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.so9#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.solaris#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.std#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.sunos#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.tc3#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.vcawin32#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.vcwin32#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makefile.watcom#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/makevms.com#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/pngdef.pas#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/pngos2.def#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/libvuln_png/scripts/smakefile.ppc#2 delete .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/Makefile#2 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/ctsrd/Makefile#2 (text+ko) ==== @@ -1,7 +1,6 @@ .include SUBDIR= flashit \ - libvuln_png \ pictview .include ==== //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/Makefile#2 (text+ko) ==== @@ -9,8 +9,7 @@ WARNS= 0 -CFLAGS+= -I${.CURDIR}/../libvuln_png/ -LDADD+= -L../libvuln_png/ -lvuln_png -lz -lm +LDADD+= -lvuln_png -lz -lm # Disable the stack protector, we want to be vulnerable SSP_CFLAGS= From owner-p4-projects@FreeBSD.ORG Thu Jun 14 21:37:09 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A7721065677; Thu, 14 Jun 2012 21:37:09 +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 C17A8106566B for ; Thu, 14 Jun 2012 21:37:08 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [69.147.83.45]) by mx1.freebsd.org (Postfix) with ESMTP id A30BC8FC24 for ; Thu, 14 Jun 2012 21:37:08 +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 q5ELb8bS039758 for ; Thu, 14 Jun 2012 21:37:08 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 q5ELb8ZR039755 for perforce@freebsd.org; Thu, 14 Jun 2012 21:37:08 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 14 Jun 2012 21:37:08 GMT Message-Id: <201206142137.q5ELb8ZR039755@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 212863 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, 14 Jun 2012 21:37:10 -0000 http://p4web.freebsd.org/@@212863?ac=10 Change 212863 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/06/14 21:36:03 Factor out common, non-DE4-specific portions of the BERI DE4 MDROOT and SDROOT kernel configuration files into a new BERI_TEPLATE configuratio file incuded by both, and also appropriatate to use with future tPad configurations. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_MDROOT#4 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_SDROOT#5 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_TEMPLATE#1 add Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_MDROOT#4 (text+ko) ==== @@ -6,46 +6,12 @@ # $FreeBSD$ # +include "BERI_TEMPLATE" + ident BERI_DE4_MDROOT -machine mips mips64eb - -cpu CPU_BERI - -options HZ=200 - -makeoptions ARCH_FLAGS="-march=mips64 -mabi=64" - -makeoptions KERNLOADADDR=0xffffffff80100000 - -include "../beri/std.beri" - hints "BERI_DE4.hints" #Default places to look for devices. -makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols - -makeoptions MODULES_OVERRIDE="" - -options DDB -options KDB -options ALT_BREAK_TO_DEBUGGER - -options SCHED_ULE - -options FFS #Berkeley Fast Filesystem - -options INET -options INET6 -options NFSCL -options NFS_ROOT - -# Debugging for use in -current -#options DEADLKRES #Enable the deadlock resolver -options INVARIANTS #Enable calls of extra sanity checking -options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -#options WITNESS #Enable checks to detect deadlocks and cycles -#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed - # # This kernel configuration uses an embedded 8MB memory root file system. # Adjust the following path based on local requirements. @@ -62,11 +28,4 @@ device terasic_mtl device isf -device geom_map - -device md -device ether -device loop -device random device sc -device snp ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_SDROOT#5 (text+ko) ==== @@ -6,45 +6,12 @@ # $FreeBSD$ # +include "BERI_TEMPLATE" + ident BERI_DE4_SDROOT -machine mips mips64eb - -cpu CPU_BERI - -options HZ=200 -makeoptions ARCH_FLAGS="-march=mips64 -mabi=64" - -makeoptions KERNLOADADDR=0xffffffff80100000 - -include "../beri/std.beri" - hints "BERI_DE4.hints" #Default places to look for devices. -makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols - -makeoptions MODULES_OVERRIDE="" - -options DDB -options KDB -options ALT_BREAK_TO_DEBUGGER - -options SCHED_ULE - -options FFS #Berkeley Fast Filesystem - -options INET -options INET6 -options NFSCL -options NFS_ROOT - -# Debugging for use in -current -#options DEADLKRES #Enable the deadlock resolver -options INVARIANTS #Enable calls of extra sanity checking -options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -#options WITNESS #Enable checks to detect deadlocks and cycles -#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed - options ROOTDEVNAME=\"ufs:altera_sdcard0\" device altera_avgen @@ -54,11 +21,4 @@ device terasic_mtl device isf -device geom_map - -device md -device ether -device loop -device random device sc -device snp From owner-p4-projects@FreeBSD.ORG Thu Jun 14 21:49:13 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECDF81065675; Thu, 14 Jun 2012 21:49:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A2D821065670 for ; Thu, 14 Jun 2012 21:49:12 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [69.147.83.45]) by mx1.freebsd.org (Postfix) with ESMTP id 8BB928FC16 for ; Thu, 14 Jun 2012 21:49:12 +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 q5ELnCn5041587 for ; Thu, 14 Jun 2012 21:49:12 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q5ELnCTo041584 for perforce@freebsd.org; Thu, 14 Jun 2012 21:49:12 GMT (envelope-from brooks@freebsd.org) Date: Thu, 14 Jun 2012 21:49:12 GMT Message-Id: <201206142149.q5ELnCTo041584@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 212864 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, 14 Jun 2012 21:49:13 -0000 http://p4web.freebsd.org/@@212864?ac=10 Change 212864 by brooks@brooks_ecr_current on 2012/06/14 21:48:53 Also add LOCAL_LIB_DIRS to SUBDIRS. Otherwise their products don't get installed. Affected files ... .. //depot/projects/ctsrd/beribsd/src/Makefile.inc1#4 edit .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/Makefile#2 edit .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libde4tc/Makefile#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libde4tc/de4tc.c#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libde4tc/de4tc.h#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/Makefile#3 edit .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/pictview.c#3 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/Makefile.inc1#4 (text+ko) ==== @@ -89,7 +89,7 @@ # These are last, since it is nice to at least get the base system # rebuilt before you do them. -.for _DIR in ${LOCAL_DIRS} +.for _DIR in ${LOCAL_LIB_DIRS} ${LOCAL_DIRS} .if exists(${.CURDIR}/${_DIR}/Makefile) SUBDIR+= ${_DIR} .endif ==== //depot/projects/ctsrd/beribsd/src/ctsrd-lib/Makefile#2 (text+ko) ==== @@ -3,6 +3,7 @@ .include -SUBDIR= libvuln_png +SUBDIR= libde4tc \ + libvuln_png .include ==== //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/Makefile#3 (text+ko) ==== @@ -9,7 +9,7 @@ WARNS= 0 -LDADD+= -lvuln_png -lz -lm +LDADD+= -lde4tc -lvuln_png -lz -lm # Disable the stack protector, we want to be vulnerable SSP_CFLAGS= ==== //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/pictview.c#3 (text+ko) ==== @@ -39,6 +39,10 @@ #include #include #include + +#include + +#if DIKE // endian.h not available in Linux? // #include #include @@ -63,11 +67,16 @@ // number of lines in the line pattern static const int num_lines_pattern = 600; +#endif // send keyboard output to stdout by default static int kbdfd = 0; +u_int32_t *fb_buf; +#if DIKE + + /***************************************************************************** * hack around endian issue * TODO: replace with endian library call (but not present in Linux?) @@ -413,6 +422,7 @@ } } */ +#endif /* DIKE */ void @@ -456,7 +466,6 @@ // while no pinch gesture, draw... while(!((touch_count==2) && (touch_gesture==0x49))) { // try to filter out short lived touch releases - multitouch_pole(); multitouch_filter(); if((touch_count<1) || (touch_count>2)) @@ -481,6 +490,7 @@ } +#if DIKE /***************************************************************************** * PNG image loader *****************************************************************************/ @@ -586,9 +596,9 @@ for(x=0; x Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FC1E1065677; Thu, 14 Jun 2012 21:59:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 468DC1065675 for ; Thu, 14 Jun 2012 21:59:06 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [69.147.83.45]) by mx1.freebsd.org (Postfix) with ESMTP id 2FEAC8FC12 for ; Thu, 14 Jun 2012 21:59:06 +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 q5ELx6QC043379 for ; Thu, 14 Jun 2012 21:59:06 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q5ELx5ui043376 for perforce@freebsd.org; Thu, 14 Jun 2012 21:59:05 GMT (envelope-from brooks@freebsd.org) Date: Thu, 14 Jun 2012 21:59:05 GMT Message-Id: <201206142159.q5ELx5ui043376@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 212865 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, 14 Jun 2012 21:59:07 -0000 http://p4web.freebsd.org/@@212865?ac=10 Change 212865 by brooks@brooks_ecr_current on 2012/06/14 21:58:19 Change 212864 accidentally included these files. The message for this part of the change should have been: Factor the more general portions of pictview out into a libde4tc library so that more programs can be written. The framebuffer is no longer exposed directly, but instead can be written in full with the fb_post() function. Also in this comment, actually remove the code that was only ifdef'd of pictview.c before. Affected files ... .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/Makefile#3 edit .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libde4tc/Makefile#2 edit .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libde4tc/de4tc.c#2 edit .. //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libde4tc/de4tc.h#2 edit .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/Makefile#4 edit .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/pictview.c#4 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/ctsrd-lib/Makefile#3 (text+ko) ==== ==== //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libde4tc/Makefile#2 (text+ko) ==== ==== //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libde4tc/de4tc.c#2 (text+ko) ==== ==== //depot/projects/ctsrd/beribsd/src/ctsrd-lib/libde4tc/de4tc.h#2 (text+ko) ==== ==== //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/Makefile#4 (text+ko) ==== ==== //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/pictview.c#4 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Thu Jun 14 22:34:13 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81BD91065802; Thu, 14 Jun 2012 22:34:13 +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 3860C1065800 for ; Thu, 14 Jun 2012 22:34:13 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [69.147.83.45]) by mx1.freebsd.org (Postfix) with ESMTP id 1E2F98FC15 for ; Thu, 14 Jun 2012 22:34:13 +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 q5EMYCE7051393 for ; Thu, 14 Jun 2012 22:34:12 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 q5EMYC3i051389 for perforce@freebsd.org; Thu, 14 Jun 2012 22:34:12 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 14 Jun 2012 22:34:12 GMT Message-Id: <201206142234.q5EMYC3i051389@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 212869 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, 14 Jun 2012 22:34:13 -0000 http://p4web.freebsd.org/@@212869?ac=10 Change 212869 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/06/14 22:33:30 Integrate FreeBSD/CHERI development brnch to pick up a variety of FreeBSD/BERI fixes and improvements, including the isf driver, MTL JTAG UART, and SD card driver improvements, MIPS pmap fixes for uncached page attributes, and demo application parts. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/Makefile.inc1#2 integrate .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/Makefile#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/Makefile.inc#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libde4tc/Makefile#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libde4tc/de4tc.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libde4tc/de4tc.h#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/ANNOUNCE#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/CHANGES#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/INSTALL#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/KNOWNBUG#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/LICENSE#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/Makefile#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/README#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/TODO#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/Y2KINFO#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/configure#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/LICENSE#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/Makefile.sgi#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/Makefile.unx#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/Makefile.w32#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/README#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/makevms.com#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/readpng.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/readpng.h#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/readpng.o#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/readpng2.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/readpng2.h#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/rpng-win.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/rpng-x.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/rpng-x.o#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/rpng2-win.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/rpng2-x.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/toucan.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/wpng.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/writepng.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/gregbook/writepng.h#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/msvctest/README.txt#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/msvctest/msvctest.dsp#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/msvctest/msvctest.dsw#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/README#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/makefile.std#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/makefile.tc3#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/makevms.com#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/png2pnm.bat#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/png2pnm.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/png2pnm.sh#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/pngminus.bat#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/pngminus.sh#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/pnm2png.bat#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/pnm2png.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngminus/pnm2png.sh#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/README#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn0g01.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn0g02.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn0g04.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn0g08.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn0g16.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn2c08.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn2c16.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn3p01.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn3p02.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn3p04.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn3p08.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn4a08.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn4a16.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn6a08.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/pngsuite/basn6a16.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/PngFile.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/PngFile.h#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/README.txt#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/VisualPng.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/VisualPng.dsp#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/VisualPng.dsw#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/VisualPng.ico#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/VisualPng.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/VisualPng.rc#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/cexcept.h#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/contrib/visupng/resource.h#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/example.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/libpng.3#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/libpng.txt#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/libpngpf.3#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/makefile.gcc#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/png.5#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/png.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/png.h#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngasmrd.h#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngbar.jpg#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngbar.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngconf.h#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngerror.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pnggccrd.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngget.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngmem.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngnow.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngpread.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngread.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngrio.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngrtran.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngrutil.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngset.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngtest.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngtest.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngtrans.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngvcrd.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngwio.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngwrite.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngwtran.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/pngwutil.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/beos/x86-shared.proj#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/beos/x86-shared.txt#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/beos/x86-static.proj#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/beos/x86-static.txt#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/borland/libpng.bpf#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/borland/libpng.bpg#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/borland/libpng.bpr#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/borland/libpng.cpp#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/borland/libpng.readme.txt#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/borland/libpngstat.bpf#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/borland/libpngstat.bpr#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/borland/zlib+libpng.bpg#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/borland/zlib.bpf#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/borland/zlib.bpg#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/borland/zlib.bpr#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/borland/zlib.cpp#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/borland/zlibstat.bpf#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/borland/zlibstat.bpr#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/msvc/README.txt#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/msvc/libpng.dsp#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/msvc/libpng.dsw#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/msvc/png.rc#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/msvc/png32ms.def#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/msvc/zlib.def#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/msvc/zlib.dsp#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/netware.txt#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/projects/wince.txt#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/SCOPTIONS.ppc#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/descrip.mms#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/libpng-config-body.in#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/libpng-config-head.in#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/libpng.icc#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/libpng.pc.in#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.32sunu#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.64sunu#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.acorn#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.aix#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.amiga#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.atari#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.bc32#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.bd32#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.beos#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.bor#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.cygwin#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.darwin#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.dec#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.dj2#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.freebsd#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.gcc#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.gcmmx#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.hpgcc#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.hpux#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.ibmc#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.intel#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.knr#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.linux#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.macosx#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.mips#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.msc#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.ne12bsd#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.netbsd#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.openbsd#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.os2#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.sco#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.sggcc#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.sgi#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.so9#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.solaris#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.std#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.sunos#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.tc3#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.vcawin32#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.vcwin32#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makefile.watcom#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/makevms.com#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/pngdef.pas#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/pngos2.def#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd-lib/libvuln_png/scripts/smakefile.ppc#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/Makefile#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/Makefile.inc#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/flashit/Makefile#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/flashit/flashit.sh#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/Makefile#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/Canon-5DII-3816.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/Canon-5DII-4717.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/Canon-5DII-5487.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/CatSword.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/Makefile#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/Quill.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/Terminal.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/busy0.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/busy0.svg#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/busy1.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/busy1.svg#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/keyboardA.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/keyboardA.svg#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/keyboardC.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/keyboardC.svg#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/keyboardN.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/keyboardN.svg#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/keyboardS.png#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/img/keyboardS.svg#1 branch .. //depot/projects/ctsrd/cheribsd/src/ctsrd/pictview/pictview.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart.c#3 delete .. //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart.h#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/sdcard/altera_sdcard_io.c#2 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/dev/isf/isf.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/dev/isf/isf.h#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/dev/isf/isf_nexus.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/dev/terasic/mtl/terasic_mtl.h#2 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/dev/terasic/mtl/terasic_mtl_text.c#2 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/geom/geom_map.c#2 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/mips/beri/files.beri#4 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI.hints#3 delete .. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_DE4.hints#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_DE4_MDROOT#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_DE4_SDROOT#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_MDROOT#3 delete .. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_SDROOT#3 delete .. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_TEMPLATE#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_TPAD.hints#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/pmap.c#2 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/trap.c#4 integrate .. //depot/projects/ctsrd/cheribsd/src/usr.sbin/Makefile#2 integrate .. //depot/projects/ctsrd/cheribsd/src/usr.sbin/isfctl/Makefile#1 branch .. //depot/projects/ctsrd/cheribsd/src/usr.sbin/isfctl/isfctl.c#1 branch Differences ... ==== //depot/projects/ctsrd/cheribsd/src/Makefile.inc1#2 (text+ko) ==== @@ -15,6 +15,7 @@ # -DNO_WWWUPDATE do not update www in ${MAKE} update # -DNO_CTF do not run the DTrace CTF conversion tools on built objects # LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list +# LOCAL_LIB_DIRS="list of dirs" to add additional dirs to libraries # LOCAL_TOOL_DIRS="list of dirs" to add additional dirs to the build-tools # list # TARGET="machine" to crossbuild world for a different machine type @@ -88,7 +89,7 @@ # These are last, since it is nice to at least get the base system # rebuilt before you do them. -.for _DIR in ${LOCAL_DIRS} +.for _DIR in ${LOCAL_LIB_DIRS} ${LOCAL_DIRS} .if exists(${.CURDIR}/${_DIR}/Makefile) SUBDIR+= ${_DIR} .endif @@ -1269,6 +1270,11 @@ .endif _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib} +.for _DIR in ${LOCAL_LIB_DIRS} +.if exists(${.CURDIR}/${_DIR}/Makefile) +_generic_libs+= ${_DIR} +.endif +.endfor lib/libopie__L lib/libtacplus__L: lib/libmd__L ==== //depot/projects/ctsrd/cheribsd/src/sys/dev/altera/sdcard/altera_sdcard_io.c#2 (text+ko) ==== @@ -54,6 +54,7 @@ #include int altera_sdcard_ignore_crc_errors = 1; +int altera_sdcard_verify_rxtx_writes = 1; /* * Low-level I/O routines for the Altera SD Card University IP Core driver. @@ -231,14 +232,69 @@ altera_sdcard_write_rxtx_buffer(struct altera_sdcard_softc *sc, void *data, size_t len) { + u_int corrections, differences, i, retry_counter; + uint16_t d, v; KASSERT((uintptr_t)data % 2 == 0, ("%s: unaligned data %p", __func__, data)); KASSERT((len <= ALTERA_SDCARD_SECTORSIZE) && (len % 2 == 0), ("%s: invalid length %ju", __func__, len)); - bus_write_region_2(sc->as_res, ALTERA_SDCARD_OFF_RXTX_BUFFER, - (uint16_t *)data, len / 2); + retry_counter = 0; + do { + bus_write_region_2(sc->as_res, ALTERA_SDCARD_OFF_RXTX_BUFFER, + (uint16_t *)data, len / 2); + + /* + * XXXRW: Due to a possible hardware bug, the above call to + * bus_write_region_2() might not succeed. If the workaround + * is enabled, verify each write and retry until it succeeds. + * + * XXXRW: Do we want a limit counter for retries here? + */ +recheck: + corrections = 0; + differences = 0; + if (altera_sdcard_verify_rxtx_writes) { + for (i = 0; i < ALTERA_SDCARD_SECTORSIZE; i += 2) { + v = bus_read_2(sc->as_res, + ALTERA_SDCARD_OFF_RXTX_BUFFER + i); + d = *(uint16_t *)((uint8_t *)data + i); + if (v != d) { + if (retry_counter == 0) { + bus_write_2(sc->as_res, + ALTERA_SDCARD_OFF_RXTX_BUFFER + i, + d); + v = bus_read_2(sc->as_res, + ALTERA_SDCARD_OFF_RXTX_BUFFER + i); + if (v == d) { + corrections++; + device_printf(sc->as_dev, + "%s: single word rewrite worked" + " at offset %u\n", + __func__, i); + continue; + } + } + differences++; + device_printf(sc->as_dev, + "%s: retrying write -- difference" + " %u at offset %u, retry %u\n", + __func__, differences, i, + retry_counter); + } + } + if (differences != 0) { + retry_counter++; + if (retry_counter == 1 && + corrections == differences) + goto recheck; + } + } + } while (differences != 0); + if (retry_counter) + device_printf(sc->as_dev, "%s: succeeded after %u retries\n", + __func__, retry_counter); } static void ==== //depot/projects/ctsrd/cheribsd/src/sys/dev/terasic/mtl/terasic_mtl.h#2 (text+ko) ==== @@ -141,6 +141,7 @@ /* * Constants to help interpret the text frame buffer. */ +#define TERASIC_MTL_TEXTFRAMEBUF_EXPECTED_ADDR 0x0177000 #define TERASIC_MTL_TEXTFRAMEBUF_CHAR_SHIFT 0 #define TERASIC_MTL_TEXTFRAMEBUF_ATTR_SHIFT 8 ==== //depot/projects/ctsrd/cheribsd/src/sys/dev/terasic/mtl/terasic_mtl_text.c#2 (text+ko) ==== @@ -154,32 +154,17 @@ bus_write_2(sc->mtl_text_res, offset, v); } -/* - * XXXRW: Work around a feature in which the default address of the text frame - * buffer is not initialised at reset as expected. - */ -#define TERASIC_MTL_TEXT_EXPECTED_ADDR 0x0177000 -static void -terasic_mtl_text_workaround(struct terasic_mtl_softc *sc) +int +terasic_mtl_text_attach(struct terasic_mtl_softc *sc) { uint32_t v; terasic_mtl_reg_textframebufaddr_get(sc, &v); - if (v == TERASIC_MTL_TEXT_EXPECTED_ADDR) - return; - device_printf(sc->mtl_dev, - "%s: adjusting text frame buffer reg from 0x%x to 0x%x\n", - __func__, v, TERASIC_MTL_TEXT_EXPECTED_ADDR); - terasic_mtl_reg_textframebufaddr_set(sc, - TERASIC_MTL_TEXT_EXPECTED_ADDR); -} - -int -terasic_mtl_text_attach(struct terasic_mtl_softc *sc) -{ - - /* XXXRW: To go away. */ - terasic_mtl_text_workaround(sc); + if (v != TERASIC_MTL_TEXTFRAMEBUF_EXPECTED_ADDR) { + device_printf(sc->mtl_dev, "%s: unexpected text frame buffer " + "address (%08x); cannot attach\n", __func__, v); + return (ENXIO); + } sc->mtl_text_cdev = make_dev(&terasic_mtl_text_cdevsw, sc->mtl_unit, UID_ROOT, GID_WHEEL, 0400, "mtl_text%d", sc->mtl_unit); ==== //depot/projects/ctsrd/cheribsd/src/sys/geom/geom_map.c#2 (text+ko) ==== @@ -119,13 +119,13 @@ g_slice_dumpconf(sb, indent, gp, cp, pp); if (pp != NULL) { if (indent == NULL) { - sbuf_printf(sb, " entry %lld", sc->entry[pp->index]); - sbuf_printf(sb, " dsize %lld", sc->dsize[pp->index]); + sbuf_printf(sb, " entry %jd", (intmax_t)sc->entry[pp->index]); + sbuf_printf(sb, " dsize %jd", (intmax_t)sc->dsize[pp->index]); } else { - sbuf_printf(sb, "%s%lld\n", indent, - sc->entry[pp->index]); - sbuf_printf(sb, "%s%lld\n", indent, - sc->dsize[pp->index]); + sbuf_printf(sb, "%s%jd\n", indent, + (intmax_t)sc->entry[pp->index]); + sbuf_printf(sb, "%s%jd\n", indent, + (intmax_t)sc->dsize[pp->index]); } } } @@ -153,8 +153,8 @@ return (1); if (bootverbose) { - printf("MAP: search key \"%s\" from 0x%llx, step 0x%llx\n", - search_key, search_start, search_step); + printf("MAP: search key \"%s\" from 0x%jx, step 0x%jx\n", + search_key, (intmax_t)search_start, (intmax_t)search_step); } /* error if search_key is empty */ @@ -321,9 +321,10 @@ } if (bootverbose) { - printf("MAP: %llxx%llx, data=%llxx%llx " + printf("MAP: %lxx%lx, data=%lxx%lx " "\"/dev/map/%s\"\n", - start, size, offset, dsize, name); + (intmax_t)start, (intmax_t)size, (intmax_t)offset, + (intmax_t)dsize, name); } sc->offset[i] = start; ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/beri/files.beri#4 (text+ko) ==== @@ -1,6 +1,8 @@ # $FreeBSD$ dev/altera/avgen/altera_avgen.c optional altera_avgen -dev/altera/jtag_uart/altera_jtag_uart.c optional altera_jtag_uart +dev/altera/jtag_uart/altera_jtag_uart_cons.c optional altera_jtag_uart +dev/altera/jtag_uart/altera_jtag_uart_tty.c optional altera_jtag_uart +dev/altera/jtag_uart/altera_jtag_uart_nexus.c optional altera_jtag_uart dev/altera/sdcard/altera_sdcard.c optional altera_sdcard dev/altera/sdcard/altera_sdcard_disk.c optional altera_sdcard dev/altera/sdcard/altera_sdcard_io.c optional altera_sdcard @@ -13,6 +15,8 @@ dev/terasic/mtl/terasic_mtl_reg.c optional terasic_mtl dev/terasic/mtl/terasic_mtl_syscons.c optional terasic_mtl dev/terasic/mtl/terasic_mtl_text.c optional terasic_mtl +dev/isf/isf.c optional isf +dev/isf/isf_nexus.c optional isf mips/beri/beri_machdep.c standard mips/cheri/cp2.c optional cpu_cheri mips/mips/intr_machdep.c standard ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/pmap.c#2 (text+ko) ==== @@ -3144,16 +3144,16 @@ pt_entry_t rw; if (!(prot & VM_PROT_WRITE)) - rw = PTE_V | PTE_RO | PTE_C_CACHE; + rw = PTE_V | PTE_RO; else if ((m->oflags & VPO_UNMANAGED) == 0) { if ((m->md.pv_flags & PV_TABLE_MOD) != 0) - rw = PTE_V | PTE_D | PTE_C_CACHE; + rw = PTE_V | PTE_D; else - rw = PTE_V | PTE_C_CACHE; + rw = PTE_V; vm_page_aflag_set(m, PGA_WRITEABLE); } else /* Needn't emulate a modified bit for unmanaged pages. */ - rw = PTE_V | PTE_D | PTE_C_CACHE; + rw = PTE_V | PTE_D; return (rw); } ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/trap.c#4 (text+ko) ==== @@ -1388,15 +1388,17 @@ read_or_write = "read"; break; default: - read_or_write = ""; + read_or_write = "unknown"; } pc = frame->pc + (DELAYBRANCH(frame->cause) ? 4 : 0); - log(LOG_ERR, "%s: pid %d (%s), uid %d: pc %#jx got a %s fault at %#jx\n", + log(LOG_ERR, "%s: pid %d (%s), uid %d: pc %#jx got a %s fault " + "(type %#x) at %#jx\n", msg, p->p_pid, p->p_comm, p->p_ucred ? p->p_ucred->cr_uid : -1, (intmax_t)pc, read_or_write, + trap_type, (intmax_t)frame->badvaddr); /* log registers in trap frame */ ==== //depot/projects/ctsrd/cheribsd/src/usr.sbin/Makefile#2 (text+ko) ==== @@ -34,6 +34,7 @@ ifmcstat \ inetd \ iostat \ + isfctl \ kldxref \ mailwrapper \ makefs \ From owner-p4-projects@FreeBSD.ORG Thu Jun 14 23:20:15 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 754241065672; Thu, 14 Jun 2012 23:20:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2D44E106566C for ; Thu, 14 Jun 2012 23:20:14 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [69.147.83.45]) by mx1.freebsd.org (Postfix) with ESMTP id 162F18FC12 for ; Thu, 14 Jun 2012 23:20:14 +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 q5ENKDfx060042 for ; Thu, 14 Jun 2012 23:20:13 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q5ENKDe2060037 for perforce@freebsd.org; Thu, 14 Jun 2012 23:20:13 GMT (envelope-from brooks@freebsd.org) Date: Thu, 14 Jun 2012 23:20:13 GMT Message-Id: <201206142320.q5ENKDe2060037@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 212871 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, 14 Jun 2012 23:20:15 -0000 http://p4web.freebsd.org/@@212871?ac=10 Change 212871 by brooks@brooks_ecr_current on 2012/06/14 23:20:11 Really remove the code that is now in libde4tc. Affected files ... .. //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/pictview.c#5 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/ctsrd/pictview/pictview.c#5 (text+ko) ==== @@ -42,390 +42,15 @@ #include -#if DIKE -// endian.h not available in Linux? -// #include -#include -#define PNG_DEBUG 3 -#include - -// file descriptors for MTL control and display regions -static int ctrlfd; -static int dispfd; -static int textfd; -static int fademode=0; -volatile static u_int32_t *pfbp; -volatile static u_int16_t *tfbp; -volatile static u_int32_t *mtlctrl; -// frame buffer dimensions -static const int fb_height = 480; -static const int fb_width = 800; - -// fade timing (for crude timing loop) -static const int fb_cross_fade_time = 500; - -// number of lines in the line pattern -static const int num_lines_pattern = 600; -#endif - // send keyboard output to stdout by default static int kbdfd = 0; u_int32_t *fb_buf; -#if DIKE - - -/***************************************************************************** - * hack around endian issue - * TODO: replace with endian library call (but not present in Linux?) - *****************************************************************************/ - -u_int32_t -endian_swap(u_int32_t lend) -{ - u_int32_t bend; - bend = lend & 0xff; - bend = bend<<8; - lend = lend>>8; - - bend |= lend & 0xff; - bend = bend<<8; - lend = lend>>8; - - bend |= lend & 0xff; - bend = bend<<8; - lend = lend>>8; - - bend |= lend & 0xff; - return bend; -} - - - -/***************************************************************************** - * sample touch input - *****************************************************************************/ - -static int touch_x0=0; -static int touch_y0=0; -static int touch_x1=0; -static int touch_y1=0; -static int touch_gesture=0; -static int touch_count=0; -volatile static int touch_tmp=0; - -void -multitouch_pole(void) -{ - /* - int j; - for(j=3; j<8; j++) - touch_tmp += pfbp[j]; // provoke cache line flush - */ - int t_x0 = endian_swap(mtlctrl[3]); - if(t_x0>=0) { // new touch info available - touch_x0 = t_x0; - touch_y0 = endian_swap(mtlctrl[4]); - touch_x1 = endian_swap(mtlctrl[5]); - touch_y1 = endian_swap(mtlctrl[6]); - // note that this final read dequeues - touch_gesture = endian_swap(mtlctrl[7]); - touch_count = touch_gesture>>8; - if(touch_count<0) touch_count=0; // hack - touch_gesture &= 0xff; - } - // else - // t_x0 = mtlctrl[7]; // clear any -1s from FIFO? -} - - -// filter out short lived touch releases -void -multitouch_filter(void) -{ - int j; - multitouch_pole(); - for(j=30000; (j>0) && (touch_count==0); j--) - multitouch_pole(); -} - -// wait for touch release -void -multitouch_release_event(void) -{ - do { - // multitouch_filter(); - multitouch_pole(); - } while(touch_count!=0); -} - - -/***************************************************************************** - * frame buffer routines - * TODO: put in seperate library - *****************************************************************************/ - -void -fb_init(void) -{ - ctrlfd = open("/dev/mtl_reg0", O_RDWR | O_NONBLOCK); - if(ctrlfd < 0) - err(1, "open mtl_reg0"); - - mtlctrl = mmap(NULL, 0x20, PROT_READ | PROT_WRITE, MAP_SHARED, ctrlfd, 0); - if (mtlctrl == MAP_FAILED) - err(1, "mmap mtl_reg0"); - - dispfd = open("/dev/mtl_pixel0", O_RDWR | O_NONBLOCK); - if(dispfd < 0) - err(1, "open mtl_pixel0"); - pfbp = mmap(NULL, 0x177000, PROT_READ | PROT_WRITE, MAP_SHARED, dispfd, 0); - if (pfbp == MAP_FAILED) - err(1, "mmap mtl_pixel0"); - - textfd = open("/dev/mtl_text0", O_RDWR | O_NONBLOCK); - if(textfd < 0) - err(1, "open mtl_text0"); - tfbp = mmap(NULL, 100*40*2, PROT_READ | PROT_WRITE, MAP_SHARED, textfd, 0); - if (tfbp == MAP_FAILED) - err(1, "mmap mtl_text0"); -} - - -inline u_int32_t -fb_colour(int r, int g, int b) -{ - return ((r&0xff)<<8) | ((g&0xff)<<16) | ((b&0xff)<<24); -} - - -inline void -fb_putpixel(int px, int py, int colour) -{ - pfbp[px+py*fb_width] = colour; -} - - -void -fb_fill(int col) -{ - int addr; - for(addr=0; addr<(fb_height*fb_width); addr++) - pfbp[addr] = col; -} - - -void -fb_blend(int blend_text_bg, int blend_text_fg, int blend_pixel, int wash) -{ - mtlctrl[0] = - ((blend_text_bg & 0xff)<<24) | - ((blend_text_fg & 0xff)<<16) | - ((blend_pixel & 0xff)<<8) | - // to avoid a red screen colour wash "attack" indicator from being - // removed, preserve the "wash" value: - //wash; - mtlctrl[0] & 0xff; - // to try the dark red "attack" indicator: - //4; -} - - -void -fb_text_cursor(int x, int y) -{ - mtlctrl[1] = ((y&0xff)<<24) | ((x)<<16); -} - - -// fade the pixel framebuffer to black using the MTL hardware alpha blending -void -fb_fade2off(void) -{ - int b,t; - if(fademode==0) - fb_blend(255,255,255,0); - else - for(b=0; b<256; b++) - for(t=fb_cross_fade_time; t>0; t--) - fb_blend(b,b,255,0); - fademode=0; -} - - -// fade the pixel framebuffer from black using the MTL hardware alpha blending -void -fb_fade2on(void) -{ - int b,t; - if(fademode==1) - fb_blend(0,0,255,0); - else - for(b=0; b<256; b++) - for(t=fb_cross_fade_time; t>0; t--) - fb_blend(255-b,255-b,255,0); - fademode=1; -} - - -void -fb_fade2text(int textbg_alpha) -{ - int b, t; - if(fademode==2) - fb_blend(255,255,0,0); - else - for(b=0; b<256; b++) - for(t=fb_cross_fade_time; t>0; t--) - fb_blend((b>1; - y=dxabs>>1; - px=x1; - py=y1; - - if((x1==x2) && (y1==y2)) - fb_putpixel(x1,y1,colour); - else if (dxabs>=dyabs) { /* the line is more horizontal than vertical */ - for(i=0;i=dxabs) { - y-=dxabs; - py+=sdy; - } - px+=sdx; - fb_putpixel(px,py,colour); - } - } else { /* the line is more vertical than horizontal */ - for(i=0;i=dyabs) { - x-=dyabs; - px+=sdx; - } - py+=sdy; - fb_putpixel(px,py,colour); - } - } -} - -/***************************************************************************** - * some test pattern generators, etc. - *****************************************************************************/ - -/* -void line_pattern() -{ - int x0buf[num_lines_pattern]; - int y0buf[num_lines_pattern]; - int x1buf[num_lines_pattern]; - int y1buf[num_lines_pattern]; - int j; - int x0=10; - int y0=10; - int dx0=3; - int dy0=3; - int x1=200; - int y1=200; - int dx1=2; - int dy1=-2; - const int on_colour = 0xffffffff; // white - const int off_colour = 0xff<<24; // blue - for(j=0; j=num_lines_pattern) j=0; - x0=x0+dx0; if((x0>=fb_width) || (x0<0)) { x0=x0-2*dx0; dx0=-dx0; } - y0=y0+dy0; if((y0>=fb_height) || (y0<0)) { y0=y0-2*dy0; dy0=-dy0; } - x1=x1+dx1; if((x1>=fb_width) || (x1<0)) { x1=x1-2*dx1; dx1=-dx1; } - y1=y1+dy1; if((y1>=fb_height) || (y1<0)) { y1=y1-2*dy1; dy1=-dy1; } - // fb_refresh(); - } -} -*/ - - /* -void -stripy_pixels_fast() -{ - // write stripes to pixel buffer - u_int32_t fb[fb_height][fb_width]; - int x,y,r,g,b; - for(y=0; y>1); - fb_putpixel(x,y,fb_colour(r,g,b)); - } - } -} -*/ - - -/* -void -flash_colours() -{ - int j, r, g, b; - for(j=0; j<8; j++) { - r = (j & 0x1)==0 ? 0 : 0xff; - g = (j & 0x2)==0 ? 0 : 0xff; - b = (j & 0x4)==0 ? 0 : 0xff; - fb_fill(fb_colour(r,g,b)); - } -} -*/ -#endif /* DIKE */ - - -void pen_drawing_clear_screen(void) { int x0,y0; @@ -490,113 +115,6 @@ } -#if DIKE -/***************************************************************************** - * PNG image loader - *****************************************************************************/ - -void -read_png_file(char* file_name, u_int32_t* imgbuf, int maxwidth, int maxheight) -{ - unsigned char header[8]; // 8 is the maximum size that can be checked - size_t tmp; - int x,y; - - int width, height, rowbytes; - png_byte colour_type; - png_byte bit_depth; - - png_structp png_ptr; - png_infop info_ptr; - int number_of_passes; - png_bytep * row_pointers; - int bppx; // bytes per pixel - - /* open file and test for it being a png */ - FILE *fp = fopen(file_name, "rb"); - if (!fp) - err(1,"fopen - failed to read from %s",file_name); - tmp=fread(header, 1, 8, fp); - if (png_sig_cmp(header, 0, 8)) - err(1,"file $s not PNG", file_name); - - png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - if (!png_ptr) - err(1,"png_create_read_struct failed"); - - info_ptr = png_create_info_struct(png_ptr); - if (!info_ptr) - err(1,"png_create_info_struct failed"); - - if (setjmp(png_jmpbuf(png_ptr))) - err(1,"Error during init_io"); - - png_init_io(png_ptr, fp); - png_set_sig_bytes(png_ptr, 8); - - png_read_info(png_ptr, info_ptr); - - width = png_get_image_width(png_ptr, info_ptr); - height = png_get_image_height(png_ptr, info_ptr); - colour_type = png_get_color_type(png_ptr, info_ptr); - bit_depth = png_get_bit_depth(png_ptr, info_ptr); - - //printf("image=%s, width=%1d, height=%1d, colour_type=%1d, bit_depth=%1d\n", - // file_name, width, height, colour_type, bit_depth); - - if((colour_type != PNG_COLOR_TYPE_RGB) && (colour_type != 6)) - err(1,"colour type is not RGB - panic!"); - if(bit_depth != 8) - err(1,"bit depth is not 8 - panic!"); - - number_of_passes = png_set_interlace_handling(png_ptr); - png_read_update_info(png_ptr, info_ptr); - - /* read file */ - if (setjmp(png_jmpbuf(png_ptr))) - err(1,"Error during read_image"); - - row_pointers = (png_bytep*) malloc(sizeof(png_bytep) * height); - - if (bit_depth == 16) - rowbytes = width*8; - else - rowbytes = width*4; - - for (y=0; ymaxheight) height=maxheight; - if(width>maxwidth) width=maxwidth; - - bppx = 3; - if(colour_type==6) - bppx = 4; - for (y=0; y Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 892DD1065672; Thu, 14 Jun 2012 23:40:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 42059106566C for ; Thu, 14 Jun 2012 23:40:00 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [69.147.83.45]) by mx1.freebsd.org (Postfix) with ESMTP id 2AF1D8FC08 for ; Thu, 14 Jun 2012 23:40:00 +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 q5ENdxS3063693 for ; Thu, 14 Jun 2012 23:40:00 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q5ENdxoX063690 for perforce@freebsd.org; Thu, 14 Jun 2012 23:39:59 GMT (envelope-from brooks@freebsd.org) Date: Thu, 14 Jun 2012 23:39:59 GMT Message-Id: <201206142339.q5ENdxoX063690@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 212874 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, 14 Jun 2012 23:40:02 -0000 http://p4web.freebsd.org/@@212874?ac=10 Change 212874 by brooks@brooks_ecr_current on 2012/06/14 23:38:57 Add a simple program to display a busy spinner. I plan to add a better signal handler to it to clean up the display when killed and use it as a busy indicatory during boot. Affected files ... .. //depot/projects/ctsrd/beribsd/src/ctsrd/Makefile#3 edit .. //depot/projects/ctsrd/beribsd/src/ctsrd/spinner/Makefile#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/spinner/images/Makefile#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/spinner/images/spinner00.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/spinner/images/spinner01.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/spinner/images/spinner02.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/spinner/images/spinner03.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/spinner/images/spinner04.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/spinner/images/spinner05.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/spinner/images/spinner06.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/spinner/images/spinner07.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/spinner/images/spinner08.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/spinner/images/spinner09.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/spinner/images/spinner10.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/spinner/images/spinner11.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/spinner/spinner.c#1 add Differences ... ==== //depot/projects/ctsrd/beribsd/src/ctsrd/Makefile#3 (text+ko) ==== @@ -1,7 +1,8 @@ .include SUBDIR= flashit \ - pictview + pictview \ + spinner .include From owner-p4-projects@FreeBSD.ORG Fri Jun 15 18:32:36 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABD8C1065679; Fri, 15 Jun 2012 18:32:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6DDD11065674 for ; Fri, 15 Jun 2012 18:32:36 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [69.147.83.45]) by mx1.freebsd.org (Postfix) with ESMTP id 56B578FC12 for ; Fri, 15 Jun 2012 18:32: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 q5FIWaTq000696 for ; Fri, 15 Jun 2012 18:32:36 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q5FIWaiX000693 for perforce@freebsd.org; Fri, 15 Jun 2012 18:32:36 GMT (envelope-from brooks@freebsd.org) Date: Fri, 15 Jun 2012 18:32:36 GMT Message-Id: <201206151832.q5FIWaiX000693@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 212921 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: Fri, 15 Jun 2012 18:32:37 -0000 http://p4web.freebsd.org/@@212921?ac=10 Change 212921 by brooks@brooks_ecr_current on 2012/06/15 18:32:30 Enhance the spinner cdoe to support overlaying images above and below the spinner. Add images for boot and flashing. Add some limited ability to run a command and send the output to the text framebuffer. It looks like we will really need to do some tty initialization there to make it useful, but the goal is to try and who boot messages and, more importantly, show the flash process. Affected files ... .. //depot/projects/ctsrd/beribsd/src/ctsrd/spinner/images/Makefile#2 edit .. //depot/projects/ctsrd/beribsd/src/ctsrd/spinner/images/boot-bottom.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/spinner/images/boot-top.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/spinner/images/upgrade-bottom.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/spinner/images/upgrade-top.png#1 add .. //depot/projects/ctsrd/beribsd/src/ctsrd/spinner/spinner.c#2 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/ctsrd/spinner/images/Makefile#2 (text+ko) ==== @@ -1,7 +1,9 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/8/93 # $FreeBSD: src/share/misc/Makefile,v 1.27 2007/12/19 01:28:17 imp Exp $ -FILES= spinner00.png \ +FILES= boot-bottom.png \ + boot-top.png \ + spinner00.png \ spinner01.png \ spinner02.png \ spinner03.png \ @@ -12,7 +14,9 @@ spinner08.png \ spinner09.png \ spinner10.png \ - spinner11.png + spinner11.png \ + upgrade-bottom.png \ + upgrade-top.png NO_OBJ= BINDIR?= ${SHAREDIR} ==== //depot/projects/ctsrd/beribsd/src/ctsrd/spinner/spinner.c#2 (text+ko) ==== @@ -31,24 +31,106 @@ #include #include +#include #include #include +#include #include #include +#include #include +#include #define NSPINNERS 12 +#define IMGDIR "/usr/share/images" + +const int b_height = 120; +const int t_height = 120; + +static void +usage(void) +{ + + printf("usage: spinner [-b bottom] [-t top] [cmd ...]\n"); + exit(1); +} + +static void +clean_exit(void) +{ + fb_fade2off(); +} +static void +poll_child(pid_t pid) +{ + int status; + + if (wait4(pid, &status, WNOHANG, NULL) != 0) { + if (WIFEXITED(status)) + exit(WEXITSTATUS(status)); + if (WIFSIGNALED(status)) + fprintf(stderr, "child killed with signal %d\n", + WTERMSIG(status)); + err(1, "wait4() unknown status 0x%x", status); + } +} int main(int argc, char *argv[]) { - int i; - char imgpath[MAXPATHLEN]; - u_int32_t* spinners[NSPINNERS]; + int alpha, ch, i, ofd; + pid_t pid; + char *ep; + char imgpath[MAXPATHLEN]; + u_int32_t *bottom, *top; + u_int32_t *spinners[NSPINNERS]; struct timespec stime; + alpha=127; + bottom=NULL; + top=NULL; + while ((ch = getopt(argc, argv, "a:b:t:")) != -1) { + switch (ch) { + case 'a': + alpha = strtoul(optarg, &ep, 0); + if (*ep != '\0' || alpha < 0 || alpha > 255) + err(1, "invalid alpha value %s", optarg); + break; + case 'b': + if (optarg[0] == '/') + strncpy(imgpath, optarg, sizeof(imgpath)); + else + snprintf(imgpath, sizeof(imgpath), "%s/%s", + IMGDIR, optarg); + bottom = malloc(sizeof(u_int32_t) * b_height * + fb_width); + if (bottom == NULL) + err(1, "malloc"); + read_png_file(imgpath, bottom, fb_width, b_height); + break; + case 't': + if (optarg[0] == '/') + strncpy(imgpath, optarg, sizeof(imgpath)); + else + snprintf(imgpath, sizeof(imgpath), "%s/%s", + IMGDIR, optarg); + top = malloc(sizeof(u_int32_t) * t_height * + fb_width); + if (top == NULL) + err(1, "malloc"); + read_png_file(imgpath, top, fb_width, t_height); + break; + case '?': + default: + usage(); + } + } + argc -= optind; + argv += optind; + fb_init(); + atexit(clean_exit); fb_text_cursor(255, 255); fb_fade2off(); @@ -56,24 +138,60 @@ spinners[i] = malloc(sizeof(u_int32_t) * fb_width * fb_height); if (spinners[i] == NULL) err(1, "malloc"); + memset(spinners[i], 0, sizeof(u_int32_t) * fb_width * fb_height); + } + fb_post(spinners[0]); + + if (argc > 1) { + fb_fade2text(alpha); + + pid = fork(); + if (pid < 0) + err(1, "fork"); + else if (pid == 0) { + ofd = open("/dev/ttyv0", O_WRONLY); + if (ofd < 0) + err(1, "open(/dev/ttyv0)"); + if (dup2(ofd, 1) == -1) + err(1, "dup2(ofd, 1)"); + if (dup2(ofd, 2) == -1) + err(1, "dup2(ofd, 2)"); + execvp(*argv, argv); + err(1, "execvp"); + } + } else + fb_fade2on(); + + + for (i = 0; i < NSPINNERS; i++) { + poll_child(pid); snprintf(imgpath, sizeof(imgpath), - "/usr/share/images/spinner%02d.png", i); + "%s/spinner%02d.png", IMGDIR, i); read_png_file(imgpath, spinners[i], fb_width, fb_height); + + /* + * If they exist overlay the top and bottom images on the + * spinners. + */ + if (top != NULL) + memcpy(spinners[i], top, sizeof(u_int32_t) * fb_width * + t_height); + if (bottom != NULL) + memcpy(spinners[i] + + (fb_width * (fb_height - b_height)), + bottom, sizeof(u_int32_t) * fb_width * b_height); fb_post(spinners[i]); - if (i == 0) - fb_fade2on(); } stime.tv_sec = 0; stime.tv_nsec = (1000 * 1000 * 1000) / NSPINNERS; for(;;) { - /* Exit if a signal is received */ - if (nanosleep(&stime, NULL) == -1) - break; + nanosleep(&stime, NULL); i++; if (i >= NSPINNERS) i = 0; fb_post(spinners[i]); + poll_child(pid); } fb_fade2off(); From owner-p4-projects@FreeBSD.ORG Sat Jun 16 16:14:17 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A44761065675; Sat, 16 Jun 2012 16:14:16 +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 55069106566C for ; Sat, 16 Jun 2012 16:14:16 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 3652C8FC1C for ; Sat, 16 Jun 2012 16:14:16 +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 q5GGEGcf061144 for ; Sat, 16 Jun 2012 16:14:16 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q5GGEFcv061141 for perforce@freebsd.org; Sat, 16 Jun 2012 16:14:15 GMT (envelope-from jhb@freebsd.org) Date: Sat, 16 Jun 2012 16:14:15 GMT Message-Id: <201206161614.q5GGEFcv061141@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 212957 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: Sat, 16 Jun 2012 16:14:17 -0000 http://p4web.freebsd.org/@@212957?ac=10 Change 212957 by jhb@jhb_jhbbsd on 2012/06/16 16:13:23 WILLNEED experimenting: - Add a variant of breada() that uses GB_LOCK_NOWAIT. NOREUSE changes: - Add counters to instrument what happens during DONTNEED requests. Affected files ... .. //depot/projects/fadvise/sys/kern/vfs_bio.c#7 edit .. //depot/projects/fadvise/sys/sys/buf.h#4 edit .. //depot/projects/fadvise/sys/ufs/ffs/ffs_vnops.c#10 edit Differences ... ==== //depot/projects/fadvise/sys/kern/vfs_bio.c#7 (text+ko) ==== @@ -94,6 +94,8 @@ static struct proc *bufdaemonproc; +static void breada_flags(struct vnode * vp, daddr_t * rablkno, int * rabsize, + int cnt, struct ucred * cred, int gbflags); static int inmem(struct vnode *vp, daddr_t blkno); static void vm_hold_free_pages(struct buf *bp, int newbsize); static void vm_hold_load_pages(struct buf *bp, vm_offset_t from, @@ -788,8 +790,8 @@ * the buffer is valid and we do not have to do anything. */ void -breada(struct vnode * vp, daddr_t * rablkno, int * rabsize, - int cnt, struct ucred * cred) +breada_flags(struct vnode * vp, daddr_t * rablkno, int * rabsize, + int cnt, struct ucred * cred, int gbflags) { struct buf *rabp; int i; @@ -797,7 +799,7 @@ for (i = 0; i < cnt; i++, rablkno++, rabsize++) { if (inmem(vp, *rablkno)) continue; - rabp = getblk(vp, *rablkno, *rabsize, 0, 0, 0); + rabp = getblk(vp, *rablkno, *rabsize, 0, 0, gbflags); if ((rabp->b_flags & B_CACHE) == 0) { if (!TD_IS_IDLETHREAD(curthread)) @@ -818,6 +820,22 @@ } } +void +breada(struct vnode * vp, daddr_t * rablkno, int * rabsize, + int cnt, struct ucred * cred) +{ + + breada_flags(vp, rablkno, rabsize, cnt, cred, 0); +} + +void +breada_nowait(struct vnode * vp, daddr_t * rablkno, int * rabsize, + int cnt, struct ucred * cred) +{ + + breada_flags(vp, rablkno, rabsize, cnt, cred, GB_LOCK_NOWAIT); +} + /* * Entry point for bread() and breadn() via #defines in sys/buf.h. * @@ -1212,6 +1230,36 @@ return vm_page_count_severe(); } +static SYSCTL_NODE(_vfs, OID_AUTO, brelse, CTLFLAG_RD, NULL, "brelse stats"); + +static int brelse_discard1; +SYSCTL_INT(_vfs_brelse, OID_AUTO, discard1, CTLFLAG_RD, &brelse_discard1, 0, + ""); +static int brelse_rundown1; +SYSCTL_INT(_vfs_brelse, OID_AUTO, rundown1, CTLFLAG_RD, &brelse_rundown1, 0, + ""); +static int brelse_rundown2; +SYSCTL_INT(_vfs_brelse, OID_AUTO, rundown2, CTLFLAG_RD, &brelse_rundown2, 0, + ""); +static int brelse_rundown3; +SYSCTL_INT(_vfs_brelse, OID_AUTO, rundown3, CTLFLAG_RD, &brelse_rundown3, 0, + ""); +static int brelse_inval; +SYSCTL_INT(_vfs_brelse, OID_AUTO, inval, CTLFLAG_RD, &brelse_inval, 0, + ""); +static int brelse_discard_nocache; +SYSCTL_INT(_vfs_brelse, OID_AUTO, discard_nocache, CTLFLAG_RD, + &brelse_discard_nocache, 0, ""); +static int brelse_discard_inval; +SYSCTL_INT(_vfs_brelse, OID_AUTO, discard_inval, CTLFLAG_RD, + &brelse_discard_inval, 0, ""); +static int brelse_discard_error; +SYSCTL_INT(_vfs_brelse, OID_AUTO, discard_error, CTLFLAG_RD, + &brelse_discard_error, 0, ""); +static int brelse_discard_badsize; +SYSCTL_INT(_vfs_brelse, OID_AUTO, discard_badsize, CTLFLAG_RD, + &brelse_discard_badsize, 0, ""); + /* * brelse: * @@ -1248,6 +1296,15 @@ * Either a failed I/O or we were asked to free or not * cache the buffer. */ + brelse_discard1++; + if (bp->b_flags & B_NOCACHE) + brelse_discard_nocache++; + if (bp->b_flags & B_INVAL) + brelse_discard_inval++; + if (bp->b_ioflags & BIO_ERROR) + brelse_discard_error++; + if (bp->b_bufsize <= 0) + brelse_discard_badsize++; bp->b_flags |= B_INVAL; if (!LIST_EMPTY(&bp->b_dep)) buf_deallocate(bp); @@ -1387,16 +1444,18 @@ foff = (foff + PAGE_SIZE) & ~(off_t)PAGE_MASK; } VM_OBJECT_UNLOCK(obj); + brelse_rundown1++; if (bp->b_flags & (B_INVAL | B_RELBUF)) vfs_vmio_release(bp); } else if (bp->b_flags & B_VMIO) { - + brelse_rundown2++; if (bp->b_flags & (B_INVAL | B_RELBUF)) { vfs_vmio_release(bp); } } else if ((bp->b_flags & (B_INVAL | B_RELBUF)) != 0) { + brelse_rundown3++; if (bp->b_bufsize != 0) allocbuf(bp, 0); if (bp->b_vp != NULL) @@ -1434,6 +1493,8 @@ (bp->b_flags & (B_INVAL | B_NOCACHE | B_RELBUF)) != 0) bp->b_flags |= B_INVAL; if (bp->b_flags & B_INVAL) { + if (bp->b_bufsize != 0) + brelse_inval++; if (bp->b_flags & B_DELWRI) bundirty(bp); if (bp->b_vp) ==== //depot/projects/fadvise/sys/sys/buf.h#4 (text+ko) ==== @@ -490,6 +490,7 @@ int breadn_flags(struct vnode *, daddr_t, int, daddr_t *, int *, int, struct ucred *, int, struct buf **); void breada(struct vnode *, daddr_t *, int *, int, struct ucred *); +void breada_nowait(struct vnode *, daddr_t *, int *, int, struct ucred *); void bdwrite(struct buf *); void bawrite(struct buf *); void bdirty(struct buf *); ==== //depot/projects/fadvise/sys/ufs/ffs/ffs_vnops.c#10 (text+ko) ==== @@ -530,7 +530,7 @@ xfersize = fs->fs_bsize - blkoffset; if (resid < xfersize) xfersize = resid; - breada(vp, &lbn, &xfersize, 1, NOCRED); + breada_nowait(vp, &lbn, &xfersize, 1, NOCRED); } resid -= xfersize; start += xfersize; From owner-p4-projects@FreeBSD.ORG Sat Jun 16 16:15:24 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 45B3F1065674; Sat, 16 Jun 2012 16:15:23 +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 DC90D1065673 for ; Sat, 16 Jun 2012 16:15:22 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 846BC8FC16 for ; Sat, 16 Jun 2012 16:15:22 +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 q5GGFMVk061176 for ; Sat, 16 Jun 2012 16:15:22 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q5GGFMpm061173 for perforce@freebsd.org; Sat, 16 Jun 2012 16:15:22 GMT (envelope-from jhb@freebsd.org) Date: Sat, 16 Jun 2012 16:15:22 GMT Message-Id: <201206161615.q5GGFMpm061173@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 212958 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: Sat, 16 Jun 2012 16:15:24 -0000 http://p4web.freebsd.org/@@212958?ac=10 Change 212958 by jhb@jhb_jhbbsd on 2012/06/16 16:14:19 Debugging and test hacks for the problem of write(2) buffers reclaiming cache pages instead of free pages. Affected files ... .. //depot/projects/fadvise/sys/vm/vm_phys.c#6 edit Differences ... ==== //depot/projects/fadvise/sys/vm/vm_phys.c#6 (text+ko) ==== @@ -128,6 +128,15 @@ static void vm_phys_split_pages(vm_page_t m, int oind, struct vm_freelist *fl, int order); +static int vm_phys_uncached; +SYSCTL_INT(_vm, OID_AUTO, phys_uncached, CTLFLAG_RD, &vm_phys_uncached, 0, ""); +static int vm_phys_uc_alloc_pages; +SYSCTL_INT(_vm, OID_AUTO, phys_uc_alloc_pages, CTLFLAG_RD, + &vm_phys_uc_alloc_pages, 0, ""); +static int vm_phys_uc_free_pages; +SYSCTL_INT(_vm, OID_AUTO, phys_uc_free_pages, CTLFLAG_RD, + &vm_phys_uc_free_pages, 0, ""); + /* * Outputs the state of the physical memory allocator, specifically, * the amount of physical memory in each free list. @@ -495,12 +504,21 @@ TAILQ_REMOVE(&alt[oind].pl, m, pageq); alt[oind].lcnt--; m->order = VM_NFREEORDER; + if (m->pool == VM_FREEPOOL_CACHE && + pool != VM_FREEPOOL_CACHE) + vm_phys_uc_alloc_pages++; vm_phys_set_pool(pool, m, oind); vm_phys_split_pages(m, oind, fl, order); return (m); } } } + + /* + * XXX: If we get here, do deferred merging of cache pages + * with pages from another pool to satisfy the request and + * try again. This may be quite hard to do. + */ return (NULL); } @@ -681,8 +699,30 @@ TAILQ_REMOVE(&fl[order].pl, m_buddy, pageq); fl[order].lcnt--; m_buddy->order = VM_NFREEORDER; - if (m_buddy->pool != m->pool) + if (m_buddy->pool != m->pool) { +#if 1 +#if 1 + if (m_buddy->pool == VM_FREEPOOL_CACHE || + m->pool == VM_FREEPOOL_CACHE) + break; +#endif + if (m_buddy->pool == VM_FREEPOOL_CACHE) + vm_phys_uc_free_pages++; vm_phys_set_pool(m->pool, m_buddy, order); +#else + if (m_buddy->pool < m->pool) { + if (m_buddy->pool == VM_FREEPOOL_CACHE) + vm_phys_uc_free_pages++; + vm_phys_set_pool(m->pool, m_buddy, + order); + } else { + if (m->pool == VM_FREEPOOL_CACHE) + vm_phys_uc_free_pages++; + vm_phys_set_pool(m_buddy->pool, m, + order); + } +#endif + } order++; pa &= ~(((vm_paddr_t)1 << (PAGE_SHIFT + order)) - 1); m = &seg->first_page[atop(pa - seg->start)]; @@ -743,8 +783,12 @@ { vm_page_t m_tmp; - for (m_tmp = m; m_tmp < &m[1 << order]; m_tmp++) + for (m_tmp = m; m_tmp < &m[1 << order]; m_tmp++) { + if (m_tmp->pool == VM_FREEPOOL_CACHE && + pool != VM_FREEPOOL_CACHE) + vm_phys_uncached++; m_tmp->pool = pool; + } } /* From owner-p4-projects@FreeBSD.ORG Sat Jun 16 17:45:18 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B37B81065675; Sat, 16 Jun 2012 17:45:17 +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 6B4B8106566C for ; Sat, 16 Jun 2012 17:45:17 +0000 (UTC) (envelope-from joel@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 545898FC08 for ; Sat, 16 Jun 2012 17:45: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 q5GHjHa0078934 for ; Sat, 16 Jun 2012 17:45:17 GMT (envelope-from joel@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q5GHjHY0078931 for perforce@freebsd.org; Sat, 16 Jun 2012 17:45:17 GMT (envelope-from joel@freebsd.org) Date: Sat, 16 Jun 2012 17:45:17 GMT Message-Id: <201206161745.q5GHjHY0078931@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to joel@freebsd.org using -f From: Joel Dahl To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 212962 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: Sat, 16 Jun 2012 17:45:19 -0000 http://p4web.freebsd.org/@@212962?ac=10 Change 212962 by joel@joel_crashbox on 2012/06/16 17:44:16 mdoc: remove end of line whitespace. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/audit_control.5#25 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/audit_control.5#25 (text+ko) ==== @@ -26,7 +26,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#24 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit_control.5#25 $ .\" .Dd May 14, 2009 .Dt AUDIT_CONTROL 5 @@ -92,7 +92,7 @@ .It Va expire-after Specifies when audit log files will expire and be removed. This may be after a time period has passed since the file was last -written to or when the aggregate of all the trail files have reached a +written to or when the aggregate of all the trail files have reached a specified size or a combination of both. If no expire-after parameter is given then audit log files will not expire and be removed by the audit control system. @@ -208,12 +208,12 @@ .It Li K Disk space used in Kilobytes. .It Li M -Disk space used in Megabytes. +Disk space used in Megabytes. .It Li G -Disk space used in Gigabytes. +Disk space used in Gigabytes. .El .Pp -The suffixes on the values are case sensitive. +The suffixes on the values are case sensitive. If both an age and disk space value are used they are separated by AND or OR and both values are used to determine when audit log files expire. @@ -222,7 +222,7 @@ In the case of OR, either condition may expire the log file. For example: .Bd -literal -offset indent -expire-after: 60d AND 1G +expire-after: 60d AND 1G .Ed .Pp will expire files that are older than 60 days but only if 1 From owner-p4-projects@FreeBSD.ORG Sat Jun 16 18:01:45 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E43031065673; Sat, 16 Jun 2012 18:01:43 +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 962E9106566B for ; Sat, 16 Jun 2012 18:01:43 +0000 (UTC) (envelope-from joel@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 774598FC08 for ; Sat, 16 Jun 2012 18:01:43 +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 q5GI1hVp081810 for ; Sat, 16 Jun 2012 18:01:43 GMT (envelope-from joel@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q5GI1hvQ081803 for perforce@freebsd.org; Sat, 16 Jun 2012 18:01:43 GMT (envelope-from joel@freebsd.org) Date: Sat, 16 Jun 2012 18:01:43 GMT Message-Id: <201206161801.q5GI1hvQ081803@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to joel@freebsd.org using -f From: Joel Dahl To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 212963 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: Sat, 16 Jun 2012 18:01:45 -0000 http://p4web.freebsd.org/@@212963?ac=10 Change 212963 by joel@joel_crashbox on 2012/06/16 18:00:57 mdoc: remove end of line whitespace. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#16 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#18 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_io.3#9 edit .. //depot/projects/trustedbsd/openbsm/man/audit.log.5#25 edit .. //depot/projects/trustedbsd/openbsm/man/auditon.2#17 edit .. //depot/projects/trustedbsd/openbsm/man/getaudit.2#11 edit .. //depot/projects/trustedbsd/openbsm/man/setaudit.2#11 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#16 (text+ko) ==== @@ -25,7 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#15 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#16 $ .\" .Dd January 29, 2009 .Dt AUDIT 8 @@ -46,18 +46,18 @@ .It Fl e Forces the audit system to immediately remove audit log files that meet the expiration criteria specified in the audit control file without -doing a log rotation. +doing a log rotation. .It Fl i Initializes and starts auditing. This option is currently for Mac OS X only and requires .Xr auditd 8 -to be configured to run under +to be configured to run under .Xr launchd 8 . .It Fl n Forces the audit system to close the existing audit log file and rotate to a new log file in a location specified in the audit control file. -Also, audit log files that meet the expiration criteria specified in the +Also, audit log files that meet the expiration criteria specified in the audit control file will be removed. .It Fl s Specifies that the audit system should [re]synchronize its @@ -77,7 +77,7 @@ .Xr launchd 8 (Mac OS X only). The -.Nm +.Nm utility requires audit administrator privileges for successful operation. .Sh FILES .Bl -tag -width ".Pa /etc/security/audit_control" -compact ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#18 (text+ko) ==== @@ -25,7 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#17 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#18 $ .\" .Dd December 11, 2008 .Dt AUDITD 8 @@ -59,7 +59,7 @@ .Pp Optionally, the audit review group "audit" may be created. Non-privileged -users that are members of this group may read the audit trail log files. +users that are members of this group may read the audit trail log files. .Sh NOTE To assure uninterrupted audit support, the .Nm @@ -72,33 +72,33 @@ .Pa audit_control file. .Pp -If +If .Nm is started on-demand by -.Xr launchd 8 +.Xr launchd 8 then auditing should only be started and stopped with .Xr audit 8 . .Pp -On Mac OS X, +On Mac OS X, .Nm -uses the +uses the .Xr asl 3 API for writing system log messages. -Therefore, only the audit administrator +Therefore, only the audit administrator and members of the audit review group will be able to read the -system log entries. +system log entries. .Sh FILES .Bl -tag -width ".Pa /etc/security" -compact .It Pa /var/audit Default directory for storing audit log files. .Pp .It Pa /etc/security -The directory containing the auditing configuration files +The directory containing the auditing configuration files .Xr audit_class 5 , .Xr audit_control 5 , .Xr audit_event 5 , and -.Xr audit_warn 5 . +.Xr audit_warn 5 . .El .Sh COMPATIBILITY The historical ==== //depot/projects/trustedbsd/openbsm/libbsm/au_io.3#9 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_io.3#8 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_io.3#9 $ .\" .Dd August 4, 2009 .Dt AU_IO 3 @@ -83,7 +83,7 @@ .Fn au_print_flags_tok function is a replacement for .Fn au_print_tok . -The +The .Fa oflags controls how the output should be formatted and is specified by or'ing the following flags: @@ -148,12 +148,12 @@ It was subsequently adopted by the TrustedBSD Project as the foundation for the OpenBSM distribution. .Pp -The +The .Fn au_print_flags_tok function was added by Stacey Son as a replacement for the .Fn au_print_tok so new output formatting flags can be easily added without changing the API. -The +The .Fn au_print_tok is obsolete but remains in the API to support legacy code. .Sh AUTHORS ==== //depot/projects/trustedbsd/openbsm/man/audit.log.5#25 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#24 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#25 $ .\" .Dd November 5, 2006 .Dt AUDIT.LOG 5 @@ -551,7 +551,7 @@ Each token has four or eight fields. Depending on the type of socket, a socket token may be created using .Xr au_to_sock_unix 3 , -.Xr au_to_sock_inet32 3 +.Xr au_to_sock_inet32 3 or .Xr au_to_sock_inet128 3 . .Bl -column -offset 3n ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" ==== //depot/projects/trustedbsd/openbsm/man/auditon.2#17 (text+ko) ==== @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditon.2#16 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditon.2#17 $ .\" .Dd January 29, 2009 .Dt AUDITON 2 @@ -73,25 +73,25 @@ .Dv AUDIT_ARGE . If .Dv AUDIT_CNT is set, the system will continue even if it becomes low -on space and discontinue logging events until the low space condition is +on space and discontinue logging events until the low space condition is remedied. -If it is not set, audited events will block until the low space +If it is not set, audited events will block until the low space condition is remedied. Unaudited events, however, are unaffected. -If -.Dv AUDIT_AHLT is set, a +If +.Dv AUDIT_AHLT is set, a .Xr panic 9 if it cannot write an event to the global audit log file. -If +If .Dv AUDIT_ARGV -is set, then the argument list passed to the -.Xr execve 2 +is set, then the argument list passed to the +.Xr execve 2 system call will be audited. If .Dv AUDIT_ARGE is set, then the environment variables passed to the .Xr execve 2 system call will be audited. The default policy is none of the audit policy -control flags set. +control flags set. .It Dv A_SETKAUDIT Set the host information. The @@ -102,7 +102,7 @@ structure containing the host IP address information. After setting, audit records that are created as a result of kernel events will contain -this information. +this information. .It Dv A_SETKMASK Set the kernel preselection masks (success and failure). The @@ -110,9 +110,9 @@ argument must point to a .Vt au_mask_t -structure containing the mask values as defined in +structure containing the mask values as defined in .In bsm/audit.h . -These masks are used for non-attributable audit event preselection. +These masks are used for non-attributable audit event preselection. The field .Fa am_success specifies which classes of successful audit events are to be logged to the @@ -197,14 +197,14 @@ .Dv AUC_NOAUDIT , or .Dv AUC_DISABLED . -If -.Dv AUC_NOAUDIT -is set, then auditing is temporarily suspended. If +If +.Dv AUC_NOAUDIT +is set, then auditing is temporarily suspended. If .Dv AUC_AUDITING -is set, auditing is resumed. If -.Dv AUC_DISABLED +is set, auditing is resumed. If +.Dv AUC_DISABLED is set, the auditing system will -shutdown, draining all audit records and closing out the audit trail file. +shutdown, draining all audit records and closing out the audit trail file. .It Dv A_SETCLASS Set the event class preselection mask for an audit event. The @@ -215,7 +215,7 @@ structure containing the audit event and mask. The field .Fa ec_number -is the audit event and +is the audit event and .Fa ec_class is the audit class mask. See .Xr audit_event 5 @@ -259,7 +259,7 @@ must point to a .Vt au_evclass_map_t structure. See the -.Dv A_SETCLASS +.Dv A_SETCLASS section above for more information. .It Dv A_GETKAUDIT Get the current host information. @@ -277,23 +277,23 @@ must point to a .Vt auditpinfo_t structure which will be set to contain -.Fa ap_auid -(the audit ID), +.Fa ap_auid +(the audit ID), .Fa ap_mask (the preselection mask), .Fa ap_termid (the terminal ID), and -.Fa ap_asid +.Fa ap_asid (the audit session ID) of the given target process. -The process ID of the target process is passed +The process ID of the target process is passed into the kernel using the .Fa ap_pid field. See the section .Dv A_SETPMASK -above and -.Xr getaudit 2 +above and +.Xr getaudit 2 for more information. .It Dv A_GETPINFO_ADDR Return the extended audit settings for a process. @@ -302,20 +302,20 @@ argument must point to a .Vt auditpinfo_addr_t -structure which is similar to the +structure which is similar to the .Vt auditpinfo_addr_t -structure described above. -The exception is the +structure described above. +The exception is the .Fa ap_termid (the terminal ID) field which points to a -.Vt au_tid_addr_t -structure can hold much a larger terminal address and an address type. +.Vt au_tid_addr_t +structure can hold much a larger terminal address and an address type. The process ID of the target process is passed into the kernel using the .Fa ap_pid field. -See the section +See the section .Dv A_SETPMASK -above and +above and .Xr getaudit 2 for more information. .It Dv A_GETSINFO_ADDR @@ -326,10 +326,10 @@ must point to a .Vt auditinfo_addr_t structure. -The audit session ID of the target session is passed +The audit session ID of the target session is passed into the kernel using the .Fa ai_asid -field. See +field. See .Xr getaudit_addr 2 for more information about the .Vt auditinfo_addr_t @@ -353,8 +353,8 @@ value which will be set to one of the current audit policy flags. The audit policy flags are -described in the -.Dv A_SETPOLICY +described in the +.Dv A_SETPOLICY section above. .It Dv A_GETQCTRL Return the current kernel audit queue control parameters. @@ -411,12 +411,12 @@ must point to a .Vt int value which will be set to -the current audit condition, one of +the current audit condition, one of .Dv AUC_AUDITING , -.Dv AUC_NOAUDIT +.Dv AUC_NOAUDIT or .Dv AUC_DISABLED . -See the +See the .Dv A_SETCOND section above for more information. .It Dv A_SENDTRIGGER ==== //depot/projects/trustedbsd/openbsm/man/getaudit.2#11 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/getaudit.2#10 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/getaudit.2#11 $ .\" .Dd October 19, 2008 .Dt GETAUDIT 2 @@ -156,7 +156,7 @@ .Fa length argument indicates an overflow condition will occur. .It Bq Er E2BIG -The address is too big and, therefore, +The address is too big and, therefore, .Fn getaudit_addr should be used instead. .El ==== //depot/projects/trustedbsd/openbsm/man/setaudit.2#11 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/setaudit.2#10 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/setaudit.2#11 $ .\" .Dd April 19, 2005 .Dt SETAUDIT 2 @@ -73,13 +73,13 @@ .Pp The .Fa ai_auid -variable contains the audit identifier which is recorded in the audit log for +variable contains the audit identifier which is recorded in the audit log for each event the process caused. .PP The .Fa au_mask_t -data structure defines the bit mask for auditing successful and failed events +data structure defines the bit mask for auditing successful and failed events out of the predefined list of event classes. It is defined as follows: .nf .in +4n @@ -95,7 +95,7 @@ The .Fa au_termid_t -data structure defines the Terminal ID recorded with every event caused by the +data structure defines the Terminal ID recorded with every event caused by the process. It is defined as follows: .nf .in +4n @@ -111,14 +111,14 @@ .PP The .Fa ai_asid -variable contains the audit session ID which is recorded with every event +variable contains the audit session ID which is recorded with every event caused by the process. .Pp The .Fn setaudit_addr system call uses the expanded -.Fa auditinfo_addr_t +.Fa auditinfo_addr_t data structure supports Terminal IDs with larger addresses such as those used in IP version 6. It is defined as follows: .nf @@ -134,9 +134,9 @@ .in .fi .Pp -The +The .Fa au_tid_addr_t -data structure which includes a larger address storage field and an additional +data structure which includes a larger address storage field and an additional field with the type of address stored: .nf .in +4n From owner-p4-projects@FreeBSD.ORG Sat Jun 16 18:26:57 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 70F111065672; Sat, 16 Jun 2012 18:26:56 +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 28D47106564A for ; Sat, 16 Jun 2012 18:26:56 +0000 (UTC) (envelope-from joel@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 11F008FC08 for ; Sat, 16 Jun 2012 18:26:56 +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 q5GIQtdQ087596 for ; Sat, 16 Jun 2012 18:26:55 GMT (envelope-from joel@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q5GIQt4X087593 for perforce@freebsd.org; Sat, 16 Jun 2012 18:26:55 GMT (envelope-from joel@freebsd.org) Date: Sat, 16 Jun 2012 18:26:55 GMT Message-Id: <201206161826.q5GIQt4X087593@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to joel@freebsd.org using -f From: Joel Dahl To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 212964 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: Sat, 16 Jun 2012 18:26:57 -0000 http://p4web.freebsd.org/@@212964?ac=10 Change 212964 by joel@joel_crashbox on 2012/06/16 18:26:12 Minor mdoc fixes. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#16 edit .. //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#18 edit .. //depot/projects/trustedbsd/openbsm/man/audit.log.5#26 edit .. //depot/projects/trustedbsd/openbsm/man/auditon.2#18 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#16 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#15 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#16 $ .\" .Dd April 19, 2005 .Dt AU_CONTROL 3 @@ -235,7 +235,7 @@ when .Dv NULL is returned. -.Sh BUGS +.Pp There is no reason for the .Fn setac interface to be exposed as part of the public API, as it is called implicitly ==== //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#18 (text+ko) ==== @@ -27,10 +27,10 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#17 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#18 $ .\" .Dd January 18, 2008 -.Dt audit_submit 3 +.Dt AUDIT_SUBMIT 3 .Os .Sh NAME .Nm audit_submit @@ -88,6 +88,13 @@ .Xr getaudit 2 , or .Xr getaudit_addr 2 . +.Sh RETURN VALUES +If successful, +.Nm +will return zero. +Otherwise a -1 is returned and the global variable +.Va errno +is set to indicate the error. .Sh EXAMPLES .Bd -literal -offset indent #include @@ -131,13 +138,6 @@ return,failure : Operation not permitted,1 trailer,94 .Ed -.Sh RETURN VALUES -If successful, -.Nm -will return zero. -Otherwise a -1 is returned and the global variable -.Va errno -is set to indicate the error. .Sh SEE ALSO .Xr auditon 2 , .Xr getaudit 2 , ==== //depot/projects/trustedbsd/openbsm/man/audit.log.5#26 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#25 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/audit.log.5#26 $ .\" .Dd November 5, 2006 .Dt AUDIT.LOG 5 @@ -183,7 +183,6 @@ token can be created using .Xr au_to_in_addr 3 for an IPv4 address. -.Pp .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" .It Sy "Field Bytes Description" .It "Token ID 1 byte Token ID" @@ -598,7 +597,6 @@ .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" .It Sy "Field Bytes Description" .It "Token ID 1 byte Token ID" -.It XXXXX .El .Ss Use-of-auth Token The @@ -607,7 +605,6 @@ .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" .It Sy "Field Bytes Description" .It "Token ID 1 byte Token ID" -.It XXXXX .El .Ss Command Token The @@ -616,7 +613,6 @@ .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" .It Sy "Field Bytes Description" .It "Token ID 1 byte Token ID" -.It XXXXX .El .Ss ACL Token The @@ -625,7 +621,6 @@ .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" .It Sy "Field Bytes Description" .It "Token ID 1 byte Token ID" -.It XXXXX .El .Ss Zonename Token The @@ -633,10 +628,9 @@ token holds a NUL-terminated string with the name of the zone or jail from which the record originated. A -.Dz zonename +.Dq zonename token can be created using .Xr au_to_zonename 3 . -.Pp .Bl -column -offset 3n ".No Terminal Address Type/Length" ".No N bytes + 1 NUL" .It Sy "Field Bytes Description" .It "Token ID 1 byte Token ID" ==== //depot/projects/trustedbsd/openbsm/man/auditon.2#18 (text+ko) ==== @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditon.2#17 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/auditon.2#18 $ .\" .Dd January 29, 2009 .Dt AUDITON 2 @@ -237,7 +237,7 @@ must point to a .Fa au_mask_t structure which holds the preselection masks as described in the -.Da A_SETKMASK +.Dv A_SETKMASK section above. .It Dv A_SETFSIZE Set the maximum size of the audit log file. From owner-p4-projects@FreeBSD.ORG Sat Jun 16 18:41:12 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A1355106566B; Sat, 16 Jun 2012 18:41:11 +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 5BC801065672 for ; Sat, 16 Jun 2012 18:41:11 +0000 (UTC) (envelope-from joel@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 2BB688FC14 for ; Sat, 16 Jun 2012 18:41: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 q5GIfAuQ091145 for ; Sat, 16 Jun 2012 18:41:10 GMT (envelope-from joel@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q5GIfAeG091139 for perforce@freebsd.org; Sat, 16 Jun 2012 18:41:10 GMT (envelope-from joel@freebsd.org) Date: Sat, 16 Jun 2012 18:41:10 GMT Message-Id: <201206161841.q5GIfAeG091139@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to joel@freebsd.org using -f From: Joel Dahl To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 212966 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: Sat, 16 Jun 2012 18:41:12 -0000 http://p4web.freebsd.org/@@212966?ac=10 Change 212966 by joel@joel_crashbox on 2012/06/16 18:41:02 mdocify. Affected files ... .. //depot/projects/trustedbsd/openbsm/man/setaudit.2#12 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/man/setaudit.2#12 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/man/setaudit.2#11 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/man/setaudit.2#12 $ .\" .Dd April 19, 2005 .Dt SETAUDIT 2 @@ -58,9 +58,7 @@ The .Fa auditinfo_t data structure is defined as follows: -.nf -.in +4n - +.Bd -literal -offset 4n struct auditinfo { au_id_t ai_auid; /* Audit user ID */ au_mask_t ai_mask; /* Audit masks */ @@ -68,47 +66,37 @@ au_asid_t ai_asid; /* Audit session ID */ }; typedef struct auditinfo auditinfo_t; -.in -.fi +.Ed .Pp The .Fa ai_auid variable contains the audit identifier which is recorded in the audit log for each event the process caused. -.PP - +.Pp The .Fa au_mask_t data structure defines the bit mask for auditing successful and failed events out of the predefined list of event classes. It is defined as follows: -.nf -.in +4n - +.Bd -literal -offset 4n struct au_mask { unsigned int am_success; /* success bits */ unsigned int am_failure; /* failure bits */ }; typedef struct au_mask au_mask_t; -.in -.fi -.PP - +.Ed +.Pp The .Fa au_termid_t data structure defines the Terminal ID recorded with every event caused by the process. It is defined as follows: -.nf -.in +4n - +.Bd -literal -offset 4n struct au_tid { dev_t port; u_int32_t machine; }; typedef struct au_tid au_tid_t; - -.in -.fi -.PP +.Ed +.Pp The .Fa ai_asid variable contains the audit session ID which is recorded with every event @@ -121,9 +109,7 @@ .Fa auditinfo_addr_t data structure supports Terminal IDs with larger addresses such as those used in IP version 6. It is defined as follows: -.nf -.in +4n - +.Bd -literal -offset 4n struct auditinfo_addr { au_id_t ai_auid; /* Audit user ID. */ au_mask_t ai_mask; /* Audit masks. */ @@ -131,24 +117,20 @@ au_asid_t ai_asid; /* Audit session ID. */ }; typedef struct auditinfo_addr auditinfo_addr_t; -.in -.fi +.Ed .Pp The .Fa au_tid_addr_t data structure which includes a larger address storage field and an additional field with the type of address stored: -.nf -.in +4n - +.Bd -literal -offset 4n struct au_tid_addr { dev_t at_port; u_int32_t at_type; u_int32_t at_addr[4]; }; typedef struct au_tid_addr au_tid_addr_t; -.in -.fi +.Ed .Pp These system calls require an appropriate privilege to complete. .Sh RETURN VALUES