Commit cf02c7e4 authored by James Simmons's avatar James Simmons

Merge maxwell.earthlink.net:/usr/src/linus-2.5

into maxwell.earthlink.net:/usr/src/fbdev-2.5
parents e77a09cd e94cf693
...@@ -2843,6 +2843,16 @@ S: Klosterweg 28 / i309 ...@@ -2843,6 +2843,16 @@ S: Klosterweg 28 / i309
S: 76131 Karlsruhe S: 76131 Karlsruhe
S: Germany S: Germany
N: James Simmons
E: jsimmons@users.sf.net
D: Frame buffer device maintainer
D: input layer developement
D: tty/console layer
D: various mipsel devices
S: 115 Carmel Avenue
S: El Cerrito CA 94530
S: USA
N: Jaspreet Singh N: Jaspreet Singh
E: jaspreet@sangoma.com E: jaspreet@sangoma.com
W: www.sangoma.com W: www.sangoma.com
......
...@@ -365,7 +365,7 @@ KAO --> ...@@ -365,7 +365,7 @@ KAO -->
!Edrivers/video/fbmem.c !Edrivers/video/fbmem.c
</sect1> </sect1>
<sect1><title>Frame Buffer Console</title> <sect1><title>Frame Buffer Console</title>
!Edrivers/video/fbcon.c !Edrivers/video/console/fbcon.c
</sect1> </sect1>
<sect1><title>Frame Buffer Colormap</title> <sect1><title>Frame Buffer Colormap</title>
!Edrivers/video/fbcmap.c !Edrivers/video/fbcmap.c
...@@ -385,7 +385,7 @@ KAO --> ...@@ -385,7 +385,7 @@ KAO -->
!Idrivers/video/macmodes.c !Idrivers/video/macmodes.c
</sect1> </sect1>
<sect1><title>Frame Buffer Fonts</title> <sect1><title>Frame Buffer Fonts</title>
!Idrivers/video/fonts.c !Idrivers/video/console/fonts.c
</sect1> </sect1>
</chapter> </chapter>
<!-- Needs ksyms to list additional exported symbols, but no specific doc. <!-- Needs ksyms to list additional exported symbols, but no specific doc.
......
...@@ -3,6 +3,7 @@ This is a first start for some documentation about frame buffer device ...@@ -3,6 +3,7 @@ This is a first start for some documentation about frame buffer device
internals. internals.
Geert Uytterhoeven <geert@linux-m68k.org>, 21 July 1998 Geert Uytterhoeven <geert@linux-m68k.org>, 21 July 1998
James Simmons <jsimmons@user.sf.net>, Nov 26 2002
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
...@@ -44,10 +45,6 @@ are defined in <linux/fb.h>. ...@@ -44,10 +45,6 @@ are defined in <linux/fb.h>.
Device dependent information that uniquely defines the video mode for this Device dependent information that uniquely defines the video mode for this
particular piece of hardware. particular piece of hardware.
- struct display
Interface between the frame buffer device and the console driver.
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
......
...@@ -642,6 +642,13 @@ M: kevin.curtis@farsite.co.uk ...@@ -642,6 +642,13 @@ M: kevin.curtis@farsite.co.uk
W: http://www.farsite.co.uk/ W: http://www.farsite.co.uk/
S: Supported S: Supported
FRAMEBUFFER LAYER
P: James Simmons, Geert Uytterhoeven
M: jsimmons@users.sf.net, geert@linux-m68k.org
L: linux-fbdev-devel@lists.sourceforge.net
W: http://www.linux-fbdev.org
S: Supported
FILE LOCKING (flock() and fcntl()/lockf()) FILE LOCKING (flock() and fcntl()/lockf())
P: Matthew Wilcox P: Matthew Wilcox
M: matthew@wil.cx M: matthew@wil.cx
......
...@@ -900,39 +900,8 @@ source "drivers/media/Kconfig" ...@@ -900,39 +900,8 @@ source "drivers/media/Kconfig"
source "fs/Kconfig" source "fs/Kconfig"
menu "Console drivers"
depends on VT
config VGA_CONSOLE
bool "VGA text console"
help
Saying Y here will allow you to use Linux in text mode through a
display that complies with the generic VGA standard. Virtually
everyone wants that.
The program SVGATextMode can be used to utilize SVGA video cards to
their full potential in text mode. Download it from
<ftp://ibiblio.org/pub/Linux/utils/console/>.
Say Y.
# if [ "$CONFIG_PCI" = "y" -a "$CONFIG_VGA_CONSOLE" = "y" ]; then
# bool ' Allow VGA on any bus?' CONFIG_VGA_HOSE
# if [ "$CONFIG_VGA_HOSE" = "y" ]; then
# define_bool CONFIG_DUMMY_CONSOLE y
# fi
# fi
source "drivers/video/Kconfig" source "drivers/video/Kconfig"
config PCI_CONSOLE
bool
depends on FB
default y
endmenu
menu "Sound" menu "Sound"
config SOUND config SOUND
......
...@@ -1047,29 +1047,8 @@ source "drivers/media/Kconfig" ...@@ -1047,29 +1047,8 @@ source "drivers/media/Kconfig"
source "fs/Kconfig" source "fs/Kconfig"
menu "Console drivers"
depends on VT
config VGA_CONSOLE
bool "VGA text console"
depends on !ARCH_ACORN && !ARCH_EBSA110
help
Saying Y here will allow you to use Linux in text mode through a
display that complies with the generic VGA standard. Virtually
everyone wants that.
The program SVGATextMode can be used to utilize SVGA video cards to
their full potential in text mode. Download it from
<ftp://ibiblio.org/pub/Linux/utils/console/>.
Say Y.
source "drivers/video/Kconfig" source "drivers/video/Kconfig"
endmenu
menu "Sound" menu "Sound"
depends on ARCH_ACORN || ARCH_CLPS7500 || ARCH_TBOX || ARCH_SHARK || ARCH_SA1100 || PCI depends on ARCH_ACORN || ARCH_CLPS7500 || ARCH_TBOX || ARCH_SHARK || ARCH_SA1100 || PCI
......
...@@ -1445,63 +1445,8 @@ source "drivers/media/Kconfig" ...@@ -1445,63 +1445,8 @@ source "drivers/media/Kconfig"
source "fs/Kconfig" source "fs/Kconfig"
menu "Console drivers"
depends on VT
config VGA_CONSOLE
bool "VGA text console"
help
Saying Y here will allow you to use Linux in text mode through a
display that complies with the generic VGA standard. Virtually
everyone wants that.
The program SVGATextMode can be used to utilize SVGA video cards to
their full potential in text mode. Download it from
<ftp://ibiblio.org/pub/Linux/utils/console/>.
Say Y.
config VIDEO_SELECT
bool "Video mode selection support"
---help---
This enables support for text mode selection on kernel startup. If
you want to take advantage of some high-resolution text mode your
card's BIOS offers, but the traditional Linux utilities like
SVGATextMode don't, you can say Y here and set the mode using the
"vga=" option from your boot loader (lilo or loadlin) or set
"vga=ask" which brings up a video mode menu on kernel startup. (Try
"man bootparam" or see the documentation of your boot loader about
how to pass options to the kernel.)
Read the file <file:Documentation/svga.txt> for more information
about the Video mode selection support. If unsure, say N.
if EXPERIMENTAL
config MDA_CONSOLE
tristate "MDA text console (dual-headed) (EXPERIMENTAL)"
---help---
Say Y here if you have an old MDA or monochrome Hercules graphics
adapter in your system acting as a second head ( = video card). You
will then be able to use two monitors with your Linux system. Do not
say Y here if your MDA card is the primary card in your system; the
normal VGA driver will handle it.
This driver is also available as a module ( = code which can be
inserted and removed from the running kernel whenever you want).
The module will be called mdacon.o. If you want to compile it as
a module, say M here and read <file:Documentation/modules.txt>.
If unsure, say N.
source "drivers/video/Kconfig" source "drivers/video/Kconfig"
endif
endmenu
menu "Sound" menu "Sound"
config SOUND config SOUND
......
...@@ -729,33 +729,8 @@ source "fs/Kconfig" ...@@ -729,33 +729,8 @@ source "fs/Kconfig"
if !IA64_HP_SIM if !IA64_HP_SIM
menu "Console drivers"
depends on VT
config VGA_CONSOLE
bool "VGA text console"
help
Saying Y here will allow you to use Linux in text mode through a
display that complies with the generic VGA standard. Virtually
everyone wants that.
The program SVGATextMode can be used to utilize SVGA video cards to
their full potential in text mode. Download it from
<ftp://ibiblio.org/pub/Linux/utils/console/>.
Say Y.
source "drivers/video/Kconfig" source "drivers/video/Kconfig"
config PCI_CONSOLE
bool
depends on FB
default y
endmenu
menu "Sound" menu "Sound"
config SOUND config SOUND
......
...@@ -2309,15 +2309,8 @@ endmenu ...@@ -2309,15 +2309,8 @@ endmenu
source "fs/Kconfig" source "fs/Kconfig"
menu "Console drivers"
depends on VT
source "drivers/video/Kconfig" source "drivers/video/Kconfig"
endmenu
menu "Kernel hacking" menu "Kernel hacking"
config DEBUG_KERNEL config DEBUG_KERNEL
......
...@@ -672,43 +672,8 @@ source "drivers/media/Kconfig" ...@@ -672,43 +672,8 @@ source "drivers/media/Kconfig"
source "fs/Kconfig" source "fs/Kconfig"
menu "Console drivers"
depends on VT
config VGA_CONSOLE
bool "VGA text console"
help
Saying Y here will allow you to use Linux in text mode through a
display that complies with the generic VGA standard. Virtually
everyone wants that.
The program SVGATextMode can be used to utilize SVGA video cards to
their full potential in text mode. Download it from
<ftp://ibiblio.org/pub/Linux/utils/console/>.
If unsure, say N.
config VIDEO_SELECT
bool "Video mode selection support"
---help---
This enables support for text mode selection on kernel startup. If
you want to take advantage of some high-resolution text mode your
card's BIOS offers, but the traditional Linux utilities like
SVGATextMode don't, you can say Y here and set the mode using the
"vga=" option from your boot loader (lilo or loadlin) or set
"vga=ask" which brings up a video mode menu on kernel startup. (Try
"man bootparam" or see the documentation of your boot loader about
how to pass options to the kernel.)
Read the file <file:Documentation/svga.txt> for more information
about the Video mode selection support. If unsure, say N.
source "drivers/video/Kconfig" source "drivers/video/Kconfig"
endmenu
menu "Sound" menu "Sound"
config SOUND config SOUND
......
...@@ -1115,28 +1115,6 @@ config VT_CONSOLE ...@@ -1115,28 +1115,6 @@ config VT_CONSOLE
bool "Support for console on virtual terminal" bool "Support for console on virtual terminal"
depends on VT depends on VT
config SGI_NEWPORT_CONSOLE
tristate "SGI Newport Console support"
depends on VT
help
Say Y here if you want the console on the Newport aka XL graphics
card of your Indy. Most people say Y here.
config DUMMY_CONSOLE
bool
depends on VT && SGI_NEWPORT_CONSOLE!=y
default y
config FONT_8x16
bool
depends on VT && SGI_NEWPORT_CONSOLE=y
default y
help
This is the "high resolution" font for the VGA frame buffer (the one
provided by the VGA text console 80x25 mode.
If unsure, say Y.
config PSMOUSE config PSMOUSE
bool "PS/2 mouse support (aka \"auxiliary device\")" bool "PS/2 mouse support (aka \"auxiliary device\")"
---help--- ---help---
...@@ -1192,48 +1170,8 @@ endmenu ...@@ -1192,48 +1170,8 @@ endmenu
source "fs/Kconfig" source "fs/Kconfig"
menu "Console drivers"
depends on VT
config VGA_CONSOLE
bool "VGA text console"
help
Saying Y here will allow you to use Linux in text mode through a
display that complies with the generic VGA standard. Virtually
everyone wants that.
The program SVGATextMode can be used to utilize SVGA video cards to
their full potential in text mode. Download it from
<ftp://ibiblio.org/pub/Linux/utils/console/>.
Say Y.
if EXPERIMENTAL
config MDA_CONSOLE
tristate "MDA text console (dual-headed) (EXPERIMENTAL)"
---help---
Say Y here if you have an old MDA or monochrome Hercules graphics
adapter in your system acting as a second head ( = video card). You
will then be able to use two monitors with your Linux system. Do not
say Y here if your MDA card is the primary card in your system; the
normal VGA driver will handle it.
This driver is also available as a module ( = code which can be
inserted and removed from the running kernel whenever you want).
The module will be called mdacon.o. If you want to compile it as
a module, say M here and read <file:Documentation/modules.txt>.
If unsure, say N.
source "drivers/video/Kconfig" source "drivers/video/Kconfig"
endif
endmenu
menu "Sound" menu "Sound"
depends on !DECSTATION depends on !DECSTATION
......
...@@ -593,31 +593,8 @@ source "drivers/media/Kconfig" ...@@ -593,31 +593,8 @@ source "drivers/media/Kconfig"
source "fs/Kconfig" source "fs/Kconfig"
menu "Console drivers"
depends on VT
source "drivers/video/Kconfig" source "drivers/video/Kconfig"
config SGI_NEWPORT_CONSOLE
tristate "SGI Newport Console support"
depends on SGI_IP22
help
Say Y here if you want the console on the Newport aka XL graphics
card of your Indy. Most people say Y here.
config DUMMY_CONSOLE
bool
depends on SGI_IP22 && SGI_NEWPORT_CONSOLE!=y
default y
config FONT_8x16
bool
depends on SGI_IP22 && SGI_NEWPORT_CONSOLE=y
default y
endmenu
config KCORE_ELF config KCORE_ELF
bool bool
depends on PROC_FS depends on PROC_FS
......
...@@ -335,38 +335,8 @@ source "drivers/media/Kconfig" ...@@ -335,38 +335,8 @@ source "drivers/media/Kconfig"
source "fs/Kconfig" source "fs/Kconfig"
menu "Console drivers"
depends on VT
config STI_CONSOLE
bool "STI console"
help
STI refers to the HP "Standard Text Interface" which is a set of
BIOS routines contained in a ROM chip in HP PA-RISC based machines.
Enabling this option will give you an 8 color text console on
most of the PA-RISC systems.
Really old HP boxes may not have STI, in which case you must use the
PDC console or your primary serial port as a console.
The text console uses a strange memory layout, and changing the
plane mask to create colored characters requires calls to the STI
routines. Because of that do not expect it to be actually very fast,
but it is sufficient for basic text console functions, including fonts.
The alternative is to use your primary serial port as a console.
It is safe to enable this option, so you should probably say "Y".
config DUMMY_CONSOLE
bool
depends on STI_CONSOLE || SERIAL_8250_CONSOLE
default y
source "drivers/video/Kconfig" source "drivers/video/Kconfig"
endmenu
menu "Sound" menu "Sound"
config SOUND config SOUND
......
...@@ -1054,11 +1054,6 @@ config CMDLINE ...@@ -1054,11 +1054,6 @@ config CMDLINE
some command-line options at build time by entering them here. In some command-line options at build time by entering them here. In
most cases you will need to specify the root device here. most cases you will need to specify the root device here.
config FB_CONSOLE
bool
depends on APUS
default y
config AMIGA config AMIGA
bool bool
depends on APUS depends on APUS
...@@ -1467,25 +1462,8 @@ source "net/irda/Kconfig" ...@@ -1467,25 +1462,8 @@ source "net/irda/Kconfig"
source "drivers/isdn/Kconfig" source "drivers/isdn/Kconfig"
menu "Console drivers"
config VGA_CONSOLE
bool "VGA text console"
depends on !4xx && !8xx
help
Saying Y here will allow you to use Linux in text mode through a
display that complies with the generic VGA standard. This can be
useful on PReP systems and IBM RS/6000 or pSeries machines but is of
limited usefulness on Apple machines.
Say N here if you have an Apple machine.
source "drivers/video/Kconfig" source "drivers/video/Kconfig"
endmenu
menu "iSeries device drivers" menu "iSeries device drivers"
depends on PPC_ISERIES depends on PPC_ISERIES
......
...@@ -414,15 +414,8 @@ source "drivers/media/Kconfig" ...@@ -414,15 +414,8 @@ source "drivers/media/Kconfig"
source "fs/Kconfig" source "fs/Kconfig"
menu "Console drivers"
depends on VT
source "drivers/video/Kconfig" source "drivers/video/Kconfig"
endmenu
menu "Sound" menu "Sound"
config SOUND config SOUND
......
...@@ -1190,63 +1190,8 @@ source "fs/Kconfig" ...@@ -1190,63 +1190,8 @@ source "fs/Kconfig"
source "drivers/media/Kconfig" source "drivers/media/Kconfig"
menu "Console drivers"
depends on VT
config VGA_CONSOLE
bool "VGA text console"
help
Saying Y here will allow you to use Linux in text mode through a
display that complies with the generic VGA standard. Virtually
everyone wants that.
The program SVGATextMode can be used to utilize SVGA video cards to
their full potential in text mode. Download it from
<ftp://ibiblio.org/pub/Linux/utils/console/>.
Say Y.
config VIDEO_SELECT
bool "Video mode selection support"
---help---
This enables support for text mode selection on kernel startup. If
you want to take advantage of some high-resolution text mode your
card's BIOS offers, but the traditional Linux utilities like
SVGATextMode don't, you can say Y here and set the mode using the
"vga=" option from your boot loader (lilo or loadlin) or set
"vga=ask" which brings up a video mode menu on kernel startup. (Try
"man bootparam" or see the documentation of your boot loader about
how to pass options to the kernel.)
Read the file <file:Documentation/svga.txt> for more information
about the Video mode selection support. If unsure, say N.
if EXPERIMENTAL
config MDA_CONSOLE
tristate "MDA text console (dual-headed) (EXPERIMENTAL)"
---help---
Say Y here if you have an old MDA or monochrome Hercules graphics
adapter in your system acting as a second head ( = video card). You
will then be able to use two monitors with your Linux system. Do not
say Y here if your MDA card is the primary card in your system; the
normal VGA driver will handle it.
This driver is also available as a module ( = code which can be
inserted and removed from the running kernel whenever you want).
The module will be called mdacon.o. If you want to compile it as
a module, say M here and read <file:Documentation/modules.txt>.
If unsure, say N.
source "drivers/video/Kconfig" source "drivers/video/Kconfig"
endif
endmenu
menu "Sound" menu "Sound"
config SOUND config SOUND
......
...@@ -417,24 +417,8 @@ config PRINTER ...@@ -417,24 +417,8 @@ config PRINTER
endmenu endmenu
menu "Console drivers"
config PROM_CONSOLE
bool "PROM console"
help
Say Y to build a console driver for Sun machines that uses the
terminal emulation built into their console PROMS.
config DUMMY_CONSOLE
bool
depends on !PROM_CONSOLE
default y
source "drivers/video/Kconfig" source "drivers/video/Kconfig"
endmenu
source "drivers/mtd/Kconfig" source "drivers/mtd/Kconfig"
source "drivers/serial/Kconfig" source "drivers/serial/Kconfig"
......
...@@ -530,19 +530,8 @@ config WATCHDOG_RIO ...@@ -530,19 +530,8 @@ config WATCHDOG_RIO
endmenu endmenu
menu "Console drivers"
config PROM_CONSOLE
bool "PROM console"
help
Say Y to build a console driver for Sun machines that uses the
terminal emulation built into their console PROMS.
source "drivers/video/Kconfig" source "drivers/video/Kconfig"
endmenu
source "drivers/serial/Kconfig" source "drivers/serial/Kconfig"
source "drivers/sbus/char/Kconfig" source "drivers/sbus/char/Kconfig"
......
...@@ -365,43 +365,8 @@ source "drivers/media/Kconfig" ...@@ -365,43 +365,8 @@ source "drivers/media/Kconfig"
source "fs/Kconfig" source "fs/Kconfig"
menu "Console drivers"
depends on VT
config VGA_CONSOLE
bool "VGA text console"
help
Saying Y here will allow you to use Linux in text mode through a
display that complies with the generic VGA standard. Virtually
everyone wants that.
The program SVGATextMode can be used to utilize SVGA video cards to
their full potential in text mode. Download it from
<ftp://ibiblio.org/pub/Linux/utils/console/>.
If unsure, say N.
config VIDEO_SELECT
bool "Video mode selection support"
---help---
This enables support for text mode selection on kernel startup. If
you want to take advantage of some high-resolution text mode your
card's BIOS offers, but the traditional Linux utilities like
SVGATextMode don't, you can say Y here and set the mode using the
"vga=" option from your boot loader (lilo or loadlin) or set
"vga=ask" which brings up a video mode menu on kernel startup. (Try
"man bootparam" or see the documentation of your boot loader about
how to pass options to the kernel.)
Read the file <file:Documentation/svga.txt> for more information
about the Video mode selection support. If unsure, say N.
source "drivers/video/Kconfig" source "drivers/video/Kconfig"
endmenu
menu "Sound" menu "Sound"
config SOUND config SOUND
......
...@@ -588,63 +588,8 @@ source "drivers/media/Kconfig" ...@@ -588,63 +588,8 @@ source "drivers/media/Kconfig"
source "fs/Kconfig" source "fs/Kconfig"
menu "Console drivers"
depends on VT
config VGA_CONSOLE
bool "VGA text console"
help
Saying Y here will allow you to use Linux in text mode through a
display that complies with the generic VGA standard. Virtually
everyone wants that.
The program SVGATextMode can be used to utilize SVGA video cards to
their full potential in text mode. Download it from
<ftp://ibiblio.org/pub/Linux/utils/console/>.
Say Y.
config VIDEO_SELECT
bool "Video mode selection support"
---help---
This enables support for text mode selection on kernel startup. If
you want to take advantage of some high-resolution text mode your
card's BIOS offers, but the traditional Linux utilities like
SVGATextMode don't, you can say Y here and set the mode using the
"vga=" option from your boot loader (lilo or loadlin) or set
"vga=ask" which brings up a video mode menu on kernel startup. (Try
"man bootparam" or see the documentation of your boot loader about
how to pass options to the kernel.)
Read the file <file:Documentation/svga.txt> for more information
about the Video mode selection support. If unsure, say N.
if EXPERIMENTAL
config MDA_CONSOLE
tristate "MDA text console (dual-headed) (EXPERIMENTAL)"
---help---
Say Y here if you have an old MDA or monochrome Hercules graphics
adapter in your system acting as a second head ( = video card). You
will then be able to use two monitors with your Linux system. Do not
say Y here if your MDA card is the primary card in your system; the
normal VGA driver will handle it.
This driver is also available as a module ( = code which can be
inserted and removed from the running kernel whenever you want).
The module will be called mdacon.o. If you want to compile it as
a module, say M here and read <file:Documentation/modules.txt>.
If unsure, say N.
source "drivers/video/Kconfig" source "drivers/video/Kconfig"
endif
endmenu
menu "Sound" menu "Sound"
config SOUND config SOUND
......
...@@ -21,7 +21,7 @@ obj-$(CONFIG_FC4) += fc4/ ...@@ -21,7 +21,7 @@ obj-$(CONFIG_FC4) += fc4/
obj-$(CONFIG_SCSI) += scsi/ obj-$(CONFIG_SCSI) += scsi/
obj-$(CONFIG_FUSION) += message/ obj-$(CONFIG_FUSION) += message/
obj-$(CONFIG_IEEE1394) += ieee1394/ obj-$(CONFIG_IEEE1394) += ieee1394/
obj-y += cdrom/ obj-y += cdrom/ video/
obj-$(CONFIG_MTD) += mtd/ obj-$(CONFIG_MTD) += mtd/
obj-$(CONFIG_PCMCIA) += pcmcia/ obj-$(CONFIG_PCMCIA) += pcmcia/
obj-$(CONFIG_DIO) += dio/ obj-$(CONFIG_DIO) += dio/
...@@ -30,7 +30,6 @@ obj-$(CONFIG_ZORRO) += zorro/ ...@@ -30,7 +30,6 @@ obj-$(CONFIG_ZORRO) += zorro/
obj-$(CONFIG_ALL_PPC) += macintosh/ obj-$(CONFIG_ALL_PPC) += macintosh/
obj-$(CONFIG_MAC) += macintosh/ obj-$(CONFIG_MAC) += macintosh/
obj-$(CONFIG_SGI) += sgi/ obj-$(CONFIG_SGI) += sgi/
obj-$(CONFIG_VT) += video/
obj-$(CONFIG_PARIDE) += block/paride/ obj-$(CONFIG_PARIDE) += block/paride/
obj-$(CONFIG_TC) += tc/ obj-$(CONFIG_TC) += tc/
obj-$(CONFIG_USB) += usb/ obj-$(CONFIG_USB) += usb/
......
...@@ -12,7 +12,7 @@ obj-y += mem.o tty_io.o n_tty.o tty_ioctl.o pty.o misc.o random.o ...@@ -12,7 +12,7 @@ obj-y += mem.o tty_io.o n_tty.o tty_ioctl.o pty.o misc.o random.o
# All of the (potential) objects that export symbols. # All of the (potential) objects that export symbols.
# This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'. # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
export-objs := busmouse.o vt.o generic_serial.o ip2main.o \ export-objs := busmouse.o vt.o generic_serial.o ip2main.o consolemap.o\
ite_gpio.o keyboard.o misc.o nvram.o random.o rtc.o \ ite_gpio.o keyboard.o misc.o nvram.o random.o rtc.o \
selection.o sonypi.o sysrq.o tty_io.o tty_ioctl.o selection.o sonypi.o sysrq.o tty_io.o tty_ioctl.o
......
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
* Fix bug in inverse translation. Stanislav Voronyi <stas@cnti.uanet.kharkov.ua>, Dec 1998 * Fix bug in inverse translation. Stanislav Voronyi <stas@cnti.uanet.kharkov.ua>, Dec 1998
*/ */
#include <linux/config.h>
#include <linux/module.h>
#include <linux/kd.h> #include <linux/kd.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/mm.h> #include <linux/mm.h>
...@@ -19,7 +21,6 @@ ...@@ -19,7 +21,6 @@
#include <linux/tty.h> #include <linux/tty.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <linux/consolemap.h> #include <linux/consolemap.h>
#include <linux/console_struct.h>
#include <linux/vt_kern.h> #include <linux/vt_kern.h>
static unsigned short translations[][256] = { static unsigned short translations[][256] = {
...@@ -681,3 +682,5 @@ console_map_init(void) ...@@ -681,3 +682,5 @@ console_map_init(void)
if (vc_cons_allocated(i) && !*vc_cons[i].d->vc_uni_pagedir_loc) if (vc_cons_allocated(i) && !*vc_cons[i].d->vc_uni_pagedir_loc)
con_set_default_unimap(i); con_set_default_unimap(i);
} }
EXPORT_SYMBOL(con_copy_unimap);
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/console_struct.h>
#include <linux/kbd_kern.h> #include <linux/kbd_kern.h>
#include <linux/kbd_diacr.h> #include <linux/kbd_diacr.h>
#include <linux/vt_kern.h> #include <linux/vt_kern.h>
......
...@@ -33,12 +33,6 @@ extern int i2c_init_all(void); ...@@ -33,12 +33,6 @@ extern int i2c_init_all(void);
#ifdef CONFIG_FB #ifdef CONFIG_FB
extern void fbmem_init(void); extern void fbmem_init(void);
#endif #endif
#ifdef CONFIG_PROM_CONSOLE
extern void prom_con_init(void);
#endif
#ifdef CONFIG_MDA_CONSOLE
extern void mda_console_init(void);
#endif
#if defined(CONFIG_S390_TAPE) && defined(CONFIG_S390_TAPE_CHAR) #if defined(CONFIG_S390_TAPE) && defined(CONFIG_S390_TAPE_CHAR)
extern void tapechar_init(void); extern void tapechar_init(void);
#endif #endif
...@@ -685,12 +679,6 @@ int __init chr_dev_init(void) ...@@ -685,12 +679,6 @@ int __init chr_dev_init(void)
#endif #endif
#if defined (CONFIG_FB) #if defined (CONFIG_FB)
fbmem_init(); fbmem_init();
#endif
#if defined (CONFIG_PROM_CONSOLE)
prom_con_init();
#endif
#if defined (CONFIG_MDA_CONSOLE)
mda_console_init();
#endif #endif
tty_init(); tty_init();
#ifdef CONFIG_M68K_PRINTER #ifdef CONFIG_M68K_PRINTER
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <linux/vt_kern.h> #include <linux/vt_kern.h>
#include <linux/consolemap.h> #include <linux/consolemap.h>
#include <linux/console_struct.h>
#include <linux/selection.h> #include <linux/selection.h>
#ifndef MIN #ifndef MIN
......
...@@ -210,7 +210,7 @@ static int tosh_emulate_fan(SMMRegisters *regs) ...@@ -210,7 +210,7 @@ static int tosh_emulate_fan(SMMRegisters *regs)
/* /*
* Put the laptop into System Management Mode * Put the laptop into System Management Mode
*/ */
static int tosh_smm(SMMRegisters *regs) int tosh_smm(SMMRegisters *regs)
{ {
int eax; int eax;
......
...@@ -1509,6 +1509,13 @@ static int tiocswinsz(struct tty_struct *tty, struct tty_struct *real_tty, ...@@ -1509,6 +1509,13 @@ static int tiocswinsz(struct tty_struct *tty, struct tty_struct *real_tty,
return -EFAULT; return -EFAULT;
if (!memcmp(&tmp_ws, &tty->winsize, sizeof(*arg))) if (!memcmp(&tmp_ws, &tty->winsize, sizeof(*arg)))
return 0; return 0;
#ifdef CONFIG_VT
if (tty->driver.type == TTY_DRIVER_TYPE_CONSOLE) {
unsigned int currcons = minor(tty->device) - tty->driver.minor_start;
if (vc_resize(currcons, tmp_ws.ws_col, tmp_ws.ws_row))
return -ENXIO;
}
#endif
if (tty->pgrp > 0) if (tty->pgrp > 0)
kill_pg(tty->pgrp, SIGWINCH, 1); kill_pg(tty->pgrp, SIGWINCH, 1);
if ((real_tty->pgrp != tty->pgrp) && (real_tty->pgrp > 0)) if ((real_tty->pgrp != tty->pgrp) && (real_tty->pgrp > 0))
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/vt_kern.h> #include <linux/vt_kern.h>
#include <linux/console_struct.h>
#include <linux/selection.h> #include <linux/selection.h>
#include <linux/kbd_kern.h> #include <linux/kbd_kern.h>
#include <linux/console.h> #include <linux/console.h>
......
...@@ -90,7 +90,6 @@ ...@@ -90,7 +90,6 @@
#include <linux/devfs_fs_kernel.h> #include <linux/devfs_fs_kernel.h>
#include <linux/vt_kern.h> #include <linux/vt_kern.h>
#include <linux/selection.h> #include <linux/selection.h>
#include <linux/console_struct.h>
#include <linux/kbd_kern.h> #include <linux/kbd_kern.h>
#include <linux/consolemap.h> #include <linux/consolemap.h>
#include <linux/timer.h> #include <linux/timer.h>
...@@ -127,6 +126,15 @@ const struct consw *conswitchp; ...@@ -127,6 +126,15 @@ const struct consw *conswitchp;
extern void vcs_make_devfs (unsigned int index, int unregister); extern void vcs_make_devfs (unsigned int index, int unregister);
extern void console_map_init(void); extern void console_map_init(void);
#ifdef CONFIG_PROM_CONSOLE
extern void prom_con_init(void);
#endif
#ifdef CONFIG_MDA_CONSOLE
extern void mda_console_init(void);
#endif
#ifdef CONFIG_FRAMEBUFFER_CONSOLE
extern int fb_console_init(void);
#endif
static struct tty_struct *console_table[MAX_NR_CONSOLES]; static struct tty_struct *console_table[MAX_NR_CONSOLES];
static struct termios *console_termios[MAX_NR_CONSOLES]; static struct termios *console_termios[MAX_NR_CONSOLES];
...@@ -691,82 +699,83 @@ int vc_allocate(unsigned int currcons) /* return 0 on success */ ...@@ -691,82 +699,83 @@ int vc_allocate(unsigned int currcons) /* return 0 on success */
return 0; return 0;
} }
inline int resize_screen(int currcons, int width, int height)
{
/* Resizes the resolution of the display adapater */
int err = 0;
if (vcmode != KD_GRAPHICS && sw->con_resize)
err = sw->con_resize(vc_cons[currcons].d, width, height);
return err;
}
/* /*
* Change # of rows and columns (0 means unchanged/the size of fg_console) * Change # of rows and columns (0 means unchanged/the size of fg_console)
* [this is to be used together with some user program * [this is to be used together with some user program
* like resize that changes the hardware videomode] * like resize that changes the hardware videomode]
*/ */
int vc_resize(unsigned int lines, unsigned int cols, int vc_resize(int currcons, unsigned int cols, unsigned int lines)
unsigned int first, unsigned int last) {
{ unsigned long old_origin, new_origin, new_scr_end, rlth, rrem, err = 0;
unsigned int cc, ll, ss, sr, todo = 0; unsigned int old_cols, old_rows, old_row_size, old_screen_size;
unsigned int currcons = fg_console, i; unsigned int new_cols, new_rows, new_row_size, new_screen_size;
unsigned short *newscreens[MAX_NR_CONSOLES]; unsigned short *newscreen;
cc = (cols ? cols : video_num_columns); if (!vc_cons_allocated(currcons))
ll = (lines ? lines : video_num_lines); return -ENXIO;
sr = cc << 1;
ss = sr * ll; new_cols = (cols ? cols : video_num_columns);
new_rows = (lines ? lines : video_num_lines);
for (currcons = first; currcons <= last; currcons++) { new_row_size = new_cols << 1;
if (!vc_cons_allocated(currcons) || new_screen_size = new_row_size * new_rows;
(cc == video_num_columns && ll == video_num_lines))
newscreens[currcons] = NULL; if (new_cols == video_num_columns && new_rows == video_num_lines)
else {
unsigned short *p = (unsigned short *) kmalloc(ss, GFP_USER);
if (!p) {
for (i = first; i < currcons; i++)
if (newscreens[i])
kfree(newscreens[i]);
return -ENOMEM;
}
newscreens[currcons] = p;
todo++;
}
}
if (!todo)
return 0; return 0;
for (currcons = first; currcons <= last; currcons++) { newscreen = (unsigned short *) kmalloc(new_screen_size, GFP_USER);
unsigned int occ, oll, oss, osr; if (!newscreen)
unsigned long ol, nl, nlend, rlth, rrem; return -ENOMEM;
if (!newscreens[currcons] || !vc_cons_allocated(currcons))
continue; old_rows = video_num_lines;
old_cols = video_num_columns;
old_row_size = video_size_row;
old_screen_size = screenbuf_size;
oll = video_num_lines; video_num_lines = new_rows;
occ = video_num_columns; video_num_columns = new_cols;
osr = video_size_row; video_size_row = new_row_size;
oss = screenbuf_size; screenbuf_size = new_screen_size;
video_num_lines = ll; err = resize_screen(currcons, new_cols, new_rows);
video_num_columns = cc; if (err)
video_size_row = sr; return err;
screenbuf_size = ss;
rlth = min(osr, sr); rlth = min(old_row_size, new_row_size);
rrem = sr - rlth; rrem = new_row_size - rlth;
ol = origin; old_origin = origin;
nl = (long) newscreens[currcons]; new_origin = (long) newscreen;
nlend = nl + ss; new_scr_end = new_origin + new_screen_size;
if (ll < oll) if (new_rows < old_rows)
ol += (oll - ll) * osr; old_origin += (old_rows - new_rows) * old_row_size;
update_attr(currcons); update_attr(currcons);
while (ol < scr_end) { while (old_origin < scr_end) {
scr_memcpyw((unsigned short *) nl, (unsigned short *) ol, rlth); scr_memcpyw((unsigned short *) new_origin, (unsigned short *) old_origin, rlth);
if (rrem) if (rrem)
scr_memsetw((void *)(nl + rlth), video_erase_char, rrem); scr_memsetw((void *)(new_origin + rlth), video_erase_char, rrem);
ol += osr; old_origin += old_row_size;
nl += sr; new_origin += new_row_size;
} }
if (nlend > nl) if (new_scr_end > new_origin)
scr_memsetw((void *) nl, video_erase_char, nlend - nl); scr_memsetw((void *) new_origin, video_erase_char, new_scr_end - new_origin);
if (kmalloced) if (kmalloced)
kfree(screenbuf); kfree(screenbuf);
screenbuf = newscreens[currcons]; screenbuf = newscreen;
kmalloced = 1; kmalloced = 1;
screenbuf_size = ss; screenbuf_size = new_screen_size;
if (IS_VISIBLE)
err = resize_screen(currcons, new_cols, new_rows);
set_origin(currcons); set_origin(currcons);
/* do part of a reset_terminal() */ /* do part of a reset_terminal() */
...@@ -775,22 +784,21 @@ int vc_resize(unsigned int lines, unsigned int cols, ...@@ -775,22 +784,21 @@ int vc_resize(unsigned int lines, unsigned int cols,
gotoxy(currcons, x, y); gotoxy(currcons, x, y);
save_cur(currcons); save_cur(currcons);
if (console_table[currcons]) { if (vc_cons[currcons].d->vc_tty) {
struct winsize ws, *cws = &console_table[currcons]->winsize; struct winsize ws, *cws = &vc_cons[currcons].d->vc_tty->winsize;
memset(&ws, 0, sizeof(ws)); memset(&ws, 0, sizeof(ws));
ws.ws_row = video_num_lines; ws.ws_row = video_num_lines;
ws.ws_col = video_num_columns; ws.ws_col = video_num_columns;
if ((ws.ws_row != cws->ws_row || ws.ws_col != cws->ws_col) && if ((ws.ws_row != cws->ws_row || ws.ws_col != cws->ws_col) &&
console_table[currcons]->pgrp > 0) vc_cons[currcons].d->vc_tty->pgrp > 0)
kill_pg(console_table[currcons]->pgrp, SIGWINCH, 1); kill_pg(vc_cons[currcons].d->vc_tty->pgrp, SIGWINCH, 1);
*cws = ws; *cws = ws;
} }
if (IS_VISIBLE) if (IS_VISIBLE)
update_screen(currcons); update_screen(currcons);
} return err;
return 0;
} }
...@@ -1200,7 +1208,7 @@ static void set_mode(int currcons, int on_off) ...@@ -1200,7 +1208,7 @@ static void set_mode(int currcons, int on_off)
case 3: /* 80/132 mode switch unimplemented */ case 3: /* 80/132 mode switch unimplemented */
deccolm = on_off; deccolm = on_off;
#if 0 #if 0
(void) vc_resize(video_num_lines, deccolm ? 132 : 80); (void) vc_resize(deccolm ? 132 : 80, video_num_lines);
/* this alone does not suffice; some user mode /* this alone does not suffice; some user mode
utility has to change the hardware regs */ utility has to change the hardware regs */
#endif #endif
...@@ -2525,6 +2533,15 @@ int __init vty_init(void) ...@@ -2525,6 +2533,15 @@ int __init vty_init(void)
kbd_init(); kbd_init();
console_map_init(); console_map_init();
#ifdef CONFIG_PROM_CONSOLE
prom_con_init();
#endif
#ifdef CONFIG_MDA_CONSOLE
mda_console_init();
#endif
#ifdef CONFIG_FRAMEBUFFER_CONSOLE
fb_console_init();
#endif
con_init_devfs(); con_init_devfs();
vcs_init(); vcs_init();
return 0; return 0;
...@@ -3021,10 +3038,15 @@ EXPORT_SYMBOL(default_grn); ...@@ -3021,10 +3038,15 @@ EXPORT_SYMBOL(default_grn);
EXPORT_SYMBOL(default_blu); EXPORT_SYMBOL(default_blu);
EXPORT_SYMBOL(video_font_height); EXPORT_SYMBOL(video_font_height);
EXPORT_SYMBOL(video_scan_lines); EXPORT_SYMBOL(video_scan_lines);
EXPORT_SYMBOL(vc_cons_allocated);
EXPORT_SYMBOL(update_region);
EXPORT_SYMBOL(redraw_screen);
EXPORT_SYMBOL(vc_resize); EXPORT_SYMBOL(vc_resize);
EXPORT_SYMBOL(fg_console); EXPORT_SYMBOL(fg_console);
EXPORT_SYMBOL(console_blank_hook); EXPORT_SYMBOL(console_blank_hook);
EXPORT_SYMBOL(console_blanked);
EXPORT_SYMBOL(vt_cons); EXPORT_SYMBOL(vt_cons);
EXPORT_SYMBOL(vc_cons);
#ifndef VT_SINGLE_DRIVER #ifndef VT_SINGLE_DRIVER
EXPORT_SYMBOL(take_over_console); EXPORT_SYMBOL(take_over_console);
EXPORT_SYMBOL(give_up_console); EXPORT_SYMBOL(give_up_console);
......
...@@ -810,7 +810,9 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, ...@@ -810,7 +810,9 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
if (get_user(ll, &vtsizes->v_rows) || if (get_user(ll, &vtsizes->v_rows) ||
get_user(cc, &vtsizes->v_cols)) get_user(cc, &vtsizes->v_cols))
return -EFAULT; return -EFAULT;
return vc_resize_all(ll, cc); for (i = 0; i < MAX_NR_CONSOLES; i++)
vc_resize(i, cc, ll);
return 0;
} }
case VT_RESIZEX: case VT_RESIZEX:
...@@ -829,36 +831,32 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, ...@@ -829,36 +831,32 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
__get_user(vcol, &vtconsize->v_vcol); __get_user(vcol, &vtconsize->v_vcol);
__get_user(ccol, &vtconsize->v_ccol); __get_user(ccol, &vtconsize->v_ccol);
vlin = vlin ? vlin : video_scan_lines; vlin = vlin ? vlin : video_scan_lines;
if ( clin ) if (clin) {
{ if (ll) {
if ( ll ) if (ll != vlin/clin)
{
if ( ll != vlin/clin )
return -EINVAL; /* Parameters don't add up */ return -EINVAL; /* Parameters don't add up */
} } else
else
ll = vlin/clin; ll = vlin/clin;
} }
if ( vcol && ccol ) if (vcol && ccol) {
{ if (cc) {
if ( cc ) if (cc != vcol/ccol)
{
if ( cc != vcol/ccol )
return -EINVAL; return -EINVAL;
} } else
else
cc = vcol/ccol; cc = vcol/ccol;
} }
if ( clin > 32 ) if (clin > 32)
return -EINVAL; return -EINVAL;
if ( vlin ) if (vlin)
video_scan_lines = vlin; video_scan_lines = vlin;
if ( clin ) if (clin)
video_font_height = clin; video_font_height = clin;
return vc_resize_all(ll, cc); for (i = 0; i < MAX_NR_CONSOLES; i++)
vc_resize(i, cc, ll);
return 0;
} }
case PIO_FONT: { case PIO_FONT: {
......
This diff is collapsed.
This diff is collapsed.
...@@ -5,33 +5,15 @@ ...@@ -5,33 +5,15 @@
# All of the (potential) objects that export symbols. # All of the (potential) objects that export symbols.
# This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'. # This list comes from 'grep -l EXPORT_SYMBOL *.[hc]'.
export-objs := fbmem.o fbcmap.o fbcon.o fbmon.o modedb.o \ export-objs := fbmem.o fbcmap.o fbmon.o modedb.o softcursor.o cfbfillrect.o \
fbcon-afb.o fbcon-ilbm.o fbcon-accel.o cyber2000fb.o \ cfbcopyarea.o cfbimgblt.o cyber2000fb.o vgastate.o
fbcon-iplan2p2.o fbcon-iplan2p4.o fbgen.o \
fbcon-iplan2p8.o fbcon-vga-planes.o fbcon-cfb16.o \
fbcon-cfb2.o fbcon-cfb24.o fbcon-cfb32.o fbcon-cfb4.o \
fbcon-cfb8.o fbcon-mfb.o fbcon-hga.o
# Each configuration option enables a list of files. # Each configuration option enables a list of files.
obj-$(CONFIG_DUMMY_CONSOLE) += dummycon.o obj-$(CONFIG_VT) += console/
obj-$(CONFIG_SGI_NEWPORT_CONSOLE) += newport_con.o
obj-$(CONFIG_PROM_CONSOLE) += promcon.o promcon_tbl.o
obj-$(CONFIG_STI_CONSOLE) += sticon.o sticon-bmode.o sticore.o
obj-$(CONFIG_VGA_CONSOLE) += vgacon.o
obj-$(CONFIG_MDA_CONSOLE) += mdacon.o
obj-$(CONFIG_FONT_SUN8x16) += font_sun8x16.o
obj-$(CONFIG_FONT_SUN12x22) += font_sun12x22.o
obj-$(CONFIG_FONT_8x8) += font_8x8.o
obj-$(CONFIG_FONT_8x16) += font_8x16.o
obj-$(CONFIG_FONT_6x11) += font_6x11.o
obj-$(CONFIG_FONT_PEARL_8x8) += font_pearl_8x8.o
obj-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o
obj-$(CONFIG_FONT_MINI_4x6) += font_mini_4x6.o
# Add fbmon.o back into obj-$(CONFIG_FB) in 2.5.x # Add fbmon.o back into obj-$(CONFIG_FB) in 2.5.x
obj-$(CONFIG_FB) += fbmem.o fbcmap.o modedb.o fbcon.o fonts.o fbgen.o obj-$(CONFIG_FB) += fbmem.o fbcmap.o modedb.o softcursor.o
# Only include macmodes.o if we have FB support and are PPC # Only include macmodes.o if we have FB support and are PPC
ifeq ($(CONFIG_FB),y) ifeq ($(CONFIG_FB),y)
obj-$(CONFIG_PPC) += macmodes.o obj-$(CONFIG_PPC) += macmodes.o
...@@ -44,10 +26,10 @@ obj-$(CONFIG_FB_PM3) += pm3fb.o ...@@ -44,10 +26,10 @@ obj-$(CONFIG_FB_PM3) += pm3fb.o
obj-$(CONFIG_FB_APOLLO) += dnfb.o cfbfillrect.o cfbimgblt.o obj-$(CONFIG_FB_APOLLO) += dnfb.o cfbfillrect.o cfbimgblt.o
obj-$(CONFIG_FB_Q40) += q40fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_Q40) += q40fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
obj-$(CONFIG_FB_ATARI) += atafb.o obj-$(CONFIG_FB_ATARI) += atafb.o
obj-$(CONFIG_FB_ATY128) += aty128fb.o obj-$(CONFIG_FB_ATY128) += aty128fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
obj-$(CONFIG_FB_RADEON) += radeonfb.o obj-$(CONFIG_FB_RADEON) += radeonfb.o
obj-$(CONFIG_FB_NEOMAGIC) += neofb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_NEOMAGIC) += neofb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
obj-$(CONFIG_FB_IGA) += igafb.o obj-$(CONFIG_FB_IGA) += igafb.o cfbfillrect.o cfbcopyarea.o cfbimgblit.o
obj-$(CONFIG_FB_CONTROL) += controlfb.o obj-$(CONFIG_FB_CONTROL) += controlfb.o
obj-$(CONFIG_FB_PLATINUM) += platinumfb.o obj-$(CONFIG_FB_PLATINUM) += platinumfb.o
obj-$(CONFIG_FB_VALKYRIE) += valkyriefb.o obj-$(CONFIG_FB_VALKYRIE) += valkyriefb.o
...@@ -68,7 +50,8 @@ obj-$(CONFIG_FB_TRIDENT) += tridentfb.o ...@@ -68,7 +50,8 @@ obj-$(CONFIG_FB_TRIDENT) += tridentfb.o
obj-$(CONFIG_FB_S3TRIO) += S3triofb.o obj-$(CONFIG_FB_S3TRIO) += S3triofb.o
obj-$(CONFIG_FB_TGA) += tgafb.o obj-$(CONFIG_FB_TGA) += tgafb.o
obj-$(CONFIG_FB_VESA) += vesafb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_VESA) += vesafb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
obj-$(CONFIG_FB_VGA16) += vga16fb.o fbcon-vga-planes.o obj-$(CONFIG_FB_VGA16) += vga16fb.o cfbfillrect.o cfbcopyarea.o \
cfbimgblt.o vgastate.o
obj-$(CONFIG_FB_VIRGE) += virgefb.o obj-$(CONFIG_FB_VIRGE) += virgefb.o
obj-$(CONFIG_FB_G364) += g364fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_G364) += g364fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
obj-$(CONFIG_FB_FM2) += fm2fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_FM2) += fm2fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
...@@ -80,20 +63,21 @@ obj-$(CONFIG_FB_TCX) += tcxfb.o sbusfb.o ...@@ -80,20 +63,21 @@ obj-$(CONFIG_FB_TCX) += tcxfb.o sbusfb.o
obj-$(CONFIG_FB_CGFOURTEEN) += cgfourteenfb.o sbusfb.o obj-$(CONFIG_FB_CGFOURTEEN) += cgfourteenfb.o sbusfb.o
obj-$(CONFIG_FB_P9100) += p9100fb.o sbusfb.o obj-$(CONFIG_FB_P9100) += p9100fb.o sbusfb.o
obj-$(CONFIG_FB_LEO) += leofb.o sbusfb.o obj-$(CONFIG_FB_LEO) += leofb.o sbusfb.o
obj-$(CONFIG_FB_STI) += stifb.o sticore.o obj-$(CONFIG_FB_STI) += stifb.o console/sticore.o
obj-$(CONFIG_FB_PMAG_BA) += pmag-ba-fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_PMAG_BA) += pmag-ba-fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
obj-$(CONFIG_FB_PMAGB_B) += pmagb-b-fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_PMAGB_B) += pmagb-b-fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
obj-$(CONFIG_FB_MAXINE) += maxinefb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_MAXINE) += maxinefb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
obj-$(CONFIG_FB_TX3912) += tx3912fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_TX3912) += tx3912fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
obj-$(CONFIG_FB_MATROX) += matrox/ obj-$(CONFIG_FB_MATROX) += matrox/
obj-$(CONFIG_FB_RIVA) += riva/ obj-$(CONFIG_FB_RIVA) += riva/ cfbfillrect.o cfbcopyarea.o \
cfbimgblt.o vgastate.o
obj-$(CONFIG_FB_SIS) += sis/ obj-$(CONFIG_FB_SIS) += sis/
obj-$(CONFIG_FB_ATY) += aty/ cfbimgblt.o obj-$(CONFIG_FB_ATY) += aty/ cfbimgblt.o
obj-$(CONFIG_FB_SUN3) += sun3fb.o obj-$(CONFIG_FB_SUN3) += sun3fb.o
obj-$(CONFIG_FB_BWTWO) += bwtwofb.o obj-$(CONFIG_FB_BWTWO) += bwtwofb.o
obj-$(CONFIG_FB_HGA) += hgafb.o obj-$(CONFIG_FB_HGA) += hgafb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
obj-$(CONFIG_FB_SA1100) += sa1100fb.o obj-$(CONFIG_FB_SA1100) += sa1100fb.o
obj-$(CONFIG_FB_VIRTUAL) += vfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_VIRTUAL) += vfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
obj-$(CONFIG_FB_HIT) += hitfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o obj-$(CONFIG_FB_HIT) += hitfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
...@@ -101,24 +85,6 @@ obj-$(CONFIG_FB_E1355) += epson1355fb.o ...@@ -101,24 +85,6 @@ obj-$(CONFIG_FB_E1355) += epson1355fb.o
obj-$(CONFIG_FB_PVR2) += pvr2fb.o obj-$(CONFIG_FB_PVR2) += pvr2fb.o
obj-$(CONFIG_FB_VOODOO1) += sstfb.o obj-$(CONFIG_FB_VOODOO1) += sstfb.o
# Generic Low Level Drivers
obj-$(CONFIG_FBCON_AFB) += fbcon-afb.o
obj-$(CONFIG_FBCON_CFB2) += fbcon-cfb2.o
obj-$(CONFIG_FBCON_CFB4) += fbcon-cfb4.o
obj-$(CONFIG_FBCON_CFB8) += fbcon-cfb8.o
obj-$(CONFIG_FBCON_CFB16) += fbcon-cfb16.o
obj-$(CONFIG_FBCON_CFB24) += fbcon-cfb24.o
obj-$(CONFIG_FBCON_CFB32) += fbcon-cfb32.o
obj-$(CONFIG_FBCON_ILBM) += fbcon-ilbm.o
obj-$(CONFIG_FBCON_IPLAN2P2) += fbcon-iplan2p2.o
obj-$(CONFIG_FBCON_IPLAN2P4) += fbcon-iplan2p4.o
obj-$(CONFIG_FBCON_IPLAN2P8) += fbcon-iplan2p8.o
obj-$(CONFIG_FBCON_MFB) += fbcon-mfb.o
obj-$(CONFIG_FBCON_HGA) += fbcon-hga.o
obj-$(CONFIG_FBCON_STI) += fbcon-sti.o
obj-$(CONFIG_FBCON_ACCEL) += fbcon-accel.o
# Files generated that shall be removed upon make clean # Files generated that shall be removed upon make clean
clean-files := promcon_tbl.c clean-files := promcon_tbl.c
......
...@@ -542,7 +542,7 @@ static void __init s3triofb_of_init(struct device_node *dp) ...@@ -542,7 +542,7 @@ static void __init s3triofb_of_init(struct device_node *dp)
return; return;
printk("fb%d: S3 Trio frame buffer device on %s\n", printk("fb%d: S3 Trio frame buffer device on %s\n",
GET_FB_IDX(fb_info.node), dp->full_name); minor(fb_info.node), dp->full_name);
} }
......
...@@ -1771,7 +1771,7 @@ int __init amifb_init(void) ...@@ -1771,7 +1771,7 @@ int __init amifb_init(void)
} }
printk("fb%d: %s frame buffer device, using %ldK of video memory\n", printk("fb%d: %s frame buffer device, using %ldK of video memory\n",
GET_FB_IDX(fb_info.node), fb_info.modename, minor(fb_info.node), fb_info.modename,
videomemorysize>>10); videomemorysize>>10);
return 0; return 0;
......
...@@ -20,25 +20,22 @@ ...@@ -20,25 +20,22 @@
#include <asm/io.h> #include <asm/io.h>
#include <video/fbcon.h> static u32 colreg[17];
static u32 colreg[16];
static struct fb_info fb_info; static struct fb_info fb_info;
static struct display display;
static struct fb_var_screeninfo anakinfb_var = { static struct fb_var_screeninfo anakinfb_var = {
.xres = 400, .xres = 400,
.yres = 234, .yres = 234,
.xres_virtual = 400, .xres_virtual = 400,
.yres_virtual = 234, .yres_virtual = 234,
.bits_per_pixel =16, .bits_per_pixel = 16,
.red = { 11, 5, 0 }, .red = { 11, 5, 0 },
.green = { 5, 6, 0 }, .green = { 5, 6, 0 },
.blue = { 0, 5, 0 }, .blue = { 0, 5, 0 },
.activate FB_ACTIVATE_NOW, .activate = FB_ACTIVATE_NOW,
.height -1, .height = -1,
.width -1, .width = -1,
.vmode FB_VMODE_NONINTERLACED, .vmode = FB_VMODE_NONINTERLACED,
}; };
static struct fb_fix_screeninfo anakinfb_fix = { static struct fb_fix_screeninfo anakinfb_fix = {
...@@ -58,40 +55,30 @@ anakinfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, ...@@ -58,40 +55,30 @@ anakinfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
if (regno > 15) if (regno > 15)
return 1; return 1;
colreg[regno] = (red & 0xf800) | (green & 0xfc00 >> 5) | ((u16 *)(info->pseudo_palette))[regno] = (red & 0xf800) | (green & 0xfc00 >> 5) | (blue & 0xf800 >> 11);
(blue & 0xf800 >> 11);
return 0; return 0;
} }
static struct fb_ops anakinfb_ops = { static struct fb_ops anakinfb_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.fb_set_var = gen_set_var,
.fb_get_cmap = gen_get_cmap,
.fb_set_cmap = gen_set_cmap,
.fb_setcolreg = anakinfb_setcolreg, .fb_setcolreg = anakinfb_setcolreg,
.fb_fillrect = cfb_fillrect, .fb_fillrect = cfb_fillrect,
.fb_copyarea = cfb_copyarea, .fb_copyarea = cfb_copyarea,
.fb_imageblit = cfb_imageblit, .fb_imageblit = cfb_imageblit,
.fb_cursor = soft_cursor,
}; };
int __init int __init
anakinfb_init(void) anakinfb_init(void)
{ {
memset(&fb_info, 0, sizeof(struct fb_info)); memset(&fb_info, 0, sizeof(struct fb_info));
memset(&display, 0, sizeof(struct display));
strcpy(fb_info.modename, anakinfb_fix.id);
fb_info.node = NODEV; fb_info.node = NODEV;
fb_info.currcon = -1;
fb_info.flags = FBINFO_FLAG_DEFAULT; fb_info.flags = FBINFO_FLAG_DEFAULT;
fb_info.fbops = &anakinfb_ops; fb_info.fbops = &anakinfb_ops;
fb_info.var = anakinfb_var; fb_info.var = anakinfb_var;
fb_info.fix = anakinfb_fix; fb_info.fix = anakinfb_fix;
fb_info.disp = &display; fb_info.psuedo_palette = colreg;
strcpy(fb_info.fontname, "VGA8x16");
fb_info.changevar = NULL;
fb_info.switch_con = gen_switch_con;
fb_info.updatevar = gen_update_var;
if (!(request_mem_region(VGA_START, VGA_SIZE, "vga"))) if (!(request_mem_region(VGA_START, VGA_SIZE, "vga")))
return -ENOMEM; return -ENOMEM;
if (fb_info.screen_base = ioremap(VGA_START, VGA_SIZE)) { if (fb_info.screen_base = ioremap(VGA_START, VGA_SIZE)) {
...@@ -100,10 +87,9 @@ anakinfb_init(void) ...@@ -100,10 +87,9 @@ anakinfb_init(void)
} }
fb_alloc_cmap(&fb_info.cmap, 16, 0); fb_alloc_cmap(&fb_info.cmap, 16, 0);
gen_set_disp(-1, &fb_info);
if (register_framebuffer(&fb_info) < 0) { if (register_framebuffer(&fb_info) < 0) {
iounmap(display.screen_base); iounmap(fb_info.screen_base);
release_mem_region(VGA_START, VGA_SIZE); release_mem_region(VGA_START, VGA_SIZE);
return -EINVAL; return -EINVAL;
} }
......
...@@ -2816,7 +2816,7 @@ int __init atafb_init(void) ...@@ -2816,7 +2816,7 @@ int __init atafb_init(void)
printk(" virtual %dx%d\n", printk(" virtual %dx%d\n",
disp.var.xres_virtual, disp.var.yres_virtual); disp.var.xres_virtual, disp.var.yres_virtual);
printk("fb%d: %s frame buffer device, using %dK of video memory\n", printk("fb%d: %s frame buffer device, using %dK of video memory\n",
GET_FB_IDX(fb_info.node), fb_info.modename, screen_len>>10); minor(fb_info.node), fb_info.modename, screen_len>>10);
/* TODO: This driver cannot be unloaded yet */ /* TODO: This driver cannot be unloaded yet */
MOD_INC_USE_COUNT; MOD_INC_USE_COUNT;
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <video/fbcon.h>
/* /*
* Elements of the hardware specific atyfb_par structure * Elements of the hardware specific atyfb_par structure
*/ */
...@@ -59,19 +57,9 @@ union aty_pll { ...@@ -59,19 +57,9 @@ union aty_pll {
*/ */
struct aty_cursor { struct aty_cursor {
int enable;
int on;
int vbl_cnt;
int blink_rate;
u32 offset;
struct {
u16 x, y;
} pos, hot, size;
u32 color[2];
u8 bits[8][64]; u8 bits[8][64];
u8 mask[8][64]; u8 mask[8][64];
u8 *ram; u8 *ram;
struct timer_list *timer;
}; };
struct atyfb_par { struct atyfb_par {
...@@ -93,8 +81,6 @@ struct atyfb_par { ...@@ -93,8 +81,6 @@ struct atyfb_par {
u8 blitter_may_be_busy; u8 blitter_may_be_busy;
#ifdef __sparc__ #ifdef __sparc__
struct pci_mmap_map *mmap_map; struct pci_mmap_map *mmap_map;
int consolecnt;
int vtconsole;
u8 mmaped; u8 mmaped;
int open; int open;
#endif #endif
...@@ -251,11 +237,9 @@ extern void aty_calc_pll_ct(const struct fb_info *info, ...@@ -251,11 +237,9 @@ extern void aty_calc_pll_ct(const struct fb_info *info,
*/ */
extern struct aty_cursor *aty_init_cursor(struct fb_info *info); extern struct aty_cursor *aty_init_cursor(struct fb_info *info);
extern void atyfb_cursor(struct display *p, int mode, int x, int y); extern int atyfb_cursor(struct fb_info *info, struct fb_cursor *cursor);
extern void aty_set_cursor_color(struct fb_info *info); extern void aty_set_cursor_color(struct fb_info *info);
extern void aty_set_cursor_shape(struct fb_info *info); extern void aty_set_cursor_shape(struct fb_info *info);
extern int atyfb_set_font(struct display *d, int width, int height);
/* /*
* Hardware acceleration * Hardware acceleration
......
...@@ -65,9 +65,6 @@ ...@@ -65,9 +65,6 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <video/fbcon.h>
#include "../fbcon-accel.h"
#include <video/mach64.h> #include <video/mach64.h>
#include "atyfb.h" #include "atyfb.h"
...@@ -149,11 +146,11 @@ static int atyfb_check_var(struct fb_var_screeninfo *var, ...@@ -149,11 +146,11 @@ static int atyfb_check_var(struct fb_var_screeninfo *var,
static int atyfb_set_par(struct fb_info *info); static int atyfb_set_par(struct fb_info *info);
static int atyfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, static int atyfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
u_int transp, struct fb_info *info); u_int transp, struct fb_info *info);
static int atyfb_pan_display(struct fb_var_screeninfo *var, int con, static int atyfb_pan_display(struct fb_var_screeninfo *var,
struct fb_info *info); struct fb_info *info);
static int atyfb_blank(int blank, struct fb_info *info); static int atyfb_blank(int blank, struct fb_info *info);
static int atyfb_ioctl(struct inode *inode, struct file *file, u_int cmd, static int atyfb_ioctl(struct inode *inode, struct file *file, u_int cmd,
u_long arg, int con, struct fb_info *info); u_long arg, struct fb_info *info);
extern void atyfb_fillrect(struct fb_info *info, struct fb_fillrect *rect); extern void atyfb_fillrect(struct fb_info *info, struct fb_fillrect *rect);
extern void atyfb_copyarea(struct fb_info *info, struct fb_copyarea *area); extern void atyfb_copyarea(struct fb_info *info, struct fb_copyarea *area);
extern void atyfb_imageblit(struct fb_info *info, struct fb_image *image); extern void atyfb_imageblit(struct fb_info *info, struct fb_image *image);
...@@ -161,7 +158,7 @@ extern void atyfb_imageblit(struct fb_info *info, struct fb_image *image); ...@@ -161,7 +158,7 @@ extern void atyfb_imageblit(struct fb_info *info, struct fb_image *image);
static int atyfb_mmap(struct fb_info *info, struct file *file, static int atyfb_mmap(struct fb_info *info, struct file *file,
struct vm_area_struct *vma); struct vm_area_struct *vma);
#endif #endif
static int atyfb_rasterimg(struct fb_info *info, int start); static int atyfb_sync(struct fb_info *info);
/* /*
* Internal routines * Internal routines
...@@ -198,21 +195,12 @@ int atyfb_init(void); ...@@ -198,21 +195,12 @@ int atyfb_init(void);
int atyfb_setup(char *); int atyfb_setup(char *);
#endif #endif
int gen_get_var(struct fb_var_screeninfo *var, int con, struct fb_info *info)
{
*var = info->var;
return 0;
}
static struct fb_ops atyfb_ops = { static struct fb_ops atyfb_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.fb_open = atyfb_open, .fb_open = atyfb_open,
.fb_release = atyfb_release, .fb_release = atyfb_release,
.fb_set_var = gen_set_var,
.fb_check_var = atyfb_check_var, .fb_check_var = atyfb_check_var,
.fb_set_par = atyfb_set_par, .fb_set_par = atyfb_set_par,
.fb_get_cmap = gen_get_cmap,
.fb_set_cmap = gen_set_cmap,
.fb_setcolreg = atyfb_setcolreg, .fb_setcolreg = atyfb_setcolreg,
.fb_pan_display = atyfb_pan_display, .fb_pan_display = atyfb_pan_display,
.fb_blank = atyfb_blank, .fb_blank = atyfb_blank,
...@@ -220,13 +208,13 @@ static struct fb_ops atyfb_ops = { ...@@ -220,13 +208,13 @@ static struct fb_ops atyfb_ops = {
.fb_fillrect = atyfb_fillrect, .fb_fillrect = atyfb_fillrect,
.fb_copyarea = atyfb_copyarea, .fb_copyarea = atyfb_copyarea,
.fb_imageblit = atyfb_imageblit, .fb_imageblit = atyfb_imageblit,
.fb_cursor = soft_cursor,
#ifdef __sparc__ #ifdef __sparc__
.fb_mmap = atyfb_mmap, .fb_mmap = atyfb_mmap,
#endif #endif
.fb_rasterimg = atyfb_rasterimg, .fb_sync = atyfb_sync,
}; };
static char fontname[40] __initdata = { 0 };
static char curblink __initdata = 1; static char curblink __initdata = 1;
static char noaccel __initdata = 0; static char noaccel __initdata = 0;
static u32 default_vram __initdata = 0; static u32 default_vram __initdata = 0;
...@@ -944,9 +932,6 @@ static int atyfb_open(struct fb_info *info, int user) ...@@ -944,9 +932,6 @@ static int atyfb_open(struct fb_info *info, int user)
if (user) { if (user) {
par->open++; par->open++;
par->mmaped = 0; par->mmaped = 0;
par->vtconsole = -1;
} else {
par->consolecnt++;
} }
#endif #endif
return (0); return (0);
...@@ -973,9 +958,6 @@ static int atyfb_release(struct fb_info *info, int user) ...@@ -973,9 +958,6 @@ static int atyfb_release(struct fb_info *info, int user)
int was_mmaped = par->mmaped; int was_mmaped = par->mmaped;
par->mmaped = 0; par->mmaped = 0;
if (par->vtconsole != -1)
vt_cons[par->vtconsole]->vc_mode = KD_TEXT;
par->vtconsole = -1;
if (was_mmaped) { if (was_mmaped) {
struct fb_var_screeninfo var; struct fb_var_screeninfo var;
...@@ -1005,8 +987,6 @@ static int atyfb_release(struct fb_info *info, int user) ...@@ -1005,8 +987,6 @@ static int atyfb_release(struct fb_info *info, int user)
gen_set_var(&var, -1, info); gen_set_var(&var, -1, info);
} }
} }
} else {
par->consolecnt--;
} }
#endif #endif
return (0); return (0);
...@@ -1018,7 +998,7 @@ static int atyfb_release(struct fb_info *info, int user) ...@@ -1018,7 +998,7 @@ static int atyfb_release(struct fb_info *info, int user)
* This call looks only at xoffset, yoffset and the FB_VMODE_YWRAP flag * This call looks only at xoffset, yoffset and the FB_VMODE_YWRAP flag
*/ */
static int atyfb_pan_display(struct fb_var_screeninfo *var, int con, static int atyfb_pan_display(struct fb_var_screeninfo *var,
struct fb_info *info) struct fb_info *info)
{ {
struct atyfb_par *par = (struct atyfb_par *) info->par; struct atyfb_par *par = (struct atyfb_par *) info->par;
...@@ -1060,7 +1040,7 @@ struct atyclk { ...@@ -1060,7 +1040,7 @@ struct atyclk {
#endif #endif
static int atyfb_ioctl(struct inode *inode, struct file *file, u_int cmd, static int atyfb_ioctl(struct inode *inode, struct file *file, u_int cmd,
u_long arg, int con, struct fb_info *info) u_long arg, struct fb_info *info)
{ {
#if defined(__sparc__) || (defined(DEBUG) && defined(CONFIG_FB_ATY_CT)) #if defined(__sparc__) || (defined(DEBUG) && defined(CONFIG_FB_ATY_CT))
struct atyfb_par *par = (struct atyfb_par *) info->par; struct atyfb_par *par = (struct atyfb_par *) info->par;
...@@ -1150,7 +1130,7 @@ static int atyfb_ioctl(struct inode *inode, struct file *file, u_int cmd, ...@@ -1150,7 +1130,7 @@ static int atyfb_ioctl(struct inode *inode, struct file *file, u_int cmd,
return 0; return 0;
} }
static int atyfb_rasterimg(struct fb_info *info, int start) static int atyfb_sync(struct fb_info *info)
{ {
struct atyfb_par *par = (struct atyfb_par *) info->par; struct atyfb_par *par = (struct atyfb_par *) info->par;
...@@ -1228,18 +1208,8 @@ static int atyfb_mmap(struct fb_info *info, struct file *file, ...@@ -1228,18 +1208,8 @@ static int atyfb_mmap(struct fb_info *info, struct file *file,
vma->vm_flags |= VM_IO; vma->vm_flags |= VM_IO;
if (!par->mmaped) { if (!par->mmaped)
int lastconsole = 0;
if (info->display_fg)
lastconsole = info->display_fg->vc_num;
par->mmaped = 1; par->mmaped = 1;
if (par->consolecnt
&& fb_display[lastconsole].fb_info == info) {
par->vtconsole = lastconsole;
vt_cons[lastconsole]->vc_mode = KD_GRAPHICS;
}
}
return 0; return 0;
} }
...@@ -1562,7 +1532,6 @@ static int __init aty_init(struct fb_info *info, const char *name) ...@@ -1562,7 +1532,6 @@ static int __init aty_init(struct fb_info *info, const char *name)
const char *chipname = NULL, *ramname = NULL, *xtal; const char *chipname = NULL, *ramname = NULL, *xtal;
int j, pll, mclk, gtb_memsize; int j, pll, mclk, gtb_memsize;
struct fb_var_screeninfo var; struct fb_var_screeninfo var;
struct display *disp;
u32 chip_id, i; u32 chip_id, i;
u16 type; u16 type;
u8 rev; u8 rev;
...@@ -1843,18 +1812,9 @@ static int __init aty_init(struct fb_info *info, const char *name) ...@@ -1843,18 +1812,9 @@ static int __init aty_init(struct fb_info *info, const char *name)
fb_memset((void *) info->screen_base, 0, fb_memset((void *) info->screen_base, 0,
info->fix.smem_len); info->fix.smem_len);
disp = info->disp;
strcpy(info->modename, info->fix.id);
info->node = NODEV; info->node = NODEV;
info->fbops = &atyfb_ops; info->fbops = &atyfb_ops;
info->disp = disp;
info->pseudo_palette = pseudo_palette; info->pseudo_palette = pseudo_palette;
info->currcon = -1;
strcpy(info->fontname, fontname);
info->changevar = NULL;
info->switch_con = gen_switch;
info->updatevar = gen_update_var;
info->flags = FBINFO_FLAG_DEFAULT; info->flags = FBINFO_FLAG_DEFAULT;
#ifdef CONFIG_PMAC_BACKLIGHT #ifdef CONFIG_PMAC_BACKLIGHT
...@@ -1965,29 +1925,20 @@ static int __init aty_init(struct fb_info *info, const char *name) ...@@ -1965,29 +1925,20 @@ static int __init aty_init(struct fb_info *info, const char *name)
#endif #endif
#ifdef CONFIG_FB_ATY_CT #ifdef CONFIG_FB_ATY_CT
if (curblink && M64_HAS(INTEGRATED)) { if (curblink && M64_HAS(INTEGRATED))
par->cursor = aty_init_cursor(info); par->cursor = aty_init_cursor(info);
if (par->cursor) {
/*
disp->dispsw.cursor = atyfb_cursor;
disp->dispsw.set_font = atyfb_set_font;
*/
}
}
#endif /* CONFIG_FB_ATY_CT */ #endif /* CONFIG_FB_ATY_CT */
info->var = var; info->var = var;
fb_alloc_cmap(&info->cmap, 256, 0); fb_alloc_cmap(&info->cmap, 256, 0);
gen_set_var(&var, -1, info);
if (register_framebuffer(info) < 0) if (register_framebuffer(info) < 0)
return 0; return 0;
fb_list = info; fb_list = info;
printk("fb%d: %s frame buffer device on %s\n", printk("fb%d: %s frame buffer device on %s\n",
GET_FB_IDX(info->node), info->fix.id, name); minor(info->node), info->fix.id, name);
return 1; return 1;
} }
...@@ -2028,16 +1979,13 @@ int __init atyfb_init(void) ...@@ -2028,16 +1979,13 @@ int __init atyfb_init(void)
continue; continue;
info = info =
kmalloc(sizeof(struct fb_info) + kmalloc(sizeof(struct fb_info), GFP_ATOMIC);
sizeof(struct display), GFP_ATOMIC);
if (!info) { if (!info) {
printk printk
("atyfb_init: can't alloc fb_info\n"); ("atyfb_init: can't alloc fb_info\n");
return -ENXIO; return -ENXIO;
} }
memset(info, 0, memset(info, 0, sizeof(struct fb_info));
sizeof(struct fb_info) +
sizeof(struct display));
default_par = default_par =
kmalloc(sizeof(struct atyfb_par), GFP_ATOMIC); kmalloc(sizeof(struct atyfb_par), GFP_ATOMIC);
...@@ -2049,7 +1997,6 @@ int __init atyfb_init(void) ...@@ -2049,7 +1997,6 @@ int __init atyfb_init(void)
} }
memset(default_par, 0, sizeof(struct atyfb_par)); memset(default_par, 0, sizeof(struct atyfb_par));
info->disp = (struct display *) (info + 1);
info->fix = atyfb_fix; info->fix = atyfb_fix;
info->par = default_par; info->par = default_par;
...@@ -2460,17 +2407,7 @@ int __init atyfb_setup(char *options) ...@@ -2460,17 +2407,7 @@ int __init atyfb_setup(char *options)
return 0; return 0;
while ((this_opt = strsep(&options, ",")) != NULL) { while ((this_opt = strsep(&options, ",")) != NULL) {
if (!strncmp(this_opt, "font:", 5)) { if (!strncmp(this_opt, "noblink", 7)) {
char *p;
int i;
p = this_opt + 5;
for (i = 0; i < sizeof(fontname) - 1; i++)
if (!*p || *p == ' ' || *p == ',')
break;
memcpy(fontname, this_opt + 5, i);
fontname[i] = 0;
} else if (!strncmp(this_opt, "noblink", 7)) {
curblink = 0; curblink = 0;
} else if (!strncmp(this_opt, "noaccel", 7)) { } else if (!strncmp(this_opt, "noaccel", 7)) {
noaccel = 1; noaccel = 1;
...@@ -2694,12 +2631,8 @@ void cleanup_module(void) ...@@ -2694,12 +2631,8 @@ void cleanup_module(void)
iounmap(info->cursor->ram); iounmap(info->cursor->ram);
#endif #endif
#endif #endif
if (info->cursor)
if (info->cursor) {
if (info->cursor->timer)
kfree(info->cursor->timer);
kfree(info->cursor); kfree(info->cursor);
}
#ifdef __sparc__ #ifdef __sparc__
if (par->mmap_map) if (par->mmap_map)
kfree(par->mmap_map); kfree(par->mmap_map);
......
...@@ -7,8 +7,6 @@ ...@@ -7,8 +7,6 @@
#include <asm/io.h> #include <asm/io.h>
#include <video/fbcon.h>
#include <video/mach64.h> #include <video/mach64.h>
#include "atyfb.h" #include "atyfb.h"
......
...@@ -11,8 +11,6 @@ ...@@ -11,8 +11,6 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <video/fbcon.h>
#ifdef __sparc__ #ifdef __sparc__
#include <asm/pbm.h> #include <asm/pbm.h>
#include <asm/fbio.h> #include <asm/fbio.h>
...@@ -21,11 +19,6 @@ ...@@ -21,11 +19,6 @@
#include <video/mach64.h> #include <video/mach64.h>
#include "atyfb.h" #include "atyfb.h"
#define DEFAULT_CURSOR_BLINK_RATE (20)
#define CURSOR_DRAW_DELAY (2)
/* /*
* Hardware Cursor support. * Hardware Cursor support.
*/ */
...@@ -51,50 +44,48 @@ void aty_set_cursor_color(struct fb_info *info) ...@@ -51,50 +44,48 @@ void aty_set_cursor_color(struct fb_info *info)
const u8 *red = cursor_color_map; const u8 *red = cursor_color_map;
const u8 *green = cursor_color_map; const u8 *green = cursor_color_map;
const u8 *blue = cursor_color_map; const u8 *blue = cursor_color_map;
int i; u32 fg_color, bg_color;
if (!c) if (!c)
return; return;
#ifdef __sparc__ #ifdef __sparc__
if (par->mmaped && (!info->display_fg if (par->mmaped)
|| info->display_fg->vc_num ==
par->vtconsole))
return; return;
#endif #endif
fg_color = (u32) red[0] << 24;
fg_color |= (u32) green[0] << 16;
fg_color |= (u32) blue[0] << 8;
fg_color |= (u32) pixel[0];
for (i = 0; i < 2; i++) { bg_color = (u32) red[1] << 24;
c->color[i] = (u32) red[i] << 24; bg_color |= (u32) green[1] << 16;
c->color[i] |= (u32) green[i] << 16; bg_color |= (u32) blue[1] << 8;
c->color[i] |= (u32) blue[i] << 8; bg_color |= (u32) pixel[1];
c->color[i] |= (u32) pixel[i];
}
wait_for_fifo(2, par); wait_for_fifo(2, par);
aty_st_le32(CUR_CLR0, c->color[0], par); aty_st_le32(CUR_CLR0, fg_color, par);
aty_st_le32(CUR_CLR1, c->color[1], par); aty_st_le32(CUR_CLR1, bg_color, par);
} }
void aty_set_cursor_shape(struct fb_info *info) void aty_set_cursor_shape(struct fb_info *info)
{ {
struct atyfb_par *par = (struct atyfb_par *) info->par; struct atyfb_par *par = (struct atyfb_par *) info->par;
struct fb_cursor *cursor = &info->cursor;
struct aty_cursor *c = par->cursor; struct aty_cursor *c = par->cursor;
u8 *ram, m, b; u8 *ram, m, b;
int x, y; int x, y;
if (!c) if (!c)
return; return;
#ifdef __sparc__ #ifdef __sparc__
if (par->mmaped && (!info->display_fg if (par->mmaped)
|| info->display_fg->vc_num ==
par->vtconsole))
return; return;
#endif #endif
ram = c->ram; ram = c->ram;
for (y = 0; y < c->size.y; y++) { for (y = 0; y < cursor->image.height; y++) {
for (x = 0; x < c->size.x >> 2; x++) { for (x = 0; x < cursor->image.width >> 2; x++) {
m = c->mask[x][y]; m = c->mask[x][y];
b = c->bits[x][y]; b = c->bits[x][y];
fb_writeb(cursor_mask_lookup[m >> 4] | fb_writeb(cursor_mask_lookup[m >> 4] |
...@@ -108,12 +99,13 @@ void aty_set_cursor_shape(struct fb_info *info) ...@@ -108,12 +99,13 @@ void aty_set_cursor_shape(struct fb_info *info)
fb_writeb(0xaa, ram++); fb_writeb(0xaa, ram++);
} }
} }
fb_memset(ram, 0xaa, (64 - c->size.y) * 16); fb_memset(ram, 0xaa, (64 - cursor->image.height) * 16);
} }
static void aty_set_cursor(struct fb_info *info, int on) static void aty_set_cursor(struct fb_info *info)
{ {
struct atyfb_par *par = (struct atyfb_par *) info->par; struct atyfb_par *par = (struct atyfb_par *) info->par;
struct fb_cursor *cursor = &info->cursor;
struct aty_cursor *c = par->cursor; struct aty_cursor *c = par->cursor;
u16 xoff, yoff; u16 xoff, yoff;
int x, y; int x, y;
...@@ -122,14 +114,12 @@ static void aty_set_cursor(struct fb_info *info, int on) ...@@ -122,14 +114,12 @@ static void aty_set_cursor(struct fb_info *info, int on)
return; return;
#ifdef __sparc__ #ifdef __sparc__
if (par->mmaped && (!info->display_fg if (par->mmaped)
|| info->display_fg->vc_num ==
par->vtconsole))
return; return;
#endif #endif
if (on) { if (cursor->enable) {
x = c->pos.x - c->hot.x - info->var.xoffset; x = cursor->image.dx - cursor->hot.x - info->var.xoffset;
if (x < 0) { if (x < 0) {
xoff = -x; xoff = -x;
x = 0; x = 0;
...@@ -137,7 +127,7 @@ static void aty_set_cursor(struct fb_info *info, int on) ...@@ -137,7 +127,7 @@ static void aty_set_cursor(struct fb_info *info, int on)
xoff = 0; xoff = 0;
} }
y = c->pos.y - c->hot.y - info->var.yoffset; y = cursor->image.dy - cursor->hot.y - info->var.yoffset;
if (y < 0) { if (y < 0) {
yoff = -y; yoff = -y;
y = 0; y = 0;
...@@ -146,10 +136,10 @@ static void aty_set_cursor(struct fb_info *info, int on) ...@@ -146,10 +136,10 @@ static void aty_set_cursor(struct fb_info *info, int on)
} }
wait_for_fifo(4, par); wait_for_fifo(4, par);
aty_st_le32(CUR_OFFSET, (c->offset >> 3) + (yoff << 1), aty_st_le32(CUR_OFFSET, (info->fix.smem_len >> 3) + (yoff << 1),
par); par);
aty_st_le32(CUR_HORZ_VERT_OFF, aty_st_le32(CUR_HORZ_VERT_OFF,
((u32) (64 - c->size.y + yoff) << 16) | xoff, ((u32) (64 - cursor->image.height + yoff) << 16) | xoff,
par); par);
aty_st_le32(CUR_HORZ_VERT_POSN, ((u32) y << 16) | x, par); aty_st_le32(CUR_HORZ_VERT_POSN, ((u32) y << 16) | x, par);
aty_st_le32(GEN_TEST_CNTL, aty_ld_le32(GEN_TEST_CNTL, par) aty_st_le32(GEN_TEST_CNTL, aty_ld_le32(GEN_TEST_CNTL, par)
...@@ -164,70 +154,25 @@ static void aty_set_cursor(struct fb_info *info, int on) ...@@ -164,70 +154,25 @@ static void aty_set_cursor(struct fb_info *info, int on)
wait_for_idle(par); wait_for_idle(par);
} }
static void aty_cursor_timer_handler(unsigned long dev_addr) int atyfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
{
struct fb_info *info = (struct fb_info *) dev_addr;
struct atyfb_par *par = (struct atyfb_par *) info->par;
if (!par->cursor)
return;
if (!par->cursor->enable)
goto out;
if (par->cursor->vbl_cnt && --par->cursor->vbl_cnt == 0) {
par->cursor->on ^= 1;
aty_set_cursor(info, par->cursor->on);
par->cursor->vbl_cnt = par->cursor->blink_rate;
}
out:
par->cursor->timer->expires = jiffies + (HZ / 50);
add_timer(par->cursor->timer);
}
void atyfb_cursor(struct display *p, int mode, int x, int y)
{ {
struct fb_info *info = p->fb_info;
struct atyfb_par *par = (struct atyfb_par *) info->par; struct atyfb_par *par = (struct atyfb_par *) info->par;
struct aty_cursor *c = par->cursor; struct aty_cursor *c = par->cursor;
if (!c) if (!c)
return; return -1;
#ifdef __sparc__ #ifdef __sparc__
if (par->mmaped && (!info->display_fg if (par->mmaped)
|| info->display_fg->vc_num ==
par->vtconsole))
return; return;
#endif #endif
x *= fontwidth(p); aty_set_cursor(info);
y *= fontheight(p); cursor->image.dx = info->cursor.image.dx;
if (c->pos.x == x && c->pos.y == y cursor->image.dy = info->cursor.image.dy;
&& (mode == CM_ERASE) == !c->enable)
return;
c->enable = 0; aty_set_cursor(info);
if (c->on) return 0;
aty_set_cursor(info, 0);
c->pos.x = x;
c->pos.y = y;
switch (mode) {
case CM_ERASE:
c->on = 0;
break;
case CM_DRAW:
case CM_MOVE:
if (c->on)
aty_set_cursor(info, 1);
else
c->vbl_cnt = CURSOR_DRAW_DELAY;
c->enable = 1;
break;
}
} }
struct aty_cursor *__init aty_init_cursor(struct fb_info *info) struct aty_cursor *__init aty_init_cursor(struct fb_info *info)
...@@ -240,47 +185,31 @@ struct aty_cursor *__init aty_init_cursor(struct fb_info *info) ...@@ -240,47 +185,31 @@ struct aty_cursor *__init aty_init_cursor(struct fb_info *info)
return 0; return 0;
memset(cursor, 0, sizeof(*cursor)); memset(cursor, 0, sizeof(*cursor));
cursor->timer = kmalloc(sizeof(*cursor->timer), GFP_KERNEL);
if (!cursor->timer) {
kfree(cursor);
return 0;
}
memset(cursor->timer, 0, sizeof(*cursor->timer));
cursor->blink_rate = DEFAULT_CURSOR_BLINK_RATE;
info->fix.smem_len -= PAGE_SIZE; info->fix.smem_len -= PAGE_SIZE;
cursor->offset = info->fix.smem_len;
#ifdef __sparc__ #ifdef __sparc__
addr = (unsigned long) info->screen_base - 0x800000 + cursor->offset; addr = info->screen_base - 0x800000 + info->fix.smem_len;
cursor->ram = (u8 *) addr; cursor->ram = (u8 *) addr;
#else #else
#ifdef __BIG_ENDIAN #ifdef __BIG_ENDIAN
addr = info->fix.smem_start - 0x800000 + cursor->offset; addr = info->fix.smem_start - 0x800000 + info->fix.smem_len;
cursor->ram = (u8 *) ioremap(addr, 1024); cursor->ram = (u8 *) ioremap(addr, 1024);
#else #else
addr = (unsigned long) info->screen_base + cursor->offset; addr = (unsigned long) info->screen_base + info->fix.smem_len;
cursor->ram = (u8 *) addr; cursor->ram = (u8 *) addr;
#endif #endif
#endif #endif
if (!cursor->ram) { if (!cursor->ram) {
kfree(cursor); kfree(cursor);
return NULL; return NULL;
} }
init_timer(cursor->timer);
cursor->timer->expires = jiffies + (HZ / 50);
cursor->timer->data = (unsigned long) info;
cursor->timer->function = aty_cursor_timer_handler;
add_timer(cursor->timer);
return cursor; return cursor;
} }
int atyfb_set_font(struct display *d, int width, int height) int atyfb_set_font(struct fb_info *info, int width, int height)
{ {
struct fb_info *info = d->fb_info;
struct atyfb_par *par = (struct atyfb_par *) info->par; struct atyfb_par *par = (struct atyfb_par *) info->par;
struct fb_cursor *cursor = &info->cursor;
struct aty_cursor *c = par->cursor; struct aty_cursor *c = par->cursor;
int i, j; int i, j;
...@@ -290,10 +219,10 @@ int atyfb_set_font(struct display *d, int width, int height) ...@@ -290,10 +219,10 @@ int atyfb_set_font(struct display *d, int width, int height)
height = 16; height = 16;
} }
c->hot.x = 0; cursor->hot.x = 0;
c->hot.y = 0; cursor->hot.y = 0;
c->size.x = width; cursor->image.width = width;
c->size.y = height; cursor->image.height = height;
memset(c->bits, 0xff, sizeof(c->bits)); memset(c->bits, 0xff, sizeof(c->bits));
memset(c->mask, 0, sizeof(c->mask)); memset(c->mask, 0, sizeof(c->mask));
......
...@@ -9,8 +9,6 @@ ...@@ -9,8 +9,6 @@
#include <asm/io.h> #include <asm/io.h>
#include <video/fbcon.h>
#include <video/mach64.h> #include <video/mach64.h>
#include "atyfb.h" #include "atyfb.h"
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -562,7 +562,7 @@ static void __init init_chips(struct fb_info_chips *p) ...@@ -562,7 +562,7 @@ static void __init init_chips(struct fb_info_chips *p)
} }
printk("fb%d: Chips 65550 frame buffer (%dK RAM detected)\n", printk("fb%d: Chips 65550 frame buffer (%dK RAM detected)\n",
GET_FB_IDX(p->info.node), p->fix.smem_len / 1024); minor(p->info.node), p->fix.smem_len / 1024);
chips_hw_init(p); chips_hw_init(p);
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#include <linux/kdev_t.h> #include <linux/kdev_t.h>
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/console.h> #include <linux/console.h>
#include <linux/console_struct.h>
#include <linux/vt_kern.h> #include <linux/vt_kern.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -33,14 +32,14 @@ static const char *dummycon_startup(void) ...@@ -33,14 +32,14 @@ static const char *dummycon_startup(void)
return "dummy device"; return "dummy device";
} }
static void dummycon_init(struct vc_data *conp, int init) static void dummycon_init(struct vc_data *vc, int init)
{ {
conp->vc_can_do_color = 1; vc->vc_can_do_color = 1;
if (init) { if (init) {
conp->vc_cols = DUMMY_COLUMNS; vc->vc_cols = DUMMY_COLUMNS;
conp->vc_rows = DUMMY_ROWS; vc->vc_rows = DUMMY_ROWS;
} else } else
vc_resize_con(DUMMY_ROWS, DUMMY_COLUMNS, conp->vc_num); vc_resize(vc->vc_num, DUMMY_COLUMNS, DUMMY_ROWS);
} }
static int dummycon_dummy(void) static int dummycon_dummy(void)
......
This diff is collapsed.
This diff is collapsed.
#include <video/font.h> #include "font.h"
#define FONTDATAMAX 11264 #define FONTDATAMAX 11264
...@@ -6206,7 +6206,7 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = { ...@@ -6206,7 +6206,7 @@ static unsigned char fontdata_sun12x22[FONTDATAMAX] = {
}; };
struct fbcon_font_desc font_sun_12x22 = { struct font_desc font_sun_12x22 = {
SUN12x22_IDX, SUN12x22_IDX,
"SUN12x22", "SUN12x22",
12, 12,
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment