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 <dev/pci/pcivar.h>
#include <machine/md_var.h>
-#include <machine/vm86.h>
#include <machine/pc/bios.h>
#include <dev/fb/vesa.h>
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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
