Deleted Added
full compact
s3_pci.c (197379) s3_pci.c (201223)
1/*-
2 * Copyright (c) 2000 Alcove - Nicolas Souchu <nsouch@freebsd.org>
3 * All rights reserved.
4 *
5 * Code based on Peter Horton <pdh@colonel-panic.com> patch.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

--- 13 unchanged lines hidden (view full) ---

22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 */
28
29#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2000 Alcove - Nicolas Souchu <nsouch@freebsd.org>
3 * All rights reserved.
4 *
5 * Code based on Peter Horton <pdh@colonel-panic.com> patch.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

--- 13 unchanged lines hidden (view full) ---

22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 */
28
29#include <sys/cdefs.h>
30__FBSDID("$FreeBSD: head/sys/dev/fb/s3_pci.c 197379 2009-09-21 07:05:48Z delphij $");
30__FBSDID("$FreeBSD: head/sys/dev/fb/s3_pci.c 201223 2009-12-29 21:51:28Z rnoland $");
31
32/* Enable LFB on S3 cards that has only VESA 1.2 BIOS */
33
34#include <sys/param.h>
35#include <sys/systm.h>
36#include <sys/kernel.h>
37#include <machine/bus.h>
38

--- 344 unchanged lines hidden (view full) ---

383
384static int
385s3lfb_blank_display(video_adapter_t *adp, int mode)
386{
387 return (*prevvidsw->blank_display)(adp, mode);
388}
389
390static int
31
32/* Enable LFB on S3 cards that has only VESA 1.2 BIOS */
33
34#include <sys/param.h>
35#include <sys/systm.h>
36#include <sys/kernel.h>
37#include <machine/bus.h>
38

--- 344 unchanged lines hidden (view full) ---

383
384static int
385s3lfb_blank_display(video_adapter_t *adp, int mode)
386{
387 return (*prevvidsw->blank_display)(adp, mode);
388}
389
390static int
391s3lfb_mmap(video_adapter_t *adp, vm_offset_t offset, vm_paddr_t *paddr,
392 int prot)
391s3lfb_mmap(video_adapter_t *adp, vm_ooffset_t offset, vm_paddr_t *paddr,
392 int prot, vm_memattr_t *memattr)
393{
393{
394 return (*prevvidsw->mmap)(adp, offset, paddr, prot);
394 return (*prevvidsw->mmap)(adp, offset, paddr, prot, memattr);
395}
396
397static int
398s3lfb_clear(video_adapter_t *adp)
399{
400 return (*prevvidsw->clear)(adp);
401}
402

--- 165 unchanged lines hidden ---
395}
396
397static int
398s3lfb_clear(video_adapter_t *adp)
399{
400 return (*prevvidsw->clear)(adp);
401}
402

--- 165 unchanged lines hidden ---