From owner-svn-src-head@FreeBSD.ORG Mon Sep 21 07:05:49 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 51BEA106566C; Mon, 21 Sep 2009 07:05:49 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3FB918FC0A; Mon, 21 Sep 2009 07:05:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8L75mqc079219; Mon, 21 Sep 2009 07:05:48 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8L75mYP079212; Mon, 21 Sep 2009 07:05:48 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <200909210705.n8L75mYP079212@svn.freebsd.org> From: Xin LI Date: Mon, 21 Sep 2009 07:05:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197379 - in head/sys: amd64/conf conf dev/fb i386/conf modules X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Sep 2009 07:05:49 -0000 Author: delphij Date: Mon Sep 21 07:05:48 2009 New Revision: 197379 URL: http://svn.freebsd.org/changeset/base/197379 Log: Enable s3pci on amd64 which works on top of VESA, and allow static building it into kernel on i386 and amd64. Submitted by: swell.k at gmail.com Modified: head/sys/amd64/conf/NOTES head/sys/conf/files.amd64 head/sys/conf/files.i386 head/sys/dev/fb/s3_pci.c head/sys/i386/conf/NOTES head/sys/modules/Makefile Modified: head/sys/amd64/conf/NOTES ============================================================================== --- head/sys/amd64/conf/NOTES Mon Sep 21 06:47:00 2009 (r197378) +++ head/sys/amd64/conf/NOTES Mon Sep 21 07:05:48 2009 (r197379) @@ -219,6 +219,9 @@ options VGA_WIDTH90 # support 90 colum # Debugging. options VGA_DEBUG +# Linear framebuffer driver for S3 VESA 1.2 cards. Works on top of VESA. +device s3pci + # 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create # the /dev/3dfx0 device to work with glide implementations. This should get # linked to /dev/3dfx and /dev/voodoo. Note that this is not the same as Modified: head/sys/conf/files.amd64 ============================================================================== --- head/sys/conf/files.amd64 Mon Sep 21 06:47:00 2009 (r197378) +++ head/sys/conf/files.amd64 Mon Sep 21 07:05:48 2009 (r197379) @@ -170,6 +170,7 @@ dev/ed/if_ed_wd80x3.c optional ed isa dev/ed/if_ed_hpp.c optional ed isa ed_hpp dev/ed/if_ed_sic.c optional ed isa ed_sic dev/fb/fb.c optional fb | vga +dev/fb/s3_pci.c optional s3pci dev/fb/vesa.c optional vga vesa x86emu dev/fb/vga.c optional vga dev/ichwd/ichwd.c optional ichwd Modified: head/sys/conf/files.i386 ============================================================================== --- head/sys/conf/files.i386 Mon Sep 21 06:47:00 2009 (r197378) +++ head/sys/conf/files.i386 Mon Sep 21 07:05:48 2009 (r197379) @@ -157,6 +157,7 @@ dev/ed/if_ed_wd80x3.c optional ed isa dev/ed/if_ed_hpp.c optional ed isa ed_hpp dev/ed/if_ed_sic.c optional ed isa ed_sic dev/fb/fb.c optional fb | vga +dev/fb/s3_pci.c optional s3pci dev/fb/vesa.c optional vga vesa x86emu dev/fb/vga.c optional vga dev/fdc/fdc.c optional fdc Modified: head/sys/dev/fb/s3_pci.c ============================================================================== --- head/sys/dev/fb/s3_pci.c Mon Sep 21 06:47:00 2009 (r197378) +++ head/sys/dev/fb/s3_pci.c Mon Sep 21 07:05:48 2009 (r197379) @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include Modified: head/sys/i386/conf/NOTES ============================================================================== --- head/sys/i386/conf/NOTES Mon Sep 21 06:47:00 2009 (r197378) +++ head/sys/i386/conf/NOTES Mon Sep 21 07:05:48 2009 (r197379) @@ -444,6 +444,9 @@ options VGA_WIDTH90 # support 90 colum # Debugging. options VGA_DEBUG +# Linear framebuffer driver for S3 VESA 1.2 cards. Works on top of VESA. +device s3pci + # 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create # the /dev/3dfx0 device to work with glide implementations. This should get # linked to /dev/3dfx and /dev/voodoo. Note that this is not the same as Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Mon Sep 21 06:47:00 2009 (r197378) +++ head/sys/modules/Makefile Mon Sep 21 07:05:48 2009 (r197379) @@ -528,6 +528,7 @@ _padlock= padlock .endif _pccard= pccard _rdma= rdma +_s3= s3 _safe= safe _scsi_low= scsi_low _smbfs= smbfs