From owner-p4-projects@FreeBSD.ORG Sun Apr 29 09:51:35 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE788106566B; Sun, 29 Apr 2012 09:51:34 +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 8C8F41065675 for ; Sun, 29 Apr 2012 09:51:34 +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 74E108FC16 for ; Sun, 29 Apr 2012 09:51: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 q3T9pYvZ007118 for ; Sun, 29 Apr 2012 09:51:34 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 q3T9pYHU007111 for perforce@freebsd.org; Sun, 29 Apr 2012 09:51:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 29 Apr 2012 09:51:34 GMT Message-Id: <201204290951.q3T9pYHU007111@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 210345 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, 29 Apr 2012 09:51:35 -0000 http://p4web.freebsd.org/@@210345?ac=10 Change 210345 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/04/29 09:50:26 Remove exist stub MTL driver, which simply allowed memory mapping of the Terasic MTL's memory from userspace via a special device node, and replace with a larger driver suite, consisting of several sub-drivers capturing various aspects of MTL behaviour: - Simple memory-mapped driver for the MTL pixel frame buffer - Simple memory-mapped driver for the MTL control register set - Simple memory-mapped driver for the MTL text frame buffer - More complex syscons driver for the MTL text frame buffer In the future we will want to provide an ioctl-driver control path for the register set from both the driver-provided device nodes, and perhaps via syscons. Although in hardware there is significant overlap with the flash device on the DE4 due to sharing a physical bus, it is likely the DE4 flash driver for FreeBSD will be entirely independent in practice. This is just a code checkpoint, and will likely require significant refinement for the syscons aspects to work properly. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl.c#1 add .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl.h#1 add .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_nexus.c#1 add .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_pixel.c#1 add .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_reg.c#1 add .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_syscons.c#1 add .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_text.c#1 add .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtllcd/terasic_mtllcd.c#5 delete .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtllcd/terasic_mtllcd.h#3 delete .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtllcd/terasic_mtllcd_nexus.c#4 delete .. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/files.beri#12 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI.hints#10 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_MDROOT#6 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_SDROOT#6 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/mips/beri/files.beri#12 (text+ko) ==== @@ -6,8 +6,12 @@ dev/altera/sdcard/altera_sdcard_nexus.c optional altera_sdcard dev/terasic/de4led/terasic_de4led.c optional terasic_de4led dev/terasic/de4led/terasic_de4led_nexus.c optional terasic_de4led -dev/terasic/mtllcd/terasic_mtllcd.c optional terasic_mtllcd -dev/terasic/mtllcd/terasic_mtllcd_nexus.c optional terasic_mtllcd +dev/terasic/mtl/terasic_mtl.c optional terasic_mtl +dev/terasic/mtl/terasic_mtl_nexus.c optional terasic_mtl +dev/terasic/mtl/terasic_mtl_pixel.c optional terasic_mtl +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 mips/beri/beri_machdep.c standard mips/mips/intr_machdep.c standard mips/mips/tick.c standard ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI.hints#10 (text+ko) ==== @@ -24,6 +24,10 @@ # # Terasic Multi-touch LCD (MTL), an optional feature in DE-4 configurations # -hint.terasic_mtllcd.0.at="nexus0" -hint.terasic_mtllcd.0.maddr=0x70000000 -hint.terasic_mtllcd.0.msize=0x401000 +hint.terasic_mtl.0.at="nexus0" +hint.terasic_mtl.0.reg_maddr=0x70400000 +hint.terasic_mtl.0.reg_msize=0x1000 +hint.terasic_mtl.0.pixel_maddr=0x70000000 +hint.terasic_mtl.0.pixel_msize=0x177000 +hint.terasic_mtl.0.text_maddr=0x70177000 +hint.terasic_mtl.0.text_msize=0x2000 ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_MDROOT#6 (text+ko) ==== @@ -52,8 +52,9 @@ device altera_jtag_uart device altera_sdcard device terasic_de4led -device terasic_mtllcd +device terasic_mtl device md device loop device random +device sc ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_SDROOT#6 (text+ko) ==== @@ -44,8 +44,9 @@ device altera_jtag_uart device altera_sdcard device terasic_de4led -device terasic_mtllcd +device terasic_mtl device md device loop device random +device sc