linuxconsole-commit Mailing List for Linux Console Project (Page 23)

Brought to you by: esr, jsimmons, skitt, vojtech

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

Flat | Threaded

<< < 1 .. 21 22 23 24 25 .. 69 > >> (Page 23 of 69)

[Linuxconsole-commit]CVS: ruby/linux/arch/i386/kernel apm.c,1.7,1.8

From: James S. <jsi...@us...> - 2002-06-22 17:51:01

Update of /cvsroot/linuxconsole/ruby/linux/arch/i386/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv25751/linux/arch/i386/kernel

Modified Files:
	apm.c 
Log Message:
Synced to 2.5.24

Index: apm.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/i386/kernel/apm.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- apm.c	18 Jun 2002 18:51:54 -0000	1.7
+++ apm.c	22 Jun 2002 17:50:58 -0000	1.8
@@ -899,7 +899,7 @@
 	 */
 #ifdef CONFIG_SMP
 	/* Some bioses don't like being called from CPU != 0 */
-	while (cpu_number_map(smp_processor_id()) != 0) {
+	while (smp_processor_id() != 0) {
 		kernel_thread(apm_magic, NULL,
 			CLONE_FS | CLONE_FILES | CLONE_SIGHAND | SIGCHLD);
 		schedule();
@@ -922,12 +922,13 @@
  * callback we use.
  */
 
-void handle_poweroff (int key, struct pt_regs *pt_regs,
-		struct tty_struct *tty) {
+static void handle_poweroff (int key, struct pt_regs *pt_regs,
+				struct tty_struct *tty)
+{
         apm_power_off();
 }
 
-struct sysrq_key_op	sysrq_poweroff_op = {
+static struct sysrq_key_op	sysrq_poweroff_op = {
 	handler:        handle_poweroff,
 	help_msg:       "Off",
 	action_msg:     "Power Off\n"
@@ -1586,7 +1587,7 @@
 
 	p = buf;
 
-	if ((smp_num_cpus == 1) &&
+	if ((num_online_cpus() == 1) &&
 	    !(error = apm_get_power_status(&bx, &cx, &dx))) {
 		ac_line_status = (bx >> 8) & 0xff;
 		battery_status = bx & 0xff;
@@ -1717,7 +1718,7 @@
 		}
 	}
 
-	if (debug && (smp_num_cpus == 1)) {
+	if (debug && (num_online_cpus() == 1)) {
 		error = apm_get_power_status(&bx, &cx, &dx);
 		if (error)
 			printk(KERN_INFO "apm: power status not available\n");
@@ -1761,7 +1762,7 @@
 		pm_power_off = apm_power_off;
 	register_sysrq_key('o', &sysrq_poweroff_op);
 
-	if (smp_num_cpus == 1) {
+	if (num_online_cpus() == 1) {
 #if defined(CONFIG_APM_DISPLAY_BLANK) && defined(CONFIG_VT)
 		console_blank_hook = apm_console_blank;
 #endif
@@ -1904,7 +1905,9 @@
 		printk(KERN_NOTICE "apm: disabled on user request.\n");
 		return -ENODEV;
 	}
-	if ((smp_num_cpus > 1) && !power_off) {
+	/* FIXME: When boot code changes, this will need to be
+           deactivated when/if a CPU comes up --RR */
+	if ((num_online_cpus() > 1) && !power_off) {
 		printk(KERN_NOTICE "apm: disabled - APM is not SMP safe.\n");
 		return -ENODEV;
 	}
@@ -1958,7 +1961,9 @@
 
 	kernel_thread(apm, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGHAND | SIGCHLD);
 
-	if (smp_num_cpus > 1) {
+	/* FIXME: When boot code changes, this will need to be
+           deactivated when/if a CPU comes up --RR */
+	if (num_online_cpus() > 1) {
 		printk(KERN_NOTICE
 		   "apm: disabled - APM is not SMP safe (power off active).\n");
 		return 0;

[Linuxconsole-commit]CVS: ruby/linux/arch/ppc/kernel ppc_ksyms.c,1.9,1.10 setup.c,1.3,1.4

From: James S. <jsi...@us...> - 2002-06-22 17:51:01

Update of /cvsroot/linuxconsole/ruby/linux/arch/ppc/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv25751/linux/arch/ppc/kernel

Modified Files:
	ppc_ksyms.c setup.c 
Log Message:
Synced to 2.5.24

Index: ppc_ksyms.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/kernel/ppc_ksyms.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ppc_ksyms.c	18 Jun 2002 18:51:54 -0000	1.9
+++ ppc_ksyms.c	22 Jun 2002 17:50:58 -0000	1.10
@@ -227,7 +227,6 @@
 #endif
 EXPORT_SYMBOL(smp_call_function);
 EXPORT_SYMBOL(smp_hw_index);
-EXPORT_SYMBOL(smp_num_cpus);
 EXPORT_SYMBOL(synchronize_irq);
 #endif
 

Index: setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/kernel/setup.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- setup.c	18 Jun 2002 18:51:54 -0000	1.3
+++ setup.c	22 Jun 2002 17:50:58 -0000	1.4
@@ -146,8 +146,8 @@
 		/* Show summary information */
 #ifdef CONFIG_SMP
 		unsigned long bogosum = 0;
-		for (i = 0; i < smp_num_cpus; ++i)
-			if (cpu_online_map & (1 << i))
+		for (i = 0; i < NR_CPUS; ++i)
+			if (cpu_online(i))
 				bogosum += cpu_data[i].loops_per_jiffy;
 		seq_printf(m, "total bogomips\t: %lu.%02lu\n",
 			   bogosum/(500000/HZ), bogosum/(5000/HZ) % 100);

[Linuxconsole-commit]CVS: ruby/linux/arch/m68k config.in,1.17,1.18

From: James S. <jsi...@us...> - 2002-06-22 17:51:01

Update of /cvsroot/linuxconsole/ruby/linux/arch/m68k
In directory usw-pr-cvs1:/tmp/cvs-serv25751/linux/arch/m68k

Modified Files:
	config.in 
Log Message:
Synced to 2.5.24

Index: config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/m68k/config.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- config.in	16 May 2002 18:01:37 -0000	1.17
+++ config.in	22 Jun 2002 17:50:58 -0000	1.18
@@ -125,7 +125,7 @@
    fi
    dep_tristate '  Parallel printer support' CONFIG_PRINTER $CONFIG_PARPORT
    if [ "$CONFIG_PRINTER" != "n" ]; then
-      bool '    Support IEEE1284 status readback' CONFIG_PARPORT_1284
+      bool '    IEEE 1284 transfer modes' CONFIG_PARPORT_1284
    fi
 fi
 
@@ -184,7 +184,7 @@
    if [ "$CONFIG_CHR_DEV_ST" != "n" ]; then
       int  'Maximum number of SCSI tapes that can be loaded as modules' CONFIG_ST_EXTRA_DEVS 2
    fi
-   dep_tristate '  SCSI CD-ROM support' CONFIG_BLK_DEV_SR $CONFIG_SCSI
+   dep_tristate '  SCSI CDROM support' CONFIG_BLK_DEV_SR $CONFIG_SCSI
    if [ "$CONFIG_BLK_DEV_SR" != "n" ]; then
       bool '    Enable vendor-specific extensions (for SCSI CDROM)' CONFIG_BLK_DEV_SR_VENDOR
       int  'Maximum number of CDROM devices that can be loaded as modules' CONFIG_SR_EXTRA_DEVS 2
@@ -474,7 +474,7 @@
 bool 'Watchdog Timer Support'	CONFIG_WATCHDOG
 if [ "$CONFIG_WATCHDOG" != "n" ]; then
    bool '  Disable watchdog shutdown on close' CONFIG_WATCHDOG_NOWAYOUT
-   bool '  Software Watchdog' CONFIG_SOFT_WATCHDOG
+   bool '  Software watchdog' CONFIG_SOFT_WATCHDOG
 fi
 if [ "$CONFIG_ATARI" = "y" ]; then
    bool 'Enhanced Real Time Clock Support' CONFIG_RTC

[Linuxconsole-commit]CVS: ruby/linux/arch/i386 config.in,1.43,1.44

From: James S. <jsi...@us...> - 2002-06-22 17:51:01

Update of /cvsroot/linuxconsole/ruby/linux/arch/i386
In directory usw-pr-cvs1:/tmp/cvs-serv25751/linux/arch/i386

Modified Files:
	config.in 
Log Message:
Synced to 2.5.24

Index: config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/i386/config.in,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- config.in	15 Jun 2002 19:17:08 -0000	1.43
+++ config.in	22 Jun 2002 17:50:57 -0000	1.44
@@ -153,9 +153,24 @@
    define_bool CONFIG_X86_OOSTORE y
 fi
 
+bool 'Symmetric multi-processing support' CONFIG_SMP
+bool 'Preemptible Kernel' CONFIG_PREEMPT
+if [ "$CONFIG_SMP" != "y" ]; then
+   bool 'Local APIC support on uniprocessors' CONFIG_X86_UP_APIC
+   dep_bool 'IO-APIC support on uniprocessors' CONFIG_X86_UP_IOAPIC $CONFIG_X86_UP_APIC
+   if [ "$CONFIG_X86_UP_APIC" = "y" ]; then
+      define_bool CONFIG_X86_LOCAL_APIC y
+   fi
+   if [ "$CONFIG_X86_UP_IOAPIC" = "y" ]; then
+      define_bool CONFIG_X86_IO_APIC y
+   fi
+else
+   bool 'Multiquad NUMA system' CONFIG_MULTIQUAD
+fi
+
 bool 'Machine Check Exception' CONFIG_X86_MCE
 dep_bool 'Check for non-fatal errors on Athlon/Duron' CONFIG_X86_MCE_NONFATAL $CONFIG_X86_MCE
-dep_bool 'check for P4 thermal throttling interrupt.' CONFIG_X86_MCE_P4THERMAL $CONFIG_X86_MCE $CONFIG_X86_LOCAL_APIC
+dep_bool 'check for P4 thermal throttling interrupt.' CONFIG_X86_MCE_P4THERMAL $CONFIG_X86_MCE $CONFIG_X86_UP_APIC
 
 
 tristate 'Toshiba Laptop support' CONFIG_TOSHIBA
@@ -185,20 +200,6 @@
 
 bool 'Math emulation' CONFIG_MATH_EMULATION
 bool 'MTRR (Memory Type Range Register) support' CONFIG_MTRR
-bool 'Symmetric multi-processing support' CONFIG_SMP
-bool 'Preemptible Kernel' CONFIG_PREEMPT
-if [ "$CONFIG_SMP" != "y" ]; then
-   bool 'Local APIC support on uniprocessors' CONFIG_X86_UP_APIC
-   dep_bool 'IO-APIC support on uniprocessors' CONFIG_X86_UP_IOAPIC $CONFIG_X86_UP_APIC
-   if [ "$CONFIG_X86_UP_APIC" = "y" ]; then
-      define_bool CONFIG_X86_LOCAL_APIC y
-   fi
-   if [ "$CONFIG_X86_UP_IOAPIC" = "y" ]; then
-      define_bool CONFIG_X86_IO_APIC y
-   fi
-else
-   bool 'Multiquad NUMA system' CONFIG_MULTIQUAD
-fi
 
 if [ "$CONFIG_SMP" = "y" -o "$CONFIG_PREEMPT" = "y" ]; then
    if [ "$CONFIG_X86_CMPXCHG" = "y" ]; then

[Linuxconsole-commit]CVS: ruby/linux/arch/ppc config.in,1.33,1.34

From: James S. <jsi...@us...> - 2002-06-22 17:51:01

Update of /cvsroot/linuxconsole/ruby/linux/arch/ppc
In directory usw-pr-cvs1:/tmp/cvs-serv25751/linux/arch/ppc

Modified Files:
	config.in 
Log Message:
Synced to 2.5.24

Index: config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/config.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- config.in	3 Jun 2002 22:44:56 -0000	1.33
+++ config.in	22 Jun 2002 17:50:58 -0000	1.34
@@ -244,7 +244,7 @@
    fi
 
    bool 'Blue Logic DMA' CONFIG_405_DMA
-   dep_bool 'Power Management support (experimental)' CONFIG_PM $CONFIG_EXPERIMENTAL
+   dep_bool 'Power Management support (EXPERIMENTAL)' CONFIG_PM $CONFIG_EXPERIMENTAL
 
    choice 'TTYS0 device and default console'	\
 	"UART0  CONFIG_UART0_TTYS0		\
@@ -311,7 +311,7 @@
 define_bool CONFIG_MCA n
 
 if [ "$CONFIG_4xx" = "y" -o "$CONFIG_8260" = "y" ]; then
-   bool "Enable PCI" CONFIG_PCI
+   bool "PCI support" CONFIG_PCI
    bool 'PC PS/2 style Keyboard' CONFIG_PC_KEYBOARD
 else
    if [ "$CONFIG_8xx" = "y" ]; then

[Linuxconsole-commit]CVS: ruby AGAINST-2.5.24,NONE,1.1 AGAINST-2.5.22,1.1,NONE

From: James S. <jsi...@us...> - 2002-06-22 17:51:01

Update of /cvsroot/linuxconsole/ruby
In directory usw-pr-cvs1:/tmp/cvs-serv25751

Added Files:
	AGAINST-2.5.24 
Removed Files:
	AGAINST-2.5.22 
Log Message:
Synced to 2.5.24

--- NEW FILE: AGAINST-2.5.24 ---

--- AGAINST-2.5.22 DELETED ---

[Linuxconsole-commit]CVS: ruby/linux Makefile,1.64,1.65

From: James S. <jsi...@us...> - 2002-06-22 17:51:00

Update of /cvsroot/linuxconsole/ruby/linux
In directory usw-pr-cvs1:/tmp/cvs-serv25751/linux

Modified Files:
	Makefile 
Log Message:
Synced to 2.5.24

Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/Makefile,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- Makefile	18 Jun 2002 18:51:54 -0000	1.64
+++ Makefile	22 Jun 2002 17:50:57 -0000	1.65
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 5
-SUBLEVEL = 22
+SUBLEVEL = 24
 EXTRAVERSION = -ruby
 
 # We are using a recursive build, so we need to do a little thinking
@@ -48,11 +48,35 @@
   KBUILD_VERBOSE = 1
 endif
 
-# 	Decide whether to build built-in, modular, or both
+# 	Decide whether to build built-in, modular, or both.
+#	Normally, just do built-in.
 
-KBUILD_MODULES := 1
+KBUILD_MODULES :=
 KBUILD_BUILTIN := 1
 
+#	If we have only "make modules", don't compile built-in objects.
+
+ifeq ($(MAKECMDGOALS),modules)
+  KBUILD_BUILTIN :=
+endif
+
+#	If we have "make <whatever> modules", compile modules
+#	in addition to whatever we do anyway.
+
+ifneq ($(filter modules,$(MAKECMDGOALS)),)
+  KBUILD_MODULES := 1
+endif
+
+#	Just "make" or "make all" shall build modules as well
+
+ifeq ($(MAKECMDGOALS),)
+  KBUILD_MODULES := 1
+endif
+
+ifneq ($(filter all,$(MAKECMDGOALS)),)
+  KBUILD_MODULES := 1
+endif
+
 export KBUILD_MODULES KBUILD_BUILTIN
 
 # Beautify output
@@ -120,6 +144,8 @@
 export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE 
 export AFLAGS AFLAGS_KERNEL AFLAGS_MODULE
 
+SUBDIRS		:= init kernel mm fs ipc lib drivers sound net
+
 noconfig_targets := xconfig menuconfig config oldconfig randconfig \
 		    defconfig allyesconfig allnoconfig allmodconfig \
 		    clean mrproper distclean \
@@ -145,7 +171,8 @@
 .config:
 	@echo '***'
 	@echo '*** You have not yet configured your kernel!'
-	@echo '*** Please run "make xconfig/menuconfig/config/oldconfig"'
+	@echo '*** Please run some configurator (do "make xconfig" or'
+	@echo '*** "make menuconfig" or "make oldconfig" or "make config").'
 	@echo '***'
 	@exit 1
 
@@ -181,7 +208,7 @@
 
 # Link components for vmlinux
 # ---------------------------------------------------------------------------
-SUBDIRS		:= init kernel mm fs ipc lib drivers sound net
+
 INIT		:= init/init.o
 CORE_FILES	:= kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o
 LIBS		:= lib/lib.a
@@ -253,6 +280,7 @@
 
 .PHONY: prepare
 prepare: include/linux/version.h include/asm include/config/MARKER
+	@echo '  Starting the build. KBUILD_BUILTIN=$(KBUILD_BUILTIN) KBUILD_MODULES=$(KBUILD_MODULES)'
 
 # Single targets
 # ---------------------------------------------------------------------------
@@ -330,18 +358,16 @@
 # 	The targets are still named depend / dep for traditional
 #	reasons, but the only thing we do here is generating
 #	the module version checksums.
-#	FIXME: For now, we are also calling "archdep" from here,
-#	which should be replaced by a more sensible solution.
 
 .PHONY: depend dep $(patsubst %,_sfdep_%,$(SUBDIRS))
 
 depend dep: .hdepend
 
 #	.hdepend is our (misnomed) marker for whether we've run
-#	generated module versions and made archdep
+#	generated module versions
 
 .hdepend: $(if $(filter dep depend,$(MAKECMDGOALS)),FORCE)
-	@$(MAKE) archdep include/linux/modversions.h
+	@$(MAKE) include/linux/modversions.h
 	@touch $@
 
 ifdef CONFIG_MODVERSIONS
@@ -355,7 +381,7 @@
 	@( echo "#ifndef _LINUX_MODVERSIONS_H";\
 	   echo "#define _LINUX_MODVERSIONS_H"; \
 	   echo "#include <linux/modsetver.h>"; \
-	   for f in `cd .tmp_export-objs; find modules -name \*.ver -print | sort`; do \
+	   for f in `cd .tmp_export-objs; find modules -name SCCS -prune -o -name BitKeeper -prune -o -name \*.ver -print | sort`; do \
 	     echo "#include <linux/$${f}>"; \
 	   done; \
 	   echo "#endif"; \
@@ -385,8 +411,7 @@
 endif
 
 .PHONY: modules
-modules:
-	@$(MAKE) KBUILD_BUILTIN= $(SUBDIRS)
+modules: $(SUBDIRS)
 
 #	Install modules
 
@@ -420,8 +445,8 @@
 
 else # CONFIG_MODULES
 
-# ---------------------------------------------------------------------------
 # Modules not configured
+# ---------------------------------------------------------------------------
 
 modules modules_install: FORCE
 	@echo
@@ -433,6 +458,25 @@
 
 endif # CONFIG_MODULES
 
+# Generate asm-offsets.h 
+# ---------------------------------------------------------------------------
+
+define generate-asm-offsets.h
+	(set -e; \
+	 echo "#ifndef __ASM_OFFSETS_H__"; \
+	 echo "#define __ASM_OFFSETS_H__"; \
+	 echo "/*"; \
+	 echo " * DO NOT MODIFY."; \
+	 echo " *"; \
+	 echo " * This file was generated by arch/$(ARCH)/Makefile"; \
+	 echo " *"; \
+	 echo " */"; \
+	 echo ""; \
+	 sed -ne "/^->/{s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; s:->::; p;}"; \
+	 echo ""; \
+	 echo "#endif" )
+endef
+
 # RPM target
 # ---------------------------------------------------------------------------
 
@@ -448,7 +492,9 @@
 #	   will become invalid
 
 rpm:	clean spec
-	find . \( -size 0 -o -name .depend -o -name .hdepend \) -type f -print | xargs rm -f
+	find . -name SCCS -prune -o -name BitKeeper -prune -o \
+		\( -size 0 -o -name .depend -o -name .hdepend \) \
+		-type f -print | xargs rm -f
 	set -e; \
 	cd $(TOPDIR)/.. ; \
 	ln -sf $(TOPDIR) $(KERNELPATH) ; \
@@ -461,6 +507,8 @@
 
 else # ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
 
+ifeq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),)
+
 # Targets which don't need .config
 # ===========================================================================
 #
@@ -519,23 +567,6 @@
 defconfig:
 	yes '' | $(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in
 
-#	How we generate .config depends on which *config the
-#	user chose when calling make
-
-.config: $(filter oldconfig xconfig menuconfig config,$(MAKECMDGOALS)) ;
-
-#	If the user gave commands from both the need / need not
-#	.config sections, we need to call make again after
-#	.config is generated, now to take care of the remaining
-#	targets we know nothing about in this section
-
-remaining_targets := $(filter-out $(noconfig_targets),$(MAKECMDGOALS))
-
-$(remaining_targets) : make_with_config
-
-make_with_config: .config
-	@$(MAKE) $(remaining_targets)
-
 # Cleaning up
 # ---------------------------------------------------------------------------
 
@@ -546,6 +577,7 @@
 	drivers/char/consolemap_deftbl.c drivers/video/promcon_tbl.c \
 	drivers/char/conmakehash \
 	drivers/char/drm/*-mod.c \
+	drivers/char/defkeymap.c drivers/char/qtronixmap.c \
 	drivers/pci/devlist.h drivers/pci/classlist.h drivers/pci/gen-devlist \
 	drivers/zorro/devlist.h drivers/zorro/gen-devlist \
 	sound/oss/bin2hex sound/oss/hex2hex \
@@ -556,9 +588,12 @@
 	drivers/scsi/aic7xxx/aicasm/aicasm_scan.c \
 	drivers/scsi/aic7xxx/aicasm/y.tab.h \
 	drivers/scsi/aic7xxx/aicasm/aicasm \
-	drivers/scsi/53c700_d.h \
-	net/khttpd/make_times_h \
-	net/khttpd/times.h \
+	drivers/scsi/53c700_d.h drivers/scsi/sim710_d.h \
+	drivers/scsi/53c7xx_d.h drivers/scsi/53c7xx_u.h \
+	drivers/scsi/53c8xx_d.h drivers/scsi/53c8xx_u.h \
+	net/802/cl2llc.c net/802/transit/pdutr.h net/802/transit/timertr.h \
+	net/802/pseudo/pseudocode.h \
+	net/khttpd/make_times_h net/khttpd/times.h \
 	submenu*
 
 # 	files removed with 'make mrproper'
@@ -596,22 +631,26 @@
 
 clean:	archclean
 	@echo 'Cleaning up'
-	@find . \( -name \*.[oas] -o -name core -o -name .\*.cmd -o \
-		   -name .\*.tmp -o -name .\*.d \) -type f -print \
+	@find . -name SCCS -prune -o -name BitKeeper -prune -o \
+		\( -name \*.[oas] -o -name core -o -name .\*.cmd -o \
+		-name .\*.tmp -o -name .\*.d \) -type f -print \
 		| grep -v lxdialog/ | xargs rm -f
 	@rm -f $(CLEAN_FILES)
 	@$(MAKE) -C Documentation/DocBook clean
 
 mrproper: clean archmrproper
 	@echo 'Making mrproper'
-	@find . \( -size 0 -o -name .depend \) -type f -print | xargs rm -f
+	@find . -name SCCS -prune -o -name BitKeeper -prune -o \
+		\( -name .depend -o -name .\*.cmd \) \
+		-type f -print | xargs rm -f
 	@rm -f $(MRPROPER_FILES)
 	@rm -rf $(MRPROPER_DIRS)
 	@$(MAKE) -C Documentation/DocBook mrproper
 
 distclean: mrproper
 	@echo 'Making distclean'
-	@find . \( -not -type d \) -and \
+	@find . -name SCCS -prune -o -name BitKeeper -prune -o \
+		\( -not -type d \) -and \
 	 	\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
 		-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
 	 	-o -name '.*.rej' -o -name '.SUMS' -o -size 0 \) -type f \
@@ -621,16 +660,24 @@
 # ---------------------------------------------------------------------------
 
 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 arch/${ARCH} -name '*.[chS]' ; } | grep -v SCCS | etags -
+	{ find include/asm-${ARCH} -name SCCS -prune -o -name BitKeeper -prune \
+		-o -name '*.h' -print ; \
+	find include -name SCCS -prune -o -name BitKeeper -prune -o \
+		-type d \( -name "asm-*" -o -name config \) -prune -o \
+		-name '*.h' -print ; \
+	find $(SUBDIRS) init arch/${ARCH} \
+		-name SCCS -prune -o -name BitKeeper -prune -o \
+		-name '*.[chS]' -print ; } | grep -v SCCS | etags -
 
 # 	Exuberant ctags works better with -I
 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
+	ctags $$CTAGSF `find include/asm-$(ARCH) -name SCCS -prune -o -name BitKeeper -prune -o -name '*.h' -print` && \
+	find include -name SCCS -prune -o -name BitKeeper -prune -o \
+		-type d \( -name "asm-*" -o -name config \) -prune -o \
+		-name '*.h' -print | xargs ctags $$CTAGSF -a && \
+	find $(SUBDIRS) init -name SCCS -prune -o -name BitKeeper -prune -o \
+		-name '*.[ch]' -print | xargs ctags $$CTAGSF -a
 
 # Documentation targets
 # ---------------------------------------------------------------------------
@@ -639,19 +686,35 @@
 	@$(MAKE) -C Documentation/DocBook $@
 
 
-endif # ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
-
 # Scripts to check various things for consistency
 # ---------------------------------------------------------------------------
 
 checkconfig:
-	find * -name '*.[hcS]' -type f -print | sort | xargs $(PERL) -w scripts/checkconfig.pl
+	find * -name SCCS -prune -o -name BitKeeper -prune -o \
+		-name '*.[hcS]' -type f -print | sort \
+		| xargs $(PERL) -w scripts/checkconfig.pl
 
 checkhelp:
-	find * -name [cC]onfig.in -print | sort | xargs $(PERL) -w scripts/checkhelp.pl
+	find * -name SCCS -prune -o -name BitKeeper -prune -o \
+		-name [cC]onfig.in -print | sort \
+		| xargs $(PERL) -w scripts/checkhelp.pl
 
 checkincludes:
-	find * -name '*.[hcS]' -type f -print | sort | xargs $(PERL) -w scripts/checkincludes.pl
+	find * -name SCCS -prune -o -name BitKeeper -prune -o \
+		-name '*.[hcS]' -type f -print | sort \
+		| xargs $(PERL) -w scripts/checkincludes.pl
+
+else # ifneq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),)
+
+# We're called with both targets which do and do not need
+# .config included. Handle them one after the other.
+# ===========================================================================
+
+%:: FORCE
+	$(MAKE) $@
+
+endif # ifeq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),)
+endif # ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
 
 # FIXME Should go into a make.lib or something 
 # ===========================================================================

[Linuxconsole-commit]CVS: ruby/linux/arch/alpha config.in,1.31,1.32

From: James S. <jsi...@us...> - 2002-06-22 17:51:00

Update of /cvsroot/linuxconsole/ruby/linux/arch/alpha
In directory usw-pr-cvs1:/tmp/cvs-serv25751/linux/arch/alpha

Modified Files:
	config.in 
Log Message:
Synced to 2.5.24

Index: config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/alpha/config.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- config.in	3 Jun 2002 22:44:55 -0000	1.31
+++ config.in	22 Jun 2002 17:50:57 -0000	1.32
@@ -329,7 +329,7 @@
 mainmenu_option next_comment
 comment 'Old CD-ROM drivers (not SCSI, not IDE)'
 
-bool 'Support non-SCSI/IDE/ATAPI drives' CONFIG_CD_NO_IDESCSI
+bool 'Support non-SCSI/IDE/ATAPI CDROM drives' CONFIG_CD_NO_IDESCSI
 if [ "$CONFIG_CD_NO_IDESCSI" != "n" ]; then
   source drivers/cdrom/Config.in
 fi

[Linuxconsole-commit]CVS: ruby/linux/drivers/video dnfb.c,1.7,1.8 fm2fb.c,1.11,1.12 hpfb.c,1.11,1.12 q40fb.c,1.9,1.10 vfb.c,1.34,1.35

From: James S. <jsi...@us...> - 2002-06-21 22:51:56

Update of /cvsroot/linuxconsole/ruby/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv29302/linux/drivers/video

Modified Files:
	dnfb.c fm2fb.c hpfb.c q40fb.c vfb.c 
Log Message:
Updates to fbdev drivers.

Index: dnfb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/dnfb.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- dnfb.c	15 Jun 2002 19:17:10 -0000	1.7
+++ dnfb.c	21 Jun 2002 22:51:53 -0000	1.8
@@ -112,7 +112,7 @@
 
 /* frame buffer operations */
 
-static int dn_fb_blank(int blank, struct fb_info *info);
+static int dnfb_blank(int blank, struct fb_info *info);
 static void dnfb_copyarea(struct fb_info *info, struct fb_copyarea *area);
 
 static struct fb_ops dn_fb_ops = {
@@ -157,7 +157,6 @@
 {
 
 	int incr, y_delta, pre_read = 0, x_end, x_word_count;
-	int x_count, y_count;
 	ushort *src, dummy;
 	uint start_mask, end_mask, dest;
 	short i, j;
@@ -165,13 +164,13 @@
 	incr = (area->dy <= area->sy) ? 1 : -1;
 
 	src =
-	    (ushort *) (info->screen_base + area->sy * info->fix.next_line +
+	    (ushort *) (info->screen_base + area->sy * info->fix.line_length +
 			(area->sx >> 4));
-	dest = area->dy * (info->fix.next_line >> 1) + (area->dx >> 4);
+	dest = area->dy * (info->fix.line_length >> 1) + (area->dx >> 4);
 
 	if (incr > 0) {
-		y_delta = (info->fix.next_line * 8) - area->sx - x_count;
-		x_end = area->dx + x_count - 1;
+		y_delta = (info->fix.line_length * 8) - area->sx - area->width;
+		x_end = area->dx + area->width - 1;
 		x_word_count = (x_end >> 4) - (area->dx >> 4) + 1;
 		start_mask = 0xffff0000 >> (area->dx & 0xf);
 		end_mask = 0x7ffff >> (x_end & 0xf);
@@ -180,8 +179,8 @@
 		if ((area->dx & 0xf) < (area->sx & 0xf))
 			pre_read = 1;
 	} else {
-		y_delta = -((info->fix.next_line * 8) - area->sx - x_count);
-		x_end = area->dx - x_count + 1;
+		y_delta = -((info->fix.line_length * 8) - area->sx - area->width);
+		x_end = area->dx - area->width + 1;
 		x_word_count = (area->dx >> 4) - (x_end >> 4) + 1;
 		start_mask = 0x7ffff >> (area->dx & 0xf);
 		end_mask = 0xffff0000 >> (x_end & 0xf);
@@ -191,7 +190,7 @@
 			pre_read = 1;
 	}
 
-	for (i = 0; i < y_count; i++) {
+	for (i = 0; i < area->height; i++) {
 
 		outb(0xc | (dest >> 16), AP_CONTROL_3A);
 
@@ -238,6 +237,9 @@
 	fb_info.fbops = &dn_fb_ops;
 	fb_info.fix = dnfb_fix;
 	fb_info.var = dnfb_var;
+
+	fb_alloc_cmap(&fb_info.cmap, 2, 0);
+
 	fb_info.screen_base = (u_char *) fb_info.fix.smem_start;
 
 	err = register_framebuffer(&fb_info);

Index: fm2fb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/fm2fb.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- fm2fb.c	3 Jun 2002 22:44:58 -0000	1.11
+++ fm2fb.c	21 Jun 2002 22:51:53 -0000	1.12
@@ -127,6 +127,8 @@
 
 static volatile unsigned char *fm2fb_reg;
 
+#define arraysize(x)	(sizeof(x)/sizeof(*(x)))
+
 static struct fb_info fb_info;
 static u32 pseudo_palette[17];
 
@@ -171,6 +173,11 @@
 
 static struct fb_ops fm2fb_ops = {
 	owner:		THIS_MODULE,
+	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_setcolreg:	fm2fb_setcolreg,
 	fb_blank:	fm2fb_blank,	
 	fb_fillrect:	cfb_fillrect,
@@ -188,8 +195,9 @@
 	if (!blank)
 		t |= FRAMEMASTER_ENABLE | FRAMEMASTER_NOLACE;
 	fm2fb_reg[0] = t;
+	return 0;
 }
-    
+
     /*
      *  Set a single color register. The values supplied are already
      *  rounded down to the hardware's capabilities (according to the
@@ -262,6 +270,8 @@
 		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: hpfb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/hpfb.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- hpfb.c	3 Jun 2002 22:44:58 -0000	1.11
+++ hpfb.c	21 Jun 2002 22:51:53 -0000	1.12
@@ -47,6 +47,7 @@
 	visual:		FB_VISUAL_PSEUDOCOLOR,
 	line_length:	1024,
 	accel:		FB_ACCEL_NONE,
+};
 
 static struct fb_var_screeninfo hpfb_defined = {
 	xres:		1024,
@@ -154,7 +155,9 @@
 	fb_info.flags = FBINFO_FLAG_DEFAULT;
 	fb_info.var   = hpfb_defined;
 	fb_info.fix   = hpfb_fix;
-	fb_info.screen_base = hpfb_fix.smem_start;
+	fb_info.screen_base = (char *)hpfb_fix.smem_start;	// FIXME
+
+	fb_alloc_cmap(&fb_info.cmap, 256, 0);
 
 	if (register_framebuffer(&fb_info) < 0)
 		return 1;

Index: q40fb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/q40fb.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- q40fb.c	3 Jun 2002 22:44:58 -0000	1.9
+++ q40fb.c	21 Jun 2002 22:51:53 -0000	1.10
@@ -39,7 +39,7 @@
 	type:		FB_TYPE_PACKED_PIXELS,
 	visual:		FB_VISUAL_TRUECOLOR,
 	line_length:	1024*2,
-	accel_flags:	FB_ACCEL_NONE,
+	accel:		FB_ACCEL_NONE,
 };
 
 static struct fb_var_screeninfo q40fb_var __initdata = {
@@ -82,14 +82,14 @@
      *  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) |
-	                              ((green & 31) << 11) |
-	                         	(blue & 63);
+	((u16 *)info->pseudo_palette)[regno] = ((red & 31) <<6) |
+					       ((green & 31) << 11) |
+					       (blue & 63);
     }
     return 0;
 }
@@ -110,6 +110,8 @@
 	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: vfb.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/vfb.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- vfb.c	3 Jun 2002 22:44:58 -0000	1.34
+++ vfb.c	21 Jun 2002 22:51:53 -0000	1.35
@@ -87,7 +87,7 @@
 static int vfb_set_par(struct fb_info *info);
 static int vfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
 			 u_int transp, struct fb_info *info);
-static int vfb_pan_display(struct fb_var_screeninfo *var,
+static int vfb_pan_display(struct fb_var_screeninfo *var, int con,
 			   struct fb_info *info);
 static int vfb_mmap(struct fb_info *info, struct file *file,
 		    struct vm_area_struct *vma);
@@ -437,6 +437,8 @@
 	fb_info.fix = vfb_fix;
 	fb_info.pseudo_palette = &vfb_pseudo_palette;
 	fb_info.flags = FBINFO_FLAG_DEFAULT;
+
+	fb_alloc_cmap(&fb_info.cmap, 256, 0);
 
 	if (register_framebuffer(&fb_info) < 0) {
 		vfree(videomemory);

[Linuxconsole-commit]CVS: ruby/linux/drivers/serial Config.help,NONE,1.1 ChangeLog,1.5,1.6 Config.in,1.7,1.8 Makefile,1.10,1.11 serial_21285.c,1.10,1.11 serial_8250.c,1.15,1.16 serial_clps711x.c,1.13,1.14 serial_core.c,1.21,1.22 serial_sa1100.c,1.18,1.19

From: James S. <jsi...@us...> - 2002-06-18 22:41:10

Update of /cvsroot/linuxconsole/ruby/linux/drivers/serial
In directory usw-pr-cvs1:/tmp/cvs-serv17900/drivers/serial

Modified Files:
	ChangeLog Config.in Makefile serial_21285.c serial_8250.c 
	serial_clps711x.c serial_core.c serial_sa1100.c 
Added Files:
	Config.help 
Log Message:
Synced up with Russell Kings work fo rth enew serial stuff.

--- NEW FILE: Config.help ---
# $Id: Config.help,v 1.1 2002/06/18 22:41:07 jsimmons Exp $

CONFIG_SERIAL_8250
  This selects whether you want to include the driver for the standard
  serial ports.  The standard answer is Y.  People who might say N
  here are those that are setting up dedicated Ethernet WWW/FTP
  servers, or users that have one of the various bus mice instead of a
  serial mouse and don't intend to use their machine's standard serial
  port for anything.  (Note that the Cyclades and Stallion multi
  serial port drivers do not need this driver built in for them to
  work.)

  If you want to compile this driver as a module, say M here and read
  <file:Documentation/modules.txt>.  The module will be called
  serial.o.
  [WARNING: Do not compile this driver as a module if you are using
  non-standard serial ports, since the configuration information will
  be lost when the driver is unloaded.  This limitation may be lifted
  in the future.]

  BTW1: If you have a mouseman serial mouse which is not recognized by
  the X window system, try running gpm first.

  BTW2: If you intend to use a software modem (also called Winmodem)
  under Linux, forget it.  These modems are crippled and require
  proprietary drivers which are only available under Windows.

  Most people will say Y or M here, so that they can use serial mice,
  modems and similar devices connecting to the standard serial ports.

CONFIG_SERIAL_8250_CONSOLE
  If you say Y here, it will be possible to use a serial port as the
  system console (the system console is the device which receives all
  kernel messages and warnings and which allows logins in single user
  mode). This could be useful if some terminal or printer is connected
  to that serial port.

  Even if you say Y here, the currently visible virtual console
  (/dev/tty0) will still be used as the system console by default, but
  you can alter that using a kernel command line option such as
  "console=ttyS1". (Try "man bootparam" or see the documentation of
  your boot loader (lilo or loadlin) about how to pass options to the
  kernel at boot time.)

  If you don't have a VGA card installed and you say Y here, the
  kernel will automatically use the first serial line, /dev/ttyS0, as
  system console.

  If unsure, say N.

CONFIG_SERIAL_8250_EXTENDED
  If you wish to use any non-standard features of the standard "dumb"
  driver, say Y here. This includes HUB6 support, shared serial
  interrupts, special multiport support, support for more than the
  four COM 1/2/3/4 boards, etc.

  Note that the answer to this question won't directly affect the
  kernel: saying N will just cause the configurator to skip all
  the questions about serial driver options. If unsure, say N.

CONFIG_SERIAL_8250_MANY_PORTS
  Say Y here if you have dumb serial boards other than the four
  standard COM 1/2/3/4 ports. This may happen if you have an AST
  FourPort, Accent Async, Boca (read the Boca mini-HOWTO, available
  from <http://www.linuxdoc.org/docs.html#howto>), or other custom
  serial port hardware which acts similar to standard serial port
  hardware. If you only use the standard COM 1/2/3/4 ports, you can
  say N here to save some memory. You can also say Y if you have an
  "intelligent" multiport card such as Cyclades, Digiboards, etc.

CONFIG_SERIAL_8250_SHARE_IRQ
  Some serial boards have hardware support which allows multiple dumb
  serial ports on the same board to share a single IRQ. To enable
  support for this in the serial driver, say Y here.

CONFIG_SERIAL_8250_DETECT_IRQ
  Say Y here if you want the kernel to try to guess which IRQ
  to use for your serial port.

  This is considered unsafe; it is far better to configure the IRQ in
  a boot script using the setserial command.

  If unsure, say N.

CONFIG_SERIAL_8250_MULTIPORT
  Some multiport serial ports have special ports which are used to
  signal when there are any serial ports on the board which need
  servicing. Say Y here to enable the serial driver to take advantage
  of those special I/O ports.

CONFIG_SERIAL_8250_RSA
  ::: To be written :::

CONFIG_SERIAL_ROCKETPORT
  This is a driver for the Comtrol Rocketport cards which provide
  multiple serial ports. You would need something like this to connect
  more than two modems to your Linux box, for instance in order to
  become a dial-in server.

  If you want to compile this driver as a module, say M here and read
  <file:Documentation/modules.txt>.  The module will be called
  rocket.o.

CONFIG_ATOMWIDE_SERIAL
  If you have an Atomwide Serial card for an Acorn system, say Y to
  this option.  The driver can handle 1, 2, or 3 port cards.
  If unsure, say N.

CONFIG_DUALSP_SERIAL
  If you have the Serial Port's dual serial card for an Acorn system,
  say Y to this option.  If unsure, say N.

CONFIG_SERIAL_ANAKIN
  ::: To be written :::
CONFIG_SERIAL_ANAKIN_CONSOLE
  ::: To be written :::

  Even if you say Y here, the currently visible virtual console
  (/dev/tty0) will still be used as the system console by default, but
  you can alter that using a kernel command line option such as
  "console=ttyAN0". (Try "man bootparam" or see the documentation of
  your boot loader (lilo or loadlin) about how to pass options to the
  kernel at boot time.)

CONFIG_ANAKIN_DEFAULT_BAUDRATE
  ::: To be written :::

CONFIG_SERIAL_AMBA
  This selects the ARM(R) AMBA(R) PrimeCell UART.  If you have an
  Integrator platform, say Y or M here.

  If unsure, say N.

CONFIG_SERIAL_AMBA_CONSOLE
  Say Y here if you wish to use an AMBA PrimeCell UART as the system
  console (the system console is the device which receives all kernel
  messages and warnings and which allows logins in single user mode).

  Even if you say Y here, the currently visible framebuffer console
  (/dev/tty0) will still be used as the system console by default, but
  you can alter that using a kernel command line option such as
  "console=ttyAM0". (Try "man bootparam" or see the documentation of
  your boot loader (lilo or loadlin) about how to pass options to the
  kernel at boot time.)

CONFIG_SERIAL_CLPS711X
  ::: To be written :::

CONFIG_SERIAL_CLPS711X_CONSOLE
  ::: To be written :::

  Even if you say Y here, the currently visible virtual console
  (/dev/tty0) will still be used as the system console by default, but
  you can alter that using a kernel command line option such as
  "console=ttyCL1". (Try "man bootparam" or see the documentation of
  your boot loader (lilo or loadlin) about how to pass options to the
  kernel at boot time.)

CONFIG_SERIAL_CLPS711X_OLD_NAME
  ::: To be written :::

CONFIG_SERIAL_21285
  If you have a machine based on a 21285 (Footbridge) StrongARM(R)/
  PCI bridge you can enable its onboard serial port by enabling this
  option.

CONFIG_SERIAL_21285_OLD
  Use the old /dev/ttyS name, major 4 minor 64.  This is obsolete
  and will be removed during later 2.5 development.

CONFIG_SERIAL_21285_CONSOLE
  If you have enabled the serial port on the 21285 footbridge you can
  make it the console by answering Y to this option.

  Even if you say Y here, the currently visible virtual console
  (/dev/tty0) will still be used as the system console by default, but
  you can alter that using a kernel command line option such as
  "console=ttyFB". (Try "man bootparam" or see the documentation of
  your boot loader (lilo or loadlin) about how to pass options to the
  kernel at boot time.)

CONFIG_SERIAL_UART00
  Say Y here if you want to use the hard logic uart on Excalibur. This
  driver also supports soft logic implentations of this uart core.

CONFIG_SERIAL_UART00_CONSOLE
  Say Y here if you want to support a serial console on an Excalibur
  hard logic uart or uart00 IP core.

  Even if you say Y here, the currently visible virtual console
  (/dev/tty0) will still be used as the system console by default, but
  you can alter that using a kernel command line option such as
  "console=ttyS1". (Try "man bootparam" or see the documentation of
  your boot loader (lilo or loadlin) about how to pass options to the
  kernel at boot time.)

CONFIG_SERIAL_SA1100
  If you have a machine based on a SA1100/SA1110 StrongARM(R) CPU you
  can enable its onboard serial port by enabling this option.
  Please read <file:Documentation/arm/SA1100/serial_UART> for further
  info.

CONFIG_SERIAL_SA1100_CONSOLE
  If you have enabled the serial port on the SA1100/SA1110 StrongARM
  CPU you can make it the console by answering Y to this option.

  Even if you say Y here, the currently visible virtual console
  (/dev/tty0) will still be used as the system console by default, but
  you can alter that using a kernel command line option such as
  "console=ttySA0". (Try "man bootparam" or see the documentation of
  your boot loader (lilo or loadlin) about how to pass options to the
  kernel at boot time.)

#CONFIG_SERIAL_L7200
#  If you have a LinkUp Systems L7200 board you can enable its two
#  onboard serial ports by enabling this option. The device numbers
#  are major ID 4 with minor 64 and 65 respectively.
#
#CONFIG_SERIAL_L7200_CONSOLE
#  If you have enabled the serial ports on the L7200 development board
#  you can make the first serial port the console by answering Y to
#  this option.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/serial/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ChangeLog	14 Mar 2002 20:03:25 -0000	1.5
+++ ChangeLog	18 Jun 2002 22:41:07 -0000	1.6
@@ -19,3 +19,7 @@
 2002-3-14  James Simmons <jsi...@us...>
 	* Grabbed RMK latest work and placed it into CVS. I haven't had time
 	  to properly modify it for the input api.
+
+2002-6-18  James Simmons <jsi...@us...>
+	* Grabbed RMK latest work and placed it into CVS. I haven't had time
+	  to properly modify it for the input api. Some day I will get to it.

Index: Config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/serial/Config.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Config.in	1 Nov 2001 21:38:35 -0000	1.7
+++ Config.in	18 Jun 2002 22:41:07 -0000	1.8
@@ -6,55 +6,75 @@
 mainmenu_option next_comment
 comment 'Serial drivers'
 
-tristate 'Serial port support' CONFIG_UART
-if [ "$CONFIG_UART" != "n" ]; then
-   if [ "$CONFIG_ARM" = "y" ]; then
-      dep_bool 'Anakin serial port support' CONFIG_SERIAL_ANAKIN $CONFIG_ARCH_ANAKIN
-      dep_bool '  Console on Anakin serial port' CONFIG_SERIAL_ANAKIN_CONSOLE $CONFIG_SERIAL_ANAKIN
-      if [ "$CONFIG_SERIAL_ANAKIN" = "y" ]; then
-         int  '  Default Anakin serial baudrate' CONFIG_ANAKIN_DEFAULT_BAUDRATE 9600
-      fi
+#
+# The new 8250/16550 serial drivers
+dep_tristate '8250/16550 and compatible serial support (EXPERIMENTAL)' CONFIG_SERIAL_8250 $CONFIG_EXPERIMENTAL
+dep_bool '  Console on 8250/16550 and compatible serial port (EXPERIMENTAL)' CONFIG_SERIAL_8250_CONSOLE $CONFIG_SERIAL_8250 $CONFIG_EXPERIMENTAL
 
-      dep_tristate 'ARM AMBA serial port support' CONFIG_SERIAL_AMBA $CONFIG_ARCH_INTEGRATOR
-      dep_bool '  Support for console on AMBA serial port' CONFIG_SERIAL_AMBA_CONSOLE $CONFIG_SERIAL_AMBA
-      if [ "$CONFIG_SERIAL_AMBA" = "y" ]; then
-         define_bool CONFIG_SERIAL_INTEGRATOR y
-      fi
+dep_mbool 'Extended 8250/16550 serial driver options' CONFIG_SERIAL_8250_EXTENDED $CONFIG_SERIAL_8250
+dep_bool '  Support more than 4 serial ports' CONFIG_SERIAL_8250_MANY_PORTS $CONFIG_SERIAL_8250_EXTENDED
+dep_bool '  Support for sharing serial interrupts' CONFIG_SERIAL_8250_SHARE_IRQ $CONFIG_SERIAL_8250_EXTENDED
+dep_bool '  Autodetect IRQ on standard ports (unsafe)' CONFIG_SERIAL_8250_DETECT_IRQ $CONFIG_SERIAL_8250_EXTENDED
+dep_bool '  Support special multiport boards' CONFIG_SERIAL_8250_MULTIPORT $CONFIG_SERIAL_8250_EXTENDED
+dep_bool '  Support RSA serial ports' CONFIG_SERIAL_8250_RSA $CONFIG_SERIAL_8250_EXTENDED
 
-      dep_tristate 'CLPS711X serial port support' CONFIG_SERIAL_CLPS711X $CONFIG_ARCH_CLPS711X
-      dep_bool '  Support for console on CLPS711X serial port' CONFIG_SERIAL_CLPS711X_CONSOLE $CONFIG_SERIAL_CLPS711X
+comment 'Non-8250 serial port support'
 
-      dep_bool 'DC21285 serial port support' CONFIG_SERIAL_21285 $CONFIG_FOOTBRIDGE
-      dep_bool '  Use /dev/ttyS0 device (OBSOLETE)' CONFIG_SERIAL_21285_OLD $CONFIG_SERIAL_21285 $CONFIG_OBSOLETE
-      dep_bool '  Console on DC21285 serial port' CONFIG_SERIAL_21285_CONSOLE $CONFIG_SERIAL_21285
+#if [ "$CONFIG_PCI" = "y" -o "$CONFIG_ISA" = "y" ]; then
+#   dep_tristate 'Comtrol Rocketport support' CONFIG_SERIAL_ROCKETPORT
+#fi
 
-      dep_bool 'Excalibur serial port (uart00) support' CONFIG_SERIAL_UART00 $CONFIG_ARCH_CAMELOT
-      dep_bool '  Support for console on Excalibur serial port' CONFIG_SERIAL_UART00_CONSOLE $CONFIG_SERIAL_UART00	
+if [ "$CONFIG_ARM" = "y" ]; then
+   dep_tristate 'Acorn Atomwide 16550 serial port support' CONFIG_ATOMWIDE_SERIAL $CONFIG_ARCH_ACORN $CONFIG_SERIAL_8250
+   dep_tristate 'Acorn Dual 16550 serial port support' CONFIG_DUALSP_SERIAL $CONFIG_ARCH_ACORN $CONFIG_SERIAL_8250
+   dep_bool 'Anakin serial port support' CONFIG_SERIAL_ANAKIN $CONFIG_ARCH_ANAKIN
+   dep_bool '  Console on Anakin serial port' CONFIG_SERIAL_ANAKIN_CONSOLE $CONFIG_SERIAL_ANAKIN
+   if [ "$CONFIG_SERIAL_ANAKIN" = "y" ]; then
+      int  '  Default Anakin serial baudrate' CONFIG_ANAKIN_DEFAULT_BAUDRATE 9600
+   fi
 
-      dep_bool 'SA1100 serial port support' CONFIG_SERIAL_SA1100 $CONFIG_ARCH_SA1100
-      dep_bool '  Console on SA1100 serial port' CONFIG_SERIAL_SA1100_CONSOLE $CONFIG_SERIAL_SA1100
-      if [ "$CONFIG_ARCH_SA1100" = "y" ]; then
-         int  '  Default SA1100 serial baudrate' CONFIG_SA1100_DEFAULT_BAUDRATE 9600
-      fi
-  fi
-#
-# The new 8250/16550 serial drivers
-  dep_tristate '8250/16550 and compatible serial support (EXPERIMENTAL)' CONFIG_SERIAL_8250 $CONFIG_EXPERIMENTAL
-  dep_bool '  Console on 8250/16550 and compatible serial port (EXPERIMENTAL)' CONFIG_SERIAL_8250_CONSOLE $CONFIG_SERIAL_8250 $CONFIG_EXPERIMENTAL
+   dep_tristate 'ARM AMBA serial port support' CONFIG_SERIAL_AMBA $CONFIG_ARCH_INTEGRATOR
+   dep_bool '  Support for console on AMBA serial port' CONFIG_SERIAL_AMBA_CONSOLE $CONFIG_SERIAL_AMBA
+   if [ "$CONFIG_SERIAL_AMBA" = "y" ]; then
+      define_bool CONFIG_SERIAL_INTEGRATOR y
+   fi
 
-  dep_mbool 'Extended 8250/16550 serial driver options' CONFIG_SERIAL_8250_EXTENDED $CONFIG_SERIAL_8250
-  dep_bool '  Support more than 4 serial ports' CONFIG_SERIAL_8250_MANY_PORTS $CONFIG_SERIAL_8250_EXTENDED
-  dep_bool '  Support for sharing serial interrupts' CONFIG_SERIAL_8250_SHARE_IRQ $CONFIG_SERIAL_8250_EXTENDED
-  dep_bool '  Autodetect IRQ on standard ports (unsafe)' CONFIG_SERIAL_8250_DETECT_IRQ $CONFIG_SERIAL_8250_EXTENDED
-  dep_bool '  Support special multiport boards' CONFIG_SERIAL_8250_MULTIPORT $CONFIG_SERIAL_8250_EXTENDED
-  dep_bool '  Support Bell Technologies HUB6 card' CONFIG_SERIAL_8250_HUB6 $CONFIG_SERIAL_8250_EXTENDED
+   dep_tristate 'CLPS711X serial port support' CONFIG_SERIAL_CLPS711X $CONFIG_ARCH_CLPS711X
+   dep_bool '  Support for console on CLPS711X serial port' CONFIG_SERIAL_CLPS711X_CONSOLE $CONFIG_SERIAL_CLPS711X
+   dep_bool '  Use the old 2.4 names for CLPS711X serial port' CONFIG_SERIAL_CLPS711X_OLD_NAME $CONFIG_SERIAL_CLPS711X
 
-  if [ "$CONFIG_SERIAL_AMBA_CONSOLE" = "y" -o \
-       "$CONFIG_SERIAL_CLPS711X_CONSOLE" = "y" -o \
-       "$CONFIG_SERIAL_SA1100_CONSOLE" = "y" -o \
-       "$CONFIG_SERIAL_ANAKIN_CONSOLE" = "y" -o \
-       "$CONFIG_SERIAL_8250_CONSOLE" = "y" ]; then
-     define_bool CONFIG_SERIAL_CORE_CONSOLE y
-  fi
+   dep_tristate 'DC21285 serial port support' CONFIG_SERIAL_21285 $CONFIG_FOOTBRIDGE
+   dep_bool '  Use /dev/ttyS0 device (OBSOLETE)' CONFIG_SERIAL_21285_OLD $CONFIG_SERIAL_21285 $CONFIG_OBSOLETE
+   dep_bool '  Console on DC21285 serial port' CONFIG_SERIAL_21285_CONSOLE $CONFIG_SERIAL_21285
+
+   dep_bool 'Excalibur serial port (uart00) support' CONFIG_SERIAL_UART00 $CONFIG_ARCH_CAMELOT
+   dep_bool '  Support for console on Excalibur serial port' CONFIG_SERIAL_UART00_CONSOLE $CONFIG_SERIAL_UART00
+
+   dep_bool 'SA1100 serial port support' CONFIG_SERIAL_SA1100 $CONFIG_ARCH_SA1100
+   dep_bool '  Console on SA1100 serial port' CONFIG_SERIAL_SA1100_CONSOLE $CONFIG_SERIAL_SA1100
+fi
+
+if [ "$CONFIG_SERIAL_AMBA" = "y"   -o "$CONFIG_SERIAL_CLPS711X" = "y" -o \
+     "$CONFIG_SERIAL_21285" = "y"  -o "$CONFIG_SERIAL_SA1100" = "y" -o \
+     "$CONFIG_SERIAL_ANAKIN" = "y" -o "$CONFIG_SERIAL_UART00" = "y" -o \
+     "$CONFIG_SERIAL_8250" = "y"   -o "$CONFIG_SERIAL_ROCKETPORT" = "y" ]; then
+   define_bool CONFIG_SERIAL_CORE y
+else
+   if [ "$CONFIG_SERIAL_AMBA" = "m"   -o "$CONFIG_SERIAL_CLPS711X" = "m" -o \
+        "$CONFIG_SERIAL_21285" = "m"  -o "$CONFIG_SERIAL_SA1100" = "m" -o \
+        "$CONFIG_SERIAL_ANAKIN" = "m" -o "$CONFIG_SERIAL_UART00" = "m" -o \
+        "$CONFIG_SERIAL_8250" = "m"   -o "$CONFIG_SERIAL_ROCKETPORT" = "m" ]; then
+      define_bool CONFIG_SERIAL_CORE m
+   fi
 fi
+if [ "$CONFIG_SERIAL_AMBA_CONSOLE" = "y" -o \
+     "$CONFIG_SERIAL_CLPS711X_CONSOLE" = "y" -o \
+     "$CONFIG_SERIAL_21285_CONSOLE" = "y" -o \
+     "$CONFIG_SERIAL_SA1100_CONSOLE" = "y" -o \
+     "$CONFIG_SERIAL_ANAKIN_CONSOLE" = "y" -o \
+     "$CONFIG_SERIAL_UART00_CONSOLE" = "y" -o \
+     "$CONFIG_SERIAL_8250_CONSOLE" = "y" ]; then
+   define_bool CONFIG_SERIAL_CORE_CONSOLE y
+fi
+
 endmenu

Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/serial/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile	12 Apr 2002 21:19:31 -0000	1.10
+++ Makefile	18 Jun 2002 22:41:07 -0000	1.11
@@ -1,25 +1,11 @@
 #
 # Makefile for the kernel serial 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..
-#
 #  $Id$
 #
 
-O_TARGET := serial.o
-
 export-objs	:= serial_core.o serial_8250.o
-obj-y		:=
-obj-m		:=
-obj-n		:=
-obj-		:=
 
-obj-$(CONFIG_UART)              += serial_core.o
 serial-8250-y :=
 serial-8250-$(CONFIG_PCI) += serial_8250_pci.o
 serial-8250-$(CONFIG_ISAPNP) += serial_8250_pnp.o
@@ -31,8 +17,6 @@
 obj-$(CONFIG_SERIAL_CLPS711X) += serial_clps711x.o
 obj-$(CONFIG_SERIAL_SA1100) += serial_sa1100.o
 obj-$(CONFIG_SERIAL_UART00) += serial_uart00.o
+obj-$(CONFIG_SERIAL_ROCKET) += rocket.o
 
 include $(TOPDIR)/Rules.make
-
-fastdep:
-

Index: serial_21285.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/serial/serial_21285.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serial_21285.c	14 Mar 2002 20:02:07 -0000	1.10
+++ serial_21285.c	18 Jun 2002 22:41:07 -0000	1.11
@@ -56,6 +56,9 @@
 static struct tty_driver normal, callout;
 static const char serial21285_name[] = "Footbridge UART";
 
+#define tx_enabled(port)	((port)->unused[0])
+#define rx_enabled(port)	((port)->unused[1])
+
 /*
  * The documented expression for selecting the divisor is:
  *  BAUD_BASE / baud - 1
@@ -70,18 +73,39 @@
 static void
 serial21285_stop_tx(struct uart_port *port, unsigned int tty_stop)
 {
-	disable_irq(IRQ_CONTX);
+	unsigned long flags;
+
+	spin_lock_irqsave(&port->lock, flags);
+	if (tx_enabled(port)) {
+		disable_irq(IRQ_CONTX);
+		tx_enabled(port) = 0;
+	}
+	spin_unlock_irqrestore(&port->lock, flags);
 }
 
 static void
 serial21285_start_tx(struct uart_port *port, unsigned int tty_start)
 {
-	enable_irq(IRQ_CONTX);
+	unsigned long flags;
+
+	spin_lock_irqsave(&port->lock, flags);
+	if (!tx_enabled(port)) {
+		enable_irq(IRQ_CONTX);
+		tx_enabled(port) = 1;
+	}
+	spin_unlock_irqrestore(&port->lock, flags);
 }
 
 static void serial21285_stop_rx(struct uart_port *port)
 {
-	disable_irq(IRQ_CONRX);
+	unsigned long flags;
+
+	spin_lock_irqsave(&port->lock, flags);
+	if (rx_enabled(port)) {
+		disable_irq(IRQ_CONRX);
+		rx_enabled(port) = 0;
+	}
+	spin_unlock_irqrestore(&port->lock, flags);
 }
 
 static void serial21285_enable_ms(struct uart_port *port)
@@ -95,7 +119,7 @@
 	unsigned int status, ch, rxs, max_count = 256;
 
 	status = *CSR_UARTFLG;
-	while (status & 0x10 && max_count--) {
+	while (!(status & 0x10) && max_count--) {
 		if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
 			tty->flip.tqueue.routine((void *)tty);
 			if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
@@ -214,6 +238,9 @@
 {
 	int ret;
 
+	tx_enabled(port) = 1;
+	rx_enabled(port) = 1;
+
 	ret = request_irq(IRQ_CONRX, serial21285_rx_chars, 0,
 			  serial21285_name, port);
 	if (ret == 0) {
@@ -222,6 +249,7 @@
 		if (ret)
 			free_irq(IRQ_CONRX, port);
 	}
+
 	return ret;
 }
 
@@ -282,6 +310,8 @@
 	if ((cflag & CREAD) == 0)
 		port->ignore_status_mask |= RXSTAT_DUMMY_READ;
 
+	quot -= 1;
+
 	*CSR_UARTCON = 0;
 	*CSR_L_UBRLCR = quot & 0xff;
 	*CSR_M_UBRLCR = (quot >> 8) & 0x0f;
@@ -358,7 +388,7 @@
 
 static void serial21285_setup_ports(void)
 {
-	serial21285_port.uartclk = mem_fclk_21285 / 16;
+	serial21285_port.uartclk = mem_fclk_21285 / 4;
 }
 
 #ifdef CONFIG_SERIAL_21285_CONSOLE
@@ -369,16 +399,16 @@
 {
 	int i;
 
-	disable_irq(IRQ_CONTX);
 	for (i = 0; i < count; i++) {
-		while (*CSR_UARTFLG & 0x20);
+		while (*CSR_UARTFLG & 0x20)
+			barrier();
 		*CSR_UARTDR = s[i];
 		if (s[i] == '\n') {
-			while (*CSR_UARTFLG & 0x20);
+			while (*CSR_UARTFLG & 0x20)
+				barrier();
 			*CSR_UARTDR = '\r';
 		}
 	}
-	enable_irq(IRQ_CONTX);
 }
 
 static kdev_t serial21285_console_device(struct console *c)
@@ -390,6 +420,36 @@
 serial21285_get_options(struct uart_port *port, int *baud,
 			int *parity, int *bits)
 {
+	if (*CSR_UARTCON == 1) {
+		unsigned int tmp;
+
+		tmp = *CSR_H_UBRLCR;
+		switch (tmp & 0x60) {
+		case 0x00:
+			*bits = 5;
+			break;
+		case 0x20:
+			*bits = 6;
+			break;
+		case 0x40:
+			*bits = 7;
+			break;
+		default:
+		case 0x60:
+			*bits = 8;
+			break;
+		}
+
+		if (tmp & H_UBRLCR_PARENB) {
+			*parity = 'o';
+			if (tmp & H_UBRLCR_PAREVN)
+				*parity = 'e';
+		}
+
+		tmp = *CSR_L_UBRLCR | (*CSR_M_UBRLCR << 8);
+
+		*baud = port->uartclk / (16 * (tmp + 1));
+	}
 }
 
 static int __init serial21285_console_setup(struct console *co, char *options)

Index: serial_8250.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/serial/serial_8250.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serial_8250.c	14 Mar 2002 20:02:07 -0000	1.15
+++ serial_8250.c	18 Jun 2002 22:41:07 -0000	1.16
@@ -1108,18 +1108,18 @@
 	 */
 	serial_outp(up, UART_LCR, UART_LCR_WLEN8);
 
-	spin_lock_irqsave(&port->lock, flags);
+	spin_lock_irqsave(&up->port.lock, flags);
 	if (up->port.flags & ASYNC_FOURPORT) {
 		if (!is_real_interrupt(up->port.irq))
-			port->mctrl |= TIOCM_OUT1;
+			up->port.mctrl |= TIOCM_OUT1;
 	} else
 		/*
 		 * Most PC uarts need OUT2 raised to enable interrupts.
 		 */
 		if (is_real_interrupt(up->port.irq))
-			port->mctrl |= TIOCM_OUT2;
+			up->port.mctrl |= TIOCM_OUT2;
 
-	serial8250_set_mctrl(&up->port, port->mctrl);
+	serial8250_set_mctrl(&up->port, up->port.mctrl);
 	spin_unlock_irqrestore(&up->port.lock, flags);
 
 	/*
@@ -1162,15 +1162,15 @@
 	up->ier = 0;
 	serial_outp(up, UART_IER, 0);
 
-	spin_lock_irqsave(&port->lock, flags);
+	spin_lock_irqsave(&up->port.lock, flags);
 	if (up->port.flags & ASYNC_FOURPORT) {
 		/* reset interrupts on the AST Fourport board */
 		inb((up->port.iobase & 0xfe0) | 0x1f);
-		port->mctrl |= TIOCM_OUT1;
+		up->port.mctrl |= TIOCM_OUT1;
 	} else
-		port->mctrl &= ~TIOCM_OUT2;
+		up->port.mctrl &= ~TIOCM_OUT2;
 
-	serial8250_set_mctrl(&up->port, port->mctrl);
+	serial8250_set_mctrl(&up->port, up->port.mctrl);
 	spin_unlock_irqrestore(&up->port.lock, flags);
 
 	/*
@@ -1631,8 +1631,6 @@
 		serial8250_ports[i].port.uartclk = old_serial_port[i].base_baud * 16;
 		serial8250_ports[i].port.flags   = old_serial_port[i].flags;
 		serial8250_ports[i].port.ops     = &serial8250_pops;
-		init_timer(&serial8250_ports[i].timer);
-		serial8250_ports[i].timer.function = serial8250_timeout;
 	}
 }
 
@@ -1644,6 +1642,9 @@
 
 	for (i = 0; i < UART_NR; i++) {
 		serial8250_ports[i].port.line = i;
+		serial8250_ports[i].port.ops = &serial8250_pops;
+		init_timer(&serial8250_ports[i].timer);
+		serial8250_ports[i].timer.function = serial8250_timeout;
 		uart_add_one_port(drv, &serial8250_ports[i].port);
 	}
 }

Index: serial_clps711x.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/serial/serial_clps711x.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serial_clps711x.c	14 Mar 2002 20:02:07 -0000	1.13
+++ serial_clps711x.c	18 Jun 2002 22:41:07 -0000	1.14
@@ -45,6 +45,7 @@
 #include <linux/serial.h>
 #include <linux/console.h>
 #include <linux/sysrq.h>
+#include <linux/spinlock.h>
 
 #include <asm/bitops.h>
 #include <asm/hardware.h>
@@ -63,6 +64,7 @@
 
 #define UART_NR		2
 
+#ifndef CONFIG_SERIAL_CLPS711X_OLD_NAME
 #define SERIAL_CLPS711X_NAME	"ttyCL"
 #define SERIAL_CLPS711X_MAJOR	204
 #define SERIAL_CLPS711X_MINOR	40
@@ -72,6 +74,18 @@
 #define CALLOUT_CLPS711X_MAJOR	205
 #define CALLOUT_CLPS711X_MINOR	40
 #define CALLOUT_CLPS711X_NR	UART_NR
+#else
+#warning The old names/device number for this driver if compatabity is needed
+#define SERIAL_CLPS711X_NAME    "ttyAM"
+#define SERIAL_CLPS711X_MAJOR   204
+#define SERIAL_CLPS711X_MINOR   16
+#define SERIAL_CLPS711X_NR      UART_NR
+
+#define CALLOUT_CLPS711X_NAME   "cuaam"
+#define CALLOUT_CLPS711X_MAJOR  205
+#define CALLOUT_CLPS711X_MINOR  16
+#define CALLOUT_CLPS711X_NR     UART_NR
+#endif
 
 static struct tty_driver normal, callout;
 
@@ -88,16 +102,32 @@
 
 #define UART_ANY_ERR		(UARTDR_FRMERR | UARTDR_PARERR | UARTDR_OVERR)
 
+#define tx_enabled(port)	((port)->unused[0])
+
 static void
 clps711xuart_stop_tx(struct uart_port *port, unsigned int tty_stop)
 {
-	disable_irq(TX_IRQ(port));
+	unsigned long flags;
+
+	spin_lock_irqsave(&port->lock, flags);
+	if (tx_enabled(port)) {
+		disable_irq(TX_IRQ(port));
+		tx_enabled(port) = 0;
+	}
+	spin_unlock_irqrestore(&port->lock, flags);
 }
 
 static void
 clps711xuart_start_tx(struct uart_port *port, unsigned int tty_start)
 {
-	enable_irq(TX_IRQ(port));
+	unsigned long flags;
+
+	spin_lock_irqsave(&port->lock, flags);
+	if (!tx_enabled(port)) {
+		enable_irq(TX_IRQ(port));
+		tx_enabled(port) = 1;
+	}
+	spin_unlock_irqrestore(&port->lock, flags);
 }
 
 static void clps711xuart_stop_rx(struct uart_port *port)
@@ -268,6 +298,8 @@
 {
 	unsigned int syscon;
 	int retval;
+
+	tx_enabled(port) = 1;
 
 	/*
 	 * Allocate the IRQs

Index: serial_core.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/serial/serial_core.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- serial_core.c	12 Apr 2002 21:28:20 -0000	1.21
+++ serial_core.c	18 Jun 2002 22:41:07 -0000	1.22
@@ -538,9 +538,13 @@
 	struct uart_info *info = tty->driver_data;
 	struct uart_port *port = info->port;
 
-	port->x_char = ch;
-	if (ch)
-		port->ops->start_tx(port, 0);
+	if (port->ops->send_xchar)
+		port->ops->send_xchar(port, ch);
+	else {
+		port->x_char = ch;
+		if (ch)
+			port->ops->start_tx(port, 0);
+	}
 }
 
 static void uart_throttle(struct tty_struct *tty)
@@ -1844,6 +1848,26 @@
 		*flow = *s;
 }
 
+struct baud_rates {
+	unsigned int rate;
+	unsigned int cflag;
+};
+
+static struct baud_rates baud_rates[] = {
+	{ 921600, B921600 },
+	{ 460800, B460800 },
+	{ 230400, B230400 },
+	{ 115200, B115200 },
+	{  57600, B57600  },
+	{  38400, B38400  },
+	{  19200, B19200  },
+	{   9600, B9600   },
+	{   4800, B4800   },
+	{   2400, B2400   },
+	{   1200, B1200   },
+	{      0, B38400  }
+};
+
 /**
  *	uart_set_options - setup the serial console parameters
  *	@port: pointer to the serial ports uart_port structure
@@ -1859,43 +1883,16 @@
 {
 	unsigned int cflag = CREAD | HUPCL | CLOCAL;
 	unsigned int quot;
+	int i;
 
 	/*
 	 * Construct a cflag setting.
 	 */
-	switch (baud) {
-	case 1200:
-		cflag |= B1200;
-		break;
-	case 2400:
-		cflag |= B2400;
-		break;
-	case 4800:
-		cflag |= B4800;
-		break;
-	case 9600:
-		cflag |= B9600;
-		break;
-	case 19200:
-		cflag |= B19200;
-		break;
-	default:
-		cflag |= B38400;
-		baud = 38400;
-		break;
-	case 57600:
-		cflag |= B57600;
-		break;
-	case 115200:
-		cflag |= B115200;
-		break;
-	case 230400:
-		cflag |= B230400;
-		break;
-	case 460800:
-		cflag |= B460800;
-		break;
-	}
+	for (i = 0; baud_rates[i].rate; i++)
+		if (baud_rates[i].rate <= baud)
+			break;
+
+	cflag |= baud_rates[i].cflag;
 
 	if (bits == 7)
 		cflag |= CS7;
@@ -2573,8 +2570,6 @@
 EXPORT_SYMBOL(uart_unregister_driver);
 EXPORT_SYMBOL(uart_register_port);
 EXPORT_SYMBOL(uart_unregister_port);
-EXPORT_SYMBOL(uart_remove_one_port);
-EXPORT_SYMBOL(uart_add_one_port);
 
 MODULE_DESCRIPTION("Serial driver core");
 MODULE_LICENSE("GPL");

Index: serial_sa1100.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/serial/serial_sa1100.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serial_sa1100.c	14 Mar 2002 20:02:07 -0000	1.18
+++ serial_sa1100.c	18 Jun 2002 22:41:07 -0000	1.19
@@ -803,7 +803,7 @@
 sa1100_console_setup(struct console *co, char *options)
 {
 	struct sa1100_port *sport;
-	int baud = CONFIG_SA1100_DEFAULT_BAUDRATE;
+	int baud = 9600;
 	int bits = 8;
 	int parity = 'n';
 	int flow = 'n';

[Linuxconsole-commit]CVS: ruby/linux/include/linux serial_core.h,1.12,1.13

From: James S. <jsi...@us...> - 2002-06-18 22:41:10

Update of /cvsroot/linuxconsole/ruby/linux/include/linux
In directory usw-pr-cvs1:/tmp/cvs-serv17900/include/linux

Modified Files:
	serial_core.h 
Log Message:
Synced up with Russell Kings work fo rth enew serial stuff.

Index: serial_core.h
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/include/linux/serial_core.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serial_core.h	14 Mar 2002 20:02:07 -0000	1.12
+++ serial_core.h	18 Jun 2002 22:41:07 -0000	1.13
@@ -72,6 +72,7 @@
 	unsigned int	(*get_mctrl)(struct uart_port *);
 	void		(*stop_tx)(struct uart_port *, unsigned int tty_stop);
 	void		(*start_tx)(struct uart_port *, unsigned int tty_start);
+	void		(*send_xchar)(struct uart_port *, char ch);
 	void		(*stop_rx)(struct uart_port *);
 	void		(*enable_ms)(struct uart_port *);
 	void		(*break_ctl)(struct uart_port *, int ctl);

[Linuxconsole-commit]CVS: ruby/linux/drivers/char Config.in,1.40,1.41 Makefile,1.43,1.44 sysrq.c,1.21,1.22

From: James S. <jsi...@us...> - 2002-06-18 18:51:59

Update of /cvsroot/linuxconsole/ruby/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv13236/linux/drivers/char

Modified Files:
	Config.in Makefile sysrq.c 
Log Message:
Synced to 2.5.22

Index: Config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/Config.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- Config.in	4 Jun 2002 19:45:08 -0000	1.40
+++ Config.in	18 Jun 2002 18:51:55 -0000	1.41
@@ -47,7 +47,7 @@
    if [ "$CONFIG_DIGIEPCA" = "n" ]; then
       tristate '  Digiboard PC/Xx Support' CONFIG_DIGI
    fi
-   tristate '  Hayes ESP serial port support' CONFIG_ESPSERIAL
+   dep_tristate '  Hayes ESP serial port support' CONFIG_ESPSERIAL $CONFIG_ISA
    tristate '  Moxa Intellio support' CONFIG_MOXA_INTELLIO
    tristate '  Moxa SmartIO support' CONFIG_MOXA_SMARTIO
    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then

Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/Makefile,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- Makefile	15 Jun 2002 19:17:09 -0000	1.43
+++ Makefile	18 Jun 2002 18:51:55 -0000	1.44
@@ -17,8 +17,6 @@
 			sonypi.o tty_io.o tty_ioctl.o generic_serial.o rtc.o \
 			ip2main.o
 
-mod-subdirs	:=	ftape drm pcmcia
-
 ifeq ($(CONFIG_DECSTATION),y)
   SERIAL   = decserial.o
 endif

Index: sysrq.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/char/sysrq.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- sysrq.c	25 May 2002 20:32:02 -0000	1.21
+++ sysrq.c	18 Jun 2002 18:51:55 -0000	1.22
@@ -111,11 +111,9 @@
 
 /* do_emergency_sync helper function */
 /* Guesses if the device is a local hard drive */
-static int is_local_disk(kdev_t dev) {
-	unsigned int major;
-	major = major(dev);
-
-	switch (major) {
+static int is_local_disk(struct block_device *bdev)
+{
+	switch (MAJOR(bdev->bd_dev)) {
 	case IDE0_MAJOR:
 	case IDE1_MAJOR:
 	case IDE2_MAJOR:
@@ -149,7 +147,7 @@
 	console_loglevel = 7;
 	printk(KERN_INFO "%sing device %s ... ",
 	       remount_flag ? "Remount" : "Sync",
-	       kdevname(sb->s_dev));
+	       sb->s_id);
 
 	if (remount_flag) { /* Remount R/O */
 		int ret, flags;
@@ -208,13 +206,13 @@
 	for (sb = sb_entry(super_blocks.next);
 	     sb != sb_entry(&super_blocks); 
 	     sb = sb_entry(sb->s_list.next))
-		if (is_local_disk(sb->s_dev))
+		if (sb->s_bdev && is_local_disk(sb->s_bdev))
 			go_sync(sb, remount_flag);
 
 	for (sb = sb_entry(super_blocks.next);
 	     sb != sb_entry(&super_blocks); 
 	     sb = sb_entry(sb->s_list.next))
-		if (!is_local_disk(sb->s_dev) && major(sb->s_dev))
+		if (sb->s_bdev && !is_local_disk(sb->s_bdev))
 			go_sync(sb, remount_flag);
 
 	unlock_kernel();
@@ -331,22 +329,6 @@
 	action_msg:	"Kill All Tasks",
 };
 
-#ifdef CONFIG_SOFTWARE_SUSPEND
-static void sysrq_handle_swsusp(int key, struct pt_regs *pt_regs,
-		struct kbd_struct *kbd, struct tty_struct *tty) {
-        if(!software_suspend_enabled) {
-		printk("Software Suspend is not possible now\n");
-		return;
-	}
-	software_suspend();
-}
-static struct sysrq_key_op sysrq_swsusp_op = {
-	handler:	sysrq_handle_swsusp,
-	help_msg:	"suspenD",
-	action_msg:	"Software suspend\n",
-};
-#endif
-
 /* END SIGNAL SYSRQ HANDLERS BLOCK */
 
 
@@ -369,11 +351,7 @@
 		 and will never arive */
 /* b */	&sysrq_reboot_op,
 /* c */	NULL,
-#ifdef CONFIG_SOFTWARE_SUSPEND
-/* d */	&sysrq_swsusp_op,
-#else
 /* d */	NULL,
-#endif
 /* e */	&sysrq_term_op,
 /* f */	NULL,
 /* g */	NULL,
@@ -399,7 +377,7 @@
 /* v */	NULL,
 /* w */	NULL,
 /* x */	NULL,
-/* w */	NULL,
+/* y */	NULL,
 /* z */	NULL
 };

[Linuxconsole-commit]CVS: ruby/linux/drivers/input/joystick Makefile,1.6,1.7

From: James S. <jsi...@us...> - 2002-06-18 18:51:59

Update of /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick
In directory usw-pr-cvs1:/tmp/cvs-serv13236/linux/drivers/input/joystick

Modified Files:
	Makefile 
Log Message:
Synced to 2.5.22

Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	25 May 2002 20:32:03 -0000	1.6
+++ Makefile	18 Jun 2002 18:51:55 -0000	1.7
@@ -2,8 +2,6 @@
 # Makefile for the input core drivers.
 #
 
-mod-subdirs	:= iforce
-
 # Each configuration option enables a list of files.
 
 obj-$(CONFIG_JOYSTICK_A3D)		+= a3d.o

[Linuxconsole-commit]CVS: ruby/linux/drivers/input Makefile,1.50,1.51

From: James S. <jsi...@us...> - 2002-06-18 18:51:59

Update of /cvsroot/linuxconsole/ruby/linux/drivers/input
In directory usw-pr-cvs1:/tmp/cvs-serv13236/linux/drivers/input

Modified Files:
	Makefile 
Log Message:
Synced to 2.5.22

Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/Makefile,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- Makefile	3 Jun 2002 22:44:57 -0000	1.50
+++ Makefile	18 Jun 2002 18:51:55 -0000	1.51
@@ -4,7 +4,6 @@
 
 # Objects that export symbols.
 
-mod-subdirs	:= joystick keyboard mouse touchscreen 
 export-objs	:= input.o
 
 # Each configuration option enables a list of files.

[Linuxconsole-commit]CVS: ruby/linux/drivers/video cfbimgblt.c,1.15,1.16 cfbfillrect.c,1.11,NONE

From: James S. <jsi...@us...> - 2002-06-18 18:51:59

Update of /cvsroot/linuxconsole/ruby/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv13236/linux/drivers/video

Modified Files:
	cfbimgblt.c 
Removed Files:
	cfbfillrect.c 
Log Message:
Synced to 2.5.22

Index: cfbimgblt.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/cfbimgblt.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- cfbimgblt.c	15 Jun 2002 19:17:10 -0000	1.15
+++ cfbimgblt.c	18 Jun 2002 18:51:55 -0000	1.16
@@ -98,7 +98,7 @@
 				end_mask = 0;
 		
 				for (k = ppw; k > 0; k--) {	
-					if (test_bit(l, src))
+					if (test_bit(l, (unsigned long *) src))
 						end_mask |= (tmp >> (p->var.bits_per_pixel*(k-1)));
 					l--;
 					if (l < 0) { l = 7; src++; }
@@ -110,7 +110,7 @@
 			if (n) {
 				end_mask = 0;	
 				for (j = n; j > 0; j--) {
-					if (test_bit(l, src))
+					if (test_bit(l, (unsigned long *) src))
 						end_mask |= (tmp >> (p->var.bits_per_pixel*(j-1)));
 					l--;
 					if (l < 0) { l = 7; src++; }

--- cfbfillrect.c DELETED ---

[Linuxconsole-commit]CVS: ruby/linux/drivers/usb/input aiptek.c,NONE,1.1 Config.help,1.1,1.2 Config.in,1.4,1.5 Makefile,1.4,1.5

From: James S. <jsi...@us...> - 2002-06-18 18:51:59

Update of /cvsroot/linuxconsole/ruby/linux/drivers/usb/input
In directory usw-pr-cvs1:/tmp/cvs-serv13236/linux/drivers/usb/input

Modified Files:
	Config.help Config.in Makefile 
Added Files:
	aiptek.c 
Log Message:
Synced to 2.5.22

--- NEW FILE: aiptek.c ---
/*
 *  Native support for the Aiptek 8000U
 *
 *  Copyright (c) 2001 Chris Atenasio		<ch...@cr...>
 *
 *  based on wacom.c by
 *     Vojtech Pavlik      <vo...@su...>
 *     Andreas Bach Aaen   <ab...@st...>
 *     Clifford Wolf       <cli...@cl...>
 *     Sam Mosel           <sam...@co...>
 *     James E. Blair      <co...@gn...>
 *     Daniel Egger        <eg...@su...>
 *
 *
 *  Many thanks to Oliver Kuechemann for his support.
 *
 *  ChangeLog:
 *      v0.1 - Initial release
 *      v0.2 - Hack to get around fake event 28's.
 *      v0.3 - Make URB dynamic (Bryan W. Headley, Jun-8-2002)
 *             (kernel 2.5.x variant, June-14-2002)
 */

/*
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */

#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/input.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/usb.h>

/*
 * Version Information
 */
#define DRIVER_VERSION "v0.3"
#define DRIVER_AUTHOR "Chris Atenasio <ch...@cr...>"
#define DRIVER_DESC "USB Aiptek 6000U/8000U tablet driver (Linux 2.5.x)"

MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");

/*
 * Aiptek status packet:
 *
 *        bit7  bit6  bit5  bit4  bit3  bit2  bit1  bit0
 * byte0   0     0     0     0     0     0     1     0
 * byte1  X7    X6    X5    X4    X3    X2    X1    X0
 * byte2  X15   X14   X13   X12   X11   X10   X9    X8
 * byte3  Y7    Y6    Y5    Y4    Y3    Y2    Y1    Y0
 * byte4  Y15   Y14   Y13   Y12   Y11   Y10   Y9    Y8
 * byte5   *     *     *    BS2   BS1   Tip   DV    IR
 * byte6  P7    P6    P5    P4    P3    P2    P1    P0
 * byte7  P15   P14   P13   P12   P11   P10   P9    P8
 *
 * IR: In Range = Proximity on
 * DV = Data Valid
 *
 * 
 * Command Summary:
 *
 * Command/Data    Description     Return Bytes    Return Value
 * 0x10/0x00       SwitchToMouse       0
 * 0x10/0x01       SwitchToTablet      0
 * 0x18/0x04       Resolution500LPI    0
 * 0x17/0x00       FilterOn            0
 * 0x12/0xFF       AutoGainOn          0
 * 0x01/0x00       GetXExtension       2           MaxX
 * 0x01/0x01       GetYExtension       2           MaxY
 * 0x02/0x00       GetModelCode        2           ModelCode = LOBYTE
 * 0x03/0x00       GetODMCode          2           ODMCode
 * 0x08/0x00       GetPressureLevels   2           =512
 * 0x04/0x00       GetFirmwareVersion  2           Firmware Version
 *
 *
 * To initialize the tablet:
 *
 * (1) Send command Resolution500LPI
 * (2) Option Commands (GetXExtension, GetYExtension)
 * (3) Send command SwitchToTablet
 */

#define USB_VENDOR_ID_AIPTEK   0x08ca

struct aiptek_features {
	char *name;
	int pktlen;
	int x_max;
	int y_max;
	int pressure_min;
	int pressure_max;
	void (*irq) (struct urb * urb);
	unsigned long evbit;
	unsigned long absbit;
	unsigned long relbit;
	unsigned long btnbit;
	unsigned long digibit;
};

struct aiptek {
	signed char data[10];
	struct input_dev dev;
	struct usb_device *usbdev;
	struct urb *irq;
	struct aiptek_features *features;
	int tool;
	int open;
};

static void
aiptek_irq(struct urb *urb)
{
	struct aiptek *aiptek = urb->context;
	unsigned char *data = aiptek->data;
	struct input_dev *dev = &aiptek->dev;
	int x;
	int y;
	int pressure;
	int proximity;

	if (urb->status)
		return;

	if ((data[0] & 2) == 0) {
		dbg("received unknown report #%d", data[0]);
	}

	proximity = data[5] & 0x01;
	input_report_key(dev, BTN_TOOL_PEN, proximity);

	x = ((__u32) data[1]) | ((__u32) data[2] << 8);
	y = ((__u32) data[3]) | ((__u32) data[4] << 8);
	pressure = ((__u32) data[6]) | ((__u32) data[7] << 8);
	pressure -= aiptek->features->pressure_min;

	if (pressure < 0) {
		pressure = 0;
	}

	if (proximity) {
		input_report_abs(dev, ABS_X, x);
		input_report_abs(dev, ABS_Y, y);
		input_report_abs(dev, ABS_PRESSURE, pressure);
		input_report_key(dev, BTN_TOUCH, data[5] & 0x04);
		input_report_key(dev, BTN_STYLUS, data[5] & 0x08);
		input_report_key(dev, BTN_STYLUS2, data[5] & 0x10);
	}

}

struct aiptek_features aiptek_features[] = {
	{"Aiptek 6000U/8000U",
	 8, 3000, 2250, 26, 511, aiptek_irq, 0, 0, 0, 0},
	{NULL, 0}
};

struct usb_device_id aiptek_ids[] = {
	{USB_DEVICE(USB_VENDOR_ID_AIPTEK, 0x20), driver_info:0},
	{}
};

MODULE_DEVICE_TABLE(usb, aiptek_ids);

static int
aiptek_open(struct input_dev *dev)
{
	struct aiptek *aiptek = dev->private;

	if (aiptek->open++)
		return 0;

	aiptek->irq->dev = aiptek->usbdev;
	if (usb_submit_urb(aiptek->irq, GFP_KERNEL))
		return -EIO;

	return 0;
}

static void
aiptek_close(struct input_dev *dev)
{
	struct aiptek *aiptek = dev->private;

	if (!--aiptek->open)
		usb_unlink_urb(aiptek->irq);
}

static void
aiptek_command(struct usb_device *dev, unsigned int ifnum,
	       unsigned char command, unsigned char data)
{
	__u8 buf[3];

	buf[0] = 4;
	buf[1] = command;
	buf[2] = data;

	/* 
	 * FIXME, either remove this call, or talk the maintainer into 
	 * adding it back into the core.
	 */
#if 0
	if (usb_set_report(dev, ifnum, 3, 2, buf, 3) != 3) {
		dbg("aiptek_command: 0x%x 0x%x\n", command, data);
	}
#endif
}

static void*
aiptek_probe(struct usb_device *dev, unsigned int ifnum,
	     const struct usb_device_id *id)
{
	struct usb_endpoint_descriptor *endpoint;
	struct aiptek *aiptek;

	if (!(aiptek = kmalloc(sizeof (struct aiptek), GFP_KERNEL)))
		return NULL;

	memset(aiptek, 0, sizeof (struct aiptek));

    aiptek->irq = usb_alloc_urb(0, GFP_KERNEL);
    if (!aiptek->irq) {
        kfree(aiptek);
        return NULL;
    }

	// Resolution500LPI
	aiptek_command(dev, ifnum, 0x18, 0x04);

	// SwitchToTablet
	aiptek_command(dev, ifnum, 0x10, 0x01);

	aiptek->features = aiptek_features + id->driver_info;

	aiptek->dev.evbit[0] |= BIT(EV_KEY) | BIT(EV_ABS) | BIT(EV_MSC) |
	    aiptek->features->evbit;

	aiptek->dev.absbit[0] |= BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_PRESSURE) |
	    BIT(ABS_MISC) | aiptek->features->absbit;

	aiptek->dev.relbit[0] |= aiptek->features->relbit;

	aiptek->dev.keybit[LONG(BTN_LEFT)] |= BIT(BTN_LEFT) | BIT(BTN_RIGHT) |
	    BIT(BTN_MIDDLE) | aiptek->features->btnbit;

	aiptek->dev.keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_PEN) |
	    BIT(BTN_TOOL_MOUSE) | BIT(BTN_TOUCH) |
	    BIT(BTN_STYLUS) | BIT(BTN_STYLUS2) | aiptek->features->digibit;

	aiptek->dev.mscbit[0] = BIT(MSC_SERIAL);

	aiptek->dev.absmax[ABS_X] = aiptek->features->x_max;
	aiptek->dev.absmax[ABS_Y] = aiptek->features->y_max;
	aiptek->dev.absmax[ABS_PRESSURE] = aiptek->features->pressure_max -
	    aiptek->features->pressure_min;

	aiptek->dev.absfuzz[ABS_X] = 0;
	aiptek->dev.absfuzz[ABS_Y] = 0;

	aiptek->dev.private = aiptek;
	aiptek->dev.open = aiptek_open;
	aiptek->dev.close = aiptek_close;

	aiptek->dev.name = aiptek->features->name;
	aiptek->dev.idbus = BUS_USB;
	aiptek->dev.idvendor = dev->descriptor.idVendor;
	aiptek->dev.idproduct = dev->descriptor.idProduct;
	aiptek->dev.idversion = dev->descriptor.bcdDevice;
	aiptek->usbdev = dev;

	endpoint = dev->config[0].interface[ifnum].altsetting[0].endpoint + 0;

	FILL_INT_URB(aiptek->irq,
		  dev,
		  usb_rcvintpipe(dev, endpoint->bEndpointAddress),
		         aiptek->data,
		  aiptek->features->pktlen,
		         aiptek->features->irq,
		  aiptek,
		  endpoint->bInterval);

	input_register_device(&aiptek->dev);

	printk(KERN_INFO "input%d: %s on usb%d:%d.%d\n",
	       aiptek->dev.number, aiptek->features->name, dev->bus->busnum,
	       dev->devnum, ifnum);

	return aiptek;
}

static void
aiptek_disconnect(struct usb_device *dev, void *ptr)
{
	struct aiptek *aiptek = ptr;
	usb_unlink_urb(aiptek->irq);
	input_unregister_device(&aiptek->dev);
    usb_free_urb(aiptek->irq);
	kfree(aiptek);
}

static struct usb_driver aiptek_driver = {
	name:"aiptek",
	probe:aiptek_probe,
	disconnect:aiptek_disconnect,
	id_table:aiptek_ids,
};

static int __init
aiptek_init(void)
{
	usb_register(&aiptek_driver);
	info(DRIVER_VERSION " " DRIVER_AUTHOR);
	info(DRIVER_DESC);
	return 0;
}

static void __exit
aiptek_exit(void)
{
	usb_deregister(&aiptek_driver);
}

module_init(aiptek_init);
module_exit(aiptek_exit);

Index: Config.help
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/usb/input/Config.help,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Config.help	16 Apr 2002 17:41:51 -0000	1.1
+++ Config.help	18 Jun 2002 18:51:55 -0000	1.2
@@ -79,6 +79,17 @@
 
   If even remotely unsure, say N.
 
+CONFIG_USB_AIPTEK
+  Say Y here if you want to use the USB version of the Aiptek 6000U
+  or Aiptek 8000U tablet.  Make sure to say Y to "Mouse support"
+  (CONFIG_INPUT_MOUSEDEV) and/or "Event interface support"
+  (CONFIG_INPUT_EVDEV) as well.
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called aiptek.o. If you want to compile it as a
+  module, say M here and read <file:Documentation/modules.txt>.
+
 CONFIG_USB_WACOM
   Say Y here if you want to use the USB version of the Wacom Intuos
   or Graphire tablet.  Make sure to say Y to "Mouse support"

Index: Config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/usb/input/Config.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Config.in	26 Apr 2002 17:23:40 -0000	1.4
+++ Config.in	18 Jun 2002 18:51:55 -0000	1.5
@@ -19,5 +19,6 @@
 dep_mbool '  Logitech WingMan Force 3D support' CONFIG_LOGITECH_3D $CONFIG_USB_HID $CONFIG_HID_FF
 dep_mbool '  PID Devices' CONFIG_HID_PID $CONFIG_USB_HID $CONFIG_HID_FF
 
+dep_tristate '  Aiptek 6000U/8000U tablet support' CONFIG_USB_AIPTEK $CONFIG_USB $CONFIG_INPUT
 dep_tristate '  Wacom Intuos/Graphire tablet support' CONFIG_USB_WACOM $CONFIG_USB $CONFIG_INPUT
    

Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/usb/input/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	3 Jun 2002 22:44:58 -0000	1.4
+++ Makefile	18 Jun 2002 18:51:55 -0000	1.5
@@ -28,6 +28,7 @@
 	hid-objs	+= hid-ff.o
 endif
 
+obj-$(CONFIG_USB_AIPTEK)	+= aiptek.o
 obj-$(CONFIG_USB_HID)		+= hid.o
 obj-$(CONFIG_USB_KBD)		+= usbkbd.o
 obj-$(CONFIG_USB_MOUSE)		+= usbmouse.o

[Linuxconsole-commit]CVS: ruby/linux/drivers Makefile,1.34,1.35