Common subdirectories: psxdev-core-2.0.0.org/pccl/CVS and psxdev-core-2.0.0/pccl/CVS
diff -u psxdev-core-2.0.0.org/pccl/Makefile psxdev-core-2.0.0/pccl/Makefile
--- psxdev-core-2.0.0.org/pccl/Makefile	Thu May 17 22:04:29 2001
+++ psxdev-core-2.0.0/pccl/Makefile	Wed May 22 23:06:12 2002
@@ -40,7 +40,18 @@
 #
 VERSION=$(shell uname -r)
 KERNEL=/usr/src/linux
-#KERNEL=/usr/src/linux-$(VERSION)
+HPATH=$(KERNEL)/include
+ARCH=i386
+
+CFLAGS := $(CFLAGS) $(DEFS) -O2 -DMODULE -D__KERNEL__ -I../include -I$(HPATH) \
+	 -Wall -Wstrict-prototypes -fomit-frame-pointer -fno-strict-aliasing 
+
+include $(KERNEL)/.config
+include $(KERNEL)/arch/$(ARCH)/Makefile
+
+ifdef CONFIG_MODVERSIONS
+CFLAGS += -DMODVERSIONS -include $(HPATH)/linux/modversions.h
+endif
 
 # you probably don't want to change this
 #
@@ -49,8 +60,8 @@
 M_OBJS = pccl.o
 EXTRA_CFLAGS = -DPCCL_WITH_PROCFS
 
-install: remove_from_etc_conf_modules add_to_etc_conf_modules
-	-@DIR=`pwd` && (cd $(KERNEL) && make SUBDIRS=$$DIR modules) 2>&1 > /dev/null
+all: $(M_OBJS);
+#	-@DIR=`pwd` && (cd $(KERNEL) && make SUBDIRS=$$DIR modules) 2>&1 > /dev/null
 	@install -m 644 -g 0 -o 0 $(M_OBJS) /lib/modules/$(VERSION)/misc/$(M_OBJS)
 	@install -m 644 -g 0 -o 0 pccl.h $(PSXDEV)/include/pccl.h 
 	-@for dev in 0 1 2 3; do \
Only in psxdev-core-2.0.0/pccl: Makefile.orig
diff -u psxdev-core-2.0.0.org/pccl/pccl.c psxdev-core-2.0.0/pccl/pccl.c
--- psxdev-core-2.0.0.org/pccl/pccl.c	Thu May 17 13:51:04 2001
+++ psxdev-core-2.0.0/pccl/pccl.c	Wed May 22 23:05:59 2002
@@ -39,7 +39,7 @@
 #include <linux/errno.h>
 #include <asm/io.h>
 #include <asm/segment.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/ioport.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
@@ -180,7 +180,7 @@
 	outb_p (val, dev->base);
 	while ( inb_p(dev->base+2) & 1 )
 	{
-		if (sigismember(&current->signal, SIGINT)) break;
+		if (sigismember(&current->blocked, SIGINT)) break;
 
 		if (timeout < jiffies)
 		{
@@ -251,7 +251,7 @@
 	{
 		x = pccl_swap_8(dev,'C');
 		if (x == 'd') break;
-		if (sigismember(&current->signal, SIGINT)) return -EINTR;
+		if (sigismember(&current->blocked, SIGINT)) return -EINTR;
 		schedule();
 	}
 
@@ -272,7 +272,7 @@
 	{
 		x = pccl_swap_8(dev,'P');
 		if (x == 'd') break;
-		if (sigismember(&current->signal, SIGINT)) return -EINTR;
+		if (sigismember(&current->blocked, SIGINT)) return -EINTR;
 		schedule();
 	}
 
@@ -383,7 +383,7 @@
 			dev->checksum += buf[i];
 			dev->checksum2 += x;
 
-			if (sigismember(&current->signal, SIGINT)) { size = -EINTR; break; }
+			if (sigismember(&current->blocked, SIGINT)) { size = -EINTR; break; }
 		}
 		
 		err = copy_to_user ((void*)buffer+o,(void*)buf,n);
@@ -441,7 +441,7 @@
 			dev->checksum += buf[i];
 			dev->checksum2 += (short) buf[i];
 
-			if (sigismember(&current->signal, SIGINT)) { size = -EINTR; break; }
+			if (sigismember(&current->blocked, SIGINT)) { size = -EINTR; break; }
 		}
 		
 		o += n;
@@ -1980,7 +1980,7 @@
 			x = pccl_swap_8 (dev,0);
 			checksum += x;
 
-			if (sigismember(&current->signal, SIGINT)) return -EINTR;
+			if (sigismember(&current->blocked, SIGINT)) return -EINTR;
 
 			err = copy_to_user ((void*)buffer+i,(void*)&x,sizeof(u_char));
 			if (err < 0) return err;
@@ -2010,7 +2010,7 @@
 			x = pccl_swap_8 (dev,0);
 			checksum += x;
 
-			if (sigismember(&current->signal, SIGINT)) return -EINTR;
+			if (sigismember(&current->blocked, SIGINT)) return -EINTR;
 
 			err = copy_to_user ((void*)buffer+i,(void*)&x,sizeof(u_char));
 			if (err < 0) return err;
@@ -2074,7 +2074,7 @@
 		{
 			u_char x;
 
-			if (sigismember(&current->signal, SIGINT)) return -EINTR;
+			if (sigismember(&current->blocked, SIGINT)) return -EINTR;
 
 			err = copy_from_user ((void*)&x,(void*)buffer+i,sizeof(u_char));
 			if (err < 0) return err;
@@ -2103,7 +2103,7 @@
 		{
 			u_char x;
 
-			if (sigismember(&current->signal, SIGINT)) return -EINTR;
+			if (sigismember(&current->blocked, SIGINT)) return -EINTR;
 
 			err = copy_from_user ((void*)&x,(void*)buffer+i,sizeof(u_char));
 			if (err < 0) return err;
@@ -2320,7 +2320,7 @@
 				x = pccl_swap_8 (dev,0);
 				checksum += x;
 
-				if (sigismember(&current->signal, SIGINT)) return -EINTR;
+				if (sigismember(&current->blocked, SIGINT)) return -EINTR;
 
 				err = copy_to_user ((void*)(buffer+i+shift),(void*)&x,sizeof(u_char));
 				if (err < 0) return err;
@@ -2350,7 +2350,7 @@
 				x = pccl_swap_8 (dev,0);
 				checksum += x;
 
-				if (sigismember(&current->signal, SIGINT)) return -EINTR;
+				if (sigismember(&current->blocked, SIGINT)) return -EINTR;
 
 				err = copy_to_user ((void*)(buffer+i+shift),(void*)&x,sizeof(u_char));
 				if (err < 0) return err;
@@ -2428,7 +2428,7 @@
 			{
 				u_char x;
 
-				if (sigismember(&current->signal, SIGINT)) return -EINTR;
+				if (sigismember(&current->blocked, SIGINT)) return -EINTR;
 
 				err = copy_from_user ((void*)&x,(void*)buffer+i+shift,sizeof(u_char));
 				if (err < 0) return err;
@@ -2457,7 +2457,7 @@
 			{
 				u_char x;
 
-				if (sigismember(&current->signal, SIGINT)) return -EINTR;
+				if (sigismember(&current->blocked, SIGINT)) return -EINTR;
 
 				err = copy_from_user ((void*)&x,(void*)buffer+i+shift,sizeof(u_char));
 				if (err < 0) return err;
@@ -2605,7 +2605,7 @@
 
 				x = __arch__swab16 (pccl_swap_16 (dev,0));
 
-				if (sigismember(&current->signal, SIGINT)) return -EINTR;
+				if (sigismember(&current->blocked, SIGINT)) return -EINTR;
 
 				err = copy_to_user ((void*)p,(void*)&x,sizeof(u_short));
 				if (err < 0) return err;
@@ -2650,7 +2650,7 @@
 
 			x = __arch__swab16 (pccl_swap_16 (dev,0));
 
-			if (sigismember(&current->signal, SIGINT)) return -EINTR;
+			if (sigismember(&current->blocked, SIGINT)) return -EINTR;
 
 			err = copy_to_user ((void*)p,(void*)&x,sizeof(u_short));
 			if (err < 0) return err;
@@ -2684,7 +2684,7 @@
 			x[1] = pccl_swap_8 (dev,0);
 			x[0] = pccl_swap_8 (dev,0);
 
-			if (sigismember(&current->signal, SIGINT)) return -EINTR;
+			if (sigismember(&current->blocked, SIGINT)) return -EINTR;
 
 			err = copy_to_user ((void*)(buffer+j),(void*)x,3);
 			if (err < 0) return err;
@@ -2789,7 +2789,7 @@
 				err = copy_from_user ((void*)&x,(void*)p,sizeof(u_short));
 				if (err < 0) return err;
 
-				if (sigismember(&current->signal, SIGINT)) return -EINTR;
+				if (sigismember(&current->blocked, SIGINT)) return -EINTR;
 
 				pccl_swap_16 (dev,__arch__swab16 (x));
 				
@@ -2831,7 +2831,7 @@
 		err = copy_from_user ((void*)&x,(void*)p,sizeof(u_short));
 		if (err < 0) return err;
 
-		if (sigismember(&current->signal, SIGINT)) return -EINTR;
+		if (sigismember(&current->blocked, SIGINT)) return -EINTR;
 
 		pccl_swap_16 (dev,__arch__swab16 (x));
 	}
@@ -3029,7 +3029,7 @@
 
 	/* register the device in the system */
 
-	err = module_register_chrdev(PCCL_MAJOR, "pccl", &pccl_fops);
+	err = register_chrdev(PCCL_MAJOR, "pccl", &pccl_fops);
 	if (err < 0)
 	{
 		printk(KERN_NOTICE "pccl: error %d (module)\n", -err);
@@ -3108,7 +3108,7 @@
 	if (pccl_boards == 0)
 	{
 		printk(KERN_NOTICE "pccl: no pccl board(s) found\n");
-		module_unregister_chrdev(PCCL_MAJOR, "pccl");
+		unregister_chrdev(PCCL_MAJOR, "pccl");
 #if defined PCCL_WITH_PROCFS
 		pccl_remove_procfs ();
 #endif
Only in psxdev-core-2.0.0/pccl: pccl.c.orig

