Menu
▾
▴
linuxconsole-commit — CVS commit mailing list
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(135) |
Nov
(123) |
Dec
(83) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(244) |
Feb
(72) |
Mar
(221) |
Apr
(91) |
May
(104) |
Jun
(93) |
Jul
(78) |
Aug
(1) |
Sep
(1) |
Oct
(29) |
Nov
(98) |
Dec
(20) |
| 2003 |
Jan
|
Feb
(21) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(18) |
Sep
(18) |
Oct
(23) |
Nov
(12) |
Dec
(6) |
| 2004 |
Jan
(2) |
Feb
(32) |
Mar
|
Apr
(12) |
May
(11) |
Jun
(11) |
Jul
|
Aug
(9) |
Sep
|
Oct
(15) |
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
(2) |
Mar
(11) |
Apr
(6) |
May
(1) |
Jun
(9) |
Jul
(7) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2006 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
(2) |
Mar
|
Apr
(25) |
May
(2) |
Jun
|
Jul
(5) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(13) |
Oct
|
Nov
(2) |
Dec
(2) |
| 2011 |
Jan
|
Feb
|
Mar
(10) |
Apr
(10) |
May
(1) |
Jun
(6) |
Jul
|
Aug
(2) |
Sep
(5) |
Oct
|
Nov
|
Dec
|
|
From: James S. <jsi...@us...> - 2002-06-04 19:45:12
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv29363/linux/drivers/char
Modified Files:
Config.in Makefile tty_io.c
Log Message:
Synced to 2.5.20.
Index: Config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/Config.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- Config.in 16 May 2002 18:01:39 -0000 1.39
+++ Config.in 4 Jun 2002 19:45:08 -0000 1.40
@@ -105,6 +105,9 @@
fi
dep_tristate 'Support for user-space parallel port device drivers' CONFIG_PPDEV $CONFIG_PARPORT
fi
+if [ "$CONFIG_PPC_PSERIES" = "y" ]; then
+ bool 'pSeries Hypervisor Virtual Console support' CONFIG_HVC_CONSOLE
+fi
source drivers/i2c/Config.in
@@ -197,6 +200,7 @@
bool ' ALI chipset support' CONFIG_AGP_ALI
bool ' Serverworks LE/HE support' CONFIG_AGP_SWORKS
if [ "$CONFIG_IA64" = "y" ]; then
+ bool ' Intel 460GX support' CONFIG_AGP_I460
bool ' HP ZX1 AGP support' CONFIG_AGP_HP_ZX1
fi
fi
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/Makefile,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- Makefile 3 Jun 2002 22:44:57 -0000 1.41
+++ Makefile 4 Jun 2002 19:45:08 -0000 1.42
@@ -60,6 +60,7 @@
obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o
obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o
obj-$(CONFIG_SERIAL_TX3912) += generic_serial.o serial_tx3912.o
+obj-$(CONFIG_HVC_CONSOLE) += hvc_console.o
obj-$(CONFIG_PRINTER) += lp.o
obj-$(CONFIG_DTLK) += dtlk.o
Index: tty_io.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/tty_io.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- tty_io.c 16 May 2002 18:01:39 -0000 1.49
+++ tty_io.c 4 Jun 2002 19:45:09 -0000 1.50
@@ -154,6 +154,7 @@
extern void sci_console_init(void);
extern void tx3912_console_init(void);
extern void tx3912_rs_init(void);
+extern void hvc_console_init(void);
#ifndef MIN
#define MIN(a,b) ((a) < (b) ? (a) : (b))
@@ -2230,6 +2231,9 @@
#endif
#ifdef CONFIG_SERIAL_TX3912_CONSOLE
tx3912_console_init();
+#endif
+#ifdef CONFIG_HVC_CONSOLE
+ hvc_console_init();
#endif
}
|
|
From: James S. <jsi...@us...> - 2002-06-04 19:45:11
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/ppc64/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv29363/linux/arch/ppc64/kernel
Modified Files:
ioctl32.c setup.c
Log Message:
Synced to 2.5.20.
Index: ioctl32.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc64/kernel/ioctl32.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ioctl32.c 16 May 2002 18:01:38 -0000 1.5
+++ ioctl32.c 4 Jun 2002 19:45:06 -0000 1.6
@@ -3764,6 +3764,7 @@
COMPATIBLE_IOCTL(TCSETSF),
COMPATIBLE_IOCTL(TIOCLINUX),
COMPATIBLE_IOCTL(TIOCSTART),
+COMPATIBLE_IOCTL(TIOCSTOP),
/* Little t */
COMPATIBLE_IOCTL(TIOCGETD),
COMPATIBLE_IOCTL(TIOCSETD),
@@ -4344,8 +4345,6 @@
COMPATIBLE_IOCTL(HCIDEVUP),
COMPATIBLE_IOCTL(HCIDEVDOWN),
COMPATIBLE_IOCTL(HCIDEVRESET),
-COMPATIBLE_IOCTL(HCIRESETSTAT),
-COMPATIBLE_IOCTL(HCIGETINFO),
COMPATIBLE_IOCTL(HCIGETDEVLIST),
COMPATIBLE_IOCTL(HCISETRAW),
COMPATIBLE_IOCTL(HCISETSCAN),
Index: setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc64/kernel/setup.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- setup.c 16 May 2002 18:01:38 -0000 1.4
+++ setup.c 4 Jun 2002 19:45:08 -0000 1.5
@@ -129,6 +129,14 @@
/* This should be fixed properly in kernel/resource.c */
iomem_resource.end = MEM_SPACE_LIMIT;
+#ifdef CONFIG_XMON_DEFAULT
+ debugger = xmon;
+ debugger_bpt = xmon_bpt;
+ debugger_sstep = xmon_sstep;
+ debugger_iabr_match = xmon_iabr_match;
+ debugger_dabr_match = xmon_dabr_match;
+#endif
+
/* pSeries systems are identified in prom.c via OF. */
if ( itLpNaca.xLparInstalled == 1 )
naca->platform = PLATFORM_ISERIES_LPAR;
@@ -370,10 +378,15 @@
#endif
cmd_line[0] = 0;
+
+#ifdef CONFIG_CMDLINE
+ strcpy(cmd_line, CONFIG_CMDLINE);
+#endif /* CONFIG_CMDLINE */
+
chosen = find_devices("chosen");
if (chosen != NULL) {
p = get_property(chosen, "bootargs", NULL);
- if (p != NULL)
+ if (p != NULL && p[0] != 0)
strncpy(cmd_line, p, sizeof(cmd_line));
}
cmd_line[sizeof(cmd_line) - 1] = 0;
@@ -506,11 +519,6 @@
ppc_md.progress("setup_arch:enter", 0x3eab);
-#if defined(CONFIG_KGDB)
- kgdb_map_scc();
- set_debug_traps();
- breakpoint();
-#endif
/*
* Set cache line size based on type of cpu as a default.
* Systems with OF can look in the properties on the cpu node(s)
@@ -540,26 +548,6 @@
paging_init();
sort_exception_table();
ppc_md.progress("setup_arch: exit", 0x3eab);
-}
-
-void exception_trace(unsigned long trap)
-{
- unsigned long x, srr0, srr1, reg20, reg1, reg21;
-
- asm("mflr %0" : "=r" (x) :);
- asm("mfspr %0,0x1a" : "=r" (srr0) :);
- asm("mfspr %0,0x1b" : "=r" (srr1) :);
- asm("mr %0,1" : "=r" (reg1) :);
- asm("mr %0,20" : "=r" (reg20) :);
- asm("mr %0,21" : "=r" (reg21) :);
-
- udbg_puts("\n");
- udbg_puts("Took an exception : "); udbg_puthex(x); udbg_puts("\n");
- udbg_puts(" "); udbg_puthex(reg1); udbg_puts("\n");
- udbg_puts(" "); udbg_puthex(reg20); udbg_puts("\n");
- udbg_puts(" "); udbg_puthex(reg21); udbg_puts("\n");
- udbg_puts(" "); udbg_puthex(srr0); udbg_puts("\n");
- udbg_puts(" "); udbg_puthex(srr1); udbg_puts("\n");
}
int set_spread_lpevents( char * str )
|
|
From: James S. <jsi...@us...> - 2002-06-04 19:45:10
|
Update of /cvsroot/linuxconsole/ruby In directory usw-pr-cvs1:/tmp/cvs-serv29363 Added Files: AGAINST-2.5.20 Removed Files: AGAINST-2.5.19 Log Message: Synced to 2.5.20. --- NEW FILE: AGAINST-2.5.20 --- --- AGAINST-2.5.19 DELETED --- |
|
From: James S. <jsi...@us...> - 2002-06-03 22:47:00
|
Update of /cvsroot/linuxconsole/ruby In directory usw-pr-cvs1:/tmp/cvs-serv25757 Removed Files: AGAINST-2.5.18 Log Message: Synced to 2.5.19 --- AGAINST-2.5.18 DELETED --- |
|
From: James S. <jsi...@us...> - 2002-06-03 22:45:29
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/parisc/kernel In directory usw-pr-cvs1:/tmp/cvs-serv23928/linux/arch/parisc/kernel Modified Files: Makefile Log Message: Synced to 2.5.19 Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/arch/parisc/kernel/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 25 May 2002 20:31:59 -0000 1.2 +++ Makefile 3 Jun 2002 22:44:56 -0000 1.3 @@ -1,26 +1,20 @@ # # Makefile for the linux kernel. # -# Note! Dependencies are done automagically by 'make dep', which also -# removes any old dependencies. DON'T put your own dependencies here -# unless it's something special (ie not a .c file). -# -# Note 2! The CFLAGS definitions are now in the main makefile... -all: kernel.o init_task.o pdc_cons.o process.o head.o -O_TARGET = kernel.o +O_TARGET := kernel.o +EXTRA_TARGETS := head.o init_task.o process.o pdc_cons.o # Object file lists. -obj-y += cache.o setup.o traps.o time.o irq.o \ - syscall.o entry.o sys_parisc.o pdc.o ptrace.o hardware.o \ - inventory.o drivers.o semaphore.o pa7300lc.o pci-dma.o \ - signal.o hpmc.o \ - real1.o real2.o led.o parisc_ksyms.o +obj-y := cache.o setup.o traps.o time.o irq.o \ + syscall.o entry.o sys_parisc.o pdc.o ptrace.o hardware.o \ + inventory.o drivers.o semaphore.o pa7300lc.o pci-dma.o \ + signal.o hpmc.o \ + real1.o real2.o led.o parisc_ksyms.o export-objs := parisc_ksyms.o - obj-$(CONFIG_PCI) += pci.o obj-$(CONFIG_PCI_LBA) += lba_pci.o # I/O SAPIC is also on IA64 platforms. @@ -31,6 +25,6 @@ # obj-$(CONFIG_IOMMU_CCIO) += ccio-rm-dma.o obj-$(CONFIG_IOMMU_CCIO) += ccio-dma.o -EXTRA_AFLAGS := -traditional +EXTRA_AFLAGS := -traditional include $(TOPDIR)/Rules.make |
|
From: James S. <jsi...@us...> - 2002-06-03 22:45:29
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/mips/jazz In directory usw-pr-cvs1:/tmp/cvs-serv23928/linux/arch/mips/jazz Modified Files: Makefile Log Message: Synced to 2.5.19 Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/arch/mips/jazz/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile 25 May 2002 20:31:58 -0000 1.5 +++ Makefile 3 Jun 2002 22:44:56 -0000 1.6 @@ -1,20 +1,12 @@ # # Makefile for the Jazz family specific parts of the kernel # -# Note! Dependencies are done automagically by 'make dep', which also -# removes any old dependencies. DON'T put your own dependencies here -# unless it's something special (ie not a .c file). -# - -EXTRA_AFLAGS := $(CFLAGS) - -all: jazz.o O_TARGET := jazz.o obj-y := int-handler.o irq.o jazzdma.o reset.o rtc-jazz.o setup.o \ floppy-jazz.o -int-handler.o: int-handler.S +EXTRA_AFLAGS := $(CFLAGS) include $(TOPDIR)/Rules.make |
|
From: James S. <jsi...@us...> - 2002-06-03 22:45:28
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/i386/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv23928/linux/arch/i386/kernel
Modified Files:
setup.c
Log Message:
Synced to 2.5.19
Index: setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/i386/kernel/setup.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- setup.c 25 May 2002 20:31:58 -0000 1.43
+++ setup.c 3 Jun 2002 22:44:55 -0000 1.44
@@ -165,6 +165,8 @@
static int disable_x86_serial_nr __initdata = 1;
static int disable_x86_fxsr __initdata = 0;
+unsigned long saved_videomode;
+
extern unsigned long saved_videomode;
/*
@@ -681,10 +683,8 @@
drive_info = DRIVE_INFO;
screen_info = SCREEN_INFO;
apm_info.bios = APM_BIOS_INFO;
-#ifdef CONFIG_ACPI_SLEEP
saved_videomode = VIDEO_MODE;
printk("Video mode to be used for restore is %lx\n", saved_videomode);
-#endif
if( SYS_DESC_TABLE.length != 0 ) {
MCA_bus = SYS_DESC_TABLE.table[3] &0x2;
machine_id = SYS_DESC_TABLE.table[0];
|
|
From: James S. <jsi...@us...> - 2002-06-03 22:45:28
|
Update of /cvsroot/linuxconsole/ruby/linux
In directory usw-pr-cvs1:/tmp/cvs-serv23928/linux
Modified Files:
Makefile
Log Message:
Synced to 2.5.19
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/Makefile,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- Makefile 25 May 2002 20:31:58 -0000 1.60
+++ Makefile 3 Jun 2002 22:44:55 -0000 1.61
@@ -1,6 +1,6 @@
VERSION = 2
PATCHLEVEL = 5
-SUBLEVEL = 18
+SUBLEVEL = 19
EXTRAVERSION = -ruby
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
@@ -110,57 +110,8 @@
LIBS =$(TOPDIR)/lib/lib.a
SUBDIRS =init kernel lib drivers mm fs net ipc sound
-DRIVERS-n :=
-DRIVERS-y :=
-DRIVERS-m :=
-DRIVERS- :=
-
-DRIVERS-$(CONFIG_ACPI) += drivers/acpi/acpi.o
-DRIVERS-$(CONFIG_PCI) += drivers/pci/driver.o
-DRIVERS-$(CONFIG_PARPORT) += drivers/parport/driver.o
-DRIVERS-y += drivers/base/base.o \
- drivers/serial/serial.o \
- drivers/char/char.o \
- drivers/block/block.o \
- drivers/misc/misc.o \
- drivers/net/net.o \
- drivers/media/media.o \
- drivers/video/video.o
-DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/built-in.o
-DRIVERS-$(CONFIG_ATM) += drivers/atm/atm.o
-DRIVERS-$(CONFIG_IDE) += drivers/ide/idedriver.o
-DRIVERS-$(CONFIG_FC4) += drivers/fc4/built-in.o
-DRIVERS-$(CONFIG_SCSI) += drivers/scsi/scsidrv.o
-DRIVERS-$(CONFIG_FUSION) += drivers/message/message.o
-DRIVERS-$(CONFIG_IEEE1394) += drivers/ieee1394/ieee1394drv.o
-
-ifneq ($(CONFIG_CD_NO_IDESCSI)$(CONFIG_BLK_DEV_IDECD)$(CONFIG_BLK_DEV_SR)$(CONFIG_PARIDE_PCD),)
-DRIVERS-y += drivers/cdrom/driver.o
-endif
-
+DRIVERS-y = drivers/built-in.o
DRIVERS-$(CONFIG_SOUND) += sound/sound.o
-DRIVERS-$(CONFIG_MTD) += drivers/mtd/mtdlink.o
-DRIVERS-$(CONFIG_PCMCIA) += drivers/pcmcia/pcmcia.o
-DRIVERS-$(CONFIG_DIO) += drivers/dio/built-in.o
-DRIVERS-$(CONFIG_SBUS) += drivers/sbus/sbus_all.o
-DRIVERS-$(CONFIG_ZORRO) += drivers/zorro/driver.o
-DRIVERS-$(CONFIG_ALL_PPC) += drivers/macintosh/macintosh.o
-DRIVERS-$(CONFIG_MAC) += drivers/macintosh/macintosh.o
-DRIVERS-$(CONFIG_PNP) += drivers/pnp/pnp.o
-DRIVERS-$(CONFIG_SGI_IP22) += drivers/sgi/built-in.o
-DRIVERS-$(CONFIG_PARIDE) += drivers/block/paride/built-in.o
-DRIVERS-$(CONFIG_TC) += drivers/tc/built-in.o
-DRIVERS-$(CONFIG_USB) += drivers/usb/usbdrv.o
-DRIVERS-$(CONFIG_INPUT) += drivers/input/inputdrv.o
-DRIVERS-$(CONFIG_GAMEPORT) += drivers/input/gameport/gamedrv.o
-DRIVERS-$(CONFIG_SERIO) += drivers/input/serio/seriodrv.o
-DRIVERS-$(CONFIG_I2O) += drivers/message/message.o
-DRIVERS-$(CONFIG_I2C) += drivers/i2c/i2c.o
-DRIVERS-$(CONFIG_PHONE) += drivers/telephony/telephony.o
-DRIVERS-$(CONFIG_MD) += drivers/md/mddev.o
-DRIVERS-$(CONFIG_BLUEZ) += drivers/bluetooth/bluetooth.o
-DRIVERS-$(CONFIG_HOTPLUG_PCI) += drivers/hotplug/vmlinux-obj.o
-DRIVERS-$(CONFIG_ISDN) += drivers/isdn/vmlinux-obj.o
DRIVERS := $(DRIVERS-y)
@@ -173,7 +124,7 @@
# ---------------------------------------------------------------------------
boot: vmlinux
- @$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" AFLAGS="$(AFLAGS) $(AFLAGS_KERNEL)" -C arch/$(ARCH)/boot
+ @$(MAKE) -C arch/$(ARCH)/boot
# Build vmlinux
# ---------------------------------------------------------------------------
@@ -203,29 +154,40 @@
echo Generating build number
. scripts/mkversion > .tmpversion
mv -f .tmpversion .version
- $(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" AFLAGS="$(AFLAGS) $(AFLAGS_KERNEL)" -C init
+ $(MAKE) -C init
echo $(cmd_link_vmlinux)
$(cmd_link_vmlinux)
echo 'cmd_$@ := $(cmd_link_vmlinux)' > $(@D)/.$(@F).cmd
$(NM) vmlinux | grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | sort > System.map
endef
-vmlinux: $(CONFIGURATION) $(vmlinux-objs) dummy
+vmlinux: $(CONFIGURATION) $(vmlinux-objs) FORCE
$(call if_changed_rule,link_vmlinux)
-# The actual objects are generated when descending, make sure
-# no implicit rule kicks in
+# The actual objects are generated when descending,
+# make sure no implicit rule kicks in
-$(sort $(vmlinux-objs)): linuxsubdirs
- @
+$(sort $(vmlinux-objs)): $(SUBDIRS) ;
# Handle descending into subdirectories listed in $(SUBDIRS)
-.PHONY: linuxsubdirs
-linuxsubdirs: $(patsubst %, _dir_%, $(SUBDIRS))
+.PHONY: $(SUBDIRS)
+$(SUBDIRS): FORCE include/linux/version.h include/config/MARKER
+ @$(MAKE) -C $@
-$(patsubst %, _dir_%, $(SUBDIRS)) : dummy include/linux/version.h include/config/MARKER
- @$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" AFLAGS="$(AFLAGS) $(AFLAGS_KERNEL)" -C $(patsubst _dir_%, %, $@)
+# Single targets
+# ---------------------------------------------------------------------------
+
+%.s: %.c FORCE
+ @$(MAKE) -C $(@D) $(@F)
+%.i: %.c FORCE
+ @$(MAKE) -C $(@D) $(@F)
+%.o: %.c FORCE
+ @$(MAKE) -C $(@D) $(@F)
+%.s: %.S FORCE
+ @$(MAKE) -C $(@D) $(@F)
+%.o: %.S FORCE
+ @$(MAKE) -C $(@D) $(@F)
# Configuration
# ---------------------------------------------------------------------------
@@ -267,7 +229,10 @@
@echo Generating $@
@. scripts/mkversion_h $@ $(KERNELRELEASE) $(VERSION) $(PATCHLEVEL) $(SUBLEVEL)
-comma := ,
+# helpers built in scripts/
+
+scripts/mkdep scripts/split-include : FORCE
+ @$(MAKE) -C scripts
# ---------------------------------------------------------------------------
# Generate dependencies
@@ -276,11 +241,34 @@
dep-files: scripts/mkdep archdep include/linux/version.h
scripts/mkdep -- `find $(FINDHPATH) -name SCCS -prune -o -follow -name \*.h ! -name modversions.h -print` > .hdepend
- $(MAKE) $(patsubst %,_sfdep_%,$(SUBDIRS)) _FASTDEP_ALL_SUB_DIRS="$(SUBDIRS)"
+ @$(MAKE) $(patsubst %,_sfdep_%,$(SUBDIRS))
ifdef CONFIG_MODVERSIONS
$(MAKE) update-modverfile
endif
+.PHONY: $(patsubst %,_sfdep_%,$(SUBDIRS))
+$(patsubst %,_sfdep_%,$(SUBDIRS)): FORCE
+ @$(MAKE) -C $(patsubst _sfdep_%, %, $@) fastdep
+
+# update modversions.h, but only if it would change
+update-modverfile:
+ @(echo "#ifndef _LINUX_MODVERSIONS_H";\
+ echo "#define _LINUX_MODVERSIONS_H"; \
+ echo "#include <linux/modsetver.h>"; \
+ cd $(TOPDIR)/include/linux/modules; \
+ for f in *.ver; do \
+ if [ -f $$f ]; then echo "#include <linux/modules/$${f}>"; fi; \
+ done; \
+ echo "#endif"; \
+ ) > $(TOPDIR)/include/linux/modversions.h.tmp
+ @if [ -r $(TOPDIR)/include/linux/modversions.h ] && cmp -s $(TOPDIR)/include/linux/modversions.h $(TOPDIR)/include/linux/modversions.h.tmp; then \
+ echo $(TOPDIR)/include/linux/modversions.h was not updated; \
+ rm -f $(TOPDIR)/include/linux/modversions.h.tmp; \
+ else \
+ echo $(TOPDIR)/include/linux/modversions.h was updated; \
+ mv -f $(TOPDIR)/include/linux/modversions.h.tmp $(TOPDIR)/include/linux/modversions.h; \
+ fi
+
# ---------------------------------------------------------------------------
# Modules
@@ -297,7 +285,7 @@
.PHONY: $(patsubst %, _mod_%, $(SUBDIRS))
$(patsubst %, _mod_%, $(SUBDIRS)) : include/linux/version.h include/config/MARKER
- @$(MAKE) -C $(patsubst _mod_%, %, $@) CFLAGS="$(CFLAGS) $(CFLAGS_MODULE)" AFLAGS="$(AFLAGS) $(AFLAGS_MODULE)" modules
+ @$(MAKE) -C $(patsubst _mod_%, %, $@) modules
# Install modules
@@ -334,7 +322,7 @@
# ---------------------------------------------------------------------------
# Modules not configured
-modules modules_install: dummy
+modules modules_install: FORCE
@echo
@echo "The present kernel configuration has modules disabled."
@echo "Type 'make config' and enable loadable module support."
@@ -344,19 +332,6 @@
endif # CONFIG_MODULES
-# ---------------------------------------------------------------------------
-
-include Rules.make
-
-# Build helpers in scripts/
-# FIXME: do that in scripts/Makefile?
-
-scripts/mkdep: scripts/mkdep.c
- $(HOSTCC) $(HOSTCFLAGS) -o scripts/mkdep scripts/mkdep.c
-
-scripts/split-include: scripts/split-include.c
- $(HOSTCC) $(HOSTCFLAGS) -o scripts/split-include scripts/split-include.c
-
# Cleaning up
# ---------------------------------------------------------------------------
@@ -481,25 +456,18 @@
# Generate tags for editors
-TAGS: dummy
+TAGS: FORCE
{ find include/asm-${ARCH} -name '*.h' -print ; \
find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print ; \
find $(SUBDIRS) init -name '*.[ch]' ; } | grep -v SCCS | etags -
# Exuberant ctags works better with -I
-tags: dummy
+tags: FORCE
CTAGSF=`ctags --version | grep -i exuberant >/dev/null && echo "-I __initdata,__exitdata,EXPORT_SYMBOL,EXPORT_SYMBOL_NOVERS"`; \
ctags $$CTAGSF `find include/asm-$(ARCH) -name '*.h'` && \
find include -type d \( -name "asm-*" -o -name config \) -prune -o -name '*.h' -print | xargs ctags $$CTAGSF -a && \
find $(SUBDIRS) init -name '*.[ch]' | xargs ctags $$CTAGSF -a
-# Targets which will only descend into one subdir, not trying
-# to link vmlinux afterwards
-# FIXME: anybody still using this?
-
-fs lib mm ipc kernel drivers net sound: dummy
- $(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" AFLAGS="$(AFLAGS) $(AFLAGS_KERNEL)" $(subst $@, _dir_$@, $@)
-
# Make a backup
# FIXME anybody still using this?
@@ -521,3 +489,4 @@
$(filter-out $(cmd_$(@F)),$(cmd_$(1)))),\
@$(rule_$(1)))
+FORCE:
|
|
From: James S. <jsi...@us...> - 2002-06-03 22:45:28
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/ia64 In directory usw-pr-cvs1:/tmp/cvs-serv23928/linux/arch/ia64 Modified Files: config.in Log Message: Synced to 2.5.19 Index: config.in =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ia64/config.in,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- config.in 6 May 2002 17:29:59 -0000 1.24 +++ config.in 3 Jun 2002 22:44:55 -0000 1.25 @@ -16,7 +16,7 @@ choice 'IA-64 processor type' \ "Itanium CONFIG_ITANIUM \ - McKinley CONFIG_MCKINLEY" Itanium + Itanium-2 CONFIG_MCKINLEY" Itanium choice 'IA-64 system type' \ "generic CONFIG_IA64_GENERIC \ @@ -26,11 +26,18 @@ SGI-SN1 CONFIG_IA64_SGI_SN1 \ SGI-SN2 CONFIG_IA64_SGI_SN2" generic -choice 'Kernel page size' \ +if [ "$CONFIG_ITANIUM" = "y" ]; then + choice 'Kernel page size' \ + "4KB CONFIG_IA64_PAGE_SIZE_4KB \ + 8KB CONFIG_IA64_PAGE_SIZE_8KB \ + 16KB CONFIG_IA64_PAGE_SIZE_16KB" 16KB +else + choice 'Kernel page size' \ "4KB CONFIG_IA64_PAGE_SIZE_4KB \ 8KB CONFIG_IA64_PAGE_SIZE_8KB \ 16KB CONFIG_IA64_PAGE_SIZE_16KB \ 64KB CONFIG_IA64_PAGE_SIZE_64KB" 16KB +fi if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then define_bool CONFIG_ACPI y |
|
From: James S. <jsi...@us...> - 2002-06-03 22:45:28
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/ia64/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv23928/linux/arch/ia64/kernel
Modified Files:
setup.c
Log Message:
Synced to 2.5.19
Index: setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ia64/kernel/setup.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- setup.c 1 May 2002 18:07:49 -0000 1.6
+++ setup.c 3 Jun 2002 22:44:55 -0000 1.7
@@ -377,7 +377,7 @@
switch (c->family) {
case 0x07: memcpy(family, "Itanium", 8); break;
- case 0x1f: memcpy(family, "Itanium 2", 9); break;
+ case 0x1f: memcpy(family, "Itanium 2", 10); break;
default: sprintf(family, "%u", c->family); break;
}
@@ -541,6 +541,20 @@
*/
identify_cpu(my_cpu_info);
+#ifdef CONFIG_MCKINLEY
+ {
+#define FEATURE_SET 16
+ struct ia64_pal_retval iprv;
+
+ if (my_cpu_info->family == 0x1f) {
+ PAL_CALL_PHYS(iprv, PAL_PROC_GET_FEATURES, 0, FEATURE_SET, 0);
+ if ((iprv.status == 0) && (iprv.v0 & 0x80) && (iprv.v2 & 0x80))
+ PAL_CALL_PHYS(iprv, PAL_PROC_SET_FEATURES,
+ (iprv.v1 | 0x80), FEATURE_SET, 0);
+ }
+ }
+#endif
+
/* Clear the stack memory reserved for pt_regs: */
memset(ia64_task_regs(current), 0, sizeof(struct pt_regs));
@@ -552,7 +566,7 @@
* shouldn't be affected by this (moral: keep your ia32 locks aligned and you'll
* be fine).
*/
- ia64_set_dcr( IA64_DCR_DM | IA64_DCR_DP | IA64_DCR_DK | IA64_DCR_DX | IA64_DCR_DR
+ ia64_set_dcr( IA64_DCR_DP | IA64_DCR_DK | IA64_DCR_DX | IA64_DCR_DR
| IA64_DCR_DA | IA64_DCR_DD | IA64_DCR_LC);
#ifndef CONFIG_SMP
ia64_set_fpu_owner(0);
|
|
From: James S. <jsi...@us...> - 2002-06-03 22:45:28
|
Update of /cvsroot/linuxconsole/ruby/linux/Documentation/DocBook In directory usw-pr-cvs1:/tmp/cvs-serv23928/linux/Documentation/DocBook Modified Files: Makefile Log Message: Synced to 2.5.19 Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/Documentation/DocBook/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- Makefile 25 May 2002 20:31:58 -0000 1.12 +++ Makefile 3 Jun 2002 22:44:55 -0000 1.13 @@ -12,17 +12,12 @@ PNG-parportbook := $(patsubst %.fig, %.png, $(IMG-parportbook)) C-procfs-example = procfs_example.sgml -$(TOPDIR)/scripts/docgen: dummy - chmod 755 $(TOPDIR)/scripts/docgen - -$(TOPDIR)/scripts/gen-all-syms: dummy - chmod 755 $(TOPDIR)/scripts/gen-all-syms - -$(TOPDIR)/scripts/kernel-doc: dummy - chmod 755 $(TOPDIR)/scripts/kernel-doc +$(TOPDIR)/scripts/docgen $(TOPDIR)/scripts/gen-all-syms \ +$(TOPDIR)/scripts/kernel-doc $(TOPDIR)/scripts/docproc: doc-progs ; -$(TOPDIR)/scripts/docproc: dummy - $(MAKE) -C $(TOPDIR)/scripts docproc +.PHONY: doc-progs +doc-progs: + @$(MAKE) -C $(TOPDIR)/scripts doc-progs $(BOOKS): $(TOPDIR)/scripts/docgen $(TOPDIR)/scripts/gen-all-syms \ $(TOPDIR)/scripts/kernel-doc $(TOPDIR)/scripts/docproc |
|
From: James S. <jsi...@us...> - 2002-06-03 22:45:28
|
Update of /cvsroot/linuxconsole/ruby/linux/arch/alpha
In directory usw-pr-cvs1:/tmp/cvs-serv23928/linux/arch/alpha
Modified Files:
config.in
Log Message:
Synced to 2.5.19
Index: config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/alpha/config.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- config.in 6 May 2002 17:29:59 -0000 1.30
+++ config.in 3 Jun 2002 22:44:55 -0000 1.31
@@ -259,7 +259,7 @@
"ELF CONFIG_KCORE_ELF \
A.OUT CONFIG_KCORE_AOUT" ELF
fi
-if [ "$CONFIG_PROC_FS" != "n" -a "$CONFIG_ALPHA_SRM" = "y" ]; then
+if [ "$CONFIG_PROC_FS" != "n" ]; then
tristate 'SRM environment through procfs' CONFIG_SRM_ENV
fi
|
|
From: James S. <jsi...@us...> - 2002-06-03 22:45:02
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv23928/linux/drivers/video
Modified Files:
Config.in Makefile anakinfb.c cfbimgblt.c fbmem.c fm2fb.c
g364fb.c hitfb.c hpfb.c pm3fb.c pm3fb.h q40fb.c skeletonfb.c
vesafb.c vfb.c
Removed Files:
hgafb.c
Log Message:
Synced to 2.5.19
Index: Config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/Config.in,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- Config.in 16 Apr 2002 17:41:51 -0000 1.61
+++ Config.in 3 Jun 2002 22:44:58 -0000 1.62
@@ -15,10 +15,6 @@
comment 'Frame-buffer support'
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- if [ "$CONFIG_PCI" = "y" ]; then
- tristate ' nVidia Riva support (EXPERIMENTAL)' CONFIG_FB_RIVA
- tristate ' Permedia3 support (EXPERIMENTAL)' CONFIG_FB_PM3
- fi
if [ "$CONFIG_AMIGA" = "y" -o "$CONFIG_PCI" = "y" ]; then
tristate ' Cirrus Logic support (EXPERIMENTAL)' CONFIG_FB_CLGEN
tristate ' Permedia2 support (EXPERIMENTAL)' CONFIG_FB_PM2
@@ -142,6 +138,7 @@
fi
fi
if [ "$CONFIG_PCI" != "n" ]; then
+ tristate ' nVidia Riva support (EXPERIMENTAL)' CONFIG_FB_RIVA
tristate ' Matrox acceleration (EXPERIMENTAL)' CONFIG_FB_MATROX
if [ "$CONFIG_FB_MATROX" != "n" ]; then
bool ' Millennium I/II support' CONFIG_FB_MATROX_MILLENIUM
@@ -168,6 +165,7 @@
tristate ' 3Dfx Banshee/Voodoo3 display support (EXPERIMENTAL)' CONFIG_FB_3DFX
tristate ' 3Dfx Voodoo Graphics (sst1) support (EXPERIMENTAL)' CONFIG_FB_VOODOO1
fi
+ tristate ' Permedia3 support (EXPERIMENTAL)' CONFIG_FB_PM3
dep_tristate ' SIS acceleration (EXPERIMENTAL)' CONFIG_FB_SIS $CONFIG_EXPERIMENTAL
if [ "$CONFIG_FB_SIS" != "n" ]; then
bool ' SIS 630/540/730 support' CONFIG_FB_SIS_300
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/Makefile,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- Makefile 25 May 2002 20:32:03 -0000 1.47
+++ Makefile 3 Jun 2002 22:44:58 -0000 1.48
@@ -40,8 +40,8 @@
obj-$(CONFIG_FB_AMIGA) += amifb.o
obj-$(CONFIG_FB_PM2) += pm2fb.o
obj-$(CONFIG_FB_PM3) += pm3fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
-obj-$(CONFIG_FB_APOLLO) += dnfb.o
-obj-$(CONFIG_FB_Q40) += q40fb.o
+obj-$(CONFIG_FB_APOLLO) += dnfb.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_ATY128) += aty128fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
obj-$(CONFIG_FB_RADEON) += radeonfb.o
@@ -50,13 +50,13 @@
obj-$(CONFIG_FB_PLATINUM) += platinumfb.o
obj-$(CONFIG_FB_VALKYRIE) += valkyriefb.o
obj-$(CONFIG_FB_CT65550) += chipsfb.o
-obj-$(CONFIG_FB_ANAKIN) += anakinfb.o
-obj-$(CONFIG_FB_CLPS711X) += clps711xfb.o
-obj-$(CONFIG_FB_CYBER) += cyberfb.o
+obj-$(CONFIG_FB_ANAKIN) += anakinfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
+obj-$(CONFIG_FB_CLPS711X) += clps711xfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
+obj-$(CONFIG_FB_CYBER) += cyberfb.o
obj-$(CONFIG_FB_CYBER2000) += cyber2000fb.o
obj-$(CONFIG_FB_SGIVW) += sgivwfb.o
obj-$(CONFIG_FB_MAC) += macfb.o macmodes.o
-obj-$(CONFIG_FB_HP300) += hpfb.o
+obj-$(CONFIG_FB_HP300) += hpfb.o cfbfillrect.o cfbimgblt.o
obj-$(CONFIG_FB_OF) += offb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
obj-$(CONFIG_FB_IMSTT) += imsttfb.o
obj-$(CONFIG_FB_RETINAZ3) += retz3fb.o
@@ -66,8 +66,8 @@
obj-$(CONFIG_FB_VESA) += vesafb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
obj-$(CONFIG_FB_VGA16) += vga16fb.o vga.o
obj-$(CONFIG_FB_VIRGE) += virgefb.o
-obj-$(CONFIG_FB_G364) += g364fb.o
-obj-$(CONFIG_FB_FM2) += fm2fb.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_CREATOR) += creatorfb.o sbusfb.o
obj-$(CONFIG_FB_CGSIX) += cgsixfb.o sbusfb.o
obj-$(CONFIG_FB_BWTWO) += bwtwofb.o sbusfb.o
@@ -77,9 +77,9 @@
obj-$(CONFIG_FB_P9100) += p9100fb.o sbusfb.o
obj-$(CONFIG_FB_LEO) += leofb.o sbusfb.o
obj-$(CONFIG_FB_STI) += stifb.o sticore.o
-obj-$(CONFIG_FB_PMAG_BA) += pmag-ba-fb.o
-obj-$(CONFIG_FB_PMAGB_B) += pmagb-b-fb.o
-obj-$(CONFIG_FB_MAXINE) += maxinefb.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_MAXINE) += maxinefb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
obj-$(CONFIG_FB_TX3912) += tx3912fb.o
obj-$(CONFIG_FB_MATROX) += matrox/
@@ -97,7 +97,7 @@
obj-$(CONFIG_FB_E1355) += epson1355fb.o
obj-$(CONFIG_FB_PVR2) += pvr2fb.o
obj-$(CONFIG_FB_VOODOO1) += sstfb.o
-obj-$(CONFIG_FB_ANAKIN) += anakinfb.o
+obj-$(CONFIG_FB_ANAKIN) += anakinfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
obj-$(CONFIG_FB_SIMPLE) += sfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
obj-$(CONFIG_FB_SED1345) += sed1345fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
obj-$(CONFIG_FB_R3912) += r3912fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
Index: anakinfb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/anakinfb.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- anakinfb.c 24 Apr 2002 18:56:51 -0000 1.2
+++ anakinfb.c 3 Jun 2002 22:44:58 -0000 1.3
@@ -20,7 +20,7 @@
#include <asm/io.h>
-static u16 colreg[16];
+static u32 colreg[16];
static struct fb_info fb_info;
static struct fb_var_screeninfo anakinfb_var = {
@@ -73,20 +73,21 @@
{
memset(&fb_info, 0, sizeof(struct fb_info));
- fb_info.node = -1;
+ fb_info.node = NODEV;
fb_info.flags = FBINFO_FLAG_DEFAULT;
fb_info.fbops = &anakinfb_ops;
fb_info.var = anakinfb_var;
fb_info.fix = anakinfb_fix;
-
+
if (!(request_mem_region(VGA_START, VGA_SIZE, "vga")))
return -ENOMEM;
- if (!(fb_info.screen_base = ioremap(VGA_START, VGA_SIZE))) {
+ if (fb_info.screen_base = ioremap(VGA_START, VGA_SIZE)) {
release_mem_region(VGA_START, VGA_SIZE);
return -EIO;
}
+
if (register_framebuffer(&fb_info) < 0) {
- iounmap(fb_info.screen_base);
+ iounmap(display.screen_base);
release_mem_region(VGA_START, VGA_SIZE);
return -EINVAL;
}
Index: cfbimgblt.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/cfbimgblt.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- cfbimgblt.c 25 May 2002 20:32:03 -0000 1.13
+++ cfbimgblt.c 3 Jun 2002 22:44:58 -0000 1.14
@@ -46,7 +46,7 @@
int pad, ppw, shift, shift_right, shift_left, x2, y2, n, i, j, k, l = 7;
unsigned long tmp = ~0 << (BITS_PER_LONG - p->var.bits_per_pixel);
unsigned long fgx, bgx, fgcolor, bgcolor, eorx;
- unsigned long end_index, end_mask, mask;
+ unsigned long end_index, end_mask;
unsigned long *dst = NULL;
u8 *dst1, *src;
@@ -89,24 +89,45 @@
eorx = fgx ^ bgx;
n = ((image->width + 7) >> 3);
pad = (n << 3) - image->width;
+ n = image->width % ppw;
for (i = 0; i < image->height; i++) {
dst = (unsigned long *) dst1;
for (j = image->width/ppw; j > 0; j--) {
- mask = 0;
+ end_mask = 0;
for (k = ppw; k > 0; k--) {
if (test_bit(l, src))
- mask |= (tmp >> (p->var.bits_per_pixel*(k-1)));
+ end_mask |= (tmp >> (p->var.bits_per_pixel*(k-1)));
l--;
if (l < 0) { l = 7; src++; }
}
- fb_writel((mask & eorx)^bgx, dst);
+ fb_writel((end_mask & eorx)^bgx, dst);
+ dst++;
+ }
+
+ if (n) {
+ for (j = n; j > 0; j--) {
+ end_mask = 0;
+
+ if (test_bit(l, src))
+ end_mask |= (tmp >> (p->var.bits_per_pixel*(k-1)));
+ l--;
+ if (l < 0) { l = 7; src++; }
+ }
+ fb_writel((end_mask & eorx)^bgx, dst);
dst++;
}
l -= pad;
dst1 += p->fix.line_length;
}
+ } else {
+ /* Draw the penguin */
+ n = ((image->width * p->var.bits_per_pixel) >> 3);
+ //shift = ((unsigned long) dst1 & (bpl -1));
+ end_mask = 0;
+
+ // n = n/bpl;
}
}
Index: fbmem.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/fbmem.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- fbmem.c 6 May 2002 17:29:59 -0000 1.63
+++ fbmem.c 3 Jun 2002 22:44:58 -0000 1.64
@@ -130,10 +130,15 @@
extern int rivafb_setup(char*);
extern int tdfxfb_init(void);
extern int tdfxfb_setup(char*);
+extern int tridentfb_init(void);
+extern int tridentfb_setup(char*);
extern int sisfb_init(void);
extern int sisfb_setup(char*);
extern int stifb_init(void);
extern int stifb_setup(char*);
+extern int pmagbafb_init(void);
+extern int pmagbbfb_init(void);
+extern void maxinefb_init(void);
extern int tx3912fb_init(void);
extern int radeonfb_init(void);
extern int radeonfb_setup(char*);
@@ -240,6 +245,9 @@
#ifdef CONFIG_FB_SIS
{ "sisfb", sisfb_init, sisfb_setup },
#endif
+#ifdef CONFIG_FB_TRIDENT
+ { "trident", tridentfb_init, tridentfb_setup },
+#endif
/*
* Generic drivers that are used as fallbacks
@@ -308,8 +316,8 @@
#ifdef CONFIG_FB_HIT
{ "hitfb", hitfb_init, NULL },
#endif
-#ifdef CONFIG_FB_ANAKIN
- { "anakinfb", anakinfb_init, NULL },
+#ifdef CONFIG_FB_TX3912
+ { "tx3912", tx3912fb_init, NULL },
#endif
#ifdef CONFIG_FB_E1355
{ "e1355fb", e1355fb_init, e1355fb_setup },
@@ -317,6 +325,18 @@
#ifdef CONFIG_FB_PVR2
{ "pvr2", pvr2fb_init, pvr2fb_setup },
#endif
+#ifdef CONFIG_FB_PMAG_BA
+ { "pmagbafb", pmagbafb_init, NULL },
+#endif
+#ifdef CONFIG_FB_PMAGB_B
+ { "pmagbbfb", pmagbbfb_init, NULL },
+#endif
+#ifdef CONFIG_FB_MAXINE
+ { "maxinefb", maxinefb_init, NULL },
+#endif
+#ifdef CONFIG_FB_VOODOO1
+ { "sst", sstfb_init, sstfb_setup },
+#endif
#ifdef CONFIG_FB_SED1345
{ "sed1345fb", sed1345fb_init, NULL },
#endif
@@ -328,9 +348,6 @@
#endif
#ifdef CONFIG_FB_VR4181
{ "vr4181fb", vr4181fb_init, NULL },
-#endif
-#ifdef CONFIG_FB_TX3912
- { "tx3912", tx3912fb_init, NULL },
#endif
/*
Index: fm2fb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/fm2fb.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- fm2fb.c 27 Mar 2002 20:58:09 -0000 1.10
+++ fm2fb.c 3 Jun 2002 22:44:58 -0000 1.11
@@ -127,8 +127,6 @@
static volatile unsigned char *fm2fb_reg;
-#define arraysize(x) (sizeof(x)/sizeof(*(x)))
-
static struct fb_info fb_info;
static u32 pseudo_palette[17];
@@ -257,7 +255,6 @@
if (fm2fb_mode == -1)
fm2fb_mode = FM2FB_MODE_PAL;
- strcpy(fb_info.modename, fb_fix.id);
fb_info.node = NODEV;
fb_info.fbops = &fm2fb_ops;
fb_info.var = fb_var_modes[fm2fb_mode];
@@ -265,8 +262,6 @@
fb_info.pseudo_palette = pseudo_palette;
fb_info.fix = fb_fix;
fb_info.flags = FBINFO_FLAG_DEFAULT;
-
- fb_alloc_cmap(&fb_info.cmap, 16, 0);
if (register_framebuffer(&fb_info) < 0)
return -EINVAL;
Index: g364fb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/g364fb.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- g364fb.c 21 May 2002 04:06:06 -0000 1.7
+++ g364fb.c 3 Jun 2002 22:44:58 -0000 1.8
@@ -36,9 +36,9 @@
*/
#define G364_MEM_BASE 0xe4400000
#define G364_PORT_BASE 0xe4000000
-#define ID_REG 0xe4000000 /* Read only */
+#define ID_REG 0xe4000000 /* Read only */
#define BOOT_REG 0xe4080000
-#define TIMING_REG 0xe4080108 /* to 0x080170 - DON'T TOUCH! */
+#define TIMING_REG 0xe4080108 /* to 0x080170 - DON'T TOUCH! */
#define DISPLAY_REG 0xe4080118
#define VDISPLAY_REG 0xe4080150
#define MASK_REG 0xe4080200
@@ -62,15 +62,15 @@
#define OP_MODE 0x000008
#define INTL_STAND 0x000004
#define SCRN_FORM 0x000002
-#define ENABLE_VTG 0x000001
+#define ENABLE_VTG 0x000001
#define TOP_REG 0xe4080400
-#define CURS_PAL_REG 0xe4080508 /* to 0x080518 */
-#define CHKSUM_REG 0xe4080600 /* to 0x080610 - unused */
+#define CURS_PAL_REG 0xe4080508 /* to 0x080518 */
+#define CHKSUM_REG 0xe4080600 /* to 0x080610 - unused */
#define CURS_POS_REG 0xe4080638
#define CLR_PAL_REG 0xe4080800 /* to 0x080ff8 */
#define CURS_PAT_REG 0xe4081000 /* to 0x081ff8 */
-#define MON_ID_REG 0xe4100000 /* unused */
-#define RESET_REG 0xe4180000 /* Write only */
+#define MON_ID_REG 0xe4100000 /* unused */
+#define RESET_REG 0xe4180000 /* Write only */
static struct fb_info fb_info;
@@ -84,21 +84,21 @@
};
static struct fb_var_screeninfo fb_var __initdata = {
- bits_per_pixel: 8,
- red: {0, 8, 0},
- green: {0, 8, 0},
- blue: {0, 8, 0},
- activate: FB_ACTIVATE_NOW,
- height: -1,
- width: -1,
- pixclock: 39722,
- left_margin: 40,
- right_margin: 24,
- upper_margin: 32,
- lower_margin: 11,
- hsync_len: 96,
- vsync_len: 2,
- vmode: FB_VMODE_NONINTERLACED,
+ bits_per_pixel: 8,
+ red: { 0, 8, 0 },
+ green: { 0, 8, 0 },
+ blue: { 0, 8, 0 },
+ activate: FB_ACTIVATE_NOW,
+ height: -1,
+ width: -1,
+ pixclock: 39722,
+ left_margin: 40,
+ right_margin: 24,
+ upper_margin: 32,
+ lower_margin: 11,
+ hsync_len: 96,
+ vsync_len: 2,
+ vmode: FB_VMODE_NONINTERLACED,
};
/*
@@ -108,13 +108,13 @@
static int g364fb_pan_display(struct fb_var_screeninfo *var, int con,
struct fb_info *info);
-static int g364fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
- u_int transp, struct fb_info *info);
+static int g364fb_setcolreg(u_int regno, u_int red, u_int green,
+ u_int blue, u_int transp,
+ struct fb_info *info);
static int g364fb_blank(int blank, struct fb_info *info);
static struct fb_ops g364fb_ops = {
owner: THIS_MODULE,
- //fb_cursor: g364fb_cursor,
fb_setcolreg: g364fb_setcolreg,
fb_pan_display: g364fb_pan_display,
fb_blank: g364fb_blank,
@@ -123,27 +123,37 @@
fb_imageblit: cfb_imageblit,
};
-void g364fb_cursor(struct fb_info *info, struct fb_cursor *cursor)
+/*
+void fbcon_g364fb_cursor(struct display *p, int mode, int x, int y)
{
- if (info->cursor.enable) {
- *(unsigned int *) CTLA_REG &= ~CURS_TOGGLE;
- *(unsigned int *) CURS_POS_REG = ((x * fontwidth(p)) << 12) | ((y * fontheight(p))-p->var.yoffset);
- } else
+ switch (mode) {
+ case CM_ERASE:
*(unsigned int *) CTLA_REG |= CURS_TOGGLE;
+ break;
+
+ case CM_MOVE:
+ case CM_DRAW:
+ *(unsigned int *) CTLA_REG &= ~CURS_TOGGLE;
+ *(unsigned int *) CURS_POS_REG =
+ ((x * fontwidth(p)) << 12) | ((y * fontheight(p)) -
+ p->var.yoffset);
+ break;
+ }
}
+*/
/*
* Pan or Wrap the Display
*
* This call looks only at xoffset, yoffset and the FB_VMODE_YWRAP flag
*/
-static int g364fb_pan_display(struct fb_var_screeninfo *var, int con,
+static int g364fb_pan_display(struct fb_var_screeninfo *var,
struct fb_info *info)
{
- if (var->xoffset || var->yoffset+var->yres > var->yres_virtual)
+ if (var->xoffset || var->yoffset + var->yres > var->yres_virtual)
return -EINVAL;
-
- *(unsigned int *)TOP_REG = var->yoffset * var->xres;
+
+ *(unsigned int *) TOP_REG = var->yoffset * var->xres;
return 0;
}
@@ -153,17 +163,17 @@
static int g364fb_blank(int blank, struct fb_info *info)
{
if (blank)
- *(unsigned int *) CTLA_REG |= FORCE_BLANK;
+ *(unsigned int *) CTLA_REG |= FORCE_BLANK;
else
- *(unsigned int *) CTLA_REG &= ~FORCE_BLANK;
- return 0;
+ *(unsigned int *) CTLA_REG &= ~FORCE_BLANK;
+ return 0;
}
/*
* Set a single color register. Return != 0 for invalid regno.
*/
-static int g364fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
- u_int transp, struct fb_info *info)
+static int g364fb_setcolreg(u_int regno, u_int red, u_int green,
+ u_int blue, u_int transp, struct fb_info *info)
{
volatile unsigned int *ptr = (volatile unsigned int *) CLR_PAL_REG;
@@ -172,9 +182,10 @@
red >>= 8;
green >>= 8;
- blue >>=8;
-
+ blue >>= 8;
+
ptr[regno << 1] = (red << 16) | (green << 8) | blue;
+
return 0;
}
@@ -183,17 +194,21 @@
*/
int __init g364fb_init(void)
{
- volatile unsigned int *curs_pal_ptr = (volatile unsigned int *) CURS_PAL_REG;
- volatile unsigned int *pal_ptr = (volatile unsigned int *) CLR_PAL_REG;
+ volatile unsigned int *pal_ptr =
+ (volatile unsigned int *) CLR_PAL_REG;
+ volatile unsigned int *curs_pal_ptr =
+ (volatile unsigned int *) CURS_PAL_REG;
int mem, i, j;
/* TBD: G364 detection */
-
+
/* get the resolution set by ARC console */
- *(volatile unsigned int *)CTLA_REG &= ~ENABLE_VTG;
- fb_var.xres = (*((volatile unsigned int*)DISPLAY_REG) & 0x00ffffff) * 4;
- fb_var.yres = (*((volatile unsigned int*)VDISPLAY_REG) & 0x00ffffff)/2;
- *(volatile unsigned int *)CTLA_REG |= ENABLE_VTG;
+ *(volatile unsigned int *) CTLA_REG &= ~ENABLE_VTG;
+ fb_var.xres =
+ (*((volatile unsigned int *) DISPLAY_REG) & 0x00ffffff) * 4;
+ fb_var.yres =
+ (*((volatile unsigned int *) VDISPLAY_REG) & 0x00ffffff) / 2;
+ *(volatile unsigned int *) CTLA_REG |= ENABLE_VTG;
/* setup cursor */
curs_pal_ptr[0] |= 0x00ffffff;
@@ -201,46 +216,37 @@
curs_pal_ptr[4] |= 0x00ffffff;
/*
- * first set the whole cursor to transparent
- */
+ * first set the whole cursor to transparent
+ */
for (i = 0; i < 512; i++)
- *(unsigned short *)(CURS_PAT_REG+i*8) = 0;
+ *(unsigned short *) (CURS_PAT_REG + i * 8) = 0;
/*
* switch the last two lines to cursor palette 3
* we assume here, that FONTSIZE_X is 8
*/
- *(unsigned short *)(CURS_PAT_REG + 14*64) = 0xffff;
- *(unsigned short *)(CURS_PAT_REG + 15*64) = 0xffff;
+ *(unsigned short *) (CURS_PAT_REG + 14 * 64) = 0xffff;
+ *(unsigned short *) (CURS_PAT_REG + 15 * 64) = 0xffff;
fb_var.xres_virtual = fbvar.xres;
- fb_fix.line_length = (fb_var.xres / 8) * fb_var.bits_per_pixel;
+ fb_fix.line_length = (xres / 8) * fb_var.bits_per_pixel;
+ fb_fix.smem_start = 0x40000000; /* physical address */
/* get size of video memory; this is special for the JAZZ hardware */
mem = (r4030_read_reg32(JAZZ_R4030_CONFIG) >> 8) & 3;
- fb_fix.smem_len = (1 << (mem*2)) * 512 * 1024;
+ fb_fix.smem_len = (1 << (mem * 2)) * 512 * 1024;
fb_var.yres_virtual = fb_fix.smem_len / fb_var.xres;
- strcpy(fb_info.modename, fb_fix.id);
fb_info.node = NODEV;
- fb_info.screen_base = (char *)G364_MEM_BASE;/* virtual kernel address */
fb_info.fbops = &g364fb_ops;
- fb_info.currcon = -1;
+ fb_info.screen_base = (char *) G364_MEM_BASE; /* virtual kernel address */
fb_info.var = fb_var;
- fb_info.fix = fb_fix;
- fb_info.disp = &disp;
- fb_info.fontname[0] = '\0';
- fb_info.changevar = NULL;
- fb_info.switch_con = gen_switch;
- fb_info.updatevar = gen_update_var;
+ fb_info.fix = fb_fix;
fb_info.flags = FBINFO_FLAG_DEFAULT;
- fb_alloc_cmap(&fb_info.cmap, 255, 0);
- gen_set_disp(-1, &fb_info);
-
if (register_framebuffer(&fb_info) < 0)
return -EINVAL;
printk("fb%d: %s frame buffer device\n", GET_FB_IDX(fb_info.node),
- fb_info.fix.id);
+ fb_info.fix.id);
return 0;
}
Index: hitfb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/hitfb.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- hitfb.c 27 Mar 2002 20:58:09 -0000 1.7
+++ hitfb.c 3 Jun 2002 22:44:58 -0000 1.8
@@ -162,11 +162,6 @@
fb_info.flags = FBINFO_FLAG_DEFAULT;
fb_info.screen_base = (void *) hitfb_fix.smem_start;
- size = (fb_info.var.bits_per_pixel == 8) ? 256 : 16;
- fb_alloc_cmap(&fb_info.cmap, size, 0);
-
- gen_get_var(&fb_info.var, -1, &fb_info);
-
if (register_framebuffer(&fb_info) < 0)
return -EINVAL;
Index: hpfb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/hpfb.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- hpfb.c 27 Mar 2002 20:58:09 -0000 1.10
+++ hpfb.c 3 Jun 2002 22:44:58 -0000 1.11
@@ -156,8 +156,6 @@
fb_info.fix = hpfb_fix;
fb_info.screen_base = hpfb_fix.smem_start;
- fb_alloc_cmap(&fb_info.cmap, 256, 0);
-
if (register_framebuffer(&fb_info) < 0)
return 1;
return 0;
Index: pm3fb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/pm3fb.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- pm3fb.c 29 Oct 2001 22:58:43 -0000 1.21
+++ pm3fb.c 3 Jun 2002 22:44:58 -0000 1.22
@@ -5,9 +5,9 @@
* Based on code written by:
* Sven Luther, <lu...@dp...>
* Alan Hourihane, <al...@fa...>
+ * Russel King, <rm...@ar...>
* Based on linux/drivers/video/skeletonfb.c:
* Copyright (C) 1997 Geert Uytterhoeven
- * Copyright (C) 2001 James Simmons
* Based on linux/driver/video/pm2fb.c:
* Copyright (C) 1998-1999 Ilario Nardinocchi (nar...@CS...)
* Copyright (C) 1999 Jakub Jelinek (ja...@re...)
@@ -17,29 +17,108 @@
[...4150 lines suppressed...]
fb_size);
release_mem_region(l_fb_info->
pIOBase,
PM3_REGS_SIZE);
+#endif /* KERNEL_2_4 or KERNEL_2_5 */
}
- unregister_framebuffer(l_fb_info->current_par->f_fb_info);
+ unregister_framebuffer(&l_fb_info->gen.
+ info);
}
}
}
return;
}
-module_init(pm3fb_init_module);
-module_exit(pm3fb_cleanup_module);
-
-MODULE_LICENSE("GPL");
-
#endif /* MODULE */
Index: pm3fb.h
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/pm3fb.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pm3fb.h 28 Aug 2001 08:34:23 -0000 1.2
+++ pm3fb.h 3 Jun 2002 22:44:58 -0000 1.3
@@ -92,6 +92,7 @@
#define PM3MemBypassWriteMask 0x1008
#define PM3MemScratch 0x1010
#define PM3LocalMemCaps 0x1018
+ #define PM3LocalMemCaps_NoWriteMask (1 << 28)
#define PM3LocalMemTimings 0x1020
#define PM3LocalMemControl 0x1028
#define PM3LocalMemRefresh 0x1030
@@ -1118,10 +1119,41 @@
/* ***** pm3fb useful define and macro ***** */
/* ***************************************** */
+/* kernel -specific definitions */
+/* what kernel is this ? */
+#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)))
+#define KERNEL_2_5
+#endif
+
+#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)))
+#define KERNEL_2_4
+#endif
+
+#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)))
+#define KERNEL_2_2
+/* pci_resource_start, available in 2.2.18 */
+#include <linux/kcomp.h>
+#ifdef CONFIG_FB_OF
+#define SUPPORT_FB_OF
+#endif
+#endif
+
+#if (!defined(KERNEL_2_2)) && (!defined(KERNEL_2_4)) && (!defined(KERNEL_2_5))
+#error "Only kernel 2.2.x, kernel 2.4.y and kernel 2.5.z might work"
+#endif
+
+/* not sure if/why it's needed. doesn't work without on my PowerMac... */
+#ifdef __BIG_ENDIAN
+#define MUST_BYTESWAP
+#endif
+
+/* for compatibility between 2.5, 2.4 and 2.2 */
+#ifndef B_FREE
+#define B_FREE -1
+#endif
+
/* permedia3 -specific definitions */
#define PM3_SCALE_TO_CLOCK(pr, fe, po) ((2 * PM3_REF_CLOCK * fe) / (pr * (1 << (po))))
-#define PICOS2KHZ(a) (1000000000UL/(a))
-#define KHZ2PICOS(a) (1000000000UL/(a))
/* in case it's not in linux/pci.h */
#ifndef PCI_DEVICE_ID_3DLABS_PERMEDIA3
@@ -1176,9 +1208,20 @@
/* ******************************************** */
/* ***** A bunch of register-access macro ***** */
/* ******************************************** */
-/* we're in 2.4.x or more */
+#ifdef KERNEL_2_2
+#ifdef MUST_BYTESWAP /* we are writing big_endian to big_endian through a little_endian macro */
+#define PM3_READ_REG(r) __swab32(readl((l_fb_info->vIOBase + r)))
+#define PM3_WRITE_REG(r, v) writel(__swab32(v), (l_fb_info->vIOBase + r))
+#else /* MUST_BYTESWAP */
+#define PM3_WRITE_REG(r, v) writel(v, (l_fb_info->vIOBase + r))
+#define PM3_READ_REG(r) readl((l_fb_info->vIOBase + r))
+#endif /* MUST_BYTESWAP */
+#endif /* KERNEL_2_2 */
+#if (defined KERNEL_2_4) || (defined KERNEL_2_5) /* native-endian access */
#define PM3_WRITE_REG(r, v) fb_writel(v, (l_fb_info->vIOBase + r))
#define PM3_READ_REG(r) fb_readl((l_fb_info->vIOBase + r))
+#endif /* KERNEL_2_4 or KERNEL_2_5 */
+
#define depth2bpp(d) ((d + 7L) & ~7L)
#define depth2ByPP(d) (depth2bpp(d) / 8)
Index: q40fb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/q40fb.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- q40fb.c 27 Mar 2002 20:58:09 -0000 1.8
+++ q40fb.c 3 Jun 2002 22:44:58 -0000 1.9
@@ -30,7 +30,7 @@
#define Q40_PHYS_SCREEN_ADDR 0xFE800000
-static u16 pseudo_palette[17];
+static u32 pseudo_palette[17];
static struct fb_info fb_info;
static struct fb_fix_screeninfo q40fb_fix __initdata = {
@@ -82,9 +82,9 @@
* Return != 0 for invalid regno.
*/
- red>>=11;
- green>>=11;
- blue>>=10;
+ red >>=11;
+ green >>=11;
+ blue >>=10;
if (regno < 16) {
info->pseudo_palette[regno] = ((red & 31) <<6) |
@@ -110,8 +110,6 @@
fb_info.pseudo_palette = pseudo_palette;
fb_info.screen_base = (char *) q40fb_fix.smem_start;
- fb_alloc_cmap(&fb_info.cmap, 16, 0);
-
master_outb(3, DISPLAY_CONTROL_REG);
if (register_framebuffer(&fb_info) < 0) {
Index: skeletonfb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/skeletonfb.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- skeletonfb.c 14 Feb 2002 20:27:28 -0000 1.16
+++ skeletonfb.c 3 Jun 2002 22:44:58 -0000 1.17
@@ -80,8 +80,13 @@
* to get a fb_var_screeninfo. Otherwise define a default var as well.
*/
static struct fb_fix_screeninfo xxxfb_fix __initdata = {
- "FB's name", (unsigned long) NULL, 0, FB_TYPE_PACKED_PIXELS, 0,
- FB_VISUAL_PSEUDOCOLOR, 1, 1, 1, 0, (unsigned long) NULL, 0, FB_ACCEL_NONE
+ id: "FB's name",
+ type: FB_TYPE_PACKED_PIXELS,
+ visual: FB_VISUAL_PSEUDOCOLOR,
+ xpanstep: 1,
+ ypanstep: 1,
+ ywrapstep: 1,
+ accel: FB_ACCEL_NONE,
};
/*
@@ -120,9 +125,6 @@
*/
static struct xxx_par __initdata current_par;
- /* To go away in the near future */
-static struct display disp;
-
int xxxfb_init(void);
int xxxfb_setup(char*);
@@ -164,10 +166,11 @@
* xxxfb_check_var is always called before xxxfb_set_par to ensure this.
*
*/
-static void xxxfb_set_par(struct fb_info *info)
+static int xxxfb_set_par(struct fb_info *info)
{
struct xxx_par *par = (struct xxx_par *) info->par;
/* ... */
+ return 0;
}
/**
@@ -399,7 +402,7 @@
int __init xxxfb_init(void)
{
- int retval;
+ int cmap_len, retval;
/*
* Here we set the screen_base to the vitrual memory address
@@ -408,12 +411,17 @@
* space via ioremap. Consult ioport.h.
*/
info.screen_base = framebuffer_virtual_memory;
- info.node = -1;
+ info.node = NODEV;
info.fbops = &xxxfb_ops;
info.fix = xxxfb_fix;
- info.par = current_par;
+ info.pseudo_palette = pseudo_palette;
info.flags = FBINFO_FLAG_DEFAULT;
- /* This should give a reasonable default video mode */
+ info.par = current_par;
+
+ /*
+ * This should give a reasonable default video mode. The following is
+ * done when we can set a video mode.
+ */
if (!mode_option)
mode_option = "640x480@60";
@@ -422,7 +430,11 @@
if (!retval || retval == 4)
return -EINVAL;
- info.cmap = fb_default_cmap(1<<info.var.bits_per_pixel);
+ /*
+ * The following is done in the case of having hardware with a static
+ * mode. If we are setting the mode ourselves we don't call this.
+ */
+ info.var = xxxfb_var;
if (register_framebuffer(&info) < 0)
return -EINVAL;
@@ -483,11 +495,11 @@
fb_open: xxxfb_open, /* only if you need it to do something */
fb_release: xxxfb_release, /* only if you need it to do something */
/* Stuff to go away. Use generic functions for now */
- fb_get_fix: fbgen_get_fix,
- fb_get_var: fbgen_get_var,
- fb_set_var: fbgen_set_var,
- fb_get_cmap: fbgen_get_cmap,
- fb_set_cmap: fbgen_set_cmap,
+ fb_get_fix: gen_get_fix,
+ fb_get_var: gen_get_var,
+ fb_set_var: gen_set_var,
+ fb_get_cmap: gen_get_cmap,
+ fb_set_cmap: gen_set_cmap,
fb_check_var: xxxfb_check_var,
fb_set_par: xxxfb_set_par, /* optional */
Index: vesafb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/vesafb.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- vesafb.c 23 Mar 2002 00:22:58 -0000 1.21
+++ vesafb.c 3 Jun 2002 22:44:58 -0000 1.22
@@ -195,6 +195,8 @@
pmi_setpal=0;
else if (! strcmp(this_opt, "pmipal"))
pmi_setpal=1;
+ else if (! strcmp(this_opt, "mtrr"))
+ mtrr=1;
}
return 0;
}
@@ -344,13 +346,11 @@
fb_info.pseudo_palette = pseudo_palette;
fb_info.flags = FBINFO_FLAG_DEFAULT;
- fb_alloc_cmap(&fb_info.cmap, video_cmap_len, 0);
-
if (register_framebuffer(&fb_info)<0)
return -EINVAL;
printk(KERN_INFO "fb%d: %s frame buffer device\n",
- minor(fb_info.node), fb_info.fix.id);
+ GET_FB_IDX(fb_info.node), fb_info.fix.id);
return 0;
}
Index: vfb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/vfb.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- vfb.c 22 May 2002 19:52:57 -0000 1.33
+++ vfb.c 3 Jun 2002 22:44:58 -0000 1.34
@@ -24,8 +24,6 @@
#include <linux/fb.h>
#include <linux/init.h>
-#include <linux/fbcon.h>
-
/*
* RAM we reserve for the frame buffer. This defines the maximum screen
* size
@@ -334,7 +332,7 @@
case 8:
break;
case 16:
- ((u16 *) (info->pseudo_palette))[regno] = v;
+ ((u32 *) (info->pseudo_palette))[regno] = v;
break;
case 24:
case 32:
@@ -428,7 +426,7 @@
memset(videomemory, 0, videomemorysize);
fb_info.screen_base = videomemory;
- fb_info.node = -1;
+ fb_info.node = NODEV;
fb_info.fbops = &vfb_ops;
retval = fb_find_mode(&fb_info.var, &fb_info, mode_option,
--- hgafb.c DELETED ---
|
|
From: James S. <jsi...@us...> - 2002-06-03 22:45:01
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/input/keyboard In directory usw-pr-cvs1:/tmp/cvs-serv23928/linux/drivers/input/keyboard Modified Files: Makefile Log Message: Synced to 2.5.19 Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/keyboard/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Makefile 13 Feb 2002 17:33:44 -0000 1.4 +++ Makefile 3 Jun 2002 22:44:57 -0000 1.5 @@ -2,10 +2,6 @@ # Makefile for the input core drivers. # -# The target object and module list name. - -O_TARGET := keybdrv.o - # Each configuration option enables a list of files. obj-$(CONFIG_KEYBOARD_ATKBD) += atkbd.o |
|
From: James S. <jsi...@us...> - 2002-06-03 22:45:01
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/sbus/char In directory usw-pr-cvs1:/tmp/cvs-serv23928/linux/drivers/sbus/char Modified Files: Makefile Log Message: Synced to 2.5.19 Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/sbus/char/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Makefile 24 Apr 2002 18:56:51 -0000 1.10 +++ Makefile 3 Jun 2002 22:44:57 -0000 1.11 @@ -7,8 +7,6 @@ # Rewritten to use lists instead of if-statements. # -O_TARGET := sunchar.o - export-objs := su.o bbc_i2c.o obj-y := sunserial.o zs.o |
|
From: James S. <jsi...@us...> - 2002-06-03 22:45:01
|
Update of /cvsroot/linuxconsole/ruby/linux/include/video In directory usw-pr-cvs1:/tmp/cvs-serv23928/linux/include/video Modified Files: tdfx.h Log Message: Synced to 2.5.19 Index: tdfx.h =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/include/video/tdfx.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- tdfx.h 19 Jun 2001 20:09:57 -0000 1.5 +++ tdfx.h 3 Jun 2002 22:44:58 -0000 1.6 @@ -184,6 +184,7 @@ spinlock_t DAClock; }; + #endif /* __KERNEL__ */ #endif /* _TDFX_H */ |
|
From: James S. <jsi...@us...> - 2002-06-03 22:45:01
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/usb/input In directory usw-pr-cvs1:/tmp/cvs-serv23928/linux/drivers/usb/input Modified Files: Makefile Log Message: Synced to 2.5.19 Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/usb/input/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 26 Apr 2002 17:23:40 -0000 1.3 +++ Makefile 3 Jun 2002 22:44:58 -0000 1.4 @@ -2,8 +2,6 @@ # Makefile for the USB input drivers # -O_TARGET := input.o - # Multipart objects. hid-objs := hid-core.o |
|
From: James S. <jsi...@us...> - 2002-06-03 22:45:00
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/input In directory usw-pr-cvs1:/tmp/cvs-serv23928/linux/drivers/input Modified Files: Makefile Log Message: Synced to 2.5.19 Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/Makefile,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- Makefile 25 May 2002 20:32:03 -0000 1.49 +++ Makefile 3 Jun 2002 22:44:57 -0000 1.50 @@ -2,10 +2,6 @@ # Makefile for the input core drivers. # -# The target object and module list name. - -O_TARGET := inputdrv.o - # Objects that export symbols. mod-subdirs := joystick keyboard mouse touchscreen |
|
From: James S. <jsi...@us...> - 2002-06-03 22:45:00
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/input/serio In directory usw-pr-cvs1:/tmp/cvs-serv23928/linux/drivers/input/serio Modified Files: Makefile Log Message: Synced to 2.5.19 Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/serio/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 19 Feb 2002 17:02:04 -0000 1.2 +++ Makefile 3 Jun 2002 22:44:57 -0000 1.3 @@ -2,10 +2,6 @@ # Makefile for the input core drivers. # -# The target object and module list name. - -O_TARGET := seriodrv.o - # Objects that export symbols. export-objs := serio.o |
|
From: James S. <jsi...@us...> - 2002-06-03 22:45:00
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/input/gameport In directory usw-pr-cvs1:/tmp/cvs-serv23928/linux/drivers/input/gameport Modified Files: Makefile Log Message: Synced to 2.5.19 Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/gameport/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 23 Jan 2002 05:23:55 -0000 1.1 +++ Makefile 3 Jun 2002 22:44:57 -0000 1.2 @@ -2,10 +2,6 @@ # Makefile for the gameport drivers. # -# The target object and module list name. - -O_TARGET := gamedrv.o - # Objects that export symbols. export-objs := gameport.o |
|
From: James S. <jsi...@us...> - 2002-06-03 22:45:00
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/macintosh In directory usw-pr-cvs1:/tmp/cvs-serv23928/linux/drivers/macintosh Modified Files: Makefile Log Message: Synced to 2.5.19 Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/macintosh/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Makefile 21 May 2002 19:34:14 -0000 1.10 +++ Makefile 3 Jun 2002 22:44:57 -0000 1.11 @@ -1,17 +1,6 @@ # # Makefile for the Macintosh-specific device drivers. # -# Note! Dependencies are done automagically by 'make dep', which also -# removes any old dependencies. DON'T put your own dependencies here -# unless it's something special (ie not a .c file). -# -# Note 2! The CFLAGS definitions are now inherited from the -# parent makes.. -# - -# The target object and module list name. - -O_TARGET := macintosh.o # Objects that export symbols. |
|
From: James S. <jsi...@us...> - 2002-06-03 22:45:00
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/input/mouse In directory usw-pr-cvs1:/tmp/cvs-serv23928/linux/drivers/input/mouse Modified Files: Makefile Log Message: Synced to 2.5.19 Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/mouse/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile 19 Mar 2002 19:21:19 -0000 1.2 +++ Makefile 3 Jun 2002 22:44:57 -0000 1.3 @@ -2,10 +2,6 @@ # Makefile for the mouse drivers. # -# The target object and module list name. - -O_TARGET := mousedrv.o - # Each configuration option enables a list of files. obj-$(CONFIG_MOUSE_AMIGA) += amimouse.o |
|
From: James S. <jsi...@us...> - 2002-06-03 22:45:00
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers In directory usw-pr-cvs1:/tmp/cvs-serv23928/linux/drivers Modified Files: Makefile Log Message: Synced to 2.5.19 Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/Makefile,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- Makefile 16 May 2002 18:01:39 -0000 1.33 +++ Makefile 3 Jun 2002 22:44:57 -0000 1.34 @@ -6,45 +6,45 @@ # -mod-subdirs := dio mtd sbus macintosh usb input telephony sgi ide \ - message scsi md ieee1394 pnp isdn atm serial \ +mod-subdirs := dio mtd sbus video macintosh usb input telephony sgi ide \ + message scsi md ieee1394 pnp isdn atm \ fc4 i2c acpi bluetooth input/serio \ - input/gameport parport hotplug - -subdir-y := base serial char block net misc media cdrom video -subdir-m := $(subdir-y) - -subdir-$(CONFIG_PARPORT) += parport -subdir-$(CONFIG_HOTPLUG_PCI) += hotplug -subdir-$(CONFIG_DIO) += dio -subdir-$(CONFIG_PCI) += pci -subdir-$(CONFIG_PCMCIA) += pcmcia -subdir-$(CONFIG_MTD) += mtd -subdir-$(CONFIG_SBUS) += sbus -subdir-$(CONFIG_ZORRO) += zorro -subdir-$(CONFIG_NUBUS) += nubus -subdir-$(CONFIG_TC) += tc -subdir-$(CONFIG_MAC) += macintosh -subdir-$(CONFIG_ALL_PPC) += macintosh -subdir-$(CONFIG_USB) += usb -subdir-$(CONFIG_INPUT) += input -subdir-$(CONFIG_SERIO) += input/serio -subdir-$(CONFIG_GAMEPORT) += input/gameport -subdir-$(CONFIG_PHONE) += telephony -subdir-$(CONFIG_SGI) += sgi -subdir-$(CONFIG_IDE) += ide -subdir-$(CONFIG_SCSI) += scsi -subdir-$(CONFIG_I2O) += message -subdir-$(CONFIG_FUSION) += message -subdir-$(CONFIG_MD) += md -subdir-$(CONFIG_IEEE1394) += ieee1394 -subdir-$(CONFIG_PNP) += pnp -subdir-$(CONFIG_ISDN) += isdn -subdir-$(CONFIG_ATM) += atm -subdir-$(CONFIG_FC4) += fc4 -subdir-$(CONFIG_I2C) += i2c -subdir-$(CONFIG_ACPI) += acpi + input/gameport parport hotplug \ + base char block misc net media cdrom -subdir-$(CONFIG_BLUEZ) += bluetooth +obj-$(CONFIG_PCI) += pci/ +obj-$(CONFIG_ACPI) += acpi/ +obj-$(CONFIG_PARPORT) += parport/ +obj-y += base/ char/ block/ misc/ net/ media/ +obj-$(CONFIG_NUBUS) += nubus/ +obj-$(CONFIG_ATM) += atm/ +obj-$(CONFIG_IDE) += ide/ +obj-$(CONFIG_FC4) += fc4/ +obj-$(CONFIG_SCSI) += scsi/ +obj-$(CONFIG_FUSION) += message/ +obj-$(CONFIG_IEEE1394) += ieee1394/ +obj-y += cdrom/ video/ serial/ +obj-$(CONFIG_MTD) += mtd/ +obj-$(CONFIG_PCMCIA) += pcmcia/ +obj-$(CONFIG_DIO) += dio/ +obj-$(CONFIG_SBUS) += sbus/ +obj-$(CONFIG_ZORRO) += zorro/ +obj-$(CONFIG_ALL_PPC) += macintosh/ +obj-$(CONFIG_MAC) += macintosh/ +obj-$(CONFIG_PNP) += pnp/ +obj-$(CONFIG_SGI) += sgi/ +obj-$(CONFIG_PARIDE) += block/paride/ +obj-$(CONFIG_TC) += tc/ +obj-$(CONFIG_USB) += usb/ +obj-$(CONFIG_INPUT) += input/ +obj-$(CONFIG_GAMEPORT) += input/gameport/ +obj-$(CONFIG_SERIO) += input/serio/ +obj-$(CONFIG_I2O) += message/ +obj-$(CONFIG_I2C) += i2c/ +obj-$(CONFIG_PHONE) += telephony/ +obj-$(CONFIG_MD) += md/ +obj-$(CONFIG_BLUEZ) += bluetooth/ +obj-$(CONFIG_HOTPLUG_PCI) += hotplug/ +obj-$(CONFIG_ISDN) += isdn/ include $(TOPDIR)/Rules.make |
|
From: James S. <jsi...@us...> - 2002-06-03 22:45:00
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/input/touchscreen In directory usw-pr-cvs1:/tmp/cvs-serv23928/linux/drivers/input/touchscreen Modified Files: Makefile Log Message: Synced to 2.5.19 Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/touchscreen/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 27 Mar 2002 20:58:50 -0000 1.3 +++ Makefile 3 Jun 2002 22:44:57 -0000 1.4 @@ -2,10 +2,6 @@ # Makefile for the mouse drivers. # -# The target object and module list name. - -O_TARGET := tsdrv.o - # Each configuration option enables a list of files. obj-$(CONFIG_TOUCHSCREEN_BITSY) += h3600_ts_input.o |
|
From: James S. <jsi...@us...> - 2002-06-03 22:45:00
|
Update of /cvsroot/linuxconsole/ruby/linux/drivers/acorn/char In directory usw-pr-cvs1:/tmp/cvs-serv23928/linux/drivers/acorn/char Modified Files: Makefile Log Message: Synced to 2.5.19 Index: Makefile =================================================================== RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/acorn/char/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile 23 Nov 2001 04:10:15 -0000 1.8 +++ Makefile 3 Jun 2002 22:44:57 -0000 1.9 @@ -1,28 +1,15 @@ # -# Makefile for the kernel character device drivers. -# -# Note! Dependencies are done automagically by 'make dep', which also -# removes any old dependencies. DON'T put your own dependencies here -# unless it's something special (ie not a .c file). -# -# Note 2! The CFLAGS definitions are now inherited from the -# parent makes.. +# Makefile for the acorn character device drivers. # -O_TARGET := acorn-char.o - -# Object file lists. - -obj-y := -obj-m := -obj-n := -obj- := - obj-$(CONFIG_ATOMWIDE_SERIAL) += serial-atomwide.o obj-$(CONFIG_DUALSP_SERIAL) += serial-dualsp.o obj-$(CONFIG_ARCH_ACORN) += i2c.o pcf8583.o # Do the i2c and rtc last -obj-y += $(obj-$(MACHINE)) +obj-y += $(obj-$(MACHINE)) include $(TOPDIR)/Rules.make + +%.c: %.map + loadkeys --mktable $< > $@ |
5 messages has been excluded from this view by a project administrator.
